diff --git a/.dir-locals.el b/.dir-locals.el new file mode 100644 index 0000000000000000000000000000000000000000..a53c8aa6db54f6d2c9c86f13e1d74daaccf2ddbd --- /dev/null +++ b/.dir-locals.el @@ -0,0 +1,8 @@ +;;; Directory Local Variables +;;; For more information see (info "(emacs) Directory Variables") + +((nil + (bug-reference-bug-regexp . "\\(\\(?:[Ii]ssue \\|[Ff]ixe[ds] \\|[Rr]esolve[ds]? \\|[Cc]lose[ds]? \\|[Pp]\\(?:ull [Rr]equest\\|[Rr]\\) \\|(\\)#\\([0-9]+\\))?\\)") + (bug-reference-url-format . "https://github.com/NixOS/nixpkgs/issues/%s")) + (nix-mode + (tab-width . 2))) diff --git a/.editorconfig b/.editorconfig index 7b40ff1ff5681ad219279608a5eda884ed397cbf..f272739f240aa6043227de71c3fe259f8e7b40c9 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,8 +13,8 @@ charset = utf-8 # see https://nixos.org/nixpkgs/manual/#chap-conventions -# Match nix/ruby files, set indent to spaces with width of two -[*.{nix,rb}] +# Match nix/ruby/docbook files, set indent to spaces with width of two +[*.{nix,rb,xml}] indent_style = space indent_size = 2 diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 01a24d64988c6c0012f018de9536ad1a8553c7e3..76fb19529b031166e9e60753388f89a5f4bf334a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -14,13 +14,15 @@ /lib @edolstra @nbp /lib/systems @nbp @ericson2314 /lib/generators.nix @edolstra @nbp @Profpatsch +/lib/debug.nix @edolstra @nbp @Profpatsch # Nixpkgs Internals /default.nix @nbp /pkgs/top-level/default.nix @nbp @Ericson2314 /pkgs/top-level/impure.nix @nbp @Ericson2314 /pkgs/top-level/stage.nix @nbp @Ericson2314 -/pkgs/stdenv +/pkgs/stdenv/generic @Ericson2314 +/pkgs/stdenv/cross @Ericson2314 /pkgs/build-support/cc-wrapper @Ericson2314 @orivej /pkgs/build-support/bintools-wrapper @Ericson2314 @orivej /pkgs/build-support/setup-hooks @Ericson2314 @@ -44,17 +46,18 @@ /nixos/modules/installer/tools/nixos-option.sh @nbp # Python-related code and docs +/maintainers/scripts/update-python-libraries @FRidh /pkgs/top-level/python-packages.nix @FRidh /pkgs/development/interpreters/python @FRidh /pkgs/development/python-modules @FRidh /doc/languages-frameworks/python.md @FRidh # Haskell -/pkgs/development/compilers/ghc @peti -/pkgs/development/haskell-modules @peti -/pkgs/development/haskell-modules/default.nix @peti -/pkgs/development/haskell-modules/generic-builder.nix @peti -/pkgs/development/haskell-modules/hoogle.nix @peti +/pkgs/development/compilers/ghc @peti @ryantm @basvandijk +/pkgs/development/haskell-modules @peti @ryantm @basvandijk +/pkgs/development/haskell-modules/default.nix @peti @ryantm @basvandijk +/pkgs/development/haskell-modules/generic-builder.nix @peti @ryantm @basvandijk +/pkgs/development/haskell-modules/hoogle.nix @peti @ryantm @basvandijk # R /pkgs/applications/science/math/R @peti @@ -64,6 +67,9 @@ /pkgs/development/interpreters/ruby @zimbatm /pkgs/development/ruby-modules @zimbatm +# Rust +/pkgs/development/compilers/rust @Mic92 @LnL7 + # Darwin-related /pkgs/stdenv/darwin @NixOS/darwin-maintainers /pkgs/os-specific/darwin @NixOS/darwin-maintainers diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 981036bf4a027b657c98485399fa001aca58189a..576beb18de6a75c53de9286a63802a005bd8e738 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -43,7 +43,7 @@ See the nixpkgs manual for more details on [standard meta-attributes](https://ni ## Writing good commit messages -In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list archives, pull request discussions or upstream changes, it may require a lot of work. +In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work. For package version upgrades and such a one-line commit message is usually sufficient. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 75db8e1377c45393860650f21c77beff7295c9de..ab1a50865f093b5e5607e1b6befaeb077417658a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,7 +5,7 @@ -- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS) +- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS) - Built on platform(s) - [ ] NixOS - [ ] macOS @@ -13,6 +13,7 @@ - [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"` - [ ] Tested execution of all binary files (usually in `./result/bin/`) +- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after) - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). --- diff --git a/README.md b/README.md index 9714bbd1ab309ab704dadf3defb4e0f457f4c3ab..004bba34530d91f84166c39571163d5597dce8c3 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ build daemon as so-called channels. To get channel information via git, add [nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote: ``` -% git remote add channels git://github.com/NixOS/nixpkgs-channels.git +% git remote add channels https://github.com/NixOS/nixpkgs-channels.git ``` For stability and maximum binary package support, it is recommended to maintain @@ -37,5 +37,5 @@ For pull-requests, please rebase onto nixpkgs `master`. Communication: -* [Mailing list](https://groups.google.com/forum/#!forum/nix-devel) +* [Discourse Forum](https://discourse.nixos.org/) * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) diff --git a/default.nix b/default.nix index a4896a9bbeecece633bd956f63f63627e145b3b3..180815d4d6de90e35d846f35e05396f0c6f97bb8 100644 --- a/default.nix +++ b/default.nix @@ -6,7 +6,10 @@ if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins. This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade: - - If you are running NixOS, use `nixos-rebuild' to upgrade your system. + - If you are running NixOS, `nixos-rebuild' can be used to upgrade your system. + + - Alternatively, with Nix > 2.0 `nix upgrade-nix' can be used to imperatively + upgrade Nix. You may use `nix-env --version' to check which version you have. - If you installed Nix using the install script (https://nixos.org/nix/install), it is safe to upgrade by running it again: diff --git a/doc/Makefile b/doc/Makefile index 0ddae8631f3cade387c96617d37a0633046226b7..ba77be6678c41c2ea9dc2ce05051ae9cf1b96947 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,12 +1,22 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md))) .PHONY: all -all: validate out/html/index.html out/epub/manual.epub +all: validate format out/html/index.html out/epub/manual.epub .PHONY: debug debug: nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml" +.PHONY: format +format: + find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ + xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {} + +.PHONY: fix-misc-xml +fix-misc-xml: + find . -iname '*.xml' -type f \ + -exec ../nixos/doc/varlistentry-fixer.rb {} ';' + .PHONY: clean clean: rm -f ${MD_TARGETS} .version manual-full.xml @@ -64,7 +74,7 @@ manual-full.xml: ${MD_TARGETS} .version *.xml .version: nix-instantiate --eval \ - -E '(import ../lib).nixpkgsVersion' > .version + -E '(import ../lib).version' > .version %.section.xml: %.section.md pandoc $^ -w docbook+smart \ diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index d556c7ebe1ed40908b9a7032f0d839593d583cf2..b3f7f093835cd4e3fbe54565fe2854a763ac8cb7 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -1,56 +1,59 @@ - -Coding conventions - - -
Syntax - - - - Use 2 spaces of indentation per indentation level in - Nix expressions, 4 spaces in shell scripts. - - Do not use tab characters, i.e. configure your - editor to use soft tabs. For instance, use (setq-default - indent-tabs-mode nil) in Emacs. Everybody has different - tab settings so it’s asking for trouble. - - Use lowerCamelCase for variable - names, not UpperCamelCase. Note, this rule does - not apply to package attribute names, which instead follow the rules - in . - - Function calls with attribute set arguments are - written as - + Coding conventions +
+ Syntax + + + + + Use 2 spaces of indentation per indentation level in Nix expressions, 4 + spaces in shell scripts. + + + + + Do not use tab characters, i.e. configure your editor to use soft tabs. + For instance, use (setq-default indent-tabs-mode nil) + in Emacs. Everybody has different tab settings so it’s asking for + trouble. + + + + + Use lowerCamelCase for variable names, not + UpperCamelCase. Note, this rule does not apply to + package attribute names, which instead follow the rules in + . + + + + + Function calls with attribute set arguments are written as foo { arg = ...; } - - not - + not foo { arg = ...; } - - Also fine is - + Also fine is foo { arg = ...; } - - if it's a short call. - - In attribute sets or lists that span multiple lines, - the attribute names or list elements should be aligned: - + if it's a short call. + + + + + In attribute sets or lists that span multiple lines, the attribute names + or list elements should be aligned: # A long list. list = @@ -73,12 +76,11 @@ attrs = { if true then big_expr else big_expr; }; - - - - Short lists or attribute sets can be written on one - line: - + + + + + Short lists or attribute sets can be written on one line: # A short list. list = [ elem1 elem2 elem3 ]; @@ -86,66 +88,58 @@ list = [ elem1 elem2 elem3 ]; # A short set. attrs = { x = 1280; y = 1024; }; - - - - Breaking in the middle of a function argument can - give hard-to-read code, like - + + + + + Breaking in the middle of a function argument can give hard-to-read code, + like someFunction { x = 1280; y = 1024; } otherArg yetAnotherArg - - (especially if the argument is very large, spanning multiple - lines). - - Better: - + (especially if the argument is very large, spanning multiple lines). + + + Better: someFunction { x = 1280; y = 1024; } otherArg yetAnotherArg - - or - + or let res = { x = 1280; y = 1024; }; in someFunction res otherArg yetAnotherArg - - - - The bodies of functions, asserts, and withs are not - indented to prevent a lot of superfluous indentation levels, i.e. - + + + + + The bodies of functions, asserts, and withs are not indented to prevent a + lot of superfluous indentation levels, i.e. { arg1, arg2 }: assert system == "i686-linux"; stdenv.mkDerivation { ... - - not - + not { arg1, arg2 }: assert system == "i686-linux"; stdenv.mkDerivation { ... - - - - Function formal arguments are written as: - + + + + + Function formal arguments are written as: { arg1, arg2, arg3 }: - - but if they don't fit on one line they're written as: - + but if they don't fit on one line they're written as: { arg1, arg2, arg3 , arg4, ... @@ -153,35 +147,28 @@ stdenv.mkDerivation { ... argN }: - - - - Functions should list their expected arguments as - precisely as possible. That is, write - + + + + + Functions should list their expected arguments as precisely as possible. + That is, write { stdenv, fetchurl, perl }: ... - - instead of - + instead of args: with args; ... - - or - + or { stdenv, fetchurl, perl, ... }: ... - - - - For functions that are truly generic in the number of - arguments (such as wrappers around mkDerivation) - that have some required arguments, you should write them using an - @-pattern: - + + + For functions that are truly generic in the number of arguments (such as + wrappers around mkDerivation) that have some required + arguments, you should write them using an @-pattern: { stdenv, doCoverageAnalysis ? false, ... } @ args: @@ -189,9 +176,7 @@ stdenv.mkDerivation (args // { ... if doCoverageAnalysis then "bla" else "" ... }) - - instead of - + instead of args: @@ -199,432 +184,635 @@ args.stdenv.mkDerivation (args // { ... if args ? doCoverageAnalysis && args.doCoverageAnalysis then "bla" else "" ... }) + + + +
+
+ Package naming - - - - -
- - -
Package naming - -In Nixpkgs, there are generally three different names associated with a package: - - - - The name attribute of the - derivation (excluding the version part). This is what most users - see, in particular when using - nix-env. - - The variable name used for the instantiated package - in all-packages.nix, and when passing it as a - dependency to other functions. Typically this is called the - package attribute name. This is what Nix - expression authors see. It can also be used when installing using - nix-env -iA. - - The filename for (the directory containing) the Nix - expression. - - - -Most of the time, these are the same. For instance, the package -e2fsprogs has a name attribute -"e2fsprogs-version", is -bound to the variable name e2fsprogs in -all-packages.nix, and the Nix expression is in -pkgs/os-specific/linux/e2fsprogs/default.nix. - - -There are a few naming guidelines: - - - - Generally, try to stick to the upstream package - name. - - Don’t use uppercase letters in the - name attribute — e.g., - "mplayer-1.0rc2" instead of - "MPlayer-1.0rc2". - - The version part of the name - attribute must start with a digit (following a - dash) — e.g., "hello-0.3.1rc2". - - If a package is not a release but a commit from a repository, then - the version part of the name must be the date of that - (fetched) commit. The date must be in "YYYY-MM-DD" format. - Also append "unstable" to the name - e.g., - "pkgname-unstable-2014-09-23". - - Dashes in the package name should be preserved in - new variable names, rather than converted to underscores or camel - cased — e.g., http-parser instead of - http_parser or httpParser. The - hyphenated style is preferred in all three package - names. - - If there are multiple versions of a package, this - should be reflected in the variable names in - all-packages.nix, - e.g. json-c-0-9 and json-c-0-11. - If there is an obvious “default” version, make an attribute like - json-c = json-c-0-9;. - See also - - - - - -
- - -
File naming and organisation - -Names of files and directories should be in lowercase, with -dashes between words — not in camel case. For instance, it should be -all-packages.nix, not -allPackages.nix or -AllPackages.nix. - -
Hierarchy - -Each package should be stored in its own directory somewhere in -the pkgs/ tree, i.e. in -pkgs/category/subcategory/.../pkgname. -Below are some rules for picking the right category for a package. -Many packages fall under several categories; what matters is the -primary purpose of a package. For example, the -libxml2 package builds both a library and some -tools; but it’s a library foremost, so it goes under -pkgs/development/libraries. - -When in doubt, consider refactoring the -pkgs/ tree, e.g. creating new categories or -splitting up an existing category. - - - - If it’s used to support software development: + + In Nixpkgs, there are generally three different names associated with a + package: + - - - If it’s a library used by other packages: - - development/libraries (e.g. libxml2) - - - - If it’s a compiler: - - development/compilers (e.g. gcc) - - - - If it’s an interpreter: - - development/interpreters (e.g. guile) - - - - If it’s a (set of) development tool(s): - - - - If it’s a parser generator (including lexers): - - development/tools/parsing (e.g. bison, flex) - - - - If it’s a build manager: - - development/tools/build-managers (e.g. gnumake) - - - - Else: - - development/tools/misc (e.g. binutils) - - - - - - - Else: - - development/misc - - - + + The name attribute of the derivation (excluding the + version part). This is what most users see, in particular when using + nix-env. + - - - If it’s a (set of) tool(s): - (A tool is a relatively small program, especially one intended - to be used non-interactively.) - - - If it’s for networking: - - tools/networking (e.g. wget) - - - - If it’s for text processing: - - tools/text (e.g. diffutils) - - - - If it’s a system utility, i.e., - something related or essential to the operation of a - system: - - tools/system (e.g. cron) - - - - If it’s an archiver (which may - include a compression function): - - tools/archivers (e.g. zip, tar) - - - - If it’s a compression program: - - tools/compression (e.g. gzip, bzip2) - - - - If it’s a security-related program: - - tools/security (e.g. nmap, gnupg) - - - - Else: - - tools/misc - - - + + The variable name used for the instantiated package in + all-packages.nix, and when passing it as a + dependency to other functions. Typically this is called the + package attribute name. This is what Nix expression + authors see. It can also be used when installing using nix-env + -iA. + - - - If it’s a shell: - shells (e.g. bash) + + The filename for (the directory containing) the Nix expression. + - - - If it’s a server: + + Most of the time, these are the same. For instance, the package + e2fsprogs has a name attribute + "e2fsprogs-version", is bound + to the variable name e2fsprogs in + all-packages.nix, and the Nix expression is in + pkgs/os-specific/linux/e2fsprogs/default.nix. + + + + There are a few naming guidelines: + - - - If it’s a web server: - - servers/http (e.g. apache-httpd) - - - - If it’s an implementation of the X Windowing System: - - servers/x11 (e.g. xorg — this includes the client libraries and programs) - - - - Else: - - servers/misc - - - + + Generally, try to stick to the upstream package name. + - - - If it’s a desktop environment: - desktops (e.g. kde, gnome, enlightenment) + + Don’t use uppercase letters in the name attribute + — e.g., "mplayer-1.0rc2" instead of + "MPlayer-1.0rc2". + - - - If it’s a window manager: - applications/window-managers (e.g. awesome, stumpwm) + + The version part of the name attribute + must start with a digit (following a dash) — e.g., + "hello-0.3.1rc2". + - - - If it’s an application: - A (typically large) program with a distinct user - interface, primarily used interactively. - - - If it’s a version management system: - - applications/version-management (e.g. subversion) - - - - If it’s for video playback / editing: - - applications/video (e.g. vlc) - - - - If it’s for graphics viewing / editing: - - applications/graphics (e.g. gimp) - - - - If it’s for networking: - - - - If it’s a mailreader: - - applications/networking/mailreaders (e.g. thunderbird) - - - - If it’s a newsreader: - - applications/networking/newsreaders (e.g. pan) - - - - If it’s a web browser: - - applications/networking/browsers (e.g. firefox) - - - - Else: - - applications/networking/misc - - - - - - - Else: - - applications/misc - - - + + If a package is not a release but a commit from a repository, then the + version part of the name must be the date of that + (fetched) commit. The date must be in "YYYY-MM-DD" + format. Also append "unstable" to the name - e.g., + "pkgname-unstable-2014-09-23". + - - - If it’s data (i.e., does not have a - straight-forward executable semantics): - - - If it’s a font: - - data/fonts - - - - If it’s related to SGML/XML processing: - - - - If it’s an XML DTD: - - data/sgml+xml/schemas/xml-dtd (e.g. docbook) - - - - If it’s an XSLT stylesheet: - - (Okay, these are executable...) - data/sgml+xml/stylesheets/xslt (e.g. docbook-xsl) - - - - - - - - - - If it’s a game: - - games + + Dashes in the package name should be preserved in new variable names, + rather than converted to underscores or camel cased — e.g., + http-parser instead of http_parser + or httpParser. The hyphenated style is preferred in + all three package names. + - - - Else: - misc + + If there are multiple versions of a package, this should be reflected in + the variable names in all-packages.nix, e.g. + json-c-0-9 and json-c-0-11. If + there is an obvious “default” version, make an attribute like + json-c = json-c-0-9;. See also + + - - - -
- -
Versioning - -Because every version of a package in Nixpkgs creates a -potential maintenance burden, old versions of a package should not be -kept unless there is a good reason to do so. For instance, Nixpkgs -contains several versions of GCC because other packages don’t build -with the latest version of GCC. Other examples are having both the -latest stable and latest pre-release version of a package, or to keep -several major releases of an application that differ significantly in -functionality. - -If there is only one version of a package, its Nix expression -should be named e2fsprogs/default.nix. If there -are multiple versions, this should be reflected in the filename, -e.g. e2fsprogs/1.41.8.nix and -e2fsprogs/1.41.9.nix. The version in the -filename should leave out unnecessary detail. For instance, if we -keep the latest Firefox 2.0.x and 3.5.x versions in Nixpkgs, they -should be named firefox/2.0.nix and -firefox/3.5.nix, respectively (which, at a given -point, might contain versions 2.0.0.20 and -3.5.4). If a version requires many auxiliary -files, you can use a subdirectory for each version, -e.g. firefox/2.0/default.nix and -firefox/3.5/default.nix. + + +
+
+ File naming and organisation -All versions of a package must be included -in all-packages.nix to make sure that they -evaluate correctly. + + Names of files and directories should be in lowercase, with dashes between + words — not in camel case. For instance, it should be + all-packages.nix, not + allPackages.nix or + AllPackages.nix. + -
+
+ Hierarchy + + + Each package should be stored in its own directory somewhere in the + pkgs/ tree, i.e. in + pkgs/category/subcategory/.../pkgname. + Below are some rules for picking the right category for a package. Many + packages fall under several categories; what matters is the + primary purpose of a package. For example, the + libxml2 package builds both a library and some tools; + but it’s a library foremost, so it goes under + pkgs/development/libraries. + + + + When in doubt, consider refactoring the pkgs/ tree, + e.g. creating new categories or splitting up an existing category. + + + + + + If it’s used to support software development: + + + + + + If it’s a library used by other packages: + + + + development/libraries (e.g. + libxml2) + + + + + + If it’s a compiler: + + + + development/compilers (e.g. + gcc) + + + + + + If it’s an interpreter: + + + + development/interpreters (e.g. + guile) + + + + + + If it’s a (set of) development tool(s): + + + + + + If it’s a parser generator (including lexers): + + + + development/tools/parsing (e.g. + bison, flex) + + + + + + If it’s a build manager: + + + + development/tools/build-managers (e.g. + gnumake) + + + + + + Else: + + + + development/tools/misc (e.g. + binutils) + + + + + + + + + Else: + + + + development/misc + + + + + + + + + If it’s a (set of) tool(s): + + + + (A tool is a relatively small program, especially one intended to be + used non-interactively.) + + + + + If it’s for networking: + + + + tools/networking (e.g. + wget) + + + + + + If it’s for text processing: + + + + tools/text (e.g. diffutils) + + + + + + If it’s a system utility, i.e., something related or essential to the operation of a system: + + + + tools/system (e.g. cron) + + + + + + If it’s an archiver (which may include a compression function): + + + + tools/archivers (e.g. zip, + tar) + + + + + + If it’s a compression program: + + + + tools/compression (e.g. + gzip, bzip2) + + + + + + If it’s a security-related program: + + + + tools/security (e.g. nmap, + gnupg) + + + + + + Else: + + + + tools/misc + + + + + + + + + If it’s a shell: + + + + shells (e.g. bash) + + + + + + If it’s a server: + + + + + + If it’s a web server: + + + + servers/http (e.g. + apache-httpd) + + + + + + If it’s an implementation of the X Windowing System: + + + + servers/x11 (e.g. xorg — + this includes the client libraries and programs) + + + + + + Else: + + + + servers/misc + + + + + + + + + If it’s a desktop environment: + + + + desktops (e.g. kde, + gnome, enlightenment) + + + + + + If it’s a window manager: + + + + applications/window-managers (e.g. + awesome, stumpwm) + + + + + + If it’s an application: + + + + A (typically large) program with a distinct user interface, primarily + used interactively. + + + + + If it’s a version management system: + + + + applications/version-management (e.g. + subversion) + + + + + + If it’s for video playback / editing: + + + + applications/video (e.g. + vlc) + + + + + + If it’s for graphics viewing / editing: + + + + applications/graphics (e.g. + gimp) + + + + + + If it’s for networking: + + + + + + If it’s a mailreader: + + + + applications/networking/mailreaders (e.g. + thunderbird) + + + + + + If it’s a newsreader: + + + + applications/networking/newsreaders (e.g. + pan) + + + + + + If it’s a web browser: + + + + applications/networking/browsers (e.g. + firefox) + + + + + + Else: + + + + applications/networking/misc + + + + + + + + + Else: + + + + applications/misc + + + + + + + + + If it’s data (i.e., does not have a straight-forward executable semantics): + + + + + + If it’s a font: + + + + data/fonts + + + + + + If it’s related to SGML/XML processing: + + + + + + If it’s an XML DTD: + + + + data/sgml+xml/schemas/xml-dtd (e.g. + docbook) + + + + + + If it’s an XSLT stylesheet: + + + + (Okay, these are executable...) + + + data/sgml+xml/stylesheets/xslt (e.g. + docbook-xsl) + + + + + + + + + + + + If it’s a game: + + + + games + + + + + + Else: + + + + misc + + + + +
+ +
+ Versioning + + + Because every version of a package in Nixpkgs creates a potential + maintenance burden, old versions of a package should not be kept unless + there is a good reason to do so. For instance, Nixpkgs contains several + versions of GCC because other packages don’t build with the latest + version of GCC. Other examples are having both the latest stable and latest + pre-release version of a package, or to keep several major releases of an + application that differ significantly in functionality. + + + + If there is only one version of a package, its Nix expression should be + named e2fsprogs/default.nix. If there are multiple + versions, this should be reflected in the filename, e.g. + e2fsprogs/1.41.8.nix and + e2fsprogs/1.41.9.nix. The version in the filename + should leave out unnecessary detail. For instance, if we keep the latest + Firefox 2.0.x and 3.5.x versions in Nixpkgs, they should be named + firefox/2.0.nix and + firefox/3.5.nix, respectively (which, at a given + point, might contain versions 2.0.0.20 and + 3.5.4). If a version requires many auxiliary files, you + can use a subdirectory for each version, e.g. + firefox/2.0/default.nix and + firefox/3.5/default.nix. + + + + All versions of a package must be included in + all-packages.nix to make sure that they evaluate + correctly. + +
+
+
+ Fetching Sources -
-
Fetching Sources - There are multiple ways to fetch a package source in nixpkgs. The - general guideline is that you should package sources with a high degree of - availability. Right now there is only one fetcher which has mirroring - support and that is fetchurl. Note that you should also - prefer protocols which have a corresponding proxy environment variable. + + There are multiple ways to fetch a package source in nixpkgs. The general + guideline is that you should package sources with a high degree of + availability. Right now there is only one fetcher which has mirroring + support and that is fetchurl. Note that you should also + prefer protocols which have a corresponding proxy environment variable. - You can find many source fetch helpers in pkgs/build-support/fetch*. + + + You can find many source fetch helpers in + pkgs/build-support/fetch*. - In the file pkgs/top-level/all-packages.nix you can - find fetch helpers, these have names on the form - fetchFrom*. The intention of these are to provide - snapshot fetches but using the same api as some of the version controlled - fetchers from pkgs/build-support/. As an example going - from bad to good: - - - Bad: Uses git:// which won't be proxied. + + + In the file pkgs/top-level/all-packages.nix you can find + fetch helpers, these have names on the form fetchFrom*. + The intention of these are to provide snapshot fetches but using the same + api as some of the version controlled fetchers from + pkgs/build-support/. As an example going from bad to + good: + + + + Bad: Uses git:// which won't be proxied. src = fetchgit { url = "git://github.com/NixOS/nix.git"; @@ -632,10 +820,11 @@ src = fetchgit { sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; } - - - - Better: This is ok, but an archive fetch will still be faster. + + + + + Better: This is ok, but an archive fetch will still be faster. src = fetchgit { url = "https://github.com/NixOS/nix.git"; @@ -643,10 +832,11 @@ src = fetchgit { sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; } - - - - Best: Fetches a snapshot archive and you get the rev you want. + + + + + Best: Fetches a snapshot archive and you get the rev you want. src = fetchFromGitHub { owner = "NixOS"; @@ -655,15 +845,19 @@ src = fetchFromGitHub { sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9"; } - - - + + + + +
+
+ Patches + + + Patches available online should be retrieved using + fetchpatch. -
-
Patches - Patches available online should be retrieved using - fetchpatch. patches = [ @@ -675,30 +869,54 @@ patches = [ ]; - Otherwise, you can add a .patch file to the - nixpkgs repository. In the interest of keeping our - maintenance burden to a minimum, only patches that are unique - to nixpkgs should be added in this way. - + + + Otherwise, you can add a .patch file to the + nixpkgs repository. In the interest of keeping our + maintenance burden to a minimum, only patches that are unique to + nixpkgs should be added in this way. + + + + patches = [ ./0001-changes.patch ]; - - If you do need to do create this sort of patch file, - one way to do so is with git: - - Move to the root directory of the source code - you're patching. -$ cd the/program/source - If a git repository is not already present, - create one and stage all of the source files. + + + + + If you do need to do create this sort of patch file, one way to do so is + with git: + + + + Move to the root directory of the source code you're patching. + +$ cd the/program/source + + + + + If a git repository is not already present, create one and stage all of + the source files. + $ git init -$ git add . - Edit some files to make whatever changes need - to be included in the patch. - Use git to create a diff, and pipe the output - to a patch file: +$ git add . + + + + + Edit some files to make whatever changes need to be included in the + patch. + + + + + Use git to create a diff, and pipe the output to a patch file: + $ git diff > nixpkgs/pkgs/the/package/0001-changes.patch - - -
- +
+
+ + +
diff --git a/doc/configuration.xml b/doc/configuration.xml index 55c5ea809d354493cadf8f89e8b2ee116583c9fb..c91f38f309300b2c4d0b7686d46c3cd4961ac31c 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -1,40 +1,51 @@ - -Global configuration - -Nix comes with certain defaults about what packages can and -cannot be installed, based on a package's metadata. By default, Nix -will prevent installation if any of the following criteria are -true: - - - The package is thought to be broken, and has had - its meta.broken set to - true. - - The package's meta.license is set - to a license which is considered to be unfree. - - The package has known security vulnerabilities but - has not or can not be updated for some reason, and a list of issues - has been entered in to the package's - meta.knownVulnerabilities. - - -Note that all this is checked during evaluation already, -and the check includes any package that is evaluated. -In particular, all build-time dependencies are checked. -nix-env -qa will (attempt to) hide any packages -that would be refused. - - -Each of these criteria can be altered in the nixpkgs -configuration. - -The nixpkgs configuration for a NixOS system is set in the -configuration.nix, as in the following example: + Global configuration + + Nix comes with certain defaults about what packages can and cannot be + installed, based on a package's metadata. By default, Nix will prevent + installation if any of the following criteria are true: + + + + + The package is thought to be broken, and has had its + meta.broken set to true. + + + + + The package isn't intended to run on the given system, as none of its + meta.platforms match the given system. + + + + + The package's meta.license is set to a license which is + considered to be unfree. + + + + + The package has known security vulnerabilities but has not or can not be + updated for some reason, and a list of issues has been entered in to the + package's meta.knownVulnerabilities. + + + + + Note that all this is checked during evaluation already, and the check + includes any package that is evaluated. In particular, all build-time + dependencies are checked. nix-env -qa will (attempt to) + hide any packages that would be refused. + + + Each of these criteria can be altered in the nixpkgs configuration. + + + The nixpkgs configuration for a NixOS system is set in the + configuration.nix, as in the following example: { nixpkgs.config = { @@ -42,151 +53,197 @@ configuration. }; } -However, this does not allow unfree software for individual users. -Their configurations are managed separately. - -A user's of nixpkgs configuration is stored in a user-specific -configuration file located at -~/.config/nixpkgs/config.nix. For example: + However, this does not allow unfree software for individual users. Their + configurations are managed separately. + + + A user's of nixpkgs configuration is stored in a user-specific configuration + file located at ~/.config/nixpkgs/config.nix. For + example: { allowUnfree = true; } - - -Note that we are not able to test or build unfree software on Hydra -due to policy. Most unfree licenses prohibit us from either executing or -distributing the software. - -
+ + + Note that we are not able to test or build unfree software on Hydra due to + policy. Most unfree licenses prohibit us from either executing or + distributing the software. + +
Installing broken packages - - There are two ways to try compiling a package which has been - marked as broken. + + There are two ways to try compiling a package which has been marked as + broken. + - - For allowing the build of a broken package once, you can use an - environment variable for a single invocation of the nix tools: - - $ export NIXPKGS_ALLOW_BROKEN=1 - - - - For permanently allowing broken packages to be built, you may - add allowBroken = true; to your user's - configuration file, like this: - + + + For allowing the build of a broken package once, you can use an + environment variable for a single invocation of the nix tools: +$ export NIXPKGS_ALLOW_BROKEN=1 + + + + + For permanently allowing broken packages to be built, you may add + allowBroken = true; to your user's configuration file, + like this: { allowBroken = true; } - + + -
+
+
+ Installing packages on unsupported systems -
- Installing unfree packages - - There are several ways to tweak how Nix handles a package - which has been marked as unfree. + + There are also two ways to try compiling a package which has been marked as + unsuported for the given system. + - - To temporarily allow all unfree packages, you can use an - environment variable for a single invocation of the nix tools: + + + For allowing the build of a broken package once, you can use an + environment variable for a single invocation of the nix tools: +$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 + + + + + For permanently allowing broken packages to be built, you may add + allowUnsupportedSystem = true; to your user's + configuration file, like this: + +{ + allowUnsupportedSystem = true; +} + + + + - $ export NIXPKGS_ALLOW_UNFREE=1 - + + The difference between an a package being unsupported on some system and + being broken is admittedly a bit fuzzy. If a program + ought to work on a certain platform, but doesn't, the + platform should be included in meta.platforms, but marked + as broken with e.g. meta.broken = + !hostPlatform.isWindows. Of course, this begs the question of what + "ought" means exactly. That is left to the package maintainer. + +
+
+ Installing unfree packages - - It is possible to permanently allow individual unfree packages, - while still blocking unfree packages by default using the - allowUnfreePredicate configuration - option in the user configuration file. + + There are several ways to tweak how Nix handles a package which has been + marked as unfree. + - This option is a function which accepts a package as a - parameter, and returns a boolean. The following example - configuration accepts a package and always returns false: + + + + To temporarily allow all unfree packages, you can use an environment + variable for a single invocation of the nix tools: +$ export NIXPKGS_ALLOW_UNFREE=1 + + + + + It is possible to permanently allow individual unfree packages, while + still blocking unfree packages by default using the + allowUnfreePredicate configuration option in the user + configuration file. + + + This option is a function which accepts a package as a parameter, and + returns a boolean. The following example configuration accepts a package + and always returns false: { allowUnfreePredicate = (pkg: false); } - - - A more useful example, the following configuration allows - only allows flash player and visual studio code: - + + + A more useful example, the following configuration allows only allows + flash player and visual studio code: { allowUnfreePredicate = (pkg: elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]); } - - - - It is also possible to whitelist and blacklist licenses - that are specifically acceptable or not acceptable, using - whitelistedLicenses and - blacklistedLicenses, respectively. - - - The following example configuration whitelists the - licenses amd and wtfpl: - + + + + + It is also possible to whitelist and blacklist licenses that are + specifically acceptable or not acceptable, using + whitelistedLicenses and + blacklistedLicenses, respectively. + + + The following example configuration whitelists the licenses + amd and wtfpl: { whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ]; } - - - The following example configuration blacklists the - gpl3 and agpl3 licenses: - + + + The following example configuration blacklists the gpl3 + and agpl3 licenses: { blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ]; } - - + + - A complete list of licenses can be found in the file - lib/licenses.nix of the nixpkgs tree. -
- + + A complete list of licenses can be found in the file + lib/licenses.nix of the nixpkgs tree. + +
+
+ Installing insecure packages -
- - Installing insecure packages - - - There are several ways to tweak how Nix handles a package - which has been marked as insecure. + + There are several ways to tweak how Nix handles a package which has been + marked as insecure. + - - To temporarily allow all insecure packages, you can use an - environment variable for a single invocation of the nix tools: - - $ export NIXPKGS_ALLOW_INSECURE=1 - - - - It is possible to permanently allow individual insecure - packages, while still blocking other insecure packages by - default using the permittedInsecurePackages - configuration option in the user configuration file. - - The following example configuration permits the - installation of the hypothetically insecure package - hello, version 1.2.3: + + + To temporarily allow all insecure packages, you can use an environment + variable for a single invocation of the nix tools: +$ export NIXPKGS_ALLOW_INSECURE=1 + + + + + It is possible to permanently allow individual insecure packages, while + still blocking other insecure packages by default using the + permittedInsecurePackages configuration option in the + user configuration file. + + + The following example configuration permits the installation of the + hypothetically insecure package hello, version + 1.2.3: { permittedInsecurePackages = [ @@ -194,47 +251,44 @@ distributing the software. ]; } - - - - - It is also possible to create a custom policy around which - insecure packages to allow and deny, by overriding the - allowInsecurePredicate configuration - option. - - The allowInsecurePredicate option is a - function which accepts a package and returns a boolean, much - like allowUnfreePredicate. - - The following configuration example only allows insecure - packages with very short names: - + + + + + It is also possible to create a custom policy around which insecure + packages to allow and deny, by overriding the + allowInsecurePredicate configuration option. + + + The allowInsecurePredicate option is a function which + accepts a package and returns a boolean, much like + allowUnfreePredicate. + + + The following configuration example only allows insecure packages with + very short names: { allowInsecurePredicate = (pkg: (builtins.stringLength (builtins.parseDrvName pkg.name).name) <= 5); } - - - Note that permittedInsecurePackages is - only checked if allowInsecurePredicate is not - specified. - + + + Note that permittedInsecurePackages is only checked if + allowInsecurePredicate is not specified. + + -
- +
- -
Modify -packages via <literal>packageOverrides</literal> - -You can define a function called -packageOverrides in your local -~/.config/nixpkgs/config.nix to override nix packages. It -must be a function that takes pkgs as an argument and return modified -set of packages. - +
+ Modify packages via <literal>packageOverrides</literal> + + + You can define a function called packageOverrides in your + local ~/.config/nixpkgs/config.nix to override nix + packages. It must be a function that takes pkgs as an argument and return + modified set of packages. { packageOverrides = pkgs: rec { @@ -242,30 +296,27 @@ set of packages. }; } - - - -
- -
+ +
+
Declarative Package Management
- Build an environment - - - Using packageOverrides, it is possible to manage - packages declaratively. This means that we can list all of our desired - packages within a declarative Nix expression. For example, to have - aspell, bc, - ffmpeg, coreutils, - gdb, nixUnstable, - emscripten, jq, - nox, and silver-searcher, we could - use the following in ~/.config/nixpkgs/config.nix: - - - + Build an environment + + + Using packageOverrides, it is possible to manage + packages declaratively. This means that we can list all of our desired + packages within a declarative Nix expression. For example, to have + aspell, bc, + ffmpeg, coreutils, + gdb, nixUnstable, + emscripten, jq, + nox, and silver-searcher, we could + use the following in ~/.config/nixpkgs/config.nix: + + + { packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { @@ -276,17 +327,17 @@ set of packages. } - - To install it into our environment, you can just run nix-env -iA - nixpkgs.myPackages. If you want to load the packages to be built - from a working copy of nixpkgs you just run - nix-env -f. -iA myPackages. To explore what's been - installed, just look through ~/.nix-profile/. You can - see that a lot of stuff has been installed. Some of this stuff is useful - some of it isn't. Let's tell Nixpkgs to only link the stuff that we want: - - - + + To install it into our environment, you can just run nix-env -iA + nixpkgs.myPackages. If you want to load the packages to be built + from a working copy of nixpkgs you just run + nix-env -f. -iA myPackages. To explore what's been + installed, just look through ~/.nix-profile/. You can + see that a lot of stuff has been installed. Some of this stuff is useful + some of it isn't. Let's tell Nixpkgs to only link the stuff that we want: + + + { packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { @@ -298,51 +349,49 @@ set of packages. } - - pathsToLink tells Nixpkgs to only link the paths listed - which gets rid of the extra stuff in the profile. - /bin and /share are good - defaults for a user environment, getting rid of the clutter. If you are - running on Nix on MacOS, you may want to add another path as well, - /Applications, that makes GUI apps available. - - + + pathsToLink tells Nixpkgs to only link the paths listed + which gets rid of the extra stuff in the profile. /bin + and /share are good defaults for a user environment, + getting rid of the clutter. If you are running on Nix on MacOS, you may + want to add another path as well, /Applications, that + makes GUI apps available. +
- Getting documentation - - - After building that new environment, look through - ~/.nix-profile to make sure everything is there that - we wanted. Discerning readers will note that some files are missing. Look - inside ~/.nix-profile/share/man/man1/ to verify this. - There are no man pages for any of the Nix tools! This is because some - packages like Nix have multiple outputs for things like documentation (see - section 4). Let's make Nix install those as well. - - - + Getting documentation + + + After building that new environment, look through + ~/.nix-profile to make sure everything is there that + we wanted. Discerning readers will note that some files are missing. Look + inside ~/.nix-profile/share/man/man1/ to verify this. + There are no man pages for any of the Nix tools! This is because some + packages like Nix have multiple outputs for things like documentation (see + section 4). Let's make Nix install those as well. + + + { packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { name = "my-packages"; paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ]; - pathsToLink = [ "/share/man" "/share/doc" /bin" ]; + pathsToLink = [ "/share/man" "/share/doc" "/bin" ]; extraOutputsToInstall = [ "man" "doc" ]; }; }; } - - This provides us with some useful documentation for using our packages. - However, if we actually want those manpages to be detected by man, we need - to set up our environment. This can also be managed within Nix - expressions. - + + This provides us with some useful documentation for using our packages. + However, if we actually want those manpages to be detected by man, we need + to set up our environment. This can also be managed within Nix expressions. + - + { packageOverrides = pkgs: with pkgs; rec { myProfile = writeText "my-profile" '' @@ -367,20 +416,20 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh nox silver-searcher ]; - pathsToLink = [ "/share/man" "/share/doc" /bin" "/etc" ]; + pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ]; extraOutputsToInstall = [ "man" "doc" ]; }; }; } - - For this to work fully, you must also have this script sourced when you - are logged in. Try adding something like this to your - ~/.profile file: - + + For this to work fully, you must also have this script sourced when you are + logged in. Try adding something like this to your + ~/.profile file: + - + #!/bin/sh if [ -d $HOME/.nix-profile/etc/profile.d ]; then for i in $HOME/.nix-profile/etc/profile.d/*.sh; do @@ -391,23 +440,22 @@ if [ -d $HOME/.nix-profile/etc/profile.d ]; then fi - - Now just run source $HOME/.profile and you can starting - loading man pages from your environent. - - + + Now just run source $HOME/.profile and you can starting + loading man pages from your environent. +
- +
- GNU info setup + GNU info setup - - Configuring GNU info is a little bit trickier than man pages. To work - correctly, info needs a database to be generated. This can be done with - some small modifications to our environment scripts. - + + Configuring GNU info is a little bit trickier than man pages. To work + correctly, info needs a database to be generated. This can be done with + some small modifications to our environment scripts. + - + { packageOverrides = pkgs: with pkgs; rec { myProfile = writeText "my-profile" '' @@ -449,16 +497,13 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh } - - postBuild tells Nixpkgs to run a command after building - the environment. In this case, install-info adds the - installed info pages to dir which is GNU info's default - root node. Note that texinfoInteractive is added to the - environment to give the install-info command. - - + + postBuild tells Nixpkgs to run a command after building + the environment. In this case, install-info adds the + installed info pages to dir which is GNU info's default + root node. Note that texinfoInteractive is added to the + environment to give the install-info command. +
- -
- +
diff --git a/doc/contributing.xml b/doc/contributing.xml index 7aa0df271ff499fd0d3a35452f215356b9261f93..d28442b7a2c6ab6c12e03edcc2a038bbc102462d 100644 --- a/doc/contributing.xml +++ b/doc/contributing.xml @@ -1,35 +1,35 @@ - -Contributing to this documentation - -The DocBook sources of the Nixpkgs manual are in the Contributing to this documentation + + The DocBook sources of the Nixpkgs manual are in the + doc -subdirectory of the Nixpkgs repository. - -You can quickly check your edits with make: - + subdirectory of the Nixpkgs repository. + + + You can quickly check your edits with make: + $ cd /path/to/nixpkgs/doc $ nix-shell [nix-shell]$ make - -If you experience problems, run make debug -to help understand the docbook errors. - -After making modifications to the manual, it's important to -build it before committing. You can do that as follows: - + + If you experience problems, run make debug to help + understand the docbook errors. + + + After making modifications to the manual, it's important to build it before + committing. You can do that as follows: $ cd /path/to/nixpkgs/doc $ nix-shell [nix-shell]$ make clean [nix-shell]$ nix-build . - -If the build succeeds, the manual will be in -./result/share/doc/nixpkgs/manual.html. - + If the build succeeds, the manual will be in + ./result/share/doc/nixpkgs/manual.html. + diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 10e4706b0590f0ecc4eebf300d61199be5137c44..a7b43aeec23f9fd763d64d1cc9e876db9bca2652 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -1,308 +1,478 @@ - -Cross-compilation - -
+ Cross-compilation +
Introduction + - "Cross-compilation" means compiling a program on one machine for another type of machine. - For example, a typical use of cross compilation is to compile programs for embedded devices. - These devices often don't have the computing power and memory to compile their own programs. - One might think that cross-compilation is a fairly niche concern, but there are advantages to being rigorous about distinguishing build-time vs run-time environments even when one is developing and deploying on the same machine. - Nixpkgs is increasingly adopting the opinion that packages should be written with cross-compilation in mind, and nixpkgs should evaluate in a similar way (by minimizing cross-compilation-specific special cases) whether or not one is cross-compiling. + "Cross-compilation" means compiling a program on one machine for another + type of machine. For example, a typical use of cross compilation is to + compile programs for embedded devices. These devices often don't have the + computing power and memory to compile their own programs. One might think + that cross-compilation is a fairly niche concern, but there are advantages + to being rigorous about distinguishing build-time vs run-time environments + even when one is developing and deploying on the same machine. Nixpkgs is + increasingly adopting the opinion that packages should be written with + cross-compilation in mind, and nixpkgs should evaluate in a similar way (by + minimizing cross-compilation-specific special cases) whether or not one is + cross-compiling. - This chapter will be organized in three parts. - First, it will describe the basics of how to package software in a way that supports cross-compilation. - Second, it will describe how to use Nixpkgs when cross-compiling. - Third, it will describe the internal infrastructure supporting cross-compilation. + This chapter will be organized in three parts. First, it will describe the + basics of how to package software in a way that supports cross-compilation. + Second, it will describe how to use Nixpkgs when cross-compiling. Third, it + will describe the internal infrastructure supporting cross-compilation. -
- +
- -
+
Packaging in a cross-friendly manner
- Platform parameters - - Nixpkgs follows the common historical convention of GNU autoconf of distinguishing between 3 types of platform: build, host, and target. + Platform parameters - In summary, build is the platform on which a package is being built, host is the platform on which it is to run. The third attribute, target, is relevant only for certain specific compilers and build tools. - + + Nixpkgs follows the + common + historical convention of GNU autoconf of distinguishing between 3 + types of platform: build, + host, and target. In + summary, build is the platform on which a package + is being built, host is the platform on which it + is to run. The third attribute, target, is + relevant only for certain specific compilers and build tools. + - - In Nixpkgs, these three platforms are defined as attribute sets under the names buildPlatform, hostPlatform, and targetPlatform. - All three are always defined as attributes in the standard environment, and at the top level. That means one can get at them just like a dependency in a function that is imported with callPackage: - { stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform..., or just off stdenv: - { stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform.... - - - - buildPlatform - - The "build platform" is the platform on which a package is built. - Once someone has a built package, or pre-built binary package, the build platform should not matter and be safe to ignore. - - - - hostPlatform - - The "host platform" is the platform on which a package will be run. - This is the simplest platform to understand, but also the one with the worst name. - - - - targetPlatform - - - The "target platform" attribute is, unlike the other two attributes, not actually fundamental to the process of building software. - Instead, it is only relevant for compatibility with building certain specific compilers and build tools. - It can be safely ignored for all other packages. - - - The build process of certain compilers is written in such a way that the compiler resulting from a single build can itself only produce binaries for a single platform. - The task specifying this single "target platform" is thus pushed to build time of the compiler. - The root cause of this mistake is often that the compiler (which will be run on the host) and the the standard library/runtime (which will be run on the target) are built by a single build process. - - - There is no fundamental need to think about a single target ahead of time like this. - If the tool supports modular or pluggable backends, both the need to specify the target at build time and the constraint of having only a single target disappear. - An example of such a tool is LLVM. - - - Although the existance of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf. - Nixpkgs tries to avoid sharing in the mistake where possible. - Still, because the concept of a target platform is so ingrained, it is best to support it as is. - - - - - - The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up. - You can see examples of ones used in practice in lib.systems.examples; note how they are not all very consistent. - For now, here are few fields can count on them containing: - - - - system - - - This is a two-component shorthand for the platform. - Examples of this would be "x86_64-darwin" and "i686-linux"; see lib.systems.doubles for more. - This format isn't very standard, but has built-in support in Nix, such as the builtins.currentSystem impure string. - - - - - config - - - This is a 3- or 4- component shorthand for the platform. - Examples of this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14". - This is a standard format called the "LLVM target triple", as they are pioneered by LLVM and traditionally just used for the targetPlatform. - This format is strictly more informative than the "Nix host double", as the previous format could analogously be termed. - This needs a better name than config! - - - - - parsed - - - This is a nix representation of a parsed LLVM target triple with white-listed components. - This can be specified directly, or actually parsed from the config. - [Technically, only one need be specified and the others can be inferred, though the precision of inference may not be very good.] - See lib.systems.parse for the exact representation. - - - - - libc - - - This is a string identifying the standard C library used. - Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc. - It should probably be refactored to use the module system, like parse. - - - - - is* - - - These predicates are defined in lib.systems.inspect, and slapped on every platform. - They are superior to the ones in stdenv as they force the user to be explicit about which platform they are inspecting. - Please use these instead of those. - - - - - platform - - - This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set). - See lib.systems.platforms for examples—there's hopefully one in there that will work verbatim for each platform that is working. - Please help us triage these flags and give them better homes! - - - - + + In Nixpkgs, these three platforms are defined as attribute sets under the + names buildPlatform, hostPlatform, + and targetPlatform. All three are always defined as + attributes in the standard environment, and at the top level. That means + one can get at them just like a dependency in a function that is imported + with callPackage: +{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform... + , or just off stdenv: +{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform... + . + + + + + + buildPlatform + + + + The "build platform" is the platform on which a package is built. Once + someone has a built package, or pre-built binary package, the build + platform should not matter and be safe to ignore. + + + + + + hostPlatform + + + + The "host platform" is the platform on which a package will be run. This + is the simplest platform to understand, but also the one with the worst + name. + + + + + + targetPlatform + + + + The "target platform" attribute is, unlike the other two attributes, not + actually fundamental to the process of building software. Instead, it is + only relevant for compatibility with building certain specific compilers + and build tools. It can be safely ignored for all other packages. + + + The build process of certain compilers is written in such a way that the + compiler resulting from a single build can itself only produce binaries + for a single platform. The task specifying this single "target platform" + is thus pushed to build time of the compiler. The root cause of this + mistake is often that the compiler (which will be run on the host) and + the the standard library/runtime (which will be run on the target) are + built by a single build process. + + + There is no fundamental need to think about a single target ahead of + time like this. If the tool supports modular or pluggable backends, both + the need to specify the target at build time and the constraint of + having only a single target disappear. An example of such a tool is + LLVM. + + + Although the existence of a "target platfom" is arguably a historical + mistake, it is a common one: examples of tools that suffer from it are + GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the + mistake where possible. Still, because the concept of a target platform + is so ingrained, it is best to support it as is. + + + + + + + The exact schema these fields follow is a bit ill-defined due to a long and + convoluted evolution, but this is slowly being cleaned up. You can see + examples of ones used in practice in + lib.systems.examples; note how they are not all very + consistent. For now, here are few fields can count on them containing: + + + + + + system + + + + This is a two-component shorthand for the platform. Examples of this + would be "x86_64-darwin" and "i686-linux"; see + lib.systems.doubles for more. This format isn't very + standard, but has built-in support in Nix, such as the + builtins.currentSystem impure string. + + + + + + config + + + + This is a 3- or 4- component shorthand for the platform. Examples of + this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14". + This is a standard format called the "LLVM target triple", as they are + pioneered by LLVM and traditionally just used for the + targetPlatform. This format is strictly more + informative than the "Nix host double", as the previous format could + analogously be termed. This needs a better name than + config! + + + + + + parsed + + + + This is a nix representation of a parsed LLVM target triple with + white-listed components. This can be specified directly, or actually + parsed from the config. [Technically, only one need + be specified and the others can be inferred, though the precision of + inference may not be very good.] See + lib.systems.parse for the exact representation. + + + + + + libc + + + + This is a string identifying the standard C library used. Valid + identifiers include "glibc" for GNU libc, "libSystem" for Darwin's + Libsystem, and "uclibc" for µClibc. It should probably be refactored to + use the module system, like parse. + + + + + + is* + + + + These predicates are defined in lib.systems.inspect, + and slapped on every platform. They are superior to the ones in + stdenv as they force the user to be explicit about + which platform they are inspecting. Please use these instead of those. + + + + + + platform + + + + This is, quite frankly, a dumping ground of ad-hoc settings (it's an + attribute set). See lib.systems.platforms for + examples—there's hopefully one in there that will work verbatim for + each platform that is working. Please help us triage these flags and + give them better homes! + + + +
- Specifying Dependencies - - In this section we explore the relationship between both runtime and buildtime dependencies and the 3 Autoconf platforms. - - - A runtime dependency between 2 packages implies that between them both the host and target platforms match. - This is directly implied by the meaning of "host platform" and "runtime dependency": - The package dependency exists while both packages are running on a single host platform. - - - A build time dependency, however, implies a shift in platforms between the depending package and the depended-on package. - The meaning of a build time dependency is that to build the depending package we need to be able to run the depended-on's package. - The depending package's build platform is therefore equal to the depended-on package's host platform. - Analogously, the depending package's host platform is equal to the depended-on package's target platform. - - - In this manner, given the 3 platforms for one package, we can determine the three platforms for all its transitive dependencies. - This is the most important guiding principle behind cross-compilation with Nixpkgs, and will be called the sliding window principle. - + Specifying Dependencies + + + In this section we explore the relationship between both runtime and + buildtime dependencies and the 3 Autoconf platforms. + + + + A runtime dependency between 2 packages implies that between them both the + host and target platforms match. This is directly implied by the meaning of + "host platform" and "runtime dependency": The package dependency exists + while both packages are running on a single host platform. + + + + A build time dependency, however, implies a shift in platforms between the + depending package and the depended-on package. The meaning of a build time + dependency is that to build the depending package we need to be able to run + the depended-on's package. The depending package's build platform is + therefore equal to the depended-on package's host platform. Analogously, + the depending package's host platform is equal to the depended-on package's + target platform. + + + + In this manner, given the 3 platforms for one package, we can determine the + three platforms for all its transitive dependencies. This is the most + important guiding principle behind cross-compilation with Nixpkgs, and will + be called the sliding window principle. + + + + Some examples will probably make this clearer. If a package is being built + with a (build, host, target) platform triple of + (foo, bar, bar), then its build-time dependencies would + have a triple of (foo, foo, bar), and those + packages' build-time dependencies would have triple of + (foo, foo, foo). In other words, it should take two + "rounds" of following build-time dependency edges before one reaches a + fixed point where, by the sliding window principle, the platform triple no + longer changes. Indeed, this happens with cross compilation, where only + rounds of native dependencies starting with the second necessarily coincide + with native packages. + + + - Some examples will probably make this clearer. - If a package is being built with a (build, host, target) platform triple of (foo, bar, bar), then its build-time dependencies would have a triple of (foo, foo, bar), and those packages' build-time dependencies would have triple of (foo, foo, foo). - In other words, it should take two "rounds" of following build-time dependency edges before one reaches a fixed point where, by the sliding window principle, the platform triple no longer changes. - Indeed, this happens with cross compilation, where only rounds of native dependencies starting with the second necessarily coincide with native packages. + The depending package's target platform is unconstrained by the sliding + window principle, which makes sense in that one can in principle build + cross compilers targeting arbitrary platforms. - - The depending package's target platform is unconstrained by the sliding window principle, which makes sense in that one can in principle build cross compilers targeting arbitrary platforms. - + + + + How does this work in practice? Nixpkgs is now structured so that + build-time dependencies are taken from buildPackages, + whereas run-time dependencies are taken from the top level attribute set. + For example, buildPackages.gcc should be used at build + time, while gcc should be used at run time. Now, for + most of Nixpkgs's history, there was no buildPackages, + and most packages have not been refactored to use it explicitly. Instead, + one can use the six (gasp) attributes used for + specifying dependencies as documented in + . We "splice" together the + run-time and build-time package sets with callPackage, + and then mkDerivation for each of four attributes pulls + the right derivation out. This splicing can be skipped when not cross + compiling as the package sets are the same, but is a bit slow for cross + compiling. Because of this, a best-of-both-worlds solution is in the works + with no splicing or explicit access of buildPackages + needed. For now, feel free to use either method. + + + - How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from buildPackages, whereas run-time dependencies are taken from the top level attribute set. - For example, buildPackages.gcc should be used at build time, while gcc should be used at run time. - Now, for most of Nixpkgs's history, there was no buildPackages, and most packages have not been refactored to use it explicitly. - Instead, one can use the six (gasp) attributes used for specifying dependencies as documented in . - We "splice" together the run-time and build-time package sets with callPackage, and then mkDerivation for each of four attributes pulls the right derivation out. - This splicing can be skipped when not cross compiling as the package sets are the same, but is a bit slow for cross compiling. - Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of buildPackages needed. - For now, feel free to use either method. + There is also a "backlink" targetPackages, yielding a + package set whose buildPackages is the current package + set. This is a hack, though, to accommodate compilers with lousy build + systems. Please do not use this unless you are absolutely sure you are + packaging such a compiler and there is no other way. - - There is also a "backlink" targetPackages, yielding a package set whose buildPackages is the current package set. - This is a hack, though, to accommodate compilers with lousy build systems. - Please do not use this unless you are absolutely sure you are packaging such a compiler and there is no other way. - +
- Cross packagaing cookbook - - Some frequently problems when packaging for cross compilation are good to just spell and answer. - Ideally the information above is exhaustive, so this section cannot provide any new information, - but its ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem. - Feel free to add to this list! - - - - - What if my package's build system needs to build a C program to be run under the build environment? - - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - Add it to your mkDerivation invocation. - - - - - My package fails to find ar. - - - Many packages assume that an unprefixed ar is available, but Nix doesn't provide one. - It only provides a prefixed one, just as it only does for all the other binutils programs. - It may be necessary to patch the package to fix the build system to use a prefixed `ar`. - - - - - My package's testsuite needs to run host platform code. - - - doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom; - Add it to your mkDerivation invocation. - - - -
-
+ Cross packaging cookbook - + + Some frequently problems when packaging for cross compilation are good to + just spell and answer. Ideally the information above is exhaustive, so this + section cannot provide any new information, but its ludicrous and cruel to + expect everyone to spend effort working through the interaction of many + features just to figure out the same answer to the same common problem. + Feel free to add to this list! + -
+ + + + + What if my package's build system needs to build a C program to be run + under the build environment? + + + + +depsBuildBuild = [ buildPackages.stdenv.cc ]; + Add it to your mkDerivation invocation. + + + + + + + My package fails to find ar. + + + + + Many packages assume that an unprefixed ar is + available, but Nix doesn't provide one. It only provides a prefixed one, + just as it only does for all the other binutils programs. It may be + necessary to patch the package to fix the build system to use a prefixed + `ar`. + + + + + + + My package's testsuite needs to run host platform code. + + + + +doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom; + Add it to your mkDerivation invocation. + + + + +
+
+ +
Cross-building packages - - More information needs to moved from the old wiki, especially , for this section. - + + + + More information needs to moved from the old wiki, especially + , for this + section. + + + - Nixpkgs can be instantiated with localSystem alone, in which case there is no cross compiling and everything is built by and for that system, - or also with crossSystem, in which case packages run on the latter, but all building happens on the former. - Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section. - As mentioned above, lib.systems.examples has some platforms which are used as arguments for these parameters in practice. - You can use them programmatically, or on the command line: + Nixpkgs can be instantiated with localSystem alone, in + which case there is no cross compiling and everything is built by and for + that system, or also with crossSystem, in which case + packages run on the latter, but all building happens on the former. Both + parameters take the same schema as the 3 (build, host, and target) platforms + defined in the previous section. As mentioned above, + lib.systems.examples has some platforms which are used as + arguments for these parameters in practice. You can use them + programmatically, or on the command line: + nix-build <nixpkgs> --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz' -A whatever + - - Eventually we would like to make these platform examples an unnecessary convenience so that + + Eventually we would like to make these platform examples an unnecessary + convenience so that + nix-build <nixpkgs> --arg crossSystem.config '<arch>-<os>-<vendor>-<abi>' -A whatever - works in the vast majority of cases. - The problem today is dependencies on other sorts of configuration which aren't given proper defaults. - We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf. - Issue #34274 tracks this inconvenience along with its root cause in crufty configuration options. - + works in the vast majority of cases. The problem today is dependencies on + other sorts of configuration which aren't given proper defaults. We rely on + the examples to crudely to set those configuration parameters in some + vaguely sane manner on the users behalf. Issue + #34274 + tracks this inconvenience along with its root cause in crufty configuration + options. + + - While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields. - As discussed in the previous section, only one of system, config, and parsed is needed to infer the other two. - Additionally, libc will be inferred from parse. - Finally, localSystem.system is also impurely inferred based on the platform evaluation occurs. - This means it is often not necessary to pass localSystem at all, as in the command-line example in the previous paragraph. + While one is free to pass both parameters in full, there's a lot of logic to + fill in missing fields. As discussed in the previous section, only one of + system, config, and + parsed is needed to infer the other two. Additionally, + libc will be inferred from parse. + Finally, localSystem.system is also + impurely inferred based on the platform evaluation + occurs. This means it is often not necessary to pass + localSystem at all, as in the command-line example in the + previous paragraph. + - - Many sources (manual, wiki, etc) probably mention passing system, platform, along with the optional crossSystem to nixpkgs: - import <nixpkgs> { system = ..; platform = ..; crossSystem = ..; }. - Passing those two instead of localSystem is still supported for compatibility, but is discouraged. - Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience. - + + Many sources (manual, wiki, etc) probably mention passing + system, platform, along with the + optional crossSystem to nixpkgs: import + <nixpkgs> { system = ..; platform = ..; crossSystem = ..; + }. Passing those two instead of localSystem is + still supported for compatibility, but is discouraged. Indeed, much of the + inference we do for these parameters is motivated by compatibility as much + as convenience. + + - One would think that localSystem and crossSystem overlap horribly with the three *Platforms (buildPlatform, hostPlatform, and targetPlatform; see stage.nix or the manual). - Actually, those identifiers are purposefully not used here to draw a subtle but important distinction: - While the granularity of having 3 platforms is necessary to properly *build* packages, it is overkill for specifying the user's *intent* when making a build plan or package set. - A simple "build vs deploy" dichotomy is adequate: the sliding window principle described in the previous section shows how to interpolate between the these two "end points" to get the 3 platform triple for each bootstrapping stage. - That means for any package a given package set, even those not bound on the top level but only reachable via dependencies or buildPackages, the three platforms will be defined as one of localSystem or crossSystem, with the former replacing the latter as one traverses build-time dependencies. - A last simple difference then is crossSystem should be null when one doesn't want to cross-compile, while the *Platforms are always non-null. - localSystem is always non-null. + One would think that localSystem and + crossSystem overlap horribly with the three + *Platforms (buildPlatform, + hostPlatform, and targetPlatform; see + stage.nix or the manual). Actually, those identifiers are + purposefully not used here to draw a subtle but important distinction: While + the granularity of having 3 platforms is necessary to properly *build* + packages, it is overkill for specifying the user's *intent* when making a + build plan or package set. A simple "build vs deploy" dichotomy is adequate: + the sliding window principle described in the previous section shows how to + interpolate between the these two "end points" to get the 3 platform triple + for each bootstrapping stage. That means for any package a given package + set, even those not bound on the top level but only reachable via + dependencies or buildPackages, the three platforms will + be defined as one of localSystem or + crossSystem, with the former replacing the latter as one + traverses build-time dependencies. A last simple difference then is + crossSystem should be null when one doesn't want to + cross-compile, while the *Platforms are always non-null. + localSystem is always non-null. -
- + - -
+
Cross-compilation infrastructure - To be written. - - If one explores nixpkgs, they will see derivations with names like gccCross. - Such *Cross derivations is a holdover from before we properly distinguished between the host and target platforms - —the derivation with "Cross" in the name covered the build = host != target case, while the other covered the host = target, with build platform the same or not based on whether one was using its .nativeDrv or .crossDrv. - This ugliness will disappear soon. - -
+ + To be written. + + + + + If one explores nixpkgs, they will see derivations with names like + gccCross. Such *Cross derivations is + a holdover from before we properly distinguished between the host and + target platforms —the derivation with "Cross" in the name covered the + build = host != target case, while the other covered the + host = target, with build platform the same or not based + on whether one was using its .nativeDrv or + .crossDrv. This ugliness will disappear soon. + + +
diff --git a/doc/default.nix b/doc/default.nix index 8abde58bb1141176c9f56a32bd730b104be7b8d3..4c04128052bc570c93b8e6e103dd21a59d627cd9 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -1,13 +1,11 @@ let pkgs = import ./.. { }; lib = pkgs.lib; - sources = lib.sourceFilesBySuffices ./. [".xml"]; - sources-langs = ./languages-frameworks; in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; - buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing ]; + buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing xmlformat ]; src = ./.; @@ -16,8 +14,9 @@ pkgs.stdenv.mkDerivation { # $ nix-shell --run "make clean all" # otherwise they won't reapply :) HIGHLIGHTJS = pkgs.documentation-highlighter; - XSL = "${pkgs.docbook5_xsl}/xml/xsl"; + XSL = "${pkgs.docbook_xsl_ns}/xml/xsl"; RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng"; + XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf; xsltFlags = lib.concatStringsSep " " [ "--param section.autolabel 1" "--param section.label.includes.component.label 1" @@ -30,7 +29,7 @@ pkgs.stdenv.mkDerivation { ]; postPatch = '' - echo ${lib.nixpkgsVersion} > .version + echo ${lib.version} > .version ''; installPhase = '' @@ -43,5 +42,6 @@ pkgs.stdenv.mkDerivation { mkdir -p $out/nix-support/ echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products + echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products ''; } diff --git a/doc/functions.xml b/doc/functions.xml index f790512e7db17f806234324d84fe1e56973a77fb..ec188e23454314e3138586154558cacb5acf7340 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -1,144 +1,140 @@ - -Functions reference - - - The nixpkgs repository has several utility functions to manipulate Nix expressions. - - -
+ Functions reference + + The nixpkgs repository has several utility functions to manipulate Nix + expressions. + +
Overriding - Sometimes one wants to override parts of - nixpkgs, e.g. derivation attributes, the results of - derivations or even the whole package set. + Sometimes one wants to override parts of nixpkgs, e.g. + derivation attributes, the results of derivations or even the whole package + set.
- <pkg>.override + <pkg>.override - - The function override is usually available for all the - derivations in the nixpkgs expression (pkgs). - - - It is used to override the arguments passed to a function. - - - Example usages: + + The function override is usually available for all the + derivations in the nixpkgs expression (pkgs). + + + + It is used to override the arguments passed to a function. + - pkgs.foo.override { arg1 = val1; arg2 = val2; ... } - import pkgs.path { overlays = [ (self: super: { + + Example usages: +pkgs.foo.override { arg1 = val1; arg2 = val2; ... } +import pkgs.path { overlays = [ (self: super: { foo = super.foo.override { barSupport = true ; }; })]}; - mypkg = pkgs.callPackage ./mypkg.nix { +mypkg = pkgs.callPackage ./mypkg.nix { mydep = pkgs.mydep.override { ... }; } - - - - In the first example, pkgs.foo is the result of a function call - with some default arguments, usually a derivation. - Using pkgs.foo.override will call the same function with - the given new arguments. - - + + + + In the first example, pkgs.foo is the result of a + function call with some default arguments, usually a derivation. Using + pkgs.foo.override will call the same function with the + given new arguments. +
- <pkg>.overrideAttrs - - - The function overrideAttrs allows overriding the - attribute set passed to a stdenv.mkDerivation call, - producing a new derivation based on the original one. - This function is available on all derivations produced by the - stdenv.mkDerivation function, which is most packages - in the nixpkgs expression pkgs. - - - - Example usage: - - helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { + <pkg>.overrideAttrs + + + The function overrideAttrs allows overriding the + attribute set passed to a stdenv.mkDerivation call, + producing a new derivation based on the original one. This function is + available on all derivations produced by the + stdenv.mkDerivation function, which is most packages in + the nixpkgs expression pkgs. + + + + Example usage: +helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { separateDebugInfo = true; }); - + - - In the above example, the separateDebugInfo attribute is - overridden to be true, thus building debug info for - helloWithDebug, while all other attributes will be - retained from the original hello package. - + + In the above example, the separateDebugInfo attribute is + overridden to be true, thus building debug info for + helloWithDebug, while all other attributes will be + retained from the original hello package. + + + The argument oldAttrs is conventionally used to refer to + the attr set originally passed to stdenv.mkDerivation. + + + - The argument oldAttrs is conventionally used to refer to - the attr set originally passed to stdenv.mkDerivation. + Note that separateDebugInfo is processed only by the + stdenv.mkDerivation function, not the generated, raw + Nix derivation. Thus, using overrideDerivation will not + work in this case, as it overrides only the attributes of the final + derivation. It is for this reason that overrideAttrs + should be preferred in (almost) all cases to + overrideDerivation, i.e. to allow using + sdenv.mkDerivation to process input arguments, as well + as the fact that it is easier to use (you can use the same attribute names + you see in your Nix code, instead of the ones generated (e.g. + buildInputs vs nativeBuildInputs, + and involves less typing. - - - - Note that separateDebugInfo is processed only by the - stdenv.mkDerivation function, not the generated, raw - Nix derivation. Thus, using overrideDerivation will - not work in this case, as it overrides only the attributes of the final - derivation. It is for this reason that overrideAttrs - should be preferred in (almost) all cases to - overrideDerivation, i.e. to allow using - sdenv.mkDerivation to process input arguments, as well - as the fact that it is easier to use (you can use the same attribute - names you see in your Nix code, instead of the ones generated (e.g. - buildInputs vs nativeBuildInputs, - and involves less typing. - - - +
-
- <pkg>.overrideDerivation - - - You should prefer overrideAttrs in almost all - cases, see its documentation for the reasons why. - overrideDerivation is not deprecated and will continue - to work, but is less nice to use and does not have as many abilities as - overrideAttrs. - - - - - Do not use this function in Nixpkgs as it evaluates a Derivation - before modifying it, which breaks package abstraction and removes - error-checking of function arguments. In addition, this - evaluation-per-function application incurs a performance penalty, - which can become a problem if many overrides are used. - It is only intended for ad-hoc customisation, such as in - ~/.config/nixpkgs/config.nix. - - + <pkg>.overrideDerivation + - The function overrideDerivation creates a new derivation - based on an existing one by overriding the original's attributes with - the attribute set produced by the specified function. - This function is available on all - derivations defined using the makeOverridable function. - Most standard derivation-producing functions, such as - stdenv.mkDerivation, are defined using this - function, which means most packages in the nixpkgs expression, - pkgs, have this function. + You should prefer overrideAttrs in almost all cases, + see its documentation for the reasons why. + overrideDerivation is not deprecated and will continue + to work, but is less nice to use and does not have as many abilities as + overrideAttrs. + + - Example usage: - - mySed = pkgs.gnused.overrideDerivation (oldAttrs: { + Do not use this function in Nixpkgs as it evaluates a Derivation before + modifying it, which breaks package abstraction and removes error-checking + of function arguments. In addition, this evaluation-per-function + application incurs a performance penalty, which can become a problem if + many overrides are used. It is only intended for ad-hoc customisation, + such as in ~/.config/nixpkgs/config.nix. + + + + + The function overrideDerivation creates a new derivation + based on an existing one by overriding the original's attributes with the + attribute set produced by the specified function. This function is + available on all derivations defined using the + makeOverridable function. Most standard + derivation-producing functions, such as + stdenv.mkDerivation, are defined using this function, + which means most packages in the nixpkgs expression, + pkgs, have this function. + + + + Example usage: +mySed = pkgs.gnused.overrideDerivation (oldAttrs: { name = "sed-4.2.2-pre"; src = fetchurl { url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; @@ -146,98 +142,90 @@ }; patches = []; }); - + - - In the above example, the name, src, - and patches of the derivation will be overridden, while - all other attributes will be retained from the original derivation. - + + In the above example, the name, src, + and patches of the derivation will be overridden, while + all other attributes will be retained from the original derivation. + + + + The argument oldAttrs is used to refer to the attribute + set of the original derivation. + + - The argument oldAttrs is used to refer to the attribute set of - the original derivation. + A package's attributes are evaluated *before* being modified by the + overrideDerivation function. For example, the + name attribute reference in url = + "mirror://gnu/hello/${name}.tar.gz"; is filled-in *before* the + overrideDerivation function modifies the attribute set. + This means that overriding the name attribute, in this + example, *will not* change the value of the url + attribute. Instead, we need to override both the name + *and* url attributes. - - - - A package's attributes are evaluated *before* being modified by - the overrideDerivation function. - For example, the name attribute reference - in url = "mirror://gnu/hello/${name}.tar.gz"; - is filled-in *before* the overrideDerivation function - modifies the attribute set. This means that overriding the - name attribute, in this example, *will not* change the - value of the url attribute. Instead, we need to override - both the name *and* url attributes. - - - +
- lib.makeOverridable - - - The function lib.makeOverridable is used to make the result - of a function easily customizable. This utility only makes sense for functions - that accept an argument set and return an attribute set. - + lib.makeOverridable - - Example usage: + + The function lib.makeOverridable is used to make the + result of a function easily customizable. This utility only makes sense for + functions that accept an argument set and return an attribute set. + - f = { a, b }: { result = a+b; } + + Example usage: +f = { a, b }: { result = a+b; } c = lib.makeOverridable f { a = 1; b = 2; } - - - - - The variable c is the value of the f function - applied with some default arguments. Hence the value of c.result - is 3, in this example. - - - - The variable c however also has some additional functions, like - c.override which can be used to - override the default arguments. In this example the value of - (c.override { a = 4; }).result is 6. - - + + + + The variable c is the value of the f + function applied with some default arguments. Hence the value of + c.result is 3, in this example. + + + + The variable c however also has some additional + functions, like c.override which + can be used to override the default arguments. In this example the value of + (c.override { a = 4; }).result is 6. +
- -
- -
+
+
Generators - Generators are functions that create file formats from nix - data structures, e. g. for configuration files. - There are generators available for: INI, - JSON and YAML + Generators are functions that create file formats from nix data structures, + e. g. for configuration files. There are generators available for: + INI, JSON and YAML - All generators follow a similar call interface: generatorName - configFunctions data, where configFunctions is - an attrset of user-defined functions that format nested parts of the - content. - They each have common defaults, so often they do not need to be set - manually. An example is mkSectionName ? (name: libStr.escape [ "[" "]" - ] name) from the INI generator. It receives the - name of a section and sanitizes it. The default - mkSectionName escapes [ and - ] with a backslash. + All generators follow a similar call interface: generatorName + configFunctions data, where configFunctions is an + attrset of user-defined functions that format nested parts of the content. + They each have common defaults, so often they do not need to be set + manually. An example is mkSectionName ? (name: libStr.escape [ "[" "]" + ] name) from the INI generator. It receives the + name of a section and sanitizes it. The default + mkSectionName escapes [ and + ] with a backslash. - Generators can be fine-tuned to produce exactly the file format required - by your application/service. One example is an INI-file format which uses - : as separator, the strings - "yes"/"no" as boolean values - and requires all string values to be quoted: + Generators can be fine-tuned to produce exactly the file format required by + your application/service. One example is an INI-file format which uses + : as separator, the strings + "yes"/"no" as boolean values and + requires all string values to be quoted: @@ -270,7 +258,9 @@ in customToINI { } - This will produce the following INI file as nix string: + + This will produce the following INI file as nix string: + [main] @@ -284,95 +274,146 @@ str\:ange:"very::strange" merge:"diff3" - Nix store paths can be converted to strings by enclosing a - derivation attribute like so: "${drv}". + + + Nix store paths can be converted to strings by enclosing a derivation + attribute like so: "${drv}". + + - Detailed documentation for each generator can be found in - lib/generators.nix. + Detailed documentation for each generator can be found in + lib/generators.nix. +
+
+ Debugging Nix Expressions -
- + + Nix is a unityped, dynamic language, this means every value can potentially + appear anywhere. Since it is also non-strict, evaluation order and what + ultimately is evaluated might surprise you. Therefore it is important to be + able to debug nix expressions. + -
+ + In the lib/debug.nix file you will find a number of + functions that help (pretty-)printing values while evaluation is runnnig. + You can even specify how deep these values should be printed recursively, + and transform them on the fly. Please consult the docstrings in + lib/debug.nix for usage information. + +
+
buildFHSUserEnv - buildFHSUserEnv provides a way to build and run - FHS-compatible lightweight sandboxes. It creates an isolated root with - bound /nix/store, so its footprint in terms of disk - space needed is quite small. This allows one to run software which is hard or - unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions, - games distributed as tarballs, software with integrity checking and/or external - self-updated binaries. It uses Linux namespaces feature to create - temporary lightweight environments which are destroyed after all child - processes exit, without root user rights requirement. Accepted arguments are: + buildFHSUserEnv provides a way to build and run + FHS-compatible lightweight sandboxes. It creates an isolated root with bound + /nix/store, so its footprint in terms of disk space + needed is quite small. This allows one to run software which is hard or + unfeasible to patch for NixOS -- 3rd-party source trees with FHS + assumptions, games distributed as tarballs, software with integrity checking + and/or external self-updated binaries. It uses Linux namespaces feature to + create temporary lightweight environments which are destroyed after all + child processes exit, without root user rights requirement. Accepted + arguments are: - - name - - Environment name. - - - - targetPkgs - - Packages to be installed for the main host's architecture - (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also - installed. - - - - multiPkgs - - Packages to be installed for all architectures supported by - a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are - installed by default. - - - - extraBuildCommands - - Additional commands to be executed for finalizing the - directory structure. - - - - extraBuildCommandsMulti - - Like extraBuildCommands, but - executed only on multilib architectures. - - - - extraOutputsToInstall - - Additional derivation outputs to be linked for both - target and multi-architecture packages. - - - - extraInstallCommands - - Additional commands to be executed for finalizing the - derivation with runner script. - - - - runScript - - A command that would be executed inside the sandbox and - passed all the command line arguments. It defaults to - bash. - + + + name + + + + Environment name. + + + + + + targetPkgs + + + + Packages to be installed for the main host's architecture (i.e. x86_64 on + x86_64 installations). Along with libraries binaries are also installed. + + + + + + multiPkgs + + + + Packages to be installed for all architectures supported by a host (i.e. + i686 and x86_64 on x86_64 installations). Only libraries are installed by + default. + + + + + + extraBuildCommands + + + + Additional commands to be executed for finalizing the directory + structure. + + + + + + extraBuildCommandsMulti + + + + Like extraBuildCommands, but executed only on multilib + architectures. + + + + + + extraOutputsToInstall + + + + Additional derivation outputs to be linked for both target and + multi-architecture packages. + + + + + + extraInstallCommands + + + + Additional commands to be executed for finalizing the derivation with + runner script. + + + + + + runScript + + + + A command that would be executed inside the sandbox and passed all the + command line arguments. It defaults to bash. + + + - One can create a simple environment using a shell.nix - like that: + One can create a simple environment using a shell.nix + like that: - Running nix-shell would then drop you into a shell with - these libraries and binaries available. You can use this to run - closed-source applications which expect FHS structure without hassles: - simply change runScript to the application path, - e.g. ./bin/start.sh -- relative paths are supported. + Running nix-shell would then drop you into a shell with + these libraries and binaries available. You can use this to run + closed-source applications which expect FHS structure without hassles: + simply change runScript to the application path, e.g. + ./bin/start.sh -- relative paths are supported. -
- -
-pkgs.dockerTools - - - pkgs.dockerTools is a set of functions for creating and - manipulating Docker images according to the - - Docker Image Specification v1.2.0 - . Docker itself is not used to perform any of the operations done by these - functions. - - - - - The dockerTools API is unstable and may be subject to - backwards-incompatible changes in the future. - - - -
- buildImage +
+ +
+ pkgs.dockerTools - This function is analogous to the docker build command, - in that can used to build a Docker-compatible repository tarball containing - a single image with one or multiple layers. As such, the result - is suitable for being loaded in Docker with docker load. + pkgs.dockerTools is a set of functions for creating and + manipulating Docker images according to the + + Docker Image Specification v1.2.0 . Docker itself is not used to + perform any of the operations done by these functions. - - The parameters of buildImage with relative example values are - described below: - - - Docker build - + + + The dockerTools API is unstable and may be subject to + backwards-incompatible changes in the future. + + + +
+ buildImage + + + This function is analogous to the docker build command, + in that can used to build a Docker-compatible repository tarball containing + a single image with one or multiple layers. As such, the result is suitable + for being loaded in Docker with docker load. + + + + The parameters of buildImage with relative example + values are described below: + + + + Docker build + buildImage { name = "redis"; tag = "latest"; @@ -464,238 +505,238 @@ merge:"diff3" }; } - - - The above example will build a Docker image redis/latest - from the given base image. Loading and running this image in Docker results in - redis-server being started automatically. - - - - + + + + The above example will build a Docker image redis/latest + from the given base image. Loading and running this image in Docker results + in redis-server being started automatically. + + + + + + name specifies the name of the resulting image. This + is the only required argument for buildImage. + + + + + tag specifies the tag of the resulting image. By + default it's null, which indicates that the nix output + hash will be used as tag. + + + + + fromImage is the repository tarball containing the + base image. It must be a valid Docker image, such as exported by + docker save. By default it's null, + which can be seen as equivalent to FROM scratch of a + Dockerfile. + + + + + fromImageName can be used to further specify the base + image within the repository, in case it contains multiple images. By + default it's null, in which case + buildImage will peek the first image available in the + repository. + + + + + fromImageTag can be used to further specify the tag of + the base image within the repository, in case an image contains multiple + tags. By default it's null, in which case + buildImage will peek the first tag available for the + base image. + + + + + contents is a derivation that will be copied in the + new layer of the resulting image. This can be similarly seen as + ADD contents/ / in a Dockerfile. + By default it's null. + + + + + runAsRoot is a bash script that will run as root in an + environment that overlays the existing layers of the base image with the + new resulting layer, including the previously copied + contents derivation. This can be similarly seen as + RUN ... in a Dockerfile. + + + Using this parameter requires the kvm device to be + available. + + + + + + + config is used to specify the configuration of the + containers that will be started off the built image in Docker. The + available options are listed in the + + Docker Image Specification v1.2.0 . + + + + + + After the new layer has been created, its closure (to which + contents, config and + runAsRoot contribute) will be copied in the layer + itself. Only new dependencies that are not already in the existing layers + will be copied. + + + + At the end of the process, only one new single layer will be produced and + added to the resulting image. + + + + The resulting repository will only list the single image + image/tag. In the case of + it would be + redis/latest. + + + + It is possible to inspect the arguments with which an image was built using + its buildArgs attribute. + + + - name specifies the name of the resulting image. - This is the only required argument for buildImage. + If you see errors similar to getProtocolByName: does not exist + (no such protocol name: tcp) you may need to add + pkgs.iana-etc to contents. - + - + - tag specifies the tag of the resulting image. - By default it's latest. + If you see errors similar to Error_Protocol ("certificate has + unknown CA",True,UnknownCa) you may need to add + pkgs.cacert to contents. - - - - - fromImage is the repository tarball containing the base image. - It must be a valid Docker image, such as exported by docker save. - By default it's null, which can be seen as equivalent - to FROM scratch of a Dockerfile. - - - - - - fromImageName can be used to further specify - the base image within the repository, in case it contains multiple images. - By default it's null, in which case - buildImage will peek the first image available - in the repository. - - - - - - fromImageTag can be used to further specify the tag - of the base image within the repository, in case an image contains multiple tags. - By default it's null, in which case - buildImage will peek the first tag available for the base image. - - - - - - contents is a derivation that will be copied in the new - layer of the resulting image. This can be similarly seen as - ADD contents/ / in a Dockerfile. - By default it's null. - - - - - - runAsRoot is a bash script that will run as root - in an environment that overlays the existing layers of the base image with - the new resulting layer, including the previously copied - contents derivation. - This can be similarly seen as - RUN ... in a Dockerfile. - - - - Using this parameter requires the kvm - device to be available. - - - - - - - - config is used to specify the configuration of the - containers that will be started off the built image in Docker. - The available options are listed in the - - Docker Image Specification v1.2.0 - . - - - - - - - After the new layer has been created, its closure - (to which contents, config and - runAsRoot contribute) will be copied in the layer itself. - Only new dependencies that are not already in the existing layers will be copied. - - - - At the end of the process, only one new single layer will be produced and - added to the resulting image. - - - - The resulting repository will only list the single image - image/tag. In the case of - it would be redis/latest. - - - - It is possible to inspect the arguments with which an image was built - using its buildArgs attribute. - - - - - - - If you see errors similar to getProtocolByName: does not exist (no such protocol name: tcp) - you may need to add pkgs.iana-etc to contents. - - - - - - If you see errors similar to Error_Protocol ("certificate has unknown CA",True,UnknownCa) - you may need to add pkgs.cacert to contents. - - + +
-
+
+ pullImage -
- pullImage + + This function is analogous to the docker pull command, + in that can be used to pull a Docker image from a Docker registry. By + default Docker Hub is + used to pull images. + - - This function is analogous to the docker pull command, - in that can be used to fetch a Docker image from a Docker registry. - Currently only registry v1 is supported. - By default Docker Hub - is used to pull images. - + + Its parameters are described in the example below: + - - Its parameters are described in the example below: - - - Docker pull - + + Docker pull + pullImage { - imageName = "debian"; - imageTag = "jessie"; - imageId = null; - sha256 = "1bhw5hkz6chrnrih0ymjbmn69hyfriza2lr550xyvpdrnbzr4gk2"; - - indexUrl = "https://index.docker.io"; - registryVersion = "v1"; + imageName = "nixos/nix"; + imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; + finalImageTag = "1.11"; + sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; + os = "linux"; + arch = "x86_64"; } - - - - - - imageName specifies the name of the image to be downloaded, - which can also include the registry namespace (e.g. library/debian). - This argument is required. - - - - - - imageTag specifies the tag of the image to be downloaded. - By default it's latest. - - - - - - imageId, if specified this exact image will be fetched, instead - of imageName/imageTag. However, the resulting repository - will still be named imageName/imageTag. - By default it's null. - - - - - - sha256 is the checksum of the whole fetched image. - This argument is required. - + + + + + + imageName specifies the name of the image to be + downloaded, which can also include the registry namespace (e.g. + nixos). This argument is required. + + + + + imageDigest specifies the digest of the image to be + downloaded. Skopeo can be used to get the digest of an image, with its + inspect subcommand. Since a given + imageName may transparently refer to a manifest list + of images which support multiple architectures and/or operating systems, + supply the `--override-os` and `--override-arch` arguments to specify + exactly which image you want. By default it will match the OS and + architecture of the host the command is run on. + + $ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'" + sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b + + This argument is required. + + + + + finalImageTag, if specified, this is the tag of the + image to be created. Note it is never used to fetch the image since we + prefer to rely on the immutable digest ID. By default it's + latest. + + + + + sha256 is the checksum of the whole fetched image. + This argument is required. + + + + + os, if specified, is the operating system of the + fetched image. By default it's linux. + + + + + arch, if specified, is the cpu architecture of the + fetched image. By default it's x86_64. + + + +
- - The checksum is computed on the unpacked directory, not on the final tarball. - +
+ exportImage - + + This function is analogous to the docker export command, + in that can used to flatten a Docker image that contains multiple layers. + It is in fact the result of the merge of all the layers of the image. As + such, the result is suitable for being imported in Docker with + docker import. + - + - In the above example the default values are shown for the variables - indexUrl and registryVersion. - Hence by default the Docker.io registry is used to pull the images. + Using this function requires the kvm device to be + available. - - - -
+ -
- exportImage + + The parameters of exportImage are the following: + - - This function is analogous to the docker export command, - in that can used to flatten a Docker image that contains multiple layers. - It is in fact the result of the merge of all the layers of the image. - As such, the result is suitable for being imported in Docker - with docker import. - - - - - Using this function requires the kvm - device to be available. - - - - - The parameters of exportImage are the following: - - - Docker export - + + Docker export + exportImage { fromImage = someLayeredImage; fromImageName = null; @@ -704,33 +745,35 @@ merge:"diff3" name = someLayeredImage.name; } - - - - The parameters relative to the base image have the same synopsis as - described in , except that - fromImage is the only required argument in this case. - - - - The name argument is the name of the derivation output, - which defaults to fromImage.name. - -
+ + + + The parameters relative to the base image have the same synopsis as + described in , except + that fromImage is the only required argument in this + case. + + + + The name argument is the name of the derivation output, + which defaults to fromImage.name. + +
-
- shadowSetup +
+ shadowSetup - - This constant string is a helper for setting up the base files for managing - users and groups, only if such files don't exist already. - It is suitable for being used in a - runAsRoot script for cases like - in the example below: - + + This constant string is a helper for setting up the base files for managing + users and groups, only if such files don't exist already. It is suitable + for being used in a runAsRoot + script for cases like + in the example below: + - Shadow base files - + + Shadow base files + buildImage { name = "shadow-basic"; @@ -744,16 +787,13 @@ merge:"diff3" ''; } - - - - Creating base files like /etc/passwd or - /etc/login.defs are necessary for shadow-utils to - manipulate users and groups. - - -
- -
+ + + Creating base files like /etc/passwd or + /etc/login.defs are necessary for shadow-utils to + manipulate users and groups. + +
+
diff --git a/doc/introduction.chapter.md b/doc/introduction.chapter.md index 8b03221c64b12b4e3754c3e173796c97ed2c20dd..6abdc2714e2c7c47e5af897490d4e65c20482d07 100644 --- a/doc/introduction.chapter.md +++ b/doc/introduction.chapter.md @@ -30,7 +30,7 @@ Packages, including the Nix packages collection, are distributed through distributed for users of Nix on non-NixOS distributions through the channel `nixpkgs`. Users of NixOS generally use one of the `nixos-*` channels, e.g. `nixos-16.03`, which includes all packages and modules for the stable NixOS -16.03. The purpose of stable NixOS releases are generally only given +16.03. Stable NixOS releases are generally only given security updates. More up to date packages and modules are available via the `nixos-unstable` channel. diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index 1a18ed27237c23f44b4c0b67cfea573572000d5b..ac7a83ed426508d59fb26861568829451699f914 100644 --- a/doc/languages-frameworks/beam.xml +++ b/doc/languages-frameworks/beam.xml @@ -1,124 +1,137 @@
+ BEAM Languages (Erlang, Elixir & LFE) - BEAM Languages (Erlang, Elixir & LFE) -
- Introduction - - In this document and related Nix expressions, we use the term, - BEAM, to describe the environment. BEAM is the name - of the Erlang Virtual Machine and, as far as we're concerned, from a - packaging perspective, all languages that run on the BEAM are - interchangeable. That which varies, like the build system, is transparent - to users of any given BEAM package, so we make no distinction. - -
-
- Structure - - All BEAM-related expressions are available via the top-level - beam attribute, which includes: - - - - - interpreters: a set of compilers running on the - BEAM, including multiple Erlang/OTP versions - (beam.interpreters.erlangR19, etc), Elixir - (beam.interpreters.elixir) and LFE - (beam.interpreters.lfe). - - - - - packages: a set of package sets, each compiled with - a specific Erlang/OTP version, e.g. - beam.packages.erlangR19. - - - - - The default Erlang compiler, defined by - beam.interpreters.erlang, is aliased as - erlang. The default BEAM package set is defined by - beam.packages.erlang and aliased at the top level as - beamPackages. - +
+ Introduction + + + In this document and related Nix expressions, we use the term, + BEAM, to describe the environment. BEAM is the name of + the Erlang Virtual Machine and, as far as we're concerned, from a packaging + perspective, all languages that run on the BEAM are interchangeable. That + which varies, like the build system, is transparent to users of any given + BEAM package, so we make no distinction. + +
+ +
+ Structure + + + All BEAM-related expressions are available via the top-level + beam attribute, which includes: + + + + - To create a package set built with a custom Erlang version, use the - lambda, beam.packagesWith, which accepts an Erlang/OTP - derivation and produces a package set similar to - beam.packages.erlang. + interpreters: a set of compilers running on the BEAM, + including multiple Erlang/OTP versions + (beam.interpreters.erlangR19, etc), Elixir + (beam.interpreters.elixir) and LFE + (beam.interpreters.lfe). + + - Many Erlang/OTP distributions available in - beam.interpreters have versions with ODBC and/or Java - enabled. For example, there's - beam.interpreters.erlangR19_odbc_javac, which - corresponds to beam.interpreters.erlangR19. + packages: a set of package sets, each compiled with a + specific Erlang/OTP version, e.g. + beam.packages.erlangR19. - - We also provide the lambda, - beam.packages.erlang.callPackage, which simplifies - writing BEAM package definitions by injecting all packages from - beam.packages.erlang into the top-level context. - -
-
+ + + + + The default Erlang compiler, defined by + beam.interpreters.erlang, is aliased as + erlang. The default BEAM package set is defined by + beam.packages.erlang and aliased at the top level as + beamPackages. + + + + To create a package set built with a custom Erlang version, use the lambda, + beam.packagesWith, which accepts an Erlang/OTP derivation + and produces a package set similar to + beam.packages.erlang. + + + + Many Erlang/OTP distributions available in + beam.interpreters have versions with ODBC and/or Java + enabled. For example, there's + beam.interpreters.erlangR19_odbc_javac, which corresponds + to beam.interpreters.erlangR19. + + + + We also provide the lambda, + beam.packages.erlang.callPackage, which simplifies + writing BEAM package definitions by injecting all packages from + beam.packages.erlang into the top-level context. + +
+ +
Build Tools +
- Rebar3 - - By default, Rebar3 wants to manage its own dependencies. This is perfectly - acceptable in the normal, non-Nix setup, but in the Nix world, it is not. - To rectify this, we provide two versions of Rebar3: - - - - rebar3: patched to remove the ability to download - anything. When not running it via nix-shell or - nix-build, it's probably not going to work as - desired. - - - - - rebar3-open: the normal, unmodified Rebar3. It - should work exactly as would any other version of Rebar3. Any Erlang - package should rely on rebar3 instead. See Rebar3 + + + By default, Rebar3 wants to manage its own dependencies. This is perfectly + acceptable in the normal, non-Nix setup, but in the Nix world, it is not. + To rectify this, we provide two versions of Rebar3: + + + + rebar3: patched to remove the ability to download + anything. When not running it via nix-shell or + nix-build, it's probably not going to work as + desired. + + + + + rebar3-open: the normal, unmodified Rebar3. It should + work exactly as would any other version of Rebar3. Any Erlang package + should rely on rebar3 instead. See + . - - - - + + + +
+
- Mix & Erlang.mk - - Both Mix and Erlang.mk work exactly as expected. There is a bootstrap - process that needs to be run for both, however, which is supported by the - buildMix and buildErlangMk - derivations, respectively. - + Mix & Erlang.mk + + + Both Mix and Erlang.mk work exactly as expected. There is a bootstrap + process that needs to be run for both, however, which is supported by the + buildMix and buildErlangMk + derivations, respectively. +
-
+
-
+
How to Install BEAM Packages + - BEAM packages are not registered at the top level, simply because they are - not relevant to the vast majority of Nix users. They are installable using - the beam.packages.erlang attribute set (aliased as - beamPackages), which points to packages built by the - default Erlang/OTP version in Nixpkgs, as defined by - beam.interpreters.erlang. - - To list the available packages in - beamPackages, use the following command: + BEAM packages are not registered at the top level, simply because they are + not relevant to the vast majority of Nix users. They are installable using + the beam.packages.erlang attribute set (aliased as + beamPackages), which points to packages built by the + default Erlang/OTP version in Nixpkgs, as defined by + beam.interpreters.erlang. To list the available packages + in beamPackages, use the following command: - + $ nix-env -f "<nixpkgs>" -qaP -A beamPackages beamPackages.esqlite esqlite-0.2.1 beamPackages.goldrush goldrush-0.1.7 @@ -128,34 +141,43 @@ beamPackages.lager lager-3.0.2 beamPackages.meck meck-0.8.3 beamPackages.rebar3-pc pc-1.1.0 + - To install any of those packages into your profile, refer to them by their - attribute path (first column): + To install any of those packages into your profile, refer to them by their + attribute path (first column): - + + $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse + - The attribute path of any BEAM package corresponds to the name of that - particular package in Hex or its - OTP Application/Release name. + The attribute path of any BEAM package corresponds to the name of that + particular package in Hex or its + OTP Application/Release name. -
-
+
+ +
Packaging BEAM Applications +
- Erlang Applications -
- Rebar3 Packages - - The Nix function, buildRebar3, defined in - beam.packages.erlang.buildRebar3 and aliased at the - top level, can be used to build a derivation that understands how to - build a Rebar3 project. For example, we can build hex2nix as - follows: - - + Erlang Applications + +
+ Rebar3 Packages + + + The Nix function, buildRebar3, defined in + beam.packages.erlang.buildRebar3 and aliased at the top + level, can be used to build a derivation that understands how to build a + Rebar3 project. For example, we can build + hex2nix + as follows: + + + { stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }: buildRebar3 rec { @@ -172,33 +194,40 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse beamDeps = [ ibrowse jsx erlware_commons ]; } - - Such derivations are callable with - beam.packages.erlang.callPackage (see ). To call this package using the normal - callPackage, refer to dependency packages via - beamPackages, e.g. - beamPackages.ibrowse. - - - Notably, buildRebar3 includes - beamDeps, while - stdenv.mkDerivation does not. BEAM dependencies added - there will be correctly handled by the system. - - - If a package needs to compile native code via Rebar3's port compilation - mechanism, add compilePort = true; to the derivation. - -
-
- Erlang.mk Packages - - Erlang.mk functions similarly to Rebar3, except we use - buildErlangMk instead of - buildRebar3. - - + + + Such derivations are callable with + beam.packages.erlang.callPackage (see + ). To call this package using + the normal callPackage, refer to dependency packages + via beamPackages, e.g. + beamPackages.ibrowse. + + + + Notably, buildRebar3 includes + beamDeps, while stdenv.mkDerivation + does not. BEAM dependencies added there will be correctly handled by the + system. + + + + If a package needs to compile native code via Rebar3's port compilation + mechanism, add compilePort = true; to the derivation. + +
+ +
+ Erlang.mk Packages + + + Erlang.mk functions similarly to Rebar3, except we use + buildErlangMk instead of + buildRebar3. + + + { buildErlangMk, fetchHex, cowlib, ranch }: buildErlangMk { @@ -222,14 +251,17 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse }; } -
-
- Mix Packages - - Mix functions similarly to Rebar3, except we use - buildMix instead of buildRebar3. - - +
+ +
+ Mix Packages + + + Mix functions similarly to Rebar3, except we use + buildMix instead of buildRebar3. + + + { buildMix, fetchHex, plug, absinthe }: buildMix { @@ -253,10 +285,12 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse }; } - - Alternatively, we can use buildHex as a shortcut: - - + + + Alternatively, we can use buildHex as a shortcut: + + + { buildHex, buildMix, plug, absinthe }: buildHex { @@ -278,21 +312,25 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse }; } -
+
-
-
+
+ +
How to Develop +
- Accessing an Environment - - Often, we simply want to access a valid environment that contains a - specific package and its dependencies. We can accomplish that with the - env attribute of a derivation. For example, let's say - we want to access an Erlang REPL with ibrowse loaded - up. We could do the following: - - + Accessing an Environment + + + Often, we simply want to access a valid environment that contains a + specific package and its dependencies. We can accomplish that with the + env attribute of a derivation. For example, let's say we + want to access an Erlang REPL with ibrowse loaded up. We + could do the following: + + + $ nix-shell -A beamPackages.ibrowse.env --run "erl" Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false] @@ -333,22 +371,25 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse ok 2> - - Notice the -A beamPackages.ibrowse.env. That is the key - to this functionality. - + + + Notice the -A beamPackages.ibrowse.env. That is the key + to this functionality. +
+
- Creating a Shell - - Getting access to an environment often isn't enough to do real - development. Usually, we need to create a shell.nix - file and do our development inside of the environment specified therein. - This file looks a lot like the packaging described above, except that - src points to the project root and we call the package - directly. - - + Creating a Shell + + + Getting access to an environment often isn't enough to do real development. + Usually, we need to create a shell.nix file and do our + development inside of the environment specified therein. This file looks a + lot like the packaging described above, except that src + points to the project root and we call the package directly. + + + { pkgs ? import "<nixpkgs"> {} }: with pkgs; @@ -368,13 +409,16 @@ in drv -
+ +
Building in a Shell (for Mix Projects) + - We can leverage the support of the derivation, irrespective of the build - derivation, by calling the commands themselves. + We can leverage the support of the derivation, irrespective of the build + derivation, by calling the commands themselves. - + + # ============================================================================= # Variables # ============================================================================= @@ -431,44 +475,54 @@ analyze: build plt $(NIX_SHELL) --run "mix dialyzer --no-compile" + - Using a shell.nix as described (see shell.nix as described (see + ) should just work. Aside from - test, plt, and - analyze, the Make targets work just fine for all of the - build derivations. + test, plt, and + analyze, the Make targets work just fine for all of the + build derivations. +
-
-
-
+
+ +
Generating Packages from Hex with <literal>hex2nix</literal> + - Updating the Hex package set - requires hex2nix. Given the - path to the Erlang modules (usually - pkgs/development/erlang-modules), it will dump a file - called hex-packages.nix, containing all the packages that - use a recognized build system in Hex. It can't be determined, however, - whether every package is buildable. - - - To make life easier for our users, try to build every Hex package and remove those that fail. - To do that, simply run the following command in the root of your - nixpkgs repository: - - + Updating the Hex package set + requires + hex2nix. + Given the path to the Erlang modules (usually + pkgs/development/erlang-modules), it will dump a file + called hex-packages.nix, containing all the packages that + use a recognized build system in + Hex. It can't be determined, + however, whether every package is buildable. + + + + To make life easier for our users, try to build every + Hex package and remove those + that fail. To do that, simply run the following command in the root of your + nixpkgs repository: + + + $ nix-build -A beamPackages - - That will attempt to build every package in - beamPackages. Then manually remove those that fail. - Hopefully, someone will improve hex2nix in the - future to automate the process. - -
+ + + That will attempt to build every package in beamPackages. + Then manually remove those that fail. Hopefully, someone will improve + hex2nix + in the future to automate the process. + +
diff --git a/doc/languages-frameworks/bower.xml b/doc/languages-frameworks/bower.xml index 742d3c2e9fe5790e01b0ea6ecf10bb128fa818ca..118f6e10473ab855aa7cb09b9d9bd8d004cf9811 100644 --- a/doc/languages-frameworks/bower.xml +++ b/doc/languages-frameworks/bower.xml @@ -1,40 +1,37 @@
- -Bower - - - Bower is a package manager - for web site front-end components. Bower packages (comprising of - build artefacts and sometimes sources) are stored in - git repositories, typically on Github. The - package registry is run by the Bower team with package metadata - coming from the bower.json file within each - package. - - - - The end result of running Bower is a - bower_components directory which can be included - in the web app's build process. - - - + Bower + + + Bower is a package manager for web + site front-end components. Bower packages (comprising of build artefacts and + sometimes sources) are stored in git repositories, + typically on Github. The package registry is run by the Bower team with + package metadata coming from the bower.json file within + each package. + + + + The end result of running Bower is a bower_components + directory which can be included in the web app's build process. + + + Bower can be run interactively, by installing nodePackages.bower. More interestingly, the Bower components can be declared in a Nix derivation, with the help of nodePackages.bower2nix. - + -
+
<command>bower2nix</command> usage - - Suppose you have a bower.json with the following contents: - - -<filename>bower.json</filename> + + Suppose you have a bower.json with the following + contents: + + <filename>bower.json</filename> - - - - - - Running bower2nix will produce something like the - following output: + + + + Running bower2nix will produce something like the + following output: - - + - - Using the bower2nix command line arguments, the - output can be redirected to a file. A name like - bower-packages.nix would be fine. - + + Using the bower2nix command line arguments, the output + can be redirected to a file. A name like + bower-packages.nix would be fine. + - - The resulting derivation is a union of all the downloaded Bower - packages (and their dependencies). To use it, they still need to be - linked together by Bower, which is where - buildBowerComponents is useful. - -
+ + The resulting derivation is a union of all the downloaded Bower packages + (and their dependencies). To use it, they still need to be linked together + by Bower, which is where buildBowerComponents is useful. + +
-
<varname>buildBowerComponents</varname> function +
+ <varname>buildBowerComponents</varname> function - The function is implemented in - pkgs/development/bower-modules/generic/default.nix. - Example usage: - -buildBowerComponents + The function is implemented in + + pkgs/development/bower-modules/generic/default.nix. + Example usage: + + buildBowerComponents bowerComponents = buildBowerComponents { name = "my-web-app"; @@ -92,42 +87,42 @@ bowerComponents = buildBowerComponents { src = myWebApp; }; - + - -In , the following arguments -are of special significance to the function: - - - - - generated specifies the file which was created by bower2nix. - - - - - - src is your project's sources. It needs to - contain a bower.json file. - - - - - - - buildBowerComponents will run Bower to link - together the output of bower2nix, resulting in a - bower_components directory which can be used. - - - - Here is an example of a web frontend build process using - gulp. You might use grunt, or - anything else. - - -Example build script (<filename>gulpfile.js</filename>) + + In , the following arguments are + of special significance to the function: + + + + generated specifies the file which was created by + bower2nix. + + + + + src is your project's sources. It needs to contain a + bower.json file. + + + + + + + buildBowerComponents will run Bower to link together the + output of bower2nix, resulting in a + bower_components directory which can be used. + + + + Here is an example of a web frontend build process using + gulp. You might use grunt, or anything + else. + + + + Example build script (<filename>gulpfile.js</filename>) - + - - Full example — <filename>default.nix</filename> + + Full example — <filename>default.nix</filename> { myWebApp ? { outPath = ./.; name = "myWebApp"; } , pkgs ? import <nixpkgs> {} @@ -172,73 +167,63 @@ pkgs.stdenv.mkDerivation { installPhase = "mv gulpdist $out"; } - - - -A few notes about : - - - - - The result of buildBowerComponents is an - input to the frontend build. - - - - - - Whether to symlink or copy the - bower_components directory depends on the - build tool in use. In this case a copy is used to avoid - gulp silliness with permissions. - - - - - - gulp requires HOME to - refer to a writeable directory. - - - - - + + + + A few notes about : + + + + The result of buildBowerComponents is an input to the + frontend build. + + + + + Whether to symlink or copy the bower_components + directory depends on the build tool in use. In this case a copy is used + to avoid gulp silliness with permissions. + + + + + gulp requires HOME to refer to a + writeable directory. + + + + The actual build command. Other tools could be used. - - - - -
+ + + + +
-
+
Troubleshooting - - - + + - ENOCACHE errors from - buildBowerComponents + ENOCACHE errors from buildBowerComponents - - This means that Bower was looking for a package version which - doesn't exist in the generated - bower-packages.nix. - - - If bower.json has been updated, then run - bower2nix again. - - - It could also be a bug in bower2nix or - fetchbower. If possible, try reformulating - the version specification in bower.json. - + + This means that Bower was looking for a package version which doesn't + exist in the generated bower-packages.nix. + + + If bower.json has been updated, then run + bower2nix again. + + + It could also be a bug in bower2nix or + fetchbower. If possible, try reformulating the version + specification in bower.json. + - - - -
- + + +
diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml index 0ce1abd6194c8db12713e66155c3b51adf40f159..d5f2574039f22e8b75d607e498c672d8c7dd688b 100644 --- a/doc/languages-frameworks/coq.xml +++ b/doc/languages-frameworks/coq.xml @@ -1,36 +1,38 @@
+ Coq -Coq - - Coq libraries should be installed in - $(out)/lib/coq/${coq.coq-version}/user-contrib/. - Such directories are automatically added to the - $COQPATH environment variable by the hook defined - in the Coq derivation. - - - Some libraries require OCaml and sometimes also Camlp5 or findlib. - The exact versions that were used to build Coq are saved in the - coq.ocaml and coq.camlp5 - and coq.findlib attributes. - - - Coq libraries may be compatible with some specific versions of Coq only. - The compatibleCoqVersions attribute is used to - precisely select those versions of Coq that are compatible with this - derivation. - - - Here is a simple package example. It is a pure Coq library, thus it - depends on Coq. It builds on the Mathematical Components library, thus it - also takes mathcomp as buildInputs. - Its Makefile has been generated using - coq_makefile so we only have to - set the $COQLIB variable at install time. - - + + Coq libraries should be installed in + $(out)/lib/coq/${coq.coq-version}/user-contrib/. Such + directories are automatically added to the $COQPATH + environment variable by the hook defined in the Coq derivation. + + + + Some libraries require OCaml and sometimes also Camlp5 or findlib. The exact + versions that were used to build Coq are saved in the + coq.ocaml and coq.camlp5 and + coq.findlib attributes. + + + + Coq libraries may be compatible with some specific versions of Coq only. The + compatibleCoqVersions attribute is used to precisely + select those versions of Coq that are compatible with this derivation. + + + + Here is a simple package example. It is a pure Coq library, thus it depends + on Coq. It builds on the Mathematical Components library, thus it also takes + mathcomp as buildInputs. Its + Makefile has been generated using + coq_makefile so we only have to set the + $COQLIB variable at install time. + + + { stdenv, fetchFromGitHub, coq, mathcomp }: stdenv.mkDerivation rec { diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 54ea60c902129269502729a8aa49483f575c377a..ab4c9f0f7c8857f6d527b2dcbdc0e8e37c678f45 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -1,14 +1,14 @@
+ Go -Go + + The function buildGoPackage builds standard Go programs. + -The function buildGoPackage builds -standard Go programs. - - -buildGoPackage + + buildGoPackage deis = buildGoPackage rec { name = "deis-${version}"; @@ -29,55 +29,56 @@ deis = buildGoPackage rec { buildFlags = "--tags release"; } - - - is an example expression using buildGoPackage, -the following arguments are of special significance to the function: - - - - + + + + is an example expression using + buildGoPackage, the following arguments are of special significance to the + function: + + - goPackagePath specifies the package's canonical Go import path. + goPackagePath specifies the package's canonical Go + import path. - - - + + - subPackages limits the builder from building child packages that - have not been listed. If subPackages is not specified, all child - packages will be built. + subPackages limits the builder from building child + packages that have not been listed. If subPackages is + not specified, all child packages will be built. - In this example only github.com/deis/deis/client will be built. + In this example only github.com/deis/deis/client will + be built. - - - + + - goDeps is where the Go dependencies of a Go program are listed - as a list of package source identified by Go import path. - It could be imported as a separate deps.nix file for - readability. The dependency data structure is described below. + goDeps is where the Go dependencies of a Go program are + listed as a list of package source identified by Go import path. It could + be imported as a separate deps.nix file for + readability. The dependency data structure is described below. - - - + + - buildFlags is a list of flags passed to the go build command. + buildFlags is a list of flags passed to the go build + command. - - - - - - -The goDeps attribute can be imported from a separate - nix file that defines which Go libraries are needed and should - be included in GOPATH for buildPhase. - - -deps.nix + + + + + + The goDeps attribute can be imported from a separate + nix file that defines which Go libraries are needed and + should be included in GOPATH for + buildPhase. + + + + deps.nix [ { @@ -100,67 +101,60 @@ the following arguments are of special significance to the function: } ] - + - - - - - + + + - goDeps is a list of Go dependencies. + goDeps is a list of Go dependencies. - - - + + - goPackagePath specifies Go package import path. + goPackagePath specifies Go package import path. - - - + + - fetch type that needs to be used to get package source. If git - is used there should be url, rev and sha256 - defined next to it. + fetch type that needs to be used to get package source. + If git is used there should be url, + rev and sha256 defined next to it. - - - - - - -To extract dependency information from a Go package in automated way use go2nix. - It can produce complete derivation and goDeps file for Go programs. - - - buildGoPackage produces - where bin includes program binaries. You can test build a Go binary as follows: - - + + + + + + To extract dependency information from a Go package in automated way use + go2nix. It can + produce complete derivation and goDeps file for Go + programs. + + + + buildGoPackage produces + where + bin includes program binaries. You can test build a Go + binary as follows: + $ nix-build -A deis.bin - or build all outputs with: - - + $ nix-build -A deis.all + bin output will be installed by default with + nix-env -i or systemPackages. + - bin output will be installed by default with nix-env -i - or systemPackages. - - - - -You may use Go packages installed into the active Nix profiles by adding -the following to your ~/.bashrc: - + + You may use Go packages installed into the active Nix profiles by adding the + following to your ~/.bashrc: for p in $NIX_PROFILES; do GOPATH="$p/share/go:$GOPATH" done - - +
diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 1623e0d276f225098cc03de9d045d9f7f9b3e9e4..7677c366191fb54ecfc9146c3a498010ef424b4f 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -312,7 +312,7 @@ For example, installing the following environment allows one to browse module documentation index [not too dissimilar to this](https://downloads.haskell.org/~ghc/latest/docs/html/libraries/index.html) for all the specified packages and their dependencies by directing a browser of -choice to `~/.nix-profiles/share/doc/hoogle/index.html` (or +choice to `~/.nix-profile/share/doc/hoogle/index.html` (or `/run/current-system/sw/share/doc/hoogle/index.html` in case you put it in `environment.systemPackages` in NixOS). @@ -334,10 +334,29 @@ navigate there. Finally, you can run ```shell -hoogle server -p 8080 --local +hoogle server --local -p 8080 ``` and navigate to http://localhost:8080/ for your own local -[Hoogle](https://www.haskell.org/hoogle/). +[Hoogle](https://www.haskell.org/hoogle/). The `--local` flag makes the hoogle +server serve files from your nix store over http, without the flag it will use +`file://` URIs. Note, however, that Firefox and possibly other browsers +disallow navigation from `http://` to `file://` URIs for security reasons, +which might be quite an inconvenience. Versions before v5 did not have this +flag. See +[this page](http://kb.mozillazine.org/Links_to_local_pages_do_not_work) for +workarounds. + +For NixOS users there's a service which runs this exact command for you. +Specify the `packages` you want documentation for and the `haskellPackages` set +you want them to come from. Add the following to `configuration.nix`. + +```nix +services.hoogle = { +enable = true; +packages = (hpkgs: with hpkgs; [text cryptonite]); +haskellPackages = pkgs.haskellPackages; +}; +``` ### How to build a Haskell project using Stack @@ -666,6 +685,112 @@ prefer one built with GHC 7.8.x in the first place. However, for users who cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an older version might be useful. +### How to override packages in all compiler-specific package sets + +In the previous section we learned how to override a package in a single +compiler-specific package set. You may have some overrides defined that you want +to use across multiple package sets. To accomplish this you could use the +technique that we learned in the previous section by repeating the overrides for +all the compiler-specific package sets. For example: + +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + haskell = super.haskell // { + packages = super.haskell.packages // { + ghc784 = super.haskell.packages.ghc784.override { + overrides = self: super: { + my-package = ...; + my-other-package = ...; + }; + }; + ghc822 = super.haskell.packages.ghc784.override { + overrides = self: super: { + my-package = ...; + my-other-package = ...; + }; + }; + ... + }; + }; + }; +} +``` + +However there's a more convenient way to override all compiler-specific package +sets at once: + +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + haskell = super.haskell // { + packageOverrides = self: super: { + my-package = ...; + my-other-package = ...; + }; + }; + }; +} +``` + +### How to specify source overrides for your Haskell package + +When starting a Haskell project you can use `developPackage` +to define a derivation for your package at the `root` path +as well as source override versions for Hackage packages, like so: + +```nix +# default.nix +{ compilerVersion ? "ghc842" }: +let + # pinning nixpkgs using new Nix 2.0 builtin `fetchGit` + pkgs = import (fetchGit (import ./version.nix)) { }; + compiler = pkgs.haskell.packages."${compilerVersion}"; + pkg = compiler.developPackage { + root = ./.; + source-overrides = { + # Let's say the GHC 8.4.2 haskellPackages uses 1.6.0.0 and your test suite is incompatible with >= 1.6.0.0 + HUnit = "1.5.0.0"; + }; + }; +in pkg +``` + +This could be used in place of a simplified `stack.yaml` defining a Nix +derivation for your Haskell package. + +As you can see this allows you to specify only the source version found on +Hackage and nixpkgs will take care of the rest. + +You can also specify `buildInputs` for your Haskell derivation for packages +that directly depend on external libraries like so: + +```nix +# default.nix +{ compilerVersion ? "ghc842" }: +let + # pinning nixpkgs using new Nix 2.0 builtin `fetchGit` + pkgs = import (fetchGit (import ./version.nix)) { }; + compiler = pkgs.haskell.packages."${compilerVersion}"; + pkg = compiler.developPackage { + root = ./.; + source-overrides = { + HUnit = "1.5.0.0"; # Let's say the GHC 8.4.2 haskellPackages uses 1.6.0.0 and your test suite is incompatible with >= 1.6.0.0 + }; + }; + # in case your package source depends on any libraries directly, not just transitively. + buildInputs = [ zlib ]; +in pkg.overrideAttrs(attrs: { + buildInputs = attrs.buildInputs ++ buildInputs; +}) +``` + +Notice that you will need to override (via `overrideAttrs` or similar) the +derivation returned by the `developPackage` Nix lambda as there is no `buildInputs` +named argument you can pass directly into the `developPackage` lambda. + ### How to recover from GHC's infamous non-deterministic library ID bug GHC and distributed build farms don't get along well: @@ -922,6 +1047,19 @@ As you can see, `packunused` finds out that although the testsuite component has no redundant dependencies the library component of `scientific-0.3.5.1` depends on `ghc-prim` which is unused in the library. +### Using hackage2nix with nixpkgs + +Hackage package derivations are found in the +[`hackage-packages.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/hackage-packages.nix) +file within `nixpkgs` and are used as the initial package set for +`haskellPackages`. The `hackage-packages.nix` file is not meant to be edited +by hand, but rather autogenerated by [`hackage2nix`](https://github.com/NixOS/cabal2nix/tree/master/hackage2nix), +which by default uses the [`configuration-hackage2nix.yaml`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/configuration-hackage2nix.yaml) +file to generate all the derivations. + +To modify the contents `configuration-hackage2nix.yaml`, follow the +instructions on [`hackage2nix`](https://github.com/NixOS/cabal2nix/tree/master/hackage2nix). + ## Other resources - The Youtube video [Nix Loves Haskell](https://www.youtube.com/watch?v=BsBhi_r-OeE) diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index a1c265f674845693ec06d3d3c3bf7f702a3b898b..f22984cb56b0aba028488f843539982ba6bb1d78 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -1,36 +1,31 @@ - -Support for specific programming languages and frameworks - -The standard build -environment makes it easy to build typical Autotools-based -packages with very little code. Any other kind of package can be -accomodated by overriding the appropriate phases of -stdenv. However, there are specialised functions -in Nixpkgs to easily build packages for other programming languages, -such as Perl or Haskell. These are described in this chapter. - - - - - - - - - - - - - - - - - - - - - - + Support for specific programming languages and frameworks + + The standard build environment makes it + easy to build typical Autotools-based packages with very little code. Any + other kind of package can be accomodated by overriding the appropriate phases + of stdenv. However, there are specialised functions in + Nixpkgs to easily build packages for other programming languages, such as + Perl or Haskell. These are described in this chapter. + + + + + + + + + + + + + + + + + + + diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml index 2507cc2c469ad7e30f0a0f6c0ecef5428e46798a..667a795a8d3ac50a558c4a4d01cee7d96f4de47a 100644 --- a/doc/languages-frameworks/java.xml +++ b/doc/languages-frameworks/java.xml @@ -1,11 +1,10 @@
+ Java -Java - -Ant-based Java packages are typically built from source as follows: - + + Ant-based Java packages are typically built from source as follows: stdenv.mkDerivation { name = "..."; @@ -16,33 +15,36 @@ stdenv.mkDerivation { buildPhase = "ant"; } - -Note that jdk is an alias for the OpenJDK. - -JAR files that are intended to be used by other packages should -be installed in $out/share/java. The OpenJDK has -a stdenv setup hook that adds any JARs in the -share/java directories of the build inputs to the -CLASSPATH environment variable. For instance, if the -package libfoo installs a JAR named -foo.jar in its share/java -directory, and another package declares the attribute - + Note that jdk is an alias for the OpenJDK (self-built + where available, or pre-built via Zulu). Platforms with OpenJDK not (yet) in + Nixpkgs (Aarch32, Aarch64) point to the + (unfree) oraclejdk. + + + + JAR files that are intended to be used by other packages should be installed + in $out/share/java. JDKs have a stdenv setup hook that + add any JARs in the share/java directories of the build + inputs to the CLASSPATH environment variable. For instance, if + the package libfoo installs a JAR named + foo.jar in its share/java + directory, and another package declares the attribute buildInputs = [ jdk libfoo ]; - -then CLASSPATH will be set to -/nix/store/...-libfoo/share/java/foo.jar. - -Private JARs -should be installed in a location like -$out/share/package-name. - -If your Java package provides a program, you need to generate a -wrapper script to run it using the OpenJRE. You can use -makeWrapper for this: - + then CLASSPATH will be set to + /nix/store/...-libfoo/share/java/foo.jar. + + + + Private JARs should be installed in a location like + $out/share/package-name. + + + + If your Java package provides a program, you need to generate a wrapper + script to run it using the OpenJRE. You can use + makeWrapper for this: buildInputs = [ makeWrapper ]; @@ -53,23 +55,30 @@ installPhase = --add-flags "-cp $out/share/java/foo.jar org.foo.Main" ''; + Note the use of jre, which is the part of the OpenJDK + package that contains the Java Runtime Environment. By using + ${jre}/bin/java instead of + ${jdk}/bin/java, you prevent your package from depending + on the JDK at runtime. + + + + Note all JDKs passthru home, so if your application + requires environment variables like JAVA_HOME being set, that + can be done in a generic fashion with the --set argument + of makeWrapper: + + --set JAVA_HOME ${jdk.home} + + -Note the use of jre, which is the part of the -OpenJDK package that contains the Java Runtime Environment. By using -${jre}/bin/java instead of -${jdk}/bin/java, you prevent your package from -depending on the JDK at runtime. - -It is possible to use a different Java compiler than -javac from the OpenJDK. For instance, to use the -GNU Java Compiler: - + + It is possible to use a different Java compiler than javac + from the OpenJDK. For instance, to use the GNU Java Compiler: buildInputs = [ gcj ant ]; - -Here, Ant will automatically use gij (the GNU Java -Runtime) instead of the OpenJRE. - + Here, Ant will automatically use gij (the GNU Java + Runtime) instead of the OpenJRE. +
- diff --git a/doc/languages-frameworks/lua.xml b/doc/languages-frameworks/lua.xml index 39b086af4cb13c95abbea7f8819e8ae84db143f1..2101402999607e5df56493728912f0f34e8a2e68 100644 --- a/doc/languages-frameworks/lua.xml +++ b/doc/languages-frameworks/lua.xml @@ -1,24 +1,22 @@
+ Lua -Lua - - - Lua packages are built by the buildLuaPackage function. This function is - implemented - in + + Lua packages are built by the buildLuaPackage function. + This function is implemented in + pkgs/development/lua-modules/generic/default.nix and works similarly to buildPerlPackage. (See for details.) - + - - Lua packages are defined - in pkgs/top-level/lua-packages.nix. + + Lua packages are defined in + pkgs/top-level/lua-packages.nix. Most of them are simple. For example: - - + fileSystem = buildLuaPackage { name = "filesystem-1.6.2"; src = fetchurl { @@ -32,20 +30,19 @@ fileSystem = buildLuaPackage { }; }; - + - + Though, more complicated package should be placed in a seperate file in pkgs/development/lua-modules. - - - Lua packages accept additional parameter disabled, which defines - the condition of disabling package from luaPackages. For example, if package has - disabled assigned to lua.luaversion != "5.1", - it will not be included in any luaPackages except lua51Packages, making it - only be built for lua 5.1. - + + + Lua packages accept additional parameter disabled, which + defines the condition of disabling package from luaPackages. For example, if + package has disabled assigned to lua.luaversion + != "5.1", it will not be included in any luaPackages except + lua51Packages, making it only be built for lua 5.1. +
- diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml index 149fcb275a0954376cc00a6d0d282accb1004044..a675e66658630532ee1ea2c9b6aa7ef7dabbf0e6 100644 --- a/doc/languages-frameworks/perl.xml +++ b/doc/languages-frameworks/perl.xml @@ -1,24 +1,27 @@
- -Perl - -Nixpkgs provides a function buildPerlPackage, -a generic package builder function for any Perl package that has a -standard Makefile.PL. It’s implemented in pkgs/development/perl-modules/generic. - -Perl packages from CPAN are defined in Perl + + + Nixpkgs provides a function buildPerlPackage, a generic + package builder function for any Perl package that has a standard + Makefile.PL. It’s implemented in + pkgs/development/perl-modules/generic. + + + + Perl packages from CPAN are defined in + pkgs/top-level/perl-packages.nix, -rather than pkgs/all-packages.nix. Most Perl -packages are so straight-forward to build that they are defined here -directly, rather than having a separate function for each package -called from perl-packages.nix. However, more -complicated packages should be put in a separate file, typically in -pkgs/development/perl-modules. Here is an -example of the former: - + rather than pkgs/all-packages.nix. Most Perl packages + are so straight-forward to build that they are defined here directly, rather + than having a separate function for each package called from + perl-packages.nix. However, more complicated packages + should be put in a separate file, typically in + pkgs/development/perl-modules. Here is an example of the + former: ClassC3 = buildPerlPackage rec { name = "Class-C3-0.21"; @@ -28,74 +31,72 @@ ClassC3 = buildPerlPackage rec { }; }; - -Note the use of mirror://cpan/, and the -${name} in the URL definition to ensure that the -name attribute is consistent with the source that we’re actually -downloading. Perl packages are made available in -all-packages.nix through the variable -perlPackages. For instance, if you have a package -that needs ClassC3, you would typically write - + Note the use of mirror://cpan/, and the + ${name} in the URL definition to ensure that the name + attribute is consistent with the source that we’re actually downloading. + Perl packages are made available in all-packages.nix + through the variable perlPackages. For instance, if you + have a package that needs ClassC3, you would typically + write foo = import ../path/to/foo.nix { inherit stdenv fetchurl ...; inherit (perlPackages) ClassC3; }; - -in all-packages.nix. You can test building a -Perl package as follows: - + in all-packages.nix. You can test building a Perl + package as follows: $ nix-build -A perlPackages.ClassC3 - -buildPerlPackage adds perl- to -the start of the name attribute, so the package above is actually -called perl-Class-C3-0.21. So to install it, you -can say: - + buildPerlPackage adds perl- to the + start of the name attribute, so the package above is actually called + perl-Class-C3-0.21. So to install it, you can say: $ nix-env -i perl-Class-C3 - -(Of course you can also install using the attribute name: -nix-env -i -A perlPackages.ClassC3.) - -So what does buildPerlPackage do? It does -the following: - - - - In the configure phase, it calls perl - Makefile.PL to generate a Makefile. You can set the - variable makeMakerFlags to pass flags to - Makefile.PL - - It adds the contents of the PERL5LIB - environment variable to #! .../bin/perl line of - Perl scripts as -Idir - flags. This ensures that a script can find its - dependencies. - - In the fixup phase, it writes the propagated build - inputs (propagatedBuildInputs) to the file - $out/nix-support/propagated-user-env-packages. - nix-env recursively installs all packages listed - in this file when you install a package that has it. This ensures - that a Perl package can find its dependencies. - - - - - -buildPerlPackage is built on top of -stdenv, so everything can be customised in the -usual way. For instance, the BerkeleyDB module has -a preConfigure hook to generate a configuration -file used by Makefile.PL: - + (Of course you can also install using the attribute name: nix-env -i + -A perlPackages.ClassC3.) + + + + So what does buildPerlPackage do? It does the following: + + + + In the configure phase, it calls perl Makefile.PL to + generate a Makefile. You can set the variable + makeMakerFlags to pass flags to + Makefile.PL + + + + + It adds the contents of the PERL5LIB environment variable + to #! .../bin/perl line of Perl scripts as + -Idir flags. This ensures + that a script can find its dependencies. + + + + + In the fixup phase, it writes the propagated build inputs + (propagatedBuildInputs) to the file + $out/nix-support/propagated-user-env-packages. + nix-env recursively installs all packages listed in + this file when you install a package that has it. This ensures that a Perl + package can find its dependencies. + + + + + + + buildPerlPackage is built on top of + stdenv, so everything can be customised in the usual way. + For instance, the BerkeleyDB module has a + preConfigure hook to generate a configuration file used by + Makefile.PL: { buildPerlPackage, fetchurl, db }: @@ -108,23 +109,20 @@ buildPerlPackage rec { }; preConfigure = '' - echo "LIB = ${db}/lib" > config.in - echo "INCLUDE = ${db}/include" >> config.in + echo "LIB = ${db.out}/lib" > config.in + echo "INCLUDE = ${db.dev}/include" >> config.in ''; } - - - -Dependencies on other Perl packages can be specified in the -buildInputs and -propagatedBuildInputs attributes. If something is -exclusively a build-time dependency, use -buildInputs; if it’s (also) a runtime dependency, -use propagatedBuildInputs. For instance, this -builds a Perl module that has runtime dependencies on a bunch of other -modules: - + + + + Dependencies on other Perl packages can be specified in the + buildInputs and propagatedBuildInputs + attributes. If something is exclusively a build-time dependency, use + buildInputs; if it’s (also) a runtime dependency, use + propagatedBuildInputs. For instance, this builds a Perl + module that has runtime dependencies on a bunch of other modules: ClassC3Componentised = buildPerlPackage rec { name = "Class-C3-Componentised-1.0004"; @@ -137,24 +135,26 @@ ClassC3Componentised = buildPerlPackage rec { ]; }; + - - -
Generation from CPAN +
+ Generation from CPAN -Nix expressions for Perl packages can be generated (almost) -automatically from CPAN. This is done by the program -nix-generate-from-cpan, which can be installed -as follows: + + Nix expressions for Perl packages can be generated (almost) automatically + from CPAN. This is done by the program + nix-generate-from-cpan, which can be installed as + follows: + $ nix-env -i nix-generate-from-cpan -This program takes a Perl module name, looks it up on CPAN, -fetches and unpacks the corresponding package, and prints a Nix -expression on standard output. For example: - + + This program takes a Perl module name, looks it up on CPAN, fetches and + unpacks the corresponding package, and prints a Nix expression on standard + output. For example: $ nix-generate-from-cpan XML::Simple XMLSimple = buildPerlPackage rec { @@ -170,26 +170,23 @@ $ nix-generate-from-cpan XML::Simple }; }; - -The output can be pasted into -pkgs/top-level/perl-packages.nix or wherever else -you need it. - -
- -
Cross-compiling modules - -Nixpkgs has experimental support for cross-compiling Perl -modules. In many cases, it will just work out of the box, even for -modules with native extensions. Sometimes, however, the Makefile.PL -for a module may (indirectly) import a native module. In that case, -you will need to make a stub for that module that will satisfy the -Makefile.PL and install it into -lib/perl5/site_perl/cross_perl/${perl.version}. -See the postInstall for DBI for -an example. - -
- + The output can be pasted into + pkgs/top-level/perl-packages.nix or wherever else you + need it. + +
+ +
+ Cross-compiling modules + + + Nixpkgs has experimental support for cross-compiling Perl modules. In many + cases, it will just work out of the box, even for modules with native + extensions. Sometimes, however, the Makefile.PL for a module may + (indirectly) import a native module. In that case, you will need to make a + stub for that module that will satisfy the Makefile.PL and install it into + lib/perl5/site_perl/cross_perl/${perl.version}. See the + postInstall for DBI for an example. + +
- diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 0f871395854cee964e8e888562d897434f192eb3..d825823d01a2466b14bdbcf162a99c1cf9cd5201 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -200,7 +200,7 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th doCheck = false; meta = { - homepage = "http://github.com/pytoolz/toolz/"; + homepage = "https://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; @@ -245,7 +245,7 @@ with import {}; doCheck = false; meta = { - homepage = "http://github.com/pytoolz/toolz/"; + homepage = "https://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; }; }; @@ -328,7 +328,7 @@ when building the bindings and are therefore added as `buildInputs`. meta = { description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = http://lxml.de; + homepage = https://lxml.de; license = licenses.bsd3; maintainers = with maintainers; [ sjourdois ]; }; @@ -374,7 +374,7 @@ and `CFLAGS`. description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; homepage = http://hgomersall.github.com/pyFFTW/; license = with licenses; [ bsd2 bsd3 ]; - maintainer = with maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; }; }; } @@ -424,7 +424,7 @@ available. At some point you'll likely have multiple packages which you would like to be able to use in different projects. In order to minimise unnecessary -duplication we now look at how you can maintain yourself a repository with your +duplication we now look at how you can maintain a repository with your own packages. The important functions here are `import` and `callPackage`. ### Including a derivation using `callPackage` @@ -436,7 +436,7 @@ Let's split the package definition from the environment definition. We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` ```nix -{ pkgs, buildPythonPackage }: +{ lib, pkgs, buildPythonPackage }: buildPythonPackage rec { pname = "toolz"; @@ -447,7 +447,7 @@ buildPythonPackage rec { sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; }; - meta = { + meta = with lib; { homepage = "http://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; license = licenses.bsd3; @@ -484,7 +484,7 @@ and in this case the `python35` interpreter is automatically used. ### Interpreters -Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as +Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and `python35`. The default interpreter, `python`, maps to `python2`. @@ -533,6 +533,7 @@ sets are * `pkgs.python34Packages` * `pkgs.python35Packages` * `pkgs.python36Packages` +* `pkgs.python37Packages` * `pkgs.pypyPackages` and the aliases @@ -587,30 +588,32 @@ The `buildPythonPackage` mainly does four things: As in Perl, dependencies on other Python packages can be specified in the `buildInputs` and `propagatedBuildInputs` attributes. If something is -exclusively a build-time dependency, use `buildInputs`; if it’s (also) a runtime +exclusively a build-time dependency, use `buildInputs`; if it is (also) a runtime dependency, use `propagatedBuildInputs`. By default tests are run because `doCheck = true`. Test dependencies, like -e.g. the test runner, should be added to `buildInputs`. +e.g. the test runner, should be added to `checkInputs`. By default `meta.platforms` is set to the same value as the interpreter unless overridden otherwise. ##### `buildPythonPackage` parameters -All parameters from `mkDerivation` function are still supported. - -* `namePrefix`: Prepended text to `${name}` parameter. Defaults to `"python3.3-"` for Python 3.3, etc. Set it to `""` if you're packaging an application or a command line tool. -* `disabled`: If `true`, package is not build for particular python interpreter version. Grep around `pkgs/top-level/python-packages.nix` for examples. -* `setupPyBuildFlags`: List of flags passed to `setup.py build_ext` command. -* `pythonPath`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). +All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`: + +* `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. +* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`. +* `disabled` ? false: If `true`, package is not build for the particular Python interpreter version. +* `dontWrapPythonPrograms ? false`: Skip wrapping of python programs. +* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. +* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed. +* `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. +* `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`. +* `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). * `preShellHook`: Hook to execute commands before `shellHook`. * `postShellHook`: Hook to execute commands after `shellHook`. -* `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. -* `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. -* `format`: Format of the source. Valid options are `setuptools` (default), `flit`, `wheel`, and `other`. `setuptools` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. In case you need to provide your own `buildPhase` and `installPhase` you can use `other`. -* `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. -* `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`. +* `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`. +* `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command. ##### Overriding Python packages @@ -642,11 +645,47 @@ in python.withPackages(ps: [ps.blaze])).env #### `buildPythonApplication` function -The `buildPythonApplication` function is practically the same as `buildPythonPackage`. -The difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter. -Because with an application we're not interested in multiple version the prefix is dropped. +The `buildPythonApplication` function is practically the same as +`buildPythonPackage`. The main purpose of this function is to build a Python +package where one is interested only in the executables, and not importable +modules. For that reason, when adding this package to a `python.buildEnv`, the +modules won't be made available. + +Another difference is that `buildPythonPackage` by default prefixes the names of +the packages with the version of the interpreter. Because this is irrelevant for +applications, the prefix is omitted. + +#### `toPythonApplication` function + +A distinction is made between applications and libraries, however, sometimes a +package is used as both. In this case the package is added as a library to +`python-packages.nix` and as an application to `all-packages.nix`. To reduce +duplication the `toPythonApplication` can be used to convert a library to an +application. -#### python.buildEnv function +The Nix expression shall use `buildPythonPackage` and be called from +`python-packages.nix`. A reference shall be created from `all-packages.nix` to +the attribute in `python-packages.nix`, and the `toPythonApplication` shall be +applied to the reference: +```nix +youtube-dl = with pythonPackages; toPythonApplication youtube-dl; +``` + +#### `toPythonModule` function + +In some cases, such as bindings, a package is created using +`stdenv.mkDerivation` and added as attribute in `all-packages.nix`. +The Python bindings should be made available from `python-packages.nix`. +The `toPythonModule` function takes a derivation and makes certain Python-specific modifications. +```nix +opencv = toPythonModule (pkgs.opencv.override { + enablePython = true; + pythonPackages = self; +}); +``` +Do pay attention to passing in the right Python version! + +#### `python.buildEnv` function Python environments can be created using the low-level `pkgs.buildEnv` function. This example shows how to create an environment that has the Pyramid Web Framework. @@ -688,7 +727,7 @@ specified packages in its path. * `postBuild`: Shell command executed after the build of environment. * `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`). -#### python.withPackages function +#### `python.withPackages` function The `python.withPackages` function provides a simpler interface to the `python.buildEnv` functionality. It takes a function as an argument that is passed the set of python packages and returns the list @@ -722,7 +761,7 @@ with import {}; In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use `python.buildEnv`. -Python 2 namespace packages may provide `__init__.py` that collide. In that case `python.buildEnv` +Python 2 namespace packages may provide `__init__.py` that collide. In that case `python.buildEnv` should be used with `ignoreCollisions = true`. ### Development mode @@ -790,8 +829,8 @@ example of such a situation is when `py.test` is used. - Non-working tests can often be deselected. By default `buildPythonPackage` runs `python setup.py test`. Most python modules follows the standard test protocol where the pytest runner can be used instead. - `py.test` supports a `-k` parameter to ignore test methods or classes: - + `py.test` supports a `-k` parameter to ignore test methods or classes: + ```nix buildPythonPackage { # ... @@ -941,7 +980,7 @@ stdenv.mkDerivation { # the following packages are related to the dependencies of your python # project. # In this particular example the python modules listed in the - # requirements.tx require the following packages to be installed locally + # requirements.txt require the following packages to be installed locally # in order to compile any binary extensions they may require. # taglib @@ -973,14 +1012,14 @@ folder and not downloaded again. If you need to change a package's attribute(s) from `configuration.nix` you could do: ```nix - nixpkgs.config.packageOverrides = superP: { - pythonPackages = superP.pythonPackages.override { - overrides = self: super: { - bepasty-server = super.bepasty-server.overrideAttrs ( oldAttrs: { - src = pkgs.fetchgit { - url = "https://github.com/bepasty/bepasty-server"; - sha256 = "9ziqshmsf0rjvdhhca55sm0x8jz76fsf2q4rwh4m6lpcf8wr0nps"; - rev = "e2516e8cf4f2afb5185337073607eb9e84a61d2d"; + nixpkgs.config.packageOverrides = super: { + python = super.python.override { + packageOverrides = python-self: python-super: { + zerobin = python-super.zerobin.overrideAttrs (oldAttrs: { + src = super.fetchgit { + url = "https://github.com/sametmax/0bin"; + rev = "a344dbb18fe7a855d0742b9a1cede7ce423b34ec"; + sha256 = "16d769kmnrpbdr0ph0whyf4yff5df6zi4kmwx7sz1d3r6c8p6xji"; }; }); }; @@ -988,27 +1027,39 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul }; ``` -If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`). +`pythonPackages.zerobin` is now globally overridden. All packages and also the +`zerobin` NixOS service use the new definition. +Note that `python-super` refers to the old package set and `python-self` +to the new, overridden version. + +To modify only a Python package set instead of a whole Python derivation, use this snippet: + +```nix + myPythonPackages = pythonPackages.override { + overrides = self: super: { + zerobin = ...; + }; + } +``` ### How to override a Python package using overlays? -To alter a python package using overlays, you would use the following approach: +Use the following overlay template: ```nix self: super: -rec { +{ python = super.python.override { packageOverrides = python-self: python-super: { - bepasty-server = python-super.bepasty-server.overrideAttrs ( oldAttrs: { - src = self.pkgs.fetchgit { - url = "https://github.com/bepasty/bepasty-server"; - sha256 = "9ziqshmsf0rjvdhhca55sm0x8jz76fsf2q4rwh4m6lpcf8wr0nps"; - rev = "e2516e8cf4f2afb5185337073607eb9e84a61d2d"; + zerobin = python-super.zerobin.overrideAttrs (oldAttrs: { + src = super.fetchgit { + url = "https://github.com/sametmax/0bin"; + rev = "a344dbb18fe7a855d0742b9a1cede7ce423b34ec"; + sha256 = "16d769kmnrpbdr0ph0whyf4yff5df6zi4kmwx7sz1d3r6c8p6xji"; }; }); }; }; - pythonPackages = python.pkgs; } ``` diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml index 1dbbb5341ba3827881699428ef82166623eb583a..b9b605b81da1284dbb6749365a75fad6f4dfe3fb 100644 --- a/doc/languages-frameworks/qt.xml +++ b/doc/languages-frameworks/qt.xml @@ -1,58 +1,74 @@
+ Qt -Qt - - -Qt is a comprehensive desktop and mobile application development toolkit for C++. -Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5. -The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features, -but older versions are typically retained until their support window ends. -The most important consideration in packaging Qt-based software is ensuring that each package and all its dependencies use the same version of Qt 5; -this consideration motivates most of the tools described below. - - -
Packaging Libraries for Nixpkgs - - -Whenever possible, libraries that use Qt 5 should be built with each available version. -Packages providing libraries should be added to the top-level function mkLibsForQt5, -which is used to build a set of libraries for every Qt 5 version. -A special callPackage function is used in this scope to ensure that the entire dependency tree uses the same Qt 5 version. -Import dependencies unqualified, i.e., qtbase not qt5.qtbase. -Do not import a package set such as qt5 or libsForQt5. - - - -If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its meta.broken attribute. -A package may be marked broken for certain versions by testing the qtbase.version attribute, which will always give the current Qt 5 version. - + + Qt is a comprehensive desktop and mobile application development toolkit for + C++. Legacy support is available for Qt 3 and Qt 4, but all current + development uses Qt 5. The Qt 5 packages in Nixpkgs are updated frequently to + take advantage of new features, but older versions are typically retained + until their support window ends. The most important consideration in + packaging Qt-based software is ensuring that each package and all its + dependencies use the same version of Qt 5; this consideration motivates most + of the tools described below. + -
+
+ Packaging Libraries for Nixpkgs -
Packaging Applications for Nixpkgs + + Whenever possible, libraries that use Qt 5 should be built with each + available version. Packages providing libraries should be added to the + top-level function mkLibsForQt5, which is used to build a + set of libraries for every Qt 5 version. A special + callPackage function is used in this scope to ensure that + the entire dependency tree uses the same Qt 5 version. Import dependencies + unqualified, i.e., qtbase not + qt5.qtbase. Do not import a package + set such as qt5 or libsForQt5. + - -Call your application expression using libsForQt5.callPackage instead of callPackage. -Import dependencies unqualified, i.e., qtbase not qt5.qtbase. -Do not import a package set such as qt5 or libsForQt5. - + + If a library does not support a particular version of Qt 5, it is best to + mark it as broken by setting its meta.broken attribute. A + package may be marked broken for certain versions by testing the + qtbase.version attribute, which will always give the + current Qt 5 version. + +
- -Qt 5 maintains strict backward compatibility, so it is generally best to build an application package against the latest version using the libsForQt5 library set. -In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. libsForQt55 for Qt 5.5, if that is the latest version the package supports. -If a package must be pinned to an older Qt version, be sure to file a bug upstream; -because Qt is strictly backwards-compatible, any incompatibility is by definition a bug in the application. - +
+ Packaging Applications for Nixpkgs - -When testing applications in Nixpkgs, it is a common practice to build the package with nix-build and run it using the created symbolic link. -This will not work with Qt applications, however, because they have many hard runtime requirements that can only be guaranteed if the package is actually installed. -To test a Qt application, install it with nix-env or run it inside nix-shell. - + + Call your application expression using + libsForQt5.callPackage instead of + callPackage. Import dependencies unqualified, i.e., + qtbase not qt5.qtbase. Do + not import a package set such as qt5 or + libsForQt5. + -
+ + Qt 5 maintains strict backward compatibility, so it is generally best to + build an application package against the latest version using the + libsForQt5 library set. In case a package does not build + with the latest Qt version, it is possible to pick a set pinned to a + particular version, e.g. libsForQt55 for Qt 5.5, if that + is the latest version the package supports. If a package must be pinned to + an older Qt version, be sure to file a bug upstream; because Qt is strictly + backwards-compatible, any incompatibility is by definition a bug in the + application. + + + When testing applications in Nixpkgs, it is a common practice to build the + package with nix-build and run it using the created + symbolic link. This will not work with Qt applications, however, because + they have many hard runtime requirements that can only be guaranteed if the + package is actually installed. To test a Qt application, install it with + nix-env or run it inside nix-shell. + +
- diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index 6bb809192f894c6393ae2741a014e1faecd857c2..c52a72a3df4a746757d844ce94a3385d4b8cffad 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -1,17 +1,19 @@
+ Ruby -Ruby + + There currently is support to bundle applications that are packaged as Ruby + gems. The utility "bundix" allows you to write a + Gemfile, let bundler create a + Gemfile.lock, and then convert this into a nix + expression that contains all Gem dependencies automatically. + -There currently is support to bundle applications that are packaged as -Ruby gems. The utility "bundix" allows you to write a -Gemfile, let bundler create a -Gemfile.lock, and then convert this into a nix -expression that contains all Gem dependencies automatically. - - -For example, to package sensu, we did: + + For example, to package sensu, we did: + -Please check in the Gemfile, -Gemfile.lock and the -gemset.nix so future updates can be run easily. - + + Please check in the Gemfile, + Gemfile.lock and the gemset.nix so + future updates can be run easily. + -For tools written in Ruby - i.e. where the desire is to install -a package and then execute e.g. rake at the command -line, there is an alternative builder called bundlerApp. -Set up the gemset.nix the same way, and then, for -example: - + + For tools written in Ruby - i.e. where the desire is to install a package and + then execute e.g. rake at the command line, there is an + alternative builder called bundlerApp. Set up the + gemset.nix the same way, and then, for example: + -The chief advantage of bundlerApp over -bundlerEnv is the executables introduced in the -environment are precisely those selected in the exes -list, as opposed to bundlerEnv which adds all the -executables made available by gems in the gemset, which can mean e.g. -rspec or rake in unpredictable -versions available from various packages. - - -Resulting derivations for both builders also have two helpful -attributes, env and wrappedRuby. -The first one allows one to quickly drop into -nix-shell with the specified environment present. -E.g. nix-shell -A sensu.env would give you an -environment with Ruby preset so it has all the libraries necessary -for sensu in its paths. The second one can be -used to make derivations from custom Ruby scripts which have -Gemfiles with their dependencies specified. It is -a derivation with ruby wrapped so it can find all -the needed dependencies. For example, to make a derivation -my-script for a my-script.rb -(which should be placed in bin) you should run -bundix as specified above and then use -bundlerEnv like this: - + + The chief advantage of bundlerApp over + bundlerEnv is the executables introduced in the + environment are precisely those selected in the exes list, + as opposed to bundlerEnv which adds all the executables + made available by gems in the gemset, which can mean e.g. + rspec or rake in unpredictable versions + available from various packages. + + + + Resulting derivations for both builders also have two helpful attributes, + env and wrappedRuby. The first one + allows one to quickly drop into nix-shell with the + specified environment present. E.g. nix-shell -A sensu.env + would give you an environment with Ruby preset so it has all the libraries + necessary for sensu in its paths. The second one can be + used to make derivations from custom Ruby scripts which have + Gemfiles with their dependencies specified. It is a + derivation with ruby wrapped so it can find all the needed + dependencies. For example, to make a derivation my-script + for a my-script.rb (which should be placed in + bin) you should run bundix as + specified above and then use bundlerEnv like this: + -
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index b77c41e9b2299f7a52dadff49785ce9ada82afae..eec982d4c90ab75585121308413bcd07f43664ab 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -59,6 +59,11 @@ all crate sources of this package. Currently it is obtained by inserting a fake checksum into the expression and building the package once. The correct checksum can be then take from the failed build. +When the `Cargo.lock`, provided by upstream, is not in sync with the +`Cargo.toml`, it is possible to use `cargoPatches` to update it. All patches +added in `cargoPatches` will also be prepended to the patches in `patches` at +build-time. + To install crates with nix there is also an experimental project called [nixcrates](https://github.com/fractalide/nixcrates). diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml index 4515e17ec09e3a9ae9adca8b156461f6fdfbe905..af0b07166e3ec70b8cea0dd795989c48aafa9877 100644 --- a/doc/languages-frameworks/texlive.xml +++ b/doc/languages-frameworks/texlive.xml @@ -1,27 +1,42 @@
+ TeX Live -TeX Live + + Since release 15.09 there is a new TeX Live packaging that lives entirely + under attribute texlive. + + +
+ User's guide -Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute texlive. -
User's guide - - For basic usage just pull texlive.combined.scheme-basic for an environment with basic LaTeX support. - - It typically won't work to use separately installed packages together. - Instead, you can build a custom set of packages like this: - + + + For basic usage just pull texlive.combined.scheme-basic + for an environment with basic LaTeX support. + + + + + It typically won't work to use separately installed packages together. + Instead, you can build a custom set of packages like this: + texlive.combine { inherit (texlive) scheme-small collection-langkorean algorithms cm-super; } - There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences). - - - By default you only get executables and files needed during runtime, and a little documentation for the core packages. To change that, you need to add pkgFilter function to combine. - + There are all the schemes, collections and a few thousand packages, as + defined upstream (perhaps with tiny differences). + + + + + By default you only get executables and files needed during runtime, and a + little documentation for the core packages. To change that, you need to + add pkgFilter function to combine. + texlive.combine { # inherit (texlive) whatever-you-want; pkgFilter = pkg: @@ -30,34 +45,55 @@ texlive.combine { # there are also other attributes: version, name } - - - You can list packages e.g. by nix-repl. - + + + + + You can list packages e.g. by nix-repl. + $ nix-repl nix-repl> :l <nixpkgs> nix-repl> texlive.collection-<TAB> - - - Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example scheme-basic, into the combination. - + + + + + Note that the wrapper assumes that the result has a chance to be useful. + For example, the core executables should be present, as well as some core + data files. The supported way of ensuring this is by including some + scheme, for example scheme-basic, into the combination. + + -
+
+ +
+ Known problems -
Known problems - - Some tools are still missing, e.g. luajittex; - - some apps aren't packaged/tested yet (asymptote, biber, etc.); - - feature/bug: when a package is rejected by pkgFilter, its dependencies are still propagated; - - in case of any bugs or feature requests, file a github issue or better a pull request and /cc @vcunat. + + + Some tools are still missing, e.g. luajittex; + + + + + some apps aren't packaged/tested yet (asymptote, biber, etc.); + + + + + feature/bug: when a package is rejected by pkgFilter, + its dependencies are still propagated; + + + + + in case of any bugs or feature requests, file a github issue or better a + pull request and /cc @vcunat. + + +
- - -
- diff --git a/doc/manual.xml b/doc/manual.xml index 385079eb5785efd3ba65dbd77b37155b815c930b..f31897aed039add2365f5ea718c5ae210913f287 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -1,29 +1,24 @@ - - - - Nixpkgs Contributors Guide - - Version - - - - - - - - - - - - - - - - - - - - + + Nixpkgs Contributors Guide + Version + + + + + + + + + + + + + + + + + + diff --git a/doc/meta.xml b/doc/meta.xml index 5dbe810810d14492c51466740a43c9d3ab22a102..496b32916552b4066ce11c290e7e0d047b9bacbe 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -1,37 +1,34 @@ - -Meta-attributes - -Nix packages can declare meta-attributes -that contain information about a package such as a description, its -homepage, its license, and so on. For instance, the GNU Hello package -has a meta declaration like this: - + Meta-attributes + + Nix packages can declare meta-attributes that contain + information about a package such as a description, its homepage, its license, + and so on. For instance, the GNU Hello package has a meta + declaration like this: -meta = { +meta = with stdenv.lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' GNU Hello is a program that prints "Hello, world!" when you run it. It is fully customizable. ''; homepage = http://www.gnu.org/software/hello/manual/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + maintainers = [ maintainers.eelco ]; + platforms = platforms.all; }; - - - -Meta-attributes are not passed to the builder of the package. -Thus, a change to a meta-attribute doesn’t trigger a recompilation of -the package. The value of a meta-attribute must be a string. - -The meta-attributes of a package can be queried from the -command-line using nix-env: - + + + Meta-attributes are not passed to the builder of the package. Thus, a change + to a meta-attribute doesn’t trigger a recompilation of the package. The + value of a meta-attribute must be a string. + + + The meta-attributes of a package can be queried from the command-line using + nix-env: $ nix-env -qa hello --json { @@ -70,252 +67,311 @@ $ nix-env -qa hello --json - -nix-env knows about the -description field specifically: - + nix-env knows about the description + field specifically: $ nix-env -qa hello --description hello-2.3 A program that produces a familiar, friendly greeting - - - - -
Standard -meta-attributes - -It is expected that each meta-attribute is one of the following: - - - - - description - A short (one-line) description of the package. - This is shown by nix-env -q --description and - also on the Nixpkgs release pages. - - Don’t include a period at the end. Don’t include newline - characters. Capitalise the first character. For brevity, don’t - repeat the name of package — just describe what it does. - - Wrong: "libpng is a library that allows you to decode PNG images." - - Right: "A library for decoding PNG images" - + +
+ Standard meta-attributes + + + It is expected that each meta-attribute is one of the following: + + + + + + description + + + + A short (one-line) description of the package. This is shown by + nix-env -q --description and also on the Nixpkgs + release pages. + + + Don’t include a period at the end. Don’t include newline characters. + Capitalise the first character. For brevity, don’t repeat the name of + package — just describe what it does. + + + Wrong: "libpng is a library that allows you to decode PNG + images." + + + Right: "A library for decoding PNG images" + - - - - longDescription - An arbitrarily long description of the - package. - - - - branch - Release branch. Used to specify that a package is not - going to receive updates that are not in this branch; for example, Linux - kernel 3.0 is supposed to be updated to 3.0.X, not 3.1. - - - - homepage - The package’s homepage. Example: - http://www.gnu.org/software/hello/manual/ - - - - downloadPage - The page where a link to the current version can be found. Example: - http://ftp.gnu.org/gnu/hello/ - - - - license + + + + longDescription + - - The license, or licenses, for the package. One from the attribute set - defined in + An arbitrarily long description of the package. + + + + + + branch + + + + Release branch. Used to specify that a package is not going to receive + updates that are not in this branch; for example, Linux kernel 3.0 is + supposed to be updated to 3.0.X, not 3.1. + + + + + + homepage + + + + The package’s homepage. Example: + http://www.gnu.org/software/hello/manual/ + + + + + + downloadPage + + + + The page where a link to the current version can be found. Example: + http://ftp.gnu.org/gnu/hello/ + + + + + + license + + + + The license, or licenses, for the package. One from the attribute set + defined in + - nixpkgs/lib/licenses.nix. At this moment - using both a list of licenses and a single license is valid. If the - license field is in the form of a list representation, then it means - that parts of the package are licensed differently. Each license - should preferably be referenced by their attribute. The non-list - attribute value can also be a space delimited string representation of - the contained attribute shortNames or spdxIds. The following are all valid - examples: - - Single license referenced by attribute (preferred) - stdenv.lib.licenses.gpl3. - - Single license referenced by its attribute shortName (frowned upon) - "gpl3". - - Single license referenced by its attribute spdxId (frowned upon) - "GPL-3.0". - - Multiple licenses referenced by attribute (preferred) - with stdenv.lib.licenses; [ asl20 free ofl ]. - - Multiple licenses referenced as a space delimited string of attribute shortNames (frowned upon) - "asl20 free ofl". - - - For details, see . - + nixpkgs/lib/licenses.nix. At this moment + using both a list of licenses and a single license is valid. If the + license field is in the form of a list representation, then it means that + parts of the package are licensed differently. Each license should + preferably be referenced by their attribute. The non-list attribute value + can also be a space delimited string representation of the contained + attribute shortNames or spdxIds. The following are all valid examples: + + + + Single license referenced by attribute (preferred) + stdenv.lib.licenses.gpl3. + + + + + Single license referenced by its attribute shortName (frowned upon) + "gpl3". + + + + + Single license referenced by its attribute spdxId (frowned upon) + "GPL-3.0". + + + + + Multiple licenses referenced by attribute (preferred) with + stdenv.lib.licenses; [ asl20 free ofl ]. + + + + + Multiple licenses referenced as a space delimited string of attribute + shortNames (frowned upon) "asl20 free ofl". + + + + For details, see . + - - - - maintainers - A list of names and e-mail addresses of the - maintainers of this Nix expression. If - you would like to be a maintainer of a package, you may want to add - yourself to + + + maintainers + + + + A list of names and e-mail addresses of the maintainers of this Nix + expression. If you would like to be a maintainer of a package, you may + want to add yourself to + nixpkgs/maintainers/maintainer-list.nix - and write something like [ stdenv.lib.maintainers.alice - stdenv.lib.maintainers.bob ]. - - - - priority - The priority of the package, - used by nix-env to resolve file name conflicts - between packages. See the Nix manual page for - nix-env for details. Example: - "10" (a low-priority - package). - - - - platforms - The list of Nix platform types on which the - package is supported. Hydra builds packages according to the - platform specified. If no platform is specified, the package does - not have prebuilt binaries. An example is: - + and write something like [ stdenv.lib.maintainers.alice + stdenv.lib.maintainers.bob ]. + + + + + + priority + + + + The priority of the package, used by + nix-env to resolve file name conflicts between + packages. See the Nix manual page for nix-env for + details. Example: "10" (a low-priority package). + + + + + + platforms + + + + The list of Nix platform types on which the package is supported. Hydra + builds packages according to the platform specified. If no platform is + specified, the package does not have prebuilt binaries. An example is: meta.platforms = stdenv.lib.platforms.linux; - - Attribute Set stdenv.lib.platforms defines - - various common lists of platforms types. - - - - hydraPlatforms - The list of Nix platform types for which the Hydra - instance at hydra.nixos.org will build the - package. (Hydra is the Nix-based continuous build system.) It - defaults to the value of meta.platforms. Thus, - the only reason to set meta.hydraPlatforms is - if you want hydra.nixos.org to build the - package on a subset of meta.platforms, or not - at all, e.g. - + Attribute Set stdenv.lib.platforms defines + + various common lists of platforms types. + + + + + + hydraPlatforms + + + + The list of Nix platform types for which the Hydra instance at + hydra.nixos.org will build the package. (Hydra is the + Nix-based continuous build system.) It defaults to the value of + meta.platforms. Thus, the only reason to set + meta.hydraPlatforms is if you want + hydra.nixos.org to build the package on a subset of + meta.platforms, or not at all, e.g. meta.platforms = stdenv.lib.platforms.linux; meta.hydraPlatforms = []; - - - - - - broken - If set to true, the package is - marked as “broken”, meaning that it won’t show up in - nix-env -qa, and cannot be built or installed. - Such packages should be removed from Nixpkgs eventually unless - they are fixed. - - - - updateWalker - If set to true, the package is - tested to be updated correctly by the update-walker.sh - script without additional settings. Such packages have - meta.version set and their homepage (or - the page specified by meta.downloadPage) contains - a direct link to the package tarball. - - - - - -
- - -
Licenses - -The meta.license attribute should preferrably contain -a value from stdenv.lib.licenses defined in - -nixpkgs/lib/licenses.nix, -or in-place license description of the same format if the license is -unlikely to be useful in another expression. - -Although it's typically better to indicate the specific license, -a few generic options are available: - - - - - stdenv.lib.licenses.free, - "free" - - Catch-all for free software licenses not listed - above. - - - - stdenv.lib.licenses.unfreeRedistributable, - "unfree-redistributable" - - Unfree package that can be redistributed in binary - form. That is, it’s legal to redistribute the - output of the derivation. This means that - the package can be included in the Nixpkgs - channel. - - Sometimes proprietary software can only be redistributed - unmodified. Make sure the builder doesn’t actually modify the - original binaries; otherwise we’re breaking the license. For - instance, the NVIDIA X11 drivers can be redistributed unmodified, - but our builder applies patchelf to make them - work. Thus, its license is "unfree" and it - cannot be included in the Nixpkgs channel. - - - - stdenv.lib.licenses.unfree, - "unfree" - - Unfree package that cannot be redistributed. You - can build it yourself, but you cannot redistribute the output of - the derivation. Thus it cannot be included in the Nixpkgs - channel. - - - - stdenv.lib.licenses.unfreeRedistributableFirmware, - "unfree-redistributable-firmware" - - This package supplies unfree, redistributable - firmware. This is a separate value from - unfree-redistributable because not everybody - cares whether firmware is free. - - - - - - - -
- - + +
+
+ + + broken + + + + If set to true, the package is marked as “broken”, + meaning that it won’t show up in nix-env -qa, and + cannot be built or installed. Such packages should be removed from + Nixpkgs eventually unless they are fixed. + + + + + + updateWalker + + + + If set to true, the package is tested to be updated + correctly by the update-walker.sh script without + additional settings. Such packages have meta.version + set and their homepage (or the page specified by + meta.downloadPage) contains a direct link to the + package tarball. + + + +
+
+
+ Licenses + + + The meta.license attribute should preferrably contain a + value from stdenv.lib.licenses defined in + + nixpkgs/lib/licenses.nix, or in-place license + description of the same format if the license is unlikely to be useful in + another expression. + + + + Although it's typically better to indicate the specific license, a few + generic options are available: + + + + stdenv.lib.licenses.free, "free" + + + + Catch-all for free software licenses not listed above. + + + + + + stdenv.lib.licenses.unfreeRedistributable, "unfree-redistributable" + + + + Unfree package that can be redistributed in binary form. That is, it’s + legal to redistribute the output of the derivation. + This means that the package can be included in the Nixpkgs channel. + + + Sometimes proprietary software can only be redistributed unmodified. + Make sure the builder doesn’t actually modify the original binaries; + otherwise we’re breaking the license. For instance, the NVIDIA X11 + drivers can be redistributed unmodified, but our builder applies + patchelf to make them work. Thus, its license is + "unfree" and it cannot be included in the Nixpkgs + channel. + + + + + + stdenv.lib.licenses.unfree, "unfree" + + + + Unfree package that cannot be redistributed. You can build it yourself, + but you cannot redistribute the output of the derivation. Thus it cannot + be included in the Nixpkgs channel. + + + + + + stdenv.lib.licenses.unfreeRedistributableFirmware, "unfree-redistributable-firmware" + + + + This package supplies unfree, redistributable firmware. This is a + separate value from unfree-redistributable because + not everybody cares whether firmware is free. + + + + + +
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index 2f23da8df01ee23446589ec874df12de64f10013..981b4b966cdf28c49173f614f9b36368f0069f62 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -5,99 +5,319 @@ + Multiple-output packages +
+ Introduction -Multiple-output packages + + The Nix language allows a derivation to produce multiple outputs, which is + similar to what is utilized by other Linux distribution packaging systems. + The outputs reside in separate nix store paths, so they can be mostly + handled independently of each other, including passing to build inputs, + garbage collection or binary substitution. The exception is that building + from source always produces all the outputs. + -
Introduction - The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs. - The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less. - The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb. -
+ + The main motivation is to save disk space by reducing runtime closure sizes; + consequently also sizes of substituted binaries get reduced. Splitting can + be used to have more granular runtime dependencies, for example the typical + reduction is to split away development-only files, as those are typically + not needed during runtime. As a result, closure sizes of many packages can + get reduced to a half or even much less. + + + + + The reduction effects could be instead achieved by building the parts in + completely separate derivations. That would often additionally reduce + build-time closures, but it tends to be much harder to write such + derivations, as build systems typically assume all parts are being built at + once. This compromise approach of single source package producing multiple + binary packages is also utilized often by rpm and deb. + + +
+
+ Installing a split package + + + When installing a package via systemPackages or + nix-env you have several options: + -
Installing a split package - When installing a package via systemPackages or nix-env you have several options: - You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package. The outputs attribute contains a list of output names. - You can let it use the default outputs. These are handled by meta.outputsToInstall attribute that contains a list of output names. - TODO: more about tweaking the attribute, etc. - NixOS provides configuration option environment.extraOutputsToInstall that allows adding extra outputs of environment.systemPackages atop the default ones. It's mainly meant for documentation and debug symbols, and it's also modified by specific options. - At this moment there is no similar configurability for packages installed by nix-env. You can still use approach from to override meta.outputsToInstall attributes, but that's a rather inconvenient way. - + + + You can install particular outputs explicitly, as each is available in the + Nix language as an attribute of the package. The + outputs attribute contains a list of output names. + + + + + You can let it use the default outputs. These are handled by + meta.outputsToInstall attribute that contains a list of + output names. + + + TODO: more about tweaking the attribute, etc. + + + + + NixOS provides configuration option + environment.extraOutputsToInstall that allows adding + extra outputs of environment.systemPackages atop the + default ones. It's mainly meant for documentation and debug symbols, and + it's also modified by specific options. + + + + At this moment there is no similar configurability for packages installed + by nix-env. You can still use approach from + to override + meta.outputsToInstall attributes, but that's a rather + inconvenient way. + + + -
+
+
+ Using a split package -
Using a split package - In the Nix language the individual outputs can be reached explicitly as attributes, e.g. coreutils.info, but the typical case is just using packages as build inputs. - When a multiple-output derivation gets into a build input of another derivation, the dev output is added if it exists, otherwise the first output is added. In addition to that, propagatedBuildOutputs of that package which by default contain $outputBin and $outputLib are also added. (See .) -
+ + In the Nix language the individual outputs can be reached explicitly as + attributes, e.g. coreutils.info, but the typical case is + just using packages as build inputs. + + + When a multiple-output derivation gets into a build input of another + derivation, the dev output is added if it exists, + otherwise the first output is added. In addition to that, + propagatedBuildOutputs of that package which by default + contain $outputBin and $outputLib are + also added. (See .) + +
+
+ Writing a split derivation -
Writing a split derivation - Here you find how to write a derivation that produces multiple outputs. - In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in <nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh>; it's relatively well-readable. The whole machinery is triggered by defining the outputs attribute to contain the list of desired output names (strings). - outputs = [ "bin" "dev" "out" "doc" ]; - Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. By convention, the first output should contain the executable programs provided by the package as that output is used by Nix in string conversions, allowing references to binaries like ${pkgs.perl}/bin/perl to always work. Typically you also want to have the main out output, as it catches any files that didn't get elsewhere. + + Here you find how to write a derivation that produces multiple outputs. + - There is a special handling of the debug output, described at . + + In nixpkgs there is a framework supporting multiple-output derivations. It + tries to cover most cases by default behavior. You can find the source + separated in + <nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh>; + it's relatively well-readable. The whole machinery is triggered by defining + the outputs attribute to contain the list of desired + output names (strings). + -
- File type groups - The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an outputFoo variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn't defined. - - - - $outputDev - is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to dev or out by default. - - - - - $outputBin - is meant for user-facing binaries, typically residing in bin/. They go to bin or out by default. - - - - $outputLib - is meant for libraries, typically residing in lib/ and libexec/. They go to lib or out by default. - - - - $outputDoc - is for user documentation, typically residing in share/doc/. It goes to doc or out by default. - - - - $outputDevdoc - is for developer documentation. Currently we count gtk-doc and devhelp books in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. - - - - $outputMan - is for man pages (except for section 3). They go to man or $outputBin by default. - - - - $outputDevman - is for section 3 man pages. They go to devman or $outputMan by default. - - - - $outputInfo - is for info pages. They go to info or $outputBin by default. - - - +outputs = [ "bin" "dev" "out" "doc" ]; + + + Often such a single line is enough. For each output an equally named + environment variable is passed to the builder and contains the path in nix + store for that output. Typically you also want to have the main + out output, as it catches any files that didn't get + elsewhere. + + + + + There is a special handling of the debug output, + described at . + + + +
+ <quote>Binaries first</quote> + + + A commonly adopted convention in nixpkgs is that + executables provided by the package are contained within its first output. + This convention allows the dependent packages to reference the executables + provided by packages in a uniform manner. For instance, provided with the + knowledge that the perl package contains a + perl executable it can be referenced as + ${pkgs.perl}/bin/perl within a Nix derivation that needs + to execute a Perl script. + + + + The glibc package is a deliberate single exception to + the binaries first convention. The glibc + has libs as its first output allowing the libraries + provided by glibc to be referenced directly (e.g. + ${stdenv.glibc}/lib/ld-linux-x86-64.so.2). The + executables provided by glibc can be accessed via its + bin attribute (e.g. + ${stdenv.glibc.bin}/bin/ldd). + + + + The reason for why glibc deviates from the convention is + because referencing a library provided by glibc is a + very common operation among Nix packages. For instance, third-party + executables packaged by Nix are typically patched and relinked with the + relevant version of glibc libraries from Nix packages + (please see the documentation on + patchelf for more + details). +
-
Common caveats - - Some configure scripts don't like some of the parameters passed by default by the framework, e.g. --docdir=/foo/bar. You can disable this by setting setOutputFlags = false;. - The outputs of a single derivation can retain references to each other, but note that circular references are not allowed. (And each strongly-connected component would act as a single output anyway.) - Most of split packages contain their core functionality in libraries. These libraries tend to refer to various kind of data that typically gets into out, e.g. locale strings, so there is often no advantage in separating the libraries into lib, as keeping them in out is easier. - Some packages have hidden assumptions on install paths, which complicates splitting. - +
+ File type groups + + + The support code currently recognizes some particular kinds of outputs and + either instructs the build system of the package to put files into their + desired outputs or it moves the files during the fixup phase. Each group of + file types has an outputFoo variable specifying the + output name where they should go. If that variable isn't defined by the + derivation writer, it is guessed – a default output name is defined, + falling back to other possibilities if the output isn't defined. + + + + + + $outputDev + + + + is for development-only files. These include C(++) headers, pkg-config, + cmake and aclocal files. They go to dev or + out by default. + + + + + + $outputBin + + + + is meant for user-facing binaries, typically residing in bin/. They go + to bin or out by default. + + + + + + $outputLib + + + + is meant for libraries, typically residing in lib/ + and libexec/. They go to lib or + out by default. + + + + + + $outputDoc + + + + is for user documentation, typically residing in + share/doc/. It goes to doc or + out by default. + + + + + + $outputDevdoc + + + + is for developer documentation. Currently we count + gtk-doc and devhelp books in there. It goes to devdoc + or is removed (!) by default. This is because e.g. gtk-doc tends to be + rather large and completely unused by nixpkgs users. + + + + + + $outputMan + + + + is for man pages (except for section 3). They go to + man or $outputBin by default. + + + + + + $outputDevman + + + + is for section 3 man pages. They go to devman or + $outputMan by default. + + + + + + $outputInfo + + + + is for info pages. They go to info or + $outputBin by default. + + + +
-
+
+ Common caveats + + + + Some configure scripts don't like some of the parameters passed by + default by the framework, e.g. --docdir=/foo/bar. You + can disable this by setting setOutputFlags = false;. + + + + + The outputs of a single derivation can retain references to each other, + but note that circular references are not allowed. (And each + strongly-connected component would act as a single output anyway.) + + + + + Most of split packages contain their core functionality in libraries. + These libraries tend to refer to various kind of data that typically gets + into out, e.g. locale strings, so there is often no + advantage in separating the libraries into lib, as + keeping them in out is easier. + + + + + Some packages have hidden assumptions on install paths, which complicates + splitting. + + + +
+
+ diff --git a/doc/old/cross.txt b/doc/old/cross.txt index 73103ea0c6d9c90c237075f07ef684161988e13c..c0885c08176e9e26ab23876bfa18940a8bb7c20e 100644 --- a/doc/old/cross.txt +++ b/doc/old/cross.txt @@ -64,7 +64,7 @@ stdenv.mkDerivation { sha256 = "1ian3kwh2vg6hr3ymrv48s04gijs539vzrq62xr76bxbhbwnz2np"; }; inherit noSysDirs; - configureFlags = "--target=arm-linux"; + configureFlags = [ "--target=arm-linux" ]; } --- diff --git a/doc/overlays.xml b/doc/overlays.xml index cc0aef447d2d63e39c631d4a4285adf9934aec1e..2decf9febe809f7b0962036e832056593aa68547 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -1,95 +1,117 @@ - -Overlays - -This chapter describes how to extend and change Nixpkgs packages using -overlays. Overlays are used to add layers in the fix-point used by Nixpkgs -to compose the set of all packages. - -Nixpkgs can be configured with a list of overlays, which are -applied in order. This means that the order of the overlays can be significant -if multiple layers override the same package. - + Overlays + + This chapter describes how to extend and change Nixpkgs packages using + overlays. Overlays are used to add layers in the fix-point used by Nixpkgs to + compose the set of all packages. + + + Nixpkgs can be configured with a list of overlays, which are applied in + order. This means that the order of the overlays can be significant if + multiple layers override the same package. + - -
-Installing overlays - -The list of overlays is determined as follows. - -If the overlays argument is not provided explicitly, we look for overlays in a path. The path -is determined as follows: - - - - - First, if an overlays argument to the nixpkgs function itself is given, - then that is used. - - This can be passed explicitly when importing nipxkgs, for example - import <nixpkgs> { overlays = [ overlay1 overlay2 ]; }. - - - - Otherwise, if the Nix path entry <nixpkgs-overlays> exists, we look for overlays - at that path, as described below. - - See the section on NIX_PATH in the Nix manual for more details on how to - set a value for <nixpkgs-overlays>. - - - - If one of ~/.config/nixpkgs/overlays.nix and - ~/.config/nixpkgs/overlays/ exists, then we look for overlays at that path, as - described below. It is an error if both exist. - - - - - -If we are looking for overlays at a path, then there are two cases: - - - If the path is a file, then the file is imported as a Nix expression and used as the list of - overlays. - - - - If the path is a directory, then we take the content of the directory, order it - lexicographically, and attempt to interpret each as an overlay by: - - - Importing the file, if it is a .nix file. - - - Importing a top-level default.nix file, if it is a directory. - - - - - - - -On a NixOS system the value of the nixpkgs.overlays option, if present, -is passed to the system Nixpkgs directly as an argument. Note that this does not affect the overlays for -non-NixOS operations (e.g. nix-env), which are looked up independently. - -The overlays.nix option therefore provides a convenient way to use the same -overlays for a NixOS system configuration and user configuration: the same file can be used -as overlays.nix and imported as the value of nixpkgs.overlays. - -
- +
+ Installing overlays + + + The list of overlays is determined as follows. + + + + If the overlays argument is not provided explicitly, we + look for overlays in a path. The path is determined as follows: + + + + First, if an overlays argument to the nixpkgs function + itself is given, then that is used. + + + This can be passed explicitly when importing nipxkgs, for example + import <nixpkgs> { overlays = [ overlay1 overlay2 ]; + }. + + + + + Otherwise, if the Nix path entry <nixpkgs-overlays> + exists, we look for overlays at that path, as described below. + + + See the section on NIX_PATH in the Nix manual for more + details on how to set a value for + <nixpkgs-overlays>. + + + + + If one of ~/.config/nixpkgs/overlays.nix and + ~/.config/nixpkgs/overlays/ exists, then we look for + overlays at that path, as described below. It is an error if both exist. + + + + + + + If we are looking for overlays at a path, then there are two cases: + + + + If the path is a file, then the file is imported as a Nix expression and + used as the list of overlays. + + + + + If the path is a directory, then we take the content of the directory, + order it lexicographically, and attempt to interpret each as an overlay + by: + + + + Importing the file, if it is a .nix file. + + + + + Importing a top-level default.nix file, if it is + a directory. + + + + + + + + + + On a NixOS system the value of the nixpkgs.overlays + option, if present, is passed to the system Nixpkgs directly as an argument. + Note that this does not affect the overlays for non-NixOS operations (e.g. + nix-env), which are looked up independently. + + + + The overlays.nix option therefore provides a convenient + way to use the same overlays for a NixOS system configuration and user + configuration: the same file can be used as + overlays.nix and imported as the value of + nixpkgs.overlays. + +
+
+ Defining overlays -
-Defining overlays - -Overlays are Nix functions which accept two arguments, -conventionally called self and super, -and return a set of packages. For example, the following is a valid overlay. + + Overlays are Nix functions which accept two arguments, conventionally called + self and super, and return a set of + packages. For example, the following is a valid overlay. + self: super: @@ -104,31 +126,39 @@ self: super: } -The first argument (self) corresponds to the final package -set. You should use this set for the dependencies of all packages specified in your -overlay. For example, all the dependencies of rr in the example above come -from self, as well as the overridden dependencies used in the -boost override. - -The second argument (super) -corresponds to the result of the evaluation of the previous stages of -Nixpkgs. It does not contain any of the packages added by the current -overlay, nor any of the following overlays. This set should be used either -to refer to packages you wish to override, or to access functions defined -in Nixpkgs. For example, the original recipe of boost -in the above example, comes from super, as well as the -callPackage function. - -The value returned by this function should be a set similar to -pkgs/top-level/all-packages.nix, containing -overridden and/or new packages. - -Overlays are similar to other methods for customizing Nixpkgs, in particular -the packageOverrides attribute described in . -Indeed, packageOverrides acts as an overlay with only the -super argument. It is therefore appropriate for basic use, -but overlays are more powerful and easier to distribute. - -
- + + The first argument (self) corresponds to the final + package set. You should use this set for the dependencies of all packages + specified in your overlay. For example, all the dependencies of + rr in the example above come from + self, as well as the overridden dependencies used in the + boost override. + + + + The second argument (super) corresponds to the result of + the evaluation of the previous stages of Nixpkgs. It does not contain any of + the packages added by the current overlay, nor any of the following + overlays. This set should be used either to refer to packages you wish to + override, or to access functions defined in Nixpkgs. For example, the + original recipe of boost in the above example, comes from + super, as well as the callPackage + function. + + + + The value returned by this function should be a set similar to + pkgs/top-level/all-packages.nix, containing overridden + and/or new packages. + + + + Overlays are similar to other methods for customizing Nixpkgs, in particular + the packageOverrides attribute described in + . Indeed, + packageOverrides acts as an overlay with only the + super argument. It is therefore appropriate for basic + use, but overlays are more powerful and easier to distribute. + +
diff --git a/doc/overrides.css b/doc/overrides.css index dd11eab82a8ad7cd8fb38f6baa91463eb4deb9a3..4c7d4a31be2d09210f8dfeb67eb3ba85b98a42d3 100644 --- a/doc/overrides.css +++ b/doc/overrides.css @@ -1,4 +1,5 @@ - +.docbook .xref img[src^=images\/callouts\/], +.screen img, .programlisting img { width: 1em; } diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 1fccfd5d329d28e033284dd339ce8b4f31eb5bff..8c7c63c8c8d7cb5a7a1a5d69a3b5f5144bcc4d36 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -1,206 +1,185 @@ - -Package Notes - -This chapter contains information about how to use and maintain -the Nix expressions for a number of specific packages, such as the -Linux kernel or X.org. - - + Package Notes + + This chapter contains information about how to use and maintain the Nix + expressions for a number of specific packages, such as the Linux kernel or + X.org. + +
+ Linux kernel -
- -Linux kernel - -The Nix expressions to build the Linux kernel are in pkgs/os-specific/linux/kernel. - -The function that builds the kernel has an argument -kernelPatches which should be a list of -{name, patch, extraConfig} attribute sets, where -name is the name of the patch (which is included in -the kernel’s meta.description attribute), -patch is the patch itself (possibly compressed), -and extraConfig (optional) is a string specifying -extra options to be concatenated to the kernel configuration file -(.config). + + The Nix expressions to build the Linux kernel are in + pkgs/os-specific/linux/kernel. + -The kernel derivation exports an attribute -features specifying whether optional functionality -is or isn’t enabled. This is used in NixOS to implement -kernel-specific behaviour. For instance, if the kernel has the -iwlwifi feature (i.e. has built-in support for -Intel wireless chipsets), then NixOS doesn’t have to build the -external iwlwifi package: + + The function that builds the kernel has an argument + kernelPatches which should be a list of {name, + patch, extraConfig} attribute sets, where name + is the name of the patch (which is included in the kernel’s + meta.description attribute), patch is + the patch itself (possibly compressed), and extraConfig + (optional) is a string specifying extra options to be concatenated to the + kernel configuration file (.config). + + + The kernel derivation exports an attribute features + specifying whether optional functionality is or isn’t enabled. This is + used in NixOS to implement kernel-specific behaviour. For instance, if the + kernel has the iwlwifi feature (i.e. has built-in support + for Intel wireless chipsets), then NixOS doesn’t have to build the + external iwlwifi package: modulesTree = [kernel] ++ pkgs.lib.optional (!kernel.features ? iwlwifi) kernelPackages.iwlwifi ++ ...; + - - -How to add a new (major) version of the Linux kernel to Nixpkgs: - - - - - Copy the old Nix expression - (e.g. linux-2.6.21.nix) to the new one - (e.g. linux-2.6.22.nix) and update it. - - - - Add the new kernel to all-packages.nix - (e.g., create an attribute - kernel_2_6_22). - - - - Now we’re going to update the kernel configuration. First - unpack the kernel. Then for each supported platform - (i686, x86_64, - uml) do the following: - + + How to add a new (major) version of the Linux kernel to Nixpkgs: + + + + Copy the old Nix expression (e.g. linux-2.6.21.nix) + to the new one (e.g. linux-2.6.22.nix) and update + it. + + + + + Add the new kernel to all-packages.nix (e.g., create + an attribute kernel_2_6_22). + + + + + Now we’re going to update the kernel configuration. First unpack the + kernel. Then for each supported platform (i686, + x86_64, uml) do the following: - - - Make an copy from the old - config (e.g. config-2.6.21-i686-smp) to - the new one - (e.g. config-2.6.22-i686-smp). - - - - Copy the config file for this platform - (e.g. config-2.6.22-i686-smp) to - .config in the kernel source tree. - - - - - Run make oldconfig - ARCH={i386,x86_64,um} - and answer all questions. (For the uml configuration, also - add SHELL=bash.) Make sure to keep the - configuration consistent between platforms (i.e. don’t - enable some feature on i686 and disable - it on x86_64). - - - - - If needed you can also run make - menuconfig: - - + + + Make an copy from the old config (e.g. + config-2.6.21-i686-smp) to the new one (e.g. + config-2.6.22-i686-smp). + + + + + Copy the config file for this platform (e.g. + config-2.6.22-i686-smp) to + .config in the kernel source tree. + + + + + Run make oldconfig + ARCH={i386,x86_64,um} and answer + all questions. (For the uml configuration, also add + SHELL=bash.) Make sure to keep the configuration + consistent between platforms (i.e. don’t enable some feature on + i686 and disable it on x86_64). + + + + + If needed you can also run make menuconfig: + $ nix-env -i ncurses $ export NIX_CFLAGS_LINK=-lncurses $ make menuconfig ARCH=arch - - - - - - Copy .config over the new config - file (e.g. config-2.6.22-i686-smp). - - + + + + + Copy .config over the new config file (e.g. + config-2.6.22-i686-smp). + + - - - - - - - Test building the kernel: nix-build -A - kernel_2_6_22. If it compiles, ship it! For extra - credit, try booting NixOS with it. - - - - It may be that the new kernel requires updating the external - kernel modules and kernel-dependent packages listed in the - linuxPackagesFor function in - all-packages.nix (such as the NVIDIA drivers, - AUFS, etc.). If the updated packages aren’t backwards compatible - with older kernels, you may need to keep the older versions - around. - - - - - - -
- - + + + + + Test building the kernel: nix-build -A kernel_2_6_22. + If it compiles, ship it! For extra credit, try booting NixOS with it. + + + + + It may be that the new kernel requires updating the external kernel + modules and kernel-dependent packages listed in the + linuxPackagesFor function in + all-packages.nix (such as the NVIDIA drivers, AUFS, + etc.). If the updated packages aren’t backwards compatible with older + kernels, you may need to keep the older versions around. + + + + +
+
+ X.org -
- -X.org - -The Nix expressions for the X.org packages reside in -pkgs/servers/x11/xorg/default.nix. This file is -automatically generated from lists of tarballs in an X.org release. -As such it should not be modified directly; rather, you should modify -the lists, the generator script or the file -pkgs/servers/x11/xorg/overrides.nix, in which you -can override or add to the derivations produced by the -generator. - -The generator is invoked as follows: + + The Nix expressions for the X.org packages reside in + pkgs/servers/x11/xorg/default.nix. This file is + automatically generated from lists of tarballs in an X.org release. As such + it should not be modified directly; rather, you should modify the lists, the + generator script or the file + pkgs/servers/x11/xorg/overrides.nix, in which you can + override or add to the derivations produced by the generator. + + + The generator is invoked as follows: $ cd pkgs/servers/x11/xorg $ cat tarballs-7.5.list extra.list old.list \ | perl ./generate-expr-from-tarballs.pl + For each of the tarballs in the .list files, the script + downloads it, unpacks it, and searches its configure.ac + and *.pc.in files for dependencies. This information is + used to generate default.nix. The generator caches + downloaded tarballs between runs. Pay close attention to the NOT + FOUND: name messages at the end of the + run, since they may indicate missing dependencies. (Some might be optional + dependencies, however.) + -For each of the tarballs in the .list files, the -script downloads it, unpacks it, and searches its -configure.ac and *.pc.in -files for dependencies. This information is used to generate -default.nix. The generator caches downloaded -tarballs between runs. Pay close attention to the NOT FOUND: -name messages at the end of the -run, since they may indicate missing dependencies. (Some might be -optional dependencies, however.) - -A file like tarballs-7.5.list contains all -tarballs in a X.org release. It can be generated like this: - + + A file like tarballs-7.5.list contains all tarballs in + a X.org release. It can be generated like this: $ export i="mirror://xorg/X11R7.4/src/everything/" $ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \ | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' \ | sort > tarballs-7.4.list + extra.list contains libraries that aren’t part of + X.org proper, but are closely related to it, such as + libxcb. old.list contains some + packages that were removed from X.org, but are still needed by some people + or by other packages (such as imake). + -extra.list contains libraries that aren’t part of -X.org proper, but are closely related to it, such as -libxcb. old.list contains -some packages that were removed from X.org, but are still needed by -some people or by other packages (such as -imake). - -If the expression for a package requires derivation attributes -that the generator cannot figure out automatically (say, -patches or a postInstall hook), -you should modify -pkgs/servers/x11/xorg/overrides.nix. - -
- - - + + If the expression for a package requires derivation attributes that the + generator cannot figure out automatically (say, patches + or a postInstall hook), you should modify + pkgs/servers/x11/xorg/overrides.nix. + +
- - - - - - -
- +
Eclipse - The Nix expressions related to the Eclipse platform and IDE are in - pkgs/applications/editors/eclipse. + The Nix expressions related to the Eclipse platform and IDE are in + pkgs/applications/editors/eclipse. - Nixpkgs provides a number of packages that will install Eclipse in - its various forms, these range from the bare-bones Eclipse - Platform to the more fully featured Eclipse SDK or Scala-IDE - packages and multiple version are often available. It is possible - to list available Eclipse packages by issuing the command: - + Nixpkgs provides a number of packages that will install Eclipse in its + various forms, these range from the bare-bones Eclipse Platform to the more + fully featured Eclipse SDK or Scala-IDE packages and multiple version are + often available. It is possible to list available Eclipse packages by + issuing the command: $ nix-env -f '<nixpkgs>' -qaP -A eclipses --description - - Once an Eclipse variant is installed it can be run using the - eclipse command, as expected. From within - Eclipse it is then possible to install plugins in the usual manner - by either manually specifying an Eclipse update site or by - installing the Marketplace Client plugin and using it to discover - and install other plugins. This installation method provides an - Eclipse installation that closely resemble a manually installed - Eclipse. + Once an Eclipse variant is installed it can be run using the + eclipse command, as expected. From within Eclipse it is + then possible to install plugins in the usual manner by either manually + specifying an Eclipse update site or by installing the Marketplace Client + plugin and using it to discover and install other plugins. This installation + method provides an Eclipse installation that closely resemble a manually + installed Eclipse. - If you prefer to install plugins in a more declarative manner then - Nixpkgs also offer a number of Eclipse plugins that can be - installed in an Eclipse environment. This - type of environment is created using the function - eclipseWithPlugins found inside the - nixpkgs.eclipses attribute set. This function - takes as argument { eclipse, plugins ? [], jvmArgs ? [] - } where eclipse is a one of the - Eclipse packages described above, plugins is a - list of plugin derivations, and jvmArgs is a - list of arguments given to the JVM running the Eclipse. For - example, say you wish to install the latest Eclipse Platform with - the popular Eclipse Color Theme plugin and also allow Eclipse to - use more RAM. You could then add - + If you prefer to install plugins in a more declarative manner then Nixpkgs + also offer a number of Eclipse plugins that can be installed in an + Eclipse environment. This type of environment is + created using the function eclipseWithPlugins found + inside the nixpkgs.eclipses attribute set. This function + takes as argument { eclipse, plugins ? [], jvmArgs ? [] } + where eclipse is a one of the Eclipse packages described + above, plugins is a list of plugin derivations, and + jvmArgs is a list of arguments given to the JVM running + the Eclipse. For example, say you wish to install the latest Eclipse + Platform with the popular Eclipse Color Theme plugin and also allow Eclipse + to use more RAM. You could then add packageOverrides = pkgs: { myEclipse = with pkgs.eclipses; eclipseWithPlugins { @@ -276,42 +243,38 @@ packageOverrides = pkgs: { }; } - - to your Nixpkgs configuration - (~/.config/nixpkgs/config.nix) and install it by - running nix-env -f '<nixpkgs>' -iA - myEclipse and afterward run Eclipse as usual. It is - possible to find out which plugins are available for installation - using eclipseWithPlugins by running - + to your Nixpkgs configuration + (~/.config/nixpkgs/config.nix) and install it by + running nix-env -f '<nixpkgs>' -iA myEclipse and + afterward run Eclipse as usual. It is possible to find out which plugins are + available for installation using eclipseWithPlugins by + running $ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description - If there is a need to install plugins that are not available in - Nixpkgs then it may be possible to define these plugins outside - Nixpkgs using the buildEclipseUpdateSite and - buildEclipsePlugin functions found in the - nixpkgs.eclipses.plugins attribute set. Use the - buildEclipseUpdateSite function to install a - plugin distributed as an Eclipse update site. This function takes - { name, src } as argument where - src indicates the Eclipse update site archive. - All Eclipse features and plugins within the downloaded update site - will be installed. When an update site archive is not available - then the buildEclipsePlugin function can be - used to install a plugin that consists of a pair of feature and - plugin JARs. This function takes an argument { name, - srcFeature, srcPlugin } where - srcFeature and srcPlugin are - the feature and plugin JARs, respectively. + If there is a need to install plugins that are not available in Nixpkgs then + it may be possible to define these plugins outside Nixpkgs using the + buildEclipseUpdateSite and + buildEclipsePlugin functions found in the + nixpkgs.eclipses.plugins attribute set. Use the + buildEclipseUpdateSite function to install a plugin + distributed as an Eclipse update site. This function takes { name, + src } as argument where src indicates the + Eclipse update site archive. All Eclipse features and plugins within the + downloaded update site will be installed. When an update site archive is not + available then the buildEclipsePlugin function can be + used to install a plugin that consists of a pair of feature and plugin JARs. + This function takes an argument { name, srcFeature, srcPlugin + } where srcFeature and + srcPlugin are the feature and plugin JARs, respectively. - Expanding the previous example with two plugins using the above - functions we have + Expanding the previous example with two plugins using the above functions we + have packageOverrides = pkgs: { myEclipse = with pkgs.eclipses; eclipseWithPlugins { @@ -343,210 +306,220 @@ packageOverrides = pkgs: { } +
+
+ Elm -
- -
- -Elm - - -The Nix expressions for Elm reside in -pkgs/development/compilers/elm. They are generated -automatically by update-elm.rb script. One should -specify versions of Elm packages inside the script, clear the -packages directory and run the script from inside it. -elm-reactor is special because it also has Elm package -dependencies. The process is not automated very much for now -- you should -get the elm-reactor source tree (e.g. with -nix-shell) and run elm2nix.rb inside -it. Place the resulting package.nix file into -packages/elm-reactor-elm.nix. - - -
- -
- -Interactive shell helpers - - - Some packages provide the shell integration to be more useful. But - unlike other systems, nix doesn't have a standard share directory - location. This is why a bunch PACKAGE-share - scripts are shipped that print the location of the corresponding - shared folder. - - Current list of such packages is as following: + + The Nix expressions for Elm reside in + pkgs/development/compilers/elm. They are generated + automatically by update-elm.rb script. One should specify + versions of Elm packages inside the script, clear the + packages directory and run the script from inside it. + elm-reactor is special because it also has Elm package + dependencies. The process is not automated very much for now -- you should + get the elm-reactor source tree (e.g. with + nix-shell) and run elm2nix.rb inside + it. Place the resulting package.nix file into + packages/elm-reactor-elm.nix. + +
+
+ Interactive shell helpers - + + Some packages provide the shell integration to be more useful. But unlike + other systems, nix doesn't have a standard share directory location. This is + why a bunch PACKAGE-share scripts are shipped that print + the location of the corresponding shared folder. Current list of such + packages is as following: + - - autojump: autojump-share - + + autojump: autojump-share + - - fzf: fzf-share - + + fzf: fzf-share + - - - E.g. autojump can then used in the .bashrc like this: + + E.g. autojump can then used in the .bashrc like this: source "$(autojump-share)/autojump.bash" - - -
- -
- -Steam - -
- -Steam in Nix - - - Steam is distributed as a .deb file, for now only - as an i686 package (the amd64 package only has documentation). - When unpacked, it has a script called steam that - in ubuntu (their target distro) would go to /usr/bin - . When run for the first time, this script copies some - files to the user's home, which include another script that is the - ultimate responsible for launching the steam binary, which is also - in $HOME. - - - Nix problems and constraints: - - We don't have /bin/bash and many - scripts point there. Similarly for /usr/bin/python - . - We don't have the dynamic loader in /lib - . - The steam.sh script in $HOME can - not be patched, as it is checked and rewritten by steam. - The steam binary cannot be patched, it's also checked. - - - - The current approach to deploy Steam in NixOS is composing a FHS-compatible - chroot environment, as documented - here. - This allows us to have binaries in the expected paths without disrupting the system, - and to avoid patching them to work in a non FHS environment. - - -
- -
- -How to play - - - For 64-bit systems it's important to have - hardware.opengl.driSupport32Bit = true; - in your /etc/nixos/configuration.nix. You'll also need - hardware.pulseaudio.support32Bit = true; - if you are using PulseAudio - this will enable 32bit ALSA apps integration. - To use the Steam controller, you need to add - services.udev.extraRules = '' + +
+
+ Steam + +
+ Steam in Nix + + + Steam is distributed as a .deb file, for now only as + an i686 package (the amd64 package only has documentation). When unpacked, + it has a script called steam that in ubuntu (their + target distro) would go to /usr/bin . When run for the + first time, this script copies some files to the user's home, which include + another script that is the ultimate responsible for launching the steam + binary, which is also in $HOME. + + + + Nix problems and constraints: + + + + We don't have /bin/bash and many scripts point + there. Similarly for /usr/bin/python . + + + + + We don't have the dynamic loader in /lib . + + + + + The steam.sh script in $HOME can not be patched, as + it is checked and rewritten by steam. + + + + + The steam binary cannot be patched, it's also checked. + + + + + + + The current approach to deploy Steam in NixOS is composing a FHS-compatible + chroot environment, as documented + here. + This allows us to have binaries in the expected paths without disrupting + the system, and to avoid patching them to work in a non FHS environment. + +
+ +
+ How to play + + + For 64-bit systems it's important to have +hardware.opengl.driSupport32Bit = true; + in your /etc/nixos/configuration.nix. You'll also need +hardware.pulseaudio.support32Bit = true; + if you are using PulseAudio - this will enable 32bit ALSA apps integration. + To use the Steam controller, you need to add +services.udev.extraRules = '' SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0666" KERNEL=="uinput", MODE="0660", GROUP="users", OPTIONS+="static_node=uinput" ''; - to your configuration. - - -
- -
- -Troubleshooting - - - - - - Steam fails to start. What do I do? - Try to run - strace steam - to see what is causing steam to fail. - - - - Using the FOSS Radeon or nouveau (nvidia) drivers - - The newStdcpp parameter - was removed since NixOS 17.09 and should not be needed anymore. - - - - Steam ships statically linked with a version of libcrypto that - conflics with the one dynamically loaded by radeonsi_dri.so. - If you get the error - steam.sh: line 713: 7842 Segmentation fault (core dumped) - have a look at this pull request. - - - - - - Java - - - There is no java in steam chrootenv by default. If you get a message like - /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found - You need to add - steam.override { withJava = true; }; - to your configuration. - - - - - - -
- -
- -steam-run - -The FHS-compatible chroot used for steam can also be used to run -other linux games that expect a FHS environment. -To do it, add + to your configuration. + +
+ +
+ Troubleshooting + + + + + + Steam fails to start. What do I do? + + + + Try to run +strace steam + to see what is causing steam to fail. + + + + + + Using the FOSS Radeon or nouveau (nvidia) drivers + + + + + + The newStdcpp parameter was removed since NixOS + 17.09 and should not be needed anymore. + + + + + Steam ships statically linked with a version of libcrypto that + conflics with the one dynamically loaded by radeonsi_dri.so. If you + get the error +steam.sh: line 713: 7842 Segmentation fault (core dumped) + have a look at + this + pull request. + + + + + + + + Java + + + + + + There is no java in steam chrootenv by default. If you get a message + like +/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found + You need to add + steam.override { withJava = true; }; + to your configuration. + + + + + + + +
+ +
+ steam-run + + + The FHS-compatible chroot used for steam can also be used to run other + linux games that expect a FHS environment. To do it, add pkgs.(steam.override { nativeOnly = true; newStdcpp = true; }).run -to your configuration, rebuild, and run the game with + to your configuration, rebuild, and run the game with steam-run ./foo - - -
- -
- -
- -Emacs - -
- -Configuring Emacs - - - The Emacs package comes with some extra helpers to make it easier to - configure. emacsWithPackages allows you to manage - packages from ELPA. This means that you will not have to install - that packages from within Emacs. For instance, if you wanted to use - company, counsel, - flycheck, ivy, - magit, projectile, and - use-package you could use this as a - ~/.config/nixpkgs/config.nix override: - + +
+
+
+ Emacs + +
+ Configuring Emacs + + + The Emacs package comes with some extra helpers to make it easier to + configure. emacsWithPackages allows you to manage + packages from ELPA. This means that you will not have to install that + packages from within Emacs. For instance, if you wanted to use + company, counsel, + flycheck, ivy, + magit, projectile, and + use-package you could use this as a + ~/.config/nixpkgs/config.nix override: + { @@ -564,17 +537,17 @@ to your configuration, rebuild, and run the game with } - - You can install it like any other packages via nix-env -iA - myEmacs. However, this will only install those packages. - It will not configure them for us. To do this, we - need to provide a configuration file. Luckily, it is possible to do - this from within Nix! By modifying the above example, we can make - Emacs load a custom config file. The key is to create a package that - provide a default.el file in - /share/emacs/site-start/. Emacs knows to load - this file automatically when it starts. - + + You can install it like any other packages via nix-env -iA + myEmacs. However, this will only install those packages. It will + not configure them for us. To do this, we need to + provide a configuration file. Luckily, it is possible to do this from + within Nix! By modifying the above example, we can make Emacs load a custom + config file. The key is to create a package that provide a + default.el file in + /share/emacs/site-start/. Emacs knows to load this + file automatically when it starts. + { @@ -654,25 +627,24 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el } - - This provides a fairly full Emacs start file. It will load in - addition to the user's presonal config. You can always disable it by - passing -q to the Emacs command. - - - - Sometimes emacsWithPackages is not enough, as - this package set has some priorities imposed on packages (with - the lowest priority assigned to Melpa Unstable, and the highest for - packages manually defined in - pkgs/top-level/emacs-packages.nix). But you - can't control this priorities when some package is installed as a - dependency. You can override it on per-package-basis, providing all - the required dependencies manually - but it's tedious and there is - always a possibility that an unwanted dependency will sneak in - through some other package. To completely override such a package - you can use overrideScope. - + + This provides a fairly full Emacs start file. It will load in addition to + the user's presonal config. You can always disable it by passing + -q to the Emacs command. + + + + Sometimes emacsWithPackages is not enough, as this + package set has some priorities imposed on packages (with the lowest + priority assigned to Melpa Unstable, and the highest for packages manually + defined in pkgs/top-level/emacs-packages.nix). But you + can't control this priorities when some package is installed as a + dependency. You can override it on per-package-basis, providing all the + required dependencies manually - but it's tedious and there is always a + possibility that an unwanted dependency will sneak in through some other + package. To completely override such a package you can use + overrideScope. + overrides = super: self: rec { @@ -685,51 +657,110 @@ overrides = super: self: rec { dante ]) +
+
+
+ Weechat -
- -
- -
-Weechat - -Weechat can be configured to include your choice of plugins, reducing its -closure size from the default configuration which includes all available -plugins. To make use of this functionality, install an expression that -overrides its configuration such as + + Weechat can be configured to include your choice of plugins, reducing its + closure size from the default configuration which includes all available + plugins. To make use of this functionality, install an expression that + overrides its configuration such as weechat.override {configure = {availablePlugins, ...}: { plugins = with availablePlugins; [ python perl ]; } } - - -The plugins currently available are python, -perl, ruby, guile, -tcl and lua. - - -The python plugin allows the addition of extra libraries. For instance, -the inotify.py script in weechat-scripts requires -D-Bus or libnotify, and the fish.py script requires -pycrypto. To use these scripts, use the python -plugin's withPackages attribute: + + + + The plugins currently available are python, + perl, ruby, guile, + tcl and lua. + + + + The python plugin allows the addition of extra libraries. For instance, the + inotify.py script in weechat-scripts requires D-Bus or + libnotify, and the fish.py script requires pycrypto. To + use these scripts, use the python plugin's + withPackages attribute: weechat.override { configure = {availablePlugins, ...}: { plugins = with availablePlugins; [ (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) ]; - } + }; } - - -In order to also keep all default plugins installed, it is possible to use -the following method: + + + + In order to also keep all default plugins installed, it is possible to use + the following method: weechat.override { configure = { availablePlugins, ... }: { plugins = builtins.attrValues (availablePlugins // { python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]); }); }; } - -
+ +
+
+ Citrix Receiver + + + The Citrix + Receiver is a remote desktop viewer which provides access to + XenDesktop + installations. + + +
+ Basic usage + + + The tarball archive needs to be downloaded manually as the licenses + agreements of the vendor need to be accepted first. This is available at + the + download + page at citrix.com. Then run nix-prefetch-url + file://$PWD/linuxx64-$version.tar.gz. With the archive available + in the store the package can be built and installed with Nix. + + + + Note: it's recommended to install Citrix + Receiver using nix-env -i or globally to + ensure that the .desktop files are installed properly + into $XDG_CONFIG_DIRS. Otherwise it won't be possible to + open .ica files automatically from the browser to start + a Citrix connection. + +
+ +
+ Custom certificates + + + The Citrix Receiver in nixpkgs trusts + several certificates + from the + Mozilla database by default. However several companies using Citrix + might require their own corporate certificate. On distros with imperative + packaging these certs can be stored easily in + $ICAROOT, + however this directory is a store path in nixpkgs. In + order to work around this issue the package provides a simple mechanism to + add custom certificates without rebuilding the entire package using + symlinkJoin: + + { config.allowUnfree = true; }; +let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in +citrix_receiver.override { + inherit extraCerts; +}]]> + + +
+
diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml index f4f6ec60029412882179bbd9647163af7fcbc9c7..cde27b8a5edfc0dd99768becd29a550c6b5748aa 100644 --- a/doc/platform-notes.xml +++ b/doc/platform-notes.xml @@ -1,27 +1,25 @@ + Platform Notes +
+ Darwin (macOS) -Platform Notes + + Some common issues when packaging software for darwin: + -
- -Darwin (macOS) -Some common issues when packaging software for darwin: - - - - + + - The darwin stdenv uses clang instead of gcc. - When referring to the compiler $CC or cc - will work in both cases. Some builds hardcode gcc/g++ in their - build scripts, that can usually be fixed with using something - like makeFlags = [ "CC=cc" ]; or by patching - the build scripts. + The darwin stdenv uses clang instead of gcc. When + referring to the compiler $CC or cc + will work in both cases. Some builds hardcode gcc/g++ in their build + scripts, that can usually be fixed with using something like + makeFlags = [ "CC=cc" ]; or by patching the build + scripts. - - + stdenv.mkDerivation { name = "libfoo-1.2.3"; # ... @@ -30,36 +28,63 @@ ''; } - - - + + - On darwin libraries are linked using absolute paths, libraries - are resolved by their install_name at link - time. Sometimes packages won't set this correctly causing the - library lookups to fail at runtime. This can be fixed by adding - extra linker flags or by running install_name_tool -id - during the fixupPhase. + On darwin libraries are linked using absolute paths, libraries are + resolved by their install_name at link time. Sometimes + packages won't set this correctly causing the library lookups to fail at + runtime. This can be fixed by adding extra linker flags or by running + install_name_tool -id during the + fixupPhase. - - + stdenv.mkDerivation { name = "libfoo-1.2.3"; # ... makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; } - - - + + - Some packages assume xcode is available and use xcrun - to resolve build tools like clang, etc. - This causes errors like xcode-select: error: no developer tools were found at '/Applications/Xcode.app' - while the build doesn't actually depend on xcode. + Even if the libraries are linked using absolute paths and resolved via + their install_name correctly, tests can sometimes fail + to run binaries. This happens because the checkPhase + runs before the libraries are installed. - - + + This can usually be solved by running the tests after the + installPhase or alternatively by using + DYLD_LIBRARY_PATH. More information about this variable + can be found in the + dyld + 1 manpage. + + + dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib + Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq + Reason: image not found + ./tests/jqtest: line 5: 75779 Abort trap: 6 + + + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + doInstallCheck = true; + installCheckTarget = "check"; + } + + + + + Some packages assume xcode is available and use xcrun + to resolve build tools like clang, etc. This causes + errors like xcode-select: error: no developer tools were found at + '/Applications/Xcode.app' while the build doesn't actually depend + on xcode. + + stdenv.mkDerivation { name = "libfoo-1.2.3"; # ... @@ -69,15 +94,12 @@ ''; } - - The package xcbuild can be used to build projects - that really depend on Xcode, however projects that build some kind of - graphical interface won't work without using Xcode in an impure way. + The package xcbuild can be used to build projects that + really depend on Xcode, however projects that build some kind of graphical + interface won't work without using Xcode in an impure way. - - - -
- + + +
diff --git a/doc/quick-start.xml b/doc/quick-start.xml index ca86e6c9519b61dda39ffd8e9cbe749281f93c8b..b9e6d789404a8e0927096dba3bd5f4782260249d 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -1,223 +1,219 @@ - -Quick Start to Adding a Package - -To add a package to Nixpkgs: - - - - - Checkout the Nixpkgs source tree: - + Quick Start to Adding a Package + + To add a package to Nixpkgs: + + + + Checkout the Nixpkgs source tree: -$ git clone git://github.com/NixOS/nixpkgs.git +$ git clone https://github.com/NixOS/nixpkgs $ cd nixpkgs - - - - - Find a good place in the Nixpkgs tree to add the Nix - expression for your package. For instance, a library package - typically goes into - pkgs/development/libraries/pkgname, - while a web browser goes into - pkgs/applications/networking/browsers/pkgname. - See for some hints on the tree - organisation. Create a directory for your package, e.g. - + + + + Find a good place in the Nixpkgs tree to add the Nix expression for your + package. For instance, a library package typically goes into + pkgs/development/libraries/pkgname, + while a web browser goes into + pkgs/applications/networking/browsers/pkgname. + See for some hints on the tree + organisation. Create a directory for your package, e.g. $ mkdir pkgs/development/libraries/libfoo - - - - - In the package directory, create a Nix expression — a piece - of code that describes how to build the package. In this case, it - should be a function that is called with the - package dependencies as arguments, and returns a build of the - package in the Nix store. The expression should usually be called - default.nix. - + + + + In the package directory, create a Nix expression — a piece of code that + describes how to build the package. In this case, it should be a + function that is called with the package dependencies + as arguments, and returns a build of the package in the Nix store. The + expression should usually be called default.nix. $ emacs pkgs/development/libraries/libfoo/default.nix $ git add pkgs/development/libraries/libfoo/default.nix - - - You can have a look at the existing Nix expressions under - pkgs/ to see how it’s done. Here are some - good ones: - - - - - GNU Hello: + You can have a look at the existing Nix expressions under + pkgs/ to see how it’s done. Here are some good + ones: + + + + GNU Hello: + pkgs/applications/misc/hello/default.nix. - Trivial package, which specifies some meta - attributes which is good practice. - - - - GNU cpio: meta + attributes which is good practice. + + + + + GNU cpio: + pkgs/tools/archivers/cpio/default.nix. - Also a simple package. The generic builder in - stdenv does everything for you. It has - no dependencies beyond stdenv. - - - - GNU Multiple Precision arithmetic library (GMP): stdenv + does everything for you. It has no dependencies beyond + stdenv. + + + + + GNU Multiple Precision arithmetic library (GMP): + pkgs/development/libraries/gmp/5.1.x.nix. - Also done by the generic builder, but has a dependency on - m4. - - - - Pan, a GTK-based newsreader: m4. + + + + + Pan, a GTK-based newsreader: + pkgs/applications/networking/newsreaders/pan/default.nix. - Has an optional dependency on gtkspell, - which is only built if spellCheck is - true. - - - - Apache HTTPD: gtkspell, which is + only built if spellCheck is true. + + + + + Apache HTTPD: + pkgs/servers/http/apache-httpd/2.4.nix. - A bunch of optional features, variable substitutions in the - configure flags, a post-install hook, and miscellaneous - hackery. - - - - Thunderbird: + + + + Thunderbird: + pkgs/applications/networking/mailreaders/thunderbird/default.nix. - Lots of dependencies. - - - - JDiskReport, a Java utility: + + + + JDiskReport, a Java utility: + pkgs/tools/misc/jdiskreport/default.nix - (and the builder). - Nixpkgs doesn’t have a decent stdenv for - Java yet so this is pretty ad-hoc. - - - - XML::Simple, a Perl module: stdenv for Java yet + so this is pretty ad-hoc. + + + + + XML::Simple, a Perl module: + pkgs/top-level/perl-packages.nix - (search for the XMLSimple attribute). - Most Perl modules are so simple to build that they are - defined directly in perl-packages.nix; - no need to make a separate file for them. - - - - Adobe Reader: XMLSimple attribute). Most Perl + modules are so simple to build that they are defined directly in + perl-packages.nix; no need to make a separate file + for them. + + + + + Adobe Reader: + pkgs/applications/misc/adobe-reader/default.nix. - Shows how binary-only packages can be supported. In - particular the builder - uses patchelf to set the RUNPATH and ELF - interpreter of the executables so that the right libraries - are found at runtime. - - - - + uses patchelf to set the RUNPATH and ELF interpreter + of the executables so that the right libraries are found at runtime. + + + - - Some notes: - - - - - All meta - attributes are optional, but it’s still a good idea to - provide at least the description, - homepage and license. - - - - You can use nix-prefetch-url (or similar nix-prefetch-git, etc) - url to get the SHA-256 hash of - source distributions. There are similar commands as nix-prefetch-git and - nix-prefetch-hg available in nix-prefetch-scripts package. - - - - A list of schemes for mirror:// - URLs can be found in pkgs/build-support/fetchurl/mirrors.nix. - - - - + + Some notes: + + + + All meta attributes are + optional, but it’s still a good idea to provide at least the + description, homepage and + license. + + + + + You can use nix-prefetch-url (or similar + nix-prefetch-git, etc) url to get the + SHA-256 hash of source distributions. There are similar commands as + nix-prefetch-git and + nix-prefetch-hg available in + nix-prefetch-scripts package. + + + + + A list of schemes for mirror:// URLs can be found in + pkgs/build-support/fetchurl/mirrors.nix. + + + - - The exact syntax and semantics of the Nix expression - language, including the built-in function, are described in the - Nix manual in the + The exact syntax and semantics of the Nix expression language, including + the built-in function, are described in the Nix manual in the + chapter - on writing Nix expressions. - - - - - Add a call to the function defined in the previous step to - . + + + + + Add a call to the function defined in the previous step to + pkgs/top-level/all-packages.nix - with some descriptive name for the variable, - e.g. libfoo. - - + with some descriptive name for the variable, e.g. + libfoo. + $ emacs pkgs/top-level/all-packages.nix - - - The attributes in that file are sorted by category (like - “Development / Libraries”) that more-or-less correspond to the - directory structure of Nixpkgs, and then by attribute name. - - - - To test whether the package builds, run the following command - from the root of the nixpkgs source tree: - - + + The attributes in that file are sorted by category (like “Development / + Libraries”) that more-or-less correspond to the directory structure of + Nixpkgs, and then by attribute name. + + + + + To test whether the package builds, run the following command from the + root of the nixpkgs source tree: + $ nix-build -A libfoo - - where libfoo should be the variable name - defined in the previous step. You may want to add the flag - to keep the temporary build directory in case - something fails. If the build succeeds, a symlink - ./result to the package in the Nix store is - created. - - - - If you want to install the package into your profile - (optional), do - - + where libfoo should be the variable name defined in the + previous step. You may want to add the flag to keep + the temporary build directory in case something fails. If the build + succeeds, a symlink ./result to the package in the + Nix store is created. + + + + + If you want to install the package into your profile (optional), do + $ nix-env -f . -iA libfoo - - - - - Optionally commit the new package and open a pull request, or send a patch to - https://groups.google.com/forum/#!forum/nix-devel. - - - - - - - + + + + Optionally commit the new package and open a pull request, or send a patch + to https://groups.google.com/forum/#!forum/nix-devel. + + + + diff --git a/doc/release-notes.xml b/doc/release-notes.xml index a50ee877acdda7a3b8c6b9c574f8dd1a21412569..6dae6ae5620e3ac7a0ff7468312f5438b57df540 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -1,164 +1,177 @@
+ Nixpkgs Release Notes +
+ Release 0.14 (June 4, 2012) + + + In preparation for the switch from Subversion to Git, this release is mainly + the prevent the Nixpkgs version number from going backwards. (This would + happen because prerelease version numbers produced for the Git repository + are lower than those for the Subversion repository.) + -Nixpkgs Release Notes - - -
Release 0.14 (June 4, 2012) - -In preparation for the switch from Subversion to Git, this -release is mainly the prevent the Nixpkgs version number from going -backwards. (This would happen because prerelease version numbers -produced for the Git repository are lower than those for the -Subversion repository.) - -Since the last release, there have been thousands of changes and -new packages by numerous contributors. For details, see the commit -logs. - -
- - -
Release 0.13 (February 5, 2010) - -As always, there are many changes. Some of the most important -updates are: - - - - Glibc 2.9. - - GCC 4.3.3. - - Linux 2.6.32. - - X.org 7.5. - - KDE 4.3.4. - - - - - - -
- - -
Release 0.12 (April 24, 2009) - -There are way too many additions to Nixpkgs since the last -release to list here: for example, the number of packages on Linux has -increased from 1002 to 2159. However, some specific improvements are -worth listing: - - - - Nixpkgs now has a manual. In particular, it - describes the standard build environment in - detail. - - Major new packages: - - - - KDE 4. - - TeXLive. - - VirtualBox. - - - - … and many others. - - - - Important updates: - - - - Glibc 2.7. - - GCC 4.2.4. - - Linux 2.6.25 — 2.6.28. - - Firefox 3. - - X.org 7.3. - - - - - - Support for building derivations in a virtual - machine, including RPM and Debian builds in automatically generated - VM images. See - pkgs/build-support/vm/default.nix for - details. - - Improved support for building Haskell - packages. - - - - - -The following people contributed to this release: - -Andres Löh, -Arie Middelkoop, -Armijn Hemel, -Eelco Dolstra, -Lluís Batlle, -Ludovic Courtès, -Marc Weber, -Mart Kolthof, -Martin Bravenboer, -Michael Raskin, -Nicolas Pierron, -Peter Simons, -Pjotr Prins, -Rob Vermaas, -Sander van der Burg, -Tobias Hammerschmidt, -Valentin David, -Wouter den Breejen and -Yury G. Kudryashov. - -In addition, several people contributed patches on the -nix-dev mailing list. - -
- - -
Release 0.11 (September 11, 2007) - -This release has the following improvements: - - - - - The standard build environment - (stdenv) is now pure on the - x86_64-linux and powerpc-linux - platforms, just as on i686-linux. (Purity means - that building and using the standard environment has no dependencies - outside of the Nix store. For instance, it doesn’t require an - external C compiler such as /usr/bin/gcc.) - Also, the statically linked binaries used in the bootstrap process - are now automatically reproducible, making it easy to update the - bootstrap tools and to add support for other Linux platforms. See - pkgs/stdenv/linux/make-bootstrap-tools.nix for - details. - - - Hook variables in the generic builder are now - executed using the eval shell command. This - has a major advantage: you can write hooks directly in Nix - expressions. For instance, rather than writing a builder like this: + + Since the last release, there have been thousands of changes and new + packages by numerous contributors. For details, see the commit logs. + +
+
+ Release 0.13 (February 5, 2010) + + + As always, there are many changes. Some of the most important updates are: + + + + Glibc 2.9. + + + + + GCC 4.3.3. + + + + + Linux 2.6.32. + + + + + X.org 7.5. + + + + + KDE 4.3.4. + + + + +
+
+ Release 0.12 (April 24, 2009) + + + There are way too many additions to Nixpkgs since the last release to list + here: for example, the number of packages on Linux has increased from 1002 + to 2159. However, some specific improvements are worth listing: + + + + Nixpkgs now has a manual. In particular, it describes the standard build + environment in detail. + + + + + Major new packages: + + + + KDE 4. + + + + + TeXLive. + + + + + VirtualBox. + + + + … and many others. + + + + + Important updates: + + + + Glibc 2.7. + + + + + GCC 4.2.4. + + + + + Linux 2.6.25 — 2.6.28. + + + + + Firefox 3. + + + + + X.org 7.3. + + + + + + + + Support for building derivations in a virtual machine, including RPM and + Debian builds in automatically generated VM images. See + pkgs/build-support/vm/default.nix for details. + + + + + Improved support for building Haskell packages. + + + + + + The following people contributed to this release: Andres Löh, Arie + Middelkoop, Armijn Hemel, Eelco Dolstra, Lluís Batlle, Ludovic Courtès, + Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Nicolas + Pierron, Peter Simons, Pjotr Prins, Rob Vermaas, Sander van der Burg, Tobias + Hammerschmidt, Valentin David, Wouter den Breejen and Yury G. Kudryashov. In + addition, several people contributed patches on the + nix-dev mailing list. + +
+
+ Release 0.11 (September 11, 2007) + + + This release has the following improvements: + + + + The standard build environment (stdenv) is now pure on + the x86_64-linux and powerpc-linux + platforms, just as on i686-linux. (Purity means that + building and using the standard environment has no dependencies outside + of the Nix store. For instance, it doesn’t require an external C + compiler such as /usr/bin/gcc.) Also, the statically + linked binaries used in the bootstrap process are now automatically + reproducible, making it easy to update the bootstrap tools and to add + support for other Linux platforms. See + pkgs/stdenv/linux/make-bootstrap-tools.nix for + details. + + + + + Hook variables in the generic builder are now executed using the + eval shell command. This has a major advantage: you + can write hooks directly in Nix expressions. For instance, rather than + writing a builder like this: source $stdenv/setup @@ -169,290 +182,311 @@ postInstall() { } genericBuild - - (the gzip builder), you can just add this - attribute to the derivation: - + (the gzip builder), you can just add this attribute to + the derivation: postInstall = "ln -sf gzip $out/bin/gunzip; ln -sf gzip $out/bin/zcat"; - - and so a separate build script becomes unnecessary. This should - allow us to get rid of most builders in Nixpkgs. - - - It is now possible to have the generic builder pass - arguments to configure and - make that contain whitespace. Previously, for - example, you could say in a builder, - + and so a separate build script becomes unnecessary. This should allow us + to get rid of most builders in Nixpkgs. + + + + + It is now possible to have the generic builder pass arguments to + configure and make that contain + whitespace. Previously, for example, you could say in a builder, configureFlags="CFLAGS=-O0" - - but not - + but not configureFlags="CFLAGS=-O0 -g" - - since the -g would be interpreted as a separate - argument to configure. Now you can say - + since the -g would be interpreted as a separate + argument to configure. Now you can say configureFlagsArray=("CFLAGS=-O0 -g") - - or similarly - + or similarly configureFlagsArray=("CFLAGS=-O0 -g" "LDFLAGS=-L/foo -L/bar") - - which does the right thing. Idem for makeFlags, - installFlags, checkFlags and - distFlags. - - Unfortunately you can't pass arrays to Bash through the - environment, so you can't put the array above in a Nix expression, - e.g., - + which does the right thing. Idem for makeFlags, + installFlags, checkFlags and + distFlags. + + + Unfortunately you can't pass arrays to Bash through the environment, so + you can't put the array above in a Nix expression, e.g., configureFlagsArray = ["CFLAGS=-O0 -g"]; - - since it would just be flattened to a since string. However, you - can use the inline hooks described above: - + since it would just be flattened to a since string. However, you + can use the inline hooks described above: preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")"; - - - - - The function fetchurl now has - support for two different kinds of mirroring of files. First, it - has support for content-addressable mirrors. - For example, given the fetchurl call - + + + + + The function fetchurl now has support for two + different kinds of mirroring of files. First, it has support for + content-addressable mirrors. For example, given the + fetchurl call fetchurl { url = http://releases.mozilla.org/.../firefox-2.0.0.6-source.tar.bz2; sha1 = "eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"; } - - fetchurl will first try to download this file - from fetchurl will first try to download this file from + . - If that file doesn’t exist, it will try the original URL. In - general, the “content-addressed” location is - mirror/hash-type/hash. - There is currently only one content-addressable mirror (mirror/hash-type/hash. + There is currently only one content-addressable mirror + (), but more can be - specified in the hashedMirrors attribute in - pkgs/build-support/fetchurl/mirrors.nix, or by - setting the NIX_HASHED_MIRRORS environment variable - to a whitespace-separated list of URLs. - - Second, fetchurl has support for - widely-mirrored distribution sites such as SourceForge or the Linux - kernel archives. Given a URL of the form - mirror://site/path, - it will try to download path from a - configurable list of mirrors for site. - (This idea was borrowed from Gentoo Linux.) Example: + specified in the hashedMirrors attribute in + pkgs/build-support/fetchurl/mirrors.nix, or by + setting the NIX_HASHED_MIRRORS environment variable to a + whitespace-separated list of URLs. + + + Second, fetchurl has support for widely-mirrored + distribution sites such as SourceForge or the Linux kernel archives. + Given a URL of the form + mirror://site/path, + it will try to download path from a + configurable list of mirrors for site. (This + idea was borrowed from Gentoo Linux.) Example: fetchurl { url = mirror://gnu/gcc/gcc-4.2.0/gcc-core-4.2.0.tar.bz2; sha256 = "0ykhzxhr8857dr97z0j9wyybfz1kjr71xk457cfapfw5fjas4ny1"; } - Currently site can be - sourceforge, gnu and - kernel. The list of mirrors is defined in - pkgs/build-support/fetchurl/mirrors.nix. You - can override the list of mirrors for a particular site by setting - the environment variable - NIX_MIRRORS_site, e.g. + Currently site can be + sourceforge, gnu and + kernel. The list of mirrors is defined in + pkgs/build-support/fetchurl/mirrors.nix. You can + override the list of mirrors for a particular site by setting the + environment variable + NIX_MIRRORS_site, e.g. export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/ + + + + + Important updates: + + + + Glibc 2.5. + + + + + GCC 4.1.2. + + + + + Gnome 2.16.3. + + + + + X11R7.2. + + + + + Linux 2.6.21.7 and 2.6.22.6. + + + + + Emacs 22.1. + + + + + + + + Major new packages: + + + + KDE 3.5.6 Base. + + + + + Wine 0.9.43. + + + + + OpenOffice 2.2.1. + + + + + Many Linux system packages to support NixOS. + + + + + + - - - - Important updates: - - - - Glibc 2.5. - - GCC 4.1.2. - - Gnome 2.16.3. - - X11R7.2. - - Linux 2.6.21.7 and 2.6.22.6. - - Emacs 22.1. - - - - - - - Major new packages: - - - - KDE 3.5.6 Base. - - Wine 0.9.43. - - OpenOffice 2.2.1. - - Many Linux system packages to support - NixOS. - - - - - - - - - -The following people contributed to this release: - - Andres Löh, - Arie Middelkoop, - Armijn Hemel, - Eelco Dolstra, - Marc Weber, - Mart Kolthof, - Martin Bravenboer, - Michael Raskin, - Wouter den Breejen and - Yury G. Kudryashov. - - - -
- - -
Release 0.10 (October 12, 2006) - -This release of Nixpkgs requires Nix -0.10 or higher. - -This release has the following improvements: - - - - pkgs/system/all-packages-generic.nix - is gone, we now just have - pkgs/top-level/all-packages.nix that contains - all available packages. This should cause much less confusion with - users. all-packages.nix is a function that by - default returns packages for the current platform, but you can - override this by specifying a different system - argument. - - Certain packages in Nixpkgs are now - user-configurable through a configuration file, i.e., without having - to edit the Nix expressions in Nixpkgs. For instance, the Firefox - provided in the Nixpkgs channel is built without the RealPlayer - plugin (for legal reasons). Previously, you could easily enable - RealPlayer support by editing the call to the Firefox function in - all-packages.nix, but such changes are not - respected when Firefox is subsequently updated through the Nixpkgs - channel. - - The Nixpkgs configuration file (found in - ~/.nixpkgs/config.nix or through the - NIXPKGS_CONFIG environment variable) is an attribute - set that contains configuration options that - all-packages.nix reads and uses for certain - packages. For instance, the following configuration file: + + The following people contributed to this release: Andres Löh, Arie + Middelkoop, Armijn Hemel, Eelco Dolstra, Marc Weber, Mart Kolthof, Martin + Bravenboer, Michael Raskin, Wouter den Breejen and Yury G. Kudryashov. + +
+
+ Release 0.10 (October 12, 2006) + + + + This release of Nixpkgs requires + Nix 0.10 + or higher. + + + + + This release has the following improvements: + + + + + pkgs/system/all-packages-generic.nix is gone, we now + just have pkgs/top-level/all-packages.nix that + contains all available packages. This should cause much less confusion + with users. all-packages.nix is a function that by + default returns packages for the current platform, but you can override + this by specifying a different system argument. + + + + + Certain packages in Nixpkgs are now user-configurable through a + configuration file, i.e., without having to edit the Nix expressions in + Nixpkgs. For instance, the Firefox provided in the Nixpkgs channel is + built without the RealPlayer plugin (for legal reasons). Previously, you + could easily enable RealPlayer support by editing the call to the Firefox + function in all-packages.nix, but such changes are + not respected when Firefox is subsequently updated through the Nixpkgs + channel. + + + The Nixpkgs configuration file (found in + ~/.nixpkgs/config.nix or through the + NIXPKGS_CONFIG environment variable) is an attribute set + that contains configuration options that + all-packages.nix reads and uses for certain packages. + For instance, the following configuration file: { firefox = { enableRealPlayer = true; }; } - - persistently enables RealPlayer support in the Firefox - build. - - (Actually, firefox.enableRealPlayer is the - only configuration option currently available, - but more are sure to be added.) - - Support for new platforms: - - - - i686-cygwin, i.e., Windows - (using Cygwin). - The standard environment on i686-cygwin by - default builds binaries for the Cygwin environment (i.e., it - uses Cygwin tools and produces executables that use the Cygwin - library). However, there is also a standard environment that - produces binaries that use MinGW. You can use it - by calling all-package.nix with the - stdenvType argument set to - "i686-mingw". - - i686-darwin, i.e., Mac OS X - on Intel CPUs. - - powerpc-linux. - - x86_64-linux, i.e., Linux on - 64-bit AMD/Intel CPUs. Unlike i686-linux, - this platform doesn’t have a pure stdenv - yet. - - - + persistently enables RealPlayer support in the Firefox build. - - - - The default compiler is now GCC 4.1.1. - - X11 updated to X.org’s X11R7.1. - - Notable new packages: - - - - Opera. - - Microsoft Visual C++ 2005 Express Edition and - the Windows SDK. - - - - In total there are now around 809 packages in Nixpkgs. - - - - - It is now much easier to - override the default C compiler and other tools in - stdenv for specific packages. - all-packages.nix provides two utility - functions for this purpose: overrideGCC and - overrideInStdenv. Both take a - stdenv and return an augmented - stdenv; the formed changes the C compiler, and - the latter adds additional packages to the front of - stdenv’s initial PATH, allowing - tools to be overridden. - - For instance, the package strategoxt - doesn’t build with the GNU Make in stdenv - (version 3.81), so we call it with an augmented - stdenv that uses GNU Make 3.80: - + + (Actually, firefox.enableRealPlayer is the + only configuration option currently available, but + more are sure to be added.) + + + + + Support for new platforms: + + + + i686-cygwin, i.e., Windows (using + Cygwin). The standard + environment on i686-cygwin by default builds + binaries for the Cygwin environment (i.e., it uses Cygwin tools and + produces executables that use the Cygwin library). However, there is + also a standard environment that produces binaries that use + MinGW. You can + use it by calling all-package.nix with the + stdenvType argument set to + "i686-mingw". + + + + + i686-darwin, i.e., Mac OS X on Intel CPUs. + + + + + powerpc-linux. + + + + + x86_64-linux, i.e., Linux on 64-bit AMD/Intel CPUs. + Unlike i686-linux, this platform doesn’t have a + pure stdenv yet. + + + + + + + + The default compiler is now GCC 4.1.1. + + + + + X11 updated to X.org’s X11R7.1. + + + + + Notable new packages: + + + + Opera. + + + + + Microsoft Visual C++ 2005 Express Edition and the Windows SDK. + + + + In total there are now around 809 packages in Nixpkgs. + + + + + It is now much easier to override the default C + compiler and other tools in stdenv for specific + packages. all-packages.nix provides two utility + functions for this purpose: overrideGCC and + overrideInStdenv. Both take a + stdenv and return an augmented + stdenv; the formed changes the C compiler, and the + latter adds additional packages to the front of + stdenv’s initial PATH, allowing tools + to be overridden. + + + For instance, the package strategoxt doesn’t build + with the GNU Make in stdenv (version 3.81), so we call + it with an augmented stdenv that uses GNU Make 3.80: strategoxt = (import ../development/compilers/strategoxt) { inherit fetchurl pkgconfig sdf aterm; @@ -460,44 +494,37 @@ strategoxt = (import ../development/compilers/strategoxt) { }; gnumake380 = ...; - - Likewise, there are many packages that don’t compile with the - default GCC (4.1.1), but that’s easily fixed: - + Likewise, there are many packages that don’t compile with the default + GCC (4.1.1), but that’s easily fixed: exult = import ../games/exult { inherit fetchurl SDL SDL_mixer zlib libpng unzip; stdenv = overrideGCC stdenv gcc34; }; - - - - - It has also become much easier to experiment with - changes to the stdenv setup script (which notably - contains the generic builder). Since edits to - pkgs/stdenv/generic/setup.sh trigger a rebuild - of everything, this was formerly quite painful. - But now stdenv contains a function to - “regenerate” stdenv with a different setup - script, allowing the use of a different setup script for specific - packages: - + + + + + It has also become much easier to experiment with changes to the + stdenv setup script (which notably contains the generic + builder). Since edits to pkgs/stdenv/generic/setup.sh + trigger a rebuild of everything, this was formerly + quite painful. But now stdenv contains a function to + “regenerate” stdenv with a different setup script, + allowing the use of a different setup script for specific packages: pkg = import ... { stdenv = stdenv.regenerate ./my-setup.sh; ... } - - - - - Packages can now have a human-readable - description field. Package descriptions are - shown by nix-env -qa --description. In addition, - they’re shown on the Nixpkgs release page. A description can be - added to a package as follows: - + + + + + Packages can now have a human-readable description + field. Package descriptions are shown by nix-env -qa + --description. In addition, they’re shown on the Nixpkgs + release page. A description can be added to a package as follows: stdenv.mkDerivation { name = "exult-1.2"; @@ -506,228 +533,268 @@ stdenv.mkDerivation { description = "A reimplementation of the Ultima VII game engine"; }; } - - The meta attribute is not passed to the builder, - so changes to the description do not trigger a rebuild. Additional - meta attributes may be defined in the future - (such as the URL of the package’s homepage, the license, - etc.). - - - - -The following people contributed to this release: - - Andres Löh, - Armijn Hemel, - Christof Douma, - Eelco Dolstra, - Eelco Visser, - Mart Kolthof, - Martin Bravenboer, - Merijn de Jonge, - Rob Vermaas and - Roy van den Broek. - - - -
- - -
Release 0.9 (January 31, 2006) - -There have been zillions of changes since the last release of -Nixpkgs. Many packages have been added or updated. The following are -some of the more notable changes: - - - - Distribution files have been moved to . - - The C library on Linux, Glibc, has been updated to - version 2.3.6. - - The default compiler is now GCC 3.4.5. GCC 4.0.2 is - also available. - - The old, unofficial Xlibs has been replaced by the - official modularised X11 distribution from X.org, i.e., X11R7.0. - X11R7.0 consists of 287 (!) packages, all of which are in Nixpkgs - though not all have been tested. It is now possible to build a - working X server (previously we only had X client libraries). We - use a fully Nixified X server on NixOS. - - The Sun JDK 5 has been purified, i.e., it doesn’t - require any non-Nix components such as - /lib/ld-linux.so.2. This means that Java - applications such as Eclipse and Azureus can run on - NixOS. - - Hardware-accelerated OpenGL support, used by games - like Quake 3 (which is now built from source). - - Improved support for FreeBSD on - x86. - - Improved Haskell support; e.g., the GHC build is now - pure. - - Some support for cross-compilation: cross-compiling - builds of GCC and Binutils, and cross-compiled builds of the C - library uClibc. - - Notable new packages: - - - - teTeX, including support for building LaTeX - documents using Nix (with automatic dependency - determination). - - Ruby. - - System-level packages to support NixOS, - e.g. Grub, GNU parted and so - on. - - ecj, the Eclipse Compiler for - Java, so we finally have a freely distributable compiler that - supports Java 5.0. - - php. - - The GIMP. - - Inkscape. - - GAIM. - - kdelibs. This allows us to - add KDE-based packages (such as - kcachegrind). - - - - - - - -The following people contributed to this release: - - Andres Löh, - Armijn Hemel, - Bogdan Dumitriu, - Christof Douma, - Eelco Dolstra, - Eelco Visser, - Mart Kolthof, - Martin Bravenboer, - Rob Vermaas and - Roy van den Broek. - - - -
- - -
Release 0.8 (April 11, 2005) - -This release is mostly to remain synchronised with the changed -hashing scheme in Nix 0.8. - -Notable updates: - - - - Adobe Reader 7.0 - - Various security updates (zlib 1.2.2, etc.) - - - - - -
- - -
Release 0.7 (March 14, 2005) - - - - - - The bootstrap process for the standard build - environment on Linux (stdenv-linux) has been improved. It is no - longer dependent in its initial bootstrap stages on the system - Glibc, GCC, and other tools. Rather, Nixpkgs contains a statically - linked bash and curl, and uses that to download other statically - linked tools. These are then used to build a Glibc and dynamically - linked versions of all other tools. - - This change also makes the bootstrap process faster. For - instance, GCC is built only once instead of three times. - - (Contributed by Armijn Hemel.) - - - - - - Tarballs used by Nixpkgs are now obtained from the same server - that hosts Nixpkgs (). This reduces the - risk of packages being unbuildable due to moved or deleted files on - various servers. - - - - - - There now is a generic mechanism for building Perl modules. - See the various Perl modules defined in - pkgs/system/all-packages-generic.nix. - - - - - - Notable new packages: - - - - Qt 3 - MySQL - MythTV - Mono - MonoDevelop (alpha) - Xine - + The meta attribute is not passed to the builder, so + changes to the description do not trigger a rebuild. Additional + meta attributes may be defined in the future (such as + the URL of the package’s homepage, the license, etc.). + + + + The following people contributed to this release: Andres Löh, Armijn Hemel, + Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin + Bravenboer, Merijn de Jonge, Rob Vermaas and Roy van den Broek. + +
+
+ Release 0.9 (January 31, 2006) + + + There have been zillions of changes since the last release of Nixpkgs. Many + packages have been added or updated. The following are some of the more + notable changes: - - - - - - Notable updates: - - GCC 3.4.3 - Glibc 2.3.4 - GTK 2.6 - + + + Distribution files have been moved to + . + + + + + The C library on Linux, Glibc, has been updated to version 2.3.6. + + + + + The default compiler is now GCC 3.4.5. GCC 4.0.2 is also available. + + + + + The old, unofficial Xlibs has been replaced by the official modularised + X11 distribution from X.org, i.e., X11R7.0. X11R7.0 consists of 287 (!) + packages, all of which are in Nixpkgs though not all have been tested. It + is now possible to build a working X server (previously we only had X + client libraries). We use a fully Nixified X server on NixOS. + + + + + The Sun JDK 5 has been purified, i.e., it doesn’t require any non-Nix + components such as /lib/ld-linux.so.2. This means + that Java applications such as Eclipse and Azureus can run on NixOS. + + + + + Hardware-accelerated OpenGL support, used by games like Quake 3 (which is + now built from source). + + + + + Improved support for FreeBSD on x86. + + + + + Improved Haskell support; e.g., the GHC build is now pure. + + + + + Some support for cross-compilation: cross-compiling builds of GCC and + Binutils, and cross-compiled builds of the C library uClibc. + + + + + Notable new packages: + + + + teTeX, including support for building LaTeX documents using Nix (with + automatic dependency determination). + + + + + Ruby. + + + + + System-level packages to support NixOS, e.g. Grub, GNU + parted and so on. + + + + + ecj, the Eclipse Compiler for Java, so we finally + have a freely distributable compiler that supports Java 5.0. + + + + + php. + + + + + The GIMP. + + + + + Inkscape. + + + + + GAIM. + + + + + kdelibs. This allows us to add KDE-based packages + (such as kcachegrind). + + + + + + + The following people contributed to this release: Andres Löh, Armijn Hemel, + Bogdan Dumitriu, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, + Martin Bravenboer, Rob Vermaas and Roy van den Broek. +
+
+ Release 0.8 (April 11, 2005) - - - + + This release is mostly to remain synchronised with the changed hashing + scheme in Nix 0.8. + -
+ + Notable updates: + + + + Adobe Reader 7.0 + + + + + Various security updates (zlib 1.2.2, etc.) + + + + +
+
+ Release 0.7 (March 14, 2005) - + + + + The bootstrap process for the standard build environment on Linux + (stdenv-linux) has been improved. It is no longer dependent in its initial + bootstrap stages on the system Glibc, GCC, and other tools. Rather, + Nixpkgs contains a statically linked bash and curl, and uses that to + download other statically linked tools. These are then used to build a + Glibc and dynamically linked versions of all other tools. + + + This change also makes the bootstrap process faster. For instance, GCC is + built only once instead of three times. + + + (Contributed by Armijn Hemel.) + + + + + Tarballs used by Nixpkgs are now obtained from the same server that hosts + Nixpkgs (). This + reduces the risk of packages being unbuildable due to moved or deleted + files on various servers. + + + + + There now is a generic mechanism for building Perl modules. See the + various Perl modules defined in pkgs/system/all-packages-generic.nix. + + + + + Notable new packages: + + + + Qt 3 + + + + + MySQL + + + + + MythTV + + + + + Mono + + + + + MonoDevelop (alpha) + + + + + Xine + + + + + + + + Notable updates: + + + + GCC 3.4.3 + + + + + Glibc 2.3.4 + + + + + GTK 2.6 + + + + + + +
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index c4bd6c57ffdbfcb621d5f342d6451a25976ec517..6b854e085549aa9c4c4a2efeaa8e84d52232f665 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -3,93 +3,155 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-reviewing-contributions"> - -Reviewing contributions - - - The following section is a draft and reviewing policy is still being - discussed. - - -The nixpkgs projects receives a fairly high number of contributions via - GitHub pull-requests. Reviewing and approving these is an important task and a - way to contribute to the project. - -The high change rate of nixpkgs make any pull request that is open for - long enough subject to conflicts that will require extra work from the - submitter or the merger. Reviewing pull requests in a timely manner and being + Reviewing contributions + + + The following section is a draft, and the policy for reviewing is still + being discussed in issues such as + #11166 + and + #20836 + . + + + + The nixpkgs project receives a fairly high number of contributions via GitHub + pull-requests. Reviewing and approving these is an important task and a way + to contribute to the project. + + + The high change rate of nixpkgs makes any pull request that remains open for + too long subject to conflicts that will require extra work from the submitter + or the merger. Reviewing pull requests in a timely manner and being responsive to the comments is the key to avoid these. GitHub provides sort - filters that can be used to see the most - recently and the and the + least - recently updated pull-requests. - -When reviewing a pull request, please always be nice and polite. + recently updated pull-requests. We highly encourage looking at + + this list of ready to merge, unreviewed pull requests. + + + When reviewing a pull request, please always be nice and polite. Controversial changes can lead to controversial opinions, but it is important - to respect every community members and their work. - -GitHub provides reactions, they are a simple and quick way to provide - feedback to pull-requests or any comments. The thumb-down reaction should be - used with care and if possible accompanied with some explanations so the - submitter has directions to improve his contribution. - -Pull-requests reviews should include a list of what has been reviewed in a - comment, so other reviewers and mergers can know the state of the - review. - -All the review template samples provided in this section are generic and + to respect every community member and their work. + + + GitHub provides reactions as a simple and quick way to provide feedback to + pull-requests or any comments. The thumb-down reaction should be used with + care and if possible accompanied with some explanation so the submitter has + directions to improve their contribution. + + + Pull-request reviews should include a list of what has been reviewed in a + comment, so other reviewers and mergers can know the state of the review. + + + All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt - them to his liking. - -
Package updates - -A package update is the most trivial and common type of pull-request. - These pull-requests mainly consist in updating the version part of the package - name and the source hash. -It can happen that non trivial updates include patches or more complex - changes. - -Reviewing process: - - - Add labels to the pull-request. (Requires commit - rights) + them to their liking. + +
+ Package updates + + + A package update is the most trivial and common type of pull-request. These + pull-requests mainly consist of updating the version part of the package + name and the source hash. + + + + It can happen that non-trivial updates include patches or more complex + changes. + + + + Reviewing process: + + + + + + Add labels to the pull-request. (Requires commit rights) + - 8.has: package (update) and any topic - label that fit the updated package. + + + 8.has: package (update) and any topic label that fit + the updated package. + + - - Ensure that the package versioning is fitting the - guidelines. - Ensure that the commit text is fitting the - guidelines. - Ensure that the package maintainers are notified. + + + + Ensure that the package versioning fits the guidelines. + + + + + Ensure that the commit text fits the guidelines. + + + + + Ensure that the package maintainers are notified. + - mention-bot usually notify GitHub users based on the - submitted changes, but it can happen that it misses some of the - package maintainers. + + + CODEOWNERS + will make GitHub notify users based on the submitted changes, but it can + happen that it misses some of the package maintainers. + + - - Ensure that the meta field contains correct - information. + + + + Ensure that the meta field information is correct. + - License can change with version updates, so it should be - checked to be fitting upstream license. - If the package has no maintainer, a maintainer must be - set. This can be the update submitter or a community member that - accepts to take maintainership of the package. + + + License can change with version updates, so it should be checked to + match the upstream license. + + + + + If the package has no maintainer, a maintainer must be set. This can be + the update submitter or a community member that accepts to take + maintainership of the package. + + - - Ensure that the code contains no typos. - Building the package locally. + + + + Ensure that the code contains no typos. + + + + + Building the package locally. + - Pull-requests are often targeted to the master or staging - branch so building the pull-request locally as it is submitted can - trigger a large amount of source builds. - It is possible to rebase the changes on nixos-unstable or - nixpkgs-unstable for easier review by running the following commands - from a nixpkgs clone. + + + Pull-requests are often targeted to the master or staging branch, and + building the pull-request locally when it is submitted can trigger many + source builds. + + + It is possible to rebase the changes on nixos-unstable or + nixpkgs-unstable for easier review by running the following commands + from a nixpkgs clone. $ git remote add channels https://github.com/NixOS/nixpkgs-channels.git @@ -98,43 +160,56 @@ $ git fetch origin pull/PRNUMBER/head $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD - - - This should be done only once to be able to fetch channel - branches from the nixpkgs-channels repository. - - - Fetching the nixos-unstable branch. - - - Fetching the pull-request changes, PRNUMBER - is the number at the end of the pull-request title and - BASEBRANCH the base branch of the - pull-request. - - - Rebasing the pull-request changes to the nixos-unstable - branch. - - - - - - The nox - tool can be used to review a pull-request content in a single command. - It doesn't rebase on a channel branch so it might trigger multiple - source builds. PRNUMBER should be replaced by the - number at the end of the pull-request title. + + + + This should be done only once to be able to fetch channel branches + from the nixpkgs-channels repository. + + + + + Fetching the nixos-unstable branch. + + + + + Fetching the pull-request changes, PRNUMBER is the + number at the end of the pull-request title and + BASEBRANCH the base branch of the pull-request. + + + + + Rebasing the pull-request changes to the nixos-unstable branch. + + + + + + + + The nox tool can + be used to review a pull-request content in a single command. It doesn't + rebase on a channel branch so it might trigger multiple source builds. + PRNUMBER should be replaced by the number at the end + of the pull-request title. + $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" - + - - Running every binary. - - -Sample template for a package update review + + + + Running every binary. + + + + + + Sample template for a package update review ##### Reviewed points @@ -148,55 +223,105 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" ##### Comments - -
- -
New packages - -New packages are a common type of pull-requests. These pull requests - consists in adding a new nix-expression for a package. - -Reviewing process: - - - Add labels to the pull-request. (Requires commit - rights) + + +
+
+ New packages + + + New packages are a common type of pull-requests. These pull requests + consists in adding a new nix-expression for a package. + + + + Reviewing process: + + + + + + Add labels to the pull-request. (Requires commit rights) + - 8.has: package (new) and any topic - label that fit the new package. + + + 8.has: package (new) and any topic label that fit the + new package. + + - - Ensure that the package versioning is fitting the - guidelines. - Ensure that the commit name is fitting the - guidelines. - Ensure that the meta field contains correct - information. + + + + Ensure that the package versioning is fitting the guidelines. + + + + + Ensure that the commit name is fitting the guidelines. + + + + + Ensure that the meta field contains correct information. + - License must be checked to be fitting upstream - license. - Platforms should be set or the package will not get binary - substitutes. - A maintainer must be set, this can be the package - submitter or a community member that accepts to take maintainership of - the package. + + + License must be checked to be fitting upstream license. + + + + + Platforms should be set or the package will not get binary substitutes. + + + + + A maintainer must be set, this can be the package submitter or a + community member that accepts to take maintainership of the package. + + - - Ensure that the code contains no typos. - Ensure the package source. + + + + Ensure that the code contains no typos. + + + + + Ensure the package source. + - Mirrors urls should be used when - available. - The most appropriate function should be used (e.g. - packages from GitHub should use - fetchFromGitHub). + + + Mirrors urls should be used when available. + + + + + The most appropriate function should be used (e.g. packages from GitHub + should use fetchFromGitHub). + + - - Building the package locally. - Running every binary. - - -Sample template for a new package review + + + + Building the package locally. + + + + + Running every binary. + + + + + + Sample template for a new package review ##### Reviewed points @@ -218,58 +343,108 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" ##### Comments - -
- -
Module updates - -Module updates are submissions changing modules in some ways. These often - contains changes to the options or introduce new options. - -Reviewing process - - - Add labels to the pull-request. (Requires commit - rights) + + +
+
+ Module updates + + + Module updates are submissions changing modules in some ways. These often + contains changes to the options or introduce new options. + + + + Reviewing process + + + + + + Add labels to the pull-request. (Requires commit rights) + - 8.has: module (update) and any topic - label that fit the module. + + + 8.has: module (update) and any topic label that fit + the module. + + - - Ensure that the module maintainers are notified. + + + + Ensure that the module maintainers are notified. + - Mention-bot notify GitHub users based on the submitted - changes, but it can happen that it miss some of the package - maintainers. + + + CODEOWNERS + will make GitHub notify users based on the submitted changes, but it can + happen that it misses some of the package maintainers. + + - - Ensure that the module tests, if any, are - succeeding. - Ensure that the introduced options are correct. + + + + Ensure that the module tests, if any, are succeeding. + + + + + Ensure that the introduced options are correct. + - Type should be appropriate (string related types differs - in their merging capabilities, optionSet and - string types are deprecated). - Description, default and example should be - provided. + + + Type should be appropriate (string related types differs in their + merging capabilities, optionSet and + string types are deprecated). + + + + + Description, default and example should be provided. + + - - Ensure that option changes are backward compatible. + + + + Ensure that option changes are backward compatible. + - mkRenamedOptionModule and - mkAliasOptionModule functions provide way to make - option changes backward compatible. + + + mkRenamedOptionModule and + mkAliasOptionModule functions provide way to make + option changes backward compatible. + + - - Ensure that removed options are declared with - mkRemovedOptionModule - Ensure that changes that are not backward compatible are - mentioned in release notes. - Ensure that documentations affected by the change is - updated. - - -Sample template for a module update review + + + + Ensure that removed options are declared with + mkRemovedOptionModule + + + + + Ensure that changes that are not backward compatible are mentioned in + release notes. + + + + + Ensure that documentations affected by the change is updated. + + + + + + Sample template for a module update review ##### Reviewed points @@ -286,51 +461,89 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" ##### Comments - -
- -
New modules - -New modules submissions introduce a new module to NixOS. - - - Add labels to the pull-request. (Requires commit - rights) + + +
+
+ New modules + + + New modules submissions introduce a new module to NixOS. + + + + + + Add labels to the pull-request. (Requires commit rights) + - 8.has: module (new) and any topic label - that fit the module. + + + 8.has: module (new) and any topic label that fit the + module. + + - - Ensure that the module tests, if any, are - succeeding. - Ensure that the introduced options are correct. + + + + Ensure that the module tests, if any, are succeeding. + + + + + Ensure that the introduced options are correct. + - Type should be appropriate (string related types differs - in their merging capabilities, optionSet and - string types are deprecated). - Description, default and example should be - provided. + + + Type should be appropriate (string related types differs in their + merging capabilities, optionSet and + string types are deprecated). + + + + + Description, default and example should be provided. + + - - Ensure that module meta field is - present + + + + Ensure that module meta field is present + - Maintainers should be declared in - meta.maintainers. - Module documentation should be declared with - meta.doc. + + + Maintainers should be declared in meta.maintainers. + + + + + Module documentation should be declared with + meta.doc. + + - - Ensure that the module respect other modules - functionality. + + + + Ensure that the module respect other modules functionality. + - For example, enabling a module should not open firewall - ports by default. + + + For example, enabling a module should not open firewall ports by + default. + + - - + + -Sample template for a new module review + + Sample template for a new module review ##### Reviewed points @@ -348,32 +561,41 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" ##### Comments - -
- -
Other submissions - -Other type of submissions requires different reviewing steps. - -If you consider having enough knowledge and experience in a topic and - would like to be a long-term reviewer for related submissions, please contact - the current reviewers for that topic. They will give you information about the - reviewing process. -The main reviewers for a topic can be hard to find as there is no list, but -checking past pull-requests to see who reviewed or git-blaming the code to see -who committed to that topic can give some hints. - -Container system, boot system and library changes are some examples of the - pull requests fitting this category. - -
- -
Merging pull-requests - -It is possible for community members that have enough knowledge and - experience on a special topic to contribute by merging pull requests. - -TODO: add the procedure to request merging rights. + + +
+
+ Other submissions + + + Other type of submissions requires different reviewing steps. + + + + If you consider having enough knowledge and experience in a topic and would + like to be a long-term reviewer for related submissions, please contact the + current reviewers for that topic. They will give you information about the + reviewing process. The main reviewers for a topic can be hard to find as + there is no list, but checking past pull-requests to see who reviewed or + git-blaming the code to see who committed to that topic can give some hints. + + + + Container system, boot system and library changes are some examples of the + pull requests fitting this category. + +
+
+ Merging pull-requests + + + It is possible for community members that have enough knowledge and + experience on a special topic to contribute by merging pull requests. + + + + TODO: add the procedure to request merging rights. + -In a case a contributor leaves definitively the Nix community, he should - create an issue or notify the mailing list with references of packages and - modules he maintains so the maintainership can be taken over by other - contributors. - -
+ + In a case a contributor leaves definitively the Nix community, he should + create an issue or post on + Discourse with + references of packages and modules he maintains so the maintainership can be + taken over by other contributors. + +
diff --git a/doc/shell.nix b/doc/shell.nix index 22590142ee1ad0801d128f1289ff2c6658d9335e..24fe20e81050e338c9b54688bbdd4a60aa47e873 100644 --- a/doc/shell.nix +++ b/doc/shell.nix @@ -1,4 +1,5 @@ { pkgs ? import ../. {} }: (import ./default.nix).overrideAttrs (x: { - buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ]; + buildInputs = x.buildInputs ++ [ pkgs.xmloscopy pkgs.ruby ]; + }) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 2a3316b8d01835460bee7af40cc2e993999cf64f..94bd7365dd9a6ff7491585b5f55a5e0affb24f5f 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1,27 +1,24 @@ - -The Standard Environment - - -The standard build environment in the Nix Packages collection -provides an environment for building Unix packages that does a lot of -common build tasks automatically. In fact, for Unix packages that use -the standard ./configure; make; make install build -interface, you don’t need to write a build script at all; the standard -environment does everything automatically. If -stdenv doesn’t do what you need automatically, you -can easily customise or override the various build phases. - - -
Using -<literal>stdenv</literal> - -To build a package with the standard environment, you use the -function stdenv.mkDerivation, instead of the -primitive built-in function derivation, e.g. - + The Standard Environment + + The standard build environment in the Nix Packages collection provides an + environment for building Unix packages that does a lot of common build tasks + automatically. In fact, for Unix packages that use the standard + ./configure; make; make install build interface, you + don’t need to write a build script at all; the standard environment does + everything automatically. If stdenv doesn’t do what you + need automatically, you can easily customise or override the various build + phases. + +
+ Using <literal>stdenv</literal> + + + To build a package with the standard environment, you use the function + stdenv.mkDerivation, instead of the primitive built-in + function derivation, e.g. stdenv.mkDerivation { name = "libfoo-1.2.3"; @@ -30,39 +27,35 @@ stdenv.mkDerivation { sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m"; }; } - -(stdenv needs to be in scope, so if you write this -in a separate Nix expression from -pkgs/all-packages.nix, you need to pass it as a -function argument.) Specifying a name and a -src is the absolute minimum you need to do. Many -packages have dependencies that are not provided in the standard -environment. It’s usually sufficient to specify those dependencies in -the buildInputs attribute: - + (stdenv needs to be in scope, so if you write this in a + separate Nix expression from pkgs/all-packages.nix, you + need to pass it as a function argument.) Specifying a + name and a src is the absolute minimum + you need to do. Many packages have dependencies that are not provided in the + standard environment. It’s usually sufficient to specify those + dependencies in the buildInputs attribute: stdenv.mkDerivation { name = "libfoo-1.2.3"; ... buildInputs = [libbar perl ncurses]; } - -This attribute ensures that the bin -subdirectories of these packages appear in the PATH -environment variable during the build, that their -include subdirectories are searched by the C -compiler, and so on. (See for -details.) - -Often it is necessary to override or modify some aspect of the -build. To make this easier, the standard environment breaks the -package build into a number of phases, all of -which can be overridden or modified individually: unpacking the -sources, applying patches, configuring, building, and installing. -(There are some others; see .) -For instance, a package that doesn’t supply a makefile but instead has -to be compiled “manually” could be handled like this: - + This attribute ensures that the bin subdirectories of + these packages appear in the PATH environment variable during + the build, that their include subdirectories are + searched by the C compiler, and so on. (See + for details.) + + + + Often it is necessary to override or modify some aspect of the build. To + make this easier, the standard environment breaks the package build into a + number of phases, all of which can be overridden or + modified individually: unpacking the sources, applying patches, configuring, + building, and installing. (There are some others; see + .) For instance, a package that doesn’t + supply a makefile but instead has to be compiled “manually” could be + handled like this: stdenv.mkDerivation { name = "fnord-4.5"; @@ -75,35 +68,33 @@ stdenv.mkDerivation { cp foo $out/bin ''; } - -(Note the use of ''-style string literals, which -are very convenient for large multi-line script fragments because they -don’t need escaping of " and \, -and because indentation is intelligently removed.) - -There are many other attributes to customise the build. These -are listed in . - -While the standard environment provides a generic builder, you -can still supply your own build script: - + (Note the use of ''-style string literals, which are very + convenient for large multi-line script fragments because they don’t need + escaping of " and \, and because + indentation is intelligently removed.) + + + + There are many other attributes to customise the build. These are listed in + . + + + + While the standard environment provides a generic builder, you can still + supply your own build script: stdenv.mkDerivation { name = "libfoo-1.2.3"; ... builder = ./builder.sh; } - -where the builder can do anything it wants, but typically starts with - + where the builder can do anything it wants, but typically starts with source $stdenv/setup - -to let stdenv set up the environment (e.g., process -the buildInputs). If you want, you can still use -stdenv’s generic builder: - + to let stdenv set up the environment (e.g., process the + buildInputs). If you want, you can still use + stdenv’s generic builder: source $stdenv/setup @@ -119,116 +110,186 @@ installPhase() { genericBuild - - - -
- - -
Tools provided by -<literal>stdenv</literal> - -The standard environment provides the following packages: - - - - The GNU C Compiler, configured with C and C++ - support. - - GNU coreutils (contains a few dozen standard Unix - commands). - - GNU findutils (contains - find). - - GNU diffutils (contains diff, - cmp). - - GNU sed. - - GNU grep. - - GNU awk. - - GNU tar. - - gzip, bzip2 - and xz. - - GNU Make. It has been patched to provide - nested output that can be fed into the - nix-log2xml command and - log2html stylesheet to create a structured, - readable output of the build steps performed by - Make. - - Bash. This is the shell used for all builders in - the Nix Packages collection. Not using /bin/sh - removes a large source of portability problems. - - The patch - command. - - - - - -On Linux, stdenv also includes the -patchelf utility. - -
- - -
Specifying dependencies - - - As described in the Nix manual, almost any *.drv store path in a derivation's attribute set will induce a dependency on that derivation. - mkDerivation, however, takes a few attributes intended to, between them, include all the dependencies of a package. - This is done both for structure and consistency, but also so that certain other setup can take place. - For example, certain dependencies need their bin directories added to the PATH. - That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. - See for details. - - - Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated. - The platform distinctions are motivated by cross compilation; see for exactly what each platform means. - - The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: - As a general programming principle, dependencies are always specified as interfaces, not concrete implementation. - - But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. - For now, the run-time/build-time distinction is just a hint for mental clarity, but in the future it perhaps could be enforced. - - - The extension of PATH with dependencies, alluded to above, proceeds according to the relative platforms alone. - The process is carried out only for dependencies whose host platform matches the new derivation's build platform–i.e. which run on the platform where the new derivation will be built. - - Currently, that means for native builds all dependencies are put on the PATH. - But in the future that may not be the case for sake of matching cross: - the platforms would be assumed to be unique for native and cross builds alike, so only the depsBuild* and nativeBuildDependencies dependencies would affect the PATH. - - For each dependency dep of those dependencies, dep/bin, if present, is added to the PATH environment variable. - - - The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency. - Nix itself already takes a package's transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency. - - - It is important to note dependencies are not necessary propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up. - The exact rules for dependency propagation can be given by assigning each sort of dependency two integers based one how it's host and target platforms are offset from the depending derivation's platforms. - Those offsets are given are given below in the descriptions of each dependency list attribute. - Algorithmically, we traverse propagated inputs, accumulating every propagated dep's propagated deps and adjusting them to account for the "shift in perspective" described by the current dep's platform offsets. - This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. - We also prune transitive deps whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd. - - - We can define the process precisely with Natural Deduction using the inference rules. - This probably seems a bit obtuse, but so is the bash code that actually implements it! - - The findInputs function, currently residing in pkgs/stdenv/generic/setup.sh, implements the propagation logic. - - They're confusing in very different ways so...hopefully if something doesn't make sense in one presentation, it does in the other! - + +
+
+ Tools provided by <literal>stdenv</literal> + + + The standard environment provides the following packages: + + + + The GNU C Compiler, configured with C and C++ support. + + + + + GNU coreutils (contains a few dozen standard Unix commands). + + + + + GNU findutils (contains find). + + + + + GNU diffutils (contains diff, cmp). + + + + + GNU sed. + + + + + GNU grep. + + + + + GNU awk. + + + + + GNU tar. + + + + + gzip, bzip2 and + xz. + + + + + GNU Make. It has been patched to provide nested output + that can be fed into the nix-log2xml command and + log2html stylesheet to create a structured, readable + output of the build steps performed by Make. + + + + + Bash. This is the shell used for all builders in the Nix Packages + collection. Not using /bin/sh removes a large source + of portability problems. + + + + + The patch command. + + + + + + + On Linux, stdenv also includes the + patchelf utility. + +
+
+ Specifying dependencies + + + As described in the Nix manual, almost any *.drv store + path in a derivation's attribute set will induce a dependency on that + derivation. mkDerivation, however, takes a few attributes + intended to, between them, include all the dependencies of a package. This + is done both for structure and consistency, but also so that certain other + setup can take place. For example, certain dependencies need their bin + directories added to the PATH. That is built-in, but other + setup is done via a pluggable mechanism that works in conjunction with these + dependency attributes. See for details. + + + + Dependencies can be broken down along three axes: their host and target + platforms relative to the new derivation's, and whether they are propagated. + The platform distinctions are motivated by cross compilation; see + for exactly what each platform means. + + + The build platform is ignored because it is a mere implementation detail + of the package satisfying the dependency: As a general programming + principle, dependencies are always specified as + interfaces, not concrete implementation. + + + But even if one is not cross compiling, the platforms imply whether or not + the dependency is needed at run-time or build-time, a concept that makes + perfect sense outside of cross compilation. For now, the run-time/build-time + distinction is just a hint for mental clarity, but in the future it perhaps + could be enforced. + + + + The extension of PATH with dependencies, alluded to above, + proceeds according to the relative platforms alone. The process is carried + out only for dependencies whose host platform matches the new derivation's + build platform–i.e. which run on the platform where the new derivation + will be built. + + + Currently, that means for native builds all dependencies are put on the + PATH. But in the future that may not be the case for sake + of matching cross: the platforms would be assumed to be unique for native + and cross builds alike, so only the depsBuild* and + nativeBuildDependencies dependencies would affect the + PATH. + + + For each dependency dep of those dependencies, + dep/bin, if present, is + added to the PATH environment variable. + + + + The dependency is propagated when it forces some of its other-transitive + (non-immediate) downstream dependencies to also take it on as an immediate + dependency. Nix itself already takes a package's transitive dependencies + into account, but this propagation ensures nixpkgs-specific infrastructure + like setup hooks (mentioned above) also are run as if the propagated + dependency. + + + + It is important to note dependencies are not necessary propagated as the + same sort of dependency that they were before, but rather as the + corresponding sort so that the platform rules still line up. The exact rules + for dependency propagation can be given by assigning each sort of dependency + two integers based one how it's host and target platforms are offset from + the depending derivation's platforms. Those offsets are given are given + below in the descriptions of each dependency list attribute. + Algorithmically, we traverse propagated inputs, accumulating every + propagated dep's propagated deps and adjusting them to account for the + "shift in perspective" described by the current dep's platform offsets. This + results in sort a transitive closure of the dependency relation, with the + offsets being approximately summed when two dependency links are combined. + We also prune transitive deps whose combined offsets go out-of-bounds, which + can be viewed as a filter over that transitive closure removing dependencies + that are blatantly absurd. + + + + We can define the process precisely with + Natural + Deduction using the inference rules. This probably seems a bit + obtuse, but so is the bash code that actually implements it! + + + The findInputs function, currently residing in + pkgs/stdenv/generic/setup.sh, implements the + propagation logic. + + + They're confusing in very different ways so...hopefully if something doesn't + make sense in one presentation, it does in the other! + let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) propagated-dep(h0, t0, A, B) @@ -239,7 +300,7 @@ h0 + t1 in {-1, 0, 1} propagated-dep(mapOffset(h0, t0, h1), mapOffset(h0, t0, t1), A, C) - + let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) dep(h0, _, A, B) @@ -250,1139 +311,1565 @@ h0 + t1 in {-1, 0, -1} propagated-dep(mapOffset(h0, t0, h1), mapOffset(h0, t0, t1), A, C) - + propagated-dep(h, t, A, B) -------------------------------------- Propagated deps count as deps dep(h, t, A, B) - Some explanation of this monstrosity is in order. - In the common case, the target offset of a dependency is the successor to the target offset: t = h + 1. - That means that: - + Some explanation of this monstrosity is in order. In the common case, the + target offset of a dependency is the successor to the target offset: + t = h + 1. That means that: + let f(h, t, i) = i + (if i <= 0 then h else t - 1) let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1) let f(h, h + 1, i) = i + (if i <= 0 then h else h) let f(h, h + 1, i) = i + h - This is where the "sum-like" comes from above: - We can just sum all the host offset to get the host offset of the transitive dependency. - The target offset is the transitive dep is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one; - it can be ignored as it doesn't add any new information. - - - Because of the bounds checks, the uncommon cases are h = t and h + 2 = t. - In the former case, the motivation for mapOffset is that since its host and target platforms are the same, no transitive dep of it should be able to "discover" an offset greater than its reduced target offsets. - mapOffset effectively "squashes" all its transitive dependencies' offsets so that none will ever be greater than the target offset of the original h = t package. - In the other case, h + 1 is skipped over between the host and target offsets. - Instead of squashing the offsets, we need to "rip" them apart so no transitive dependencies' offset is that one. - - -Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the needing package is unaware of. -The offset bounds checking and definition of mapOffset together ensure that this is the case. -Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they cannot be relevant. -From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency. - - - - Variables specifying dependencies - + This is where the "sum-like" comes from above: We can just sum all the host + offset to get the host offset of the transitive dependency. The target + offset is the transitive dep is simply the host offset + 1, just as it was + with the dependencies composed to make this transitive one; it can be + ignored as it doesn't add any new information. + + + + Because of the bounds checks, the uncommon cases are h = + t and h + 2 = t. In the former case, the + motivation for mapOffset is that since its host and + target platforms are the same, no transitive dep of it should be able to + "discover" an offset greater than its reduced target offsets. + mapOffset effectively "squashes" all its transitive + dependencies' offsets so that none will ever be greater than the target + offset of the original h = t package. In the other case, + h + 1 is skipped over between the host and target + offsets. Instead of squashing the offsets, we need to "rip" them apart so no + transitive dependencies' offset is that one. + + + + Overall, the unifying theme here is that propagation shouldn't be + introducing transitive dependencies involving platforms the needing package + is unaware of. The offset bounds checking and definition of + mapOffset together ensure that this is the case. + Discovering a new offset is discovering a new platform, and since those + platforms weren't in the derivation "spec" of the needing package, they + cannot be relevant. From a capability perspective, we can imagine that the + host and target platforms of a package are the capabilities a package + requires, and the depending package must provide the capability to the + dependency. + + + + Variables specifying dependencies - depsBuildBuild - - - A list of dependencies whose host and target platforms are the new derivation's build platform. - This means a -1 host and -1 target offset from the new derivation's platforms. - They are programs/libraries used at build time that furthermore produce programs/libraries also used at build time. - If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it in nativeBuildInputsinstead. - The most common use for this buildPackages.stdenv.cc, the default C compiler for this role. - That example crops up more than one might think in old commonly used C libraries. - - - Since these packages are able to be run at build time, that are always added to the PATH, as described above. - But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. - This isn't currently enforced, but could be in the future. - - - - - - nativeBuildInputs + + depsBuildBuild + - - A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's host platform. - This means a -1 host offset and 0 target offset from the new derivation's platforms. - They are programs/libraries used at build time that, if they are a compiler or similar tool, produce code to run at run time—i.e. tools used to build the new derivation. - If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild or depsBuildTarget. - This would be called depsBuildHost but for historical continuity. - - - Since these packages are able to be run at build time, that are added to the PATH, as described above. - But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies. - This isn't currently enforced, but could be in the future. - + + A list of dependencies whose host and target platforms are the new + derivation's build platform. This means a -1 host and + -1 target offset from the new derivation's platforms. + They are programs/libraries used at build time that furthermore produce + programs/libraries also used at build time. If the dependency doesn't + care about the target platform (i.e. isn't a compiler or similar tool), + put it in nativeBuildInputsinstead. The most common + use for this buildPackages.stdenv.cc, the default C + compiler for this role. That example crops up more than one might think + in old commonly used C libraries. + + + Since these packages are able to be run at build time, that are always + added to the PATH, as described above. But since these + packages are only guaranteed to be able to run then, they shouldn't + persist as run-time dependencies. This isn't currently enforced, but + could be in the future. + - - - - depsBuildTarget + + + + nativeBuildInputs + - - A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's target platform. - This means a -1 host offset and 1 target offset from the new derivation's platforms. - They are programs used at build time that produce code to run at run with code produced by the depending package. - Most commonly, these would tools used to build the runtime or standard library the currently-being-built compiler will inject into any code it compiles. - In many cases, the currently-being built compiler is itself employed for that task, but when that compiler won't run (i.e. its build and host platform differ) this is not possible. - Other times, the compiler relies on some other tool, like binutils, that is always built separately so the dependency is unconditional. - - - This is a somewhat confusing dependency to wrap ones head around, and for good reason. - As the only one where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage two away from the current one. - It and it's use-case go hand in hand and are both considered poor form: - try not to need this sort dependency, and try not avoid building standard libraries / runtimes in the same derivation as the compiler produces code using them. - Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would. - In short, do not use this attribute unless you are packaging a compiler and are sure it is needed. + + A list of dependencies whose host platform is the new derivation's build + platform, and target platform is the new derivation's host platform. This + means a -1 host offset and 0 target + offset from the new derivation's platforms. They are programs/libraries + used at build time that, if they are a compiler or similar tool, produce + code to run at run time—i.e. tools used to build the new derivation. If + the dependency doesn't care about the target platform (i.e. isn't a + compiler or similar tool), put it here, rather than in + depsBuildBuild or depsBuildTarget. + This would be called depsBuildHost but for historical + continuity. - Since these packages are able to be run at build time, that are added to the PATH, as described above. - But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies. - This isn't currently enforced, but could be in the future. + Since these packages are able to be run at build time, that are added to + the PATH, as described above. But since these packages + only are guaranteed to be able to run then, they shouldn't persist as + run-time dependencies. This isn't currently enforced, but could be in the + future. - - - - depsHostHost - - A list of dependencies whose host and target platforms match the new derivation's host platform. - This means a both 0 host offset and 0 target offset from the new derivation's host platform. - These are packages used at run-time to generate code also used at run-time. - In practice, that would usually be tools used by compilers for metaprogramming/macro systems, or libraries used by the macros/metaprogramming code itself. - It's always preferable to use a depsBuildBuild dependency in the derivation being built than a depsHostHost on the tool doing the building for this purpose. - - - - - buildInputs + + + + depsBuildTarget + - - A list of dependencies whose host platform and target platform match the new derivation's. - This means a 0 host offset and 1 target offset from the new derivation's host platform. - This would be called depsHostTarget but for historical continuity. - If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild. - - - These often are programs/libraries used by the new derivation at run-time, but that isn't always the case. - For example, the machine code in a statically linked library is only used at run time, but the derivation containing the library is only needed at build time. - Even in the dynamic case, the library may also be needed at build time to appease the linker. - + + A list of dependencies whose host platform is the new derivation's build + platform, and target platform is the new derivation's target platform. + This means a -1 host offset and 1 + target offset from the new derivation's platforms. They are programs used + at build time that produce code to run at run with code produced by the + depending package. Most commonly, these would tools used to build the + runtime or standard library the currently-being-built compiler will + inject into any code it compiles. In many cases, the currently-being + built compiler is itself employed for that task, but when that compiler + won't run (i.e. its build and host platform differ) this is not possible. + Other times, the compiler relies on some other tool, like binutils, that + is always built separately so the dependency is unconditional. + + + This is a somewhat confusing dependency to wrap ones head around, and for + good reason. As the only one where the platform offsets are not adjacent + integers, it requires thinking of a bootstrapping stage + two away from the current one. It and it's use-case + go hand in hand and are both considered poor form: try not to need this + sort dependency, and try not avoid building standard libraries / runtimes + in the same derivation as the compiler produces code using them. Instead + strive to build those like a normal library, using the newly-built + compiler just as a normal library would. In short, do not use this + attribute unless you are packaging a compiler and are sure it is needed. + + + Since these packages are able to be run at build time, that are added to + the PATH, as described above. But since these packages + only are guaranteed to be able to run then, they shouldn't persist as + run-time dependencies. This isn't currently enforced, but could be in the + future. + - - - - depsTargetTarget - - A list of dependencies whose host platform matches the new derivation's target platform. - This means a 1 offset from the new derivation's platforms. - These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. - It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset]. - Do not use this attribute unless you are packaging a compiler and are sure it is needed. - - - - - depsBuildBuildPropagated - - The propagated equivalent of depsBuildBuild. - This perhaps never ought to be used, but it is included for consistency [see below for the others]. - - - - - propagatedNativeBuildInputs - - The propagated equivalent of nativeBuildInputs. - This would be called depsBuildHostPropagated but for historical continuity. - For example, if package Y has propagatedNativeBuildInputs = [X], and package Z has buildInputs = [Y], then package Z will be built as if it included package X in its nativeBuildInputs. - If instead, package Z has nativeBuildInputs = [Y], then Z will be built as if it included X in the depsBuildBuild of package Z, because of the sum of the two -1 host offsets. - - - - - depsBuildTargetPropagated - - The propagated equivalent of depsBuildTarget. - This is prefixed for the same reason of alerting potential users. - - - - - depsHostHostPropagated - - The propagated equivalent of depsHostHost. - - - - - propagatedBuildInputs - - The propagated equivalent of buildInputs. - This would be called depsHostTargetPropagated but for historical continuity. - - - - - depsTargetTarget - - The propagated equivalent of depsTargetTarget. - This is prefixed for the same reason of alerting potential users. - - - - - -
- - -
Attributes - - - Variables affecting <literal>stdenv</literal> - initialisation - - - NIX_DEBUG - - A natural number indicating how much information to log. - If set to 1 or higher, stdenv will print moderate debug information during the build. - In particular, the gcc and ld wrapper scripts will print out the complete command line passed to the wrapped tools. - If set to 6 or higher, the stdenv setup script will be run with set -x tracing. - If set to 7 or higher, the gcc and ld wrapper scripts will also be run with set -x tracing. - - - - - - - Variables affecting build properties - - - enableParallelBuilding + + + + depsHostHost + - If set to true, stdenv will - pass specific flags to make and other build tools to - enable parallel building with up to build-cores - workers. - - Unless set to false, some build systems with good - support for parallel building including cmake, - meson, and qmake will set it to - true. + + A list of dependencies whose host and target platforms match the new + derivation's host platform. This means a both 0 host + offset and 0 target offset from the new derivation's + host platform. These are packages used at run-time to generate code also + used at run-time. In practice, that would usually be tools used by + compilers for metaprogramming/macro systems, or libraries used by the + macros/metaprogramming code itself. It's always preferable to use a + depsBuildBuild dependency in the derivation being + built than a depsHostHost on the tool doing the + building for this purpose. + - - - - preferLocalBuild - If set, specifies that the package is so lightweight - in terms of build operations (e.g. write a text file from a Nix string - to the store) that there's no need to look for it in binary caches -- - it's faster to just build it locally. It also tells Hydra and other - facilities that this package doesn't need to be exported in binary - caches (noone would use it, after all). - - - - - - Special variables - - - passthru - This is an attribute set which can be filled with arbitrary - values. For example: - - -passthru = { - foo = "bar"; - baz = { - value1 = 4; - value2 = 5; - }; -} - - - - - Values inside it are not passed to the builder, so you can change - them without triggering a rebuild. However, they can be accessed outside of a - derivation directly, as if they were set inside a derivation itself, e.g. - hello.baz.value1. We don't specify any usage or - schema of passthru - it is meant for values that would be - useful outside the derivation in other parts of a Nix expression (e.g. in other - derivations). An example would be to convey some specific dependency of your - derivation which contains a program with plugins support. Later, others who - make derivations with plugins can use passed-through dependency to ensure that - their plugin would be binary-compatible with built program. - - - - -
- - -
Phases - -The generic builder has a number of phases. -Package builds are split into phases to make it easier to override -specific parts of the build (e.g., unpacking the sources or installing -the binaries). Furthermore, it allows a nicer presentation of build -logs in the Nix build farm. - -Each phase can be overridden in its entirety either by setting -the environment variable -namePhase to a string -containing some shell commands to be executed, or by redefining the -shell function -namePhase. The former -is convenient to override a phase from the derivation, while the -latter is convenient from a build script. - -However, typically one only wants to add some -commands to a phase, e.g. by defining postInstall -or preFixup, as skipping some of the default actions -may have unexpected consequences. - - - -
Controlling -phases - -There are a number of variables that control what phases are -executed and in what order: - - - Variables affecting phase control - - - phases + + + + buildInputs + - Specifies the phases. You can change the order in which - phases are executed, or add new phases, by setting this - variable. If it’s not set, the default value is used, which is - $prePhases unpackPhase patchPhase $preConfigurePhases - configurePhase $preBuildPhases buildPhase checkPhase - $preInstallPhases installPhase fixupPhase $preDistPhases - distPhase $postPhases. - - - Usually, if you just want to add a few phases, it’s more - convenient to set one of the variables below (such as - preInstallPhases), as you then don’t specify - all the normal phases. + + A list of dependencies whose host platform and target platform match the + new derivation's. This means a 0 host offset and + 1 target offset from the new derivation's host + platform. This would be called depsHostTarget but for + historical continuity. If the dependency doesn't care about the target + platform (i.e. isn't a compiler or similar tool), put it here, rather + than in depsBuildBuild. + + + These often are programs/libraries used by the new derivation at + run-time, but that isn't always the case. For + example, the machine code in a statically linked library is only used at + run time, but the derivation containing the library is only needed at + build time. Even in the dynamic case, the library may also be needed at + build time to appease the linker. + - - - - prePhases + + + + depsTargetTarget + - Additional phases executed before any of the default phases. + + A list of dependencies whose host platform matches the new derivation's + target platform. This means a 1 offset from the new + derivation's platforms. These are packages that run on the target + platform, e.g. the standard library or run-time deps of standard library + that a compiler insists on knowing about. It's poor form in almost all + cases for a package to depend on another from a future stage [future + stage corresponding to positive offset]. Do not use this attribute unless + you are packaging a compiler and are sure it is needed. + - - - - preConfigurePhases + + + + depsBuildBuildPropagated + - Additional phases executed just before the configure phase. + + The propagated equivalent of depsBuildBuild. This + perhaps never ought to be used, but it is included for consistency [see + below for the others]. + - - - - preBuildPhases + + + + propagatedNativeBuildInputs + - Additional phases executed just before the build phase. + + The propagated equivalent of nativeBuildInputs. This + would be called depsBuildHostPropagated but for + historical continuity. For example, if package Y has + propagatedNativeBuildInputs = [X], and package + Z has buildInputs = [Y], then + package Z will be built as if it included package + X in its nativeBuildInputs. If + instead, package Z has nativeBuildInputs = + [Y], then Z will be built as if it included + X in the depsBuildBuild of package + Z, because of the sum of the two -1 + host offsets. + - - - - preInstallPhases + + + + depsBuildTargetPropagated + - Additional phases executed just before the install phase. + + The propagated equivalent of depsBuildTarget. This is + prefixed for the same reason of alerting potential users. + - - - - preFixupPhases + + + + depsHostHostPropagated + - Additional phases executed just before the fixup phase. + + The propagated equivalent of depsHostHost. + - - - - preDistPhases + + + + propagatedBuildInputs + - Additional phases executed just before the distribution phase. + + The propagated equivalent of buildInputs. This would + be called depsHostTargetPropagated but for historical + continuity. + - - - - postPhases + + + + depsTargetTarget + - Additional phases executed after any of the default - phases. + + The propagated equivalent of depsTargetTarget. This is + prefixed for the same reason of alerting potential users. + - - - - - - -
- - -
The unpack phase - -The unpack phase is responsible for unpacking the source code of -the package. The default implementation of -unpackPhase unpacks the source files listed in -the src environment variable to the current directory. -It supports the following files by default: - - - - - Tar files - These can optionally be compressed using - gzip (.tar.gz, - .tgz or .tar.Z), - bzip2 (.tar.bz2 or - .tbz2) or xz - (.tar.xz or - .tar.lzma). - - - - Zip files - Zip files are unpacked using - unzip. However, unzip is - not in the standard environment, so you should add it to - buildInputs yourself. - - - - Directories in the Nix store - These are simply copied to the current directory. - The hash part of the file name is stripped, - e.g. /nix/store/1wydxgby13cz...-my-sources - would be copied to - my-sources. - - - - -Additional file types can be supported by setting the -unpackCmd variable (see below). - - - - - Variables controlling the unpack phase - - - srcs / src - The list of source files or directories to be - unpacked or copied. One of these must be set. - - - - sourceRoot - After running unpackPhase, - the generic builder changes the current directory to the directory - created by unpacking the sources. If there are multiple source - directories, you should set sourceRoot to the - name of the intended directory. - - - - setSourceRoot - Alternatively to setting - sourceRoot, you can set - setSourceRoot to a shell command to be - evaluated by the unpack phase after the sources have been - unpacked. This command must set - sourceRoot. - - - - preUnpack - Hook executed at the start of the unpack - phase. - - - - postUnpack - Hook executed at the end of the unpack - phase. - - - - dontMakeSourcesWritable - If set to 1, the unpacked - sources are not made - writable. By default, they are made writable to prevent problems - with read-only sources. For example, copied store directories - would be read-only without this. - - - - unpackCmd - The unpack phase evaluates the string - $unpackCmd for any unrecognised file. The path - to the current source file is contained in the - curSrc variable. - - - - -
- - -
The patch phase - -The patch phase applies the list of patches defined in the -patches variable. - - - Variables controlling the patch phase - - - patches - The list of patches. They must be in the format - accepted by the patch command, and may - optionally be compressed using gzip - (.gz), bzip2 - (.bz2) or xz - (.xz). - - - - patchFlags - Flags to be passed to patch. - If not set, the argument is used, which - causes the leading directory component to be stripped from the - file names in each patch. - - - - prePatch - Hook executed at the start of the patch - phase. - - - - postPatch - Hook executed at the end of the patch - phase. - - - - -
- - -
The configure phase - -The configure phase prepares the source tree for building. The -default configurePhase runs -./configure (typically an Autoconf-generated -script) if it exists. - - - Variables controlling the configure phase - - - configureScript - The name of the configure script. It defaults to - ./configure if it exists; otherwise, the - configure phase is skipped. This can actually be a command (like - perl ./Configure.pl). - - - - configureFlags - A list of strings passed as additional arguments to the - configure script. - - - - configureFlagsArray - A shell array containing additional arguments - passed to the configure script. You must use this instead of - configureFlags if the arguments contain - spaces. - - - - dontAddPrefix - By default, the flag - --prefix=$prefix is added to the configure - flags. If this is undesirable, set this variable to - true. - - - - prefix - The prefix under which the package must be - installed, passed via the option to the - configure script. It defaults to - . - - - - dontAddDisableDepTrack - By default, the flag - --disable-dependency-tracking is added to the - configure flags to speed up Automake-based builds. If this is - undesirable, set this variable to true. - - - - dontFixLibtool - By default, the configure phase applies some - special hackery to all files called ltmain.sh - before running the configure script in order to improve the purity - of Libtool-based packagesIt clears the - sys_lib_*search_path - variables in the Libtool script to prevent Libtool from using - libraries in /usr/lib and - such.. If this is undesirable, set this - variable to true. - - - - dontDisableStatic - By default, when the configure script has - , the option - is added to the configure flags. - If this is undesirable, set this variable to - true. - - - - configurePlatforms - - By default, when cross compiling, the configure script has and passed. - Packages can instead pass [ "build" "host" "target" ] or a subset to control exactly which platform flags are passed. - Compilers and other tools should use this to also pass the target platform, for example. - Eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity. - - - - - preConfigure - Hook executed at the start of the configure - phase. - - - - postConfigure - Hook executed at the end of the configure - phase. - - - - - -
- - -
The build phase - -The build phase is responsible for actually building the package -(e.g. compiling it). The default buildPhase -simply calls make if a file named -Makefile, makefile or -GNUmakefile exists in the current directory (or -the makefile is explicitly set); otherwise it does -nothing. - - - Variables controlling the build phase - - - dontBuild - Set to true to skip the build phase. - - - - makefile - The file name of the Makefile. - - - - makeFlags - A list of strings passed as additional flags to - make. These flags are also used by the default - install and check phase. For setting make flags specific to the - build phase, use buildFlags (see below). - - -makeFlags = [ "PREFIX=$(out)" ]; - - - The flags are quoted in bash, but environment variables can - be specified by using the make syntax. - - - - makeFlagsArray - A shell array containing additional arguments - passed to make. You must use this instead of - makeFlags if the arguments contain - spaces, e.g. - - -makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") - - - Note that shell arrays cannot be passed through environment - variables, so you cannot set makeFlagsArray in - a derivation attribute (because those are passed through - environment variables): you have to define them in shell - code. - - - - buildFlags / buildFlagsArray - A list of strings passed as additional flags to - make. Like makeFlags and - makeFlagsArray, but only used by the build - phase. - - - - preBuild - Hook executed at the start of the build - phase. - - - - postBuild - Hook executed at the end of the build - phase. - - - - - - -You can set flags for make through the -makeFlags variable. - -Before and after running make, the hooks -preBuild and postBuild are -called, respectively. - -
- - -
The check phase - -The check phase checks whether the package was built correctly -by running its test suite. The default -checkPhase calls make check, -but only if the doCheck variable is enabled. - - - Variables controlling the check phase - - - doCheck - - Controls whether the check phase is executed. - By default it is skipped, but if doCheck is set to true, the check phase is usually executed. - Thus you should set doCheck = true; in the derivation to enable checks. - The exception is cross compilation. - Cross compiled builds never run tests, no matter how doCheck is set, - as the newly-built program won't run on the platform used to build it. - - - - - makeFlags / - makeFlagsArray / - makefile - See the build phase for details. - - - - checkTarget - The make target that runs the tests. Defaults to - check. - - - - checkFlags / checkFlagsArray - A list of strings passed as additional flags to - make. Like makeFlags and - makeFlagsArray, but only used by the check - phase. - - - - preCheck - Hook executed at the start of the check - phase. - - - - postCheck - Hook executed at the end of the check - phase. - - - - - -
- - -
The install phase - -The install phase is responsible for installing the package in -the Nix store under out. The default -installPhase creates the directory -$out and calls make -install. - - - Variables controlling the install phase - - - makeFlags / - makeFlagsArray / - makefile - See the build phase for details. - - - - installTargets - The make targets that perform the installation. - Defaults to install. Example: - - -installTargets = "install-bin install-doc"; + + +
+
+ Attributes + + + Variables affecting <literal>stdenv</literal> initialisation + + + NIX_DEBUG + + + + A natural number indicating how much information to log. If set to 1 or + higher, stdenv will print moderate debug information + during the build. In particular, the gcc and + ld wrapper scripts will print out the complete command + line passed to the wrapped tools. If set to 6 or higher, the + stdenv setup script will be run with set + -x tracing. If set to 7 or higher, the gcc + and ld wrapper scripts will also be run with + set -x tracing. + + + + - - - - - installFlags / installFlagsArray - A list of strings passed as additional flags to - make. Like makeFlags and - makeFlagsArray, but only used by the install - phase. - - - - preInstall - Hook executed at the start of the install - phase. - - - - postInstall - Hook executed at the end of the install - phase. - - - - - -
- - -
The fixup phase - -The fixup phase performs some (Nix-specific) post-processing -actions on the files installed under $out by the -install phase. The default fixupPhase does the -following: - - - - It moves the man/, - doc/ and info/ - subdirectories of $out to - share/. - - It strips libraries and executables of debug - information. - - On Linux, it applies the patchelf - command to ELF executables and libraries to remove unused - directories from the RPATH in order to prevent - unnecessary runtime dependencies. - - It rewrites the interpreter paths of shell scripts - to paths found in PATH. E.g., - /usr/bin/perl will be rewritten to - /nix/store/some-perl/bin/perl - found in PATH. - - - - - - - Variables controlling the fixup phase - - - dontStrip - If set, libraries and executables are not - stripped. By default, they are. - - - dontStripHost - - Like dontStripHost, but only affects the strip command targetting the package's host platform. - Useful when supporting cross compilation, but otherwise feel free to ignore. - - - - dontStripTarget - - Like dontStripHost, but only affects the strip command targetting the packages' target platform. - Useful when supporting cross compilation, but otherwise feel free to ignore. - - - - - dontMoveSbin - If set, files in $out/sbin are not moved - to $out/bin. By default, they are. - - - - stripAllList - List of directories to search for libraries and - executables from which all symbols should be - stripped. By default, it’s empty. Stripping all symbols is - risky, since it may remove not just debug symbols but also ELF - information necessary for normal execution. - - - - stripAllFlags - Flags passed to the strip - command applied to the files in the directories listed in - stripAllList. Defaults to - (i.e. ). - - - - stripDebugList - List of directories to search for libraries and - executables from which only debugging-related symbols should be - stripped. It defaults to lib bin - sbin. - - - - stripDebugFlags - Flags passed to the strip - command applied to the files in the directories listed in - stripDebugList. Defaults to - - (i.e. ). - - - - dontPatchELF - If set, the patchelf command is - not used to remove unnecessary RPATH entries. - Only applies to Linux. - - - - dontPatchShebangs - If set, scripts starting with - #! do not have their interpreter paths - rewritten to paths in the Nix store. - - - - forceShare - The list of directories that must be moved from - $out to $out/share. - Defaults to man doc info. - - - - setupHook - A package can export a setup hook by setting this - variable. The setup hook, if defined, is copied to - $out/nix-support/setup-hook. Environment - variables are then substituted in it using substituteAll. - - - - preFixup - Hook executed at the start of the fixup - phase. - - - - postFixup - Hook executed at the end of the fixup - phase. - - - - separateDebugInfo - If set to true, the standard - environment will enable debug information in C/C++ builds. After - installation, the debug information will be separated from the - executables and stored in the output named - debug. (This output is enabled automatically; - you don’t need to set the outputs attribute - explicitly.) To be precise, the debug information is stored in - debug/lib/debug/.build-id/XX/YYYY…, - where XXYYYY… is the build - ID of the binary — a SHA-1 hash of the contents of - the binary. Debuggers like GDB use the build ID to look up the - separated debug information. - - For example, with GDB, you can add + + Variables affecting build properties + + + enableParallelBuilding + + + + If set to true, stdenv will pass + specific flags to make and other build tools to enable + parallel building with up to build-cores workers. + + + Unless set to false, some build systems with good + support for parallel building including cmake, + meson, and qmake will set it to + true. + + + + + + preferLocalBuild + + + + If set, specifies that the package is so lightweight in terms of build + operations (e.g. write a text file from a Nix string to the store) that + there's no need to look for it in binary caches -- it's faster to just + build it locally. It also tells Hydra and other facilities that this + package doesn't need to be exported in binary caches (noone would use it, + after all). + + + + + + Special variables + + + passthru + + + + This is an attribute set which can be filled with arbitrary values. For + example: -set debug-file-directory ~/.nix-profile/lib/debug +passthru = { + foo = "bar"; + baz = { + value1 = 4; + value2 = 5; + }; +} - - to ~/.gdbinit. GDB will then be able to find - debug information installed via nix-env - -i. - + + + Values inside it are not passed to the builder, so you can change them + without triggering a rebuild. However, they can be accessed outside of a + derivation directly, as if they were set inside a derivation itself, e.g. + hello.baz.value1. We don't specify any usage or schema + of passthru - it is meant for values that would be + useful outside the derivation in other parts of a Nix expression (e.g. in + other derivations). An example would be to convey some specific + dependency of your derivation which contains a program with plugins + support. Later, others who make derivations with plugins can use + passed-through dependency to ensure that their plugin would be + binary-compatible with built program. + - - - - -
- -
The installCheck phase - -The installCheck phase checks whether the package was installed -correctly by running its test suite against the installed directories. -The default installCheck calls make -installcheck. - - - Variables controlling the installCheck phase - - - doInstallCheck - - Controls whether the installCheck phase is executed. - By default it is skipped, but if doInstallCheck is set to true, the installCheck phase is usually executed. - Thus you should set doInstallCheck = true; in the derivation to enable install checks. - The exception is cross compilation. - Cross compiled builds never run tests, no matter how doInstallCheck is set, - as the newly-built program won't run on the platform used to build it. - - - - - preInstallCheck - Hook executed at the start of the installCheck - phase. - - - - postInstallCheck - Hook executed at the end of the installCheck - phase. - - - - -
- -
The distribution -phase - -The distribution phase is intended to produce a source -distribution of the package. The default -distPhase first calls make -dist, then it copies the resulting source tarballs to -$out/tarballs/. This phase is only executed if -the attribute doDist is set. - - - Variables controlling the distribution phase - - - distTarget - The make target that produces the distribution. - Defaults to dist. - - - - distFlags / distFlagsArray - Additional flags passed to - make. - - - - tarballs - The names of the source distribution files to be - copied to $out/tarballs/. It can contain - shell wildcards. The default is - *.tar.gz. - - - - dontCopyDist - If set, no files are copied to - $out/tarballs/. - - - - preDist - Hook executed at the start of the distribution - phase. - - - - postDist - Hook executed at the end of the distribution - phase. - - - - - -
- - -
- - -
Shell functions - -The standard environment provides a number of useful -functions. - - - - - - makeWrapper - executable - wrapperfile - args - Constructs a wrapper for a program with various - possible arguments. For example: - + + +
+
+ Phases + + + The generic builder has a number of phases. Package + builds are split into phases to make it easier to override specific parts of + the build (e.g., unpacking the sources or installing the binaries). + Furthermore, it allows a nicer presentation of build logs in the Nix build + farm. + + + + Each phase can be overridden in its entirety either by setting the + environment variable namePhase + to a string containing some shell commands to be executed, or by redefining + the shell function namePhase. + The former is convenient to override a phase from the derivation, while the + latter is convenient from a build script. However, typically one only wants + to add some commands to a phase, e.g. by defining + postInstall or preFixup, as skipping + some of the default actions may have unexpected consequences. + + +
+ Controlling phases + + + There are a number of variables that control what phases are executed and + in what order: + + Variables affecting phase control + + + phases + + + + Specifies the phases. You can change the order in which phases are + executed, or add new phases, by setting this variable. If it’s not + set, the default value is used, which is $prePhases + unpackPhase patchPhase $preConfigurePhases configurePhase + $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase + fixupPhase $preDistPhases distPhase $postPhases. + + + Usually, if you just want to add a few phases, it’s more convenient + to set one of the variables below (such as + preInstallPhases), as you then don’t specify all + the normal phases. + + + + + + prePhases + + + + Additional phases executed before any of the default phases. + + + + + + preConfigurePhases + + + + Additional phases executed just before the configure phase. + + + + + + preBuildPhases + + + + Additional phases executed just before the build phase. + + + + + + preInstallPhases + + + + Additional phases executed just before the install phase. + + + + + + preFixupPhases + + + + Additional phases executed just before the fixup phase. + + + + + + preDistPhases + + + + Additional phases executed just before the distribution phase. + + + + + + postPhases + + + + Additional phases executed after any of the default phases. + + + + + +
+ +
+ The unpack phase + + + The unpack phase is responsible for unpacking the source code of the + package. The default implementation of unpackPhase + unpacks the source files listed in the src environment + variable to the current directory. It supports the following files by + default: + + + + Tar files + + + + These can optionally be compressed using gzip + (.tar.gz, .tgz or + .tar.Z), bzip2 + (.tar.bz2, .tbz2 or + .tbz) or xz + (.tar.xz, .tar.lzma or + .txz). + + + + + + Zip files + + + + Zip files are unpacked using unzip. However, + unzip is not in the standard environment, so you + should add it to buildInputs yourself. + + + + + + Directories in the Nix store + + + + These are simply copied to the current directory. The hash part of the + file name is stripped, e.g. + /nix/store/1wydxgby13cz...-my-sources would be + copied to my-sources. + + + + + Additional file types can be supported by setting the + unpackCmd variable (see below). + + + + + + Variables controlling the unpack phase + + + srcs / src + + + + The list of source files or directories to be unpacked or copied. One of + these must be set. + + + + + + sourceRoot + + + + After running unpackPhase, the generic builder + changes the current directory to the directory created by unpacking the + sources. If there are multiple source directories, you should set + sourceRoot to the name of the intended directory. + + + + + + setSourceRoot + + + + Alternatively to setting sourceRoot, you can set + setSourceRoot to a shell command to be evaluated by + the unpack phase after the sources have been unpacked. This command must + set sourceRoot. + + + + + + preUnpack + + + + Hook executed at the start of the unpack phase. + + + + + + postUnpack + + + + Hook executed at the end of the unpack phase. + + + + + + dontMakeSourcesWritable + + + + If set to 1, the unpacked sources are + not made writable. By default, they are made + writable to prevent problems with read-only sources. For example, copied + store directories would be read-only without this. + + + + + + unpackCmd + + + + The unpack phase evaluates the string $unpackCmd for + any unrecognised file. The path to the current source file is contained + in the curSrc variable. + + + + +
+ +
+ The patch phase + + + The patch phase applies the list of patches defined in the + patches variable. + + + + Variables controlling the patch phase + + + patches + + + + The list of patches. They must be in the format accepted by the + patch command, and may optionally be compressed using + gzip (.gz), + bzip2 (.bz2) or + xz (.xz). + + + + + + patchFlags + + + + Flags to be passed to patch. If not set, the argument + is used, which causes the leading directory + component to be stripped from the file names in each patch. + + + + + + prePatch + + + + Hook executed at the start of the patch phase. + + + + + + postPatch + + + + Hook executed at the end of the patch phase. + + + + +
+ +
+ The configure phase + + + The configure phase prepares the source tree for building. The default + configurePhase runs ./configure + (typically an Autoconf-generated script) if it exists. + + + + Variables controlling the configure phase + + + configureScript + + + + The name of the configure script. It defaults to + ./configure if it exists; otherwise, the configure + phase is skipped. This can actually be a command (like perl + ./Configure.pl). + + + + + + configureFlags + + + + A list of strings passed as additional arguments to the configure + script. + + + + + + configureFlagsArray + + + + A shell array containing additional arguments passed to the configure + script. You must use this instead of configureFlags + if the arguments contain spaces. + + + + + + dontAddPrefix + + + + By default, the flag --prefix=$prefix is added to the + configure flags. If this is undesirable, set this variable to true. + + + + + + prefix + + + + The prefix under which the package must be installed, passed via the + option to the configure script. It defaults to + . + + + + + + dontAddDisableDepTrack + + + + By default, the flag --disable-dependency-tracking is + added to the configure flags to speed up Automake-based builds. If this + is undesirable, set this variable to true. + + + + + + dontFixLibtool + + + + By default, the configure phase applies some special hackery to all + files called ltmain.sh before running the configure + script in order to improve the purity of Libtool-based packages + + + It clears the + sys_lib_*search_path + variables in the Libtool script to prevent Libtool from using + libraries in /usr/lib and such. + + + . If this is undesirable, set this variable to true. + + + + + + dontDisableStatic + + + + By default, when the configure script has + , the option + is added to the configure flags. + + + If this is undesirable, set this variable to true. + + + + + + configurePlatforms + + + + By default, when cross compiling, the configure script has + and passed. + Packages can instead pass [ "build" "host" "target" ] + or a subset to control exactly which platform flags are passed. + Compilers and other tools should use this to also pass the target + platform, for example. + + + Eventually these will be passed when in native builds too, to improve + determinism: build-time guessing, as is done today, is a risk of + impurity. + + + + + + + + preConfigure + + + + Hook executed at the start of the configure phase. + + + + + + postConfigure + + + + Hook executed at the end of the configure phase. + + + + +
+ +
+ The build phase + + + The build phase is responsible for actually building the package (e.g. + compiling it). The default buildPhase simply calls + make if a file named Makefile, + makefile or GNUmakefile exists in + the current directory (or the makefile is explicitly + set); otherwise it does nothing. + + + + Variables controlling the build phase + + + dontBuild + + + + Set to true to skip the build phase. + + + + + + makefile + + + + The file name of the Makefile. + + + + + + checkInputs + + + + A list of dependencies used by the phase. This gets included in + buildInputs when doCheck is set. + + + + + + makeFlags + + + + A list of strings passed as additional flags to make. + These flags are also used by the default install and check phase. For + setting make flags specific to the build phase, use + buildFlags (see below). + +makeFlags = [ "PREFIX=$(out)" ]; + + + + The flags are quoted in bash, but environment variables can be + specified by using the make syntax. + + + + + + + + makeFlagsArray + + + + A shell array containing additional arguments passed to + make. You must use this instead of + makeFlags if the arguments contain spaces, e.g. + +makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") + + Note that shell arrays cannot be passed through environment variables, + so you cannot set makeFlagsArray in a derivation + attribute (because those are passed through environment variables): you + have to define them in shell code. + + + + + + buildFlags / buildFlagsArray + + + + A list of strings passed as additional flags to make. + Like makeFlags and makeFlagsArray, + but only used by the build phase. + + + + + + preBuild + + + + Hook executed at the start of the build phase. + + + + + + postBuild + + + + Hook executed at the end of the build phase. + + + + + + + You can set flags for make through the + makeFlags variable. + + + + Before and after running make, the hooks + preBuild and postBuild are called, + respectively. + +
+ +
+ The check phase + + + The check phase checks whether the package was built correctly by running + its test suite. The default checkPhase calls + make check, but only if the doCheck + variable is enabled. + + + + Variables controlling the check phase + + + doCheck + + + + Controls whether the check phase is executed. By default it is skipped, + but if doCheck is set to true, the check phase is + usually executed. Thus you should set +doCheck = true; + in the derivation to enable checks. The exception is cross compilation. + Cross compiled builds never run tests, no matter how + doCheck is set, as the newly-built program won't run + on the platform used to build it. + + + + + + makeFlags / makeFlagsArray / makefile + + + + See the build phase for details. + + + + + + checkTarget + + + + The make target that runs the tests. Defaults to + check. + + + + + + checkFlags / checkFlagsArray + + + + A list of strings passed as additional flags to make. + Like makeFlags and makeFlagsArray, + but only used by the check phase. + + + + + + preCheck + + + + Hook executed at the start of the check phase. + + + + + + postCheck + + + + Hook executed at the end of the check phase. + + + + +
+ +
+ The install phase + + + The install phase is responsible for installing the package in the Nix + store under out. The default + installPhase creates the directory + $out and calls make install. + + + + Variables controlling the install phase + + + makeFlags / makeFlagsArray / makefile + + + + See the build phase for details. + + + + + + installTargets + + + + The make targets that perform the installation. Defaults to + install. Example: + +installTargets = "install-bin install-doc"; + + + + + + installFlags / installFlagsArray + + + + A list of strings passed as additional flags to make. + Like makeFlags and makeFlagsArray, + but only used by the install phase. + + + + + + preInstall + + + + Hook executed at the start of the install phase. + + + + + + postInstall + + + + Hook executed at the end of the install phase. + + + + +
+ +
+ The fixup phase + + + The fixup phase performs some (Nix-specific) post-processing actions on the + files installed under $out by the install phase. The + default fixupPhase does the following: + + + + It moves the man/, doc/ and + info/ subdirectories of $out to + share/. + + + + + It strips libraries and executables of debug information. + + + + + On Linux, it applies the patchelf command to ELF + executables and libraries to remove unused directories from the + RPATH in order to prevent unnecessary runtime + dependencies. + + + + + It rewrites the interpreter paths of shell scripts to paths found in + PATH. E.g., /usr/bin/perl will be + rewritten to + /nix/store/some-perl/bin/perl + found in PATH. + + + + + + + Variables controlling the fixup phase + + + dontStrip + + + + If set, libraries and executables are not stripped. By default, they + are. + + + + + + dontStripHost + + + + Like dontStripHost, but only affects the + strip command targetting the package's host platform. + Useful when supporting cross compilation, but otherwise feel free to + ignore. + + + + + + dontStripTarget + + + + Like dontStripHost, but only affects the + strip command targetting the packages' target + platform. Useful when supporting cross compilation, but otherwise feel + free to ignore. + + + + + + dontMoveSbin + + + + If set, files in $out/sbin are not moved to + $out/bin. By default, they are. + + + + + + stripAllList + + + + List of directories to search for libraries and executables from which + all symbols should be stripped. By default, it’s + empty. Stripping all symbols is risky, since it may remove not just + debug symbols but also ELF information necessary for normal execution. + + + + + + stripAllFlags + + + + Flags passed to the strip command applied to the + files in the directories listed in stripAllList. + Defaults to (i.e. ). + + + + + + stripDebugList + + + + List of directories to search for libraries and executables from which + only debugging-related symbols should be stripped. It defaults to + lib bin sbin. + + + + + + stripDebugFlags + + + + Flags passed to the strip command applied to the + files in the directories listed in stripDebugList. + Defaults to (i.e. ). + + + + + + dontPatchELF + + + + If set, the patchelf command is not used to remove + unnecessary RPATH entries. Only applies to Linux. + + + + + + dontPatchShebangs + + + + If set, scripts starting with #! do not have their + interpreter paths rewritten to paths in the Nix store. + + + + + + forceShare + + + + The list of directories that must be moved from + $out to $out/share. Defaults + to man doc info. + + + + + + setupHook + + + + A package can export a setup + hook by setting this variable. The setup hook, if defined, is + copied to $out/nix-support/setup-hook. Environment + variables are then substituted in it using + substituteAll. + + + + + + preFixup + + + + Hook executed at the start of the fixup phase. + + + + + + postFixup + + + + Hook executed at the end of the fixup phase. + + + + + + separateDebugInfo + + + + If set to true, the standard environment will enable + debug information in C/C++ builds. After installation, the debug + information will be separated from the executables and stored in the + output named debug. (This output is enabled + automatically; you don’t need to set the outputs + attribute explicitly.) To be precise, the debug information is stored in + debug/lib/debug/.build-id/XX/YYYY…, + where XXYYYY… is the build + ID of the binary — a SHA-1 hash of the contents of the + binary. Debuggers like GDB use the build ID to look up the separated + debug information. + + + For example, with GDB, you can add + +set debug-file-directory ~/.nix-profile/lib/debug + + to ~/.gdbinit. GDB will then be able to find debug + information installed via nix-env -i. + + + + +
+ +
+ The installCheck phase + + + The installCheck phase checks whether the package was installed correctly + by running its test suite against the installed directories. The default + installCheck calls make + installcheck. + + + + Variables controlling the installCheck phase + + + doInstallCheck + + + + Controls whether the installCheck phase is executed. By default it is + skipped, but if doInstallCheck is set to true, the + installCheck phase is usually executed. Thus you should set +doInstallCheck = true; + in the derivation to enable install checks. The exception is cross + compilation. Cross compiled builds never run tests, no matter how + doInstallCheck is set, as the newly-built program + won't run on the platform used to build it. + + + + + + installCheckInputs + + + + A list of dependencies used by the phase. This gets included in + buildInputs when doInstallCheck is + set. + + + + + + preInstallCheck + + + + Hook executed at the start of the installCheck phase. + + + + + + postInstallCheck + + + + Hook executed at the end of the installCheck phase. + + + + +
+ +
+ The distribution phase + + + The distribution phase is intended to produce a source distribution of the + package. The default distPhase first calls + make dist, then it copies the resulting source tarballs + to $out/tarballs/. This phase is only executed if the + attribute doDist is set. + + + + Variables controlling the distribution phase + + + distTarget + + + + The make target that produces the distribution. Defaults to + dist. + + + + + + distFlags / distFlagsArray + + + + Additional flags passed to make. + + + + + + tarballs + + + + The names of the source distribution files to be copied to + $out/tarballs/. It can contain shell wildcards. The + default is *.tar.gz. + + + + + + dontCopyDist + + + + If set, no files are copied to $out/tarballs/. + + + + + + preDist + + + + Hook executed at the start of the distribution phase. + + + + + + postDist + + + + Hook executed at the end of the distribution phase. + + + + +
+
+
+ Shell functions + + + The standard environment provides a number of useful functions. + + + + + + makeWrapper executable wrapperfile args + + + + Constructs a wrapper for a program with various possible arguments. For + example: # adds `FOOBAR=baz` to `$out/bin/foo`’s environment makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz @@ -1392,662 +1879,810 @@ makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz # (via string replacements or in `configurePhase`). makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]} - - There’s many more kinds of arguments, they are documented in - nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh. - - wrapProgram is a convenience function you probably - want to use most of the time. - + There’s many more kinds of arguments, they are documented in + nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh. + + + wrapProgram is a convenience function you probably + want to use most of the time. + - - - - - substitute - infile - outfile - subs - + + + + substitute infile outfile subs + - Performs string substitution on the contents of + + Performs string substitution on the contents of infile, writing the result to - outfile. The substitutions in + outfile. The substitutions in subs are of the following form: - - - - - s1 - s2 - Replace every occurrence of the string - s1 by - s2. - - - - - varName - Replace every occurrence of - @varName@ by - the contents of the environment variable - varName. This is useful for - generating files from templates, using - @...@ in the - template as placeholders. - - - - - varName - s - Replace every occurrence of - @varName@ by - the string s. - - - - - - - Example: - + + + + s1 s2 + + + + Replace every occurrence of the string s1 + by s2. + + + + + + varName + + + + Replace every occurrence of + @varName@ by the + contents of the environment variable + varName. This is useful for generating + files from templates, using + @...@ in the template + as placeholders. + + + + + + varName s + + + + Replace every occurrence of + @varName@ by the string + s. + + + + + + + Example: substitute ./foo.in ./foo.out \ --replace /usr/bin/bar $bar/bin/bar \ --replace "a string containing spaces" "some other text" \ --subst-var someVar - - - - substitute is implemented using the + + + substitute is implemented using the replace - command. Unlike with the sed command, you - don’t have to worry about escaping special characters. It - supports performing substitutions on binary files (such as - executables), though there you’ll probably want to make sure - that the replacement string is as long as the replaced - string. - + command. Unlike with the sed command, you don’t have + to worry about escaping special characters. It supports performing + substitutions on binary files (such as executables), though there + you’ll probably want to make sure that the replacement string is as + long as the replaced string. + - - - - - substituteInPlace - file - subs - Like substitute, but performs - the substitutions in place on the file - file. - - - - - substituteAll - infile - outfile - Replaces every occurrence of - @varName@, where - varName is any environment variable, in - infile, writing the result to - outfile. For instance, if - infile has the contents - + + + + substituteInPlace file subs + + + + Like substitute, but performs the substitutions in + place on the file file. + + + + + + substituteAll infile outfile + + + + Replaces every occurrence of + @varName@, where + varName is any environment variable, in + infile, writing the result to + outfile. For instance, if + infile has the contents #! @bash@/bin/sh PATH=@coreutils@/bin echo @foo@ - - and the environment contains - bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39 - and - coreutils=/nix/store/68afga4khv0w...-coreutils-6.12, - but does not contain the variable foo, then the - output will be - + and the environment contains + bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39 and + coreutils=/nix/store/68afga4khv0w...-coreutils-6.12, + but does not contain the variable foo, then the output + will be #! /nix/store/bmwp0q28cf21...-bash-3.2-p39/bin/sh PATH=/nix/store/68afga4khv0w...-coreutils-6.12/bin echo @foo@ - - That is, no substitution is performed for undefined variables. - - Environment variables that start with an uppercase letter or an - underscore are filtered out, - to prevent global variables (like HOME) or private - variables (like __ETC_PROFILE_DONE) from accidentally - getting substituted. - The variables also have to be valid bash “names”, as - defined in the bash manpage (alphanumeric or _, - must not start with a number). - - - - - - substituteAllInPlace - file - Like substituteAll, but performs - the substitutions in place on the file - file. - - - - - stripHash - path - Strips the directory and hash part of a store - path, outputting the name part to stdout. - For example: - + That is, no substitution is performed for undefined variables. + + + Environment variables that start with an uppercase letter or an + underscore are filtered out, to prevent global variables (like + HOME) or private variables (like + __ETC_PROFILE_DONE) from accidentally getting + substituted. The variables also have to be valid bash “names”, as + defined in the bash manpage (alphanumeric or _, must + not start with a number). + + + + + + substituteAllInPlace file + + + + Like substituteAll, but performs the substitutions + in place on the file file. + + + + + + stripHash path + + + + Strips the directory and hash part of a store path, outputting the name + part to stdout. For example: # prints coreutils-8.24 stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" - - If you wish to store the result in another variable, then the - following idiom may be useful: - + If you wish to store the result in another variable, then the following + idiom may be useful: name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" someVar=$(stripHash $name) - - - - - - - wrapProgram - executable - makeWrapperArgs - Convenience function for makeWrapper - that automatically creates a sane wrapper file - - It takes all the same arguments as makeWrapper, - except for --argv0. - - It cannot be applied multiple times, since it will overwrite the wrapper - file. + + + + + + wrapProgram executable makeWrapperArgs + + + + Convenience function for makeWrapper that + automatically creates a sane wrapper file It takes all the same arguments + as makeWrapper, except for --argv0. + + + It cannot be applied multiple times, since it will overwrite the wrapper + file. + - - - - - -
- - -
Package setup hooks - - - Nix itself considers a build-time dependency merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. - In most cases, that is fine, and the downstream derivation can deal with it's own dependencies. - But for a few common tasks, that would result in almost every package doing the same sort of setup work---depending not on the package itself, but entirely on which dependencies were used. - - - In order to alleviate this burden, the setup hook>mechanism was written, where any package can include a shell script that [by convention rather than enforcement by Nix], any downstream reverse-dependency will source as part of its build process. - That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. - No boilerplate mirroring the list of dependencies is needed. - - - The Setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. - The combination of its power and implicit use may be expedient, but isn't without costs. - Nix itself is unchanged, but the spirit of adding dependencies being effect-free is violated even if the letter isn't. - For example, if a derivation path is mentioned more than once, Nix itself doesn't care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. - However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). - More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. - - - The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. - For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libaries and headers. - This is done by defining a bash function, and appending its name to one of - envBuildBuildHooks`, - envBuildHostHooks`, - envBuildTargetHooks`, - envHostHostHooks`, - envHostTargetHooks`, or - envTargetTargetHooks`. - These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis). - - - Packages adding a hook should not hard code a specific hook, but rather choose a variable relative to how they are included. - Returning to the C compiler wrapper example, if it itself is an n dependency, then it only wants to accumulate flags from n + 1 dependencies, as only those ones match the compiler's target platform. - The hostOffset variable is defined with the current dependency's host offset targetOffset with its target offset, before it's setup hook is sourced. - Additionally, since most environment hooks don't care about the target platform, - That means the setup hook can append to the right bash array by doing something like - + + +
+
+ Package setup hooks + + + Nix itself considers a build-time dependency merely something that should + previously be built and accessible at build time—packages themselves are + on their own to perform any additional setup. In most cases, that is fine, + and the downstream derivation can deal with it's own dependencies. But for a + few common tasks, that would result in almost every package doing the same + sort of setup work---depending not on the package itself, but entirely on + which dependencies were used. + + + + In order to alleviate this burden, the setup + hook>mechanism was written, where any package can include a + shell script that [by convention rather than enforcement by Nix], any + downstream reverse-dependency will source as part of its build process. That + allows the downstream dependency to merely specify its dependencies, and + lets those dependencies effectively initialize themselves. No boilerplate + mirroring the list of dependencies is needed. + + + + The Setup hook mechanism is a bit of a sledgehammer though: a powerful + feature with a broad and indiscriminate area of effect. The combination of + its power and implicit use may be expedient, but isn't without costs. Nix + itself is unchanged, but the spirit of adding dependencies being effect-free + is violated even if the letter isn't. For example, if a derivation path is + mentioned more than once, Nix itself doesn't care and simply makes sure the + dependency derivation is already built just the same—depending is just + needing something to exist, and needing is idempotent. However, a dependency + specified twice will have its setup hook run twice, and that could easily + change the build environment (though a well-written setup hook will + therefore strive to be idempotent so this is in fact not observable). More + broadly, setup hooks are anti-modular in that multiple dependencies, whether + the same or different, should not interfere and yet their setup hooks may + well do so. + + + + The most typical use of the setup hook is actually to add other hooks which + are then run (i.e. after all the setup hooks) on each dependency. For + example, the C compiler wrapper's setup hook feeds itself flags for each + dependency that contains relevant libaries and headers. This is done by + defining a bash function, and appending its name to one of + envBuildBuildHooks`, envBuildHostHooks`, + envBuildTargetHooks`, envHostHostHooks`, + envHostTargetHooks`, or envTargetTargetHooks`. + These 6 bash variables correspond to the 6 sorts of dependencies by platform + (there's 12 total but we ignore the propagated/non-propagated axis). + + + + Packages adding a hook should not hard code a specific hook, but rather + choose a variable relative to how they are included. + Returning to the C compiler wrapper example, if it itself is an + n dependency, then it only wants to accumulate flags from + n + 1 dependencies, as only those ones match the + compiler's target platform. The hostOffset variable is + defined with the current dependency's host offset + targetOffset with its target offset, before it's setup hook + is sourced. Additionally, since most environment hooks don't care about the + target platform, That means the setup hook can append to the right bash + array by doing something like + addEnvHooks "$hostOffset" myBashFunction - - - The existence of setups hooks has long been documented and packages inside Nixpkgs are free to use these mechanism. - Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. - Because of the existing issues with this system, there's little benefit from mandating it be stable for any period of time. - - - Here are some packages that provide a setup hook. - Since the mechanism is modular, this probably isn't an exhaustive list. - Then again, since the mechanism is only to be used as a last resort, it might be. - - - - Bintools Wrapper - + + + + The existence of setups hooks has long been documented + and packages inside Nixpkgs are free to use these mechanism. Other packages, + however, should not rely on these mechanisms not changing between Nixpkgs + versions. Because of the existing issues with this system, there's little + benefit from mandating it be stable for any period of time. + + + + Here are some packages that provide a setup hook. Since the mechanism is + modular, this probably isn't an exhaustive list. Then again, since the + mechanism is only to be used as a last resort, it might be. + + + + Bintools Wrapper + + - Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. - These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. - [The "Bintools" name is supposed to be a compromise between "Binutils" and "cctools" not denoting any specific implementation.] - Specifically, the underlying bintools package, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by Bintools Wrapper. - Packages typically depend on CC Wrapper, which in turn (at run time) depends on Bintools Wrapper. + Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous + purposes. These are GNU Binutils when targetting Linux, and a mix of + cctools and GNU binutils for Darwin. [The "Bintools" name is supposed to + be a compromise between "Binutils" and "cctools" not denoting any + specific implementation.] Specifically, the underlying bintools package, + and a C standard library (glibc or Darwin's libSystem, just for the + dynamic loader) are all fed in, and dependency finding, hardening (see + below), and purity checks for each are handled by Bintools Wrapper. + Packages typically depend on CC Wrapper, which in turn (at run time) + depends on Bintools Wrapper. - Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out. - For example, it shouldn't care about about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux). - Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand. - It is currently accomplished by collecting directories of host-platform dependencies (i.e. buildInputs and nativeBuildInputs) in environment variables. - Bintools Wrapper's setup hook causes any lib and lib64 subdirectories to be added to NIX_LDFLAGS. - Since CC Wrapper and Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to CC Wrapper. - But CC Wrapper's code, by contrast, has quite lengthy comments. - Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync. + Bintools Wrapper was only just recently split off from CC Wrapper, so + the division of labor is still being worked out. For example, it + shouldn't care about about the C standard library, but just take a + derivation with the dynamic loader (which happens to be the glibc on + linux). Dependency finding however is a task both wrappers will continue + to need to share, and probably the most important to understand. It is + currently accomplished by collecting directories of host-platform + dependencies (i.e. buildInputs and + nativeBuildInputs) in environment variables. Bintools + Wrapper's setup hook causes any lib and + lib64 subdirectories to be added to + NIX_LDFLAGS. Since CC Wrapper and Bintools Wrapper use + the same strategy, most of the Bintools Wrapper code is sparsely + commented and refers to CC Wrapper. But CC Wrapper's code, by contrast, + has quite lengthy comments. Bintools Wrapper merely cites those, rather + than repeating them, to avoid falling out of sync. - A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables full-fill which purpose. - They are defined to just be the base name of the tools, under the assumption that Bintools Wrapper's binaries will be on the path. - Firstly, this helps poorly-written packages, e.g. ones that look for just gcc when CC isn't defined yet clang is to be used. - Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use. - - Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times. - As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms. - - BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional Bintools Wrappers, properly disambiguating them. + A final task of the setup hook is defining a number of standard + environment variables to tell build systems which executables full-fill + which purpose. They are defined to just be the base name of the tools, + under the assumption that Bintools Wrapper's binaries will be on the + path. Firstly, this helps poorly-written packages, e.g. ones that look + for just gcc when CC isn't defined yet + clang is to be used. Secondly, this helps packages + not get confused when cross-compiling, in which case multiple Bintools + Wrappers may simultaneously be in use. + + + Each wrapper targets a single platform, so if binaries for multiple + platforms are needed, the underlying binaries must be wrapped multiple + times. As this is a property of the wrapper itself, the multiple + wrappings are needed whether or not the same underlying binaries can + target multiple platforms. + + + BUILD_- and TARGET_-prefixed versions of + the normal environment variable are defined for the additional Bintools + Wrappers, properly disambiguating them. - A problem with this final task is that Bintools Wrapper is honest and defines LD as ld. - Most packages, however, firstly use the C compiler for linking, secondly use LD anyways, defining it as the C compiler, and thirdly, only so define LD when it is undefined as a fallback. - This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won't override yet doesn't want to use. - The workaround is to define, just for the problematic package, LD as the C compiler. - A good way to do this would be preConfigure = "LD=$CC". + A problem with this final task is that Bintools Wrapper is honest and + defines LD as ld. Most packages, + however, firstly use the C compiler for linking, secondly use + LD anyways, defining it as the C compiler, and thirdly, + only so define LD when it is undefined as a fallback. + This triple-threat means Bintools Wrapper will break those packages, as + LD is already defined as the actual linker which the package won't + override yet doesn't want to use. The workaround is to define, just for + the problematic package, LD as the C compiler. A good way + to do this would be preConfigure = "LD=$CC". - - - - - CC Wrapper - + + + + + CC Wrapper + + - CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. - Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper. - Packages typically depend on CC Wrapper, which in turn (at run time) depends on Bintools Wrapper. + CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. + Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C + standard library (glibc or Darwin's libSystem, just for the dynamic + loader) are all fed in, and dependency finding, hardening (see below), + and purity checks for each are handled by CC Wrapper. Packages typically + depend on CC Wrapper, which in turn (at run time) depends on Bintools + Wrapper. - Dependency finding is undoubtedly the main task of CC Wrapper. - This works just like Bintools Wrapper, except that any include subdirectory of any relevant dependency is added to NIX_CFLAGS_COMPILE. - The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished. + Dependency finding is undoubtedly the main task of CC Wrapper. This + works just like Bintools Wrapper, except that any + include subdirectory of any relevant dependency is + added to NIX_CFLAGS_COMPILE. The setup hook itself + contains some lengthy comments describing the exact convoluted mechanism + by which this is accomplished. - CC Wrapper also like Bintools Wrapper defines standard environment variables with the names of the tools it wraps, for the same reasons described above. - Importantly, while it includes a cc symlink to the c compiler for portability, the CC will be defined using the compiler's "real name" (i.e. gcc or clang). - This helps lousy build systems that inspect on the name of the compiler rather than run it. + CC Wrapper also like Bintools Wrapper defines standard environment + variables with the names of the tools it wraps, for the same reasons + described above. Importantly, while it includes a cc + symlink to the c compiler for portability, the CC will be + defined using the compiler's "real name" (i.e. gcc or + clang). This helps lousy build systems that inspect + on the name of the compiler rather than run it. - - - - - Perl - + + + + + Perl + + - Adds the lib/site_perl subdirectory of each build input to the PERL5LIB environment variable. - For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable. + Adds the lib/site_perl subdirectory of each build + input to the PERL5LIB environment variable. For instance, + if buildInputs contains Perl, then the + lib/site_perl subdirectory of each input is added + to the PERL5LIB environment variable. - - - - - Python - Adds the - lib/${python.libPrefix}/site-packages subdirectory of - each build input to the PYTHONPATH environment - variable. - - - - pkg-config - Adds the lib/pkgconfig and - share/pkgconfig subdirectories of each - build input to the PKG_CONFIG_PATH environment - variable. - - - - Automake - Adds the share/aclocal - subdirectory of each build input to the ACLOCAL_PATH - environment variable. - - - - Autoconf - The autoreconfHook derivation adds - autoreconfPhase, which runs autoreconf, libtoolize and - automake, essentially preparing the configure script in autotools-based - builds. - - - - libxml2 - Adds every file named - catalog.xml found under the - xml/dtd and xml/xsl - subdirectories of each build input to the - XML_CATALOG_FILES environment - variable. - - - - teTeX / TeX Live - Adds the share/texmf-nix - subdirectory of each build input to the TEXINPUTS - environment variable. - - - - Qt 4 - Sets the QTDIR environment variable - to Qt’s path. - - - - gdk-pixbuf - Exports GDK_PIXBUF_MODULE_FILE - environment variable the the builder. Add librsvg package - to buildInputs to get svg support. - - - - GHC - Creates a temporary package database and registers - every Haskell build input in it (TODO: how?). - - - - GStreamer - Adds the - GStreamer plugins subdirectory of - each build input to the GST_PLUGIN_SYSTEM_PATH_1_0 or - GST_PLUGIN_SYSTEM_PATH environment variable. - - - - paxctl - Defines the paxmark helper for - setting per-executable PaX flags on Linux (where it is available by - default; on all other platforms, paxmark is a no-op). - For example, to disable secure memory protections on the executable - foo: - + + + + + Python + + + + Adds the lib/${python.libPrefix}/site-packages + subdirectory of each build input to the PYTHONPATH + environment variable. + + + + + + pkg-config + + + + Adds the lib/pkgconfig and + share/pkgconfig subdirectories of each build input + to the PKG_CONFIG_PATH environment variable. + + + + + + Automake + + + + Adds the share/aclocal subdirectory of each build + input to the ACLOCAL_PATH environment variable. + + + + + + Autoconf + + + + The autoreconfHook derivation adds + autoreconfPhase, which runs autoreconf, libtoolize + and automake, essentially preparing the configure script in + autotools-based builds. + + + + + + libxml2 + + + + Adds every file named catalog.xml found under the + xml/dtd and xml/xsl + subdirectories of each build input to the + XML_CATALOG_FILES environment variable. + + + + + + teTeX / TeX Live + + + + Adds the share/texmf-nix subdirectory of each build + input to the TEXINPUTS environment variable. + + + + + + Qt 4 + + + + Sets the QTDIR environment variable to Qt’s path. + + + + + + gdk-pixbuf + + + + Exports GDK_PIXBUF_MODULE_FILE environment variable the + the builder. Add librsvg package to buildInputs to + get svg support. + + + + + + GHC + + + + Creates a temporary package database and registers every Haskell build + input in it (TODO: how?). + + + + + + GStreamer + + + + Adds the GStreamer plugins subdirectory of each build input to the + GST_PLUGIN_SYSTEM_PATH_1_0 or + GST_PLUGIN_SYSTEM_PATH environment variable. + + + + + + paxctl + + + + Defines the paxmark helper for setting per-executable + PaX flags on Linux (where it is available by default; on all other + platforms, paxmark is a no-op). For example, to + disable secure memory protections on the executable + foo: + postFixup = '' paxmark m $out/bin/foo ''; - The m flag is the most common flag and is typically - required for applications that employ JIT compilation or otherwise need to - execute code generated at run-time. Disabling PaX protections should be - considered a last resort: if possible, problematic features should be - disabled or patched to work with PaX. - - - - autoPatchelfHook - This is a special setup hook which helps in packaging - proprietary software in that it automatically tries to find missing shared - library dependencies of ELF files. All packages within the - runtimeDependencies environment variable are unconditionally - added to executables, which is useful for programs that use - - dlopen - 3 - - to load libraries at runtime. - - - - - - -
- - -
Purity in Nixpkgs - -[measures taken to prevent dependencies on packages outside the -store, and what you can do to prevent them] - -GCC doesn't search in locations such as -/usr/include. In fact, attempts to add such -directories through the flag are filtered out. -Likewise, the linker (from GNU binutils) doesn't search in standard -locations such as /usr/lib. Programs built on -Linux are linked against a GNU C Library that likewise doesn't search -in the default system locations. - -
- -
Hardening in Nixpkgs - -There are flags available to harden packages at compile or link-time. -These can be toggled using the stdenv.mkDerivation parameters -hardeningDisable and hardeningEnable. - - - -Both parameters take a list of flags as strings. The special -"all" flag can be passed to hardeningDisable -to turn off all hardening. These flags can also be used as environment variables -for testing or development purposes. - - -The following flags are enabled by default and might require disabling with -hardeningDisable if the program to package is incompatible. - - - - - - format - Adds the compiler options. At present, - this warns about calls to printf and - scanf functions where the format string is - not a string literal and there are no format arguments, as in - printf(foo);. This may be a security hole - if the format string came from untrusted input and contains - %n. - - This needs to be turned off or fixed for errors similar to: - - + The m flag is the most common flag and is typically + required for applications that employ JIT compilation or otherwise need + to execute code generated at run-time. Disabling PaX protections should + be considered a last resort: if possible, problematic features should be + disabled or patched to work with PaX. + + + + + + autoPatchelfHook + + + + This is a special setup hook which helps in packaging proprietary + software in that it automatically tries to find missing shared library + dependencies of ELF files. All packages within the + runtimeDependencies environment variable are + unconditionally added to executables, which is useful for programs that + use + dlopen + 3 to load libraries at runtime. + + + + + +
+
+ Purity in Nixpkgs + + + [measures taken to prevent dependencies on packages outside the store, and + what you can do to prevent them] + + + + GCC doesn't search in locations such as /usr/include. + In fact, attempts to add such directories through the + flag are filtered out. Likewise, the linker (from GNU binutils) doesn't + search in standard locations such as /usr/lib. Programs + built on Linux are linked against a GNU C Library that likewise doesn't + search in the default system locations. + +
+
+ Hardening in Nixpkgs + + + There are flags available to harden packages at compile or link-time. These + can be toggled using the stdenv.mkDerivation parameters + hardeningDisable and hardeningEnable. + + + + Both parameters take a list of flags as strings. The special + "all" flag can be passed to + hardeningDisable to turn off all hardening. These flags + can also be used as environment variables for testing or development + purposes. + + + + The following flags are enabled by default and might require disabling with + hardeningDisable if the program to package is + incompatible. + + + + + + format + + + + Adds the compiler options. At present, this warns + about calls to printf and scanf + functions where the format string is not a string literal and there are + no format arguments, as in printf(foo);. This may be a + security hole if the format string came from untrusted input and contains + %n. + + + This needs to be turned off or fixed for errors similar to: + + /tmp/nix-build-zynaddsubfx-2.5.2.drv-0/zynaddsubfx-2.5.2/src/UI/guimain.cpp:571:28: error: format not a string literal and no format arguments [-Werror=format-security] printf(help_message); ^ cc1plus: some warnings being treated as errors - - - - - stackprotector + + + + + + stackprotector + - Adds the - compiler options. This adds safety checks against stack overwrites - rendering many potential code injection attacks into aborting situations. - In the best case this turns code injection vulnerabilities into denial - of service or into non-issues (depending on the application). - - This needs to be turned off or fixed for errors similar to: - - + + Adds the compiler options. This adds safety checks + against stack overwrites rendering many potential code injection attacks + into aborting situations. In the best case this turns code injection + vulnerabilities into denial of service or into non-issues (depending on + the application). + + + This needs to be turned off or fixed for errors similar to: + + bin/blib.a(bios_console.o): In function `bios_handle_cup': /tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail' - - - - - fortify + + + + + + fortify + - Adds the compiler - options. During code generation the compiler knows a great deal of - information about buffer sizes (where possible), and attempts to replace - insecure unlimited length buffer function calls with length-limited ones. - This is especially useful for old, crufty code. Additionally, format - strings in writable memory that contain '%n' are blocked. If an application - depends on such a format string, it will need to be worked around. - - - Additionally, some warnings are enabled which might trigger build - failures if compiler warnings are treated as errors in the package build. - In this case, set to - . - - This needs to be turned off or fixed for errors similar to: - - + + Adds the compiler options. + During code generation the compiler knows a great deal of information + about buffer sizes (where possible), and attempts to replace insecure + unlimited length buffer function calls with length-limited ones. This is + especially useful for old, crufty code. Additionally, format strings in + writable memory that contain '%n' are blocked. If an application depends + on such a format string, it will need to be worked around. + + + Additionally, some warnings are enabled which might trigger build + failures if compiler warnings are treated as errors in the package build. + In this case, set to + . + + + This needs to be turned off or fixed for errors similar to: + + malloc.c:404:15: error: return type is an incomplete type malloc.c:410:19: error: storage size of 'ms' isn't known - + strdup.h:22:1: error: expected identifier or '(' before '__extension__' - + strsep.c:65:23: error: register name not specified for 'delim' - + installwatch.c:3751:5: error: conflicting types for '__open_2' - + fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments - - - - pic + + + + pic + - Adds the compiler options. This options adds - support for position independent code in shared libraries and thus making - ASLR possible. - Most notably, the Linux kernel, kernel modules and other code - not running in an operating system environment like boot loaders won't - build with PIC enabled. The compiler will is most cases complain that - PIC is not supported for a specific build. - - - This needs to be turned off or fixed for assembler errors similar to: - - + + Adds the compiler options. This options adds + support for position independent code in shared libraries and thus making + ASLR possible. + + + Most notably, the Linux kernel, kernel modules and other code not running + in an operating system environment like boot loaders won't build with PIC + enabled. The compiler will is most cases complain that PIC is not + supported for a specific build. + + + This needs to be turned off or fixed for assembler errors similar to: + + ccbLfRgg.s: Assembler messages: ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF' - - - - strictoverflow + + + + strictoverflow + - Signed integer overflow is undefined behaviour according to the C - standard. If it happens, it is an error in the program as it should check - for overflow before it can happen, not afterwards. GCC provides built-in - functions to perform arithmetic with overflow checking, which are correct - and faster than any custom implementation. As a workaround, the option - makes gcc behave as if signed - integer overflows were defined. - - - This flag should not trigger any build or runtime errors. + + Signed integer overflow is undefined behaviour according to the C + standard. If it happens, it is an error in the program as it should check + for overflow before it can happen, not afterwards. GCC provides built-in + functions to perform arithmetic with overflow checking, which are correct + and faster than any custom implementation. As a workaround, the option + makes gcc behave as if signed + integer overflows were defined. + + + This flag should not trigger any build or runtime errors. + - - - - relro + + + + relro + - Adds the linker option. During program - load, several ELF memory sections need to be written to by the linker, - but can be turned read-only before turning over control to the program. - This prevents some GOT (and .dtors) overwrite attacks, but at least the - part of the GOT used by the dynamic linker (.got.plt) is still vulnerable. - - - This flag can break dynamic shared object loading. For instance, the - module systems of Xorg and OpenCV are incompatible with this flag. In almost - all cases the bindnow flag must also be disabled and - incompatible programs typically fail with similar errors at runtime. + + Adds the linker option. During program load, + several ELF memory sections need to be written to by the linker, but can + be turned read-only before turning over control to the program. This + prevents some GOT (and .dtors) overwrite attacks, but at least the part + of the GOT used by the dynamic linker (.got.plt) is still vulnerable. + + + This flag can break dynamic shared object loading. For instance, the + module systems of Xorg and OpenCV are incompatible with this flag. In + almost all cases the bindnow flag must also be + disabled and incompatible programs typically fail with similar errors at + runtime. + - - - - bindnow + + + + bindnow + - Adds the linker option. During program - load, all dynamic symbols are resolved, allowing for the complete GOT to - be marked read-only (due to relro). This prevents GOT - overwrite attacks. For very large applications, this can incur some - performance loss during initial load while symbols are resolved, but this - shouldn't be an issue for daemons. - - - This flag can break dynamic shared object loading. For instance, the - module systems of Xorg and PHP are incompatible with this flag. Programs - incompatible with this flag often fail at runtime due to missing symbols, - like: - - + + Adds the linker option. During program load, + all dynamic symbols are resolved, allowing for the complete GOT to be + marked read-only (due to relro). This prevents GOT + overwrite attacks. For very large applications, this can incur some + performance loss during initial load while symbols are resolved, but this + shouldn't be an issue for daemons. + + + This flag can break dynamic shared object loading. For instance, the + module systems of Xorg and PHP are incompatible with this flag. Programs + incompatible with this flag often fail at runtime due to missing symbols, + like: + + intel_drv.so: undefined symbol: vgaHWFreeHWRec - - - - -The following flags are disabled by default and should be enabled -with hardeningEnable for packages that take untrusted -input like network services. - + + - + + The following flags are disabled by default and should be enabled with + hardeningEnable for packages that take untrusted input + like network services. + - - pie + + + + pie + - Adds the compiler and - linker options. Position Independent Executables are needed to take - advantage of Address Space Layout Randomization, supported by modern - kernel versions. While ASLR can already be enforced for data areas in - the stack and heap (brk and mmap), the code areas must be compiled as - position-independent. Shared libraries already do this with the - pic flag, so they gain ASLR automatically, but binary - .text regions need to be build with pie to gain ASLR. - When this happens, ROP attacks are much harder since there are no static - locations to bounce off of during a memory corruption attack. - + + Adds the compiler and linker + options. Position Independent Executables are needed to take advantage of + Address Space Layout Randomization, supported by modern kernel versions. + While ASLR can already be enforced for data areas in the stack and heap + (brk and mmap), the code areas must be compiled as position-independent. + Shared libraries already do this with the pic flag, so + they gain ASLR automatically, but binary .text regions need to be build + with pie to gain ASLR. When this happens, ROP attacks + are much harder since there are no static locations to bounce off of + during a memory corruption attack. + - - - - -For more in-depth information on these hardening flags and hardening in -general, refer to the -Debian Wiki, -Ubuntu Wiki, -Gentoo Wiki, -and the -Arch Wiki. - - -
- + + + + + For more in-depth information on these hardening flags and hardening in + general, refer to the + Debian Wiki, + Ubuntu + Wiki, + Gentoo + Wiki, and the + + Arch Wiki. + +
diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index d3cf221c9b6962234fffa092b6a996f66d0526f8..6c6f808f631ec497f637cb2e40b431dd57ee0b45 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -1,447 +1,513 @@ + Submitting changes +
+ Making patches -Submitting changes - -
-Making patches - - - -Read Manual (How to write packages for Nix). - - - -Fork the repository on GitHub. - - - -Create a branch for your future fix. - - - -You can make branch from a commit of your local nixos-version. That will help you to avoid additional local compilations. Because you will receive packages from binary cache. - - - -For example: nixos-version returns 15.05.git.0998212 (Dingo). So you can do: - - - + + + + Read Manual (How to + write packages for Nix). + + + + + Fork the repository on GitHub. + + + + + Create a branch for your future fix. + + + + You can make branch from a commit of your local + nixos-version. That will help you to avoid + additional local compilations. Because you will receive packages from + binary cache. + + + + For example: nixos-version returns + 15.05.git.0998212 (Dingo). So you can do: + + + $ git checkout 0998212 $ git checkout -b 'fix/pkg-name-update' - - - - -Please avoid working directly on the master branch. - - - - - - -Make commits of logical units. - - - -If you removed pkgs, made some major NixOS changes etc., write about them in nixos/doc/manual/release-notes/rl-unstable.xml. - - - - - - -Check for unnecessary whitespace with git diff --check before committing. - - - -Format the commit in a following way: - -(pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc) -Additional information. - - - - -Examples: - - - - -nginx: init at 2.0.1 - - - - - -firefox: 54.0.1 -> 55.0 - - - - - -nixos/hydra: add bazBaz option - - - - - -nixos/nginx: refactor config generation - - - - - - - - - -Test your changes. If you work with - - - -nixpkgs: - - - -update pkg -> - - - - -nix-env -i pkg-name -f <path to your local nixpkgs folder> - - - - - - - -add pkg -> - - - -Make sure it's in pkgs/top-level/all-packages.nix - - - - - -nix-env -i pkg-name -f <path to your local nixpkgs folder> - - - - - - - - -If you don't want to install pkg in you profile. - - - - -nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix and check results in the folder result. It will appear in the same directory where you did nix-build. - - - - - - -If you did nix-env -i pkg-name you can do nix-env -e pkg-name to uninstall it from your system. - - - - - - -NixOS and its modules: - - - -You can add new module to your NixOS configuration file (usually it's /etc/nixos/configuration.nix). - And do sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast. - - - - - - - - - -If you have commits pkg-name: oh, forgot to insert whitespace: squash commits in this case. Use git rebase -i. - - - -Rebase you branch against current master. - - -
- -
-Submitting changes - - - -Push your changes to your fork of nixpkgs. - - - -Create pull request: - - - -Write the title in format (pkg-name | nixos/<module>): improvement. - - - -If you update the pkg, write versions from -> to. - - - - - - -Write in comment if you have tested your patch. Do not rely much on TravisCI. - - - -If you make an improvement, write about your motivation. - - - -Notify maintainers of the package. For example add to the message: cc @jagajaga @domenkozar. - - - - - -
- -
- Pull Request Template - - The pull request template helps determine what steps have been made for a - contribution so far, and will help guide maintainers on the status of a - change. The motivation section of the PR should include any extra details - the title does not address and link any existing issues related to the pull - request. - - When a PR is created, it will be pre-populated with some checkboxes detailed below: - -
- Tested using sandboxing + + + + + Please avoid working directly on the master branch. + + + + + + - When sandbox builds are enabled, Nix will setup an isolated environment - for each build process. It is used to remove further hidden dependencies - set by the build environment to improve reproducibility. This includes - access to the network during the build outside of - fetch* functions and files outside the Nix store. - Depending on the operating system access to other resources are blocked - as well (ex. inter process communication is isolated on Linux); see build-use-sandbox - in Nix manual for details. + Make commits of logical units. + + + + If you removed pkgs, made some major NixOS changes etc., write about + them in + nixos/doc/manual/release-notes/rl-unstable.xml. + + + + + - Sandboxing is not enabled by default in Nix due to a small performance - hit on each build. In pull requests for nixpkgs people - are asked to test builds with sandboxing enabled (see Tested - using sandboxing in the pull request template) because - inhttps://nixos.org/hydra/ - sandboxing is also used. + Check for unnecessary whitespace with git diff --check + before committing. + + - Depending if you use NixOS or other platforms you can use one of the - following methods to enable sandboxing before building the package: - + Format the commit in a following way: + + +(pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc) +Additional information. + + + + + Examples: + - - Globally enable sandboxing on NixOS: - add the following to - configuration.nix - nix.useSandbox = true; - + + nginx: init at 2.0.1 + - - Globally enable sandboxing on non-NixOS platforms: - add the following to: /etc/nix/nix.conf - build-use-sandbox = true - + + firefox: 54.0.1 -> 55.0 + - - - -
-
- Built on platform(s) + + + nixos/hydra: add bazBaz option + + + + + nixos/nginx: refactor config generation + + + + + + + + - Many Nix packages are designed to run on multiple - platforms. As such, it's important to let the maintainer know which - platforms your changes have been tested on. It's not always practical to - test a change on all platforms, and is not required for a pull request to - be merged. Only check the systems you tested the build on in this - section. + Test your changes. If you work with + + + + nixpkgs: + + + + update pkg -> + + + + nix-env -i pkg-name -f <path to your local nixpkgs + folder> + + + + + + + + add pkg -> + + + + Make sure it's in + pkgs/top-level/all-packages.nix + + + + + nix-env -i pkg-name -f <path to your local nixpkgs + folder> + + + + + + + + If you don't want to install pkg in you + profile. + + + + nix-build -A pkg-attribute-name <path to your local + nixpkgs folder>/default.nix and check results in the + folder result. It will appear in the same + directory where you did nix-build. + + + + + + + + If you did nix-env -i pkg-name you can do + nix-env -e pkg-name to uninstall it from your + system. + + + + + + + + NixOS and its modules: + + + + You can add new module to your NixOS configuration file (usually + it's /etc/nixos/configuration.nix). And do + sudo nixos-rebuild test -I nixpkgs=<path to your local + nixpkgs folder> --fast. + + + + + + -
-
- Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests) + + - Packages with automated tests are much more likely to be merged in a - timely fashion because it doesn't require as much manual testing by the - maintainer to verify the functionality of the package. If there are - existing tests for the package, they should be run to verify your changes - do not break the tests. Tests only apply to packages with NixOS modules - defined and can only be run on Linux. For more details on writing and - running tests, see the section - in the NixOS manual. + If you have commits pkg-name: oh, forgot to insert + whitespace: squash commits in this case. Use git rebase + -i. -
-
- Tested compilation of all pkgs that depend on this change using <command>nox-review</command> + + - If you are updating a package's version, you can use nox to make sure all - packages that depend on the updated package still compile correctly. This - can be done using the nox utility. The nox-review - utility can look for and build all dependencies either based on - uncommited changes with the wip option or specifying a - github pull request number. + Rebase you branch against current master. + + +
+
+ Submitting changes + + + - review uncommitted changes: - nix-shell -p nox --run "nox-review wip" + Push your changes to your fork of nixpkgs. + + - review changes from pull request number 12345: - nix-shell -p nox --run "nox-review pr 12345" + Create pull request: + + + + Write the title in format (pkg-name | nixos/<module>): + improvement. + + + + If you update the pkg, write versions from -> to. + + + + + + + + Write in comment if you have tested your patch. Do not rely much on + TravisCI. + + + + + If you make an improvement, write about your motivation. + + + + + Notify maintainers of the package. For example add to the message: + cc @jagajaga @domenkozar. + + + -
+ + +
+
+ Pull Request Template + + + The pull request template helps determine what steps have been made for a + contribution so far, and will help guide maintainers on the status of a + change. The motivation section of the PR should include any extra details + the title does not address and link any existing issues related to the pull + request. + + + + When a PR is created, it will be pre-populated with some checkboxes detailed + below: + +
- Tested execution of all binary files (usually in <filename>./result/bin/</filename>) - - It's important to test any executables generated by a build when you - change or create a package in nixpkgs. This can be done by looking in - ./result/bin and running any files in there, or at a - minimum, the main executable for the package. For example, if you make a change - to texlive, you probably would only check the binaries - associated with the change you made rather than testing all of them. - + Tested using sandboxing + + + When sandbox builds are enabled, Nix will setup an isolated environment for + each build process. It is used to remove further hidden dependencies set by + the build environment to improve reproducibility. This includes access to + the network during the build outside of fetch* + functions and files outside the Nix store. Depending on the operating + system access to other resources are blocked as well (ex. inter process + communication is isolated on Linux); see + build-use-sandbox + in Nix manual for details. + + + + Sandboxing is not enabled by default in Nix due to a small performance hit + on each build. In pull requests for + nixpkgs + people are asked to test builds with sandboxing enabled (see + Tested using sandboxing in the pull request template) + because + inhttps://nixos.org/hydra/ + sandboxing is also used. + + + + Depending if you use NixOS or other platforms you can use one of the + following methods to enable sandboxing + before building the package: + + + + Globally enable sandboxing on NixOS: + add the following to configuration.nix +nix.useSandbox = true; + + + + + Globally enable sandboxing on non-NixOS + platforms: add the following to: + /etc/nix/nix.conf +build-use-sandbox = true + + + +
+
- Meets nixpkgs contribution standards - - The last checkbox is fits CONTRIBUTING.md. - The contributing document has detailed information on standards the Nix - community has for commit messages, reviews, licensing of contributions - you make to the project, etc... Everyone should read and understand the - standards the community has for contributing before submitting a pull - request. - - + Built on platform(s) + + + Many Nix packages are designed to run on multiple platforms. As such, it's + important to let the maintainer know which platforms your changes have been + tested on. It's not always practical to test a change on all platforms, and + is not required for a pull request to be merged. Only check the systems you + tested the build on in this section. +
-
- -
-Hotfixing pull requests - - -Make the appropriate changes in you branch. - - - -Don't create additional commits, do +
+ Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests) + + + Packages with automated tests are much more likely to be merged in a timely + fashion because it doesn't require as much manual testing by the maintainer + to verify the functionality of the package. If there are existing tests for + the package, they should be run to verify your changes do not break the + tests. Tests only apply to packages with NixOS modules defined and can only + be run on Linux. For more details on writing and running tests, see the + section + in the NixOS manual. + +
- - -git rebase -i - - - -git push --force to your branch. - - -
-
+
+ Tested compilation of all pkgs that depend on this change using <command>nox-review</command> + + + If you are updating a package's version, you can use nox to make sure all + packages that depend on the updated package still compile correctly. This + can be done using the nox utility. The nox-review + utility can look for and build all dependencies either based on uncommited + changes with the wip option or specifying a github pull + request number. + + + + review uncommitted changes: +nix-shell -p nox --run "nox-review wip" + + + + review changes from pull request number 12345: +nix-shell -p nox --run "nox-review pr 12345" + +
-
-
+
+ Tested execution of all binary files (usually in <filename>./result/bin/</filename>) + + + It's important to test any executables generated by a build when you change + or create a package in nixpkgs. This can be done by looking in + ./result/bin and running any files in there, or at a + minimum, the main executable for the package. For example, if you make a + change to texlive, you probably would only check the + binaries associated with the change you made rather than testing all of + them. + +
-
-Commit policy +
+ Meets nixpkgs contribution standards - - -Commits must be sufficiently tested before being merged, both for the master and staging branches. - + + The last checkbox is fits + CONTRIBUTING.md. + The contributing document has detailed information on standards the Nix + community has for commit messages, reviews, licensing of contributions you + make to the project, etc... Everyone should read and understand the + standards the community has for contributing before submitting a pull + request. + +
+
+
+ Hotfixing pull requests - -Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested. - + + + + Make the appropriate changes in you branch. + + + + + Don't create additional commits, do + + + + git rebase -i + + + + + git push --force to your branch. + + + + + + +
+
+ Commit policy - -When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra. - - + + + + Commits must be sufficiently tested before being merged, both for the + master and staging branches. + + + + + Hydra builds for master and staging should not be used as testing + platform, it's a build farm for changes that have been already tested. + + + + + When changing the bootloader installation process, extra care must be + taken. Grub installations cannot be rolled back, hence changes may break + people's installations forever. For any non-trivial change to the + bootloader please file a PR asking for review, especially from @edolstra. + + + -
- Master branch +
+ Master branch - + - - It should only see non-breaking commits that do not cause mass rebuilds. - + + It should only see non-breaking commits that do not cause mass rebuilds. + - -
+ +
-
- Staging branch +
+ Staging branch - + - - It's only for non-breaking mass-rebuild commits. That means it's not to - be used for testing, and changes must have been well tested already. - Read policy here. - + + It's only for non-breaking mass-rebuild commits. That means it's not to + be used for testing, and changes must have been well tested already. + Read + policy here. + - - If the branch is already in a broken state, please refrain from adding - extra new breakages. Stabilize it for a few days, merge into master, - then resume development on staging. - Keep an eye on the staging evaluations here. - If any fixes for staging happen to be already in master, then master can - be merged into staging. - + + If the branch is already in a broken state, please refrain from adding + extra new breakages. Stabilize it for a few days, merge into master, then + resume development on staging. + Keep + an eye on the staging evaluations here. If any fixes for staging + happen to be already in master, then master can be merged into staging. + - -
+ +
-
- Stable release branches +
+ Stable release branches - + - - If you're cherry-picking a commit to a stable release branch, always use - git cherry-pick -xe and ensure the message contains a - clear description about why this needs to be included in the stable - branch. - - An example of a cherry-picked commit would look like this: - + + If you're cherry-picking a commit to a stable release branch, always use + git cherry-pick -xe and ensure the message contains a + clear description about why this needs to be included in the stable + branch. + + + An example of a cherry-picked commit would look like this: + + nixos: Refactor the world. The original commit message describing the reason why the world was torn apart. @@ -451,9 +517,7 @@ Reason: I just had a gut feeling that this would also be wanted by people from the stone age. - -
- -
+ +
+
- diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 19218cfe8ecb40d0827bf715511d948ac88ee514..cda13ee43eedebc1bea5199d899dd864392fe58e 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -3,9 +3,9 @@ let inherit (builtins) head tail length; - inherit (lib.trivial) and or; + inherit (lib.trivial) and; inherit (lib.strings) concatStringsSep; - inherit (lib.lists) fold concatMap concatLists all deepSeqList; + inherit (lib.lists) fold concatMap concatLists; in rec { @@ -195,8 +195,9 @@ rec { { x = "foo"; y = "bar"; } => { x = "x-foo"; y = "y-bar"; } */ - mapAttrs = f: set: - listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)); + mapAttrs = builtins.mapAttrs or + (f: set: + listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))); /* Like `mapAttrs', but allows the name of each attribute to be @@ -383,11 +384,12 @@ rec { recursiveUpdateUntil = pred: lhs: rhs: let f = attrPath: zipAttrsWith (n: values: + let here = attrPath ++ [n]; in if tail values == [] - || pred attrPath (head (tail values)) (head values) then + || pred here (head (tail values)) (head values) then head values else - f (attrPath ++ [n]) values + f here values ); in f [] [rhs lhs]; diff --git a/lib/composable-derivation.nix b/lib/composable-derivation.nix index 5e55ac023f148c4622b81e289ab39d79159ad16f..cb1fdc121e11b7bfbcf4a25864568fe3077df2e3 100644 --- a/lib/composable-derivation.nix +++ b/lib/composable-derivation.nix @@ -1,5 +1,5 @@ {lib, pkgs}: -let inherit (lib) nv nvs; in +let inherit (lib) nvs; in { # composableDerivation basically mixes these features: diff --git a/lib/customisation.nix b/lib/customisation.nix index d942f54ee7989f66b51dd252f6671d872e8dfcff..0107ed33d9e432c405d1a73492a7085dfa1096e0 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -1,9 +1,4 @@ { lib }: -let - - inherit (builtins) attrNames; - -in rec { @@ -200,9 +195,10 @@ rec { let self = f self // { newScope = scope: newScope (self // scope); callPackage = self.newScope {}; + # TODO(@Ericson2314): Haromonize argument order of `g` with everything else overrideScope = g: makeScope newScope - (self_: let super = f self_; in super // g super self_); + (lib.fixedPoints.extends (lib.flip g) f); packages = f; }; in self; diff --git a/lib/debug.nix b/lib/debug.nix index d163e60b69570851c123947ffe61e04691cb1929..383eb32d75d0d8be32e4c98c3c8c1c548ff365be 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -1,34 +1,67 @@ +/* Collection of functions useful for debugging + broken nix expressions. + + * `trace`-like functions take two values, print + the first to stderr and return the second. + * `traceVal`-like functions take one argument + which both printed and returned. + * `traceSeq`-like functions fully evaluate their + traced value before printing (not just to “weak + head normal form” like trace does by default). + * Functions that end in `-Fn` take an additional + function as their first argument, which is applied + to the traced value before it is printed. +*/ { lib }: - let - -inherit (builtins) trace attrNamesToStr isAttrs isList isInt - isString isBool head substring attrNames; - -inherit (lib) all id mapAttrsFlatten elem isFunction; - + inherit (builtins) trace isAttrs isList isInt + head substring attrNames; + inherit (lib) id elem isFunction; in rec { - inherit (builtins) addErrorContext; - - addErrorContextToAttrs = lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v); + # -- TRACING -- - traceIf = p: msg: x: if p then trace msg x else x; + /* Trace msg, but only if pred is true. - traceVal = x: trace x x; - traceXMLVal = x: trace (builtins.toXML x) x; - traceXMLValMarked = str: x: trace (str + builtins.toXML x) x; + Example: + traceIf true "hello" 3 + trace: hello + => 3 + */ + traceIf = pred: msg: x: if pred then trace msg x else x; - # strict trace functions (traced structure is fully evaluated and printed) + /* Trace the value and also return it. - /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. */ + Example: + traceValFn (v: "mystring ${v}") "foo" + trace: mystring foo + => "foo" + */ + traceValFn = f: x: trace (f x) x; + traceVal = traceValFn id; + + /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. + + Example: + trace { a.b.c = 3; } null + trace: { a = ; } + => null + traceSeq { a.b.c = 3; } null + trace: { a = { b = { c = 3; }; }; } + => null + */ traceSeq = x: y: trace (builtins.deepSeq x x) y; - /* Like `traceSeq`, but only down to depth n. - * This is very useful because lots of `traceSeq` usages - * lead to an infinite recursion. + /* Like `traceSeq`, but only evaluate down to depth n. + This is very useful because lots of `traceSeq` usages + lead to an infinite recursion. + + Example: + traceSeqN 2 { a.b.c = 3; } null + trace: { a = { b = {…}; }; } + => null */ traceSeqN = depth: x: y: with lib; let snip = v: if isList v then noQuotes "[…]" v @@ -43,39 +76,16 @@ rec { in trace (generators.toPretty { allowPrettyValues = true; } (modify depth snip x)) y; - /* `traceSeq`, but the same value is traced and returned */ - traceValSeq = v: traceVal (builtins.deepSeq v v); - /* `traceValSeq` but with fixed depth */ - traceValSeqN = depth: v: traceSeqN depth v v; + /* A combination of `traceVal` and `traceSeq` */ + traceValSeqFn = f: v: traceValFn f (builtins.deepSeq v v); + traceValSeq = traceValSeqFn id; + /* A combination of `traceVal` and `traceSeqN`. */ + traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v; + traceValSeqN = traceValSeqNFn id; - # this can help debug your code as well - designed to not produce thousands of lines - traceShowVal = x: trace (showVal x) x; - traceShowValMarked = str: x: trace (str + showVal x) x; - attrNamesToStr = a: lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a)); - showVal = x: - if isAttrs x then - if x ? outPath then "x is a derivation, name ${if x ? name then x.name else ""}, { ${attrNamesToStr x} }" - else "x is attr set { ${attrNamesToStr x} }" - else if isFunction x then "x is a function" - else if x == [] then "x is an empty list" - else if isList x then "x is a list, first element is: ${showVal (head x)}" - else if x == true then "x is boolean true" - else if x == false then "x is boolean false" - else if x == null then "x is null" - else if isInt x then "x is an integer `${toString x}'" - else if isString x then "x is a string `${substring 0 50 x}...'" - else "x is probably a path `${substring 0 50 (toString x)}...'"; - # trace the arguments passed to function and its result - # maybe rewrite these functions in a traceCallXml like style. Then one function is enough - traceCall = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a)); - traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b)); - traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); - - # FIXME: rename this? - traceValIfNot = c: x: - if c x then true else trace (showVal x) false; + # -- TESTING -- /* Evaluate a set of tests. A test is an attribute set {expr, expected}, denoting an expression and its expected result. The @@ -99,9 +109,68 @@ rec { # usage: { testX = allTrue [ true ]; } testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; - strict = v: - trace "Warning: strict is deprecated and will be removed in the next release" - (builtins.seq v v); + + # -- DEPRECATED -- + + traceShowVal = x: trace (showVal x) x; + traceShowValMarked = str: x: trace (str + showVal x) x; + + attrNamesToStr = a: + trace ( "Warning: `attrNamesToStr` is deprecated " + + "and will be removed in the next release. " + + "Please use more specific concatenation " + + "for your uses (`lib.concat(Map)StringsSep`)." ) + (lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a))); + + showVal = with lib; + trace ( "Warning: `showVal` is deprecated " + + "and will be removed in the next release, " + + "please use `traceSeqN`" ) + (let + modify = v: + let pr = f: { __pretty = f; val = v; }; + in if isDerivation v then pr + (drv: "<δ:${drv.name}:${concatStringsSep "," + (attrNames drv)}>") + else if [] == v then pr (const "[]") + else if isList v then pr (l: "[ ${go (head l)}, … ]") + else if isAttrs v then pr + (a: "{ ${ concatStringsSep ", " (attrNames a)} }") + else v; + go = x: generators.toPretty + { allowPrettyValues = true; } + (modify x); + in go); + + traceXMLVal = x: + trace ( "Warning: `traceXMLVal` is deprecated " + + "and will be removed in the next release. " + + "Please use `traceValFn builtins.toXML`." ) + (trace (builtins.toXML x) x); + traceXMLValMarked = str: x: + trace ( "Warning: `traceXMLValMarked` is deprecated " + + "and will be removed in the next release. " + + "Please use `traceValFn (x: str + builtins.toXML x)`." ) + (trace (str + builtins.toXML x) x); + + # trace the arguments passed to function and its result + # maybe rewrite these functions in a traceCallXml like style. Then one function is enough + traceCall = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a)); + traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b)); + traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); + + traceValIfNot = c: x: + trace ( "Warning: `traceValIfNot` is deprecated " + + "and will be removed in the next release. " + + "Please use `if/then/else` and `traceValSeq 1`.") + (if c x then true else traceSeq (showVal x) false); + + + addErrorContextToAttrs = attrs: + trace ( "Warning: `addErrorContextToAttrs` is deprecated " + + "and will be removed in the next release. " + + "Please use `builtins.addErrorContext` directly." ) + (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs); # example: (traceCallXml "myfun" id 3) will output something like # calling myfun arg 1: 3 result: 3 @@ -109,17 +178,20 @@ rec { # note: if result doesn't evaluate you'll get no trace at all (FIXME) # args should be printed in any case traceCallXml = a: - if !isInt a then + trace ( "Warning: `traceCallXml` is deprecated " + + "and will be removed in the next release. " + + "Please complain if you use the function regularly." ) + (if !isInt a then traceCallXml 1 "calling ${a}\n" else let nr = a; in (str: expr: if isFunction expr then (arg: - traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (strict arg)}" (expr arg) + traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (builtins.seq arg arg)}" (expr arg) ) else - let r = strict expr; + let r = builtins.seq expr expr; in trace "${str}\n result:\n${builtins.toXML r}" r - ); + )); } diff --git a/lib/default.nix b/lib/default.nix index cbe0a0ba21b5978d78cb66edcf052885e33bfb2b..dd6fcec75e219ca9f846ca5ed67cf3dfee903ba4 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -5,9 +5,11 @@ */ let - callLibs = file: import file { inherit lib; }; + inherit (import ./fixed-points.nix {}) makeExtensible; - lib = rec { + lib = makeExtensible (self: let + callLibs = file: import file { lib = self; }; + in with self; { # often used, or depending on very little trivial = callLibs ./trivial.nix; @@ -49,15 +51,15 @@ let # back-compat aliases platforms = systems.forMeta; - inherit (builtins) add addErrorContext attrNames - concatLists deepSeq elem elemAt filter genericClosure genList - getAttr hasAttr head isAttrs isBool isInt isList - isString length lessThan listToAttrs pathExists readFile - replaceStrings seq stringLength sub substring tail; - inherit (trivial) id const concat or and boolToString mergeAttrs - flip mapNullable inNixShell min max importJSON warn info - nixpkgsVersion mod compare splitByAndCompare - functionArgs setFunctionArgs isFunction; + inherit (builtins) add addErrorContext attrNames concatLists + deepSeq elem elemAt filter genericClosure genList getAttr + hasAttr head isAttrs isBool isInt isList isString length + lessThan listToAttrs pathExists readFile replaceStrings seq + stringLength sub substring tail; + inherit (trivial) id const concat or and bitAnd bitOr bitXor bitNot + boolToString mergeAttrs flip mapNullable inNixShell min max + importJSON warn info nixpkgsVersion version mod compare + splitByAndCompare functionArgs setFunctionArgs isFunction; inherit (fixedPoints) fix fix' extends composeExtensions makeExtensible makeExtensibleWithCustomName; @@ -72,30 +74,32 @@ let inherit (lists) singleton foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists - reverseList listDfs toposort sort compareLists take drop sublist - last init crossLists unique intersectLists subtractLists - mutuallyExclusive; + reverseList listDfs toposort sort naturalSort compareLists take + drop sublist last init crossLists unique intersectLists + subtractLists mutuallyExclusive groupBy groupBy'; inherit (strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep concatImapStringsSep makeSearchPath makeSearchPathOutput - makeLibraryPath makeBinPath makePerlPath optionalString + makeLibraryPath makeBinPath makePerlPath makeFullPerlPath optionalString hasPrefix hasSuffix stringToCharacters stringAsChars escape - escapeShellArg escapeShellArgs replaceChars lowerChars upperChars - toLower toUpper addContextFrom splitString removePrefix - removeSuffix versionOlder versionAtLeast getVersion nameFromURL - enableFeature fixedWidthString fixedWidthNumber isStorePath + escapeShellArg escapeShellArgs replaceChars lowerChars + upperChars toLower toUpper addContextFrom splitString + removePrefix removeSuffix versionOlder versionAtLeast getVersion + nameFromURL enableFeature enableFeatureAs withFeature + withFeatureAs fixedWidthString fixedWidthNumber isStorePath toInt readPathsFromFile fileContents; inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith extendDerivation - hydraJob makeScope; + callPackageWith callPackagesWith extendDerivation hydraJob + makeScope; inherit (meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio hiPrioSet; inherit (sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices - commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource; + commitIdFromGitRepo cleanSourceWith pathHasContext + canCleanSource; inherit (modules) evalModules closeModules unifyModuleSyntax applyIfFunction unpackSubmodule packSubmodule mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions @@ -113,11 +117,11 @@ let unknownModule mkOption; inherit (types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; - inherit (debug) addErrorContextToAttrs traceIf traceVal + inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq - traceValSeqN traceShowVal traceShowValMarked - showVal traceCall traceCall2 traceCall3 traceValIfNot runTests - testAllTrue strict traceCallXml attrNamesToStr; + traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal + traceShowValMarked showVal traceCall traceCall2 traceCall3 + traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs defaultOverridableDelayableArgs composedArgsAndFun maybeAttrNullable maybeAttr ifEnable checkFlag getValue @@ -126,7 +130,7 @@ let closePropagation mapAttrsFlatten nvs setAttr setAttrMerge mergeAttrsWithFunc mergeAttrsConcatenateValues mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults - mergeAttrsByFuncDefaultsClean mergeAttrBy - prepareDerivationArgs nixType imap overridableDelayableArgs; - }; + mergeAttrsByFuncDefaultsClean mergeAttrBy prepareDerivationArgs + nixType imap overridableDelayableArgs; + }); in lib diff --git a/lib/generators.nix b/lib/generators.nix index d1a8f6bf8dcdaf63cbf0fd03740d232096667fba..f5faf70078605698b808210a58db7bae94b1c644 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -19,8 +19,6 @@ let libStr = lib.strings; libAttr = lib.attrsets; - flipMapAttrs = flip libAttr.mapAttrs; - inherit (lib) isFunction; in @@ -143,18 +141,13 @@ rec { (This means fn is type Val -> String.) */ allowPrettyValues ? false }@args: v: with builtins; - if isInt v then toString v + let isPath = v: typeOf v == "path"; + in if isInt v then toString v else if isString v then ''"${libStr.escape [''"''] v}"'' else if true == v then "true" else if false == v then "false" - else if null == v then "null" - else if isFunction v then - let fna = lib.functionArgs v; - showFnas = concatStringsSep "," (libAttr.mapAttrsToList - (name: hasDefVal: if hasDefVal then "(${name})" else name) - fna); - in if fna == {} then "<λ>" - else "<λ:{${showFnas}}>" + else if null == v then "null" + else if isPath v then toString v else if isList v then "[ " + libStr.concatMapStringsSep " " (toPretty args) v + " ]" @@ -163,12 +156,71 @@ rec { if attrNames v == [ "__pretty" "val" ] && allowPrettyValues then v.__pretty v.val # TODO: there is probably a better representation? - else if v ? type && v.type == "derivation" then "<δ>" + else if v ? type && v.type == "derivation" then + "<δ:${v.name}>" + # "<δ:${concatStringsSep "," (builtins.attrNames v)}>" else "{ " + libStr.concatStringsSep " " (libAttr.mapAttrsToList (name: value: "${toPretty args name} = ${toPretty args value};") v) + " }" + else if isFunction v then + let fna = lib.functionArgs v; + showFnas = concatStringsSep "," (libAttr.mapAttrsToList + (name: hasDefVal: if hasDefVal then "(${name})" else name) + fna); + in if fna == {} then "<λ>" + else "<λ:{${showFnas}}>" else abort "generators.toPretty: should never happen (v = ${v})"; + # PLIST handling + toPlist = {}: v: let + isFloat = builtins.isFloat or (x: false); + expr = ind: x: with builtins; + if isNull x then "" else + if isBool x then bool ind x else + if isInt x then int ind x else + if isString x then str ind x else + if isList x then list ind x else + if isAttrs x then attrs ind x else + if isFloat x then float ind x else + abort "generators.toPlist: should never happen (v = ${v})"; + + literal = ind: x: ind + x; + + bool = ind: x: literal ind (if x then "" else ""); + int = ind: x: literal ind "${toString x}"; + str = ind: x: literal ind "${x}"; + key = ind: x: literal ind "${x}"; + float = ind: x: literal ind "${toString x}"; + + indent = ind: expr "\t${ind}"; + + item = ind: libStr.concatMapStringsSep "\n" (indent ind); + + list = ind: x: libStr.concatStringsSep "\n" [ + (literal ind "") + (item ind x) + (literal ind "") + ]; + + attrs = ind: x: libStr.concatStringsSep "\n" [ + (literal ind "") + (attr ind x) + (literal ind "") + ]; + + attr = let attrFilter = name: value: name != "_module" && value != null; + in ind: x: libStr.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList + (name: value: lib.optional (attrFilter name value) [ + (key "\t${ind}" name) + (expr "\t${ind}" value) + ]) x)); + + in '' + + +${expr "" v} +''; + } diff --git a/lib/kernel.nix b/lib/kernel.nix new file mode 100644 index 0000000000000000000000000000000000000000..45b33aea7b87190364d4b99914b612021051a349 --- /dev/null +++ b/lib/kernel.nix @@ -0,0 +1,57 @@ +{ lib +# we pass the kernel version here to keep a nice syntax `whenOlder "4.13"` +# kernelVersion, e.g., config.boot.kernelPackages.version +, version +, mkValuePreprocess ? null +}: + +with lib; +rec { + # Common patterns + when = cond: opt: if cond then opt else null; + whenAtLeast = ver: when (versionAtLeast version ver); + whenOlder = ver: when (versionOlder version ver); + whenBetween = verLow: verHigh: when (versionAtLeast version verLow && versionOlder version verHigh); + + # Keeping these around in case we decide to change this horrible implementation :) + option = x: if x == null then null else "?${x}"; + yes = "y"; + no = "n"; + module = "m"; + + mkValue = val: + let + isNumber = c: elem c ["0" "1" "2" "3" "4" "5" "6" "7" "8" "9"]; + in + if val == "" then "\"\"" + else if val == yes || val == module || val == no then val + else if all isNumber (stringToCharacters val) then val + else if substring 0 2 val == "0x" then val + else val; # FIXME: fix quoting one day + + + # generate nix intermediate kernel config file of the form + # + # VIRTIO_MMIO m + # VIRTIO_BLK y + # VIRTIO_CONSOLE n + # NET_9P_VIRTIO? y + # + # Use mkValuePreprocess to preprocess option values, aka mark 'modules' as + # 'yes' or vice-versa + # Borrowed from copumpkin https://github.com/NixOS/nixpkgs/pull/12158 + # returns a string, expr should be an attribute set + generateNixKConf = exprs: mkValuePreprocess: + let + mkConfigLine = key: rawval: + let + val = if builtins.isFunction mkValuePreprocess then mkValuePreprocess rawval else rawval; + in + if val == null + then "" + else if hasPrefix "?" val + then "${key}? ${mkValue (removePrefix "?" val)}\n" + else "${key} ${mkValue val}\n"; + mkConf = cfg: concatStrings (mapAttrsToList mkConfigLine cfg); + in mkConf exprs; +} diff --git a/lib/licenses.nix b/lib/licenses.nix index 767fd89b948cc219f651dc616f8f9568a647e1c0..c442d74c857c1f9944df79501b9f659db69f58ea 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -99,6 +99,16 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = ''BSD 4-clause "Original" or "Old" License''; }; + bsl10 = { + fullName = "Business Source License 1.0"; + url = https://mariadb.com/bsl10; + }; + + bsl11 = { + fullName = "Business Source License 1.1"; + url = https://mariadb.com/bsl11; + }; + clArtistic = spdx { spdxId = "ClArtistic"; fullName = "Clarified Artistic License"; @@ -112,26 +122,37 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { cc-by-nc-sa-20 = spdx { spdxId = "CC-BY-NC-SA-2.0"; fullName = "Creative Commons Attribution Non Commercial Share Alike 2.0"; + free = false; }; cc-by-nc-sa-25 = spdx { spdxId = "CC-BY-NC-SA-2.5"; fullName = "Creative Commons Attribution Non Commercial Share Alike 2.5"; + free = false; }; cc-by-nc-sa-30 = spdx { spdxId = "CC-BY-NC-SA-3.0"; fullName = "Creative Commons Attribution Non Commercial Share Alike 3.0"; + free = false; }; cc-by-nc-sa-40 = spdx { spdxId = "CC-BY-NC-SA-4.0"; fullName = "Creative Commons Attribution Non Commercial Share Alike 4.0"; + free = false; + }; + + cc-by-nc-40 = spdx { + spdxId = "CC-BY-NC-4.0"; + fullName = "Creative Commons Attribution Non Commercial 4.0 International"; + free = false; }; cc-by-nd-30 = spdx { spdxId = "CC-BY-ND-3.0"; fullName = "Creative Commons Attribution-No Derivative Works v3.00"; + free = false; }; cc-by-sa-25 = spdx { @@ -189,6 +210,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Common Public License 1.0"; }; + curl = { + fullName = "MIT/X11 derivate"; + url = "https://curl.haxx.se/docs/copyright.html"; + }; + doc = spdx { spdxId = "DOC"; fullName = "DOC License"; @@ -210,6 +236,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Eiffel Forum License v2.0"; }; + elastic = { + fullName = "ELASTIC LICENSE"; + url = https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt; + free = false; + }; + epl10 = spdx { spdxId = "EPL-1.0"; fullName = "Eclipse Public License 1.0"; @@ -445,6 +477,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { msrla = { fullName = "Microsoft Research License Agreement"; url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt"; + free = false; }; ncsa = spdx { @@ -585,6 +618,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Vim License"; }; + virtualbox-puel = { + fullName = "Oracle VM VirtualBox Extension Pack Personal Use and Evaluation License (PUEL)"; + url = "https://www.virtualbox.org/wiki/VirtualBox_PUEL"; + free = false; + }; + vsl10 = spdx { spdxId = "VSL-1.0"; fullName = "Vovida Software License v1.0"; @@ -615,6 +654,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "wxWindows Library Licence, Version 3.1"; }; + xfig = { + fullName = "xfig"; + url = "http://mcj.sourceforge.net/authors.html#xfig"; + }; + zlib = spdx { spdxId = "Zlib"; fullName = "zlib License"; diff --git a/lib/lists.nix b/lib/lists.nix index 424d2c57f5563e2c6553e1f3ebb77a901f696652..288882924fff103bf670de01e212b67f317f202f 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -1,7 +1,9 @@ # General list operations. { lib }: with lib.trivial; - +let + inherit (lib.strings) toInt; +in rec { inherit (builtins) head tail length isList elemAt concatLists filter elem genList; @@ -62,7 +64,6 @@ rec { */ foldl = op: nul: list: let - len = length list; foldl' = n: if n == -1 then nul @@ -99,7 +100,7 @@ rec { concatMap (x: [x] ++ ["z"]) ["a" "b"] => [ "a" "z" "b" "z" ] */ - concatMap = f: list: concatLists (map f list); + concatMap = builtins.concatMap or (f: list: concatLists (map f list)); /* Flatten the argument into a single list; that is, nested lists are spliced into the top-level lists. @@ -248,6 +249,42 @@ rec { else { right = t.right; wrong = [h] ++ t.wrong; } ) { right = []; wrong = []; }); + /* Splits the elements of a list into many lists, using the return value of a predicate. + Predicate should return a string which becomes keys of attrset `groupBy' returns. + + `groupBy'' allows to customise the combining function and initial value + + Example: + groupBy (x: boolToString (x > 2)) [ 5 1 2 3 4 ] + => { true = [ 5 3 4 ]; false = [ 1 2 ]; } + groupBy (x: x.name) [ {name = "icewm"; script = "icewm &";} + {name = "xfce"; script = "xfce4-session &";} + {name = "icewm"; script = "icewmbg &";} + {name = "mate"; script = "gnome-session &";} + ] + => { icewm = [ { name = "icewm"; script = "icewm &"; } + { name = "icewm"; script = "icewmbg &"; } ]; + mate = [ { name = "mate"; script = "gnome-session &"; } ]; + xfce = [ { name = "xfce"; script = "xfce4-session &"; } ]; + } + + + groupBy' allows to customise the combining function and initial value + + Example: + groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ] + => { true = 12; false = 3; } + */ + groupBy' = op: nul: pred: lst: + foldl' (r: e: + let + key = pred e; + in + r // { ${key} = op (r.${key} or nul) e; } + ) {} lst; + + groupBy = groupBy' (sum: e: sum ++ [e]) []; + /* Merges two lists of the same size together. If the sizes aren't the same the merging stops at the shortest. How both lists are merged is defined by the first argument. @@ -409,6 +446,25 @@ rec { then compareLists cmp (tail a) (tail b) else rel; + /* Sort list using "Natural sorting". + Numeric portions of strings are sorted in numeric order. + + Example: + naturalSort ["disk11" "disk8" "disk100" "disk9"] + => ["disk8" "disk9" "disk11" "disk100"] + naturalSort ["10.46.133.149" "10.5.16.62" "10.54.16.25"] + => ["10.5.16.62" "10.46.133.149" "10.54.16.25"] + naturalSort ["v0.2" "v0.15" "v0.0.9"] + => [ "v0.0.9" "v0.2" "v0.15" ] + */ + naturalSort = lst: + let + vectorise = s: map (x: if isList x then toInt (head x) else x) (builtins.split "(0|[1-9][0-9]*)" s); + prepared = map (x: [ (vectorise x) x ]) lst; # remember vectorised version for O(n) regex splits + less = a: b: (compareLists compare (head a) (head b)) < 0; + in + map (x: elemAt x 1) (sort less prepared); + /* Return the first (at most) N elements of a list. Example: diff --git a/lib/meta.nix b/lib/meta.nix index 8516cc1cd6f1b48d647cae36c2b3588a0b552059..199030c103af58031ec8243193d324c0b391a8c6 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -86,6 +86,4 @@ rec { then { system = elem; } else { parsed = elem; }; in lib.matchAttrs pattern platform; - - enableIfAvailable = p: if p.meta.available or true then [ p ] else []; } diff --git a/lib/modules.nix b/lib/modules.nix index acd07f732bdb5ba02705a5ef998f0b5bddaf848d..a443d5ec5d161861938a2bb841ecceafb789f202 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -59,7 +59,7 @@ rec { }; }; - closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options; lib = import ./.; } // specialArgs); + closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options lib; } // specialArgs); options = mergeModules prefix (reverseList (filterModules (specialArgs.modulesPath or "") closed)); @@ -159,7 +159,7 @@ rec { context = name: ''while evaluating the module argument `${name}' in "${key}":''; extraArgs = builtins.listToAttrs (map (name: { inherit name; - value = addErrorContext (context name) + value = builtins.addErrorContext (context name) (args.${name} or config._module.args.${name}); }) requiredArgs); @@ -309,7 +309,8 @@ rec { res.mergedValue; in opt // - { value = addErrorContext "while evaluating the option `${showOption loc}':" value; + { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; + inherit (res.defsFinal') highestPrio; definitions = map (def: def.value) res.defsFinal; files = map (def: def.file) res.defsFinal; inherit (res) isDefined; @@ -317,7 +318,7 @@ rec { # Merge definitions of a value of a given type. mergeDefinitions = loc: type: defs: rec { - defsFinal = + defsFinal' = let # Process mkMerge and mkIf properties. defs' = concatMap (m: @@ -325,15 +326,20 @@ rec { ) defs; # Process mkOverride properties. - defs'' = filterOverrides defs'; + defs'' = filterOverrides' defs'; # Sort mkOrder properties. defs''' = # Avoid sorting if we don't have to. - if any (def: def.value._type or "" == "order") defs'' - then sortProperties defs'' - else defs''; - in defs'''; + if any (def: def.value._type or "" == "order") defs''.values + then sortProperties defs''.values + else defs''.values; + in { + values = defs'''; + inherit (defs'') highestPrio; + }; + + defsFinal = defsFinal'.values; # Type-check the remaining definitions, and merge them. mergedValue = foldl' (res: def: @@ -416,13 +422,18 @@ rec { Note that "z" has the default priority 100. */ - filterOverrides = defs: + filterOverrides = defs: (filterOverrides' defs).values; + + filterOverrides' = defs: let defaultPrio = 100; getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPrio; highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs; strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def; - in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs; + in { + values = concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs; + inherit highestPrio; + }; /* Sort a list of properties. The sort priority of a property is 1000 by default, but can be overridden by wrapping the property @@ -482,7 +493,7 @@ rec { inherit priority content; }; - mkOptionDefault = mkOverride 1001; # priority of option defaults + mkOptionDefault = mkOverride 1500; # priority of option defaults mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default mkForce = mkOverride 50; mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’ @@ -521,9 +532,7 @@ rec { # mkAliasDefinitions = mkAliasAndWrapDefinitions id; mkAliasAndWrapDefinitions = wrap: option: - mkMerge - (optional (isOption option && option.isDefined) - (wrap (mkMerge option.definitions))); + mkIf (isOption option && option.isDefined) (wrap (mkMerge option.definitions)); /* Compatibility. */ @@ -658,21 +667,25 @@ rec { }; doRename = { from, to, visible, warn, use }: + { config, options, ... }: let + fromOpt = getAttrFromPath from options; toOf = attrByPath to (abort "Renaming error: option `${showOption to}' does not exist."); in - { config, options, ... }: - { options = setAttrByPath from (mkOption { - description = "Alias of ."; - apply = x: use (toOf config); - }); - config = { - warnings = - let opt = getAttrFromPath from options; in - optional (warn && opt.isDefined) - "The option `${showOption from}' defined in ${showFiles opt.files} has been renamed to `${showOption to}'."; - } // setAttrByPath to (mkAliasDefinitions (getAttrFromPath from options)); - }; + { + options = setAttrByPath from (mkOption { + inherit visible; + description = "Alias of ."; + apply = x: use (toOf config); + }); + config = mkMerge [ + { + warnings = optional (warn && fromOpt.isDefined) + "The option `${showOption from}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption to}'."; + } + (mkAliasAndWrapDefinitions (setAttrByPath to) fromOpt) + ]; + }; } diff --git a/lib/options.nix b/lib/options.nix index 9446eca36778bc272ffe99cc7f833e41062a361b..01160b48ec01998ac665b7685cdbbecb1ba0627c 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -127,7 +127,20 @@ rec { /* Helper functions. */ - showOption = concatStringsSep "."; + + # Convert an option, described as a list of the option parts in to a + # safe, human readable version. ie: + # + # (showOption ["foo" "bar" "baz"]) == "foo.bar.baz" + # (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux" + showOption = parts: let + escapeOptionPart = part: + let + escaped = lib.strings.escapeNixString part; + in if escaped == "\"${part}\"" + then part + else escaped; + in (concatStringsSep ".") (map escapeOptionPart parts); showFiles = files: concatStringsSep " and " (map (f: "`${f}'") files); unknownModule = ""; diff --git a/lib/strings.nix b/lib/strings.nix index e6df7d99cb2e196c15eafa509a27c0de0a0c8b52..af932ce6ecff86458ff5cf13885621223b457e39 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -82,7 +82,7 @@ rec { => "//bin" */ makeSearchPath = subDir: packages: - concatStringsSep ":" (map (path: path + "/" + subDir) packages); + concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) packages)); /* Construct a Unix-style search path, using given package output. If no output is found, fallback to `.out` and then to the default. @@ -121,11 +121,20 @@ rec { Example: pkgs = import { } - makePerlPath [ pkgs.perlPackages.NetSMTP ] + makePerlPath [ pkgs.perlPackages.libnet ] => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl" */ makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl"; + /* Construct a perl search path recursively including all dependencies (such as $PERL5LIB) + + Example: + pkgs = import { } + makeFullPerlPath [ pkgs.perlPackages.CGI ] + => "/nix/store/fddivfrdc1xql02h9q500fpnqy12c74n-perl-CGI-4.38/lib/perl5/site_perl:/nix/store/8hsvdalmsxqkjg0c5ifigpf31vc4vsy2-perl-HTML-Parser-3.72/lib/perl5/site_perl:/nix/store/zhc7wh0xl8hz3y3f71nhlw1559iyvzld-perl-HTML-Tagset-3.20/lib/perl5/site_perl" + */ + makeFullPerlPath = deps: makePerlPath (lib.misc.closePropagation deps); + /* Depending on the boolean `cond', return either the given string or the empty string. Useful to concatenate against a bigger string. @@ -414,6 +423,39 @@ rec { */ enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}"; + /* Create an --{enable-=,disable-} string that can be passed to + standard GNU Autoconf scripts. + + Example: + enableFeature true "shared" "foo" + => "--enable-shared=foo" + enableFeature false "shared" (throw "ignored") + => "--disable-shared" + */ + enableFeatureAs = enable: feat: value: enableFeature enable feat + optionalString enable "=${value}"; + + /* Create an --{with,without}- string that can be passed to + standard GNU Autoconf scripts. + + Example: + withFeature true "shared" + => "--with-shared" + withFeature false "shared" + => "--without-shared" + */ + withFeature = with_: feat: "--${if with_ then "with" else "without"}-${feat}"; + + /* Create an --{with-=,without-} string that can be passed to + standard GNU Autoconf scripts. + + Example: + with_Feature true "shared" "foo" + => "--with-shared=foo" + with_Feature false "shared" (throw "ignored") + => "--without-shared" + */ + withFeatureAs = with_: feat: value: withFeature with_ feat + optionalString with_ "=${value}"; + /* Create a fixed width string with additional prefix to match required width. diff --git a/lib/systems/default.nix b/lib/systems/default.nix index bd408e00bb14213d55cec1941fdc635119f1ffd8..5eacc9eb23e11277e7f59bd76533b005f4b5e527 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -29,6 +29,7 @@ rec { /**/ if final.isDarwin then "libSystem" else if final.isMinGW then "msvcrt" else if final.isMusl then "musl" + else if final.isUClibc then "uclibc" else if final.isAndroid then "bionic" else if final.isLinux /* default */ then "glibc" # TODO(@Ericson2314) think more about other operating systems @@ -44,8 +45,16 @@ rec { }; # Misc boolean options useAndroidPrebuilt = false; + useiOSPrebuilt = false; } // mapAttrs (n: v: v final.parsed) inspect.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; + assert lib.foldl + (pass: { assertion, message }: + if assertion final + then pass + else throw message) + true + (final.parsed.abi.assertions or []); final; } diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 012a1786a3ccb44096f86f85e45591194919890c..a00165db171603477c96e0399402276a3ade9232 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,7 +26,7 @@ in rec { none = []; - arm = filterDoubles predicates.isArm; + arm = filterDoubles predicates.isAarch32; aarch64 = filterDoubles predicates.isAarch64; x86 = filterDoubles predicates.isx86; i686 = filterDoubles predicates.isi686; @@ -36,7 +36,7 @@ in rec { cygwin = filterDoubles predicates.isCygwin; darwin = filterDoubles predicates.isDarwin; freebsd = filterDoubles predicates.isFreeBSD; - # Should be better, but MinGW is unclear, and HURD is bit-rotted. + # Should be better, but MinGW is unclear. gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }); illumos = filterDoubles predicates.isSunOS; linux = filterDoubles predicates.isLinux; @@ -44,5 +44,5 @@ in rec { openbsd = filterDoubles predicates.isOpenBSD; unix = filterDoubles predicates.isUnix; - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux"]; + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "powerpc64le-linux"]; } diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 848737700b0bc5fdd45605be3679acb33f79eeb4..3828b2f84c6491ad608ed2f3c480a646eb4492ef 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -8,39 +8,55 @@ rec { # # Linux # + powernv = { + config = "powerpc64le-unknown-linux-gnu"; + platform = platforms.powernv; + }; + musl-power = { + config = "powerpc64le-unknown-linux-musl"; + platform = platforms.powernv; + }; sheevaplug = rec { config = "armv5tel-unknown-linux-gnueabi"; - arch = "armv5tel"; - float = "soft"; platform = platforms.sheevaplug; }; raspberryPi = rec { config = "armv6l-unknown-linux-gnueabihf"; - arch = "armv6l"; - float = "hard"; - fpu = "vfp"; platform = platforms.raspberrypi; }; armv7l-hf-multiplatform = rec { - config = "arm-unknown-linux-gnueabihf"; - arch = "armv7-a"; - float = "hard"; - fpu = "vfpv3-d16"; + config = "armv7a-unknown-linux-gnueabihf"; platform = platforms.armv7l-hf-multiplatform; }; aarch64-multiplatform = rec { config = "aarch64-unknown-linux-gnu"; - arch = "aarch64"; platform = platforms.aarch64-multiplatform; }; + armv5te-android-prebuilt = rec { + config = "armv5tel-unknown-linux-androideabi"; + sdkVer = "21"; + ndkVer = "10e"; + platform = platforms.armv5te-android; + useAndroidPrebuilt = true; + }; + + armv7a-android-prebuilt = rec { + config = "armv7a-unknown-linux-androideabi"; + sdkVer = "24"; + ndkVer = "17"; + platform = platforms.armv7a-android; + useAndroidPrebuilt = true; + }; + aarch64-android-prebuilt = rec { config = "aarch64-unknown-linux-android"; - arch = "aarch64"; + sdkVer = "24"; + ndkVer = "17"; platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; }; @@ -51,16 +67,17 @@ rec { }; pogoplug4 = rec { - arch = "armv5tel"; config = "armv5tel-unknown-linux-gnueabi"; - float = "soft"; platform = platforms.pogoplug4; }; + ben-nanonote = rec { + config = "mipsel-unknown-linux-uclibc"; + platform = platforms.ben_nanonote; + }; + fuloongminipc = rec { config = "mipsel-unknown-linux-gnu"; - arch = "mips"; - float = "hard"; platform = platforms.fuloong2f_n32; }; @@ -88,16 +105,42 @@ rec { # iphone64 = { - config = "aarch64-apple-darwin14"; - arch = "arm64"; - libc = "libSystem"; + config = "aarch64-apple-ios"; + # config = "aarch64-apple-darwin14"; + sdkVer = "10.2"; + xcodeVer = "8.2"; + xcodePlatform = "iPhoneOS"; + useiOSPrebuilt = true; platform = {}; }; iphone32 = { - config = "arm-apple-darwin10"; - arch = "armv7-a"; - libc = "libSystem"; + config = "armv7a-apple-ios"; + # config = "arm-apple-darwin10"; + sdkVer = "10.2"; + xcodeVer = "8.2"; + xcodePlatform = "iPhoneOS"; + useiOSPrebuilt = true; + platform = {}; + }; + + iphone64-simulator = { + config = "x86_64-apple-ios"; + # config = "x86_64-apple-darwin14"; + sdkVer = "10.2"; + xcodeVer = "8.2"; + xcodePlatform = "iPhoneSimulator"; + useiOSPrebuilt = true; + platform = {}; + }; + + iphone32-simulator = { + config = "i686-apple-ios"; + # config = "i386-apple-darwin11"; + sdkVer = "10.2"; + xcodeVer = "8.2"; + xcodePlatform = "iPhoneSimulator"; + useiOSPrebuilt = true; platform = {}; }; @@ -108,7 +151,6 @@ rec { # 32 bit mingw-w64 mingw32 = { config = "i686-pc-mingw32"; - arch = "x86"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; @@ -117,7 +159,6 @@ rec { mingwW64 = { # That's the triplet they use in the mingw-w64 docs. config = "x86_64-pc-mingw32"; - arch = "x86_64"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix index 43c0195c3f18a8addab01195a4b76b76b2603586..51fb6ae760d1e9fd8c68711b51bd9f73d712fc9b 100644 --- a/lib/systems/for-meta.nix +++ b/lib/systems/for-meta.nix @@ -3,11 +3,13 @@ let inherit (lib.systems) parse; inherit (lib.systems.inspect) patterns; + abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) parse.abis; + in rec { all = [ {} ]; # `{}` matches anything none = []; - arm = [ patterns.isArm ]; + arm = [ patterns.isAarch32 ]; aarch64 = [ patterns.isAarch64 ]; x86 = [ patterns.isx86 ]; i686 = [ patterns.isi686 ]; @@ -18,8 +20,12 @@ in rec { 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; } ]; + # Should be better, but MinGW is unclear. + gnu = [ + { kernel = parse.kernels.linux; abi = abis.gnu; } + { kernel = parse.kernels.linux; abi = abis.gnueabi; } + { kernel = parse.kernels.linux; abi = abis.gnueabihf; } + ]; illumos = [ patterns.isSunOS ]; linux = [ patterns.isLinux ]; netbsd = [ patterns.isNetBSD ]; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index d7fabf684b72d521a87293d8c5feab60abd8e708..65f560328af536b764142e7eb769661d49d78b7a 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -3,16 +3,21 @@ with import ./parse.nix { inherit lib; }; with lib.attrsets; with lib.lists; +let abis_ = abis; in +let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis_; in + rec { patterns = rec { isi686 = { cpu = cpuTypes.i686; }; isx86_64 = { cpu = cpuTypes.x86_64; }; isPowerPC = { cpu = cpuTypes.powerpc; }; + isPower = { cpu = { family = "power"; }; }; isx86 = { cpu = { family = "x86"; }; }; - isArm = { cpu = { family = "arm"; }; }; - isAarch64 = { cpu = { family = "aarch64"; }; }; + isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; + isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; isMips = { cpu = { family = "mips"; }; }; isRiscV = { cpu = { family = "riscv"; }; }; + isSparc = { cpu = { family = "sparc"; }; }; isWasm = { cpu = { family = "wasm"; }; }; is32bit = { cpu = { bits = 32; }; }; @@ -22,14 +27,13 @@ rec { isBSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; }; isDarwin = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; }; - isUnix = [ isBSD isDarwin isLinux isSunOS isHurd isCygwin ]; + isUnix = [ isBSD isDarwin isLinux isSunOS isCygwin ]; 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; }; @@ -38,9 +42,13 @@ rec { isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; + isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; isEfi = map (family: { cpu.family = family; }) [ "x86" "arm" "aarch64" ]; + + # Deprecated after 18.03 + isArm = isAarch32; }; matchAnyAttrs = patterns: diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 641a7f5d758499b2193d734894f6c0f67b5c323f..bb26c93f3d7aa774e1664217b4fce5a14242d0c6 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -18,6 +18,7 @@ with lib.lists; with lib.types; with lib.attrsets; +with lib.strings; with (import ./inspect.nix { inherit lib; }).predicates; let @@ -34,7 +35,7 @@ rec { ################################################################################ - types.openSignifiantByte = mkOptionType { + types.openSignificantByte = mkOptionType { name = "significant-byte"; description = "Endianness"; merge = mergeOneOption; @@ -42,7 +43,7 @@ rec { types.significantByte = enum (attrValues significantBytes); - significantBytes = setTypes types.openSignifiantByte { + significantBytes = setTypes types.openSignificantByte { bigEndian = {}; littleEndian = {}; }; @@ -68,20 +69,36 @@ rec { cpuTypes = with significantBytes; setTypes types.openCpuType { arm = { bits = 32; significantByte = littleEndian; family = "arm"; }; - armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; }; - armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; }; - armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; }; - armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; }; - aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; }; + armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; version = "5"; }; + armv6m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; }; + armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; }; + armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; + armv7r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; + armv7m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; + armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; + armv8a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; }; + armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; }; + armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; }; + aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; }; + i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; + mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; + powerpc = { bits = 32; significantByte = bigEndian; family = "power"; }; + powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; }; + powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; }; + riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; }; riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; }; + + sparc = { bits = 32; significantByte = bigEndian; family = "sparc"; }; + sparc64 = { bits = 64; significantByte = bigEndian; family = "sparc"; }; + wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; }; wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; }; }; @@ -155,7 +172,6 @@ rec { 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 = { }; }; netbsd = { execFormat = elf; families = { inherit bsd; }; }; none = { execFormat = unknown; families = { }; }; @@ -165,9 +181,6 @@ rec { } // { # 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.macos; - darwin14 = kernels.macos; watchos = kernels.ios; tvos = kernels.ios; win32 = kernels.windows; @@ -184,24 +197,47 @@ rec { types.abi = enum (attrValues abis); abis = setTypes types.openAbi { - android = {}; - cygnus = {}; - gnu = {}; - msvc = {}; - eabi = {}; - androideabi = {}; - gnueabi = {}; - gnueabihf = {}; - musleabi = {}; - musleabihf = {}; - musl = {}; + cygnus = {}; + msvc = {}; + eabi = {}; + + androideabi = {}; + android = { + assertions = [ + { assertion = platform: !platform.isAarch32; + message = '' + The "android" ABI is not for 32-bit ARM. Use "androideabi" instead. + ''; + } + ]; + }; + + gnueabi = { float = "soft"; }; + gnueabihf = { float = "hard"; }; + gnu = { + assertions = [ + { assertion = platform: !platform.isAarch32; + message = '' + The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead. + ''; + } + ]; + }; + + musleabi = { float = "soft"; }; + musleabihf = { float = "hard"; }; + musl = {}; + + uclibceabihf = { float = "soft"; }; + uclibceabi = { float = "hard"; }; + uclibc = {}; unknown = {}; }; ################################################################################ - types.system = mkOptionType { + types.parsedPlatform = mkOptionType { name = "system"; description = "fully parsed representation of llvm- or nix-style platform tuple"; merge = mergeOneOption; @@ -215,15 +251,13 @@ rec { isSystem = isType "system"; mkSystem = components: - assert types.system.check components; + assert types.parsedPlatform.check components; setType "system" components; mkSkeletonFromList = l: { "2" = # We only do 2-part hacks for things Nix already supports if elemAt l 1 == "cygwin" then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; } - else if elemAt l 1 == "gnu" - then { cpu = elemAt l 0; kernel = "hurd"; abi = "gnu"; } else { cpu = elemAt l 0; kernel = elemAt l 1; }; "3" = # Awkwards hacks, beware! if elemAt l 1 == "apple" @@ -232,6 +266,8 @@ rec { then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; } else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; abi = "gnu"; } + else if hasPrefix "netbsd" (elemAt l 2) + then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; } else throw "Target specification with 3 components is ambiguous"; "4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; }; }.${toString (length l)} @@ -258,10 +294,17 @@ rec { else if isDarwin parsed then vendors.apple else if isWindows parsed then vendors.pc else vendors.unknown; - kernel = getKernel args.kernel; + kernel = if hasPrefix "darwin" args.kernel then getKernel "darwin" + else if hasPrefix "netbsd" args.kernel then getKernel "netbsd" + else getKernel args.kernel; abi = /**/ if args ? abi then getAbi args.abi - else if isLinux parsed then abis.gnu + else if isLinux parsed then + if isAarch32 parsed then + if lib.versionAtLeast (parsed.cpu.version or "0") "6" + then abis.gnueabihf + else abis.gnueabi + else abis.gnu else if isWindows parsed then abis.gnu else abis.unknown; }; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index f39e890fbf1c968cfcfb5a95df1fdf05f623a83f..56783d99e3d43fc7a8b2af1200cb0849f5cdb91a 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -20,12 +20,31 @@ rec { kernelAutoModules = false; }; + powernv = { + name = "PowerNV"; + kernelArch = "powerpc"; + kernelBaseConfig = "powernv_defconfig"; + kernelTarget = "zImage"; + kernelInstallTarget = "install"; + kernelFile = "vmlinux"; + kernelAutoModules = true; + # avoid driver/FS trouble arising from unusual page size + kernelExtraConfig = '' + PPC_64K_PAGES n + PPC_4K_PAGES y + IPV6 y + ''; + }; + + ## + ## ARM + ## + pogoplug4 = { name = "pogoplug4"; gcc = { arch = "armv5te"; - float = "soft"; }; kernelMajor = "2.6"; @@ -158,185 +177,36 @@ rec { kernelDTB = true; # Beyond 3.10 gcc = { arch = "armv5te"; - float = "soft"; }; }; raspberrypi = { name = "raspberrypi"; kernelMajor = "2.6"; - kernelBaseConfig = "bcmrpi_defconfig"; + kernelBaseConfig = "bcm2835_defconfig"; kernelDTB = true; kernelArch = "arm"; - kernelAutoModules = false; + kernelAutoModules = true; + kernelPreferBuiltin = true; kernelExtraConfig = '' - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - BTRFS_FS y - XFS_FS m - JFS_FS y - EXT4_FS y - - IP_PNP y - IP_PNP_DHCP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NETFILTER y - IP_NF_IPTABLES y - IP_NF_FILTER y - IP_NF_MATCH_ADDRTYPE y - IP_NF_TARGET_LOG y - IP_NF_MANGLE y - IPV6 m - VLAN_8021Q m - - CIFS y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - CIFS_ACL y - - ZRAM m - # Disable OABI to have seccomp_filter (required for systemd) # https://github.com/raspberrypi/firmware/issues/651 OABI_COMPAT n - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # nixos mounts some cgroup - CGROUPS y - - # Latencytop - LATENCYTOP y ''; kernelTarget = "zImage"; gcc = { arch = "armv6"; fpu = "vfp"; - float = "hard"; - # TODO(@Ericson2314) what is this and is it a good idea? It was - # used in some cross compilation examples but not others. - # - # abi = "aapcs-linux"; }; }; - raspberrypi2 = armv7l-hf-multiplatform // { - name = "raspberrypi2"; - kernelBaseConfig = "bcm2709_defconfig"; - kernelDTB = true; - kernelAutoModules = false; - kernelExtraConfig = '' - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - BTRFS_FS y - XFS_FS m - JFS_FS y - EXT4_FS y - - IP_PNP y - IP_PNP_DHCP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NETFILTER y - IP_NF_IPTABLES y - IP_NF_FILTER y - IP_NF_MATCH_ADDRTYPE y - IP_NF_TARGET_LOG y - IP_NF_MANGLE y - IPV6 m - VLAN_8021Q m - - CIFS y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - CIFS_ACL y - - ZRAM m - - # Disable OABI to have seccomp_filter (required for systemd) - # https://github.com/raspberrypi/firmware/issues/651 - OABI_COMPAT n - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # nixos mounts some cgroup - CGROUPS y - - # Latencytop - LATENCYTOP y - - # Disable the common config Xen, it doesn't build on ARM - XEN? n - ''; - kernelTarget = "zImage"; - }; + # Legacy attribute, for compatibility with existing configs only. + raspberrypi2 = armv7l-hf-multiplatform; scaleway-c1 = armv7l-hf-multiplatform // { gcc = { cpu = "cortex-a9"; fpu = "vfpv3"; - float = "hard"; }; }; @@ -363,7 +233,6 @@ rec { gcc = { cpu = "cortex-a9"; fpu = "neon"; - float = "hard"; }; }; @@ -376,83 +245,6 @@ rec { kernelBaseConfig = "guruplug_defconfig"; }; - fuloong2f_n32 = { - name = "fuloong2f_n32"; - kernelMajor = "2.6"; - kernelBaseConfig = "lemote2f_defconfig"; - kernelArch = "mips"; - kernelAutoModules = false; - kernelExtraConfig = '' - MIGRATION n - COMPACTION n - - # nixos mounts some cgroup - CGROUPS y - - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - EXT4_FS m - USB_STORAGE_CYPRESS_ATACB m - - IP_PNP y - IP_PNP_DHCP y - IP_PNP_BOOTP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # Needed for udev >= 150 - SYSFS_DEPRECATED_V2 n - - VGA_CONSOLE n - VT_HW_CONSOLE_BINDING y - SERIAL_8250_CONSOLE y - FRAMEBUFFER_CONSOLE y - EXT2_FS y - EXT3_FS y - REISERFS_FS y - MAGIC_SYSRQ y - - # The kernel doesn't boot at all, with FTRACE - FTRACE n - ''; - kernelTarget = "vmlinux"; - gcc = { - arch = "loongson2f"; - abi = "n32"; - }; - }; - beaglebone = armv7l-hf-multiplatform // { name = "beaglebone"; kernelBaseConfig = "bb.org_defconfig"; @@ -461,6 +253,27 @@ rec { kernelTarget = "zImage"; }; + # https://developer.android.com/ndk/guides/abis#armeabi + armv5te-android = { + name = "armeabi"; + gcc = { + arch = "armv5te"; + float = "soft"; + float-abi = "soft"; + }; + }; + + # https://developer.android.com/ndk/guides/abis#v7a + armv7a-android = { + name = "armeabi-v7a"; + gcc = { + arch = "armv7-a"; + float = "hard"; + float-abi = "softfp"; + fpu = "vfpv3-d16"; + }; + }; + armv7l-hf-multiplatform = { name = "armv7l-hf-multiplatform"; kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. @@ -481,6 +294,10 @@ rec { # Hangs ODROID-XU4 ARM_BIG_LITTLE_CPUIDLE n + + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n ''; gcc = { # Some table about fpu flags: @@ -498,7 +315,6 @@ rec { # and the above page suggests NEON is only an improvement with hand-written assembly. arch = "armv7-a"; fpu = "vfpv3-d16"; - float = "hard"; # For Raspberry Pi the 2 the best would be: # cpu = "cortex-a7"; @@ -541,6 +357,102 @@ rec { }; }; + ## + ## MIPS + ## + + ben_nanonote = { + name = "ben_nanonote"; + kernelMajor = "2.6"; + kernelArch = "mips"; + gcc = { + arch = "mips32"; + float = "soft"; + }; + }; + + fuloong2f_n32 = { + name = "fuloong2f_n32"; + kernelMajor = "2.6"; + kernelBaseConfig = "lemote2f_defconfig"; + kernelArch = "mips"; + kernelAutoModules = false; + kernelExtraConfig = '' + MIGRATION n + COMPACTION n + + # nixos mounts some cgroup + CGROUPS y + + BLK_DEV_RAM y + BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m + BLK_DEV_DM m + DM_CRYPT m + MD y + REISERFS_FS m + EXT4_FS m + USB_STORAGE_CYPRESS_ATACB m + + IP_PNP y + IP_PNP_DHCP y + IP_PNP_BOOTP y + NFS_FS y + ROOT_NFS y + TUN m + NFS_V4 y + NFS_V4_1 y + NFS_FSCACHE y + NFSD m + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + + # Fail to build + DRM n + SCSI_ADVANSYS n + USB_ISP1362_HCD n + SND_SOC n + SND_ALI5451 n + FB_SAVAGE n + SCSI_NSP32 n + ATA_SFF n + SUNGEM n + IRDA n + ATM_HE n + SCSI_ACARD n + BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m + + # Needed for udev >= 150 + SYSFS_DEPRECATED_V2 n + + VGA_CONSOLE n + VT_HW_CONSOLE_BINDING y + SERIAL_8250_CONSOLE y + FRAMEBUFFER_CONSOLE y + EXT2_FS y + EXT3_FS y + REISERFS_FS y + MAGIC_SYSRQ y + + # The kernel doesn't boot at all, with FTRACE + FTRACE n + ''; + kernelTarget = "vmlinux"; + gcc = { + arch = "loongson2f"; + float = "hard"; + abi = "n32"; + }; + }; + + ## + ## Other + ## + riscv-multiplatform = bits: { name = "riscv-multiplatform"; kernelArch = "riscv"; @@ -562,5 +474,6 @@ rec { "armv7l-linux" = armv7l-hf-multiplatform; "aarch64-linux" = aarch64-multiplatform; "mipsel-linux" = fuloong2f_n32; + "powerpc64le-linux" = powernv; }.${system} or pcBase; } diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 5f19dd63f2d86e815ab0bfbeb865884a633960f3..cf99aca58c0907b252b4aea589ce91e271f58f78 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -45,6 +45,21 @@ runTests { expected = true; }; + testBitAnd = { + expr = (bitAnd 3 10); + expected = 2; + }; + + testBitOr = { + expr = (bitOr 3 10); + expected = 11; + }; + + testBitXor = { + expr = (bitXor 3 10); + expected = 9; + }; + # STRINGS testConcatMapStrings = { @@ -198,6 +213,30 @@ runTests { }; +# ATTRSETS + + # code from the example + testRecursiveUpdateUntil = { + expr = recursiveUpdateUntil (path: l: r: path == ["foo"]) { + # first attribute set + foo.bar = 1; + foo.baz = 2; + bar = 3; + } { + #second attribute set + foo.bar = 1; + foo.quz = 2; + baz = 4; + }; + expected = { + foo.bar = 1; # 'foo.*' from the second set + foo.quz = 2; # + bar = 3; # 'bar' from the first set + baz = 4; # 'baz' from the second set + }; + }; + + # GENERATORS # these tests assume attributes are converted to lists # in alphabetical order @@ -317,7 +356,8 @@ runTests { expr = mapAttrs (const (generators.toPretty {})) rec { int = 42; bool = true; - string = "fnord"; + string = ''fno"rd''; + path = /. + "/foo"; # toPath returns a string null_ = null; function = x: x; functionArgs = { arg ? 4, foo }: arg; @@ -328,13 +368,14 @@ runTests { expected = rec { int = "42"; bool = "true"; - string = "\"fnord\""; + string = ''"fno\"rd"''; + path = "/foo"; null_ = "null"; function = "<λ>"; functionArgs = "<λ:{(arg),foo}>"; list = "[ 3 4 ${function} [ false ] ]"; attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }"; - drv = "<δ>"; + drv = "<δ:test>"; }; }; @@ -363,10 +404,6 @@ runTests { resRem7 = res6.replace (a: removeAttrs a ["a"]); - resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; }; - x2 = x.merge { a = 20; }; # now we have 27 - in (x2.replace) { a = 10; }; # and override the value by 10 - # fixed tests (delayed args): (when using them add some comments, please) resFixed1 = let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; }); diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 96a91c0fffbc986996be6f657b8ccab4f66db4b3..b83e1eb7d82d01bc228d9af375be0e49204ef506 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -136,7 +136,18 @@ checkConfigOutput "true" "$@" ./define-module-check.nix # Check coerced value. checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix -checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix +checkConfigError 'The option value .* in .* is not.*string or signed integer convertible to it' config.value ./declare-coerced-value.nix ./define-value-list.nix + +# Check coerced value with unsound coercion +checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix +checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix +checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix + +# Check loaOf with long list. +checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.nix + +# Check loaOf with many merges of lists. +checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix cat < [ 2 1 ] + */ flip = f: a: b: f b a; - # Apply function if argument is non-null + /* Apply function if argument is non-null. + + Example: + mapNullable (x: x+1) null + => null + mapNullable (x: x+1) 22 + => 23 + */ mapNullable = f: a: if isNull a then a else f a; # Pull in some builtins not included elsewhere. inherit (builtins) pathExists readFile isBool - isInt add sub lessThan + isInt isFloat add sub lessThan seq deepSeq genericClosure; - inherit (lib.strings) fileContents; - # Return the Nixpkgs version number. - nixpkgsVersion = - let suffixFile = ../.version-suffix; in - fileContents ../.version - + (if pathExists suffixFile then fileContents suffixFile else "pre-git"); + ## nixpks version strings + + # The current full nixpkgs version number. + version = release + versionSuffix; + + # The current nixpkgs version number as string. + release = lib.strings.fileContents ../.version; + + # The current nixpkgs version suffix as string. + versionSuffix = + let suffixFile = ../.version-suffix; + in if pathExists suffixFile + then lib.strings.fileContents suffixFile + else "pre-git"; + + nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version; # Whether we're being called by nix-shell. inNixShell = builtins.getEnv "IN_NIX_SHELL" != ""; + + ## Integer operations + # Return minimum/maximum of two numbers. min = x: y: if x < y then x else y; max = x: y: if x > y then x else y; @@ -81,6 +127,9 @@ rec { */ mod = base: int: base - (int * (builtins.div base int)); + + ## Comparisons + /* C-style comparisons a < b, compare a b => -1 @@ -110,17 +159,20 @@ rec { cmp "fooa" "a" => -1 # while compare "fooa" "a" => 1 - */ splitByAndCompare = p: yes: no: a: b: if p a then if p b then yes a b else -1 else if p b then 1 else no a b; + /* Reads a JSON file. */ importJSON = path: builtins.fromJSON (builtins.readFile path); + + ## Warnings and asserts + /* See https://github.com/NixOS/nix/issues/749. Eventually we'd like these to expand to Nix builtins that carry metadata so that Nix can filter out the INFO messages without parsing the message string. @@ -136,28 +188,36 @@ rec { warn = msg: builtins.trace "WARNING: ${msg}"; info = msg: builtins.trace "INFO: ${msg}"; - # | Add metadata about expected function arguments to a function. - # The metadata should match the format given by - # builtins.functionArgs, i.e. a set from expected argument to a bool - # representing whether that argument has a default or not. - # setFunctionArgs : (a → b) → Map String Bool → (a → b) - # - # This function is necessary because you can't dynamically create a - # function of the { a, b ? foo, ... }: format, but some facilities - # like callPackage expect to be able to query expected arguments. + + ## Function annotations + + /* Add metadata about expected function arguments to a function. + The metadata should match the format given by + builtins.functionArgs, i.e. a set from expected argument to a bool + representing whether that argument has a default or not. + setFunctionArgs : (a → b) → Map String Bool → (a → b) + + This function is necessary because you can't dynamically create a + function of the { a, b ? foo, ... }: format, but some facilities + like callPackage expect to be able to query expected arguments. + */ setFunctionArgs = f: args: { # TODO: Should we add call-time "type" checking like built in? __functor = self: f; __functionArgs = args; }; - # | Extract the expected function arguments from a function. - # This works both with nix-native { a, b ? foo, ... }: style - # functions and functions with args set with 'setFunctionArgs'. It - # has the same return type and semantics as builtins.functionArgs. - # setFunctionArgs : (a → b) → Map String Bool. + /* Extract the expected function arguments from a function. + This works both with nix-native { a, b ? foo, ... }: style + functions and functions with args set with 'setFunctionArgs'. It + has the same return type and semantics as builtins.functionArgs. + setFunctionArgs : (a → b) → Map String Bool. + */ functionArgs = f: f.__functionArgs or (builtins.functionArgs f); + /* Check whether something is a function or something + annotated with function args. + */ isFunction = f: builtins.isFunction f || (f ? __functor && isFunction (f.__functor f)); } diff --git a/lib/types.nix b/lib/types.nix index a334db5c7247b5ac4ea8ebc09693381f8b0386bc..4d6ac51c89882c7652e8427ab28f8d5b8c8185ee 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -8,7 +8,7 @@ with lib.trivial; with lib.strings; let - inherit (lib.modules) mergeDefinitions filterOverrides; + inherit (lib.modules) mergeDefinitions; outer_types = rec { isType = type: x: (x._type or "") == type; @@ -167,6 +167,13 @@ rec { # s32 = sign 32 4294967296; }; + float = mkOptionType rec { + name = "float"; + description = "floating point number"; + check = isFloat; + merge = mergeOneOption; + }; + str = mkOptionType { name = "str"; description = "string"; @@ -256,7 +263,7 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; - nonEmptyListOf = elemType: + nonEmptyListOf = elemType: let list = addCheck (types.listOf elemType) (l: l != []); in list // { description = "non-empty " + list.description; }; @@ -280,24 +287,34 @@ rec { # List or attribute set of ... loaOf = elemType: let - convertIfList = defIdx: def: + convertAllLists = defs: + let + padWidth = stringLength (toString (length defs)); + unnamedPrefix = i: "unnamed-" + fixedWidthNumber padWidth i + "."; + in + imap1 (i: convertIfList (unnamedPrefix i)) defs; + + convertIfList = unnamedPrefix: def: if isList def.value then - { inherit (def) file; - value = listToAttrs ( - imap1 (elemIdx: elem: - { name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}"; - value = elem; - }) def.value); - } + let + padWidth = stringLength (toString (length def.value)); + unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i; + in + { inherit (def) file; + value = listToAttrs ( + imap1 (elemIdx: elem: + { name = elem.name or (unnamed elemIdx); + value = elem; + }) def.value); + } else def; - listOnly = listOf elemType; attrOnly = attrsOf elemType; in mkOptionType rec { name = "loaOf"; description = "list or attribute set of ${elemType.description}s"; check = x: isList x || isAttrs x; - merge = loc: defs: attrOnly.merge loc (imap1 convertIfList defs); + merge = loc: defs: attrOnly.merge loc (convertAllLists defs); getSubOptions = prefix: elemType.getSubOptions (prefix ++ [""]); getSubModules = elemType.getSubModules; substSubModules = m: loaOf (elemType.substSubModules m); @@ -361,7 +378,13 @@ rec { # This is mandatory as some option declaration might use the # "name" attribute given as argument of the submodule and use it # as the default of option declarations. - args.name = "<name>"; + # + # Using lookalike unicode single angle quotation marks because + # of the docbook transformation the options receive. In all uses + # > and < wouldn't be encoded correctly so the encoded values + # would be used, and use of `<` and `>` would break the XML document. + # It shouldn't cause an issue since this is cosmetic for the manual. + args.name = "‹name›"; }).options; getSubModules = opts'; substSubModules = m: submodule m; @@ -419,16 +442,13 @@ rec { assert coercedType.getSubModules == null; mkOptionType rec { name = "coercedTo"; - description = "${finalType.description} or ${coercedType.description}"; - check = x: finalType.check x || coercedType.check x; + description = "${finalType.description} or ${coercedType.description} convertible to it"; + check = x: finalType.check x || (coercedType.check x && finalType.check (coerceFunc x)); merge = loc: defs: let coerceVal = val: if finalType.check val then val - else let - coerced = coerceFunc val; - in assert finalType.check coerced; coerced; - + else coerceFunc val; in finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs); getSubOptions = finalType.getSubOptions; getSubModules = finalType.getSubModules; diff --git a/lib/zip-int-bits.nix b/lib/zip-int-bits.nix new file mode 100644 index 0000000000000000000000000000000000000000..edbcdfe1e6826db6b92c705a9a871e3665000642 --- /dev/null +++ b/lib/zip-int-bits.nix @@ -0,0 +1,39 @@ +/* Helper function to implement a fallback for the bit operators + `bitAnd`, `bitOr` and `bitXOr` on older nix version. + See ./trivial.nix +*/ +f: x: y: + let + # (intToBits 6) -> [ 0 1 1 ] + intToBits = x: + if x == 0 || x == -1 then + [] + else + let + headbit = if (x / 2) * 2 != x then 1 else 0; # x & 1 + tailbits = if x < 0 then ((x + 1) / 2) - 1 else x / 2; # x >> 1 + in + [headbit] ++ (intToBits tailbits); + + # (bitsToInt [ 0 1 1 ] 0) -> 6 + # (bitsToInt [ 0 1 0 ] 1) -> -6 + bitsToInt = l: signum: + if l == [] then + (if signum == 0 then 0 else -1) + else + (builtins.head l) + (2 * (bitsToInt (builtins.tail l) signum)); + + xsignum = if x < 0 then 1 else 0; + ysignum = if y < 0 then 1 else 0; + zipListsWith' = fst: snd: + if fst==[] && snd==[] then + [] + else if fst==[] then + [(f xsignum (builtins.head snd))] ++ (zipListsWith' [] (builtins.tail snd)) + else if snd==[] then + [(f (builtins.head fst) ysignum )] ++ (zipListsWith' (builtins.tail fst) [] ) + else + [(f (builtins.head fst) (builtins.head snd))] ++ (zipListsWith' (builtins.tail fst) (builtins.tail snd)); + in + assert (builtins.isInt x) && (builtins.isInt y); + bitsToInt (zipListsWith' (intToBits x) (intToBits y)) (f xsignum ysignum) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a39aa8b98829c99b39d2a63880030c884421ead4..1d6d772e7e95ed39ad479441f74449ef8a29301b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18,153 +18,6 @@ for an example on how to work with this data. */ { - Adjective-Object = { - email = "mhuan13@gmail.com"; - github = "Adjective-Object"; - name = "Maxwell Huang-Hobbs"; - }; - AndersonTorres = { - email = "torres.anderson.85@gmail.com"; - github = "AndersonTorres"; - name = "Anderson Torres"; - }; - Baughn = { - email = "sveina@gmail.com"; - github = "Baughn"; - name = "Svein Ove Aas"; - }; - ChengCat = { - email = "yu@cheng.cat"; - github = "ChengCat"; - name = "Yucheng Zhang"; - }; - CrystalGamma = { - email = "nixos@crystalgamma.de"; - github = "CrystalGamma"; - name = "Jona Stubbe"; - }; - DamienCassou = { - email = "damien@cassou.me"; - github = "DamienCassou"; - name = "Damien Cassou"; - }; - DerGuteMoritz = { - email = "moritz@twoticketsplease.de"; - github = "DerGuteMoritz"; - name = "Moritz Heidkamp"; - }; - DerTim1 = { - email = "tim.digel@active-group.de"; - github = "DerTim1"; - name = "Tim Digel"; - }; - DmitryTsygankov = { - email = "dmitry.tsygankov@gmail.com"; - github = "DmitryTsygankov"; - name = "Dmitry Tsygankov"; - }; - Esteth = { - email = "adam.copp@gmail.com"; - name = "Adam Copp"; - }; - FireyFly = { - email = "nix@firefly.nu"; - github = "FireyFly"; - name = "Jonas Höglund"; - }; - Gonzih = { - email = "gonzih@gmail.com"; - github = "Gonzih"; - name = "Max Gonzih"; - }; - Jo = { - email = "0x4A6F@shackspace.de"; - name = "Joachim Ernst"; - }; - KibaFox = { - email = "kiba.fox@foxypossibilities.com"; - github = "KibaFox"; - name = "Kiba Fox"; - }; - MP2E = { - email = "MP2E@archlinux.us"; - github = "MP2E"; - name = "Cray Elliott"; - }; - Mogria = { - email = "m0gr14@gmail.com"; - github = "mogria"; - name = "Mogria"; - }; - MostAwesomeDude = { - email = "cds@corbinsimpson.com"; - github = "MostAwesomeDude"; - name = "Corbin Simpson"; - }; - Nate-Devv = { - email = "natedevv@gmail.com"; - name = "Nathan Moore"; - }; - NikolaMandic = { - email = "nikola@mandic.email"; - github = "NikolaMandic"; - name = "Ratko Mladic"; - }; - Phlogistique = { - email = "noe.rubinstein@gmail.com"; - github = "Phlogistique"; - name = "Noé Rubinstein"; - }; - Profpatsch = { - email = "mail@profpatsch.de"; - github = "Profpatsch"; - name = "Profpatsch"; - }; - roosemberth = { - email = "roosembert.palacios+nixpkgs@gmail.com"; - github = "roosemberth"; - name = "Roosembert (Roosemberth) Palacios"; - }; - SShrike = { - email = "severen@shrike.me"; - github = "severen"; - name = "Severen Redwood"; - }; - SeanZicari = { - email = "sean.zicari@gmail.com"; - github = "SeanZicari"; - name = "Sean Zicari"; - }; - StijnDW = { - email = "stekke@airmail.cc"; - github = "StijnDW"; - name = "Stijn DW"; - }; - StillerHarpo = { - email = "florianengel39@gmail.com"; - github = "StillerHarpo"; - name = "Florian Engel"; - }; - SuprDewd = { - email = "suprdewd@gmail.com"; - github = "SuprDewd"; - name = "Bjarki Ágúst Guðmundsson"; - }; - TealG = { - email = "~@Teal.Gr"; - github = "TealG"; - name = "Teal Gaure"; - }; - ThomasMader = { - email = "thomas.mader@gmail.com"; - github = "ThomasMader"; - name = "Thomas Mader"; - }; - Zimmi48 = { - email = "theo.zimmermann@univ-paris-diderot.fr"; - github = "Zimmi48"; - name = "Théo Zimmermann"; - }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; @@ -225,6 +78,11 @@ github = "adisbladis"; name = "Adam Hose"; }; + Adjective-Object = { + email = "mhuan13@gmail.com"; + github = "Adjective-Object"; + name = "Maxwell Huang-Hobbs"; + }; adnelson = { email = "ithinkican@gmail.com"; github = "adnelson"; @@ -235,6 +93,11 @@ github = "adolfogc"; name = "Adolfo E. García Castro"; }; + aepsil0n = { + email = "eduard.bopp@aepsil0n.de"; + github = "aepsil0n"; + name = "Eduard Bopp"; + }; aespinosa = { email = "allan.espinosa@outlook.com"; github = "aespinosa"; @@ -300,6 +163,16 @@ github = "akru"; name = "Alexander Krupenkin "; }; + alexchapman = { + email = "alex@farfromthere.net"; + github = "AJChapman"; + name = "Alex Chapman"; + }; + alexfmpe = { + email = "alexandre.fmp.esteves@gmail.com"; + github = "alexfmpe"; + name = "Alexandre Esteves"; + }; alexvorobiev = { email = "alexander.vorobiev@gmail.com"; github = "alexvorobiev"; @@ -348,6 +221,11 @@ github = "AndrewMorsillo"; name = "Andrew Morsillo"; }; + AndersonTorres = { + email = "torres.anderson.85@gmail.com"; + github = "AndersonTorres"; + name = "Anderson Torres"; + }; anderspapitto = { email = "anderspapitto@gmail.com"; github = "anderspapitto"; @@ -358,6 +236,11 @@ github = "andir"; name = "Andreas Rammhold"; }; + andreabedini = { + email = "andrea@kzn.io"; + github = "andreabedini"; + name = "Andrea Bedini"; + }; andres = { email = "ksnixos@andres-loeh.de"; github = "kosmikus"; @@ -393,6 +276,11 @@ github = "ankhers"; name = "Justin Wood"; }; + Anton-Latukha = { + email = "anton.latuka+nixpkgs@gmail.com"; + github = "Anton-Latukha"; + name = "Anton Latukha"; + }; antono = { email = "self@antono.info"; github = "antono"; @@ -428,6 +316,11 @@ github = "aristidb"; name = "Aristid Breitkreuz"; }; + ariutta = { + email = "anders.riutta@gmail.com"; + github = "ariutta"; + name = "Anders Riutta"; + }; arobyn = { email = "shados@shados.net"; github = "shados"; @@ -512,6 +405,11 @@ email = "sivaraman.balaji@gmail.com"; name = "Balaji Sivaraman"; }; + bandresen = { + email = "bandresen@gmail.com"; + github = "bandresen"; + name = "Benjamin Andresen"; + }; barrucadu = { email = "mike@barrucadu.co.uk"; github = "barrucadu"; @@ -522,6 +420,21 @@ github = "basvandijk"; name = "Bas van Dijk"; }; + Baughn = { + email = "sveina@gmail.com"; + github = "Baughn"; + name = "Svein Ove Aas"; + }; + bb010g = { + email = "me@bb010g.com"; + github = "bb010g"; + name = "Brayden Banks"; + }; + bbarker = { + email = "brandon.barker@gmail.com"; + github = "bbarker"; + name = "Brandon Elam Barker"; + }; bcarrell = { email = "brandoncarrell@gmail.com"; github = "bcarrell"; @@ -572,6 +485,11 @@ github = "bergey"; name = "Daniel Bergey"; }; + bfortz = { + email = "bernard.fortz@gmail.com"; + github = "bfortz"; + name = "Bernard Fortz"; + }; bgamari = { email = "ben@smart-cactus.org"; github = "bgamari"; @@ -621,11 +539,21 @@ github = "bodil"; name = "Bodil Stokke"; }; + boj = { + email = "brian@uncannyworks.com"; + github = "boj"; + name = "Brian Jones"; + }; boothead = { email = "ben@perurbis.com"; github = "boothead"; name = "Ben Ford"; }; + borisbabic = { + email = "boris.ivan.babic@gmail.com"; + github = "borisbabic"; + name = "Boris Babić"; + }; bosu = { email = "boriss@gmail.com"; github = "bosu"; @@ -646,6 +574,16 @@ github = "bramd"; name = "Bram Duvigneau"; }; + brian-dawn = { + email = "brian.t.dawn@gmail.com"; + github = "brian-dawn"; + name = "Brian Dawn"; + }; + bricewge = { + email = "bricewge@gmail.com"; + github = "bricewge"; + name = "Brice Waegeneire"; + }; bstrik = { email = "dutchman55@gmx.com"; github = "bstrik"; @@ -666,6 +604,11 @@ github = "c0bw3b"; name = "Renaud"; }; + c0deaddict = { + email = "josvanbakel@protonmail.com"; + github = "c0deaddict"; + name = "Jos van Bakel"; + }; c0dehero = { email = "codehero@nerdpol.ch"; name = "CodeHero"; @@ -690,6 +633,11 @@ github = "canndrew"; name = "Andrew Cann"; }; + carlosdagos = { + email = "m@cdagostino.io"; + github = "carlosdagos"; + name = "Carlos D'Agostino"; + }; carlsverre = { email = "accounts@carlsverre.com"; github = "carlsverre"; @@ -730,6 +678,11 @@ github = "changlinli"; name = "Changlin Li"; }; + CharlesHD = { + email = "charleshdespointes@gmail.com"; + github = "CharlesHD"; + name = "Charles Huyghues-Despointes"; + }; chaoflow = { email = "flo@chaoflow.net"; github = "chaoflow"; @@ -739,6 +692,11 @@ email = "me@philscotted.com"; name = "Phil Scott"; }; + ChengCat = { + email = "yu@cheng.cat"; + github = "ChengCat"; + name = "Yucheng Zhang"; + }; chiiruno = { email = "okinan@protonmail.com"; github = "chiiruno"; @@ -864,11 +822,21 @@ github = "coroa"; name = "Jonas Hörsch"; }; + costrouc = { + email = "chris.ostrouchov@gmail.com"; + github = "costrouc"; + name = "Chris Ostrouchov"; + }; couchemar = { email = "couchemar@yandex.ru"; github = "couchemar"; name = "Andrey Pavlov"; }; + countingsort = { + email = "niclas@countingsort.com"; + github = "countingsort"; + name = "Niclas Meyer"; + }; cpages = { email = "page@ruiec.cat"; github = "cpages"; @@ -879,11 +847,21 @@ github = "cransom"; name = "Casey Ransom"; }; + CrazedProgrammer = { + email = "crazedprogrammer@gmail.com"; + github = "CrazedProgrammer"; + name = "CrazedProgrammer"; + }; cryptix = { email = "cryptix@riseup.net"; github = "cryptix"; name = "Henry Bubert"; }; + CrystalGamma = { + email = "nixos@crystalgamma.de"; + github = "CrystalGamma"; + name = "Jona Stubbe"; + }; csingley = { email = "csingley@gmail.com"; github = "csingley"; @@ -899,6 +877,11 @@ github = "cwoac"; name = "Oliver Matthews"; }; + DamienCassou = { + email = "damien@cassou.me"; + github = "DamienCassou"; + name = "Damien Cassou"; + }; danbst = { email = "abcz2.uprola@gmail.com"; github = "danbst"; @@ -914,11 +897,21 @@ github = "danharaj"; name = "Dan Haraj"; }; + danieldk = { + email = "me@danieldk.eu"; + github = "danieldk"; + name = "Daniël de Kok"; + }; danielfullmer = { email = "danielrf12@gmail.com"; github = "danielfullmer"; name = "Daniel Fullmer"; }; + das_j = { + email = "janne@hess.ooo"; + github = "dasJ"; + name = "Janne Heß"; + }; dasuxullebt = { email = "christoph.senjak@googlemail.com"; name = "Christoph-Simon Senjak"; @@ -944,9 +937,9 @@ name = "Davor Babic"; }; dbohdan = { - email = "danyil.bohdan@gmail.com"; + email = "dbohdan@dbohdan.com"; github = "dbohdan"; - name = "Danyil Bohdan"; + name = "D. Bohdan"; }; dbrock = { email = "daniel@brockman.se"; @@ -958,21 +951,46 @@ github = "deepfire"; name = "Kosyrev Serge"; }; + deltaevo = { + email = "deltaduartedavid@gmail.com"; + github = "DeltaEvo"; + name = "Duarte David"; + }; demin-dmitriy = { email = "demindf@gmail.com"; github = "demin-dmitriy"; name = "Dmitriy Demin"; }; + demize = { + email = "johannes@kyriasis.com"; + github = "kyrias"; + name = "Johannes Löthberg"; + }; + demyanrogozhin = { + email = "demyan.rogozhin@gmail.com"; + github = "demyanrogozhin"; + name = "Demyan Rogozhin"; + }; derchris = { email = "derchris@me.com"; github = "derchrisuk"; name = "Christian Gerbrandt"; }; + DerGuteMoritz = { + email = "moritz@twoticketsplease.de"; + github = "DerGuteMoritz"; + name = "Moritz Heidkamp"; + }; dermetfan = { email = "serverkorken@gmail.com"; github = "dermetfan"; name = "Robin Stumm"; }; + DerTim1 = { + email = "tim.digel@active-group.de"; + github = "DerTim1"; + name = "Tim Digel"; + }; desiderius = { email = "didier@devroye.name"; github = "desiderius"; @@ -1018,11 +1036,21 @@ github = "dizfer"; name = "David Izquierdo"; }; + Dje4321 = { + email = "dje4321@gmail.com"; + github = "dje4321"; + name = "Dje4321"; + }; dmalikov = { email = "malikov.d.y@gmail.com"; github = "dmalikov"; name = "Dmitry Malikov"; }; + DmitryTsygankov = { + email = "dmitry.tsygankov@gmail.com"; + github = "DmitryTsygankov"; + name = "Dmitry Tsygankov"; + }; dmjio = { email = "djohnson.m@gmail.com"; github = "dmjio"; @@ -1092,6 +1120,11 @@ github = "e-user"; name = "Alexander Kahl"; }; + eadwu = { + email = "edmund.wu@protonmail.com"; + github = "eadwu"; + name = "Edmund Wu"; + }; earldouglas = { email = "james@earldouglas.com"; github = "earldouglas"; @@ -1166,6 +1199,11 @@ github = "proteansec"; name = "Dejan Lukan"; }; + eliasp = { + email = "mail@eliasprobst.eu"; + github = "eliasp"; + name = "Elias Probst"; + }; elijahcaine = { email = "elijahcainemv@gmail.com"; github = "pop"; @@ -1181,6 +1219,21 @@ github = "ellis"; name = "Ellis Whitehead"; }; + elvishjerricco = { + email = "elvishjerricco@gmail.com"; + github = "ElvishJerricco"; + name = "Will Fancher"; + }; + emmanuelrosa = { + email = "emmanuel_rosa@aol.com"; + github = "emmanuelrosa"; + name = "Emmanuel Rosa"; + }; + endgame = { + email = "jack@jackkelly.name"; + github = "endgame"; + name = "Jack Kelly"; + }; enzime = { email = "enzime@users.noreply.github.com"; github = "enzime"; @@ -1196,7 +1249,7 @@ name = "Mabry Cervin"; }; eqyiel = { - email = "r@rkm.id.au"; + email = "ruben@maher.fyi"; github = "eqyiel"; name = "Ruben Maher"; }; @@ -1205,11 +1258,6 @@ github = "ericbmerritt"; name = "Eric Merritt"; }; - erosennin = { - email = "ag@sologoc.com"; - github = "erosennin"; - name = "Andrey Golovizin"; - }; ericsagnes = { email = "eric.sagnes@gmail.com"; github = "ericsagnes"; @@ -1230,11 +1278,20 @@ github = "erikryb"; name = "Erik Rybakken"; }; + erosennin = { + email = "ag@sologoc.com"; + github = "erosennin"; + name = "Andrey Golovizin"; + }; ertes = { email = "esz@posteo.de"; github = "ertes"; name = "Ertugrul Söylemez"; }; + Esteth = { + email = "adam.copp@gmail.com"; + name = "Adam Copp"; + }; ethercrow = { email = "ethercrow@gmail.com"; github = "ethercrow"; @@ -1295,6 +1352,11 @@ github = "fgaz"; name = "Francesco Gazzetta"; }; + FireyFly = { + email = "nix@firefly.nu"; + github = "FireyFly"; + name = "Jonas Höglund"; + }; flokli = { email = "flokli@flokli.de"; github = "flokli"; @@ -1340,6 +1402,16 @@ github = "fps"; name = "Florian Paul Schmidt"; }; + freepotion = { + email = "freepotion@protonmail.com"; + github = "freepotion"; + name = "Free Potion"; + }; + Fresheyeball = { + email = "fresheyeball@gmail.com"; + github = "fresheyeball"; + name = "Isaac Shapira"; + }; fridh = { email = "fridh@fridh.nl"; github = "fridh"; @@ -1355,6 +1427,11 @@ github = "froozen"; name = "fro_ozen"; }; + frontsideair = { + email = "photonia@gmail.com"; + github = "frontsideair"; + name = "Fatih Altinok"; + }; ftrvxmtrx = { email = "ftrvxmtrx@gmail.com"; github = "ftrvxmtrx"; @@ -1399,7 +1476,7 @@ name = "Jim Garrison"; }; gavin = { - email = "gavin@praxeology.co.uk"; + email = "gavin.rogers@holo.host"; github = "gavinrogers"; name = "Gavin Rogers"; }; @@ -1423,6 +1500,11 @@ github = "georgewhewell"; name = "George Whewell"; }; + gerschtli = { + email = "tobias.happ@gmx.de"; + github = "Gerschtli"; + name = "Tobias Happ"; + }; gilligan = { email = "tobias.pflug@gmail.com"; github = "gilligan"; @@ -1449,7 +1531,7 @@ name = "Robin Gloster"; }; gnidorah = { - email = "yourbestfriend@opmbx.org"; + email = "gnidorah@yandex.com"; github = "gnidorah"; name = "Alex Ivanov"; }; @@ -1458,6 +1540,11 @@ github = "cillianderoiste"; name = "Cillian de Róiste"; }; + Gonzih = { + email = "gonzih@gmail.com"; + github = "Gonzih"; + name = "Max Gonzih"; + }; goodrone = { email = "goodrone@gmail.com"; github = "goodrone"; @@ -1518,6 +1605,11 @@ github = "havvy"; name = "Ryan Scheel"; }; + hax404 = { + email = "hax404foogit@hax404.de"; + github = "hax404"; + name = "Georg Haas"; + }; hbunke = { email = "bunke.hendrik@gmail.com"; github = "hbunke"; @@ -1607,16 +1699,41 @@ github = "igsha"; name = "Igor Sharonov"; }; + iimog = { + email = "iimog@iimog.org"; + github = "iimog"; + name = "Markus J. Ankenbrand"; + }; ikervagyok = { email = "ikervagyok@gmail.com"; github = "ikervagyok"; name = "Balázs Lengyel"; }; + illegalprime = { + email = "themichaeleden@gmail.com"; + github = "illegalprime"; + name = "Michael Eden"; + }; ilya-kolpakov = { email = "ilya.kolpakov@gmail.com"; github = "ilya-kolpakov"; name = "Ilya Kolpakov"; }; + imalison = { + email = "IvanMalison@gmail.com"; + github = "IvanMalison"; + name = "Ivan Malison"; + }; + imalsogreg = { + email = "imalsogreg@gmail.com"; + github = "imalsogreg"; + name = "Greg Hale"; + }; + imuli = { + email = "i@imu.li"; + github = "imuli"; + name = "Imuli"; + }; infinisil = { email = "infinisil@icloud.com"; github = "infinisil"; @@ -1681,10 +1798,20 @@ github = "jbedo"; name = "Justin Bedő"; }; + jbgi = { + email = "jb@giraudeau.info"; + github = "jbgi"; + name = "Jean-Baptiste Giraudeau"; + }; jcumming = { email = "jack@mudshark.org"; name = "Jack Cummings"; }; + jD91mZM2 = { + email = "me@krake.one"; + github = "jD91mZM2"; + name = "jD91mZM2"; + }; jdagilliland = { email = "jdagilliland@gmail.com"; github = "jdagilliland"; @@ -1696,7 +1823,7 @@ name = "Jeffrey David Johnson"; }; jensbin = { - email = "jensbin@protonmail.com"; + email = "jensbin+git@pm.me"; github = "jensbin"; name = "Jens Binkert"; }; @@ -1710,6 +1837,11 @@ github = "tftio"; name = "James Felix Black"; }; + jflanglois = { + email = "yourstruly@julienlanglois.me"; + github = "jflanglois"; + name = "Julien Langlois"; + }; jfrankenau = { email = "johannes@frankenau.net"; github = "jfrankenau"; @@ -1750,6 +1882,15 @@ github = "jluttine"; name = "Jaakko Luttinen"; }; + jmettes = { + email = "jonathan@jmettes.com"; + github = "jmettes"; + name = "Jonathan Mettes"; + }; + Jo = { + email = "0x4A6F@shackspace.de"; + name = "Joachim Ernst"; + }; joachifm = { email = "joachifm@fastmail.fm"; github = "joachifm"; @@ -1760,6 +1901,11 @@ github = "joamaki"; name = "Jussi Maki"; }; + joelburget = { + email = "joelburget@gmail.com"; + github = "joelburget"; + name = "Joel Burget"; + }; joelmo = { email = "joel.moberg@gmail.com"; github = "joelmo"; @@ -1769,6 +1915,11 @@ email = "me@joelt.io"; name = "Joel Taylor"; }; + johanot = { + email = "write@ownrisk.dk"; + github = "johanot"; + name = "Johan Thomsen"; + }; johbo = { email = "johannes@bornhold.name"; github = "johbo"; @@ -1804,6 +1955,11 @@ github = "jonafato"; name = "Jon Banafato"; }; + jonathanreeve = { + email = "jon.reeve@gmail.com"; + github = "JonathanReeve"; + name = "Jonathan Reeve"; + }; joncojonathan = { email = "joncojonathan@gmail.com"; github = "joncojonathan"; @@ -1824,6 +1980,11 @@ github = "jpotier"; name = "Martin Potier"; }; + jqueiroz = { + email = "nixos@johnjq.com"; + github = "jqueiroz"; + name = "Jonathan Queiroz"; + }; jraygauthier = { email = "jraygauthier@gmail.com"; github = "jraygauthier"; @@ -1863,6 +2024,11 @@ github = "kaiha"; name = "Kai Harries"; }; + kalbasit = { + email = "wael.nasreddine@gmail.com"; + github = "kalbasit"; + name = "Wael Nasreddine"; + }; kamilchm = { email = "kamil.chm@gmail.com"; github = "kamilchm"; @@ -1877,6 +2043,11 @@ email = "info+nix@chmist.com"; name = "karolchmist"; }; + kazcw = { + email = "kaz@lambdaverse.org"; + github = "kazcw"; + name = "Kaz Wesley"; + }; kentjames = { email = "jameschristopherkent@gmail.com"; github = "kentjames"; @@ -1892,6 +2063,11 @@ github = "khumba"; name = "Bryan Gardiner"; }; + KibaFox = { + email = "kiba.fox@foxypossibilities.com"; + github = "KibaFox"; + name = "Kiba Fox"; + }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; @@ -1907,10 +2083,22 @@ github = "kini"; name = "Keshav Kini"; }; + kirelagin = { + email = "kirelagin@gmail.com"; + github = "kirelagin"; + name = "Kirill Elagin"; + }; kkallio = { email = "tierpluspluslists@gmail.com"; name = "Karn Kallio"; }; + + kmeakin = { + email = "karlwfmeakin@gmail.com"; + name = "Karl Meakin"; + github = "Kmeakin"; + }; + knedlsepp = { email = "josef.kemetmueller@gmail.com"; github = "knedlsepp"; @@ -1941,11 +2129,21 @@ github = "kragniz"; name = "Louis Taylor"; }; + krav = { + email = "kristoffer@microdisko.no"; + github = "krav"; + name = "Kristoffer Thømt Ravneberg"; + }; kristoff3r = { email = "k.soeholm@gmail.com"; github = "kristoff3r"; name = "Kristoffer Søholm"; }; + ktf = { + email = "giulio.eulisse@cern.ch"; + github = "ktf"; + name = "Giuluo Eulisse"; + }; ktosiek = { email = "tomasz.kontusz@gmail.com"; github = "ktosiek"; @@ -1956,6 +2154,11 @@ github = "kuznero"; name = "Roman Kuznetsov"; }; + kylewlacy = { + email = "kylelacy+nix@pm.me"; + github = "kylewlacy"; + name = "Kyle Lacy"; + }; lasandell = { email = "lasandell@gmail.com"; github = "lasandell"; @@ -2006,6 +2209,11 @@ github = "leenaars"; name = "Michiel Leenaars"; }; + lejonet = { + email = "daniel@kuehn.se"; + github = "lejonet"; + name = "Daniel Kuehn"; + }; leo60228 = { email = "iakornfeld@gmail.com"; github = "leo60228"; @@ -2016,11 +2224,6 @@ github = "leonardoce"; name = "Leonardo Cecchi"; }; - lejonet = { - email = "daniel@kuehn.se"; - github = "lejonet"; - name = "Daniel Kuehn"; - }; lethalman = { email = "lucabru@src.gnome.org"; github = "lethalman"; @@ -2041,6 +2244,11 @@ github = "nathanielbaxter"; name = "Nathaniel Baxter"; }; + lightdiscord = { + email = "root@arnaud.sh"; + github = "lightdiscord"; + name = "Arnaud Pascal"; + }; lihop = { email = "nixos@leroy.geek.nz"; github = "lihop"; @@ -2051,6 +2259,11 @@ github = "limeytexan"; name = "Michael Brantley"; }; + linc01n = { + email = "git@lincoln.hk"; + github = "linc01n"; + name = "Lincoln Lee"; + }; linquize = { email = "linquize@yahoo.com.hk"; github = "linquize"; @@ -2131,6 +2344,11 @@ github = "luispedro"; name = "Luis Pedro Coelho"; }; + lukeadams = { + email = "luke.adams@belljar.io"; + github = "lukeadams"; + name = "Luke Adams"; + }; lukego = { email = "luke@snabb.co"; github = "lukego"; @@ -2164,6 +2382,11 @@ github = "madjar"; name = "Georges Dubus"; }; + mafo = { + email = "Marc.Fontaine@gmx.de"; + github = "MarcFontaine"; + name = "Marc Fontaine"; + }; magnetophon = { email = "bart@magnetophon.nl"; github = "magnetophon"; @@ -2194,10 +2417,6 @@ github = "marcweber"; name = "Marc Weber"; }; - markWot = { - email = "markus@wotringer.de"; - name = "Markus Wotringer"; - }; markus1189 = { email = "markus1189@gmail.com"; github = "markus1189"; @@ -2208,6 +2427,10 @@ github = "markuskowa"; name = "Markus Kowalewski"; }; + markWot = { + email = "markus@wotringer.de"; + name = "Markus Wotringer"; + }; marsam = { email = "marsam@users.noreply.github.com"; github = "marsam"; @@ -2293,6 +2516,11 @@ github = "meditans"; name = "Carlo Nucera"; }; + megheaiulian = { + email = "iulian.meghea@gmail.com"; + github = "megheaiulian"; + name = "Meghea Iulian"; + }; mehandes = { email = "niewskici@gmail.com"; github = "mehandes"; @@ -2303,6 +2531,11 @@ github = "meisternu"; name = "Matt Miemiec"; }; + melsigl = { + email = "melanie.bianca.sigl@gmail.com"; + github = "melsigl"; + name = "Melanie B. Sigl"; + }; metabar = { email = "softs@metabarcoding.org"; name = "Celine Mercier"; @@ -2391,6 +2624,11 @@ github = "MikePlayle"; name = "Mike Playle"; }; + mkazulak = { + email = "kazulakm@gmail.com"; + github = "mulderr"; + name = "Maciej Kazulak"; + }; mkg = { email = "mkg@vt.edu"; github = "mkgvt"; @@ -2406,6 +2644,16 @@ github = "mmahut"; name = "Marek Mahut"; }; + mmlb = { + email = "me.mmlb@mmlb.me"; + github = "mmlb"; + name = "Manuel Mendez"; + }; + mnacamura = { + email = "m.nacamura@gmail.com"; + github = "mnacamura"; + name = "Mitsuhiro Nakamura"; + }; moaxcp = { email = "moaxcp@gmail.com"; github = "moaxcp"; @@ -2421,6 +2669,11 @@ github = "mogorman"; name = "Matthew O'Gorman"; }; + Mogria = { + email = "m0gr14@gmail.com"; + github = "mogria"; + name = "Mogria"; + }; montag451 = { email = "montag451@laposte.net"; github = "montag451"; @@ -2441,11 +2694,21 @@ github = "moretea"; name = "Maarten Hoogendoorn"; }; + MostAwesomeDude = { + email = "cds@corbinsimpson.com"; + github = "MostAwesomeDude"; + name = "Corbin Simpson"; + }; mounium = { email = "muoniurn@gmail.com"; github = "mounium"; name = "Katona László"; }; + MP2E = { + email = "MP2E@archlinux.us"; + github = "MP2E"; + name = "Cray Elliott"; + }; mpcsh = { email = "m@mpc.sh"; github = "mpcsh"; @@ -2466,6 +2729,11 @@ github = "fstamour"; name = "Francis St-Amour"; }; + mrkkrp = { + email = "markkarpov92@gmail.com"; + github = "mrkkrp"; + name = "Mark Karpov"; + }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; @@ -2480,6 +2748,11 @@ github = "mschristiansen"; name = "Mikkel Christiansen"; }; + msiedlarek = { + email = "mikolaj@siedlarek.pl"; + github = "msiedlarek"; + name = "Mikołaj Siedlarek"; + }; mstarzyk = { email = "mstarzyk@gmail.com"; github = "mstarzyk"; @@ -2495,6 +2768,11 @@ github = "mt-caret"; name = "Masayuki Takeda"; }; + MtP = { + email = "marko.nixos@poikonen.de"; + github = "MtP76"; + name = "Marko Poikonen"; + }; mtreskin = { email = "zerthurd@gmail.com"; github = "Zert"; @@ -2530,6 +2808,10 @@ github = "nand0p"; name = "Fernando Jose Pando"; }; + Nate-Devv = { + email = "natedevv@gmail.com"; + name = "Nathan Moore"; + }; nathan-gs = { email = "nathan@nathan.gs"; github = "nathan-gs"; @@ -2550,6 +2832,11 @@ github = "neeasade"; name = "Nathan Isom"; }; + neonfuz = { + email = "neonfuz@gmail.com"; + github = "neonfuz"; + name = "Sage Raflik"; + }; nequissimus = { email = "tim@nequissimus.com"; github = "nequissimus"; @@ -2585,11 +2872,21 @@ github = "nico202"; name = "Nicolò Balzarotti"; }; + NikolaMandic = { + email = "nikola@mandic.email"; + github = "NikolaMandic"; + name = "Ratko Mladic"; + }; ninjatrappeur = { email = "felix@alternativebit.fr"; github = "ninjatrappeur"; name = "Félix Baylac-Jacqué"; }; + nioncode = { + email = "nioncode+github@gmail.com"; + github = "nioncode"; + name = "Nicolas Schneider"; + }; nipav = { email = "niko.pavlinek@gmail.com"; github = "nipav"; @@ -2605,11 +2902,21 @@ github = "nmattia"; name = "Nicolas Mattia"; }; + nocent = { + email = "nocent@protonmail.ch"; + github = "nocent"; + name = "nocent"; + }; nocoolnametom = { email = "nocoolnametom@gmail.com"; github = "nocoolnametom"; name = "Tom Doggett"; }; + noneucat = { + email = "andy@lolc.at"; + github = "noneucat"; + name = "Andy Chun"; + }; notthemessiah = { email = "brian.cohen.88@gmail.com"; github = "notthemessiah"; @@ -2629,6 +2936,16 @@ github = "nthorne"; name = "Niklas Thörne"; }; + numinit = { + email = "me@numin.it"; + github = "numinit"; + name = "Morgan Jones"; + }; + nyanloutre = { + email = "paul@nyanlout.re"; + github = "nyanloutre"; + name = "Paul Trehiou"; + }; nyarly = { email = "nyarly@gmail.com"; github = "nyarly"; @@ -2708,10 +3025,10 @@ github = "oxij"; name = "Jan Malakhovski"; }; - pSub = { - email = "mail@pascal-wittmann.de"; - github = "pSub"; - name = "Pascal Wittmann"; + oyren = { + email = "m.scheuren@oyra.eu"; + github = "oyren"; + name = "Moritz Scheuren"; }; paholg = { email = "paho@paholg.com"; @@ -2728,6 +3045,11 @@ github = "panaeon"; name = "Vitalii Voloshyn"; }; + pandaman = { + email = "kointosudesuyo@infoseek.jp"; + github = "pandaman64"; + name = "pandaman"; + }; paperdigits = { email = "mica@silentumbrella.com"; github = "paperdigits"; @@ -2798,11 +3120,21 @@ github = "phile314"; name = "Philipp Hausmann"; }; + Phlogistique = { + email = "noe.rubinstein@gmail.com"; + github = "Phlogistique"; + name = "Noé Rubinstein"; + }; phreedom = { email = "phreedom@yandex.ru"; github = "phreedom"; name = "Evgeny Egorochkin"; }; + phryneas = { + email = "mail@lenzw.de"; + github = "phryneas"; + name = "Lenz Weber"; + }; phunehehe = { email = "phunehehe@gmail.com"; github = "phunehehe"; @@ -2867,6 +3199,11 @@ github = "pmiddend"; name = "Philipp Middendorf"; }; + pmyjavec = { + email = "pauly@myjavec.com"; + github = "pmyjavec"; + name = "Pauly Myjavec"; + }; pneumaticat = { email = "kevin@potatofrom.space"; github = "pneumaticat"; @@ -2892,6 +3229,11 @@ github = "primeos"; name = "Michael Weiss"; }; + Profpatsch = { + email = "mail@profpatsch.de"; + github = "Profpatsch"; + name = "Profpatsch"; + }; proglodyte = { email = "proglodyte23@gmail.com"; github = "proglodyte"; @@ -2911,6 +3253,16 @@ email = "philipp@xndr.de"; name = "Philipp Steinpaß"; }; + pSub = { + email = "mail@pascal-wittmann.de"; + github = "pSub"; + name = "Pascal Wittmann"; + }; + psyanticy = { + email = "iuns@outlook.fr"; + github = "Assassinkin"; + name = "Psyanticy"; + }; puffnfresh = { email = "brian@brianmckenna.org"; github = "puffnfresh"; @@ -2920,11 +3272,26 @@ email = "patrick.callahan@latitudeengineering.com"; name = "Patrick Callahan"; }; + q3k = { + email = "q3k@q3k.org"; + github = "q3k"; + name = "Serge Bazanski"; + }; qknight = { email = "js@lastlog.de"; github = "qknight"; name = "Joachim Schiele"; }; + qoelet = { + email = "kenny@machinesung.com"; + github = "qoelet"; + name = "Kenny Shen"; + }; + qyliss = { + email = "hi@alyssa.is"; + github = "alyssais"; + name = "Alyssa Ross"; + }; ragge = { email = "r.dahlen@gmail.com"; github = "ragnard"; @@ -2959,6 +3326,11 @@ email = "ravloony@gmail.com"; name = "Tom Macdonald"; }; + rawkode = { + email = "david.andrew.mckay@gmail.com"; + github = "rawkode"; + name = "David McKay"; + }; razvan = { email = "razvan.panda@gmail.com"; github = "razvan-panda"; @@ -3039,6 +3411,16 @@ github = "risicle"; name = "Robert Scott"; }; + rittelle = { + email = "rittelle@posteo.de"; + github = "rittelle"; + name = "Lennart Rittel"; + }; + rkoe = { + email = "rk@simple-is-better.org"; + github = "rkoe"; + name = "Roland Koebler"; + }; rlupton20 = { email = "richard.lupton@gmail.com"; github = "rlupton20"; @@ -3099,6 +3481,16 @@ github = "rongcuid"; name = "Rongcui Dong"; }; + roosemberth = { + email = "roosembert.palacios+nixpkgs@gmail.com"; + github = "roosemberth"; + name = "Roosembert (Roosemberth) Palacios"; + }; + rprospero = { + email = "rprospero+nix@gmail.com"; + github = "rprospero"; + name = "Adam Washington"; + }; rszibele = { email = "richard@szibele.com"; github = "rszibele"; @@ -3114,6 +3506,11 @@ github = "rushmorem"; name = "Rushmore Mushambi"; }; + ruuda = { + email = "dev+nix@veniogames.com"; + github = "ruuda"; + name = "Ruud van Asseldonk"; + }; rvl = { email = "dev+nix@rodney.id.au"; github = "rvl"; @@ -3228,11 +3625,21 @@ github = "scolobb"; name = "Sergiu Ivanov"; }; + Scriptkiddi = { + email = "nixos@scriptkiddi.de"; + github = "scriptkiddi"; + name = "Fritz Otlinghaus"; + }; sdll = { email = "sasha.delly@gmail.com"; github = "sdll"; name = "Sasha Illarionov"; }; + SeanZicari = { + email = "sean.zicari@gmail.com"; + github = "SeanZicari"; + name = "Sean Zicari"; + }; sellout = { email = "greg@technomadic.org"; github = "sellout"; @@ -3243,6 +3650,11 @@ github = "sengaya"; name = "Thilo Uttendorfer"; }; + sephalon = { + email = "me@sephalon.net"; + github = "sephalon"; + name = "Stefan Wiehler"; + }; sepi = { email = "raffael@mancini.lu"; github = "sepi"; @@ -3293,6 +3705,11 @@ github = "siddharthist"; name = "Langston Barrett"; }; + siers = { + email = "veinbahs+nixpkgs@gmail.com"; + github = "siers"; + name = "Raitis Veinbahs"; + }; sifmelcara = { email = "ming@culpring.com"; github = "sifmelcara"; @@ -3341,11 +3758,26 @@ github = "sleexyz"; name = "Sean Lee"; }; + smaret = { + email = "sebastien.maret@icloud.com"; + github = "smaret"; + name = "Sébastien Maret"; + }; smironov = { email = "grrwlf@gmail.com"; github = "grwlf"; name = "Sergey Mironov"; }; + sna = { + email = "abouzahra.9@wright.edu"; + github = "s-na"; + name = "S. Nordin Abouzahra"; + }; + snaar = { + email = "snaar@snaar.net"; + github = "snaar"; + name = "Serguei Narojnyi"; + }; snyh = { email = "snyh@snyh.org"; github = "snyh"; @@ -3391,11 +3823,21 @@ github = "spwhitt"; name = "Spencer Whitt"; }; + srghma = { + email = "srghma@gmail.com"; + github = "srghma"; + name = "Sergei Khoma"; + }; srhb = { email = "sbrofeldt@gmail.com"; github = "srhb"; name = "Sarah Brofeldt"; }; + SShrike = { + email = "severen@shrike.me"; + github = "severen"; + name = "Severen Redwood"; + }; stephenmw = { email = "stephen@q5comm.com"; github = "stephenmw"; @@ -3416,11 +3858,26 @@ github = "steveej"; name = "Stefan Junker"; }; + StijnDW = { + email = "stekke@airmail.cc"; + github = "StijnDW"; + name = "Stijn DW"; + }; + StillerHarpo = { + email = "florianengel39@gmail.com"; + github = "StillerHarpo"; + name = "Florian Engel"; + }; stumoss = { email = "samoss@gmail.com"; github = "stumoss"; name = "Stuart Moss"; }; + SuprDewd = { + email = "suprdewd@gmail.com"; + github = "SuprDewd"; + name = "Bjarki Ágúst Guðmundsson"; + }; suvash = { email = "suvash+nixpkgs@gmail.com"; github = "suvash"; @@ -3441,6 +3898,11 @@ github = "swarren83"; name = "Shawn Warren"; }; + swdunlop = { + email = "swdunlop@gmail.com"; + github = "swdunlop"; + name = "Scott W. Dunlop"; + }; swflint = { email = "swflint@flintfam.org"; github = "swflint"; @@ -3456,6 +3918,11 @@ github = "symphorien"; name = "Guillaume Girol"; }; + synthetica = { + email = "nix@hilhorst.be"; + github = "Synthetica9"; + name = "Patrick Hilhorst"; + }; szczyp = { email = "qb@szczyp.com"; github = "szczyp"; @@ -3476,6 +3943,11 @@ github = "Radvendii"; name = "Taeer Bar-Yam"; }; + taha = { + email = "xrcrod@gmail.com"; + github = "tgharib"; + name = "Taha Gharib"; + }; tailhook = { email = "paul@colomiets.name"; github = "tailhook"; @@ -3516,6 +3988,11 @@ github = "tazjin"; name = "Vincent Ambo"; }; + TealG = { + email = "~@Teal.Gr"; + github = "TealG"; + name = "Teal Gaure"; + }; teh = { email = "tehunger@gmail.com"; github = "teh"; @@ -3566,6 +4043,11 @@ github = "ctheune"; name = "Christian Theune"; }; + ThomasMader = { + email = "thomas.mader@gmail.com"; + github = "ThomasMader"; + name = "Thomas Mader"; + }; thoughtpolice = { email = "aseipp@pobox.com"; github = "thoughtpolice"; @@ -3596,6 +4078,11 @@ github = "timor"; name = "timor"; }; + timput = { + email = "tim@timput.com"; + github = "TimPut"; + name = "Tim Put"; + }; tiramiseb = { email = "sebastien@maccagnoni.eu"; github = "tiramiseb"; @@ -3606,6 +4093,11 @@ github = "titanous"; name = "Jonathan Rudenberg"; }; + tmplt = { + email = "tmplt@dragons.rocks"; + github = "tmplt"; + name = "Viktor"; + }; tnias = { email = "phil@grmr.de"; github = "tnias"; @@ -3626,6 +4118,11 @@ github = "tokudan"; name = "Daniel Frank"; }; + tomahna = { + email = "kevin.rauscher@tomahna.fr"; + github = "Tomahna"; + name = "Kevin Rauscher"; + }; tomberek = { email = "tomberek@gmail.com"; github = "tomberek"; @@ -3695,6 +4192,16 @@ github = "twey"; name = "James ‘Twey’ Kay"; }; + typetetris = { + email = "ericwolf42@mail.com"; + github = "typetetris"; + name = "Eric Wolf"; + }; + udono = { + email = "udono@virtual-things.biz"; + github = "udono"; + name = "Udo Spallek"; + }; unode = { email = "alves.rjc@gmail.com"; github = "unode"; @@ -3705,6 +4212,11 @@ github = "uralbash"; name = "Svintsov Dmitry"; }; + uri-canva = { + email = "uri@canva.com"; + github = "uri-canva"; + name = "Uri Baghin"; + }; utdemir = { email = "me@utdemir.com"; github = "utdemir"; @@ -3854,6 +4366,16 @@ github = "vyp"; name = "vyp"; }; + waynr = { + name = "Wayne Warren"; + email = "wayne.warren.s@gmail.com"; + github = "waynr"; + }; + wchresta = { + email = "wchresta.nix@chrummibei.ch"; + github = "wchresta"; + name = "wchresta"; + }; wedens = { email = "kirill.wedens@gmail.com"; name = "wedens"; @@ -3901,11 +4423,21 @@ github = "womfoo"; name = "Kranium Gikos Mendoza"; }; + worldofpeace = { + email = "worldofpeace@users.noreply.github.com"; + github = "worldofpeace"; + name = "Worldofpeace"; + }; wscott = { email = "wsc9tt@gmail.com"; github = "wscott"; name = "Wayne Scott"; }; + wucke13 = { + email = "info@wucke13.de"; + github = "wucke13"; + name = "Wucke"; + }; wyvie = { email = "elijahrum@gmail.com"; github = "wyvie"; @@ -3919,7 +4451,7 @@ xeji = { email = "xeji@cat3.de"; github = "xeji"; - name = "xeji"; + name = "Uli Baum"; }; xnaveira = { email = "xnaveira@gmail.com"; @@ -4035,11 +4567,21 @@ email = "zef@zef.me"; name = "Zef Hemel"; }; + zgrannan = { + email = "zgrannan@gmail.com"; + github = "zgrannan"; + name = "Zack Grannan"; + }; zimbatm = { email = "zimbatm@zimbatm.com"; github = "zimbatm"; name = "zimbatm"; }; + Zimmi48 = { + email = "theo.zimmermann@univ-paris-diderot.fr"; + github = "Zimmi48"; + name = "Théo Zimmermann"; + }; zohl = { email = "zohl@fmap.me"; github = "zohl"; diff --git a/maintainers/scripts/all-tarballs.nix b/maintainers/scripts/all-tarballs.nix index d981a1fa7dbc0ba27a2aaaad17d42e39584c0b22..6a4de8a4b95115a685779c3024cf99051826c57e 100644 --- a/maintainers/scripts/all-tarballs.nix +++ b/maintainers/scripts/all-tarballs.nix @@ -6,13 +6,11 @@ $ copy-tarballs.pl --expr 'import ' */ -removeAttrs (import ../../pkgs/top-level/release.nix +import ../../pkgs/top-level/release.nix { # Don't apply ‘hydraJob’ to jobs, because then we can't get to the # dependency graph. scrubJobs = false; # No need to evaluate on i686. supportedSystems = [ "x86_64-linux" ]; - }) - [ # Remove jobs whose evaluation depends on a writable Nix store. - "tarball" "unstable" "darwin-tested" - ] + limitedSupportedSystems = []; + } diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index d0bd1913ba8a71d89eb7208bbca66d8cff695c84..23669502e46d6b6a0e0eaf0248316e8dbf11211a 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/maintainers/scripts/hydra-eval-failures.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python -p pythonFull pythonPackages.requests pythonPackages.pyquery pythonPackages.click +#!nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ requests pyquery click ])' # To use, just execute this script with --help to display help. @@ -16,7 +16,7 @@ maintainers_json = subprocess.check_output([ 'nix-instantiate', '-E', 'import ./maintainers/maintainer-list.nix {}', '--eval', '--json' ]) maintainers = json.loads(maintainers_json) -MAINTAINERS = {v: k for k, v in maintainers.iteritems()} +MAINTAINERS = {v: k for k, v in maintainers.items()} def get_response_text(url): @@ -45,6 +45,17 @@ def get_maintainers(attr_name): except: return [] +def print_build(table_row): + a = pq(table_row)('a')[1] + print("- [ ] [{}]({})".format(a.text, a.get('href')), flush=True) + + maintainers = get_maintainers(a.text) + if maintainers: + print(" - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers)))) + # TODO: print last three persons that touched this file + # TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked? + + sys.stdout.flush() @click.command() @click.option( @@ -73,23 +84,17 @@ def cli(jobset): # TODO: aborted evaluations # TODO: dependency failed without propagated builds + print('\nFailures:') for tr in d('img[alt="Failed"]').parents('tr'): - a = pq(tr)('a')[1] - print("- [ ] [{}]({})".format(a.text, a.get('href'))) + print_build(tr) - sys.stdout.flush() - - maintainers = get_maintainers(a.text) - if maintainers: - print(" - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers)))) - # TODO: print last three persons that touched this file - # TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked? - - sys.stdout.flush() + print('\nDependency failures:') + for tr in d('img[alt="Dependency failed"]').parents('tr'): + print_build(tr) if __name__ == "__main__": try: cli() - except: + except Exception as e: import pdb;pdb.post_mortem() diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index 82d9ad6077a2b619a865a0d0eff53edaa39dd8f1..ec406ac1a70334d30dc4c03b21e12bd55d243dee 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "nix-generate-from-cpan-3"; buildInputs = with perlPackages; [ - makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly Log4Perl + makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly LogLog4perl ]; phases = [ "installPhase" ]; diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl index 7e9ff91ebe068dd0ac48eaef144efc873b99f08c..638d1b2aaa167e29ef53e78f02b4612f5e8273ec 100755 --- a/maintainers/scripts/nixpkgs-lint.pl +++ b/maintainers/scripts/nixpkgs-lint.pl @@ -1,4 +1,5 @@ -#! /run/current-system/sw/bin/perl -w +#! /usr/bin/env nix-shell +#! nix-shell -i perl -p perl perlPackages.XMLSimple use strict; use List::Util qw(min); diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index 4536662c8420b29025d68218fbeef2a41d148e15..d95ff4f347e87f761be71fd6f6a1f857c403bb08 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -262,7 +262,7 @@ def _update_package(path, target): if new_version == version: logging.info("Path {}: no update available for {}.".format(path, pname)) return False - elif new_version <= version: + elif Version(new_version) <= Version(version): raise ValueError("downgrade for {}.".format(pname)) if not new_sha256: raise ValueError("no file available for {}.".format(pname)) diff --git a/nixos/doc/manual/.gitignore b/nixos/doc/manual/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..87928262421739c2d9073e8cf32c232775248a99 --- /dev/null +++ b/nixos/doc/manual/.gitignore @@ -0,0 +1,2 @@ +generated +manual-combined.xml diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..5cbbf140869a6d649b4ff42dfbddd78f1e94d91c --- /dev/null +++ b/nixos/doc/manual/Makefile @@ -0,0 +1,29 @@ +.PHONY: all +all: manual-combined.xml format + +.PHONY: debug +debug: generated manual-combined.xml + +manual-combined.xml: generated *.xml + rm -f ./manual-combined.xml + nix-shell --packages xmloscopy \ + --run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml" + +.PHONY: format +format: + find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ + xmlformat --config-file "../xmlformat.conf" -i {} + +.PHONY: fix-misc-xml +fix-misc-xml: + find . -iname '*.xml' -type f \ + -exec ../varlistentry-fixer.rb {} ';' + +.PHONY: clean +clean: + rm -f manual-combined.xml generated + +generated: ./options-to-docbook.xsl + nix-build ../../release.nix \ + --attr manualGeneratedSources.x86_64-linux \ + --out-link ./generated diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml index be6ff3aac0fe8b4858bd00e5035fce061bfbe05b..de3d8ac21aebc6aa808cf53848d2ea258ecd6835 100644 --- a/nixos/doc/manual/administration/boot-problems.xml +++ b/nixos/doc/manual/administration/boot-problems.xml @@ -3,63 +3,88 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-boot-problems"> + Boot Problems -Boot Problems + + If NixOS fails to boot, there are a number of kernel command line parameters + that may help you to identify or fix the issue. You can add these parameters + in the GRUB boot menu by pressing “e” to modify the selected boot entry + and editing the line starting with linux. The following + are some useful kernel command line parameters that are recognised by the + NixOS boot scripts or by systemd: + + + + boot.shell_on_fail + + + + Start a root shell if something goes wrong in stage 1 of the boot process + (the initial ramdisk). This is disabled by default because there is no + authentication for the root shell. + + + + + + boot.debug1 + + + + Start an interactive shell in stage 1 before anything useful has been + done. That is, no modules have been loaded and no file systems have been + mounted, except for /proc and + /sys. + + + + + + boot.trace + + + + Print every shell command executed by the stage 1 and 2 boot scripts. + + + + + + single + + + + Boot into rescue mode (a.k.a. single user mode). This will cause systemd + to start nothing but the unit rescue.target, which + runs sulogin to prompt for the root password and start + a root login shell. Exiting the shell causes the system to continue with + the normal boot process. + + + + + + systemd.log_level=debug systemd.log_target=console + + + + Make systemd very verbose and send log messages to the console instead of + the journal. + + + + + For more parameters recognised by systemd, see + systemd + 1. + -If NixOS fails to boot, there are a number of kernel command -line parameters that may help you to identify or fix the issue. You -can add these parameters in the GRUB boot menu by pressing “e” to -modify the selected boot entry and editing the line starting with -linux. The following are some useful kernel command -line parameters that are recognised by the NixOS boot scripts or by -systemd: - - - - boot.shell_on_fail - Start a root shell if something goes wrong in - stage 1 of the boot process (the initial ramdisk). This is - disabled by default because there is no authentication for the - root shell. - - - boot.debug1 - Start an interactive shell in stage 1 before - anything useful has been done. That is, no modules have been - loaded and no file systems have been mounted, except for - /proc and - /sys. - - - boot.trace - Print every shell command executed by the stage 1 - and 2 boot scripts. - - - single - Boot into rescue mode (a.k.a. single user mode). - This will cause systemd to start nothing but the unit - rescue.target, which runs - sulogin to prompt for the root password and - start a root login shell. Exiting the shell causes the system to - continue with the normal boot process. - - - systemd.log_level=debug systemd.log_target=console - Make systemd very verbose and send log messages to - the console instead of the journal. - - - - -For more parameters recognised by systemd, see -systemd1. - -If no login prompts or X11 login screens appear (e.g. due to -hanging dependencies), you can press Alt+ArrowUp. If you’re lucky, -this will start rescue mode (described above). (Also note that since -most units have a 90-second timeout before systemd gives up on them, -the agetty login prompts should appear eventually -unless something is very wrong.) - -
\ No newline at end of file + + If no login prompts or X11 login screens appear (e.g. due to hanging + dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start + rescue mode (described above). (Also note that since most units have a + 90-second timeout before systemd gives up on them, the + agetty login prompts should appear eventually unless + something is very wrong.) + +
diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml index 4cf62947f5283d6b2346227c06b2c3d5794137e2..ee201982a40be37a0e6ae52f4b5e9dfe365d20f3 100644 --- a/nixos/doc/manual/administration/cleaning-store.xml +++ b/nixos/doc/manual/administration/cleaning-store.xml @@ -3,60 +3,51 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-nix-gc"> - -Cleaning the Nix Store - -Nix has a purely functional model, meaning that packages are -never upgraded in place. Instead new versions of packages end up in a -different location in the Nix store (/nix/store). -You should periodically run Nix’s garbage -collector to remove old, unreferenced packages. This is -easy: - + Cleaning the Nix Store + + Nix has a purely functional model, meaning that packages are never upgraded + in place. Instead new versions of packages end up in a different location in + the Nix store (/nix/store). You should periodically run + Nix’s garbage collector to remove old, unreferenced + packages. This is easy: $ nix-collect-garbage - -Alternatively, you can use a systemd unit that does the same in the -background: - + Alternatively, you can use a systemd unit that does the same in the + background: # systemctl start nix-gc.service - -You can tell NixOS in configuration.nix to run -this unit automatically at certain points in time, for instance, every -night at 03:15: - + You can tell NixOS in configuration.nix to run this unit + automatically at certain points in time, for instance, every night at 03:15: -nix.gc.automatic = true; -nix.gc.dates = "03:15"; + = true; + = "03:15"; - - - -The commands above do not remove garbage collector roots, such -as old system configurations. Thus they do not remove the ability to -roll back to previous configurations. The following command deletes -old roots, removing the ability to roll back to them: + + + The commands above do not remove garbage collector roots, such as old system + configurations. Thus they do not remove the ability to roll back to previous + configurations. The following command deletes old roots, removing the ability + to roll back to them: $ nix-collect-garbage -d -You can also do this for specific profiles, e.g. + You can also do this for specific profiles, e.g. $ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old -Note that NixOS system configurations are stored in the profile -/nix/var/nix/profiles/system. - -Another way to reclaim disk space (often as much as 40% of the -size of the Nix store) is to run Nix’s store optimiser, which seeks -out identical files in the store and replaces them with hard links to -a single copy. + Note that NixOS system configurations are stored in the profile + /nix/var/nix/profiles/system. + + + Another way to reclaim disk space (often as much as 40% of the size of the + Nix store) is to run Nix’s store optimiser, which seeks out identical files + in the store and replaces them with hard links to a single copy. $ nix-store --optimise -Since this command needs to read the entire Nix store, it can take -quite a while to finish. - + Since this command needs to read the entire Nix store, it can take quite a + while to finish. +
diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index d89d262eff4e87d270fb31c1005f4d388f5e9ee4..4b977d1d82eb42b79d4eed281e13f5320f11225f 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -3,15 +3,13 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-container-networking"> + Container Networking - -Container Networking - -When you create a container using nixos-container -create, it gets it own private IPv4 address in the range -10.233.0.0/16. You can get the container’s IPv4 -address as follows: - + + When you create a container using nixos-container create, + it gets it own private IPv4 address in the range + 10.233.0.0/16. You can get the container’s IPv4 address + as follows: # nixos-container show-ip foo 10.233.4.2 @@ -19,40 +17,39 @@ address as follows: $ ping -c1 10.233.4.2 64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms - - - -Networking is implemented using a pair of virtual Ethernet -devices. The network interface in the container is called -eth0, while the matching interface in the host is -called ve-container-name -(e.g., ve-foo). The container has its own network -namespace and the CAP_NET_ADMIN capability, so it -can perform arbitrary network configuration such as setting up -firewall rules, without affecting or having access to the host’s -network. - -By default, containers cannot talk to the outside network. If -you want that, you should set up Network Address Translation (NAT) -rules on the host to rewrite container traffic to use your external -IP address. This can be accomplished using the following configuration -on the host: - + + + + Networking is implemented using a pair of virtual Ethernet devices. The + network interface in the container is called eth0, while + the matching interface in the host is called + ve-container-name (e.g., + ve-foo). The container has its own network namespace and + the CAP_NET_ADMIN capability, so it can perform arbitrary + network configuration such as setting up firewall rules, without affecting or + having access to the host’s network. + + + + By default, containers cannot talk to the outside network. If you want that, + you should set up Network Address Translation (NAT) rules on the host to + rewrite container traffic to use your external IP address. This can be + accomplished using the following configuration on the host: -networking.nat.enable = true; -networking.nat.internalInterfaces = ["ve-+"]; -networking.nat.externalInterface = "eth0"; + = true; + = ["ve-+"]; + = "eth0"; -where eth0 should be replaced with the desired -external interface. Note that ve-+ is a wildcard -that matches all container interfaces. - -If you are using Network Manager, you need to explicitly prevent -it from managing container interfaces: - + where eth0 should be replaced with the desired external + interface. Note that ve-+ is a wildcard that matches all + container interfaces. + + + + If you are using Network Manager, you need to explicitly prevent it from + managing container interfaces: networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; - - +
diff --git a/nixos/doc/manual/administration/containers.xml b/nixos/doc/manual/administration/containers.xml index 4cd2c8ae55637acebc3fb057c9124132ed8ceb3c..0d3355e56a586cefbcff8fb4a61901c5bcbe16f7 100644 --- a/nixos/doc/manual/administration/containers.xml +++ b/nixos/doc/manual/administration/containers.xml @@ -3,32 +3,32 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-containers"> - -Container Management - -NixOS allows you to easily run other NixOS instances as -containers. Containers are a light-weight -approach to virtualisation that runs software in the container at the -same speed as in the host system. NixOS containers share the Nix store -of the host, making container creation very efficient. - -Currently, NixOS containers are not perfectly isolated -from the host system. This means that a user with root access to the -container can do things that affect the host. So you should not give -container root access to untrusted users. - -NixOS containers can be created in two ways: imperatively, using -the command nixos-container, and declaratively, by -specifying them in your configuration.nix. The -declarative approach implies that containers get upgraded along with -your host system when you run nixos-rebuild, which -is often not what you want. By contrast, in the imperative approach, -containers are configured and updated independently from the host -system. - - - - - + Container Management + + NixOS allows you to easily run other NixOS instances as + containers. Containers are a light-weight approach to + virtualisation that runs software in the container at the same speed as in + the host system. NixOS containers share the Nix store of the host, making + container creation very efficient. + + + + Currently, NixOS containers are not perfectly isolated from the host system. + This means that a user with root access to the container can do things that + affect the host. So you should not give container root access to untrusted + users. + + + + NixOS containers can be created in two ways: imperatively, using the command + nixos-container, and declaratively, by specifying them in + your configuration.nix. The declarative approach implies + that containers get upgraded along with your host system when you run + nixos-rebuild, which is often not what you want. By + contrast, in the imperative approach, containers are configured and updated + independently from the host system. + + + + - diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml index 0d7b8ae910a788f290d1f9b313cfdccbefb5b86f..bb8b7f83d9e0a1b314c7e77f65f7d455d369612e 100644 --- a/nixos/doc/manual/administration/control-groups.xml +++ b/nixos/doc/manual/administration/control-groups.xml @@ -3,20 +3,18 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-cgroups"> - -Control Groups - -To keep track of the processes in a running system, systemd uses -control groups (cgroups). A control group is a -set of processes used to allocate resources such as CPU, memory or I/O -bandwidth. There can be multiple control group hierarchies, allowing -each kind of resource to be managed independently. - -The command systemd-cgls lists all control -groups in the systemd hierarchy, which is what -systemd uses to keep track of the processes belonging to each service -or user session: - + Control Groups + + To keep track of the processes in a running system, systemd uses + control groups (cgroups). A control group is a set of + processes used to allocate resources such as CPU, memory or I/O bandwidth. + There can be multiple control group hierarchies, allowing each kind of + resource to be managed independently. + + + The command systemd-cgls lists all control groups in the + systemd hierarchy, which is what systemd uses to keep + track of the processes belonging to each service or user session: $ systemd-cgls ├─user @@ -34,40 +32,34 @@ $ systemd-cgls │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf └─ ... - -Similarly, systemd-cgls cpu shows the cgroups in -the CPU hierarchy, which allows per-cgroup CPU scheduling priorities. -By default, every systemd service gets its own CPU cgroup, while all -user sessions are in the top-level CPU cgroup. This ensures, for -instance, that a thousand run-away processes in the -httpd.service cgroup cannot starve the CPU for one -process in the postgresql.service cgroup. (By -contrast, it they were in the same cgroup, then the PostgreSQL process -would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s -CPU share in configuration.nix: - + Similarly, systemd-cgls cpu shows the cgroups in the CPU + hierarchy, which allows per-cgroup CPU scheduling priorities. By default, + every systemd service gets its own CPU cgroup, while all user sessions are in + the top-level CPU cgroup. This ensures, for instance, that a thousand + run-away processes in the httpd.service cgroup cannot + starve the CPU for one process in the postgresql.service + cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL + process would get 1/1001 of the cgroup’s CPU time.) You can limit a + service’s CPU share in configuration.nix: -systemd.services.httpd.serviceConfig.CPUShares = 512; +systemd.services.httpd.serviceConfig.CPUShares = 512; - -By default, every cgroup has 1024 CPU shares, so this will halve the -CPU allocation of the httpd.service cgroup. - -There also is a memory hierarchy that -controls memory allocation limits; by default, all processes are in -the top-level cgroup, so any service or session can exhaust all -available memory. Per-cgroup memory limits can be specified in -configuration.nix; for instance, to limit -httpd.service to 512 MiB of RAM (excluding swap): - + By default, every cgroup has 1024 CPU shares, so this will halve the CPU + allocation of the httpd.service cgroup. + + + There also is a memory hierarchy that controls memory + allocation limits; by default, all processes are in the top-level cgroup, so + any service or session can exhaust all available memory. Per-cgroup memory + limits can be specified in configuration.nix; for + instance, to limit httpd.service to 512 MiB of RAM + (excluding swap): -systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; +systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; - - - -The command systemd-cgtop shows a -continuously updated list of all cgroups with their CPU and memory -usage. - + + + The command systemd-cgtop shows a continuously updated + list of all cgroups with their CPU and memory usage. + diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 94f03a2ee116ad6d930a6f36b4e86c5b90dcb924..2a98fb1262310275849d0451221f3fc671b04a47 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -3,58 +3,58 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-declarative-containers"> + Declarative Container Specification -Declarative Container Specification - -You can also specify containers and their configuration in the -host’s configuration.nix. For example, the -following specifies that there shall be a container named -database running PostgreSQL: - + + You can also specify containers and their configuration in the host’s + configuration.nix. For example, the following specifies + that there shall be a container named database running + PostgreSQL: containers.database = { config = { config, pkgs, ... }: - { services.postgresql.enable = true; - services.postgresql.package = pkgs.postgresql96; + { = true; + = pkgs.postgresql96; }; }; - -If you run nixos-rebuild switch, the container will -be built. If the container was already running, it will be -updated in place, without rebooting. The container can be configured to -start automatically by setting containers.database.autoStart = true -in its configuration. - -By default, declarative containers share the network namespace -of the host, meaning that they can listen on (privileged) -ports. However, they cannot change the network configuration. You can -give a container its own network as follows: - + If you run nixos-rebuild switch, the container will be + built. If the container was already running, it will be updated in place, + without rebooting. The container can be configured to start automatically by + setting containers.database.autoStart = true in its + configuration. + + + + By default, declarative containers share the network namespace of the host, + meaning that they can listen on (privileged) ports. However, they cannot + change the network configuration. You can give a container its own network as + follows: -containers.database = - { privateNetwork = true; - hostAddress = "192.168.100.10"; - localAddress = "192.168.100.11"; - }; +containers.database = { + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; +}; - -This gives the container a private virtual Ethernet interface with IP -address 192.168.100.11, which is hooked up to a -virtual Ethernet interface on the host with IP address -192.168.100.10. (See the next section for details -on container networking.) - -To disable the container, just remove it from -configuration.nix and run nixos-rebuild -switch. Note that this will not delete the root directory of -the container in /var/lib/containers. Containers can be -destroyed using the imperative method: nixos-container destroy - foo. - -Declarative containers can be started and stopped using the -corresponding systemd service, e.g. systemctl start -container@database. - + This gives the container a private virtual Ethernet interface with IP address + 192.168.100.11, which is hooked up to a virtual Ethernet + interface on the host with IP address 192.168.100.10. (See + the next section for details on container networking.) + + + + To disable the container, just remove it from + configuration.nix and run nixos-rebuild + switch. Note that this will not delete the root directory of the + container in /var/lib/containers. Containers can be + destroyed using the imperative method: nixos-container destroy + foo. + + + + Declarative containers can be started and stopped using the corresponding + systemd service, e.g. systemctl start container@database. + diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index d5d8140e076496edd7bb17b91422385d9a3bf56f..9bb62bc2ece9e8acde2a354a2b7c4d05fdf5fab4 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -3,131 +3,114 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-imperative-containers"> + Imperative Container Management -Imperative Container Management - -We’ll cover imperative container management using -nixos-container first. -Be aware that container management is currently only possible -as root. - -You create a container with -identifier foo as follows: + + We’ll cover imperative container management using + nixos-container first. Be aware that container management + is currently only possible as root. + + + You create a container with identifier foo as follows: # nixos-container create foo - -This creates the container’s root directory in -/var/lib/containers/foo and a small configuration -file in /etc/containers/foo.conf. It also builds -the container’s initial system configuration and stores it in -/nix/var/nix/profiles/per-container/foo/system. You -can modify the initial configuration of the container on the command -line. For instance, to create a container that has -sshd running, with the given public key for -root: - + This creates the container’s root directory in + /var/lib/containers/foo and a small configuration file + in /etc/containers/foo.conf. It also builds the + container’s initial system configuration and stores it in + /nix/var/nix/profiles/per-container/foo/system. You can + modify the initial configuration of the container on the command line. For + instance, to create a container that has sshd running, + with the given public key for root: # nixos-container create foo --config ' - services.openssh.enable = true; - users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; + = true; + users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; ' + - - -Creating a container does not start it. To start the container, -run: - + + Creating a container does not start it. To start the container, run: # nixos-container start foo - -This command will return as soon as the container has booted and has -reached multi-user.target. On the host, the -container runs within a systemd unit called -container@container-name.service. -Thus, if something went wrong, you can get status info using -systemctl: - + This command will return as soon as the container has booted and has reached + multi-user.target. On the host, the container runs within + a systemd unit called + container@container-name.service. + Thus, if something went wrong, you can get status info using + systemctl: # systemctl status container@foo + - - -If the container has started successfully, you can log in as -root using the root-login operation: - + + If the container has started successfully, you can log in as root using the + root-login operation: # nixos-container root-login foo [root@foo:~]# - -Note that only root on the host can do this (since there is no -authentication). You can also get a regular login prompt using the -login operation, which is available to all users on -the host: - + Note that only root on the host can do this (since there is no + authentication). You can also get a regular login prompt using the + login operation, which is available to all users on the + host: # nixos-container login foo foo login: alice Password: *** - -With nixos-container run, you can execute arbitrary -commands in the container: - + With nixos-container run, you can execute arbitrary + commands in the container: # nixos-container run foo -- uname -a Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux + - - -There are several ways to change the configuration of the -container. First, on the host, you can edit -/var/lib/container/name/etc/nixos/configuration.nix, -and run - + + There are several ways to change the configuration of the container. First, + on the host, you can edit + /var/lib/container/name/etc/nixos/configuration.nix, + and run # nixos-container update foo - -This will build and activate the new configuration. You can also -specify a new configuration on the command line: - + This will build and activate the new configuration. You can also specify a + new configuration on the command line: # nixos-container update foo --config ' - services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - networking.firewall.allowedTCPPorts = [ 80 ]; + = true; + = "foo@example.org"; + = [ 80 ]; ' # curl http://$(nixos-container show-ip foo)/ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… - -However, note that this will overwrite the container’s -/etc/nixos/configuration.nix. - -Alternatively, you can change the configuration from within the -container itself by running nixos-rebuild switch -inside the container. Note that the container by default does not have -a copy of the NixOS channel, so you should run nix-channel ---update first. - -Containers can be stopped and started using -nixos-container stop and nixos-container -start, respectively, or by using -systemctl on the container’s service unit. To -destroy a container, including its file system, do - + However, note that this will overwrite the container’s + /etc/nixos/configuration.nix. + + + + Alternatively, you can change the configuration from within the container + itself by running nixos-rebuild switch inside the + container. Note that the container by default does not have a copy of the + NixOS channel, so you should run nix-channel --update + first. + + + + Containers can be stopped and started using nixos-container + stop and nixos-container start, respectively, or + by using systemctl on the container’s service unit. To + destroy a container, including its file system, do # nixos-container destroy foo - - - + diff --git a/nixos/doc/manual/administration/logging.xml b/nixos/doc/manual/administration/logging.xml index 1d5df7770e298ec8c2b9ba8fcf6d343e62d1d6de..a41936b373d6f126518f18a20db9ac4ff7387b33 100644 --- a/nixos/doc/manual/administration/logging.xml +++ b/nixos/doc/manual/administration/logging.xml @@ -3,26 +3,20 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-logging"> - -Logging - -System-wide logging is provided by systemd’s -journal, which subsumes traditional logging -daemons such as syslogd and klogd. Log entries are kept in binary -files in /var/log/journal/. The command -journalctl allows you to see the contents of the -journal. For example, - + Logging + + System-wide logging is provided by systemd’s journal, + which subsumes traditional logging daemons such as syslogd and klogd. Log + entries are kept in binary files in /var/log/journal/. + The command journalctl allows you to see the contents of + the journal. For example, $ journalctl -b - -shows all journal entries since the last reboot. (The output of -journalctl is piped into less by -default.) You can use various options and match operators to restrict -output to messages of interest. For instance, to get all messages -from PostgreSQL: - + shows all journal entries since the last reboot. (The output of + journalctl is piped into less by + default.) You can use various options and match operators to restrict output + to messages of interest. For instance, to get all messages from PostgreSQL: $ journalctl -u postgresql.service -- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- @@ -32,21 +26,18 @@ Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections - -Or to get all messages since the last reboot that have at least a -“critical” severity level: - + Or to get all messages since the last reboot that have at least a + “critical” severity level: $ journalctl -b -p crit Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) - - - -The system journal is readable by root and by users in the -wheel and systemd-journal -groups. All users have a private journal that can be read using -journalctl. - - \ No newline at end of file + + + The system journal is readable by root and by users in the + wheel and systemd-journal groups. All + users have a private journal that can be read using + journalctl. + + diff --git a/nixos/doc/manual/administration/maintenance-mode.xml b/nixos/doc/manual/administration/maintenance-mode.xml index 17a1609e557959edbc92c251b6b8ea10944c79f4..71e3f9ea665d8ee318f9466534ebb73cad6deffa 100644 --- a/nixos/doc/manual/administration/maintenance-mode.xml +++ b/nixos/doc/manual/administration/maintenance-mode.xml @@ -3,16 +3,14 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-maintenance-mode"> + Maintenance Mode -Maintenance Mode - -You can enter rescue mode by running: - + + You can enter rescue mode by running: # systemctl rescue - -This will eventually give you a single-user root shell. Systemd will -stop (almost) all system services. To get out of maintenance mode, -just exit from the rescue shell. - + This will eventually give you a single-user root shell. Systemd will stop + (almost) all system services. To get out of maintenance mode, just exit from + the rescue shell. + diff --git a/nixos/doc/manual/administration/network-problems.xml b/nixos/doc/manual/administration/network-problems.xml index 91f9eb4e22c680aa2cb08cdafc8ec9ef7ab00e38..570f58358845bf7a80e4dc26c9003c052eb44fb7 100644 --- a/nixos/doc/manual/administration/network-problems.xml +++ b/nixos/doc/manual/administration/network-problems.xml @@ -3,31 +3,25 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-nix-network-issues"> + Network Problems -Network Problems - -Nix uses a so-called binary cache to -optimise building a package from source into downloading it as a -pre-built binary. That is, whenever a command like -nixos-rebuild needs a path in the Nix store, Nix -will try to download that path from the Internet rather than build it -from source. The default binary cache is -https://cache.nixos.org/. If this cache is unreachable, -Nix operations may take a long time due to HTTP connection timeouts. -You can disable the use of the binary cache by adding , e.g. - + + Nix uses a so-called binary cache to optimise building a + package from source into downloading it as a pre-built binary. That is, + whenever a command like nixos-rebuild needs a path in the + Nix store, Nix will try to download that path from the Internet rather than + build it from source. The default binary cache is + https://cache.nixos.org/. If this cache is unreachable, Nix + operations may take a long time due to HTTP connection timeouts. You can + disable the use of the binary cache by adding , e.g. # nixos-rebuild switch --option use-binary-caches false - -If you have an alternative binary cache at your disposal, you can use -it instead: - + If you have an alternative binary cache at your disposal, you can use it + instead: # nixos-rebuild switch --option binary-caches http://my-cache.example.org/ - - - + diff --git a/nixos/doc/manual/administration/rebooting.xml b/nixos/doc/manual/administration/rebooting.xml index 23f3a3219c6ae42c3ab64798494ce375ae62b8b0..a5abd6f025885d51a84ccfb258018f702d0f4669 100644 --- a/nixos/doc/manual/administration/rebooting.xml +++ b/nixos/doc/manual/administration/rebooting.xml @@ -3,42 +3,33 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-rebooting"> - -Rebooting and Shutting Down - -The system can be shut down (and automatically powered off) by -doing: - + Rebooting and Shutting Down + + The system can be shut down (and automatically powered off) by doing: # shutdown - -This is equivalent to running systemctl -poweroff. - -To reboot the system, run - + This is equivalent to running systemctl poweroff. + + + To reboot the system, run # reboot - -which is equivalent to systemctl reboot. -Alternatively, you can quickly reboot the system using -kexec, which bypasses the BIOS by directly loading -the new kernel into memory: - + which is equivalent to systemctl reboot. Alternatively, + you can quickly reboot the system using kexec, which + bypasses the BIOS by directly loading the new kernel into memory: # systemctl kexec - - - -The machine can be suspended to RAM (if supported) using -systemctl suspend, and suspended to disk using -systemctl hibernate. - -These commands can be run by any user who is logged in locally, -i.e. on a virtual console or in X11; otherwise, the user is asked for -authentication. - + + + The machine can be suspended to RAM (if supported) using systemctl + suspend, and suspended to disk using systemctl + hibernate. + + + These commands can be run by any user who is logged in locally, i.e. on a + virtual console or in X11; otherwise, the user is asked for authentication. + diff --git a/nixos/doc/manual/administration/rollback.xml b/nixos/doc/manual/administration/rollback.xml index ae621f33de2caa40cf25122234a1c15b1d6e6b06..07c6acaa469c9fc5f12ca1e2bcab548e44a64c6c 100644 --- a/nixos/doc/manual/administration/rollback.xml +++ b/nixos/doc/manual/administration/rollback.xml @@ -3,46 +3,39 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-rollback"> - -Rolling Back Configuration Changes - -After running nixos-rebuild to switch to a -new configuration, you may find that the new configuration doesn’t -work very well. In that case, there are several ways to return to a -previous configuration. - -First, the GRUB boot manager allows you to boot into any -previous configuration that hasn’t been garbage-collected. These -configurations can be found under the GRUB submenu “NixOS - All -configurations”. This is especially useful if the new configuration -fails to boot. After the system has booted, you can make the selected -configuration the default for subsequent boots: - + Rolling Back Configuration Changes + + + After running nixos-rebuild to switch to a new + configuration, you may find that the new configuration doesn’t work very + well. In that case, there are several ways to return to a previous + configuration. + + + + First, the GRUB boot manager allows you to boot into any previous + configuration that hasn’t been garbage-collected. These configurations can + be found under the GRUB submenu “NixOS - All configurations”. This is + especially useful if the new configuration fails to boot. After the system + has booted, you can make the selected configuration the default for + subsequent boots: # /run/current-system/bin/switch-to-configuration boot + - - -Second, you can switch to the previous configuration in a running -system: - + + Second, you can switch to the previous configuration in a running system: # nixos-rebuild switch --rollback - -This is equivalent to running: - + This is equivalent to running: # /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch - -where N is the number of the NixOS system -configuration. To get a list of the available configurations, do: - + where N is the number of the NixOS system + configuration. To get a list of the available configurations, do: $ ls -l /nix/var/nix/profiles/system-*-link ... lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 - - - + diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml index 9091511ed527a25b7c4bd6d9edd964d3a02a8624..786dd5e2390d6579f90e55881717d723c95bf4f8 100644 --- a/nixos/doc/manual/administration/running.xml +++ b/nixos/doc/manual/administration/running.xml @@ -3,22 +3,19 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-running"> - -Administration - - -This chapter describes various aspects of managing a running -NixOS system, such as how to use the systemd -service manager. - - - - - - - - - - - + Administration + + + This chapter describes various aspects of managing a running NixOS system, + such as how to use the systemd service manager. + + + + + + + + + + diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml index 1627c7a2fdeb0d03218aacf78b16c86664187a2c..0c2085c815597d3a3c1894e70941f774d10cdc35 100644 --- a/nixos/doc/manual/administration/service-mgmt.xml +++ b/nixos/doc/manual/administration/service-mgmt.xml @@ -3,26 +3,23 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-systemctl"> - -Service Management - -In NixOS, all system services are started and monitored using -the systemd program. Systemd is the “init” process of the system -(i.e. PID 1), the parent of all other processes. It manages a set of -so-called “units”, which can be things like system services -(programs), but also mount points, swap files, devices, targets -(groups of units) and more. Units can have complex dependencies; for -instance, one unit can require that another unit must be successfully -started before the first unit can be started. When the system boots, -it starts a unit named default.target; the -dependencies of this unit cause all system services to be started, -file systems to be mounted, swap files to be activated, and so -on. - -The command systemctl is the main way to -interact with systemd. Without any arguments, it -shows the status of active units: - + Service Management + + In NixOS, all system services are started and monitored using the systemd + program. Systemd is the “init” process of the system (i.e. PID 1), the + parent of all other processes. It manages a set of so-called “units”, + which can be things like system services (programs), but also mount points, + swap files, devices, targets (groups of units) and more. Units can have + complex dependencies; for instance, one unit can require that another unit + must be successfully started before the first unit can be started. When the + system boots, it starts a unit named default.target; the + dependencies of this unit cause all system services to be started, file + systems to be mounted, swap files to be activated, and so on. + + + The command systemctl is the main way to interact with + systemd. Without any arguments, it shows the status of + active units: $ systemctl -.mount loaded active mounted / @@ -31,12 +28,10 @@ sshd.service loaded active running SSH Daemon graphical.target loaded active active Graphical Interface ... - - - -You can ask for detailed status information about a unit, for -instance, the PostgreSQL database service: - + + + You can ask for detailed status information about a unit, for instance, the + PostgreSQL database service: $ systemctl status postgresql.service postgresql.service - PostgreSQL Server @@ -56,28 +51,22 @@ Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. - -Note that this shows the status of the unit (active and running), all -the processes belonging to the service, as well as the most recent log -messages from the service. - - - -Units can be stopped, started or restarted: - + Note that this shows the status of the unit (active and running), all the + processes belonging to the service, as well as the most recent log messages + from the service. + + + Units can be stopped, started or restarted: # systemctl stop postgresql.service # systemctl start postgresql.service # systemctl restart postgresql.service - -These operations are synchronous: they wait until the service has -finished starting or stopping (or has failed). Starting a unit will -cause the dependencies of that unit to be started as well (if -necessary). - + These operations are synchronous: they wait until the service has finished + starting or stopping (or has failed). Starting a unit will cause the + dependencies of that unit to be started as well (if necessary). + - diff --git a/nixos/doc/manual/administration/store-corruption.xml b/nixos/doc/manual/administration/store-corruption.xml index 9f567042b727e956c860d8190cf392fb0b09f76f..a4ca3b651e20e20c7e5e16769195ba2ca6b8f75c 100644 --- a/nixos/doc/manual/administration/store-corruption.xml +++ b/nixos/doc/manual/administration/store-corruption.xml @@ -3,35 +3,34 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-nix-store-corruption"> - -Nix Store Corruption - -After a system crash, it’s possible for files in the Nix store -to become corrupted. (For instance, the Ext4 file system has the -tendency to replace un-synced files with zero bytes.) NixOS tries -hard to prevent this from happening: it performs a -sync before switching to a new configuration, and -Nix’s database is fully transactional. If corruption still occurs, -you may be able to fix it automatically. - -If the corruption is in a path in the closure of the NixOS -system configuration, you can fix it by doing - + Nix Store Corruption + + + After a system crash, it’s possible for files in the Nix store to become + corrupted. (For instance, the Ext4 file system has the tendency to replace + un-synced files with zero bytes.) NixOS tries hard to prevent this from + happening: it performs a sync before switching to a new + configuration, and Nix’s database is fully transactional. If corruption + still occurs, you may be able to fix it automatically. + + + + If the corruption is in a path in the closure of the NixOS system + configuration, you can fix it by doing # nixos-rebuild switch --repair + This will cause Nix to check every path in the closure, and if its + cryptographic hash differs from the hash recorded in Nix’s database, the + path is rebuilt or redownloaded. + -This will cause Nix to check every path in the closure, and if its -cryptographic hash differs from the hash recorded in Nix’s database, -the path is rebuilt or redownloaded. - -You can also scan the entire Nix store for corrupt paths: - + + You can also scan the entire Nix store for corrupt paths: # nix-store --verify --check-contents --repair - -Any corrupt paths will be redownloaded if they’re available in a -binary cache; otherwise, they cannot be repaired. - + Any corrupt paths will be redownloaded if they’re available in a binary + cache; otherwise, they cannot be repaired. + diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml index 351fb1883310af5997346522adcffbcdfe37123c..6496e7bde3877b03bcf6d99c4072644ed3279fa6 100644 --- a/nixos/doc/manual/administration/troubleshooting.xml +++ b/nixos/doc/manual/administration/troubleshooting.xml @@ -3,16 +3,14 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-troubleshooting"> - -Troubleshooting - -This chapter describes solutions to common problems you might -encounter when you manage your NixOS system. - - - - - - - + Troubleshooting + + This chapter describes solutions to common problems you might encounter when + you manage your NixOS system. + + + + + + diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixos/doc/manual/administration/user-sessions.xml index 0a7eb8cd123c34022f2ac13d2133c616f5abc929..1d95cfb22b69674816c2ae1c483ebcca54f3be16 100644 --- a/nixos/doc/manual/administration/user-sessions.xml +++ b/nixos/doc/manual/administration/user-sessions.xml @@ -3,14 +3,12 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-user-sessions"> - -User Sessions - -Systemd keeps track of all users who are logged into the system -(e.g. on a virtual console or remotely via SSH). The command -loginctl allows querying and manipulating user -sessions. For instance, to list all user sessions: - + User Sessions + + Systemd keeps track of all users who are logged into the system (e.g. on a + virtual console or remotely via SSH). The command loginctl + allows querying and manipulating user sessions. For instance, to list all + user sessions: $ loginctl SESSION UID USER SEAT @@ -18,12 +16,10 @@ $ loginctl c3 0 root seat0 c4 500 alice - -This shows that two users are logged in locally, while another is -logged in remotely. (“Seats” are essentially the combinations of -displays and input devices attached to the system; usually, there is -only one seat.) To get information about a session: - + This shows that two users are logged in locally, while another is logged in + remotely. (“Seats” are essentially the combinations of displays and input + devices attached to the system; usually, there is only one seat.) To get + information about a session: $ loginctl session-status c3 c3 - root (0) @@ -38,16 +34,12 @@ c3 - root (0) ├─10339 -bash └─10355 w3m nixos.org - -This shows that the user is logged in on virtual console 3. It also -lists the processes belonging to this session. Since systemd keeps -track of this, you can terminate a session in a way that ensures that -all the session’s processes are gone: - + This shows that the user is logged in on virtual console 3. It also lists the + processes belonging to this session. Since systemd keeps track of this, you + can terminate a session in a way that ensures that all the session’s + processes are gone: # loginctl terminate-session c3 - - - + diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml index cbd54bca62f92674191f221fe52b2bdb32a3e948..5bf0635cc1aa614f3fac70592e5be260d7429cd4 100644 --- a/nixos/doc/manual/configuration/abstractions.xml +++ b/nixos/doc/manual/configuration/abstractions.xml @@ -3,15 +3,14 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-module-abstractions"> + Abstractions -Abstractions - -If you find yourself repeating yourself over and over, it’s time -to abstract. Take, for instance, this Apache HTTP Server configuration: - + + If you find yourself repeating yourself over and over, it’s time to + abstract. Take, for instance, this Apache HTTP Server configuration: { - services.httpd.virtualHosts = + = [ { hostName = "example.org"; documentRoot = "/webroot"; adminAddr = "alice@example.org"; @@ -28,11 +27,9 @@ to abstract. Take, for instance, this Apache HTTP Server configuration: ]; } - -It defines two virtual hosts with nearly identical configuration; the -only difference is that the second one has SSL enabled. To prevent -this duplication, we can use a let: - + It defines two virtual hosts with nearly identical configuration; the only + difference is that the second one has SSL enabled. To prevent this + duplication, we can use a let: let exampleOrgCommon = @@ -43,7 +40,7 @@ let }; in { - services.httpd.virtualHosts = + = [ exampleOrgCommon (exampleOrgCommon // { enableSSL = true; @@ -53,40 +50,38 @@ in ]; } - -The let exampleOrgCommon = -... defines a variable named -exampleOrgCommon. The // -operator merges two attribute sets, so the configuration of the second -virtual host is the set exampleOrgCommon extended -with the SSL options. - -You can write a let wherever an expression is -allowed. Thus, you also could have written: - + The let exampleOrgCommon = ... + defines a variable named exampleOrgCommon. The + // operator merges two attribute sets, so the + configuration of the second virtual host is the set + exampleOrgCommon extended with the SSL options. + + + + You can write a let wherever an expression is allowed. + Thus, you also could have written: { - services.httpd.virtualHosts = + = let exampleOrgCommon = ...; in [ exampleOrgCommon (exampleOrgCommon // { ... }) ]; } - -but not { let exampleOrgCommon = -...; in ...; -} since attributes (as opposed to attribute values) are not -expressions. - -Functions provide another method of -abstraction. For instance, suppose that we want to generate lots of -different virtual hosts, all with identical configuration except for -the host name. This can be done as follows: - + but not { let exampleOrgCommon = ...; in + ...; } since attributes (as opposed to + attribute values) are not expressions. + + + + Functions provide another method of abstraction. For + instance, suppose that we want to generate lots of different virtual hosts, + all with identical configuration except for the host name. This can be done + as follows: { - services.httpd.virtualHosts = + = let makeVirtualHost = name: { hostName = name; @@ -101,38 +96,36 @@ the host name. This can be done as follows: ]; } - -Here, makeVirtualHost is a function that takes a -single argument name and returns the configuration -for a virtual host. That function is then called for several names to -produce the list of virtual host configurations. - -We can further improve on this by using the function -map, which applies another function to every -element in a list: - + Here, makeVirtualHost is a function that takes a single + argument name and returns the configuration for a virtual + host. That function is then called for several names to produce the list of + virtual host configurations. + + + + We can further improve on this by using the function map, + which applies another function to every element in a list: { - services.httpd.virtualHosts = + = let makeVirtualHost = ...; in map makeVirtualHost [ "example.org" "example.com" "example.gov" "example.nl" ]; } - -(The function map is called a -higher-order function because it takes another -function as an argument.) - -What if you need more than one argument, for instance, if we -want to use a different documentRoot for each -virtual host? Then we can make makeVirtualHost a -function that takes a set as its argument, like this: - + (The function map is called a higher-order + function because it takes another function as an argument.) + + + + What if you need more than one argument, for instance, if we want to use a + different documentRoot for each virtual host? Then we can + make makeVirtualHost a function that takes a + set as its argument, like this: { - services.httpd.virtualHosts = + = let makeVirtualHost = { name, root }: { hostName = name; @@ -147,10 +140,9 @@ function that takes a set as its argument, like this: ]; } - -But in this case (where every root is a subdirectory of -/sites named after the virtual host), it would -have been shorter to define makeVirtualHost as + But in this case (where every root is a subdirectory of + /sites named after the virtual host), it would have been + shorter to define makeVirtualHost as makeVirtualHost = name: { hostName = name; @@ -158,9 +150,7 @@ makeVirtualHost = name: adminAddr = "alice@example.org"; }; - -Here, the construct -${...} allows the result -of an expression to be spliced into a string. - + Here, the construct ${...} + allows the result of an expression to be spliced into a string. + diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml index 26a572ba1fb560f036b1bf0f5934d5adf01f25ea..00e595c7cb7f4e5a1f038e7f069568d1c08748ba 100644 --- a/nixos/doc/manual/configuration/ad-hoc-network-config.xml +++ b/nixos/doc/manual/configuration/ad-hoc-network-config.xml @@ -3,22 +3,18 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ad-hoc-network-config"> + Ad-Hoc Configuration -Ad-Hoc Configuration - -You can use to specify -shell commands to be run at the end of -network-setup.service. This is useful for doing -network configuration not covered by the existing NixOS modules. For -instance, to statically configure an IPv6 address: - + + You can use to specify shell + commands to be run at the end of network-setup.service. + This is useful for doing network configuration not covered by the existing + NixOS modules. For instance, to statically configure an IPv6 address: -networking.localCommands = + = '' ip -6 addr add 2001:610:685:1::1/64 dev eth0 ''; - - - + diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml index a147291c4f3d9933600da9dca1485b65a9ab7616..19159d8db5b6703cfff53084155d6d9befffad1b 100644 --- a/nixos/doc/manual/configuration/ad-hoc-packages.xml +++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml @@ -3,61 +3,59 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-ad-hoc-packages"> + Ad-Hoc Package Management -Ad-Hoc Package Management - -With the command nix-env, you can install and -uninstall packages from the command line. For instance, to install -Mozilla Thunderbird: - + + With the command nix-env, you can install and uninstall + packages from the command line. For instance, to install Mozilla Thunderbird: $ nix-env -iA nixos.thunderbird - -If you invoke this as root, the package is installed in the Nix -profile /nix/var/nix/profiles/default and visible -to all users of the system; otherwise, the package ends up in -/nix/var/nix/profiles/per-user/username/profile -and is not visible to other users. The flag -specifies the package by its attribute name; without it, the package -is installed by matching against its package name -(e.g. thunderbird). The latter is slower because -it requires matching against all available Nix packages, and is -ambiguous if there are multiple matching packages. - -Packages come from the NixOS channel. You typically upgrade a -package by updating to the latest version of the NixOS channel: + If you invoke this as root, the package is installed in the Nix profile + /nix/var/nix/profiles/default and visible to all users + of the system; otherwise, the package ends up in + /nix/var/nix/profiles/per-user/username/profile + and is not visible to other users. The flag specifies the + package by its attribute name; without it, the package is installed by + matching against its package name (e.g. thunderbird). The + latter is slower because it requires matching against all available Nix + packages, and is ambiguous if there are multiple matching packages. + + + + Packages come from the NixOS channel. You typically upgrade a package by + updating to the latest version of the NixOS channel: $ nix-channel --update nixos -and then running nix-env -i again. Other packages -in the profile are not affected; this is the -crucial difference with the declarative style of package management, -where running nixos-rebuild switch causes all -packages to be updated to their current versions in the NixOS channel. -You can however upgrade all packages for which there is a newer -version by doing: + and then running nix-env -i again. Other packages in the + profile are not affected; this is the crucial difference + with the declarative style of package management, where running + nixos-rebuild switch causes all packages to be updated to + their current versions in the NixOS channel. You can however upgrade all + packages for which there is a newer version by doing: $ nix-env -u '*' - + -A package can be uninstalled using the -flag: + + A package can be uninstalled using the flag: $ nix-env -e thunderbird - + -Finally, you can roll back an undesirable -nix-env action: + + Finally, you can roll back an undesirable nix-env action: $ nix-env --rollback - - -nix-env has many more flags. For details, -see the -nix-env1 -manpage or the Nix manual. - + + + + nix-env has many more flags. For details, see the + + nix-env + 1 manpage or the Nix manual. + diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml index ab3665bae50468c76c6dd5e6be887000119fe803..028a94275345d470ddc1e5ace68566573bccf9da 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -3,45 +3,38 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-custom-packages"> + Adding Custom Packages -Adding Custom Packages - -It’s possible that a package you need is not available in NixOS. -In that case, you can do two things. First, you can clone the Nixpkgs -repository, add the package to your clone, and (optionally) submit a -patch or pull request to have it accepted into the main Nixpkgs -repository. This is described in detail in the Nixpkgs manual. -In short, you clone Nixpkgs: - + + It’s possible that a package you need is not available in NixOS. In that + case, you can do two things. First, you can clone the Nixpkgs repository, add + the package to your clone, and (optionally) submit a patch or pull request to + have it accepted into the main Nixpkgs repository. This is described in + detail in the Nixpkgs + manual. In short, you clone Nixpkgs: -$ git clone git://github.com/NixOS/nixpkgs.git +$ git clone https://github.com/NixOS/nixpkgs $ cd nixpkgs - -Then you write and test the package as described in the Nixpkgs -manual. Finally, you add it to -environment.systemPackages, e.g. - + Then you write and test the package as described in the Nixpkgs manual. + Finally, you add it to environment.systemPackages, e.g. -environment.systemPackages = [ pkgs.my-package ]; + = [ pkgs.my-package ]; - -and you run nixos-rebuild, specifying your own -Nixpkgs tree: - + and you run nixos-rebuild, specifying your own Nixpkgs + tree: # nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs + - - -The second possibility is to add the package outside of the -Nixpkgs tree. For instance, here is how you specify a build of the -GNU Hello -package directly in configuration.nix: - + + The second possibility is to add the package outside of the Nixpkgs tree. For + instance, here is how you specify a build of the + GNU Hello + package directly in configuration.nix: -environment.systemPackages = + = let my-hello = with pkgs; stdenv.mkDerivation rec { name = "hello-2.8"; @@ -53,13 +46,12 @@ environment.systemPackages = in [ my-hello ]; - -Of course, you can also move the definition of -my-hello into a separate Nix expression, e.g. + Of course, you can also move the definition of my-hello + into a separate Nix expression, e.g. -environment.systemPackages = [ (import ./my-hello.nix) ]; + = [ (import ./my-hello.nix) ]; -where my-hello.nix contains: + where my-hello.nix contains: with import <nixpkgs> {}; # bring all of Nixpkgs into scope @@ -71,14 +63,11 @@ stdenv.mkDerivation rec { }; } - -This allows testing the package easily: + This allows testing the package easily: $ nix-build my-hello.nix $ ./result/bin/hello Hello, world! - - - + diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 3d1cdaf4c4ab6825e957d3a64db8b546172b4c35..8a1a39c98c10d3dec9e919959b24b5c7e6d5d276 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -3,49 +3,46 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-configuration-file"> + NixOS Configuration File -NixOS Configuration File - -The NixOS configuration file generally looks like this: - + + The NixOS configuration file generally looks like this: { config, pkgs, ... }: { option definitions } - -The first line ({ config, pkgs, ... }:) denotes -that this is actually a function that takes at least the two arguments - config and pkgs. (These are -explained later.) The function returns a set of -option definitions ({ ... }). These definitions have the -form name = -value, where -name is the name of an option and -value is its value. For example, - + The first line ({ config, pkgs, ... }:) denotes that this + is actually a function that takes at least the two arguments + config and pkgs. (These are explained + later.) The function returns a set of option definitions + ({ ... }). These definitions + have the form name = + value, where + name is the name of an option and + value is its value. For example, { config, pkgs, ... }: -{ services.httpd.enable = true; - services.httpd.adminAddr = "alice@example.org"; - services.httpd.documentRoot = "/webroot"; +{ = true; + = "alice@example.org"; + = "/webroot"; } - -defines a configuration with three option definitions that together -enable the Apache HTTP Server with /webroot as -the document root. - -Sets can be nested, and in fact dots in option names are -shorthand for defining a set containing another set. For instance, - defines a set named -services that contains a set named -httpd, which in turn contains an option definition -named enable with value true. -This means that the example above can also be written as: - + defines a configuration with three option definitions that together enable + the Apache HTTP Server with /webroot as the document + root. + + + + Sets can be nested, and in fact dots in option names are shorthand for + defining a set containing another set. For instance, + defines a set named + services that contains a set named + httpd, which in turn contains an option definition named + enable with value true. This means that + the example above can also be written as: { config, pkgs, ... }: @@ -58,160 +55,156 @@ This means that the example above can also be written as: }; } - -which may be more convenient if you have lots of option definitions -that share the same prefix (such as -services.httpd). - -NixOS checks your option definitions for correctness. For -instance, if you try to define an option that doesn’t exist (that is, -doesn’t have a corresponding option declaration), -nixos-rebuild will give an error like: + which may be more convenient if you have lots of option definitions that + share the same prefix (such as services.httpd). + + + + NixOS checks your option definitions for correctness. For instance, if you + try to define an option that doesn’t exist (that is, doesn’t have a + corresponding option declaration), + nixos-rebuild will give an error like: The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. -Likewise, values in option definitions must have a correct type. For -instance, must be a Boolean -(true or false). Trying to give -it a value of another type, such as a string, will cause an error: + Likewise, values in option definitions must have a correct type. For + instance, must be a Boolean + (true or false). Trying to give it a + value of another type, such as a string, will cause an error: The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean. - - - -Options have various types of values. The most important are: - - - - Strings + + + + Options have various types of values. The most important are: + + + + Strings + - Strings are enclosed in double quotes, e.g. - + + Strings are enclosed in double quotes, e.g. -networking.hostName = "dexter"; + = "dexter"; - - Special characters can be escaped by prefixing them with a - backslash (e.g. \"). - - Multi-line strings can be enclosed in double - single quotes, e.g. - + Special characters can be escaped by prefixing them with a backslash + (e.g. \"). + + + Multi-line strings can be enclosed in double single + quotes, e.g. -networking.extraHosts = + = '' 127.0.0.2 other-localhost 10.0.0.1 server ''; - - The main difference is that it strips from each line - a number of spaces equal to the minimal indentation of - the string as a whole (disregarding the indentation of - empty lines), and that characters like - " and \ are not special - (making it more convenient for including things like shell - code). - See more info about this in the Nix manual here. + The main difference is that it strips from each line a number of spaces + equal to the minimal indentation of the string as a whole (disregarding + the indentation of empty lines), and that characters like + " and \ are not special (making it + more convenient for including things like shell code). See more info + about this in the Nix manual + here. + - - - - Booleans + + + + Booleans + - These can be true or - false, e.g. - + + These can be true or false, e.g. -networking.firewall.enable = true; -networking.firewall.allowPing = false; + = true; + = false; - + - - - - Integers + + + + Integers + - For example, - + + For example, -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; +."net.ipv4.tcp_keepalive_time" = 60; - (Note that here the attribute name - net.ipv4.tcp_keepalive_time is enclosed in - quotes to prevent it from being interpreted as a set named - net containing a set named - ipv4, and so on. This is because it’s not a - NixOS option but the literal name of a Linux kernel - setting.) + net.ipv4.tcp_keepalive_time is enclosed in quotes to + prevent it from being interpreted as a set named net + containing a set named ipv4, and so on. This is + because it’s not a NixOS option but the literal name of a Linux kernel + setting.) + - - - - Sets + + + + Sets + - Sets were introduced above. They are name/value pairs - enclosed in braces, as in the option definition - + + Sets were introduced above. They are name/value pairs enclosed in braces, + as in the option definition -fileSystems."/boot" = +."/boot" = { device = "/dev/sda1"; fsType = "ext4"; options = [ "rw" "data=ordered" "relatime" ]; }; - + - - - - Lists + + + + Lists + - The important thing to note about lists is that list - elements are separated by whitespace, like this: - + + The important thing to note about lists is that list elements are + separated by whitespace, like this: -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + = [ "fuse" "kvm-intel" "coretemp" ]; - List elements can be any other type, e.g. sets: - swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; - + - - - - Packages + + + + Packages + - Usually, the packages you need are already part of the Nix - Packages collection, which is a set that can be accessed through - the function argument pkgs. Typical uses: - + + Usually, the packages you need are already part of the Nix Packages + collection, which is a set that can be accessed through the function + argument pkgs. Typical uses: -environment.systemPackages = + = [ pkgs.thunderbird pkgs.emacs ]; -postgresql.package = pkgs.postgresql90; + = pkgs.postgresql90; - - The latter option definition changes the default PostgreSQL - package used by NixOS’s PostgreSQL service to 9.0. For more - information on packages, including how to add new ones, see - . + The latter option definition changes the default PostgreSQL package used + by NixOS’s PostgreSQL service to 9.0. For more information on packages, + including how to add new ones, see . + - - - - - - + + + diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml index 87847f8451ec354b91a3919b5f9e476e18c8ca7a..5ef498cf9ae385c8633913e8193e154dc679a37c 100644 --- a/nixos/doc/manual/configuration/config-syntax.xml +++ b/nixos/doc/manual/configuration/config-syntax.xml @@ -3,25 +3,23 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-configuration-syntax"> - -Configuration Syntax - -The NixOS configuration file -/etc/nixos/configuration.nix is actually a -Nix expression, which is the Nix package -manager’s purely functional language for describing how to build -packages and configurations. This means you have all the expressive -power of that language at your disposal, including the ability to -abstract over common patterns, which is very useful when managing -complex systems. The syntax and semantics of the Nix language are -fully described in the Configuration Syntax + + The NixOS configuration file + /etc/nixos/configuration.nix is actually a Nix + expression, which is the Nix package manager’s purely functional + language for describing how to build packages and configurations. This means + you have all the expressive power of that language at your disposal, + including the ability to abstract over common patterns, which is very useful + when managing complex systems. The syntax and semantics of the Nix language + are fully described in the + Nix -manual, but here we give a short overview of the most important -constructs useful in NixOS configuration files. - - - - - - + manual, but here we give a short overview of the most important + constructs useful in NixOS configuration files. + + + + + diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 8677c13db40ff4fa5fd7e5941fabf8c1d9adb4db..8d05dcd34b4d40813b5d6224af5258337e77c431 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -3,31 +3,24 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-configuration"> - -Configuration - - - -This chapter describes how to configure various aspects of a -NixOS machine through the configuration file -/etc/nixos/configuration.nix. As described in -, changes to this file only take -effect after you run nixos-rebuild. - - - - - - - - - - - - - - + Configuration + + + This chapter describes how to configure various aspects of a NixOS machine + through the configuration file + /etc/nixos/configuration.nix. As described in + , changes to this file only take + effect after you run nixos-rebuild. + + + + + + + + + + + - - diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml index 8aa01fb57a0950c1ab467d78ca8ac13935e33b19..03b5bb53197bd6a849b629277867d20fcdcfe1a3 100644 --- a/nixos/doc/manual/configuration/customizing-packages.xml +++ b/nixos/doc/manual/configuration/customizing-packages.xml @@ -3,91 +3,84 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-customising-packages"> + Customising Packages -Customising Packages + + Some packages in Nixpkgs have options to enable or disable optional + functionality or change other aspects of the package. For instance, the + Firefox wrapper package (which provides Firefox with a set of plugins such as + the Adobe Flash player) has an option to enable the Google Talk plugin. It + can be set in configuration.nix as follows: + nixpkgs.config.firefox.enableGoogleTalkPlugin = true; + -Some packages in Nixpkgs have options to enable or disable -optional functionality or change other aspects of the package. For -instance, the Firefox wrapper package (which provides Firefox with a -set of plugins such as the Adobe Flash player) has an option to enable -the Google Talk plugin. It can be set in -configuration.nix as follows: - - -nixpkgs.config.firefox.enableGoogleTalkPlugin = true; - - - -Unfortunately, Nixpkgs currently lacks a way to query -available configuration options. - -Apart from high-level options, it’s possible to tweak a package -in almost arbitrary ways, such as changing or disabling dependencies -of a package. For instance, the Emacs package in Nixpkgs by default -has a dependency on GTK+ 2. If you want to build it against GTK+ 3, -you can specify that as follows: + + + Unfortunately, Nixpkgs currently lacks a way to query available + configuration options. + + + + Apart from high-level options, it’s possible to tweak a package in almost + arbitrary ways, such as changing or disabling dependencies of a package. For + instance, the Emacs package in Nixpkgs by default has a dependency on GTK+ 2. + If you want to build it against GTK+ 3, you can specify that as follows: -environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; + = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; + The function override performs the call to the Nix + function that produces Emacs, with the original arguments amended by the set + of arguments specified by you. So here the function argument + gtk gets the value pkgs.gtk3, causing + Emacs to depend on GTK+ 3. (The parentheses are necessary because in Nix, + function application binds more weakly than list construction, so without + them, would be a list with + two elements.) + -The function override performs the call to the Nix -function that produces Emacs, with the original arguments amended by -the set of arguments specified by you. So here the function argument -gtk gets the value pkgs.gtk3, -causing Emacs to depend on GTK+ 3. (The parentheses are necessary -because in Nix, function application binds more weakly than list -construction, so without them, -environment.systemPackages would be a list with two -elements.) - -Even greater customisation is possible using the function -overrideAttrs. While the -override mechanism above overrides the arguments of -a package function, overrideAttrs allows -changing the attributes passed to mkDerivation. -This permits changing any aspect of the package, such as the source code. -For instance, if you want to override the source code of Emacs, you -can say: - + + Even greater customisation is possible using the function + overrideAttrs. While the override + mechanism above overrides the arguments of a package function, + overrideAttrs allows changing the + attributes passed to mkDerivation. + This permits changing any aspect of the package, such as the source code. For + instance, if you want to override the source code of Emacs, you can say: -environment.systemPackages = [ + = [ (pkgs.emacs.overrideAttrs (oldAttrs: { name = "emacs-25.0-pre"; src = /path/to/my/emacs/tree; })) ]; + Here, overrideAttrs takes the Nix derivation specified by + pkgs.emacs and produces a new derivation in which the + original’s name and src attribute + have been replaced by the given values by re-calling + stdenv.mkDerivation. The original attributes are + accessible via the function argument, which is conventionally named + oldAttrs. + -Here, overrideAttrs takes the Nix derivation -specified by pkgs.emacs and produces a new -derivation in which the original’s name and -src attribute have been replaced by the given -values by re-calling stdenv.mkDerivation. -The original attributes are accessible via the function argument, -which is conventionally named oldAttrs. - -The overrides shown above are not global. They do not affect -the original package; other packages in Nixpkgs continue to depend on -the original rather than the customised package. This means that if -another package in your system depends on the original package, you -end up with two instances of the package. If you want to have -everything depend on your customised instance, you can apply a -global override as follows: - + + The overrides shown above are not global. They do not affect the original + package; other packages in Nixpkgs continue to depend on the original rather + than the customised package. This means that if another package in your + system depends on the original package, you end up with two instances of the + package. If you want to have everything depend on your customised instance, + you can apply a global override as follows: nixpkgs.config.packageOverrides = pkgs: { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; }; - -The effect of this definition is essentially equivalent to modifying -the emacs attribute in the Nixpkgs source tree. -Any package in Nixpkgs that depends on emacs will -be passed your customised instance. (However, the value -pkgs.emacs in -nixpkgs.config.packageOverrides refers to the -original rather than overridden instance, to prevent an infinite -recursion.) - + The effect of this definition is essentially equivalent to modifying the + emacs attribute in the Nixpkgs source tree. Any package in + Nixpkgs that depends on emacs will be passed your + customised instance. (However, the value pkgs.emacs in + nixpkgs.config.packageOverrides refers to the original + rather than overridden instance, to prevent an infinite recursion.) + diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml index dc2fa715097c3359db877742e466414247266051..be9884fe9dce14bcc6ff6889c96f888283762241 100644 --- a/nixos/doc/manual/configuration/declarative-packages.xml +++ b/nixos/doc/manual/configuration/declarative-packages.xml @@ -3,41 +3,41 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-declarative-package-mgmt"> - -Declarative Package Management - -With declarative package management, you specify which packages -you want on your system by setting the option -. For instance, adding the -following line to configuration.nix enables the -Mozilla Thunderbird email application: - + Declarative Package Management + + + With declarative package management, you specify which packages you want on + your system by setting the option + . For instance, adding the + following line to configuration.nix enables the Mozilla + Thunderbird email application: -environment.systemPackages = [ pkgs.thunderbird ]; + = [ pkgs.thunderbird ]; + The effect of this specification is that the Thunderbird package from Nixpkgs + will be built or downloaded as part of the system when you run + nixos-rebuild switch. + -The effect of this specification is that the Thunderbird package from -Nixpkgs will be built or downloaded as part of the system when you run -nixos-rebuild switch. - -You can get a list of the available packages as follows: + + You can get a list of the available packages as follows: $ nix-env -qaP '*' --description nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded ... + The first column in the output is the attribute name, + such as nixos.thunderbird. (The nixos + prefix allows distinguishing between different channels that you might have.) + -The first column in the output is the attribute -name, such as -nixos.thunderbird. (The -nixos prefix allows distinguishing between -different channels that you might have.) - -To “uninstall” a package, simply remove it from - and run -nixos-rebuild switch. + + To “uninstall” a package, simply remove it from + and run + nixos-rebuild switch. + - - + + diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml index ae3d124cd6bbe11d91920a0a79c8e13c8d161f70..e4c03de71b72feda6ccc74b7eae7a00f23517c7b 100644 --- a/nixos/doc/manual/configuration/file-systems.xml +++ b/nixos/doc/manual/configuration/file-systems.xml @@ -3,44 +3,44 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-file-systems"> - -File Systems - -You can define file systems using the - configuration option. For instance, the -following definition causes NixOS to mount the Ext4 file system on -device /dev/disk/by-label/data onto the mount -point /data: - + File Systems + + You can define file systems using the + configuration option. For instance, the following definition causes NixOS to + mount the Ext4 file system on device + /dev/disk/by-label/data onto the mount point + /data: -fileSystems."/data" = +."/data" = { device = "/dev/disk/by-label/data"; fsType = "ext4"; }; - -Mount points are created automatically if they don’t already exist. -For , it’s best to use the topology-independent -device aliases in /dev/disk/by-label and -/dev/disk/by-uuid, as these don’t change if the -topology changes (e.g. if a disk is moved to another IDE -controller). - -You can usually omit the file system type -(), since mount can usually -detect the type and load the necessary kernel module automatically. -However, if the file system is needed at early boot (in the initial -ramdisk) and is not ext2, ext3 -or ext4, then it’s best to specify - to ensure that the kernel module is -available. - -System startup will fail if any of the filesystems fails to mount, -dropping you to the emergency shell. -You can make a mount asynchronous and non-critical by adding -options = [ "nofail" ];. - - - - + Mount points are created automatically if they don’t already exist. For + , + it’s best to use the topology-independent device aliases in + /dev/disk/by-label and + /dev/disk/by-uuid, as these don’t change if the + topology changes (e.g. if a disk is moved to another IDE controller). + + + You can usually omit the file system type + (), + since mount can usually detect the type and load the + necessary kernel module automatically. However, if the file system is needed + at early boot (in the initial ramdisk) and is not ext2, + ext3 or ext4, then it’s best to + specify to ensure that the kernel module is + available. + + + + System startup will fail if any of the filesystems fails to mount, dropping + you to the emergency shell. You can make a mount asynchronous and + non-critical by adding + options = [ + "nofail" ];. + + + diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml index 75cccef95b38f06af0667772bcdd1c4b2c1b4c93..b66adcedce6e888ce613ede9e4db7f9a03fa85cd 100644 --- a/nixos/doc/manual/configuration/firewall.xml +++ b/nixos/doc/manual/configuration/firewall.xml @@ -3,49 +3,44 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-firewall"> + Firewall -Firewall - -NixOS has a simple stateful firewall that blocks incoming -connections and other unexpected packets. The firewall applies to -both IPv4 and IPv6 traffic. It is enabled by default. It can be -disabled as follows: - + + NixOS has a simple stateful firewall that blocks incoming connections and + other unexpected packets. The firewall applies to both IPv4 and IPv6 traffic. + It is enabled by default. It can be disabled as follows: -networking.firewall.enable = false; + = false; - -If the firewall is enabled, you can open specific TCP ports to the -outside world: - + If the firewall is enabled, you can open specific TCP ports to the outside + world: -networking.firewall.allowedTCPPorts = [ 80 443 ]; + = [ 80 443 ]; - -Note that TCP port 22 (ssh) is opened automatically if the SSH daemon -is enabled (). UDP -ports can be opened through -. - -To open ranges of TCP ports: - + Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is + enabled (). UDP ports can be opened through + . + + + + To open ranges of TCP ports: -networking.firewall.allowedTCPPortRanges = [ + = [ { from = 4000; to = 4007; } { from = 8000; to = 8010; } ]; + Similarly, UDP port ranges can be opened through + . + -Similarly, UDP port ranges can be opened through -. - -Also of interest is - + + Also of interest is -networking.firewall.allowPing = true; + = true; - -to allow the machine to respond to ping requests. (ICMPv6 pings are -always allowed.) - + to allow the machine to respond to ping requests. (ICMPv6 pings are always + allowed.) + diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index 68238b547d60fb79eb3ff704af62ddedb23c9fb3..71ddf41491bafcfb34b288ab756862d579ebc1f9 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -3,42 +3,41 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-ipv4"> + IPv4 Configuration -IPv4 Configuration - -By default, NixOS uses DHCP (specifically, -dhcpcd) to automatically configure network -interfaces. However, you can configure an interface manually as -follows: - + + By default, NixOS uses DHCP (specifically, dhcpcd) to + automatically configure network interfaces. However, you can configure an + interface manually as follows: -networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; +networking.interfaces.eth0.ipv4.addresses = [ { + address = "192.168.1.2"; + prefixLength = 24; +} ]; - -Typically you’ll also want to set a default gateway and set of name -servers: - + Typically you’ll also want to set a default gateway and set of name + servers: -networking.defaultGateway = "192.168.1.1"; -networking.nameservers = [ "8.8.8.8" ]; + = "192.168.1.1"; + = [ "8.8.8.8" ]; - - - -Statically configured interfaces are set up by the systemd -service -interface-name-cfg.service. -The default gateway and name server configuration is performed by -network-setup.service. - -The host name is set using : - + + + + + Statically configured interfaces are set up by the systemd service + interface-name-cfg.service. + The default gateway and name server configuration is performed by + network-setup.service. + + + + + The host name is set using : -networking.hostName = "cartman"; + = "cartman"; - -The default host name is nixos. Set it to the -empty string ("") to allow the DHCP server to -provide the host name. - + The default host name is nixos. Set it to the empty string + ("") to allow the DHCP server to provide the host name. + diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index 74a21e18ec3fee57a8f1f5e9cd37304c45d41ab3..e9ab7cce4eb25ba38726c061a126a3bf63076769 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -3,44 +3,48 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-ipv6"> + IPv6 Configuration -IPv6 Configuration - -IPv6 is enabled by default. Stateless address autoconfiguration -is used to automatically assign IPv6 addresses to all interfaces. You -can disable IPv6 support globally by setting: - + + IPv6 is enabled by default. Stateless address autoconfiguration is used to + automatically assign IPv6 addresses to all interfaces. You can disable IPv6 + support globally by setting: -networking.enableIPv6 = false; - - -You can disable IPv6 on a single interface using a normal sysctl (in this -example, we use interface eth0): + = false; + + + + You can disable IPv6 on a single interface using a normal sysctl (in this + example, we use interface eth0): -boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; +."net.ipv6.conf.eth0.disable_ipv6" = true; - - -As with IPv4 networking interfaces are automatically configured via -DHCPv6. You can configure an interface manually: + + + As with IPv4 networking interfaces are automatically configured via DHCPv6. + You can configure an interface manually: -networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; +networking.interfaces.eth0.ipv6.addresses = [ { + address = "fe00:aa:bb:cc::2"; + prefixLength = 64; +} ]; - - -For configuring a gateway, optionally with explicitly specified interface: + + + For configuring a gateway, optionally with explicitly specified interface: -networking.defaultGateway6 = { + = { address = "fe00::1"; interface = "enp0s3"; } - - -See for similar examples and additional information. - + + + See for similar examples and additional + information. + diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index 52be26d6024a82593118edf5d676b57d83e52cac..f4d697c42dbd0b030dee92e66502c8e67e72901f 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -3,29 +3,29 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-kernel-config"> - -Linux Kernel - -You can override the Linux kernel and associated packages using -the option . For instance, this -selects the Linux 3.10 kernel: + Linux Kernel + + You can override the Linux kernel and associated packages using the option + . For instance, this selects the Linux + 3.10 kernel: -boot.kernelPackages = pkgs.linuxPackages_3_10; + = pkgs.linuxPackages_3_10; -Note that this not only replaces the kernel, but also packages that -are specific to the kernel version, such as the NVIDIA video drivers. -This ensures that driver packages are consistent with the -kernel. - -The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command: + Note that this not only replaces the kernel, but also packages that are + specific to the kernel version, such as the NVIDIA video drivers. This + ensures that driver packages are consistent with the kernel. + + + The default Linux kernel configuration should be fine for most users. You can + see the configuration of your current kernel with the following command: zcat /proc/config.gz -If you want to change the kernel configuration, you can use the - feature (see ). For instance, to enable -support for the kernel debugger KGDB: - + If you want to change the kernel configuration, you can use the + feature (see + ). For instance, to enable support + for the kernel debugger KGDB: nixpkgs.config.packageOverrides = pkgs: { linux_3_4 = pkgs.linux_3_4.override { @@ -36,47 +36,97 @@ nixpkgs.config.packageOverrides = pkgs: }; }; - -extraConfig takes a list of Linux kernel -configuration options, one per line. The name of the option should -not include the prefix CONFIG_. The option value -is typically y, n or -m (to build something as a kernel module). - -Kernel modules for hardware devices are generally loaded -automatically by udev. You can force a module to -be loaded via , e.g. + extraConfig takes a list of Linux kernel configuration + options, one per line. The name of the option should not include the prefix + CONFIG_. The option value is typically + y, n or m (to build + something as a kernel module). + + + Kernel modules for hardware devices are generally loaded automatically by + udev. You can force a module to be loaded via + , e.g. -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + = [ "fuse" "kvm-intel" "coretemp" ]; -If the module is required early during the boot (e.g. to mount the -root file system), you can use -: + If the module is required early during the boot (e.g. to mount the root file + system), you can use : -boot.initrd.extraKernelModules = [ "cifs" ]; + = [ "cifs" ]; -This causes the specified modules and their dependencies to be added -to the initial ramdisk. - -Kernel runtime parameters can be set through -, e.g. + This causes the specified modules and their dependencies to be added to the + initial ramdisk. + + + Kernel runtime parameters can be set through + , e.g. -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; +."net.ipv4.tcp_keepalive_time" = 120; -sets the kernel’s TCP keepalive time to 120 seconds. To see the -available parameters, run sysctl -a. + sets the kernel’s TCP keepalive time to 120 seconds. To see the available + parameters, run sysctl -a. + +
+ Customize your kernel -
- Developing kernel modules + + The first step before compiling the kernel is to generate an appropriate + .config configuration. Either you pass your own config via + the configfile setting of linuxManualConfig: + When developing kernel modules it's often convenient to run - edit-compile-run loop as quickly as possible. + configfile = /home/me/my_kernel_config; + allowImportFromDerivation = true; + }; + ]]> + +You can edit the config with this snippet (by default make menuconfig won't work + out of the box on nixos): + {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})' + ]]> - See below snippet as an example of developing mellanox - drivers. + + or you can let nixpkgs generate the configuration. + Nixpkgs generates it via answering the interactive kernel utility make config. + The answers depend on parameters passed to pkgs/os-specific/linux/kernel/generic.nix + (which you can influence by overriding extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig). + +
+
+ Developing kernel modules - + When developing kernel modules it's often convenient to run edit-compile-run + loop as quickly as possible. See below snippet as an example of developing + mellanox drivers. + + +' -A linuxPackages.kernel.dev $ nix-shell '' -A linuxPackages.kernel $ unpackPhase @@ -84,7 +134,5 @@ $ cd linux-* $ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules # insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko ]]> - -
- +
diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml index 00c795cd089840720fa4953f55a613e34702e66f..8a2b107e0ee8aa5c61d6624e53152f07731ca1a5 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/nixos/doc/manual/configuration/luks-file-systems.xml @@ -3,14 +3,13 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-luks-file-systems"> + LUKS-Encrypted File Systems -LUKS-Encrypted File Systems - -NixOS supports file systems that are encrypted using -LUKS (Linux Unified Key Setup). For example, -here is how you create an encrypted Ext4 file system on the device -/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: - + + NixOS supports file systems that are encrypted using + LUKS (Linux Unified Key Setup). For example, here is how + you create an encrypted Ext4 file system on the device + /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: # cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d @@ -27,20 +26,15 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** # mkfs.ext4 /dev/mapper/crypted - -To ensure that this file system is automatically mounted at boot time -as /, add the following to -configuration.nix: - + To ensure that this file system is automatically mounted at boot time as + /, add the following to + configuration.nix: -boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; -fileSystems."/".device = "/dev/mapper/crypted"; +boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; +."/".device = "/dev/mapper/crypted"; - -Should grub be used as bootloader, and /boot is located -on an encrypted partition, it is necessary to add the following grub option: -boot.loader.grub.enableCryptodisk = true; - - - + Should grub be used as bootloader, and /boot is located + on an encrypted partition, it is necessary to add the following grub option: + = true; + diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 5420c7f88385331f66d9fea75b15fdd3b45ef3b3..3ff96f719ec57f70004103c2f2925c058d11edff 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -3,101 +3,95 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-modularity"> - -Modularity - -The NixOS configuration mechanism is modular. If your -configuration.nix becomes too big, you can split -it into multiple files. Likewise, if you have multiple NixOS -configurations (e.g. for different computers) with some commonality, -you can move the common configuration into a shared file. - -Modules have exactly the same syntax as -configuration.nix. In fact, -configuration.nix is itself a module. You can -use other modules by including them from -configuration.nix, e.g.: - + Modularity + + + The NixOS configuration mechanism is modular. If your + configuration.nix becomes too big, you can split it into + multiple files. Likewise, if you have multiple NixOS configurations (e.g. for + different computers) with some commonality, you can move the common + configuration into a shared file. + + + + Modules have exactly the same syntax as + configuration.nix. In fact, + configuration.nix is itself a module. You can use other + modules by including them from configuration.nix, e.g.: { config, pkgs, ... }: { imports = [ ./vpn.nix ./kde.nix ]; - services.httpd.enable = true; - environment.systemPackages = [ pkgs.emacs ]; + = true; + = [ pkgs.emacs ]; ... } - -Here, we include two modules from the same directory, -vpn.nix and kde.nix. The -latter might look like this: - + Here, we include two modules from the same directory, + vpn.nix and kde.nix. The latter + might look like this: { config, pkgs, ... }: -{ services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; +{ = true; + = true; + = true; } - -Note that both configuration.nix and -kde.nix define the option -. When multiple modules -define an option, NixOS will try to merge the -definitions. In the case of -, that’s easy: the lists of -packages can simply be concatenated. The value in -configuration.nix is merged last, so for -list-type options, it will appear at the end of the merged list. If -you want it to appear first, you can use mkBefore: - + Note that both configuration.nix and + kde.nix define the option + . When multiple modules + define an option, NixOS will try to merge the + definitions. In the case of , + that’s easy: the lists of packages can simply be concatenated. The value in + configuration.nix is merged last, so for list-type + options, it will appear at the end of the merged list. If you want it to + appear first, you can use mkBefore: -boot.kernelModules = mkBefore [ "kvm-intel" ]; + = mkBefore [ "kvm-intel" ]; - -This causes the kvm-intel kernel module to be -loaded before any other kernel modules. - -For other types of options, a merge may not be possible. For -instance, if two modules define -, -nixos-rebuild will give an error: - + This causes the kvm-intel kernel module to be loaded + before any other kernel modules. + + + + For other types of options, a merge may not be possible. For instance, if two + modules define , + nixos-rebuild will give an error: The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'. - -When that happens, it’s possible to force one definition take -precedence over the others: - + When that happens, it’s possible to force one definition take precedence + over the others: -services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; + = pkgs.lib.mkForce "bob@example.org"; - - - -When using multiple modules, you may need to access -configuration values defined in other modules. This is what the -config function argument is for: it contains the -complete, merged system configuration. That is, -config is the result of combining the -configurations returned by every moduleIf you’re -wondering how it’s possible that the (indirect) -result of a function is passed as an -input to that same function: that’s because Nix -is a “lazy” language — it only computes values when they are needed. -This works as long as no individual configuration value depends on -itself.. For example, here is a module that adds -some packages to only if - is set to -true somewhere else: - + + + + When using multiple modules, you may need to access configuration values + defined in other modules. This is what the config function + argument is for: it contains the complete, merged system configuration. That + is, config is the result of combining the configurations + returned by every module + + + If you’re wondering how it’s possible that the (indirect) + result of a function is passed as an + input to that same function: that’s because Nix is a + “lazy” language — it only computes values when they are needed. This + works as long as no individual configuration value depends on itself. + + + . For example, here is a module that adds some packages to + only if + is set to + true somewhere else: { config, pkgs, ... }: -{ environment.systemPackages = - if config.services.xserver.enable then +{ = + if config. then [ pkgs.firefox pkgs.thunderbird ] @@ -105,38 +99,32 @@ some packages to only if [ ]; } + - - -With multiple modules, it may not be obvious what the final -value of a configuration option is. The command - allows you to find out: - + + With multiple modules, it may not be obvious what the final value of a + configuration option is. The command allows you + to find out: -$ nixos-option services.xserver.enable +$ nixos-option true -$ nixos-option boot.kernelModules +$ nixos-option [ "tun" "ipv6" "loop" ... ] - -Interactive exploration of the configuration is possible using -nix-repl, -a read-eval-print loop for Nix expressions. It’s not installed by -default; run nix-env -i nix-repl to get it. A -typical use: - + a read-eval-print loop for Nix expressions. It’s not installed by default; + run nix-env -i nix-repl to get it. A typical use: $ nix-repl '<nixpkgs/nixos>' -nix-repl> config.networking.hostName +nix-repl> config. "mandark" -nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts +nix-repl> map (x: x.hostName) config. [ "example.org" "example.gov" ] - - - + diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index b4808e74ff9dfce91ff68998d867d82aa5e642ef..d103ee24978390131729ad7270c2f1c879aa72cd 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -3,39 +3,42 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-networkmanager"> + NetworkManager -NetworkManager - -To facilitate network configuration, some desktop environments -use NetworkManager. You can enable NetworkManager by setting: - + + To facilitate network configuration, some desktop environments use + NetworkManager. You can enable NetworkManager by setting: -networking.networkmanager.enable = true; + = true; + some desktop managers (e.g., GNOME) enable NetworkManager automatically for + you. + -some desktop managers (e.g., GNOME) enable NetworkManager -automatically for you. - -All users that should have permission to change network settings must -belong to the networkmanager group: - + + All users that should have permission to change network settings must belong + to the networkmanager group: -users.extraUsers.youruser.extraGroups = [ "networkmanager" ]; +users.users.alice.extraGroups = [ "networkmanager" ]; - - -NetworkManager is controlled using either nmcli or -nmtui (curses-based terminal user interface). See their -manual pages for details on their usage. Some desktop environments (GNOME, KDE) -have their own configuration tools for NetworkManager. On XFCE, there is no -configuration tool for NetworkManager by default: by adding -networkmanagerapplet to the list of system packages, the graphical -applet will be installed and will launch automatically when XFCE is starting -(and will show in the status tray). - -networking.networkmanager and -networking.wireless (WPA Supplicant) cannot be enabled at the same -time: you can still connect to the wireless networks using -NetworkManager. - + + + + NetworkManager is controlled using either nmcli or + nmtui (curses-based terminal user interface). See their + manual pages for details on their usage. Some desktop environments (GNOME, + KDE) have their own configuration tools for NetworkManager. On XFCE, there is + no configuration tool for NetworkManager by default: by adding + networkmanagerapplet to the list of system packages, the + graphical applet will be installed and will launch automatically when XFCE is + starting (and will show in the status tray). + + + + + networking.networkmanager and networking.wireless + (WPA Supplicant) cannot be enabled at the same time: you can still connect + to the wireless networks using NetworkManager. + + diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml index 5f08bc1f12756e20c6d8215f25634cbb6cf1be0e..02cf811e0bd3d77dfd93eb977444ffbc16e8ec42 100644 --- a/nixos/doc/manual/configuration/networking.xml +++ b/nixos/doc/manual/configuration/networking.xml @@ -3,20 +3,17 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-networking"> - -Networking - -This section describes how to configure networking components on -your NixOS machine. - - - - - - - - - + Networking + + This section describes how to configure networking components on your NixOS + machine. + + + + + + + + - diff --git a/nixos/doc/manual/configuration/package-mgmt.xml b/nixos/doc/manual/configuration/package-mgmt.xml index 73c1722da02c6c252976f0fe1626e6717652dfcf..e8ac5d0681a91b13e1f3261727e2bde0cbd1ef76 100644 --- a/nixos/doc/manual/configuration/package-mgmt.xml +++ b/nixos/doc/manual/configuration/package-mgmt.xml @@ -3,32 +3,29 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-package-management"> - -Package Management - -This section describes how to add additional packages to your -system. NixOS has two distinct styles of package management: - - - - Declarative, where you declare - what packages you want in your - configuration.nix. Every time you run - nixos-rebuild, NixOS will ensure that you get a - consistent set of binaries corresponding to your - specification. - - Ad hoc, where you install, - upgrade and uninstall packages via the nix-env - command. This style allows mixing packages from different Nixpkgs - versions. It’s the only choice for non-root - users. - - - - - - - - + Package Management + + This section describes how to add additional packages to your system. NixOS + has two distinct styles of package management: + + + + Declarative, where you declare what packages you want + in your configuration.nix. Every time you run + nixos-rebuild, NixOS will ensure that you get a + consistent set of binaries corresponding to your specification. + + + + + Ad hoc, where you install, upgrade and uninstall + packages via the nix-env command. This style allows + mixing packages from different Nixpkgs versions. It’s the only choice + for non-root users. + + + + + + diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml index 7c928baaf896c20590786b94eeedc3a09a67c448..a4af1b96583d8b18cc8918a20f93bd40b70ffe3c 100644 --- a/nixos/doc/manual/configuration/ssh.xml +++ b/nixos/doc/manual/configuration/ssh.xml @@ -3,30 +3,25 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-ssh"> + Secure Shell Access -Secure Shell Access - -Secure shell (SSH) access to your machine can be enabled by -setting: - + + Secure shell (SSH) access to your machine can be enabled by setting: -services.openssh.enable = true; + = true; - -By default, root logins using a password are disallowed. They can be -disabled entirely by setting -services.openssh.permitRootLogin to -"no". - -You can declaratively specify authorised RSA/DSA public keys for -a user as follows: - + By default, root logins using a password are disallowed. They can be disabled + entirely by setting to + "no". + + + + You can declaratively specify authorised RSA/DSA public keys for a user as + follows: -users.extraUsers.alice.openssh.authorizedKeys.keys = +users.users.alice.openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; - - - + diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml index be1f2263149e47edc3f7dc537fe2782f0a103012..ea980254a8fc4d47bae7d2046afce6840b64544b 100644 --- a/nixos/doc/manual/configuration/summary.xml +++ b/nixos/doc/manual/configuration/summary.xml @@ -3,190 +3,225 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-nix-syntax-summary"> + Syntax Summary -Syntax Summary - -Below is a summary of the most important syntactic constructs in -the Nix expression language. It’s not complete. In particular, there -are many other built-in functions. See the + Below is a summary of the most important syntactic constructs in the Nix + expression language. It’s not complete. In particular, there are many other + built-in functions. See the + Nix -manual for the rest. + manual for the rest. + - + - - - - - Example - Description - - - - - - Basic values - - - "Hello world" - A string - - - "${pkgs.bash}/bin/sh" - A string containing an expression (expands to "/nix/store/hash-bash-version/bin/sh") - - - true, false - Booleans - - - 123 - An integer - - - ./foo.png - A path (relative to the containing Nix expression) - - - - Compound values - - - { x = 1; y = 2; } - An set with attributes names x and y - - - { foo.bar = 1; } - A nested set, equivalent to { foo = { bar = 1; }; } - - - rec { x = "foo"; y = x + "bar"; } - A recursive set, equivalent to { x = "foo"; y = "foobar"; } - - - [ "foo" "bar" ] - A list with two elements - - - - Operators - - - "foo" + "bar" - String concatenation - - - 1 + 2 - Integer addition - - - "foo" == "f" + "oo" - Equality test (evaluates to true) - - - "foo" != "bar" - Inequality test (evaluates to true) - - - !true - Boolean negation - - - { x = 1; y = 2; }.x - Attribute selection (evaluates to 1) - - - { x = 1; y = 2; }.z or 3 - Attribute selection with default (evaluates to 3) - - - { x = 1; y = 2; } // { z = 3; } - Merge two sets (attributes in the right-hand set taking precedence) - - - - Control structures - - - if 1 + 1 == 2 then "yes!" else "no!" - Conditional expression - - - assert 1 + 1 == 2; "yes!" - Assertion check (evaluates to "yes!"). See + + + + Example + Description + + + + + Basic values + + + + "Hello world" + + A string + + + "${pkgs.bash}/bin/sh" + + A string containing an expression (expands to "/nix/store/hash-bash-version/bin/sh") + + + true, false + + Booleans + + + 123 + + An integer + + + ./foo.png + + A path (relative to the containing Nix expression) + + + Compound values + + + + { x = 1; y = 2; } + + A set with attributes named x and y + + + + { foo.bar = 1; } + + A nested set, equivalent to { foo = { bar = 1; }; } + + + + rec { x = "foo"; y = x + "bar"; } + + A recursive set, equivalent to { x = "foo"; y = "foobar"; } + + + + [ "foo" "bar" ] + + A list with two elements + + + Operators + + + + "foo" + "bar" + + String concatenation + + + 1 + 2 + + Integer addition + + + "foo" == "f" + "oo" + + Equality test (evaluates to true) + + + "foo" != "bar" + + Inequality test (evaluates to true) + + + !true + + Boolean negation + + + { x = 1; y = 2; }.x + + Attribute selection (evaluates to 1) + + + { x = 1; y = 2; }.z or 3 + + Attribute selection with default (evaluates to 3) + + + { x = 1; y = 2; } // { z = 3; } + + Merge two sets (attributes in the right-hand set taking precedence) + + + Control structures + + + + if 1 + 1 == 2 then "yes!" else "no!" + + Conditional expression + + + assert 1 + 1 == 2; "yes!" + + Assertion check (evaluates to "yes!"). See for using assertions in modules - - - let x = "foo"; y = "bar"; in x + y - Variable definition - - - with pkgs.lib; head [ 1 2 3 ] - Add all attributes from the given set to the scope + + + let x = "foo"; y = "bar"; in x + y + + Variable definition + + + with pkgs.lib; head [ 1 2 3 ] + + Add all attributes from the given set to the scope (evaluates to 1) - - - - Functions (lambdas) - - - x: x + 1 - A function that expects an integer and returns it increased by 1 - - - (x: x + 1) 100 - A function call (evaluates to 101) - - - let inc = x: x + 1; in inc (inc (inc 100)) - A function bound to a variable and subsequently called by name (evaluates to 103) - - - { x, y }: x + y - A function that expects a set with required attributes + + + Functions (lambdas) + + + + x: x + 1 + + A function that expects an integer and returns it increased by 1 + + + (x: x + 1) 100 + + A function call (evaluates to 101) + + + let inc = x: x + 1; in inc (inc (inc 100)) + + A function bound to a variable and subsequently called by name (evaluates to 103) + + + { x, y }: x + y + + A function that expects a set with required attributes x and y and concatenates them - - - { x, y ? "bar" }: x + y - A function that expects a set with required attribute + + + { x, y ? "bar" }: x + y + + A function that expects a set with required attribute x and optional y, using "bar" as default value for - y - - - { x, y, ... }: x + y - A function that expects a set with required attributes + y + + + + { x, y, ... }: x + y + + A function that expects a set with required attributes x and y and ignores any other attributes - - - { x, y } @ args: x + y - A function that expects a set with required attributes + + + { x, y } @ args: x + y + + A function that expects a set with required attributes x and y, and binds the - whole set to args - - - - Built-in functions - - - import ./foo.nix - Load and return Nix expression in given file - - - map (x: x + x) [ 1 2 3 ] - Apply a function to every element of a list (evaluates to [ 2 4 6 ]) - - - - + - - + diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index c6656edff6c8f5ffee70efd61089ded8b66ba20b..66c1c6eb3a115f4369a917c8dd0e637069152a97 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -3,98 +3,86 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-user-management"> - -User Management - -NixOS supports both declarative and imperative styles of user -management. In the declarative style, users are specified in -configuration.nix. For instance, the following -states that a user account named alice shall exist: - + User Management + + NixOS supports both declarative and imperative styles of user management. In + the declarative style, users are specified in + configuration.nix. For instance, the following states + that a user account named alice shall exist: -users.users.alice = - { isNormalUser = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; - }; +.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; +}; - -Note that alice is a member of the -wheel and networkmanager groups, -which allows her to use sudo to execute commands as -root and to configure the network, respectively. -Also note the SSH public key that allows remote logins with the -corresponding private key. Users created in this way do not have a -password by default, so they cannot log in via mechanisms that require -a password. However, you can use the passwd program -to set a password, which is retained across invocations of -nixos-rebuild. - -If you set users.mutableUsers to false, then the contents of /etc/passwd -and /etc/group will be congruent to your NixOS configuration. For instance, -if you remove a user from users.users and run nixos-rebuild, the user -account will cease to exist. Also, imperative commands for managing users -and groups, such as useradd, are no longer available. Passwords may still be -assigned by setting the user's hashedPassword option. A -hashed password can be generated using mkpasswd -m sha-512 -after installing the mkpasswd package. - -A user ID (uid) is assigned automatically. You can also specify -a uid manually by adding - + Note that alice is a member of the + wheel and networkmanager groups, which + allows her to use sudo to execute commands as + root and to configure the network, respectively. Also note + the SSH public key that allows remote logins with the corresponding private + key. Users created in this way do not have a password by default, so they + cannot log in via mechanisms that require a password. However, you can use + the passwd program to set a password, which is retained + across invocations of nixos-rebuild. + + + If you set to false, then the + contents of /etc/passwd and /etc/group + will be congruent to your NixOS configuration. For instance, if you remove a + user from and run nixos-rebuild, the user + account will cease to exist. Also, imperative commands for managing users and + groups, such as useradd, are no longer available. Passwords may still be + assigned by setting the user's + hashedPassword + option. A hashed password can be generated using mkpasswd -m + sha-512 after installing the mkpasswd package. + + + A user ID (uid) is assigned automatically. You can also specify a uid + manually by adding uid = 1000; - -to the user specification. - -Groups can be specified similarly. The following states that a -group named students shall exist: - + to the user specification. + + + Groups can be specified similarly. The following states that a group named + students shall exist: -users.groups.students.gid = 1000; +.students.gid = 1000; - -As with users, the group ID (gid) is optional and will be assigned -automatically if it’s missing. - -In the imperative style, users and groups are managed by -commands such as useradd, -groupmod and so on. For instance, to create a user -account named alice: - + As with users, the group ID (gid) is optional and will be assigned + automatically if it’s missing. + + + In the imperative style, users and groups are managed by commands such as + useradd, groupmod and so on. For + instance, to create a user account named alice: # useradd -m alice - -To make all nix tools available to this new user use `su - USER` which -opens a login shell (==shell that loads the profile) for given user. -This will create the ~/.nix-defexpr symlink. So run: - + To make all nix tools available to this new user use `su - USER` which opens + a login shell (==shell that loads the profile) for given user. This will + create the ~/.nix-defexpr symlink. So run: # su - alice -c "true" - - -The flag causes the creation of a home directory -for the new user, which is generally what you want. The user does not -have an initial password and therefore cannot log in. A password can -be set using the passwd utility: - + The flag causes the creation of a home directory for the + new user, which is generally what you want. The user does not have an initial + password and therefore cannot log in. A password can be set using the + passwd utility: # passwd alice Enter new UNIX password: *** Retype new UNIX password: *** - -A user can be deleted using userdel: - + A user can be deleted using userdel: # userdel -r alice - -The flag deletes the user’s home directory. -Accounts can be modified using usermod. Unix -groups can be managed using groupadd, -groupmod and groupdel. - + The flag deletes the user’s home directory. Accounts + can be modified using usermod. Unix groups can be managed + using groupadd, groupmod and + groupdel. + diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml index 1868380dcbfad31ab5f88ffe0ac5dd354da8e43d..999447234ad1f276f24c092b1969a6f02c3de411 100644 --- a/nixos/doc/manual/configuration/wireless.xml +++ b/nixos/doc/manual/configuration/wireless.xml @@ -3,51 +3,43 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-wireless"> + Wireless Networks -Wireless Networks - -For a desktop installation using NetworkManager (e.g., GNOME), -you just have to make sure the user is in the -networkmanager group and you can skip the rest of this -section on wireless networks. - - -NixOS will start wpa_supplicant for you if you enable this setting: + + For a desktop installation using NetworkManager (e.g., GNOME), you just have + to make sure the user is in the networkmanager group and you can + skip the rest of this section on wireless networks. + + + NixOS will start wpa_supplicant for you if you enable this setting: -networking.wireless.enable = true; + = true; - -NixOS lets you specify networks for wpa_supplicant declaratively: + NixOS lets you specify networks for wpa_supplicant declaratively: -networking.wireless.networks = { + = { echelon = { psk = "abcdefgh"; }; "free.wifi" = {}; } - -Be aware that keys will be written to the nix store in plaintext! - -When no networks are set, it will default to using a configuration file at -/etc/wpa_supplicant.conf. You should edit this file -yourself to define wireless networks, WPA keys and so on (see -wpa_supplicant.conf(5)). - - - -If you are using WPA2 the wpa_passphrase tool might be useful -to generate the wpa_supplicant.conf. - + Be aware that keys will be written to the nix store in plaintext! When no + networks are set, it will default to using a configuration file at + /etc/wpa_supplicant.conf. You should edit this file + yourself to define wireless networks, WPA keys and so on (see + wpa_supplicant.conf(5)). + + + + If you are using WPA2 the wpa_passphrase tool might be + useful to generate the wpa_supplicant.conf. # wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf - -After you have edited the wpa_supplicant.conf, -you need to restart the wpa_supplicant service. - + After you have edited the wpa_supplicant.conf, you need to + restart the wpa_supplicant service. # systemctl restart wpa_supplicant.service - - + diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 9c2c59006f15d04453c352b8052e6802f22df60a..948b35209b7902a39c433e9bf065216d44d57bfb 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -3,138 +3,134 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-x11"> - -X Window System - -The X Window System (X11) provides the basis of NixOS’ graphical -user interface. It can be enabled as follows: + X Window System + + The X Window System (X11) provides the basis of NixOS’ graphical user + interface. It can be enabled as follows: -services.xserver.enable = true; + = true; -The X server will automatically detect and use the appropriate video -driver from a set of X.org drivers (such as vesa -and intel). You can also specify a driver -manually, e.g. + The X server will automatically detect and use the appropriate video driver + from a set of X.org drivers (such as vesa and + intel). You can also specify a driver manually, e.g. -services.xserver.videoDrivers = [ "r128" ]; + = [ "r128" ]; -to enable X.org’s xf86-video-r128 driver. - -You also need to enable at least one desktop or window manager. -Otherwise, you can only log into a plain undecorated -xterm window. Thus you should pick one or more of -the following lines: + to enable X.org’s xf86-video-r128 driver. + + + You also need to enable at least one desktop or window manager. Otherwise, + you can only log into a plain undecorated xterm window. + Thus you should pick one or more of the following lines: -services.xserver.desktopManager.plasma5.enable = true; -services.xserver.desktopManager.xfce.enable = true; -services.xserver.desktopManager.gnome3.enable = true; -services.xserver.windowManager.xmonad.enable = true; -services.xserver.windowManager.twm.enable = true; -services.xserver.windowManager.icewm.enable = true; -services.xserver.windowManager.i3.enable = true; + = true; + = true; + = true; + = true; + = true; + = true; + = true; + = true; - - -NixOS’s default display manager (the -program that provides a graphical login prompt and manages the X -server) is SLiM. You can select an alternative one by picking one -of the following lines: + + + NixOS’s default display manager (the program that + provides a graphical login prompt and manages the X server) is SLiM. You can + select an alternative one by picking one of the following lines: -services.xserver.displayManager.sddm.enable = true; -services.xserver.displayManager.lightdm.enable = true; + = true; + = true; - - -You can set the keyboard layout (and optionally the layout variant): + + + You can set the keyboard layout (and optionally the layout variant): -services.xserver.layout = "de"; -services.xserver.xkbVariant = "neo"; + = "de"; + = "neo"; - - -The X server is started automatically at boot time. If you -don’t want this to happen, you can set: + + + The X server is started automatically at boot time. If you don’t want this + to happen, you can set: -services.xserver.autorun = false; + = false; -The X server can then be started manually: + The X server can then be started manually: # systemctl start display-manager.service - - - -NVIDIA Graphics Cards - -NVIDIA provides a proprietary driver for its graphics cards that -has better 3D performance than the X.org drivers. It is not enabled -by default because it’s not free software. You can enable it as follows: + + + NVIDIA Graphics Cards + + NVIDIA provides a proprietary driver for its graphics cards that has better + 3D performance than the X.org drivers. It is not enabled by default because + it’s not free software. You can enable it as follows: -services.xserver.videoDrivers = [ "nvidia" ]; + = [ "nvidia" ]; -Or if you have an older card, you may have to use one of the legacy drivers: + Or if you have an older card, you may have to use one of the legacy drivers: -services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; -services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; -services.xserver.videoDrivers = [ "nvidiaLegacy173" ]; + = [ "nvidiaLegacy340" ]; + = [ "nvidiaLegacy304" ]; + = [ "nvidiaLegacy173" ]; -You may need to reboot after enabling this driver to prevent a clash -with other kernel modules. - -On 64-bit systems, if you want full acceleration for 32-bit -programs such as Wine, you should also set the following: + You may need to reboot after enabling this driver to prevent a clash with + other kernel modules. + + + On 64-bit systems, if you want full acceleration for 32-bit programs such as + Wine, you should also set the following: -hardware.opengl.driSupport32Bit = true; + = true; - - - - -AMD Graphics Cards - -AMD provides a proprietary driver for its graphics cards that -has better 3D performance than the X.org drivers. It is not enabled -by default because it’s not free software. You can enable it as follows: + + + + AMD Graphics Cards + + AMD provides a proprietary driver for its graphics cards that has better 3D + performance than the X.org drivers. It is not enabled by default because + it’s not free software. You can enable it as follows: -services.xserver.videoDrivers = [ "ati_unfree" ]; + = [ "ati_unfree" ]; -You will need to reboot after enabling this driver to prevent a clash -with other kernel modules. - -On 64-bit systems, if you want full acceleration for 32-bit -programs such as Wine, you should also set the following: + You will need to reboot after enabling this driver to prevent a clash with + other kernel modules. + + + On 64-bit systems, if you want full acceleration for 32-bit programs such as + Wine, you should also set the following: -hardware.opengl.driSupport32Bit = true; + = true; - - - - -Touchpads - -Support for Synaptics touchpads (found in many laptops such as -the Dell Latitude series) can be enabled as follows: + + + + Touchpads + + Support for Synaptics touchpads (found in many laptops such as the Dell + Latitude series) can be enabled as follows: -services.xserver.libinput.enable = true; + = true; -The driver has many options (see ). For -instance, the following disables tap-to-click behavior: + The driver has many options (see ). For + instance, the following disables tap-to-click behavior: -services.xserver.libinput.tapping = false; + = false; -Note: the use of services.xserver.synaptics is deprecated since NixOS 17.09. - - - - -GTK/Qt themes - -GTK themes can be installed either to user profile or system-wide (via -environment.systemPackages). To make Qt 5 applications look similar -to GTK2 ones, you can install qt5.qtbase.gtk package into your -system environment. It should work for all Qt 5 library versions. - - - - + Note: the use of services.xserver.synaptics is deprecated + since NixOS 17.09. + + + + GTK/Qt themes + + GTK themes can be installed either to user profile or system-wide (via + environment.systemPackages). To make Qt 5 applications + look similar to GTK2 ones, you can install qt5.qtbase.gtk + package into your system environment. It should work for all Qt 5 library + versions. + + diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 18804d2c08bed85d4c9716f258493a0d55fffb71..40e61d2bd691ff360ad2767e46a3ebe3e4d4c677 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -3,92 +3,70 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-xfce"> - - Xfce Desktop Environment - - - To enable the Xfce Desktop Environment, set - -services.xserver.desktopManager = { - xfce.enable = true; - default = "xfce"; + Xfce Desktop Environment + + To enable the Xfce Desktop Environment, set + +services.xserver.desktopManager = { + xfce.enable = true; + default = "xfce"; }; - - - - Optionally, compton - can be enabled for nice graphical effects, some example settings: - -services.compton = { - enable = true; - fade = true; - inactiveOpacity = "0.9"; - shadow = true; - fadeDelta = 4; + + + Optionally, compton can be enabled for nice graphical + effects, some example settings: + +services.compton = { + enable = true; + fade = true; + inactiveOpacity = "0.9"; + shadow = true; + fadeDelta = 4; }; - - - - Some Xfce programs are not installed automatically. - To install them manually (system wide), put them into your - environment.systemPackages. - - - - Thunar Volume Support - - - To enable - Thunar - volume support, put - -services.xserver.desktopManager.xfce.enable = true; + + + Some Xfce programs are not installed automatically. To install them manually + (system wide), put them into your + . + + + Thunar Volume Support + + To enable Thunar volume support, put + + = true; - into your configuration.nix. - - - - - - Polkit Authentication Agent - - - There is no authentication agent automatically installed alongside - Xfce. To allow mounting of local (non-removable) filesystems, you - will need to install one. - - Installing polkit_gnome, a rebuild, logout and - login did the trick. - - - - - - Troubleshooting - - - Even after enabling udisks2, volume management might not work. - Thunar and/or the desktop takes time to show up. - - Thunar will spit out this kind of message on start - (look at journalctl --user -b). - - + into your configuration.nix. + + + + Polkit Authentication Agent + + There is no authentication agent automatically installed alongside Xfce. To + allow mounting of local (non-removable) filesystems, you will need to + install one. Installing polkit_gnome, a rebuild, logout + and login did the trick. + + + + Troubleshooting + + Even after enabling udisks2, volume management might not work. Thunar and/or + the desktop takes time to show up. Thunar will spit out this kind of message + on start (look at journalctl --user -b). + Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported - - This is caused by some needed GNOME services not running. - This is all fixed by enabling "Launch GNOME services on startup" in - the Advanced tab of the Session and Startup settings panel. - Alternatively, you can run this command to do the same thing. - + This is caused by some needed GNOME services not running. This is all fixed + by enabling "Launch GNOME services on startup" in the Advanced tab of the + Session and Startup settings panel. Alternatively, you can run this command + to do the same thing. + $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true - A log-out and re-log will be needed for this to take effect. - - - - + A log-out and re-log will be needed for this to take effect. + + diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index ac22712baf87aecffc480dca4d067548ea806999..be28c2c17afd83bf87fd8693609a26984dc14724 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -31,11 +31,12 @@ let else p; describe = args: let + title = args.title or null; name = args.name or (lib.concatStringsSep "." args.path); path = args.path or [ args.name ]; package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs); in "" - + "pkgs.${name} (${package.meta.name})" + + "${lib.optionalString (title != null) "${title} aka "}pkgs.${name} (${package.meta.name})" + lib.optionalString (!package.meta.available) " [UNAVAILABLE]" + ": ${package.meta.description or "???"}." + lib.optionalString (args ? comment) "\n${args.comment}" @@ -51,7 +52,7 @@ let // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; } // lib.optionalAttrs (opt ? default) { default = substFunction opt.default; } // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; } - // lib.optionalAttrs (opt ? relatedPackages) { relatedPackages = genRelatedPackages opt.relatedPackages; }); + // lib.optionalAttrs (opt ? relatedPackages && opt.relatedPackages != []) { relatedPackages = genRelatedPackages opt.relatedPackages; }); # We need to strip references to /nix/store/* from options, # including any `extraSources` if some modules came from elsewhere, @@ -102,13 +103,18 @@ let ''; + generatedSources = runCommand "generated-docbook" {} '' + mkdir $out + ln -s ${modulesDoc} $out/modules.xml + ln -s ${optionsDocBook} $out/options-db.xml + printf "%s" "${version}" > $out/version + ''; + copySources = '' cp -prd $sources/* . # */ + ln -s ${generatedSources} ./generated chmod -R u+w . - ln -s ${modulesDoc} configuration/modules.xml - ln -s ${optionsDocBook} options-db.xml - printf "%s" "${version}" > version ''; toc = builtins.toFile "toc.xml" @@ -203,13 +209,13 @@ let --stringparam collect.xref.targets only \ --stringparam targets.filename "$out/manual.db" \ --nonet \ - ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \ + ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ ${manual-combined}/manual-combined.xml cat > "$out/olinkdb.xml" < ]> @@ -224,6 +230,7 @@ let ''; in rec { + inherit generatedSources; # The NixOS options in JSON format. optionsJSON = runCommand "options-json" @@ -257,11 +264,11 @@ in rec { ${manualXsltprocOptions} \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --nonet --output $dst/ \ - ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \ + ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ ${manual-combined}/manual-combined.xml mkdir -p $dst/images/callouts - cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/ + cp ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/ cp ${../../../doc/style.css} $dst/style.css cp ${../../../doc/overrides.css} $dst/overrides.css @@ -285,11 +292,11 @@ in rec { ${manualXsltprocOptions} \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --nonet --xinclude --output $dst/epub/ \ - ${docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \ + ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ ${manual-combined}/manual-combined.xml mkdir -p $dst/epub/OEBPS/images/callouts - cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */ + cp -r ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */ echo "application/epub+zip" > mimetype manual="$dst/nixos-manual.epub" zip -0Xq "$manual" mimetype @@ -317,7 +324,7 @@ in rec { --param man.endnotes.are.numbered 0 \ --param man.break.after.slash 1 \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ - ${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \ + ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl \ ${manual-combined}/man-pages-combined.xml ''; diff --git a/nixos/doc/manual/development/assertions.xml b/nixos/doc/manual/development/assertions.xml index d3434e1f112ee1e71df9aa50cde970d6980b83f5..17c38ffcc717b219b5d68f6eb5c650febcc0f773 100644 --- a/nixos/doc/manual/development/assertions.xml +++ b/nixos/doc/manual/development/assertions.xml @@ -3,30 +3,29 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-assertions"> + Warnings and Assertions -Warnings and Assertions + + When configuration problems are detectable in a module, it is a good idea to + write an assertion or warning. Doing so provides clear feedback to the user + and prevents errors after the build. + - - When configuration problems are detectable in a module, it is a good - idea to write an assertion or warning. Doing so provides clear - feedback to the user and prevents errors after the build. - - - + Although Nix has the abort and - builtins.trace functions to perform such tasks, - they are not ideally suited for NixOS modules. Instead of these - functions, you can declare your warnings and assertions using the + builtins.trace + functions + to perform such tasks, they are not ideally suited for NixOS modules. Instead + of these functions, you can declare your warnings and assertions using the NixOS module system. - - -
+ -Warnings +
+ Warnings - - This is an example of using warnings. - + + This is an example of using warnings. + +
-
- -
- -Assertions +
+ Assertions - - - This example, extracted from the - - syslogd module - shows how to use assertions. Since there - can only be one active syslog daemon at a time, an assertion is useful to - prevent such a broken system from being built. - + + This example, extracted from the + + syslogd module shows how to use + assertions. Since there can only be one active syslog + daemon at a time, an assertion is useful to prevent such a broken system + from being built. + - -
- +
diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml index 2f963f8666f1d2a44eebfb0e94f4c996c15701d9..23d9ddf88a776c107e9f90f6c4b209a4d5e68a4e 100644 --- a/nixos/doc/manual/development/building-nixos.xml +++ b/nixos/doc/manual/development/building-nixos.xml @@ -3,30 +3,25 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-building-cd"> - -Building Your Own NixOS CD - -Building a NixOS CD is as easy as configuring your own computer. The -idea is to use another module which will replace -your configuration.nix to configure the system that -would be installed on the CD. - -Default CD/DVD configurations are available -inside nixos/modules/installer/cd-dvd. - + Building Your Own NixOS CD + + Building a NixOS CD is as easy as configuring your own computer. The idea is + to use another module which will replace your + configuration.nix to configure the system that would be + installed on the CD. + + + Default CD/DVD configurations are available inside + nixos/modules/installer/cd-dvd. $ git clone https://github.com/NixOS/nixpkgs.git $ cd nixpkgs/nixos $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix - - - -Before burning your CD/DVD, you can check the content of the image by mounting anywhere like -suggested by the following command: - + + + Before burning your CD/DVD, you can check the content of the image by + mounting anywhere like suggested by the following command: # mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso - - - + diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml index 09a40114f02ece9317d461a92a969cb22b9e3d0c..eaffc0ef47c2f0af4b809ec5ce4761a3d9098788 100644 --- a/nixos/doc/manual/development/building-parts.xml +++ b/nixos/doc/manual/development/building-parts.xml @@ -3,111 +3,119 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-building-parts"> - -Building Specific Parts of NixOS - -With the command nix-build, you can build -specific parts of your NixOS configuration. This is done as follows: - + Building Specific Parts of NixOS + + With the command nix-build, you can build specific parts + of your NixOS configuration. This is done as follows: $ cd /path/to/nixpkgs/nixos $ nix-build -A config.option - -where option is a NixOS option with type -“derivation” (i.e. something that can be built). Attributes of -interest include: - - - - - system.build.toplevel + where option is a NixOS option with type + “derivation” (i.e. something that can be built). Attributes of interest + include: + + + + system.build.toplevel + - The top-level option that builds the entire NixOS system. - Everything else in your configuration is indirectly pulled in by - this option. This is what nixos-rebuild - builds and what /run/current-system points - to afterwards. - - A shortcut to build this is: - + + The top-level option that builds the entire NixOS system. Everything else + in your configuration is indirectly pulled in by this option. This is + what nixos-rebuild builds and what + /run/current-system points to afterwards. + + + A shortcut to build this is: $ nix-build -A system - + - - - - system.build.manual.manual - The NixOS manual. - - - - system.build.etc - A tree of symlinks that form the static parts of - /etc. - - - - system.build.initialRamdisk - system.build.kernel + + + + system.build.manual.manual + - The initial ramdisk and kernel of the system. This allows - a quick way to test whether the kernel and the initial ramdisk - boot correctly, by using QEMU’s and - options: - + + The NixOS manual. + + + + + + system.build.etc + + + + A tree of symlinks that form the static parts of + /etc. + + + + + + system.build.initialRamdisk + + + system.build.kernel + + + + The initial ramdisk and kernel of the system. This allows a quick way to + test whether the kernel and the initial ramdisk boot correctly, by using + QEMU’s and options: $ nix-build -A config.system.build.initialRamdisk -o initrd $ nix-build -A config.system.build.kernel -o kernel $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null - - +
- - - - system.build.nixos-rebuild - system.build.nixos-install - system.build.nixos-generate-config + + + + system.build.nixos-rebuild + + + system.build.nixos-install + + + system.build.nixos-generate-config + - These build the corresponding NixOS commands. + + These build the corresponding NixOS commands. + - - - - systemd.units.unit-name.unit + + + + systemd.units.unit-name.unit + - This builds the unit with the specified name. Note that - since unit names contain dots - (e.g. httpd.service), you need to put them - between quotes, like this: - + + This builds the unit with the specified name. Note that since unit names + contain dots (e.g. httpd.service), you need to put + them between quotes, like this: $ nix-build -A 'config.systemd.units."httpd.service".unit' - - You can also test individual units, without rebuilding the whole - system, by putting them in - /run/systemd/system: - + You can also test individual units, without rebuilding the whole system, + by putting them in /run/systemd/system: $ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ /run/systemd/system/tmp-httpd.service # systemctl daemon-reload # systemctl start tmp-httpd.service - Note that the unit must not have the same name as any unit in - /etc/systemd/system since those take - precedence over /run/systemd/system. - That’s why the unit is installed as - tmp-httpd.service here. + /etc/systemd/system since those take precedence over + /run/systemd/system. That’s why the unit is + installed as tmp-httpd.service here. + - - - - - - + + + diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 47343d93cde953e0fe2c55ed6204e8d3f0cc1c3a..03dee6ff09bb958fdc087c5ae2bd24fd69ca4f1d 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -3,21 +3,18 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-development"> - -Development - - -This chapter describes how you can modify and extend -NixOS. - - - - - - - - - - - + Development + + + This chapter describes how you can modify and extend NixOS. + + + + + + + + + + diff --git a/nixos/doc/manual/development/importing-modules.xml b/nixos/doc/manual/development/importing-modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..1c6a5671eda8bb6397753dad58d9d15b790bc970 --- /dev/null +++ b/nixos/doc/manual/development/importing-modules.xml @@ -0,0 +1,56 @@ +
+ Importing Modules + + + Sometimes NixOS modules need to be used in configuration but exist outside of + Nixpkgs. These modules can be imported: + + + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Use a locally-available module definition in + # ./example-module/default.nix + ./example-module + ]; + + services.exampleModule.enable = true; +} + + + + The environment variable NIXOS_EXTRA_MODULE_PATH is an + absolute path to a NixOS module that is included alongside the Nixpkgs NixOS + modules. Like any NixOS module, this module can import additional modules: + + + +# ./module-list/default.nix +[ + ./example-module1 + ./example-module2 +] + + + +# ./extra-module/default.nix +{ imports = import ./module-list.nix; } + + + +# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module +{ config, lib, pkgs, ... }: + +{ + # No `imports` needed + + services.exampleModule1.enable = true; +} + +
diff --git a/nixos/doc/manual/development/meta-attributes.xml b/nixos/doc/manual/development/meta-attributes.xml index de0870314dcb34102e607487d446cae6d85495b3..3d019a4987e1b2b0da13579a87f10fad2f3bf818 100644 --- a/nixos/doc/manual/development/meta-attributes.xml +++ b/nixos/doc/manual/development/meta-attributes.xml @@ -3,22 +3,26 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-meta-attributes"> + Meta Attributes -Meta Attributes - -Like Nix packages, NixOS modules can declare meta-attributes to provide - extra information. Module meta attributes are defined in the + + Like Nix packages, NixOS modules can declare meta-attributes to provide extra + information. Module meta attributes are defined in the meta.nix - special module. + special module. + -meta is a top level attribute like + + meta is a top level attribute like options and config. Available meta-attributes are maintainers and - doc. + doc. + -Each of the meta-attributes must be defined at most once per module - file. + + Each of the meta-attributes must be defined at most once per module file. + { config, lib, pkgs, ... }: @@ -39,24 +43,21 @@ } - - - + + + maintainers contains a list of the module maintainers. - - - - - + + + + doc points to a valid DocBook file containing the module - documentation. Its contents is automatically added to . - Changes to a module documentation have to be checked to not break - building the NixOS manual: - - $ nix-build nixos/release.nix -A manual - - - - + documentation. Its contents is automatically added to + . Changes to a module documentation + have to be checked to not break building the NixOS manual: + +$ nix-build nixos/release.nix -A manual + + diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml index c09c41ea3bdc1216dbe7b7cdf0f0bf4cffd54805..2695082e386735df28a46021ba45ccc23117530f 100644 --- a/nixos/doc/manual/development/nixos-tests.xml +++ b/nixos/doc/manual/development/nixos-tests.xml @@ -3,18 +3,17 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-nixos-tests"> - -NixOS Tests - -When you add some feature to NixOS, you should write a test for -it. NixOS tests are kept in the directory NixOS Tests + + When you add some feature to NixOS, you should write a test for it. NixOS + tests are kept in the directory + nixos/tests, -and are executed (using Nix) by a testing framework that automatically -starts one or more virtual machines containing the NixOS system(s) -required for the test. - - - - - + and are executed (using Nix) by a testing framework that automatically starts + one or more virtual machines containing the NixOS system(s) required for the + test. + + + + diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index ed718c89eb77cf6577c09539701f66070f697529..eee81bf64263802d3fece3f36e6d085cdd094473 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -3,14 +3,12 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-option-declarations"> + Option Declarations -Option Declarations - -An option declaration specifies the name, type and description -of a NixOS configuration option. It is invalid to define an option -that hasn’t been declared in any module. An option declaration -generally looks like this: - + + An option declaration specifies the name, type and description of a NixOS + configuration option. It is invalid to define an option that hasn’t been + declared in any module. An option declaration generally looks like this: options = { name = mkOption { @@ -21,146 +19,181 @@ options = { }; }; - -The attribute names within the name -attribute path must be camel cased in general but should, as an -exception, match the -name attribute path + must be camel cased in general but should, as an exception, match the + -package attribute name when referencing a Nixpkgs package. For -example, the option services.nix-serve.bindAddress -references the nix-serve Nixpkgs package. - - - -The function mkOption accepts the following arguments. - - - - - type + package attribute name when referencing a Nixpkgs package. For + example, the option services.nix-serve.bindAddress + references the nix-serve Nixpkgs package. + + + + The function mkOption accepts the following arguments. + + + + type + - The type of the option (see ). - It may be omitted, but that’s not advisable since it may lead to errors - that are hard to diagnose. + + The type of the option (see ). It may + be omitted, but that’s not advisable since it may lead to errors that + are hard to diagnose. + - - - - default + + + + default + - The default value used if no value is defined by any - module. A default is not required; but if a default is not given, - then users of the module will have to define the value of the - option, otherwise an error will be thrown. + + The default value used if no value is defined by any module. A default is + not required; but if a default is not given, then users of the module + will have to define the value of the option, otherwise an error will be + thrown. + - - - - example + + + + example + - An example value that will be shown in the NixOS manual. + + An example value that will be shown in the NixOS manual. + - - - - description + + + + description + - A textual description of the option, in DocBook format, - that will be included in the NixOS manual. + + A textual description of the option, in DocBook format, that will be + included in the NixOS manual. + - - - - - - -
Extensible Option - Types - - Extensible option types is a feature that allow to extend certain types - declaration through multiple module files. - This feature only work with a restricted set of types, namely - enum and submodules and any composed - forms of them. - - Extensible option types can be used for enum options - that affects multiple modules, or as an alternative to related - enable options. + + + + +
+ Extensible Option Types + + + Extensible option types is a feature that allow to extend certain types + declaration through multiple module files. This feature only work with a + restricted set of types, namely enum and + submodules and any composed forms of them. + - As an example, we will take the case of display managers. There is a - central display manager module for generic display manager options and a - module file per display manager backend (slim, sddm, gdm ...). + + Extensible option types can be used for enum options that + affects multiple modules, or as an alternative to related + enable options. - There are two approach to this module structure: + + As an example, we will take the case of display managers. There is a central + display manager module for generic display manager options and a module file + per display manager backend (slim, sddm, gdm ...). + - - Managing the display managers independently by adding an - enable option to every display manager module backend. (NixOS) + + There are two approach to this module structure: + + + + Managing the display managers independently by adding an enable option to + every display manager module backend. (NixOS) + - Managing the display managers in the central module by - adding an option to select which display manager backend to use. + + + Managing the display managers in the central module by adding an option + to select which display manager backend to use. + - + - Both approaches have problems. + + Both approaches have problems. + - Making backends independent can quickly become hard to manage. For - display managers, there can be only one enabled at a time, but the type - system can not enforce this restriction as there is no relation between - each backend enable option. As a result, this restriction - has to be done explicitely by adding assertions in each display manager - backend module. + + Making backends independent can quickly become hard to manage. For display + managers, there can be only one enabled at a time, but the type system can + not enforce this restriction as there is no relation between each backend + enable option. As a result, this restriction has to be + done explicitely by adding assertions in each display manager backend + module. + - On the other hand, managing the display managers backends in the - central module will require to change the central module option every time - a new backend is added or removed. + + On the other hand, managing the display managers backends in the central + module will require to change the central module option every time a new + backend is added or removed. + - By using extensible option types, it is possible to create a placeholder - option in the central module (), and to extend it in each backend module (, ). + + By using extensible option types, it is possible to create a placeholder + option in the central module + (), and to extend + it in each backend module + (, + ). + - As a result, displayManager.enable option values can - be added without changing the main service module file and the type system - automatically enforce that there can only be a single display manager - enabled. + + As a result, displayManager.enable option values can be + added without changing the main service module file and the type system + automatically enforce that there can only be a single display manager + enabled. + -Extensible type - placeholder in the service module + + Extensible type placeholder in the service module services.xserver.displayManager.enable = mkOption { description = "Display manager to use"; type = with types; nullOr (enum [ ]); -}; +}; + -Extending - <literal>services.xserver.displayManager.enable</literal> in the - <literal>slim</literal> module + + Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>slim</literal> module services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "slim" ]); -}; +}; + -Extending - <literal>services.xserver.displayManager.enable</literal> in the - <literal>sddm</literal> module + + Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>sddm</literal> module services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "sddm" ]); -}; - -The placeholder declaration is a standard mkOption - declaration, but it is important that extensible option declarations only use - the type argument. +}; + -Extensible option types work with any of the composed variants of - enum such as - with types; nullOr (enum [ "foo" "bar" ]) - or with types; listOf (enum [ "foo" "bar" ]). + + The placeholder declaration is a standard mkOption + declaration, but it is important that extensible option declarations only + use the type argument. + -
+ + Extensible option types work with any of the composed variants of + enum such as with types; nullOr (enum [ "foo" + "bar" ]) or with types; listOf (enum [ "foo" "bar" + ]). + +
diff --git a/nixos/doc/manual/development/option-def.xml b/nixos/doc/manual/development/option-def.xml index 4e267ecfd1e3e7085480c19304ee2bc00c78272f..580a5afd58cdc9452a58e7b9ad44350d5e0410ce 100644 --- a/nixos/doc/manual/development/option-def.xml +++ b/nixos/doc/manual/development/option-def.xml @@ -3,39 +3,36 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-option-definitions"> + Option Definitions -Option Definitions - -Option definitions are generally straight-forward bindings of values to option names, like - + + Option definitions are generally straight-forward bindings of values to + option names, like config = { services.httpd.enable = true; }; - -However, sometimes you need to wrap an option definition or set of -option definitions in a property to achieve -certain effects: - -Delaying Conditionals - -If a set of option definitions is conditional on the value of -another option, you may need to use mkIf. -Consider, for instance: - + However, sometimes you need to wrap an option definition or set of option + definitions in a property to achieve certain effects: + + + + Delaying Conditionals + + If a set of option definitions is conditional on the value of another + option, you may need to use mkIf. Consider, for instance: config = if config.services.httpd.enable then { environment.systemPackages = [ ... ]; ... } else {}; - -This definition will cause Nix to fail with an “infinite recursion” -error. Why? Because the value of - depends on the value -being constructed here. After all, you could also write the clearly -circular and contradictory: + This definition will cause Nix to fail with an “infinite recursion” + error. Why? Because the value of + depends on the value being + constructed here. After all, you could also write the clearly circular and + contradictory: config = if config.services.httpd.enable then { services.httpd.enable = false; @@ -43,56 +40,49 @@ config = if config.services.httpd.enable then { services.httpd.enable = true; }; - -The solution is to write: - + The solution is to write: config = mkIf config.services.httpd.enable { environment.systemPackages = [ ... ]; ... }; - -The special function mkIf causes the evaluation of -the conditional to be “pushed down” into the individual definitions, -as if you had written: - + The special function mkIf causes the evaluation of the + conditional to be “pushed down” into the individual definitions, as if + you had written: config = { environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; ... }; - - - - - -Setting Priorities - -A module can override the definitions of an option in other -modules by setting a priority. All option -definitions that do not have the lowest priority value are discarded. -By default, option definitions have priority 1000. You can specify an -explicit priority by using mkOverride, e.g. - + + + + + Setting Priorities + + A module can override the definitions of an option in other modules by + setting a priority. All option definitions that do not + have the lowest priority value are discarded. By default, option definitions + have priority 1000. You can specify an explicit priority by using + mkOverride, e.g. services.openssh.enable = mkOverride 10 false; - -This definition causes all other definitions with priorities above 10 -to be discarded. The function mkForce is -equal to mkOverride 50. - - - -Merging Configurations - -In conjunction with mkIf, it is sometimes -useful for a module to return multiple sets of option definitions, to -be merged together as if they were declared in separate modules. This -can be done using mkMerge: - + This definition causes all other definitions with priorities above 10 to be + discarded. The function mkForce is equal to + mkOverride 50. + + + + + Merging Configurations + + In conjunction with mkIf, it is sometimes useful for a + module to return multiple sets of option definitions, to be merged together + as if they were declared in separate modules. This can be done using + mkMerge: config = mkMerge [ # Unconditional stuff. @@ -104,9 +94,6 @@ config = mkMerge }) ]; - - - - - - \ No newline at end of file + + + diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 13fa8d1e114cce7db822e2b1bf41d411b34c3f0b..47dd09158e91e4d935fcf92de11d9a886f61e235 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -3,241 +3,380 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-option-types"> + Options Types -Options Types - - Option types are a way to put constraints on the values a module option - can take. - Types are also responsible of how values are merged in case of multiple - value definitions. -
Basic Types - - Basic types are the simplest available types in the module system. - Basic types include multiple string types that mainly differ in how - definition merging is handled. - - - - types.bool - A boolean, its values can be true or - false. - - - types.path - A filesystem path, defined as anything that when coerced to - a string starts with a slash. Even if derivations can be considered as - path, the more specific types.package should be - preferred. - - - types.package - A derivation or a store path. - - - -Integer-related types: - - - - types.int - A signed integer. - - - - types.ints.{s8, s16, s32} - - - Signed integers with a fixed length (8, 16 or 32 bits). - They go from - −2n/2 - to - 2n/2−1 - - respectively (e.g. −128 to 127 - for 8 bits). - - - - - types.ints.unsigned - - An unsigned integer (that is >= 0). - - - - - types.ints.{u8, u16, u32} - - - Unsigned integers with a fixed length (8, 16 or 32 bits). - They go from - 0 to - 2n−1 - - respectively (e.g. 0 to 255 - for 8 bits). - - - - - types.ints.positive - - A positive integer (that is > 0). - - - - -String-related types: - - - - types.str - A string. Multiple definitions cannot be - merged. - - - types.lines - A string. Multiple definitions are concatenated with a new - line "\n". - - - types.commas - A string. Multiple definitions are concatenated with a comma - ",". - - - types.envVar - A string. Multiple definitions are concatenated with a - collon ":". - - - types.strMatching - A string matching a specific regular expression. Multiple - definitions cannot be merged. The regular expression is processed using - builtins.match. - - + + Option types are a way to put constraints on the values a module option can + take. Types are also responsible of how values are merged in case of multiple + value definitions. + +
+ Basic Types + + + Basic types are the simplest available types in the module system. Basic + types include multiple string types that mainly differ in how definition + merging is handled. + + + + + + types.attrs + + + + A free-form attribute set. + + + + + + types.bool + + + + A boolean, its values can be true or + false. + + + + + + types.path + + + + A filesystem path, defined as anything that when coerced to a string + starts with a slash. Even if derivations can be considered as path, the + more specific types.package should be preferred. + + + + + + types.package + + + + A derivation or a store path. + + + + + + + Integer-related types: + + + + + + types.int + + + + A signed integer. + + + + + + types.ints.{s8, s16, s32} + + + + Signed integers with a fixed length (8, 16 or 32 bits). They go from + −2n/2 + to + 2n/2−1 + respectively (e.g. −128 to + 127 for 8 bits). + + + + + + types.ints.unsigned + + + + An unsigned integer (that is >= 0). + + + + + + types.ints.{u8, u16, u32} + + + + Unsigned integers with a fixed length (8, 16 or 32 bits). They go from + 0 to + + 2n−1 + respectively (e.g. 0 to + 255 for 8 bits). + + + + + + types.ints.positive + + + + A positive integer (that is > 0). + + + + + + + String-related types: + + + + + + types.str + + + + A string. Multiple definitions cannot be merged. + + + + + + types.lines + + + + A string. Multiple definitions are concatenated with a new line + "\n". + + + + + + types.commas + + + + A string. Multiple definitions are concatenated with a comma + ",". + + + + + + types.envVar + + + + A string. Multiple definitions are concatenated with a collon + ":". + + + + + + types.strMatching + + + + A string matching a specific regular expression. Multiple definitions + cannot be merged. The regular expression is processed using + builtins.match. + + + +
-
Value Types - - Value types are types that take a value parameter. - - - - types.enum l - One element of the list l, e.g. - types.enum [ "left" "right" ]. Multiple definitions - cannot be merged. - - - types.separatedString - sep - A string with a custom separator - sep, e.g. types.separatedString - "|". - - - - types.ints.between - lowest - highest - - An integer between lowest - and highest (both inclusive). - Useful for creating types like types.port. - - - - types.submodule o - A set of sub options o. - o can be an attribute set or a function - returning an attribute set. Submodules are used in composed types to - create modular options. Submodule are detailed in . - - +
+ Value Types + + + Value types are types that take a value parameter. + + + + + + types.enum l + + + + One element of the list l, e.g. + types.enum [ "left" "right" ]. Multiple definitions + cannot be merged. + + + + + + types.separatedString sep + + + + A string with a custom separator sep, e.g. + types.separatedString "|". + + + + + + types.ints.between lowest highest + + + + An integer between lowest and + highest (both inclusive). Useful for creating + types like types.port. + + + + + + types.submodule o + + + + A set of sub options o. + o can be an attribute set or a function + returning an attribute set. Submodules are used in composed types to + create modular options. Submodule are detailed in + . + + + +
-
Composed Types - - Composed types are types that take a type as parameter. listOf - int and either int str are examples of - composed types. - - - - types.listOf t - A list of t type, e.g. - types.listOf int. Multiple definitions are merged - with list concatenation. - - - types.attrsOf t - An attribute set of where all the values are of - t type. Multiple definitions result in the - joined attribute set. - - - types.loaOf t - An attribute set or a list of t - type. Multiple definitions are merged according to the - value. - - - types.nullOr t - null or type - t. Multiple definitions are merged according - to type t. - - - types.uniq t - Ensures that type t cannot be - merged. It is used to ensure option definitions are declared only - once. - - - types.either t1 - t2 - Type t1 or type - t2, e.g. with types; either int - str. Multiple definitions cannot be - merged. - - - types.coercedTo from - f to - Type to or type - from which will be coerced to - type to using function - f which takes an argument of type - from and return a value of type - to. Can be used to preserve backwards - compatibility of an option if its type was changed. - - +
+ Composed Types -
+ + Composed types are types that take a type as parameter. listOf + int and either int str are examples of composed + types. + -
Submodule + + + + types.listOf t + + + + A list of t type, e.g. types.listOf + int. Multiple definitions are merged with list concatenation. + + + + + + types.attrsOf t + + + + An attribute set of where all the values are of + t type. Multiple definitions result in the + joined attribute set. + + + + + + types.loaOf t + + + + An attribute set or a list of t type. Multiple + definitions are merged according to the value. + + + + + + types.nullOr t + + + + null or type t. Multiple + definitions are merged according to type t. + + + + + + types.uniq t + + + + Ensures that type t cannot be merged. It is + used to ensure option definitions are declared only once. + + + + + + types.either t1 t2 + + + + Type t1 or type t2, + e.g. with types; either int str. Multiple definitions + cannot be merged. + + + + + + types.coercedTo from f to + + + + Type to or type + from which will be coerced to type + to using function f + which takes an argument of type from and + return a value of type to. Can be used to + preserve backwards compatibility of an option if its type was changed. + + + + +
+ +
+ Submodule - submodule is a very powerful type that defines a set - of sub-options that are handled like a separate module. + + submodule is a very powerful type that defines a set of + sub-options that are handled like a separate module. + - It takes a parameter o, that should be a set, - or a function returning a set with an options key - defining the sub-options. - Submodule option definitions are type-checked accordingly to the - options declarations. - Of course, you can nest submodule option definitons for even higher - modularity. + + It takes a parameter o, that should be a set, or + a function returning a set with an options key defining + the sub-options. Submodule option definitions are type-checked accordingly + to the options declarations. Of course, you can nest + submodule option definitons for even higher modularity. + - The option set can be defined directly - () or as reference - (). + + The option set can be defined directly + () or as reference + (). + -Directly defined submodule + + Directly defined submodule options.mod = mkOption { description = "submodule example"; @@ -251,10 +390,11 @@ options.mod = mkOption { }; }; }; -}; +}; + -Submodule defined as a - reference + + Submodule defined as a reference let modOptions = { @@ -271,19 +411,20 @@ in options.mod = mkOption { description = "submodule example"; type = with types; submodule modOptions; -}; - - The submodule type is especially interesting when - used with composed types like attrsOf or - listOf. - When composed with listOf - (), - submodule allows multiple definitions of the submodule - option set (). - - -Declaration of a list - of submodules +}; + + + + The submodule type is especially interesting when used + with composed types like attrsOf or + listOf. When composed with listOf + (), + submodule allows multiple definitions of the submodule + option set (). + + + + Declaration of a list of submodules options.mod = mkOption { description = "submodule example"; @@ -297,24 +438,27 @@ options.mod = mkOption { }; }; }); -}; +}; + -Definition of a list of - submodules + + Definition of a list of submodules config.mod = [ { foo = 1; bar = "one"; } { foo = 2; bar = "two"; } -]; - - When composed with attrsOf - (), - submodule allows multiple named definitions of the - submodule option set (). +]; + + + + When composed with attrsOf + (), + submodule allows multiple named definitions of the + submodule option set (). -Declaration of - attribute sets of submodules + + Declaration of attribute sets of submodules options.mod = mkOption { description = "submodule example"; @@ -328,194 +472,299 @@ options.mod = mkOption { }; }; }); -}; +}; + -Declaration of - attribute sets of submodules + + Declaration of attribute sets of submodules config.mod.one = { foo = 1; bar = "one"; }; -config.mod.two = { foo = 2; bar = "two"; }; - -
- -
Extending types +config.mod.two = { foo = 2; bar = "two"; }; + +
- Types are mainly characterized by their check and - merge functions. +
+ Extending types - - - check - The function to type check the value. Takes a value as - parameter and return a boolean. - It is possible to extend a type check with the - addCheck function (), or to fully override the - check function (). + + Types are mainly characterized by their check and + merge functions. + -Adding a type check + + + + check + + + + The function to type check the value. Takes a value as parameter and + return a boolean. It is possible to extend a type check with the + addCheck function + (), or to fully + override the check function + (). + + + Adding a type check byte = mkOption { description = "An integer between 0 and 255."; type = addCheck types.int (x: x >= 0 && x <= 255); -}; - -Overriding a type - check +}; + + + Overriding a type check nixThings = mkOption { description = "words that start with 'nix'"; type = types.str // { check = (x: lib.hasPrefix "nix" x) }; -}; - - - - merge - Function to merge the options values when multiple values - are set. -The function takes two parameters, loc the option path as a -list of strings, and defs the list of defined values as a -list. -It is possible to override a type merge function for custom -needs. - - +}; + + + + + + merge + + + + Function to merge the options values when multiple values are set. The + function takes two parameters, loc the option path as + a list of strings, and defs the list of defined values + as a list. It is possible to override a type merge function for custom + needs. + + + + +
-
+
+ Custom Types -
Custom Types - -Custom types can be created with the mkOptionType - function. -As type creation includes some more complex topics such as submodule handling, -it is recommended to get familiar with types.nix -code before creating a new type. - -The only required parameter is name. - - - - name - A string representation of the type function - name. - - - definition - Description of the type used in documentation. Give - information of the type and any of its arguments. - - - check - A function to type check the definition value. Takes the - definition value as a parameter and returns a boolean indicating the - type check result, true for success and - false for failure. - - - merge - A function to merge multiple definitions values. Takes two - parameters: - - - loc - The option path as a list of strings, e.g. - ["boot" "loader "grub" - "enable"]. - - - defs - The list of sets of defined value - and file where the value was defined, e.g. - [ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; - value = 2 } ]. The merge function - should return the merged value or throw an error in case the - values are impossible or not meant to be merged. - - - - - - getSubOptions - For composed types that can take a submodule as type - parameter, this function generate sub-options documentation. It takes - the current option prefix as a list and return the set of sub-options. - Usually defined in a recursive manner by adding a term to the prefix, - e.g. prefix: elemType.getSubOptions (prefix ++ - ["prefix"]) where - "prefix" is the newly added - prefix. - - - getSubModules - For composed types that can take a submodule as type - parameter, this function should return the type parameters submodules. - If the type parameter is called elemType, the - function should just recursively look into submodules by returning - elemType.getSubModules;. - - - substSubModules - For composed types that can take a submodule as type - parameter, this function can be used to substitute the parameter of a - submodule type. It takes a module as parameter and return the type with - the submodule options substituted. It is usually defined as a type - function call with a recursive call to - substSubModules, e.g for a type - composedType that take an elemtype - type parameter, this function should be defined as m: - composedType (elemType.substSubModules m). - - - typeMerge - A function to merge multiple type declarations. Takes the - type to merge functor as parameter. A - null return value means that type cannot be - merged. - - - f - The type to merge - functor. - - - Note: There is a generic defaultTypeMerge that - work with most of value and composed types. - - - - functor - An attribute set representing the type. It is used for type - operations and has the following keys: - - - type - The type function. - - - wrapped - Holds the type parameter for composed types. - - - - payload - Holds the value parameter for value types. - The types that have a payload are the - enum, separatedString and - submodule types. - - - binOp - A binary operation that can merge the payloads of two - same types. Defined as a function that take two payloads as - parameters and return the payloads merged. - - - - - + + Custom types can be created with the mkOptionType + function. As type creation includes some more complex topics such as + submodule handling, it is recommended to get familiar with + types.nix + code before creating a new type. + -
+ + The only required parameter is name. + + + + + + name + + + + A string representation of the type function name. + + + + + + definition + + + + Description of the type used in documentation. Give information of the + type and any of its arguments. + + + + + + check + + + + A function to type check the definition value. Takes the definition value + as a parameter and returns a boolean indicating the type check result, + true for success and false for + failure. + + + + + + merge + + + + A function to merge multiple definitions values. Takes two parameters: + + + + + loc + + + + The option path as a list of strings, e.g. ["boot" "loader + "grub" "enable"]. + + + + + + defs + + + + The list of sets of defined value and + file where the value was defined, e.g. [ { + file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } + ]. The merge function should return the + merged value or throw an error in case the values are impossible or + not meant to be merged. + + + + + + + + + getSubOptions + + + + For composed types that can take a submodule as type parameter, this + function generate sub-options documentation. It takes the current option + prefix as a list and return the set of sub-options. Usually defined in a + recursive manner by adding a term to the prefix, e.g. prefix: + elemType.getSubOptions (prefix ++ + ["prefix"]) where + "prefix" is the newly added prefix. + + + + + + getSubModules + + + + For composed types that can take a submodule as type parameter, this + function should return the type parameters submodules. If the type + parameter is called elemType, the function should just + recursively look into submodules by returning + elemType.getSubModules;. + + + + + + substSubModules + + + + For composed types that can take a submodule as type parameter, this + function can be used to substitute the parameter of a submodule type. It + takes a module as parameter and return the type with the submodule + options substituted. It is usually defined as a type function call with a + recursive call to substSubModules, e.g for a type + composedType that take an elemtype + type parameter, this function should be defined as m: + composedType (elemType.substSubModules m). + + + + + + typeMerge + + + + A function to merge multiple type declarations. Takes the type to merge + functor as parameter. A null return + value means that type cannot be merged. + + + + + f + + + + The type to merge functor. + + + + + + Note: There is a generic defaultTypeMerge that work + with most of value and composed types. + + + + + + functor + + + + An attribute set representing the type. It is used for type operations + and has the following keys: + + + + + type + + + + The type function. + + + + + + wrapped + + + + Holds the type parameter for composed types. + + + + + + payload + + + + Holds the value parameter for value types. The types that have a + payload are the enum, + separatedString and submodule + types. + + + + + + binOp + + + + A binary operation that can merge the payloads of two same types. + Defined as a function that take two payloads as parameters and return + the payloads merged. + + + + + + + +
diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index afcb970ed700baea7b943c13e8aa2c95314bb35f..d4e5ff3f4312e713d3ff445e51452cab743ea908 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -3,252 +3,258 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-releases"> - -Releases - -
+ Releases +
Release process - Going through an example of releasing NixOS 17.09: + Going through an example of releasing NixOS 17.09:
- One month before the beta - - - - Send an email to the nix-devel mailinglist as a warning about upcoming beta "feature freeze" in a month. - - - - - Discuss with Eelco Dolstra and the community (via IRC, ML) about what will reach the deadline. - Any issue or Pull Request targeting the release should be included in the release milestone. - - - + One month before the beta + + + + + Send an email to the nix-devel mailinglist as a warning about upcoming + beta "feature freeze" in a month. + + + + + Discuss with Eelco Dolstra and the community (via IRC, ML) about what + will reach the deadline. Any issue or Pull Request targeting the release + should be included in the release milestone. + + +
+
- At beta release time - - - - Create - an issue for tracking Zero Hydra Failures progress. ZHF is an effort - to get build failures down to zero. - - - - - git tag -a -s -m "Release 17.09-beta" 17.09-beta && git push --tags - - - - - From the master branch run git checkout -B release-17.09. - - - - - - Make sure a channel is created at http://nixos.org/channels/. - - - - - - - Let a GitHub nixpkgs admin lock the branch on github for you. - (so developers can’t force push) - - - - - - - Bump the system.defaultChannel attribute in - nixos/modules/misc/version.nix - - - - - - - Update versionSuffix in - nixos/release.nix, use - git log --format=%an|wc -l to get the commit - count - - - - - echo -n "18.03" > .version on - master. - - - - - - Pick a new name for the unstable branch. - - - - - - Create a new release notes file for the upcoming release + 1, in this - case rl-1803.xml. - - + At beta release time + + + + + Create + an issue for tracking Zero Hydra Failures progress. ZHF is an effort to + get build failures down to zero. + + + + + git tag -a -s -m "Release 17.09-beta" 17.09-beta + && git push --tags + + + + + From the master branch run git checkout -B + release-17.09. + + + + + + Make sure a channel is created at http://nixos.org/channels/. + + + + + + Let a GitHub nixpkgs admin lock the branch on github for you. (so + developers can’t force push) + + + + + + Bump the system.defaultChannel attribute in + nixos/modules/misc/version.nix + + + + + + Update versionSuffix in + nixos/release.nix, use git log + --format=%an|wc -l to get the commit count + + + + + echo -n "18.03" > .version on master. + + + + + + Pick a new name for the unstable branch. + + + + + Create a new release notes file for the upcoming release + 1, in this + case rl-1803.xml. + + + + + Create two Hydra jobsets: release-17.09 and release-17.09-small with + stableBranch set to false. + + + + + Edit changelog at + nixos/doc/manual/release-notes/rl-1709.xml (double + check desktop versions are noted) + + - - Create two Hydra jobsets: release-17.09 and release-17.09-small with stableBranch set to false. - + + Get all new NixOS modules git diff + release-17.03..release-17.09 nixos/modules/module-list.nix|grep + ^+ + - - Edit changelog at - nixos/doc/manual/release-notes/rl-1709.xml - (double check desktop versions are noted) - - - - - Get all new NixOS modules - git diff release-17.03..release-17.09 nixos/modules/module-list.nix|grep ^+ - - - - - Note systemd, kernel, glibc and Nix upgrades. - - - + + Note systemd, kernel, glibc and Nix upgrades. + - + + +
+
- During Beta - - - - Monitor the master branch for bugfixes and minor updates - and cherry-pick them to the release branch. - - - + During Beta + + + + + Monitor the master branch for bugfixes and minor updates and cherry-pick + them to the release branch. + + +
+
- Before the final release - - - - Re-check that the release notes are complete. - - - - - Release Nix (currently only Eelco Dolstra can do that). - - Make sure fallback is updated. - - - - - - - Update README.md with new stable NixOS version information. - - - - - - Change stableBranch to true and wait for channel to update. - - - + Before the final release + + + + + Re-check that the release notes are complete. + + + + + Release Nix (currently only Eelco Dolstra can do that). + + Make sure fallback is updated. + + + + + + Update README.md with new stable NixOS version information. + + + + + Change stableBranch to true and wait for channel to + update. + + +
+
- At final release time - - - - git tag -s -a -m "Release 15.09" 15.09 - - - - - Update http://nixos.org/nixos/download.html and http://nixos.org/nixos/manual in https://github.com/NixOS/nixos-org-configurations - - - - - Get number of commits for the release: - git log release-14.04..release-14.12 --format=%an|wc -l - - - - - Commits by contributor: - git log release-14.04..release-14.12 --format=%an|sort|uniq -c|sort -rn - - - - - Send an email to nix-dev to announce the release with above information. Best to check how previous email was formulated - to see what needs to be included. - - - -
-
+ At final release time -
+ + + + git tag -s -a -m "Release 15.09" 15.09 + + + + + Update http://nixos.org/nixos/download.html and + http://nixos.org/nixos/manual in + https://github.com/NixOS/nixos-org-configurations + + + + + Get number of commits for the release: git log + release-14.04..release-14.12 --format=%an|wc -l + + + + + Commits by contributor: git log release-14.04..release-14.12 + --format=%an|sort|uniq -c|sort -rn + + + + + Send an email to nix-dev to announce the release with above information. + Best to check how previous email was formulated to see what needs to be + included. + + + +
+
+
Release schedule - - - - - - + + + + + + Date - + Event - - - - - + + + + + 2016-07-25 - + Send email to nix-dev about upcoming branch-off - - - + + + 2016-09-01 - - release-16.09 branch and corresponding jobsets are created, + release-16.09 branch and corresponding jobsets are created, change freeze - - - + + + 2016-09-30 - + NixOS 16.09 released - - - + + + -
- +
diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml index cc0539ec51092ed58220b67ceb652e8769df6269..7b103c36d907d4f6344493fb11dc8937e04e6eab 100644 --- a/nixos/doc/manual/development/replace-modules.xml +++ b/nixos/doc/manual/development/replace-modules.xml @@ -3,27 +3,31 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-replace-modules"> + Replace Modules -Replace Modules + + Modules that are imported can also be disabled. The option declarations and + config implementation of a disabled module will be ignored, allowing another + to take it's place. This can be used to import a set of modules from another + channel while keeping the rest of the system on a stable release. + -Modules that are imported can also be disabled. The option - declarations and config implementation of a disabled module will be - ignored, allowing another to take it's place. This can be used to - import a set of modules from another channel while keeping the rest - of the system on a stable release. -disabledModules is a top level attribute like + + disabledModules is a top level attribute like imports, options and - config. It contains a list of modules that will - be disabled. This can either be the full path to the module or a - string with the filename relative to the modules path - (eg. <nixpkgs/nixos/modules> for nixos). - + config. It contains a list of modules that will be + disabled. This can either be the full path to the module or a string with the + filename relative to the modules path (eg. <nixpkgs/nixos/modules> for + nixos). + -This example will replace the existing postgresql module with - the version defined in the nixos-unstable channel while keeping the - rest of the modules and packages from the original nixos channel. - This only overrides the module definition, this won't use postgresql - from nixos-unstable unless explicitly configured to do so. + + This example will replace the existing postgresql module with the version + defined in the nixos-unstable channel while keeping the rest of the modules + and packages from the original nixos channel. This only overrides the module + definition, this won't use postgresql from nixos-unstable unless explicitly + configured to do so. + { config, lib, pkgs, ... }: @@ -41,10 +45,11 @@ } -This example shows how to define a custom module as a - replacement for an existing module. Importing this module will - disable the original module without having to know it's - implementation details. + + This example shows how to define a custom module as a replacement for an + existing module. Importing this module will disable the original module + without having to know it's implementation details. + { config, lib, pkgs, ... }: @@ -71,5 +76,4 @@ in }; } - diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml index e4749077781553953384d3576f072bf6e992dcfd..862b364a6d79b5b450d85aaed20e1aa6ad9c62b5 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml @@ -3,41 +3,38 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-running-nixos-tests"> -Running Tests interactively - -The test itself can be run interactively. This is -particularly useful when developing or debugging a test: + Running Tests interactively + + The test itself can be run interactively. This is particularly useful when + developing or debugging a test: $ nix-build nixos/tests/login.nix -A driver $ ./result/bin/nixos-test-driver starting VDE switch for network 1 > - -You can then take any Perl statement, e.g. - + You can then take any Perl statement, e.g. > startAll > testScript > $machine->succeed("touch /tmp/foo") - -The function testScript executes the entire test -script and drops you back into the test driver command line upon its -completion. This allows you to inspect the state of the VMs after the -test (e.g. to debug the test script). - -To just start and experiment with the VMs, run: - + The function testScript executes the entire test script + and drops you back into the test driver command line upon its completion. + This allows you to inspect the state of the VMs after the test (e.g. to debug + the test script). + + + + To just start and experiment with the VMs, run: $ nix-build nixos/tests/login.nix -A driver $ ./result/bin/nixos-run-vms - -The script nixos-run-vms starts the virtual -machines defined by test. The root file system of the VMs is created -on the fly and kept across VM restarts in -./hostname.qcow2. - + The script nixos-run-vms starts the virtual machines + defined by test. The root file system of the VMs is created on the fly and + kept across VM restarts in + ./hostname.qcow2. + diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml index 908c0a66a32deb93ad23a251a0cd56930ecc1800..eadbe1ea4f2691524561585a49ac7a8ac4a4755b 100644 --- a/nixos/doc/manual/development/running-nixos-tests.xml +++ b/nixos/doc/manual/development/running-nixos-tests.xml @@ -3,20 +3,18 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-running-nixos-tests-interactively"> + Running Tests -Running Tests - -You can run tests using nix-build. For -example, to run the test + You can run tests using nix-build. For example, to run the + test + login.nix, -you just do: - + you just do: $ nix-build '<nixpkgs/nixos/tests/login.nix>' - -or, if you don’t want to rely on NIX_PATH: - + or, if you don’t want to rely on NIX_PATH: $ cd /my/nixpkgs/nixos/tests $ nix-build login.nix @@ -26,16 +24,13 @@ machine: QEMU running (pid 8841) … 6 out of 6 tests succeeded - -After building/downloading all required dependencies, this will -perform a build that starts a QEMU/KVM virtual machine containing a -NixOS system. The virtual machine mounts the Nix store of the host; -this makes VM creation very fast, as no disk image needs to be -created. Afterwards, you can view a pretty-printed log of the test: - + After building/downloading all required dependencies, this will perform a + build that starts a QEMU/KVM virtual machine containing a NixOS system. The + virtual machine mounts the Nix store of the host; this makes VM creation very + fast, as no disk image needs to be created. Afterwards, you can view a + pretty-printed log of the test: $ firefox result/log.html - - +
diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index a2896cd7a135e66ceb75dcf3d96872ebfec964d7..eec9b56b1c07ca141aab3e03aebfcbc7a652e84e 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -3,101 +3,84 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-getting-sources"> - -Getting the Sources - -By default, NixOS’s nixos-rebuild command -uses the NixOS and Nixpkgs sources provided by the -nixos channel (kept in -/nix/var/nix/profiles/per-user/root/channels/nixos). -To modify NixOS, however, you should check out the latest sources from -Git. This is as follows: - + Getting the Sources + + By default, NixOS’s nixos-rebuild command uses the NixOS + and Nixpkgs sources provided by the nixos channel (kept in + /nix/var/nix/profiles/per-user/root/channels/nixos). To + modify NixOS, however, you should check out the latest sources from Git. This + is as follows: -$ git clone git://github.com/NixOS/nixpkgs.git +$ git clone https://github.com/NixOS/nixpkgs $ cd nixpkgs -$ git remote add channels git://github.com/NixOS/nixpkgs-channels.git +$ git remote add channels https://github.com/NixOS/nixpkgs-channels $ git remote update channels - -This will check out the latest Nixpkgs sources to -./nixpkgs the NixOS sources to -./nixpkgs/nixos. (The NixOS source tree lives in -a subdirectory of the Nixpkgs repository.) The remote -channels refers to a read-only repository that -tracks the Nixpkgs/NixOS channels (see -for more information about channels). Thus, the Git branch -channels/nixos-17.03 will contain the latest built -and tested version available in the nixos-17.03 -channel. - -It’s often inconvenient to develop directly on the master -branch, since if somebody has just committed (say) a change to GCC, -then the binary cache may not have caught up yet and you’ll have to -rebuild everything from source. So you may want to create a local -branch based on your current NixOS version: - + This will check out the latest Nixpkgs sources to + ./nixpkgs the NixOS sources to + ./nixpkgs/nixos. (The NixOS source tree lives in a + subdirectory of the Nixpkgs repository.) The remote + channels refers to a read-only repository that tracks the + Nixpkgs/NixOS channels (see for more + information about channels). Thus, the Git branch + channels/nixos-17.03 will contain the latest built and + tested version available in the nixos-17.03 channel. + + + It’s often inconvenient to develop directly on the master branch, since if + somebody has just committed (say) a change to GCC, then the binary cache may + not have caught up yet and you’ll have to rebuild everything from source. + So you may want to create a local branch based on your current NixOS version: $ nixos-version 17.09pre104379.6e0b727 (Hummingbird) $ git checkout -b local 6e0b727 - -Or, to base your local branch on the latest version available in a -NixOS channel: - + Or, to base your local branch on the latest version available in a NixOS + channel: $ git remote update channels $ git checkout -b local channels/nixos-17.03 - -(Replace nixos-17.03 with the name of the channel -you want to use.) You can use git merge or -git rebase to keep your local branch in sync with -the channel, e.g. - + (Replace nixos-17.03 with the name of the channel you want + to use.) You can use git merge or git + rebase to keep your local branch in sync with the channel, e.g. $ git remote update channels $ git merge channels/nixos-17.03 - -You can use git cherry-pick to copy commits from -your local branch to the upstream branch. - -If you want to rebuild your system using your (modified) -sources, you need to tell nixos-rebuild about them -using the flag: - + You can use git cherry-pick to copy commits from your + local branch to the upstream branch. + + + If you want to rebuild your system using your (modified) sources, you need to + tell nixos-rebuild about them using the + flag: # nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs - - - -If you want nix-env to use the expressions in -/my/sources, use nix-env -f -/my/sources/nixpkgs, or change -the default by adding a symlink in -~/.nix-defexpr: - + + + If you want nix-env to use the expressions in + /my/sources, use nix-env -f + /my/sources/nixpkgs, or change the + default by adding a symlink in ~/.nix-defexpr: $ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs - -You may want to delete the symlink -~/.nix-defexpr/channels_root to prevent root’s -NixOS channel from clashing with your own tree (this may break the -command-not-found utility though). If you want to go back to the default -state, you may just remove the ~/.nix-defexpr -directory completely, log out and log in again and it should have been -recreated with a link to the root channels. - + You may want to delete the symlink + ~/.nix-defexpr/channels_root to prevent root’s NixOS + channel from clashing with your own tree (this may break the + command-not-found utility though). If you want to go back to the default + state, you may just remove the ~/.nix-defexpr directory + completely, log out and log in again and it should have been recreated with a + link to the root channels. + - diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml index 16bc8125d9ff48ccdf46d6a782d5ca99f29cb812..63f5f3de7f4df781bb2fa7ddb05f84214a5cc4ea 100644 --- a/nixos/doc/manual/development/testing-installer.xml +++ b/nixos/doc/manual/development/testing-installer.xml @@ -3,27 +3,20 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-testing-installer"> - -Testing the Installer - -Building, burning, and booting from an installation CD is rather -tedious, so here is a quick way to see if the installer works -properly: - + Testing the Installer + + Building, burning, and booting from an installation CD is rather tedious, so + here is a quick way to see if the installer works properly: # mount -t tmpfs none /mnt # nixos-generate-config --root /mnt $ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install # ./result/bin/nixos-install - -To start a login shell in the new NixOS installation in -/mnt: - + To start a login shell in the new NixOS installation in + /mnt: $ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter # ./result/bin/nixos-enter - - - + diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml index 59a287717acb422421d5831ea5f6975762d5290b..8ecdd1c770f2dce348ceac88480e74d9d7635a15 100644 --- a/nixos/doc/manual/development/writing-documentation.xml +++ b/nixos/doc/manual/development/writing-documentation.xml @@ -3,145 +3,147 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-writing-documentation"> - -Writing NixOS Documentation - - - As NixOS grows, so too does the need for a catalogue and explanation - of its extensive functionality. Collecting pertinent information - from disparate sources and presenting it in an accessible style - would be a worthy contribution to the project. - - -
-Building the Manual - - The DocBook sources of the are in the - nixos/doc/manual - subdirectory of the Nixpkgs repository. If you make modifications to - the manual, it's important to build it before committing. You can do - that as follows: - - nix-build nixos/release.nix -A manual.x86_64-linux - - - - When this command successfully finishes, it will tell you where the - manual got generated. The HTML will be accessible through the - result symlink at - ./result/share/doc/nixos/index.html. - -
- -
-Editing DocBook XML - - - For general information on how to write in DocBook, see - - DocBook 5: The Definitive Guide. - - - - Emacs nXML Mode is very helpful for editing DocBook XML because it - validates the document as you write, and precisely locates - errors. To use it, see . - - - - Pandoc can generate - DocBook XML from a multitude of formats, which makes a good starting - point. - - + Writing NixOS Documentation + + As NixOS grows, so too does the need for a catalogue and explanation of its + extensive functionality. Collecting pertinent information from disparate + sources and presenting it in an accessible style would be a worthy + contribution to the project. + +
+ Building the Manual + + + The DocBook sources of the are in the + nixos/doc/manual + subdirectory of the Nixpkgs repository. + + + + You can quickly validate your edits with make: + + + + $ cd /path/to/nixpkgs/nixos/doc/manual + $ make + + + + Once you are done making modifications to the manual, it's important to + build it before committing. You can do that as follows: + + +nix-build nixos/release.nix -A manual.x86_64-linux + + + When this command successfully finishes, it will tell you where the manual + got generated. The HTML will be accessible through the + result symlink at + ./result/share/doc/nixos/index.html. + +
+
+ Editing DocBook XML + + + For general information on how to write in DocBook, see + DocBook + 5: The Definitive Guide. + + + + Emacs nXML Mode is very helpful for editing DocBook XML because it validates + the document as you write, and precisely locates errors. To use it, see + . + + + + Pandoc can generate DocBook XML + from a multitude of formats, which makes a good starting point. + Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML - pandoc -f markdown_github -t docbook5 docs.md -o my-section.md - - - Pandoc can also quickly convert a single - section.xml to HTML, which is helpful when - drafting. - - - - Sometimes writing valid DocBook is simply too difficult. In this - case, submit your documentation updates in a pandoc -f markdown_github -t docbook5 docs.md -o my-section.md + + Pandoc can also quickly convert a single section.xml to + HTML, which is helpful when drafting. + + + + Sometimes writing valid DocBook is simply too difficult. In this case, + submit your documentation updates in a + GitHub - Issue and someone will handle the conversion to XML for you. - -
- -
-Creating a Topic - - - You can use an existing topic as a basis for the new topic or create a topic from scratch. - - - -Keep the following guidelines in mind when you create and add a topic: - - - - The NixOS book - element is in nixos/doc/manual/manual.xml. - It includes several - parts - which are in subdirectories. - - - - Store the topic file in the same directory as the part - to which it belongs. If your topic is about configuring a NixOS - module, then the XML file can be stored alongside the module - definition nix file. - - - - If you include multiple words in the file name, separate the words - with a dash. For example: ipv6-config.xml. - - - - Make sure that the xml:id value is unique. You can use - abbreviations if the ID is too long. For example: - nixos-config. - - - - Determine whether your topic is a chapter or a section. If you are - unsure, open an existing topic file and check whether the main - element is chapter or section. - - - - - -
- -
-Adding a Topic to the Book - - - Open the parent XML file and add an xi:include - element to the list of chapters with the file name of the topic that - you created. If you created a section, you add the file to - the chapter file. If you created a chapter, you - add the file to the part file. - - - - If the topic is about configuring a NixOS module, it can be - automatically included in the manual by using the - meta.doc attribute. See and someone will handle the conversion to XML for you. + +
+
+ Creating a Topic + + + You can use an existing topic as a basis for the new topic or create a topic + from scratch. + + + + Keep the following guidelines in mind when you create and add a topic: + + + + The NixOS + book + element is in nixos/doc/manual/manual.xml. It + includes several + parts + which are in subdirectories. + + + + + Store the topic file in the same directory as the part to + which it belongs. If your topic is about configuring a NixOS module, then + the XML file can be stored alongside the module definition + nix file. + + + + + If you include multiple words in the file name, separate the words with a + dash. For example: ipv6-config.xml. + + + + + Make sure that the xml:id value is unique. You can use + abbreviations if the ID is too long. For example: + nixos-config. + + + + + Determine whether your topic is a chapter or a section. If you are + unsure, open an existing topic file and check whether the main element is + chapter or section. + + + + +
+
+ Adding a Topic to the Book + + + Open the parent XML file and add an xi:include element to + the list of chapters with the file name of the topic that you created. If + you created a section, you add the file to the chapter + file. If you created a chapter, you add the file to the + part file. + + + + If the topic is about configuring a NixOS module, it can be automatically + included in the manual by using the meta.doc attribute. + See for an explanation. - - -
- - - - - - +
+
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index cb363b45675bf3eda9d2416f9817135f609228ea..bbf793bb0be9862f9c208b0b96fd0962f343ed18 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -3,52 +3,54 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-writing-modules"> - -Writing NixOS Modules - -NixOS has a modular system for declarative configuration. This -system combines multiple modules to produce the -full system configuration. One of the modules that constitute the -configuration is /etc/nixos/configuration.nix. -Most of the others live in the Writing NixOS Modules + + NixOS has a modular system for declarative configuration. This system + combines multiple modules to produce the full system + configuration. One of the modules that constitute the configuration is + /etc/nixos/configuration.nix. Most of the others live in + the + nixos/modules -subdirectory of the Nixpkgs tree. - -Each NixOS module is a file that handles one logical aspect of -the configuration, such as a specific kind of hardware, a service, or -network settings. A module configuration does not have to handle -everything from scratch; it can use the functionality provided by -other modules for its implementation. Thus a module can -declare options that can be used by other -modules, and conversely can define options -provided by other modules in its own implementation. For example, the -module + + Each NixOS module is a file that handles one logical aspect of the + configuration, such as a specific kind of hardware, a service, or network + settings. A module configuration does not have to handle everything from + scratch; it can use the functionality provided by other modules for its + implementation. Thus a module can declare options that + can be used by other modules, and conversely can define + options provided by other modules in its own implementation. For example, the + module + pam.nix -declares the option that allows -other modules (e.g. security.pam.services that allows other + modules (e.g. + sshd.nix) -to define PAM services; and it defines the option - (declared by environment.etc (declared by + etc.nix) -to cause files to be created in -/etc/pam.d. - -In /etc/pam.d. + + + In , we saw the following structure -of NixOS modules: - + of NixOS modules: { config, pkgs, ... }: { option definitions } - -This is actually an abbreviated form of module -that only defines options, but does not declare any. The structure of -full NixOS modules is shown in . - -Structure of NixOS Modules + This is actually an abbreviated form of module that only + defines options, but does not declare any. The structure of full NixOS + modules is shown in . + + + Structure of NixOS Modules { config, pkgs, ... }: @@ -65,56 +67,56 @@ full NixOS modules is shown in . option definitions }; } - - -The meaning of each part is as follows. - - - - This line makes the current Nix expression a function. The - variable pkgs contains Nixpkgs, while - config contains the full system configuration. - This line can be omitted if there is no reference to - pkgs and config inside the - module. - - - - This list enumerates the paths to other NixOS modules that - should be included in the evaluation of the system configuration. - A default set of modules is defined in the file - modules/module-list.nix. These don't need to - be added in the import list. - - - - The attribute options is a nested set of - option declarations (described below). - - - - The attribute config is a nested set of - option definitions (also described - below). - - - - - - shows a module that handles -the regular update of the “locate” database, an index of all files in -the file system. This module declares two options that can be defined -by other modules (typically the user’s -configuration.nix): - (whether the database should -be updated) and (when the -update should be done). It implements its functionality by defining -two options declared by other modules: - (the set of all systemd services) -and (the list of commands to be -executed periodically by systemd). - -NixOS Module for the “locate” Service + + + The meaning of each part is as follows. + + + + This line makes the current Nix expression a function. The variable + pkgs contains Nixpkgs, while config + contains the full system configuration. This line can be omitted if there + is no reference to pkgs and config + inside the module. + + + + + This list enumerates the paths to other NixOS modules that should be + included in the evaluation of the system configuration. A default set of + modules is defined in the file + modules/module-list.nix. These don't need to be added + in the import list. + + + + + The attribute options is a nested set of + option declarations (described below). + + + + + The attribute config is a nested set of + option definitions (also described below). + + + + + + shows a module that handles the regular + update of the “locate” database, an index of all files in the file + system. This module declares two options that can be defined by other modules + (typically the user’s configuration.nix): + (whether the database should be + updated) and (when the update + should be done). It implements its functionality by defining two options + declared by other modules: (the set of all + systemd services) and (the list of commands + to be executed periodically by systemd). + + + NixOS Module for the “locate” Service { config, lib, pkgs, ... }: @@ -173,13 +175,12 @@ in { }; } - - - - - - - - - + + + + + + + + diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index a8f6aa00858e3229493a678372ec3a554e6b6a6a..5935fbc049bde683dacf09f14bfa2a3bf1cd4c7e 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -3,11 +3,10 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-writing-nixos-tests"> + Writing Tests -Writing Tests - -A NixOS test is a Nix expression that has the following structure: - + + A NixOS test is a Nix expression that has the following structure: import ./make-test.nix { @@ -32,277 +31,391 @@ import ./make-test.nix { ''; } - -The attribute testScript is a bit of Perl code that -executes the test (described below). During the test, it will start -one or more virtual machines, the configuration of which is described -by the attribute machine (if you need only one -machine in your test) or by the attribute nodes (if -you need multiple machines). For instance, testScript is a bit of Perl code that + executes the test (described below). During the test, it will start one or + more virtual machines, the configuration of which is described by the + attribute machine (if you need only one machine in your + test) or by the attribute nodes (if you need multiple + machines). For instance, + login.nix -only needs a single machine to test whether users can log in on the -virtual console, whether device ownership is correctly maintained when -switching between consoles, and so on. On the other hand, nfs.nix, -which tests NFS client and server functionality in the Linux kernel -(including whether locks are maintained across server crashes), -requires three machines: a server and two clients. - -There are a few special NixOS configuration options for test -VMs: + which tests NFS client and server functionality in the Linux kernel + (including whether locks are maintained across server crashes), requires + three machines: a server and two clients. + + + There are a few special NixOS configuration options for test VMs: - - - - - - The memory of the VM in - megabytes. - - - - - The virtual networks to which the VM is - connected. See + + + + + + + The memory of the VM in megabytes. + + + + + + + + + + The virtual networks to which the VM is connected. See + nat.nix - for an example. - - - - - By default, the Nix store in the VM is not - writable. If you enable this option, a writable union file system - is mounted on top of the Nix store to make it appear - writable. This is necessary for tests that run Nix operations that - modify the store. - - - - -For more options, see the module qemu-vm.nix. - -The test script is a sequence of Perl statements that perform -various actions, such as starting VMs, executing commands in the VMs, -and so on. Each virtual machine is represented as an object stored in -the variable $name, -where name is the identifier of the machine -(which is just machine if you didn’t specify -multiple machines using the nodes attribute). For -instance, the following starts the machine, waits until it has -finished booting, then executes a command and checks that the output -is more-or-less correct: - + for an example. + + + + + + + + + + By default, the Nix store in the VM is not writable. If you enable this + option, a writable union file system is mounted on top of the Nix store + to make it appear writable. This is necessary for tests that run Nix + operations that modify the store. + + + + + For more options, see the module + qemu-vm.nix. + + + + The test script is a sequence of Perl statements that perform various + actions, such as starting VMs, executing commands in the VMs, and so on. Each + virtual machine is represented as an object stored in the variable + $name, where + name is the identifier of the machine (which is + just machine if you didn’t specify multiple machines + using the nodes attribute). For instance, the following + starts the machine, waits until it has finished booting, then executes a + command and checks that the output is more-or-less correct: $machine->start; $machine->waitForUnit("default.target"); $machine->succeed("uname") =~ /Linux/; - -The first line is actually unnecessary; machines are implicitly -started when you first execute an action on them (such as -waitForUnit or succeed). If you -have multiple machines, you can speed up the test by starting them in -parallel: - + The first line is actually unnecessary; machines are implicitly started when + you first execute an action on them (such as waitForUnit + or succeed). If you have multiple machines, you can speed + up the test by starting them in parallel: startAll; - - - -The following methods are available on machine objects: - - - - - start - Start the virtual machine. This method is - asynchronous — it does not wait for the machine to finish - booting. - - - - shutdown - Shut down the machine, waiting for the VM to - exit. - - - - crash - Simulate a sudden power failure, by telling the VM - to exit immediately. - - - - block - Simulate unplugging the Ethernet cable that - connects the machine to the other machines. - - - - unblock - Undo the effect of - block. - - - - screenshot - Take a picture of the display of the virtual - machine, in PNG format. The screenshot is linked from the HTML - log. - - - - getScreenText - Return a textual representation of what is currently - visible on the machine's screen using optical character - recognition. - This requires passing to the test - attribute set. - - - - sendMonitorCommand - Send a command to the QEMU monitor. This is rarely - used, but allows doing stuff such as attaching virtual USB disks - to a running machine. - - - - sendKeys - Simulate pressing keys on the virtual keyboard, - e.g., sendKeys("ctrl-alt-delete"). - - - - sendChars - Simulate typing a sequence of characters on the - virtual keyboard, e.g., sendKeys("foobar\n") - will type the string foobar followed by the - Enter key. - - - - execute - Execute a shell command, returning a list - (status, - stdout). - - - - succeed - Execute a shell command, raising an exception if - the exit status is not zero, otherwise returning the standard - output. - - - - fail - Like succeed, but raising - an exception if the command returns a zero status. - - - - waitUntilSucceeds - Repeat a shell command with 1-second intervals - until it succeeds. - - - - waitUntilFails - Repeat a shell command with 1-second intervals - until it fails. - - - - waitForUnit - Wait until the specified systemd unit has reached - the “active” state. - - - - waitForFile - Wait until the specified file - exists. - - - - waitForOpenPort - Wait until a process is listening on the given TCP - port (on localhost, at least). - - - - waitForClosedPort - Wait until nobody is listening on the given TCP - port. - - - - waitForX - Wait until the X11 server is accepting - connections. - - - - waitForText - Wait until the supplied regular expressions matches - the textual contents of the screen by using optical character recognition - (see getScreenText). - This requires passing to the test - attribute set. - - - - waitForWindow - Wait until an X11 window has appeared whose name - matches the given regular expression, e.g., - waitForWindow(qr/Terminal/). - - - - copyFileFromHost - Copies a file from host to machine, e.g., - copyFileFromHost("myfile", "/etc/my/important/file"). - The first argument is the file on the host. The file needs to be - accessible while building the nix derivation. The second argument is - the location of the file on the machine. + + + + The following methods are available on machine objects: + + + + start + + + + Start the virtual machine. This method is asynchronous — it does not + wait for the machine to finish booting. + - - - - systemctl + + + + shutdown + + + + Shut down the machine, waiting for the VM to exit. + + + + + + crash + - Runs systemctl commands with optional support for - systemctl --user - - + + Simulate a sudden power failure, by telling the VM to exit immediately. + + + + + + block + + + + Simulate unplugging the Ethernet cable that connects the machine to the + other machines. + + + + + + unblock + + + + Undo the effect of block. + + + + + + screenshot + + + + Take a picture of the display of the virtual machine, in PNG format. The + screenshot is linked from the HTML log. + + + + + + getScreenText + + + + Return a textual representation of what is currently visible on the + machine's screen using optical character recognition. + + + + This requires passing to the test attribute + set. + + + + + + + sendMonitorCommand + + + + Send a command to the QEMU monitor. This is rarely used, but allows doing + stuff such as attaching virtual USB disks to a running machine. + + + + + + sendKeys + + + + Simulate pressing keys on the virtual keyboard, e.g., + sendKeys("ctrl-alt-delete"). + + + + + + sendChars + + + + Simulate typing a sequence of characters on the virtual keyboard, e.g., + sendKeys("foobar\n") will type the string + foobar followed by the Enter key. + + + + + + execute + + + + Execute a shell command, returning a list + (status, + stdout). + + + + + + succeed + + + + Execute a shell command, raising an exception if the exit status is not + zero, otherwise returning the standard output. + + + + + + fail + + + + Like succeed, but raising an exception if the + command returns a zero status. + + + + + + waitUntilSucceeds + + + + Repeat a shell command with 1-second intervals until it succeeds. + + + + + + waitUntilFails + + + + Repeat a shell command with 1-second intervals until it fails. + + + + + + waitForUnit + + + + Wait until the specified systemd unit has reached the “active” state. + + + + + + waitForFile + + + + Wait until the specified file exists. + + + + + + waitForOpenPort + + + + Wait until a process is listening on the given TCP port (on + localhost, at least). + + + + + + waitForClosedPort + + + + Wait until nobody is listening on the given TCP port. + + + + + + waitForX + + + + Wait until the X11 server is accepting connections. + + + + + + waitForText + + + + Wait until the supplied regular expressions matches the textual contents + of the screen by using optical character recognition (see + getScreenText). + + + + This requires passing to the test attribute + set. + + + + + + + waitForWindow + + + + Wait until an X11 window has appeared whose name matches the given + regular expression, e.g., waitForWindow(qr/Terminal/). + + + + + + copyFileFromHost + + + + Copies a file from host to machine, e.g., + copyFileFromHost("myfile", "/etc/my/important/file"). + + + The first argument is the file on the host. The file needs to be + accessible while building the nix derivation. The second argument is the + location of the file on the machine. + + + + + + systemctl + + + + Runs systemctl commands with optional support for + systemctl --user + + + $machine->systemctl("list-jobs --no-pager"); // runs `systemctl list-jobs --no-pager` $machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` - + - + + + - - - - - - To test user units declared by systemd.user.services the optional $user - argument can be used: - - + + To test user units declared by systemd.user.services the + optional $user argument can be used: + $machine->start; $machine->waitForX; $machine->waitForUnit("xautolock.service", "x-session-user"); - This applies to systemctl, getUnitInfo, - waitForUnit, startJob - and stopJob. - - + waitForUnit, startJob and + stopJob. + diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index 4db9020b96064a09d2fbf6abceed87d3b928b6de..1a116ec0b6556dc8ef698dc86870cbc2765ebf83 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -2,101 +2,84 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="sec-changing-config"> - -Changing the Configuration - -The file /etc/nixos/configuration.nix -contains the current configuration of your machine. Whenever you’ve -changed something in that file, you should do - + Changing the Configuration + + The file /etc/nixos/configuration.nix contains the + current configuration of your machine. Whenever you’ve + changed something in that file, you + should do # nixos-rebuild switch - -to build the new configuration, make it the default configuration for -booting, and try to realise the configuration in the running system -(e.g., by restarting system services). - -These commands must be executed as root, so you should -either run them from a root shell or by prefixing them with -sudo -i. - -You can also do - + to build the new configuration, make it the default configuration for + booting, and try to realise the configuration in the running system (e.g., by + restarting system services). + + + + These commands must be executed as root, so you should either run them from + a root shell or by prefixing them with sudo -i. + + + + You can also do # nixos-rebuild test - -to build the configuration and switch the running system to it, but -without making it the boot default. So if (say) the configuration -locks up your machine, you can just reboot to get back to a working -configuration. - -There is also - + to build the configuration and switch the running system to it, but without + making it the boot default. So if (say) the configuration locks up your + machine, you can just reboot to get back to a working configuration. + + + There is also # nixos-rebuild boot - -to build the configuration and make it the boot default, but not -switch to it now (so it will only take effect after the next -reboot). - -You can make your configuration show up in a different submenu -of the GRUB 2 boot screen by giving it a different profile -name, e.g. - + to build the configuration and make it the boot default, but not switch to it + now (so it will only take effect after the next reboot). + + + You can make your configuration show up in a different submenu of the GRUB 2 + boot screen by giving it a different profile name, e.g. # nixos-rebuild switch -p test - -which causes the new configuration (and previous ones created using --p test) to show up in the GRUB submenu “NixOS - -Profile 'test'”. This can be useful to separate test configurations -from “stable” configurations. - -Finally, you can do - + which causes the new configuration (and previous ones created using + -p test) to show up in the GRUB submenu “NixOS - Profile + 'test'”. This can be useful to separate test configurations from + “stable” configurations. + + + Finally, you can do $ nixos-rebuild build - -to build the configuration but nothing more. This is useful to see -whether everything compiles cleanly. - -If you have a machine that supports hardware virtualisation, you -can also test the new configuration in a sandbox by building and -running a QEMU virtual machine that contains the -desired configuration. Just do - + to build the configuration but nothing more. This is useful to see whether + everything compiles cleanly. + + + If you have a machine that supports hardware virtualisation, you can also + test the new configuration in a sandbox by building and running a QEMU + virtual machine that contains the desired configuration. + Just do $ nixos-rebuild build-vm $ ./result/bin/run-*-vm - -The VM does not have any data from your host system, so your existing -user accounts and home directories will not be available unless you -have set mutableUsers = false. Another way is to -temporarily add the following to your configuration: - + The VM does not have any data from your host system, so your existing user + accounts and home directories will not be available unless you have set + mutableUsers = false. Another way is to temporarily add + the following to your configuration: -users.extraUsers.your-user.initialPassword = "test" +users.users.your-user.initialHashedPassword = "test"; - -Important: delete the $hostname.qcow2 file if you -have started the virtual machine at least once without the right -users, otherwise the changes will not get picked up. - -You can forward ports on the host to the guest. For -instance, the following will forward host port 2222 to guest port 22 -(SSH): - + Important: delete the $hostname.qcow2 file if you have + started the virtual machine at least once without the right users, otherwise + the changes will not get picked up. You can forward ports on the host to the + guest. For instance, the following will forward host port 2222 to guest port + 22 (SSH): $ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm - -allowing you to log in via SSH (assuming you have set the appropriate -passwords or SSH authorized keys): - + allowing you to log in via SSH (assuming you have set the appropriate + passwords or SSH authorized keys): $ ssh -p 2222 localhost - - - + diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml index ee61bedc4183a827bada575cba23a67fb7379cc0..d4276be95d6893df24151ab1f63ecc5652c6b011 100644 --- a/nixos/doc/manual/installation/installation.xml +++ b/nixos/doc/manual/installation/installation.xml @@ -3,19 +3,15 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-installation"> - -Installation - - - -This section describes how to obtain, install, and configure -NixOS for first-time use. - - - - - - - - + Installation + + + This section describes how to obtain, install, and configure NixOS for + first-time use. + + + + + + diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index ecd020a067a95ff5750581af3c252ae54ca25cb0..d1e49a2a1597cc903909379595fa7ba785a69b96 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -5,280 +5,325 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-installing-from-other-distro"> - - Installing from another Linux distribution - - - Because Nix (the package manager) & Nixpkgs (the Nix packages - collection) can both be installed on any (most?) Linux distributions, - they can be used to install NixOS in various creative ways. You can, - for instance: - - - - Install NixOS on another partition, from your existing - Linux distribution (without the use of a USB or optical - device!) - - Install NixOS on the same partition (in place!), from - your existing non-NixOS Linux distribution using - NIXOS_LUSTRATE. - - Install NixOS on your hard drive from the Live CD of - any Linux distribution. - - - The first steps to all these are the same: - - - - Install the Nix package manager: - - Short version: - - -$ bash <(curl https://nixos.org/nix/install) + Installing from another Linux distribution + + + Because Nix (the package manager) & Nixpkgs (the Nix packages collection) + can both be installed on any (most?) Linux distributions, they can be used to + install NixOS in various creative ways. You can, for instance: + + + + + + Install NixOS on another partition, from your existing Linux distribution + (without the use of a USB or optical device!) + + + + + Install NixOS on the same partition (in place!), from your existing + non-NixOS Linux distribution using NIXOS_LUSTRATE. + + + + + Install NixOS on your hard drive from the Live CD of any Linux + distribution. + + + + + + The first steps to all these are the same: + + + + + + Install the Nix package manager: + + + Short version: + + +$ curl https://nixos.org/nix/install | sh $ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell - - More details in the + More details in the + - Nix manual - - - - Switch to the NixOS channel: - - If you've just installed Nix on a non-NixOS distribution, you - will be on the nixpkgs channel by - default. - - + Nix manual + + + + + Switch to the NixOS channel: + + + If you've just installed Nix on a non-NixOS distribution, you will be on + the nixpkgs channel by default. + + $ nix-channel --list nixpkgs https://nixos.org/channels/nixpkgs-unstable - - As that channel gets released without running the NixOS - tests, it will be safer to use the nixos-* - channels instead: - - + + As that channel gets released without running the NixOS tests, it will be + safer to use the nixos-* channels instead: + + $ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs - - You may want to throw in a nix-channel - --update for good measure. - - - - Install the NixOS installation tools: - - You'll need nixos-generate-config and - nixos-install and we'll throw in some man - pages and nixos-enter just in case you want - to chroot into your NixOS partition. They are installed by - default on NixOS, but you don't have NixOS yet.. - - $ nix-env -iE "_: with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]" - - - - The following 5 steps are only for installing NixOS to - another partition. For installing NixOS in place using - NIXOS_LUSTRATE, skip ahead. - - Prepare your target partition: - - At this point it is time to prepare your target partition. - Please refer to the partitioning, file-system creation, and - mounting steps of - - If you're about to install NixOS in place using - NIXOS_LUSTRATE there is nothing to do for - this step. - - - - Generate your NixOS configuration: - - $ sudo `which nixos-generate-config` --root /mnt - - You'll probably want to edit the configuration files. Refer - to the nixos-generate-config step in for more information. - - Consider setting up the NixOS bootloader to give you the - ability to boot on your existing Linux partition. For instance, - if you're using GRUB and your existing distribution is running - Ubuntu, you may want to add something like this to your - configuration.nix: - - -boot.loader.grub.extraEntries = '' + + You may want to throw in a nix-channel --update for good + measure. + + + + + Install the NixOS installation tools: + + + You'll need nixos-generate-config and + nixos-install and we'll throw in some man pages and + nixos-enter just in case you want to chroot into your + NixOS partition. They are installed by default on NixOS, but you don't have + NixOS yet.. + +$ nix-env -iE "_: with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]" + + + + + The following 5 steps are only for installing NixOS to another partition. + For installing NixOS in place using NIXOS_LUSTRATE, + skip ahead. + + + + Prepare your target partition: + + + At this point it is time to prepare your target partition. Please refer to + the partitioning, file-system creation, and mounting steps of + + + + If you're about to install NixOS in place using + NIXOS_LUSTRATE there is nothing to do for this step. + + + + + Generate your NixOS configuration: + +$ sudo `which nixos-generate-config` --root /mnt + + You'll probably want to edit the configuration files. Refer to the + nixos-generate-config step in + for more + information. + + + Consider setting up the NixOS bootloader to give you the ability to boot on + your existing Linux partition. For instance, if you're using GRUB and your + existing distribution is running Ubuntu, you may want to add something like + this to your configuration.nix: + + + = '' menuentry "Ubuntu" { search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e configfile "($ubuntu)/boot/grub/grub.cfg" } ''; - - (You can find the appropriate UUID for your partition in - /dev/disk/by-uuid) - - - - Create the nixbld group and user on your - original distribution: - - + + (You can find the appropriate UUID for your partition in + /dev/disk/by-uuid) + + + + + Create the nixbld group and user on your original + distribution: + + $ sudo groupadd -g 30000 nixbld $ sudo useradd -u 30000 -g nixbld -G nixbld nixbld - - - - Download/build/install NixOS: - - Once you complete this step, you might no longer be - able to boot on existing systems without the help of a - rescue USB drive or similar. - - $ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt - - Again, please refer to the nixos-install - step in for more - information. - - That should be it for installation to another partition! - - - - Optionally, you may want to clean up your non-NixOS distribution: - - + + + + Download/build/install NixOS: + + + + Once you complete this step, you might no longer be able to boot on + existing systems without the help of a rescue USB drive or similar. + + +$ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt + + Again, please refer to the nixos-install step in + for more information. + + + That should be it for installation to another partition! + + + + + Optionally, you may want to clean up your non-NixOS distribution: + + $ sudo userdel nixbld $ sudo groupdel nixbld - - If you do not wish to keep the Nix package mananager - installed either, run something like sudo rm -rv - ~/.nix-* /nix and remove the line that the Nix - installer added to your ~/.profile. - - - - The following steps are only for installing NixOS in - place using - NIXOS_LUSTRATE: - - Generate your NixOS configuration: - - $ sudo `which nixos-generate-config` --root / - - Note that this will place the generated configuration files - in /etc/nixos. You'll probably want to edit - the configuration files. Refer to the - nixos-generate-config step in for more information. - - You'll likely want to set a root password for your first boot - using the configuration files because you won't have a chance - to enter a password until after you reboot. You can initalize - the root password to an empty one with this line: (and of course - don't forget to set one once you've rebooted or to lock the - account with sudo passwd -l root if you use - sudo) - - users.extraUsers.root.initialHashedPassword = ""; - - - - Build the NixOS closure and install it in the - system profile: - - $ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system - - - - Change ownership of the /nix tree to root - (since your Nix install was probably single user): - - $ sudo chown -R 0.0 /nix - - - - Set up the /etc/NIXOS and - /etc/NIXOS_LUSTRATE files: - - /etc/NIXOS officializes that this is now a - NixOS partition (the bootup scripts require its presence). - - /etc/NIXOS_LUSTRATE tells the NixOS bootup - scripts to move everything that's in the - root partition to /old-root. This will move - your existing distribution out of the way in the very early - stages of the NixOS bootup. There are exceptions (we do need to - keep NixOS there after all), so the NixOS lustrate process will - not touch: - - - The /nix - directory - - The /boot - directory - - Any file or directory listed in - /etc/NIXOS_LUSTRATE (one per - line) - - - Support for NIXOS_LUSTRATE was added - in NixOS 16.09. The act of "lustrating" refers to the - wiping of the existing distribution. Creating - /etc/NIXOS_LUSTRATE can also be used on - NixOS to remove all mutable files from your root partition - (anything that's not in /nix or - /boot gets "lustrated" on the next - boot. - lustrate /ˈlʌstreɪt/ verb. - purify by expiatory sacrifice, ceremonial washing, or - some other ritual action. - - Let's create the files: - - + + If you do not wish to keep the Nix package manager installed either, run + something like sudo rm -rv ~/.nix-* /nix and remove the + line that the Nix installer added to your ~/.profile. + + + + + + The following steps are only for installing NixOS in place using + NIXOS_LUSTRATE: + + + + Generate your NixOS configuration: + +$ sudo `which nixos-generate-config` --root / + + Note that this will place the generated configuration files in + /etc/nixos. You'll probably want to edit the + configuration files. Refer to the nixos-generate-config + step in for more + information. + + + You'll likely want to set a root password for your first boot using the + configuration files because you won't have a chance to enter a password + until after you reboot. You can initalize the root password to an empty one + with this line: (and of course don't forget to set one once you've rebooted + or to lock the account with sudo passwd -l root if you + use sudo) + + +users.users.root.initialHashedPassword = ""; + + + + + Build the NixOS closure and install it in the system + profile: + +$ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system + + + + Change ownership of the /nix tree to root (since your + Nix install was probably single user): + +$ sudo chown -R 0.0 /nix + + + + Set up the /etc/NIXOS and + /etc/NIXOS_LUSTRATE files: + + + /etc/NIXOS officializes that this is now a NixOS + partition (the bootup scripts require its presence). + + + /etc/NIXOS_LUSTRATE tells the NixOS bootup scripts to + move everything that's in the root partition to + /old-root. This will move your existing distribution out + of the way in the very early stages of the NixOS bootup. There are + exceptions (we do need to keep NixOS there after all), so the NixOS + lustrate process will not touch: + + + + + The /nix directory + + + + + The /boot directory + + + + + Any file or directory listed in /etc/NIXOS_LUSTRATE + (one per line) + + + + + + Support for NIXOS_LUSTRATE was added in NixOS 16.09. + The act of "lustrating" refers to the wiping of the existing distribution. + Creating /etc/NIXOS_LUSTRATE can also be used on NixOS + to remove all mutable files from your root partition (anything that's not + in /nix or /boot gets "lustrated" on + the next boot. + + + lustrate /ˈlʌstreɪt/ verb. + + + purify by expiatory sacrifice, ceremonial washing, or some other ritual + action. + + + + Let's create the files: + + $ sudo touch /etc/NIXOS -$ sudo touch /etc/NIXOS_LUSTRATE - - Let's also make sure the NixOS configuration files are kept - once we reboot on NixOS: - - -$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE - - - - Finally, move the /boot directory of your - current distribution out of the way (the lustrate process will - take care of the rest once you reboot, but this one must be - moved out now because NixOS needs to install its own boot - files: - - Once you complete this step, your current - distribution will no longer be bootable! If you didn't get - all the NixOS configuration right, especially those - settings pertaining to boot loading and root partition, - NixOS may not be bootable either. Have a USB rescue device - ready in case this happens. - - +$ sudo touch /etc/NIXOS_LUSTRATE + + + Let's also make sure the NixOS configuration files are kept once we reboot + on NixOS: + + +$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE + + + + + Finally, move the /boot directory of your current + distribution out of the way (the lustrate process will take care of the + rest once you reboot, but this one must be moved out now because NixOS + needs to install its own boot files: + + + + Once you complete this step, your current distribution will no longer be + bootable! If you didn't get all the NixOS configuration right, especially + those settings pertaining to boot loading and root partition, NixOS may + not be bootable either. Have a USB rescue device ready in case this + happens. + + + $ sudo mv -v /boot /boot.bak && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot - - Cross your fingers, reboot, hopefully you should get a NixOS - prompt! - - - If for some reason you want to revert to the old - distribution, you'll need to boot on a USB rescue disk and do - something along these lines: - - + + Cross your fingers, reboot, hopefully you should get a NixOS prompt! + + + + + If for some reason you want to revert to the old distribution, you'll need + to boot on a USB rescue disk and do something along these lines: + + # mkdir root # mount /dev/sdaX root # mkdir root/nixos-root @@ -287,23 +332,25 @@ $ sudo mv -v /boot /boot.bak && # mv -v root/boot.bak root/boot # We had renamed this by hand earlier # umount root # reboot - - This may work as is or you might also need to reinstall the - boot loader - - And of course, if you're happy with NixOS and no longer need - the old distribution: - - sudo rm -rf /old-root - - - - It's also worth noting that this whole process can be - automated. This is especially useful for Cloud VMs, where - provider do not provide NixOS. For instance, + This may work as is or you might also need to reinstall the boot loader + + + And of course, if you're happy with NixOS and no longer need the old + distribution: + +sudo rm -rf /old-root + + + + It's also worth noting that this whole process can be automated. This is + especially useful for Cloud VMs, where provider do not provide NixOS. For + instance, + nixos-infect - uses the lustrate process to convert Digital Ocean droplets to - NixOS from other distributions automatically. - - + uses the lustrate process to convert Digital Ocean droplets to NixOS from + other distributions automatically. + + + diff --git a/nixos/doc/manual/installation/installing-pxe.xml b/nixos/doc/manual/installation/installing-pxe.xml index 7b7597c91626832421bd77ca93e825a7be76165f..94199e5e028db4844556b889699c75403be94276 100644 --- a/nixos/doc/manual/installation/installing-pxe.xml +++ b/nixos/doc/manual/installation/installing-pxe.xml @@ -3,46 +3,48 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-booting-from-pxe"> + Booting from the <quote>netboot</quote> media (PXE) -Booting from the <quote>netboot</quote> media (PXE) - - Advanced users may wish to install NixOS using an existing PXE or - iPXE setup. - - + + Advanced users may wish to install NixOS using an existing PXE or iPXE setup. + + + These instructions assume that you have an existing PXE or iPXE - infrastructure and simply want to add the NixOS installer as another - option. To build the necessary files from a recent version of - nixpkgs, you can run: - + infrastructure and simply want to add the NixOS installer as another option. + To build the necessary files from a recent version of nixpkgs, you can run: + + nix-build -A netboot nixos/release.nix - + + This will create a result directory containing: * - bzImage – the Linux kernel * - initrd – the initrd file * - netboot.ipxe – an example ipxe script - demonstrating the appropriate kernel command line arguments for this + bzImage – the Linux kernel * initrd + – the initrd file * netboot.ipxe – an example ipxe + script demonstrating the appropriate kernel command line arguments for this image - - + + + If you’re using plain PXE, configure your boot loader to use the - bzImage and initrd files and - have it provide the same kernel command line arguments found in + bzImage and initrd files and have it + provide the same kernel command line arguments found in netboot.ipxe. - - + + + If you’re using iPXE, depending on how your HTTP/FTP/etc. server is - configured you may be able to use netboot.ipxe - unmodified, or you may need to update the paths to the files to - match your server’s directory layout - - - In the future we may begin making these files available as build - products from hydra at which point we will update this documentation - with instructions on how to obtain them either for placing on a - dedicated TFTP server or to boot them directly over the internet. - + configured you may be able to use netboot.ipxe unmodified, + or you may need to update the paths to the files to match your server’s + directory layout + + + In the future we may begin making these files available as build products + from hydra at which point we will update this documentation with instructions + on how to obtain them either for placing on a dedicated TFTP server or to + boot them directly over the internet. + diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 122a4745f1948acc2c29d8441892ca9ab67f9883..c5934111749cf7dd75dbd9ddd181e4b2de3139b8 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -3,17 +3,19 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-booting-from-usb"> + Booting from a USB Drive -Booting from a USB Drive + + For systems without CD drive, the NixOS live CD can be booted from a USB + stick. You can use the dd utility to write the image: + dd if=path-to-image + of=/dev/sdb. Be careful about specifying + the correct drive; you can use the lsblk command to get a + list of block devices. + -For systems without CD drive, the NixOS live CD can be booted from -a USB stick. You can use the dd utility to write the image: -dd if=path-to-image -of=/dev/sdb. Be careful about specifying the -correct drive; you can use the lsblk command to get a list of -block devices. - -On macOS: + + On macOS: $ diskutil list [..] @@ -24,36 +26,43 @@ $ diskutil unmountDisk diskN Unmount of all volumes on diskN was successful $ sudo dd bs=1m if=nix.iso of=/dev/rdiskN -Using the 'raw' rdiskN device instead of diskN -completes in minutes instead of hours. After dd completes, a GUI -dialog "The disk you inserted was not readable by this computer" will pop up, which -can be ignored. - -The dd utility will write the image verbatim to the drive, -making it the recommended option for both UEFI and non-UEFI installations. For -non-UEFI installations, you can alternatively use -unetbootin. If you -cannot use dd for a UEFI installation, you can also mount the -ISO, copy its contents verbatim to your drive, then either: - - - - Change the label of the disk partition to the label of the ISO - (visible with the blkid command), or - - - Edit loader/entries/nixos-livecd.conf on the drive - and change the root= field in the options - line to point to your drive (see the documentation on root= - in - the kernel documentation for more details). - - - If you want to load the contents of the ISO to ram after bootin - (So you can remove the stick after bootup) you can append the parameter - copytoramto the options field. - - - + Using the 'raw' rdiskN device instead of + diskN completes in minutes instead of hours. After + dd completes, a GUI dialog "The disk you inserted was not + readable by this computer" will pop up, which can be ignored. + + + The dd utility will write the image verbatim to the drive, + making it the recommended option for both UEFI and non-UEFI installations. + For non-UEFI installations, you can alternatively use + unetbootin. If + you cannot use dd for a UEFI installation, you can also + mount the ISO, copy its contents verbatim to your drive, then either: + + + + Change the label of the disk partition to the label of the ISO (visible + with the blkid command), or + + + + + Edit loader/entries/nixos-livecd.conf on the drive + and change the root= field in the + options line to point to your drive (see the + documentation on root= in + + the kernel documentation for more details). + + + + + If you want to load the contents of the ISO to ram after bootin (So you + can remove the stick after bootup) you can append the parameter + copytoram to the options field. + + + + diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 7fcd22a112cf0e3b4e4ccd330ab17e034ebf9776..da78b480f5aa90f07fbd0c8aab2ae7c92aa58972 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -3,63 +3,82 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-instaling-virtualbox-guest"> + Installing in a VirtualBox guest -Installing in a VirtualBox guest - + Installing NixOS into a VirtualBox guest is convenient for users who want to try NixOS without installing it on bare metal. If you want to use a pre-made - VirtualBox appliance, it is available at the downloads page. - If you want to set up a VirtualBox guest manually, follow these instructions: - - - - - Add a New Machine in VirtualBox with OS Type "Linux / Other - Linux" - - Base Memory Size: 768 MB or higher. - - New Hard Disk of 8 GB or higher. - - Mount the CD-ROM with the NixOS ISO (by clicking on - CD/DVD-ROM) - - Click on Settings / System / Processor and enable - PAE/NX - - Click on Settings / System / Acceleration and enable - "VT-x/AMD-V" acceleration - - Save the settings, start the virtual machine, and continue - installation like normal - - - - - There are a few modifications you should make in configuration.nix. - Enable booting: - + VirtualBox appliance, it is available at + the downloads + page. If you want to set up a VirtualBox guest manually, follow these + instructions: + + + + + + Add a New Machine in VirtualBox with OS Type "Linux / Other Linux" + + + + + Base Memory Size: 768 MB or higher. + + + + + New Hard Disk of 8 GB or higher. + + + + + Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM) + + + + + Click on Settings / System / Processor and enable PAE/NX + + + + + Click on Settings / System / Acceleration and enable "VT-x/AMD-V" + acceleration + + + + + Save the settings, start the virtual machine, and continue installation + like normal + + + + + + There are a few modifications you should make in configuration.nix. Enable + booting: + -boot.loader.grub.device = "/dev/sda"; + = "/dev/sda"; - + Also remove the fsck that runs at startup. It will always fail to run, stopping your boot until you press *. - + -boot.initrd.checkJournalingFS = false; + = false; - + Shared folders can be given a name and a path in the host system in the VirtualBox settings (Machine / Settings / Shared Folders, then click on the "Add" icon). Add the following to the /etc/nixos/configuration.nix to auto-mount them: - + { config, pkgs, ...} : @@ -74,8 +93,7 @@ boot.initrd.checkJournalingFS = false; } - + The folder will be available directly under the root directory. - - + diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index e20b6574b72543c2f982297246bf992c3c0e5ea9..6f8e0f613b198aa0d67d40ebc2cc1e10e7d9a1f6 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -3,66 +3,94 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-installation"> - -Installing NixOS - -NixOS can be installed on BIOS or UEFI systems. The procedure -for a UEFI installation is by and large the same as a BIOS installation. The differences are mentioned in the steps that follow. - - - - Boot from the CD. - - UEFI systems - You should boot the live CD in UEFI mode - (consult your specific hardware's documentation for instructions). - You may find the rEFInd boot - manager useful. - - The CD contains a basic NixOS installation. (It - also contains Memtest86+, useful if you want to test new hardware). - When it’s finished booting, it should have detected most of your - hardware. - - The NixOS manual is available on virtual console 8 - (press Alt+F8 to access) or by running nixos-help. - - - You get logged in as root - (with empty password). - - If you downloaded the graphical ISO image, you can - run systemctl start display-manager to start KDE. If you - want to continue on the terminal, you can use - loadkeys to switch to your preferred keyboard layout. - (We even provide neo2 via loadkeys de neo!) - - The boot process should have brought up networking (check - ip a). Networking is necessary for the - installer, since it will download lots of stuff (such as source - tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP - server on your network. Otherwise configure networking manually - using ifconfig. - To manually configure the network on the graphical installer, - first disable network-manager with - systemctl stop network-manager. - To manually configure the wifi on the minimal installer, run - wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID' 'key'). - - - If you would like to continue the installation from a different - machine you need to activate the SSH daemon via systemctl start sshd. - In order to be able to login you also need to set a password for - root using passwd. - - The NixOS installer doesn’t do any partitioning or - formatting yet, so you need to do that yourself. Use the following - commands: - - - - For partitioning: - fdisk. + Installing NixOS + + NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI + installation is by and large the same as a BIOS installation. The differences + are mentioned in the steps that follow. + + + + + Boot from the CD. + + + + + UEFI systems + + + + You should boot the live CD in UEFI mode (consult your specific + hardware's documentation for instructions). You may find the + rEFInd boot + manager useful. + + + + + + + + The CD contains a basic NixOS installation. (It also contains Memtest86+, + useful if you want to test new hardware). When it’s finished booting, it + should have detected most of your hardware. + + + + + The NixOS manual is available on virtual console 8 (press Alt+F8 to access) + or by running nixos-help. + + + + + You get logged in as root (with empty password). + + + + + If you downloaded the graphical ISO image, you can run systemctl + start display-manager to start KDE. If you want to continue on + the terminal, you can use loadkeys to switch to your + preferred keyboard layout. (We even provide neo2 via loadkeys de + neo!) + + + + + The boot process should have brought up networking (check ip + a). Networking is necessary for the installer, since it will + download lots of stuff (such as source tarballs or Nixpkgs channel + binaries). It’s best if you have a DHCP server on your network. Otherwise + configure networking manually using ifconfig. + + + To manually configure the network on the graphical installer, first disable + network-manager with systemctl stop network-manager. + + + To manually configure the wifi on the minimal installer, run + wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID' + 'key'). + + + + + If you would like to continue the installation from a different machine you + need to activate the SSH daemon via systemctl start + sshd. In order to be able to login you also need to set a + password for root using passwd. + + + + + The NixOS installer doesn’t do any partitioning or formatting yet, so you + need to do that yourself. Use the following commands: + + + + For partitioning: fdisk. # fdisk /dev/sda # (or whatever device you want to install on) -- for UEFI systems only @@ -86,259 +114,273 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif > x # (enter expert mode) > f # (fix up the partition ordering) > r # (exit expert mode) -> w # (write the partition table to disk and exit) - - For initialising Ext4 partitions: - mkfs.ext4. It is recommended that you assign a - unique symbolic label to the file system using the option - , since this - makes the file system configuration independent from device - changes. For example: - +> w # (write the partition table to disk and exit) + + + + + For initialising Ext4 partitions: mkfs.ext4. It is + recommended that you assign a unique symbolic label to the file system + using the option , + since this makes the file system configuration independent from device + changes. For example: # mkfs.ext4 -L nixos /dev/sda1 - - - - For creating swap partitions: - mkswap. Again it’s recommended to assign a - label to the swap partition: . For example: - + + + + + For creating swap partitions: mkswap. Again it’s + recommended to assign a label to the swap partition: . For example: # mkswap -L swap /dev/sda2 - - - - - - UEFI systems - For creating boot partitions: - mkfs.fat. Again it’s recommended to assign a - label to the boot partition: . For example: - - -# mkfs.fat -F 32 -L boot /dev/sda3 - - - - For creating LVM volumes, the LVM commands, e.g., - + + + + + + + UEFI systems + + + + For creating boot partitions: mkfs.fat. Again + it’s recommended to assign a label to the boot partition: + . For example: -# pvcreate /dev/sda1 /dev/sdb1 -# vgcreate MyVolGroup /dev/sda1 /dev/sdb1 -# lvcreate --size 2G --name bigdisk MyVolGroup -# lvcreate --size 1G --name smalldisk MyVolGroup - - - - For creating software RAID devices, use - mdadm. - - - - - - Mount the target file system on which NixOS should - be installed on /mnt, e.g. - +# mkfs.fat -F 32 -n boot /dev/sda3 + + + + + + + + For creating LVM volumes, the LVM commands, e.g., + pvcreate, vgcreate, and + lvcreate. + + + + + For creating software RAID devices, use mdadm. + + + + + + + + Mount the target file system on which NixOS should be installed on + /mnt, e.g. # mount /dev/disk/by-label/nixos /mnt - - - + + - - UEFI systems - Mount the boot file system on /mnt/boot, e.g. - + + + + UEFI systems + + + + Mount the boot file system on /mnt/boot, e.g. +# mkdir -p /mnt/boot # mount /dev/disk/by-label/boot /mnt/boot - - - - If your machine has a limited amount of memory, you - may want to activate swap devices now (swapon - device). The installer (or - rather, the build actions that it may spawn) may need quite a bit of - RAM, depending on your configuration. - + + + + + + + + If your machine has a limited amount of memory, you may want to activate + swap devices now (swapon + device). The installer (or rather, the + build actions that it may spawn) may need quite a bit of RAM, depending on + your configuration. # swapon /dev/sda2 - - - + + - - You now need to create a file - /mnt/etc/nixos/configuration.nix that - specifies the intended configuration of the system. This is - because NixOS has a declarative configuration - model: you create or edit a description of the desired - configuration of your system, and then NixOS takes care of making - it happen. The syntax of the NixOS configuration file is - described in , while a - list of available configuration options appears in . A minimal example is shown in . - - The command nixos-generate-config can - generate an initial configuration file for you: - + + You now need to create a file + /mnt/etc/nixos/configuration.nix that specifies the + intended configuration of the system. This is because NixOS has a + declarative configuration model: you create or edit a + description of the desired configuration of your system, and then NixOS + takes care of making it happen. The syntax of the NixOS configuration file + is described in , while a list of + available configuration options appears in + . A minimal example is shown in + . + + + The command nixos-generate-config can generate an + initial configuration file for you: # nixos-generate-config --root /mnt - - You should then edit - /mnt/etc/nixos/configuration.nix to suit your - needs: - + You should then edit /mnt/etc/nixos/configuration.nix + to suit your needs: # nano /mnt/etc/nixos/configuration.nix - - If you’re using the graphical ISO image, other editors may be - available (such as vim). If you have network - access, you can also install other editors — for instance, you can - install Emacs by running nix-env -i - emacs. - - - - BIOS systems - You must set the option - to specify on which disk - the GRUB boot loader is to be installed. Without it, NixOS cannot - boot. - - UEFI systems - You must set the option - to true. - nixos-generate-config should do this automatically for new - configurations when booted in - UEFI mode. - You may want to look at the options starting with - and - as well. - - - - If there are other operating systems running on the machine before - installing NixOS, the - option can be set to - true to automatically add them to the grub menu. - - Another critical option is , - specifying the file systems that need to be mounted by NixOS. - However, you typically don’t need to set it yourself, because + If you’re using the graphical ISO image, other editors may be available + (such as vim). If you have network access, you can also + install other editors — for instance, you can install Emacs by running + nix-env -i emacs. + + + + + BIOS systems + + + + You must set the option + to specify on which disk + the GRUB boot loader is to be installed. Without it, NixOS cannot boot. + + + + + + UEFI systems + + + + You must set the option + to + true. nixos-generate-config should + do this automatically for new configurations when booted in UEFI mode. + + + You may want to look at the options starting with + + and + + as well. + + + + + + If there are other operating systems running on the machine before + installing NixOS, the + option can be set to true to automatically add them to + the grub menu. + + + Another critical option is , specifying the + file systems that need to be mounted by NixOS. However, you typically + don’t need to set it yourself, because nixos-generate-config sets it automatically in - /mnt/etc/nixos/hardware-configuration.nix - from your currently mounted file systems. (The configuration file + /mnt/etc/nixos/hardware-configuration.nix from your + currently mounted file systems. (The configuration file hardware-configuration.nix is included from - configuration.nix and will be overwritten by - future invocations of nixos-generate-config; - thus, you generally should not modify it.) - - Depending on your hardware configuration or type of - file system, you may need to set the option - to include the kernel - modules that are necessary for mounting the root file system, - otherwise the installed system will not be able to boot. (If this - happens, boot from the CD again, mount the target file system on - /mnt, fix - /mnt/etc/nixos/configuration.nix and rerun - nixos-install.) In most cases, - nixos-generate-config will figure out the - required modules. - + configuration.nix and will be overwritten by future + invocations of nixos-generate-config; thus, you + generally should not modify it.) + + + + Depending on your hardware configuration or type of file system, you may + need to set the option to + include the kernel modules that are necessary for mounting the root file + system, otherwise the installed system will not be able to boot. (If this + happens, boot from the CD again, mount the target file system on + /mnt, fix + /mnt/etc/nixos/configuration.nix and rerun + nixos-install.) In most cases, + nixos-generate-config will figure out the required + modules. + + - - Do the installation: - + + + Do the installation: # nixos-install - - Cross fingers. If this fails due to a temporary problem (such as - a network issue while downloading binaries from the NixOS binary - cache), you can just re-run nixos-install. - Otherwise, fix your configuration.nix and - then re-run nixos-install. - - As the last step, nixos-install will ask - you to set the password for the root user, e.g. - + Cross fingers. If this fails due to a temporary problem (such as a network + issue while downloading binaries from the NixOS binary cache), you can just + re-run nixos-install. Otherwise, fix your + configuration.nix and then re-run + nixos-install. + + + As the last step, nixos-install will ask you to set the + password for the root user, e.g. setting root password... Enter new UNIX password: *** Retype new UNIX password: *** - - + - - To prevent the password prompt, set users.mutableUsers = false; in - configuration.nix, which allows unattended installation - necessary in automation. - + + For unattended installations, it is possible to use + nixos-install --no-root-passwd + in order to disable the password prompt entirely. + - - - + - - If everything went well: - + + If everything went well: -# reboot - - - + # reboot + + - - You should now be able to boot into the installed NixOS. The - GRUB boot menu shows a list of available - configurations (initially just one). Every time you - change the NixOS configuration (see Changing Configuration ), a - new item is added to the menu. This allows you to easily roll back - to a previous configuration if something goes wrong. - - You should log in and change the root - password with passwd. - - You’ll probably want to create some user accounts as well, - which can be done with useradd: - + + You should now be able to boot into the installed NixOS. The GRUB boot menu + shows a list of available configurations (initially + just one). Every time you change the NixOS configuration (see + Changing Configuration + ), a new item is added to the menu. This allows you to easily roll back to + a previous configuration if something goes wrong. + + + You should log in and change the root password with + passwd. + + + You’ll probably want to create some user accounts as well, which can be + done with useradd: $ useradd -c 'Eelco Dolstra' -m eelco $ passwd eelco - - - - You may also want to install some software. For instance, - + + + You may also want to install some software. For instance, $ nix-env -qa \* - shows what packages are available, and - $ nix-env -i w3m - - install the w3m browser. - + install the w3m browser. + - - - -To summarise, shows a -typical sequence of commands for installing NixOS on an empty hard -drive (here /dev/sda). shows a corresponding configuration Nix expression. - -Commands for Installing NixOS on <filename>/dev/sda</filename> + + + To summarise, shows a typical sequence + of commands for installing NixOS on an empty hard drive (here + /dev/sda). shows a + corresponding configuration Nix expression. + + + Commands for Installing NixOS on <filename>/dev/sda</filename> # fdisk /dev/sda # (or whatever device you want to install on) -- for UEFI systems only @@ -366,41 +408,39 @@ drive (here /dev/sda). (for UEFI systems only) +# mkfs.fat -F 32 -n boot /dev/sda3 # (for UEFI systems only) # mount /dev/disk/by-label/nixos /mnt +# mkdir -p /mnt/boot # (for UEFI systems only) # mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only) # nixos-generate-config --root /mnt # nano /mnt/etc/nixos/configuration.nix # nixos-install # reboot - - -NixOS Configuration + + + NixOS Configuration -{ config, pkgs, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; +{ config, pkgs, ... }: { + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; - boot.loader.grub.device = "/dev/sda"; # (for BIOS systems only) - boot.loader.systemd-boot.enable = true; # (for UEFI systems only) + = "/dev/sda"; # (for BIOS systems only) + = true; # (for UEFI systems only) # Note: setting fileSystems is generally not # necessary, since nixos-generate-config figures them out # automatically in hardware-configuration.nix. - #fileSystems."/".device = "/dev/disk/by-label/nixos"; + #fileSystems."/".device = "/dev/disk/by-label/nixos"; # Enable the OpenSSH server. services.sshd.enable = true; -} - - - - - - - +} + + + + + + diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index 9b2b474c60ce5fa9d3b8cab146963208ef8d3c0c..56af5c0e25a08e59492eecf19d7b4b3e134db9b8 100644 --- a/nixos/doc/manual/installation/obtaining.xml +++ b/nixos/doc/manual/installation/obtaining.xml @@ -3,46 +3,52 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-obtaining"> - -Obtaining NixOS - -NixOS ISO images can be downloaded from the NixOS -download page. There are a number of installation options. If -you happen to have an optical drive and a spare CD, burning the -image to CD and booting from that is probably the easiest option. -Most people will need to prepare a USB stick to boot from. - describes the preferred method -to prepare a USB stick. -A number of alternative methods are presented in the Obtaining NixOS + + NixOS ISO images can be downloaded from the + NixOS download + page. There are a number of installation options. If you happen to + have an optical drive and a spare CD, burning the image to CD and booting + from that is probably the easiest option. Most people will need to prepare a + USB stick to boot from. describes the + preferred method to prepare a USB stick. A number of alternative methods are + presented in the + NixOS -Wiki. - -As an alternative to installing NixOS yourself, you can get a -running NixOS system through several other means: - - - - Using virtual appliances in Open Virtualization Format (OVF) - that can be imported into VirtualBox. These are available from - the NixOS - download page. - - - Using AMIs for Amazon’s EC2. To find one for your region - and instance type, please refer to the . + + + As an alternative to installing NixOS yourself, you can get a running NixOS + system through several other means: + + + + Using virtual appliances in Open Virtualization Format (OVF) that can be + imported into VirtualBox. These are available from the + NixOS download + page. + + + + + Using AMIs for Amazon’s EC2. To find one for your region and instance + type, please refer to the + list - of most recent AMIs. - - - Using NixOps, the NixOS-based cloud deployment tool, which - allows you to provision VirtualBox and EC2 NixOS instances from - declarative specifications. Check out the . + + + + + Using NixOps, the NixOS-based cloud deployment tool, which allows you to + provision VirtualBox and EC2 NixOS instances from declarative + specifications. Check out the + NixOps homepage for - details. - - - - - + details. + + + + diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index aee6523345c450bd7f895a39235ae986685315c0..20355812ec635e32ce6f10e84f3ace3d7e0ba004 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -2,140 +2,130 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="sec-upgrading"> - -Upgrading NixOS - -The best way to keep your NixOS installation up to date is to -use one of the NixOS channels. A channel is a -Nix mechanism for distributing Nix expressions and associated -binaries. The NixOS channels are updated automatically from NixOS’s -Git repository after certain tests have passed and all packages have -been built. These channels are: - - - - Stable channels, such as Upgrading NixOS + + The best way to keep your NixOS installation up to date is to use one of the + NixOS channels. A channel is a Nix mechanism for + distributing Nix expressions and associated binaries. The NixOS channels are + updated automatically from NixOS’s Git repository after certain tests have + passed and all packages have been built. These channels are: + + + + Stable channels, such as + nixos-17.03. - These only get conservative bug fixes and package upgrades. For - instance, a channel update may cause the Linux kernel on your - system to be upgraded from 4.9.16 to 4.9.17 (a minor bug fix), but - not from 4.9.x to - 4.11.x (a major change that has the - potential to break things). Stable channels are generally - maintained until the next stable branch is created. + These only get conservative bug fixes and package upgrades. For instance, + a channel update may cause the Linux kernel on your system to be upgraded + from 4.9.16 to 4.9.17 (a minor bug fix), but not from + 4.9.x to 4.11.x (a + major change that has the potential to break things). Stable channels are + generally maintained until the next stable branch is created. + - - - The unstable channel, + + + The unstable channel, + nixos-unstable. - This corresponds to NixOS’s main development branch, and may thus - see radical changes between channel updates. It’s not recommended - for production systems. - - - Small channels, such as + + + + Small channels, such as + nixos-17.03-small - or nixos-unstable-small. These - are identical to the stable and unstable channels described above, - except that they contain fewer binary packages. This means they - get updated faster than the regular channels (for instance, when a - critical security patch is committed to NixOS’s source tree), but - may require more packages to be built from source than - usual. They’re mostly intended for server environments and as such - contain few GUI applications. - - - -To see what channels are available, go to . (Note that the URIs of the -various channels redirect to a directory that contains the channel’s -latest version and includes ISO images and VirtualBox -appliances.) - -When you first install NixOS, you’re automatically subscribed to -the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 17.03 ISO, you will be subscribed to -the nixos-17.03 channel. To see which NixOS -channel you’re subscribed to, run the following as root: - + or + nixos-unstable-small. + These are identical to the stable and unstable channels described above, + except that they contain fewer binary packages. This means they get + updated faster than the regular channels (for instance, when a critical + security patch is committed to NixOS’s source tree), but may require + more packages to be built from source than usual. They’re mostly + intended for server environments and as such contain few GUI applications. + + + + To see what channels are available, go to + . (Note that the URIs of the + various channels redirect to a directory that contains the channel’s latest + version and includes ISO images and VirtualBox appliances.) + + + When you first install NixOS, you’re automatically subscribed to the NixOS + channel that corresponds to your installation source. For instance, if you + installed from a 17.03 ISO, you will be subscribed to the + nixos-17.03 channel. To see which NixOS channel you’re + subscribed to, run the following as root: # nix-channel --list | grep nixos nixos https://nixos.org/channels/nixos-unstable - -To switch to a different NixOS channel, do - + To switch to a different NixOS channel, do # nix-channel --add https://nixos.org/channels/channel-name nixos - -(Be sure to include the nixos parameter at the -end.) For instance, to use the NixOS 17.03 stable channel: - + (Be sure to include the nixos parameter at the end.) For + instance, to use the NixOS 17.03 stable channel: # nix-channel --add https://nixos.org/channels/nixos-17.03 nixos - -If you have a server, you may want to use the “small” channel instead: - + If you have a server, you may want to use the “small” channel instead: # nix-channel --add https://nixos.org/channels/nixos-17.03-small nixos - -And if you want to live on the bleeding edge: - + And if you want to live on the bleeding edge: # nix-channel --add https://nixos.org/channels/nixos-unstable nixos - - - -You can then upgrade NixOS to the latest version in your chosen -channel by running - + + + You can then upgrade NixOS to the latest version in your chosen channel by + running # nixos-rebuild switch --upgrade - -which is equivalent to the more verbose nix-channel --update -nixos; nixos-rebuild switch. - -Channels are set per user. This means that running -nix-channel --add as a non root user (or without sudo) will not -affect configuration in /etc/nixos/configuration.nix - - -It is generally safe to switch back and forth between -channels. The only exception is that a newer NixOS may also have a -newer Nix version, which may involve an upgrade of Nix’s database -schema. This cannot be undone easily, so in that case you will not be -able to go back to your original channel. - - -
Automatic Upgrades - -You can keep a NixOS system up-to-date automatically by adding -the following to configuration.nix: - + which is equivalent to the more verbose nix-channel --update nixos; + nixos-rebuild switch. + + + + Channels are set per user. This means that running nix-channel + --add as a non root user (or without sudo) will not affect + configuration in /etc/nixos/configuration.nix + + + + + It is generally safe to switch back and forth between channels. The only + exception is that a newer NixOS may also have a newer Nix version, which may + involve an upgrade of Nix’s database schema. This cannot be undone easily, + so in that case you will not be able to go back to your original channel. + + +
+ Automatic Upgrades + + + You can keep a NixOS system up-to-date automatically by adding the following + to configuration.nix: -system.autoUpgrade.enable = true; + = true; - -This enables a periodically executed systemd service named -nixos-upgrade.service. It runs -nixos-rebuild switch --upgrade to upgrade NixOS to -the latest version in the current channel. (To see when the service -runs, see systemctl list-timers.) You can also -specify a channel explicitly, e.g. - + This enables a periodically executed systemd service named + nixos-upgrade.service. It runs nixos-rebuild + switch --upgrade to upgrade NixOS to the latest version in the + current channel. (To see when the service runs, see systemctl + list-timers.) You can also specify a channel explicitly, e.g. -system.autoUpgrade.channel = https://nixos.org/channels/nixos-17.03; + = https://nixos.org/channels/nixos-17.03; - - - -
- - + +
diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml index 05531b3909a3fdffab8e91a390b6f423021deeab..9f30b79251017882edb973b8c4f0104485654ca2 100644 --- a/nixos/doc/manual/man-configuration.xml +++ b/nixos/doc/manual/man-configuration.xml @@ -1,38 +1,31 @@ - - - configuration.nix - 5 + + configuration.nix + 5 NixOS - - - - - configuration.nix - NixOS system configuration specification - - - -Description - -The file /etc/nixos/configuration.nix -contains the declarative specification of your NixOS system -configuration. The command nixos-rebuild takes -this file and realises the system configuration specified -therein. - - - - -Options - -You can use the following options in -configuration.nix. - - - - - + + + + configuration.nix + NixOS system configuration specification + + + Description + + The file /etc/nixos/configuration.nix contains the + declarative specification of your NixOS system configuration. The command + nixos-rebuild takes this file and realises the system + configuration specified therein. + + + + Options + + You can use the following options in configuration.nix. + + + diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml index 878ebee05273c1186f4c50c74e010bef10a2f595..87e4f3dae869072658a6dbd32d4b427d880920a0 100644 --- a/nixos/doc/manual/man-nixos-build-vms.xml +++ b/nixos/doc/manual/man-nixos-build-vms.xml @@ -1,46 +1,53 @@ - - - nixos-build-vms - 8 + + nixos-build-vms + 8 NixOS - - - - - nixos-build-vms - build a network of virtual machines from a network of NixOS configurations - - - + + + + nixos-build-vms + build a network of virtual machines from a network of NixOS configurations + + - nixos-build-vms - - - - network.nix + nixos-build-vms + + + + + + + + + + + + + + network.nix + - - -Description - -This command builds a network of QEMU-KVM virtual machines of a Nix expression -specifying a network of NixOS machines. The virtual network can be started by -executing the bin/run-vms shell script that is generated by -this command. By default, a result symlink is produced that -points to the generated virtual network. - - -A network Nix expression has the following structure: - + + + Description + + This command builds a network of QEMU-KVM virtual machines of a Nix + expression specifying a network of NixOS machines. The virtual network can + be started by executing the bin/run-vms shell script + that is generated by this command. By default, a result + symlink is produced that points to the generated virtual network. + + + A network Nix expression has the following structure: { test1 = {pkgs, config, ...}: { services.openssh.enable = true; - nixpkgs.system = "i686-linux"; + nixpkgs.localSystem.system = "i686-linux"; deployment.targetHost = "test1.example.net"; # Other NixOS options @@ -51,60 +58,63 @@ points to the generated virtual network. services.openssh.enable = true; services.httpd.enable = true; environment.systemPackages = [ pkgs.lynx ]; - nixpkgs.system = "x86_64-linux"; + nixpkgs.localSystem.system = "x86_64-linux"; deployment.targetHost = "test2.example.net"; # Other NixOS options }; } - -Each attribute in the expression represents a machine in the network -(e.g. test1 and test2) -referring to a function defining a NixOS configuration. -In each NixOS configuration, two attributes have a special meaning. -The deployment.targetHost specifies the address -(domain name or IP address) -of the system which is used by ssh to perform -remote deployment operations. The nixpkgs.system -attribute can be used to specify an architecture for the target machine, -such as i686-linux which builds a 32-bit NixOS -configuration. Omitting this property will build the configuration -for the same architecture as the host system. - - - - -Options - -This command accepts the following options: - - - - - + Each attribute in the expression represents a machine in the network (e.g. + test1 and test2) referring to a + function defining a NixOS configuration. In each NixOS configuration, two + attributes have a special meaning. The + deployment.targetHost specifies the address (domain name + or IP address) of the system which is used by ssh to + perform remote deployment operations. The + nixpkgs.localSystem.system attribute can be used to + specify an architecture for the target machine, such as + i686-linux which builds a 32-bit NixOS configuration. + Omitting this property will build the configuration for the same + architecture as the host system. + + + + Options + + This command accepts the following options: + + + + + + - Shows a trace of the output. + + Shows a trace of the output. + - - - - + + + + + - Do not create a 'result' symlink. + + Do not create a 'result' symlink. + - - - - , + + + + , + - Shows the usage of this command to the user. + + Shows the usage of this command to the user. + - - - - - - - + + + diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml index a2fbe07961db622b98f539ac8c66668e176b60a3..42edaa1ae5b607a7a61964b439a3e57033403c25 100644 --- a/nixos/doc/manual/man-nixos-enter.xml +++ b/nixos/doc/manual/man-nixos-enter.xml @@ -1,119 +1,138 @@ - - - nixos-enter - 8 + + nixos-enter + 8 NixOS - - - - - nixos-enter - run a command in a NixOS chroot environment - - - + + + + nixos-enter + run a command in a NixOS chroot environment + + - nixos-enter - - - root + nixos-enter + + + - - - system + root + + + + + - - - shell-command + system + + + + + - - + shell-command + + + + + - - - arguments + + + + + + arguments + - - - -Description - -This command runs a command in a NixOS chroot environment, that -is, in a filesystem hierarchy previously prepared using -nixos-install. - - - -Options - -This command accepts the following options: - - - - - + + + Description + + This command runs a command in a NixOS chroot environment, that is, in a + filesystem hierarchy previously prepared using + nixos-install. + + + + Options + + This command accepts the following options: + + + + + + - The path to the NixOS system you want to enter. It defaults to /mnt. + + The path to the NixOS system you want to enter. It defaults to + /mnt. + - - - - + + + + + - The NixOS system configuration to use. It defaults to - /nix/var/nix/profiles/system. You can enter - a previous NixOS configuration by specifying a path such as - /nix/var/nix/profiles/system-106-link. + + The NixOS system configuration to use. It defaults to + /nix/var/nix/profiles/system. You can enter a + previous NixOS configuration by specifying a path such as + /nix/var/nix/profiles/system-106-link. + - - - - - + + + + + + + + - The bash command to execute. + + The bash command to execute. + - - - - - - Interpret the remaining arguments as the program - name and arguments to be invoked. The program is not executed in a - shell. - - - - - - - - -Examples - -Start an interactive shell in the NixOS installation in -/mnt: - + + + + + + + + Interpret the remaining arguments as the program name and arguments to be + invoked. The program is not executed in a shell. + + + + + + + Examples + + Start an interactive shell in the NixOS installation in + /mnt: + # nixos-enter /mnt - -Run a shell command: - + + Run a shell command: + # nixos-enter -c 'ls -l /; cat /proc/mounts' - -Run a non-shell command: - + + Run a non-shell command: + # nixos-enter -- cat /proc/mounts - - - + diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml index 993a932ddfbe4e34d9dff5d09d5d9424e0d381fa..1227873f57800b34baad489ca43c58418db24b67 100644 --- a/nixos/doc/manual/man-nixos-generate-config.xml +++ b/nixos/doc/manual/man-nixos-generate-config.xml @@ -1,152 +1,164 @@ - - - nixos-generate-config - 8 + + nixos-generate-config + 8 NixOS - - - - - nixos-generate-config - generate NixOS configuration modules - - - + + + + nixos-generate-config + generate NixOS configuration modules + + - nixos-generate-config - - - - root + nixos-generate-config + + + + + + + - - - dir + root + + + + + + dir + - - - -Description - -This command writes two NixOS configuration modules: - - - - - + + + Description + + This command writes two NixOS configuration modules: + + + + + + + + This module sets NixOS configuration options based on your current + hardware configuration. In particular, it sets the + option to reflect all currently mounted file + systems, the option to reflect active swap + devices, and the options to ensure that + the initial ramdisk contains any kernel modules necessary for mounting + the root file system. + + + If this file already exists, it is overwritten. Thus, you should not + modify it manually. Rather, you should include it from your + /etc/nixos/configuration.nix, and re-run + nixos-generate-config to update it whenever your + hardware configuration changes. + + + + + + + + + + This is the main NixOS system configuration module. If it already + exists, it’s left unchanged. Otherwise, + nixos-generate-config will write a template for you + to customise. + + + + + + + + Options + + This command accepts the following options: + + + + + + - This module sets NixOS configuration options based on your - current hardware configuration. In particular, it sets the - option to reflect all currently - mounted file systems, the option to - reflect active swap devices, and the - options to ensure that the - initial ramdisk contains any kernel modules necessary for - mounting the root file system. - - If this file already exists, it is overwritten. Thus, you - should not modify it manually. Rather, you should include it - from your /etc/nixos/configuration.nix, and - re-run nixos-generate-config to update it - whenever your hardware configuration changes. + + If this option is given, treat the directory + root as the root of the file system. This + means that configuration files will be written to + root/etc/nixos, and that + any file systems outside of root are ignored + for the purpose of generating the option. + - - - - + + + + + - This is the main NixOS system configuration module. If it - already exists, it’s left unchanged. Otherwise, - nixos-generate-config will write a template - for you to customise. + + If this option is given, write the configuration files to the directory + dir instead of + /etc/nixos. + - - - - - - - - - -Options - -This command accepts the following options: - - - - - + + + + + - If this option is given, treat the directory - root as the root of the file system. - This means that configuration files will be written to - root/etc/nixos, - and that any file systems outside of - root are ignored for the purpose of - generating the option. + + Overwrite /etc/nixos/configuration.nix if it already + exists. + - - - - + + + + + - If this option is given, write the configuration files to - the directory dir instead of - /etc/nixos. + + Omit everything concerning file systems and swap devices from the + hardware configuration. + - - - - + + + + + - Overwrite - /etc/nixos/configuration.nix if it already - exists. + + Don't generate configuration.nix or + hardware-configuration.nix and print the hardware + configuration to stdout only. + - - - - - - Omit everything concerning file systems and swap devices - from the hardware configuration. - - - - - - - Don't generate configuration.nix or - hardware-configuration.nix and print the - hardware configuration to stdout only. - - - - - - - - -Examples - -This command is typically used during NixOS installation to -write initial configuration modules. For example, if you created and -mounted the target file systems on /mnt and -/mnt/boot, you would run: - + + + + + Examples + + This command is typically used during NixOS installation to write initial + configuration modules. For example, if you created and mounted the target + file systems on /mnt and + /mnt/boot, you would run: $ nixos-generate-config --root /mnt - -The resulting file -/mnt/etc/nixos/hardware-configuration.nix might -look like this: - + The resulting file + /mnt/etc/nixos/hardware-configuration.nix might look + like this: # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes @@ -181,28 +193,22 @@ look like this: nix.maxJobs = 8; } - -It will also create a basic -/mnt/etc/nixos/configuration.nix, which you -should edit to customise the logical configuration of your system. -This file includes the result of the hardware scan as follows: - + It will also create a basic + /mnt/etc/nixos/configuration.nix, which you should edit + to customise the logical configuration of your system. This file includes + the result of the hardware scan as follows: imports = [ ./hardware-configuration.nix ]; - - -After installation, if your hardware configuration changes, you -can run: - + + + After installation, if your hardware configuration changes, you can run: $ nixos-generate-config - -to update /etc/nixos/hardware-configuration.nix. -Your /etc/nixos/configuration.nix will -not be overwritten. - - - + to update /etc/nixos/hardware-configuration.nix. Your + /etc/nixos/configuration.nix will + not be overwritten. + + diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index c9887146989b19af935fa8cdb53a3e635ec3ae75..25f4f40613ace000cfa488e9e193a3e922a23e0b 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -1,212 +1,259 @@ - - - nixos-install - 8 + + nixos-install + 8 NixOS - - - - - nixos-install - install bootloader and NixOS - - - + + + + nixos-install + install bootloader and NixOS + + - nixos-install - - - path + nixos-install + + + - - - root + path + + + + + - - - path + root + + + + + - - + path + + + + + - - + + + + + - - + + + + + - - - - - - number + + + + + + - - - number + + + - - - name - value + number + + + + number + + + + name value + + + + + - - - - - - - - + + + + + + - - - -Description - -This command installs NixOS in the file system mounted on -/mnt, based on the NixOS configuration specified -in /mnt/etc/nixos/configuration.nix. It performs -the following steps: - - - - It copies Nix and its dependencies to - /mnt/nix/store. - - It runs Nix in /mnt to build - the NixOS configuration specified in - /mnt/etc/nixos/configuration.nix. - - It installs the GRUB boot loader on the device - specified in the option - (unless is specified), - and generates a GRUB configuration file that boots into the NixOS - configuration just installed. - - It prompts you for a password for the root account - (unless is specified). - - - - - -This command is idempotent: if it is interrupted or fails due to -a temporary problem (e.g. a network issue), you can safely re-run -it. - - - -Options - -This command accepts the following options: - - - - - + + + Description + + This command installs NixOS in the file system mounted on + /mnt, based on the NixOS configuration specified in + /mnt/etc/nixos/configuration.nix. It performs the + following steps: + + + + It copies Nix and its dependencies to + /mnt/nix/store. + + + + + It runs Nix in /mnt to build the NixOS configuration + specified in /mnt/etc/nixos/configuration.nix. + + + + + It installs the GRUB boot loader on the device specified in the option + (unless + is specified), and generates a GRUB + configuration file that boots into the NixOS configuration just + installed. + + + + + It prompts you for a password for the root account (unless + is specified). + + + + + + This command is idempotent: if it is interrupted or fails due to a temporary + problem (e.g. a network issue), you can safely re-run it. + + + + Options + + This command accepts the following options: + + + + + + + + + Defaults to /mnt. If this option is given, treat the + directory root as the root of the NixOS + installation. + + + + + + + + + + If this option is provided, nixos-install will install + the specified closure rather than attempt to build one from + /mnt/etc/nixos/configuration.nix. + + + The closure must be an appropriately configured NixOS system, with boot + loader and partition configuration that fits the target host. Such a + closure is typically obtained with a command such as nix-build + -I nixos-config=./configuration.nix '<nixos>' -A system + --no-out-link + + + + + + + - Defaults to /mnt. If this option is given, treat the directory - root as the root of the NixOS installation. - + + Add a path to the Nix expression search path. This option may be given + multiple times. See the NIX_PATH environment variable for information on + the semantics of the Nix search path. Paths added through + -I take precedence over NIX_PATH. + - - - - + + + + + + + + - If this option is provided, nixos-install will install the specified closure - rather than attempt to build one from /mnt/etc/nixos/configuration.nix. - - The closure must be an appropriately configured NixOS system, with boot loader and partition - configuration that fits the target host. Such a closure is typically obtained with a command such as - nix-build -I nixos-config=./configuration.nix '<nixos>' -A system --no-out-link - + + Sets the maximum number of build jobs that Nix will perform in parallel + to the specified number. The default is 1. A higher + value is useful on SMP systems or to exploit I/O latency. + - - - - + + + + + - Add a path to the Nix expression search path. This option may be given multiple times. - See the NIX_PATH environment variable for information on the semantics of the Nix search path. - Paths added through -I take precedence over NIX_PATH. + + Sets the value of the NIX_BUILD_CORES environment variable + in the invocation of builders. Builders can use this variable at their + discretion to control the maximum amount of parallelism. For instance, in + Nixpkgs, if the derivation attribute + enableParallelBuilding is set to + true, the builder passes the + flag to GNU Make. The + value 0 means that the builder should use all + available CPU cores in the system. + - - - - - - Sets the maximum number of build jobs that Nix will - perform in parallel to the specified number. The default is 1. - A higher value is useful on SMP systems or to exploit I/O latency. - - - - - - - Sets the value of the NIX_BUILD_CORES - environment variable in the invocation of builders. Builders can - use this variable at their discretion to control the maximum amount - of parallelism. For instance, in Nixpkgs, if the derivation - attribute enableParallelBuilding is set to - true, the builder passes the - flag to GNU Make. - The value 0 means that the builder should use all - available CPU cores in the system. - - - - name value - - Set the Nix configuration option - name to value. - - - - - + + + + name value + - Causes Nix to print out a stack trace in case of Nix expression evaluation errors. + + Set the Nix configuration option name to + value. + - - - - + + + + + - Chroot into given installation. Any additional arguments passed are going to be executed inside the chroot. - + + Causes Nix to print out a stack trace in case of Nix expression + evaluation errors. + - - - - + + + + + - Synonym for man nixos-install. + + Synonym for man nixos-install. + - - - - - - - -Examples - -A typical NixOS installation is done by creating and mounting a -file system on /mnt, generating a NixOS -configuration in -/mnt/etc/nixos/configuration.nix, and running -nixos-install. For instance, if we want to install -NixOS on an ext4 file system created in -/dev/sda1: - + + + + + Examples + + A typical NixOS installation is done by creating and mounting a file system + on /mnt, generating a NixOS configuration in + /mnt/etc/nixos/configuration.nix, and running + nixos-install. For instance, if we want to install NixOS + on an ext4 file system created in + /dev/sda1: $ mkfs.ext4 /dev/sda1 $ mount /dev/sda1 /mnt @@ -215,9 +262,6 @@ $ # edit /mnt/etc/nixos/configuration.nix $ nixos-install $ reboot - - - - - + + diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml index d2b2d5b7965c323f8b88ee897a01cadf66a27cc8..d436cce742a2b912d293babf693e0676705d783e 100644 --- a/nixos/doc/manual/man-nixos-option.xml +++ b/nixos/doc/manual/man-nixos-option.xml @@ -1,103 +1,108 @@ - - - nixos-option - 8 + + nixos-option + 8 NixOS - - - - - nixos-option - inspect a NixOS configuration - - - + + + + nixos-option + inspect a NixOS configuration + + - nixos-option - - - path - - - - option.name + nixos-option + + path + + + + + + + + + + + + option.name + - - -Description - -This command evaluates the configuration specified in -/etc/nixos/configuration.nix and returns the properties -of the option name given as argument. - -When the option name is not an option, the command prints the list of -attributes contained in the attribute set. - - - -Options - -This command accepts the following options: - - - - - path + + + Description + + This command evaluates the configuration specified in + /etc/nixos/configuration.nix and returns the properties + of the option name given as argument. + + + When the option name is not an option, the command prints the list of + attributes contained in the attribute set. + + + + Options + + This command accepts the following options: + + + + + path + - - This option is passed to the underlying - nix-instantiate invocation. - + + This option is passed to the underlying + nix-instantiate invocation. + - - - - + + + + + - - This option enables verbose mode, which currently is just - the Bash set debug mode. - + + This option enables verbose mode, which currently is just the Bash + set debug mode. + - - - - + + + + + - - This option causes the output to be rendered as XML. - + + This option causes the output to be rendered as XML. + - - - - - - -Environment - - - - - NIXOS_CONFIG + + + + + Environment + + + + NIXOS_CONFIG + - Path to the main NixOS configuration module. Defaults to - /etc/nixos/configuration.nix. + + Path to the main NixOS configuration module. Defaults to + /etc/nixos/configuration.nix. + - - - - - - - -Examples - -Investigate option values: - + + + + + Examples + + Investigate option values: $ nixos-option boot.loader This attribute set contains: generationsDir @@ -119,16 +124,14 @@ Declared by: Defined by: "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" - - - - -Bugs - -The author listed in the following section is wrong. If there is any - other bug, please report to Nicolas Pierron. - - - - + + + + + Bugs + + The author listed in the following section is wrong. If there is any other + bug, please report to Nicolas Pierron. + + diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index f74788353e67e585b16a6f060a253d3887fba184..551a65f5e96beebc770d1c9b8fd9b41e941323d1 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -1,399 +1,468 @@ - - - nixos-rebuild - 8 + + nixos-rebuild + 8 NixOS - - - - - nixos-rebuild - reconfigure a NixOS machine - - - + + + + nixos-rebuild + reconfigure a NixOS machine + + - nixos-rebuild - - - - - - - - - + nixos-rebuild + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - name + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + name + + + + + - - - -Description - -This command updates the system so that it corresponds to the -configuration specified in -/etc/nixos/configuration.nix. Thus, every time -you modify /etc/nixos/configuration.nix or any -NixOS module, you must run nixos-rebuild to make -the changes take effect. It builds the new system in -/nix/store, runs its activation script, and stop -and (re)starts any system services if needed. - -This command has one required argument, which specifies the -desired operation. It must be one of the following: - - - - - - - Build and activate the new configuration, and make it the - boot default. That is, the configuration is added to the GRUB - boot menu as the default menu entry, so that subsequent reboots - will boot the system into the new configuration. Previous - configurations activated with nixos-rebuild - switch or nixos-rebuild boot remain - available in the GRUB menu. - - - - - - - Build the new configuration and make it the boot default - (as with nixos-rebuild switch), but do not - activate it. That is, the system continues to run the previous - configuration until the next reboot. - - - - - - - Build and activate the new configuration, but do not add - it to the GRUB boot menu. Thus, if you reboot the system (or if - it crashes), you will automatically revert to the default - configuration (i.e. the configuration resulting from the last - call to nixos-rebuild switch or - nixos-rebuild boot). - - - - - - - Build the new configuration, but neither activate it nor - add it to the GRUB boot menu. It leaves a symlink named - result in the current directory, which - points to the output of the top-level “system” derivation. This - is essentially the same as doing + + + Description + + This command updates the system so that it corresponds to the configuration + specified in /etc/nixos/configuration.nix. Thus, every + time you modify /etc/nixos/configuration.nix or any + NixOS module, you must run nixos-rebuild to make the + changes take effect. It builds the new system in + /nix/store, runs its activation script, and stop and + (re)starts any system services if needed. + + + This command has one required argument, which specifies the desired + operation. It must be one of the following: + + + + + + + + Build and activate the new configuration, and make it the boot default. + That is, the configuration is added to the GRUB boot menu as the default + menu entry, so that subsequent reboots will boot the system into the new + configuration. Previous configurations activated with + nixos-rebuild switch or nixos-rebuild + boot remain available in the GRUB menu. + + + + + + + + + + Build the new configuration and make it the boot default (as with + nixos-rebuild switch), but do not activate it. That + is, the system continues to run the previous configuration until the + next reboot. + + + + + + + + + + Build and activate the new configuration, but do not add it to the GRUB + boot menu. Thus, if you reboot the system (or if it crashes), you will + automatically revert to the default configuration (i.e. the + configuration resulting from the last call to nixos-rebuild + switch or nixos-rebuild boot). + + + + + + + + + + Build the new configuration, but neither activate it nor add it to the + GRUB boot menu. It leaves a symlink named result in + the current directory, which points to the output of the top-level + “system” derivation. This is essentially the same as doing $ nix-build /path/to/nixpkgs/nixos -A system - Note that you do not need to be root to run - nixos-rebuild build. - - - - - - - Show what store paths would be built or downloaded by any - of the operations above, but otherwise do nothing. - - - - - - - Build the new configuration, but instead of activating it, - show what changes would be performed by the activation (i.e. by - nixos-rebuild test). For - instance, this command will print which systemd units would be - restarted. The list of changes is not guaranteed to be - complete. - - - - - - - Build a script that starts a NixOS virtual machine with - the desired configuration. It leaves a symlink - result in the current directory that points - (under - result/bin/run-hostname-vm) - at the script that starts the VM. Thus, to test a NixOS - configuration in a virtual machine, you should do the following: + Note that you do not need to be root to run + nixos-rebuild build. + + + + + + + + + + Show what store paths would be built or downloaded by any of the + operations above, but otherwise do nothing. + + + + + + + + + + Build the new configuration, but instead of activating it, show what + changes would be performed by the activation (i.e. by + nixos-rebuild test). For instance, this command will + print which systemd units would be restarted. The list of changes is not + guaranteed to be complete. + + + + + + + + + + Build a script that starts a NixOS virtual machine with the desired + configuration. It leaves a symlink result in the + current directory that points (under + result/bin/run-hostname-vm) + at the script that starts the VM. Thus, to test a NixOS configuration in + a virtual machine, you should do the following: $ nixos-rebuild build-vm $ ./result/bin/run-*-vm - - - The VM is implemented using the qemu - package. For best performance, you should load the - kvm-intel or kvm-amd - kernel modules to get hardware virtualisation. - - The VM mounts the Nix store of the host through the 9P - file system. The host Nix store is read-only, so Nix commands - that modify the Nix store will not work in the VM. This - includes commands such as nixos-rebuild; to - change the VM’s configuration, you must halt the VM and re-run - the commands above. + - - The VM has its own ext3 root file - system, which is automatically created when the VM is first - started, and is persistent across reboots of the VM. It is - stored in - ./hostname.qcow2. - - - - - - - - Like , but boots using the - regular boot loader of your configuration (e.g., GRUB 1 or 2), - rather than booting directly into the kernel and initial ramdisk - of the system. This allows you to test whether the boot loader - works correctly. However, it does not guarantee that your NixOS - configuration will boot successfully on the host hardware (i.e., - after running nixos-rebuild switch), because - the hardware and boot loader configuration in the VM are - different. The boot loader is installed on an automatically - generated virtual disk containing a /boot - partition, which is mounted read-only in the VM. - - - - - - - - - - - -Options - -This command accepts the following options: - - - - - + + The VM is implemented using the qemu package. For + best performance, you should load the kvm-intel or + kvm-amd kernel modules to get hardware + virtualisation. + + + The VM mounts the Nix store of the host through the 9P file system. The + host Nix store is read-only, so Nix commands that modify the Nix store + will not work in the VM. This includes commands such as + nixos-rebuild; to change the VM’s configuration, + you must halt the VM and re-run the commands above. + + + The VM has its own ext3 root file system, which is + automatically created when the VM is first started, and is persistent + across reboots of the VM. It is stored in + ./hostname.qcow2. + + + + + + + + + + + Like , but boots using the regular boot loader + of your configuration (e.g., GRUB 1 or 2), rather than booting directly + into the kernel and initial ramdisk of the system. This allows you to + test whether the boot loader works correctly. However, it does not + guarantee that your NixOS configuration will boot successfully on the + host hardware (i.e., after running nixos-rebuild + switch), because the hardware and boot loader configuration in + the VM are different. The boot loader is installed on an automatically + generated virtual disk containing a /boot + partition, which is mounted read-only in the VM. + + + + + + + + Options + + This command accepts the following options: + + + + + + - Fetch the latest version of NixOS from the NixOS - channel. + + Fetch the latest version of NixOS from the NixOS channel. + - - - - + + + + + - Causes the boot loader to be (re)installed on the - device specified by the relevant configuration options. - + + Causes the boot loader to be (re)installed on the device specified by the + relevant configuration options. + - - - - + + + + + - Normally, nixos-rebuild first builds - the nixUnstable attribute in Nixpkgs, and - uses the resulting instance of the Nix package manager to build - the new system configuration. This is necessary if the NixOS - modules use features not provided by the currently installed - version of Nix. This option disables building a new Nix. + + Normally, nixos-rebuild first builds the + nixUnstable attribute in Nixpkgs, and uses the + resulting instance of the Nix package manager to build the new system + configuration. This is necessary if the NixOS modules use features not + provided by the currently installed version of Nix. This option disables + building a new Nix. + - - - - + + + + + - Equivalent to - . This option is useful if you - call nixos-rebuild frequently (e.g. if you’re - hacking on a NixOS module). + + Equivalent to + . This option is useful if you call + nixos-rebuild frequently (e.g. if you’re hacking on + a NixOS module). + - - - - + + + + + - Instead of building a new configuration as specified by - /etc/nixos/configuration.nix, roll back to - the previous configuration. (The previous configuration is - defined as the one before the “current” generation of the - Nix profile /nix/var/nix/profiles/system.) + + Instead of building a new configuration as specified by + /etc/nixos/configuration.nix, roll back to the + previous configuration. (The previous configuration is defined as the one + before the “current” generation of the Nix profile + /nix/var/nix/profiles/system.) + - - - - - + + + + + + + + - Instead of using the Nix profile - /nix/var/nix/profiles/system to keep track - of the current and previous system configurations, use + + Instead of using the Nix profile + /nix/var/nix/profiles/system to keep track of the + current and previous system configurations, use /nix/var/nix/profiles/system-profiles/name. - When you use GRUB 2, for every system profile created with this - flag, NixOS will create a submenu named “NixOS - Profile - 'name'” in GRUB’s boot menu, - containing the current and previous configurations of this - profile. - - For instance, if you want to test a configuration file - named test.nix without affecting the - default system profile, you would do: - + When you use GRUB 2, for every system profile created with this flag, + NixOS will create a submenu named “NixOS - Profile + 'name'” in GRUB’s boot menu, containing + the current and previous configurations of this profile. + + + For instance, if you want to test a configuration file named + test.nix without affecting the default system + profile, you would do: $ nixos-rebuild switch -p test -I nixos-config=./test.nix - - The new configuration will appear in the GRUB 2 submenu “NixOS - Profile - 'test'”. + The new configuration will appear in the GRUB 2 submenu “NixOS - + Profile 'test'”. + - - - - + + + + + - Instead of building the new configuration locally, use the - specified host to perform the build. The host needs to be accessible - with ssh, and must be able to perform Nix builds. If the option + + Instead of building the new configuration locally, use the specified host + to perform the build. The host needs to be accessible with ssh, and must + be able to perform Nix builds. If the option is not set, the build will be copied back - to the local machine when done. - - Note that, if is not specified, - Nix will be built both locally and remotely. This is because the - configuration will always be evaluated locally even though the building - might be performed remotely. - - You can include a remote user name in - the host name (user@host). You can also set - ssh options by defining the NIX_SSHOPTS environment - variable. + to the local machine when done. + + + Note that, if is not specified, Nix will + be built both locally and remotely. This is because the configuration + will always be evaluated locally even though the building might be + performed remotely. + + + You can include a remote user name in the host name + (user@host). You can also set ssh options by + defining the NIX_SSHOPTS environment variable. + - - - - + + + + + - Specifies the NixOS target host. By setting this to something other - than localhost, the system activation will - happen on the remote host instead of the local machine. The remote host - needs to be accessible over ssh, and for the commands - , and - you need root access. - - If is not explicitly - specified, will implicitly be set to the - same value as . So, if you only specify + + Specifies the NixOS target host. By setting this to something other than + localhost, the system activation will happen + on the remote host instead of the local machine. The remote host needs to + be accessible over ssh, and for the commands , + and you need root access. + + + If is not explicitly specified, + will implicitly be set to the same value as + . So, if you only specify both building and activation will take place remotely (and no build artifacts will be copied to the local - machine). - - You can include a remote user name in - the host name (user@host). You can also set - ssh options by defining the NIX_SSHOPTS environment - variable. + machine). + + + You can include a remote user name in the host name + (user@host). You can also set ssh options by + defining the NIX_SSHOPTS environment variable. + + + + + + In addition, nixos-rebuild accepts various Nix-related + flags, including / , + , , + and / + . See the Nix manual for details. + + + + Environment + + + + NIXOS_CONFIG + + + + Path to the main NixOS configuration module. Defaults to + /etc/nixos/configuration.nix. + - - - - -In addition, nixos-rebuild accepts various -Nix-related flags, including / -, , -, and - / . See -the Nix manual for details. - - - - -Environment - - - - - NIXOS_CONFIG + + + + NIX_SSHOPTS + - Path to the main NixOS configuration module. Defaults to - /etc/nixos/configuration.nix. + + Additional options to be passed to ssh on the command + line. + - - - NIX_SSHOPTS - - Additional options to be passed to - ssh on the command line. - - - - - - - - -Files - - - - - /run/current-system + + + + + Files + + + + /run/current-system + - A symlink to the currently active system configuration in - the Nix store. + + A symlink to the currently active system configuration in the Nix store. + - - - - /nix/var/nix/profiles/system + + + + /nix/var/nix/profiles/system + - The Nix profile that contains the current and previous - system configurations. Used to generate the GRUB boot - menu. + + The Nix profile that contains the current and previous system + configurations. Used to generate the GRUB boot menu. + - - - - - - - -Bugs - -This command should be renamed to something more -descriptive. - - - - - + + + + + Bugs + + This command should be renamed to something more descriptive. + + diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml index 615d74f9090852bd878422226f5bd62c4a2190ab..931c4a5ad029333a169bbbcad00489f2680be16c 100644 --- a/nixos/doc/manual/man-nixos-version.xml +++ b/nixos/doc/manual/man-nixos-version.xml @@ -1,97 +1,112 @@ - - - nixos-version - 8 + + nixos-version + 8 NixOS - - - - nixos-version - show the NixOS version - - - + + + nixos-version + show the NixOS version + + - nixos-version - - + nixos-version + + + + + + + - - -Description - -This command shows the version of the currently active NixOS -configuration. For example: - + + + Description + + This command shows the version of the currently active NixOS configuration. + For example: $ nixos-version 16.03.1011.6317da4 (Emu) - -The version consists of the following elements: - - - - - 16.03 - The NixOS release, indicating the year and month - in which it was released (e.g. March 2016). - - - - 1011 - The number of commits in the Nixpkgs Git - repository between the start of the release branch and the commit - from which this version was built. This ensures that NixOS - versions are monotonically increasing. It is - git when the current NixOS configuration was - built from a checkout of the Nixpkgs Git repository rather than - from a NixOS channel. - - - - 6317da4 - The first 7 characters of the commit in the - Nixpkgs Git repository from which this version was - built. - - - - Emu - The code name of the NixOS release. The first - letter of the code name indicates that this is the N'th stable - NixOS release; for example, Emu is the fifth - release. - - - - - - - - - -Options - -This command accepts the following options: - - - - - - + The version consists of the following elements: + + + + 16.03 + + + + The NixOS release, indicating the year and month in which it was + released (e.g. March 2016). + + + + + + 1011 + + + + The number of commits in the Nixpkgs Git repository between the start of + the release branch and the commit from which this version was built. + This ensures that NixOS versions are monotonically increasing. It is + git when the current NixOS configuration was built + from a checkout of the Nixpkgs Git repository rather than from a NixOS + channel. + + + + + + 6317da4 + + + + The first 7 characters of the commit in the Nixpkgs Git repository from + which this version was built. + + + + + + Emu + + + + The code name of the NixOS release. The first letter of the code name + indicates that this is the N'th stable NixOS release; for example, Emu + is the fifth release. + + + + + + + + Options + + This command accepts the following options: + + + + + + + + + - Show the full SHA1 hash of the Git commit from which this - configuration was built, e.g. + + Show the full SHA1 hash of the Git commit from which this configuration + was built, e.g. $ nixos-version --hash 6317da40006f6bc2480c6781999c52d88dde2acf - + - - - - + + + diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml index 80a8458fbfec499831d67874239e7d1a16eb1d7a..0390dda6468fa3ab8fb161dd2b025bc0aadc44b2 100644 --- a/nixos/doc/manual/man-pages.xml +++ b/nixos/doc/manual/man-pages.xml @@ -1,33 +1,20 @@ - - NixOS Reference Pages - - - - - - Eelco - Dolstra - - Author - - - - 2007-2018 - Eelco Dolstra - - - - - - - - - - - - - + NixOS Reference Pages + + EelcoDolstra + Author + + 2007-2018Eelco Dolstra + + + + + + + + + + diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 9aa332f026da4a311882670d21bdbb1613e0189b..e9338efbc025d7fdfff21217f945adeb75789c35 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -3,45 +3,46 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="book-nixos-manual"> - - - NixOS Manual - Version - - - - Preface - - This manual describes how to install, use and extend NixOS, - a Linux distribution based on the purely functional package - management system Nix. - - If you encounter problems, please report them on the - nix-devel - mailing list or on the + NixOS Manual + Version + + + + Preface + + This manual describes how to install, use and extend NixOS, a Linux + distribution based on the purely functional package management system Nix. + + + If you encounter problems, please report them on the + Discourse + or on the - #nixos channel on Freenode. Bugs should - be reported in NixOS’ GitHub - issue tracker. - - Commands prefixed with # have to be run as - root, either requiring to login as root user or temporarily switching - to it using sudo for example. - - - - - - - - - - Configuration Options - - - - - + #nixos channel on Freenode. Bugs should be + reported in + NixOS’ + GitHub issue tracker. + + + + Commands prefixed with # have to be run as root, either + requiring to login as root user or temporarily switching to it using + sudo for example. + + + + + + + + + + Configuration Options + + + diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl index 7b45b233ab2a5a6efae7e405f001a4b7d0d71ff8..43a69806a2b0fd27ff6c36b12353446ad11d8513 100644 --- a/nixos/doc/manual/options-to-docbook.xsl +++ b/nixos/doc/manual/options-to-docbook.xsl @@ -15,9 +15,9 @@ - - - + + Configuration Options + @@ -100,7 +100,7 @@ - + diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index b7f9fab44f3b100460bb2a94375140ba93593301..94f176186b6e0abacb766793b198ba85137a0031 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -3,21 +3,19 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-release-notes"> - -Release Notes - -This section lists the release notes for each stable version of NixOS -and current unstable revision. - - - - - - - - - - - - + Release Notes + + This section lists the release notes for each stable version of NixOS and + current unstable revision. + + + + + + + + + + + diff --git a/nixos/doc/manual/release-notes/rl-1310.xml b/nixos/doc/manual/release-notes/rl-1310.xml index 583912d70738ead258586b6969e8156a01410acb..248bab70c36b5a1105ad46408a61977156e170ce 100644 --- a/nixos/doc/manual/release-notes/rl-1310.xml +++ b/nixos/doc/manual/release-notes/rl-1310.xml @@ -3,9 +3,9 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-13.10"> + Release 13.10 (“Aardvark”, 2013/10/31) -Release 13.10 (“Aardvark”, 2013/10/31) - -This is the first stable release branch of NixOS. - + + This is the first stable release branch of NixOS. + diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml index 137caf14cba206492fa47d50fe78506467a6cde1..8d8cea4303a32ceb7d6c31ab2d9ea96568482f13 100644 --- a/nixos/doc/manual/release-notes/rl-1404.xml +++ b/nixos/doc/manual/release-notes/rl-1404.xml @@ -3,158 +3,177 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-14.04"> - -Release 14.04 (“Baboon”, 2014/04/30) - -This is the second stable release branch of NixOS. In addition -to numerous new and upgraded packages and modules, this release has -the following highlights: - - - - Installation on UEFI systems is now supported. See - for - details. - - Systemd has been updated to version 212, which has - numerous - improvements. NixOS now automatically starts systemd user - instances when you log in. You can define global user units through - the options. - - NixOS is now based on Glibc 2.19 and GCC - 4.8. - - The default Linux kernel has been updated to - 3.12. - - KDE has been updated to 4.12. - - GNOME 3.10 experimental support has been added. - - Nix has been updated to 1.7 (details). - - NixOS now supports fully declarative management of - users and groups. If you set to - false, then the contents of - /etc/passwd and /etc/group - will be Release 14.04 (“Baboon”, 2014/04/30) + + + This is the second stable release branch of NixOS. In addition to numerous + new and upgraded packages and modules, this release has the following + highlights: + + + + Installation on UEFI systems is now supported. See + for details. + + + + + Systemd has been updated to version 212, which has + numerous + improvements. NixOS now automatically starts systemd user instances + when you log in. You can define global user units through the + options. + + + + + NixOS is now based on Glibc 2.19 and GCC 4.8. + + + + + The default Linux kernel has been updated to 3.12. + + + + + KDE has been updated to 4.12. + + + + + GNOME 3.10 experimental support has been added. + + + + + Nix has been updated to 1.7 + (details). + + + + + NixOS now supports fully declarative management of users and groups. If + you set to false, + then the contents of /etc/passwd and + /etc/group will be + congruent - to your NixOS configuration. For instance, if you remove a user from - and run - nixos-rebuild, the user account will cease to - exist. Also, imperative commands for managing users and groups, such - as useradd, are no longer available. If - is true (the - default), then behaviour is unchanged from NixOS - 13.10. - - NixOS now has basic container support, meaning you - can easily run a NixOS instance as a container in a NixOS host - system. These containers are suitable for testing and - experimentation but not production use, since they’re not fully - isolated from the host. See for - details. - - Systemd units provided by packages can now be - overridden from the NixOS configuration. For instance, if a package - foo provides systemd units, you can say: - + to your NixOS configuration. For instance, if you remove a user from + and run + nixos-rebuild, the user account will cease to exist. + Also, imperative commands for managing users and groups, such as + useradd, are no longer available. If + is true (the + default), then behaviour is unchanged from NixOS 13.10. + + + + + NixOS now has basic container support, meaning you can easily run a NixOS + instance as a container in a NixOS host system. These containers are + suitable for testing and experimentation but not production use, since + they’re not fully isolated from the host. See + for details. + + + + + Systemd units provided by packages can now be overridden from the NixOS + configuration. For instance, if a package foo provides + systemd units, you can say: systemd.packages = [ pkgs.foo ]; - - to enable those units. You can then set or override unit options in - the usual way, e.g. - + to enable those units. You can then set or override unit options in the + usual way, e.g. systemd.services.foo.wantedBy = [ "multi-user.target" ]; systemd.services.foo.serviceConfig.MemoryLimit = "512M"; - - - - - - - -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - - Nixpkgs no longer exposes unfree packages by - default. If your NixOS configuration requires unfree packages from - Nixpkgs, you need to enable support for them explicitly by setting: - + + + + + + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + + Nixpkgs no longer exposes unfree packages by default. If your NixOS + configuration requires unfree packages from Nixpkgs, you need to enable + support for them explicitly by setting: nixpkgs.config.allowUnfree = true; - - Otherwise, you get an error message such as: - + Otherwise, you get an error message such as: error: package ‘nvidia-x11-331.49-3.12.17’ in ‘…/nvidia-x11/default.nix:56’ has an unfree license, refusing to evaluate - - - - The Adobe Flash player is no longer enabled by - default in the Firefox and Chromium wrappers. To enable it, you must - set: - + + + + + The Adobe Flash player is no longer enabled by default in the Firefox and + Chromium wrappers. To enable it, you must set: nixpkgs.config.allowUnfree = true; nixpkgs.config.firefox.enableAdobeFlash = true; # for Firefox nixpkgs.config.chromium.enableAdobeFlash = true; # for Chromium - - - - The firewall is now enabled by default. If you don’t - want this, you need to disable it explicitly: - + + + + + The firewall is now enabled by default. If you don’t want this, you need + to disable it explicitly: networking.firewall.enable = false; - - - - The option - has been renamed to - . - - The mysql55 service has been - merged into the mysql service, which no longer - sets a default for the option - . - - Package variants are now differentiated by suffixing - the name, rather than the version. For instance, - sqlite-3.8.4.3-interactive is now called - sqlite-interactive-3.8.4.3. This ensures that - nix-env -i sqlite is unambiguous, and that - nix-env -u won’t “upgrade” - sqlite to sqlite-interactive - or vice versa. Notably, this change affects the Firefox wrapper - (which provides plugins), as it is now called - firefox-wrapper. So when using - nix-env, you should do nix-env -e - firefox; nix-env -i firefox-wrapper if you want to keep - using the wrapper. This change does not affect declarative package - management, since attribute names like - pkgs.firefoxWrapper were already - unambiguous. - - The symlink /etc/ca-bundle.crt - is gone. Programs should instead use the environment variable - OPENSSL_X509_CERT_FILE (which points to - /etc/ssl/certs/ca-bundle.crt). - - - - - + + + + + The option has been renamed to + . + + + + + The mysql55 service has been merged into the + mysql service, which no longer sets a default for the + option . + + + + + Package variants are now differentiated by suffixing the name, rather than + the version. For instance, sqlite-3.8.4.3-interactive + is now called sqlite-interactive-3.8.4.3. This + ensures that nix-env -i sqlite is unambiguous, and that + nix-env -u won’t “upgrade” + sqlite to sqlite-interactive or vice + versa. Notably, this change affects the Firefox wrapper (which provides + plugins), as it is now called firefox-wrapper. So when + using nix-env, you should do nix-env -e + firefox; nix-env -i firefox-wrapper if you want to keep using + the wrapper. This change does not affect declarative package management, + since attribute names like pkgs.firefoxWrapper were + already unambiguous. + + + + + The symlink /etc/ca-bundle.crt is gone. Programs + should instead use the environment variable + OPENSSL_X509_CERT_FILE (which points to + /etc/ssl/certs/ca-bundle.crt). + + + + diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml index 42b51cd4a8ef1884d6b270ad991028cb6e30880d..4d93aa644c1d6fdf205237a1e41f8afeba8d395b 100644 --- a/nixos/doc/manual/release-notes/rl-1412.xml +++ b/nixos/doc/manual/release-notes/rl-1412.xml @@ -3,175 +3,465 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-14.12"> + Release 14.12 (“Caterpillar”, 2014/12/30) -Release 14.12 (“Caterpillar”, 2014/12/30) + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + + + Systemd has been updated to version 217, which has numerous + improvements. + + + + + + Nix has been updated to 1.8. + + + + + NixOS is now based on Glibc 2.20. + + + + + KDE has been updated to 4.14. + + + + + The default Linux kernel has been updated to 3.14. + + + + + If is enabled (the default), changes + made to the declaration of a user or group will be correctly realised when + running nixos-rebuild. For instance, removing a user + specification from configuration.nix will cause the + actual user account to be deleted. If + is disabled, it is no longer necessary to specify UIDs or GIDs; if + omitted, they are allocated dynamically. + + + + -In addition to numerous new and upgraded packages, this release has the following highlights: + + Following new services were added since the last release: + + + + atftpd + + + + + bosun + + + + + bspwm + + + + + chronos + + + + + collectd + + + + + consul + + + + + cpuminer-cryptonight + + + + + crashplan + + + + + dnscrypt-proxy + + + + + docker-registry + + + + + docker + + + + + etcd + + + + + fail2ban + + + + + fcgiwrap + + + + + fleet + + + + + fluxbox + + + + + gdm + + + + + geoclue2 + + + + + gitlab + + + + + gitolite + + + + + gnome3.gnome-documents + + + + + gnome3.gnome-online-miners + + + + + gnome3.gvfs + + + + + gnome3.seahorse + + + + + hbase + + + + + i2pd + + + + + influxdb + + + + + kubernetes + + + + + liquidsoap + + + + + lxc + + + + + mailpile + + + + + mesos + + + + + mlmmj + + + + + monetdb + + + + + mopidy + + + + + neo4j + + + + + nsd + + + + + openntpd + + + + + opentsdb + + + + + openvswitch + + + + + parallels-guest + + + + + peerflix + + + + + phd + + + + + polipo + + + + + prosody + + + + + radicale + + + + + redmine + + + + + riemann + + + + + scollector + + + + + seeks + + + + + siproxd + + + + + strongswan + + + + + tcsd + + + + + teamspeak3 + + + + + thermald + + + + + torque/mrom + + + + + torque/server + + + + + uhub + + + + + unifi + + + + + znc + + + + + zookeeper + + + + - - -Systemd has been updated to version 217, which has numerous -improvements. - - -Nix has been updated to 1.8. - -NixOS is now based on Glibc 2.20. - -KDE has been updated to 4.14. - -The default Linux kernel has been updated to 3.14. - -If is enabled (the -default), changes made to the declaration of a user or group will be -correctly realised when running nixos-rebuild. For -instance, removing a user specification from -configuration.nix will cause the actual user -account to be deleted. If is -disabled, it is no longer necessary to specify UIDs or GIDs; if -omitted, they are allocated dynamically. - - - -Following new services were added since the last release: - - -atftpd -bosun -bspwm -chronos -collectd -consul -cpuminer-cryptonight -crashplan -dnscrypt-proxy -docker-registry -docker -etcd -fail2ban -fcgiwrap -fleet -fluxbox -gdm -geoclue2 -gitlab -gitolite -gnome3.gnome-documents -gnome3.gnome-online-miners -gnome3.gvfs -gnome3.seahorse -hbase -i2pd -influxdb -kubernetes -liquidsoap -lxc -mailpile -mesos -mlmmj -monetdb -mopidy -neo4j -nsd -openntpd -opentsdb -openvswitch -parallels-guest -peerflix -phd -polipo -prosody -radicale -redmine -riemann -scollector -seeks -siproxd -strongswan -tcsd -teamspeak3 -thermald -torque/mrom -torque/server -uhub -unifi -znc -zookeeper - - - -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - -The default version of Apache httpd is now 2.4. If -you use the option to pass literal -Apache configuration text, you may need to update it — see + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + + The default version of Apache httpd is now 2.4. If you use the + option to pass literal Apache configuration + text, you may need to update it — see + Apache’s -documentation for details. If you wish to continue to use -httpd 2.2, add the following line to your NixOS configuration: - + documentation for details. If you wish to continue to use httpd + 2.2, add the following line to your NixOS configuration: services.httpd.package = pkgs.apacheHttpd_2_2; - - - -PHP 5.3 has been removed because it is no longer -supported by the PHP project. A migration guide is -available. - -The host side of a container virtual Ethernet pair -is now called ve-container-name -rather than c-container-name. - -GNOME 3.10 support has been dropped. The default GNOME version is now 3.12. - -VirtualBox has been upgraded to 4.3.20 release. Users -may be required to run rm -rf /tmp/.vbox*. The line -imports = [ <nixpkgs/nixos/modules/programs/virtualbox.nix> ] is -no longer necessary, use services.virtualboxHost.enable = -true instead. - -Also, hardening mode is now enabled by default, which means that unless you want to use -USB support, you no longer need to be a member of the vboxusers group. - - -Chromium has been updated to 39.0.2171.65. is now enabled by default. -chromium*Wrapper packages no longer exist, because upstream removed NSAPI support. -chromium-stable has been renamed to chromium. - - -Python packaging documentation is now part of nixpkgs manual. To override -the python packages available to a custom python you now use pkgs.pythonFull.buildEnv.override -instead of pkgs.pythonFull.override. - - -boot.resumeDevice = "8:6" is no longer supported. Most users will -want to leave it undefined, which takes the swap partitions automatically. There is an evaluation -assertion to ensure that the string starts with a slash. - - -The system-wide default timezone for NixOS installations -changed from CET to UTC. To choose -a different timezone for your system, configure -time.timeZone in -configuration.nix. A fairly complete list of possible -values for that setting is available at . - -GNU screen has been updated to 4.2.1, which breaks -the ability to connect to sessions created by older versions of -screen. - -The Intel GPU driver was updated to the 3.x prerelease -version (used by most distributions) and supports DRI3 -now. - - - - - + + + + + PHP 5.3 has been removed because it is no longer supported by the PHP + project. A migration + guide is available. + + + + + The host side of a container virtual Ethernet pair is now called + ve-container-name rather + than c-container-name. + + + + + GNOME 3.10 support has been dropped. The default GNOME version is now + 3.12. + + + + + VirtualBox has been upgraded to 4.3.20 release. Users may be required to + run rm -rf /tmp/.vbox*. The line imports = [ + <nixpkgs/nixos/modules/programs/virtualbox.nix> ] is no + longer necessary, use services.virtualboxHost.enable = + true instead. + + + Also, hardening mode is now enabled by default, which means that unless + you want to use USB support, you no longer need to be a member of the + vboxusers group. + + + + + Chromium has been updated to 39.0.2171.65. + is now enabled by default. + chromium*Wrapper packages no longer exist, because + upstream removed NSAPI support. chromium-stable has + been renamed to chromium. + + + + + Python packaging documentation is now part of nixpkgs manual. To override + the python packages available to a custom python you now use + pkgs.pythonFull.buildEnv.override instead of + pkgs.pythonFull.override. + + + + + boot.resumeDevice = "8:6" is no longer supported. Most + users will want to leave it undefined, which takes the swap partitions + automatically. There is an evaluation assertion to ensure that the string + starts with a slash. + + + + + The system-wide default timezone for NixOS installations changed from + CET to UTC. To choose a different + timezone for your system, configure time.timeZone in + configuration.nix. A fairly complete list of possible + values for that setting is available at + . + + + + + GNU screen has been updated to 4.2.1, which breaks the ability to connect + to sessions created by older versions of screen. + + + + + The Intel GPU driver was updated to the 3.x prerelease version (used by + most distributions) and supports DRI3 now. + + + + diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 6c1c46844ccbe989eacbe1b80e5c809622d5db66..4eb2f9aa0a95687ec4589e31d3ed754859990a22 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -3,375 +3,640 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-15.09"> + Release 15.09 (“Dingo”, 2015/09/30) -Release 15.09 (“Dingo”, 2015/09/30) - -In addition to numerous new and upgraded packages, this release -has the following highlights: - - + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + - The Haskell - packages infrastructure has been re-designed from the ground up - ("Haskell NG"). NixOS now distributes the latest version - of every single package registered on Hackage -- well in - excess of 8,000 Haskell packages. Detailed instructions on how to - use that infrastructure can be found in the + The Haskell packages + infrastructure has been re-designed from the ground up ("Haskell + NG"). NixOS now distributes the latest version of every single package + registered on + Hackage -- well + in excess of 8,000 Haskell packages. Detailed instructions on how to use + that infrastructure can be found in the + User's - Guide to the Haskell Infrastructure. Users migrating from an - earlier release may find helpful information below, in the list of - backwards-incompatible changes. Furthermore, we distribute 51(!) - additional Haskell package sets that provide every single . Users migrating from an earlier + release may find helpful information below, in the list of + backwards-incompatible changes. Furthermore, we distribute 51(!) additional + Haskell package sets that provide every single + LTS Haskell release - since version 0.0 as well as the most recent Stackage Nightly - snapshot. The announcement "Full - Stackage Support in Nixpkgs" gives additional - details. + Stackage Support in Nixpkgs" gives additional details. + - - Nix has been updated to version 1.10, which among other - improvements enables cryptographic signatures on binary caches for - improved security. + + Nix has been updated to version 1.10, which among other improvements + enables cryptographic signatures on binary caches for improved security. + - - You can now keep your NixOS system up to date automatically - by setting - + + You can now keep your NixOS system up to date automatically by setting system.autoUpgrade.enable = true; - - This will cause the system to periodically check for updates in - your current channel and run nixos-rebuild. + This will cause the system to periodically check for updates in your + current channel and run nixos-rebuild. + - - This release is based on Glibc 2.21, GCC 4.9 and Linux - 3.18. + + This release is based on Glibc 2.21, GCC 4.9 and Linux 3.18. + - - GNOME has been upgraded to 3.16. - + + GNOME has been upgraded to 3.16. + - - Xfce has been upgraded to 4.12. - + + Xfce has been upgraded to 4.12. + - - KDE 5 has been upgraded to KDE Frameworks 5.10, - Plasma 5.3.2 and Applications 15.04.3. - KDE 4 has been updated to kdelibs-4.14.10. - + + KDE 5 has been upgraded to KDE Frameworks 5.10, Plasma 5.3.2 and + Applications 15.04.3. KDE 4 has been updated to kdelibs-4.14.10. + - - E19 has been upgraded to 0.16.8.15. - + + E19 has been upgraded to 0.16.8.15. + + - - - -The following new services were added since the last release: - + + The following new services were added since the last release: - services/mail/exim.nix - services/misc/apache-kafka.nix - services/misc/canto-daemon.nix - services/misc/confd.nix - services/misc/devmon.nix - services/misc/gitit.nix - services/misc/ihaskell.nix - services/misc/mbpfan.nix - services/misc/mediatomb.nix - services/misc/mwlib.nix - services/misc/parsoid.nix - services/misc/plex.nix - services/misc/ripple-rest.nix - services/misc/ripple-data-api.nix - services/misc/subsonic.nix - services/misc/sundtek.nix - services/monitoring/cadvisor.nix - services/monitoring/das_watchdog.nix - services/monitoring/grafana.nix - services/monitoring/riemann-tools.nix - services/monitoring/teamviewer.nix - services/network-filesystems/u9fs.nix - services/networking/aiccu.nix - services/networking/asterisk.nix - services/networking/bird.nix - services/networking/charybdis.nix - services/networking/docker-registry-server.nix - services/networking/fan.nix - services/networking/firefox/sync-server.nix - services/networking/gateone.nix - services/networking/heyefi.nix - services/networking/i2p.nix - services/networking/lambdabot.nix - services/networking/mstpd.nix - services/networking/nix-serve.nix - services/networking/nylon.nix - services/networking/racoon.nix - services/networking/skydns.nix - services/networking/shout.nix - services/networking/softether.nix - services/networking/sslh.nix - services/networking/tinc.nix - services/networking/tlsdated.nix - services/networking/tox-bootstrapd.nix - services/networking/tvheadend.nix - services/networking/zerotierone.nix - services/scheduling/marathon.nix - services/security/fprintd.nix - services/security/hologram.nix - services/security/munge.nix - services/system/cloud-init.nix - services/web-servers/shellinabox.nix - services/web-servers/uwsgi.nix - services/x11/unclutter.nix - services/x11/display-managers/sddm.nix - system/boot/coredump.nix - system/boot/loader/loader.nix - system/boot/loader/generic-extlinux-compatible - system/boot/networkd.nix - system/boot/resolved.nix - system/boot/timesyncd.nix - tasks/filesystems/exfat.nix - tasks/filesystems/ntfs.nix - tasks/filesystems/vboxsf.nix - virtualisation/virtualbox-host.nix - virtualisation/vmware-guest.nix - virtualisation/xen-dom0.nix + + + services/mail/exim.nix + + + + + services/misc/apache-kafka.nix + + + + + services/misc/canto-daemon.nix + + + + + services/misc/confd.nix + + + + + services/misc/devmon.nix + + + + + services/misc/gitit.nix + + + + + services/misc/ihaskell.nix + + + + + services/misc/mbpfan.nix + + + + + services/misc/mediatomb.nix + + + + + services/misc/mwlib.nix + + + + + services/misc/parsoid.nix + + + + + services/misc/plex.nix + + + + + services/misc/ripple-rest.nix + + + + + services/misc/ripple-data-api.nix + + + + + services/misc/subsonic.nix + + + + + services/misc/sundtek.nix + + + + + services/monitoring/cadvisor.nix + + + + + services/monitoring/das_watchdog.nix + + + + + services/monitoring/grafana.nix + + + + + services/monitoring/riemann-tools.nix + + + + + services/monitoring/teamviewer.nix + + + + + services/network-filesystems/u9fs.nix + + + + + services/networking/aiccu.nix + + + + + services/networking/asterisk.nix + + + + + services/networking/bird.nix + + + + + services/networking/charybdis.nix + + + + + services/networking/docker-registry-server.nix + + + + + services/networking/fan.nix + + + + + services/networking/firefox/sync-server.nix + + + + + services/networking/gateone.nix + + + + + services/networking/heyefi.nix + + + + + services/networking/i2p.nix + + + + + services/networking/lambdabot.nix + + + + + services/networking/mstpd.nix + + + + + services/networking/nix-serve.nix + + + + + services/networking/nylon.nix + + + + + services/networking/racoon.nix + + + + + services/networking/skydns.nix + + + + + services/networking/shout.nix + + + + + services/networking/softether.nix + + + + + services/networking/sslh.nix + + + + + services/networking/tinc.nix + + + + + services/networking/tlsdated.nix + + + + + services/networking/tox-bootstrapd.nix + + + + + services/networking/tvheadend.nix + + + + + services/networking/zerotierone.nix + + + + + services/scheduling/marathon.nix + + + + + services/security/fprintd.nix + + + + + services/security/hologram.nix + + + + + services/security/munge.nix + + + + + services/system/cloud-init.nix + + + + + services/web-servers/shellinabox.nix + + + + + services/web-servers/uwsgi.nix + + + + + services/x11/unclutter.nix + + + + + services/x11/display-managers/sddm.nix + + + + + system/boot/coredump.nix + + + + + system/boot/loader/loader.nix + + + + + system/boot/loader/generic-extlinux-compatible + + + + + system/boot/networkd.nix + + + + + system/boot/resolved.nix + + + + + system/boot/timesyncd.nix + + + + + tasks/filesystems/exfat.nix + + + + + tasks/filesystems/ntfs.nix + + + + + tasks/filesystems/vboxsf.nix + + + + + virtualisation/virtualbox-host.nix + + + + + virtualisation/vmware-guest.nix + + + + + virtualisation/xen-dom0.nix + + - - - -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - -sshd no longer supports DSA and ECDSA -host keys by default. If you have existing systems with such host keys -and want to continue to use them, please set + + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + + sshd no longer supports DSA and ECDSA host keys by + default. If you have existing systems with such host keys and want to + continue to use them, please set system.stateVersion = "14.12"; - -The new option ensures that -certain configuration changes that could break existing systems (such -as the sshd host key setting) will maintain -compatibility with the specified NixOS release. NixOps sets the state -version of existing deployments automatically. - -cron is no longer enabled by -default, unless you have a non-empty -. To force -cron to be enabled, set -. - -Nix now requires binary caches to be cryptographically -signed. If you have unsigned binary caches that you want to continue -to use, you should set . - -Steam now doesn't need root rights to work. Instead of using -*-steam-chrootenv, you should now just run steam. -steamChrootEnv package was renamed to steam, -and old steam package -- to steamOriginal. - - -CMPlayer has been renamed to bomi upstream. Package -cmplayer was accordingly renamed to -bomi - -Atom Shell has been renamed to Electron upstream. Package atom-shell -was accordingly renamed to electron - - -Elm is not released on Hackage anymore. You should now use elmPackages.elm -which contains the latest Elm platform. - - - The CUPS printing service has been updated to version - 2.0.2. Furthermore its systemd service has been - renamed to cups.service. - - Local printers are no longer shared or advertised by - default. This behavior can be changed by enabling - or - respectively. - - - - - The VirtualBox host and guest options have been named more - consistently. They can now found in - instead of - and - instead of - . - - - - Also, there now is support for the vboxsf file - system using the configuration - attribute. An example of how this can be used in a configuration: - + The new option ensures that + certain configuration changes that could break existing systems (such as + the sshd host key setting) will maintain compatibility + with the specified NixOS release. NixOps sets the state version of + existing deployments automatically. + + + + + cron is no longer enabled by default, unless you have a + non-empty . To force + cron to be enabled, set . + + + + + Nix now requires binary caches to be cryptographically signed. If you have + unsigned binary caches that you want to continue to use, you should set + . + + + + + Steam now doesn't need root rights to work. Instead of using + *-steam-chrootenv, you should now just run + steam. steamChrootEnv package was + renamed to steam, and old steam + package -- to steamOriginal. + + + + + CMPlayer has been renamed to bomi upstream. Package + cmplayer was accordingly renamed to + bomi + + + + + Atom Shell has been renamed to Electron upstream. Package + atom-shell was accordingly renamed to + electron + + + + + Elm is not released on Hackage anymore. You should now use + elmPackages.elm which contains the latest Elm platform. + + + + + The CUPS printing service has been updated to version + 2.0.2. Furthermore its systemd service has been renamed + to cups.service. + + + Local printers are no longer shared or advertised by default. This + behavior can be changed by enabling + or + respectively. + + + + + The VirtualBox host and guest options have been named more consistently. + They can now found in + instead of and + instead of + . + + + Also, there now is support for the vboxsf file system + using the configuration attribute. An example + of how this can be used in a configuration: fileSystems."/shiny" = { device = "myshinysharedfolder"; fsType = "vboxsf"; }; - - - - - - - "nix-env -qa" no longer discovers - Haskell packages by name. The only packages visible in the global - scope are ghc, cabal-install, - and stack, but all other packages are hidden. The - reason for this inconvenience is the sheer size of the Haskell - package set. Name-based lookups are expensive, and most - nix-env -qa operations would become much slower - if we'd add the entire Hackage database into the top level attribute - set. Instead, the list of Haskell packages can be displayed by - running: - - + + + + + "nix-env -qa" no longer discovers Haskell + packages by name. The only packages visible in the global scope are + ghc, cabal-install, and + stack, but all other packages are hidden. The reason + for this inconvenience is the sheer size of the Haskell package set. + Name-based lookups are expensive, and most nix-env -qa + operations would become much slower if we'd add the entire Hackage + database into the top level attribute set. Instead, the list of Haskell + packages can be displayed by running: + + nix-env -f "<nixpkgs>" -qaP -A haskellPackages - - Executable programs written in Haskell can be installed with: - - + + Executable programs written in Haskell can be installed with: + + nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc - - Installing Haskell libraries this way, however, is no - longer supported. See the next item for more details. - - - - - - Previous versions of NixOS came with a feature called - ghc-wrapper, a small script that allowed GHC to - transparently pick up on libraries installed in the user's profile. This - feature has been deprecated; ghc-wrapper was removed - from the distribution. The proper way to register Haskell libraries with - the compiler now is the haskellPackages.ghcWithPackages - function. The + Installing Haskell libraries this way, however, is no + longer supported. See the next item for more details. + + + + + Previous versions of NixOS came with a feature called + ghc-wrapper, a small script that allowed GHC to + transparently pick up on libraries installed in the user's profile. This + feature has been deprecated; ghc-wrapper was removed + from the distribution. The proper way to register Haskell libraries with + the compiler now is the haskellPackages.ghcWithPackages + function. The + User's - Guide to the Haskell Infrastructure provides more information about - this subject. - - - - - - All Haskell builds that have been generated with version 1.x of - the cabal2nix utility are now invalid and need - to be re-generated with a current version of - cabal2nix to function. The most recent version - of this tool can be installed by running - nix-env -i cabal2nix. - - - - - - The haskellPackages set in Nixpkgs used to have a - function attribute called extension that users - could override in their ~/.nixpkgs/config.nix - files to configure additional attributes, etc. That function still - exists, but it's now called overrides. - - - - - - The OpenBLAS library has been updated to version - 0.2.14. Support for the - x86_64-darwin platform was added. Dynamic - architecture detection was enabled; OpenBLAS now selects - microarchitecture-optimized routines at runtime, so optimal - performance is achieved without the need to rebuild OpenBLAS - locally. OpenBLAS has replaced ATLAS in most packages which use an - optimized BLAS or LAPACK implementation. - - - - - - The phpfpm is now using the default PHP version - (pkgs.php) instead of PHP 5.4 (pkgs.php54). - - - - - - The locate service no longer indexes the Nix store - by default, preventing packages with potentially numerous versions from - cluttering the output. Indexing the store can be activated by setting - . - - - - - - The Nix expression search path (NIX_PATH) no longer - contains /etc/nixos/nixpkgs by default. You - can override NIX_PATH by setting - . - - - - - - Python 2.6 has been marked as broken (as it no longer receives - security updates from upstream). - - - - - - Any use of module arguments such as pkgs to access - library functions, or to define imports attributes - will now lead to an infinite loop at the time of the evaluation. - - - - In case of an infinite loop, use the --show-trace - command line argument and read the line just above the error message. - + Guide to the Haskell Infrastructure provides more information about + this subject. + + + + + All Haskell builds that have been generated with version 1.x of the + cabal2nix utility are now invalid and need to be + re-generated with a current version of cabal2nix to + function. The most recent version of this tool can be installed by running + nix-env -i cabal2nix. + + + + + The haskellPackages set in Nixpkgs used to have a + function attribute called extension that users could + override in their ~/.nixpkgs/config.nix files to + configure additional attributes, etc. That function still exists, but it's + now called overrides. + + + + + The OpenBLAS library has been updated to version + 0.2.14. Support for the + x86_64-darwin platform was added. Dynamic architecture + detection was enabled; OpenBLAS now selects microarchitecture-optimized + routines at runtime, so optimal performance is achieved without the need + to rebuild OpenBLAS locally. OpenBLAS has replaced ATLAS in most packages + which use an optimized BLAS or LAPACK implementation. + + + + + The phpfpm is now using the default PHP version + (pkgs.php) instead of PHP 5.4 + (pkgs.php54). + + + + + The locate service no longer indexes the Nix store by + default, preventing packages with potentially numerous versions from + cluttering the output. Indexing the store can be activated by setting + . + + + + + The Nix expression search path (NIX_PATH) no longer + contains /etc/nixos/nixpkgs by default. You can + override NIX_PATH by setting . + + + + + Python 2.6 has been marked as broken (as it no longer receives security + updates from upstream). + + + + + Any use of module arguments such as pkgs to access + library functions, or to define imports attributes will + now lead to an infinite loop at the time of the evaluation. + + + In case of an infinite loop, use the --show-trace + command line argument and read the line just above the error message. $ nixos-rebuild build --show-trace … while evaluating the module argument `pkgs' in "/etc/nixos/my-module.nix": infinite recursion encountered - - - - - Any use of pkgs.lib, should be replaced by - lib, after adding it as argument of the module. The - following module - + + + Any use of pkgs.lib, should be replaced by + lib, after adding it as argument of the module. The + following module { config, pkgs, ... }: @@ -384,9 +649,7 @@ with pkgs.lib; config = mkIf config.foo { … }; } - - should be modified to look like: - + should be modified to look like: { config, pkgs, lib, ... }: @@ -399,13 +662,11 @@ with lib; config = mkIf config.foo { option definition }; } - - - - When pkgs is used to download other projects to - import their modules, and only in such cases, it should be replaced by - (import <nixpkgs> {}). The following module - + + + When pkgs is used to download other projects to import + their modules, and only in such cases, it should be replaced by + (import <nixpkgs> {}). The following module { config, pkgs, ... }: @@ -420,9 +681,7 @@ in imports = [ "${myProject}/module.nix" ]; } - - should be modified to look like: - + should be modified to look like: { config, pkgs, ... }: @@ -437,55 +696,55 @@ in imports = [ "${myProject}/module.nix" ]; } - - - - - - - - -Other notable improvements: - - - - The nixos and nixpkgs channels were unified, - so one can use nix-env -iA nixos.bash - instead of nix-env -iA nixos.pkgs.bash. - See the commit for details. - + + + + - + + Other notable improvements: + + - Users running an SSH server who worry about the quality of their - /etc/ssh/moduli file with respect to the - can use nix-env -iA nixos.bash + instead of nix-env -iA nixos.pkgs.bash. See + the + commit for details. + + + + + Users running an SSH server who worry about the quality of their + /etc/ssh/moduli file with respect to the + vulnerabilities - discovered in the Diffie-Hellman key exchange can now - replace OpenSSH's default version with one they generated - themselves using the new - option. - - - - - A newly packaged TeX Live 2015 is provided in pkgs.texlive, - split into 6500 nix packages. For basic user documentation see - the source. - Beware of an issue when installing a too large package set. - - The plan is to deprecate and maybe delete the original TeX packages - until the next release. - - - - on all Python interpreters - is now available for nix-shell interoperability. - - - - - + discovered in the Diffie-Hellman key exchange can now replace + OpenSSH's default version with one they generated themselves using the new + option. + + + + + A newly packaged TeX Live 2015 is provided in + pkgs.texlive, split into 6500 nix packages. For basic + user documentation see + the + source. Beware of + an + issue when installing a too large package set. The plan is to + deprecate and maybe delete the original TeX packages until the next + release. + + + + + on all Python interpreters is now available + for nix-shell interoperability. + + + + diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 7279dd05827031f859905b4d59118ce6d3de240b..9b512c4b1e58602a43b7d635d53603c93d2719ba 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -3,250 +3,471 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-16.03"> + Release 16.03 (“Emu”, 2016/03/31) -Release 16.03 (“Emu”, 2016/03/31) - -In addition to numerous new and upgraded packages, this release -has the following highlights: - - + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + - Systemd 229, bringing + Systemd 229, bringing + numerous - improvements over 217. + improvements over 217. + - - Linux 4.4 (was 3.18). + + Linux 4.4 (was 3.18). + - - GCC 5.3 (was 4.9). Note that GCC 5 + GCC 5.3 (was 4.9). Note that GCC 5 + changes - the C++ ABI in an incompatible way; this may cause problems - if you try to link objects compiled with different versions of - GCC. + the C++ ABI in an incompatible way; this may cause problems if you + try to link objects compiled with different versions of GCC. + - - Glibc 2.23 (was 2.21). + + Glibc 2.23 (was 2.21). + - - Binutils 2.26 (was 2.23.1). See #909 + + Binutils 2.26 (was 2.23.1). See #909 + - - Improved support for ensuring bitwise reproducible - builds. For example, stdenv now sets the - environment variable + Improved support for ensuring + bitwise + reproducible builds. For example, stdenv now sets + the environment variable + SOURCE_DATE_EPOCH - to a deterministic value, and Nix has gained - an option to repeat a build a number of times to test - determinism. An ongoing project, the goal of exact reproducibility - is to allow binaries to be verified independently (e.g., a user - might only trust binaries that appear in three independent binary - caches). + an option to repeat a build a number of times to test determinism. + An ongoing project, the goal of exact reproducibility is to allow binaries + to be verified independently (e.g., a user might only trust binaries that + appear in three independent binary caches). + - - Perl 5.22. + + Perl 5.22. + + - - -The following new services were added since the last release: - + + The following new services were added since the last release: - services/monitoring/longview.nix - hardware/video/webcam/facetimehd.nix - i18n/input-method/default.nix - i18n/input-method/fcitx.nix - i18n/input-method/ibus.nix - i18n/input-method/nabi.nix - i18n/input-method/uim.nix - programs/fish.nix - security/acme.nix - security/audit.nix - security/oath.nix - services/hardware/irqbalance.nix - services/mail/dspam.nix - services/mail/opendkim.nix - services/mail/postsrsd.nix - services/mail/rspamd.nix - services/mail/rmilter.nix - services/misc/autofs.nix - services/misc/bepasty.nix - services/misc/calibre-server.nix - services/misc/cfdyndns.nix - services/misc/gammu-smsd.nix - services/misc/mathics.nix - services/misc/matrix-synapse.nix - services/misc/octoprint.nix - services/monitoring/hdaps.nix - services/monitoring/heapster.nix - services/monitoring/longview.nix - services/network-filesystems/netatalk.nix - services/network-filesystems/xtreemfs.nix - services/networking/autossh.nix - services/networking/dnschain.nix - services/networking/gale.nix - services/networking/miniupnpd.nix - services/networking/namecoind.nix - services/networking/ostinato.nix - services/networking/pdnsd.nix - services/networking/shairport-sync.nix - services/networking/supplicant.nix - services/search/kibana.nix - services/security/haka.nix - services/security/physlock.nix - services/web-apps/pump.io.nix - services/x11/hardware/libinput.nix - services/x11/window-managers/windowlab.nix - system/boot/initrd-network.nix - system/boot/initrd-ssh.nix - system/boot/loader/loader.nix - system/boot/networkd.nix - system/boot/resolved.nix - virtualisation/lxd.nix - virtualisation/rkt.nix + + + services/monitoring/longview.nix + + + + + hardware/video/webcam/facetimehd.nix + + + + + i18n/input-method/default.nix + + + + + i18n/input-method/fcitx.nix + + + + + i18n/input-method/ibus.nix + + + + + i18n/input-method/nabi.nix + + + + + i18n/input-method/uim.nix + + + + + programs/fish.nix + + + + + security/acme.nix + + + + + security/audit.nix + + + + + security/oath.nix + + + + + services/hardware/irqbalance.nix + + + + + services/mail/dspam.nix + + + + + services/mail/opendkim.nix + + + + + services/mail/postsrsd.nix + + + + + services/mail/rspamd.nix + + + + + services/mail/rmilter.nix + + + + + services/misc/autofs.nix + + + + + services/misc/bepasty.nix + + + + + services/misc/calibre-server.nix + + + + + services/misc/cfdyndns.nix + + + + + services/misc/gammu-smsd.nix + + + + + services/misc/mathics.nix + + + + + services/misc/matrix-synapse.nix + + + + + services/misc/octoprint.nix + + + + + services/monitoring/hdaps.nix + + + + + services/monitoring/heapster.nix + + + + + services/monitoring/longview.nix + + + + + services/network-filesystems/netatalk.nix + + + + + services/network-filesystems/xtreemfs.nix + + + + + services/networking/autossh.nix + + + + + services/networking/dnschain.nix + + + + + services/networking/gale.nix + + + + + services/networking/miniupnpd.nix + + + + + services/networking/namecoind.nix + + + + + services/networking/ostinato.nix + + + + + services/networking/pdnsd.nix + + + + + services/networking/shairport-sync.nix + + + + + services/networking/supplicant.nix + + + + + services/search/kibana.nix + + + + + services/security/haka.nix + + + + + services/security/physlock.nix + + + + + services/web-apps/pump.io.nix + + + + + services/x11/hardware/libinput.nix + + + + + services/x11/window-managers/windowlab.nix + + + + + system/boot/initrd-network.nix + + + + + system/boot/initrd-ssh.nix + + + + + system/boot/loader/loader.nix + + + + + system/boot/networkd.nix + + + + + system/boot/resolved.nix + + + + + virtualisation/lxd.nix + + + + + virtualisation/rkt.nix + + - - -When upgrading from a previous release, please be aware of the -following incompatible changes: + - + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + - We no longer produce graphical ISO images and VirtualBox - images for i686-linux. A minimal ISO image is - still provided. + + We no longer produce graphical ISO images and VirtualBox images for + i686-linux. A minimal ISO image is still provided. + - - Firefox and similar browsers are now wrapped by default. - The package and attribute names are plain firefox - or midori, etc. Backward-compatibility attributes were set up, - but note that nix-env -u will not update - your current firefox-with-plugins; - you have to uninstall it and install firefox instead. + + Firefox and similar browsers are now wrapped by + default. The package and attribute names are plain + firefox or midori, etc. + Backward-compatibility attributes were set up, but note that + nix-env -u will not update your + current firefox-with-plugins; you have to uninstall it + and install firefox instead. + - - wmiiSnap has been replaced with + + wmiiSnap has been replaced with wmii_hg, but - services.xserver.windowManager.wmii.enable has - been updated respectively so this only affects you if you have - explicitly installed wmiiSnap. - + services.xserver.windowManager.wmii.enable has been + updated respectively so this only affects you if you have explicitly + installed wmiiSnap. + - - jobs NixOS option has been removed. It served as + + jobs NixOS option has been removed. It served as compatibility layer between Upstart jobs and SystemD services. All services - have been rewritten to use systemd.services + have been rewritten to use systemd.services + - - wmiimenu is removed, as it has been - removed by the developers upstream. Use wimenu - from the wmii-hg package. + + wmiimenu is removed, as it has been removed by the + developers upstream. Use wimenu from the + wmii-hg package. + - - Gitit is no longer automatically added to the module list in - NixOS and as such there will not be any manual entries for it. You - will need to add an import statement to your NixOS configuration - in order to use it, e.g. - + + Gitit is no longer automatically added to the module list in NixOS and as + such there will not be any manual entries for it. You will need to add an + import statement to your NixOS configuration in order to use it, e.g. ]; } ]]> - - will include the Gitit service configuration options. + will include the Gitit service configuration options. + - - nginx does not accept flags for enabling and - disabling modules anymore. Instead it accepts modules - argument, which is a list of modules to be built in. All modules now - reside in nginxModules set. Example configuration: - + + nginx does not accept flags for enabling and disabling + modules anymore. Instead it accepts modules argument, + which is a list of modules to be built in. All modules now reside in + nginxModules set. Example configuration: - + - - s3sync is removed, as it hasn't been - developed by upstream for 4 years and only runs with ruby 1.8. - For an actively-developer alternative look at - tarsnap and others. - + + s3sync is removed, as it hasn't been developed by + upstream for 4 years and only runs with ruby 1.8. For an actively-developer + alternative look at tarsnap and others. + - - ruby_1_8 has been removed as it's not - supported from upstream anymore and probably contains security - issues. - + + ruby_1_8 has been removed as it's not supported from + upstream anymore and probably contains security issues. + - - tidy-html5 package is removed. - Upstream only provided (lib)tidy5 during development, - and now they went back to (lib)tidy to work as a drop-in - replacement of the original package that has been unmaintained for years. - You can (still) use the html-tidy package, which got updated - to a stable release from this new upstream. + + tidy-html5 package is removed. Upstream only provided + (lib)tidy5 during development, and now they went back to + (lib)tidy to work as a drop-in replacement of the + original package that has been unmaintained for years. You can (still) use + the html-tidy package, which got updated to a stable + release from this new upstream. + - - extraDeviceOptions argument is removed - from bumblebee package. Instead there are - now two separate arguments: extraNvidiaDeviceOptions - and extraNouveauDeviceOptions for setting - extra X11 options for nvidia and nouveau drivers, respectively. - + + extraDeviceOptions argument is removed from + bumblebee package. Instead there are now two separate + arguments: extraNvidiaDeviceOptions and + extraNouveauDeviceOptions for setting extra X11 options + for nvidia and nouveau drivers, respectively. + - - The Ctrl+Alt+Backspace key combination - no longer kills the X server by default. - There's a new option - allowing to enable the combination again. - + + The Ctrl+Alt+Backspace key combination no longer kills + the X server by default. There's a new option + allowing to enable + the combination again. + - - emacsPackagesNg now contains all packages - from the ELPA, MELPA, and MELPA Stable repositories. - + + emacsPackagesNg now contains all packages from the ELPA, + MELPA, and MELPA Stable repositories. + - - Data directory for Postfix MTA server is moved from + + Data directory for Postfix MTA server is moved from /var/postfix to /var/lib/postfix. - Old configurations are migrated automatically. service.postfix - module has also received many improvements, such as correct directories' access - rights, new aliasFiles and mapFiles - options and more. + Old configurations are migrated automatically. + service.postfix module has also received many + improvements, such as correct directories' access rights, new + aliasFiles and mapFiles options and + more. + - - Filesystem options should now be configured as a list of strings, not - a comma-separated string. The old style will continue to work, but print a + + Filesystem options should now be configured as a list of strings, not a + comma-separated string. The old style will continue to work, but print a warning, until the 16.09 release. An example of the new style: - fileSystems."/example" = { device = "/dev/sdc"; @@ -254,103 +475,103 @@ fileSystems."/example" = { options = [ "noatime" "compress=lzo" "space_cache" "autodefrag" ]; }; - + - - CUPS, installed by services.printing module, now - has its data directory in /var/lib/cups. Old - configurations from /etc/cups are moved there - automatically, but there might be problems. Also configuration options + + CUPS, installed by services.printing module, now has its + data directory in /var/lib/cups. Old configurations + from /etc/cups are moved there automatically, but + there might be problems. Also configuration options services.printing.cupsdConf and - services.printing.cupsdFilesConf were removed - because they had been allowing one to override configuration variables - required for CUPS to work at all on NixOS. For most use cases, + services.printing.cupsdFilesConf were removed because + they had been allowing one to override configuration variables required for + CUPS to work at all on NixOS. For most use cases, services.printing.extraConf and new option - services.printing.extraFilesConf should be enough; - if you encounter a situation when they are not, please file a bug. - - There are also Gutenprint improvements; in particular, a new option - services.printing.gutenprint is added to enable automatic - updating of Gutenprint PPMs; it's greatly recommended to enable it instead - of adding gutenprint to the drivers list. - - - - - services.xserver.vaapiDrivers has been removed. Use - hardware.opengl.extraPackages{,32} instead. You can - also specify VDPAU drivers there. - - - - - programs.ibus moved to i18n.inputMethod.ibus. - The option programs.ibus.plugins changed to i18n.inputMethod.ibus.engines - and the option to enable ibus changed from programs.ibus.enable to + services.printing.extraFilesConf should be enough; if + you encounter a situation when they are not, please file a bug. + + + There are also Gutenprint improvements; in particular, a new option + services.printing.gutenprint is added to enable + automatic updating of Gutenprint PPMs; it's greatly recommended to enable + it instead of adding gutenprint to the + drivers list. + + + + + services.xserver.vaapiDrivers has been removed. Use + hardware.opengl.extraPackages{,32} instead. You can also + specify VDPAU drivers there. + + + + + programs.ibus moved to + i18n.inputMethod.ibus. The option + programs.ibus.plugins changed to + i18n.inputMethod.ibus.engines and the option to enable + ibus changed from programs.ibus.enable to i18n.inputMethod.enabled. - i18n.inputMethod.enabled should be set to the used input method name, - "ibus" for ibus. - An example of the new style: - + i18n.inputMethod.enabled should be set to the used input + method name, "ibus" for ibus. An example of the new + style: i18n.inputMethod.enabled = "ibus"; i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ]; - -That is equivalent to the old version: - + That is equivalent to the old version: programs.ibus.enable = true; programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ]; - - + - - services.udev.extraRules option now writes rules - to 99-local.rules instead of 10-local.rules. - This makes all the user rules apply after others, so their results wouldn't be - overriden by anything else. + + services.udev.extraRules option now writes rules to + 99-local.rules instead of + 10-local.rules. This makes all the user rules apply + after others, so their results wouldn't be overriden by anything else. + - - Large parts of the services.gitlab module has been - been rewritten. There are new configuration options available. The + + Large parts of the services.gitlab module has been been + rewritten. There are new configuration options available. The stateDir option was renamned to - statePath and the satellitesDir option - was removed. Please review the currently available options. + statePath and the satellitesDir + option was removed. Please review the currently available options. + - - - The option no - longer interpret the dollar sign ($) as a shell variable, as such it - should not be escaped anymore. Thus the following zone data: - - + + The option no longer + interpret the dollar sign ($) as a shell variable, as such it should not be + escaped anymore. Thus the following zone data: + + \$ORIGIN example.com. \$TTL 1800 @ IN SOA ns1.vpn.nbp.name. admin.example.com. ( - + Should modified to look like the actual file expected by nsd: - - + + $ORIGIN example.com. $TTL 1800 @ IN SOA ns1.vpn.nbp.name. admin.example.com. ( - - - service.syncthing.dataDir options now has to point - to exact folder where syncthing is writing to. Example configuration should + + service.syncthing.dataDir options now has to point to + exact folder where syncthing is writing to. Example configuration should look something like: - - + + services.syncthing = { enable = true; dataDir = "/home/somebody/.syncthing"; @@ -358,76 +579,73 @@ services.syncthing = { }; - - - - networking.firewall.allowPing is now enabled by - default. Users are encouraged to configure an appropriate rate limit for - their machines using the Kernel interface at - /proc/sys/net/ipv4/icmp_ratelimit and - /proc/sys/net/ipv6/icmp/ratelimit or using the - firewall itself, i.e. by setting the NixOS option - networking.firewall.pingLimit. - - - - - - Systems with some broadcom cards used to result into a generated config - that is no longer accepted. If you get errors like - error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created - you should either re-run nixos-generate-config or manually replace - "${config.boot.kernelPackages.broadcom_sta}" - by - config.boot.kernelPackages.broadcom_sta - in your /etc/nixos/hardware-configuration.nix. - More discussion is on - the github issue. - - - - - The services.xserver.startGnuPGAgent option has been removed. - GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no - longer requires (or even supports) the "start everything as a child of the - agent" scheme we've implemented in NixOS for older versions. - To configure the gpg-agent for your X session, add the following code to - ~/.bashrc or some file that’s sourced when your shell is started: - + + networking.firewall.allowPing is now enabled by default. + Users are encouraged to configure an appropriate rate limit for their + machines using the Kernel interface at + /proc/sys/net/ipv4/icmp_ratelimit and + /proc/sys/net/ipv6/icmp/ratelimit or using the + firewall itself, i.e. by setting the NixOS option + networking.firewall.pingLimit. + + + + + Systems with some broadcom cards used to result into a generated config + that is no longer accepted. If you get errors like +error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created + you should either re-run nixos-generate-config or + manually replace + "${config.boot.kernelPackages.broadcom_sta}" by + config.boot.kernelPackages.broadcom_sta in your + /etc/nixos/hardware-configuration.nix. More discussion + is on the + github issue. + + + + + The services.xserver.startGnuPGAgent option has been + removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new + approach no longer requires (or even supports) the "start everything as a + child of the agent" scheme we've implemented in NixOS for older versions. + To configure the gpg-agent for your X session, add the following code to + ~/.bashrc or some file that’s sourced when your + shell is started: + GPG_TTY=$(tty) export GPG_TTY - If you want to use gpg-agent for SSH, too, add the following to your session - initialization (e.g. displayManager.sessionCommands) - + If you want to use gpg-agent for SSH, too, add the following to your + session initialization (e.g. + displayManager.sessionCommands) + gpg-connect-agent /bye unset SSH_AGENT_PID export SSH_AUTH_SOCK="''${HOME}/.gnupg/S.gpg-agent.ssh" - and make sure that - + and make sure that + enable-ssh-support - is included in your ~/.gnupg/gpg-agent.conf. - You will need to use ssh-add to re-add your ssh keys. - If gpg’s automatic transformation of the private keys to the new format fails, - you will need to re-import your private keyring as well: - + is included in your ~/.gnupg/gpg-agent.conf. You will + need to use ssh-add to re-add your ssh keys. If gpg’s + automatic transformation of the private keys to the new format fails, you + will need to re-import your private keyring as well: + gpg --import ~/.gnupg/secring.gpg - The gpg-agent(1) man page has more details about this subject, - i.e. in the "EXAMPLES" section. - + The gpg-agent(1) man page has more details about this + subject, i.e. in the "EXAMPLES" section. + - - - -Other notable improvements: + - - - - - - ejabberd module is brought back and now works on - NixOS. - - - - Input method support was improved. New NixOS modules (fcitx, nabi and uim), - fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus engines (hangul and m17n) - have been added. - - - - + + + ejabberd module is brought back and now works on NixOS. + + + + + Input method support was improved. New NixOS modules (fcitx, nabi and + uim), fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus + engines (hangul and m17n) have been added. + + + + diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 893f894f42fee5c763c31f88a561f7bc30192ed5..4a2343edc970268a8a6899b093a6b3875e98ebe8 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -3,237 +3,275 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-16.09"> + Release 16.09 (“Flounder”, 2016/09/30) -Release 16.09 (“Flounder”, 2016/09/30) - -In addition to numerous new and upgraded packages, this release -has the following highlights: - - + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + - Many NixOS configurations and Nix packages now use - significantly less disk space, thanks to the + Many NixOS configurations and Nix packages now use significantly less disk + space, thanks to the + extensive - work on closure size reduction. For example, the closure - size of a minimal NixOS container went down from ~424 MiB in 16.03 - to ~212 MiB in 16.09, while the closure size of Firefox went from - ~651 MiB to ~259 MiB. + work on closure size reduction. For example, the closure size of a + minimal NixOS container went down from ~424 MiB in 16.03 to ~212 MiB in + 16.09, while the closure size of Firefox went from ~651 MiB to ~259 MiB. + - - To improve security, packages are now + To improve security, packages are now + built - using various hardening features. See the Nixpkgs manual - for more information. + using various hardening features. See the Nixpkgs manual for more + information. + - - Support for PXE netboot. See for documentation. + + Support for PXE netboot. See + for documentation. + - - X.org server 1.18. If you use the - ati_unfree driver, 1.17 is still used due to an - ABI incompatibility. + + X.org server 1.18. If you use the ati_unfree driver, + 1.17 is still used due to an ABI incompatibility. + - - This release is based on Glibc 2.24, GCC 5.4.0 and systemd - 231. The default Linux kernel remains 4.4. + + This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. The default + Linux kernel remains 4.4. + + - - -The following new services were added since the last release: + + The following new services were added since the last release: + - - (this will get automatically generated at release time) - - -When upgrading from a previous release, please be aware of the -following incompatible changes: + + + + (this will get automatically generated at release time) + + + - + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + - A large number of packages have been converted to use the multiple outputs feature - of Nix to greatly reduce the amount of required disk space, as - mentioned above. This may require changes - to any custom packages to make them build again; see the relevant chapter in the - Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions - related to multiple-output packages - were changed - late (August 2016) in the release cycle and differ from the initial introduction of multiple outputs.) - + + A large number of packages have been converted to use the multiple outputs + feature of Nix to greatly reduce the amount of required disk space, as + mentioned above. This may require changes to any custom packages to make + them build again; see the relevant chapter in the Nixpkgs manual for more + information. (Additional caveat to packagers: some packaging conventions + related to multiple-output packages + were + changed late (August 2016) in the release cycle and differ from the + initial introduction of multiple outputs.) + - - Previous versions of Nixpkgs had support for all versions of the LTS + + Previous versions of Nixpkgs had support for all versions of the LTS Haskell package set. That support has been dropped. The previously provided haskell.packages.lts-x_y package sets still exist in name to aviod breaking user code, but these package sets don't actually contain the versions mandated by the corresponding LTS release. Instead, our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will - drop those old names entirely. The motivation for this change has been discussed at length on the - nix-dev mailing list and in Github issue - #14897. Development strategies for Haskell hackers who want to rely - on Nix and NixOS have been described in nix-dev mailing list and in + Github + issue #14897. Development strategies for Haskell hackers who want to + rely on Nix and NixOS have been described in + another - nix-dev article. + nix-dev article. + - - Shell aliases for systemd sub-commands - were dropped: - start, stop, - restart, status. + + Shell aliases for systemd sub-commands + were + dropped: start, stop, + restart, status. + - - Redis now binds to 127.0.0.1 only instead of listening to all network interfaces. This is the default - behavior of Redis 3.2 + + Redis now binds to 127.0.0.1 only instead of listening to all network + interfaces. This is the default behavior of Redis 3.2 + - - - /var/empty is now immutable. Activation script runs chattr +i - to forbid any modifications inside the folder. See - the pull request for what bugs this caused. - + + /var/empty is now immutable. Activation script runs + chattr +i to forbid any modifications inside the folder. + See the + pull request for what bugs this caused. + - - Gitlab's maintainance script - gitlab-runner was removed and split up into the - more clearer gitlab-run and + + Gitlab's maintainance script gitlab-runner was removed + and split up into the more clearer gitlab-run and gitlab-rake scripts, because - gitlab-runner is a component of Gitlab - CI. + gitlab-runner is a component of Gitlab CI. + - - services.xserver.libinput.accelProfile default - changed from flat to adaptive, - as per - official documentation. + + services.xserver.libinput.accelProfile default changed + from flat to adaptive, as per + + official documentation. + - - fonts.fontconfig.ultimate.rendering was removed - because our presets were obsolete for some time. New presets are hardcoded - into FreeType; you can select a preset via fonts.fontconfig.ultimate.preset. - You can customize those presets via ordinary environment variables, using - environment.variables. + + fonts.fontconfig.ultimate.rendering was removed because + our presets were obsolete for some time. New presets are hardcoded into + FreeType; you can select a preset via + fonts.fontconfig.ultimate.preset. You can customize + those presets via ordinary environment variables, using + environment.variables. + - - The audit service is no longer enabled by default. - Use security.audit.enable = true to explicitly enable it. + + The audit service is no longer enabled by default. Use + security.audit.enable = true to explicitly enable it. + - - - pkgs.linuxPackages.virtualbox now contains only the - kernel modules instead of the VirtualBox user space binaries. - If you want to reference the user space binaries, you have to use the new - pkgs.virtualbox instead. - + + pkgs.linuxPackages.virtualbox now contains only the + kernel modules instead of the VirtualBox user space binaries. If you want + to reference the user space binaries, you have to use the new + pkgs.virtualbox instead. + - - goPackages was replaced with separated Go - applications in appropriate nixpkgs - categories. Each Go package uses its own dependency set. There's - also a new go2nix tool introduced to generate a - Go package definition from its Go source automatically. + + goPackages was replaced with separated Go applications + in appropriate nixpkgs categories. Each Go package uses + its own dependency set. There's also a new go2nix tool + introduced to generate a Go package definition from its Go source + automatically. + - - services.mongodb.extraConfig configuration format - was changed to YAML. + + services.mongodb.extraConfig configuration format was + changed to YAML. + - - - PHP has been upgraded to 7.0 - + + PHP has been upgraded to 7.0 + - - - -Other notable improvements: - - + - Revamped grsecurity/PaX support. There is now only a single - general-purpose distribution kernel and the configuration interface has been - streamlined. Desktop users should be able to simply set - security.grsecurity.enable = true to get - a reasonably secure system without having to sacrifice too much - functionality. - + + Other notable improvements: + - Special filesystems, like /proc, - /run and others, now have the same mount options - as recommended by systemd and are unified across different places in - NixOS. Mount options are updated during nixos-rebuild - switch if possible. One benefit from this is improved - security — most such filesystems are now mounted with - noexec, nodev and/or - nosuid options. - - The reverse path filter was interfering with DHCPv4 server - operation in the past. An exception for DHCPv4 and a new option to log - packets that were dropped due to the reverse path filter was added - (networking.firewall.logReversePathDrops) for easier - debugging. - - Containers configuration within - containers.<name>.config is + + + Revamped grsecurity/PaX support. There is now only a single general-purpose + distribution kernel and the configuration interface has been streamlined. + Desktop users should be able to simply set +security.grsecurity.enable = true + to get a reasonably secure system without having to sacrifice too much + functionality. + + + + + Special filesystems, like /proc, /run + and others, now have the same mount options as recommended by systemd and + are unified across different places in NixOS. Mount options are updated + during nixos-rebuild switch if possible. One benefit + from this is improved security — most such filesystems are now mounted + with noexec, nodev and/or + nosuid options. + + + + + The reverse path filter was interfering with DHCPv4 server operation in the + past. An exception for DHCPv4 and a new option to log packets that were + dropped due to the reverse path filter was added + (networking.firewall.logReversePathDrops) for easier + debugging. + + + + + Containers configuration within + containers.<name>.config is + now - properly typed and checked. In particular, partial - configurations are merged correctly. - + properly typed and checked. In particular, partial configurations + are merged correctly. + + - The directory container setuid wrapper programs, - /var/setuid-wrappers, + The directory container setuid wrapper programs, + /var/setuid-wrappers, + is now - updated atomically to prevent failures if the switch to a new - configuration is interrupted. + updated atomically to prevent failures if the switch to a new configuration + is interrupted. + - - services.xserver.startGnuPGAgent - has been removed due to GnuPG 2.1.x bump. See + services.xserver.startGnuPGAgent has been removed due to + GnuPG 2.1.x bump. See + - how to achieve similar behavior. You might need to - pkill gpg-agent after the upgrade - to prevent a stale agent being in the way. - + how to achieve similar behavior. You might need to pkill + gpg-agent after the upgrade to prevent a stale agent being in the + way. + - - + + - Declarative users could share the uid due to the bug in - the script handling conflict resolution. - - - - + Declarative users could share the uid due to the bug in the script handling + conflict resolution. + + + + Gummi boot has been replaced using systemd-boot. - - - + + + + Hydra package and NixOS module were added for convenience. - - - - - + + + diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 6147b9830137d3b507cffe09c8471d72decbb58b..6ca79e2bc00da1d145c5c37af99d59a8af5477de 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -3,259 +3,588 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-17.03"> + Release 17.03 (“Gorilla”, 2017/03/31) -Release 17.03 (“Gorilla”, 2017/03/31) - -
+ Highlights -Highlights + + In addition to numerous new and upgraded packages, this release has the + following highlights: + -In addition to numerous new and upgraded packages, this release -has the following highlights: - - - - Nixpkgs is now extensible through overlays. See the + + + Nixpkgs is now extensible through overlays. See the + Nixpkgs - manual for more information. - - - - This release is based on Glibc 2.25, GCC 5.4.0 and systemd - 232. The default Linux kernel is 4.9 and Nix is at 1.11.8. - - - - The default desktop environment now is KDE's Plasma 5. KDE 4 has been removed - - - - The setuid wrapper functionality now supports setting - capabilities. - - - - X.org server uses branch 1.19. Due to ABI incompatibilities, - ati_unfree keeps forcing 1.17 - and amdgpu-pro starts forcing 1.18. - - - + manual for more information. + + + - Cross compilation has been rewritten. See the nixpkgs manual for - details. The most obvious breaking change is that in derivations there is no - .nativeDrv nor .crossDrv are now - cross by default, not native. + This release is based on Glibc 2.25, GCC 5.4.0 and systemd 232. The + default Linux kernel is 4.9 and Nix is at 1.11.8. - - - - The overridePackages function has been rewritten - to be replaced by + + + The default desktop environment now is KDE's Plasma 5. KDE 4 has been + removed + + + + + The setuid wrapper functionality now supports setting capabilities. + + + + + X.org server uses branch 1.19. Due to ABI incompatibilities, + ati_unfree keeps forcing 1.17 and + amdgpu-pro starts forcing 1.18. + + + + + Cross compilation has been rewritten. See the nixpkgs manual for details. + The most obvious breaking change is that in derivations there is no + .nativeDrv nor .crossDrv are now + cross by default, not native. + + + + + The overridePackages function has been rewritten to be + replaced by + - overlays - - - - Packages in nixpkgs can be marked as insecure through listed - vulnerabilities. See the + + + + + Packages in nixpkgs can be marked as insecure through listed + vulnerabilities. See the + Nixpkgs - manual for more information. - - - - PHP now defaults to PHP 7.1 - - - + manual for more information. + + + + + PHP now defaults to PHP 7.1 + + + +
- -
+ New Services -New Services + + The following new services were added since the last release: + -The following new services were added since the last release: - - - hardware/ckb.nix - hardware/mcelog.nix - hardware/usb-wwan.nix - hardware/video/capture/mwprocapture.nix - programs/adb.nix - programs/chromium.nix - programs/gphoto2.nix - programs/java.nix - programs/mtr.nix - programs/oblogout.nix - programs/vim.nix - programs/wireshark.nix - security/dhparams.nix - services/audio/ympd.nix - services/computing/boinc/client.nix - services/continuous-integration/buildbot/master.nix - services/continuous-integration/buildbot/worker.nix - services/continuous-integration/gitlab-runner.nix - services/databases/riak-cs.nix - services/databases/stanchion.nix - services/desktops/gnome3/gnome-terminal-server.nix - services/editors/infinoted.nix - services/hardware/illum.nix - services/hardware/trezord.nix - services/logging/journalbeat.nix - services/mail/offlineimap.nix - services/mail/postgrey.nix - services/misc/couchpotato.nix - services/misc/docker-registry.nix - services/misc/errbot.nix - services/misc/geoip-updater.nix - services/misc/gogs.nix - services/misc/leaps.nix - services/misc/nix-optimise.nix - services/misc/ssm-agent.nix - services/misc/sssd.nix - services/monitoring/arbtt.nix - services/monitoring/netdata.nix - services/monitoring/prometheus/default.nix - services/monitoring/prometheus/alertmanager.nix - services/monitoring/prometheus/blackbox-exporter.nix - services/monitoring/prometheus/json-exporter.nix - services/monitoring/prometheus/nginx-exporter.nix - services/monitoring/prometheus/node-exporter.nix - services/monitoring/prometheus/snmp-exporter.nix - services/monitoring/prometheus/unifi-exporter.nix - services/monitoring/prometheus/varnish-exporter.nix - services/monitoring/sysstat.nix - services/monitoring/telegraf.nix - services/monitoring/vnstat.nix - services/network-filesystems/cachefilesd.nix - services/network-filesystems/glusterfs.nix - services/network-filesystems/ipfs.nix - services/networking/dante.nix - services/networking/dnscrypt-wrapper.nix - services/networking/fakeroute.nix - services/networking/flannel.nix - services/networking/htpdate.nix - services/networking/miredo.nix - services/networking/nftables.nix - services/networking/powerdns.nix - services/networking/pdns-recursor.nix - services/networking/quagga.nix - services/networking/redsocks.nix - services/networking/wireguard.nix - services/system/cgmanager.nix - services/torrent/opentracker.nix - services/web-apps/atlassian/confluence.nix - services/web-apps/atlassian/crowd.nix - services/web-apps/atlassian/jira.nix - services/web-apps/frab.nix - services/web-apps/nixbot.nix - services/web-apps/selfoss.nix - services/web-apps/quassel-webserver.nix - services/x11/unclutter-xfixes.nix - services/x11/urxvtd.nix - system/boot/systemd-nspawn.nix - virtualisation/ecs-agent.nix - virtualisation/lxcfs.nix - virtualisation/openstack/keystone.nix - virtualisation/openstack/glance.nix - + + + + hardware/ckb.nix + + + + + hardware/mcelog.nix + + + + + hardware/usb-wwan.nix + + + + + hardware/video/capture/mwprocapture.nix + + + + + programs/adb.nix + + + + + programs/chromium.nix + + + + + programs/gphoto2.nix + + + + + programs/java.nix + + + + + programs/mtr.nix + + + + + programs/oblogout.nix + + + + + programs/vim.nix + + + + + programs/wireshark.nix + + + + + security/dhparams.nix + + + + + services/audio/ympd.nix + + + + + services/computing/boinc/client.nix + + + + + services/continuous-integration/buildbot/master.nix + + + + + services/continuous-integration/buildbot/worker.nix + + + + + services/continuous-integration/gitlab-runner.nix + + + + + services/databases/riak-cs.nix + + + + + services/databases/stanchion.nix + + + + + services/desktops/gnome3/gnome-terminal-server.nix + + + + + services/editors/infinoted.nix + + + + + services/hardware/illum.nix + + + + + services/hardware/trezord.nix + + + + + services/logging/journalbeat.nix + + + + + services/mail/offlineimap.nix + + + + + services/mail/postgrey.nix + + + + + services/misc/couchpotato.nix + + + + + services/misc/docker-registry.nix + + + + + services/misc/errbot.nix + + + + + services/misc/geoip-updater.nix + + + + + services/misc/gogs.nix + + + + + services/misc/leaps.nix + + + + + services/misc/nix-optimise.nix + + + + + services/misc/ssm-agent.nix + + + + + services/misc/sssd.nix + + + + + services/monitoring/arbtt.nix + + + + + services/monitoring/netdata.nix + + + + + services/monitoring/prometheus/default.nix + + + + + services/monitoring/prometheus/alertmanager.nix + + + + + services/monitoring/prometheus/blackbox-exporter.nix + + + + + services/monitoring/prometheus/json-exporter.nix + + + + + services/monitoring/prometheus/nginx-exporter.nix + + + + + services/monitoring/prometheus/node-exporter.nix + + + + + services/monitoring/prometheus/snmp-exporter.nix + + + + + services/monitoring/prometheus/unifi-exporter.nix + + + + + services/monitoring/prometheus/varnish-exporter.nix + + + + + services/monitoring/sysstat.nix + + + + + services/monitoring/telegraf.nix + + + + + services/monitoring/vnstat.nix + + + + + services/network-filesystems/cachefilesd.nix + + + + + services/network-filesystems/glusterfs.nix + + + + + services/network-filesystems/ipfs.nix + + + + + services/networking/dante.nix + + + + + services/networking/dnscrypt-wrapper.nix + + + + + services/networking/fakeroute.nix + + + + + services/networking/flannel.nix + + + + + services/networking/htpdate.nix + + + + + services/networking/miredo.nix + + + + + services/networking/nftables.nix + + + + + services/networking/powerdns.nix + + + + + services/networking/pdns-recursor.nix + + + + + services/networking/quagga.nix + + + + + services/networking/redsocks.nix + + + + + services/networking/wireguard.nix + + + + + services/system/cgmanager.nix + + + + + services/torrent/opentracker.nix + + + + + services/web-apps/atlassian/confluence.nix + + + + + services/web-apps/atlassian/crowd.nix + + + + + services/web-apps/atlassian/jira.nix + + + + + services/web-apps/frab.nix + + + + + services/web-apps/nixbot.nix + + + + + services/web-apps/selfoss.nix + + + + + services/web-apps/quassel-webserver.nix + + + + + services/x11/unclutter-xfixes.nix + + + + + services/x11/urxvtd.nix + + + + + system/boot/systemd-nspawn.nix + + + + + virtualisation/ecs-agent.nix + + + + + virtualisation/lxcfs.nix + + + + + virtualisation/openstack/keystone.nix + + + + + virtualisation/openstack/glance.nix + + + +
- -
+ Backward Incompatibilities -Backward Incompatibilities + + When upgrading from a previous release, please be aware of the following + incompatible changes: + -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - + + - Derivations have no .nativeDrv nor .crossDrv - and are now cross by default, not native. + Derivations have no .nativeDrv nor + .crossDrv and are now cross by default, not native. - - - + + - stdenv.overrides is now expected to take self - and super arguments. See lib.trivial.extends - for what those parameters represent. + stdenv.overrides is now expected to take + self and super arguments. See + lib.trivial.extends for what those parameters + represent. - - - + + - ansible now defaults to ansible version 2 as version 1 - has been removed due to a serious ansible now defaults to ansible version 2 as version 1 + has been removed due to a serious + - vulnerability unpatched by upstream. + vulnerability unpatched by upstream. - - - + + - gnome alias has been removed along with - gtk, gtkmm and several others. - Now you need to use versioned attributes, like gnome3. + gnome alias has been removed along with + gtk, gtkmm and several others. Now + you need to use versioned attributes, like gnome3. - - - + + - The attribute name of the Radicale daemon has been changed from - pythonPackages.radicale to - radicale. + The attribute name of the Radicale daemon has been changed from + pythonPackages.radicale to radicale. - - - + + - The stripHash bash function in stdenv - changed according to its documentation; it now outputs the stripped name to - stdout instead of putting it in the variable - strippedName. + The stripHash bash function in + stdenv changed according to its documentation; it now + outputs the stripped name to stdout instead of putting + it in the variable strippedName. - - - - PHP now scans for extra configuration .ini files in /etc/php.d - instead of /etc. This prevents accidentally loading non-PHP .ini files - that may be in /etc. + + + + PHP now scans for extra configuration .ini files in /etc/php.d instead of + /etc. This prevents accidentally loading non-PHP .ini files that may be in + /etc. - - - + + - Two lone top-level dict dbs moved into dictdDBs. This - affects: dictdWordnet which is now at - dictdDBs.wordnet and dictdWiktionary - which is now at dictdDBs.wiktionary + Two lone top-level dict dbs moved into dictdDBs. This + affects: dictdWordnet which is now at + dictdDBs.wordnet and dictdWiktionary + which is now at dictdDBs.wiktionary - - - + + - Parsoid service now uses YAML configuration format. + Parsoid service now uses YAML configuration format. service.parsoid.interwikis is now called service.parsoid.wikis and is a list of either API URLs or attribute sets as specified in parsoid's documentation. - - - + + Ntpd was replaced by systemd-timesyncd as the default service to synchronize @@ -263,14 +592,12 @@ following incompatible changes: setting services.ntp.enable to true. Upstream time servers for all NTP implementations are now configured using networking.timeServers. - - - - + + + - service.nylon is now declared using named instances. - As an example: - + service.nylon is now declared using named instances. As + an example: services.nylon = { enable = true; @@ -279,9 +606,7 @@ following incompatible changes: port = 5912; }; - - should be replaced with: - + should be replaced with: services.nylon.myvpn = { enable = true; @@ -290,225 +615,203 @@ following incompatible changes: port = 5912; }; - - this enables you to declare a SOCKS proxy for each uplink. - + this enables you to declare a SOCKS proxy for each uplink. - - - - overridePackages function no longer exists. - It is replaced by + + + overridePackages function no longer exists. It is + replaced by + - overlays. For example, the following code: - + overlays. For example, the following code: let pkgs = import <nixpkgs> {}; in pkgs.overridePackages (self: super: ...) - - should be replaced by: - + should be replaced by: let pkgs = import <nixpkgs> {}; in import pkgs.path { overlays = [(self: super: ...)]; } - - - - + + - Autoloading connection tracking helpers is now disabled by default. - This default was also changed in the Linux kernel and is considered - insecure if not configured properly in your firewall. If you need - connection tracking helpers (i.e. for active FTP) please enable - networking.firewall.autoLoadConntrackHelpers and - tune networking.firewall.connectionTrackingModules - to suit your needs. - - - - + Autoloading connection tracking helpers is now disabled by default. This + default was also changed in the Linux kernel and is considered insecure if + not configured properly in your firewall. If you need connection tracking + helpers (i.e. for active FTP) please enable + networking.firewall.autoLoadConntrackHelpers and tune + networking.firewall.connectionTrackingModules to suit + your needs. + + + - local_recipient_maps is not set to empty value by - Postfix service. It's an insecure default as stated by Postfix - documentation. Those who want to retain this setting need to set it via - services.postfix.extraConfig. + local_recipient_maps is not set to empty value by + Postfix service. It's an insecure default as stated by Postfix + documentation. Those who want to retain this setting need to set it via + services.postfix.extraConfig. - - - + + - Iputils no longer provide ping6 and traceroute6. The functionality of - these tools has been integrated into ping and traceroute respectively. To - enforce an address family the new flags -4 and - -6 have been added. One notable incompatibility is that - specifying an interface (for link-local IPv6 for instance) is no longer done - with the -I flag, but by encoding the interface into the - address (ping fe80::1%eth0). - - - - + Iputils no longer provide ping6 and traceroute6. The functionality of + these tools has been integrated into ping and traceroute respectively. To + enforce an address family the new flags -4 and + -6 have been added. One notable incompatibility is that + specifying an interface (for link-local IPv6 for instance) is no longer + done with the -I flag, but by encoding the interface + into the address (ping fe80::1%eth0). + + + - The socket handling of the services.rmilter module - has been fixed and refactored. As rmilter doesn't support binding to - more than one socket, the options bindUnixSockets - and bindInetSockets have been replaced by - services.rmilter.bindSocket.*. The default is still - a unix socket in /run/rmilter/rmilter.sock. Refer to - the options documentation for more information. - - - - + The socket handling of the services.rmilter module has + been fixed and refactored. As rmilter doesn't support binding to more than + one socket, the options bindUnixSockets and + bindInetSockets have been replaced by + services.rmilter.bindSocket.*. The default is still a + unix socket in /run/rmilter/rmilter.sock. Refer to the + options documentation for more information. + + + - The fetch* functions no longer support md5, - please use sha256 instead. + The fetch* functions no longer support md5, please use + sha256 instead. - - - + + - The dnscrypt-proxy module interface has been streamlined around the - option. Where possible, legacy option - declarations are mapped to but will emit - warnings. The has been outright - removed: to use an unlisted resolver, use the - option. - - - - + The dnscrypt-proxy module interface has been streamlined around the + option. Where possible, legacy option + declarations are mapped to but will emit + warnings. The has been outright removed: to + use an unlisted resolver, use the option. + + + - torbrowser now stores local state under - ~/.local/share/tor-browser by default. Any - browser profile data from the old location, - ~/.torbrowser4, must be migrated manually. + torbrowser now stores local state under + ~/.local/share/tor-browser by default. Any browser + profile data from the old location, ~/.torbrowser4, + must be migrated manually. - - - + + - The ihaskell, monetdb, offlineimap and sitecopy services have been removed. + The ihaskell, monetdb, offlineimap and sitecopy services have been + removed. - - + + +
- -
+ Other Notable Changes -Other Notable Changes - - - - - Module type system have a new extensible option types feature that - allow to extend certain types, such as enum, through multiple option - declarations of the same option across multiple modules. - - - - + + - jre now defaults to GTK+ UI by default. This - improves visual consistency and makes Java follow system font style, - improving the situation on HighDPI displays. This has a cost of increased - closure size; for server and other headless workloads it's recommended to - use jre_headless. + Module type system have a new extensible option types feature that allow + to extend certain types, such as enum, through multiple option + declarations of the same option across multiple modules. - - - - Python 2.6 interpreter and package set have been removed. - - - + + + + jre now defaults to GTK+ UI by default. This improves + visual consistency and makes Java follow system font style, improving the + situation on HighDPI displays. This has a cost of increased closure size; + for server and other headless workloads it's recommended to use + jre_headless. + + + - The Python 2.7 interpreter does not use modules anymore. Instead, all - CPython interpreters now include the whole standard library except for `tkinter`, - which is available in the Python package set. + Python 2.6 interpreter and package set have been removed. - - - + + - Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. - Minor modifications had to be made to the interpreters in order to generate - deterministic bytecode. This has security implications and is relevant for - those using Python in a nix-shell. See the Nixpkgs manual - for details. + The Python 2.7 interpreter does not use modules anymore. Instead, all + CPython interpreters now include the whole standard library except for + `tkinter`, which is available in the Python package set. - - - + + - The Python package sets now use a fixed-point combinator and the sets are - available as attributes of the interpreters. + Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. + Minor modifications had to be made to the interpreters in order to + generate deterministic bytecode. This has security implications and is + relevant for those using Python in a nix-shell. See the + Nixpkgs manual for details. + + + + + The Python package sets now use a fixed-point combinator and the sets are + available as attributes of the interpreters. - - - + + - The Python function buildPythonPackage has been improved and can be - used to build from Setuptools source, Flit source, and precompiled Wheels. + The Python function buildPythonPackage has been + improved and can be used to build from Setuptools source, Flit source, and + precompiled Wheels. - - - + + - When adding new or updating current Python libraries, the expressions should be put - in separate files in pkgs/development/python-modules and - called from python-packages.nix. + When adding new or updating current Python libraries, the expressions + should be put in separate files in + pkgs/development/python-modules and called from + python-packages.nix. - - - + + - The dnscrypt-proxy service supports synchronizing the list of public - resolvers without working DNS resolution. This fixes issues caused by the - resolver list becoming outdated. It also improves the viability of - DNSCrypt only configurations. + The dnscrypt-proxy service supports synchronizing the list of public + resolvers without working DNS resolution. This fixes issues caused by the + resolver list becoming outdated. It also improves the viability of + DNSCrypt only configurations. - - - + + - Containers using bridged networking no longer lose their connection after - changes to the host networking. + Containers using bridged networking no longer lose their connection after + changes to the host networking. - - - + + - ZFS supports pool auto scrubbing. + ZFS supports pool auto scrubbing. - - - + + - The bind DNS utilities (e.g. dig) have been split into their own output and - are now also available in pkgs.dnsutils and it is no longer - necessary to pull in all of bind to use them. + The bind DNS utilities (e.g. dig) have been split into their own output + and are now also available in pkgs.dnsutils and it is + no longer necessary to pull in all of bind to use them. - - - + + - Per-user configuration was moved from ~/.nixpkgs to - ~/.config/nixpkgs. The former is still valid for - config.nix for backwards compatibility. + Per-user configuration was moved from ~/.nixpkgs to + ~/.config/nixpkgs. The former is still valid for + config.nix for backwards compatibility. - - -
+ + + diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 66f7b01db72a8aa103b9f7e0635465ef3d007fd5..795c51d2923dada71b2f4bffae27b6322df8052c 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -3,40 +3,40 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-17.09"> + Release 17.09 (“Hummingbird”, 2017/09/??) -Release 17.09 (“Hummingbird”, 2017/09/??) - -
+ Highlights -Highlights - -In addition to numerous new and upgraded packages, this release -has the following highlights: + + In addition to numerous new and upgraded packages, this release has the + following highlights: + - - + + - The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, - KDE Applications to 17.08.1 and KDE Frameworks to 5.37. + The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, KDE + Applications to 17.08.1 and KDE Frameworks to 5.37. - - + + - The user handling now keeps track of deallocated UIDs/GIDs. When a user - or group is revived, this allows it to be allocated the UID/GID it had before. - A consequence is that UIDs and GIDs are no longer reused. + The user handling now keeps track of deallocated UIDs/GIDs. When a user or + group is revived, this allows it to be allocated the UID/GID it had + before. A consequence is that UIDs and GIDs are no longer reused. - - + + - The module option now - causes the first head specified in this list to be set as the primary - head. Apart from that, it's now possible to also set additional options - by using an attribute set, for example: + The module option now causes + the first head specified in this list to be set as the primary head. Apart + from that, it's now possible to also set additional options by using an + attribute set, for example: { services.xserver.xrandrHeads = [ "HDMI-0" @@ -50,365 +50,664 @@ has the following highlights: ]; } - This will set the DVI-0 output to be the primary head, - even though HDMI-0 is the first head in the list. + This will set the DVI-0 output to be the primary head, + even though HDMI-0 is the first head in the list. - - + + - The handling of SSL in the services.nginx module has - been cleaned up, renaming the misnamed enableSSL to - onlySSL which reflects its original intention. This - is not to be used with the already existing forceSSL - which creates a second non-SSL virtual host redirecting to the SSL - virtual host. This by chance had worked earlier due to specific - implementation details. In case you had specified both please remove - the enableSSL option to keep the previous behaviour. + The handling of SSL in the services.nginx module has + been cleaned up, renaming the misnamed enableSSL to + onlySSL which reflects its original intention. This is + not to be used with the already existing forceSSL which + creates a second non-SSL virtual host redirecting to the SSL virtual host. + This by chance had worked earlier due to specific implementation details. + In case you had specified both please remove the + enableSSL option to keep the previous behaviour. - Another addSSL option has been introduced to configure - both a non-SSL virtual host and an SSL virtual host with the same - configuration. + Another addSSL option has been introduced to configure + both a non-SSL virtual host and an SSL virtual host with the same + configuration. - Options to configure resolver options and - upstream blocks have been introduced. See their information - for further details. + Options to configure resolver options and + upstream blocks have been introduced. See their + information for further details. - The port option has been replaced by a more generic - listen option which makes it possible to specify - multiple addresses, ports and SSL configs dependant on the new SSL - handling mentioned above. + The port option has been replaced by a more generic + listen option which makes it possible to specify + multiple addresses, ports and SSL configs dependant on the new SSL + handling mentioned above. - - + + +
- -
+ New Services -New Services - -The following new services were added since the last release: + + The following new services were added since the last release: + - - config/fonts/fontconfig-penultimate.nix - config/fonts/fontconfig-ultimate.nix - config/terminfo.nix - hardware/sensor/iio.nix - hardware/nitrokey.nix - hardware/raid/hpsa.nix - programs/browserpass.nix - programs/gnupg.nix - programs/qt5ct.nix - programs/slock.nix - programs/thefuck.nix - security/auditd.nix - security/lock-kernel-modules.nix - service-managers/docker.nix - service-managers/trivial.nix - services/admin/salt/master.nix - services/admin/salt/minion.nix - services/audio/slimserver.nix - services/cluster/kubernetes/default.nix - services/cluster/kubernetes/dns.nix - services/cluster/kubernetes/dashboard.nix - services/continuous-integration/hail.nix - services/databases/clickhouse.nix - services/databases/postage.nix - services/desktops/gnome3/gnome-disks.nix - services/desktops/gnome3/gpaste.nix - services/logging/SystemdJournal2Gelf.nix - services/logging/heartbeat.nix - services/logging/journalwatch.nix - services/logging/syslogd.nix - services/mail/mailhog.nix - services/mail/nullmailer.nix - services/misc/airsonic.nix - services/misc/autorandr.nix - services/misc/exhibitor.nix - services/misc/fstrim.nix - services/misc/gollum.nix - services/misc/irkerd.nix - services/misc/jackett.nix - services/misc/radarr.nix - services/misc/snapper.nix - services/monitoring/osquery.nix - services/monitoring/prometheus/collectd-exporter.nix - services/monitoring/prometheus/fritzbox-exporter.nix - services/network-filesystems/kbfs.nix - services/networking/dnscache.nix - services/networking/fireqos.nix - services/networking/iwd.nix - services/networking/keepalived/default.nix - services/networking/keybase.nix - services/networking/lldpd.nix - services/networking/matterbridge.nix - services/networking/squid.nix - services/networking/tinydns.nix - services/networking/xrdp.nix - services/security/shibboleth-sp.nix - services/security/sks.nix - services/security/sshguard.nix - services/security/torify.nix - services/security/usbguard.nix - services/security/vault.nix - services/system/earlyoom.nix - services/system/saslauthd.nix - services/web-apps/nexus.nix - services/web-apps/pgpkeyserver-lite.nix - services/web-apps/piwik.nix - services/web-servers/lighttpd/collectd.nix - services/web-servers/minio.nix - services/x11/display-managers/xpra.nix - services/x11/xautolock.nix - tasks/filesystems/bcachefs.nix - tasks/powertop.nix - + + + + config/fonts/fontconfig-penultimate.nix + + + + + config/fonts/fontconfig-ultimate.nix + + + + + config/terminfo.nix + + + + + hardware/sensor/iio.nix + + + + + hardware/nitrokey.nix + + + + + hardware/raid/hpsa.nix + + + + + programs/browserpass.nix + + + + + programs/gnupg.nix + + + + + programs/qt5ct.nix + + + + + programs/slock.nix + + + + + programs/thefuck.nix + + + + + security/auditd.nix + + + + + security/lock-kernel-modules.nix + + + + + service-managers/docker.nix + + + + + service-managers/trivial.nix + + + + + services/admin/salt/master.nix + + + + + services/admin/salt/minion.nix + + + + + services/audio/slimserver.nix + + + + + services/cluster/kubernetes/default.nix + + + + + services/cluster/kubernetes/dns.nix + + + + + services/cluster/kubernetes/dashboard.nix + + + + + services/continuous-integration/hail.nix + + + + + services/databases/clickhouse.nix + + + + + services/databases/postage.nix + + + + + services/desktops/gnome3/gnome-disks.nix + + + + + services/desktops/gnome3/gpaste.nix + + + + + services/logging/SystemdJournal2Gelf.nix + + + + + services/logging/heartbeat.nix + + + + + services/logging/journalwatch.nix + + + + + services/logging/syslogd.nix + + + + + services/mail/mailhog.nix + + + + + services/mail/nullmailer.nix + + + + + services/misc/airsonic.nix + + + + + services/misc/autorandr.nix + + + + + services/misc/exhibitor.nix + + + + + services/misc/fstrim.nix + + + + + services/misc/gollum.nix + + + + + services/misc/irkerd.nix + + + + + services/misc/jackett.nix + + + + + services/misc/radarr.nix + + + + + services/misc/snapper.nix + + + + + services/monitoring/osquery.nix + + + + + services/monitoring/prometheus/collectd-exporter.nix + + + + + services/monitoring/prometheus/fritzbox-exporter.nix + + + + + services/network-filesystems/kbfs.nix + + + + + services/networking/dnscache.nix + + + + + services/networking/fireqos.nix + + + + + services/networking/iwd.nix + + + + + services/networking/keepalived/default.nix + + + + + services/networking/keybase.nix + + + + + services/networking/lldpd.nix + + + + + services/networking/matterbridge.nix + + + + + services/networking/squid.nix + + + + + services/networking/tinydns.nix + + + + + services/networking/xrdp.nix + + + + + services/security/shibboleth-sp.nix + + + + + services/security/sks.nix + + + + + services/security/sshguard.nix + + + + + services/security/torify.nix + + + + + services/security/usbguard.nix + + + + + services/security/vault.nix + + + + + services/system/earlyoom.nix + + + + + services/system/saslauthd.nix + + + + + services/web-apps/nexus.nix + + + + + services/web-apps/pgpkeyserver-lite.nix + + + + + services/web-apps/piwik.nix + + + + + services/web-servers/lighttpd/collectd.nix + + + + + services/web-servers/minio.nix + + + + + services/x11/display-managers/xpra.nix + + + + + services/x11/xautolock.nix + + + + + tasks/filesystems/bcachefs.nix + + + + + tasks/powertop.nix + + + +
- -
+ Backward Incompatibilities -Backward Incompatibilities - -When upgrading from a previous release, please be aware of the -following incompatible changes: + + When upgrading from a previous release, please be aware of the following + incompatible changes: + - - - - - In an Qemu-based virtualization environment, the network interface - names changed from i.e. enp0s3 to - ens3. - - - - This is due to a kernel configuration change. The new naming - is consistent with those of other Linux distributions with - systemd. See - #29197 - for more information. - - - A machine is affected if the virt-what tool - either returns qemu or - kvm and has - interface names used in any part of its NixOS configuration, - in particular if a static network configuration with - networking.interfaces is used. - - - Before rebooting affected machines, please ensure: - - - - Change the interface names in your NixOS configuration. - The first interface will be called ens3, - the second one ens8 and starting from there - incremented by 1. - - - - - After changing the interface names, rebuild your system with - nixos-rebuild boot to activate the new - configuration after a reboot. If you switch to the new - configuration right away you might lose network connectivity! - If using nixops, deploy with - nixops deploy --force-reboot. - - - - - - - - The following changes apply if the stateVersion is changed to 17.09 or higher. - For stateVersion = "17.03" or lower the old behavior is preserved. + + + + In an Qemu-based virtualization environment, the + network interface names changed from i.e. enp0s3 to + ens3. - - - - The postgres default version was changed from 9.5 to 9.6. - - - - - The postgres superuser name has changed from root to postgres to more closely follow what other Linux distributions are doing. - - - - - The postgres default dataDir has changed from /var/db/postgres to /var/lib/postgresql/$psqlSchema where $psqlSchema is 9.6 for example. - - + + This is due to a kernel configuration change. The new naming is consistent + with those of other Linux distributions with systemd. See + #29197 + for more information. + + + A machine is affected if the virt-what tool either + returns qemu or kvm + and has interface names used in any part of its NixOS + configuration, in particular if a static network configuration with + networking.interfaces is used. + + + Before rebooting affected machines, please ensure: + - - The mysql default dataDir has changed from /var/mysql to /var/lib/mysql. - + + Change the interface names in your NixOS configuration. The first + interface will be called ens3, the second one + ens8 and starting from there incremented by 1. + - - Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found here . It is also possible to use the newer version by setting the package to radicale2, which is done automatically when stateVersion is 17.09 or higher. The extraArgs option has been added to allow passing the data migration arguments specified in the instructions; see the radicale.nix NixOS test for an example migration. - + + After changing the interface names, rebuild your system with + nixos-rebuild boot to activate the new configuration + after a reboot. If you switch to the new configuration right away you + might lose network connectivity! If using nixops, + deploy with nixops deploy --force-reboot. + + + + + + + The following changes apply if the stateVersion is + changed to 17.09 or higher. For stateVersion = "17.03" + or lower the old behavior is preserved. + + + + + The postgres default version was changed from 9.5 to + 9.6. + + + + + The postgres superuser name has changed from + root to postgres to more closely + follow what other Linux distributions are doing. + + + + + The postgres default dataDir has + changed from /var/db/postgres to + /var/lib/postgresql/$psqlSchema where $psqlSchema is + 9.6 for example. + + + + + The mysql default dataDir has + changed from /var/mysql to + /var/lib/mysql. + + + + + Radicale's default package has changed from 1.x to 2.x. Instructions to + migrate can be found here + . It is also possible to use the newer version by setting the + package to radicale2, which is + done automatically when stateVersion is 17.09 or + higher. The extraArgs option has been added to allow + passing the data migration arguments specified in the instructions; see + the + radicale.nix + NixOS test for an example migration. + + - - + + - The aiccu package was removed. This is due to SixXS - sunsetting its IPv6 tunnel. + The aiccu package was removed. This is due to SixXS + sunsetting its IPv6 + tunnel. - - + + - The fanctl package and fan module - have been removed due to the developers not upstreaming their iproute2 - patches and lagging with compatibility to recent iproute2 versions. + The fanctl package and fan module + have been removed due to the developers not upstreaming their iproute2 + patches and lagging with compatibility to recent iproute2 versions. - - + + - Top-level idea package collection was renamed. - All JetBrains IDEs are now at jetbrains. + Top-level idea package collection was renamed. All + JetBrains IDEs are now at jetbrains. - - + + - flexget's state database cannot be upgraded to its - new internal format, requiring removal of any existing - db-config.sqlite which will be automatically recreated. + flexget's state database cannot be upgraded to its new + internal format, requiring removal of any existing + db-config.sqlite which will be automatically recreated. - - + + - The ipfs service now doesn't ignore the dataDir option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with + The ipfs service now doesn't ignore the + dataDir option anymore. If you've ever set this option + to anything other than the default you'll have to either unset it (so the + default gets used) or migrate the old data manually with dataDir=<valueOfDataDir> mv /var/lib/ipfs/.ipfs/* $dataDir rmdir /var/lib/ipfs/.ipfs - - + + - The caddy service was previously using an extra - .caddy directory in the data directory specified - with the dataDir option. The contents of the - .caddy directory are now expected to be in the - dataDir. + The caddy service was previously using an extra + .caddy directory in the data directory specified with + the dataDir option. The contents of the + .caddy directory are now expected to be in the + dataDir. - - + + - The ssh-agent user service is not started by default - anymore. Use programs.ssh.startAgent to enable it if - needed. There is also a new programs.gnupg.agent - module that creates a gpg-agent user service. It can - also serve as a SSH agent if enableSSHSupport is set. + The ssh-agent user service is not started by default + anymore. Use programs.ssh.startAgent to enable it if + needed. There is also a new programs.gnupg.agent module + that creates a gpg-agent user service. It can also + serve as a SSH agent if enableSSHSupport is set. - - + + - The services.tinc.networks.<name>.listenAddress - option had a misleading name that did not correspond to its behavior. It - now correctly defines the ip to listen for incoming connections on. To - keep the previous behaviour, use - services.tinc.networks.<name>.bindToAddress - instead. Refer to the description of the options for more details. + The services.tinc.networks.<name>.listenAddress + option had a misleading name that did not correspond to its behavior. It + now correctly defines the ip to listen for incoming connections on. To + keep the previous behaviour, use + services.tinc.networks.<name>.bindToAddress + instead. Refer to the description of the options for more details. - - + + - tlsdate package and module were removed. This is due to the project - being dead and not building with openssl 1.1. + tlsdate package and module were removed. This is due to + the project being dead and not building with openssl 1.1. - - + + - wvdial package and module were removed. This is due to the project - being dead and not building with openssl 1.1. + wvdial package and module were removed. This is due to + the project being dead and not building with openssl 1.1. - - + + - cc-wrapper's setup-hook now exports a number of - environment variables corresponding to binutils binaries, - (e.g. LD, STRIP, RANLIB, - etc). This is done to prevent packages' build systems guessing, which is - harder to predict, especially when cross-compiling. However, some packages - have broken due to this—their build systems either not supporting, or - claiming to support without adequate testing, taking such environment - variables as parameters. + cc-wrapper's setup-hook now exports a number of + environment variables corresponding to binutils binaries, (e.g. + LD, STRIP, RANLIB, etc). This + is done to prevent packages' build systems guessing, which is harder to + predict, especially when cross-compiling. However, some packages have + broken due to this—their build systems either not supporting, or + claiming to support without adequate testing, taking such environment + variables as parameters. - - + + - services.firefox.syncserver now runs by default as a - non-root user. To accomodate this change, the default sqlite database - location has also been changed. Migration should work automatically. - Refer to the description of the options for more details. + services.firefox.syncserver now runs by default as a + non-root user. To accomodate this change, the default sqlite database + location has also been changed. Migration should work automatically. Refer + to the description of the options for more details. - - + + - The compiz window manager and package was - removed. The system support had been broken for several years. + The compiz window manager and package was removed. The + system support had been broken for several years. - - + + - Touchpad support should now be enabled through - libinput as synaptics is - now deprecated. See the option - services.xserver.libinput.enable. + Touchpad support should now be enabled through libinput + as synaptics is now deprecated. See the option + services.xserver.libinput.enable. - - + + - grsecurity/PaX support has been dropped, following upstream's - decision to cease free support. See - - upstream's announcement for more information. - No complete replacement for grsecurity/PaX is available presently. + grsecurity/PaX support has been dropped, following upstream's decision to + cease free support. See + + upstream's announcement for more information. No complete + replacement for grsecurity/PaX is available presently. - - + + - services.mysql now has declarative - configuration of databases and users with the ensureDatabases and - ensureUsers options. + services.mysql now has declarative configuration of + databases and users with the ensureDatabases and + ensureUsers options. - - These options will never delete existing databases and users, - especially not when the value of the options are changed. + These options will never delete existing databases and users, especially + not when the value of the options are changed. - - The MySQL users will be identified using - - Unix socket authentication. This authenticates the - Unix user with the same name only, and that without the need - for a password. + The MySQL users will be identified using + + Unix socket authentication. This authenticates the Unix user with + the same name only, and that without the need for a password. - - If you have previously created a MySQL root - user with a password, you will need to add - root user for unix socket authentication - before using the new options. This can be done by running the - following SQL script: - + If you have previously created a MySQL root user + with a password, you will need to add + root user for unix socket authentication before using + the new options. This can be done by running the following SQL script: CREATE USER 'root'@'%' IDENTIFIED BY ''; GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION; @@ -418,194 +717,183 @@ FLUSH PRIVILEGES; -- DROP USER 'root'@'localhost'; - - - + + - services.mysqlBackup now works by default - without any user setup, including for users other than - mysql. + services.mysqlBackup now works by default without any + user setup, including for users other than mysql. - - By default, the mysql user is no longer the - user which performs the backup. Instead a system account - mysqlbackup is used. + By default, the mysql user is no longer the user which + performs the backup. Instead a system account + mysqlbackup is used. - - The mysqlBackup service is also now using - systemd timers instead of cron. + The mysqlBackup service is also now using systemd + timers instead of cron. - - Therefore, the services.mysqlBackup.period - option no longer exists, and has been replaced with - services.mysqlBackup.calendar, which is in - the format of services.mysqlBackup.period option no + longer exists, and has been replaced with + services.mysqlBackup.calendar, which is in the format + of + systemd.time(7). - - If you expect to be sent an e-mail when the backup fails, - consider using a script which monitors the systemd journal for - errors. Regretfully, at present there is no built-in - functionality for this. + If you expect to be sent an e-mail when the backup fails, consider using a + script which monitors the systemd journal for errors. Regretfully, at + present there is no built-in functionality for this. - - You can check that backups still work by running - systemctl start mysql-backup then - systemctl status mysql-backup. + You can check that backups still work by running systemctl start + mysql-backup then systemctl status + mysql-backup. - - - + + - Templated systemd services e.g container@name are - now handled currectly when switching to a new configuration, resulting - in them being reloaded. + Templated systemd services e.g container@name are now + handled currectly when switching to a new configuration, resulting in them + being reloaded. - - - - Steam: the newStdcpp parameter - was removed and should not be needed anymore. - - - + + - Redis has been updated to version 4 which mandates a cluster - mass-restart, due to changes in the network handling, in order - to ensure compatibility with networks NATing traffic. + Steam: the newStdcpp parameter was removed and should + not be needed anymore. - - + + + + Redis has been updated to version 4 which mandates a cluster mass-restart, + due to changes in the network handling, in order to ensure compatibility + with networks NATing traffic. + + + +
- -
+ Other Notable Changes -Other Notable Changes - - - - + + - Modules can now be disabled by using - disabledModules, allowing another to take it's place. This can be - used to import a set of modules from another channel while keeping the - rest of the system on a stable release. + disabledModules, allowing another to take it's place. This can be + used to import a set of modules from another channel while keeping the + rest of the system on a stable release. - - + + - Updated to FreeType 2.7.1, including a new TrueType engine. - The new engine replaces the Infinality engine which was the default in - NixOS. The default font rendering settings are now provided by - fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults - are less invasive and provide rendering that is more consistent with - other systems and hopefully with each font designer's intent. Some - system-wide configuration has been removed from the Fontconfig NixOS - module where user Fontconfig settings are available. + Updated to FreeType 2.7.1, including a new TrueType engine. The new engine + replaces the Infinality engine which was the default in NixOS. The default + font rendering settings are now provided by fontconfig-penultimate, + replacing fontconfig-ultimate; the new defaults are less invasive and + provide rendering that is more consistent with other systems and hopefully + with each font designer's intent. Some system-wide configuration has been + removed from the Fontconfig NixOS module where user Fontconfig settings + are available. - - + + - ZFS/SPL have been updated to 0.7.0, zfsUnstable, splUnstable - have therefore been removed. + ZFS/SPL have been updated to 0.7.0, zfsUnstable, + splUnstable have therefore been removed. - - + + - The option now allows the value - null in addition to timezone strings. This value - allows changing the timezone of a system imperatively using - timedatectl set-timezone. The default timezone - is still UTC. + The option now allows the value + null in addition to timezone strings. This value allows + changing the timezone of a system imperatively using timedatectl + set-timezone. The default timezone is still UTC. - - + + - Nixpkgs overlays may now be specified with a file as well as a directory. The - value of <nixpkgs-overlays> may be a file, and - ~/.config/nixpkgs/overlays.nix can be used instead of the - ~/.config/nixpkgs/overlays directory. + Nixpkgs overlays may now be specified with a file as well as a directory. + The value of <nixpkgs-overlays> may be a file, and + ~/.config/nixpkgs/overlays.nix can be used instead of + the ~/.config/nixpkgs/overlays directory. - See the overlays chapter of the Nixpkgs manual for more details. + See the overlays chapter of the Nixpkgs manual for more details. - - + + - Definitions for /etc/hosts can now be specified - declaratively with networking.hosts. + Definitions for /etc/hosts can now be specified + declaratively with networking.hosts. - - + + - Two new options have been added to the installer loader, in addition - to the default having changed. The kernel log verbosity has been lowered - to the upstream default for the default options, in order to not spam - the console when e.g. joining a network. + Two new options have been added to the installer loader, in addition to + the default having changed. The kernel log verbosity has been lowered to + the upstream default for the default options, in order to not spam the + console when e.g. joining a network. - This therefore leads to adding a new debug option - to set the log level to the previous verbose mode, to make debugging - easier, but still accessible easily. + This therefore leads to adding a new debug option to + set the log level to the previous verbose mode, to make debugging easier, + but still accessible easily. - Additionally a copytoram option has been added, - which makes it possible to remove the install medium after booting. - This allows tethering from your phone after booting from it. + Additionally a copytoram option has been added, which + makes it possible to remove the install medium after booting. This allows + tethering from your phone after booting from it. - - + + - services.gitlab-runner.configOptions has been added - to specify the configuration of gitlab-runners declaratively. + services.gitlab-runner.configOptions has been added to + specify the configuration of gitlab-runners declaratively. - - + + - services.jenkins.plugins has been added - to install plugins easily, this can be generated with jenkinsPlugins2nix. + services.jenkins.plugins has been added to install + plugins easily, this can be generated with jenkinsPlugins2nix. - - + + - services.postfix.config has been added - to specify the main.cf with NixOS options. Additionally other options - have been added to the postfix module and has been improved further. + services.postfix.config has been added to specify the + main.cf with NixOS options. Additionally other options have been added to + the postfix module and has been improved further. - - + + - The GitLab package and module have been updated to the latest 10.0 - release. + The GitLab package and module have been updated to the latest 10.0 + release. - - + + - The systemd-boot boot loader now lists the NixOS - version, kernel version and build date of all bootable generations. + The systemd-boot boot loader now lists the NixOS + version, kernel version and build date of all bootable generations. - - + + - The dnscrypt-proxy service now defaults to using a random upstream resolver, - selected from the list of public non-logging resolvers with DNSSEC support. - Existing configurations can be migrated to this mode of operation by - omitting the option - or setting it to "random". + The dnscrypt-proxy service now defaults to using a random upstream + resolver, selected from the list of public non-logging resolvers with + DNSSEC support. Existing configurations can be migrated to this mode of + operation by omitting the + option or setting it + to "random". - - - - -
+ + + diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 9221c2951ed25b5739159694ef75164901371fc8..c14679eea0719f0860acf5d230174034ea5e213d 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -3,532 +3,822 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-18.03"> + Release 18.03 (“Impala”, 2018/04/04) -Release 18.03 (“Impala”, 2018/04/04) - -
+ Highlights -Highlights - -In addition to numerous new and upgraded packages, this release -has the following highlights: - - + + In addition to numerous new and upgraded packages, this release has the + following highlights: + - + + - End of support is planned for end of October 2018, handing over to 18.09. + End of support is planned for end of October 2018, handing over to 18.09. - - - + + - Platform support: x86_64-linux and x86_64-darwin since release time (the latter isn't NixOS, really). - Binaries for aarch64-linux are available, but no channel exists yet, as it's waiting for some test fixes, etc. + Platform support: x86_64-linux and x86_64-darwin since release time (the + latter isn't NixOS, really). Binaries for aarch64-linux are available, but + no channel exists yet, as it's waiting for some test fixes, etc. - - - + + - Nix now defaults to 2.0; see its - release notes. + Nix now defaults to 2.0; see its + release + notes. - - - + + - Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 -> 7, systemd: 234 -> 237. + Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 -> + 7, systemd: 234 -> 237. - - - + + - Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10 -> 5.12. + Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10 + -> 5.12. - - - - - MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes - have been made to the infrastructure involved: - - - - libmysql has been deprecated, please use mysql.connector-c - instead, a compatibility passthru has been added to the MySQL packages. - - - - - The mysql57 package has a new static output containing - the static libraries including libmysqld.a - - - - - - - - PHP now defaults to PHP 7.2, updated from 7.1. - - + + + + MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. + While upgrading a few changes have been made to the infrastructure + involved: + + + + libmysql has been deprecated, please use + mysql.connector-c instead, a compatibility passthru + has been added to the MySQL packages. + + + + + The mysql57 package has a new + static output containing the static libraries + including libmysqld.a + + + + + + + + PHP now defaults to PHP 7.2, updated from 7.1. + + + +
- -
+ New Services -New Services - -The following new services were added since the last release: + + The following new services were added since the last release: + - - ./config/krb5/default.nix - ./hardware/digitalbitbox.nix - ./misc/label.nix - ./programs/ccache.nix - ./programs/criu.nix - ./programs/digitalbitbox/default.nix - ./programs/less.nix - ./programs/npm.nix - ./programs/plotinus.nix - ./programs/rootston.nix - ./programs/systemtap.nix - ./programs/sway.nix - ./programs/udevil.nix - ./programs/way-cooler.nix - ./programs/yabar.nix - ./programs/zsh/zsh-autoenv.nix - ./services/backup/borgbackup.nix - ./services/backup/crashplan-small-business.nix - ./services/desktops/dleyna-renderer.nix - ./services/desktops/dleyna-server.nix - ./services/desktops/pipewire.nix - ./services/desktops/gnome3/chrome-gnome-shell.nix - ./services/desktops/gnome3/tracker-miners.nix - ./services/hardware/fwupd.nix - ./services/hardware/interception-tools.nix - ./services/hardware/u2f.nix - ./services/hardware/usbmuxd.nix - ./services/mail/clamsmtp.nix - ./services/mail/dkimproxy-out.nix - ./services/mail/pfix-srsd.nix - ./services/misc/gitea.nix - ./services/misc/home-assistant.nix - ./services/misc/ihaskell.nix - ./services/misc/logkeys.nix - ./services/misc/novacomd.nix - ./services/misc/osrm.nix - ./services/misc/plexpy.nix - ./services/misc/pykms.nix - ./services/misc/tzupdate.nix - ./services/monitoring/fusion-inventory.nix - ./services/monitoring/prometheus/exporters.nix - ./services/network-filesystems/beegfs.nix - ./services/network-filesystems/davfs2.nix - ./services/network-filesystems/openafs/client.nix - ./services/network-filesystems/openafs/server.nix - ./services/network-filesystems/ceph.nix - ./services/networking/aria2.nix - ./services/networking/monero.nix - ./services/networking/nghttpx/default.nix - ./services/networking/nixops-dns.nix - ./services/networking/rxe.nix - ./services/networking/stunnel.nix - ./services/web-apps/matomo.nix - ./services/web-apps/restya-board.nix - ./services/web-servers/mighttpd2.nix - ./services/x11/fractalart.nix - ./system/boot/binfmt.nix - ./system/boot/grow-partition.nix - ./tasks/filesystems/ecryptfs.nix - ./virtualisation/hyperv-guest.nix - + + + + ./config/krb5/default.nix + + + + + ./hardware/digitalbitbox.nix + + + + + ./misc/label.nix + + + + + ./programs/ccache.nix + + + + + ./programs/criu.nix + + + + + ./programs/digitalbitbox/default.nix + + + + + ./programs/less.nix + + + + + ./programs/npm.nix + + + + + ./programs/plotinus.nix + + + + + ./programs/rootston.nix + + + + + ./programs/systemtap.nix + + + + + ./programs/sway.nix + + + + + ./programs/udevil.nix + + + + + ./programs/way-cooler.nix + + + + + ./programs/yabar.nix + + + + + ./programs/zsh/zsh-autoenv.nix + + + + + ./services/backup/borgbackup.nix + + + + + ./services/backup/crashplan-small-business.nix + + + + + ./services/desktops/dleyna-renderer.nix + + + + + ./services/desktops/dleyna-server.nix + + + + + ./services/desktops/pipewire.nix + + + + + ./services/desktops/gnome3/chrome-gnome-shell.nix + + + + + ./services/desktops/gnome3/tracker-miners.nix + + + + + ./services/hardware/fwupd.nix + + + + + ./services/hardware/interception-tools.nix + + + + + ./services/hardware/u2f.nix + + + + + ./services/hardware/usbmuxd.nix + + + + + ./services/mail/clamsmtp.nix + + + + + ./services/mail/dkimproxy-out.nix + + + + + ./services/mail/pfix-srsd.nix + + + + + ./services/misc/gitea.nix + + + + + ./services/misc/home-assistant.nix + + + + + ./services/misc/ihaskell.nix + + + + + ./services/misc/logkeys.nix + + + + + ./services/misc/novacomd.nix + + + + + ./services/misc/osrm.nix + + + + + ./services/misc/plexpy.nix + + + + + ./services/misc/pykms.nix + + + + + ./services/misc/tzupdate.nix + + + + + ./services/monitoring/fusion-inventory.nix + + + + + ./services/monitoring/prometheus/exporters.nix + + + + + ./services/network-filesystems/beegfs.nix + + + + + ./services/network-filesystems/davfs2.nix + + + + + ./services/network-filesystems/openafs/client.nix + + + + + ./services/network-filesystems/openafs/server.nix + + + + + ./services/network-filesystems/ceph.nix + + + + + ./services/networking/aria2.nix + + + + + ./services/networking/monero.nix + + + + + ./services/networking/nghttpx/default.nix + + + + + ./services/networking/nixops-dns.nix + + + + + ./services/networking/rxe.nix + + + + + ./services/networking/stunnel.nix + + + + + ./services/web-apps/matomo.nix + + + + + ./services/web-apps/restya-board.nix + + + + + ./services/web-servers/mighttpd2.nix + + + + + ./services/x11/fractalart.nix + + + + + ./system/boot/binfmt.nix + + + + + ./system/boot/grow-partition.nix + + + + + ./tasks/filesystems/ecryptfs.nix + + + + + ./virtualisation/hyperv-guest.nix + + + +
- -
+ Backward Incompatibilities -Backward Incompatibilities - -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - - - sound.enable now defaults to false. - - - - - Dollar signs in options under are - passed verbatim to Postfix, which will interpret them as the beginning of - a parameter expression. This was already true for string-valued options - in the previous release, but not for list-valued options. If you need to - pass literal dollar signs through Postfix, double them. - - - - - The postage package (for web-based PostgreSQL - administration) has been renamed to pgmanage. The - corresponding module has also been renamed. To migrate please rename all - options to - . - - - - - Package attributes starting with a digit have been prefixed with an - underscore sign. This is to avoid quoting in the configuration and - other issues with command-line tools like nix-env. - The change affects the following packages: - - - 2048-in-terminal_2048-in-terminal - - - 90secondportraits_90secondportraits - - - 2bwm_2bwm - - - 389-ds-base_389-ds-base - - - - - - - - The OpenSSH service no longer enables support for DSA keys by default, - which could cause a system lock out. Update your keys or, unfavorably, - re-enable DSA support manually. - - + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + - DSA support was - deprecated in OpenSSH 7.0, - due to it being too weak. To re-enable support, add - PubkeyAcceptedKeyTypes +ssh-dss to the end of your - . + sound.enable now defaults to false. - + + - After updating the keys to be stronger, anyone still on a pre-17.03 - version is safe to jump to 17.03, as vetted - here. + Dollar signs in options under are passed + verbatim to Postfix, which will interpret them as the beginning of a + parameter expression. This was already true for string-valued options in + the previous release, but not for list-valued options. If you need to pass + literal dollar signs through Postfix, double them. - - + + - The openssh package - now includes Kerberos support by default; - the openssh_with_kerberos package - is now a deprecated alias. - If you do not want Kerberos support, - you can do openssh.override { withKerberos = false; }. - Note, this also applies to the openssh_hpn package. + The postage package (for web-based PostgreSQL + administration) has been renamed to pgmanage. The + corresponding module has also been renamed. To migrate please rename all + options to + . - - + + - cc-wrapper has been split in two; there is now also a bintools-wrapper. - The most commonly used files in nix-support are now split between the two wrappers. - Some commonly used ones, like nix-support/dynamic-linker, are duplicated for backwards compatability, even though they rightly belong only in bintools-wrapper. - Other more obscure ones are just moved. + Package attributes starting with a digit have been prefixed with an + underscore sign. This is to avoid quoting in the configuration and other + issues with command-line tools like nix-env. The change + affects the following packages: + + + + 2048-in-terminal → + _2048-in-terminal + + + + + 90secondportraits → + _90secondportraits + + + + + 2bwm_2bwm + + + + + 389-ds-base_389-ds-base + + + + + + + + The OpenSSH service no longer enables support for + DSA keys by default, which could cause a system lock out. Update your keys + or, unfavorably, re-enable DSA support manually. + + + DSA support was + deprecated in + OpenSSH 7.0, due to it being too weak. To re-enable support, add + PubkeyAcceptedKeyTypes +ssh-dss to the end of your + . + + + After updating the keys to be stronger, anyone still on a pre-17.03 + version is safe to jump to 17.03, as vetted + here. + + + + + The openssh package now includes Kerberos support by + default; the openssh_with_kerberos package is now a + deprecated alias. If you do not want Kerberos support, you can do + openssh.override { withKerberos = false; }. Note, this + also applies to the openssh_hpn package. + + + + + cc-wrapper has been split in two; there is now also a + bintools-wrapper. The most commonly used files in + nix-support are now split between the two wrappers. + Some commonly used ones, like + nix-support/dynamic-linker, are duplicated for + backwards compatability, even though they rightly belong only in + bintools-wrapper. Other more obscure ones are just + moved. + + + + + The propagation logic has been changed. The new logic, along with new + types of dependencies that go with, is thoroughly documented in the + "Specifying dependencies" section of the "Standard Environment" chapter of + the nixpkgs manual. + + The old logic isn't but is easy to describe: dependencies were propagated + as the same type of dependency no matter what. In practice, that means + that many propagatedNativeBuildInputs should instead + be propagatedBuildInputs. Thankfully, that was and is + the least used type of dependency. Also, it means that some + propagatedBuildInputs should instead be + depsTargetTargetPropagated. Other types dependencies + should be unaffected. + + + + + lib.addPassthru drv passthru is removed. Use + lib.extendDerivation true passthru drv instead. + + + + + The memcached service no longer accept dynamic socket + paths via . Unix sockets can be + still enabled by and + will be accessible at /run/memcached/memcached.sock. + + + + + The hardware.amdHybridGraphics.disable option was + removed for lack of a maintainer. If you still need this module, you may + wish to include a copy of it from an older version of nixos in your + imports. + + + + + The merging of config options for + services.postfix.config was buggy. Previously, if other + options in the Postfix module like + services.postfix.useSrs were set and the user set + config options that were also set by such options, the resulting config + wouldn't include all options that were needed. They are now merged + correctly. If config options need to be overridden, + lib.mkForce or lib.mkOverride can be + used. + + + + + The following changes apply if the stateVersion is + changed to 18.03 or higher. For stateVersion = "17.09" + or lower the old behavior is preserved. - - + + + + matrix-synapse uses postgresql by default instead of + sqlite. Migration instructions can be found + + here . + + + + + - The propagation logic has been changed. - The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual. - - The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what. - In practice, that means that many propagatedNativeBuildInputs should instead be propagatedBuildInputs. - Thankfully, that was and is the least used type of dependency. - Also, it means that some propagatedBuildInputs should instead be depsTargetTargetPropagated. - Other types dependencies should be unaffected. + The jid package has been removed, due to maintenance + overhead of a go package having non-versioned dependencies. - - + + - lib.addPassthru drv passthru is removed. Use lib.extendDerivation true passthru drv instead. + When using (enabled by default + in GNOME), it now handles all input devices, not just touchpads. As a + result, you might need to re-evaluate any custom Xorg configuration. In + particular, Option "XkbRules" "base" may result in + broken keyboard layout. - - + + - The memcached service no longer accept dynamic socket - paths via . Unix sockets can be - still enabled by and - will be accessible at /run/memcached/memcached.sock. + The attic package was removed. A maintained fork called + Borg should be used + instead. Migration instructions can be found + here. - - + + - The hardware.amdHybridGraphics.disable option was removed for lack of a maintainer. If you still need this module, you may wish to include a copy of it from an older version of nixos in your imports. + The Piwik analytics software was renamed to Matomo: + + + + The package pkgs.piwik was renamed to + pkgs.matomo. + + + + + The service services.piwik was renamed to + services.matomo. + + + + + The data directory /var/lib/piwik was renamed to + /var/lib/matomo. All files will be moved + automatically on first startup, but you might need to adjust your + backup scripts. + + + + + The default for the nginx configuration + changed from piwik.${config.networking.hostName} to + matomo.${config.networking.hostName}.${config.networking.domain} + if is set, + matomo.${config.networking.hostName} if it is not + set. If you change your , remember you'll + need to update the trustedHosts[] array in + /var/lib/matomo/config/config.ini.php as well. + + + + + The piwik user was renamed to + matomo. The service will adjust ownership + automatically for files in the data directory. If you use unix socket + authentication, remember to give the new matomo user + access to the database and to change the username to + matomo in the [database] section + of /var/lib/matomo/config/config.ini.php. + + + + + If you named your database `piwik`, you might want to rename it to + `matomo` to keep things clean, but this is neither enforced nor + required. + + + - - + + - The merging of config options for services.postfix.config - was buggy. Previously, if other options in the Postfix module like - services.postfix.useSrs were set and the user set config - options that were also set by such options, the resulting config wouldn't - include all options that were needed. They are now merged correctly. If - config options need to be overridden, lib.mkForce or - lib.mkOverride can be used. + nodejs-4_x is end-of-life. + nodejs-4_x, nodejs-slim-4_x and + nodePackages_4_x are removed. - - + + - The following changes apply if the stateVersion is changed to 18.03 or higher. - For stateVersion = "17.09" or lower the old behavior is preserved. + The pump.io NixOS module was removed. It is now + maintained as an + external + module. - + + + + The Prosody XMPP server has received a major update. The following modules + were renamed: + - - matrix-synapse uses postgresql by default instead of sqlite. - Migration instructions can be found here . - + + is now + + - - - - - The jid package has been removed, due to maintenance - overhead of a go package having non-versioned dependencies. - - - - - When using (enabled by default in GNOME), - it now handles all input devices, not just touchpads. As a result, you might need to - re-evaluate any custom Xorg configuration. In particular, - Option "XkbRules" "base" may result in broken keyboard layout. - - - - - The attic package was removed. A maintained fork called - Borg should be used instead. - Migration instructions can be found - here. - - - - - The Piwik analytics software was renamed to Matomo: - - - The package pkgs.piwik was renamed to pkgs.matomo. - - - The service services.piwik was renamed to services.matomo. - - - - The data directory /var/lib/piwik was renamed to /var/lib/matomo. - All files will be moved automatically on first startup, but you might need to adjust your backup scripts. - - - - - The default for the nginx configuration changed from - piwik.${config.networking.hostName} to - matomo.${config.networking.hostName}.${config.networking.domain} - if is set, - matomo.${config.networking.hostName} if it is not set. - If you change your , remember you'll need to update the - trustedHosts[] array in /var/lib/matomo/config/config.ini.php - as well. - - - - - The piwik user was renamed to matomo. - The service will adjust ownership automatically for files in the data directory. - If you use unix socket authentication, remember to give the new matomo user - access to the database and to change the username to matomo - in the [database] section of /var/lib/matomo/config/config.ini.php. - - - - - If you named your database `piwik`, you might want to rename it to `matomo` to keep things clean, - but this is neither enforced nor required. - - - - - - - - nodejs-4_x is end-of-life. - nodejs-4_x, nodejs-slim-4_x and nodePackages_4_x are removed. - - - - - The pump.io NixOS module was removed. - It is now maintained as an - external module. - - - - - The Prosody XMPP server has received a major update. The following modules were renamed: - - - - is now - - - - - is now - - - + + + is now + + + + - - Many new modules are now core modules, most notably - and . + Many new modules are now core modules, most notably + and + . - - The better-performing libevent backend is now enabled by default. + The better-performing libevent backend is now enabled + by default. - - withCommunityModules now passes through the modules to . - Use withOnlyInstalledCommunityModules for modules that should not be enabled directly, e.g lib_ldap. + withCommunityModules now passes through the modules to + . Use + withOnlyInstalledCommunityModules for modules that + should not be enabled directly, e.g lib_ldap. - - + + - All prometheus exporter modules are now defined as submodules. - The exporters are configured using services.prometheus.exporters. + All prometheus exporter modules are now defined as submodules. The + exporters are configured using + services.prometheus.exporters. - - + + +
- -
+ Other Notable Changes -Other Notable Changes - - - - - ZNC option now defaults to - true. That means that old configuration is not - overwritten by default when update to the znc options are made. - - - - - The option - has been added for wireless networks with WPA-Enterprise authentication. - There is also a new option to directly - configure wpa_supplicant and - to connect to hidden networks. - - - - - In the module the - following options have been removed: - - - - - - - - - - - - - - - - - - To assign static addresses to an interface the options - and - should be used instead. - The options and have been - renamed to - respectively. - The new options and - have been added to set up static routing. - - - - - The option is now 127.0.0.1 by default. - Previously the default behaviour was to listen on all interfaces. - - - - - services.btrfs.autoScrub has been added, to - periodically check btrfs filesystems for data corruption. - If there's a correct copy available, it will automatically repair - corrupted blocks. - - - - - displayManager.lightdm.greeters.gtk.clock-format. - has been added, the clock format string (as expected by - strftime, e.g. %H:%M) to use with the lightdm - gtk greeter panel. - - - If set to null the default clock format is used. - - - - - displayManager.lightdm.greeters.gtk.indicators - has been added, a list of allowed indicator modules to use with - the lightdm gtk greeter panel. - - - Built-in indicators include ~a11y, - ~language, ~session, - ~power, ~clock, - ~host, ~spacer. Unity - indicators can be represented by short name - (e.g. sound, power), - service file name, or absolute path. - - - If set to null the default indicators are - used. - - - In order to have the previous default configuration add + + + + ZNC option now defaults to + true. That means that old configuration is not + overwritten by default when update to the znc options are made. + + + + + The option + has been added for wireless networks with WPA-Enterprise authentication. + There is also a new option to directly + configure wpa_supplicant and to + connect to hidden networks. + + + + + In the module the + following options have been removed: + + + + + + + + + + + + + + + + + + + + + + + + + + + + To assign static addresses to an interface the options + and should + be used instead. The options and + have been renamed to + respectively. The new options + and have been + added to set up static routing. + + + + + The option is now + 127.0.0.1 by default. Previously the default behaviour + was to listen on all interfaces. + + + + + services.btrfs.autoScrub has been added, to + periodically check btrfs filesystems for data corruption. If there's a + correct copy available, it will automatically repair corrupted blocks. + + + + + displayManager.lightdm.greeters.gtk.clock-format. has + been added, the clock format string (as expected by strftime, e.g. + %H:%M) to use with the lightdm gtk greeter panel. + + + If set to null the default clock format is used. + + + + + displayManager.lightdm.greeters.gtk.indicators has been + added, a list of allowed indicator modules to use with the lightdm gtk + greeter panel. + + + Built-in indicators include ~a11y, + ~language, ~session, + ~power, ~clock, + ~host, ~spacer. Unity indicators can + be represented by short name (e.g. sound, + power), service file name, or absolute path. + + + If set to null the default indicators are used. + + + In order to have the previous default configuration add services.xserver.displayManager.lightdm.greeters.gtk.indicators = [ "~host" "~spacer" @@ -539,24 +829,27 @@ following incompatible changes: "~power" ]; - to your configuration.nix. + to your configuration.nix. - - + + - The NixOS test driver supports user services declared by systemd.user.services. - The methods waitForUnit, getUnitInfo, startJob - and stopJob provide an optional $user argument for that purpose. + The NixOS test driver supports user services declared by + systemd.user.services. The methods + waitForUnit, getUnitInfo, + startJob and stopJob provide an + optional $user argument for that purpose. - - + + - Enabling bash completion on NixOS, programs.bash.enableCompletion, will now also enable - completion for the Nix command line tools by installing the - nix-bash-completions package. + Enabling bash completion on NixOS, + programs.bash.enableCompletion, will now also enable + completion for the Nix command line tools by installing the + nix-bash-completions + package. - - - -
+ + + diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 959bd86759b1e4b19362507a11fe08db19c93bb9..db9e13da06549c9179c9a3b8d82c39a443af27be 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -3,80 +3,480 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-18.09"> + Release 18.09 (“Jellyfish”, 2018/09/??) -Release 18.09 (“Jellyfish”, 2018/09/??) - -
+ Highlights -Highlights + + In addition to numerous new and upgraded packages, this release has the + following highlights: + -In addition to numerous new and upgraded packages, this release -has the following highlights: - - - + + + + Support for wrapping binaries using firejail has been + added through programs.firejail.wrappedBinaries. + + + For example + + +programs.firejail = { + enable = true; + wrappedBinaries = { + firefox = "${lib.getBin pkgs.firefox}/bin/firefox"; + mpv = "${lib.getBin pkgs.mpv}/bin/mpv"; + }; +}; + + + This will place firefox and mpv binaries in the global path wrapped by firejail. + + + - TODO + User channels are now in the default NIX_PATH, allowing + users to use their personal nix-channel defined + channels in nix-build and nix-shell + commands, as well as in imports like import + <mychannel>. - - - + + For example + + +$ nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgsunstable +$ nix-channel --update +$ nix-build '<nixpkgsunstable>' -A gitFull +$ nix run -f '<nixpkgsunstable>' gitFull +$ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' + + + +
- -
+ New Services -New Services - -The following new services were added since the last release: + + The following new services were added since the last release: + - - - - - + + + + The services.cassandra module has been reworked and + was rewritten from scratch. The service has succeeding tests for + the versions 2.1, 2.2, 3.0 and 3.11 of Apache Cassandra. + + + + + There is a new services.foundationdb module for deploying + FoundationDB clusters. + + + + + When enabled the iproute2 will copy the files expected + by ip route (e.g., rt_tables) in + /run/iproute2. This allows to write aliases for + routing tables for instance. + + + + + services.strongswan-swanctl + is a modern replacement for services.strongswan. + You can use either one of them to setup IPsec VPNs but not both at the same time. + + + services.strongswan-swanctl uses the + swanctl + command which uses the modern + vici + Versatile IKE Configuration Interface. + The deprecated ipsec command used in services.strongswan is using the legacy + stroke configuration interface. + + + + + The new services.elasticsearch-curator service + periodically curates or manages, your Elasticsearch indices and snapshots. + + + +
- -
+ Backward Incompatibilities -Backward Incompatibilities - -When upgrading from a previous release, please be aware of the -following incompatible changes: + + When upgrading from a previous release, please be aware of the following + incompatible changes: + - - + + + The deprecated services.cassandra module has + seen a complete rewrite. (See above.) - - + + + + lib.strict is removed. Use + builtins.seq instead. + + + + + The clementine package points now to the free + derivation. clementineFree is removed now and + clementineUnfree points to the package which is bundled + with the unfree libspotify package. + + + + + The netcat package is now taken directly from OpenBSD's + libressl, instead of relying on Debian's fork. The new + version should be very close to the old version, but there are some minor + differences. Importantly, flags like -b, -q, -C, and -Z are no longer + accepted by the nc command. + + + + + The services.docker-registry.extraConfig object doesn't + contain environment variables anymore. Instead it needs to provide an + object structure that can be mapped onto the YAML configuration defined in + the + docker/distribution docs. + + + + + gnucash has changed from version 2.4 to 3.x. If you've + been using gnucash (version 2.4) instead of + gnucash26 (version 2.6) you must open your Gnucash data + file(s) with gnucash26 and then save them to upgrade + the file format. Then you may use your data file(s) with Gnucash 3.x. See + the upgrade + documentation. + Gnucash 2.4 is still available under the attribute + gnucash24. + + + + + services.munge now runs as user (and group) munge instead of root. + Make sure the key file is accessible to the daemon. + + + + + dockerTools.buildImage now uses null as default value for tag, + which indicates that the nix output hash will be used as tag. + + + + + The ELK stack: elasticsearch, logstash and kibana + has been upgraded from 2.* to 6.3.*. + The 2.* versions have been unsupported since last year + so they have been removed. You can still use the 5.* versions under the names + elasticsearch5, logstash5 and + kibana5. + + + The elastic beats: + filebeat, heartbeat, + metricbeat and packetbeat + have had the same treatment: they now target 6.3.* as well. + The 5.* versions are available under the names: + filebeat5, heartbeat5, + metricbeat5 and packetbeat5 + + + The ELK-6.3 stack now comes with + X-Pack by default. + Since X-Pack is licensed under the + Elastic License + the ELK packages now have an unfree license. To use them you need to specify + allowUnfree = true; in your nixpkgs configuration. + + + Fortunately there is also a free variant of the ELK stack without X-Pack. + The packages are available under the names: + elasticsearch-oss, logstash-oss and + kibana-oss. + + + + + Options + boot.initrd.luks.devices.name.yubikey.ramfsMountPoint + boot.initrd.luks.devices.name.yubikey.storage.mountPoint + were removed. luksroot.nix module never supported more than one YubiKey at + a time anyway, hence those options never had any effect. You should be able to remove them + from your config without any issues. + + + +
- -
+ Other Notable Changes + + + + + dockerTools.pullImage relies on image digest instead of + image tag to download the image. The sha256 of a pulled + image has to be updated. + + + + + lib.attrNamesToStr has been deprecated. Use more + specific concatenation (lib.concat(Map)StringsSep) + instead. + + + + + lib.addErrorContextToAttrs has been deprecated. Use + builtins.addErrorContext directly. + + + + + lib.showVal has been deprecated. Use + lib.traceSeqN instead. + + + + + lib.traceXMLVal has been deprecated. Use + lib.traceValFn builtins.toXml instead. + + + + + lib.traceXMLValMarked has been deprecated. Use + lib.traceValFn (x: str + builtins.toXML x) instead. + + + + + The pkgs argument to NixOS modules can now be set directly using nixpkgs.pkgs. Previously, only the system, config and overlays arguments could be used to influence pkgs. + + + + + A NixOS system can now be constructed more easily based on a preexisting invocation of Nixpkgs. For example: + +inherit (pkgs.nixos { + boot.loader.grub.enable = false; + fileSystems."/".device = "/dev/xvda1"; +}) toplevel kernel initialRamdisk manual; + -Other Notable Changes + This benefits evaluation performance, lets you write Nixpkgs packages that depend on NixOS images and is consistent with a deployment architecture that would be centered around Nixpkgs overlays. + + + + + lib.traceValIfNot has been deprecated. Use + if/then/else and lib.traceValSeq instead. + + + + + lib.traceCallXml has been deprecated. Please complain + if you use the function regularly. + + + + + The attribute lib.nixpkgsVersion has been deprecated in + favor of lib.version. Please refer to the discussion in + NixOS/nixpkgs#39416 + for further reference. + + + + + lib.recursiveUpdateUntil was not acting according to its + specification. It has been fixed to act according to the docstring, and a + test has been added. + + + + + The module for has two new options now: + + + + + + + + + Puts the generated Diffie-Hellman parameters into the Nix store instead + of managing them in a stateful manner in + /var/lib/dhparams. + + + + + + + + + + The default bit size to use for the generated Diffie-Hellman + parameters. + + + + + + + The path to the actual generated parameter files should now be queried + using + config.security.dhparams.params.name.path + because it might be either in the Nix store or in a directory configured + by . + + + + For developers: + + Module implementers should not set a specific bit size in order to let + users configure it by themselves if they want to have a different bit + size than the default (2048). + + + An example usage of this would be: + +{ config, ... }: - +{ + security.dhparams.params.myservice = {}; + environment.etc."myservice.conf".text = '' + dhparams = ${config.security.dhparams.params.myservice.path} + ''; +} + + + + + + + networking.networkmanager.useDnsmasq has been + deprecated. Use networking.networkmanager.dns instead. + + + + + The option + services.kubernetes.apiserver.admissionControl was + renamed to + services.kubernetes.apiserver.enableAdmissionPlugins. + + + + + Recommended way to access the Kubernetes Dashboard is via HTTPS (TLS) + Therefore; public service port for the dashboard has changed to 443 + (container port 8443) and scheme to https. + + + + + The option services.kubernetes.apiserver.address + was renamed to services.kubernetes.apiserver.bindAddress. + Note that the default value has changed from 127.0.0.1 to 0.0.0.0. + + + + + The option services.kubernetes.apiserver.publicAddress + was not used and thus has been removed. + + + + + The option services.kubernetes.addons.dashboard.enableRBAC + was renamed to services.kubernetes.addons.dashboard.rbac.enable. + + + + + The Kubernetes Dashboard now has only minimal RBAC permissions by default. + If dashboard cluster-admin rights are desired, + set services.kubernetes.addons.dashboard.rbac.clusterAdmin to true. + On existing clusters, in order for the revocation of privileges to take effect, + the current ClusterRoleBinding for kubernetes-dashboard must be manually removed: + kubectl delete clusterrolebinding kubernetes-dashboard + + + + + The programs.screen module provides allows to configure + /etc/screenrc, however the module behaved fairly counterintuitive as + the config exists, but the package wasn't available. Since 18.09 pkgs.screen + will be added to environment.systemPackages. + + + + + The module now uses WPA2 by default. + + + + + s6Dns, s6Networking, + s6LinuxUtils and s6PortableUtils + renamed to + s6-dns, s6-networking, + s6-linux-utils and s6-portable-utils respectively. + + + The module option is now defaulted to true. - - -
+ + + The config activation script of nixos-rebuild now + reloads + all user units for each authenticated user. + + + + diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix new file mode 100644 index 0000000000000000000000000000000000000000..cc3609d750e036126de0ae37152ae439c5acd2a1 --- /dev/null +++ b/nixos/doc/manual/shell.nix @@ -0,0 +1,8 @@ +let + pkgs = import ../../.. { }; +in +pkgs.mkShell { + name = "nixos-manual"; + + buildInputs = with pkgs; [ xmlformat jing xmloscopy ruby ]; +} diff --git a/nixos/doc/varlistentry-fixer.rb b/nixos/doc/varlistentry-fixer.rb new file mode 100755 index 0000000000000000000000000000000000000000..6c7cc1e6439b14f24ea8b192a43b5c629ddd31d8 --- /dev/null +++ b/nixos/doc/varlistentry-fixer.rb @@ -0,0 +1,124 @@ +#!/usr/bin/env ruby + +# This script is written intended as a living, evolving tooling +# to fix oopsies within the docbook documentation. +# +# This is *not* a formatter. It, instead, handles some known cases +# where something bad happened, and fixing it manually is tedious. +# +# Read the code to see the different cases it handles. +# +# ALWAYS `make format` after fixing with this! +# ALWAYS read the changes, this tool isn't yet proven to be always right. + +require "rexml/document" +include REXML + +if ARGV.length < 1 then + $stderr.puts "Needs a filename." + exit 1 +end + +filename = ARGV.shift +doc = Document.new(File.open(filename)) + +$touched = false + +# Fixing varnames having a sibling element without spacing. +# This is to fix an initial `xmlformat` issue where `term` +# would mangle as spaces. +# +# +# types.separatedStringsep <---- +# +# ... +# +# Generates: types.separatedStringsep +# ^^^^ +# +# +# +# makeWrapperexecutablewrapperfileargs <---- +# +# +# Generates: makeWrapperexecutablewrapperfileargs +# ^^^^ ^^^^ ^^ ^^ +# +# +# namevalue <----- +# +# +# Generates: --optionnamevalue +# ^^ ^^ +doc.elements.each("//varlistentry/term") do |term| + ["varname", "function", "option", "replaceable"].each do |prev_name| + term.elements.each(prev_name) do |el| + if el.next_element and + el.next_element.name == "replaceable" and + el.next_sibling_node.class == Element + then + $touched = true + term.insert_after(el, Text.new(" ")) + end + end + end +end + + + +# +# nixos-option +# +# path <------ +# +# +# Generates: -Ipath +# ^^ +doc.elements.each("//cmdsynopsis/arg") do |term| + ["option", "replaceable"].each do |prev_name| + term.elements.each(prev_name) do |el| + if el.next_element and + el.next_element.name == "replaceable" and + el.next_sibling_node.class == Element + then + $touched = true + term.insert_after(el, Text.new(" ")) + end + end + end +end + +# +# +# +# +# +# +# +# +# +# +# name <---- +# +# +# Generates: [{--profile-name | -p }name] +# ^^^^ +doc.elements.each("//cmdsynopsis/arg") do |term| + ["group"].each do |prev_name| + term.elements.each(prev_name) do |el| + if el.next_element and + el.next_element.name == "replaceable" and + el.next_sibling_node.class == Element + then + $touched = true + term.insert_after(el, Text.new(" ")) + end + end + end +end + + +if $touched then + doc.context[:attribute_quote] = :quote + doc.write(output: File.open(filename, "w")) +end diff --git a/nixos/doc/xmlformat.conf b/nixos/doc/xmlformat.conf new file mode 100644 index 0000000000000000000000000000000000000000..4a565c8465bc038a515c5cbdb3c6cc115f06c2c7 --- /dev/null +++ b/nixos/doc/xmlformat.conf @@ -0,0 +1,73 @@ +# +# DocBook Configuration file for "xmlformat" +# see http://www.kitebird.com/software/xmlformat/ +# 10 Sept. 2004 +# + +# Only block elements +ackno address appendix article biblioentry bibliography bibliomixed \ +biblioset blockquote book bridgehead callout calloutlist caption caution \ +chapter chapterinfo classsynopsis cmdsynopsis colophon constraintdef \ +constructorsynopsis dedication destructorsynopsis entry epigraph equation example \ +figure formalpara funcsynopsis glossary glossdef glossdiv glossentry glosslist \ +glosssee glossseealso graphic graphicco highlights imageobjectco important \ +index indexdiv indexentry indexinfo info informalequation informalexample \ +informalfigure informaltable legalnotice literallayout lot lotentry mediaobject \ +mediaobjectco msgmain msgset note orderedlist para part preface primaryie \ +procedure qandadiv qandaentry qandaset refentry refentrytitle reference \ +refnamediv refsect1 refsect2 refsect3 refsection revhistory screenshot sect1 \ +sect2 sect3 sect4 sect5 section seglistitem set setindex sidebar simpara \ +simplesect step substeps synopfragment synopsis table term title \ +toc variablelist varlistentry warning itemizedlist listitem \ +footnote colspec partintro row simplelist subtitle tbody tgroup thead tip + format block + normalize no + + +#appendix bibliography chapter glossary preface reference +# element-break 3 + +sect1 section + element-break 2 + + +# +para abstract + format block + entry-break 1 + exit-break 1 + normalize yes + wrap-length 79 + +title + format block + normalize = yes + entry-break = 0 + exit-break = 0 + +# Inline elements +abbrev accel acronym action application citation citebiblioid citerefentry citetitle \ +classname co code command computeroutput constant country database date email emphasis \ +envar errorcode errorname errortext errortype exceptionname fax filename \ +firstname firstterm footnoteref foreignphrase funcdef funcparams function \ +glossterm group guibutton guiicon guilabel guimenu guimenuitem guisubmenu \ +hardware holder honorific indexterm inlineequation inlinegraphic inlinemediaobject \ +interface interfacename \ +keycap keycode keycombo keysym lineage link literal manvolnum markup medialabel \ +menuchoice methodname methodparam modifier mousebutton olink ooclass ooexception \ +oointerface option optional otheraddr othername package paramdef parameter personname \ +phrase pob postcode productname prompt property quote refpurpose replaceable \ +returnvalue revnumber sgmltag state street structfield structname subscript \ +superscript surname symbol systemitem token trademark type ulink userinput \ +uri varargs varname void wordasword xref year mathphrase member tag + format inline + +programlisting screen + format verbatim + entry-break = 0 + exit-break = 0 + +# This is needed so that the spacing inside those tags is kept. +term cmdsynopsis arg + normalize yes + format block diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index e14105f5f011be00c159ce30b8ccde374eb9af8e..48288cf5962c4f30f72ad727bbab1e2528738755 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -47,7 +47,7 @@ rec { machinesNumbered = zipLists machines (range 1 254); nodes_ = flip map machinesNumbered (m: nameValuePair m.fst - [ ( { config, pkgs, nodes, ... }: + [ ( { config, nodes, ... }: let interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255); interfaces = flip map interfacesNumbered ({ fst, snd }: diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 2e7971cca8103d6e276976a20e0f3e779282f625..97c79487df4c140d2c0126899cd9630041e357c9 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -26,7 +26,7 @@ , lib ? import ../../lib }: -let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; +let extraArgs_ = extraArgs; pkgs_ = pkgs; extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH"; in if e == "" then [] else [(import (builtins.toPath e))]; in @@ -36,7 +36,7 @@ let _file = ./eval-config.nix; key = _file; config = { - nixpkgs.system = lib.mkDefault system_; + nixpkgs.localSystem = lib.mkDefault { inherit system; }; _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_); }; }; diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index ebfb09db7b7e4e91f869d1d952f7b08a37ed4a6c..bf32a36895c5e1f837730624f3b46cdf4e034845 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -24,9 +24,6 @@ # most likely fails as GRUB will probably refuse to install. partitionTableType ? "legacy" - # Whether to invoke switch-to-configuration boot during image creation -, installBootLoader ? true - , # The root file system type. fsType ? "ext4" diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 21c69ed560a32e1014c56221ab51db71c2980900..88be8b73ab37b03a66fba86f8fe23c3cfa4544e4 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -5,25 +5,28 @@ { pkgs , storePaths , volumeLabel +, uuid ? "44444444-4444-4444-8888-888888888888" +, e2fsprogs +, libfaketime +, perl }: +let + sdClosureInfo = pkgs.buildPackages.closureInfo { rootPaths = storePaths; }; +in + pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; - nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl]; - - # For obtaining the closure of `storePaths'. - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x) x]) storePaths; + nativeBuildInputs = [e2fsprogs.bin libfaketime perl]; buildCommand = '' # Add the closures of the top-level store objects. - storePaths=$(perl ${pkgs.pathsFromGraph} closure-*) + storePaths=$(cat ${sdClosureInfo}/store-paths) - # Also include a manifest of the closures in a format suitable - # for nix-store --load-db. - printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > nix-path-registration + # Also include a manifest of the closures in a format suitable for nix-store --load-db. + cp ${sdClosureInfo}/registration nix-path-registration # Make a crude approximation of the size of the target image. # If the script starts failing, increase the fudge factors here. @@ -33,7 +36,7 @@ pkgs.stdenv.mkDerivation { echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)" truncate -s $bytes $out - faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U 44444444-4444-4444-8888-888888888888 $out + faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $out # Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs. # For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep: @@ -84,5 +87,12 @@ pkgs.stdenv.mkDerivation { echo "--- Failed to create EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---" return 1 fi + + # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build. + if ! fsck.ext4 -n -f $out; then + echo "--- Fsck failed for EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---" + cat errorlog + return 1 + fi ''; } diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index c6bafd48f9dbd80a8d56fd233a368f1788af06d1..8cd19b6e1874b1f8e0f51017f76faea7b1420c96 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, closureInfo, xorriso, syslinux +{ stdenv, closureInfo, xorriso, syslinux , # The file name of the resulting ISO image. isoName ? "cd.iso" diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index fcdcbf1b00770014c4076c01f50e8cb86f17fa02..f115ca5ac000eb21a3ed2a5cbff19f7675fd2367 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -1,21 +1,25 @@ # QEMU flags shared between various Nix expressions. { pkgs }: +let + zeroPad = n: if n < 10 then "0${toString n}" else toString n; +in + { qemuNICFlags = nic: net: machine: - [ "-net nic,vlan=${toString nic},macaddr=52:54:00:12:${toString net}:${toString machine},model=virtio" - "-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}" + [ "-device virtio-net-pci,netdev=vlan${toString nic},mac=52:54:00:12:${zeroPad net}:${zeroPad machine}" + "-netdev vde,id=vlan${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}" ]; qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" - else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" + else if pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64 then "ttyAMA0" else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; qemuBinary = qemuPkg: { - "i686-linux" = "${qemuPkg}/bin/qemu-kvm"; "x86_64-linux" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; "armv7l-linux" = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; "aarch64-linux" = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; - }.${pkgs.stdenv.system} or (throw "Unknown QEMU binary for '${pkgs.stdenv.system}'"); + "x86_64-darwin" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; + }.${pkgs.stdenv.system} or "${qemuPkg}/bin/qemu-kvm"; } diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 78598b3efb4b1f578b8d7710bbb44d42ec60b99b..b18f48464ceec5917b38b71d02b9235e54368ffa 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -33,9 +33,20 @@ sub new { $startCommand = "qemu-kvm -m 384 " . "-net nic,model=virtio \$QEMU_OPTS "; - my $iface = $args->{hdaInterface} || "virtio"; - $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,werror=report " - if defined $args->{hda}; + + if (defined $args->{hda}) { + if ($args->{hdaInterface} eq "scsi") { + $startCommand .= "-drive id=hda,file=" + . Cwd::abs_path($args->{hda}) + . ",werror=report,if=none " + . "-device scsi-hd,drive=hda "; + } else { + $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) + . ",if=" . $args->{hdaInterface} + . ",werror=report "; + } + } + $startCommand .= "-cdrom $args->{cdrom} " if defined $args->{cdrom}; $startCommand .= "-device piix3-usb-uhci -drive id=usbdisk,file=$args->{usb},if=none,readonly -device usb-storage,drive=usbdisk " @@ -612,7 +623,7 @@ sub waitForX { my ($self, $regexp) = @_; $self->nest("waiting for the X11 server", sub { retry sub { - my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'"); + my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'Reached target Current graphical'"); return 0 if $status != 0; ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]"); return 1 if $status == 0; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index d990a5f8b6ace1c5b92b6f18127a0c8e3a638005..42a0c60c7e19c893ad57d49a9b03ddb0f6e19a6d 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -111,6 +111,8 @@ in rec { ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; }; + imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; + # Generate onvenience wrappers for running the test driver # interactively with the specified network, and for starting the # VMs from the command line. @@ -128,7 +130,7 @@ in rec { wrapProgram $out/bin/nixos-test-driver \ --add-flags "''${vms[*]}" \ ${lib.optionalString enableOCR - "--prefix PATH : '${ocrProg}/bin:${imagemagick}/bin'"} \ + "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \ --run "export testScript=\"\$(cat $out/test-script)\"" \ --set VLANS '${toString vlans}' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms @@ -220,7 +222,7 @@ in rec { runInMachineWithX = { require ? [], ... } @ args: let client = - { config, pkgs, ... }: + { ... }: { inherit require; virtualisation.memorySize = 1024; diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix index 371ee7d91808d691d8a1017f33bccd4bcfc451d1..242c2a4dd442f2e15b5c44d023d20dde54c3da83 100644 --- a/nixos/maintainers/option-usages.nix +++ b/nixos/maintainers/option-usages.nix @@ -149,7 +149,7 @@ let else testOptions; checkAll = checkList == []; in - flip filter graph ({option, usedBy}: + flip filter graph ({option, ...}: (checkAll || elem option checkList) && !(elem option excludedTestOptions) ); @@ -165,7 +165,7 @@ let ''; graphToText = graph: - concatMapStrings ({option, usedBy}: + concatMapStrings ({usedBy, ...}: concatMapStrings (user: '' ${user} '') usedBy diff --git a/nixos/maintainers/scripts/azure/create-azure.sh b/nixos/maintainers/scripts/azure/create-azure.sh index a834566be8f75cd7b0cec03bd7d58874f8e007c2..2b22cb53661905309bfe4b5c56d28080b780afd7 100755 --- a/nixos/maintainers/scripts/azure/create-azure.sh +++ b/nixos/maintainers/scripts/azure/create-azure.sh @@ -5,4 +5,4 @@ export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation export TIMESTAMP=$(date +%Y%m%d%H%M) nix-build '' \ - -A config.system.build.azureImage --argstr system x86_64-linux -o azure --option extra-binary-caches https://hydra.nixos.org -j 10 + -A config.system.build.azureImage --argstr system x86_64-linux -o azure -j 10 diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 972c04453aefcde4b9f0847379c9154726dc1111..eeae27ede0f89f04f43dc5d12a284cc87fd7559e 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -8,6 +8,11 @@ in { imports = [ ../../../modules/virtualisation/amazon-image.nix ]; + # Required to provide good EBS experience, + # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes + # TODO change value to 4294967295 when kernel is updated to 4.15 or later + config.boot.kernelParams = [ "nvme_core.io_timeout=255" ]; + options.amazonImage = { name = mkOption { type = types.str; diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 347e6b9c6e0dbb104847dc0bdab4085d8f0a10b9..790cc6cbc5318899bb05164d2b7c7e6dc68f3705 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -6,11 +6,11 @@ set -e set -o pipefail -version=$(nix-instantiate --eval --strict '' -A lib.nixpkgsVersion | sed s/'"'//g) +version=$(nix-instantiate --eval --strict '' -A lib.version | sed s/'"'//g) major=${version:0:5} echo "NixOS version is $version ($major)" -stateDir=/var/tmp/ec2-image-$version +stateDir=/home/deploy/amis/ec2-image-$version echo "keeping state in $stateDir" mkdir -p $stateDir @@ -161,6 +161,7 @@ for type in $types; do # Create a snapshot. if [ -z "$snapId" ]; then echo "creating snapshot..." + # FIXME: this can fail with InvalidVolume.NotFound. Eventual consistency yay. snapId=$(aws ec2 create-snapshot --volume-id "$volId" --region "$region" --description "$description" | jq -r .SnapshotId) if [ "$snapId" = null ]; then exit 1; fi echo -n "$snapId" > $stateDir/$region.$type.snap-id diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh index ef1801fe54beb87a700aa131f19a7e9f57f6b5cf..0fd26d34d07f9ff6bf8bc55eb78bb88785196ae9 100755 --- a/nixos/maintainers/scripts/gce/create-gce.sh +++ b/nixos/maintainers/scripts/gce/create-gce.sh @@ -3,7 +3,7 @@ set -euo pipefail -BUCKET_NAME="${BUCKET_NAME:-nixos-images}" +BUCKET_NAME="${BUCKET_NAME:-nixos-cloud-images}" TIMESTAMP="$(date +%Y%m%d%H%M)" export TIMESTAMP @@ -19,5 +19,5 @@ img_name=$(basename "$img_path") img_id=$(echo "$img_name" | sed 's|.raw.tar.gz$||;s|\.|-|g;s|_|-|g') if ! gsutil ls "gs://${BUCKET_NAME}/$img_name"; then gsutil cp "$img_path" "gs://${BUCKET_NAME}/$img_name" + gsutil acl ch -u AllUsers:R "gs://${BUCKET_NAME}/$img_name" fi -gcloud compute images create "$img_id" --source-uri "gs://${BUCKET_NAME}/$img_name" diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix index c7654ca78c3a1c2f1712ed587a0629d93fe224d0..7549dc6c0651c029221b79a760d7fccadb50a080 100644 --- a/nixos/modules/config/fonts/fontconfig-ultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix @@ -2,9 +2,7 @@ with lib; -let fcBool = x: if x then "true" else "false"; - - cfg = config.fonts.fontconfig.ultimate; +let cfg = config.fonts.fontconfig.ultimate; latestVersion = pkgs.fontconfig.configVersion; diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix index ef48ccb7b4feb75ed9cde47596d3b8b091c80e85..93d130970190297955dace98abcfda5986aa876e 100644 --- a/nixos/modules/config/gnu.nix +++ b/nixos/modules/config/gnu.nix @@ -26,11 +26,11 @@ with lib; nano zile texinfo # for the stand-alone Info reader ] - ++ stdenv.lib.optional (!stdenv.isArm) grub2; + ++ stdenv.lib.optional (!stdenv.isAarch32) grub2; # GNU GRUB, where available. - boot.loader.grub.enable = !pkgs.stdenv.isArm; + boot.loader.grub.enable = !pkgs.stdenv.isAarch32; boot.loader.grub.version = 2; # GNU lsh. diff --git a/nixos/modules/config/iproute2.nix b/nixos/modules/config/iproute2.nix new file mode 100644 index 0000000000000000000000000000000000000000..881ad671a627596c8b903c8bc1fb493ce96acc9d --- /dev/null +++ b/nixos/modules/config/iproute2.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.iproute2; + confDir = "/run/iproute2"; +in +{ + options.networking.iproute2.enable = mkEnableOption "copy IP route configuration files"; + + config = mkMerge [ + ({ nixpkgs.config.iproute2.confDir = confDir; }) + + (mkIf cfg.enable { + system.activationScripts.iproute2 = '' + cp -R ${pkgs.iproute}/etc/iproute2 ${confDir} + chmod -R 664 ${confDir} + chmod +x ${confDir} + ''; + }) + ]; +} diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index 710dfdd01af5e3b344e2aa8942ede73e6bbc8d01..0693e896f7151601b93bb47970ac46b055095348 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -215,11 +215,11 @@ in ); users = mkIf cfg.daemon.enable { - extraGroups.nslcd = { + groups.nslcd = { gid = config.ids.gids.nslcd; }; - extraUsers.nslcd = { + users.nslcd = { uid = config.ids.uids.nslcd; description = "nslcd user."; group = "nslcd"; diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 4101ef82f3e1b46670905162d50cdc280991f878..1ef5313d3fdd5dab4fdcf638ac249a0627190404 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -9,7 +9,9 @@ let cfg = config.networking; dnsmasqResolve = config.services.dnsmasq.enable && config.services.dnsmasq.resolveLocalQueries; - hasLocalResolver = config.services.bind.enable || dnsmasqResolve; + hasLocalResolver = config.services.bind.enable || + config.services.unbound.enable || + dnsmasqResolve; resolvconfOptions = cfg.resolvconfOptions ++ optional cfg.dnsSingleRequest "single-request" @@ -231,10 +233,6 @@ in # a collision with an apparently unrelated environment # variable with the same name exported by dhcpcd. interface_order='lo lo[0-9]*' - '' + optionalString config.services.nscd.enable '' - # Invalidate the nscd cache whenever resolv.conf is - # regenerated. - libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' '' + optionalString (length resolvconfOptions > 0) '' # Options as described in resolv.conf(5) resolv_conf_options='${concatStringsSep " " resolvconfOptions}' diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index a20910353f34766dc9072d51bb1a7fd85d0ff3f2..d9ecaa4818ba66f101928109114e1c353b6848cf 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -1,7 +1,7 @@ # This module gets rid of all dependencies on X11 client libraries # (including fontconfig). -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; @@ -26,16 +26,16 @@ with lib; fonts.fontconfig.enable = false; - nixpkgs.config.packageOverrides = pkgs: { - dbus = pkgs.dbus.override { x11Support = false; }; - networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { withGnome = false; }; - networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; }; - networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; }; - networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; }; - networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; }; - networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; }; - pinentry = pkgs.pinentry_ncurses; - gobjectIntrospection = pkgs.gobjectIntrospection.override { x11Support = false; }; - }; + nixpkgs.overlays = singleton (const (super: { + dbus = super.dbus.override { x11Support = false; }; + networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; + networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; }; + networkmanager-openconnect = super.networkmanager-openconnect.override { withGnome = false; }; + networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; + networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; + networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; + pinentry = super.pinentry_ncurses; + gobjectIntrospection = super.gobjectIntrospection.override { x11Support = false; }; + })); }; } diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index c595c693294694ba7fb3b2292c9ecb4752863955..a74d551f50df47240f622ffb221c6278f9eef707 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -1,6 +1,6 @@ # Configuration for the Name Service Switch (/etc/nsswitch.conf). -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix index 4c37e8a6208caa04c37f4970564048c38cfa575d..0277f1ad11e9c4d2ba96e9d4a8536a0cc6b96bd0 100644 --- a/nixos/modules/config/power-management.nix +++ b/nixos/modules/config/power-management.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index a9c5fc75660d38906f3299027ab0479b9628b35a..e16a021ec20b86ce9a78ac88f01f5665b512bc0a 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -144,8 +144,8 @@ in { package = mkOption { type = types.package; - default = pulseaudioLight; - defaultText = "pkgs.pulseaudioLight"; + default = pkgs.pulseaudio; + defaultText = "pkgs.pulseaudio"; example = literalExample "pkgs.pulseaudioFull"; description = '' The PulseAudio derivation to use. This can be used to enable @@ -214,6 +214,8 @@ in { (mkIf cfg.enable { environment.systemPackages = [ overriddenPackage ]; + sound.enable = true; + environment.etc = [ { target = "asound.conf"; source = alsaConf; } @@ -262,7 +264,7 @@ in { }) (mkIf systemWide { - users.extraUsers.pulse = { + users.users.pulse = { # For some reason, PulseAudio wants UID == GID. uid = assert uid == gid; uid; group = "pulse"; @@ -272,7 +274,7 @@ in { createHome = true; }; - users.extraGroups.pulse.gid = gid; + users.groups.pulse.gid = gid; systemd.services.pulseaudio = { description = "PulseAudio System-Wide Server"; diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 398660967c529710eb957a52dacd5640ed95cf4b..b2bfc785f2a351c8991df90112c2c562bf4bc54f 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -70,7 +70,7 @@ in description = '' Shell script code called during global environment initialisation after all variables and profileVariables have been set. - This code is asumed to be shell-independent, which means you should + This code is assumed to be shell-independent, which means you should stick to pure sh without sh word split. ''; type = types.lines; @@ -80,7 +80,7 @@ in default = ""; description = '' Shell script code called during shell initialisation. - This code is asumed to be shell-independent, which means you should + This code is assumed to be shell-independent, which means you should stick to pure sh without sh word split. ''; type = types.lines; @@ -90,7 +90,7 @@ in default = ""; description = '' Shell script code called during login shell initialisation. - This code is asumed to be shell-independent, which means you should + This code is assumed to be shell-independent, which means you should stick to pure sh without sh word split. ''; type = types.lines; @@ -100,7 +100,7 @@ in default = ""; description = '' Shell script code called during interactive shell initialisation. - This code is asumed to be shell-independent, which means you should + This code is assumed to be shell-independent, which means you should stick to pure sh without sh word split. ''; type = types.lines; diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 2114fb2b9d49cf1eeefea606bcd242dfaf001c75..74bff602a4771ec6bdfd5fa82e1835f415163f3f 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix index 9565a09b3a1e0be9a5257d2d14e019b37a4782f2..8dd811727389a3926cba1ac10bb5b8b57866970e 100644 --- a/nixos/modules/config/unix-odbc-drivers.nix +++ b/nixos/modules/config/unix-odbc-drivers.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 42d5d233f1c1185514fc91532001ea58db79f885..426e1666a814f90b6fbc1a9825ac578f4fde0a49 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -92,7 +92,7 @@ let group = mkOption { type = types.str; - apply = x: assert (builtins.stringLength x < 17 || abort "Group name '${x}' is longer than 16 characters which is not allowed!"); x; + apply = x: assert (builtins.stringLength x < 32 || abort "Group name '${x}' is longer than 31 characters which is not allowed!"); x; default = "nogroup"; description = "The user's primary group."; }; @@ -120,8 +120,8 @@ let shell = mkOption { type = types.either types.shellPackage types.path; - default = pkgs.nologin; - defaultText = "pkgs.nologin"; + default = pkgs.shadow; + defaultText = "pkgs.shadow"; example = literalExample "pkgs.bashInteractive"; description = '' The path to the user's shell. Can use shell derivations, @@ -282,7 +282,7 @@ let }; - groupOpts = { name, config, ... }: { + groupOpts = { name, ... }: { options = { @@ -524,6 +524,8 @@ in { utmp.gid = ids.gids.utmp; adm.gid = ids.gids.adm; input.gid = ids.gids.input; + kvm.gid = ids.gids.kvm; + render.gid = ids.gids.render; }; system.activationScripts.users = stringAfter [ "stdio" ] diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix index c7ac1b3530e14a25dc93ef073c0d4ac190404dad..356e007c0a3e94663bc58a8481a762def4e46a83 100644 --- a/nixos/modules/config/vpnc.nix +++ b/nixos/modules/config/vpnc.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index ae1b0a6c8e113f6ead2d0565957f9fe2129b9af5..c1748812821e71a86412c6a6566b708ca33244e0 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -25,16 +25,16 @@ in type = types.bool; description = '' Enable in-memory compressed swap space provided by the zram kernel - module. It is recommended to enable only for kernel 3.14 or higher. + module. + See https://www.kernel.org/doc/Documentation/blockdev/zram.txt ''; }; numDevices = mkOption { - default = 4; + default = 1; type = types.int; description = '' - Number of zram swap devices to create. It should be equal to the - number of CPU cores your system has. + Number of zram swap devices to create. ''; }; diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index b61acf1815d9681726b76996f262e793aff42163..e978ec6b40ada61d64047bfc9605d8f09d26998b 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -38,7 +38,8 @@ in { firmwareLinuxNonfree intel2200BGFirmware rtl8192su-firmware - ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ + ] ++ optional (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) raspberrypiWirelessFirmware + ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware ]; }) diff --git a/nixos/modules/hardware/brightnessctl.nix b/nixos/modules/hardware/brightnessctl.nix new file mode 100644 index 0000000000000000000000000000000000000000..341e4b791c237a96625902acfe6eb1498e34f98f --- /dev/null +++ b/nixos/modules/hardware/brightnessctl.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.hardware.brightnessctl; +in +{ + + options = { + + hardware.brightnessctl = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable brightnessctl in userspace. + This will allow brightness control from users in the video group. + ''; + + }; + }; + }; + + + config = mkIf cfg.enable { + services.udev.packages = with pkgs; [ brightnessctl ]; + }; + +} diff --git a/nixos/modules/hardware/network/smc-2632w/default.nix b/nixos/modules/hardware/network/smc-2632w/default.nix index 650011aca8173eaccc0109a17bbb7c007b63764a..b00286464f348e1407fd4794a6fa3268dd1537d2 100644 --- a/nixos/modules/hardware/network/smc-2632w/default.nix +++ b/nixos/modules/hardware/network/smc-2632w/default.nix @@ -1,4 +1,4 @@ -{lib, config, ...}: +{lib, ...}: { hardware = { diff --git a/nixos/modules/hardware/network/zydas-zd1211.nix b/nixos/modules/hardware/network/zydas-zd1211.nix index c8428a7241b1c85485767c8971c44fa90e37cc6f..5dd7f30ed82b181f3b68a94462f195b2a9d7e4c8 100644 --- a/nixos/modules/hardware/network/zydas-zd1211.nix +++ b/nixos/modules/hardware/network/zydas-zd1211.nix @@ -1,4 +1,4 @@ -{pkgs, config, ...}: +{pkgs, ...}: { hardware.firmware = [ pkgs.zd1211fw ]; diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix index bd440de697228f9d941727b371cecf72c3a03a25..60fc95a7582814cdb7005319c28bb6fc54993480 100644 --- a/nixos/modules/hardware/nitrokey.nix +++ b/nixos/modules/hardware/nitrokey.nix @@ -36,6 +36,6 @@ in { inherit (cfg) group; } )) ]; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; }; } diff --git a/nixos/modules/hardware/onlykey.nix b/nixos/modules/hardware/onlykey.nix new file mode 100644 index 0000000000000000000000000000000000000000..b6820fe01911fee112538ff215bfc4428a73ca2d --- /dev/null +++ b/nixos/modules/hardware/onlykey.nix @@ -0,0 +1,33 @@ +{ config, lib, ... }: + +with lib; + +{ + + ####### interface + + options = { + + hardware.onlykey = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable OnlyKey device (https://crp.to/p/) support. + ''; + }; + }; + + }; + + ## As per OnlyKey's documentation piece (hhttps://docs.google.com/document/d/1Go_Rs218fKUx-j_JKhddbSVTqY6P0vQO831t2MKCJC8), + ## it is important to add udev rule for OnlyKey for it to work on Linux + + ####### implementation + + config = mkIf config.hardware.onlykey.enable { + services.udev.extraRules = builtin.readFile ./onlykey.udev; + }; + + +} diff --git a/nixos/modules/hardware/onlykey.udev b/nixos/modules/hardware/onlykey.udev new file mode 100644 index 0000000000000000000000000000000000000000..6583530e56846754bf85cb4e2a3e7b1e0ce6b166 --- /dev/null +++ b/nixos/modules/hardware/onlykey.udev @@ -0,0 +1,4 @@ +ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" +ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", GROUP+="plugdev" +KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", GROUP+="plugdev" diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index d9646704e6f60f49d3630121445fcb64bba8e890..b371af353cf9ac2b3913398c51e55221064c63d3 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -14,7 +14,6 @@ let name = "mesa-drivers+txc-${p.mesa_drivers.version}"; paths = [ p.mesa_drivers - p.mesa_drivers.out # mainly for libGL (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc) ]; }; @@ -33,89 +32,92 @@ in { options = { - hardware.opengl.enable = mkOption { - description = '' - Whether to enable OpenGL drivers. This is needed to enable - OpenGL support in X11 systems, as well as for Wayland compositors - like sway, way-cooler and Weston. It is enabled by default - by the corresponding modules, so you do not usually have to - set it yourself, only if there is no module for your wayland - compositor of choice. See services.xserver.enable, - programs.sway.enable, and programs.way-cooler.enable. - ''; - type = types.bool; - default = false; - }; - - hardware.opengl.driSupport = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable accelerated OpenGL rendering through the - Direct Rendering Interface (DRI). - ''; - }; - - hardware.opengl.driSupport32Bit = mkOption { - type = types.bool; - default = false; - description = '' - On 64-bit systems, whether to support Direct Rendering for - 32-bit applications (such as Wine). This is currently only - supported for the nvidia and - ati_unfree drivers, as well as - Mesa. - ''; - }; - - hardware.opengl.s3tcSupport = mkOption { - type = types.bool; - default = false; - description = '' - Make S3TC(S3 Texture Compression) via libtxc_dxtn available - to OpenGL drivers instead of the patent-free S2TC replacement. - - Using this library may require a patent license depending on your location. - ''; - }; - - hardware.opengl.package = mkOption { - type = types.package; - internal = true; - description = '' - The package that provides the OpenGL implementation. - ''; - }; - hardware.opengl.package32 = mkOption { - type = types.package; - internal = true; - description = '' - The package that provides the 32-bit OpenGL implementation on - 64-bit systems. Used when is - set. - ''; - }; - - hardware.opengl.extraPackages = mkOption { - type = types.listOf types.package; - default = []; - example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; - description = '' - Additional packages to add to OpenGL drivers. This can be used - to add OpenCL drivers, VA-API/VDPAU drivers etc. - ''; - }; - - hardware.opengl.extraPackages32 = mkOption { - type = types.listOf types.package; - default = []; - example = literalExample "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; - description = '' - Additional packages to add to 32-bit OpenGL drivers on - 64-bit systems. Used when is - set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. - ''; + hardware.opengl = { + enable = mkOption { + description = '' + Whether to enable OpenGL drivers. This is needed to enable + OpenGL support in X11 systems, as well as for Wayland compositors + like sway, way-cooler and Weston. It is enabled by default + by the corresponding modules, so you do not usually have to + set it yourself, only if there is no module for your wayland + compositor of choice. See services.xserver.enable, + programs.sway.enable, and programs.way-cooler.enable. + ''; + type = types.bool; + default = false; + }; + + driSupport = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable accelerated OpenGL rendering through the + Direct Rendering Interface (DRI). + ''; + }; + + driSupport32Bit = mkOption { + type = types.bool; + default = false; + description = '' + On 64-bit systems, whether to support Direct Rendering for + 32-bit applications (such as Wine). This is currently only + supported for the nvidia and + ati_unfree drivers, as well as + Mesa. + ''; + }; + + s3tcSupport = mkOption { + type = types.bool; + default = false; + description = '' + Make S3TC(S3 Texture Compression) via libtxc_dxtn available + to OpenGL drivers instead of the patent-free S2TC replacement. + + Using this library may require a patent license depending on your location. + ''; + }; + + package = mkOption { + type = types.package; + internal = true; + description = '' + The package that provides the OpenGL implementation. + ''; + }; + + package32 = mkOption { + type = types.package; + internal = true; + description = '' + The package that provides the 32-bit OpenGL implementation on + 64-bit systems. Used when is + set. + ''; + }; + + extraPackages = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; + description = '' + Additional packages to add to OpenGL drivers. This can be used + to add OpenCL drivers, VA-API/VDPAU drivers etc. + ''; + }; + + extraPackages32 = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; + description = '' + Additional packages to add to 32-bit OpenGL drivers on + 64-bit systems. Used when is + set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. + ''; + }; }; }; diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix index 022fdea0a0a3ed362a2731a6dcfd25ecf76145cb..2fa37af6ca58836d8c82fb0223f8af066dedda67 100644 --- a/nixos/modules/hardware/video/ati.nix +++ b/nixos/modules/hardware/video/ati.nix @@ -1,6 +1,6 @@ # This module provides the proprietary ATI X11 / OpenGL drivers. -{ config, lib, pkgs, pkgs_i686, ... }: +{ config, lib, pkgs_i686, ... }: with lib; diff --git a/nixos/modules/hardware/video/capture/mwprocapture.nix b/nixos/modules/hardware/video/capture/mwprocapture.nix index aee15dcec6e56ed41428e17ec11609a98becdabf..61bab533edaf7b343b193e13a4c77787d20f92d5 100644 --- a/nixos/modules/hardware/video/capture/mwprocapture.nix +++ b/nixos/modules/hardware/video/capture/mwprocapture.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index a1f1cef07adae7f482724e216cd5a81afaf82de5..eb1952280331f6553cc21f016e9376b64b33de2c 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -25,13 +25,6 @@ let nvidia_x11 = nvidiaForKernel config.boot.kernelPackages; nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }; - nvidiaPackage = nvidia: pkgs: - if !nvidia.useGLVND then nvidia.out - else pkgs.buildEnv { - name = "nvidia-libs"; - paths = [ pkgs.libglvnd nvidia.out ]; - }; - enabled = nvidia_x11 != null; in @@ -57,8 +50,8 @@ in source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc"; }; - hardware.opengl.package = nvidiaPackage nvidia_x11 pkgs; - hardware.opengl.package32 = nvidiaPackage nvidia_libs32 pkgs_i686; + hardware.opengl.package = nvidia_x11.out; + hardware.opengl.package32 = nvidia_libs32.out; environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ]; diff --git a/nixos/modules/hardware/video/uvcvideo/default.nix b/nixos/modules/hardware/video/uvcvideo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7e3e94fdf2bd6511ccb53582605c0df5c3b10cca --- /dev/null +++ b/nixos/modules/hardware/video/uvcvideo/default.nix @@ -0,0 +1,64 @@ + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.uvcvideo; + + uvcdynctrl-udev-rules = packages: pkgs.callPackage ./uvcdynctrl-udev-rules.nix { + drivers = packages; + udevDebug = false; + }; + +in + +{ + + options = { + services.uvcvideo.dynctrl = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable uvcvideo dynamic controls. + + Note that enabling this brings the uvcdynctrl tool + into your environement and register all dynamic controls from + specified packages to the uvcvideo driver. + ''; + }; + + packages = mkOption { + type = types.listOf types.path; + example = literalExample "[ pkgs.tiscamera ]"; + description = '' + List of packages containing uvcvideo dynamic controls + rules. All files found in + pkg/share/uvcdynctrl/data + will be included. + + Note that these will serve as input to the libwebcam + package which through its own udev rule will register + the dynamic controls from specified packages to the uvcvideo + driver. + ''; + apply = map getBin; + }; + }; + }; + + config = mkIf cfg.dynctrl.enable { + + services.udev.packages = [ + (uvcdynctrl-udev-rules cfg.dynctrl.packages) + ]; + + environment.systemPackages = [ + pkgs.libwebcam + ]; + + }; +} diff --git a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix new file mode 100644 index 0000000000000000000000000000000000000000..2cf5f13bc159e6259d9c6cdefecf3b5834c91420 --- /dev/null +++ b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix @@ -0,0 +1,44 @@ +{ buildEnv +, libwebcam +, makeWrapper +, runCommand +, drivers ? [] +, udevDebug ? false +}: + +let + version = "0.0.0"; + + dataPath = buildEnv { + name = "uvcdynctrl-with-drivers-data-path"; + paths = drivers ++ [ libwebcam ]; + pathsToLink = [ "/share/uvcdynctrl/data" ]; + ignoreCollisions = false; + }; + + dataDir = "${dataPath}/share/uvcdynctrl/data"; + udevDebugVarValue = if udevDebug then "1" else "0"; +in + +runCommand "uvcdynctrl-udev-rules-${version}" +{ + inherit dataPath; + buildInputs = [ + makeWrapper + libwebcam + ]; + dontPatchELF = true; + dontStrip = true; +} +'' + mkdir -p "$out/lib/udev" + makeWrapper "${libwebcam}/lib/udev/uvcdynctrl" "$out/lib/udev/uvcdynctrl" \ + --set NIX_UVCDYNCTRL_DATA_DIR "${dataDir}" \ + --set NIX_UVCDYNCTRL_UDEV_DEBUG "${udevDebugVarValue}" + + mkdir -p "$out/lib/udev/rules.d" + cat "${libwebcam}/lib/udev/rules.d/80-uvcdynctrl.rules" | \ + sed -r "s#RUN\+\=\"([^\"]+)\"#RUN\+\=\"$out/lib/udev/uvcdynctrl\"#g" > \ + "$out/lib/udev/rules.d/80-uvcdynctrl.rules" +'' + diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix index 7ed4a584d646950a451d98471bf115cb7e7a1466..9548a249efa0a28ebdb3d52397f1eac689703710 100644 --- a/nixos/modules/i18n/input-method/default.nix +++ b/nixos/modules/i18n/input-method/default.nix @@ -50,7 +50,7 @@ in package = mkOption { internal = true; - type = types.path; + type = types.nullOr types.path; default = null; description = '' The input method method package. diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index 45d6daf068b34133ef2fc40fc554c7c73d17f90b..eb75b7415c9c4e943bb6f64b7f41c8c3251d7078 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -6,56 +6,56 @@ Input Methods -Input methods are an operating system component that allows any data, such - as keyboard strokes or mouse movements, to be received as input. In this way - users can enter characters and symbols not found on their input devices. Using - an input method is obligatory for any language that has more graphemes than +Input methods are an operating system component that allows any data, such + as keyboard strokes or mouse movements, to be received as input. In this way + users can enter characters and symbols not found on their input devices. Using + an input method is obligatory for any language that has more graphemes than there are keys on the keyboard. The following input methods are available in NixOS: IBus: The intelligent input bus. - Fcitx: A customizable lightweight input + Fcitx: A customizable lightweight input method. Nabi: A Korean input method based on XIM. - Uim: The universal input method, is a library with a XIM + Uim: The universal input method, is a library with a XIM bridge.
IBus -IBus is an Intelligent Input Bus. It provides full featured and user +IBus is an Intelligent Input Bus. It provides full featured and user friendly input method user interface. The following snippet can be used to configure IBus: i18n.inputMethod = { - enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; + enabled = "ibus"; + ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; }; -i18n.inputMethod.ibus.engines is optional and can be +i18n.inputMethod.ibus.engines is optional and can be used to add extra IBus engines. Available extra IBus engines are: - Anthy (ibus-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to Kana Kanji + Anthy (ibus-engines.anthy): Anthy is a + system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text. - Hangul (ibus-engines.hangul): Korean input + Hangul (ibus-engines.hangul): Korean input method. - m17n (ibus-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the m17n + m17n (ibus-engines.m17n): m17n is an input + method that uses input methods and corresponding icons in the m17n database. - mozc (ibus-engines.mozc): A Japanese input + mozc (ibus-engines.mozc): A Japanese input method from Google. - Table (ibus-engines.table): An input method + Table (ibus-engines.table): An input method that load tables of input methods. - table-others (ibus-engines.table-others): + table-others (ibus-engines.table-others): Various table-based input methods. To use this, and any other table-based input methods, it must appear in the list of engines along with table. For example: @@ -68,75 +68,87 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ]; To use any input method, the package must be added in the configuration, as shown above, and also (after running nixos-rebuild) the input method must be added from IBus' preference dialog. + + + Troubleshooting + If IBus works in some applications but not others, a likely cause of + this is that IBus is depending on a different version of + glib to what the applications are depending on. This can + be checked by running nix-store -q --requisites <path> | grep + glib, where <path> is the path of either + IBus or an application in the Nix store. The glib + packages must match exactly. If they do not, uninstalling and reinstalling + the application is a likely fix. +
Fcitx -Fcitx is an input method framework with extension support. It has three - built-in Input Method Engine, Pinyin, QuWei and Table-based input +Fcitx is an input method framework with extension support. It has three + built-in Input Method Engine, Pinyin, QuWei and Table-based input methods. The following snippet can be used to configure Fcitx: i18n.inputMethod = { - enabled = "fcitx"; - fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; + enabled = "fcitx"; + fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; }; -i18n.inputMethod.fcitx.engines is optional and can be +i18n.inputMethod.fcitx.engines is optional and can be used to add extra Fcitx engines. Available extra Fcitx engines are: - Anthy (fcitx-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to Kana Kanji + Anthy (fcitx-engines.anthy): Anthy is a + system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text. - Chewing (fcitx-engines.chewing): Chewing is - an intelligent Zhuyin input method. It is one of the most popular input + Chewing (fcitx-engines.chewing): Chewing is + an intelligent Zhuyin input method. It is one of the most popular input methods among Traditional Chinese Unix users. - Hangul (fcitx-engines.hangul): Korean input + Hangul (fcitx-engines.hangul): Korean input method. - Unikey (fcitx-engines.unikey): Vietnamese input + Unikey (fcitx-engines.unikey): Vietnamese input method. - m17n (fcitx-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the m17n + m17n (fcitx-engines.m17n): m17n is an input + method that uses input methods and corresponding icons in the m17n database. - mozc (fcitx-engines.mozc): A Japanese input + mozc (fcitx-engines.mozc): A Japanese input method from Google. - table-others (fcitx-engines.table-others): + table-others (fcitx-engines.table-others): Various table-based input methods.
Nabi -Nabi is an easy to use Korean X input method. It allows you to enter - phonetic Korean characters (hangul) and pictographic Korean characters +Nabi is an easy to use Korean X input method. It allows you to enter + phonetic Korean characters (hangul) and pictographic Korean characters (hanja). The following snippet can be used to configure Nabi: i18n.inputMethod = { - enabled = "nabi"; + enabled = "nabi"; };
Uim -Uim (short for "universal input method") is a multilingual input method +Uim (short for "universal input method") is a multilingual input method framework. Applications can use it through so-called bridges. The following snippet can be used to configure uim: i18n.inputMethod = { - enabled = "uim"; + enabled = "uim"; }; -Note: The i18n.inputMethod.uim.toolbar option can be +Note: The option can be used to choose uim toolbar.
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index 4a1983167957d34cb6b011527d5005962256cca6..01cfe8a02e10d248083fd135e32bfd33c8e7e222 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -21,7 +21,9 @@ let if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs fi + echo -n ${config.system.nixos.revision} > $out/nixos/.git-revision echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix + echo ${config.system.nixos.versionSuffix} | sed -e s/pre// > $out/nixos/svn-revision ''; in diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 756c8751d00e5ddc829e4ab6b24b60a2af72221d..1453e8082b0ddc526abc466512abd381f4e45508 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -29,6 +29,5 @@ with lib; # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; - # Allow the user to log in as root without a password. - users.extraUsers.root.initialHashedPassword = ""; + system.stateVersion = mkDefault "18.03"; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix index a4bcd7079a4f91ae5a3aebc13313e9deea4caaf7..3336d512cfd86e58c2be5685af09f551cff1bd8a 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = [ ./installation-cd-graphical-kde.nix ]; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix index 4363c8e6c93b149dca47a8fdbeeefebe8c18a375..3911a2b01b1e4c84d02162bc51dd305f5d1e1911 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = [ ./installation-cd-minimal.nix ]; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index 7ec55f159d0e63ccf5019eb6ce8daf06e26c18b3..3dc0f606bf6090b7278a53485ec0eb7f98429d7c 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -1,7 +1,7 @@ # This module defines a small NixOS installation CD. It does not # contain any graphical stuff. -{ config, lib, pkgs, ... }: +{ ... }: { imports = diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index e7cbf415a22335770594a0abe2ab7e4cd98dddb9..74fce0d1721d48ce9d06e7a47fc9bb8fe4d433cf 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -7,6 +7,63 @@ with lib; let + /** + * Given a list of `options`, concats the result of mapping each options + * to a menuentry for use in grub. + * + * * defaults: {name, image, params, initrd} + * * options: [ option... ] + * * option: {name, params, class} + */ + menuBuilderGrub2 = + defaults: options: lib.concatStrings + ( + map + (option: '' + menuentry '${defaults.name} ${ + # Name appended to menuentry defaults to params if no specific name given. + option.name or (if option ? params then "(${option.params})" else "") + }' ${if option ? class then " --class ${option.class}" else ""} { + linux ${defaults.image} ${defaults.params} ${ + option.params or "" + } + initrd ${defaults.initrd} + } + '') + options + ) + ; + + /** + * Given a `config`, builds the default options. + */ + buildMenuGrub2 = config: + buildMenuAdditionalParamsGrub2 config "" + ; + + /** + * Given a `config` and params to add to `params`, build a set of default options. + * Use this one when creating a variant (e.g. hidpi) + */ + buildMenuAdditionalParamsGrub2 = config: additional: + let + finalCfg = { + name = "NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}"; + params = "init=${config.system.build.toplevel}/init ${additional} ${toString config.boot.kernelParams}"; + image = "/boot/bzImage"; + initrd = "/boot/initrd"; + }; + in + menuBuilderGrub2 + finalCfg + [ + { class = "installer"; } + { class = "nomodeset"; params = "nomodeset"; } + { class = "copytoram"; params = "copytoram"; } + { class = "debug"; params = "debug"; } + ] + ; + # Timeout in syslinux is in units of 1/10 of a second. # 0 is used to disable timeouts. syslinuxTimeout = if config.boot.loader.timeout == null then @@ -36,6 +93,28 @@ let UI vesamenu.c32 MENU TITLE NixOS MENU BACKGROUND /isolinux/background.png + MENU RESOLUTION 800 600 + MENU CLEAR + MENU ROWS 6 + MENU CMDLINEROW -4 + MENU TIMEOUTROW -3 + MENU TABMSGROW -2 + MENU HELPMSGROW -1 + MENU HELPMSGENDROW -1 + MENU MARGIN 0 + + # FG:AARRGGBB BG:AARRGGBB shadow + MENU COLOR BORDER 30;44 #00000000 #00000000 none + MENU COLOR SCREEN 37;40 #FF000000 #00E2E8FF none + MENU COLOR TABMSG 31;40 #80000000 #00000000 none + MENU COLOR TIMEOUT 1;37;40 #FF000000 #00000000 none + MENU COLOR TIMEOUT_MSG 37;40 #FF000000 #00000000 none + MENU COLOR CMDMARK 1;36;40 #FF000000 #00000000 none + MENU COLOR CMDLINE 37;40 #FF000000 #00000000 none + MENU COLOR TITLE 1;36;44 #00000000 #00000000 none + MENU COLOR UNSEL 37;44 #FF000000 #00000000 none + MENU COLOR SEL 7;37;40 #FFFFFFFF #FF5277C3 std + DEFAULT boot LABEL boot @@ -59,7 +138,7 @@ let INITRD /boot/${config.system.boot.loader.initrdFile} # A variant to boot with verbose logging to the console - LABEL boot-nomodeset + LABEL boot-debug MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (debug) LINUX /boot/${config.system.boot.loader.kernelFile} APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7 @@ -73,51 +152,170 @@ let APPEND ${toString config.boot.loader.grub.memtest86.params} ''; - isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); + isolinuxCfg = concatStringsSep "\n" + ([ baseIsolinuxCfg ] ++ optional config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); + + # Setup instructions for rEFInd. + refind = + if targetArch == "x64" then + '' + # Adds rEFInd to the ISO. + cp -v ${pkgs.refind}/share/refind/refind_x64.efi $out/EFI/boot/ + '' + else + "# No refind for ia32" + ; + + grubMenuCfg = '' + # + # Menu configuration + # + + insmod gfxterm + insmod png + set gfxpayload=keep + + # Fonts can be loaded? + # (This font is assumed to always be provided as a fallback by NixOS) + if loadfont (hd0)/EFI/boot/unicode.pf2; then + # Use graphical term, it can be either with background image or a theme. + # input is "console", while output is "gfxterm". + # This enables "serial" input and output only when possible. + # Otherwise the failure mode is to not even enable gfxterm. + if test "\$with_serial" == "yes"; then + terminal_output gfxterm serial + terminal_input console serial + else + terminal_output gfxterm + terminal_input console + fi + else + # Sets colors for the non-graphical term. + set menu_color_normal=cyan/blue + set menu_color_highlight=white/blue + fi + + ${ # When there is a theme configured, use it, otherwise use the background image. + if (!isNull config.isoImage.grubTheme) then '' + # Sets theme. + set theme=(hd0)/EFI/boot/grub-theme/theme.txt + # Load theme fonts + $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (hd0)/EFI/boot/grub-theme/%P\n") + '' else '' + if background_image (hd0)/EFI/boot/efi-background.png; then + # Black background means transparent background when there + # is a background image set... This seems undocumented :( + set color_normal=black/black + set color_highlight=white/blue + else + # Falls back again to proper colors. + set menu_color_normal=cyan/blue + set menu_color_highlight=white/blue + fi + ''} + ''; # The EFI boot image. + # Notes about grub: + # * Yes, the grubMenuCfg has to be repeated in all submenus. Otherwise you + # will get white-on-black console-like text on sub-menus. *sigh* efiDir = pkgs.runCommand "efi-directory" {} '' - mkdir -p $out/EFI/boot - cp -v ${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${targetArch}.efi $out/EFI/boot/boot${targetArch}.efi - mkdir -p $out/loader/entries - - cat << EOF > $out/loader/entries/nixos-iso.conf - title NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} - linux /boot/${config.system.boot.loader.kernelFile} - initrd /boot/${config.system.boot.loader.initrdFile} - options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} - EOF - - # A variant to boot with 'nomodeset' - cat << EOF > $out/loader/entries/nixos-iso-nomodeset.conf - title NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} - version nomodeset - linux /boot/${config.system.boot.loader.kernelFile} - initrd /boot/${config.system.boot.loader.initrdFile} - options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset - EOF - - # A variant to boot with 'copytoram' - cat << EOF > $out/loader/entries/nixos-iso-copytoram.conf - title NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} - version copytoram - linux /boot/${config.system.boot.loader.kernelFile} - initrd /boot/${config.system.boot.loader.initrdFile} - options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram + mkdir -p $out/EFI/boot/ + + MODULES="fat iso9660 part_gpt part_msdos \ + normal boot linux configfile loopback chain halt \ + efifwsetup efi_gop efi_uga \ + ls search search_label search_fs_uuid search_fs_file \ + gfxmenu gfxterm gfxterm_background gfxterm_menu test all_video loadenv \ + exfat ext2 ntfs btrfs hfsplus udf \ + videoinfo png \ + echo serial \ + " + # Make our own efi program, we can't rely on "grub-install" since it seems to + # probe for devices, even with --skip-fs-probe. + ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/bootx64.efi -p /EFI/boot -O x86_64-efi \ + $MODULES + cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ + + cat < $out/EFI/boot/grub.cfg + + # If you want to use serial for "terminal_*" commands, you need to set one up: + # Example manual configuration: + # → serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1 + # This uses the defaults, and makes the serial terminal available. + set with_serial=no + if serial; then set with_serial=yes ;fi + export with_serial + clear + set timeout=10 + ${grubMenuCfg} + + # + # Menu entries + # + + ${buildMenuGrub2 config} + submenu "HiDPI, Quirks and Accessibility" --class hidpi --class submenu { + ${grubMenuCfg} + submenu "Suggests resolution @720p" --class hidpi-720p { + ${grubMenuCfg} + ${buildMenuAdditionalParamsGrub2 config "video=1280x720@60"} + } + submenu "Suggests resolution @1080p" --class hidpi-1080p { + ${grubMenuCfg} + ${buildMenuAdditionalParamsGrub2 config "video=1920x1080@60"} + } + + # Some laptop and convertibles have the panel installed in an + # inconvenient way, rotated away from the keyboard. + # Those entries makes it easier to use the installer. + submenu "" {return} + submenu "Rotate framebuffer Clockwise" --class rotate-90cw { + ${grubMenuCfg} + ${buildMenuAdditionalParamsGrub2 config "fbcon=rotate:1"} + } + submenu "Rotate framebuffer Upside-Down" --class rotate-180 { + ${grubMenuCfg} + ${buildMenuAdditionalParamsGrub2 config "fbcon=rotate:2"} + } + submenu "Rotate framebuffer Counter-Clockwise" --class rotate-90ccw { + ${grubMenuCfg} + ${buildMenuAdditionalParamsGrub2 config "fbcon=rotate:3"} + } + + # As a proof of concept, mainly. (Not sure it has accessibility merits.) + submenu "" {return} + submenu "Use black on white" --class accessibility-blakconwhite { + ${grubMenuCfg} + ${buildMenuAdditionalParamsGrub2 config "vt.default_red=0xFF,0xBC,0x4F,0xB4,0x56,0xBC,0x4F,0x00,0xA1,0xCF,0x84,0xCA,0x8D,0xB4,0x84,0x68 vt.default_grn=0xFF,0x55,0xBA,0xBA,0x4D,0x4D,0xB3,0x00,0xA0,0x8F,0xB3,0xCA,0x88,0x93,0xA4,0x68 vt.default_blu=0xFF,0x58,0x5F,0x58,0xC5,0xBD,0xC5,0x00,0xA8,0xBB,0xAB,0x97,0xBD,0xC7,0xC5,0x68"} + } + + # Serial access is a must! + submenu "" {return} + submenu "Serial console=ttyS0,115200n8" --class serial { + ${grubMenuCfg} + ${buildMenuAdditionalParamsGrub2 config "console=ttyS0,115200n8"} + } + } + + menuentry 'rEFInd' --class refind { + # UUID is hard-coded in the derivation. + search --set=root --no-floppy --fs-uuid 1234-5678 + chainloader (\$root)/EFI/boot/refind_x64.efi + } + menuentry 'Firmware Setup' --class settings { + fwsetup + clear + echo "" + echo "If you see this message, your EFI system doesn't support this feature." + echo "" + } + menuentry 'Shutdown' --class shutdown { + halt + } EOF - # A variant to boot with verbose logging to the console - cat << EOF > $out/loader/entries/nixos-iso-debug.conf - title NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (debug) - linux /boot/${config.system.boot.loader.kernelFile} - initrd /boot/${config.system.boot.loader.initrdFile} - options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7 - EOF - - cat << EOF > $out/loader/loader.conf - default nixos-iso - timeout ${builtins.toString config.boot.loader.timeout} - EOF + ${refind} ''; efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools pkgs.libfaketime ]; } @@ -233,13 +431,31 @@ in ''; }; + isoImage.efiSplashImage = mkOption { + default = pkgs.fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/a9e05d7deb38a8e005a2b52575a3f59a63a4dba0/bootloader/efi-background.png; + sha256 = "18lfwmp8yq923322nlb9gxrh5qikj1wsk6g5qvdh31c4h5b1538x"; + }; + description = '' + The splash image to use in the EFI bootloader. + ''; + }; + isoImage.splashImage = mkOption { default = pkgs.fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/5729ab16c6a5793c10a2913b5a1b3f59b91c36ee/ideas/grub-splash/grub-nixos-1.png; - sha256 = "43fd8ad5decf6c23c87e9026170a13588c2eba249d9013cb9f888da5e2002217"; + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/a9e05d7deb38a8e005a2b52575a3f59a63a4dba0/bootloader/isolinux/bios-boot.png; + sha256 = "1wp822zrhbg4fgfbwkr7cbkr4labx477209agzc0hr6k62fr6rxd"; }; description = '' - The splash image to use in the bootloader. + The splash image to use in the legacy-boot bootloader. + ''; + }; + + isoImage.grubTheme = mkOption { + default = pkgs.nixos-grub2-theme; + type = types.nullOr (types.either types.path types.package); + description = '' + The grub2 theme used for UEFI boot. ''; }; @@ -317,7 +533,7 @@ in options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ]; }; - boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" "uas" ]; + boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" ]; boot.blacklistedKernelModules = [ "nouveau" ]; @@ -357,6 +573,9 @@ in { source = "${pkgs.syslinux}/share/syslinux"; target = "/isolinux"; } + { source = config.isoImage.efiSplashImage; + target = "/EFI/boot/efi-background.png"; + } { source = config.isoImage.splashImage; target = "/isolinux/background.png"; } @@ -370,13 +589,14 @@ in { source = "${efiDir}/EFI"; target = "/EFI"; } - { source = "${efiDir}/loader"; - target = "/loader"; - } ] ++ optionals config.boot.loader.grub.memtest86.enable [ { source = "${pkgs.memtest86plus}/memtest.bin"; target = "/boot/memtest.bin"; } + ] ++ optionals (!isNull config.isoImage.grubTheme) [ + { source = config.isoImage.grubTheme; + target = "/EFI/boot/grub-theme"; + } ]; boot.loader.timeout = 10; diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index ddf91a5656c7cfc34552212931a4fef688f24df8..bd6cf029967cbc69583b427dd390dc4038e25815 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -33,9 +33,6 @@ in # Also increase the amount of CMA to ensure the virtual console on the RPi3 works. boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; - # FIXME: this probably should be in installation-device.nix - users.extraUsers.root.initialHashedPassword = ""; - sdImage = { populateBootCommands = let configTxt = pkgs.writeText "config.txt" '' diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 891923234dda9144bc21f3c0cb5d486f75b1761f..0c89eb533359b85c368f04aa102dbb62a46b1ce3 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -34,9 +34,6 @@ in # - ttySAC2: for Exynos (ODROID-XU3) boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"]; - # FIXME: this probably should be in installation-device.nix - users.extraUsers.root.initialHashedPassword = ""; - sdImage = { populateBootCommands = let configTxt = pkgs.writeText "config.txt" '' diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 212013b5e289621c73d7417383ff405c68b2d389..78ea3f1a205c86b37854c48f1f83c68dd80643b6 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -27,15 +27,25 @@ in boot.consoleLogLevel = lib.mkDefault 7; boot.kernelPackages = pkgs.linuxPackages_rpi; - # FIXME: this probably should be in installation-device.nix - users.extraUsers.root.initialHashedPassword = ""; - sdImage = { - populateBootCommands = '' - (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/) - cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi.bin - echo 'kernel u-boot-rpi.bin' > boot/config.txt - ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot - ''; + populateBootCommands = let + configTxt = pkgs.writeText "config.txt" '' + # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel + # when attempting to show low-voltage or overtemperature warnings. + avoid_warnings=1 + + [pi0] + kernel=u-boot-rpi0.bin + + [pi1] + kernel=u-boot-rpi1.bin + ''; + in '' + (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/) + cp ${pkgs.ubootRaspberryPiZero}/u-boot.bin boot/u-boot-rpi0.bin + cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi1.bin + cp ${configTxt} boot/config.txt + ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot + ''; }; } diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index c091923de60f7daf6741214aa6a19b1fc0088469..2371be9d89a1e8688f00fc697fdc8a9d15e1d032 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -12,11 +12,12 @@ with lib; let - rootfsImage = import ../../../lib/make-ext4-fs.nix { - inherit pkgs; + rootfsImage = pkgs.callPackage ../../../lib/make-ext4-fs.nix ({ inherit (config.sdImage) storePaths; volumeLabel = "NIXOS_SD"; - }; + } // optionalAttrs (config.sdImage.rootPartitionUUID != null) { + uuid = config.sdImage.rootPartitionUUID; + }); in { options.sdImage = { @@ -42,6 +43,24 @@ in ''; }; + bootPartitionID = mkOption { + type = types.string; + default = "0x2178694e"; + description = '' + Volume ID for the /boot partition on the SD card. This value must be a + 32-bit hexadecimal number. + ''; + }; + + rootPartitionUUID = mkOption { + type = types.nullOr types.string; + default = null; + example = "14e19a7b-0ae0-484d-9d54-43bd6fdc20c7"; + description = '' + UUID for the main NixOS partition on the SD card. + ''; + }; + bootSize = mkOption { type = types.int; default = 120; @@ -74,10 +93,10 @@ in sdImage.storePaths = [ config.system.build.toplevel ]; - system.build.sdImage = pkgs.stdenv.mkDerivation { + system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux }: stdenv.mkDerivation { name = config.sdImage.imageName; - buildInputs = with pkgs; [ dosfstools e2fsprogs mtools libfaketime utillinux ]; + nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux ]; buildCommand = '' mkdir -p $out/nix-support $out/sd-image @@ -95,7 +114,7 @@ in # type=b is 'W95 FAT32', type=83 is 'Linux'. sfdisk $img <&2 || true diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 0e0744a52e42fc37c47b1770ee7781447ba9156c..bb201d97ded1edb6995d9ca94a1dd4ff17762f56 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -536,6 +536,13 @@ if ($showHardwareConfig) { # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; +EOF + } elsif (-e "/boot/extlinux") { + $bootLoaderConfig = <&1) - if test $? -eq 0; then + exit_code=$? + set -e + + if test $exit_code -eq 0; then cat <environment.systemPackages into the generated system path. + + See "Multiple-output packages" chapter in the nixpkgs manual for more info. ''; + # which is at ../../../doc/multiple-output.xml }; man.enable = mkOption { @@ -28,6 +31,15 @@ let cfg = config.documentation; in ''; }; + info.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install info pages and the info command. + This also includes "info" outputs. + ''; + }; + doc.enable = mkOption { type = types.bool; default = true; @@ -38,12 +50,19 @@ let cfg = config.documentation; in ''; }; - info.enable = mkOption { + dev.enable = mkOption { type = types.bool; - default = true; + default = false; description = '' - Whether to install info pages and the info command. - This also includes "info" outputs. + Whether to install documentation targeted at developers. + + This includes man pages targeted at developers if is + set (this also includes "devman" outputs). + This includes info pages targeted at developers if + is set (this also includes "devinfo" outputs). + This includes other pages targeted at developers if + is set (this also includes "devdoc" outputs). + ''; }; @@ -56,20 +75,20 @@ let cfg = config.documentation; in (mkIf cfg.man.enable { environment.systemPackages = [ pkgs.man-db ]; environment.pathsToLink = [ "/share/man" ]; - environment.extraOutputsToInstall = [ "man" ]; + environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; + }) + + (mkIf cfg.info.enable { + environment.systemPackages = [ pkgs.texinfoInteractive ]; + environment.pathsToLink = [ "/share/info" ]; + environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable "devinfo"; }) (mkIf cfg.doc.enable { # TODO(@oxij): put it here and remove from profiles? # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox? environment.pathsToLink = [ "/share/doc" ]; - environment.extraOutputsToInstall = [ "doc" ]; - }) - - (mkIf cfg.info.enable { - environment.systemPackages = [ pkgs.texinfoInteractive ]; - environment.pathsToLink = [ "/share/info" ]; - environment.extraOutputsToInstall = [ "info" ]; + environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc"; }) ]); diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix index f4ee94ecc0d7e427208b49e2abb4f83416e65b51..8716e3d9fef22d62969bf60199d2f33e1c1c33d9 100644 --- a/nixos/modules/misc/extra-arguments.nix +++ b/nixos/modules/misc/extra-arguments.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ pkgs, ... }: { _module.args = { diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c5dee2ca97aff198199a9f999b69cf62a57d2a45..0928e368d80ffa1eb0086523c0d045730018ff11 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -1,7 +1,15 @@ # This module defines the global list of uids and gids. We keep a # central list to prevent id collisions. -{ config, pkgs, lib, ... }: +# IMPORTANT! +# We only add static uids and gids for services where it is not feasible +# to change uids/gids on service start, in example a service with a lot of +# files. Please also check if the service is applicable for systemd's +# DynamicUser option and does not need a uid/gid allocation at all. +# Systemd can also change ownership of service directories using the +# RuntimeDirectory/StateDirectory options. + +{ lib, ... }: { options = { @@ -56,7 +64,7 @@ #dialout = 27; # unused polkituser = 28; #utmp = 29; # unused - ddclient = 30; + # ddclient = 30; # converted to DynamicUser = true davfs2 = 31; #disnix = 33; # unused osgi = 34; @@ -135,10 +143,10 @@ jenkins = 109; systemd-journal-gateway = 110; #notbit = 111; # unused + aerospike = 111; ngircd = 112; btsync = 113; minecraft = 114; - #monetdb = 115; # unused (not packaged), removed 2016-09-19 vault = 115; rippled = 116; murmur = 117; @@ -191,7 +199,7 @@ cadvisor = 167; nylon = 168; apache-kafka = 169; - panamax = 170; + #panamax = 170; # unused exim = 172; #fleet = 173; # unused #input = 174; # unused @@ -305,6 +313,21 @@ hass = 286; monero = 287; ceph = 288; + duplicati = 289; + monetdb = 290; + restic = 291; + openvpn = 292; + meguca = 293; + yarn = 294; + hdfs = 295; + mapred = 296; + hadoop = 297; + hydron = 298; + cfssl = 299; + cassandra = 300; + qemu-libvirtd = 301; + # kvm = 302; # unused + # render = 303; # unused # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -343,7 +366,7 @@ dialout = 27; #polkituser = 28; # currently unused, polkitd doesn't need a group utmp = 29; - ddclient = 30; + # ddclient = 30; # converted to DynamicUser = true davfs2 = 31; disnix = 33; osgi = 34; @@ -420,10 +443,10 @@ jenkins = 109; systemd-journal-gateway = 110; #notbit = 111; # unused + aerospike = 111; #ngircd = 112; # unused btsync = 113; #minecraft = 114; # unused - #monetdb = 115; # unused (not packaged), removed 2016-09-19 vault = 115; #ripped = 116; # unused #murmur = 117; # unused @@ -473,9 +496,9 @@ #chronos = 164; # unused gitlab = 165; nylon = 168; - panamax = 170; + #panamax = 170; # unused exim = 172; - fleet = 173; + #fleet = 173; # unused input = 174; sddm = 175; tss = 176; @@ -578,6 +601,21 @@ hass = 286; monero = 287; ceph = 288; + duplicati = 289; + monetdb = 290; + restic = 291; + openvpn = 292; + meguca = 293; + yarn = 294; + hdfs = 295; + mapred = 296; + hadoop = 297; + hydron = 298; + cfssl = 299; + cassandra = 300; + qemu-libvirtd = 301; + kvm = 302; # default udev rules from systemd requires these + render = 303; # default udev rules from systemd requires these # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/misc/label.nix b/nixos/modules/misc/label.nix index 8e5e57b3b83b71b6cb0cc707809c833f6f984571..02b91555b3c218f52d6919871d72a032c117da29 100644 --- a/nixos/modules/misc/label.nix +++ b/nixos/modules/misc/label.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/misc/lib.nix b/nixos/modules/misc/lib.nix index be8000ac029dfe03961f98a97d5626f77fc9ff70..121f396701eae5395ad0bdf01778b7ddc07d7f3d 100644 --- a/nixos/modules/misc/lib.nix +++ b/nixos/modules/misc/lib.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: { options = { diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 51953d1110c438d027a908897c42fc1c2786ceaa..449149e4bb65fca6cc3ba1a0fb61c606f4be6717 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -97,11 +97,11 @@ in { Whether not to index bind mounts ''; }; - + }; config = mkIf cfg.enable { - users.extraGroups = mkIf isMLocate { mlocate = {}; }; + users.groups = mkIf isMLocate { mlocate = {}; }; security.wrappers = mkIf isMLocate { locate = { @@ -133,13 +133,26 @@ in { systemd.services.update-locatedb = { description = "Update Locate Database"; path = mkIf (!isMLocate) [ pkgs.su ]; + + # mlocate's updatedb takes flags via a configuration file or + # on the command line, but not by environment variable. script = + if isMLocate + then let toFlags = x: optional (cfg.${x} != []) + "--${lib.toLower x} '${concatStringsSep " " cfg.${x}}'"; + args = concatLists (map toFlags ["pruneFS" "pruneNames" "prunePaths"]); + in '' + exec ${cfg.locate}/bin/updatedb \ + --output ${toString cfg.output} ${concatStringsSep " " args} \ + --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \ + ${concatStringsSep " " cfg.extraFlags} '' + else '' exec ${cfg.locate}/bin/updatedb \ ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; - environment = { + environment = optionalAttrs (!isMLocate) { PRUNEFS = concatStringsSep " " cfg.pruneFS; PRUNEPATHS = concatStringsSep " " cfg.prunePaths; PRUNENAMES = concatStringsSep " " cfg.pruneNames; diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix index 7a1e751394c0ae3d42d7871c6aa9ab487bc788ef..be3f4cbbcfe4e8ae5758c77c4a3cad79a3af10c1 100644 --- a/nixos/modules/misc/meta.nix +++ b/nixos/modules/misc/meta.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 9217250eec29090f3d83655f02cdd3a854525ad8..8fbe218b232af3f57eb87c2b5abaf9aa024fc668 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -33,7 +33,11 @@ let configType = mkOptionType { name = "nixpkgs-config"; description = "nixpkgs config"; - check = traceValIfNot isConfig; + check = x: + let traceXIfNot = c: + if c x then true + else lib.traceSeqN 1 x false; + in traceXIfNot isConfig; merge = args: fold (def: mergeConfig def.value) {}; }; @@ -58,10 +62,13 @@ in pkgs = mkOption { defaultText = literalExample ''import "''${nixos}/.." { - inherit (config.nixpkgs) config overlays system; + inherit (config.nixpkgs) config overlays localSystem crossSystem; } ''; - default = import ../../.. { inherit (cfg) config overlays system crossSystem; }; + default = import ../../.. { + localSystem = { inherit (cfg) system; } // cfg.localSystem; + inherit (cfg) config overlays crossSystem; + }; type = pkgsType; example = literalExample ''import {}''; description = '' @@ -73,8 +80,9 @@ in relative to the location of this NixOS module, because NixOS and Nixpkgs are distributed together for consistency, so the nixos in the default value is in fact a - relative path. The config, overlays - and system come from this option's siblings. + relative path. The config, overlays, + localSystem, and crossSystem come + from this option's siblings. This option can be used by applications like NixOps to increase the performance of evaluation, or to create packages that depend @@ -130,13 +138,40 @@ in ''; }; + localSystem = mkOption { + type = types.attrs; # TODO utilize lib.systems.parsedPlatform + default = { system = builtins.currentSystem; }; + example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + defaultText = literalExample + ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; + description = '' + Specifies the platform on which NixOS should be built. When + nixpkgs.crossSystem is unset, it also specifies + the platform for which NixOS should be + built. If this option is unset, it defaults to the platform + type of the machine where evaluation happens. Specifying this + option is useful when doing distributed multi-platform + deployment, or when building virtual machines. See its + description in the Nixpkgs manual for more details. + + Ignored when nixpkgs.pkgs is set. + ''; + }; + crossSystem = mkOption { - type = types.nullOr types.attrs; + type = types.nullOr types.attrs; # TODO utilize lib.systems.parsedPlatform default = null; + example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + defaultText = literalExample + ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; description = '' - The description of the system we're cross-compiling to, or null - if this isn't a cross-compile. See the description of the - crossSystem argument in the nixpkgs manual. + Specifies the platform for which NixOS should be + built. Specify this only if it is different from + nixpkgs.localSystem, the platform + on which NixOS should be built. In other + words, specify this to cross-compile NixOS. Otherwise it + should be set as null, the default. See its description in the + Nixpkgs manual for more details. Ignored when nixpkgs.pkgs is set. ''; @@ -146,10 +181,20 @@ in type = types.str; example = "i686-linux"; description = '' - Specifies the Nix platform type for which NixOS should be built. - If unset, it defaults to the platform type of your host system. - Specifying this option is useful when doing distributed - multi-platform deployment, or when building virtual machines. + Specifies the Nix platform type on which NixOS should be built. + It is better to specify nixpkgs.localSystem instead. + + { + nixpkgs.system = ..; + } + + is the same as + + { + nixpkgs.localSystem.system = ..; + } + + See nixpkgs.localSystem for more information. Ignored when nixpkgs.pkgs is set. ''; diff --git a/nixos/modules/misc/passthru.nix b/nixos/modules/misc/passthru.nix index f3c9f6ba651bf3c510a067285b64c98160415a26..4e99631fdd85c5cff07ba8413194b4c8bc39d0bc 100644 --- a/nixos/modules/misc/passthru.nix +++ b/nixos/modules/misc/passthru.nix @@ -1,7 +1,7 @@ # This module allows you to export something from configuration # Use case: export kernel source expression for ease of configuring -{ config, lib, ... }: +{ lib, ... }: { options = { diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 7519d9176982be709fbb36ed4d75bf7571f3ca9e..63717e0c6a8107debd672791d979d9d350d1bf69 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -1,12 +1,10 @@ -{ config, lib, pkgs, ... }: +{ options, config, lib, pkgs, ... }: with lib; let cfg = config.system.nixos; - releaseFile = "${toString pkgs.path}/.version"; - suffixFile = "${toString pkgs.path}/.version-suffix"; revisionFile = "${toString pkgs.path}/.git-revision"; gitRepo = "${toString pkgs.path}/.git"; gitCommitId = lib.substring 0 7 (commitIdFromGitRepo gitRepo); @@ -16,21 +14,6 @@ in options.system = { - # XXX: Reintroduce old options to make nixops before 1.6 able to evaluate configurations - # XXX: Remove after nixops has been bumped to a compatible version - nixosVersion = mkOption { - readOnly = true; - internal = true; - type = types.str; - default = config.system.nixos.version; - }; - nixosVersionSuffix = mkOption { - readOnly = true; - internal = true; - type = types.str; - default = config.system.nixos.versionSuffix; - }; - nixos.version = mkOption { internal = true; type = types.str; @@ -40,14 +23,14 @@ in nixos.release = mkOption { readOnly = true; type = types.str; - default = fileContents releaseFile; + default = trivial.release; description = "The NixOS release (e.g. 16.03)."; }; nixos.versionSuffix = mkOption { internal = true; type = types.str; - default = if pathExists suffixFile then fileContents suffixFile else "pre-git"; + default = trivial.versionSuffix; description = "The NixOS version suffix (e.g. 1160.f2d4ee1)."; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3a8b1014553c18dd95cc974bcb8e2916139064eb..12944857af4eac1d5d16ee300a2e2c4b68319af3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -9,6 +9,7 @@ ./config/fonts/ghostscript.nix ./config/gnu.nix ./config/i18n.nix + ./config/iproute2.nix ./config/krb5/default.nix ./config/ldap.nix ./config/networking.nix @@ -28,6 +29,7 @@ ./config/vpnc.nix ./config/zram.nix ./hardware/all-firmware.nix + ./hardware/brightnessctl.nix ./hardware/ckb.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix @@ -41,6 +43,7 @@ ./hardware/pcmcia.nix ./hardware/raid/hpsa.nix ./hardware/usb-wwan.nix + ./hardware/onlykey.nix ./hardware/video/amdgpu.nix ./hardware/video/amdgpu-pro.nix ./hardware/video/ati.nix @@ -48,6 +51,7 @@ ./hardware/video/bumblebee.nix ./hardware/video/displaylink.nix ./hardware/video/nvidia.nix + ./hardware/video/uvcvideo/default.nix ./hardware/video/webcam/facetimehd.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix @@ -82,10 +86,12 @@ ./programs/dconf.nix ./programs/digitalbitbox/default.nix ./programs/environment.nix + ./programs/firejail.nix ./programs/fish.nix ./programs/freetds.nix ./programs/gnupg.nix ./programs/gphoto2.nix + ./programs/iftop.nix ./programs/java.nix ./programs/kbdlight.nix ./programs/less.nix @@ -99,6 +105,7 @@ ./programs/qt5ct.nix ./programs/rootston.nix ./programs/screen.nix + ./programs/sedutil.nix ./programs/slock.nix ./programs/shadow.nix ./programs/shell.nix @@ -118,10 +125,12 @@ ./programs/wireshark.nix ./programs/xfs_quota.nix ./programs/xonsh.nix + ./programs/xss-lock.nix ./programs/yabar.nix ./programs/zsh/oh-my-zsh.nix ./programs/zsh/zsh.nix ./programs/zsh/zsh-autoenv.nix + ./programs/zsh/zsh-autosuggestions.nix ./programs/zsh/zsh-syntax-highlighting.nix ./rename.nix ./security/acme.nix @@ -145,6 +154,7 @@ ./security/rtkit.nix ./security/wrappers/default.nix ./security/sudo.nix + ./services/admin/oxidized.nix ./services/admin/salt/master.nix ./services/admin/salt/minion.nix ./services/amqp/activemq/default.nix @@ -159,18 +169,20 @@ ./services/audio/ympd.nix ./services/backup/bacula.nix ./services/backup/borgbackup.nix + ./services/backup/duplicati.nix ./services/backup/crashplan.nix ./services/backup/crashplan-small-business.nix ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix + ./services/backup/restic.nix + ./services/backup/restic-rest-server.nix ./services/backup/rsnapshot.nix ./services/backup/tarsnap.nix ./services/backup/znapzend.nix - ./services/cluster/fleet.nix + ./services/cluster/hadoop/default.nix ./services/cluster/kubernetes/default.nix ./services/cluster/kubernetes/dns.nix ./services/cluster/kubernetes/dashboard.nix - ./services/cluster/panamax.nix ./services/computing/boinc/client.nix ./services/computing/torque/server.nix ./services/computing/torque/mom.nix @@ -188,12 +200,16 @@ ./services/continuous-integration/jenkins/slave.nix ./services/databases/4store-endpoint.nix ./services/databases/4store.nix + ./services/databases/aerospike.nix + ./services/databases/cassandra.nix ./services/databases/clickhouse.nix ./services/databases/couchdb.nix ./services/databases/firebird.nix + ./services/databases/foundationdb.nix ./services/databases/hbase.nix ./services/databases/influxdb.nix ./services/databases/memcached.nix + ./services/databases/monetdb.nix ./services/databases/mongodb.nix ./services/databases/mysql.nix ./services/databases/neo4j.nix @@ -207,8 +223,10 @@ ./services/databases/stanchion.nix ./services/databases/virtuoso.nix ./services/desktops/accountsservice.nix + ./services/desktops/bamf.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix + ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix ./services/desktops/pipewire.nix ./services/desktops/gnome3/at-spi2-core.nix @@ -229,7 +247,10 @@ ./services/desktops/gnome3/tracker-miners.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/telepathy.nix + ./services/desktops/zeitgeist.nix + ./services/development/bloop.nix ./services/development/hoogle.nix + ./services/development/jupyter/default.nix ./services/editors/emacs.nix ./services/editors/infinoted.nix ./services/games/factorio.nix @@ -245,6 +266,7 @@ ./services/hardware/illum.nix ./services/hardware/interception-tools.nix ./services/hardware/irqbalance.nix + ./services/hardware/lcd.nix ./services/hardware/nvidia-optimus.nix ./services/hardware/pcscd.nix ./services/hardware/pommed.nix @@ -260,6 +282,7 @@ ./services/hardware/upower.nix ./services/hardware/usbmuxd.nix ./services/hardware/thermald.nix + ./services/hardware/undervolt.nix ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix ./services/logging/fluentd.nix @@ -302,6 +325,7 @@ ./services/misc/canto-daemon.nix ./services/misc/calibre-server.nix ./services/misc/cfdyndns.nix + ./services/misc/clipmenu.nix ./services/misc/cpuminer-cryptonight.nix ./services/misc/cgminer.nix ./services/misc/confd.nix @@ -322,7 +346,7 @@ ./services/misc/geoip-updater.nix ./services/misc/gitea.nix #./services/misc/gitit.nix - #./services/misc/gitlab.nix + ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gitweb.nix ./services/misc/gogs.nix @@ -363,6 +387,7 @@ ./services/misc/ripple-data-api.nix ./services/misc/rogue.nix ./services/misc/serviio.nix + ./services/misc/safeeyes.nix ./services/misc/siproxd.nix ./services/misc/snapper.nix ./services/misc/sonarr.nix @@ -373,6 +398,7 @@ ./services/misc/sundtek.nix ./services/misc/svnserve.nix ./services/misc/synergy.nix + ./services/misc/sysprof.nix ./services/misc/taskserver ./services/misc/tzupdate.nix ./services/misc/uhub.nix @@ -384,6 +410,7 @@ ./services/monitoring/cadvisor.nix ./services/monitoring/collectd.nix ./services/monitoring/das_watchdog.nix + ./services/monitoring/datadog-agent.nix ./services/monitoring/dd-agent/dd-agent.nix ./services/monitoring/fusion-inventory.nix ./services/monitoring/grafana.nix @@ -459,6 +486,7 @@ ./services/networking/dnschain.nix ./services/networking/dnscrypt-proxy.nix ./services/networking/dnscrypt-wrapper.nix + ./services/networking/dnsdist.nix ./services/networking/dnsmasq.nix ./services/networking/ejabberd.nix ./services/networking/fakeroute.nix @@ -469,6 +497,7 @@ ./services/networking/flannel.nix ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix + ./services/networking/freeradius.nix ./services/networking/gale.nix ./services/networking/gateone.nix ./services/networking/gdomap.nix @@ -476,6 +505,7 @@ ./services/networking/gnunet.nix ./services/networking/gogoclient.nix ./services/networking/gvpe.nix + ./services/networking/hans.nix ./services/networking/haproxy.nix ./services/networking/heyefi.nix ./services/networking/hostapd.nix @@ -500,11 +530,13 @@ ./services/networking/miniupnpd.nix ./services/networking/mosquitto.nix ./services/networking/monero.nix + ./services/networking/morty.nix ./services/networking/miredo.nix ./services/networking/mstpd.nix ./services/networking/murmur.nix ./services/networking/namecoind.nix ./services/networking/nat.nix + ./services/networking/ndppd.nix ./services/networking/networkmanager.nix ./services/networking/nftables.nix ./services/networking/ngircd.nix @@ -516,11 +548,13 @@ ./services/networking/ntopng.nix ./services/networking/ntpd.nix ./services/networking/nylon.nix + ./services/networking/ocserv.nix ./services/networking/oidentd.nix ./services/networking/openfire.nix ./services/networking/openntpd.nix ./services/networking/openvpn.nix ./services/networking/ostinato.nix + ./services/networking/owamp.nix ./services/networking/pdnsd.nix ./services/networking/polipo.nix ./services/networking/powerdns.nix @@ -529,7 +563,7 @@ ./services/networking/prayer.nix ./services/networking/privoxy.nix ./services/networking/prosody.nix - # ./services/networking/quagga.nix + ./services/networking/quagga.nix ./services/networking/quassel.nix ./services/networking/racoon.nix ./services/networking/radicale.nix @@ -543,6 +577,7 @@ ./services/networking/searx.nix ./services/networking/seeks.nix ./services/networking/skydns.nix + ./services/networking/shadowsocks.nix ./services/networking/shairport-sync.nix ./services/networking/shout.nix ./services/networking/sniproxy.nix @@ -554,7 +589,9 @@ ./services/networking/ssh/lshd.nix ./services/networking/ssh/sshd.nix ./services/networking/strongswan.nix + ./services/networking/strongswan-swanctl/module.nix ./services/networking/stunnel.nix + ./services/networking/stubby.nix ./services/networking/supplicant.nix ./services/networking/supybot.nix ./services/networking/syncthing.nix @@ -587,9 +624,12 @@ ./services/scheduling/fcron.nix ./services/scheduling/marathon.nix ./services/search/elasticsearch.nix + ./services/search/elasticsearch-curator.nix ./services/search/hound.nix ./services/search/kibana.nix ./services/search/solr.nix + ./services/security/certmgr.nix + ./services/security/cfssl.nix ./services/security/clamav.nix ./services/security/fail2ban.nix ./services/security/fprintd.nix @@ -600,6 +640,7 @@ ./services/security/hologram-agent.nix ./services/security/munge.nix ./services/security/oauth2_proxy.nix + ./services/security/oauth2_proxy_nginx.nix ./services/security/physlock.nix ./services/security/shibboleth-sp.nix ./services/security/sks.nix @@ -638,15 +679,19 @@ ./services/web-apps/tt-rss.nix ./services/web-apps/selfoss.nix ./services/web-apps/quassel-webserver.nix + ./services/web-apps/virtlyst.nix + ./services/web-apps/youtrack.nix ./services/web-servers/apache-httpd/default.nix ./services/web-servers/caddy.nix ./services/web-servers/fcgiwrap.nix + ./services/web-servers/hitch/default.nix + ./services/web-servers/hydron.nix ./services/web-servers/jboss/default.nix ./services/web-servers/lighttpd/cgit.nix ./services/web-servers/lighttpd/collectd.nix ./services/web-servers/lighttpd/default.nix ./services/web-servers/lighttpd/gitweb.nix - ./services/web-servers/lighttpd/inginious.nix + ./services/web-servers/meguca.nix ./services/web-servers/mighttpd2.nix ./services/web-servers/minio.nix ./services/web-servers/nginx/default.nix @@ -766,8 +811,10 @@ ./virtualisation/lxd.nix ./virtualisation/amazon-options.nix ./virtualisation/hyperv-guest.nix + ./virtualisation/kvmgt.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix + ./virtualisation/qemu-guest-agent.nix ./virtualisation/rkt.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index f56640f19782efef9589dadf367e8e448ac606fe..19f821ae17f393770ae4b5f660bc3c06911c669e 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -3,7 +3,7 @@ # enabled in the initrd. Its primary use is in the NixOS installation # CDs. -{ config, pkgs, ... }: +{ ... }: { @@ -33,7 +33,7 @@ # USB support, especially for booting from USB CD-ROM # drives. - "usb_storage" + "uas" # Firewire support. Not tested. "ohci1394" "sbp2" diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 3bf06a951193fc36e137cab17ef1b6cbe6e7ddf2..5aaffa4f1f2a1272ab76868c5ae27f67d02e33a6 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -1,7 +1,7 @@ # This module defines the software packages included in the "minimal" # installation CD. It might be useful elsewhere. -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: { # Include some utilities that are useful for installing or repairing @@ -17,6 +17,7 @@ pkgs.ddrescue pkgs.ccrypt pkgs.cryptsetup # needed for dm-crypt volumes + pkgs.mkpasswd # for generating password files # Some networking tools. pkgs.fuse @@ -28,7 +29,6 @@ # Hardware-related tools. pkgs.sdparm pkgs.hdparm - pkgs.dmraid pkgs.smartmontools # for diagnosing hard disks pkgs.pciutils pkgs.usbutils diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix index 5b4e68beb6a6928021e7022b89d221282b480b01..99d4774584f1eb527d44dad10e3bb7ae791f90ee 100644 --- a/nixos/modules/profiles/clone-config.nix +++ b/nixos/modules/profiles/clone-config.nix @@ -31,7 +31,6 @@ let let relocateNixOS = path: ""; - relocateOthers = null; in { nixos = map relocateNixOS partitionedModuleFiles.nixos; others = []; # TODO: copy the modules to the install-device repository. diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix index c3ee6e98371ee1d18b0ed9700b000d2f071dba3a..18f190071bad8ef2f9fdc6e78432cda815dc7b79 100644 --- a/nixos/modules/profiles/demo.nix +++ b/nixos/modules/profiles/demo.nix @@ -1,9 +1,9 @@ -{ config, pkgs, ... }: +{ ... }: { imports = [ ./graphical.nix ]; - users.extraUsers.demo = + users.users.demo = { isNormalUser = true; description = "Demo user account"; extraGroups = [ "wheel" ]; diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index fe9851e79a6d46446561088b0b64aceeb9a9eb8d..332cf58aa538224ceb1ad1e3f84a340efcb1bb88 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -1,7 +1,7 @@ # This module defines a NixOS configuration with the Plasma 5 desktop. # It's used by the graphical installation CD. -{ config, pkgs, ... }: +{ pkgs, ... }: { services.xserver = { diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 456538742f5174feee3dd0ccced39d1ae11ce3b9..2af8bf1f8e30cb38fa2779aa4aea2a36c9b2367a 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -1,7 +1,7 @@ # A profile with most (vanilla) hardening options enabled by default, # potentially at the cost of features and performance. -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: with lib; diff --git a/nixos/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix index 67f8d633bab560c4ffcfde4d830ec5625a17f589..131ee272859a914899406a6344c47c8843667988 100644 --- a/nixos/modules/profiles/headless.nix +++ b/nixos/modules/profiles/headless.nix @@ -1,7 +1,7 @@ # Common configuration for headless machines (e.g., Amazon EC2 # instances). -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 43f06c219f8242fbcab6195563877259c28861ee..ff4a23a18d0692bb9c8316b10f4266cb7bca40a6 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -31,7 +31,8 @@ with lib; #services.rogue.enable = true; # Disable some other stuff we don't need. - security.sudo.enable = false; + security.sudo.enable = mkDefault false; + services.udisks2.enable = mkDefault false; # Automatically log in at the virtual consoles. services.mingetty.autologinUser = "root"; @@ -86,5 +87,9 @@ with lib; networking.firewall.logRefusedConnections = mkDefault false; environment.systemPackages = [ pkgs.vim ]; + + + # Allow the user to log in as root without a password. + users.users.root.initialHashedPassword = ""; }; } diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index 40df7063a9bf371d9d248e523474b9f8bbd102a5..ed04e46c77d1d35199c8aac45880440a923c12e2 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -1,7 +1,7 @@ # This module defines a small NixOS configuration. It does not # contain any graphical stuff. -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix index a1ec1d45395e96925032cc0841e452753970ae1e..315d04093b134df806997b68f18c1d9e0b82ae3a 100644 --- a/nixos/modules/profiles/qemu-guest.nix +++ b/nixos/modules/profiles/qemu-guest.nix @@ -1,7 +1,7 @@ # Common configuration for virtual machines running under QEMU (using # virtio). -{ config, pkgs, ... }: +{ ... }: { boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix index f648d70bd9fa40e392c8308b8fcf3cb3ff0cf911..942572cef9d5114569a3df55b8e7bfaf0c99d0f2 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -14,7 +14,7 @@ with lib; description = '' Whether to configure system to use Android Debug Bridge (adb). To grant access to a user, it must be part of adbusers group: - users.extraUsers.alice.extraGroups = ["adbusers"]; + users.users.alice.extraGroups = ["adbusers"]; ''; relatedPackages = [ ["androidenv" "platformTools"] ]; }; @@ -25,6 +25,6 @@ with lib; config = mkIf config.programs.adb.enable { services.udev.packages = [ pkgs.android-udev-rules ]; environment.systemPackages = [ pkgs.androidenv.platformTools ]; - users.extraGroups.adbusers = {}; + users.groups.adbusers = {}; }; } diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index b91bd98047ee156f21683e898014f835f4b0fc73..4651cdb76e0b833f162305d0b36921f24b0402e5 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -1,6 +1,6 @@ # Global configuration for atop. -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index c0967316c0c7c4673f8a2441d4b901c1bd96b31d..69a1a482d0747831940b43433db77c582eb2a7e6 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -110,7 +110,7 @@ in }; enableCompletion = mkOption { - default = false; + default = true; description = '' Enable Bash completion for all interactive bash shells. ''; diff --git a/nixos/modules/programs/bcc.nix b/nixos/modules/programs/bcc.nix index 3522ab22fa8ea4320e8c1a1af747e69a467a098e..d76249bb5cab4f1644f9c2506fc31df4f6c67787 100644 --- a/nixos/modules/programs/bcc.nix +++ b/nixos/modules/programs/bcc.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: { options.programs.bcc.enable = lib.mkEnableOption "bcc"; diff --git a/nixos/modules/programs/digitalbitbox/default.nix b/nixos/modules/programs/digitalbitbox/default.nix index 7c727489c6c96f96b34c5be8806f4301b6e4c5d9..2fe0a14412c516afa4c39174dbb3e38d99b2b16d 100644 --- a/nixos/modules/programs/digitalbitbox/default.nix +++ b/nixos/modules/programs/digitalbitbox/default.nix @@ -34,6 +34,6 @@ in meta = { doc = ./doc.xml; - maintainers = with stdenv.lib.maintainers; [ vidbina ]; + maintainers = with lib.maintainers; [ vidbina ]; }; } diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml index 7acbc2fc4dde8b1ac163697502c2d143646de48a..a26653dda535fd83854193bfd1d18c054f7421ec 100644 --- a/nixos/modules/programs/digitalbitbox/doc.xml +++ b/nixos/modules/programs/digitalbitbox/doc.xml @@ -15,9 +15,9 @@ installed by setting programs.digitalbitbox to true in a manner similar to - - programs.digitalbitbox.enable = true; - + + = true; + and bundles the digitalbitbox package (see ), which contains the @@ -46,11 +46,11 @@ digitalbitbox package which could be installed as follows: - - environment.systemPackages = [ - pkgs.digitalbitbox - ]; - + + = [ + pkgs.digitalbitbox +]; +
@@ -62,9 +62,9 @@ The digitalbitbox hardware package enables the udev rules for Digital Bitbox devices and may be installed as follows: - - hardware.digitalbitbox.enable = true; - + + = true; + @@ -72,14 +72,14 @@ the udevRule51 and udevRule52 attributes by means of overriding as follows: - - programs.digitalbitbox = { - enable = true; - package = pkgs.digitalbitbox.override { - udevRule51 = "something else"; - }; - }; - + +programs.digitalbitbox = { + enable = true; + package = pkgs.digitalbitbox.override { + udevRule51 = "something else"; + }; +}; + diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 401d152941a0ac528770f6d7661acf6e210170fc..3bac8d98990ab5c48165de40233cfe119d6c5d15 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -2,7 +2,7 @@ # Most of the stuff here should probably be moved elsewhere sometime. -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; @@ -33,8 +33,6 @@ in environment.profileRelativeEnvVars = { PATH = [ "/bin" ]; INFOPATH = [ "/info" "/share/info" ]; - PKG_CONFIG_PATH = [ "/lib/pkgconfig" ]; - PERL5LIB = [ "/lib/perl5/site_perl" ]; KDEDIRS = [ "" ]; STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ]; QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ]; diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix new file mode 100644 index 0000000000000000000000000000000000000000..46ee4bc0f7a015db9eed93502842205e315fd1ac --- /dev/null +++ b/nixos/modules/programs/firejail.nix @@ -0,0 +1,48 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.firejail; + + wrappedBins = pkgs.stdenv.mkDerivation rec { + name = "firejail-wrapped-binaries"; + nativeBuildInputs = with pkgs; [ makeWrapper ]; + buildCommand = '' + mkdir -p $out/bin + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (command: binary: '' + cat <<_EOF >$out/bin/${command} + #!${pkgs.stdenv.shell} -e + /run/wrappers/bin/firejail ${binary} "\$@" + _EOF + chmod 0755 $out/bin/${command} + '') cfg.wrappedBinaries)} + ''; + }; + +in { + options.programs.firejail = { + enable = mkEnableOption "firejail"; + + wrappedBinaries = mkOption { + type = types.attrs; + default = {}; + description = '' + Wrap the binaries in firejail and place them in the global path. + + + You will get file collisions if you put the actual application binary in + the global environment and applications started via .desktop files are + not wrapped if they specify the absolute path to the binary. + ''; + }; + }; + + config = mkIf cfg.enable { + security.wrappers.firejail.source = "${lib.getBin pkgs.firejail}/bin/firejail"; + + environment.systemPackages = [ wrappedBins ]; + }; + + meta.maintainers = with maintainers; [ peterhoeg ]; +} diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix index ca7c6fb28f525bf4f6510b097ab9775e53702feb..93923ff3133cbeb332bac2be15c02407ef80b9bd 100644 --- a/nixos/modules/programs/gphoto2.nix +++ b/nixos/modules/programs/gphoto2.nix @@ -15,7 +15,7 @@ with lib; Whether to configure system to use gphoto2. To grant digital camera access to a user, the user must be part of the camera group: - users.extraUsers.alice.extraGroups = ["camera"]; + users.users.alice.extraGroups = ["camera"]; ''; }; }; @@ -25,6 +25,6 @@ with lib; config = mkIf config.programs.gphoto2.enable { services.udev.packages = [ pkgs.libgphoto2 ]; environment.systemPackages = [ pkgs.gphoto2 ]; - users.extraGroups.camera = {}; + users.groups.camera = {}; }; } diff --git a/nixos/modules/programs/iftop.nix b/nixos/modules/programs/iftop.nix new file mode 100644 index 0000000000000000000000000000000000000000..a98a9a8187d4ba6b604e4cba20defe7f034b8805 --- /dev/null +++ b/nixos/modules/programs/iftop.nix @@ -0,0 +1,18 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.iftop; +in { + options = { + programs.iftop.enable = mkEnableOption "iftop + setcap wrapper"; + }; + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.iftop ]; + security.wrappers.iftop = { + source = "${pkgs.iftop}/bin/iftop"; + capabilities = "cap_net_raw+p"; + }; + }; +} diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix index c0283c9e686264c2c0b79e6d166400e7cb744508..d39103a58057d6a09a3c22276144841b9ae8af70 100644 --- a/nixos/modules/programs/less.nix +++ b/nixos/modules/programs/less.nix @@ -6,7 +6,7 @@ let cfg = config.programs.less; - configFile = '' + configText = if (cfg.configFile != null) then (builtins.readFile cfg.configFile) else '' #command ${concatStringsSep "\n" (mapAttrsToList (command: action: "${command} ${action}") cfg.commands) @@ -25,7 +25,7 @@ let ''; lessKey = pkgs.runCommand "lesskey" - { src = pkgs.writeText "lessconfig" configFile; } + { src = pkgs.writeText "lessconfig" configText; } "${pkgs.less}/bin/lesskey -o $out $src"; in @@ -37,6 +37,19 @@ in enable = mkEnableOption "less"; + configFile = mkOption { + type = types.nullOr types.path; + default = null; + example = literalExample "$${pkgs.my-configs}/lesskey"; + description = '' + Path to lesskey configuration file. + + takes precedence over , + , , and + . + ''; + }; + commands = mkOption { type = types.attrsOf types.str; default = {}; diff --git a/nixos/modules/programs/mosh.nix b/nixos/modules/programs/mosh.nix index b3aa55e189a3d02140497b75144843d46547713b..359fe23e0ecdb167da469d9636e99c7c24bb0102 100644 --- a/nixos/modules/programs/mosh.nix +++ b/nixos/modules/programs/mosh.nix @@ -16,10 +16,28 @@ in default = false; type = lib.types.bool; }; + withUtempter = mkOption { + description = '' + Whether to enable libutempter for mosh. + This is required so that mosh can write to /var/run/utmp (which can be queried with `who` to display currently connected user sessions). + Note, this will add a guid wrapper for the group utmp! + ''; + default = true; + type = lib.types.bool; + }; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ mosh ]; networking.firewall.allowedUDPPortRanges = [ { from = 60000; to = 61000; } ]; + security.wrappers = mkIf cfg.withUtempter { + utempter = { + source = "${pkgs.libutempter}/lib/utempter/utempter"; + owner = "nobody"; + group = "utmp"; + setuid = false; + setgid = true; + }; + }; }; } diff --git a/nixos/modules/programs/npm.nix b/nixos/modules/programs/npm.nix index 7ef172355c1fcfd4600ea40d2a3b9c8bd6dc0108..5fdd4fa841a1ebec87d8cd1f6747ea7a278bd4c8 100644 --- a/nixos/modules/programs/npm.nix +++ b/nixos/modules/programs/npm.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -39,6 +39,8 @@ in environment.etc."npmrc".text = cfg.npmrc; environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc"; + + environment.systemPackages = [ pkgs.nodePackages.npm ]; }; } diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix index 9a6cf755f2a27a2415766f189257f86277b5a360..08a6cd0a6049be2fccf33cc7407013e2de394f7c 100644 --- a/nixos/modules/programs/nylas-mail.nix +++ b/nixos/modules/programs/nylas-mail.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.nylas-mail; - defaultUser = "nylas-mail"; in { ###### interface options = { diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml index 85b0e023e6c1721f1f83ba72ebf097e8397c06e1..91740ee16ec2f59d497c0cdc9cd814dfe4d9aaa6 100644 --- a/nixos/modules/programs/plotinus.xml +++ b/nixos/modules/programs/plotinus.xml @@ -17,7 +17,7 @@ To enable Plotinus, add the following to your configuration.nix: -programs.plotinus.enable = true; + = true; diff --git a/nixos/modules/programs/screen.nix b/nixos/modules/programs/screen.nix index f82338a69d25d69c68b650bd4a4c372802c15c7d..c1daaa58f16f4d0a3348e9aa3b2e03eb56d08b98 100644 --- a/nixos/modules/programs/screen.nix +++ b/nixos/modules/programs/screen.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: let inherit (lib) mkOption mkIf types; @@ -25,6 +25,8 @@ in config = mkIf (cfg.screenrc != "") { environment.etc."screenrc".text = cfg.screenrc; + + environment.systemPackages = [ pkgs.screen ]; }; } diff --git a/nixos/modules/programs/sedutil.nix b/nixos/modules/programs/sedutil.nix new file mode 100644 index 0000000000000000000000000000000000000000..7efc80f4abba2ec8243b014de24eb4a44e5e150d --- /dev/null +++ b/nixos/modules/programs/sedutil.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.sedutil; + +in { + options.programs.sedutil.enable = mkEnableOption "sedutil"; + + config = mkIf cfg.enable { + boot.kernelParams = [ + "libata.allow_tpm=1" + ]; + + environment.systemPackages = with pkgs; [ sedutil ]; + }; +} diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix index d8845fd8f44639a075cbc219b32836f28a565458..944a8bdf16fc40bc7e90c72c49db0b1730fa3c50 100644 --- a/nixos/modules/programs/shell.nix +++ b/nixos/modules/programs/shell.nix @@ -1,15 +1,9 @@ # This module defines a standard configuration for NixOS shells. -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; -let - - cfg = config.environment; - -in - { config = { @@ -23,39 +17,39 @@ in environment.shellInit = '' # Set up the per-user profile. - mkdir -m 0755 -p $NIX_USER_PROFILE_DIR - if test "$(stat --printf '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then - echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2 + mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR" + if [ "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)" ]; then + echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR, should be $(id -u)" >&2 fi - if test -w $HOME; then - if ! test -L $HOME/.nix-profile; then - if test "$USER" != root; then - ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile + if [ -w "$HOME" ]; then + if ! [ -L "$HOME/.nix-profile" ]; then + if [ "$USER" != root ]; then + ln -s "$NIX_USER_PROFILE_DIR/profile" "$HOME/.nix-profile" else # Root installs in the system-wide profile by default. - ln -s /nix/var/nix/profiles/default $HOME/.nix-profile + ln -s /nix/var/nix/profiles/default "$HOME/.nix-profile" fi fi # Subscribe the root user to the NixOS channel by default. - if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then - echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels + if [ "$USER" = root -a ! -e "$HOME/.nix-channels" ]; then + echo "${config.system.defaultChannel} nixos" > "$HOME/.nix-channels" fi # Create the per-user garbage collector roots directory. - NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER - mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR - if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then - echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2 + NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER" + mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR" + if [ "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)" ]; then + echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR, should be $(id -u)" >&2 fi # Set up a default Nix expression from which to install stuff. - if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then - rm -f $HOME/.nix-defexpr - mkdir -p $HOME/.nix-defexpr + if [ ! -e "$HOME/.nix-defexpr" -o -L "$HOME/.nix-defexpr" ]; then + rm -f "$HOME/.nix-defexpr" + mkdir -p "$HOME/.nix-defexpr" if [ "$USER" != root ]; then - ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root + ln -s /nix/var/nix/profiles/per-user/root/channels "$HOME/.nix-defexpr/channels_root" fi fi fi diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 36289080a82ac6fc337a604ece836140b84a2d83..cc398174e6ce03418cc45ffedc3b32603fc2155e 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -7,7 +7,6 @@ with lib; let cfg = config.programs.ssh; - cfgd = config.services.openssh; askPassword = cfg.askPassword; @@ -62,6 +61,29 @@ in ''; }; + # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.) + pubkeyAcceptedKeyTypes = mkOption { + type = types.listOf types.str; + default = [ + "+ssh-dss" + ]; + example = [ "ssh-ed25519" "ssh-rsa" ]; + description = '' + Specifies the key types that will be used for public key authentication. + ''; + }; + + hostKeyAlgorithms = mkOption { + type = types.listOf types.str; + default = [ + "+ssh-dss" + ]; + example = [ "ssh-ed25519" "ssh-rsa" ]; + description = '' + Specifies the host key algorithms that the client wants to use in order of preference. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -189,9 +211,8 @@ in ForwardX11 ${if cfg.forwardX11 then "yes" else "no"} - # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.) - PubkeyAcceptedKeyTypes +ssh-dss - HostKeyAlgorithms +ssh-dss + ${optionalString (cfg.pubkeyAcceptedKeyTypes != []) "PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"} + ${optionalString (cfg.hostKeyAlgorithms != []) "HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}"} ${cfg.extraConfig} ''; diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index d9503d6004ff6b45e02e434bbf1a8bffcf7431a8..0eaaf6b85b99ade2a9c308ed6c603d564d7eda4d 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -73,7 +73,7 @@ in { permissions = "u+rx,g+rx"; }; - users.extraGroups.sway = {}; + users.groups.sway = {}; security.pam.services.swaylock = {}; hardware.opengl.enable = mkDefault true; diff --git a/nixos/modules/programs/systemtap.nix b/nixos/modules/programs/systemtap.nix index fd84732cd4125945e7b1173e85d2daf3a61f30c2..ca81e018c9dc21a1e9bd3491165bbca53f970a19 100644 --- a/nixos/modules/programs/systemtap.nix +++ b/nixos/modules/programs/systemtap.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix index eb913477cf05aaa61aac5c478b6f1779c3169267..f4ae52934760d75fe15a9710e74424c56d4f5137 100644 --- a/nixos/modules/programs/thefuck.nix +++ b/nixos/modules/programs/thefuck.nix @@ -31,8 +31,8 @@ in environment.systemPackages = with pkgs; [ thefuck ]; environment.shellInit = initScript; - programs.zsh.shellInit = mkIf prg.zsh.enable initScript; - programs.fish.shellInit = mkIf prg.fish.enable '' + programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript; + programs.fish.interactiveShellInit = mkIf prg.fish.enable '' ${pkgs.thefuck}/bin/thefuck --alias | source ''; }; diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index 4a60403a2827edb22980593a922cbcb59b6481f8..3d5a37274ae2da8a330fc2e6e729f8c6967dbc77 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - inherit (lib) mkOption mkEnableOption mkIf mkMerge types; + inherit (lib) mkOption mkIf types; cfg = config.programs.tmux; diff --git a/nixos/modules/programs/wireshark.nix b/nixos/modules/programs/wireshark.nix index 710d223b6f594297033a918156bb42394486e252..819f15b98a05ad1adbb9848972130d143295ac44 100644 --- a/nixos/modules/programs/wireshark.nix +++ b/nixos/modules/programs/wireshark.nix @@ -29,7 +29,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ wireshark ]; - users.extraGroups.wireshark = {}; + users.groups.wireshark = {}; security.wrappers.dumpcap = { source = "${wireshark}/bin/dumpcap"; diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix index 49cc4906e0385cddfab1a1461df707471758800c..f967ca82ac8c78b22bac51c3233677463e266ade 100644 --- a/nixos/modules/programs/xonsh.nix +++ b/nixos/modules/programs/xonsh.nix @@ -6,8 +6,6 @@ with lib; let - cfge = config.environment; - cfg = config.programs.xonsh; in diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix new file mode 100644 index 0000000000000000000000000000000000000000..49d522c604f5fb1cfafa12a7efc212f005909680 --- /dev/null +++ b/nixos/modules/programs/xss-lock.nix @@ -0,0 +1,26 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.xss-lock; +in +{ + options.programs.xss-lock = { + enable = mkEnableOption "xss-lock"; + lockerCommand = mkOption { + example = "xlock"; + type = types.string; + description = "Locker to be used with xsslock"; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.xss-lock = { + description = "XSS Lock Daemon"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + serviceConfig.ExecStart = "${pkgs.xss-lock}/bin/xss-lock ${cfg.lockerCommand}"; + }; + }; +} diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index b995d390b279388964998b7c1d9d15990effceb7..f4df4e983e421cb2ded660466ca1ec230f211f0c 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -3,7 +3,30 @@ with lib; let + cfg = config.programs.zsh.ohMyZsh; + + mkLinkFarmEntry = name: dir: + let + env = pkgs.buildEnv { + name = "zsh-${name}-env"; + paths = cfg.customPkgs; + pathsToLink = "/share/zsh/${dir}"; + }; + in + { inherit name; path = "${env}/share/zsh/${dir}"; }; + + mkLinkFarmEntry' = name: mkLinkFarmEntry name name; + + custom = + if cfg.custom != null then cfg.custom + else if length cfg.customPkgs == 0 then null + else pkgs.linkFarm "oh-my-zsh-custom" [ + (mkLinkFarmEntry' "themes") + (mkLinkFarmEntry "completions" "site-functions") + (mkLinkFarmEntry' "plugins") + ]; + in { options = { @@ -34,10 +57,19 @@ in }; custom = mkOption { - default = ""; - type = types.str; + default = null; + type = with types; nullOr str; description = '' Path to a custom oh-my-zsh package to override config of oh-my-zsh. + (Can't be used along with `customPkgs`). + ''; + }; + + customPkgs = mkOption { + default = []; + type = types.listOf types.package; + description = '' + List of custom packages that should be loaded into `oh-my-zsh`. ''; }; @@ -67,7 +99,7 @@ in environment.systemPackages = [ cfg.package ]; - programs.zsh.interactiveShellInit = with builtins; '' + programs.zsh.interactiveShellInit = '' # oh-my-zsh configuration generated by NixOS export ZSH=${cfg.package}/share/oh-my-zsh @@ -75,8 +107,8 @@ in "plugins=(${concatStringsSep " " cfg.plugins})" } - ${optionalString (stringLength(cfg.custom) > 0) - "ZSH_CUSTOM=\"${cfg.custom}\"" + ${optionalString (custom != null) + "ZSH_CUSTOM=\"${custom}\"" } ${optionalString (stringLength(cfg.theme) > 0) @@ -92,5 +124,15 @@ in source $ZSH/oh-my-zsh.sh ''; + + assertions = [ + { + assertion = cfg.custom != null -> cfg.customPkgs == []; + message = "If `cfg.custom` is set for `ZSH_CUSTOM`, `customPkgs` can't be used!"; + } + ]; + }; + + meta.doc = ./oh-my-zsh.xml; } diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml new file mode 100644 index 0000000000000000000000000000000000000000..b74da8630ee77e86d23a6b176bd87e1381f027a1 --- /dev/null +++ b/nixos/modules/programs/zsh/oh-my-zsh.xml @@ -0,0 +1,125 @@ + + +Oh my ZSH + +oh-my-zsh is a framework +to manage your ZSH configuration +including completion scripts for several CLI tools or custom prompt themes. + +
Basic usage +The module uses the oh-my-zsh package with all available features. The +initial setup using Nix expressions is fairly similar to the configuration format +of oh-my-zsh. + + +{ + programs.ohMyZsh = { + enable = true; + plugins = [ "git" "python" "man" ]; + theme = "agnoster"; + }; +} + + +For a detailed explanation of these arguments please refer to the +oh-my-zsh docs. + +The expression generates the needed +configuration and writes it into your /etc/zshrc. +
+ +
Custom additions + +Sometimes third-party or custom scripts such as a modified theme may be needed. +oh-my-zsh provides the +ZSH_CUSTOM +environment variable for this which points to a directory with additional scripts. + +The module can do this as well: + + +{ + programs.ohMyZsh.custom = "~/path/to/custom/scripts"; +} + +
+ +
Custom environments + +There are several extensions for oh-my-zsh packaged in nixpkgs. +One of them is nix-zsh-completions +which bundles completion scripts and a plugin for oh-my-zsh. + +Rather than using a single mutable path for ZSH_CUSTOM, it's also possible to +generate this path from a list of Nix packages: + + +{ pkgs, ... }: +{ + programs.ohMyZsh.customPkgs = with pkgs; [ + pkgs.nix-zsh-completions + # and even more... + ]; +} + + +Internally a single store path will be created using buildEnv. +Please refer to the docs of +buildEnv +for further reference. + +Please keep in mind that this is not compatible with programs.ohMyZsh.custom +as it requires an immutable store path while custom shall remain mutable! An evaluation failure +will be thrown if both custom and customPkgs are set. +
+ +
Package your own customizations + +If third-party customizations (e.g. new themes) are supposed to be added to oh-my-zsh +there are several pitfalls to keep in mind: + + + + To comply with the default structure of ZSH the entire output needs to be written to + $out/share/zsh. + + + Completion scripts are supposed to be stored at $out/share/zsh/site-functions. This directory + is part of the fpath + and the package should be compatible with pure ZSH setups. The module will automatically link + the contents of site-functions to completions directory in the proper store path. + + + The plugins directory needs the structure pluginname/pluginname.plugin.zsh + as structured in the upstream repo. + + + + + +A derivation for oh-my-zsh may look like this: + +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "exemplary-zsh-customization-${version}"; + version = "1.0.0"; + src = fetchFromGitHub { + # path to the upstream repository + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/share/zsh/site-functions + cp {themes,plugins} $out/share/zsh + cp completions $out/share/zsh/site-functions + ''; +} + + +
+
diff --git a/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/nixos/modules/programs/zsh/zsh-autosuggestions.nix new file mode 100644 index 0000000000000000000000000000000000000000..416f4c9c675115ca4b685a40d7c3f74257468f45 --- /dev/null +++ b/nixos/modules/programs/zsh/zsh-autosuggestions.nix @@ -0,0 +1,60 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.zsh.autosuggestions; +in +{ + options.programs.zsh.autosuggestions = { + + enable = mkEnableOption "zsh-autosuggestions"; + + highlightStyle = mkOption { + type = types.str; + default = "fg=8"; # https://github.com/zsh-users/zsh-autosuggestions/tree/v0.4.3#suggestion-highlight-style + description = "Highlight style for suggestions ({fore,back}ground color)"; + example = "fg=cyan"; + }; + + strategy = mkOption { + type = types.enum [ "default" "match_prev_cmd" ]; + default = "default"; + description = '' + Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions. + There are currently two to choose from: + + * default: Chooses the most recent match. + * match_prev_cmd: Chooses the most recent match whose preceding history item matches + the most recently executed command (more info). Note that this strategy won't work as + expected with ZSH options that don't preserve the history order such as + HIST_IGNORE_ALL_DUPS or HIST_EXPIRE_DUPS_FIRST. + ''; + }; + + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + description = "Attribute set with additional configuration values"; + example = literalExample '' + { + "ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" = "20"; + } + ''; + }; + + }; + + config = mkIf cfg.enable { + + programs.zsh.interactiveShellInit = '' + source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh + + export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}" + export ZSH_AUTOSUGGEST_STRATEGY="${cfg.strategy}" + + ${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)} + ''; + + }; +} diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index f689250dc61fb82b08fc92c5ccd11b9e68778691..d30b3415411f2aee695253ef225531f3ec726f57 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -69,7 +69,9 @@ in promptInit = mkOption { default = '' - autoload -U promptinit && promptinit && prompt walters + if [ "$TERM" != dumb ]; then + autoload -U promptinit && promptinit && prompt walters + fi ''; description = '' Shell script code used to initialise the zsh prompt. @@ -85,13 +87,19 @@ in type = types.bool; }; - enableAutosuggestions = mkOption { - default = false; + + enableGlobalCompInit = mkOption { + default = cfg.enableCompletion; description = '' - Enable zsh-autosuggestions + Enable execution of compinit call for all interactive zsh shells. + + This option can be disabled if the user wants to extend its + fpath and a custom compinit + call in the local config is required. ''; type = types.bool; }; + }; }; @@ -164,11 +172,7 @@ in fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) done - ${optionalString cfg.enableCompletion "autoload -U compinit && compinit"} - - ${optionalString (cfg.enableAutosuggestions) - "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh" - } + ${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"} ${cfge.interactiveShellInit} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 0c3ac054292d36916bc88c14dafe91eaa986dbec..4a6bdfe83dd28495e35215bfd6ea1c973a758c37 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -4,7 +4,11 @@ with lib; { imports = [ - (mkRenamedOptionModule [ "dysnomia" ] [ "services" "dysnomia" ]) + # !!! These were renamed the other way, but got reverted later. + # !!! Drop these before 18.09 is released. + (mkRenamedOptionModule [ "system" "nixos" "stateVersion" ] [ "system" "stateVersion" ]) + (mkRenamedOptionModule [ "system" "nixos" "defaultChannel" ] [ "system" "defaultChannel" ]) + (mkRenamedOptionModule [ "environment" "x11Packages" ] [ "environment" "systemPackages" ]) (mkRenamedOptionModule [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ]) (mkRenamedOptionModule [ "environment" "nix" ] [ "nix" "package" ]) @@ -17,20 +21,35 @@ with lib; (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ]) (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ] (config: let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config; in if enabled then [ pkgs.gutenprint ] else [ ])) + (mkRenamedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]) + (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "") (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ]) (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ]) (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ]) + (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ]) + (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"]) + (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "") + (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ]) (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) - (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ]) + (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ]) + (mkRenamedOptionModule [ "services" "neo4j" "listenAddress" ] [ "services" "neo4j" "defaultListenAddress" ]) + (mkRenamedOptionModule [ "services" "neo4j" "enableBolt" ] [ "services" "neo4j" "bolt" "enable" ]) + (mkRenamedOptionModule [ "services" "neo4j" "enableHttps" ] [ "services" "neo4j" "https" "enable" ]) + (mkRenamedOptionModule [ "services" "neo4j" "certDir" ] [ "services" "neo4j" "directories" "certificates" ]) + (mkRenamedOptionModule [ "services" "neo4j" "dataDir" ] [ "services" "neo4j" "directories" "home" ]) + (mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.") + (mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.") + (mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.") (mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ]) (mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ]) (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ]) @@ -187,22 +206,26 @@ with lib; (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ]) # Fontconfig - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "config" "fonts" "fontconfig" "allowBitmaps" ]) - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "allowType1" ] [ "config" "fonts" "fontconfig" "allowType1" ]) - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "config" "fonts" "fontconfig" "useEmbeddedBitmaps" ]) - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "config" "fonts" "fontconfig" "forceAutohint" ]) - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "config" "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) + + # postgresqlBackup + (mkRemovedOptionModule [ "services" "postgresqlBackup" "period" ] '' + A systemd timer is now used instead of cron. + The starting time can be configured via services.postgresqlBackup.startAt. + '') # Profile splitting - (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ]) + (mkRenamedOptionModule [ "virtualisation" "growPartition" ] [ "boot" "growPartition" ]) # misc/version.nix - #(mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ]) - (mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ]) - #(mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ]) - (mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ]) - (mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ]) - (mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ]) + (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ]) + (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ]) + (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ]) + (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ]) # Users (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ]) @@ -229,9 +252,12 @@ with lib; (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "") (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ] "Set the option `services.xserver.displayManager.sddm.package' instead.") + (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") + (mkRemovedOptionModule [ "services" "logstash" "enableWeb" ] "The web interface was removed from logstash") + (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) @@ -243,6 +269,8 @@ with lib; (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ]) (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ]) + (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestions" "enable" ]) + # Xen (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ]) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index e9676d9dfb15411670e9812212bc9c78106a4c3a..946da92d80e76525662c4d1561df4111c6c551b1 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -58,9 +58,11 @@ let default = ""; example = "systemctl reload nginx.service"; description = '' - Commands to run after certificates are re-issued. Typically + Commands to run after new certificates go live. Typically the web server and other servers using certificates need to be reloaded. + + Executed in the same directory with the new certificate. ''; }; @@ -78,6 +80,27 @@ let ''; }; + activationDelay = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Systemd time span expression to delay copying new certificates to main + state directory. See systemd.time + 7. + ''; + }; + + preDelay = mkOption { + type = types.lines; + default = ""; + description = '' + Commands to run after certificates are re-issued but before they are + activated. Typically the new certificate is published to DNS. + + Executed in the same directory with the new certificate. + ''; + }; + extraDomains = mkOption { type = types.attrsOf (types.nullOr types.str); default = {}; @@ -186,14 +209,14 @@ in servicesLists = mapAttrsToList certToServices cfg.certs; certToServices = cert: data: let - cpath = "${cfg.directory}/${cert}"; + cpath = lpath + optionalString (data.activationDelay != null) ".staging"; + lpath = "${cfg.directory}/${cert}"; rights = if data.allowKeysForGroup then "750" else "700"; cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin ] ++ optionals (data.email != null) [ "--email" data.email ] ++ concatMap (p: [ "-f" p ]) data.plugins ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains) - ++ (if cfg.production then [] - else ["--server" "https://acme-staging.api.letsencrypt.org/directory"]); + ++ optionals (!cfg.production) ["--server" "https://acme-staging.api.letsencrypt.org/directory"]; acmeService = { description = "Renew ACME Certificate for ${cert}"; after = [ "network.target" "network-online.target" ]; @@ -206,7 +229,7 @@ in Group = data.group; PrivateTmp = true; }; - path = [ pkgs.simp_le ]; + path = with pkgs; [ simp_le systemd ]; preStart = '' mkdir -p '${cfg.directory}' chown 'root:root' '${cfg.directory}' @@ -229,17 +252,43 @@ in exit "$EXITCODE" ''; postStop = '' + cd '${cpath}' + if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then - echo "Executing postRun hook..." - ${data.postRun} + ${if data.activationDelay != null then '' + + ${data.preDelay} + + if [ -d '${lpath}' ]; then + systemd-run --no-block --on-active='${data.activationDelay}' --unit acme-setlive-${cert}.service + else + systemctl --wait start acme-setlive-${cert}.service + fi + '' else data.postRun} + + # noop ensuring that the "if" block is non-empty even if + # activationDelay == null and postRun == "" + true fi ''; before = [ "acme-certificates.target" ]; wantedBy = [ "acme-certificates.target" ]; }; + delayService = { + description = "Set certificate for ${cert} live"; + path = with pkgs; [ rsync ]; + serviceConfig = { + Type = "oneshot"; + }; + script = '' + rsync -a --delete-after '${cpath}/' '${lpath}' + ''; + postStop = data.postRun; + }; selfsignedService = { description = "Create preliminary self-signed certificate for ${cert}"; + path = [ pkgs.openssl ]; preStart = '' if [ ! -d '${cpath}' ] then @@ -248,39 +297,43 @@ in chown '${data.user}:${data.group}' '${cpath}' fi ''; - script = + script = '' - # Create self-signed key - workdir="/run/acme-selfsigned-${cert}" - ${pkgs.openssl.bin}/bin/openssl genrsa -des3 -passout pass:x -out $workdir/server.pass.key 2048 - ${pkgs.openssl.bin}/bin/openssl rsa -passin pass:x -in $workdir/server.pass.key -out $workdir/server.key - ${pkgs.openssl.bin}/bin/openssl req -new -key $workdir/server.key -out $workdir/server.csr \ + workdir="$(mktemp -d)" + + # Create CA + openssl genrsa -des3 -passout pass:x -out $workdir/ca.pass.key 2048 + openssl rsa -passin pass:x -in $workdir/ca.pass.key -out $workdir/ca.key + openssl req -new -key $workdir/ca.key -out $workdir/ca.csr \ + -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=Security Department/CN=example.com" + openssl x509 -req -days 1 -in $workdir/ca.csr -signkey $workdir/ca.key -out $workdir/ca.crt + + # Create key + openssl genrsa -des3 -passout pass:x -out $workdir/server.pass.key 2048 + openssl rsa -passin pass:x -in $workdir/server.pass.key -out $workdir/server.key + openssl req -new -key $workdir/server.key -out $workdir/server.csr \ -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=IT Department/CN=example.com" - ${pkgs.openssl.bin}/bin/openssl x509 -req -days 1 -in $workdir/server.csr -signkey $workdir/server.key -out $workdir/server.crt + openssl x509 -req -days 1 -in $workdir/server.csr -CA $workdir/ca.crt \ + -CAkey $workdir/ca.key -CAserial $workdir/ca.srl -CAcreateserial \ + -out $workdir/server.crt - # Move key to destination - mv $workdir/server.key ${cpath}/key.pem - mv $workdir/server.crt ${cpath}/fullchain.pem + # Copy key to destination + cp $workdir/server.key ${cpath}/key.pem - # Create full.pem for e.g. lighttpd (same format as "simp_le ... -f full.pem" creates) - cat "${cpath}/key.pem" "${cpath}/fullchain.pem" > "${cpath}/full.pem" + # Create fullchain.pem (same format as "simp_le ... -f fullchain.pem" creates) + cat $workdir/{server.crt,ca.crt} > "${cpath}/fullchain.pem" - # Clean up working directory - rm $workdir/server.csr - rm $workdir/server.pass.key + # Create full.pem for e.g. lighttpd + cat $workdir/{server.key,server.crt,ca.crt} > "${cpath}/full.pem" # Give key acme permissions - chmod ${rights} '${cpath}/key.pem' - chown '${data.user}:${data.group}' '${cpath}/key.pem' - chmod ${rights} '${cpath}/fullchain.pem' - chown '${data.user}:${data.group}' '${cpath}/fullchain.pem' - chmod ${rights} '${cpath}/full.pem' - chown '${data.user}:${data.group}' '${cpath}/full.pem' + chown '${data.user}:${data.group}' "${cpath}/"{key,fullchain,full}.pem + chmod ${rights} "${cpath}/"{key,fullchain,full}.pem ''; serviceConfig = { Type = "oneshot"; - RuntimeDirectory = "acme-selfsigned-${cert}"; PermissionsStartOnly = true; + PrivateTmp = true; User = data.user; Group = data.group; }; @@ -297,11 +350,8 @@ in }; in ( [ { name = "acme-${cert}"; value = acmeService; } ] - ++ - (if cfg.preliminarySelfsigned - then [ { name = "acme-selfsigned-${cert}"; value = selfsignedService; } ] - else [] - ) + ++ optional cfg.preliminarySelfsigned { name = "acme-selfsigned-${cert}"; value = selfsignedService; } + ++ optional (data.activationDelay != null) { name = "acme-setlive-${cert}"; value = delayService; } ); servicesAttr = listToAttrs services; injectServiceDep = { diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 6130ed82ed3806370afdffc045b5f8c80f992037..7cdc554989ea4bce9033ef330e3edf27a36f305a 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -48,9 +48,9 @@ http { configuration.nix: -security.acme.certs."foo.example.com" = { - webroot = "/var/www/challenges"; - email = "foo@example.com"; +."foo.example.com" = { + webroot = "/var/www/challenges"; + email = "foo@example.com"; };
@@ -58,17 +58,17 @@ security.acme.certs."foo.example.com" = { The private key key.pem and certificate fullchain.pem will be put into /var/lib/acme/foo.example.com. The target directory can -be configured with the option security.acme.directory. +be configured with the option . Refer to for all available configuration -options for the security.acme module. +options for the security.acme module.
Using ACME certificates in Nginx NixOS supports fetching ACME certificates for you by setting -enableACME = true; in a virtualHost config. We + enableACME = true; in a virtualHost config. We first create self-signed placeholder certificates in place of the real ACME certs. The placeholder certs are overwritten when the ACME certs arrive. For foo.example.com the config would @@ -77,13 +77,13 @@ look like. services.nginx = { - enable = true; - virtualHosts = { + enable = true; + virtualHosts = { "foo.example.com" = { - forceSSL = true; - enableACME = true; + forceSSL = true; + enableACME = true; locations."/" = { - root = "/var/www"; + root = "/var/www"; }; }; }; diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 55c75713101d323dca33a1eb5754430d042a64e7..e2b84c3e3b38018b95aa1ea7e8e1911e31f56226 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -1,107 +1,173 @@ { config, lib, pkgs, ... }: -with lib; let + inherit (lib) mkOption types; cfg = config.security.dhparams; -in -{ + + bitType = types.addCheck types.int (b: b >= 16) // { + name = "bits"; + description = "integer of at least 16 bits"; + }; + + paramsSubmodule = { name, config, ... }: { + options.bits = mkOption { + type = bitType; + default = cfg.defaultBitSize; + description = '' + The bit size for the prime that is used during a Diffie-Hellman + key exchange. + ''; + }; + + options.path = mkOption { + type = types.path; + readOnly = true; + description = '' + The resulting path of the generated Diffie-Hellman parameters + file for other services to reference. This could be either a + store path or a file inside the directory specified by + . + ''; + }; + + config.path = let + generated = pkgs.runCommand "dhparams-${name}.pem" { + nativeBuildInputs = [ pkgs.openssl ]; + } "openssl dhparam -out \"$out\" ${toString config.bits}"; + in if cfg.stateful then "${cfg.path}/${name}.pem" else generated; + }; + +in { options = { security.dhparams = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to generate new DH params and clean up old DH params. + ''; + }; + params = mkOption { - description = - '' - Diffie-Hellman parameters to generate. - - The value is the size (in bits) of the DH params to generate. The - generated DH params path can be found in - security.dhparams.path/name.pem. - - Note: The name of the DH params is taken as being the name of the - service it serves: the params will be generated before the said - service is started. - - Warning: If you are removing all dhparams from this list, you have - to leave security.dhparams.enable for at least one activation in - order to have them be cleaned up. This also means if you rollback to - a version without any dhparams the existing ones won't be cleaned - up. - ''; - type = with types; attrsOf int; + type = with types; let + coerce = bits: { inherit bits; }; + in attrsOf (coercedTo int coerce (submodule paramsSubmodule)); default = {}; - example = { nginx = 3072; }; + example = lib.literalExample "{ nginx.bits = 3072; }"; + description = '' + Diffie-Hellman parameters to generate. + + The value is the size (in bits) of the DH params to generate. The + generated DH params path can be found in + config.security.dhparams.params.name.path. + + The name of the DH params is taken as being the name of + the service it serves and the params will be generated before the + said service is started. + + If you are removing all dhparams from this list, you + have to leave for at + least one activation in order to have them be cleaned up. This also + means if you rollback to a version without any dhparams the + existing ones won't be cleaned up. Of course this only applies if + is + true. + + For module implementers:It's recommended + to not set a specific bit size here, so that users can easily + override this by setting + . + ''; + }; + + stateful = mkOption { + type = types.bool; + default = true; + description = '' + Whether generation of Diffie-Hellman parameters should be stateful or + not. If this is enabled, PEM-encoded files for Diffie-Hellman + parameters are placed in the directory specified by + . Otherwise the files are + created within the Nix store. + + If this is false the resulting store + path will be non-deterministic and will be rebuilt every time the + openssl package changes. + ''; + }; + + defaultBitSize = mkOption { + type = bitType; + default = 2048; + description = '' + This allows to override the default bit size for all of the + Diffie-Hellman parameters set in + . + ''; }; path = mkOption { - description = - '' - Path to the directory in which Diffie-Hellman parameters will be - stored. - ''; type = types.str; default = "/var/lib/dhparams"; - }; - - enable = mkOption { - description = - '' - Whether to generate new DH params and clean up old DH params. - ''; - default = false; - type = types.bool; + description = '' + Path to the directory in which Diffie-Hellman parameters will be + stored. This only is relevant if + is + true. + ''; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf (cfg.enable && cfg.stateful) { systemd.services = { dhparams-init = { - description = "Cleanup old Diffie-Hellman parameters"; - wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set + description = "Clean Up Old Diffie-Hellman Parameters"; + + # Clean up even when no DH params is set + wantedBy = [ "multi-user.target" ]; + + serviceConfig.RemainAfterExit = true; serviceConfig.Type = "oneshot"; - script = - # Create directory - '' - if [ ! -d ${cfg.path} ]; then - mkdir -p ${cfg.path} - fi - '' + + + script = '' + if [ ! -d ${cfg.path} ]; then + mkdir -p ${cfg.path} + fi + # Remove old dhparams - '' - for file in ${cfg.path}/*; do - if [ ! -f "$file" ]; then - continue - fi - '' + concatStrings (mapAttrsToList (name: value: - '' - if [ "$file" == "${cfg.path}/${name}.pem" ] && \ - ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then + for file in ${cfg.path}/*; do + if [ ! -f "$file" ]; then + continue + fi + ${lib.concatStrings (lib.mapAttrsToList (name: { bits, path, ... }: '' + if [ "$file" = ${lib.escapeShellArg path} ] && \ + ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text \ + | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then continue fi - '' - ) cfg.params) + - '' - rm $file - done - - # TODO: Ideally this would be removing the *former* cfg.path, though this - # does not seem really important as changes to it are quite unlikely - rmdir --ignore-fail-on-non-empty ${cfg.path} - ''; + '') cfg.params)} + rm $file + done + + # TODO: Ideally this would be removing the *former* cfg.path, though + # this does not seem really important as changes to it are quite + # unlikely + rmdir --ignore-fail-on-non-empty ${cfg.path} + ''; }; - } // - mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" { - description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet"; - after = [ "dhparams-init.service" ]; - before = [ "${name}.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig.Type = "oneshot"; - script = - '' - mkdir -p ${cfg.path} - if [ ! -f ${cfg.path}/${name}.pem ]; then - ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value} - fi - ''; - }) cfg.params; + } // lib.mapAttrs' (name: { bits, path, ... }: lib.nameValuePair "dhparams-gen-${name}" { + description = "Generate Diffie-Hellman Parameters for ${name}"; + after = [ "dhparams-init.service" ]; + before = [ "${name}.service" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig.ConditionPathExists = "!${path}"; + serviceConfig.Type = "oneshot"; + script = '' + mkdir -p ${lib.escapeShellArg cfg.path} + ${pkgs.openssl}/bin/openssl dhparam -out ${lib.escapeShellArg path} \ + ${toString bits} + ''; + }) cfg.params; }; } diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix index 96443fda758c5f563e3d505e26fe8f16435abbf0..55a48ea3c9c62cea4b2034016ca649424ec3db93 100644 --- a/nixos/modules/security/hidepid.nix +++ b/nixos/modules/security/hidepid.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: with lib; { diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml index 5715ee7ac165b8c6ad85fdea0c37e11386f57899..d69341eb3cde18697fee94f1bf153332f3298c2c 100644 --- a/nixos/modules/security/hidepid.xml +++ b/nixos/modules/security/hidepid.xml @@ -8,9 +8,9 @@ Setting - - security.hideProcessInformation = true; - + + = true; + ensures that access to process information is restricted to the owning user. This implies, among other things, that command-line arguments remain private. Unless your deployment relies on unprivileged @@ -25,9 +25,9 @@ To allow a service foo to run without process information hiding, set - - systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ]; - + +systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ]; + diff --git a/nixos/modules/security/oath.nix b/nixos/modules/security/oath.nix index 20f3e2dd9f838709f3b9fafbca9f90871cf330ff..93bdc851117ae31de41961a3ae2a9124871b87b5 100644 --- a/nixos/modules/security/oath.nix +++ b/nixos/modules/security/oath.nix @@ -1,6 +1,6 @@ # This module provides configuration for the OATH PAM modules. -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index e1cad03e66e22bfd160c152286749606190579a9..bef10b4fe614c92b5ce1693347c3896e55eb6c99 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -234,6 +234,11 @@ let password, KDE will prompt separately after login. ''; }; + sssdStrictAccess = mkOption { + default = false; + type = types.bool; + description = "enforce sssd access control"; + }; enableGnomeKeyring = mkOption { default = false; @@ -264,11 +269,13 @@ let text = mkDefault ('' # Account management. - account sufficient pam_unix.so + account ${if cfg.sssdStrictAccess then "required" else "sufficient"} pam_unix.so ${optionalString use_ldap "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"} - ${optionalString config.services.sssd.enable + ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess==false) "account sufficient ${pkgs.sssd}/lib/security/pam_sss.so"} + ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess) + "account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so"} ${optionalString config.krb5.enable "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"} @@ -386,7 +393,7 @@ let ${optionalString (cfg.enableGnomeKeyring) "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} ${optionalString (config.virtualisation.lxc.lxcfs.enable) - "session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"} + "session optional ${pkgs.lxc}/lib/security/pam_cgfs.so -c all"} ''); }; @@ -442,6 +449,10 @@ in item, and value attribute. The syntax and semantics of these attributes must be that described in the limits.conf(5) man page. + + Note that these limits do not apply to systemd services, + whose limits can be changed via + instead. ''; }; diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index a5299728348d6099bbb2fc3a9e1f337b67e6f23c..8b131c54a2a5e29e8c99ac738f901813d2ac7af9 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -40,7 +40,7 @@ in target = "security/pam_mount.conf.xml"; source = let - extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.extraUsers; + extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.users; userVolumeEntry = user: "\n"; in pkgs.writeText "pam_mount.conf.xml" '' diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix index 9bc73bf0b85c3202492b162c2b0fec64ebba16d2..c695ba075ca94cce53ae16abf7466b1ed136d758 100644 --- a/nixos/modules/security/pam_usb.nix +++ b/nixos/modules/security/pam_usb.nix @@ -4,8 +4,6 @@ with lib; let - inherit (pkgs) pam_usb; - cfg = config.security.pam.usb; anyUsbAuth = any (attrByPath ["usbAuth"] false) (attrValues config.security.pam.services); diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 7e59408a5b0b3acee81d6e4e1a0d5215cbfbaa3c..04685f2c9ea15c4a18715528a27259caeb4f954a 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -94,7 +94,7 @@ in rm -rf /var/lib/{polkit-1,PolicyKit} ''; - users.extraUsers.polkituser = { + users.users.polkituser = { description = "PolKit daemon"; uid = config.ids.uids.polkituser; }; diff --git a/nixos/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix index afe93f24273d3922f6afc3cef0ef0fbde00b351a..f6dda21c600643c3365bcca7b182fad6f668b5f1 100644 --- a/nixos/modules/security/rtkit.nix +++ b/nixos/modules/security/rtkit.nix @@ -34,7 +34,7 @@ with lib; services.dbus.packages = [ pkgs.rtkit ]; - users.extraUsers = singleton + users.users = singleton { name = "rtkit"; uid = config.ids.uids.rtkit; description = "RealtimeKit daemon"; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 24283e1d6165cbaf653480f8be387eb439433c6a..69a2a4f8f9ae442c219e513b4567abc098b44828 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -66,6 +66,9 @@ in security.sudo.extraRules = mkOption { description = '' Define specific rules to be in the sudoers file. + More specific rules should come after more general ones in order to + yield the expected behavior. You can use mkBefore/mkAfter to ensure + this is the case when configuration options are merged. ''; default = []; example = [ @@ -75,7 +78,7 @@ in # Allow execution of "/home/root/secret.sh" by user `backup`, `database` # and the group with GID `1006` without a password. - { users = [ "backup" ]; groups = [ 1006 ]; + { users = [ "backup" "database" ]; groups = [ 1006 ]; commands = [ { command = "/home/root/secret.sh"; options = [ "SETENV" "NOPASSWD" ]; } ]; } # Allow all users of group `bar` to run two executables as user `foo` diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c index 7091e314bb22210d73c4c06f8c5d9fcbf2d75f20..494e9e93ac22230a00846098b9ec20df8dc06c89 100644 --- a/nixos/modules/security/wrappers/wrapper.c +++ b/nixos/modules/security/wrappers/wrapper.c @@ -10,8 +10,8 @@ #include #include #include -#include #include +#include #include // Make sure assertions are not compiled out, we use them to codify diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix new file mode 100644 index 0000000000000000000000000000000000000000..70f7dd9e36475a193852a3f7c2e2c5bc6dca8cae --- /dev/null +++ b/nixos/modules/services/admin/oxidized.nix @@ -0,0 +1,116 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.oxidized; +in +{ + options.services.oxidized = { + enable = mkEnableOption "the oxidized configuation backup service."; + + user = mkOption { + type = types.str; + default = "oxidized"; + description = '' + User under which the oxidized service runs. + ''; + }; + + group = mkOption { + type = types.str; + default = "oxidized"; + description = '' + Group under which the oxidized service runs. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/oxidized"; + description = "State directory for the oxidized service."; + }; + + configFile = mkOption { + type = types.path; + example = literalExample '' + pkgs.writeText "oxidized-config.yml" ''' + --- + debug: true + use_syslog: true + input: + default: ssh + ssh: + secure: true + interval: 3600 + model_map: + dell: powerconnect + hp: procurve + source: + default: csv + csv: + delimiter: !ruby/regexp /:/ + file: "/var/lib/oxidized/.config/oxidized/router.db" + map: + name: 0 + model: 1 + username: 2 + password: 3 + pid: "/var/lib/oxidized/.config/oxidized/pid" + rest: 127.0.0.1:8888 + retries: 3 + # ... additional config + '''; + ''; + description = '' + Path to the oxidized configuration file. + ''; + }; + + routerDB = mkOption { + type = types.path; + example = literalExample '' + pkgs.writeText "oxidized-router.db" ''' + hostname-sw1:powerconnect:username1:password2 + hostname-sw2:procurve:username2:password2 + # ... additional hosts + ''' + ''; + description = '' + Path to the file/database which contains the targets for oxidized. + ''; + }; + }; + + config = mkIf cfg.enable { + users.groups.${cfg.group} = { }; + users.users.${cfg.user} = { + description = "Oxidized service user"; + group = cfg.group; + home = cfg.dataDir; + createHome = true; + }; + + systemd.services.oxidized = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + preStart = '' + mkdir -p ${cfg.dataDir}/.config/oxidized + cp -v ${cfg.routerDB} ${cfg.dataDir}/.config/oxidized/router.db + cp -v ${cfg.configFile} ${cfg.dataDir}/.config/oxidized/config + ''; + + serviceConfig = { + ExecStart = "${pkgs.oxidized}/bin/oxidized"; + User = cfg.user; + Group = cfg.group; + UMask = "0077"; + NoNewPrivileges = true; + Restart = "always"; + WorkingDirectory = cfg.dataDir; + KillSignal = "SIGKILL"; + }; + }; + }; +} diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index 261f97617664476aeea44ea26d6fcf59ccd88b5b..27bfd91cd2d58f0eaae5198050e353f531cffb64 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -93,13 +93,13 @@ in { }; config = mkIf cfg.enable { - users.extraUsers.activemq = { + users.users.activemq = { description = "ActiveMQ server user"; group = "activemq"; uid = config.ids.uids.activemq; }; - users.extraGroups.activemq.gid = config.ids.gids.activemq; + users.groups.activemq.gid = config.ids.gids.activemq; systemd.services.activemq_init = { wantedBy = [ "activemq.service" ]; diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index f536d56d7c63da1cefa530abe03df2d9db6f04f6..bb6fc0a104dff90dcac9766b756c791e4a1c932b 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -83,7 +83,7 @@ in { environment.systemPackages = [ pkgs.rabbitmq_server ]; - users.extraUsers.rabbitmq = { + users.users.rabbitmq = { description = "RabbitMQ server user"; home = "${cfg.dataDir}"; createHome = true; @@ -91,7 +91,7 @@ in { uid = config.ids.uids.rabbitmq; }; - users.extraGroups.rabbitmq.gid = config.ids.gids.rabbitmq; + users.groups.rabbitmq.gid = config.ids.gids.rabbitmq; systemd.services.rabbitmq = { description = "RabbitMQ Server"; diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index e3e8bb28c58bbebe4d10637332637404329ffed7..376aad66e236225de09944bf4d8693a3b98fa0eb 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -54,6 +54,11 @@ in description = '' Whether to enable volume and capture control with keyboard media keys. + You want to leave this disabled if you run a desktop environment + like KDE, Gnome, Xfce, etc, as those handle such things themselves. + You might want to enable this if you run a minimalistic desktop + environment or work from bare linux ttys/framebuffers. + Enabling this will turn on . ''; }; diff --git a/nixos/modules/services/audio/liquidsoap.nix b/nixos/modules/services/audio/liquidsoap.nix index 1c19ed36bdc7e24a599d2a04ae836541af7ce666..66f84ef207622d869d8b8db3b63c2cc59b4b5a8f 100644 --- a/nixos/modules/services/audio/liquidsoap.nix +++ b/nixos/modules/services/audio/liquidsoap.nix @@ -57,7 +57,7 @@ in config = mkIf (builtins.length streams != 0) { - users.extraUsers.liquidsoap = { + users.users.liquidsoap = { uid = config.ids.uids.liquidsoap; group = "liquidsoap"; extraGroups = [ "audio" ]; @@ -66,7 +66,7 @@ in createHome = true; }; - users.extraGroups.liquidsoap.gid = config.ids.gids.liquidsoap; + users.groups.liquidsoap.gid = config.ids.gids.liquidsoap; systemd.services = builtins.listToAttrs ( map streamService streams ); }; diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index 52613d450b51eb83cbafd5c172695fd099e9ee08..e2f4ec39f94c6bb9016f85a79d4b919f8891cf37 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -93,7 +93,7 @@ in { }; }; - users.extraUsers.mopidy = { + users.users.mopidy = { inherit uid; group = "mopidy"; extraGroups = [ "audio" ]; @@ -101,7 +101,7 @@ in { home = "${cfg.dataDir}"; }; - users.extraGroups.mopidy.gid = gid; + users.groups.mopidy.gid = gid; }; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 5f379b392ea8b014889afbb06e1c4771b4611e9d..5bfe2b6a22ad78fc8b73a04e0d9c8c02ecda3ec4 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -13,7 +13,9 @@ let mpdConf = pkgs.writeText "mpd.conf" '' music_directory "${cfg.musicDirectory}" playlist_directory "${cfg.playlistDirectory}" - db_file "${cfg.dbFile}" + ${lib.optionalString (cfg.dbFile != null) '' + db_file "${cfg.dbFile}" + ''} state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" log_file "syslog" @@ -53,11 +55,11 @@ in { }; musicDirectory = mkOption { - type = types.path; + type = with types; either path (strMatching "(http|https|nfs|smb)://.+"); default = "${cfg.dataDir}/music"; defaultText = ''''${dataDir}/music''; description = '' - The directory where mpd reads music from. + The directory or NFS/SMB network share where mpd reads music from. ''; }; @@ -126,11 +128,12 @@ in { }; dbFile = mkOption { - type = types.str; + type = types.nullOr types.str; default = "${cfg.dataDir}/tag_cache"; defaultText = ''''${dataDir}/tag_cache''; description = '' - The path to MPD's database. + The path to MPD's database. If set to null the + parameter is omitted from the configuration. ''; }; }; @@ -181,7 +184,7 @@ in { }; }; - users.extraUsers = optionalAttrs (cfg.user == name) (singleton { + users.users = optionalAttrs (cfg.user == name) (singleton { inherit uid; inherit name; group = cfg.group; @@ -190,7 +193,7 @@ in { home = "${cfg.dataDir}"; }); - users.extraGroups = optionalAttrs (cfg.group == name) (singleton { + users.groups = optionalAttrs (cfg.group == name) (singleton { inherit name; gid = gid; }); diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix index 7d661dd604081ff0f996d2437167b08bd2523426..640403d2c97db816d915de2b2e53d749bd91b730 100644 --- a/nixos/modules/services/audio/slimserver.nix +++ b/nixos/modules/services/audio/slimserver.nix @@ -51,7 +51,8 @@ in { serviceConfig = { User = "slimserver"; PermissionsStartOnly = true; - ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache"; + # Issue 40589: Disable broken image/video support (audio still works!) + ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache --noimage --novideo"; }; }; diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix index f1a60be992d85ae3bd9992d1840798f25d58f6f7..57ae385599394dfff178b33b588dc993d9e69bc4 100644 --- a/nixos/modules/services/audio/squeezelite.nix +++ b/nixos/modules/services/audio/squeezelite.nix @@ -54,7 +54,7 @@ in { }; }; - users.extraUsers.squeezelite= { + users.users.squeezelite= { inherit uid; group = "nogroup"; extraGroups = [ "audio" ]; diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 340b0cf072342a5944553f3e0c5acde734ac34c8..a0565ca26204b6c1be1c1f69dacd8517be83821f 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -97,18 +97,7 @@ let ${dir_cfg.extraConfig} ''; - # TODO: by default use this config - bconsole_conf = pkgs.writeText "bconsole.conf" - '' - Director { - Name = ${dir_cfg.name}; - Address = "localhost"; - DirPort = ${toString dir_cfg.port}; - Password = "${dir_cfg.password}"; - } - ''; - - directorOptions = {name, config, ...}: + directorOptions = {...}: { options = { password = mkOption { @@ -128,7 +117,7 @@ let }; }; - deviceOptions = {name, config, ...}: + deviceOptions = {...}: { options = { archiveDevice = mkOption { @@ -397,7 +386,7 @@ in { environment.systemPackages = [ pkgs.bacula ]; - users.extraUsers.bacula = { + users.users.bacula = { group = "bacula"; uid = config.ids.uids.bacula; home = "${libDir}"; @@ -406,6 +395,6 @@ in { shell = "${pkgs.bash}/bin/bash"; }; - users.extraGroups.bacula.gid = config.ids.gids.bacula; + users.groups.bacula.gid = config.ids.gids.bacula; }; } diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 1b730e0c2b76d11253895aa6badf62c75d6cfac3..415a70ea5ad41e41dbc6f3c70df361d68f32a8ae 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -35,25 +35,26 @@ let ${cfg.preHook} '' + optionalString cfg.doInit '' # Run borg init if the repo doesn't exist yet - if ! borg list > /dev/null; then - borg init \ + if ! borg list $extraArgs > /dev/null; then + borg init $extraArgs \ --encryption ${cfg.encryption.mode} \ $extraInitArgs ${cfg.postInit} fi '' + '' - borg create \ + borg create $extraArgs \ --compression ${cfg.compression} \ --exclude-from ${mkExcludeFile cfg} \ $extraCreateArgs \ "::$archiveName$archiveSuffix" \ ${escapeShellArgs cfg.paths} '' + optionalString cfg.appendFailedSuffix '' - borg rename "::$archiveName$archiveSuffix" "$archiveName" + borg rename $extraArgs \ + "::$archiveName$archiveSuffix" "$archiveName" '' + '' ${cfg.postCreate} '' + optionalString (cfg.prune.keep != { }) '' - borg prune \ + borg prune $extraArgs \ ${mkKeepArgs cfg} \ --prefix ${escapeShellArg cfg.prune.prefix} \ $extraPruneArgs @@ -85,13 +86,14 @@ let ProtectSystem = "strict"; ReadWritePaths = [ "${userHome}/.config/borg" "${userHome}/.cache/borg" ] + ++ cfg.readWritePaths # Borg needs write access to repo if it is not remote ++ optional (isLocalPath cfg.repo) cfg.repo; - PrivateTmp = true; + PrivateTmp = cfg.privateTmp; }; environment = { BORG_REPO = cfg.repo; - inherit (cfg) extraInitArgs extraCreateArgs extraPruneArgs; + inherit (cfg) extraArgs extraInitArgs extraCreateArgs extraPruneArgs; } // (mkPassEnv cfg) // cfg.environment; inherit (cfg) startAt; }; @@ -318,6 +320,30 @@ in { ]; }; + readWritePaths = mkOption { + type = with types; listOf path; + description = '' + By default, borg cannot write anywhere on the system but + $HOME/.config/borg and $HOME/.cache/borg. + If, for example, your preHook script needs to dump files + somewhere, put those directories here. + ''; + default = [ ]; + example = [ + "/var/backup/mysqldump" + ]; + }; + + privateTmp = mkOption { + type = types.bool; + description = '' + Set the PrivateTmp option for + the systemd-service. Set to false if you need sockets + or other files from global /tmp. + ''; + default = true; + }; + doInit = mkOption { type = types.bool; description = '' @@ -430,6 +456,16 @@ in { default = ""; }; + extraArgs = mkOption { + type = types.str; + description = '' + Additional arguments for all borg calls the + service has. Handle with care. + ''; + default = ""; + example = "--remote-path=/path/to/borg"; + }; + extraInitArgs = mkOption { type = types.str; description = '' @@ -474,7 +510,7 @@ in { ''; default = { }; type = types.attrsOf (types.submodule ( - { name, config, ... }: { + { ... }: { options = { path = mkOption { diff --git a/nixos/modules/services/backup/crashplan-small-business.nix b/nixos/modules/services/backup/crashplan-small-business.nix index 9497d8c18bb76b0a558661d7008834a0aaaac391..790dafefe66fd22003a4409409a904dc55fc9f81 100644 --- a/nixos/modules/services/backup/crashplan-small-business.nix +++ b/nixos/modules/services/backup/crashplan-small-business.nix @@ -3,7 +3,6 @@ let cfg = config.services.crashplansb; crashplansb = pkgs.crashplansb.override { maxRam = cfg.maxRam; }; - varDir = "/var/lib/crashplan"; in with lib; diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix index d0af2e416b63cdd99feee91570959e17985a4832..c540cc6e2aee6a0da6683db36f8fab8ceca2b65c 100644 --- a/nixos/modules/services/backup/crashplan.nix +++ b/nixos/modules/services/backup/crashplan.nix @@ -3,7 +3,6 @@ let cfg = config.services.crashplan; crashplan = pkgs.crashplan; - varDir = "/var/lib/crashplan"; in with lib; diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix new file mode 100644 index 0000000000000000000000000000000000000000..80287f30b813f876e1068a3c7418ae5f92947598 --- /dev/null +++ b/nixos/modules/services/backup/duplicati.nix @@ -0,0 +1,57 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.duplicati; +in +{ + options = { + services.duplicati = { + enable = mkEnableOption "Duplicati"; + + port = mkOption { + default = 8200; + type = types.int; + description = '' + Port serving the web interface + ''; + }; + + interface = mkOption { + default = "lo"; + type = types.str; + description = '' + Listening interface for the web UI + Set it to "any" to listen on all available interfaces + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.duplicati ]; + + systemd.services.duplicati = { + description = "Duplicati backup"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "duplicati"; + Group = "duplicati"; + ExecStart = "${pkgs.duplicati}/bin/duplicati-server --webservice-interface=${cfg.interface} --webservice-port=${toString cfg.port} --server-datafolder=/var/lib/duplicati"; + Restart = "on-failure"; + }; + }; + + users.users.duplicati = { + uid = config.ids.uids.duplicati; + home = "/var/lib/duplicati"; + createHome = true; + group = "duplicati"; + }; + users.groups.duplicati.gid = config.ids.gids.duplicati; + + }; +} + diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 3f533fa457dc181e8a02dfc6c9de7584feeecf0c..f0c273ffebf154d5841a472a4edcfcadf4f8c8b8 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -84,7 +84,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == defaultUser) (singleton + users.users = optionalAttrs (cfg.user == defaultUser) (singleton { name = defaultUser; isSystemUser = true; createHome = false; diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 4a5ebebc682e1746e4e46f716b99a380b55664ea..2ec78ce6f2cfa2e2ab43d81bc87289a5a35c276b 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -3,18 +3,41 @@ with lib; let - inherit (pkgs) gzip; - location = config.services.postgresqlBackup.location; + cfg = config.services.postgresqlBackup; - postgresqlBackupCron = db: - '' - ${config.services.postgresqlBackup.period} root ${config.services.postgresql.package}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz - ''; + postgresqlBackupService = db : + { + enable = true; -in + description = "Backup of database ${db}"; -{ + requires = [ "postgresql.service" ]; + + preStart = '' + mkdir -m 0700 -p ${cfg.location} + chown postgres ${cfg.location} + ''; + + script = '' + if [ -e ${cfg.location}/${db}.sql.gz ]; then + ${pkgs.coreutils}/bin/mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz + fi + + ${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db} | \ + ${pkgs.gzip}/bin/gzip -c > ${cfg.location}/${db}.sql.gz + ''; + + serviceConfig = { + Type = "oneshot"; + PermissionsStartOnly = "true"; + User = "postgres"; + }; + + startAt = cfg.startAt; + }; + +in { options = { @@ -27,10 +50,10 @@ in ''; }; - period = mkOption { - default = "15 01 * * *"; + startAt = mkOption { + default = "*-*-* 01:15:00"; description = '' - This option defines (in the format used by cron) when the + This option defines (see systemd.time for format) when the databases should be dumped. The default is to update at 01:15 (at night) every day. ''; @@ -49,18 +72,23 @@ in Location to put the gzipped PostgreSQL database dumps. ''; }; + + pgdumpOptions = mkOption { + type = types.string; + default = "-Cbo"; + description = '' + Command line options for pg_dump. + ''; + }; }; }; config = mkIf config.services.postgresqlBackup.enable { - services.cron.systemCronJobs = map postgresqlBackupCron config.services.postgresqlBackup.databases; - system.activationScripts.postgresqlBackup = stringAfter [ "stdio" "users" ] - '' - mkdir -m 0700 -p ${config.services.postgresqlBackup.location} - chown root ${config.services.postgresqlBackup.location} - ''; + systemd.services = listToAttrs (map (db : { + name = "postgresqlBackup-${db}"; + value = postgresqlBackupService db; } ) cfg.databases); }; } diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix new file mode 100644 index 0000000000000000000000000000000000000000..d1b775f150dc173551b91e310feb79fefe05b597 --- /dev/null +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -0,0 +1,107 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.restic.server; +in +{ + meta.maintainers = [ maintainers.bachp ]; + + options.services.restic.server = { + enable = mkEnableOption "Restic REST Server"; + + listenAddress = mkOption { + default = ":8000"; + example = "127.0.0.1:8080"; + type = types.str; + description = "Listen on a specific IP address and port."; + }; + + dataDir = mkOption { + default = "/var/lib/restic"; + type = types.path; + description = "The directory for storing the restic repository."; + }; + + appendOnly = mkOption { + default = false; + type = types.bool; + description = '' + Enable append only mode. + This mode allows creation of new backups but prevents deletion and modification of existing backups. + This can be useful when backing up systems that have a potential of being hacked. + ''; + }; + + privateRepos = mkOption { + default = false; + type = types.bool; + description = '' + Enable private repos. + Grants access only when a subdirectory with the same name as the user is specified in the repository URL. + ''; + }; + + prometheus = mkOption { + default = false; + type = types.bool; + description = "Enable Prometheus metrics at /metrics."; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options to pass to Restic REST server. + ''; + }; + + package = mkOption { + default = pkgs.restic-rest-server; + defaultText = "pkgs.restic-rest-server"; + type = types.package; + description = "Restic REST server package to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.restic-rest-server = { + description = "Restic REST Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/rest-server \ + --listen ${cfg.listenAddress} \ + --path ${cfg.dataDir} \ + ${optionalString cfg.appendOnly "--append-only"} \ + ${optionalString cfg.privateRepos "--private-repos"} \ + ${optionalString cfg.prometheus "--prometheus"} \ + ${escapeShellArgs cfg.extraFlags} \ + ''; + Type = "simple"; + User = "restic"; + Group = "restic"; + + # Security hardening + ReadWritePaths = [ cfg.dataDir ]; + PrivateTmp = true; + ProtectSystem = "strict"; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + PrivateDevices = true; + }; + }; + + users.users.restic = { + group = "restic"; + home = cfg.dataDir; + createHome = true; + uid = config.ids.uids.restic; + }; + + users.groups.restic.gid = config.ids.uids.restic; + }; +} diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix new file mode 100644 index 0000000000000000000000000000000000000000..6ece5a9b5ad632273ac1d4470e98842de9babea9 --- /dev/null +++ b/nixos/modules/services/backup/restic.nix @@ -0,0 +1,160 @@ +{ config, lib, pkgs, ... }: + +with lib; +{ + options.services.restic.backups = mkOption { + description = '' + Periodic backups to create with Restic. + ''; + type = types.attrsOf (types.submodule ({ name, ... }: { + options = { + passwordFile = mkOption { + type = types.str; + description = '' + Read the repository password from a file. + ''; + example = "/etc/nixos/restic-password"; + }; + + s3CredentialsFile = mkOption { + type = with types; nullOr str; + default = null; + description = '' + file containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY + for an S3-hosted repository, in the format of an EnvironmentFile + as described by systemd.exec(5) + ''; + }; + + repository = mkOption { + type = types.str; + description = '' + repository to backup to. + ''; + example = "sftp:backup@192.168.1.100:/backups/${name}"; + }; + + paths = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Which paths to backup. + ''; + example = [ + "/var/lib/postgresql" + "/home/user/backup" + ]; + }; + + timerConfig = mkOption { + type = types.attrsOf types.str; + default = { + OnCalendar = "daily"; + }; + description = '' + When to run the backup. See man systemd.timer for details. + ''; + example = { + OnCalendar = "00:05"; + RandomizedDelaySec = "5h"; + }; + }; + + user = mkOption { + type = types.str; + default = "root"; + description = '' + As which user the backup should run. + ''; + example = "postgresql"; + }; + + extraBackupArgs = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra arguments passed to restic backup. + ''; + example = [ + "--exclude-file=/etc/nixos/restic-ignore" + ]; + }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra extended options to be passed to the restic --option flag. + ''; + example = [ + "sftp.command='ssh backup@192.168.1.100 -i /home/user/.ssh/id_rsa -s sftp'" + ]; + }; + + initialize = mkOption { + type = types.bool; + default = false; + description = '' + Create the repository if it doesn't exist. + ''; + }; + }; + })); + default = {}; + example = { + localbackup = { + paths = [ "/home" ]; + repository = "/mnt/backup-hdd"; + passwordFile = "/etc/nixos/secrets/restic-password"; + initialize = true; + }; + remotebackup = { + paths = [ "/home" ]; + repository = "sftp:backup@host:/backups/home"; + passwordFile = "/etc/nixos/secrets/restic-password"; + extraOptions = [ + "sftp.command='ssh backup@host -i /etc/nixos/secrets/backup-private-key -s sftp'" + ]; + timerConfig = { + OnCalendar = "00:05"; + RandomizedDelaySec = "5h"; + }; + }; + }; + }; + + config = { + systemd.services = + mapAttrs' (name: backup: + let + extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions; + resticCmd = "${pkgs.restic}/bin/restic${extraOptions}"; + in nameValuePair "restic-backups-${name}" ({ + environment = { + RESTIC_PASSWORD_FILE = backup.passwordFile; + RESTIC_REPOSITORY = backup.repository; + }; + path = with pkgs; [ + openssh + ]; + restartIfChanged = false; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${resticCmd} backup ${concatStringsSep " " backup.extraBackupArgs} ${concatStringsSep " " backup.paths}"; + User = backup.user; + } // optionalAttrs (backup.s3CredentialsFile != null) { + EnvironmentFile = backup.s3CredentialsFile; + }; + } // optionalAttrs backup.initialize { + preStart = '' + ${resticCmd} snapshots || ${resticCmd} init + ''; + }) + ) config.services.restic.backups; + systemd.timers = + mapAttrs' (name: backup: nameValuePair "restic-backups-${name}" { + wantedBy = [ "timers.target" ]; + timerConfig = backup.timerConfig; + }) config.services.restic.backups; + }; +} diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index 3d133f82d204878ab6d88e6a88055936bd36ed76..fc8a424190f7ee7ffced2ad4fcb0ad5f4b25aff7 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -5,13 +5,6 @@ with types; let - # Converts a plan like - # { "1d" = "1h"; "1w" = "1d"; } - # into - # "1d=>1h,1w=>1d" - attrToPlan = attrs: concatStringsSep "," (builtins.attrValues ( - mapAttrs (n: v: "${n}=>${v}") attrs)); - planDescription = '' The znapzend backup plan to use for the source. diff --git a/nixos/modules/services/cluster/fleet.nix b/nixos/modules/services/cluster/fleet.nix deleted file mode 100644 index ec03be3959483cf3c033a6583ec913143fad2e95..0000000000000000000000000000000000000000 --- a/nixos/modules/services/cluster/fleet.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.fleet; - -in { - - ##### Interface - options.services.fleet = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable fleet service. - ''; - }; - - listen = mkOption { - type = types.listOf types.str; - default = [ "/var/run/fleet.sock" ]; - example = [ "/var/run/fleet.sock" "127.0.0.1:49153" ]; - description = '' - Fleet listening addresses. - ''; - }; - - etcdServers = mkOption { - type = types.listOf types.str; - default = [ "http://127.0.0.1:2379" ]; - description = '' - Fleet list of etcd endpoints to use. - ''; - }; - - publicIp = mkOption { - type = types.nullOr types.str; - default = ""; - description = '' - Fleet IP address that should be published with the local Machine's - state and any socket information. If not set, fleetd will attempt - to detect the IP it should publish based on the machine's IP - routing information. - ''; - }; - - etcdCafile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Fleet TLS ca file when SSL certificate authentication is enabled - in etcd endpoints. - ''; - }; - - etcdKeyfile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Fleet TLS key file when SSL certificate authentication is enabled - in etcd endpoints. - ''; - }; - - etcdCertfile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Fleet TLS cert file when SSL certificate authentication is enabled - in etcd endpoints. - ''; - }; - - metadata = mkOption { - type = types.attrsOf types.str; - default = {}; - apply = attrs: concatMapStringsSep "," (n: "${n}=${attrs."${n}"}") (attrNames attrs); - example = literalExample '' - { - region = "us-west"; - az = "us-west-1"; - } - ''; - description = '' - Key/value pairs that are published with the local to the fleet registry. - This data can be used directly by a client of fleet to make scheduling decisions. - ''; - }; - - extraConfig = mkOption { - type = types.attrsOf types.str; - apply = mapAttrs' (n: v: nameValuePair ("FLEET_" + n) v); - default = {}; - example = literalExample '' - { - VERBOSITY = 1; - ETCD_REQUEST_TIMEOUT = "2.0"; - AGENT_TTL = "40s"; - } - ''; - description = '' - Fleet extra config. See - - for configuration options. - ''; - }; - - }; - - ##### Implementation - config = mkIf cfg.enable { - systemd.services.fleet = { - description = "Fleet Init System Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "fleet.socket" "etcd.service" "docker.service" ]; - requires = [ "fleet.socket" ]; - environment = { - FLEET_ETCD_SERVERS = concatStringsSep "," cfg.etcdServers; - FLEET_PUBLIC_IP = cfg.publicIp; - FLEET_ETCD_CAFILE = cfg.etcdCafile; - FLEET_ETCD_KEYFILE = cfg.etcdKeyfile; - FLEET_ETCD_CERTFILE = cfg.etcdCertfile; - FLEET_METADATA = cfg.metadata; - } // cfg.extraConfig; - serviceConfig = { - ExecStart = "${pkgs.fleet}/bin/fleetd"; - Group = "fleet"; - }; - }; - - systemd.sockets.fleet = { - description = "Fleet Socket for the API"; - wantedBy = [ "sockets.target" ]; - listenStreams = cfg.listen; - socketConfig = { - ListenStream = "/var/run/fleet.sock"; - SocketMode = "0660"; - SocketUser = "root"; - SocketGroup = "fleet"; - }; - }; - - services.etcd.enable = mkDefault true; - virtualisation.docker.enable = mkDefault true; - - environment.systemPackages = [ pkgs.fleet ]; - users.extraGroups.fleet.gid = config.ids.gids.fleet; - }; -} diff --git a/nixos/modules/services/cluster/hadoop/conf.nix b/nixos/modules/services/cluster/hadoop/conf.nix new file mode 100644 index 0000000000000000000000000000000000000000..38db10406b9a0d62847ecaad7354d129e1837cd4 --- /dev/null +++ b/nixos/modules/services/cluster/hadoop/conf.nix @@ -0,0 +1,31 @@ +{ hadoop, pkgs }: +let + propertyXml = name: value: '' + + ${name} + ${builtins.toString value} + + ''; + siteXml = fileName: properties: pkgs.writeTextDir fileName '' + + + + ${builtins.concatStringsSep "\n" (pkgs.lib.mapAttrsToList propertyXml properties)} + + ''; + userFunctions = '' + hadoop_verify_logdir() { + echo Skipping verification of log directory + } + ''; +in +pkgs.buildEnv { + name = "hadoop-conf"; + paths = [ + (siteXml "core-site.xml" hadoop.coreSite) + (siteXml "hdfs-site.xml" hadoop.hdfsSite) + (siteXml "mapred-site.xml" hadoop.mapredSite) + (siteXml "yarn-site.xml" hadoop.yarnSite) + (pkgs.writeTextDir "hadoop-user-functions.sh" userFunctions) + ]; +} diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f0f5a6ecbfc54cb2c0ce7a639938a0cb6d26f6c0 --- /dev/null +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -0,0 +1,60 @@ +{ config, lib, pkgs, ...}: + +with lib; +{ + imports = [ ./yarn.nix ./hdfs.nix ]; + + options.services.hadoop = { + coreSite = mkOption { + default = {}; + example = { + "fs.defaultFS" = "hdfs://localhost"; + }; + description = "Hadoop core-site.xml definition"; + }; + + hdfsSite = mkOption { + default = {}; + example = { + "dfs.nameservices" = "namenode1"; + }; + description = "Hadoop hdfs-site.xml definition"; + }; + + mapredSite = mkOption { + default = {}; + example = { + "mapreduce.map.cpu.vcores" = "1"; + }; + description = "Hadoop mapred-site.xml definition"; + }; + + yarnSite = mkOption { + default = {}; + example = { + "yarn.resourcemanager.ha.id" = "resourcemanager1"; + }; + description = "Hadoop yarn-site.xml definition"; + }; + + package = mkOption { + type = types.package; + default = pkgs.hadoop; + defaultText = "pkgs.hadoop"; + example = literalExample "pkgs.hadoop"; + description = '' + ''; + }; + }; + + + config = mkMerge [ + (mkIf (builtins.hasAttr "yarn" config.users.users || + builtins.hasAttr "hdfs" config.users.users) { + users.groups.hadoop = { + gid = config.ids.gids.hadoop; + }; + }) + + ]; +} diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixos/modules/services/cluster/hadoop/hdfs.nix new file mode 100644 index 0000000000000000000000000000000000000000..a38b6a78d3a51efed1bd0edf6c7ec9dd20bcd1cb --- /dev/null +++ b/nixos/modules/services/cluster/hadoop/hdfs.nix @@ -0,0 +1,73 @@ +{ config, lib, pkgs, ...}: +let + cfg = config.services.hadoop; + hadoopConf = import ./conf.nix { hadoop = cfg; pkgs = pkgs; }; +in +with lib; +{ + options.services.hadoop.hdfs = { + namenode.enabled = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run the Hadoop YARN NameNode + ''; + }; + datanode.enabled = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run the Hadoop YARN DataNode + ''; + }; + }; + + config = mkMerge [ + (mkIf cfg.hdfs.namenode.enabled { + systemd.services."hdfs-namenode" = { + description = "Hadoop HDFS NameNode"; + wantedBy = [ "multi-user.target" ]; + + environment = { + HADOOP_HOME = "${cfg.package}"; + }; + + preStart = '' + ${cfg.package}/bin/hdfs --config ${hadoopConf} namenode -format -nonInteractive || true + ''; + + serviceConfig = { + User = "hdfs"; + SyslogIdentifier = "hdfs-namenode"; + ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} namenode"; + }; + }; + }) + (mkIf cfg.hdfs.datanode.enabled { + systemd.services."hdfs-datanode" = { + description = "Hadoop HDFS DataNode"; + wantedBy = [ "multi-user.target" ]; + + environment = { + HADOOP_HOME = "${cfg.package}"; + }; + + serviceConfig = { + User = "hdfs"; + SyslogIdentifier = "hdfs-datanode"; + ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} datanode"; + }; + }; + }) + (mkIf ( + cfg.hdfs.namenode.enabled || cfg.hdfs.datanode.enabled + ) { + users.users.hdfs = { + description = "Hadoop HDFS user"; + group = "hadoop"; + uid = config.ids.uids.hdfs; + }; + }) + + ]; +} diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix new file mode 100644 index 0000000000000000000000000000000000000000..5345a2732d7e01dbcfb5c32b84966045983c2e03 --- /dev/null +++ b/nixos/modules/services/cluster/hadoop/yarn.nix @@ -0,0 +1,74 @@ +{ config, lib, pkgs, ...}: +let + cfg = config.services.hadoop; + hadoopConf = import ./conf.nix { hadoop = cfg; pkgs = pkgs; }; +in +with lib; +{ + options.services.hadoop.yarn = { + resourcemanager.enabled = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run the Hadoop YARN ResourceManager + ''; + }; + nodemanager.enabled = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run the Hadoop YARN NodeManager + ''; + }; + }; + + config = mkMerge [ + (mkIf ( + cfg.yarn.resourcemanager.enabled || cfg.yarn.nodemanager.enabled + ) { + + users.users.yarn = { + description = "Hadoop YARN user"; + group = "hadoop"; + uid = config.ids.uids.yarn; + }; + }) + + (mkIf cfg.yarn.resourcemanager.enabled { + systemd.services."yarn-resourcemanager" = { + description = "Hadoop YARN ResourceManager"; + wantedBy = [ "multi-user.target" ]; + + environment = { + HADOOP_HOME = "${cfg.package}"; + }; + + serviceConfig = { + User = "yarn"; + SyslogIdentifier = "yarn-resourcemanager"; + ExecStart = "${cfg.package}/bin/yarn --config ${hadoopConf} " + + " resourcemanager"; + }; + }; + }) + + (mkIf cfg.yarn.nodemanager.enabled { + systemd.services."yarn-nodemanager" = { + description = "Hadoop YARN NodeManager"; + wantedBy = [ "multi-user.target" ]; + + environment = { + HADOOP_HOME = "${cfg.package}"; + }; + + serviceConfig = { + User = "yarn"; + SyslogIdentifier = "yarn-nodemanager"; + ExecStart = "${cfg.package}/bin/yarn --config ${hadoopConf} " + + " nodemanager"; + }; + }; + }) + + ]; +} diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix index e331889b9dd5a2230366839dae5f872e7dc757c0..cbd6e8f7bf733d2d03fb68cfc5695a4c7a77ed62 100644 --- a/nixos/modules/services/cluster/kubernetes/dashboard.nix +++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix @@ -4,38 +4,60 @@ with lib; let cfg = config.services.kubernetes.addons.dashboard; - - name = "gcr.io/google_containers/kubernetes-dashboard-amd64"; - version = "v1.8.2"; - - image = pkgs.dockerTools.pullImage { - imageName = name; - imageTag = version; - sha256 = "11h0fz3wxp0f10fsyqaxjm7l2qg7xws50dv5iwlck5gb1fjmajad"; - }; in { options.services.kubernetes.addons.dashboard = { enable = mkEnableOption "kubernetes dashboard addon"; - enableRBAC = mkOption { - description = "Whether to enable role based access control is enabled for kubernetes dashboard"; - type = types.bool; - default = elem "RBAC" config.services.kubernetes.apiserver.authorizationMode; + rbac = mkOption { + description = "Role-based access control (RBAC) options"; + default = {}; + type = types.submodule { + options = { + enable = mkOption { + description = "Whether to enable role based access control is enabled for kubernetes dashboard"; + type = types.bool; + default = elem "RBAC" config.services.kubernetes.apiserver.authorizationMode; + }; + + clusterAdmin = mkOption { + description = "Whether to assign cluster admin rights to the kubernetes dashboard"; + type = types.bool; + default = false; + }; + }; + }; + }; + + version = mkOption { + description = "Which version of the kubernetes dashboard to deploy"; + type = types.str; + default = "v1.8.3"; + }; + + image = mkOption { + description = "Docker image to seed for the kubernetes dashboard container."; + type = types.attrs; + default = { + imageName = "k8s.gcr.io/kubernetes-dashboard-amd64"; + imageDigest = "sha256:dc4026c1b595435ef5527ca598e1e9c4343076926d7d62b365c44831395adbd0"; + finalImageTag = cfg.version; + sha256 = "18ajcg0q1vignfjk2sm4xj4wzphfz8wah69ps8dklqfvv0164mc8"; + }; }; }; config = mkIf cfg.enable { - services.kubernetes.kubelet.seedDockerImages = [image]; + services.kubernetes.kubelet.seedDockerImages = [(pkgs.dockerTools.pullImage cfg.image)]; services.kubernetes.addonManager.addons = { kubernetes-dashboard-deployment = { kind = "Deployment"; - apiVersion = "apps/v1beta1"; + apiVersion = "apps/v1"; metadata = { labels = { k8s-addon = "kubernetes-dashboard.addons.k8s.io"; k8s-app = "kubernetes-dashboard"; - version = version; + version = cfg.version; "kubernetes.io/cluster-service" = "true"; "addonmanager.kubernetes.io/mode" = "Reconcile"; }; @@ -51,45 +73,66 @@ in { labels = { k8s-addon = "kubernetes-dashboard.addons.k8s.io"; k8s-app = "kubernetes-dashboard"; - version = version; + version = cfg.version; "kubernetes.io/cluster-service" = "true"; }; annotations = { "scheduler.alpha.kubernetes.io/critical-pod" = ""; - #"scheduler.alpha.kubernetes.io/tolerations" = ''[{"key":"CriticalAddonsOnly", "operator":"Exists"}]''; }; }; spec = { + priorityClassName = "system-cluster-critical"; containers = [{ name = "kubernetes-dashboard"; - image = "${name}:${version}"; + image = with cfg.image; "${imageName}:${finalImageTag}"; ports = [{ - containerPort = 9090; + containerPort = 8443; protocol = "TCP"; }]; resources = { limits = { cpu = "100m"; - memory = "50Mi"; + memory = "300Mi"; }; requests = { cpu = "100m"; - memory = "50Mi"; + memory = "100Mi"; }; }; + args = ["--auto-generate-certificates"]; + volumeMounts = [{ + name = "tmp-volume"; + mountPath = "/tmp"; + } { + name = "kubernetes-dashboard-certs"; + mountPath = "/certs"; + }]; livenessProbe = { httpGet = { + scheme = "HTTPS"; path = "/"; - port = 9090; + port = 8443; }; initialDelaySeconds = 30; timeoutSeconds = 30; }; }]; + volumes = [{ + name = "kubernetes-dashboard-certs"; + secret = { + secretName = "kubernetes-dashboard-certs"; + }; + } { + name = "tmp-volume"; + emptyDir = {}; + }]; serviceAccountName = "kubernetes-dashboard"; tolerations = [{ key = "node-role.kubernetes.io/master"; effect = "NoSchedule"; + } { + key = "CriticalAddonsOnly"; + operator = "Exists"; }]; }; }; @@ -112,8 +155,8 @@ in { }; spec = { ports = [{ - port = 80; - targetPort = 9090; + port = 443; + targetPort = 8443; }]; selector.k8s-app = "kubernetes-dashboard"; }; @@ -126,35 +169,153 @@ in { labels = { k8s-app = "kubernetes-dashboard"; k8s-addon = "kubernetes-dashboard.addons.k8s.io"; - "addonmanager.kubernetes.io/mode" = "Reconcile"; + "addonmanager.kubernetes.io/mode" = "Reconcile"; }; name = "kubernetes-dashboard"; namespace = "kube-system"; }; }; - } // (optionalAttrs cfg.enableRBAC { - kubernetes-dashboard-crb = { - apiVersion = "rbac.authorization.k8s.io/v1beta1"; - kind = "ClusterRoleBinding"; + kubernetes-dashboard-sec-certs = { + apiVersion = "v1"; + kind = "Secret"; metadata = { - name = "kubernetes-dashboard"; labels = { k8s-app = "kubernetes-dashboard"; - k8s-addon = "kubernetes-dashboard.addons.k8s.io"; - "addonmanager.kubernetes.io/mode" = "Reconcile"; + # Allows editing resource and makes sure it is created first. + "addonmanager.kubernetes.io/mode" = "EnsureExists"; + }; + name = "kubernetes-dashboard-certs"; + namespace = "kube-system"; + }; + type = "Opaque"; + }; + kubernetes-dashboard-sec-kholder = { + apiVersion = "v1"; + kind = "Secret"; + metadata = { + labels = { + k8s-app = "kubernetes-dashboard"; + # Allows editing resource and makes sure it is created first. + "addonmanager.kubernetes.io/mode" = "EnsureExists"; }; + name = "kubernetes-dashboard-key-holder"; + namespace = "kube-system"; }; - roleRef = { - apiGroup = "rbac.authorization.k8s.io"; - kind = "ClusterRole"; - name = "cluster-admin"; + type = "Opaque"; + }; + kubernetes-dashboard-cm = { + apiVersion = "v1"; + kind = "ConfigMap"; + metadata = { + labels = { + k8s-app = "kubernetes-dashboard"; + # Allows editing resource and makes sure it is created first. + "addonmanager.kubernetes.io/mode" = "EnsureExists"; + }; + name = "kubernetes-dashboard-settings"; + namespace = "kube-system"; }; + }; + } // (optionalAttrs cfg.rbac.enable + (let subjects = [{ kind = "ServiceAccount"; name = "kubernetes-dashboard"; namespace = "kube-system"; }]; - }; - }); + labels = { + k8s-app = "kubernetes-dashboard"; + k8s-addon = "kubernetes-dashboard.addons.k8s.io"; + "addonmanager.kubernetes.io/mode" = "Reconcile"; + }; + in + (if cfg.rbac.clusterAdmin then { + kubernetes-dashboard-crb = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "ClusterRoleBinding"; + metadata = { + name = "kubernetes-dashboard"; + inherit labels; + }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "ClusterRole"; + name = "cluster-admin"; + }; + inherit subjects; + }; + } + else + { + # Upstream role- and rolebinding as per: + # https://raw.githubusercontent.com/kubernetes/dashboard/master/src/deploy/alternative/kubernetes-dashboard.yaml + kubernetes-dashboard-role = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "Role"; + metadata = { + name = "kubernetes-dashboard-minimal"; + namespace = "kube-system"; + inherit labels; + }; + rules = [ + # Allow Dashboard to create 'kubernetes-dashboard-key-holder' secret. + { + apiGroups = [""]; + resources = ["secrets"]; + verbs = ["create"]; + } + # Allow Dashboard to create 'kubernetes-dashboard-settings' config map. + { + apiGroups = [""]; + resources = ["configmaps"]; + verbs = ["create"]; + } + # Allow Dashboard to get, update and delete Dashboard exclusive secrets. + { + apiGroups = [""]; + resources = ["secrets"]; + resourceNames = ["kubernetes-dashboard-key-holder"]; + verbs = ["get" "update" "delete"]; + } + # Allow Dashboard to get and update 'kubernetes-dashboard-settings' config map. + { + apiGroups = [""]; + resources = ["configmaps"]; + resourceNames = ["kubernetes-dashboard-settings"]; + verbs = ["get" "update"]; + } + # Allow Dashboard to get metrics from heapster. + { + apiGroups = [""]; + resources = ["services"]; + resourceNames = ["heapster"]; + verbs = ["proxy"]; + } + { + apiGroups = [""]; + resources = ["services/proxy"]; + resourceNames = ["heapster" "http:heapster:" "https:heapster:"]; + verbs = ["get"]; + } + ]; + }; + + kubernetes-dashboard-rb = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "RoleBinding"; + metadata = { + name = "kubernetes-dashboard-minimal"; + namespace = "kube-system"; + inherit labels; + }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "Role"; + name = "kubernetes-dashboard-minimal"; + }; + inherit subjects; + }; + }) + )); }; } diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index aeb0a0d2432d73e6b34dbd81a85383367dbcd022..aeaa6bd66c99fb57648d1cd7e60610a51f81cc7f 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -5,8 +5,36 @@ with lib; let cfg = config.services.kubernetes; - skipAttrs = attrs: map (filterAttrs (k: v: k != "enable")) - (filter (v: !(hasAttr "enable" v) || v.enable) attrs); + # YAML config; see: + # https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ + # https://github.com/kubernetes/kubernetes/blob/release-1.10/pkg/kubelet/apis/kubeletconfig/v1beta1/types.go + # + # TODO: migrate the following flags to this config file + # + # --pod-manifest-path + # --address + # --port + # --tls-cert-file + # --tls-private-key-file + # --client-ca-file + # --authentication-token-webhook + # --authentication-token-webhook-cache-ttl + # --authorization-mode + # --healthz-bind-address + # --healthz-port + # --allow-privileged + # --cluster-dns + # --cluster-domain + # --hairpin-mode + # --feature-gates + kubeletConfig = pkgs.runCommand "kubelet-config.yaml" { } '' + echo > $out ${pkgs.lib.escapeShellArg (builtins.toJSON { + kind = "KubeletConfiguration"; + apiVersion = "kubelet.config.k8s.io/v1beta1"; + ${if cfg.kubelet.applyManifests then "staticPodPath" else null} = + manifests; + })} + ''; infraContainer = pkgs.dockerTools.buildImage { name = "pause"; @@ -42,12 +70,14 @@ let mkKubeConfigOptions = prefix: { server = mkOption { description = "${prefix} kube-apiserver server address."; - default = "http://${cfg.apiserver.address}:${toString cfg.apiserver.port}"; + default = "http://${if cfg.apiserver.advertiseAddress != null + then cfg.apiserver.advertiseAddress + else "127.0.0.1"}:${toString cfg.apiserver.port}"; type = types.str; }; caFile = mkOption { - description = "${prefix} certificate authrority file used to connect to kube-apiserver."; + description = "${prefix} certificate authority file used to connect to kube-apiserver."; type = types.nullOr types.path; default = cfg.caFile; }; @@ -72,12 +102,18 @@ let keyFile = mkDefault cfg.kubeconfig.keyFile; }; - cniConfig = pkgs.buildEnv { - name = "kubernetes-cni-config"; - paths = imap (i: entry: - pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry) - ) cfg.kubelet.cni.config; - }; + cniConfig = + if cfg.kubelet.cni.config != [] && !(isNull cfg.kubelet.cni.configDir) then + throw "Verbatim CNI-config and CNI configDir cannot both be set." + else if !(isNull cfg.kubelet.cni.configDir) then + cfg.kubelet.cni.configDir + else + (pkgs.buildEnv { + name = "kubernetes-cni-config"; + paths = imap (i: entry: + pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry) + ) cfg.kubelet.cni.config; + }); manifests = pkgs.buildEnv { name = "kubernetes-manifests"; @@ -213,18 +249,13 @@ in { type = types.listOf types.str; }; - address = mkOption { - description = "Kubernetes apiserver listening address."; - default = "127.0.0.1"; - type = types.str; - }; - - publicAddress = mkOption { + bindAddress = mkOption { description = '' - Kubernetes apiserver public listening address used for read only and - secure port. + The IP address on which to listen for the --secure-port port. + The associated interface(s) must be reachable by the rest + of the cluster, and by CLI/web clients. ''; - default = cfg.apiserver.address; + default = "0.0.0.0"; type = types.str; }; @@ -279,7 +310,7 @@ in { tokenAuthFile = mkOption { description = '' Kubernetes apiserver token authentication file. See - + ''; default = null; type = types.nullOr types.path; @@ -288,7 +319,7 @@ in { basicAuthFile = mkOption { description = '' Kubernetes apiserver basic authentication file. See - + ''; default = pkgs.writeText "users" '' kubernetes,admin,0 @@ -298,22 +329,31 @@ in { authorizationMode = mkOption { description = '' - Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See - + Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/Webhook/RBAC/Node). See + ''; default = ["RBAC" "Node"]; - type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC" "Node"]); + type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "Webhook" "RBAC" "Node"]); }; authorizationPolicy = mkOption { description = '' Kubernetes apiserver authorization policy file. See - + ''; default = []; type = types.listOf types.attrs; }; + webhookConfig = mkOption { + description = '' + Kubernetes apiserver Webhook config file. It uses the kubeconfig file format. + See + ''; + default = null; + type = types.nullOr types.path; + }; + allowPrivileged = mkOption { description = "Whether to allow privileged containers on Kubernetes."; default = true; @@ -332,16 +372,16 @@ in { runtimeConfig = mkOption { description = '' Api runtime configuration. See - + ''; default = "authentication.k8s.io/v1beta1=true"; example = "api/all=false,api/v1=true"; type = types.str; }; - admissionControl = mkOption { + enableAdmissionPlugins = mkOption { description = '' - Kubernetes admission control plugins to use. See + Kubernetes admission control plugins to enable. See ''; default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" "NodeRestriction"]; @@ -353,6 +393,15 @@ in { type = types.listOf types.str; }; + disableAdmissionPlugins = mkOption { + description = '' + Kubernetes admission control plugins to disable. See + + ''; + default = []; + type = types.listOf types.str; + }; + serviceAccountKeyFile = mkOption { description = '' Kubernetes apiserver PEM-encoded x509 RSA private or public key file, @@ -573,6 +622,7 @@ in { type = types.bool; }; + # TODO: remove this deprecated flag cadvisorPort = mkOption { description = "Kubernetes kubelet local cadvisor port."; default = 4194; @@ -629,6 +679,12 @@ in { }] ''; }; + + configDir = mkOption { + description = "Path to Kubernetes CNI configuration directory."; + type = types.nullOr types.path; + default = null; + }; }; manifests = mkOption { @@ -782,13 +838,13 @@ in { path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ cfg.path; serviceConfig = { Slice = "kubernetes.slice"; + CPUAccounting = true; + MemoryAccounting = true; ExecStart = ''${cfg.package}/bin/kubelet \ - ${optionalString cfg.kubelet.applyManifests - "--pod-manifest-path=${manifests}"} \ ${optionalString (taints != "") "--register-with-taints=${taints}"} \ --kubeconfig=${mkKubeConfig "kubelet" cfg.kubelet.kubeconfig} \ - --require-kubeconfig \ + --config=${kubeletConfig} \ --address=${cfg.kubelet.address} \ --port=${toString cfg.kubelet.port} \ --register-node=${boolToString cfg.kubelet.registerNode} \ @@ -853,7 +909,7 @@ in { (mkIf cfg.apiserver.enable { systemd.services.kube-apiserver = { - description = "Kubernetes Kubelet Service"; + description = "Kubernetes APIServer Service"; wantedBy = [ "kubernetes.target" ]; after = [ "network.target" "docker.service" ]; serviceConfig = { @@ -867,7 +923,7 @@ in { ${optionalString (cfg.etcd.keyFile != null) "--etcd-keyfile=${cfg.etcd.keyFile}"} \ --insecure-port=${toString cfg.apiserver.port} \ - --bind-address=0.0.0.0 \ + --bind-address=${cfg.apiserver.bindAddress} \ ${optionalString (cfg.apiserver.advertiseAddress != null) "--advertise-address=${cfg.apiserver.advertiseAddress}"} \ --allow-privileged=${boolToString cfg.apiserver.allowPrivileged}\ @@ -895,11 +951,15 @@ in { (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.apiserver.authorizationPolicy) }" } \ + ${optionalString (elem "Webhook" cfg.apiserver.authorizationMode) + "--authorization-webhook-config-file=${cfg.apiserver.webhookConfig}" + } \ --secure-port=${toString cfg.apiserver.securePort} \ --service-cluster-ip-range=${cfg.apiserver.serviceClusterIpRange} \ ${optionalString (cfg.apiserver.runtimeConfig != "") "--runtime-config=${cfg.apiserver.runtimeConfig}"} \ - --admission_control=${concatStringsSep "," cfg.apiserver.admissionControl} \ + --enable-admission-plugins=${concatStringsSep "," cfg.apiserver.enableAdmissionPlugins} \ + --disable-admission-plugins=${concatStringsSep "," cfg.apiserver.disableAdmissionPlugins} \ ${optionalString (cfg.apiserver.serviceAccountKeyFile!=null) "--service-account-key-file=${cfg.apiserver.serviceAccountKeyFile}"} \ ${optionalString cfg.verbose "--v=6"} \ @@ -1055,6 +1115,7 @@ in { wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; environment.ADDON_PATH = "/etc/kubernetes/addons/"; + path = [ pkgs.gawk ]; serviceConfig = { Slice = "kubernetes.slice"; ExecStart = "${cfg.package}/bin/kube-addons"; @@ -1084,7 +1145,7 @@ in { ]; environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { + users.users = singleton { name = "kubernetes"; uid = config.ids.uids.kubernetes; description = "Kubernetes user"; @@ -1093,7 +1154,7 @@ in { home = cfg.dataDir; createHome = true; }; - users.extraGroups.kubernetes.gid = config.ids.gids.kubernetes; + users.groups.kubernetes.gid = config.ids.gids.kubernetes; # dns addon is enabled by default services.kubernetes.addons.dns.enable = mkDefault true; diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/dns.nix index 226fdadffd1a278b2a0315c84a0c0ef02b59821e..43bbb50a48d4de8b01a25f775634b0940f479592 100644 --- a/nixos/modules/services/cluster/kubernetes/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/dns.nix @@ -3,26 +3,7 @@ with lib; let - version = "1.14.4"; - - k8s-dns-kube-dns = pkgs.dockerTools.pullImage { - imageName = "gcr.io/google_containers/k8s-dns-kube-dns-amd64"; - imageTag = version; - sha256 = "0q97xfqrigrfjl2a9cxl5in619py0zv44gch09jm8gqjkxl80imp"; - }; - - k8s-dns-dnsmasq-nanny = pkgs.dockerTools.pullImage { - imageName = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64"; - imageTag = version; - sha256 = "051w5ca4qb88mwva4hbnh9xzlsvv7k1mbk3wz50lmig2mqrqqx6c"; - }; - - k8s-dns-sidecar = pkgs.dockerTools.pullImage { - imageName = "gcr.io/google_containers/k8s-dns-sidecar-amd64"; - imageTag = version; - sha256 = "1z0d129bcm8i2cqq36x5jhnrv9hirj8c6kjrmdav8vgf7py78vsm"; - }; - + version = "1.14.10"; cfg = config.services.kubernetes.addons.dns; in { options.services.kubernetes.addons.dns = { @@ -45,18 +26,51 @@ in { default = "cluster.local"; type = types.str; }; + + kube-dns = mkOption { + description = "Docker image to seed for the kube-dns main container."; + type = types.attrs; + default = { + imageName = "k8s.gcr.io/k8s-dns-kube-dns-amd64"; + imageDigest = "sha256:b99fc3eee2a9f052f7eb4cc00f15eb12fc405fa41019baa2d6b79847ae7284a8"; + finalImageTag = version; + sha256 = "0x583znk9smqn0fix7ld8sm5jgaxhqhx3fq97b1wkqm7iwhvl3pj"; + }; + }; + + dnsmasq-nanny = mkOption { + description = "Docker image to seed for the kube-dns dnsmasq container."; + type = types.attrs; + default = { + imageName = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64"; + imageDigest = "sha256:bbb2a290a568125b3b996028958eb773f33b5b87a6b37bf38a28f8b62dddb3c8"; + finalImageTag = version; + sha256 = "1fihml7s2mfwgac51cbqpylkwbivc8nyhgi4vb820s83zvl8a6y1"; + }; + }; + + sidecar = mkOption { + description = "Docker image to seed for the kube-dns sidecar container."; + type = types.attrs; + default = { + imageName = "k8s.gcr.io/k8s-dns-sidecar-amd64"; + imageDigest = "sha256:4f1ab957f87b94a5ec1edc26fae50da2175461f00afecf68940c4aa079bd08a4"; + finalImageTag = version; + sha256 = "08l1bv5jgrhvjzpqpbinrkgvv52snc4fzyd8ya9v18ns2klyz7m0"; + }; + }; }; config = mkIf cfg.enable { - services.kubernetes.kubelet.seedDockerImages = [ - k8s-dns-kube-dns - k8s-dns-dnsmasq-nanny - k8s-dns-sidecar + services.kubernetes.kubelet.seedDockerImages = with pkgs.dockerTools; [ + (pullImage cfg.kube-dns) + (pullImage cfg.dnsmasq-nanny) + (pullImage cfg.sidecar) ]; services.kubernetes.addonManager.addons = { kubedns-deployment = { - apiVersion = "apps/v1beta1"; + apiVersion = "extensions/v1beta1"; kind = "Deployment"; metadata = { labels = { @@ -81,9 +95,38 @@ in { labels.k8s-app = "kube-dns"; }; spec = { + priorityClassName = "system-cluster-critical"; containers = [ { name = "kubedns"; + image = with cfg.kube-dns; "${imageName}:${finalImageTag}"; + resources = { + limits.memory = "170Mi"; + requests = { + cpu = "100m"; + memory = "70Mi"; + }; + }; + livenessProbe = { + failureThreshold = 5; + httpGet = { + path = "/healthcheck/kubedns"; + port = 10054; + scheme = "HTTP"; + }; + initialDelaySeconds = 60; + successThreshold = 1; + timeoutSeconds = 5; + }; + readinessProbe = { + httpGet = { + path = "/readiness"; + port = 8081; + scheme = "HTTP"; + }; + initialDelaySeconds = 3; + timeoutSeconds = 5; + }; args = [ "--domain=${cfg.clusterDomain}" "--dns-port=10053" @@ -96,18 +139,6 @@ in { value = "10055"; } ]; - image = "gcr.io/google_containers/k8s-dns-kube-dns-amd64:${version}"; - livenessProbe = { - failureThreshold = 5; - httpGet = { - path = "/healthcheck/kubedns"; - port = 10054; - scheme = "HTTP"; - }; - initialDelaySeconds = 60; - successThreshold = 1; - timeoutSeconds = 5; - }; ports = [ { containerPort = 10053; @@ -125,22 +156,6 @@ in { protocol = "TCP"; } ]; - readinessProbe = { - httpGet = { - path = "/readiness"; - port = 8081; - scheme = "HTTP"; - }; - initialDelaySeconds = 3; - timeoutSeconds = 5; - }; - resources = { - limits.memory = "170Mi"; - requests = { - cpu = "100m"; - memory = "70Mi"; - }; - }; volumeMounts = [ { mountPath = "/kube-dns-config"; @@ -149,6 +164,19 @@ in { ]; } { + name = "dnsmasq"; + image = with cfg.dnsmasq-nanny; "${imageName}:${finalImageTag}"; + livenessProbe = { + httpGet = { + path = "/healthcheck/dnsmasq"; + port = 10054; + scheme = "HTTP"; + }; + initialDelaySeconds = 60; + timeoutSeconds = 5; + successThreshold = 1; + failureThreshold = 5; + }; args = [ "-v=2" "-logtostderr" @@ -162,19 +190,6 @@ in { "--server=/in-addr.arpa/127.0.0.1#10053" "--server=/ip6.arpa/127.0.0.1#10053" ]; - image = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:${version}"; - livenessProbe = { - failureThreshold = 5; - httpGet = { - path = "/healthcheck/dnsmasq"; - port = 10054; - scheme = "HTTP"; - }; - initialDelaySeconds = 60; - successThreshold = 1; - timeoutSeconds = 5; - }; - name = "dnsmasq"; ports = [ { containerPort = 53; @@ -202,24 +217,24 @@ in { } { name = "sidecar"; - image = "gcr.io/google_containers/k8s-dns-sidecar-amd64:${version}"; - args = [ - "--v=2" - "--logtostderr" - "--probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.${cfg.clusterDomain},5,A" - "--probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.${cfg.clusterDomain},5,A" - ]; + image = with cfg.sidecar; "${imageName}:${finalImageTag}"; livenessProbe = { - failureThreshold = 5; httpGet = { path = "/metrics"; port = 10054; scheme = "HTTP"; }; initialDelaySeconds = 60; - successThreshold = 1; timeoutSeconds = 5; + successThreshold = 1; + failureThreshold = 5; }; + args = [ + "--v=2" + "--logtostderr" + "--probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.${cfg.clusterDomain},5,A" + "--probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.${cfg.clusterDomain},5,A" + ]; ports = [ { containerPort = 10054; diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix deleted file mode 100644 index 4475e8d8c24b4501e9e45856a76499e7097e8680..0000000000000000000000000000000000000000 --- a/nixos/modules/services/cluster/panamax.nix +++ /dev/null @@ -1,156 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.panamax; - - panamax_api = pkgs.panamax_api.override { dataDir = cfg.dataDir + "/api"; }; - panamax_ui = pkgs.panamax_ui.override { dataDir = cfg.dataDir + "/ui"; }; - -in { - - ##### Interface - options.services.panamax = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Panamax service. - ''; - }; - - UIPort = mkOption { - type = types.int; - default = 8888; - description = '' - Panamax UI listening port. - ''; - }; - - APIPort = mkOption { - type = types.int; - default = 3000; - description = '' - Panamax UI listening port. - ''; - }; - - dataDir = mkOption { - type = types.str; - default = "/var/lib/panamax"; - description = '' - Data dir for Panamax. - ''; - }; - - fleetctlEndpoint = mkOption { - type = types.str; - default = "http://127.0.0.1:2379"; - description = '' - Panamax fleetctl endpoint. - ''; - }; - - journalEndpoint = mkOption { - type = types.str; - default = "http://127.0.0.1:19531"; - description = '' - Panamax journal endpoint. - ''; - }; - - secretKey = mkOption { - type = types.str; - default = "SomethingVeryLong."; - description = '' - Panamax secret key (do change this). - ''; - }; - - }; - - ##### Implementation - config = mkIf cfg.enable { - systemd.services.panamax-api = { - description = "Panamax API"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "fleet.service" "etcd.service" "docker.service" ]; - - path = [ panamax_api ]; - environment = { - RAILS_ENV = "production"; - JOURNAL_ENDPOINT = cfg.journalEndpoint; - FLEETCTL_ENDPOINT = cfg.fleetctlEndpoint; - PANAMAX_DATABASE_PATH = "${cfg.dataDir}/api/db/mnt/db.sqlite3"; - }; - - preStart = '' - rm -rf ${cfg.dataDir}/state/tmp - mkdir -p ${cfg.dataDir}/api/{db/mnt,state/log,state/tmp} - ln -sf ${panamax_api}/share/panamax-api/_db/{schema.rb,seeds.rb,migrate} ${cfg.dataDir}/api/db/ - - if [ ! -f ${cfg.dataDir}/.created ]; then - bundle exec rake db:setup - bundle exec rake db:seed - bundle exec rake panamax:templates:load || true - touch ${cfg.dataDir}/.created - else - bundle exec rake db:migrate - fi - ''; - - serviceConfig = { - ExecStart = "${panamax_api}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.APIPort}"; - User = "panamax"; - Group = "panamax"; - }; - }; - - systemd.services.panamax-ui = { - description = "Panamax UI"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "panamax_api.service" ]; - - path = [ panamax_ui ]; - environment = { - RAILS_ENV = "production"; - JOURNAL_ENDPOINT = cfg.journalEndpoint; - PMX_API_PORT_3000_TCP_ADDR = "localhost"; - PMX_API_PORT_3000_TCP_PORT = toString cfg.APIPort; - SECRET_KEY_BASE = cfg.secretKey; - }; - - preStart = '' - mkdir -p ${cfg.dataDir}/ui/state/{log,tmp} - chown -R panamax:panamax ${cfg.dataDir} - ''; - - serviceConfig = { - ExecStart = "${panamax_ui}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.UIPort}"; - User = "panamax"; - Group = "panamax"; - PermissionsStartOnly = true; - }; - }; - - users.extraUsers.panamax = - { uid = config.ids.uids.panamax; - description = "Panamax user"; - createHome = true; - home = cfg.dataDir; - extraGroups = [ "docker" ]; - }; - - services.journald.enableHttpGateway = mkDefault true; - services.fleet.enable = mkDefault true; - services.cadvisor.enable = mkDefault true; - services.cadvisor.port = mkDefault 3002; - virtualisation.docker.enable = mkDefault true; - - environment.systemPackages = [ panamax_api panamax_ui ]; - users.extraGroups.panamax.gid = config.ids.gids.panamax; - }; -} diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix index e43b6bbb253604446734206f05d055bd43514f4f..8abe3c5b8c9b8a7c143bc27f451c1b7a4b2ca396 100644 --- a/nixos/modules/services/computing/boinc/client.nix +++ b/nixos/modules/services/computing/boinc/client.nix @@ -6,6 +6,13 @@ let cfg = config.services.boinc; allowRemoteGuiRpcFlag = optionalString cfg.allowRemoteGuiRpc "--allow_remote_gui_rpc"; + fhsEnv = pkgs.buildFHSUserEnv { + name = "boinc-fhs-env"; + targetPkgs = pkgs': [ cfg.package ] ++ cfg.extraEnvPackages; + runScript = "/bin/boinc_client"; + }; + fhsEnvExecutable = "${fhsEnv}/bin/${fhsEnv.name}"; + in { options.services.boinc = { @@ -49,6 +56,43 @@ in See also: ''; }; + + extraEnvPackages = mkOption { + type = types.listOf types.package; + default = []; + example = "[ pkgs.virtualbox ]"; + description = '' + Additional packages to make available in the environment in which + BOINC will run. Common choices are: + + + pkgs.virtualbox + + The VirtualBox virtual machine framework. Required by some BOINC + projects, such as ATLAS@home. + + + + pkgs.ocl-icd + + OpenCL infrastructure library. Required by BOINC projects that + use OpenCL, in addition to a device-specific OpenCL driver. + + + + pkgs.linuxPackages.nvidia_x11 + + Provides CUDA libraries. Required by BOINC projects that use + CUDA. Note that this requires an NVIDIA graphics device to be + present on the system. + + Also provides OpenCL drivers for NVIDIA GPUs; + pkgs.ocl-icd is also needed in this case. + + + + ''; + }; }; config = mkIf cfg.enable { @@ -70,7 +114,7 @@ in chown boinc ${cfg.dataDir} ''; script = '' - ${cfg.package}/bin/boinc_client --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag} + ${fhsEnvExecutable} --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag} ''; serviceConfig = { PermissionsStartOnly = true; # preStart must be run as root diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 45d34f5b76f504029c0dacddadb45b46e913af0c..1e1c5bc9f035a50c469fd31b07a6cfa85fcdd81d 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -6,20 +6,36 @@ let cfg = config.services.slurm; # configuration file can be generated by http://slurm.schedmd.com/configurator.html - configFile = pkgs.writeText "slurm.conf" + configFile = pkgs.writeTextDir "slurm.conf" '' ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''} ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''} ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''} PlugStackConfig=${plugStackConfig} + ProctrackType=${cfg.procTrackType} ${cfg.extraConfig} ''; - plugStackConfig = pkgs.writeText "plugstack.conf" + plugStackConfig = pkgs.writeTextDir "plugstack.conf" '' ${optionalString cfg.enableSrunX11 ''optional ${pkgs.slurm-spank-x11}/lib/x11.so''} + ${cfg.extraPlugstackConfig} ''; + + + cgroupConfig = pkgs.writeTextDir "cgroup.conf" + '' + ${cfg.extraCgroupConfig} + ''; + + # slurm expects some additional config files to be + # in the same directory as slurm.conf + etcSlurm = pkgs.symlinkJoin { + name = "etc-slurm"; + paths = [ configFile cgroupConfig plugStackConfig ]; + }; + in { @@ -31,13 +47,31 @@ in services.slurm = { server = { - enable = mkEnableOption "slurm control daemon"; - + enable = mkOption { + type = types.bool; + default = false; + description = '' + Wether to enable the slurm control daemon. + Note that the standard authentication method is "munge". + The "munge" service needs to be provided with a password file in order for + slurm to work properly (see services.munge.password). + ''; + }; }; client = { - enable = mkEnableOption "slurm rlient daemon"; + enable = mkEnableOption "slurm client daemon"; + }; + enableStools = mkOption { + type = types.bool; + default = false; + description = '' + Wether to provide a slurm.conf file. + Enable this option if you do not run a slurm daemon on this host + (i.e. server.enable and client.enable are false) + but you still want to run slurm commands from this host. + ''; }; package = mkOption { @@ -88,7 +122,7 @@ in example = "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP"; description = '' Name by which the partition may be referenced. Note that now you have - to write patrition's parameters after the name. + to write the partition's parameters after the name. ''; }; @@ -98,8 +132,20 @@ in description = '' If enabled srun will accept the option "--x11" to allow for X11 forwarding from within an interactive session or a batch job. This activates the - slurm-spank-x11 module. Note that this requires 'services.openssh.forwardX11' - to be enabled on the compute nodes. + slurm-spank-x11 module. Note that this option also enables + 'services.openssh.forwardX11' on the client. + + This option requires slurm to be compiled without native X11 support. + ''; + }; + + procTrackType = mkOption { + type = types.string; + default = "proctrack/linuxproc"; + description = '' + Plugin to be used for process tracking on a job step basis. + The slurmd daemon uses this mechanism to identify all processes + which are children of processes it spawns for a user job step. ''; }; @@ -111,6 +157,23 @@ in the end of the slurm configuration file. ''; }; + + extraPlugstackConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Extra configuration that will be added to the end of plugstack.conf. + ''; + }; + + extraCgroupConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Extra configuration for cgroup.conf. This file is + used when procTrackType=proctrack/cgroup. + ''; + }; }; }; @@ -123,8 +186,6 @@ in wrappedSlurm = pkgs.stdenv.mkDerivation { name = "wrappedSlurm"; - propagatedBuildInputs = [ cfg.package configFile ]; - builder = pkgs.writeText "builder.sh" '' source $stdenv/setup mkdir -p $out/bin @@ -136,20 +197,25 @@ in #!/bin/sh if [ -z "$SLURM_CONF" ] then - SLURM_CONF="${configFile}" "$EXE" "\$@" + SLURM_CONF="${etcSlurm}/slurm.conf" "$EXE" "\$@" else "$EXE" "\$0" fi EOT chmod +x "$wrappername" done + + mkdir -p $out/share + ln -s ${getBin cfg.package}/share/man $out/share/man ''; }; - in mkIf (cfg.client.enable || cfg.server.enable) { + in mkIf (cfg.enableStools || cfg.client.enable || cfg.server.enable) { environment.systemPackages = [ wrappedSlurm ]; + services.munge.enable = mkDefault true; + systemd.services.slurmd = mkIf (cfg.client.enable) { path = with pkgs; [ wrappedSlurm coreutils ] ++ lib.optional cfg.enableSrunX11 slurm-spank-x11; @@ -169,6 +235,8 @@ in ''; }; + services.openssh.forwardX11 = mkIf cfg.client.enable (mkDefault true); + systemd.services.slurmctld = mkIf (cfg.server.enable) { path = with pkgs; [ wrappedSlurm munge coreutils ] ++ lib.optional cfg.enableSrunX11 slurm-spank-x11; diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 846efc8b5b9acca80d88e4a14c60771a98fd4ca2..8d767de37f00abeac5fa4df69d81762dc37fd4f2 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -191,11 +191,11 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "buildbot") { + users.groups = optional (cfg.group == "buildbot") { name = "buildbot"; }; - users.extraUsers = optional (cfg.user == "buildbot") { + users.users = optional (cfg.user == "buildbot") { name = "buildbot"; description = "Buildbot User."; isNormalUser = true; diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index a97f571e89df21c9f7588835464d291844cdd0de..67c541570b97c4af283ecc346b8b8e892930e0ca 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -84,11 +84,11 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "bbworker") { + users.groups = optional (cfg.group == "bbworker") { name = "bbworker"; }; - users.extraUsers = optional (cfg.user == "bbworker") { + users.users = optional (cfg.user == "bbworker") { name = "bbworker"; description = "Buildbot Worker User."; isNormalUser = true; diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index 03af9a7859ec2d8d03b3d46ec89552ec633cd2f1..9daf391c73c46808f4f9aba9559c563fd03cbb70 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -17,7 +17,7 @@ let hooksDir = let mkHookEntry = name: value: '' - cat > $out/${name} < $out/${name} <<'EOF' #! ${pkgs.runtimeShell} set -e ${value} @@ -185,7 +185,7 @@ in }; config = mkIf config.services.buildkite-agent.enable { - users.extraUsers.buildkite-agent = + users.users.buildkite-agent = { name = "buildkite-agent"; home = cfg.dataDir; createHome = true; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 6d5cea4f77a5cbe857bfec2b3608302289638baf..a0aff1b8b5b92b4e8ea9a818fb2773dbf924c2ec 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -134,7 +134,7 @@ in # Make the gitlab-runner command availabe so users can query the runner environment.systemPackages = [ cfg.package ]; - users.extraUsers.gitlab-runner = { + users.users.gitlab-runner = { group = "gitlab-runner"; extraGroups = optional hasDocker "docker"; uid = config.ids.uids.gitlab-runner; @@ -142,6 +142,6 @@ in createHome = true; }; - users.extraGroups.gitlab-runner.gid = config.ids.gids.gitlab-runner; + users.groups.gitlab-runner.gid = config.ids.gids.gitlab-runner; }; } diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 05adb18fbe9118c5c1065b809d60c5f3d861b531..8126f27c2b0c5de0fd01675facd9ab7dc8248f87 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -135,12 +135,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "gocd-agent") { + users.groups = optional (cfg.group == "gocd-agent") { name = "gocd-agent"; gid = config.ids.gids.gocd-agent; }; - users.extraUsers = optional (cfg.user == "gocd-agent") { + users.users = optional (cfg.user == "gocd-agent") { name = "gocd-agent"; description = "gocd-agent user"; createHome = true; diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 07e00f17f1e8e36268d3ef3f9879474bcb777fd5..8f177da129e50364379c694640124770e05ffec3 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -113,8 +113,8 @@ in { extraOptions = mkOption { default = [ ]; - example = [ - "-X debug" + example = [ + "-X debug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" "-verbose:gc" "-Xloggc:go-server-gc.log" @@ -143,12 +143,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "gocd-server") { + users.groups = optional (cfg.group == "gocd-server") { name = "gocd-server"; gid = config.ids.gids.gocd-server; }; - users.extraUsers = optional (cfg.user == "gocd-server") { + users.users = optional (cfg.user == "gocd-server") { name = "gocd-server"; description = "gocd-server user"; createHome = true; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 2fa7c59a965d385a11be10c1b6cf4ac843b108ed..c7fe4eeeab9966179bffb14014f2a7f5a16e8c30 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -194,11 +194,11 @@ in config = mkIf cfg.enable { - users.extraGroups.hydra = { + users.groups.hydra = { gid = config.ids.gids.hydra; }; - users.extraUsers.hydra = + users.users.hydra = { description = "Hydra"; group = "hydra"; createHome = true; @@ -207,7 +207,7 @@ in uid = config.ids.uids.hydra; }; - users.extraUsers.hydra-queue-runner = + users.users.hydra-queue-runner = { description = "Hydra queue runner"; group = "hydra"; useDefaultShell = true; @@ -215,7 +215,7 @@ in uid = config.ids.uids.hydra-queue-runner; }; - users.extraUsers.hydra-www = + users.users.hydra-www = { description = "Hydra web server"; group = "hydra"; useDefaultShell = true; diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index c2f4e9c0c5a73b0bed1dbb031dfaf02b8c0d9910..1eca45fbd570cd04c4fedb814342a2154519c366 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -150,12 +150,12 @@ in { pkgs.dejavu_fonts ]; - users.extraGroups = optional (cfg.group == "jenkins") { + users.groups = optional (cfg.group == "jenkins") { name = "jenkins"; gid = config.ids.gids.jenkins; }; - users.extraUsers = optional (cfg.user == "jenkins") { + users.users = optional (cfg.user == "jenkins") { name = "jenkins"; description = "jenkins user"; createHome = true; diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix index a0216caf2b5c6d07703519a3c3fe991fbb92341b..92deabc3dd3b022724ba90a7d5e0bcfecb8125d6 100644 --- a/nixos/modules/services/continuous-integration/jenkins/slave.nix +++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let cfg = config.services.jenkinsSlave; @@ -50,12 +50,12 @@ in { }; config = mkIf (cfg.enable && !masterCfg.enable) { - users.extraGroups = optional (cfg.group == "jenkins") { + users.groups = optional (cfg.group == "jenkins") { name = "jenkins"; gid = config.ids.gids.jenkins; }; - users.extraUsers = optional (cfg.user == "jenkins") { + users.users = optional (cfg.user == "jenkins") { name = "jenkins"; description = "jenkins user"; createHome = true; diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix index d528355671f61c175440d6a4ce5a4a05bb2e0864..59ed0e5f0afdf8b37c0b1f00a09e720436dd4ed5 100644 --- a/nixos/modules/services/databases/4store-endpoint.nix +++ b/nixos/modules/services/databases/4store-endpoint.nix @@ -52,7 +52,7 @@ with lib; message = "Must specify 4Store database name"; }; - users.extraUsers = singleton + users.users = singleton { name = endpointUser; uid = config.ids.uids.fourstorehttp; description = "4Store SPARQL endpoint user"; diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix index abb62e1f2637e3faae0b2c25d520426f15b645d8..be4351c1c38f457631221a157b397554508fad81 100644 --- a/nixos/modules/services/databases/4store.nix +++ b/nixos/modules/services/databases/4store.nix @@ -43,7 +43,7 @@ with lib; message = "Must specify 4Store database name."; }; - users.extraUsers = singleton + users.users = singleton { name = fourStoreUser; uid = config.ids.uids.fourstore; description = "4Store database user"; diff --git a/nixos/modules/services/databases/aerospike.nix b/nixos/modules/services/databases/aerospike.nix new file mode 100644 index 0000000000000000000000000000000000000000..5f33164998bebcafd944a21ae8deab4ea646280c --- /dev/null +++ b/nixos/modules/services/databases/aerospike.nix @@ -0,0 +1,155 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.aerospike; + + aerospikeConf = pkgs.writeText "aerospike.conf" '' + # This stanza must come first. + service { + user aerospike + group aerospike + paxos-single-replica-limit 1 # Number of nodes where the replica count is automatically reduced to 1. + proto-fd-max 15000 + work-directory ${cfg.workDir} + } + logging { + console { + context any info + } + } + mod-lua { + system-path ${cfg.package}/share/udf/lua + user-path ${cfg.workDir}/udf/lua + } + network { + ${cfg.networkConfig} + } + ${cfg.extraConfig} + ''; + +in + +{ + + ###### interface + + options = { + + services.aerospike = { + enable = mkEnableOption "Aerospike server"; + + package = mkOption { + default = pkgs.aerospike; + type = types.package; + description = "Which Aerospike derivation to use"; + }; + + workDir = mkOption { + type = types.str; + default = "/var/lib/aerospike"; + description = "Location where Aerospike stores its files"; + }; + + networkConfig = mkOption { + type = types.lines; + default = '' + service { + address any + port 3000 + } + + heartbeat { + address any + mode mesh + port 3002 + interval 150 + timeout 10 + } + + fabric { + address any + port 3001 + } + + info { + address any + port 3003 + } + ''; + description = "network section of configuration file"; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + namespace test { + replication-factor 2 + memory-size 4G + default-ttl 30d + storage-engine memory + } + ''; + description = "Extra configuration"; + }; + }; + + }; + + + ###### implementation + + config = mkIf config.services.aerospike.enable { + + users.users.aerospike = { + name = "aerospike"; + group = "aerospike"; + uid = config.ids.uids.aerospike; + description = "Aerospike server user"; + }; + users.groups.aerospike.gid = config.ids.gids.aerospike; + + systemd.services.aerospike = rec { + description = "Aerospike server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/asd --fgdaemon --config-file ${aerospikeConf}"; + User = "aerospike"; + Group = "aerospike"; + LimitNOFILE = 100000; + PermissionsStartOnly = true; + }; + + preStart = '' + if [ $(echo "$(${pkgs.procps}/bin/sysctl -n kernel.shmall) < 4294967296" | ${pkgs.bc}/bin/bc) == "1" ]; then + echo "kernel.shmall too low, setting to 4G pages" + ${pkgs.procps}/bin/sysctl -w kernel.shmall=4294967296 + fi + if [ $(echo "$(${pkgs.procps}/bin/sysctl -n kernel.shmmax) < 1073741824" | ${pkgs.bc}/bin/bc) == "1" ]; then + echo "kernel.shmmax too low, setting to 1GB" + ${pkgs.procps}/bin/sysctl -w kernel.shmmax=1073741824 + fi + if [ $(echo "$(cat /proc/sys/net/core/rmem_max) < 15728640" | ${pkgs.bc}/bin/bc) == "1" ]; then + echo "increasing socket buffer limit (/proc/sys/net/core/rmem_max): $(cat /proc/sys/net/core/rmem_max) -> 15728640" + echo 15728640 > /proc/sys/net/core/rmem_max + fi + if [ $(echo "$(cat /proc/sys/net/core/wmem_max) < 5242880" | ${pkgs.bc}/bin/bc) == "1" ]; then + echo "increasing socket buffer limit (/proc/sys/net/core/wmem_max): $(cat /proc/sys/net/core/wmem_max) -> 5242880" + echo 5242880 > /proc/sys/net/core/wmem_max + fi + install -d -m0700 -o ${serviceConfig.User} -g ${serviceConfig.Group} "${cfg.workDir}" + install -d -m0700 -o ${serviceConfig.User} -g ${serviceConfig.Group} "${cfg.workDir}/smd" + install -d -m0700 -o ${serviceConfig.User} -g ${serviceConfig.Group} "${cfg.workDir}/udf" + install -d -m0700 -o ${serviceConfig.User} -g ${serviceConfig.Group} "${cfg.workDir}/udf/lua" + ''; + }; + + }; + +} diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index 1e5cd8f54130792deb23e7b464c71d6022cebcab..86e74d5d5ab42555fd6daac062c08854563c2afc 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -4,445 +4,288 @@ with lib; let cfg = config.services.cassandra; - cassandraPackage = cfg.package.override { - jre = cfg.jre; - }; - cassandraUser = { - name = cfg.user; - home = "/var/lib/cassandra"; - description = "Cassandra role user"; - }; - - cassandraRackDcProperties = '' - dc=${cfg.dc} - rack=${cfg.rack} - ''; - - cassandraConf = '' - cluster_name: ${cfg.clusterName} - num_tokens: 256 - auto_bootstrap: ${boolToString cfg.autoBootstrap} - hinted_handoff_enabled: ${boolToString cfg.hintedHandOff} - hinted_handoff_throttle_in_kb: ${builtins.toString cfg.hintedHandOffThrottle} - max_hints_delivery_threads: 2 - max_hint_window_in_ms: 10800000 # 3 hours - authenticator: ${cfg.authenticator} - authorizer: ${cfg.authorizer} - permissions_validity_in_ms: 2000 - partitioner: org.apache.cassandra.dht.Murmur3Partitioner - data_file_directories: - ${builtins.concatStringsSep "\n" (map (v: " - "+v) cfg.dataDirs)} - commitlog_directory: ${cfg.commitLogDirectory} - disk_failure_policy: stop - key_cache_size_in_mb: - key_cache_save_period: 14400 - row_cache_size_in_mb: 0 - row_cache_save_period: 0 - saved_caches_directory: ${cfg.savedCachesDirectory} - commitlog_sync: ${cfg.commitLogSync} - commitlog_sync_period_in_ms: ${builtins.toString cfg.commitLogSyncPeriod} - commitlog_segment_size_in_mb: 32 - seed_provider: - - class_name: org.apache.cassandra.locator.SimpleSeedProvider - parameters: - - seeds: "${builtins.concatStringsSep "," cfg.seeds}" - concurrent_reads: ${builtins.toString cfg.concurrentReads} - concurrent_writes: ${builtins.toString cfg.concurrentWrites} - memtable_flush_queue_size: 4 - trickle_fsync: false - trickle_fsync_interval_in_kb: 10240 - storage_port: 7000 - ssl_storage_port: 7001 - listen_address: ${cfg.listenAddress} - start_native_transport: true - native_transport_port: 9042 - start_rpc: true - rpc_address: ${cfg.rpcAddress} - rpc_port: 9160 - rpc_keepalive: true - rpc_server_type: sync - thrift_framed_transport_size_in_mb: 15 - incremental_backups: ${boolToString cfg.incrementalBackups} - snapshot_before_compaction: false - auto_snapshot: true - column_index_size_in_kb: 64 - in_memory_compaction_limit_in_mb: 64 - multithreaded_compaction: false - compaction_throughput_mb_per_sec: 16 - compaction_preheat_key_cache: true - read_request_timeout_in_ms: 10000 - range_request_timeout_in_ms: 10000 - write_request_timeout_in_ms: 10000 - cas_contention_timeout_in_ms: 1000 - truncate_request_timeout_in_ms: 60000 - request_timeout_in_ms: 10000 - cross_node_timeout: false - endpoint_snitch: ${cfg.snitch} - dynamic_snitch_update_interval_in_ms: 100 - dynamic_snitch_reset_interval_in_ms: 600000 - dynamic_snitch_badness_threshold: 0.1 - request_scheduler: org.apache.cassandra.scheduler.NoScheduler - server_encryption_options: - internode_encryption: ${cfg.internodeEncryption} - keystore: ${cfg.keyStorePath} - keystore_password: ${cfg.keyStorePassword} - truststore: ${cfg.trustStorePath} - truststore_password: ${cfg.trustStorePassword} - client_encryption_options: - enabled: ${boolToString cfg.clientEncryption} - keystore: ${cfg.keyStorePath} - keystore_password: ${cfg.keyStorePassword} - internode_compression: all - inter_dc_tcp_nodelay: false - preheat_kernel_page_cache: false - streaming_socket_timeout_in_ms: ${toString cfg.streamingSocketTimoutInMS} - ''; - - cassandraLog = '' - log4j.rootLogger=${cfg.logLevel},stdout - log4j.appender.stdout=org.apache.log4j.ConsoleAppender - log4j.appender.stdout.layout=org.apache.log4j.PatternLayout - log4j.appender.stdout.layout.ConversionPattern=%5p [%t] %d{HH:mm:ss,SSS} %m%n - ''; - - cassandraConfFile = pkgs.writeText "cassandra.yaml" cassandraConf; - cassandraLogFile = pkgs.writeText "log4j-server.properties" cassandraLog; - cassandraRackFile = pkgs.writeText "cassandra-rackdc.properties" cassandraRackDcProperties; - - cassandraEnvironment = { - CASSANDRA_HOME = cassandraPackage; - JAVA_HOME = cfg.jre; - CASSANDRA_CONF = "/etc/cassandra"; - }; + defaultUser = "cassandra"; + cassandraConfig = flip recursiveUpdate cfg.extraConfig + ({ commitlog_sync = "batch"; + commitlog_sync_batch_window_in_ms = 2; + partitioner = "org.apache.cassandra.dht.Murmur3Partitioner"; + endpoint_snitch = "SimpleSnitch"; + seed_provider = + [{ class_name = "org.apache.cassandra.locator.SimpleSeedProvider"; + parameters = [ { seeds = "127.0.0.1"; } ]; + }]; + data_file_directories = [ "${cfg.homeDir}/data" ]; + commitlog_directory = "${cfg.homeDir}/commitlog"; + saved_caches_directory = "${cfg.homeDir}/saved_caches"; + } // (if builtins.compareVersions cfg.package.version "3" >= 0 + then { hints_directory = "${cfg.homeDir}/hints"; } + else {}) + ); + cassandraConfigWithAddresses = cassandraConfig // + ( if isNull cfg.listenAddress + then { listen_interface = cfg.listenInterface; } + else { listen_address = cfg.listenAddress; } + ) // ( + if isNull cfg.rpcAddress + then { rpc_interface = cfg.rpcInterface; } + else { rpc_address = cfg.rpcAddress; } + ); + cassandraEtc = pkgs.stdenv.mkDerivation + { name = "cassandra-etc"; + cassandraYaml = builtins.toJSON cassandraConfigWithAddresses; + cassandraEnvPkg = "${cfg.package}/conf/cassandra-env.sh"; + buildCommand = '' + mkdir -p "$out" + echo "$cassandraYaml" > "$out/cassandra.yaml" + ln -s "$cassandraEnvPkg" "$out/cassandra-env.sh" + ''; + }; in { - - ###### interface - options.services.cassandra = { - enable = mkOption { - description = "Whether to enable cassandra."; - default = false; - type = types.bool; - }; - package = mkOption { - description = "Cassandra package to use."; - default = pkgs.cassandra; - defaultText = "pkgs.cassandra"; - type = types.package; - }; - jre = mkOption { - description = "JRE package to run cassandra service."; - default = pkgs.jre; - defaultText = "pkgs.jre"; - type = types.package; - }; + enable = mkEnableOption '' + Apache Cassandra – Scalable and highly available database. + ''; user = mkOption { - description = "User that runs cassandra service."; - default = "cassandra"; - type = types.string; + type = types.str; + default = defaultUser; + description = "Run Apache Cassandra under this user."; }; group = mkOption { - description = "Group that runs cassandra service."; - default = "cassandra"; - type = types.string; - }; - envFile = mkOption { - description = "path to cassandra-env.sh"; - default = "${cassandraPackage}/conf/cassandra-env.sh"; - defaultText = "\${cassandraPackage}/conf/cassandra-env.sh"; - type = types.path; - }; - clusterName = mkOption { - description = "set cluster name"; - default = "cassandra"; - example = "prod-cluster0"; - type = types.string; - }; - commitLogDirectory = mkOption { - description = "directory for commit logs"; - default = "/var/lib/cassandra/commit_log"; - type = types.string; - }; - savedCachesDirectory = mkOption { - description = "directory for saved caches"; - default = "/var/lib/cassandra/saved_caches"; - type = types.string; - }; - hintedHandOff = mkOption { - description = "enable hinted handoff"; - default = true; - type = types.bool; - }; - hintedHandOffThrottle = mkOption { - description = "hinted hand off throttle rate in kb"; - default = 1024; - type = types.int; - }; - commitLogSync = mkOption { - description = "commitlog sync method"; - default = "periodic"; type = types.str; - example = "batch"; - }; - commitLogSyncPeriod = mkOption { - description = "commitlog sync period in ms "; - default = 10000; - type = types.int; + default = defaultUser; + description = "Run Apache Cassandra under this group."; }; - envScript = mkOption { - default = "${cassandraPackage}/conf/cassandra-env.sh"; - defaultText = "\${cassandraPackage}/conf/cassandra-env.sh"; + homeDir = mkOption { type = types.path; - description = "Supply your own cassandra-env.sh rather than using the default"; - }; - extraParams = mkOption { - description = "add additional lines to cassandra-env.sh"; - default = []; - example = [''JVM_OPTS="$JVM_OPTS -Dcassandra.available_processors=1"'']; - type = types.listOf types.str; - }; - dataDirs = mkOption { - type = types.listOf types.path; - default = [ "/var/lib/cassandra/data" ]; - description = "Data directories for cassandra"; - }; - logLevel = mkOption { - type = types.str; - default = "INFO"; - description = "default logging level for log4j"; - }; - internodeEncryption = mkOption { - description = "enable internode encryption"; - default = "none"; - example = "all"; - type = types.str; - }; - clientEncryption = mkOption { - description = "enable client encryption"; - default = false; - type = types.bool; - }; - trustStorePath = mkOption { - description = "path to truststore"; - default = ".conf/truststore"; - type = types.str; - }; - keyStorePath = mkOption { - description = "path to keystore"; - default = ".conf/keystore"; - type = types.str; - }; - keyStorePassword = mkOption { - description = "password to keystore"; - default = "cassandra"; - type = types.str; + default = "/var/lib/cassandra"; + description = '' + Home directory for Apache Cassandra. + ''; }; - trustStorePassword = mkOption { - description = "password to truststore"; - default = "cassandra"; - type = types.str; + package = mkOption { + type = types.package; + default = pkgs.cassandra; + defaultText = "pkgs.cassandra"; + example = literalExample "pkgs.cassandra_3_11"; + description = '' + The Apache Cassandra package to use. + ''; }; - seeds = mkOption { - description = "password to truststore"; - default = [ "127.0.0.1" ]; + jvmOpts = mkOption { type = types.listOf types.str; - }; - concurrentWrites = mkOption { - description = "number of concurrent writes allowed"; - default = 32; - type = types.int; - }; - concurrentReads = mkOption { - description = "number of concurrent reads allowed"; - default = 32; - type = types.int; + default = []; + description = '' + Populate the JVM_OPT environment variable. + ''; }; listenAddress = mkOption { - description = "listen address"; - default = "localhost"; - type = types.str; - }; - rpcAddress = mkOption { - description = "rpc listener address"; - default = "localhost"; - type = types.str; - }; - incrementalBackups = mkOption { - description = "enable incremental backups"; - default = false; - type = types.bool; - }; - snitch = mkOption { - description = "snitch to use for topology discovery"; - default = "GossipingPropertyFileSnitch"; - example = "Ec2Snitch"; - type = types.str; - }; - dc = mkOption { - description = "datacenter for use in topology configuration"; - default = "DC1"; - example = "DC1"; - type = types.str; - }; - rack = mkOption { - description = "rack for use in topology configuration"; - default = "RAC1"; - example = "RAC1"; - type = types.str; - }; - authorizer = mkOption { - description = " - Authorization backend, implementing IAuthorizer; used to limit access/provide permissions - "; - default = "AllowAllAuthorizer"; - example = "CassandraAuthorizer"; - type = types.str; - }; - authenticator = mkOption { - description = " - Authentication backend, implementing IAuthenticator; used to identify users - "; - default = "AllowAllAuthenticator"; - example = "PasswordAuthenticator"; - type = types.str; - }; - autoBootstrap = mkOption { - description = "It makes new (non-seed) nodes automatically migrate the right data to themselves."; - default = true; - type = types.bool; - }; - streamingSocketTimoutInMS = mkOption { - description = "Enable or disable socket timeout for streaming operations"; - default = 3600000; #CASSANDRA-8611 - example = 120; - type = types.int; - }; - repairStartAt = mkOption { - default = "Sun"; - type = types.string; + type = types.nullOr types.str; + default = "127.0.0.1"; + example = literalExample "null"; description = '' - Defines realtime (i.e. wallclock) timers with calendar event - expressions. For more details re: systemd OnCalendar at - https://www.freedesktop.org/software/systemd/man/systemd.time.html#Displaying%20Time%20Spans + Address or interface to bind to and tell other Cassandra nodes + to connect to. You _must_ change this if you want multiple + nodes to be able to communicate! + + Set listenAddress OR listenInterface, not both. + + Leaving it blank leaves it up to + InetAddress.getLocalHost(). This will always do the Right + Thing _if_ the node is properly configured (hostname, name + resolution, etc), and the Right Thing is to use the address + associated with the hostname (it might not be). + + Setting listen_address to 0.0.0.0 is always wrong. ''; - example = ["weekly" "daily" "08:05:40" "mon,fri *-1/2-1,3 *:30:45"]; }; - repairRandomizedDelayInSec = mkOption { - default = 0; - type = types.int; - description = ''Delay the timer by a randomly selected, evenly distributed - amount of time between 0 and the specified time value. re: systemd timer - RandomizedDelaySec for more details + listenInterface = mkOption { + type = types.nullOr types.str; + default = null; + example = "eth1"; + description = '' + Set listenAddress OR listenInterface, not both. Interfaces + must correspond to a single address, IP aliasing is not + supported. ''; }; - repairPostStop = mkOption { - default = null; - type = types.nullOr types.string; + rpcAddress = mkOption { + type = types.nullOr types.str; + default = "127.0.0.1"; + example = literalExample "null"; description = '' - Run a script when repair is over. One can use it to send statsd events, email, etc. + The address or interface to bind the native transport server to. + + Set rpcAddress OR rpcInterface, not both. + + Leaving rpcAddress blank has the same effect as on + listenAddress (i.e. it will be based on the configured hostname + of the node). + + Note that unlike listenAddress, you can specify 0.0.0.0, but you + must also set extraConfig.broadcast_rpc_address to a value other + than 0.0.0.0. + + For security reasons, you should not expose this port to the + internet. Firewall it if needed. ''; }; - repairPostStart = mkOption { + rpcInterface = mkOption { + type = types.nullOr types.str; default = null; - type = types.nullOr types.string; + example = "eth1"; description = '' - Run a script when repair starts. One can use it to send statsd events, email, etc. - It has same semantics as systemd ExecStopPost; So, if it fails, unit is consisdered - failed. + Set rpcAddress OR rpcInterface, not both. Interfaces must + correspond to a single address, IP aliasing is not supported. ''; }; - }; - ###### implementation - - config = mkIf cfg.enable { + extraConfig = mkOption { + type = types.attrs; + default = {}; + example = + { commitlog_sync_batch_window_in_ms = 3; + }; + description = '' + Extra options to be merged into cassandra.yaml as nix attribute set. + ''; + }; + fullRepairInterval = mkOption { + type = types.nullOr types.str; + default = "3w"; + example = literalExample "null"; + description = '' + Set the interval how often full repairs are run, i.e. + `nodetool repair --full` is executed. See + https://cassandra.apache.org/doc/latest/operating/repair.html + for more information. - environment.etc."cassandra/cassandra-rackdc.properties" = { - source = cassandraRackFile; + Set to `null` to disable full repairs. + ''; }; - environment.etc."cassandra/cassandra.yaml" = { - source = cassandraConfFile; + fullRepairOptions = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--partitioner-range" ]; + description = '' + Options passed through to the full repair command. + ''; }; - environment.etc."cassandra/log4j-server.properties" = { - source = cassandraLogFile; + incrementalRepairInterval = mkOption { + type = types.nullOr types.str; + default = "3d"; + example = literalExample "null"; + description = '' + Set the interval how often incremental repairs are run, i.e. + `nodetool repair` is executed. See + https://cassandra.apache.org/doc/latest/operating/repair.html + for more information. + + Set to `null` to disable incremental repairs. + ''; }; - environment.etc."cassandra/cassandra-env.sh" = { - text = '' - ${builtins.readFile cfg.envFile} - ${concatStringsSep "\n" cfg.extraParams} - ''; + incrementalRepairOptions = mkOption { + type = types.listOf types.string; + default = []; + example = [ "--partitioner-range" ]; + description = '' + Options passed through to the incremental repair command. + ''; }; - systemd.services.cassandra = { - description = "Cassandra Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - environment = cassandraEnvironment; - restartTriggers = [ cassandraConfFile cassandraLogFile cassandraRackFile ]; - serviceConfig = { - - User = cfg.user; - PermissionsStartOnly = true; - LimitAS = "infinity"; - LimitNOFILE = "100000"; - LimitNPROC = "32768"; - LimitMEMLOCK = "infinity"; + }; - }; - script = '' - ${cassandraPackage}/bin/cassandra -f - ''; - path = [ - cfg.jre - cassandraPackage - pkgs.coreutils + config = mkIf cfg.enable { + assertions = + [ { assertion = + ((isNull cfg.listenAddress) + || (isNull cfg.listenInterface) + ) && !((isNull cfg.listenAddress) + && (isNull cfg.listenInterface) + ); + message = "You have to set either listenAddress or listenInterface"; + } + { assertion = + ((isNull cfg.rpcAddress) + || (isNull cfg.rpcInterface) + ) && !((isNull cfg.rpcAddress) + && (isNull cfg.rpcInterface) + ); + message = "You have to set either rpcAddress or rpcInterface"; + } ]; - preStart = '' - mkdir -m 0700 -p /etc/cassandra/triggers - mkdir -m 0700 -p /var/lib/cassandra /var/log/cassandra - chown ${cfg.user} /var/lib/cassandra /var/log/cassandra /etc/cassandra/triggers - ''; - postStart = '' - sleep 2 - while ! nodetool status >/dev/null 2>&1; do - sleep 2 - done - nodetool status - ''; + users = mkIf (cfg.user == defaultUser) { + extraUsers."${defaultUser}" = + { group = cfg.group; + home = cfg.homeDir; + createHome = true; + uid = config.ids.uids.cassandra; + description = "Cassandra service user"; + }; + extraGroups."${defaultUser}".gid = config.ids.gids.cassandra; }; - environment.systemPackages = [ cassandraPackage ]; - - networking.firewall.allowedTCPPorts = [ - 7000 - 7001 - 9042 - 9160 - ]; - - users.extraUsers.cassandra = - if config.ids.uids ? "cassandra" - then { uid = config.ids.uids.cassandra; } // cassandraUser - else cassandraUser ; - - boot.kernel.sysctl."vm.swappiness" = pkgs.lib.mkOptionDefault 0; + systemd.services.cassandra = + { description = "Apache Cassandra service"; + after = [ "network.target" ]; + environment = + { CASSANDRA_CONF = "${cassandraEtc}"; + JVM_OPTS = builtins.concatStringsSep " " cfg.jvmOpts; + }; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + { User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.package}/bin/cassandra -f"; + SuccessExitStatus = 143; + }; + }; - systemd.timers."cassandra-repair" = { - timerConfig = { - OnCalendar = "${toString cfg.repairStartAt}"; - RandomizedDelaySec = cfg.repairRandomizedDelayInSec; + systemd.services.cassandra-full-repair = + { description = "Perform a full repair on this Cassandra node"; + after = [ "cassandra.service" ]; + requires = [ "cassandra.service" ]; + serviceConfig = + { User = cfg.user; + Group = cfg.group; + ExecStart = + lib.concatStringsSep " " + ([ "${cfg.package}/bin/nodetool" "repair" "--full" + ] ++ cfg.fullRepairOptions); + }; + }; + systemd.timers.cassandra-full-repair = + mkIf (!isNull cfg.fullRepairInterval) { + description = "Schedule full repairs on Cassandra"; + wantedBy = [ "timers.target" ]; + timerConfig = + { OnBootSec = cfg.fullRepairInterval; + OnUnitActiveSec = cfg.fullRepairInterval; + Persistent = true; + }; }; - }; - systemd.services."cassandra-repair" = { - description = "Cassandra repair daemon"; - environment = cassandraEnvironment; - script = "${cassandraPackage}/bin/nodetool repair -pr"; - postStop = mkIf (cfg.repairPostStop != null) cfg.repairPostStop; - postStart = mkIf (cfg.repairPostStart != null) cfg.repairPostStart; - serviceConfig = { - User = cfg.user; + systemd.services.cassandra-incremental-repair = + { description = "Perform an incremental repair on this cassandra node."; + after = [ "cassandra.service" ]; + requires = [ "cassandra.service" ]; + serviceConfig = + { User = cfg.user; + Group = cfg.group; + ExecStart = + lib.concatStringsSep " " + ([ "${cfg.package}/bin/nodetool" "repair" + ] ++ cfg.incrementalRepairOptions); + }; + }; + systemd.timers.cassandra-incremental-repair = + mkIf (!isNull cfg.incrementalRepairInterval) { + description = "Schedule incremental repairs on Cassandra"; + wantedBy = [ "timers.target" ]; + timerConfig = + { OnBootSec = cfg.incrementalRepairInterval; + OnUnitActiveSec = cfg.incrementalRepairInterval; + Persistent = true; + }; }; - }; }; } diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index 631d7f8cba793b61376723df9d8230262d0cdc5f..1b8771cec3915e037568865b27fa149b3baec6f4 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -27,14 +27,14 @@ with lib; config = mkIf cfg.enable { - users.extraUsers.clickhouse = { + users.users.clickhouse = { name = "clickhouse"; uid = config.ids.uids.clickhouse; group = "clickhouse"; description = "ClickHouse server user"; }; - users.extraGroups.clickhouse.gid = config.ids.gids.clickhouse; + users.groups.clickhouse.gid = config.ids.gids.clickhouse; systemd.services.clickhouse = { description = "ClickHouse server"; diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 52247bfb983e2ddda4ce1fa64c2b9c29003ae4c4..ca89b1198205b5e0315f3bc0f58e5b9e89d54fb4 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -198,13 +198,13 @@ in { }; }; - users.extraUsers.couchdb = { + users.users.couchdb = { description = "CouchDB Server user"; group = "couchdb"; uid = config.ids.uids.couchdb; }; - users.extraGroups.couchdb.gid = config.ids.gids.couchdb; + users.groups.couchdb.gid = config.ids.gids.couchdb; }; } diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index b9f66612d4ebf8ae2b9640c0b8fff298363c419a..cc81b440450b11d16633fc0e09647205d7ec61cd 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -154,13 +154,13 @@ in # there are some additional settings which should be reviewed ''; - users.extraUsers.firebird = { + users.users.firebird = { description = "Firebird server user"; group = "firebird"; uid = config.ids.uids.firebird; }; - users.extraGroups.firebird.gid = config.ids.gids.firebird; + users.groups.firebird.gid = config.ids.gids.firebird; }; } diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix new file mode 100644 index 0000000000000000000000000000000000000000..ad24f9f4b0fdf396bc661404d5a651dea8bf802e --- /dev/null +++ b/nixos/modules/services/databases/foundationdb.nix @@ -0,0 +1,416 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.foundationdb; + pkg = cfg.package; + + # used for initial cluster configuration + initialIpAddr = if (cfg.publicAddress != "auto") then cfg.publicAddress else "127.0.0.1"; + + fdbServers = n: + concatStringsSep "\n" (map (x: "[fdbserver.${toString (x+cfg.listenPortStart)}]") (range 0 (n - 1))); + + backupAgents = n: + concatStringsSep "\n" (map (x: "[backup_agent.${toString x}]") (range 1 n)); + + configFile = pkgs.writeText "foundationdb.conf" '' + [general] + cluster_file = /etc/foundationdb/fdb.cluster + + [fdbmonitor] + restart_delay = ${toString cfg.restartDelay} + user = ${cfg.user} + group = ${cfg.group} + + [fdbserver] + command = ${pkg}/bin/fdbserver + public_address = ${cfg.publicAddress}:$ID + listen_address = ${cfg.listenAddress} + datadir = ${cfg.dataDir}/$ID + logdir = ${cfg.logDir} + logsize = ${cfg.logSize} + maxlogssize = ${cfg.maxLogSize} + ${optionalString (cfg.class != null) "class = ${cfg.class}"} + memory = ${cfg.memory} + storage_memory = ${cfg.storageMemory} + + ${optionalString (cfg.tls != null) '' + tls_plugin = ${pkg}/libexec/plugins/FDBLibTLS.so + tls_certificate_file = ${cfg.tls.certificate} + tls_key_file = ${cfg.tls.key} + tls_verify_peers = ${cfg.tls.allowedPeers} + ''} + + ${optionalString (cfg.locality.machineId != null) "locality_machineid=${cfg.locality.machineId}"} + ${optionalString (cfg.locality.zoneId != null) "locality_zoneid=${cfg.locality.zoneId}"} + ${optionalString (cfg.locality.datacenterId != null) "locality_dcid=${cfg.locality.datacenterId}"} + ${optionalString (cfg.locality.dataHall != null) "locality_data_hall=${cfg.locality.dataHall}"} + + ${fdbServers cfg.serverProcesses} + + [backup_agent] + command = ${pkg}/libexec/backup_agent + ${backupAgents cfg.backupProcesses} + ''; +in +{ + options.services.foundationdb = { + + enable = mkEnableOption "FoundationDB Server"; + + package = mkOption { + type = types.package; + description = '' + The FoundationDB package to use for this server. This must be specified by the user + in order to ensure migrations and upgrades are controlled appropriately. + ''; + }; + + publicAddress = mkOption { + type = types.str; + default = "auto"; + description = "Publicly visible IP address of the process. Port is determined by process ID"; + }; + + listenAddress = mkOption { + type = types.str; + default = "public"; + description = "Publicly visible IP address of the process. Port is determined by process ID"; + }; + + listenPortStart = mkOption { + type = types.int; + default = 4500; + description = '' + Starting port number for database listening sockets. Every FDB process binds to a + subsequent port, to this number reflects the start of the overall range. e.g. having + 8 server processes will use all ports between 4500 and 4507. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open the firewall ports corresponding to FoundationDB processes and coordinators + using . + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/foundationdb"; + description = "Data directory. All cluster data will be put under here."; + }; + + logDir = mkOption { + type = types.path; + default = "/var/log/foundationdb"; + description = "Log directory."; + }; + + user = mkOption { + type = types.str; + default = "foundationdb"; + description = "User account under which FoundationDB runs."; + }; + + group = mkOption { + type = types.str; + default = "foundationdb"; + description = "Group account under which FoundationDB runs."; + }; + + class = mkOption { + type = types.nullOr (types.enum [ "storage" "transaction" "stateless" ]); + default = null; + description = "Process class"; + }; + + restartDelay = mkOption { + type = types.int; + default = 10; + description = "Number of seconds to wait before restarting servers."; + }; + + logSize = mkOption { + type = types.string; + default = "10MiB"; + description = '' + Roll over to a new log file after the current log file + reaches the specified size. + ''; + }; + + maxLogSize = mkOption { + type = types.string; + default = "100MiB"; + description = '' + Delete the oldest log file when the total size of all log + files exceeds the specified size. If set to 0, old log files + will not be deleted. + ''; + }; + + serverProcesses = mkOption { + type = types.int; + default = 1; + description = "Number of fdbserver processes to run."; + }; + + backupProcesses = mkOption { + type = types.int; + default = 1; + description = "Number of backup_agent processes to run for snapshots."; + }; + + memory = mkOption { + type = types.string; + default = "8GiB"; + description = '' + Maximum memory used by the process. The default value is + 8GiB. When specified without a unit, + MiB is assumed. This parameter does not + change the memory allocation of the program. Rather, it sets + a hard limit beyond which the process will kill itself and + be restarted. The default value of 8GiB + is double the intended memory usage in the default + configuration (providing an emergency buffer to deal with + memory leaks or similar problems). It is not recommended to + decrease the value of this parameter below its default + value. It may be increased if you wish to allocate a very + large amount of storage engine memory or cache. In + particular, when the storageMemory + parameter is increased, the memory + parameter should be increased by an equal amount. + ''; + }; + + storageMemory = mkOption { + type = types.string; + default = "1GiB"; + description = '' + Maximum memory used for data storage. The default value is + 1GiB. When specified without a unit, + MB is assumed. Clusters using the memory + storage engine will be restricted to using this amount of + memory per process for purposes of data storage. Memory + overhead associated with storing the data is counted against + this total. If you increase the + storageMemory, you should also increase + the memory parameter by the same amount. + ''; + }; + + tls = mkOption { + default = null; + description = '' + FoundationDB Transport Security Layer (TLS) settings. + ''; + + type = types.nullOr (types.submodule ({ + options = { + certificate = mkOption { + type = types.str; + description = '' + Path to the TLS certificate file. This certificate will + be offered to, and may be verified by, clients. + ''; + }; + + key = mkOption { + type = types.str; + description = "Private key file for the certificate."; + }; + + allowedPeers = mkOption { + type = types.str; + default = "Check.Valid=1,Check.Unexpired=1"; + description = '' + "Peer verification string". This may be used to adjust which TLS + client certificates a server will accept, as a form of user + authorization; for example, it may only accept TLS clients who + offer a certificate abiding by some locality or organization name. + + For more information, please see the FoundationDB documentation. + ''; + }; + }; + })); + }; + + locality = mkOption { + default = { + machineId = null; + zoneId = null; + datacenterId = null; + dataHall = null; + }; + + description = '' + FoundationDB locality settings. + ''; + + type = types.submodule ({ + options = { + machineId = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + Machine identifier key. All processes on a machine should share a + unique id. By default, processes on a machine determine a unique id to share. + This does not generally need to be set. + ''; + }; + + zoneId = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + Zone identifier key. Processes that share a zone id are + considered non-unique for the purposes of data replication. + If unset, defaults to machine id. + ''; + }; + + datacenterId = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + Data center identifier key. All processes physically located in a + data center should share the id. If you are depending on data + center based replication this must be set on all processes. + ''; + }; + + dataHall = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + Data hall identifier key. All processes physically located in a + data hall should share the id. If you are depending on data + hall based replication this must be set on all processes. + ''; + }; + }; + }); + }; + + extraReadWritePaths = mkOption { + default = [ ]; + type = types.listOf types.path; + description = '' + An extra set of filesystem paths that FoundationDB can read to + and write from. By default, FoundationDB runs under a heavily + namespaced systemd environment without write access to most of + the filesystem outside of its data and log directories. By + adding paths to this list, the set of writeable paths will be + expanded. This is useful for allowing e.g. backups to local files, + which must be performed on behalf of the foundationdb service. + ''; + }; + + pidfile = mkOption { + type = types.path; + default = "/run/foundationdb.pid"; + description = "Path to pidfile for fdbmonitor."; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkg ]; + + users.users = optionalAttrs (cfg.user == "foundationdb") (singleton + { name = "foundationdb"; + description = "FoundationDB User"; + uid = config.ids.uids.foundationdb; + group = cfg.group; + }); + + users.groups = optionalAttrs (cfg.group == "foundationdb") (singleton + { name = "foundationdb"; + gid = config.ids.gids.foundationdb; + }); + + networking.firewall.allowedTCPPortRanges = mkIf cfg.openFirewall + [ { from = cfg.listenPortStart; + to = (cfg.listenPortStart + cfg.serverProcesses) - 1; + } + ]; + + systemd.services.foundationdb = { + description = "FoundationDB Service"; + + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig = + { RequiresMountsFor = "${cfg.dataDir} ${cfg.logDir}"; + }; + + serviceConfig = + let rwpaths = [ cfg.dataDir cfg.logDir cfg.pidfile "/etc/foundationdb" ] + ++ cfg.extraReadWritePaths; + in + { Type = "simple"; + Restart = "always"; + RestartSec = 5; + User = cfg.user; + Group = cfg.group; + PIDFile = "${cfg.pidfile}"; + + PermissionsStartOnly = true; # setup needs root perms + TimeoutSec = 120; # give reasonable time to shut down + + # Security options + NoNewPrivileges = true; + ProtectHome = true; + ProtectSystem = "strict"; + ProtectKernelTunables = true; + ProtectControlGroups = true; + PrivateTmp = true; + PrivateDevices = true; + ReadWritePaths = lib.concatStringsSep " " (map (x: "-" + x) rwpaths); + }; + + path = [ pkg pkgs.coreutils ]; + + preStart = '' + rm -f ${cfg.pidfile} && \ + touch ${cfg.pidfile} && \ + chown -R ${cfg.user}:${cfg.group} ${cfg.pidfile} + + for x in "${cfg.logDir}" "${cfg.dataDir}"; do + [ ! -d "$x" ] && mkdir -m 0700 -vp "$x"; + chown -R ${cfg.user}:${cfg.group} "$x"; + done + + [ ! -d /etc/foundationdb ] && \ + mkdir -m 0775 -vp /etc/foundationdb && \ + chown -R ${cfg.user}:${cfg.group} "/etc/foundationdb" + + if [ ! -f /etc/foundationdb/fdb.cluster ]; then + cf=/etc/foundationdb/fdb.cluster + desc=$(tr -dc A-Za-z0-9 /dev/null | head -c8) + rand=$(tr -dc A-Za-z0-9 /dev/null | head -c8) + echo ''${desc}:''${rand}@${initialIpAddr}:${builtins.toString cfg.listenPortStart} > $cf + chmod 0664 $cf && chown -R ${cfg.user}:${cfg.group} $cf + touch "${cfg.dataDir}/.first_startup" + fi + ''; + + script = "exec fdbmonitor --lockfile ${cfg.pidfile} --conffile ${configFile}"; + + postStart = '' + if [ -e "${cfg.dataDir}/.first_startup" ]; then + fdbcli --exec "configure new single memory" + rm -f "${cfg.dataDir}/.first_startup"; + fi + ''; + }; + }; + + meta.doc = ./foundationdb.xml; + meta.maintainers = with lib.maintainers; [ thoughtpolice ]; +} diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml new file mode 100644 index 0000000000000000000000000000000000000000..f4090c4927641117c5673d98f1a0f34c880e7603 --- /dev/null +++ b/nixos/modules/services/databases/foundationdb.xml @@ -0,0 +1,354 @@ + + +FoundationDB + +Source: modules/services/databases/foundationdb.nix + +Upstream documentation: + +Maintainer: Austin Seipp + +Available version(s): 5.1.x, 5.2.x, 6.0.x + +FoundationDB (or "FDB") is an open source, distributed, transactional +key-value store. + +
Configuring and basic setup + +To enable FoundationDB, add the following to your +configuration.nix: + + +services.foundationdb.enable = true; +services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x + + + +The option is required, +and must always be specified. Due to the fact FoundationDB network protocols and +on-disk storage formats may change between (major) versions, and upgrades must +be explicitly handled by the user, you must always manually specify this +yourself so that the NixOS module will use the proper version. Note that minor, +bugfix releases are always compatible. + +After running nixos-rebuild, you can verify whether +FoundationDB is running by executing fdbcli (which is added +to ): + + +$ sudo -u foundationdb fdbcli +Using cluster file `/etc/foundationdb/fdb.cluster'. + +The database is available. + +Welcome to the fdbcli. For help, type `help'. +fdb> status + +Using cluster file `/etc/foundationdb/fdb.cluster'. + +Configuration: + Redundancy mode - single + Storage engine - memory + Coordinators - 1 + +Cluster: + FoundationDB processes - 1 + Machines - 1 + Memory availability - 5.4 GB per process on machine with least available + Fault Tolerance - 0 machines + Server time - 04/20/18 15:21:14 + +... + +fdb> + + + +You can also write programs using the available client libraries. +For example, the following Python program can be run in order to grab the +cluster status, as a quick example. (This example uses +nix-shell shebang support to automatically supply the +necessary Python modules). + + +a@link> cat fdb-status.py +#! /usr/bin/env nix-shell +#! nix-shell -i python -p python pythonPackages.foundationdb52 + +import fdb +import json + +def main(): + fdb.api_version(520) + db = fdb.open() + + @fdb.transactional + def get_status(tr): + return str(tr['\xff\xff/status/json']) + + obj = json.loads(get_status(db)) + print('FoundationDB available: %s' % obj['client']['database_status']['available']) + +if __name__ == "__main__": + main() +a@link> chmod +x fdb-status.py +a@link> ./fdb-status.py +FoundationDB available: True +a@link> + + + +FoundationDB is run under the foundationdb user and +group by default, but this may be changed in the NixOS configuration. The +systemd unit foundationdb.service controls the +fdbmonitor process. + +By default, the NixOS module for FoundationDB creates a single +SSD-storage based database for development and basic usage. This storage engine +is designed for SSDs and will perform poorly on HDDs; however it can handle far +more data than the alternative "memory" engine and is a better default choice +for most deployments. (Note that you can change the storage backend on-the-fly +for a given FoundationDB cluster using fdbcli.) + +Furthermore, only 1 server process and 1 backup agent are started in the +default configuration. See below for more on scaling to increase this. + +FoundationDB stores all data for all server processes under +/var/lib/foundationdb. You can override this using +, e.g. + + +services.foundationdb.dataDir = "/data/fdb"; + + + + +Similarly, logs are stored under +/var/log/foundationdb by default, and there is a +corresponding as well. + +
+ +
Scaling processes and backup agents + +Scaling the number of server processes is quite easy; simply specify + to be the number of +FoundationDB worker processes that should be started on the machine. + +FoundationDB worker processes typically require 4GB of RAM per-process at +minimum for good performance, so this option is set to 1 by default since the +maximum amount of RAM is unknown. You're advised to abide by this restriction, +so pick a number of processes so that each has 4GB or more. + +A similar option exists in order to scale backup agent processes, +. Backup agents are not +as performance/RAM sensitive, so feel free to experiment with the number of +available backup processes. + +
+ +
Clustering + +FoundationDB on NixOS works similarly to other Linux systems, so this +section will be brief. Please refer to the full FoundationDB documentation for +more on clustering. + +FoundationDB organizes clusters using a set of +coordinators, which are just specially-designated worker +processes. By default, every installation of FoundationDB on NixOS will start +as its own individual cluster, with a single coordinator: the first worker +process on localhost. + +Coordinators are specified globally using the +/etc/foundationdb/fdb.cluster file, which all servers and +client applications will use to find and join coordinators. Note that this file +can not be managed by NixOS so easily: FoundationDB is +designed so that it will rewrite the file at runtime for all clients and nodes +when cluster coordinators change, with clients transparently handling this +without intervention. It is fundamentally a mutable file, and you should not +try to manage it in any way in NixOS. + +When dealing with a cluster, there are two main things you want to +do: + + + Add a node to the cluster for storage/compute. + Promote an ordinary worker to a coordinator. + + +A node must already be a member of the cluster in order to properly be +promoted to a coordinator, so you must always add it first if you wish to +promote it. + +To add a machine to a FoundationDB cluster: + + + Choose one of the servers to start as the initial coordinator. + + Copy the /etc/foundationdb/fdb.cluster file + from this server to all the other servers. Restart FoundationDB on all of + these other servers, so they join the cluster. + All of these servers are now connected and working together + in the cluster, under the chosen coordinator. + + +At this point, you can add as many nodes as you want by just repeating +the above steps. By default there will still be a single coordinator: you can +use fdbcli to change this and add new coordinators. + +As a convenience, FoundationDB can automatically assign coordinators +based on the redundancy mode you wish to achieve for the cluster. Once all the +nodes have been joined, simply set the replication policy, and then issue the +coordinators auto command + +For example, assuming we have 3 nodes available, we can enable double +redundancy mode, then auto-select coordinators. For double redundancy, 3 +coordinators is ideal: therefore FoundationDB will make +every node a coordinator automatically: + + +fdbcli> configure double ssd +fdbcli> coordinators auto + + +This will transparently update all the servers within seconds, and +appropriately rewrite the fdb.cluster file, as well as +informing all client processes to do the same. + +
+ +
Client connectivity + +By default, all clients must use the current +fdb.cluster file to access a given FoundationDB cluster. +This file is located by default in +/etc/foundationdb/fdb.cluster on all machines with the +FoundationDB service enabled, so you may copy the active one from your cluster +to a new node in order to connect, if it is not part of the cluster. + +
+ +
Client authorization and TLS + +By default, any user who can connect to a FoundationDB process with the +correct cluster configuration can access anything. FoundationDB uses a +pluggable design to transport security, and out of the box it supports a +LibreSSL-based plugin for TLS support. This plugin not only does in-flight +encryption, but also performs client authorization based on the given +endpoint's certificate chain. For example, a FoundationDB server may be +configured to only accept client connections over TLS, where the client TLS +certificate is from organization Acme Co in the +Research and Development unit. + +Configuring TLS with FoundationDB is done using the + options in order to control the peer +verification string, as well as the certificate and its private key. + +Note that the certificate and its private key must be accessible to the +FoundationDB user account that the server runs under. These files are also NOT +managed by NixOS, as putting them into the store may reveal private +information. + +After you have a key and certificate file in place, it is not enough to +simply set the NixOS module options -- you must also configure the +fdb.cluster file to specify that a given set of coordinators +use TLS. This is as simple as adding the suffix :tls to your +cluster coordinator configuration, after the port number. For example, assuming +you have a coordinator on localhost with the default configuration, simply +specifying: + + +XXXXXX:XXXXXX@127.0.0.1:4500:tls + + +will configure all clients and server processes to use TLS from now +on. + +
+ +
Backups and Disaster Recovery + +The usual rules for doing FoundationDB backups apply on NixOS as written +in the FoundationDB manual. However, one important difference is the security +profile for NixOS: by default, the foundationdb systemd unit +uses Linux namespaces to restrict write access to the +system, except for the log directory, data directory, and the +/etc/foundationdb/ directory. This is enforced by default +and cannot be disabled. + +However, a side effect of this is that the fdbbackup +command doesn't work properly for local filesystem backups: FoundationDB uses a +server process alongside the database processes to perform backups and copy the +backups to the filesystem. As a result, this process is put under the +restricted namespaces above: the backup process can only write to a limited +number of paths. + +In order to allow flexible backup locations on local disks, the +FoundationDB NixOS module supports a + option. This option +takes a list of paths, and adds them to the systemd unit, allowing the +processes inside the service to write (and read) the specified +directories. + +For example, to create backups in /opt/fdb-backups, +first set up the paths in the module options: + + +services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; + + +Restart the FoundationDB service, and it will now be able to write to +this directory (even if it does not yet exist.) Note: this path +must exist before restarting the unit. Otherwise, systemd +will not include it in the private FoundationDB namespace (and it will not add +it dynamically at runtime). + +You can now perform a backup: + + +$ sudo -u foundationdb fdbbackup start -t default -d file:///opt/fdb-backups +$ sudo -u foundationdb fdbbackup status -t default + + +
+ +
Known limitations + +The FoundationDB setup for NixOS should currently be considered beta. +FoundationDB is not new software, but the NixOS compilation and integration has +only undergone fairly basic testing of all the available functionality. + + + There is no way to specify individual parameters for + individual fdbserver processes. Currently, all server + processes inherit all the global fdbmonitor settings. + + Ruby bindings are not currently installed. + Go bindings are not currently installed. + + +
+ +
Options + +NixOS's FoundationDB module allows you to configure all of the most +relevant configuration options for fdbmonitor, matching it +quite closely. A complete list of options for the FoundationDB module may be +found here. You should +also read the FoundationDB documentation as well. + +
+ +
Full documentation + +FoundationDB is a complex piece of software, and requires careful +administration to properly use. Full documentation for administration can be +found here: . + +
+ +
diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 629d02209a9c763d7247f418677d15170eb8813e..4772e897efe2c904faf7847ac66703e9e242d272 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -122,13 +122,13 @@ in { }; }; - users.extraUsers.hbase = { + users.users.hbase = { description = "HBase Server user"; group = "hbase"; uid = config.ids.uids.hbase; }; - users.extraGroups.hbase.gid = config.ids.gids.hbase; + users.groups.hbase.gid = config.ids.gids.hbase; }; } diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index 15b711f57b13b437b3f3cd4da4c21c46932e1f7a..d7a028b25d8d9f0523af41f885c0660022caf33f 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -182,13 +182,13 @@ in ''; }; - users.extraUsers = optional (cfg.user == "influxdb") { + users.users = optional (cfg.user == "influxdb") { name = "influxdb"; uid = config.ids.uids.influxdb; description = "Influxdb daemon user"; }; - users.extraGroups = optional (cfg.group == "influxdb") { + users.groups = optional (cfg.group == "influxdb") { name = "influxdb"; gid = config.ids.gids.influxdb; }; diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index 46bc6fc5c1320f78390899ca4dbaaa22d8636c55..7af452e4dced70e6c7ee17e199a7126948fa4eb1 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -64,7 +64,7 @@ in config = mkIf config.services.memcached.enable { - users.extraUsers = optional (cfg.user == "memcached") { + users.users = optional (cfg.user == "memcached") { name = "memcached"; description = "Memcached server user"; }; diff --git a/nixos/modules/services/databases/monetdb.nix b/nixos/modules/services/databases/monetdb.nix new file mode 100644 index 0000000000000000000000000000000000000000..5c66fc7b2e360ca9323273891669d2b5e9e07577 --- /dev/null +++ b/nixos/modules/services/databases/monetdb.nix @@ -0,0 +1,100 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.monetdb; + +in { + meta.maintainers = with maintainers; [ StillerHarpo primeos ]; + + ###### interface + options = { + services.monetdb = { + + enable = mkEnableOption "the MonetDB database server"; + + package = mkOption { + type = types.package; + default = pkgs.monetdb; + defaultText = "pkgs.monetdb"; + description = "MonetDB package to use."; + }; + + user = mkOption { + type = types.str; + default = "monetdb"; + description = "User account under which MonetDB runs."; + }; + + group = mkOption { + type = types.str; + default = "monetdb"; + description = "Group under which MonetDB runs."; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/monetdb"; + description = "Data directory for the dbfarm."; + }; + + port = mkOption { + type = types.ints.u16; + default = 50000; + description = "Port to listen on."; + }; + + listenAddress = mkOption { + type = types.str; + default = "127.0.0.1"; + example = "0.0.0.0"; + description = "Address to listen on."; + }; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + + users.users.monetdb = mkIf (cfg.user == "monetdb") { + uid = config.ids.uids.monetdb; + group = cfg.group; + description = "MonetDB user"; + home = cfg.dataDir; + createHome = true; + }; + + users.groups.monetdb = mkIf (cfg.group == "monetdb") { + gid = config.ids.gids.monetdb; + members = [ cfg.user ]; + }; + + environment.systemPackages = [ cfg.package ]; + + systemd.services.monetdb = { + description = "MonetDB database server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = [ cfg.package ]; + unitConfig.RequiresMountsFor = "${cfg.dataDir}"; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.package}/bin/monetdbd start -n ${cfg.dataDir}"; + ExecStop = "${cfg.package}/bin/monetdbd stop ${cfg.dataDir}"; + }; + preStart = '' + if [ ! -e ${cfg.dataDir}/.merovingian_properties ]; then + # Create the dbfarm (as cfg.user) + ${cfg.package}/bin/monetdbd create ${cfg.dataDir} + fi + + # Update the properties + ${cfg.package}/bin/monetdbd set port=${toString cfg.port} ${cfg.dataDir} + ${cfg.package}/bin/monetdbd set listenaddr=${cfg.listenAddress} ${cfg.dataDir} + ''; + }; + + }; +} diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 78dbf0d784cfb64569878a0f3119ff4ed312d0e7..4c46d9228e5f88b745a1d7e94fe89e1c950d649e 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -93,7 +93,7 @@ in config = mkIf config.services.mongodb.enable { - users.extraUsers.mongodb = mkIf (cfg.user == "mongodb") + users.users.mongodb = mkIf (cfg.user == "mongodb") { name = "mongodb"; uid = config.ids.uids.mongodb; description = "MongoDB server user"; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 21a131b90a8115f6277cf8ce3f63867b519189ae..0dde9ee6e2e5ff8033ab17e3167927f2ba83451f 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -221,18 +221,20 @@ in mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql"); - users.extraUsers.mysql = { + users.users.mysql = { description = "MySQL server user"; group = "mysql"; uid = config.ids.uids.mysql; }; - users.extraGroups.mysql.gid = config.ids.gids.mysql; + users.groups.mysql.gid = config.ids.gids.mysql; environment.systemPackages = [mysql]; - systemd.services.mysql = - { description = "MySQL Server"; + systemd.services.mysql = let + hasNotify = (cfg.package == pkgs.mariadb); + in { + description = "MySQL Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -256,17 +258,16 @@ in mkdir -m 0755 -p ${cfg.pidDir} chown -R ${cfg.user} ${cfg.pidDir} - - # Make the socket directory - mkdir -p /run/mysqld - chmod 0755 /run/mysqld - chown -R ${cfg.user} /run/mysqld ''; - serviceConfig.ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; + serviceConfig = { + Type = if hasNotify then "notify" else "simple"; + RuntimeDirectory = "mysqld"; + ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; + }; - postStart = - '' + postStart = '' + ${lib.optionalString (!hasNotify) '' # Wait until the MySQL server is available for use count=0 while [ ! -e /run/mysqld/mysqld.sock ] @@ -281,6 +282,7 @@ in count=$((count++)) sleep 1 done + ''} if [ -f /tmp/mysql_init ] then diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 424e08a6ee346751449cac6a9987e25bb3025909..5533182c31168f4b7948ba5eff5e079351a53c77 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -1,32 +1,87 @@ -{ config, lib, pkgs, ... }: +{ config, options, lib, pkgs, ... }: with lib; let cfg = config.services.neo4j; + certDirOpt = options.services.neo4j.directories.certificates; + isDefaultPathOption = opt: isOption opt && opt.type == types.path && opt.highestPrio >= 1500; + + sslPolicies = mapAttrsToList ( + name: conf: '' + dbms.ssl.policy.${name}.allow_key_generation=${boolToString conf.allowKeyGeneration} + dbms.ssl.policy.${name}.base_directory=${conf.baseDirectory} + ${optionalString (conf.ciphers != null) '' + dbms.ssl.policy.${name}.ciphers=${concatStringsSep "," conf.ciphers} + ''} + dbms.ssl.policy.${name}.client_auth=${conf.clientAuth} + ${if length (splitString "/" conf.privateKey) > 1 then + ''dbms.ssl.policy.${name}.private_key=${conf.privateKey}'' + else + ''dbms.ssl.policy.${name}.private_key=${conf.baseDirectory}/${conf.privateKey}'' + } + ${if length (splitString "/" conf.privateKey) > 1 then + ''dbms.ssl.policy.${name}.public_certificate=${conf.publicCertificate}'' + else + ''dbms.ssl.policy.${name}.public_certificate=${conf.baseDirectory}/${conf.publicCertificate}'' + } + dbms.ssl.policy.${name}.revoked_dir=${conf.revokedDir} + dbms.ssl.policy.${name}.tls_versions=${concatStringsSep "," conf.tlsVersions} + dbms.ssl.policy.${name}.trust_all=${boolToString conf.trustAll} + dbms.ssl.policy.${name}.trusted_dir=${conf.trustedDir} + '' + ) cfg.ssl.policies; serverConfig = pkgs.writeText "neo4j.conf" '' - dbms.directories.data=${cfg.dataDir}/data - dbms.directories.certificates=${cfg.certDir} - dbms.directories.logs=${cfg.dataDir}/logs - dbms.directories.plugins=${cfg.dataDir}/plugins - dbms.connector.http.type=HTTP - dbms.connector.http.enabled=true - dbms.connector.http.address=${cfg.listenAddress}:${toString cfg.port} - ${optionalString cfg.enableBolt '' - dbms.connector.bolt.type=BOLT - dbms.connector.bolt.enabled=true - dbms.connector.bolt.tls_level=OPTIONAL - dbms.connector.bolt.address=${cfg.listenAddress}:${toString cfg.boltPort} + # General + dbms.allow_upgrade=${boolToString cfg.allowUpgrade} + dbms.connectors.default_listen_address=${cfg.defaultListenAddress} + dbms.read_only=${boolToString cfg.readOnly} + ${optionalString (cfg.workerCount > 0) '' + dbms.threads.worker_count=${toString cfg.workerCount} ''} - ${optionalString cfg.enableHttps '' - dbms.connector.https.type=HTTP - dbms.connector.https.enabled=true - dbms.connector.https.encryption=TLS - dbms.connector.https.address=${cfg.listenAddress}:${toString cfg.httpsPort} + + # Directories + dbms.directories.certificates=${cfg.directories.certificates} + dbms.directories.data=${cfg.directories.data} + dbms.directories.logs=${cfg.directories.home}/logs + dbms.directories.plugins=${cfg.directories.plugins} + ${optionalString (cfg.constrainLoadCsv) '' + dbms.directories.import=${cfg.directories.imports} ''} - dbms.shell.enabled=true - ${cfg.extraServerConfig} + + # HTTP Connector + ${optionalString (cfg.http.enable) '' + dbms.connector.http.enabled=${boolToString cfg.http.enable} + dbms.connector.http.listen_address=${cfg.http.listenAddress} + ''} + ${optionalString (!cfg.http.enable) '' + # It is not possible to disable the HTTP connector. To fully prevent + # clients from connecting to HTTP, block the HTTP port (7474 by default) + # via firewall. listen_address is set to the loopback interface to + # prevent remote clients from connecting. + dbms.connector.http.listen_address=127.0.0.1 + ''} + + # HTTPS Connector + dbms.connector.https.enabled=${boolToString cfg.https.enable} + dbms.connector.https.listen_address=${cfg.https.listenAddress} + https.ssl_policy=${cfg.https.sslPolicy} + + # BOLT Connector + dbms.connector.bolt.enabled=${boolToString cfg.bolt.enable} + dbms.connector.bolt.listen_address=${cfg.bolt.listenAddress} + bolt.ssl_policy=${cfg.bolt.sslPolicy} + dbms.connector.bolt.tls_level=${cfg.bolt.tlsLevel} + + # neo4j-shell + dbms.shell.enabled=${boolToString cfg.shell.enable} + + # SSL Policies + ${concatStringsSep "\n" sslPolicies} + + # Default retention policy from neo4j.conf + dbms.tx_log.rotation.retention_policy=1 days # Default JVM parameters from neo4j.conf dbms.jvm.additional=-XX:+UseG1GC @@ -36,8 +91,14 @@ let dbms.jvm.additional=-XX:+TrustFinalNonStaticFields dbms.jvm.additional=-XX:+DisableExplicitGC dbms.jvm.additional=-Djdk.tls.ephemeralDHKeySize=2048 - + dbms.jvm.additional=-Djdk.tls.rejectClientInitiatedRenegotiation=true dbms.jvm.additional=-Dunsupported.dbms.udc.source=tarball + + # Usage Data Collector + dbms.udc.enabled=${boolToString cfg.udc.enable} + + # Extra Configuration + ${cfg.extraServerConfig} ''; in { @@ -45,105 +106,547 @@ in { ###### interface options.services.neo4j = { + enable = mkOption { - description = "Whether to enable neo4j."; + type = types.bool; default = false; + description = '' + Whether to enable Neo4j Community Edition. + ''; + }; + + allowUpgrade = mkOption { type = types.bool; + default = false; + description = '' + Allow upgrade of Neo4j database files from an older version. + ''; + }; + + constrainLoadCsv = mkOption { + type = types.bool; + default = true; + description = '' + Sets the root directory for file URLs used with the Cypher + LOAD CSV clause to be that defined by + . It restricts + access to only those files within that directory and its + subdirectories. +
+ + Setting this option to false introduces + possible security problems. + ''; + }; + + defaultListenAddress = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + Default network interface to listen for incoming connections. To + listen for connections on all interfaces, use "0.0.0.0". + + + Specifies the default IP address and address part of connector + specific options. To bind specific + connectors to a specific network interfaces, specify the entire + option for that connector. + ''; + }; + + extraServerConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration for Neo4j Community server. Refer to the + complete reference + of Neo4j configuration settings. + ''; }; package = mkOption { - description = "Neo4j package to use."; + type = types.package; default = pkgs.neo4j; defaultText = "pkgs.neo4j"; - type = types.package; + description = '' + Neo4j package to use. + ''; }; - listenAddress = mkOption { - description = "Neo4j listen address."; - default = "127.0.0.1"; - type = types.str; + readOnly = mkOption { + type = types.bool; + default = false; + description = '' + Only allow read operations from this Neo4j instance. + ''; }; - port = mkOption { - description = "Neo4j port to listen for HTTP traffic."; - default = 7474; - type = types.int; + workerCount = mkOption { + type = types.ints.between 0 44738; + default = 0; + description = '' + Number of Neo4j worker threads, where the default of + 0 indicates a worker count equal to the number of + available processors. + ''; }; - enableBolt = mkOption { - description = "Enable bolt for Neo4j."; - default = true; - type = types.bool; + bolt = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Enable the BOLT connector for Neo4j. Setting this option to + false will stop Neo4j from listening for incoming + connections on the BOLT port (7687 by default). + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = ":7687"; + description = '' + Neo4j listen address for BOLT traffic. The listen address is + expressed in the format <ip-address>:<port-number>. + ''; + }; + + sslPolicy = mkOption { + type = types.str; + default = "legacy"; + description = '' + Neo4j SSL policy for BOLT traffic. + + + The legacy policy is a special policy which is not defined in + the policy configuration section, but rather derives from + and + associated files (by default: neo4j.key and + neo4j.cert). Its use will be deprecated. + + + Note: This connector must be configured to support/require + SSL/TLS for the legacy policy to actually be utilized. See + . + ''; + }; + + tlsLevel = mkOption { + type = types.enum [ "REQUIRED" "OPTIONAL" "DISABLED" ]; + default = "OPTIONAL"; + description = '' + SSL/TSL requirement level for BOLT traffic. + ''; + }; }; - boltPort = mkOption { - description = "Neo4j port to listen for BOLT traffic."; - default = 7687; - type = types.int; + directories = { + certificates = mkOption { + type = types.path; + default = "${cfg.directories.home}/certificates"; + description = '' + Directory for storing certificates to be used by Neo4j for + TLS connections. + + + When setting this directory to something other than its default, + ensure the directory's existence, and that read/write permissions are + given to the Neo4j daemon user neo4j. + + + Note that changing this directory from its default will prevent + the directory structure required for each SSL policy from being + automatically generated. A policy's directory structure as defined by + its , and + must then be setup manually. The + existence of these directories is mandatory, as well as the presence + of the certificate file and the private key. Ensure the correct + permissions are set on these directories and files. + ''; + }; + + data = mkOption { + type = types.path; + default = "${cfg.directories.home}/data"; + description = '' + Path of the data directory. You must not configure more than one + Neo4j installation to use the same data directory. + + + When setting this directory to something other than its default, + ensure the directory's existence, and that read/write permissions are + given to the Neo4j daemon user neo4j. + ''; + }; + + home = mkOption { + type = types.path; + default = "/var/lib/neo4j"; + description = '' + Path of the Neo4j home directory. Other default directories are + subdirectories of this path. This directory will be created if + non-existent, and its ownership will be chown to + the Neo4j daemon user neo4j. + ''; + }; + + imports = mkOption { + type = types.path; + default = "${cfg.directories.home}/import"; + description = '' + The root directory for file URLs used with the Cypher + LOAD CSV clause. Only meaningful when + is set to + true. + + + When setting this directory to something other than its default, + ensure the directory's existence, and that read permission is + given to the Neo4j daemon user neo4j. + ''; + }; + + plugins = mkOption { + type = types.path; + default = "${cfg.directories.home}/plugins"; + description = '' + Path of the database plugin directory. Compiled Java JAR files that + contain database procedures will be loaded if they are placed in + this directory. + + + When setting this directory to something other than its default, + ensure the directory's existence, and that read permission is + given to the Neo4j daemon user neo4j. + ''; + }; }; - enableHttps = mkOption { - description = "Enable https for Neo4j."; - default = false; - type = types.bool; + http = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + The HTTP connector is required for Neo4j, and cannot be disabled. + Setting this option to false will force the HTTP + connector's to the loopback + interface to prevent connection of remote clients. To prevent all + clients from connecting, block the HTTP port (7474 by default) by + firewall. + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = ":7474"; + description = '' + Neo4j listen address for HTTP traffic. The listen address is + expressed in the format <ip-address>:<port-number>. + ''; + }; }; - httpsPort = mkOption { - description = "Neo4j port to listen for HTTPS traffic."; - default = 7473; - type = types.int; + https = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Enable the HTTPS connector for Neo4j. Setting this option to + false will stop Neo4j from listening for incoming + connections on the HTTPS port (7473 by default). + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = ":7473"; + description = '' + Neo4j listen address for HTTPS traffic. The listen address is + expressed in the format <ip-address>:<port-number>. + ''; + }; + + sslPolicy = mkOption { + type = types.str; + default = "legacy"; + description = '' + Neo4j SSL policy for HTTPS traffic. + + + The legacy policy is a special policy which is not defined in the + policy configuration section, but rather derives from + and + associated files (by default: neo4j.key and + neo4j.cert). Its use will be deprecated. + ''; + }; }; - certDir = mkOption { - description = "Neo4j TLS certificates directory."; - default = "${cfg.dataDir}/certificates"; - type = types.path; + shell = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable a remote shell server which Neo4j Shell clients can log in to. + Only applicable to neo4j-shell. + ''; + }; }; - dataDir = mkOption { - description = "Neo4j data directory."; - default = "/var/lib/neo4j"; - type = types.path; + ssl.policies = mkOption { + type = with types; attrsOf (submodule ({ name, config, options, ... }: { + options = { + + allowKeyGeneration = mkOption { + type = types.bool; + default = false; + description = '' + Allows the generation of a private key and associated self-signed + certificate. Only performed when both objects cannot be found for + this policy. It is recommended to turn this off again after keys + have been generated. + + + The public certificate is required to be duplicated to the + directory holding trusted certificates as defined by the + option. + + + Keys should in general be generated and distributed offline by a + trusted certificate authority and not by utilizing this mode. + ''; + }; + + baseDirectory = mkOption { + type = types.path; + default = "${cfg.directories.certificates}/${name}"; + description = '' + The mandatory base directory for cryptographic objects of this + policy. This path is only automatically generated when this + option as well as are + left at their default. Ensure read/write permissions are given + to the Neo4j daemon user neo4j. + + + It is also possible to override each individual + configuration with absolute paths. See the + and + policy options. + ''; + }; + + ciphers = mkOption { + type = types.nullOr (types.listOf types.str); + default = null; + description = '' + Restrict the allowed ciphers of this policy to those defined + here. The default ciphers are those of the JVM platform. + ''; + }; + + clientAuth = mkOption { + type = types.enum [ "NONE" "OPTIONAL" "REQUIRE" ]; + default = "REQUIRE"; + description = '' + The client authentication stance for this policy. + ''; + }; + + privateKey = mkOption { + type = types.str; + default = "private.key"; + description = '' + The name of private PKCS #8 key file for this policy to be found + in the , or the absolute path to + the key file. It is mandatory that a key can be found or generated. + ''; + }; + + publicCertificate = mkOption { + type = types.str; + default = "public.crt"; + description = '' + The name of public X.509 certificate (chain) file in PEM format + for this policy to be found in the , + or the absolute path to the certificate file. It is mandatory + that a certificate can be found or generated. + + + The public certificate is required to be duplicated to the + directory holding trusted certificates as defined by the + option. + ''; + }; + + revokedDir = mkOption { + type = types.path; + default = "${config.baseDirectory}/revoked"; + description = '' + Path to directory of CRLs (Certificate Revocation Lists) in + PEM format. Must be an absolute path. The existence of this + directory is mandatory and will need to be created manually when: + setting this option to something other than its default; setting + either this policy's or + to something other than + their default. Ensure read/write permissions are given to the + Neo4j daemon user neo4j. + ''; + }; + + tlsVersions = mkOption { + type = types.listOf types.str; + default = [ "TLSv1.2" ]; + description = '' + Restrict the TLS protocol versions of this policy to those + defined here. + ''; + }; + + trustAll = mkOption { + type = types.bool; + default = false; + description = '' + Makes this policy trust all remote parties. Enabling this is not + recommended and the policy's trusted directory will be ignored. + Use of this mode is discouraged. It would offer encryption but + no security. + ''; + }; + + trustedDir = mkOption { + type = types.path; + default = "${config.baseDirectory}/trusted"; + description = '' + Path to directory of X.509 certificates in PEM format for + trusted parties. Must be an absolute path. The existence of this + directory is mandatory and will need to be created manually when: + setting this option to something other than its default; setting + either this policy's or + to something other than + their default. Ensure read/write permissions are given to the + Neo4j daemon user neo4j. + + + The public certificate as defined by + is required to be duplicated + to this directory. + ''; + }; + + directoriesToCreate = mkOption { + type = types.listOf types.path; + internal = true; + readOnly = true; + description = '' + Directories of this policy that will be created automatically + when the certificates directory is left at its default value. + This includes all options of type path that are left at their + default value. + ''; + }; + + }; + + config.directoriesToCreate = optionals + (certDirOpt.highestPrio >= 1500 && options.baseDirectory.highestPrio >= 1500) + (map (opt: opt.value) (filter isDefaultPathOption (attrValues options))); + + })); + default = {}; + description = '' + Defines the SSL policies for use with Neo4j connectors. Each attribute + of this set defines a policy, with the attribute name defining the name + of the policy and its namespace. Refer to the operations manual section + on Neo4j's + SSL Framework + for further details. + ''; }; - extraServerConfig = mkOption { - description = "Extra configuration for neo4j server."; - default = ""; - type = types.lines; + udc = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the Usage Data Collector which Neo4j uses to collect usage + data. Refer to the operations manual section on the + Usage Data Collector + for more information. + ''; + }; }; + }; ###### implementation - config = mkIf cfg.enable { - systemd.services.neo4j = { - description = "Neo4j Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - environment = { - NEO4J_HOME = "${cfg.package}/share/neo4j"; - NEO4J_CONF = "${cfg.dataDir}/conf"; - }; - serviceConfig = { - ExecStart = "${cfg.package}/bin/neo4j console"; - User = "neo4j"; - PermissionsStartOnly = true; - LimitNOFILE = 40000; - }; - preStart = '' - mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf,logs} - ln -fs ${serverConfig} ${cfg.dataDir}/conf/neo4j.conf - if [ "$(id -u)" = 0 ]; then chown -R neo4j ${cfg.dataDir}; fi - ''; - }; + config = + let + # Assertion helpers + policyNameList = attrNames cfg.ssl.policies; + validPolicyNameList = [ "legacy" ] ++ policyNameList; + validPolicyNameString = concatStringsSep ", " validPolicyNameList; + + # Capture various directories left at their default so they can be created. + defaultDirectoriesToCreate = map (opt: opt.value) (filter isDefaultPathOption (attrValues options.services.neo4j.directories)); + policyDirectoriesToCreate = concatMap (pol: pol.directoriesToCreate) (attrValues cfg.ssl.policies); + in + + mkIf cfg.enable { + assertions = [ + { assertion = !elem "legacy" policyNameList; + message = "The policy 'legacy' is special to Neo4j, and its name is reserved."; } + { assertion = elem cfg.bolt.sslPolicy validPolicyNameList; + message = "Invalid policy assigned: `services.neo4j.bolt.sslPolicy = \"${cfg.bolt.sslPolicy}\"`, defined policies are: ${validPolicyNameString}"; } + { assertion = elem cfg.https.sslPolicy validPolicyNameList; + message = "Invalid policy assigned: `services.neo4j.https.sslPolicy = \"${cfg.https.sslPolicy}\"`, defined policies are: ${validPolicyNameString}"; } + ]; + + systemd.services.neo4j = { + description = "Neo4j Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = { + NEO4J_HOME = "${cfg.package}/share/neo4j"; + NEO4J_CONF = "${cfg.directories.home}/conf"; + }; + serviceConfig = { + ExecStart = "${cfg.package}/bin/neo4j console"; + User = "neo4j"; + PermissionsStartOnly = true; + LimitNOFILE = 40000; + }; + + preStart = '' + # Directories Setup + # Always ensure home exists with nested conf, logs directories. + mkdir -m 0700 -p ${cfg.directories.home}/{conf,logs} - environment.systemPackages = [ cfg.package ]; + # Create other sub-directories and policy directories that have been left at their default. + ${concatMapStringsSep "\n" ( + dir: '' + mkdir -m 0700 -p ${dir} + '') (defaultDirectoriesToCreate ++ policyDirectoriesToCreate)} - users.extraUsers = singleton { - name = "neo4j"; - uid = config.ids.uids.neo4j; - description = "Neo4j daemon user"; - home = cfg.dataDir; + # Place the configuration where Neo4j can find it. + ln -fs ${serverConfig} ${cfg.directories.home}/conf/neo4j.conf + + # Ensure neo4j user ownership + chown -R neo4j ${cfg.directories.home} + ''; + }; + + environment.systemPackages = [ cfg.package ]; + + users.users = singleton { + name = "neo4j"; + uid = config.ids.uids.neo4j; + description = "Neo4j daemon user"; + home = cfg.directories.home; + }; }; + + meta = { + maintainers = with lib.maintainers; [ patternspandemic ]; }; } diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index a67c61eb99492cbcb857a4dcdcaa475535f25e1d..9f2bf5ef8a9ccdae9a0757c1eff441026d72fad7 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -145,13 +145,13 @@ in "${configOpts}"; }; - users.extraUsers.openldap = + users.users.openldap = { name = cfg.user; group = cfg.group; uid = config.ids.uids.openldap; }; - users.extraGroups.openldap = + users.groups.openldap = { name = cfg.group; gid = config.ids.gids.openldap; }; diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix index 489cdcffe65879cecf0686d1618cc594e8c9c359..b26fa9093ef467c9a8b93603879c7e92548509ba 100644 --- a/nixos/modules/services/databases/opentsdb.nix +++ b/nixos/modules/services/databases/opentsdb.nix @@ -97,13 +97,13 @@ in { }; }; - users.extraUsers.opentsdb = { + users.users.opentsdb = { description = "OpenTSDB Server user"; group = "opentsdb"; uid = config.ids.uids.opentsdb; }; - users.extraGroups.opentsdb.gid = config.ids.gids.opentsdb; + users.groups.opentsdb.gid = config.ids.gids.opentsdb; }; } diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index 86733a3e5a075d642f2af75082831dd28775e941..1a34c7f5ecee60c93352cd8e4aac951f8f0c7e80 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -22,7 +22,7 @@ let web_root = ${cfg.package}/etc/pgmanage/web_root - data_root = ${cfg.dataRoot} + sql_root = ${cfg.sqlRoot} ${optionalString (!isNull cfg.tls) '' tls_cert = ${cfg.tls.cert} @@ -41,7 +41,9 @@ let pgmanage = "pgmanage"; - pgmanageOptions = { +in { + + options.services.pgmanage = { enable = mkEnableOption "PostgreSQL Administration for the web"; package = mkOption { @@ -130,7 +132,7 @@ let ''; }; - dataRoot = mkOption { + sqlRoot = mkOption { type = types.str; default = "/var/lib/pgmanage"; description = '' @@ -176,47 +178,29 @@ let }; }; - -in { - - options.services.pgmanage = pgmanageOptions; - - # This is deprecated and should be removed for NixOS-18.03. - options.services.postage = pgmanageOptions; - - config = mkMerge [ - { assertions = [ - { assertion = !config.services.postage.enable; - message = - "services.postage is deprecated in favour of pgmanage. " + - "They have the same options so just substitute postage for pgmanage." ; - } - ]; - } - (mkIf cfg.enable { - systemd.services.pgmanage = { - description = "pgmanage - PostgreSQL Administration for the web"; - wants = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = pgmanage; - Group = pgmanage; - ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" + - optionalString cfg.localOnly " --local-only=true"; - }; + config = mkIf cfg.enable { + systemd.services.pgmanage = { + description = "pgmanage - PostgreSQL Administration for the web"; + wants = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = pgmanage; + Group = pgmanage; + ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" + + optionalString cfg.localOnly " --local-only=true"; }; - users = { - users."${pgmanage}" = { - name = pgmanage; - group = pgmanage; - home = cfg.dataRoot; - createHome = true; - }; - groups."${pgmanage}" = { - name = pgmanage; - }; + }; + users = { + users."${pgmanage}" = { + name = pgmanage; + group = pgmanage; + home = cfg.sqlRoot; + createHome = true; }; - }) - ]; + groups."${pgmanage}" = { + name = pgmanage; + }; + }; + }; } diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 0dcbfe2e47ac5541f77ac472472e05a45fbae611..f59fb1c8177265b408a2d5e166396d2c0893efac 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -24,21 +24,17 @@ let postgresql = postgresqlAndPlugins cfg.package; - flags = optional cfg.enableTCPIP "-i"; - # The main PostgreSQL configuration file. configFile = pkgs.writeText "postgresql.conf" '' hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}' ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}' log_destination = 'stderr' + listen_addresses = '${if cfg.enableTCPIP then "*" else "localhost"}' port = ${toString cfg.port} ${cfg.extraConfig} ''; - pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4"; - - in { @@ -182,19 +178,19 @@ in services.postgresql.authentication = mkAfter '' # Generated file; do not edit! - local all all ident ${optionalString pre84 "sameuser"} + local all all ident host all all 127.0.0.1/32 md5 host all all ::1/128 md5 ''; - users.extraUsers.postgres = + users.users.postgres = { name = "postgres"; uid = config.ids.uids.postgres; group = "postgres"; description = "PostgreSQL server user"; }; - users.extraGroups.postgres.gid = config.ids.gids.postgres; + users.groups.postgres.gid = config.ids.gids.postgres; environment.systemPackages = [ postgresql ]; @@ -232,7 +228,7 @@ in "${cfg.dataDir}/recovery.conf" ''} - exec postgres ${toString flags} + exec postgres ''; serviceConfig = diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index a98026942959c83fb689c3ee46ad7404cccdd3a4..98a631c0cd32aff47946ba9e4e7e034262b5b07e 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -23,15 +23,15 @@ configuration.nix: -services.postgresql.enable = true; -services.postgresql.package = pkgs.postgresql94; + = true; + = pkgs.postgresql94; Note that you are required to specify the desired version of PostgreSQL (e.g. pkgs.postgresql94). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for - such as the most recent + such as the most recent release of PostgreSQL. - If services.emacs.defaultEditor is + If is true, the EDITOR variable will be set to a wrapper script which launches emacsclient. @@ -497,10 +497,10 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal Emacs daemon is not wanted for all users, it is possible to install the service but not globally enable it: - + + = false; + = true; + @@ -582,7 +582,7 @@ services.emacs.install = true; To install the DocBook 5.0 schemas, either add pkgs.docbook5 to - environment.systemPackages ( (NixOS), or run nix-env -i pkgs.docbook5 (Nix). diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix index 963147b18a04770cc18dcdbd109e77d13fd8b1ec..9cc8d421270ea26dd808d9551f453b9419bf2397 100644 --- a/nixos/modules/services/editors/infinoted.nix +++ b/nixos/modules/services/editors/infinoted.nix @@ -10,8 +10,8 @@ in { package = mkOption { type = types.package; - default = pkgs.libinfinity.override { daemon = true; }; - defaultText = "pkgs.libinfinity.override { daemon = true; }"; + default = pkgs.libinfinity; + defaultText = "pkgs.libinfinity"; description = '' Package providing infinoted ''; @@ -111,15 +111,15 @@ in { }; config = mkIf (cfg.enable) { - users.extraUsers = optional (cfg.user == "infinoted") + users.users = optional (cfg.user == "infinoted") { name = "infinoted"; description = "Infinoted user"; group = cfg.group; }; - users.extraGroups = optional (cfg.group == "infinoted") + users.groups = optional (cfg.group == "infinoted") { name = "infinoted"; }; - + systemd.services.infinoted = { description = "Gobby Dedicated Server"; @@ -129,7 +129,7 @@ in { serviceConfig = { Type = "simple"; Restart = "always"; - ExecStart = "${cfg.package}/bin/infinoted-0.6 --config-file=/var/lib/infinoted/infinoted.conf"; + ExecStart = "${cfg.package.infinoted} --config-file=/var/lib/infinoted/infinoted.conf"; User = cfg.user; Group = cfg.group; PermissionsStartOnly = true; diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index d2c8af6de0c54ed02355b3d993863db8d17974a4..f50d2897843a27fa0b0716b195147e1067126a3a 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -45,7 +45,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.minecraft = { + users.users.minecraft = { description = "Minecraft Server Service user"; home = cfg.dataDir; createHome = true; diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index 58b73ac4f6bfa26db8936e011856ac06e1e46849..2de42f20f6ccdbd6910ce600b685810c91862415 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -79,7 +79,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.minetest = { + users.users.minetest = { description = "Minetest Server Service user"; home = "/var/lib/minetest"; createHome = true; diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index 21aff780b6729cb1e3f4ca45e5f7970e04561c6c..31f8edca20ce02c1619c5a603db41c389091f83b 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -18,6 +18,16 @@ let (boolFlag "secure" cfg.secure) (boolFlag "noupnp" cfg.noUPnP) ]; + stopScript = pkgs.writeScript "terraria-stop" '' + #!${pkgs.runtimeShell} + + if ! [ -d "/proc/$1" ]; then + exit 0 + fi + + ${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter exit Enter + ${getBin pkgs.coreutils}/bin/tail --pid="$1" -f /dev/null + ''; in { options = { @@ -105,14 +115,14 @@ in }; config = mkIf cfg.enable { - users.extraUsers.terraria = { + users.users.terraria = { description = "Terraria server service user"; home = "/var/lib/terraria"; createHome = true; uid = config.ids.uids.terraria; }; - users.extraGroups.terraria = { + users.groups.terraria = { gid = config.ids.gids.terraria; members = [ "terraria" ]; }; @@ -124,10 +134,10 @@ in serviceConfig = { User = "terraria"; - Type = "oneshot"; - RemainAfterExit = true; + Type = "forking"; + GuessMainPID = true; ExecStart = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}"; - ExecStop = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter \"exit\" Enter"; + ExecStop = "${stopScript} $MAINPID"; }; postStart = '' diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixos/modules/services/hardware/actkbd.nix index b16a8f50a3d840ebc9aa358c6e009520631606c2..4168140b287a69e8bcc855f36f7f47e9b784faa0 100644 --- a/nixos/modules/services/hardware/actkbd.nix +++ b/nixos/modules/services/hardware/actkbd.nix @@ -15,7 +15,7 @@ let ${cfg.extraConfig} ''; - bindingCfg = { config, ... }: { + bindingCfg = { ... }: { options = { keys = mkOption { diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 4a8cd86b0b11eeb0051f93fc3be6d4b4c49dbab6..d7ca8a431794656a10c533199dc0d1c72454f824 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -3,8 +3,8 @@ with lib; let - bluez-bluetooth = pkgs.bluez; cfg = config.hardware.bluetooth; + bluez-bluetooth = cfg.package; in { @@ -21,6 +21,16 @@ in { description = "Whether to power up the default Bluetooth controller on boot."; }; + package = mkOption { + type = types.package; + default = pkgs.bluez; + defaultText = "pkgs.bluez"; + example = "pkgs.bluez.override { enableMidi = true; }"; + description = '' + Which BlueZ package to use. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index d8abde2a600a850fe9ae74ae6268019f54f16914..7743f81fd622c82bcbc6a96cbe7b50af3a2402d3 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -71,6 +71,13 @@ in { BlacklistPlugins=${lib.concatStringsSep ";" cfg.blacklistPlugins} ''; }; + "fwupd/uefi.conf" = { + source = pkgs.writeText "uefi.conf" '' + [uefi] + OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint} + ''; + }; + } // originalEtc // extraTrustedKeys; services.dbus.packages = [ pkgs.fwupd ]; @@ -85,6 +92,6 @@ in { }; meta = { - maintainers = pkgs.fwupd.maintainers; + maintainers = pkgs.fwupd.meta.maintainers; }; } diff --git a/nixos/modules/services/hardware/lcd.nix b/nixos/modules/services/hardware/lcd.nix new file mode 100644 index 0000000000000000000000000000000000000000..d78d742cd3185f9540d4fe8fc95ed374ec62de17 --- /dev/null +++ b/nixos/modules/services/hardware/lcd.nix @@ -0,0 +1,172 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.hardware.lcd; + pkg = lib.getBin pkgs.lcdproc; + + serverCfg = pkgs.writeText "lcdd.conf" '' + [server] + DriverPath=${pkg}/lib/lcdproc/ + ReportToSyslog=false + Bind=${cfg.serverHost} + Port=${toString cfg.serverPort} + ${cfg.server.extraConfig} + ''; + + clientCfg = pkgs.writeText "lcdproc.conf" '' + [lcdproc] + Server=${cfg.serverHost} + Port=${toString cfg.serverPort} + ReportToSyslog=false + ${cfg.client.extraConfig} + ''; + + serviceCfg = { + DynamicUser = true; + Restart = "on-failure"; + Slice = "lcd.slice"; + }; + +in with lib; { + + meta.maintainers = with maintainers; [ peterhoeg ]; + + options = with types; { + services.hardware.lcd = { + serverHost = mkOption { + type = str; + default = "localhost"; + description = "Host on which LCDd is listening."; + }; + + serverPort = mkOption { + type = int; + default = 13666; + description = "Port on which LCDd is listening."; + }; + + server = { + enable = mkOption { + type = bool; + default = false; + description = "Enable the LCD panel server (LCDd)"; + }; + + openPorts = mkOption { + type = bool; + default = false; + description = "Open the ports in the firewall"; + }; + + usbPermissions = mkOption { + type = bool; + default = false; + description = '' + Set group-write permissions on a USB device. + + + A USB connected LCD panel will most likely require having its + permissions modified for lcdd to write to it. Enabling this option + sets group-write permissions on the device identified by + and + . In order to find the + values, you can run the lsusb command. Example + output: + + + + Bus 005 Device 002: ID 0403:c630 Future Technology Devices International, Ltd lcd2usb interface + + + + In this case the vendor id is 0403 and the product id is c630. + ''; + }; + + usbVid = mkOption { + type = str; + default = ""; + description = "The vendor ID of the USB device to claim."; + }; + + usbPid = mkOption { + type = str; + default = ""; + description = "The product ID of the USB device to claim."; + }; + + usbGroup = mkOption { + type = str; + default = "dialout"; + description = "The group to use for settings permissions. This group must exist or you will have to create it."; + }; + + extraConfig = mkOption { + type = lines; + default = ""; + description = "Additional configuration added verbatim to the server config."; + }; + }; + + client = { + enable = mkOption { + type = bool; + default = false; + description = "Enable the LCD panel client (LCDproc)"; + }; + + extraConfig = mkOption { + type = lines; + default = ""; + description = "Additional configuration added verbatim to the client config."; + }; + + restartForever = mkOption { + type = bool; + default = true; + description = "Try restarting the client forever."; + }; + }; + }; + }; + + config = mkIf (cfg.server.enable || cfg.client.enable) { + networking.firewall.allowedTCPPorts = mkIf (cfg.server.enable && cfg.server.openPorts) [ cfg.serverPort ]; + + services.udev.extraRules = mkIf (cfg.server.enable && cfg.server.usbPermissions) '' + ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="${cfg.server.usbVid}", ATTRS{idProduct}=="${cfg.server.usbPid}", MODE="660", GROUP="${cfg.server.usbGroup}" + ''; + + systemd.services = { + lcdd = mkIf cfg.server.enable { + description = "LCDproc - server"; + wantedBy = [ "lcd.target" ]; + serviceConfig = serviceCfg // { + ExecStart = "${pkg}/bin/LCDd -f -c ${serverCfg}"; + SupplementaryGroups = cfg.server.usbGroup; + }; + }; + + lcdproc = mkIf cfg.client.enable { + description = "LCDproc - client"; + after = [ "lcdd.service" ]; + wantedBy = [ "lcd.target" ]; + serviceConfig = serviceCfg // { + ExecStart = "${pkg}/bin/lcdproc -f -c ${clientCfg}"; + # If the server is being restarted at the same time, the client will + # fail as it cannot connect, so space it out a bit. + RestartSec = "5"; + # Allow restarting for eternity + StartLimitIntervalSec = lib.mkIf cfg.client.restartForever "0"; + StartLimitBurst = lib.mkIf cfg.client.restartForever "0"; + }; + }; + }; + + systemd.targets.lcd = { + description = "LCD client/server"; + after = [ "lcdd.service" "lcdproc.service" ]; + wantedBy = [ "multi-user.target" ]; + }; + }; +} diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix index eb1713baa140ef6bb98523bac422fe874d90103e..d53175052c74af0cff3dd38a62fd4889d1b0284d 100644 --- a/nixos/modules/services/hardware/nvidia-optimus.nix +++ b/nixos/modules/services/hardware/nvidia-optimus.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let kernel = config.boot.kernelPackages; in diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index fa97e8bf746b8cdd772dfb8079e640286e8efb38..f3fc4c3cc79e0e344ac7009c996f95b4911b78d5 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -61,8 +61,8 @@ in { description = "PCSC-Lite daemon"; environment.PCSCLITE_HP_DROPDIR = pluginEnv; serviceConfig = { - ExecStart = "${pkgs.pcsclite}/sbin/pcscd -f -x -c ${cfgFile}"; - ExecReload = "${pkgs.pcsclite}/sbin/pcscd -H"; + ExecStart = "${getBin pkgs.pcsclite}/sbin/pcscd -f -x -c ${cfgFile}"; + ExecReload = "${getBin pkgs.pcsclite}/sbin/pcscd -H"; }; }; }; diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index d651ccaa57764eebc3939c7c47d938c0fb85b6b0..fe05c5a5c06f8e613072e6b3d4138e5a143d91cb 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -124,7 +124,7 @@ in environment.sessionVariables = env; services.udev.packages = backends; - users.extraGroups."scanner".gid = config.ids.gids.scanner; + users.groups."scanner".gid = config.ids.gids.scanner; }) (mkIf config.services.saned.enable { @@ -152,7 +152,7 @@ in }; }; - users.extraUsers."scanner" = { + users.users."scanner" = { uid = config.ids.uids.scanner; group = "scanner"; }; diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix index 1923addeb3ac2409ba4ee684c2fc3d19796fc599..f6ed4e25e9cb9a9645ccc667fa9eacbdf99cda15 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix @@ -9,7 +9,7 @@ let etcFiles = pkgs.callPackage ./brscan4_etc_files.nix { netDevices = netDeviceList; }; - netDeviceOpts = { name, config, ... }: { + netDeviceOpts = { name, ... }: { options = { diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index d957b5063d3861d54114782c586d5a64961f696a..d4b0a9495d75779f87eb65af540b7a556bd4b271 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -137,13 +137,13 @@ in serviceConfig.ExecStart = "${pkgs.trousers}/sbin/tcsd -f -c ${tcsdConf}"; }; - users.extraUsers = optionalAttrs (cfg.user == "tss") (singleton + users.users = optionalAttrs (cfg.user == "tss") (singleton { name = "tss"; group = "tss"; uid = config.ids.uids.tss; }); - users.extraGroups = optionalAttrs (cfg.group == "tss") (singleton + users.groups = optionalAttrs (cfg.group == "tss") (singleton { name = "tss"; gid = config.ids.gids.tss; }); diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix index 88c3f99aed4e00526fd7da81859839f777ece615..69577bbe018108466ba1754045d9d3e74ab30330 100644 --- a/nixos/modules/services/hardware/thermald.nix +++ b/nixos/modules/services/hardware/thermald.nix @@ -6,16 +6,30 @@ let cfg = config.services.thermald; in { ###### interface - options = { - services.thermald = { + options = { + services.thermald = { enable = mkOption { default = false; description = '' Whether to enable thermald, the temperature management daemon. - ''; - }; - }; - }; + ''; + }; + + debug = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable debug logging. + ''; + }; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "the thermald manual configuration file."; + }; + }; + }; ###### implementation config = mkIf cfg.enable { @@ -24,7 +38,15 @@ in { systemd.services.thermald = { description = "Thermal Daemon Service"; wantedBy = [ "multi-user.target" ]; - script = "exec ${pkgs.thermald}/sbin/thermald --no-daemon --dbus-enable"; + serviceConfig = { + ExecStart = '' + ${pkgs.thermald}/sbin/thermald \ + --no-daemon \ + ${optionalString cfg.debug "--loglevel=debug"} \ + ${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \ + --dbus-enable + ''; + }; }; }; } diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 5a898631e0903a4f2b0aa9d0d3f596248175f674..d17121ca1c5bf35b762519561b5acf294dc4839c 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -28,11 +28,14 @@ let # temperatures are read from the file. # # For example: - # sensor /proc/acpi/ibm/thermal (0, 0, 10) + # tp_thermal /proc/acpi/ibm/thermal (0, 0, 10) # will add a fixed value of 10 °C the 3rd value read from that file. Check out # http://www.thinkwiki.org/wiki/Thermal_Sensors to find out how much you may # want to add to certain temperatures. - + + ${cfg.fan} + ${cfg.sensors} + # Syntax: # (LEVEL, LOW, HIGH) # LEVEL is the fan level to use (0-7 with thinkpad_acpi) @@ -41,8 +44,6 @@ let # All numbers are integers. # - sensor ${cfg.sensor} (0, 10, 15, 2, 10, 5, 0, 3, 0, 3) - ${cfg.levels} ''; @@ -53,20 +54,52 @@ in { services.thinkfan = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable thinkfan, fan controller for IBM/Lenovo ThinkPads. ''; }; - sensor = mkOption { - default = "/proc/acpi/ibm/thermal"; + sensors = mkOption { + type = types.lines; + default = '' + tp_thermal /proc/acpi/ibm/thermal (0,0,10) + ''; + description ='' + thinkfan can read temperatures from three possible sources: + + /proc/acpi/ibm/thermal + Which is provided by the thinkpad_acpi kernel + module (keyword tp_thermal) + + /sys/class/hwmon/*/temp*_input + Which may be provided by any hwmon drivers (keyword + hwmon) + + S.M.A.R.T. (since 0.9 and requires the USE_ATASMART compilation flag) + Which reads the temperature directly from the hard + disk using libatasmart (keyword atasmart) + + Multiple sensors may be added, in which case they will be + numbered in their order of appearance. + ''; + }; + + fan = mkOption { + type = types.str; + default = "tp_fan /proc/acpi/ibm/fan"; description ='' - Sensor used by thinkfan + Specifies the fan we want to use. + On anything other than a Thinkpad you'll probably + use some PWM control file in /sys/class/hwmon. + A sysfs fan would be specified like this: + pwm_fan /sys/class/hwmon/hwmon2/device/pwm1 ''; }; levels = mkOption { + type = types.lines; default = '' (0, 0, 55) (1, 48, 60) @@ -76,8 +109,12 @@ in { (7, 60, 85) (127, 80, 32767) ''; - description ='' - Sensor used by thinkfan + description = '' + (LEVEL, LOW, HIGH) + LEVEL is the fan level to use (0-7 with thinkpad_acpi). + LOW is the temperature at which to step down to the previous level. + HIGH is the temperature at which to step up to the next level. + All numbers are integers. ''; }; diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index 38d0a3a1d75252e62778fb3abe602bb1c28856c0..f2ec00a7d3e18d447d269e44c723e15206702d15 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -26,8 +26,15 @@ in { name = "trezord-udev-rules"; destination = "/etc/udev/rules.d/51-trezor.rules"; text = '' - SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", SYMLINK+="trezor%n" - KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout" + # Trezor 1 + SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout" + + # Trezor 2 (Model-T) + SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" + SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl" + ]; ''; }); @@ -38,7 +45,7 @@ in { path = []; serviceConfig = { Type = "simple"; - ExecStart = "${pkgs.trezord}/bin/trezord -f"; + ExecStart = "${pkgs.trezord}/bin/trezord-go"; User = "trezord"; }; }; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 7bfc3bb6487270aec75d5a30ba21cfcf9a08023a..0266286aaacf9d174e274c10ee00de1a1f1e0a5c 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -4,8 +4,6 @@ with lib; let - inherit (pkgs) stdenv writeText procps; - udev = config.systemd.package; cfg = config.services.udev; diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix index ad5dc8e8a49b71a493cefb2798197a9e9ae3e502..ed8703be921cbba48bce8f3f36969c5c3d9aaa05 100644 --- a/nixos/modules/services/hardware/udisks2.nix +++ b/nixos/modules/services/hardware/udisks2.nix @@ -40,15 +40,8 @@ with lib; ''; services.udev.packages = [ pkgs.udisks2 ]; - - systemd.services.udisks2 = { - description = "Udisks2 service"; - serviceConfig = { - Type = "dbus"; - BusName = "org.freedesktop.UDisks2"; - ExecStart = "${pkgs.udisks2}/libexec/udisks2/udisksd --no-debug"; - }; - }; + + systemd.packages = [ pkgs.udisks2 ]; }; } diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix new file mode 100644 index 0000000000000000000000000000000000000000..e5ef0601de3cd2ff5da0567190e898e87af8a990 --- /dev/null +++ b/nixos/modules/services/hardware/undervolt.nix @@ -0,0 +1,134 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.undervolt; +in { + options.services.undervolt = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to undervolt intel cpus. + ''; + }; + + verbose = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable verbose logging. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.undervolt; + defaultText = "pkgs.undervolt"; + description = '' + undervolt derivation to use. + ''; + }; + + coreOffset = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The amount of voltage to offset the CPU cores by. Accepts a floating point number. + ''; + }; + + gpuOffset = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The amount of voltage to offset the GPU by. Accepts a floating point number. + ''; + }; + + uncoreOffset = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The amount of voltage to offset uncore by. Accepts a floating point number. + ''; + }; + + analogioOffset = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The amount of voltage to offset analogio by. Accepts a floating point number. + ''; + }; + + temp = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The temperature target. Accepts a floating point number. + ''; + }; + + tempAc = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The temperature target on AC power. Accepts a floating point number. + ''; + }; + + tempBat = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The temperature target on battery power. Accepts a floating point number. + ''; + }; + }; + + config = mkIf cfg.enable { + boot.kernelModules = [ "msr" ]; + + environment.systemPackages = [ cfg.package ]; + + systemd.services.undervolt = { + path = [ pkgs.undervolt ]; + + description = "Intel Undervolting Service"; + serviceConfig = { + Type = "oneshot"; + Restart = "no"; + + # `core` and `cache` are both intentionally set to `cfg.coreOffset` as according to the undervolt docs: + # + # Core or Cache offsets have no effect. It is not possible to set different offsets for + # CPU Core and Cache. The CPU will take the smaller of the two offsets, and apply that to + # both CPU and Cache. A warning message will be displayed if you attempt to set different offsets. + ExecStart = '' + ${pkgs.undervolt}/bin/undervolt \ + ${optionalString cfg.verbose "--verbose"} \ + ${optionalString (cfg.coreOffset != null) "--core ${cfg.coreOffset}"} \ + ${optionalString (cfg.coreOffset != null) "--cache ${cfg.coreOffset}"} \ + ${optionalString (cfg.gpuOffset != null) "--gpu ${cfg.gpuOffset}"} \ + ${optionalString (cfg.uncoreOffset != null) "--uncore ${cfg.uncoreOffset}"} \ + ${optionalString (cfg.analogioOffset != null) "--analogio ${cfg.analogioOffset}"} \ + ${optionalString (cfg.temp != null) "--temp ${cfg.temp}"} \ + ${optionalString (cfg.tempAc != null) "--temp-ac ${cfg.tempAc}"} \ + ${optionalString (cfg.tempBat != null) "--temp-bat ${cfg.tempBat}"} + ''; + }; + }; + + systemd.timers.undervolt = { + description = "Undervolt timer to ensure voltage settings are always applied"; + partOf = [ "undervolt.service" ]; + wantedBy = [ "multi-user.target" ]; + timerConfig = { + OnBootSec = "2min"; + OnUnitActiveSec = "30"; + }; + }; + }; +} diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix index 7ebd49fa01c2752354068c59e880effd385bc24f..93ced0b9f04d42689ce6b9e9fcd6f517540b5796 100644 --- a/nixos/modules/services/hardware/usbmuxd.nix +++ b/nixos/modules/services/hardware/usbmuxd.nix @@ -43,13 +43,13 @@ in config = mkIf cfg.enable { - users.extraUsers = optional (cfg.user == defaultUserGroup) { + users.users = optional (cfg.user == defaultUserGroup) { name = cfg.user; description = "usbmuxd user"; group = cfg.group; }; - users.extraGroups = optional (cfg.group == defaultUserGroup) { + users.groups = optional (cfg.group == defaultUserGroup) { name = cfg.group; }; @@ -65,7 +65,7 @@ in serviceConfig = { # Trigger the udev rule manually. This doesn't require replugging the # device when first enabling the option to get it to work - ExecStartPre = "${pkgs.libudev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; + ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f"; }; }; diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index 95f31829882ff75acf45a04e8d4daa41113b9748..74a7b3c9b470ba3f6a197bba6e04f71be8230fdb 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -127,7 +127,7 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == "graylog") { + users.users = mkIf (cfg.user == "graylog") { graylog = { uid = config.ids.uids.graylog; description = "Graylog server daemon user"; diff --git a/nixos/modules/services/logging/journaldriver.nix b/nixos/modules/services/logging/journaldriver.nix new file mode 100644 index 0000000000000000000000000000000000000000..74ac3d4c23659829dbfe1a18aeb583c3f1c1741d --- /dev/null +++ b/nixos/modules/services/logging/journaldriver.nix @@ -0,0 +1,112 @@ +# This module implements a systemd service for running journaldriver, +# a log forwarding agent that sends logs from journald to Stackdriver +# Logging. +# +# It can be enabled without extra configuration when running on GCP. +# On machines hosted elsewhere, the other configuration options need +# to be set. +# +# For further information please consult the documentation in the +# upstream repository at: https://github.com/aprilabank/journaldriver/ + +{ config, lib, pkgs, ...}: + +with lib; let cfg = config.services.journaldriver; +in { + options.services.journaldriver = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable journaldriver to forward journald logs to + Stackdriver Logging. + ''; + }; + + logLevel = mkOption { + type = types.str; + default = "info"; + description = '' + Log level at which journaldriver logs its own output. + ''; + }; + + logName = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Configures the name of the target log in Stackdriver Logging. + This option can be set to, for example, the hostname of a + machine to improve the user experience in the logging + overview. + ''; + }; + + googleCloudProject = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Configures the name of the Google Cloud project to which to + forward journald logs. + + This option is required on non-GCP machines, but should not be + set on GCP instances. + ''; + }; + + logStream = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Configures the name of the Stackdriver Logging log stream into + which to write journald entries. + + This option is required on non-GCP machines, but should not be + set on GCP instances. + ''; + }; + + applicationCredentials = mkOption { + type = with types; nullOr path; + default = null; + description = '' + Path to the service account private key (in JSON-format) used + to forward log entries to Stackdriver Logging on non-GCP + instances. + + This option is required on non-GCP machines, but should not be + set on GCP instances. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.journaldriver = { + description = "Stackdriver Logging journal forwarder"; + script = "${pkgs.journaldriver}/bin/journaldriver"; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Restart = "always"; + DynamicUser = true; + + # This directive lets systemd automatically configure + # permissions on /var/lib/journaldriver, the directory in + # which journaldriver persists its cursor state. + StateDirectory = "journaldriver"; + + # This group is required for accessing journald. + SupplementaryGroups = "systemd-journal"; + }; + + environment = { + RUST_LOG = cfg.logLevel; + LOG_NAME = cfg.logName; + LOG_STREAM = cfg.logStream; + GOOGLE_CLOUD_PROJECT = cfg.googleCloudProject; + GOOGLE_APPLICATION_CREDENTIALS = cfg.applicationCredentials; + }; + }; + }; +} diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix index d49795fe2b77c2324e2152281fac97ab01f1dc6d..d0824df38ae306ad18800b10417481b712fdf0be 100644 --- a/nixos/modules/services/logging/journalwatch.nix +++ b/nixos/modules/services/logging/journalwatch.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, services, ... }: +{ config, lib, pkgs, ... }: with lib; let @@ -197,7 +197,7 @@ in { config = mkIf cfg.enable { - users.extraUsers.${user} = { + users.users.${user} = { isSystemUser = true; createHome = true; home = dataDir; @@ -241,6 +241,6 @@ in { }; meta = { - maintainers = with stdenv.lib.maintainers; [ florianjacob ]; + maintainers = with lib.maintainers; [ florianjacob ]; }; } diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index a4cab0c94cdccc6539bde652fdcca4e034b6b652..1477d273d5ee9b1bffc7709e718c8008f253e55e 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -213,7 +213,7 @@ in mapAttrsToList writeIgnoreRule cfg.ignore ++ mapAttrsToList writeIgnoreCronRule cfg.ignoreCron; - users.extraUsers = optionalAttrs (cfg.user == "logcheck") (singleton + users.users = optionalAttrs (cfg.user == "logcheck") (singleton { name = "logcheck"; uid = config.ids.uids.logcheck; shell = "/bin/sh"; diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 28d89a7463ab7d419e7a1f8eb594cdfbbceb20e7..aa019d855ea9d631a62ed67e3c7128297cacdde3 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -4,25 +4,12 @@ with lib; let cfg = config.services.logstash; - atLeast54 = versionAtLeast (builtins.parseDrvName cfg.package.name).version "5.4"; pluginPath = lib.concatStringsSep ":" cfg.plugins; havePluginPath = lib.length cfg.plugins > 0; ops = lib.optionalString; - verbosityFlag = - if atLeast54 - then "--log.level " + cfg.logLevel - else { - debug = "--debug"; - info = "--verbose"; - warn = ""; # intentionally empty - error = "--quiet"; - fatal = "--silent"; - }."${cfg.logLevel}"; - - pluginsPath = - if atLeast54 - then "--path.plugins ${pluginPath}" - else "--pluginpath ${pluginPath}"; + verbosityFlag = "--log.level " + cfg.logLevel; + + pluginsPath = "--path.plugins ${pluginPath}"; logstashConf = pkgs.writeText "logstash.conf" '' input { @@ -63,7 +50,7 @@ in type = types.package; default = pkgs.logstash; defaultText = "pkgs.logstash"; - example = literalExample "pkgs.logstash"; + example = literalExample "pkgs.logstash5"; description = "Logstash package to use."; }; @@ -95,12 +82,6 @@ in description = "The quantity of filter workers to run."; }; - enableWeb = mkOption { - type = types.bool; - default = false; - description = "Enable the logstash web interface."; - }; - listenAddress = mkOption { type = types.str; default = "127.0.0.1"; @@ -174,16 +155,6 @@ in ###### implementation config = mkIf cfg.enable { - assertions = [ - { assertion = atLeast54 -> !cfg.enableWeb; - message = '' - The logstash web interface is only available for versions older than 5.4. - So either set services.logstash.enableWeb = false, - or set services.logstash.package to an older logstash. - ''; - } - ]; - systemd.services.logstash = with pkgs; { description = "Logstash Daemon"; wantedBy = [ "multi-user.target" ]; @@ -193,14 +164,12 @@ in ExecStartPre = ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}" ; ${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"''; ExecStart = concatStringsSep " " (filter (s: stringLength s != 0) [ "${cfg.package}/bin/logstash" - (ops (!atLeast54) "agent") "-w ${toString cfg.filterWorkers}" (ops havePluginPath pluginsPath) "${verbosityFlag}" "-f ${logstashConf}" - (ops atLeast54 "--path.settings ${logstashSettingsDir}") - (ops atLeast54 "--path.data ${cfg.dataDir}") - (ops cfg.enableWeb "-- web -a ${cfg.listenAddress} -p ${cfg.port}") + "--path.settings ${logstashSettingsDir}" + "--path.data ${cfg.dataDir}" ]); }; }; diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index 21be286a6e9855bb5944288588f9499610da4db8..65e103ac2ba58ef3623940ccaa75e6e8d392c364 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -85,9 +85,11 @@ in { after = [ "multi-user.target" ]; # makes sure hostname etc is set serviceConfig = { Type = "notify"; + PIDFile = pidFile; StandardOutput = "null"; Restart = "on-failure"; ExecStart = "${cfg.package}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; }; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 543e732127a538661ef801ddf2088f74d195a0be..e6091182b2abc0ec239a89bc2e961398058851c7 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -9,8 +9,6 @@ let baseDir = "/run/dovecot2"; stateDir = "/var/lib/dovecot"; - canCreateMailUserGroup = cfg.mailUser != null && cfg.mailGroup != null; - dovecotConf = concatStrings [ '' base_dir = ${baseDir} @@ -25,6 +23,7 @@ let ssl_cert = <${cfg.sslServerCert} ssl_key = <${cfg.sslServerKey} ${optionalString (!(isNull cfg.sslCACert)) ("ssl_ca = <" + cfg.sslCACert)} + ssl_dh = <${config.security.dhparams.params.dovecot2.path} disable_plaintext_auth = yes '') @@ -111,7 +110,7 @@ let special_use = \${toString mailbox.specialUse} '' + "}"; - mailboxes = { lib, pkgs, ... }: { + mailboxes = { ... }: { options = { name = mkOption { type = types.strMatching ''[^"]+''; @@ -297,15 +296,18 @@ in config = mkIf cfg.enable { - security.pam.services.dovecot2 = mkIf cfg.enablePAM {}; - services.dovecot2.protocols = + security.dhparams = mkIf (! isNull cfg.sslServerCert) { + enable = true; + params.dovecot2 = {}; + }; + services.dovecot2.protocols = optional cfg.enableImap "imap" ++ optional cfg.enablePop3 "pop3" ++ optional cfg.enableLmtp "lmtp"; - users.extraUsers = [ + users.users = [ { name = "dovenull"; uid = config.ids.uids.dovenull2; description = "Dovecot user for untrusted logins"; @@ -324,7 +326,7 @@ in group = cfg.mailGroup; }); - users.extraGroups = optional (cfg.group == "dovecot2") + users.groups = optional (cfg.group == "dovecot2") { name = "dovecot2"; gid = config.ids.gids.dovecot2; } diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix index 89076ff054620eccaa6bdc48ec72bbaad83ca741..167b5aeccc848c9d98ddab4457119bcc23efc5fd 100644 --- a/nixos/modules/services/mail/dspam.nix +++ b/nixos/modules/services/mail/dspam.nix @@ -86,13 +86,13 @@ in { config = mkIf cfg.enable (mkMerge [ { - users.extraUsers = optionalAttrs (cfg.user == "dspam") (singleton + users.users = optionalAttrs (cfg.user == "dspam") (singleton { name = "dspam"; group = cfg.group; uid = config.ids.uids.dspam; }); - users.extraGroups = optionalAttrs (cfg.group == "dspam") (singleton + users.groups = optionalAttrs (cfg.group == "dspam") (singleton { name = "dspam"; gid = config.ids.gids.dspam; }); diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index 440eae281f405bbb2fa13a840dbca14681901f68..06c4b2811b3fc244aec2ca8bad09b87274860546 100644 --- a/nixos/modules/services/mail/exim.nix +++ b/nixos/modules/services/mail/exim.nix @@ -77,14 +77,14 @@ in systemPackages = [ exim ]; }; - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "Exim mail transfer agent user"; uid = config.ids.uids.exim; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.exim; }; @@ -94,6 +94,7 @@ in systemd.services.exim = { description = "Exim Mail Daemon"; wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."exim.conf".source ]; serviceConfig = { ExecStart = "${exim}/bin/exim -bdf -q30m"; ExecReload = "${coreutils}/bin/kill -HUP $MAINPID"; diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix index cfe1b5496a45d28a9a0f3720928526468abdee76..fed313e4738efb08e11897287a8762627727e1d9 100644 --- a/nixos/modules/services/mail/mail.nix +++ b/nixos/modules/services/mail/mail.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/mail/mailhog.nix b/nixos/modules/services/mail/mailhog.nix index 206fb50d31a29b354d970641d0b6f22f985eba2a..b78f4c8e0e663838d812d5ce19e5f6320b8b27a5 100644 --- a/nixos/modules/services/mail/mailhog.nix +++ b/nixos/modules/services/mail/mailhog.nix @@ -24,7 +24,7 @@ in { config = mkIf cfg.enable { - users.extraUsers.mailhog = { + users.users.mailhog = { name = cfg.user; description = "MailHog service user"; }; diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix index b6439b44fb5f5d66931da8f1f7143dd87ebdf501..11565bc02f89198b79f35bc662ab2cd6bd6ee2de 100644 --- a/nixos/modules/services/mail/mlmmj.nix +++ b/nixos/modules/services/mail/mlmmj.nix @@ -94,7 +94,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "mlmmj user"; home = stateDir; @@ -104,7 +104,7 @@ in useDefaultShell = true; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.mlmmj; }; diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index 59cb512c115b668fc4e215f919aac595b7c14a96..418c02af4b7f1c94f7dd7fd3a8a85673dd9d3b40 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -201,13 +201,13 @@ with lib; }; users = { - extraUsers = singleton { + users = singleton { name = cfg.user; description = "Nullmailer relay-only mta user"; group = cfg.group; }; - extraGroups = singleton { + groups = singleton { name = cfg.group; }; }; diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix index 59a8373843a1f28ccc69872e55cf03c322855572..7855efb46c73df0d9cb8d195165aa74efe1318b6 100644 --- a/nixos/modules/services/mail/opendkim.nix +++ b/nixos/modules/services/mail/opendkim.nix @@ -88,13 +88,13 @@ in { config = mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == "opendkim") (singleton + users.users = optionalAttrs (cfg.user == "opendkim") (singleton { name = "opendkim"; group = cfg.group; uid = config.ids.uids.opendkim; }); - users.extraGroups = optionalAttrs (cfg.group == "opendkim") (singleton + users.groups = optionalAttrs (cfg.group == "opendkim") (singleton { name = "opendkim"; gid = config.ids.gids.opendkim; }); diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index 53acdba424570e5d871337662aaac976500f022f..4276552d4f03a7e863ed79511d18273f7305c4c6 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -10,7 +10,7 @@ let sendmail = pkgs.runCommand "opensmtpd-sendmail" {} '' mkdir -p $out/bin - ln -s ${pkgs.opensmtpd}/sbin/smtpctl $out/bin/sendmail + ln -s ${cfg.package}/sbin/smtpctl $out/bin/sendmail ''; in { @@ -27,6 +27,13 @@ in { description = "Whether to enable the OpenSMTPD server."; }; + package = mkOption { + type = types.package; + default = pkgs.opensmtpd; + defaultText = "pkgs.opensmtpd"; + description = "The OpenSMTPD package to use."; + }; + addSendmailToSystemPath = mkOption { type = types.bool; default = true; @@ -76,12 +83,12 @@ in { ###### implementation config = mkIf cfg.enable { - users.extraGroups = { + users.groups = { smtpd.gid = config.ids.gids.smtpd; smtpq.gid = config.ids.gids.smtpq; }; - users.extraUsers = { + users.users = { smtpd = { description = "OpenSMTPD process user"; uid = config.ids.uids.smtpd; @@ -97,7 +104,7 @@ in { systemd.services.opensmtpd = let procEnv = pkgs.buildEnv { name = "opensmtpd-procs"; - paths = [ pkgs.opensmtpd ] ++ cfg.procPackages; + paths = [ cfg.package ] ++ cfg.procPackages; pathsToLink = [ "/libexec/opensmtpd" ]; }; in { @@ -115,7 +122,7 @@ in { chown smtpq.root /var/spool/smtpd/purge chmod 700 /var/spool/smtpd/purge ''; - serviceConfig.ExecStart = "${pkgs.opensmtpd}/sbin/smtpd -d -f ${conf} ${args}"; + serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}"; environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd"; }; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 5ab331ac067fdc091399ca2678d0ef3b8cc38ca8..33249aa3e554c3f167c9a900ad71d63ddaa26a4c 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -616,14 +616,14 @@ in setgid = true; }; - users.extraUsers = optional (user == "postfix") + users.users = optional (user == "postfix") { name = "postfix"; description = "Postfix mail server user"; uid = config.ids.uids.postfix; group = group; }; - users.extraGroups = + users.groups = optional (group == "postfix") { name = group; gid = config.ids.gids.postfix; diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index d4ae25c066acd15e9154eac00ebdf7994259ab08..241f75eae279f9c2107ece743bcdb59827b5a129 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -136,14 +136,14 @@ in { environment.systemPackages = [ pkgs.postgrey ]; users = { - extraUsers = { + users = { postgrey = { description = "Postgrey Daemon"; uid = config.ids.uids.postgrey; group = "postgrey"; }; }; - extraGroups = { + groups = { postgrey = { gid = config.ids.gids.postgrey; }; diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix index a1af16ec9ac1855316451a32fceb883c515818d3..8f12a16906c5ab745c42f88cca34a8c9dc9eabfa 100644 --- a/nixos/modules/services/mail/postsrsd.nix +++ b/nixos/modules/services/mail/postsrsd.nix @@ -90,13 +90,13 @@ in { services.postsrsd.domain = mkDefault config.networking.hostName; - users.extraUsers = optionalAttrs (cfg.user == "postsrsd") (singleton + users.users = optionalAttrs (cfg.user == "postsrsd") (singleton { name = "postsrsd"; group = cfg.group; uid = config.ids.uids.postsrsd; }); - users.extraGroups = optionalAttrs (cfg.group == "postsrsd") (singleton + users.groups = optionalAttrs (cfg.group == "postsrsd") (singleton { name = "postsrsd"; gid = config.ids.gids.postsrsd; }); diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index e17b7516bfff8ca512b17b0fa6e55404583de89f..7f38d757013296b337f539b8a1af8eacc8f90fb3 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -194,14 +194,14 @@ in (mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "rmilter daemon"; uid = config.ids.uids.rmilter; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.rmilter; }; @@ -238,12 +238,12 @@ in }) (mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) { - users.extraUsers.${cfg.user}.extraGroups = [ rspamdCfg.group ]; + users.users.${cfg.user}.extraGroups = [ rspamdCfg.group ]; }) (mkIf (cfg.enable && cfg.postfix.enable) { services.postfix.extraConfig = cfg.postfix.configFragment; - users.extraUsers.${postfixCfg.user}.extraGroups = [ cfg.group ]; + users.users.${postfixCfg.user}.extraGroups = [ cfg.group ]; }) ]; } diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 09fb587e74b56814ee13e23e49ba1eec9197d5b9..b3dae60c2c7e0675c10519bc6b842f1bddeff16a 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -282,14 +282,14 @@ in # Allow users to run 'rspamc' and 'rspamadm'. environment.systemPackages = [ pkgs.rspamd ]; - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "rspamd daemon"; uid = config.ids.uids.rspamd; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.rspamd; }; diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index d483a8c3d67dc7945179a05a7d633cf23c7143dc..0c11ea431368572c28f6b8a5c6f4a170bc971ca5 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -128,14 +128,14 @@ in systemPackages = [ pkgs.spamassassin ]; }; - users.extraUsers = singleton { + users.users = singleton { name = "spamd"; description = "Spam Assassin Daemon"; uid = config.ids.uids.spamd; group = "spamd"; }; - users.extraGroups = singleton { + users.groups = singleton { name = "spamd"; gid = config.ids.gids.spamd; }; diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix index b92104787a5602282812ac3c1de32a23d6676fc0..083587b8ebb1be6856364ed949007a05d3ac15a6 100644 --- a/nixos/modules/services/misc/airsonic.nix +++ b/nixos/modules/services/misc/airsonic.nix @@ -107,7 +107,7 @@ in { }; }; - users.extraUsers.airsonic = { + users.users.airsonic = { description = "Airsonic service user"; name = cfg.user; home = cfg.home; diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 82fa1cc2e7e51bcc20cebccd124d8447139f7abe..363ac4411e11dfa0a0a4d4d8a19fdc98b7c031f6 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -124,7 +124,7 @@ in { environment.systemPackages = [cfg.package]; - users.extraUsers = singleton { + users.users = singleton { name = "apache-kafka"; uid = config.ids.uids.apache-kafka; description = "Apache Kafka daemon user"; diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 3020130ad1f699f8fc53dc9d89a0c2ba3e8520f0..4708e16e2a6c6fc31668f9c73028dec0a3a4611d 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -12,6 +12,16 @@ in { services.autorandr = { enable = mkEnableOption "handling of hotplug and sleep events by autorandr"; + + defaultTarget = mkOption { + default = "default"; + type = types.str; + description = '' + Fallback if no monitor layout can be detected. See the docs + (https://github.com/phillipberndt/autorandr/blob/v1.0/README.md#how-to-use) + for further reference. + ''; + }; }; }; @@ -22,13 +32,21 @@ in { environment.systemPackages = [ pkgs.autorandr ]; - systemd.packages = [ pkgs.autorandr ]; - systemd.services.autorandr = { wantedBy = [ "sleep.target" ]; + description = "Autorandr execution hook"; + after = [ "sleep.target" ]; + + serviceConfig = { + StartLimitInterval = 5; + StartLimitBurst = 1; + ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default ${cfg.defaultTarget}"; + Type = "oneshot"; + RemainAfterExit = false; + }; }; }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ gnidorah ma27 ]; } diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix index c499e428af35906321206dfaa32d373b9a5a1cba..62835c194e42b635f84d25eac79cad77fb7a3fbb 100644 --- a/nixos/modules/services/misc/bepasty.nix +++ b/nixos/modules/services/misc/bepasty.nix @@ -168,14 +168,14 @@ in }) ) cfg.servers; - users.extraUsers = [{ + users.users = [{ uid = config.ids.uids.bepasty; name = user; group = group; home = default_home; }]; - users.extraGroups = [{ + users.groups = [{ name = group; gid = config.ids.gids.bepasty; }]; diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix index 6b19f780ec0cc46833011264d5f270207ecb1e52..84c04f403d3a3e485107d06232a6c45e679b5722 100644 --- a/nixos/modules/services/misc/calibre-server.nix +++ b/nixos/modules/services/misc/calibre-server.nix @@ -49,12 +49,12 @@ in environment.systemPackages = [ pkgs.calibre ]; - users.extraUsers.calibre-server = { + users.users.calibre-server = { uid = config.ids.uids.calibre-server; group = "calibre-server"; }; - users.extraGroups.calibre-server = { + users.groups.calibre-server = { gid = config.ids.gids.calibre-server; }; diff --git a/nixos/modules/services/misc/cfdyndns.nix b/nixos/modules/services/misc/cfdyndns.nix index 69a33d0b8c1baf70a3bde66c692a285537d2445d..dcf416022734f8565fc8332fd66acb04c2f744c5 100644 --- a/nixos/modules/services/misc/cfdyndns.nix +++ b/nixos/modules/services/misc/cfdyndns.nix @@ -54,14 +54,14 @@ in }; }; - users.extraUsers = { + users.users = { cfdyndns = { group = "cfdyndns"; uid = config.ids.uids.cfdyndns; }; }; - users.extraGroups = { + users.groups = { cfdyndns = { gid = config.ids.gids.cfdyndns; }; diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix index d5071d8ff767f5d9096da28ab3862c6deecf9a36..b1cf5a7d110406d3194070430e8efff5c68d1709 100644 --- a/nixos/modules/services/misc/cgminer.nix +++ b/nixos/modules/services/misc/cgminer.nix @@ -110,7 +110,7 @@ in config = mkIf config.services.cgminer.enable { - users.extraUsers = optionalAttrs (cfg.user == "cgminer") (singleton + users.users = optionalAttrs (cfg.user == "cgminer") (singleton { name = "cgminer"; uid = config.ids.uids.cgminer; description = "Cgminer user"; diff --git a/nixos/modules/services/misc/clipmenu.nix b/nixos/modules/services/misc/clipmenu.nix new file mode 100644 index 0000000000000000000000000000000000000000..3ba050044cace78d314f1dafd81c57ad15f27ebd --- /dev/null +++ b/nixos/modules/services/misc/clipmenu.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.clipmenu; +in { + + options.services.clipmenu = { + enable = mkEnableOption "clipmenu, the clipboard management daemon"; + + package = mkOption { + type = types.package; + default = pkgs.clipmenu; + defaultText = "pkgs.clipmenu"; + description = "clipmenu derivation to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.clipmenu = { + enable = true; + description = "Clipboard management daemon"; + wantedBy = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig.ExecStart = "${cfg.package}/bin/clipmenud"; + }; + + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixos/modules/services/misc/couchpotato.nix index 49648762235165a221771bedebab1050946638b9..70aa895f76d8857f0b2612d9baa15a99e19d9727 100644 --- a/nixos/modules/services/misc/couchpotato.nix +++ b/nixos/modules/services/misc/couchpotato.nix @@ -34,7 +34,7 @@ in }; }; - users.extraUsers = singleton + users.users = singleton { name = "couchpotato"; group = "couchpotato"; home = "/var/lib/couchpotato/"; @@ -42,7 +42,7 @@ in uid = config.ids.uids.couchpotato; }; - users.extraGroups = singleton + users.groups = singleton { name = "couchpotato"; gid = config.ids.gids.couchpotato; }; diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index 7e3b6431a133ab84c07d0360321d58c706517553..8d3e294622d13af1b179cb0781788854bfecc17c 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -45,7 +45,7 @@ in # get the command line client on system path to make some use of the service environment.systemPackages = [ pkgs.dict ]; - users.extraUsers = singleton + users.users = singleton { name = "dictd"; group = "dictd"; description = "DICT.org dictd server"; @@ -53,7 +53,7 @@ in uid = config.ids.uids.dictd; }; - users.extraGroups = singleton + users.groups = singleton { name = "dictd"; gid = config.ids.gids.dictd; }; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index e4517c636e880f92d704bf7aef7da5fdeda79927..c21cb2afc3ca4b8531b7110b5bc83bd6483d5b5e 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -7,16 +7,6 @@ let cfg = config.services.disnix; - dysnomia = pkgs.dysnomia.override (origArgs: { - enableApacheWebApplication = config.services.httpd.enable; - enableAxis2WebService = config.services.tomcat.axis2.enable; - enableEjabberdDump = config.services.ejabberd.enable; - enableMySQLDatabase = config.services.mysql.enable; - enablePostgreSQLDatabase = config.services.postgresql.enable; - enableSubversionRepository = config.services.svnserve.enable; - enableTomcatWebApplication = config.services.tomcat.enable; - enableMongoDatabase = config.services.mongodb.enable; - }); in { @@ -57,7 +47,7 @@ in ###### implementation config = mkIf cfg.enable { - services.dysnomia.enable = true; + dysnomia.enable = true; environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; @@ -71,7 +61,7 @@ in ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar"; services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService; - users.extraGroups = singleton + users.groups = singleton { name = "disnix"; gid = config.ids.gids.disnix; }; diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index 96ac2a1cf2c9dc8bd746187da373baaee9ff3b42..9a3966ab30aa20e07752f18d0bb013f0278201ef 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -5,6 +5,45 @@ with lib; let cfg = config.services.dockerRegistry; + blobCache = if cfg.enableRedisCache + then "redis" + else "inmemory"; + + registryConfig = { + version = "0.1"; + log.fields.service = "registry"; + storage = { + cache.blobdescriptor = blobCache; + filesystem.rootdirectory = cfg.storagePath; + delete.enabled = cfg.enableDelete; + }; + http = { + addr = ":${builtins.toString cfg.port}"; + headers.X-Content-Type-Options = ["nosniff"]; + }; + health.storagedriver = { + enabled = true; + interval = "10s"; + threshold = 3; + }; + }; + + registryConfig.redis = mkIf cfg.enableRedisCache { + addr = "${cfg.redisUrl}"; + password = "${cfg.redisPassword}"; + db = 0; + dialtimeout = "10ms"; + readtimeout = "10ms"; + writetimeout = "10ms"; + pool = { + maxidle = 16; + maxactive = 64; + idletimeout = "300s"; + }; + }; + + configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig)); + in { options.services.dockerRegistry = { enable = mkEnableOption "Docker Registry"; @@ -27,12 +66,45 @@ in { description = "Docker registry storage path."; }; + enableDelete = mkOption { + type = types.bool; + default = false; + description = "Enable delete for manifests and blobs."; + }; + + enableRedisCache = mkEnableOption "redis as blob cache"; + + redisUrl = mkOption { + type = types.str; + default = "localhost:6379"; + description = "Set redis host and port."; + }; + + redisPassword = mkOption { + type = types.str; + default = ""; + description = "Set redis password."; + }; + extraConfig = mkOption { description = '' Docker extra registry configuration via environment variables. ''; default = {}; - type = types.attrsOf types.str; + type = types.attrs; + }; + + enableGarbageCollect = mkEnableOption "garbage collect"; + + garbageCollectDates = mkOption { + default = "daily"; + type = types.str; + description = '' + Specification (in the format described by + systemd.time + 7) of the time at + which the garbage collect will occur. + ''; }; }; @@ -41,24 +113,34 @@ in { description = "Docker Container Registry"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - - environment = { - REGISTRY_HTTP_ADDR = "${cfg.listenAddress}:${toString cfg.port}"; - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY = cfg.storagePath; - } // cfg.extraConfig; - script = '' - ${pkgs.docker-distribution}/bin/registry serve \ - ${pkgs.docker-distribution.out}/share/go/src/github.com/docker/distribution/cmd/registry/config-example.yml + ${pkgs.docker-distribution}/bin/registry serve ${configFile} ''; serviceConfig = { User = "docker-registry"; WorkingDirectory = cfg.storagePath; + AmbientCapabilities = mkIf (cfg.port < 1024) "cap_net_bind_service"; }; }; - users.extraUsers.docker-registry = { + systemd.services.docker-registry-garbage-collect = { + description = "Run Garbage Collection for docker registry"; + + restartIfChanged = false; + unitConfig.X-StopOnRemoval = false; + + serviceConfig.Type = "oneshot"; + + script = '' + ${pkgs.docker-distribution}/bin/registry garbage-collect ${configFile} + ${pkgs.systemd}/bin/systemctl restart docker-registry.service + ''; + + startAt = optional cfg.enableGarbageCollect cfg.garbageCollectDates; + }; + + users.users.docker-registry = { createHome = true; home = cfg.storagePath; }; diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index 25cd0038e36d3696b70bc5093fbcfb2d323fc9fa..61ea822890ed8a2255e5450b4fe56d604a56a7ec 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.services.dysnomia; + cfg = config.dysnomia; printProperties = properties: concatMapStrings (propertyName: @@ -62,9 +62,6 @@ let cd $out ${concatMapStrings (containerName: - let - components = cfg.components."${containerName}"; - in linkMutableComponents { inherit containerName; } ) (builtins.attrNames cfg.components)} ''; @@ -72,7 +69,7 @@ let in { options = { - services.dysnomia = { + dysnomia = { enable = mkOption { type = types.bool; @@ -145,7 +142,7 @@ in environment.systemPackages = [ cfg.package ]; - services.dysnomia.package = pkgs.dysnomia.override (origArgs: { + dysnomia.package = pkgs.dysnomia.override (origArgs: { enableApacheWebApplication = config.services.httpd.enable; enableAxis2WebService = config.services.tomcat.axis2.enable; enableEjabberdDump = config.services.ejabberd.enable; @@ -156,9 +153,9 @@ in enableMongoDatabase = config.services.mongodb.enable; }); - services.dysnomia.properties = { + dysnomia.properties = { hostname = config.networking.hostName; - system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system; + inherit (config.nixpkgs.localSystem) system; supportedTypes = (import "${pkgs.stdenv.mkDerivation { name = "supportedtypes"; @@ -174,7 +171,7 @@ in }}"); }; - services.dysnomia.containers = lib.recursiveUpdate ({ + dysnomia.containers = lib.recursiveUpdate ({ process = {}; wrapper = {}; } diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix index e295f0f930e1a040974fdc221449194f9ec9dfee..64cc9c610ac397a44f8889dcb64093fc3461847b 100644 --- a/nixos/modules/services/misc/emby.nix +++ b/nixos/modules/services/misc/emby.nix @@ -1,10 +1,9 @@ -{ config, pkgs, lib, mono, ... }: +{ config, pkgs, lib, ... }: with lib; let cfg = config.services.emby; - emby = pkgs.emby; in { options = { @@ -54,14 +53,14 @@ in }; }; - users.extraUsers = mkIf (cfg.user == "emby") { + users.users = mkIf (cfg.user == "emby") { emby = { group = cfg.group; uid = config.ids.uids.emby; }; }; - users.extraGroups = mkIf (cfg.group == "emby") { + users.groups = mkIf (cfg.group == "emby") { emby = { gid = config.ids.gids.emby; }; diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix index cb2fa6776240d6507356c95a7d3ac9e2f6eabc42..ac6ba2181de2838d4633e08502b8e2ba2356d275 100644 --- a/nixos/modules/services/misc/errbot.nix +++ b/nixos/modules/services/misc/errbot.nix @@ -76,8 +76,8 @@ in { }; config = mkIf (cfg.instances != {}) { - users.extraUsers.errbot.group = "errbot"; - users.extraGroups.errbot = {}; + users.users.errbot.group = "errbot"; + users.groups.errbot = {}; systemd.services = mapAttrs' (name: instanceCfg: nameValuePair "errbot-${name}" ( let diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index 7c91462883f13dfde1017c3e8d619c64ec38f4e0..2d1893dae64be41a68b9ccb4b211d880d684d34d 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -188,7 +188,7 @@ in { environment.systemPackages = [ pkgs.etcdctl ]; - users.extraUsers = singleton { + users.users = singleton { name = "etcd"; uid = config.ids.uids.etcd; description = "Etcd daemon user"; diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix index 600bd780e7b0e787ea082a6625057cd1b56d975c..a90c7f402e7f3790680c74ad34a39a7403a54fa5 100644 --- a/nixos/modules/services/misc/exhibitor.nix +++ b/nixos/modules/services/misc/exhibitor.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.exhibitor; - exhibitor = cfg.package; exhibitorConfig = '' zookeeper-install-directory=${cfg.baseDir}/zookeeper zookeeper-data-directory=${cfg.zkDataDir} @@ -408,7 +407,7 @@ in chmod -R u+w ${cfg.baseDir}/zookeeper/conf ''; }; - users.extraUsers = singleton { + users.users = singleton { name = "zookeeper"; uid = config.ids.uids.zookeeper; description = "Zookeeper daemon user"; diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix index d6ad9dcaebc2cc75346fde6cb09da4cefe1ee61c..1c5ece868258791dd4fb0c756b994344247e7e7f 100644 --- a/nixos/modules/services/misc/felix.nix +++ b/nixos/modules/services/misc/felix.nix @@ -47,12 +47,12 @@ in ###### implementation config = mkIf cfg.enable { - users.extraGroups = singleton + users.groups = singleton { name = "osgi"; gid = config.ids.gids.osgi; }; - users.extraUsers = singleton + users.users = singleton { name = "osgi"; uid = config.ids.uids.osgi; description = "OSGi user"; diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix index 164221cbab7fb2ba089fdfbfcac0f65a57842434..122c89ce0680afda3027ce57d81deb7daac8bc0f 100644 --- a/nixos/modules/services/misc/folding-at-home.nix +++ b/nixos/modules/services/misc/folding-at-home.nix @@ -42,7 +42,7 @@ in { config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = fahUser; uid = config.ids.uids.foldingathome; description = "Folding@Home user"; diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix index 2d406b63443715cfd149f580e4620651270cf5b6..3057d7fd1a0950468a7daeab7a0b2c307c88e7e6 100644 --- a/nixos/modules/services/misc/gammu-smsd.nix +++ b/nixos/modules/services/misc/gammu-smsd.nix @@ -200,7 +200,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers.${cfg.user} = { + users.users.${cfg.user} = { description = "gammu-smsd user"; uid = config.ids.uids.gammu-smsd; extraGroups = [ "${cfg.device.group}" ]; diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix index e0b9df96f8e8d30bc0e2fd9efeb6451e9523fe77..baf0a8d73d19831b052bacd8846aab93b7536f8a 100644 --- a/nixos/modules/services/misc/geoip-updater.nix +++ b/nixos/modules/services/misc/geoip-updater.nix @@ -251,7 +251,7 @@ in } ]; - users.extraUsers.geoip = { + users.users.geoip = { group = "root"; description = "GeoIP database updater"; uid = config.ids.uids.geoip; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 63e976ae566ca08a43f3ad72ec060231c6864dbf..dc63f1a6c052542387eda1892464a947f23593d3 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.gitea; + gitea = cfg.package; pg = config.services.postgresql; usePostgresql = cfg.database.type == "postgres"; configFile = pkgs.writeText "app.ini" '' @@ -57,6 +58,13 @@ in description = "Enable Gitea Service."; }; + package = mkOption { + default = pkgs.gitea; + type = types.package; + defaultText = "pkgs.gitea"; + description = "gitea derivation to use"; + }; + useWizard = mkOption { default = false; type = types.bool; @@ -156,6 +164,30 @@ in }; }; + dump = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable a timer that runs gitea dump to generate backup-files of the + current gitea database and repositories. + ''; + }; + + interval = mkOption { + type = types.str; + default = "04:31"; + example = "hourly"; + description = '' + Run a gitea dump at this interval. Runs by default at 04:31 every day. + + The format is described in + systemd.time + 7. + ''; + }; + }; + appName = mkOption { type = types.str; default = "gitea: Gitea Service"; @@ -203,7 +235,7 @@ in staticRootPath = mkOption { type = types.str; - default = "${pkgs.gitea.data}"; + default = "${gitea.data}"; example = "/var/lib/gitea/data"; description = "Upper level of template and static files path."; }; @@ -223,13 +255,14 @@ in description = "gitea"; after = [ "network.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.gitea.bin ]; + path = [ gitea.bin ]; preStart = let runConfig = "${cfg.stateDir}/custom/conf/app.ini"; secretKey = "${cfg.stateDir}/custom/conf/secret_key"; in '' - mkdir -p ${cfg.stateDir} + # Make sure that the stateDir exists, as well as the conf dir in there + mkdir -p ${cfg.stateDir}/conf # copy custom configuration and generate a random secret key if needed ${optionalString (cfg.useWizard == false) '' @@ -250,18 +283,25 @@ in mkdir -p ${cfg.repositoryRoot} # update all hooks' binary paths - HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*") + HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 5 -type f -wholename "*git/hooks/*") if [ "$HOOKS" ] then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${pkgs.gitea.bin}/bin/gitea,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS fi - if [ ! -d ${cfg.stateDir}/conf/locale ] + # If we have a folder or symlink with gitea locales, remove it + if [ -e ${cfg.stateDir}/conf/locale ] + then + rm -r ${cfg.stateDir}/conf/locale + fi + # And symlink the current gitea locales in place + ln -s ${gitea.out}/locale ${cfg.stateDir}/conf/locale + # update command option in authorized_keys + if [ -r ${cfg.stateDir}/.ssh/authorized_keys ] then - mkdir -p ${cfg.stateDir}/conf - cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys fi '' + optionalString (usePostgresql && cfg.database.createDatabase) '' if ! test -e "${cfg.stateDir}/db-created"; then @@ -288,7 +328,7 @@ in User = cfg.user; WorkingDirectory = cfg.stateDir; PermissionsStartOnly = true; - ExecStart = "${pkgs.gitea.bin}/bin/gitea web"; + ExecStart = "${gitea.bin}/bin/gitea web"; Restart = "always"; }; @@ -300,7 +340,7 @@ in }; users = mkIf (cfg.user == "gitea") { - extraUsers.gitea = { + users.gitea = { description = "Gitea Service"; home = cfg.stateDir; createHome = true; @@ -318,5 +358,32 @@ in name = "gitea-database-password"; text = cfg.database.password; }))); + + systemd.services.gitea-dump = mkIf cfg.dump.enable { + description = "gitea dump"; + after = [ "gitea.service" ]; + wantedBy = [ "default.target" ]; + path = [ gitea.bin ]; + + environment = { + USER = cfg.user; + HOME = cfg.stateDir; + GITEA_WORK_DIR = cfg.stateDir; + }; + + serviceConfig = { + Type = "oneshot"; + User = cfg.user; + ExecStart = "${gitea.bin}/bin/gitea dump"; + WorkingDirectory = cfg.stateDir; + }; + }; + + systemd.timers.gitea-dump = mkIf cfg.dump.enable { + description = "Update timer for gitea-dump"; + partOf = [ "gitea-dump.service" ]; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = cfg.dump.interval; + }; }; } diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 94a98e0335dffc059308ae7c3aa2a075704aa78c..0025d96bd37bddc7f702f11a4c796fe8519949ab 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -645,15 +645,15 @@ in config = mkIf cfg.enable { - users.extraUsers.gitit = { - group = config.users.extraGroups.gitit.name; + users.users.gitit = { + group = config.users.groups.gitit.name; description = "Gitit user"; home = homeDir; createHome = true; uid = config.ids.uids.gitit; }; - users.extraGroups.gitit.gid = config.ids.gids.gitit; + users.groups.gitit.gid = config.ids.gids.gitit; systemd.services.gitit = let uid = toString config.ids.uids.gitit; @@ -715,8 +715,8 @@ NAMED ''; serviceConfig = { - User = config.users.extraUsers.gitit.name; - Group = config.users.extraGroups.gitit.name; + User = config.users.users.gitit.name; + Group = config.users.groups.gitit.name; ExecStart = with cfg; gititSh haskellPackages extraPackages; }; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 20d7ec90dcc95f3ef8c5ba2fc13220d490e0c933..5bf66354f487e2ce9b845dbe46bace940d80f959 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -8,9 +8,6 @@ let cfg = config.services.gitlab; ruby = cfg.packages.gitlab.ruby; - bundler = pkgs.bundler; - - gemHome = "${cfg.packages.gitlab.rubyEnv}/${ruby.gemPath}"; gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket"; gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; @@ -132,13 +129,12 @@ let }; }; extra = {}; + uploads.storage_path = cfg.statePath; }; }; gitlabEnv = { HOME = "${cfg.statePath}/home"; - GEM_HOME = gemHome; - BUNDLE_GEMFILE = "${cfg.packages.gitlab}/share/gitlab/Gemfile"; UNICORN_PATH = "${cfg.statePath}/"; GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; GITLAB_STATE_PATH = "${cfg.statePath}"; @@ -158,19 +154,17 @@ let gitlab-rake = pkgs.stdenv.mkDerivation rec { name = "gitlab-rake"; - buildInputs = [ cfg.packages.gitlab cfg.packages.gitlab.rubyEnv pkgs.makeWrapper ]; - phases = "installPhase fixupPhase"; - buildPhase = ""; + buildInputs = [ pkgs.makeWrapper ]; + dontBuild = true; + unpackPhase = ":"; installPhase = '' mkdir -p $out/bin - makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/bundle $out/bin/gitlab-bundle \ + makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \ --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package ]}:$PATH' \ --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \ --run 'cd ${cfg.packages.gitlab}/share/gitlab' - makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \ - --add-flags "exec rake" ''; }; @@ -450,7 +444,7 @@ in { # Use postfix to send out mails. services.postfix.enable = mkDefault true; - users.extraUsers = [ + users.users = [ { name = cfg.user; group = cfg.group; home = "${cfg.statePath}/home"; @@ -459,7 +453,7 @@ in { } ]; - users.extraGroups = [ + users.groups = [ { name = cfg.group; gid = config.ids.gids.gitlab; } @@ -482,10 +476,10 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - TimeoutSec = "300"; + TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart="${cfg.packages.gitlab.rubyEnv}/bin/bundle exec \"sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid\""; + ExecStart="${cfg.packages.gitlab.rubyEnv}/bin/sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid"; }; }; @@ -493,11 +487,9 @@ in { after = [ "network.target" "gitlab.service" ]; wantedBy = [ "multi-user.target" ]; environment.HOME = gitlabEnv.HOME; - environment.GEM_HOME = "${cfg.packages.gitaly.rubyEnv}/${ruby.gemPath}"; environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH; - path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ruby ]; + path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby ]; serviceConfig = { - #PermissionsStartOnly = true; # preStart must be run as root Type = "simple"; User = cfg.user; Group = cfg.group; @@ -529,7 +521,7 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - TimeoutSec = "300"; + TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = gitlabEnv.HOME; ExecStart = @@ -568,20 +560,18 @@ in { mkdir -p ${cfg.statePath}/tmp/sockets mkdir -p ${cfg.statePath}/shell mkdir -p ${cfg.statePath}/db + mkdir -p ${cfg.statePath}/uploads rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks mkdir -p ${cfg.statePath}/config ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret - # The uploads directory is hardcoded somewhere deep in rails. It is - # symlinked in the gitlab package to /run/gitlab/uploads to make it - # configurable mkdir -p /run/gitlab - mkdir -p ${cfg.statePath}/{log,uploads} + mkdir -p ${cfg.statePath}/log ln -sf ${cfg.statePath}/log /run/gitlab/log - ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp + ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml chown -R ${cfg.user}:${cfg.group} /run/gitlab @@ -596,6 +586,10 @@ in { ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb ''} ln -sf ${cfg.statePath}/config /run/gitlab/config + if [ -e ${cfg.statePath}/lib ]; then + rm ${cfg.statePath}/lib + fi + ln -sf ${pkgs.gitlab}/share/gitlab/lib ${cfg.statePath}/lib cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION # JSON is a subset of YAML @@ -618,10 +612,11 @@ in { ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName} touch "${cfg.statePath}/db-created" fi + + # enable required pg_trgm extension for gitlab + ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm" fi - # enable required pg_trgm extension for gitlab - ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm" # Always do the db migrations just to be sure the database is up-to-date ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production @@ -647,10 +642,6 @@ in { chmod -R ug+rwX,o-rwx ${cfg.statePath}/repositories chmod -R ug-s ${cfg.statePath}/repositories find ${cfg.statePath}/repositories -type d -print0 | xargs -0 chmod g+s - chmod 770 ${cfg.statePath}/uploads - chown -R ${cfg.user} ${cfg.statePath}/uploads - find ${cfg.statePath}/uploads -type f -exec chmod 0644 {} \; - find ${cfg.statePath}/uploads -type d -not -path ${cfg.statePath}/uploads -exec chmod 0770 {} \; ''; serviceConfig = { @@ -658,10 +649,10 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - TimeoutSec = "300"; + TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec \"unicorn -c ${cfg.statePath}/config/unicorn.rb -E production\""; + ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/unicorn -c ${cfg.statePath}/config/unicorn.rb -E production"; }; }; diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml index 4b00f50abd63d1b3432f4f39d5df8f14a7a07b12..3306ba8e9b11e143e039fff13ccaff00bd9b50c4 100644 --- a/nixos/modules/services/misc/gitlab.xml +++ b/nixos/modules/services/misc/gitlab.xml @@ -18,19 +18,18 @@ webserver to proxy HTTP requests to the socket. frontend proxy: - services.nginx = { - enable = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - virtualHosts."git.example.com" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; - }; - }; -''; +services.nginx = { + enable = true; + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + virtualHosts."git.example.com" = { + enableACME = true; + forceSSL = true; + locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + }; +}; @@ -49,24 +48,24 @@ all data like the repositories and uploads will be stored. services.gitlab = { - enable = true; - databasePassword = "eXaMpl3"; - initialRootPassword = "UseNixOS!"; - https = true; - host = "git.example.com"; - port = 443; - user = "git"; - group = "git"; + enable = true; + databasePassword = "eXaMpl3"; + initialRootPassword = "UseNixOS!"; + https = true; + host = "git.example.com"; + port = 443; + user = "git"; + group = "git"; smtp = { - enable = true; - address = "localhost"; - port = 25; + enable = true; + address = "localhost"; + port = 25; }; secrets = { - db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6"; - secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3"; - otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI"; - jws = '' + db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6"; + secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3"; + otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI"; + jws = '' -----BEGIN RSA PRIVATE KEY----- MIIEpAIBAAKCAQEArrtx4oHKwXoqUbMNqnHgAklnnuDon3XG5LJB35yPsXKv/8GK ke92wkI+s1Xkvsp8tg9BIY/7c6YK4SR07EWL+dB5qwctsWR2Q8z+/BKmTx9D99pm @@ -96,7 +95,7 @@ services.gitlab = { -----END RSA PRIVATE KEY----- ''; }; - extraConfig = { + extraConfig = { gitlab = { email_from = "gitlab-no-reply@example.com"; email_display_name = "Example GitLab"; @@ -116,7 +115,7 @@ secret from config/secrets.yml located in your Gitlab state folder. Refer to for all available configuration -options for the services.gitlab module. +options for the services.gitlab module.
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index 6e60316d000c0baafc575fc27db1a5af36dcf503..b9c2a966e6f51d324d3e1a9cb20e5d4b8c1c8a3c 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -140,7 +140,7 @@ in push( @{$RC{ENABLE}}, 'git-annex-shell ua'); ''; - users.extraUsers.${cfg.user} = { + users.users.${cfg.user} = { description = "Gitolite user"; home = cfg.dataDir; createHome = true; @@ -148,7 +148,7 @@ in group = cfg.group; useDefaultShell = true; }; - users.extraGroups."${cfg.group}".gid = config.ids.gids.gitolite; + users.groups."${cfg.group}".gid = config.ids.gids.gitolite; systemd.services."gitolite-init" = { description = "Gitolite initialization"; diff --git a/nixos/modules/services/misc/gitweb.nix b/nixos/modules/services/misc/gitweb.nix index 8e4d85a1e15f727ca9c00ba9f3993acf2deb232f..ca21366b7796e03b4cfb1b036b5a5e31888d2579 100644 --- a/nixos/modules/services/misc/gitweb.nix +++ b/nixos/modules/services/misc/gitweb.nix @@ -28,6 +28,15 @@ in example = '' $feature{'highlight'}{'default'} = [1]; $feature{'ctags'}{'default'} = [1]; + $feature{'avatar'}{'default'} = ['gravatar']; + ''; + }; + + gitwebTheme = mkOption { + default = false; + type = types.bool; + description = '' + Use an alternative theme for gitweb, strongly inspired by GitHub. ''; }; diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index ba744d37e71c5172cd45ac52ccab78f0ead0b318..ee99967c261b6745f9568aef62dea3eda338960b 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -254,7 +254,7 @@ in }; users = mkIf (cfg.user == "gogs") { - extraUsers.gogs = { + users.gogs = { description = "Go Git Service"; uid = config.ids.uids.gogs; group = "gogs"; @@ -262,7 +262,7 @@ in createHome = true; shell = pkgs.bash; }; - extraGroups.gogs.gid = config.ids.gids.gogs; + groups.gogs.gid = config.ids.gids.gogs; }; warnings = optional (cfg.database.password != "") diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index 0888221ab62fc382f8af7822d18520a4662d5ce1..d1823bc6d4df6d3f929e623a1ff7403ca9ee11ce 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -93,8 +93,8 @@ in ''; serviceConfig = { - User = config.users.extraUsers.gollum.name; - Group = config.users.extraGroups.gollum.name; + User = config.users.users.gollum.name; + Group = config.users.groups.gollum.name; PermissionsStartOnly = true; ExecStart = '' ${pkgs.gollum}/bin/gollum \ diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix index a4a4c7b5d937df0729614ea07010a78ad3da774d..3bfcb636a3c6c322c05708325dc84373b276d165 100644 --- a/nixos/modules/services/misc/gpsd.nix +++ b/nixos/modules/services/misc/gpsd.nix @@ -53,6 +53,14 @@ in ''; }; + nowait = mkOption { + type = types.bool; + default = false; + description = '' + don't wait for client connects to poll GPS + ''; + }; + port = mkOption { type = types.int; default = 2947; @@ -78,14 +86,14 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = "gpsd"; inherit uid; description = "gpsd daemon user"; home = "/var/empty"; }; - users.extraGroups = singleton + users.groups = singleton { name = "gpsd"; inherit gid; }; @@ -99,7 +107,8 @@ in ExecStart = '' ${pkgs.gpsd}/sbin/gpsd -D "${toString cfg.debugLevel}" \ -S "${toString cfg.port}" \ - ${if cfg.readonly then "-b" else ""} \ + ${optionalString cfg.readonly "-b"} \ + ${optionalString cfg.nowait "-n"} \ "${cfg.device}" ''; }; diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index ac37c11106efc6fa1732e95a09f1fb78dbb20dab..0756e81612ac01babacbe49edae2af59878c4265 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -5,7 +5,10 @@ with lib; let cfg = config.services.home-assistant; - configFile = pkgs.writeText "configuration.yaml" (builtins.toJSON cfg.config); + # cfg.config != null can be assumed here + configFile = pkgs.writeText "configuration.json" + (builtins.toJSON (if cfg.applyDefaultConfig then + (lib.recursiveUpdate defaultConfig cfg.config) else cfg.config)); availableComponents = pkgs.home-assistant.availableComponents; @@ -34,10 +37,16 @@ let # List of components used in config extraComponents = filter useComponent availableComponents; - package = if cfg.autoExtraComponents + package = if (cfg.autoExtraComponents && cfg.config != null) then (cfg.package.override { inherit extraComponents; }) else cfg.package; + # If you are changing this, please update the description in applyDefaultConfig + defaultConfig = { + homeassistant.time_zone = config.time.timeZone; + http.server_port = (toString cfg.port); + }; + in { meta.maintainers = with maintainers; [ dotlambda ]; @@ -50,6 +59,26 @@ in { description = "The config directory, where your configuration.yaml is located."; }; + port = mkOption { + default = 8123; + type = types.int; + description = "The port on which to listen."; + }; + + applyDefaultConfig = mkOption { + default = true; + type = types.bool; + description = '' + Setting this option enables a few configuration options for HA based on NixOS configuration (such as time zone) to avoid having to manually specify configuration we already have. + + + Currently one side effect of enabling this is that the http component will be enabled. + + + This only takes effect if config != null in order to ensure that a manually managed configuration.yaml is not overwritten. + ''; + }; + config = mkOption { default = null; type = with types; nullOr attrs; @@ -81,7 +110,9 @@ in { ''; description = '' Home Assistant package to use. - Override extraPackages in order to add additional dependencies. + Override extraPackages or extraComponents in order to add additional dependencies. + If you specify and do not set + to false, overriding extraComponents will have no effect. ''; }; @@ -99,26 +130,35 @@ in { you might need to specify it in extraPackages. ''; }; + + openFirewall = mkOption { + default = false; + type = types.bool; + description = "Whether to open the firewall for the specified port."; + }; }; config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + systemd.services.home-assistant = { description = "Home Assistant"; after = [ "network.target" ]; preStart = lib.optionalString (cfg.config != null) '' - rm -f ${cfg.configDir}/configuration.yaml - ln -s ${configFile} ${cfg.configDir}/configuration.yaml + config=${cfg.configDir}/configuration.yaml + rm -f $config + ${pkgs.remarshal}/bin/json2yaml -i ${configFile} -o $config + chmod 444 $config ''; serviceConfig = { - ExecStart = '' - ${package}/bin/hass --config "${cfg.configDir}" - ''; + ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; User = "hass"; Group = "hass"; Restart = "on-failure"; ProtectSystem = "strict"; ReadWritePaths = "${cfg.configDir}"; PrivateTmp = true; + RemoveIPC = true; }; path = [ "/run/wrappers" # needed for ping @@ -132,13 +172,13 @@ in { after = wants; }; - users.extraUsers.hass = { + users.users.hass = { home = cfg.configDir; createHome = true; group = "hass"; uid = config.ids.uids.hass; }; - users.extraGroups.hass.gid = config.ids.gids.hass; + users.groups.hass.gid = config.ids.gids.hass; }; } diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index 6da9cc8c47e6e9266ff09c5ca4370725e68adb28..11597706d0d16b20827b5fdb96f8d859eefe3c19 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -38,23 +38,23 @@ in config = mkIf cfg.enable { - users.extraUsers.ihaskell = { - group = config.users.extraGroups.ihaskell.name; + users.users.ihaskell = { + group = config.users.groups.ihaskell.name; description = "IHaskell user"; home = "/var/lib/ihaskell"; createHome = true; uid = config.ids.uids.ihaskell; }; - users.extraGroups.ihaskell.gid = config.ids.gids.ihaskell; + users.groups.ihaskell.gid = config.ids.gids.ihaskell; systemd.services.ihaskell = { description = "IHaskell notebook instance"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - User = config.users.extraUsers.ihaskell.name; - Group = config.users.extraGroups.ihaskell.name; + User = config.users.users.ihaskell.name; + Group = config.users.groups.ihaskell.name; ExecStart = "${pkgs.runtimeShell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\""; }; }; diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix index 87a41ee70b5404a21d4fced5923bbea9dffc4e56..8d1b3d225a4457e4b0f16c53bf014597940573be 100644 --- a/nixos/modules/services/misc/jackett.nix +++ b/nixos/modules/services/misc/jackett.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, mono, ... }: +{ config, pkgs, lib, ... }: with lib; @@ -36,12 +36,12 @@ in }; }; - users.extraUsers.jackett = { + users.users.jackett = { uid = config.ids.uids.jackett; home = "/var/lib/jackett"; group = "jackett"; }; - users.extraGroups.jackett.gid = config.ids.gids.jackett; + users.groups.jackett.gid = config.ids.gids.jackett; }; } diff --git a/nixos/modules/services/misc/leaps.nix b/nixos/modules/services/misc/leaps.nix index b92cf27f58dc51cdd178f34400dab676779130f6..d4e88ecbebdba7c042b6cc4413dbda0672e3784d 100644 --- a/nixos/modules/services/misc/leaps.nix +++ b/nixos/modules/services/misc/leaps.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... } @ args: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/logkeys.nix b/nixos/modules/services/misc/logkeys.nix index df0b3ae24c90143ab57cc1ac74d6286ec92c85aa..ad13d9eaa674bbc1e5a4a816ea6b055d396ee25d 100644 --- a/nixos/modules/services/misc/logkeys.nix +++ b/nixos/modules/services/misc/logkeys.nix @@ -7,6 +7,13 @@ let in { options.services.logkeys = { enable = mkEnableOption "logkeys service"; + + device = mkOption { + description = "Use the given device as keyboard input event device instead of /dev/input/eventX default."; + default = null; + type = types.nullOr types.string; + example = "/dev/input/event15"; + }; }; config = mkIf cfg.enable { @@ -14,7 +21,7 @@ in { description = "LogKeys Keylogger Daemon"; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.logkeys}/bin/logkeys -s"; + ExecStart = "${pkgs.logkeys}/bin/logkeys -s${lib.optionalString (cfg.device != null) " -d ${cfg.device}"}"; ExecStop = "${pkgs.logkeys}/bin/logkeys -k"; Type = "forking"; }; diff --git a/nixos/modules/services/misc/mathics.nix b/nixos/modules/services/misc/mathics.nix index 50715858881accac68eee4f435b18a3f044c4d60..c588a30d76cd143046e7cef70c0c0bf19902e350 100644 --- a/nixos/modules/services/misc/mathics.nix +++ b/nixos/modules/services/misc/mathics.nix @@ -26,23 +26,23 @@ in { config = mkIf cfg.enable { - users.extraUsers.mathics = { - group = config.users.extraGroups.mathics.name; + users.users.mathics = { + group = config.users.groups.mathics.name; description = "Mathics user"; home = "/var/lib/mathics"; createHome = true; uid = config.ids.uids.mathics; }; - users.extraGroups.mathics.gid = config.ids.gids.mathics; + users.groups.mathics.gid = config.ids.gids.mathics; systemd.services.mathics = { description = "Mathics notebook server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - User = config.users.extraUsers.mathics.name; - Group = config.users.extraGroups.mathics.name; + User = config.users.users.mathics.name; + Group = config.users.groups.mathics.name; ExecStart = concatStringsSep " " [ "${pkgs.mathics}/bin/mathicsserver" "--port" (toString cfg.port) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 7e880ad09b89650ad6513588413fe46f376fc966..18e13f6ac0300869b13633163067e0fe6d6736c0 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -395,7 +395,14 @@ in { }; url_preview_ip_range_blacklist = mkOption { type = types.listOf types.str; - default = []; + default = [ + "127.0.0.0/8" + "10.0.0.0/8" + "172.16.0.0/12" + "192.168.0.0/16" + "100.64.0.0/10" + "169.254.0.0/16" + ]; description = '' List of IP address CIDR ranges that the URL preview spider is denied from accessing. @@ -412,14 +419,7 @@ in { }; url_preview_url_blacklist = mkOption { type = types.listOf types.str; - default = [ - "127.0.0.0/8" - "10.0.0.0/8" - "172.16.0.0/12" - "192.168.0.0/16" - "100.64.0.0/10" - "169.254.0.0/16" - ]; + default = []; description = '' Optional list of URL matches that the URL preview spider is denied from accessing. @@ -635,7 +635,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers = [ + users.users = [ { name = "matrix-synapse"; group = "matrix-synapse"; home = cfg.dataDir; @@ -644,7 +644,7 @@ in { uid = config.ids.uids.matrix-synapse; } ]; - users.extraGroups = [ + users.groups = [ { name = "matrix-synapse"; gid = config.ids.gids.matrix-synapse; } ]; diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 40ec2831ff09d678037711548b22adbdc5def8b6..e8e9c0946d7f20ee847906fd729ab916df494a80 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -4,7 +4,6 @@ with lib; let - uid = config.ids.uids.mediatomb; gid = config.ids.gids.mediatomb; cfg = config.services.mediatomb; @@ -267,12 +266,12 @@ in { serviceConfig.User = "${cfg.user}"; }; - users.extraGroups = optionalAttrs (cfg.group == "mediatomb") (singleton { + users.groups = optionalAttrs (cfg.group == "mediatomb") (singleton { name = "mediatomb"; gid = gid; }); - users.extraUsers = optionalAttrs (cfg.user == "mediatomb") (singleton { + users.users = optionalAttrs (cfg.user == "mediatomb") (singleton { name = "mediatomb"; isSystemUser = true; group = cfg.group; diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index 12485141e219b585c740331f9871490dab03ff40..468c7f36ecc5f878e766196d83aca7fdd95cd90a 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -187,7 +187,7 @@ in { systemd.services.mesos-slave = { description = "Mesos Slave"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ; path = [ pkgs.runtimeShellPackage ]; serviceConfig = { ExecStart = '' @@ -213,7 +213,7 @@ in { PermissionsStartOnly = true; }; preStart = '' - mkdir -m 0700 -p ${cfg.workDir} + mkdir -m 0701 -p ${cfg.workDir} ''; }; }; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index f2d34560a718dd23af0d60739dbab4decd630d1b..c0eb882c58f3774a53badd59501484a48155b478 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -33,7 +33,7 @@ let sh = pkgs.runtimeShell; binshDeps = pkgs.writeReferencesToFile sh; in - pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } '' + pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } ('' ${optionalString (!isNix20) '' extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) ''} @@ -62,7 +62,11 @@ let ''} $extraOptions END - ''; + '' + optionalString cfg.checkConfig '' + echo "Checking that Nix can read nix.conf..." + ln -s $out ./nix.conf + NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null + ''); in @@ -84,7 +88,7 @@ in }; maxJobs = mkOption { - type = types.int; + type = types.either types.int (types.enum ["auto"]); default = 1; example = 64; description = '' @@ -123,14 +127,16 @@ in useSandbox = mkOption { type = types.either types.bool (types.enum ["relaxed"]); - default = false; + default = true; description = " If set, Nix will perform builds in a sandboxed environment that it - will set up automatically for each build. This prevents - impurities in builds by disallowing access to dependencies - outside of the Nix store. This isn't enabled by default for - performance. It doesn't affect derivation hashes, so changing - this option will not trigger a rebuild of packages. + will set up automatically for each build. This prevents impurities + in builds by disallowing access to dependencies outside of the Nix + store by using network and mount namespaces in a chroot environment. + This is enabled by default even though it has a possible performance + impact due to the initial setup time of a sandbox for each build. It + doesn't affect derivation hashes, so changing this option will not + trigger a rebuild of packages. "; }; @@ -338,7 +344,9 @@ in nixPath = mkOption { type = types.listOf types.str; default = - [ "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs" + [ + "$HOME/.nix-defexpr/channels" + "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" "nixos-config=/etc/nixos/configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" ]; @@ -349,6 +357,13 @@ in ''; }; + checkConfig = mkOption { + type = types.bool; + default = true; + description = '' + If enabled (the default), checks that Nix can parse the generated nix.conf. + ''; + }; }; }; @@ -435,7 +450,7 @@ in nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs); - users.extraUsers = nixbldUsers; + users.users = nixbldUsers; services.xserver.displayManager.hiddenUsers = map ({ name, ... }: name) nixbldUsers; diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 8b493041b2c910a7a9d2283280cd8f478fabc9f1..12bed05757ad539879cd93f23ac1338dc28c0bd9 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index 295e7fb0ba031030b051855a2808c561be51ca10..6f75e4dd03ea8435c6a48eed70a45d0ac95abcb7 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index 5bd9cf9086f1f96d4dae9ca8ebfda033e0941aef..7ce3841be2f5e1728afcef905f09bc2ac422b8d7 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let cfg = config.nix.sshServe; @@ -36,7 +36,7 @@ in { config = mkIf cfg.enable { - users.extraUsers.nix-ssh = { + users.users.nix-ssh = { description = "Nix SSH store user"; uid = config.ids.uids.nix-ssh; useDefaultShell = true; @@ -55,7 +55,7 @@ in { Match All ''; - users.extraUsers.nix-ssh.openssh.authorizedKeys.keys = cfg.keys; + users.users.nix-ssh.openssh.authorizedKeys.keys = cfg.keys; }; } diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index abf506ea7c673679a8448c0734dbd6c5ad2a7215..3916c3052e8bf146acb36367e38755864a010710 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -23,7 +23,7 @@ let options = let scrubbedEval = evalModules { - modules = [ { nixpkgs.system = config.nixpkgs.system; } ] ++ baseModules; + modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ baseModules; args = (config._module.args) // { modules = [ ]; }; specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; }; }; @@ -99,7 +99,7 @@ in services.nixosManual.browser = mkOption { type = types.path; - default = "${pkgs.w3m-nox}/bin/w3m"; + default = "${pkgs.w3m-nographics}/bin/w3m"; description = '' Browser used to show the manual. ''; diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix index a186d57ceba216bbd96e54df4ffed7468a0eb721..a472b6c7157c16553c037a4f6fbbfa23f59023e2 100644 --- a/nixos/modules/services/misc/nzbget.nix +++ b/nixos/modules/services/misc/nzbget.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.nzbget; - nzbget = pkgs.nzbget; in { +in { options = { services.nzbget = { enable = mkEnableOption "NZBGet"; @@ -86,14 +86,14 @@ let }; }; - users.extraUsers = mkIf (cfg.user == "nzbget") { + users.users = mkIf (cfg.user == "nzbget") { nzbget = { group = cfg.group; uid = config.ids.uids.nzbget; }; }; - users.extraGroups = mkIf (cfg.group == "nzbget") { + users.groups = mkIf (cfg.group == "nzbget") { nzbget = { gid = config.ids.gids.nzbget; }; diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 6883993a893bb0cc9617d8370ee6c2543a50d246..baa7c3ade52e304a6c9404eadb54de3d6f7ebb2f 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -86,13 +86,13 @@ in config = mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == "octoprint") (singleton + users.users = optionalAttrs (cfg.user == "octoprint") (singleton { name = "octoprint"; group = cfg.group; uid = config.ids.uids.octoprint; }); - users.extraGroups = optionalAttrs (cfg.group == "octoprint") (singleton + users.groups = optionalAttrs (cfg.group == "octoprint") (singleton { name = "octoprint"; gid = config.ids.gids.octoprint; }); diff --git a/nixos/modules/services/misc/osrm.nix b/nixos/modules/services/misc/osrm.nix index 7ec8b15906fcada44d55c07eefe27b88ad5ed345..f89f37ccd9df5c3c628f30c28704a567ccf036a4 100644 --- a/nixos/modules/services/misc/osrm.nix +++ b/nixos/modules/services/misc/osrm.nix @@ -69,7 +69,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { - User = config.users.extraUsers.osrm.name; + User = config.users.users.osrm.name; ExecStart = '' ${pkgs.osrm-backend}/bin/osrm-routed \ --ip ${cfg.address} \ diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 46221ace30843ca2236cafb1adb61d8798a62942..8fe5879c27648b61a45ecb1af4383e7bdbc929cf 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.plex; - plex = pkgs.plex; in { options = { @@ -157,14 +156,14 @@ in allowedUDPPorts = [ 1900 5353 32410 32412 32413 32414 ]; }; - users.extraUsers = mkIf (cfg.user == "plex") { + users.users = mkIf (cfg.user == "plex") { plex = { group = cfg.group; uid = config.ids.uids.plex; }; }; - users.extraGroups = mkIf (cfg.group == "plex") { + users.groups = mkIf (cfg.group == "plex") { plex = { gid = config.ids.gids.plex; }; diff --git a/nixos/modules/services/misc/plexpy.nix b/nixos/modules/services/misc/plexpy.nix index df9f125812471fae6ac4c973863c5b9f8bc63082..2a589fdfb27fc4f98a01d245db3bc218cea86874 100644 --- a/nixos/modules/services/misc/plexpy.nix +++ b/nixos/modules/services/misc/plexpy.nix @@ -74,7 +74,7 @@ in }; }; - users.extraUsers = mkIf (cfg.user == "plexpy") { + users.users = mkIf (cfg.user == "plexpy") { plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; }; }; }; diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix index 897e856e2a2d6cc6e782ed4bd3316446c5f9a771..a11296e1bd02cb49af6fbc773d81070f2e5018ac 100644 --- a/nixos/modules/services/misc/pykms.nix +++ b/nixos/modules/services/misc/pykms.nix @@ -73,7 +73,7 @@ in { }; users = { - extraUsers.pykms = { + users.pykms = { name = "pykms"; group = "pykms"; home = home; @@ -82,7 +82,7 @@ in { description = "PyKMS daemon user"; }; - extraGroups.pykms = { + groups.pykms = { gid = config.ids.gids.pykms; }; }; diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix index 245ad9f9a6df914ffc244be660a547a5af1732cf..1a9fad3883c3ff1ba3dec7187653a2b77d42698a 100644 --- a/nixos/modules/services/misc/radarr.nix +++ b/nixos/modules/services/misc/radarr.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, mono, ... }: +{ config, pkgs, lib, ... }: with lib; @@ -36,12 +36,12 @@ in }; }; - users.extraUsers.radarr = { + users.users.radarr = { uid = config.ids.uids.radarr; home = "/var/lib/radarr"; group = "radarr"; }; - users.extraGroups.radarr.gid = config.ids.gids.radarr; + users.groups.radarr.gid = config.ids.gids.radarr; }; } diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 3997b3f0dca0ead75af5bddc89e30b8c69186a3d..f763ba21d0b2c80c39765e2cb6a8133a18152784 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -1,121 +1,124 @@ { config, lib, pkgs, ... }: -# TODO: support non-postgresql - with lib; let cfg = config.services.redmine; - ruby = pkgs.ruby; + bundle = "${pkgs.redmine}/share/redmine/bin/bundle"; - databaseYml = '' + databaseYml = pkgs.writeText "database.yml" '' production: - adapter: postgresql - database: ${cfg.databaseName} - host: ${cfg.databaseHost} - password: ${cfg.databasePassword} - username: ${cfg.databaseUsername} - encoding: utf8 + adapter: ${cfg.database.type} + database: ${cfg.database.name} + host: ${cfg.database.host} + port: ${toString cfg.database.port} + username: ${cfg.database.user} + password: #dbpass# ''; - configurationYml = '' + configurationYml = pkgs.writeText "configuration.yml" '' default: - # Absolute path to the directory where attachments are stored. - # The default is the 'files' directory in your Redmine instance. - # Your Redmine instance needs to have write permission on this - # directory. - # Examples: - # attachments_storage_path: /var/redmine/files - # attachments_storage_path: D:/redmine/files - attachments_storage_path: ${cfg.stateDir}/files - - # Absolute path to the SCM commands errors (stderr) log file. - # The default is to log in the 'log' directory of your Redmine instance. - # Example: - # scm_stderr_log_file: /var/log/redmine_scm_stderr.log - scm_stderr_log_file: ${cfg.stateDir}/redmine_scm_stderr.log - - ${cfg.extraConfig} + scm_subversion_command: ${pkgs.subversion}/bin/svn + scm_mercurial_command: ${pkgs.mercurial}/bin/hg + scm_git_command: ${pkgs.gitAndTools.git}/bin/git + scm_cvs_command: ${pkgs.cvs}/bin/cvs + scm_bazaar_command: ${pkgs.bazaar}/bin/bzr + scm_darcs_command: ${pkgs.darcs}/bin/darcs + + ${cfg.extraConfig} ''; - unpackTheme = unpack "theme"; - unpackPlugin = unpack "plugin"; - unpack = id: (name: source: - pkgs.stdenv.mkDerivation { - name = "redmine-${id}-${name}"; - buildInputs = [ pkgs.unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unpackFile ${source} - ''; - }); - -in { +in +{ options = { services.redmine = { enable = mkOption { type = types.bool; default = false; - description = '' - Enable the redmine service. - ''; + description = "Enable the Redmine service."; }; - stateDir = mkOption { + user = mkOption { type = types.str; - default = "/var/redmine"; - description = "The state directory, logs and plugins are stored here"; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = "Extra configuration in configuration.yml"; - }; - - themes = mkOption { - type = types.attrsOf types.path; - default = {}; - description = "Set of themes"; + default = "redmine"; + description = "User under which Redmine is ran."; }; - plugins = mkOption { - type = types.attrsOf types.path; - default = {}; - description = "Set of plugins"; + group = mkOption { + type = types.str; + default = "redmine"; + description = "Group under which Redmine is ran."; }; - #databaseType = mkOption { - # type = types.str; - # default = "postgresql"; - # description = "Type of database"; - #}; - - databaseHost = mkOption { + stateDir = mkOption { type = types.str; - default = "127.0.0.1"; - description = "Database hostname"; + default = "/var/lib/redmine"; + description = "The state directory, logs and plugins are stored here."; }; - databasePassword = mkOption { - type = types.str; + extraConfig = mkOption { + type = types.lines; default = ""; - description = "Database user password"; - }; + description = '' + Extra configuration in configuration.yml. - databaseName = mkOption { - type = types.str; - default = "redmine"; - description = "Database name"; + See https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration + ''; }; - databaseUsername = mkOption { - type = types.str; - default = "redmine"; - description = "Database user"; + database = { + type = mkOption { + type = types.enum [ "mysql2" "postgresql" ]; + example = "postgresql"; + default = "mysql2"; + description = "Database engine to use."; + }; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Database host address."; + }; + + port = mkOption { + type = types.int; + default = 3306; + description = "Database host port."; + }; + + name = mkOption { + type = types.str; + default = "redmine"; + description = "Database name."; + }; + + user = mkOption { + type = types.str; + default = "redmine"; + description = "Database user."; + }; + + password = mkOption { + type = types.str; + default = ""; + description = '' + The password corresponding to . + Warning: this is stored in cleartext in the Nix store! + Use instead. + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/redmine-dbpassword"; + description = '' + A file containing the password corresponding to + . + ''; + }; }; }; }; @@ -123,99 +126,106 @@ in { config = mkIf cfg.enable { assertions = [ - { assertion = cfg.databasePassword != ""; - message = "services.redmine.databasePassword must be set"; + { assertion = cfg.database.passwordFile != null || cfg.database.password != ""; + message = "either services.redmine.database.passwordFile or services.redmine.database.password must be set"; } ]; - users.extraUsers = [ - { name = "redmine"; - group = "redmine"; - uid = config.ids.uids.redmine; - } ]; - - users.extraGroups = [ - { name = "redmine"; - gid = config.ids.gids.redmine; - } ]; + environment.systemPackages = [ pkgs.redmine ]; systemd.services.redmine = { - after = [ "network.target" "postgresql.service" ]; + after = [ "network.target" (if cfg.database.type == "mysql2" then "mysql.service" else "postgresql.service") ]; wantedBy = [ "multi-user.target" ]; + environment.HOME = "${pkgs.redmine}/share/redmine"; environment.RAILS_ENV = "production"; - environment.RAILS_ETC = "${cfg.stateDir}/config"; - environment.RAILS_LOG = "${cfg.stateDir}/log"; - environment.RAILS_VAR = "${cfg.stateDir}/var"; environment.RAILS_CACHE = "${cfg.stateDir}/cache"; - environment.RAILS_PLUGINS = "${cfg.stateDir}/plugins"; - environment.RAILS_PUBLIC = "${cfg.stateDir}/public"; - environment.RAILS_TMP = "${cfg.stateDir}/tmp"; - environment.SCHEMA = "${cfg.stateDir}/cache/schema.db"; - environment.HOME = "${pkgs.redmine}/share/redmine"; environment.REDMINE_LANG = "en"; - environment.GEM_HOME = "${pkgs.redmine}/share/redmine/vendor/bundle/ruby/1.9.1"; - environment.GEM_PATH = "${pkgs.bundler}/${pkgs.bundler.ruby.gemPath}"; + environment.SCHEMA = "${cfg.stateDir}/cache/schema.db"; path = with pkgs; [ imagemagickBig - subversion - mercurial - cvs - config.services.postgresql.package bazaar + cvs + darcs gitAndTools.git - # once we build binaries for darc enable it - #darcs + mercurial + subversion ]; preStart = '' - # TODO: use env vars - for i in plugins public/plugin_assets db files log config cache var/files tmp; do + # start with a fresh config directory every time + rm -rf ${cfg.stateDir}/config + cp -r ${pkgs.redmine}/share/redmine/config.dist ${cfg.stateDir}/config + + # create the basic state directory layout pkgs.redmine expects + mkdir -p /run/redmine + + for i in config files log plugins tmp; do mkdir -p ${cfg.stateDir}/$i + ln -fs ${cfg.stateDir}/$i /run/redmine/$i done - chown -R redmine:redmine ${cfg.stateDir} - chmod -R 755 ${cfg.stateDir} + # ensure cache directory exists for db:migrate command + mkdir -p ${cfg.stateDir}/cache - rm -rf ${cfg.stateDir}/public/* - cp -R ${pkgs.redmine}/share/redmine/public/* ${cfg.stateDir}/public/ - for theme in ${concatStringsSep " " (mapAttrsToList unpackTheme cfg.themes)}; do - ln -fs $theme/* ${cfg.stateDir}/public/themes/ - done + # link in the application configuration + ln -fs ${configurationYml} ${cfg.stateDir}/config/configuration.yml - rm -rf ${cfg.stateDir}/plugins/* - for plugin in ${concatStringsSep " " (mapAttrsToList unpackPlugin cfg.plugins)}; do - ln -fs $plugin/* ${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-} - done + chmod -R ug+rwX,o-rwx+x ${cfg.stateDir}/ - ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.stateDir}/config/database.yml - ln -fs ${pkgs.writeText "configuration.yml" configurationYml} ${cfg.stateDir}/config/configuration.yml + # handle database.passwordFile + DBPASS=$(head -n1 ${cfg.database.passwordFile}) + cp -f ${databaseYml} ${cfg.stateDir}/config/database.yml + sed -e "s,#dbpass#,$DBPASS,g" -i ${cfg.stateDir}/config/database.yml + chmod 440 ${cfg.stateDir}/config/database.yml - if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then - if ! test -e "${cfg.stateDir}/db-created"; then - psql postgres -c "CREATE ROLE redmine WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.databasePassword}'" - ${config.services.postgresql.package}/bin/createdb --owner redmine redmine || true - touch "${cfg.stateDir}/db-created" - fi + # generate a secret token if required + if ! test -e "${cfg.stateDir}/config/initializers/secret_token.rb"; then + ${bundle} exec rake generate_secret_token + chmod 440 ${cfg.stateDir}/config/initializers/secret_token.rb fi - cd ${pkgs.redmine}/share/redmine/ - ${ruby}/bin/rake db:migrate - ${ruby}/bin/rake redmine:plugins:migrate - ${ruby}/bin/rake redmine:load_default_data - ${ruby}/bin/rake generate_secret_token + # ensure everything is owned by ${cfg.user} + chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir} + + ${bundle} exec rake db:migrate + ${bundle} exec rake redmine:load_default_data ''; serviceConfig = { PermissionsStartOnly = true; # preStart must be run as root Type = "simple"; - User = "redmine"; - Group = "redmine"; + User = cfg.user; + Group = cfg.group; TimeoutSec = "300"; WorkingDirectory = "${pkgs.redmine}/share/redmine"; - ExecStart="${ruby}/bin/ruby ${pkgs.redmine}/share/redmine/script/rails server webrick -e production -P ${cfg.stateDir}/redmine.pid"; + ExecStart="${bundle} exec rails server webrick -e production -P ${cfg.stateDir}/redmine.pid"; }; }; + users.extraUsers = optionalAttrs (cfg.user == "redmine") (singleton + { name = "redmine"; + group = cfg.group; + home = cfg.stateDir; + createHome = true; + uid = config.ids.uids.redmine; + }); + + users.extraGroups = optionalAttrs (cfg.group == "redmine") (singleton + { name = "redmine"; + gid = config.ids.gids.redmine; + }); + + warnings = optional (cfg.database.password != "") + ''config.services.redmine.database.password will be stored as plaintext + in the Nix store. Use database.passwordFile instead.''; + + # Create database passwordFile default when password is configured. + services.redmine.database.passwordFile = + (mkDefault (toString (pkgs.writeTextFile { + name = "redmine-database-password"; + text = cfg.database.password; + }))); + }; } diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix index dbca56b13335e998fd37190afb85269c6baa5ebe..042b496d35eebc2208cdffbfe70bbedb5c8b7258 100644 --- a/nixos/modules/services/misc/ripple-data-api.nix +++ b/nixos/modules/services/misc/ripple-data-api.nix @@ -185,7 +185,7 @@ in { ]; }; - users.extraUsers = singleton + users.users = singleton { name = "ripple-data-api"; description = "Ripple data api user"; uid = config.ids.uids.ripple-data-api; diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 8bcf35a8ad3822a1630a3bff3047eb8af2a3ced1..9d9a0ba44da59bc353843d5cd7b5017894fd5867 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -406,7 +406,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = "rippled"; description = "Ripple server user"; uid = config.ids.uids.rippled; diff --git a/nixos/modules/services/misc/safeeyes.nix b/nixos/modules/services/misc/safeeyes.nix new file mode 100644 index 0000000000000000000000000000000000000000..1a33971d9227257f5c29c9f4395e1b24cdf3ddba --- /dev/null +++ b/nixos/modules/services/misc/safeeyes.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.safeeyes; + +in + +{ + + ###### interface + + options = { + + services.safeeyes = { + + enable = mkOption { + default = false; + description = "Whether to enable the safeeyes OSGi service"; + }; + + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + + systemd.user.services.safeeyes = { + description = "Safeeyes"; + + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + + serviceConfig = { + ExecStart = '' + ${pkgs.safeeyes}/bin/safeeyes + ''; + Restart = "on-failure"; + RestartSec = 3; + StartLimitInterval = 350; + StartLimitBurst = 10; + }; + }; + + }; +} diff --git a/nixos/modules/services/misc/serviio.nix b/nixos/modules/services/misc/serviio.nix index a6612e9c6adb39d1029ea4d007c8c169ba8e4f63..8808f2d2193115d5171bad78efc5c0599ba48a4a 100644 --- a/nixos/modules/services/misc/serviio.nix +++ b/nixos/modules/services/misc/serviio.nix @@ -63,7 +63,7 @@ in { }; }; - users.extraUsers = [ + users.users = [ { name = "serviio"; group = "serviio"; @@ -74,7 +74,7 @@ in { } ]; - users.extraGroups = [ + users.groups = [ { name = "serviio";} ]; diff --git a/nixos/modules/services/misc/siproxd.nix b/nixos/modules/services/misc/siproxd.nix index 9e8fb6c228f21814c06f5a2eace9a1fd91a96023..dcaf73aca4482a4b444295e19d0d1d3f39507448 100644 --- a/nixos/modules/services/misc/siproxd.nix +++ b/nixos/modules/services/misc/siproxd.nix @@ -161,7 +161,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "siproxyd"; uid = config.ids.uids.siproxd; }; diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/sonarr.nix index ecde2c33bfa93a2c9c2c36c73d3a34b2291126cc..97b67a0b5033c051aa14031b172ae9306ff6de89 100644 --- a/nixos/modules/services/misc/sonarr.nix +++ b/nixos/modules/services/misc/sonarr.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, mono, ... }: +{ config, pkgs, lib, ... }: with lib; @@ -36,12 +36,12 @@ in }; }; - users.extraUsers.sonarr = { + users.users.sonarr = { uid = config.ids.uids.sonarr; home = "/var/lib/sonarr"; group = "sonarr"; }; - users.extraGroups.sonarr.gid = config.ids.gids.sonarr; + users.groups.sonarr.gid = config.ids.gids.sonarr; }; } diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index c2efd53d413ae357ea6d8c5c801ecb534fabcb22..1612b197f35f4001b7c412177aa45c44a542d529 100644 --- a/nixos/modules/services/misc/subsonic.nix +++ b/nixos/modules/services/misc/subsonic.nix @@ -130,7 +130,7 @@ let cfg = config.services.subsonic; in { ! [ -e "${cfg.home}" ] && [ -d "$oldHome" ] && [ $(${pkgs.coreutils}/bin/stat -c %u "$oldHome") -eq \ - ${toString config.users.extraUsers.subsonic.uid} ]; then + ${toString config.users.users.subsonic.uid} ]; then logger Moving "$oldHome" to "${cfg.home}" ${pkgs.coreutils}/bin/mv -T "$oldHome" "${cfg.home}" fi @@ -152,7 +152,7 @@ let cfg = config.services.subsonic; in { }; }; - users.extraUsers.subsonic = { + users.users.subsonic = { description = "Subsonic daemon user"; home = cfg.home; createHome = true; @@ -160,6 +160,6 @@ let cfg = config.services.subsonic; in { uid = config.ids.uids.subsonic; }; - users.extraGroups.subsonic.gid = config.ids.gids.subsonic; + users.groups.subsonic.gid = config.ids.gids.subsonic; }; } diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix index 7e8eadbe5f37fc4e4e0cb5a4fbf516154fbddaf8..b89cb41ac3aded2a50be40c17c5143fb8b62fa1c 100644 --- a/nixos/modules/services/misc/synergy.nix +++ b/nixos/modules/services/misc/synergy.nix @@ -83,20 +83,20 @@ in config = mkMerge [ (mkIf cfgC.enable { - systemd.services."synergy-client" = { - after = [ "network.target" ]; + systemd.user.services."synergy-client" = { + after = [ "network.target" "graphical-session.target" ]; description = "Synergy client"; - wantedBy = optional cfgC.autoStart "multi-user.target"; + wantedBy = optional cfgC.autoStart "graphical-session.target"; path = [ pkgs.synergy ]; serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}"} ${cfgC.serverAddress}''; serviceConfig.Restart = "on-failure"; }; }) (mkIf cfgS.enable { - systemd.services."synergy-server" = { - after = [ "network.target" ]; + systemd.user.services."synergy-server" = { + after = [ "network.target" "graphical-session.target" ]; description = "Synergy server"; - wantedBy = optional cfgS.autoStart "multi-user.target"; + wantedBy = optional cfgS.autoStart "graphical-session.target"; path = [ pkgs.synergy ]; serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f ${optionalString (cfgS.address != "") "-a ${cfgS.address}"} ${optionalString (cfgS.screenName != "") "-n ${cfgS.screenName}" }''; serviceConfig.Restart = "on-failure"; diff --git a/nixos/modules/services/misc/sysprof.nix b/nixos/modules/services/misc/sysprof.nix new file mode 100644 index 0000000000000000000000000000000000000000..ab91a8b586a2322ca858fcd80e7c4ac8b84e755e --- /dev/null +++ b/nixos/modules/services/misc/sysprof.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: + +{ + options = { + services.sysprof = { + enable = lib.mkEnableOption "sysprof profiling daemon"; + }; + }; + + config = lib.mkIf config.services.sysprof.enable { + environment.systemPackages = [ pkgs.sysprof ]; + + services.dbus.packages = [ pkgs.sysprof ]; + + systemd.packages = [ pkgs.sysprof ]; + }; + + meta.maintainers = pkgs.sysprof.meta.maintainers; +} diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index ba9f52f1904b18bc4cf496d65cbc1f1f7c0cff5d..5f97abf18715f002f17c6a92206f64e1be6f11d0 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -7,16 +7,6 @@ let taskd = "${pkgs.taskserver}/bin/taskd"; - mkVal = val: - if val == true then "true" - else if val == false then "false" - else if isList val then concatStringsSep ", " val - else toString val; - - mkConfLine = key: val: let - result = "${key} = ${mkVal val}"; - in optionalString (val != null && val != []) result; - mkManualPkiOption = desc: mkOption { type = types.nullOr types.path; default = null; @@ -94,7 +84,7 @@ let in flatten (mapAttrsToList mkSublist attrs); in all isNull (findPkiDefinitions [] manualPkiOptions); - orgOptions = { name, ... }: { + orgOptions = { ... }: { options.users = mkOption { type = types.uniq (types.listOf types.str); default = []; diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml index 6d4d2a9b488c073395d5ab514e167c647548f1ea..75493ac1394f6e7b0d546417c60dc42a22ddc085 100644 --- a/nixos/modules/services/misc/taskserver/doc.xml +++ b/nixos/modules/services/misc/taskserver/doc.xml @@ -55,7 +55,7 @@ Because Taskserver by default only provides scripts to setup users imperatively, the nixos-taskserver tool is used for addition and deletion of organisations along with users and groups defined - by and as well for + by and as well for imperative set up. @@ -99,10 +99,10 @@ For example, let's say you have the following configuration: { - services.taskserver.enable = true; - services.taskserver.fqdn = "server"; - services.taskserver.listenHost = "::"; - services.taskserver.organisations.my-company.users = [ "alice" ]; + = true; + = "server"; + = "::"; + services.taskserver.organisations.my-company.users = [ "alice" ]; } This creates an organisation called my-company with the @@ -136,7 +136,7 @@ $ ssh server nixos-taskserver user export my-company alice | sh If you set any options within - , + service.taskserver.pki.manual.*, nixos-taskserver won't issue certificates, but you can still use it for adding or removing user accounts. diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix index 15071202b9c2ea640166b67e0d436e3cd65e29f2..005951b9231ec8d18cd4171271f1f5b936642289 100644 --- a/nixos/modules/services/misc/uhub.nix +++ b/nixos/modules/services/misc/uhub.nix @@ -161,11 +161,11 @@ in config = mkIf cfg.enable { users = { - extraUsers = singleton { + users = singleton { name = "uhub"; uid = config.ids.uids.uhub; }; - extraGroups = singleton { + groups = singleton { name = "uhub"; gid = config.ids.gids.uhub; }; diff --git a/nixos/modules/services/misc/xmr-stak.nix b/nixos/modules/services/misc/xmr-stak.nix index 57f4393654717b56fb9acf3598e7eda9f2ae0501..a87878c31e0d53df5a4408f9c19ba4673443ffb9 100644 --- a/nixos/modules/services/misc/xmr-stak.nix +++ b/nixos/modules/services/misc/xmr-stak.nix @@ -10,9 +10,6 @@ let inherit (cfg) openclSupport cudaSupport; }; - xmrConfArg = optionalString (cfg.configText != "") ("-c " + - pkgs.writeText "xmr-stak-config.txt" cfg.configText); - in { @@ -29,22 +26,34 @@ in description = "List of parameters to pass to xmr-stak."; }; - configText = mkOption { - type = types.lines; - default = ""; - example = '' - "currency" : "monero", - "pool_list" : - [ { "pool_address" : "pool.supportxmr.com:5555", - "wallet_address" : "", - "pool_password" : "minername", - "pool_weight" : 1, - }, - ], + configFiles = mkOption { + type = types.attrsOf types.str; + default = {}; + example = literalExample '' + { + "config.txt" = ''' + "verbose_level" : 4, + "h_print_time" : 60, + "tls_secure_algo" : true, + '''; + "pools.txt" = ''' + "currency" : "monero7", + "pool_list" : + [ { "pool_address" : "pool.supportxmr.com:443", + "wallet_address" : "my-wallet-address", + "rig_id" : "", + "pool_password" : "nixos", + "use_nicehash" : false, + "use_tls" : true, + "tls_fingerprint" : "", + "pool_weight" : 23 + }, + ], + '''; + } ''; description = '' - Verbatim xmr-stak config.txt. If empty, the -c - parameter will not be added to the xmr-stak command. + Content of config files like config.txt, pools.txt or cpu.txt. ''; }; }; @@ -58,10 +67,13 @@ in environment = mkIf cfg.cudaSupport { LD_LIBRARY_PATH = "${pkgs.linuxPackages_latest.nvidia_x11}/lib"; }; - script = '' - exec ${pkg}/bin/xmr-stak ${xmrConfArg} ${concatStringsSep " " cfg.extraArgs} - ''; + + preStart = concatStrings (flip mapAttrsToList cfg.configFiles (fn: content: '' + ln -sf '${pkgs.writeText "xmr-stak-${fn}" content}' '${fn}' + '')); + serviceConfig = let rootRequired = cfg.openclSupport || cfg.cudaSupport; in { + ExecStart = "${pkg}/bin/xmr-stak ${concatStringsSep " " cfg.extraArgs}"; # xmr-stak generates cpu and/or gpu configuration files WorkingDirectory = "/tmp"; PrivateTmp = true; @@ -70,4 +82,12 @@ in }; }; }; + + imports = [ + (mkRemovedOptionModule ["services" "xmr-stak" "configText"] '' + This option was removed in favour of `services.xmr-stak.configFiles` + because the new config file `pools.txt` was introduced. You are + now able to define all other config files like cpu.txt or amd.txt. + '') + ]; } diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index 91539592511c2d4bc35db375724e772b8e2595fa..cb7cc97d5a5c98bbb1d7e5cd2a67972b85c9e5ce 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -144,7 +144,7 @@ in { ''; }; - users.extraUsers = singleton { + users.users = singleton { name = "zookeeper"; uid = config.ids.uids.zookeeper; description = "Zookeeper daemon user"; diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index 496838a131ba5da2c40120cc7b6199640e2a057d..8bf741adb6e3370410a7e58ebec08211a07b3108 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -153,13 +153,13 @@ in { }; }; - users.extraUsers.bosun = { + users.users.bosun = { description = "bosun user"; group = "bosun"; uid = config.ids.uids.bosun; }; - users.extraGroups.bosun.gid = config.ids.gids.bosun; + users.groups.bosun.gid = config.ids.gids.bosun; }; diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index dfbac3446e035293910d14c2b11a225680fc62f5..6606980cdad88c65dddc4ea2cc871078de5c8b5d 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -97,7 +97,7 @@ in { ''; }; - users.extraUsers = optional (cfg.user == "collectd") { + users.users = optional (cfg.user == "collectd") { name = "collectd"; }; }; diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix new file mode 100644 index 0000000000000000000000000000000000000000..e545e06b3495831af4c34b72f0e7e96b6bb60067 --- /dev/null +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -0,0 +1,236 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.datadog-agent; + + ddConf = { + dd_url = "https://app.datadoghq.com"; + skip_ssl_validation = "no"; + api_key = ""; + confd_path = "/etc/datadog-agent/conf.d"; + additional_checksd = "/etc/datadog-agent/checks.d"; + use_dogstatsd = true; + } + // optionalAttrs (cfg.logLevel != null) { log_level = cfg.logLevel; } + // optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; } + // optionalAttrs (cfg.tags != null ) { tags = concatStringsSep ", " cfg.tags; } + // cfg.extraConfig; + + # Generate Datadog configuration files for each configured checks. + # This works because check configurations have predictable paths, + # and because JSON is a valid subset of YAML. + makeCheckConfigs = entries: mapAttrsToList (name: conf: { + source = pkgs.writeText "${name}-check-conf.yaml" (builtins.toJSON conf); + target = "datadog-agent/conf.d/${name}.d/conf.yaml"; + }) entries; + + defaultChecks = { + disk = cfg.diskCheck; + network = cfg.networkCheck; + }; + + # Assemble all check configurations and the top-level agent + # configuration. + etcfiles = with pkgs; with builtins; [{ + source = writeText "datadog.yaml" (toJSON ddConf); + target = "datadog-agent/datadog.yaml"; + }] ++ makeCheckConfigs (cfg.checks // defaultChecks); + + # Apply the configured extraIntegrations to the provided agent + # package. See the documentation of `dd-agent/integrations-core.nix` + # for detailed information on this. + datadogPkg = cfg.package.overrideAttrs(_: { + python = (pkgs.datadog-integrations-core cfg.extraIntegrations).python; + }); +in { + options.services.datadog-agent = { + enable = mkOption { + description = '' + Whether to enable the datadog-agent v6 monitoring service + ''; + default = false; + type = types.bool; + }; + + package = mkOption { + default = pkgs.datadog-agent; + defaultText = "pkgs.datadog-agent"; + description = '' + Which DataDog v6 agent package to use. Note that the provided + package is expected to have an overridable `python`-attribute + which configures the Python environment with the Datadog + checks. + ''; + type = types.package; + }; + + apiKeyFile = mkOption { + description = '' + Path to a file containing the Datadog API key to associate the + agent with your account. + ''; + example = "/run/keys/datadog_api_key"; + type = types.path; + }; + + tags = mkOption { + description = "The tags to mark this Datadog agent"; + example = [ "test" "service" ]; + default = null; + type = types.nullOr (types.listOf types.str); + }; + + hostname = mkOption { + description = "The hostname to show in the Datadog dashboard (optional)"; + default = null; + example = "mymachine.mydomain"; + type = types.uniq (types.nullOr types.string); + }; + + logLevel = mkOption { + description = "Logging verbosity."; + default = null; + type = types.nullOr (types.enum ["DEBUG" "INFO" "WARN" "ERROR"]); + }; + + extraIntegrations = mkOption { + default = {}; + type = types.attrs; + + description = '' + Extra integrations from the Datadog core-integrations + repository that should be built and included. + + By default the included integrations are disk, mongo, network, + nginx and postgres. + + To include additional integrations the name of the derivation + and a function to filter its dependencies from the Python + package set must be provided. + ''; + + example = { + ntp = (pythonPackages: [ pythonPackages.ntplib ]); + }; + }; + + extraConfig = mkOption { + default = {}; + type = types.attrs; + description = '' + Extra configuration options that will be merged into the + main config file datadog.yaml. + ''; + }; + + checks = mkOption { + description = '' + Configuration for all Datadog checks. Keys of this attribute + set will be used as the name of the check to create the + appropriate configuration in `conf.d/$check.d/conf.yaml`. + + The configuration is converted into JSON from the plain Nix + language configuration, meaning that you should write + configuration adhering to Datadog's documentation - but in Nix + language. + + Refer to the implementation of this module (specifically the + definition of `defaultChecks`) for an example. + + Note: The 'disk' and 'network' check are configured in + separate options because they exist by default. Attempting to + override their configuration here will have no effect. + ''; + + example = { + http_check = { + init_config = null; # sic! + instances = [ + { + name = "some-service"; + url = "http://localhost:1337/healthz"; + tags = [ "some-service" ]; + } + ]; + }; + }; + + default = {}; + + # sic! The structure of the values is up to the check, so we can + # not usefully constrain the type further. + type = with types; attrsOf attrs; + }; + + diskCheck = mkOption { + description = "Disk check config"; + type = types.attrs; + default = { + init_config = {}; + instances = [ { use-mount = "no"; } ]; + }; + }; + + networkCheck = mkOption { + description = "Network check config"; + type = types.attrs; + default = { + init_config = {}; + # Network check only supports one configured instance + instances = [ { collect_connection_state = false; + excluded_interfaces = [ "lo" "lo0" ]; } ]; + }; + }; + }; + config = mkIf cfg.enable { + environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps ]; + + users.extraUsers.datadog = { + description = "Datadog Agent User"; + uid = config.ids.uids.datadog; + group = "datadog"; + home = "/var/log/datadog/"; + createHome = true; + }; + + users.extraGroups.datadog.gid = config.ids.gids.datadog; + + systemd.services = let + makeService = attrs: recursiveUpdate { + path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "datadog"; + Group = "datadog"; + Restart = "always"; + RestartSec = 2; + PrivateTmp = true; + }; + restartTriggers = [ datadogPkg ] ++ map (etc: etc.source) etcfiles; + } attrs; + in { + datadog-agent = makeService { + description = "Datadog agent monitor"; + preStart = '' + chown -R datadog: /etc/datadog-agent + rm -f /etc/datadog-agent/auth_token + ''; + script = '' + export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile}) + exec ${datadogPkg}/bin/agent start -c /etc/datadog-agent/datadog.yaml + ''; + serviceConfig.PermissionsStartOnly = true; + }; + + dd-jmxfetch = lib.mkIf (lib.hasAttr "jmx" cfg.checks) (makeService { + description = "Datadog JMX Fetcher"; + path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; + serviceConfig.ExecStart = "${datadogPkg}/bin/dd-jmxfetch"; + }); + }; + + environment.etc = etcfiles; + }; +} diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index beaa2c01b2984db726a324dfde3d24adefe1f10b..abc8d65d58f260ff71b5ce5e938d91eb503fca96 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -57,7 +57,7 @@ let instances: - use_mount: no ''; - + networkConfig = pkgs.writeText "network.yaml" '' init_config: @@ -68,13 +68,13 @@ let - lo - lo0 ''; - + postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig; nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig; mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig; jmxConfig = pkgs.writeText "jmx.yaml" cfg.jmxConfig; processConfig = pkgs.writeText "process.yaml" cfg.processConfig; - + etcfiles = let defaultConfd = import ./dd-agent-defaults.nix; @@ -114,13 +114,22 @@ let in { options.services.dd-agent = { enable = mkOption { - description = "Whether to enable the dd-agent montioring service"; + description = '' + Whether to enable the dd-agent v5 monitoring service. + For datadog-agent v6, see . + ''; default = false; type = types.bool; }; api_key = mkOption { - description = "The Datadog API key to associate the agent with your account"; + description = '' + The Datadog API key to associate the agent with your account. + + Warning: this key is stored in cleartext within the world-readable + Nix store! Consider using the new v6 + module instead. + ''; example = "ae0aa6a8f08efa988ba0a17578f009ab"; type = types.str; }; @@ -150,7 +159,7 @@ in { default = null; type = types.uniq (types.nullOr types.string); }; - + mongoConfig = mkOption { description = "MongoDB integration configuration"; default = null; @@ -166,7 +175,7 @@ in { processConfig = mkOption { description = '' Process integration configuration - + See http://docs.datadoghq.com/integrations/process/ ''; default = null; @@ -178,7 +187,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ]; - users.extraUsers.datadog = { + users.users.datadog = { description = "Datadog Agent User"; uid = config.ids.uids.datadog; group = "datadog"; @@ -186,50 +195,43 @@ in { createHome = true; }; - users.extraGroups.datadog.gid = config.ids.gids.datadog; - - systemd.services.dd-agent = { - description = "Datadog agent monitor"; - path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; - User = "datadog"; - Group = "datadog"; - Restart = "always"; - RestartSec = 2; + users.groups.datadog.gid = config.ids.gids.datadog; + + systemd.services = let + makeService = attrs: recursiveUpdate { + path = [ pkgs.dd-agent pkgs.python pkgs.sysstat pkgs.procps pkgs.gohai ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "datadog"; + Group = "datadog"; + Restart = "always"; + RestartSec = 2; + PrivateTmp = true; + }; + restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ]; + } attrs; + in { + dd-agent = makeService { + description = "Datadog agent monitor"; + serviceConfig.ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; }; - restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ]; - }; - systemd.services.dogstatsd = { - description = "Datadog statsd"; - path = [ pkgs."dd-agent" pkgs.python pkgs.procps ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start"; - User = "datadog"; - Group = "datadog"; - Type = "forking"; - PIDFile = "/tmp/dogstatsd.pid"; - Restart = "always"; - RestartSec = 2; + dogstatsd = makeService { + description = "Datadog statsd"; + environment.TMPDIR = "/run/dogstatsd"; + serviceConfig = { + ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start"; + Type = "forking"; + PIDFile = "/run/dogstatsd/dogstatsd.pid"; + RuntimeDirectory = "dogstatsd"; + }; }; - restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ]; - }; - systemd.services.dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) { - description = "Datadog JMX Fetcher"; - path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch"; - User = "datadog"; - Group = "datadog"; - Restart = "always"; - RestartSec = 2; + dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) { + description = "Datadog JMX Fetcher"; + path = [ pkgs.dd-agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; + serviceConfig.ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch"; }; - restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ]; }; environment.etc = etcfiles; diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix index c3b869e00880e6207f0234f2758053bcf8d9e4e4..9c976c65ea49af4e8953ef6477dbfdfe388262f8 100644 --- a/nixos/modules/services/monitoring/fusion-inventory.nix +++ b/nixos/modules/services/monitoring/fusion-inventory.nix @@ -46,7 +46,7 @@ in { config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "fusion-inventory"; description = "FusionInventory user"; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index a5b6dbab1577b0cc195d110539b2b01ac0727b3d..3e801f9b838db0c91e3c01c9afa5aede8ad49266 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -50,7 +50,7 @@ in { protocol = mkOption { description = "Which protocol to listen."; default = "http"; - type = types.enum ["http" "https"]; + type = types.enum ["http" "https" "socket"]; }; addr = mkOption { @@ -265,7 +265,7 @@ in { ''; }; - users.extraUsers.grafana = { + users.users.grafana = { uid = config.ids.uids.grafana; description = "Grafana user"; home = cfg.dataDir; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 4b1ad34b3a4efbc7e4bd256adbb464b51aef9426..cdc98b407e90090bf6ec4562326de09750e7d1e6 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -57,12 +57,6 @@ let --nodaemon --syslog --prefix=${name} --pidfile /run/${name}/${name}.pid ${name} ''; - mkPidFileDir = name: '' - mkdir -p /run/${name} - chmod 0700 /run/${name} - chown -R graphite:graphite /run/${name} - ''; - carbonEnv = { PYTHONPATH = let cenv = pkgs.python.buildEnv.override { @@ -136,7 +130,7 @@ in { finders = mkOption { description = "List of finder plugins to load."; default = []; - example = literalExample "[ pkgs.python27Packages.graphite_influxdb ]"; + example = literalExample "[ pkgs.python27Packages.influxgraph ]"; type = types.listOf types.package; }; @@ -412,18 +406,16 @@ in { after = [ "network.target" ]; environment = carbonEnv; serviceConfig = { + RuntimeDirectory = name; ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PermissionsStartOnly = true; PIDFile="/run/${name}/${name}.pid"; }; - preStart = mkPidFileDir name + '' - - mkdir -p ${cfg.dataDir}/whisper - chmod 0700 ${cfg.dataDir}/whisper - chown graphite:graphite ${cfg.dataDir} - chown graphite:graphite ${cfg.dataDir}/whisper + preStart = '' + install -dm0700 -o graphite -g graphite ${cfg.dataDir} + install -dm0700 -o graphite -g graphite ${cfg.dataDir}/whisper ''; }; }) @@ -436,12 +428,12 @@ in { after = [ "network.target" ]; environment = carbonEnv; serviceConfig = { + RuntimeDirectory = name; ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PIDFile="/run/${name}/${name}.pid"; }; - preStart = mkPidFileDir name; }; }) @@ -452,12 +444,12 @@ in { after = [ "network.target" ]; environment = carbonEnv; serviceConfig = { + RuntimeDirectory = name; ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PIDFile="/run/${name}/${name}.pid"; }; - preStart = mkPidFileDir name; }; }) @@ -485,7 +477,7 @@ in { PYTHONPATH = let penv = pkgs.python.buildEnv.override { extraLibs = [ - pythonPackages.graphite_web + pythonPackages.graphite-web pythonPackages.pysqlite ]; }; @@ -524,16 +516,16 @@ in { fi # Only collect static files when graphite_web changes. - if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite_web}" ]; then + if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite-web}" ]; then mkdir -p ${staticDir} ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic --noinput --clear chown -R graphite:graphite ${staticDir} - ln -sfT "${pythonPackages.graphite_web}" "${dataDir}/current_graphite_web" + ln -sfT "${pythonPackages.graphite-web}" "${dataDir}/current_graphite_web" fi ''; }; - environment.systemPackages = [ pythonPackages.graphite_web ]; + environment.systemPackages = [ pythonPackages.graphite-web ]; })) (mkIf cfg.api.enable { @@ -607,7 +599,7 @@ in { GRAPHITE_URL = cfg.pager.graphiteUrl; }; serviceConfig = { - ExecStart = "${pkgs.pythonPackages.graphite_pager}/bin/graphite-pager --config ${pagerConfig}"; + ExecStart = "${pkgs.pythonPackages.graphitepager}/bin/graphite-pager --config ${pagerConfig}"; User = "graphite"; Group = "graphite"; }; @@ -615,7 +607,7 @@ in { services.redis.enable = mkDefault true; - environment.systemPackages = [ pkgs.pythonPackages.graphite_pager ]; + environment.systemPackages = [ pkgs.pythonPackages.graphitepager ]; }) (mkIf cfg.beacon.enable { @@ -638,13 +630,13 @@ in { cfg.web.enable || cfg.api.enable || cfg.seyren.enable || cfg.pager.enable || cfg.beacon.enable ) { - users.extraUsers = singleton { + users.users = singleton { name = "graphite"; uid = config.ids.uids.graphite; description = "Graphite daemon user"; home = dataDir; }; - users.extraGroups.graphite.gid = config.ids.gids.graphite; + users.groups.graphite.gid = config.ids.gids.graphite; }) ]; } diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixos/modules/services/monitoring/heapster.nix index deee64aa41ea99f017a34cda9911a00fb060bb79..fbdff2eb5dbe4ed6a9c0aaaad60435156d66d1cb 100644 --- a/nixos/modules/services/monitoring/heapster.nix +++ b/nixos/modules/services/monitoring/heapster.nix @@ -49,7 +49,7 @@ in { }; }; - users.extraUsers = singleton { + users.users = singleton { name = "heapster"; uid = config.ids.uids.heapster; description = "Heapster user"; diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 358ffd431dd48456ca32e7793642485adc0c0d62..ff9604c7dbcd133b008716f6db8793435f074b71 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -150,14 +150,14 @@ in environment.systemPackages = [ pkgs.munin ]; - users.extraUsers = [{ + users.users = [{ name = "munin"; description = "Munin monitoring user"; group = "munin"; uid = config.ids.uids.munin; }]; - users.extraGroups = [{ + users.groups = [{ name = "munin"; gid = config.ids.gids.munin; }]; diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 4914c5db97d246ac55972c03f3059d8f117ed0ae..3e1d727b416e038ab8dc6e63f7741810a1b4220b 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -143,7 +143,7 @@ in config = mkIf cfg.enable { - users.extraUsers.nagios = { + users.users.nagios = { description = "Nagios user "; uid = config.ids.uids.nagios; home = nagiosState; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index d23b329eeb2580f003f3a715df27eb373a722bd7..edcaa10d969dd7427c3140d8b786626a9d3bbdb3 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -14,6 +14,10 @@ let global = { "plugins directory" = "${wrappedPlugins}/libexec/netdata/plugins.d ${pkgs.netdata}/libexec/netdata/plugins.d"; }; + web = { + "web files owner" = "root"; + "web files group" = "root"; + }; }; mkConfig = generators.toINI {} (recursiveUpdate localConfig cfg.config); configFile = pkgs.writeText "netdata.conf" (if cfg.configText != null then cfg.configText else mkConfig); @@ -100,11 +104,11 @@ in { }; - users.extraUsers = optional (cfg.user == defaultUser) { + users.users = optional (cfg.user == defaultUser) { name = defaultUser; }; - users.extraGroups = optional (cfg.group == defaultUser) { + users.groups = optional (cfg.group == defaultUser) { name = defaultUser; }; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 80122e69d16732613bf3aa2aaf7645f07b12777c..5dda763bd56b711cd78882c63af60cfe681e3ff8 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -471,8 +471,8 @@ in { }; config = mkIf cfg.enable { - users.extraGroups.${promGroup}.gid = config.ids.gids.prometheus; - users.extraUsers.${promUser} = { + users.groups.${promGroup}.gid = config.ids.gids.prometheus; + users.users.${promUser} = { description = "Prometheus daemon user"; uid = config.ids.uids.prometheus; group = promGroup; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 8d6ca1e40a19bb9b6d22757a53209c64ea88d8d6..1d5f400250fd4594df943797ee4131a110fa28e8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -18,17 +18,20 @@ let # systemd service must be provided by specifying either # `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart` exporterOpts = { - blackbox = import ./exporters/blackbox.nix { inherit config lib pkgs; }; - collectd = import ./exporters/collectd.nix { inherit config lib pkgs; }; - fritzbox = import ./exporters/fritzbox.nix { inherit config lib pkgs; }; - json = import ./exporters/json.nix { inherit config lib pkgs; }; - minio = import ./exporters/minio.nix { inherit config lib pkgs; }; - nginx = import ./exporters/nginx.nix { inherit config lib pkgs; }; - node = import ./exporters/node.nix { inherit config lib pkgs; }; - postfix = import ./exporters/postfix.nix { inherit config lib pkgs; }; - snmp = import ./exporters/snmp.nix { inherit config lib pkgs; }; - unifi = import ./exporters/unifi.nix { inherit config lib pkgs; }; - varnish = import ./exporters/varnish.nix { inherit config lib pkgs; }; + blackbox = import ./exporters/blackbox.nix { inherit config lib pkgs; }; + collectd = import ./exporters/collectd.nix { inherit config lib pkgs; }; + dnsmasq = import ./exporters/dnsmasq.nix { inherit config lib pkgs; }; + dovecot = import ./exporters/dovecot.nix { inherit config lib pkgs; }; + fritzbox = import ./exporters/fritzbox.nix { inherit config lib pkgs; }; + json = import ./exporters/json.nix { inherit config lib pkgs; }; + minio = import ./exporters/minio.nix { inherit config lib pkgs; }; + nginx = import ./exporters/nginx.nix { inherit config lib pkgs; }; + node = import ./exporters/node.nix { inherit config lib pkgs; }; + postfix = import ./exporters/postfix.nix { inherit config lib pkgs; }; + snmp = import ./exporters/snmp.nix { inherit config lib pkgs; }; + surfboard = import ./exporters/surfboard.nix { inherit config lib pkgs; }; + unifi = import ./exporters/unifi.nix { inherit config lib pkgs; }; + varnish = import ./exporters/varnish.nix { inherit config lib pkgs; }; }; mkExporterOpts = ({ name, port }: { @@ -70,7 +73,7 @@ let description = '' Specify a filter for iptables to use when - is true. It is used as `ip46tables -I INPUT -j ACCEPT`. + is true. It is used as `ip46tables -I nixos-fw -j nixos-fw-accept`. ''; }; user = mkOption { @@ -91,7 +94,7 @@ let }; }); - mkSubModule = { name, port, extraOpts, serviceOpts }: { + mkSubModule = { name, port, extraOpts, ... }: { ${name} = mkOption { type = types.submodule { options = (mkExporterOpts { @@ -113,9 +116,10 @@ let mkExporterConf = { name, conf, serviceOpts }: mkIf conf.enable { - networking.firewall.extraCommands = mkIf conf.openFirewall '' - ip46tables -I INPUT ${conf.firewallFilter} -j ACCEPT - ''; + networking.firewall.extraCommands = mkIf conf.openFirewall (concatStrings [ + "ip46tables -I nixos-fw ${conf.firewallFilter} " + "-m comment --comment ${name}-exporter -j nixos-fw-accept" + ]); systemd.services."prometheus-${name}-exporter" = mkMerge ([{ wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix new file mode 100644 index 0000000000000000000000000000000000000000..b1fab85109afc36e7d9164942e2764a7bb480cc0 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.dnsmasq; +in +{ + port = 9153; + extraOpts = { + dnsmasqListenAddress = mkOption { + type = types.str; + default = "localhost:53"; + description = '' + Address on which dnsmasq listens. + ''; + }; + leasesPath = mkOption { + type = types.path; + default = "/var/lib/misc/dnsmasq.leases"; + example = "/var/lib/dnsmasq/dnsmasq.leases"; + description = '' + Path to the dnsmasq.leases file. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-dnsmasq-exporter}/bin/dnsmasq_exporter \ + --listen ${cfg.listenAddress}:${toString cfg.port} \ + --dnsmasq ${cfg.dnsmasqListenAddress} \ + --leases_path ${cfg.leasesPath} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix new file mode 100644 index 0000000000000000000000000000000000000000..4ca6d4e5f8b6d0dbd111b32775056f6df0c20201 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.dovecot; +in +{ + port = 9166; + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + socketPath = mkOption { + type = types.path; + default = "/var/run/dovecot/stats"; + example = "/var/run/dovecot2/stats"; + description = '' + Path under which the stats socket is placed. + The user/group under which the exporter runs, + should be able to access the socket in order + to scrape the metrics successfully. + ''; + }; + scopes = mkOption { + type = types.listOf types.str; + default = [ "user" ]; + example = [ "user" "global" ]; + description = '' + Stats scopes to query. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-dovecot-exporter}/bin/dovecot_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + --dovecot.socket-path ${cfg.socketPath} \ + --dovecot.scopes ${concatStringsSep "," cfg.scopes} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix index 6a3ba2d0457c5670f2210ccd6af0c77b0324f448..431dd8b4ead794c82d1168794da2dd3ee4234622 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -9,21 +9,37 @@ in port = 9113; extraOpts = { scrapeUri = mkOption { - type = types.string; + type = types.str; default = "http://localhost/nginx_status"; description = '' Address to access the nginx status page. Can be enabled with services.nginx.statusPage = true. ''; }; + telemetryEndpoint = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + insecure = mkOption { + type = types.bool; + default = true; + description = '' + Ignore server certificate if using https. + ''; + }; }; serviceOpts = { serviceConfig = { DynamicUser = true; ExecStart = '' ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \ - -nginx.scrape_uri '${cfg.scrapeUri}' \ - -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ + --nginx.scrape_uri '${cfg.scrapeUri}' \ + --telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ + --telemetry.endpoint ${cfg.telemetryEndpoint} \ + --insecure ${toString cfg.insecure} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix index c85f5f9cfb2d7f15ceca09bd3dee821f3a8a59a3..ee7bf39f199a2bb3e50ddd9218168a3b45b639c0 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -27,6 +27,7 @@ in }; serviceOpts = { serviceConfig = { + RuntimeDirectory = "prometheus-node-exporter"; ExecStart = '' ${pkgs.prometheus-node-exporter}/bin/node_exporter \ ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \ diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix index 1e909aa27d8332ec6298cfaed24a2a4d23891e31..efe78ebcba86548c153b306e26b98fb201fcb2de 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix @@ -32,6 +32,33 @@ in Path where Postfix places it's showq socket. ''; }; + systemd = { + enable = mkEnableOption '' + reading metrics from the systemd-journal instead of from a logfile + ''; + unit = mkOption { + type = types.str; + default = "postfix.service"; + description = '' + Name of the postfix systemd unit. + ''; + }; + slice = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Name of the postfix systemd slice. + This overrides the . + ''; + }; + journalPath = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to the systemd journal. + ''; + }; + }; }; serviceOpts = { serviceConfig = { @@ -39,7 +66,15 @@ in ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ --web.telemetry-path ${cfg.telemetryPath} \ - ${concatStringsSep " \\\n " cfg.extraFlags} + --postfix.showq_path ${cfg.showqPath} \ + ${concatStringsSep " \\\n " (cfg.extraFlags + ++ optional cfg.systemd.enable "--systemd.enable" + ++ optional cfg.systemd.enable (if cfg.systemd.slice != null + then "--systemd.slice ${cfg.systemd.slice}" + else "--systemd.unit ${cfg.systemd.unit}") + ++ optional (cfg.systemd.enable && (cfg.systemd.journalPath != null)) + "--systemd.jounal_path ${cfg.systemd.journalPath}" + ++ optional (!cfg.systemd.enable) "--postfix.logfile_path ${cfg.logfilePath}")} ''; }; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix b/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix new file mode 100644 index 0000000000000000000000000000000000000000..715dba06a3dcac277512213bca42279b8bcd9a7d --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix @@ -0,0 +1,32 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.surfboard; +in +{ + port = 9239; + extraOpts = { + modemAddress = mkOption { + type = types.str; + default = "192.168.100.1"; + description = '' + The hostname or IP of the cable modem. + ''; + }; + }; + serviceOpts = { + description = "Prometheus exporter for surfboard cable modem"; + unitConfig.Documentation = "https://github.com/ipstatic/surfboard_exporter"; + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-surfboard-exporter}/bin/surfboard_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --modem-address ${cfg.modemAddress} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix index b439a83e7aa2fb1eecc9de84897a8b761e7f4b71..8dbf2d735ab96b8a57d9e32cc89c1b108352e7e7 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix @@ -7,14 +7,80 @@ let in { port = 9131; + extraOpts = { + noExit = mkOption { + type = types.bool; + default = false; + description = '' + Do not exit server on Varnish scrape errors. + ''; + }; + withGoMetrics = mkOption { + type = types.bool; + default = false; + description = '' + Export go runtime and http handler metrics. + ''; + }; + verbose = mkOption { + type = types.bool; + default = false; + description = '' + Enable verbose logging. + ''; + }; + raw = mkOption { + type = types.bool; + default = false; + description = '' + Enable raw stdout logging without timestamps. + ''; + }; + varnishStatPath = mkOption { + type = types.str; + default = "varnishstat"; + description = '' + Path to varnishstat. + ''; + }; + instance = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + varnishstat -n value. + ''; + }; + healthPath = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path under which to expose healthcheck. Disabled unless configured. + ''; + }; + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + }; serviceOpts = { path = [ pkgs.varnish ]; serviceConfig = { DynamicUser = true; ExecStart = '' ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \ - -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - ${concatStringsSep " \\\n " cfg.extraFlags} + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + --varnishstat-path ${cfg.varnishStatPath} \ + ${concatStringsSep " \\\n " (cfg.extraFlags + ++ optional (cfg.healthPath != null) "--web.health-path ${cfg.healthPath}" + ++ optional (cfg.instance != null) "-n ${cfg.instance}" + ++ optional cfg.noExit "--no-exit" + ++ optional cfg.withGoMetrics "--with-go-metrics" + ++ optional cfg.verbose "--verbose" + ++ optional cfg.raw "--raw")} ''; }; }; diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix index 523f74cb72b972fc36b7ab0d19ca351abbe00cc5..7eb4d888b0cc4ed82b3cb37d570872a63efc7277 100644 --- a/nixos/modules/services/monitoring/riemann-dash.nix +++ b/nixos/modules/services/monitoring/riemann-dash.nix @@ -51,9 +51,9 @@ in { config = mkIf cfg.enable { - users.extraGroups.riemanndash.gid = config.ids.gids.riemanndash; + users.groups.riemanndash.gid = config.ids.gids.riemanndash; - users.extraUsers.riemanndash = { + users.users.riemanndash = { description = "riemann-dash daemon user"; uid = config.ids.uids.riemanndash; group = "riemanndash"; diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix index de858813a762001b9b3382291bc82d26ac2791e3..4e8832dadc5e91a1f884b65c157a83b299a7f806 100644 --- a/nixos/modules/services/monitoring/riemann-tools.nix +++ b/nixos/modules/services/monitoring/riemann-tools.nix @@ -40,9 +40,9 @@ in { config = mkIf cfg.enableHealth { - users.extraGroups.riemanntools.gid = config.ids.gids.riemanntools; + users.groups.riemanntools.gid = config.ids.gids.riemanntools; - users.extraUsers.riemanntools = { + users.users.riemanntools = { description = "riemann-tools daemon user"; uid = config.ids.uids.riemanntools; group = "riemanntools"; diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix index ac5d0134a80d60aaeccceb03952ea8c69e278ea3..237de53456f987673c846e4b2ef419808e91bb54 100644 --- a/nixos/modules/services/monitoring/riemann.nix +++ b/nixos/modules/services/monitoring/riemann.nix @@ -69,9 +69,9 @@ in { config = mkIf cfg.enable { - users.extraGroups.riemann.gid = config.ids.gids.riemann; + users.groups.riemann.gid = config.ids.gids.riemann; - users.extraUsers.riemann = { + users.users.riemann = { description = "riemann daemon user"; uid = config.ids.uids.riemann; group = "riemann"; diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 2684482c618482e448468ecc5dfe09957739670a..6ecb21d628dee3b99bc5a6cb7942887fcda88776 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -123,13 +123,13 @@ in { }; }; - users.extraUsers.scollector = { + users.users.scollector = { description = "scollector user"; group = "scollector"; uid = config.ids.uids.scollector; }; - users.extraGroups.scollector.gid = config.ids.gids.scollector; + users.groups.scollector.gid = config.ids.gids.scollector; }; diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index fecae4ca1b3620021bd131fd95a02d678926c0a7..c345ec48a018eb2aa488c072d063eaf74aaa9be2 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -64,7 +64,7 @@ let "DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"} ''; - smartdDeviceOpts = { name, ... }: { + smartdDeviceOpts = { ... }: { options = { diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 7b0e9981cbb18532f5869b30a489050e8b8b539b..ea155821ecc9b0efda11ec1fb2f2d487f3c66443 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -125,7 +125,7 @@ in message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!"; }) cfg.backends; - users.extraUsers = singleton { + users.users = singleton { name = "statsd"; uid = config.ids.uids.statsd; description = "Statsd daemon user"; diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index 49dc9d8143e6f2e6938b50de27662cd91ea49f18..6bfcd7143e1c9db6c4cb0aeb707540f8384199a9 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -62,7 +62,7 @@ in { }; }; - users.extraUsers = [{ + users.users = [{ name = "telegraf"; uid = config.ids.uids.telegraf; description = "telegraf daemon user"; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 29dc68f90cc942a6ee868e8f60bb6b39e9ac04a3..bc755612fd9bb8e9c04173f7f563fdf1e1224c1f 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -259,7 +259,7 @@ in /* - users.extraUsers = [ + users.users = [ { name = "nut"; uid = 84; home = "/var/lib/nut"; @@ -269,7 +269,7 @@ in } ]; - users.extraGroups = [ + users.groups = [ { name = "nut"; gid = 84; } diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix index 29616a085c8f3f3b53241fcc54f429943a6c1af3..b4d3a2640109a976196ce477467813fd3380797c 100644 --- a/nixos/modules/services/monitoring/uptime.nix +++ b/nixos/modules/services/monitoring/uptime.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: let - inherit (lib) mkOption mkEnableOption mkIf mkMerge types optionalAttrs optional; + inherit (lib) mkOption mkEnableOption mkIf mkMerge types optional; cfg = config.services.uptime; diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix index ca56e4a7b958b42a5b6a8a68ef72a51e4e2aceb9..cb2f8c07edb97879b7cc2aaed3bb27ff0d1373c1 100644 --- a/nixos/modules/services/monitoring/vnstat.nix +++ b/nixos/modules/services/monitoring/vnstat.nix @@ -16,7 +16,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers.vnstatd = { + users.users.vnstatd = { isSystemUser = true; description = "vnstat daemon user"; home = "/var/lib/vnstat"; diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix index 88a63b4bf161b5b69567390729b2cac309cff9cd..426cf9bf86ef8157bb62d525060eafdbbff6bcee 100644 --- a/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/nixos/modules/services/monitoring/zabbix-agent.nix @@ -7,6 +7,8 @@ let cfg = config.services.zabbixAgent; + zabbix = cfg.package; + stateDir = "/var/run/zabbix"; logDir = "/var/log/zabbix"; @@ -44,6 +46,16 @@ in ''; }; + package = mkOption { + type = types.attrs; # Note: pkgs.zabbixXY isn't a derivation, but an attrset of { server = ...; agent = ...; }. + default = pkgs.zabbix; + defaultText = "pkgs.zabbix"; + example = literalExample "pkgs.zabbix34"; + description = '' + The Zabbix package to use. + ''; + }; + server = mkOption { default = "127.0.0.1"; description = '' @@ -68,7 +80,7 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (!config.services.zabbixServer.enable) (singleton + users.users = mkIf (!config.services.zabbixServer.enable) (singleton { name = "zabbix"; uid = config.ids.uids.zabbix; description = "Zabbix daemon user"; @@ -87,14 +99,14 @@ in chown zabbix ${stateDir} ${logDir} ''; - serviceConfig.ExecStart = "@${pkgs.zabbix.agent}/sbin/zabbix_agentd zabbix_agentd --config ${configFile}"; + serviceConfig.ExecStart = "@${zabbix.agent}/sbin/zabbix_agentd zabbix_agentd --config ${configFile}"; serviceConfig.Type = "forking"; serviceConfig.RemainAfterExit = true; serviceConfig.Restart = "always"; serviceConfig.RestartSec = 2; }; - environment.systemPackages = [ pkgs.zabbix.agent ]; + environment.systemPackages = [ zabbix.agent ]; }; diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index acd1279ddf47aa62f2ee017e4d84d6d755cb000a..5f9fc12832fc0fc9a2b3d3e30e5ec9e808867be2 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -85,7 +85,7 @@ in services.postgresql.enable = useLocalPostgres; - users.extraUsers = singleton + users.users = singleton { name = "zabbix"; uid = config.ids.uids.zabbix; description = "Zabbix daemon user"; @@ -103,8 +103,8 @@ in chown zabbix ${stateDir} ${logDir} ${libDir} if ! test -e "${libDir}/db-created"; then - ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole zabbix || true - ${pkgs.postgresql}/bin/createdb --owner zabbix zabbix || true + ${pkgs.su}/bin/su -s "$SHELL" ${config.services.postgresql.superUser} -c '${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole zabbix' || true + ${pkgs.su}/bin/su -s "$SHELL" ${config.services.postgresql.superUser} -c '${pkgs.postgresql}/bin/createdb --owner zabbix zabbix' || true cat ${pkgs.zabbix.server}/share/zabbix/db/schema/postgresql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c '${pkgs.postgresql}/bin/psql zabbix' cat ${pkgs.zabbix.server}/share/zabbix/db/data/images_pgsql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c '${pkgs.postgresql}/bin/psql zabbix' cat ${pkgs.zabbix.server}/share/zabbix/db/data/data.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c '${pkgs.postgresql}/bin/psql zabbix' diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix index a6a2ec6cbc366d43f43dde9e633a4a41d9806a0d..d9dde3f6bb67689d011ae4da0616db202b08ca4e 100644 --- a/nixos/modules/services/network-filesystems/beegfs.nix +++ b/nixos/modules/services/network-filesystems/beegfs.nix @@ -31,7 +31,7 @@ let connPortShift = ${toString cfg.connPortShift} storeAllowFirstRunInit = false - ${cfg.mgmtd.extraConfig} + ${cfg.meta.extraConfig} ''; configStorage = name: cfg: pkgs.writeText "storage-${name}.conf" '' @@ -139,7 +139,7 @@ in description = '' BeeGFS configurations. Every mount point requires a separate configuration. ''; - type = with types; attrsOf (submodule ({ config, ... } : { + type = with types; attrsOf (submodule ({ ... } : { options = { mgmtdHost = mkOption { type = types.str; @@ -195,6 +195,17 @@ in }; helperd = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Enable the BeeGFS helperd. + The helpered is need for logging purposes on the client. + Disabling helperd allows for runing the client + with allowUnfree = false. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index 5de8ae79a246eed377a0250225c85b74a821e786..4e3bc839d4007b79bea2f78880010e36a5cb3e2a 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -332,13 +332,13 @@ in in generators.toINI {} totalConfig; - users.extraUsers = singleton { + users.users = singleton { name = "ceph"; uid = config.ids.uids.ceph; description = "Ceph daemon user"; }; - users.extraGroups = singleton { + users.groups = singleton { name = "ceph"; gid = config.ids.gids.ceph; }; diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix index 6b2a770100c5b28f8616127eefb786729e1130ad..c16e12378d758e97d66601e1e9e274beb756231d 100644 --- a/nixos/modules/services/network-filesystems/davfs2.nix +++ b/nixos/modules/services/network-filesystems/davfs2.nix @@ -57,12 +57,12 @@ in environment.systemPackages = [ pkgs.davfs2 ]; environment.etc."davfs2/davfs2.conf".source = cfgFile; - users.extraGroups = optionalAttrs (cfg.davGroup == "davfs2") (singleton { + users.groups = optionalAttrs (cfg.davGroup == "davfs2") (singleton { name = "davfs2"; gid = config.ids.gids.davfs2; }); - users.extraUsers = optionalAttrs (cfg.davUser == "davfs2") (singleton { + users.users = optionalAttrs (cfg.davUser == "davfs2") (singleton { name = "davfs2"; createHome = false; group = cfg.davGroup; diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 39a4fd6beff841a23ec390cb913624d88fe3bee3..412d57b27b82c8d7747829f26f121d454bb8f757 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -186,6 +186,14 @@ in { default = []; }; + localDiscovery = mkOption { + type = types.bool; + description = ''Whether to enable local discovery for the ipfs daemon. + This will allow ipfs to scan ports on your local network. Some hosting services will ban you if you do this. + ''; + default = true; + }; + serviceFdlimit = mkOption { type = types.nullOr types.int; default = null; @@ -204,7 +212,7 @@ in { user_allow_other ''; }; - users.extraUsers = mkIf (cfg.user == "ipfs") { + users.users = mkIf (cfg.user == "ipfs") { ipfs = { group = cfg.group; home = cfg.dataDir; @@ -214,7 +222,7 @@ in { }; }; - users.extraGroups = mkIf (cfg.group == "ipfs") { + users.groups = mkIf (cfg.group == "ipfs") { ipfs.gid = config.ids.gids.ipfs; }; @@ -232,7 +240,13 @@ in { ''; script = '' if [[ ! -f ${cfg.dataDir}/config ]]; then - ipfs init ${optionalString cfg.emptyRepo "-e"} + ipfs init ${optionalString cfg.emptyRepo "-e"} \ + ${optionalString (! cfg.localDiscovery) "--profile=server"} + else + ${if cfg.localDiscovery + then "ipfs config profile apply local-discovery" + else "ipfs config profile apply server" + } fi ''; diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix index 3826fe3edfd0327db63857336726feb595d83eaf..52c0966e05bc5ad49ffc33b27d54bb55a0c270cf 100644 --- a/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -1,6 +1,7 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: -with import ./lib.nix { inherit lib; }; +# openafsMod, openafsBin, mkCellServDB +with import ./lib.nix { inherit config lib pkgs; }; let inherit (lib) getBin mkOption mkIf optionalString singleton types; @@ -8,8 +9,8 @@ let cfg = config.services.openafsClient; cellServDB = pkgs.fetchurl { - url = http://dl.central.org/dl/cellservdb/CellServDB.2017-03-14; - sha256 = "1197z6c5xrijgf66rhaymnm5cvyg2yiy1i20y4ah4mrzmjx0m7sc"; + url = http://dl.central.org/dl/cellservdb/CellServDB.2018-05-14; + sha256 = "1wmjn6mmyy2r8p10nlbdzs4nrqxy8a9pjyrdciy5nmppg4053rk2"; }; clientServDB = pkgs.writeText "client-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.cellServDB); @@ -21,8 +22,6 @@ let echo "${cfg.mountPoint}:${cfg.cache.directory}:${toString cfg.cache.blocks}" > $out/cacheinfo ''; - openafsMod = config.boot.kernelPackages.openafs; - openafsBin = lib.getBin pkgs.openafs; in { ###### interface @@ -147,6 +146,19 @@ in ''; }; + packages = { + module = mkOption { + default = config.boot.kernelPackages.openafs; + type = types.package; + description = "OpenAFS kernel module package. MUST match the userland package!"; + }; + programs = mkOption { + default = getBin pkgs.openafs; + type = types.package; + description = "OpenAFS programs package. MUST match the kernel module package!"; + }; + }; + sparse = mkOption { default = true; type = types.bool; @@ -180,7 +192,7 @@ in } ]; - environment.systemPackages = [ pkgs.openafs ]; + environment.systemPackages = [ openafsBin ]; environment.etc = { clientCellServDB = { diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix index ecfc72d2eaf911a19b02f8801361a086387be230..1cc9bed847ab1987120fcd2d7f4004734a088db7 100644 --- a/nixos/modules/services/network-filesystems/openafs/lib.nix +++ b/nixos/modules/services/network-filesystems/openafs/lib.nix @@ -1,4 +1,4 @@ -{ lib, ...}: +{ config, lib, ...}: let inherit (lib) concatStringsSep mkOption types; @@ -8,7 +8,8 @@ in rec { mkCellServDB = cellName: db: '' >${cellName} '' + (concatStringsSep "\n" (map (dbm: if (dbm.ip != "" && dbm.dnsname != "") then dbm.ip + " #" + dbm.dnsname else "") - db)); + db)) + + "\n"; # CellServDB configuration type cellServDBConfig = { @@ -25,4 +26,8 @@ in rec { description = "DNS full-qualified domain name of a database server"; }; }; + + openafsMod = config.services.openafsClient.packages.module; + openafsBin = config.services.openafsClient.packages.programs; + openafsSrv = config.services.openafsServer.package; } diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix index 429eb945ac9e800493ae3fcd7968e56154c954bf..4c80ed0839f7c85dde5daa0c010a155a434de2d5 100644 --- a/nixos/modules/services/network-filesystems/openafs/server.nix +++ b/nixos/modules/services/network-filesystems/openafs/server.nix @@ -1,9 +1,10 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: -with import ./lib.nix { inherit lib; }; +# openafsBin, openafsSrv, mkCellServDB +with import ./lib.nix { inherit config lib pkgs; }; let - inherit (lib) concatStringsSep intersperse mapAttrsToList mkForce mkIf mkMerge mkOption optionalString types; + inherit (lib) concatStringsSep mkIf mkOption optionalString types; bosConfig = pkgs.writeText "BosConfig" ('' restrictmode 1 @@ -11,21 +12,21 @@ let checkbintime 3 0 5 0 0 '' + (optionalString cfg.roles.database.enable '' bnode simple vlserver 1 - parm ${openafsBin}/libexec/openafs/vlserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.vlserverArgs} + parm ${openafsSrv}/libexec/openafs/vlserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.vlserverArgs} end bnode simple ptserver 1 - parm ${openafsBin}/libexec/openafs/ptserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.ptserverArgs} + parm ${openafsSrv}/libexec/openafs/ptserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.ptserverArgs} end '') + (optionalString cfg.roles.fileserver.enable '' bnode dafs dafs 1 - parm ${openafsBin}/libexec/openafs/dafileserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.fileserverArgs} - parm ${openafsBin}/libexec/openafs/davolserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.volserverArgs} - parm ${openafsBin}/libexec/openafs/salvageserver ${cfg.roles.fileserver.salvageserverArgs} - parm ${openafsBin}/libexec/openafs/dasalvager ${cfg.roles.fileserver.salvagerArgs} + parm ${openafsSrv}/libexec/openafs/dafileserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.fileserverArgs} + parm ${openafsSrv}/libexec/openafs/davolserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.volserverArgs} + parm ${openafsSrv}/libexec/openafs/salvageserver ${cfg.roles.fileserver.salvageserverArgs} + parm ${openafsSrv}/libexec/openafs/dasalvager ${cfg.roles.fileserver.salvagerArgs} end '') + (optionalString (cfg.roles.database.enable && cfg.roles.backup.enable) '' bnode simple buserver 1 - parm ${openafsBin}/libexec/openafs/buserver ${cfg.roles.backup.buserverArgs} ${optionalString (cfg.roles.backup.cellServDB != []) "-cellservdb /etc/openafs/backup/"} + parm ${openafsSrv}/libexec/openafs/buserver ${cfg.roles.backup.buserverArgs} ${optionalString (cfg.roles.backup.cellServDB != []) "-cellservdb /etc/openafs/backup/"} end '')); @@ -39,8 +40,6 @@ let udpSizeStr = toString cfg.udpPacketSize; - openafsBin = lib.getBin pkgs.openafs; - in { options = { @@ -79,6 +78,12 @@ in { description = "Definition of all cell-local database server machines."; }; + package = mkOption { + default = pkgs.openafs.server or pkgs.openafs; + type = types.package; + description = "OpenAFS package for the server binaries"; + }; + roles = { fileserver = { enable = mkOption { @@ -213,7 +218,7 @@ in { } ]; - environment.systemPackages = [ pkgs.openafs ]; + environment.systemPackages = [ openafsBin ]; environment.etc = { bosConfig = { @@ -244,7 +249,10 @@ in { after = [ "syslog.target" "network.target" ]; wantedBy = [ "multi-user.target" ]; restartIfChanged = false; - unitConfig.ConditionPathExists = [ "/etc/openafs/server/rxkad.keytab" ]; + unitConfig.ConditionPathExists = [ + "|/etc/openafs/server/rxkad.keytab" + "|/etc/openafs/server/KeyFileExt" + ]; preStart = '' mkdir -m 0755 -p /var/openafs ${optionalString (netInfo != null) "cp ${netInfo} /var/openafs/netInfo"} diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index b23266e8d43a3ec5bb9f89a2d10b10834f30ee16..10dc583112121b97033653927c0e13bdf6bbeac4 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -214,12 +214,10 @@ in } ]; # Always provide a smb.conf to shut up programs like smbclient and smbspool. - environment.etc = singleton - { source = - if cfg.enable then configFile - else pkgs.writeText "smb-dummy.conf" "# Samba is disabled."; - target = "samba/smb.conf"; - }; + environment.etc."samba/smb.conf".source = mkOptionDefault ( + if cfg.enable then configFile + else pkgs.writeText "smb-dummy.conf" "# Samba is disabled." + ); } (mkIf cfg.enable { diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index 80b34c48f1d2fb331442dadaa6596daeb55211c0..534862a3c9e4ceb9aa3d4d43cdcfeeb5dc581245 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -255,7 +255,7 @@ in cp /etc/tahoe-lafs/introducer-"${node}".cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); - users.extraUsers = flip mapAttrs' cfg.introducers (node: _: + users.users = flip mapAttrs' cfg.introducers (node: _: nameValuePair "tahoe.introducer-${node}" { description = "Tahoe node user for introducer ${node}"; isSystemUser = true; @@ -355,7 +355,7 @@ in cp /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); - users.extraUsers = flip mapAttrs' cfg.nodes (node: _: + users.users = flip mapAttrs' cfg.nodes (node: _: nameValuePair "tahoe.${node}" { description = "Tahoe node user for node ${node}"; isSystemUser = true; diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index 95d7641e8b53f947507597e8a6ef358630bc1cb5..c93e201da56caa738af3035c713152ae2c080ef7 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -432,14 +432,14 @@ in environment.systemPackages = [ xtreemfs ]; - users.extraUsers.xtreemfs = + users.users.xtreemfs = { uid = config.ids.uids.xtreemfs; description = "XtreemFS user"; createHome = true; home = home; }; - users.extraGroups.xtreemfs = + users.groups.xtreemfs = { gid = config.ids.gids.xtreemfs; }; diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index 44b0edf6201854fc1e44e8f2a6235fbb528dea2b..e93f45b49867b59a6473adc8c7da42e94fb1f096 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -73,7 +73,7 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == null) [ { + users.users = mkIf (cfg.user == null) [ { name = u; uid = config.ids.uids.yandexdisk; group = "nogroup"; diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index 9898f164c5cf87ada7a6f0527ff790488766d037..57f02542eafd4bdfb762a729ba0af4047bbe27a1 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -45,14 +45,14 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == null) [ + users.users = mkIf (cfg.user == null) [ { name = "amule"; description = "AMule daemon"; group = "amule"; uid = config.ids.uids.amule; } ]; - users.extraGroups = mkIf (cfg.user == null) [ + users.groups = mkIf (cfg.user == null) [ { name = "amule"; gid = config.ids.gids.amule; } ]; diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix index df9c92db2e5408980ad9fcc317a8f6bcc5bb0f54..98eb0086101698a4f01b2ac72ede92b5fdac3e84 100644 --- a/nixos/modules/services/networking/aria2.nix +++ b/nixos/modules/services/networking/aria2.nix @@ -92,7 +92,7 @@ in allowedTCPPorts = [ config.services.aria2.rpcListenPort ]; }; - users.extraUsers.aria2 = { + users.users.aria2 = { group = "aria2"; uid = config.ids.uids.aria2; description = "aria2 user"; @@ -100,7 +100,7 @@ in createHome = false; }; - users.extraGroups.aria2.gid = config.ids.gids.aria2; + users.groups.aria2.gid = config.ids.gids.aria2; systemd.services.aria2 = { description = "aria2 Service"; diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index 514204db33fa599ad80b44ecf166301af08ab6eb..b8ec2b25a22741d4c6ee3453ee24dacec4b089b6 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -211,7 +211,7 @@ in environment.etc.asterisk.source = asteriskEtc; - users.extraUsers.asterisk = + users.users.asterisk = { name = asteriskUser; group = asteriskGroup; uid = config.ids.uids.asterisk; @@ -219,7 +219,7 @@ in home = varlibdir; }; - users.extraGroups.asterisk = + users.groups.asterisk = { name = asteriskGroup; gid = config.ids.gids.asterisk; }; diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 9ccdacb20e91ad362901c77c7dbb4094fb308741..488d9877b5e002e91a915cf9656409f765eefaef 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -1,5 +1,5 @@ # Avahi daemon. -{ config, lib, utils, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -37,6 +37,7 @@ let [reflector] enable-reflector=${yesNo reflector} + ${extraConfig} ''; in @@ -176,6 +177,14 @@ in ''; }; + extraConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Extra config to append to avahi-daemon.conf. + ''; + }; + }; }; @@ -187,14 +196,14 @@ in services.avahi.hostName = mkDefault config.networking.hostName; - users.extraUsers = singleton + users.users = singleton { name = "avahi"; uid = config.ids.uids.avahi; description = "`avahi-daemon' privilege separation user"; home = "/var/empty"; }; - users.extraGroups = singleton + users.groups = singleton { name = "avahi"; gid = config.ids.gids.avahi; }; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 763283dfe7a22eee4f778f6222f8e47e7486e636..abcd1ef6ff5de0b5568c2d956b84843a254b1b0b 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -27,6 +27,7 @@ let forwarders { ${concatMapStrings (entry: " ${entry}; ") cfg.forwarders} }; directory "/var/run/named"; pid-file "/var/run/named/named.pid"; + ${cfg.extraOptions} }; ${cfg.extraConfig} @@ -141,6 +142,15 @@ in "; }; + extraOptions = mkOption { + type = types.lines; + default = ""; + description = '' + Extra lines to be added verbatim to the options section of the + generated named configuration file. + ''; + }; + configFile = mkOption { type = types.path; default = confFile; @@ -160,7 +170,7 @@ in config = mkIf config.services.bind.enable { - users.extraUsers = singleton + users.users = singleton { name = bindUser; uid = config.ids.uids.bind; description = "BIND daemon user"; diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index c25bd0fdc5411cdf06b2d363633db84f4e61dc3b..9f08cc0a79ede566398a3af929fdeb432eb485c6 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -60,11 +60,11 @@ let }; }; users = { - extraUsers.${variant} = { + users.${variant} = { description = "BIRD Internet Routing Daemon user"; group = variant; }; - extraGroups.${variant} = {}; + groups.${variant} = {}; }; }; }; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index bd26804788f38d4d00645ac5965b8926c0f0e43f..392a8d5c2e7ce34daae29aefffd639a80d40f232 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -149,7 +149,7 @@ in config = mkIf config.services.bitlbee.enable { - users.extraUsers = singleton + users.users = singleton { name = "bitlbee"; uid = bitlbeeUid; description = "BitlBee user"; @@ -157,7 +157,7 @@ in createHome = true; }; - users.extraGroups = singleton + users.groups = singleton { name = "bitlbee"; gid = config.ids.gids.bitlbee; }; diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix index 6e479a5860acf8baf29275675703dc3c424e3dab..33e85ef58e6e6839cf51d75da847cee592737b6e 100644 --- a/nixos/modules/services/networking/btsync.nix +++ b/nixos/modules/services/networking/btsync.nix @@ -284,7 +284,7 @@ in services.btsync.package = mkOptionDefault pkgs.bittorrentSync14; - users.extraUsers.btsync = { + users.users.btsync = { description = "Bittorrent Sync Service user"; home = cfg.storagePath; createHome = true; @@ -292,7 +292,7 @@ in group = "btsync"; }; - users.extraGroups = [ + users.groups = [ { name = "btsync"; }]; diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix index c354ec61fe236ede20e41fc612240ef428148a7c..6d57faa9ac2b775fb52101b1e4c037227f51a176 100644 --- a/nixos/modules/services/networking/charybdis.nix +++ b/nixos/modules/services/networking/charybdis.nix @@ -71,14 +71,14 @@ in config = mkIf cfg.enable (lib.mkMerge [ { - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "Charybdis IRC daemon user"; uid = config.ids.uids.ircd; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.ircd; }; diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix index 9bf266b38054c62c2a6e8892c7a19fc634e86907..cef30661cc3370ec8ca06a7a124c78a95296c939 100644 --- a/nixos/modules/services/networking/chrony.nix +++ b/nixos/modules/services/networking/chrony.nix @@ -4,8 +4,6 @@ with lib; let - inherit (pkgs) chrony; - stateDir = "/var/lib/chrony"; keyFile = "/etc/chrony.keys"; @@ -96,12 +94,12 @@ in # Make chronyc available in the system path environment.systemPackages = [ pkgs.chrony ]; - users.extraGroups = singleton + users.groups = singleton { name = "chrony"; gid = config.ids.gids.chrony; }; - users.extraUsers = singleton + users.users = singleton { name = "chrony"; uid = config.ids.uids.chrony; group = "chrony"; @@ -109,7 +107,7 @@ in home = stateDir; }; - systemd.services.timesyncd.enable = mkForce false; + services.timesyncd.enable = mkForce false; systemd.services.chronyd = { description = "chrony NTP daemon"; diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 12c2677c3368d47e92811c93909842c94a08f034..c40962f4aa827d53de674f851de95ac1b164afdb 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -9,7 +9,7 @@ let cfg = config.services.cjdns; connectToSubmodule = - { options, ... }: + { ... }: { options = { password = mkOption { type = types.str; @@ -260,7 +260,8 @@ in RestartSec = 1; CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID"; ProtectSystem = true; - MemoryDenyWriteExecute = true; + # Doesn't work on i686, causing service to fail + MemoryDenyWriteExecute = !pkgs.stdenv.isi686; ProtectHome = true; PrivateTmp = true; }; diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index 3978a1969ce91be0603fbfe389447086d34fc8de..4e4e3104c3a8acf4aca7b95843fb3cb38068e475 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -117,7 +117,7 @@ in }; }; - users.extraUsers.cntlm = { + users.users.cntlm = { name = "cntlm"; description = "cntlm system-wide daemon"; isSystemUser = true; diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 6333970cb338fbbaf39bd44d06b301cab8e14972..ab3f81037681170f30fcdc29bea67ede3504c0fd 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -155,7 +155,7 @@ in config = mkIf cfg.enable ( mkMerge [{ - users.extraUsers."consul" = { + users.users."consul" = { description = "Consul agent daemon user"; uid = config.ids.uids.consul; # The shell is needed for health checks diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index b3c64490d97e4dcb655e9d2b95224a723cd4f672..c430ce5af92a34682e29b9057bc789f5de666507 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -294,12 +294,12 @@ in { }; config = mkIf cfg.enable { - users.extraUsers = [ + users.users = [ { name = "turnserver"; uid = config.ids.uids.turnserver; description = "coturn TURN server user"; } ]; - users.extraGroups = [ + users.groups = [ { name = "turnserver"; gid = config.ids.gids.turnserver; members = [ "turnserver" ]; diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix index 32acce51e692a99225e241e63dcaf50d3b6c2177..20d4faa1cdb156ae67031ef4202898f0691303ba 100644 --- a/nixos/modules/services/networking/dante.nix +++ b/nixos/modules/services/networking/dante.nix @@ -6,6 +6,7 @@ let confFile = pkgs.writeText "dante-sockd.conf" '' user.privileged: root user.unprivileged: dante + logoutput: syslog ${cfg.config} ''; @@ -21,11 +22,10 @@ in enable = mkEnableOption "Dante SOCKS proxy"; config = mkOption { - default = null; - type = types.nullOr types.str; + type = types.lines; description = '' - Contents of Dante's configuration file - NOTE: user.privileged/user.unprivileged are set by the service + Contents of Dante's configuration file. + NOTE: user.privileged, user.unprivileged and logoutput are set by the service. ''; }; }; @@ -33,7 +33,7 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = cfg.config != null; + { assertion = cfg.config != ""; message = "please provide Dante configuration file contents"; } ]; @@ -54,7 +54,8 @@ in Type = "simple"; ExecStart = "${pkgs.dante}/bin/sockd -f ${confFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - Restart = "always"; + # Can crash sometimes; see https://github.com/NixOS/nixpkgs/pull/39005#issuecomment-381828708 + Restart = "on-failure"; }; }; }; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 9e56545f746c4d20cf0e7a61d4eb00b350472f1d..9a2e13e9553c6f23b395bc26b2e01afdc6323cd1 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -3,24 +3,24 @@ let cfg = config.services.ddclient; boolToStr = bool: if bool then "yes" else "no"; + dataDir = "/var/lib/ddclient"; configText = '' # This file can be used as a template for configFile or is automatically generated by Nix options. - daemon=${toString cfg.interval} - cache=${cfg.homeDir}/ddclient.cache - pid=/run/ddclient/ddclient.pid - foreground=NO + cache=${dataDir}/ddclient.cache + foreground=YES use=${cfg.use} login=${cfg.username} password=${cfg.password} protocol=${cfg.protocol} - ${let server = cfg.server; in - lib.optionalString (server != "") "server=${server}"} + ${lib.optionalString (cfg.script != "") "script=${cfg.script}"} + ${lib.optionalString (cfg.server != "") "server=${cfg.server}"} + ${lib.optionalString (cfg.zone != "") "zone=${cfg.zone}"} ssl=${boolToStr cfg.ssl} wildcard=YES quiet=${boolToStr cfg.quiet} verbose=${boolToStr cfg.verbose} - ${cfg.domain} + ${lib.concatStringsSep "," cfg.domains} ${cfg.extraConfig} ''; @@ -44,17 +44,11 @@ with lib; ''; }; - homeDir = mkOption { - default = "/var/lib/ddclient"; - type = str; - description = "Home directory for the daemon user."; - }; - - domain = mkOption { - default = ""; - type = str; + domains = mkOption { + default = [ "" ]; + type = listOf str; description = '' - Domain name to synchronize. + Domain name(s) to synchronize. ''; }; @@ -62,7 +56,7 @@ with lib; default = ""; type = str; description = '' - Username. + User name. ''; }; @@ -75,9 +69,12 @@ with lib; }; interval = mkOption { - default = 600; - type = int; - description = "The interval at which to run the check and update."; + default = "10min"; + type = str; + description = '' + The interval at which to run the check and update. + See man 7 systemd.time for the format. + ''; }; configFile = mkOption { @@ -95,7 +92,7 @@ with lib; default = "dyndns2"; type = str; description = '' - Protocol to use with dynamic DNS provider (see http://sourceforge.net/apps/trac/ddclient/wiki/Protocols). + Protocol to use with dynamic DNS provider (see https://sourceforge.net/p/ddclient/wiki/protocols). ''; }; @@ -115,11 +112,20 @@ with lib; ''; }; - extraConfig = mkOption { + + quiet = mkOption { + default = false; + type = bool; + description = '' + Print no messages for unnecessary updates. + ''; + }; + + script = mkOption { default = ""; - type = lines; + type = str; description = '' - Extra configuration. Contents will be added verbatim to the configuration file. + script as required by some providers. ''; }; @@ -139,11 +145,19 @@ with lib; ''; }; - quiet = mkOption { - default = false; - type = bool; + zone = mkOption { + default = ""; + type = str; description = '' - Print no messages for unnecessary updates. + zone as required by some providers. + ''; + }; + + extraConfig = mkOption { + default = ""; + type = lines; + description = '' + Extra configuration. Contents will be added verbatim to the configuration file. ''; }; }; @@ -153,23 +167,8 @@ with lib; ###### implementation config = mkIf config.services.ddclient.enable { - - users = { - extraGroups.ddclient.gid = config.ids.gids.ddclient; - - extraUsers.ddclient = { - uid = config.ids.uids.ddclient; - description = "ddclient daemon user"; - group = "ddclient"; - home = cfg.homeDir; - createHome = true; - }; - }; - environment.etc."ddclient.conf" = { enable = cfg.configFile == "/etc/ddclient.conf"; - uid = config.ids.uids.ddclient; - gid = config.ids.gids.ddclient; mode = "0600"; text = configText; }; @@ -180,15 +179,22 @@ with lib; after = [ "network.target" ]; restartTriggers = [ config.environment.etc."ddclient.conf".source ]; - serviceConfig = { - RuntimeDirectory = "ddclient"; - # we cannot run in forking mode as it swallows all the program output - Type = "simple"; - User = "ddclient"; - Group = "ddclient"; - ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -foreground -file ${cfg.configFile}"; - ProtectSystem = "full"; - PrivateTmp = true; + serviceConfig = rec { + DynamicUser = true; + RuntimeDirectory = StateDirectory; + StateDirectory = builtins.baseNameOf dataDir; + Type = "oneshot"; + ExecStartPre = "!${lib.getBin pkgs.coreutils}/bin/install -m666 ${cfg.configFile} /run/${RuntimeDirectory}/ddclient.conf"; + ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -file /run/${RuntimeDirectory}/ddclient.conf"; + }; + }; + + systemd.timers.ddclient = { + description = "Run ddclient"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = cfg.interval; + OnUnitInactiveSec = cfg.interval; }; }; }; diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index de0aa1a2c2c31009867fae775134061879dcfc88..efdbca5d52e8469793fd6051119d1d61aa02aefc 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -161,8 +161,9 @@ in { description = "DHCP Client"; wantedBy = [ "multi-user.target" ] ++ optional (!hasDefaultGatewaySet) "network-online.target"; - after = [ "network.target" ]; - wants = [ "network.target" ]; + wants = [ "network.target" "systemd-udev-settle.service" ]; + before = [ "network.target" ]; + after = [ "systemd-udev-settle.service" ]; # Stopping dhcpcd during a reconfiguration is undesirable # because it brings down the network interfaces configured by diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index fd7e317eee9551c262a2c92aa6c57c6b16064c8f..0b2063bc424664ff1216dca02c6f0952d477a8d4 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -197,7 +197,7 @@ in config = mkIf (cfg4.enable || cfg6.enable) { users = { - extraUsers.dhcpd = { + users.dhcpd = { uid = config.ids.uids.dhcpd; description = "DHCP daemon user"; }; diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index 379203cd1ab6e121d414fab8f9e950081916f49a..fc30f50317fe92623d3b950a02a014f93716622d 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -9,12 +9,12 @@ let mkdir -p $out/{servers,ip} ${concatMapStrings (ip: '' - echo > "$out/ip/"${lib.escapeShellArg ip} + touch "$out/ip/"${lib.escapeShellArg ip} '') cfg.clientIps} ${concatStrings (mapAttrsToList (host: ips: '' ${concatMapStrings (ip: '' - echo ${lib.escapeShellArg ip} > "$out/servers/"${lib.escapeShellArg host} + echo ${lib.escapeShellArg ip} >> "$out/servers/"${lib.escapeShellArg host} '') ips} '') cfg.domainServers)} @@ -34,33 +34,49 @@ in { options = { services.dnscache = { + enable = mkOption { default = false; type = types.bool; - description = "Whether to run the dnscache caching dns server"; + description = "Whether to run the dnscache caching dns server."; }; ip = mkOption { default = "0.0.0.0"; type = types.str; - description = "IP address on which to listen for connections"; + description = "IP address on which to listen for connections."; }; clientIps = mkOption { default = [ "127.0.0.1" ]; type = types.listOf types.str; - description = "client IP addresses (or prefixes) from which to accept connections"; + description = "Client IP addresses (or prefixes) from which to accept connections."; example = ["192.168" "172.23.75.82"]; }; domainServers = mkOption { default = { }; type = types.attrsOf (types.listOf types.str); - description = "table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts)"; + description = '' + Table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts). + If entry for @ is not specified predefined list of root servers is used. + ''; example = { - "example.com" = ["8.8.8.8" "8.8.4.4"]; + "@" = ["8.8.8.8" "8.8.4.4"]; + "example.com" = ["192.168.100.100"]; }; }; + + forwardOnly = mkOption { + default = false; + type = types.bool; + description = '' + Whether to treat root servers (for @) as caching + servers, requesting addresses the same way a client does. This is + needed if you want to use e.g. Google DNS as your upstream DNS. + ''; + }; + }; }; @@ -68,7 +84,7 @@ in { config = mkIf config.services.dnscache.enable { environment.systemPackages = [ pkgs.djbdns ]; - users.extraUsers.dnscache = {}; + users.users.dnscache = {}; systemd.services.dnscache = { description = "djbdns dnscache server"; @@ -82,6 +98,7 @@ in { ''; script = '' cd /var/lib/dnscache/ + ${optionalString cfg.forwardOnly "export FORWARDONLY=1"} exec ./run ''; }; diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index ee1cd36000398494ea91aeb6005223f89ea9a24f..0c2add424bac541c43f3826e010cdff512b844ae 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -141,7 +141,7 @@ in dns = "127.0.0.1:${toString cfg.dns.port}"; }; - users.extraUsers = singleton { + users.users = singleton { name = username; description = "DNSChain daemon user"; home = dataDir; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 857657eea4db4f4c1da8148b8a79575ce312f378..8edcf925dbfa13ae2b383f31c258b781218547db 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -145,6 +145,9 @@ in } ]; + # make man 8 dnscrypt-proxy work + environment.systemPackages = [ pkgs.dnscrypt-proxy ]; + users.users.dnscrypt-proxy = { description = "dnscrypt-proxy daemon user"; isSystemUser = true; @@ -192,6 +195,7 @@ in security.apparmor.profiles = singleton (pkgs.writeText "apparmor-dnscrypt-proxy" '' ${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy { /dev/null rw, + /dev/random r, /dev/urandom r, /etc/passwd r, @@ -211,6 +215,9 @@ in ${getLib pkgs.gcc.cc}/lib/libssp.so.* mr, ${getLib pkgs.libsodium}/lib/libsodium.so.* mr, ${getLib pkgs.systemd}/lib/libsystemd.so.* mr, + ${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so.* mr, + ${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so.* mr, + ${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so.* mr, ${getLib pkgs.xz}/lib/liblzma.so.* mr, ${getLib pkgs.libgcrypt}/lib/libgcrypt.so.* mr, ${getLib pkgs.libgpgerror}/lib/libgpg-error.so.* mr, diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml index 555c6df4d551f95ddcfdc6320f75d1d3d9141f65..ff10886985891daca1e9f5c8b45c68051e2ddfcd 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.xml +++ b/nixos/modules/services/networking/dnscrypt-proxy.xml @@ -19,7 +19,7 @@ To enable the client proxy, set - services.dnscrypt-proxy.enable = true; + = true; @@ -38,17 +38,17 @@ DNS client, change the default proxy listening port to a non-standard value and point the other client to it: - services.dnscrypt-proxy.localPort = 43; + = 43; dnsmasq - { - services.dnsmasq.enable = true; - services.dnsmasq.servers = [ "127.0.0.1#43" ]; - } +{ + = true; + = [ "127.0.0.1#43" ]; +} @@ -56,10 +56,10 @@ unbound - { - services.unbound.enable = true; - services.unbound.forwardAddresses = [ "127.0.0.1@43" ]; - } +{ + = true; + = [ "127.0.0.1@43" ]; +} diff --git a/nixos/modules/services/networking/dnsdist.nix b/nixos/modules/services/networking/dnsdist.nix new file mode 100644 index 0000000000000000000000000000000000000000..12eee136e6394b5b4c1b5603487a2cf1bb9e3ff3 --- /dev/null +++ b/nixos/modules/services/networking/dnsdist.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.dnsdist; + configFile = pkgs.writeText "dndist.conf" '' + setLocal('${cfg.listenAddress}:${toString cfg.listenPort}') + ${cfg.extraConfig} + ''; +in { + options = { + services.dnsdist = { + enable = mkEnableOption "dnsdist domain name server"; + + listenAddress = mkOption { + type = types.str; + description = "Listen IP Address"; + default = "0.0.0.0"; + }; + listenPort = mkOption { + type = types.int; + description = "Listen port"; + default = 53; + }; + + extraConfig = mkOption { + type = types.lines; + default = '' + ''; + description = '' + Extra lines to be added verbatim to dnsdist.conf. + ''; + }; + }; + }; + + config = mkIf config.services.dnsdist.enable { + systemd.services.dnsdist = { + description = "dnsdist load balancer"; + wantedBy = [ "multi-user.target" ]; + after = ["network.target"]; + + serviceConfig = { + Restart="on-failure"; + RestartSec="1"; + DynamicUser = true; + StartLimitInterval="0"; + PrivateTmp=true; + PrivateDevices=true; + CapabilityBoundingSet="CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID"; + ExecStart = "${pkgs.dnsdist}/bin/dnsdist --supervised --disable-syslog --config ${configFile}"; + ProtectSystem="full"; + ProtectHome=true; + RestrictAddressFamilies="AF_UNIX AF_INET AF_INET6"; + LimitNOFILE="16384"; + TasksMax="8192"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 91a3e54474ac9cf7bf4f04619c85297b2a3a9f1f..24d16046c63e621dd2d956c2058b4aa36e5b6f9d 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -86,7 +86,7 @@ in services.dbus.packages = [ dnsmasq ]; - users.extraUsers = singleton { + users.users = singleton { name = "dnsmasq"; uid = config.ids.uids.dnsmasq; description = "Dnsmasq daemon user"; diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix index 82ed7fc4a837714d938a0ab2b47992f1bfe14446..ef5e2cee6f200f2c6473f5d21d63a2c594ca250b 100644 --- a/nixos/modules/services/networking/ejabberd.nix +++ b/nixos/modules/services/networking/ejabberd.nix @@ -94,7 +94,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - users.extraUsers = optionalAttrs (cfg.user == "ejabberd") (singleton + users.users = optionalAttrs (cfg.user == "ejabberd") (singleton { name = "ejabberd"; group = cfg.group; home = cfg.spoolDir; @@ -102,7 +102,7 @@ in { uid = config.ids.uids.ejabberd; }); - users.extraGroups = optionalAttrs (cfg.group == "ejabberd") (singleton + users.groups = optionalAttrs (cfg.group == "ejabberd") (singleton { name = "ejabberd"; gid = config.ids.gids.ejabberd; }); diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 20c0b0acf165c1f90cf6f4500fe4d8815cc078fd..86463f276c65d11453ebd0520acc5dfcc03e593e 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -123,7 +123,7 @@ let # Perform a reverse-path test to refuse spoofers # For now, we just drop, as the raw table doesn't have a log-refuse yet ip46tables -t raw -N nixos-fw-rpfilter 2> /dev/null || true - ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN + ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter --validmark ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN # Allows this host to act as a DHCP4 client without first having to use APIPA iptables -t raw -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN @@ -148,38 +148,42 @@ let ip46tables -A nixos-fw -m conntrack --ctstate ESTABLISHED,RELATED -j nixos-fw-accept # Accept connections to the allowed TCP ports. - ${concatMapStrings (port: + ${concatStrings (mapAttrsToList (iface: cfg: + concatMapStrings (port: '' - ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept + ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} '' ) cfg.allowedTCPPorts - } + ) cfg.interfaces)} # Accept connections to the allowed TCP port ranges. - ${concatMapStrings (rangeAttr: + ${concatStrings (mapAttrsToList (iface: cfg: + concatMapStrings (rangeAttr: let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in '' - ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept + ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} '' ) cfg.allowedTCPPortRanges - } + ) cfg.interfaces)} # Accept packets on the allowed UDP ports. - ${concatMapStrings (port: + ${concatStrings (mapAttrsToList (iface: cfg: + concatMapStrings (port: '' - ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept + ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} '' ) cfg.allowedUDPPorts - } + ) cfg.interfaces)} # Accept packets on the allowed UDP port ranges. - ${concatMapStrings (rangeAttr: + ${concatStrings (mapAttrsToList (iface: cfg: + concatMapStrings (rangeAttr: let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in '' - ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept + ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} '' ) cfg.allowedUDPPortRanges - } + ) cfg.interfaces)} # Accept IPv4 multicast. Not a big security risk since # probably nobody is listening anyway. @@ -242,6 +246,9 @@ let # Don't allow traffic to leak out until the script has completed ip46tables -A INPUT -j nixos-drop + + ${cfg.extraStopCommands} + if ${startScript}; then ip46tables -D INPUT -j nixos-drop 2>/dev/null || true else @@ -251,106 +258,30 @@ let fi ''; -in - -{ - - ###### interface - - options = { - - networking.firewall.enable = mkOption { - type = types.bool; - default = true; - description = - '' - Whether to enable the firewall. This is a simple stateful - firewall that blocks connection attempts to unauthorised TCP - or UDP ports on this machine. It does not affect packet - forwarding. - ''; - }; - - networking.firewall.logRefusedConnections = mkOption { - type = types.bool; - default = true; - description = - '' - Whether to log rejected or dropped incoming connections. - ''; - }; - - networking.firewall.logRefusedPackets = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to log all rejected or dropped incoming packets. - This tends to give a lot of log messages, so it's mostly - useful for debugging. - ''; - }; - - networking.firewall.logRefusedUnicastsOnly = mkOption { - type = types.bool; - default = true; - description = - '' - If - and this option are enabled, then only log packets - specifically directed at this machine, i.e., not broadcasts - or multicasts. - ''; - }; - - networking.firewall.rejectPackets = mkOption { - type = types.bool; - default = false; - description = - '' - If set, refused packets are rejected rather than dropped - (ignored). This means that an ICMP "port unreachable" error - message is sent back to the client (or a TCP RST packet in - case of an existing connection). Rejecting packets makes - port scanning somewhat easier. - ''; - }; - - networking.firewall.trustedInterfaces = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "enp0s2" ]; - description = - '' - Traffic coming in from these interfaces will be accepted - unconditionally. Traffic from the loopback (lo) interface - will always be accepted. - ''; - }; - - networking.firewall.allowedTCPPorts = mkOption { + commonOptions = { + allowedTCPPorts = mkOption { type = types.listOf types.int; default = [ ]; example = [ 22 80 ]; description = - '' + '' List of TCP ports on which incoming connections are accepted. ''; }; - networking.firewall.allowedTCPPortRanges = mkOption { + allowedTCPPortRanges = mkOption { type = types.listOf (types.attrsOf types.int); default = [ ]; example = [ { from = 8999; to = 9003; } ]; description = - '' + '' A range of TCP ports on which incoming connections are accepted. ''; }; - networking.firewall.allowedUDPPorts = mkOption { + allowedUDPPorts = mkOption { type = types.listOf types.int; default = [ ]; example = [ 53 ]; @@ -360,7 +291,7 @@ in ''; }; - networking.firewall.allowedUDPPortRanges = mkOption { + allowedUDPPortRanges = mkOption { type = types.listOf (types.attrsOf types.int); default = [ ]; example = [ { from = 60000; to = 61000; } ]; @@ -369,133 +300,226 @@ in Range of open UDP ports. ''; }; + }; - networking.firewall.allowPing = mkOption { - type = types.bool; - default = true; - description = - '' - Whether to respond to incoming ICMPv4 echo requests - ("pings"). ICMPv6 pings are always allowed because the - larger address space of IPv6 makes network scanning much - less effective. - ''; - }; +in - networking.firewall.pingLimit = mkOption { - type = types.nullOr (types.separatedString " "); - default = null; - example = "--limit 1/minute --limit-burst 5"; - description = - '' - If pings are allowed, this allows setting rate limits - on them. If non-null, this option should be in the form of - flags like "--limit 1/minute --limit-burst 5" - ''; - }; +{ - networking.firewall.checkReversePath = mkOption { - type = types.either types.bool (types.enum ["strict" "loose"]); - default = kernelHasRPFilter; - example = "loose"; - description = - '' - Performs a reverse path filter test on a packet. If a reply - to the packet would not be sent via the same interface that - the packet arrived on, it is refused. + ###### interface - If using asymmetric routing or other complicated routing, set - this option to loose mode or disable it and setup your own - counter-measures. + options = { - This option can be either true (or "strict"), "loose" (only - drop the packet if the source address is not reachable via any - interface) or false. Defaults to the value of - kernelHasRPFilter. + networking.firewall = { + enable = mkOption { + type = types.bool; + default = true; + description = + '' + Whether to enable the firewall. This is a simple stateful + firewall that blocks connection attempts to unauthorised TCP + or UDP ports on this machine. It does not affect packet + forwarding. + ''; + }; - (needs kernel 3.3+) - ''; - }; + logRefusedConnections = mkOption { + type = types.bool; + default = true; + description = + '' + Whether to log rejected or dropped incoming connections. + ''; + }; - networking.firewall.logReversePathDrops = mkOption { - type = types.bool; - default = false; - description = - '' - Logs dropped packets failing the reverse path filter test if - the option networking.firewall.checkReversePath is enabled. - ''; - }; + logRefusedPackets = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to log all rejected or dropped incoming packets. + This tends to give a lot of log messages, so it's mostly + useful for debugging. + ''; + }; - networking.firewall.connectionTrackingModules = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ]; - description = - '' - List of connection-tracking helpers that are auto-loaded. - The complete list of possible values is given in the example. - - As helpers can pose as a security risk, it is advised to - set this to an empty list and disable the setting - networking.firewall.autoLoadConntrackHelpers unless you - know what you are doing. Connection tracking is disabled - by default. - - Loading of helpers is recommended to be done through the - CT target. More info: - https://home.regit.org/netfilter-en/secure-use-of-helpers/ - ''; - }; + logRefusedUnicastsOnly = mkOption { + type = types.bool; + default = true; + description = + '' + If + and this option are enabled, then only log packets + specifically directed at this machine, i.e., not broadcasts + or multicasts. + ''; + }; - networking.firewall.autoLoadConntrackHelpers = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to auto-load connection-tracking helpers. - See the description at networking.firewall.connectionTrackingModules + rejectPackets = mkOption { + type = types.bool; + default = false; + description = + '' + If set, refused packets are rejected rather than dropped + (ignored). This means that an ICMP "port unreachable" error + message is sent back to the client (or a TCP RST packet in + case of an existing connection). Rejecting packets makes + port scanning somewhat easier. + ''; + }; - (needs kernel 3.5+) - ''; - }; + trustedInterfaces = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "enp0s2" ]; + description = + '' + Traffic coming in from these interfaces will be accepted + unconditionally. Traffic from the loopback (lo) interface + will always be accepted. + ''; + }; - networking.firewall.extraCommands = mkOption { - type = types.lines; - default = ""; - example = "iptables -A INPUT -p icmp -j ACCEPT"; - description = - '' - Additional shell commands executed as part of the firewall - initialisation script. These are executed just before the - final "reject" firewall rule is added, so they can be used - to allow packets that would otherwise be refused. - ''; - }; + allowPing = mkOption { + type = types.bool; + default = true; + description = + '' + Whether to respond to incoming ICMPv4 echo requests + ("pings"). ICMPv6 pings are always allowed because the + larger address space of IPv6 makes network scanning much + less effective. + ''; + }; - networking.firewall.extraPackages = mkOption { - type = types.listOf types.package; - default = [ ]; - example = literalExample "[ pkgs.ipset ]"; - description = - '' - Additional packages to be included in the environment of the system - as well as the path of networking.firewall.extraCommands. - ''; - }; + pingLimit = mkOption { + type = types.nullOr (types.separatedString " "); + default = null; + example = "--limit 1/minute --limit-burst 5"; + description = + '' + If pings are allowed, this allows setting rate limits + on them. If non-null, this option should be in the form of + flags like "--limit 1/minute --limit-burst 5" + ''; + }; - networking.firewall.extraStopCommands = mkOption { - type = types.lines; - default = ""; - example = "iptables -P INPUT ACCEPT"; - description = - '' - Additional shell commands executed as part of the firewall - shutdown script. These are executed just after the removal - of the NixOS input rule, or if the service enters a failed - state. - ''; - }; + checkReversePath = mkOption { + type = types.either types.bool (types.enum ["strict" "loose"]); + default = kernelHasRPFilter; + example = "loose"; + description = + '' + Performs a reverse path filter test on a packet. If a reply + to the packet would not be sent via the same interface that + the packet arrived on, it is refused. + + If using asymmetric routing or other complicated routing, set + this option to loose mode or disable it and setup your own + counter-measures. + + This option can be either true (or "strict"), "loose" (only + drop the packet if the source address is not reachable via any + interface) or false. Defaults to the value of + kernelHasRPFilter. + + (needs kernel 3.3+) + ''; + }; + + logReversePathDrops = mkOption { + type = types.bool; + default = false; + description = + '' + Logs dropped packets failing the reverse path filter test if + the option networking.firewall.checkReversePath is enabled. + ''; + }; + + connectionTrackingModules = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ]; + description = + '' + List of connection-tracking helpers that are auto-loaded. + The complete list of possible values is given in the example. + + As helpers can pose as a security risk, it is advised to + set this to an empty list and disable the setting + networking.firewall.autoLoadConntrackHelpers unless you + know what you are doing. Connection tracking is disabled + by default. + + Loading of helpers is recommended to be done through the + CT target. More info: + https://home.regit.org/netfilter-en/secure-use-of-helpers/ + ''; + }; + + autoLoadConntrackHelpers = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to auto-load connection-tracking helpers. + See the description at networking.firewall.connectionTrackingModules + + (needs kernel 3.5+) + ''; + }; + + extraCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -A INPUT -p icmp -j ACCEPT"; + description = + '' + Additional shell commands executed as part of the firewall + initialisation script. These are executed just before the + final "reject" firewall rule is added, so they can be used + to allow packets that would otherwise be refused. + ''; + }; + + extraPackages = mkOption { + type = types.listOf types.package; + default = [ ]; + example = literalExample "[ pkgs.ipset ]"; + description = + '' + Additional packages to be included in the environment of the system + as well as the path of networking.firewall.extraCommands. + ''; + }; + + extraStopCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -P INPUT ACCEPT"; + description = + '' + Additional shell commands executed as part of the firewall + shutdown script. These are executed just after the removal + of the NixOS input rule, or if the service enters a failed + state. + ''; + }; + + interfaces = mkOption { + default = { + default = mapAttrs (name: value: cfg."${name}") commonOptions; + }; + type = with types; attrsOf (submodule [ { options = commonOptions; } ]); + description = + '' + Interface-specific open ports. Setting this value will override + all values of the networking.firewall.allowed* + options. + ''; + }; + } // commonOptions; }; diff --git a/nixos/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix index 3903a2c708cbc740fdd831764158fadb10bb97d0..3da3ab0c7df489021a953179aacea4dec19262d7 100644 --- a/nixos/modules/services/networking/freenet.nix +++ b/nixos/modules/services/networking/freenet.nix @@ -50,7 +50,7 @@ in serviceConfig.Nice = cfg.nice; }; - users.extraUsers.freenet = { + users.users.freenet = { group = "freenet"; description = "Freenet daemon user"; home = varDir; @@ -58,7 +58,7 @@ in uid = config.ids.uids.freenet; }; - users.extraGroups.freenet.gid = config.ids.gids.freenet; + users.groups.freenet.gid = config.ids.gids.freenet; }; } diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix index 45cba1ce27708dff331d1d6b34ef2f90dc1ea82d..e192b70c129c0fb317284a8438c01145dbdf1ce6 100644 --- a/nixos/modules/services/networking/freeradius.nix +++ b/nixos/modules/services/networking/freeradius.nix @@ -59,7 +59,7 @@ in config = mkIf (cfg.enable) { users = { - extraUsers.radius = { + users.radius = { /*uid = config.ids.uids.radius;*/ description = "Radius daemon user"; }; diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix index fd83f9e3c1b73136491c6090ce562d3b40cac38b..7083d87c4073537b2cdd97217e8f0d36b86e9cc4 100644 --- a/nixos/modules/services/networking/gale.nix +++ b/nixos/modules/services/networking/gale.nix @@ -104,7 +104,7 @@ in systemPackages = [ pkgs.gale ]; }; - users.extraUsers = [{ + users.users = [{ name = cfg.user; description = "Gale daemon"; uid = config.ids.uids.gale; @@ -113,7 +113,7 @@ in createHome = true; }]; - users.extraGroups = [{ + users.groups = [{ name = cfg.group; gid = config.ids.gids.gale; }]; diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix index 78ff0b76198c4a1409a375bb1cdd6c0b137c334e..4456a95402eddf7569cca6b76d762c8edf6d439f 100644 --- a/nixos/modules/services/networking/gateone.nix +++ b/nixos/modules/services/networking/gateone.nix @@ -23,12 +23,12 @@ config = mkIf cfg.enable { environment.systemPackages = with pkgs.pythonPackages; [ gateone pkgs.openssh pkgs.procps pkgs.coreutils pkgs.cacert]; - users.extraUsers.gateone = { + users.users.gateone = { description = "GateOne privilege separation user"; uid = config.ids.uids.gateone; home = cfg.settingsDir; }; - users.extraGroups.gateone.gid = config.ids.gids.gateone; + users.groups.gateone.gid = config.ids.gids.gateone; systemd.services.gateone = with pkgs; { description = "GateOne web-based terminal"; diff --git a/nixos/modules/services/networking/gdomap.nix b/nixos/modules/services/networking/gdomap.nix index b3fd91d037fac8dd064d09d00f7608e671b03ca4..3d829cb69135335b3b0757a0ed3532123b3e83cd 100644 --- a/nixos/modules/services/networking/gdomap.nix +++ b/nixos/modules/services/networking/gdomap.nix @@ -2,9 +2,6 @@ with lib; -let - cfg = config.services.gdomap; -in { # # interface diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix index cd3fcd0f8f66a0530f8c2f82887f56c1561a1931..c0020349ec7403f0b97713cf0a97c394e8de8e63 100644 --- a/nixos/modules/services/networking/git-daemon.nix +++ b/nixos/modules/services/networking/git-daemon.nix @@ -104,13 +104,13 @@ in config = mkIf cfg.enable { - users.extraUsers = if cfg.user != "git" then {} else singleton + users.users = if cfg.user != "git" then {} else singleton { name = "git"; uid = config.ids.uids.git; description = "Git daemon user"; }; - users.extraGroups = if cfg.group != "git" then {} else singleton + users.groups = if cfg.group != "git" then {} else singleton { name = "git"; gid = config.ids.gids.git; }; diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index 02cd53c6fa38069ccbe3feba96091e94cb017c0f..6a1db81413c532092d184ed2858f6ece886e95b1 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -102,6 +102,14 @@ in }; }; + package = mkOption { + type = types.package; + default = pkgs.gnunet; + defaultText = "pkgs.gnunet"; + description = "Overridable attribute of the gnunet package to use."; + example = literalExample "pkgs.gnunet_git"; + }; + extraOptions = mkOption { default = ""; description = '' @@ -118,7 +126,7 @@ in config = mkIf config.services.gnunet.enable { - users.extraUsers.gnunet = { + users.users.gnunet = { group = "gnunet"; description = "GNUnet User"; home = homeDir; @@ -126,20 +134,20 @@ in uid = config.ids.uids.gnunet; }; - users.extraGroups.gnunet.gid = config.ids.gids.gnunet; + users.groups.gnunet.gid = config.ids.gids.gnunet; # The user tools that talk to `gnunetd' should come from the same source, # so install them globally. - environment.systemPackages = [ pkgs.gnunet ]; + environment.systemPackages = [ cfg.package ]; systemd.services.gnunet = { description = "GNUnet"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.gnunet pkgs.miniupnpc ]; + path = [ cfg.package pkgs.miniupnpc ]; environment.TMPDIR = "/tmp"; serviceConfig.PrivateTemp = true; - serviceConfig.ExecStart = "${pkgs.gnunet}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}"; + serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}"; serviceConfig.User = "gnunet"; serviceConfig.UMask = "0007"; serviceConfig.WorkingDirectory = homeDir; diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix new file mode 100644 index 0000000000000000000000000000000000000000..20e57e4626efa5e64ef9e3064fb022d33d7d620e --- /dev/null +++ b/nixos/modules/services/networking/hans.nix @@ -0,0 +1,145 @@ +# NixOS module for hans, ip over icmp daemon + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.hans; + + hansUser = "hans"; + +in +{ + + ### configuration + + options = { + + services.hans = { + clients = mkOption { + default = {}; + description = '' + Each attribute of this option defines a systemd service that + runs hans. Many or none may be defined. + The name of each service is + hans-name + where name is the name of the + corresponding attribute name. + ''; + example = literalExample '' + { + foo = { + server = "192.0.2.1"; + extraConfig = "-v"; + } + } + ''; + type = types.attrsOf (types.submodule ( + { + options = { + server = mkOption { + type = types.str; + default = ""; + description = "IP address of server running hans"; + example = "192.0.2.1"; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = "Additional command line parameters"; + example = "-v"; + }; + + passwordFile = mkOption { + type = types.str; + default = ""; + description = "File that containts password"; + }; + + }; + })); + }; + + server = { + enable = mkOption { + type = types.bool; + default = false; + description = "enable hans server"; + }; + + ip = mkOption { + type = types.str; + default = ""; + description = "The assigned ip range"; + example = "198.51.100.0"; + }; + + respondToSystemPings = mkOption { + type = types.bool; + default = false; + description = "Force hans respond to ordinary pings"; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = "Additional command line parameters"; + example = "-v"; + }; + + passwordFile = mkOption { + type = types.str; + default = ""; + description = "File that containts password"; + }; + }; + + }; + }; + + ### implementation + + config = mkIf (cfg.server.enable || cfg.clients != {}) { + boot.kernel.sysctl = optionalAttrs cfg.server.respondToSystemPings { + "net.ipv4.icmp_echo_ignore_all" = 1; + }; + + boot.kernelModules = [ "tun" ]; + + systemd.services = + let + createHansClientService = name: cfg: + { + description = "hans client - ${name}"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}"; + serviceConfig = { + RestartSec = "30s"; + Restart = "always"; + }; + }; + in + listToAttrs ( + mapAttrsToList + (name: value: nameValuePair "hans-${name}" (createHansClientService name value)) + cfg.clients + ) // { + hans = mkIf (cfg.server.enable) { + description = "hans, ip over icmp server daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.respondToSystemPings "-r"} ${optionalString (cfg.server.passwordFile != "") "-p $(cat \"${cfg.server.passwordFile}\")"}"; + }; + }; + + users.users = singleton { + name = hansUser; + description = "Hans daemon user"; + }; + }; + + meta.maintainers = with maintainers; [ gnidorah ]; +} diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix index 09e48ec4bff0716eea7b5840a7b9cf75c5cd6a89..0438d0bf8d86061e0c627741b5cae849b546b036 100644 --- a/nixos/modules/services/networking/haproxy.nix +++ b/nixos/modules/services/networking/haproxy.nix @@ -52,11 +52,11 @@ with lib; environment.systemPackages = [ pkgs.haproxy ]; - users.extraUsers.haproxy = { + users.users.haproxy = { group = "haproxy"; uid = config.ids.uids.haproxy; }; - users.extraGroups.haproxy.gid = config.ids.uids.haproxy; + users.groups.haproxy.gid = config.ids.uids.haproxy; }; } diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index bf2d0916fa36d9013d0bab192e7a79e368a61e51..3af0441a89d8efaf3d6cfe0b2fbc21c4d2350267 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -29,7 +29,7 @@ let ctrl_interface_group=${cfg.group} ${if cfg.wpa then '' - wpa=1 + wpa=2 wpa_passphrase=${cfg.wpaPassphrase} '' else ""} @@ -151,11 +151,6 @@ in config = mkIf cfg.enable { - assertions = [ - { assertion = (cfg.channel >= 1 && cfg.channel <= 13); - message = "channel must be between 1 and 13"; - }]; - environment.systemPackages = [ pkgs.hostapd ]; systemd.services.hostapd = diff --git a/nixos/modules/services/networking/i2p.nix b/nixos/modules/services/networking/i2p.nix index e6ee5fd1f9576ade404a34c07e28afe784ef3932..3b6010531f13f43470952b08bcc88e81541db093 100644 --- a/nixos/modules/services/networking/i2p.nix +++ b/nixos/modules/services/networking/i2p.nix @@ -11,14 +11,14 @@ in { ###### implementation config = mkIf cfg.enable { - users.extraUsers.i2p = { + users.users.i2p = { group = "i2p"; description = "i2p User"; home = homeDir; createHome = true; uid = config.ids.uids.i2p; }; - users.extraGroups.i2p.gid = config.ids.gids.i2p; + users.groups.i2p.gid = config.ids.gids.i2p; systemd.services.i2p = { description = "I2P router with administration interface for hidden services"; after = [ "network.target" ]; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 8f5aeee4a16b4e956bd65f8dd80d61d3386c5943..3afafaf3fed58d1b2968403cb2ded9d192afc883 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -103,7 +103,7 @@ let ${flip concatMapStrings (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto) - (proto: let portStr = toString proto.port; in '' + (proto: '' [${proto.name}] enabled = ${boolToString proto.enable} address = ${proto.address} @@ -122,7 +122,7 @@ let # DO NOT EDIT -- this file has been generated automatically. ${flip concatMapStrings (collect (tun: tun ? port && tun ? destination) cfg.outTunnels) - (tun: let portStr = toString tun.port; in '' + (tun: '' [${tun.name}] type = client destination = ${tun.destination} @@ -405,7 +405,7 @@ in outTunnels = mkOption { default = {}; type = with types; loaOf (submodule ( - { name, config, ... }: { + { name, ... }: { options = { destinationPort = mkOption { type = types.int; @@ -426,7 +426,7 @@ in inTunnels = mkOption { default = {}; type = with types; loaOf (submodule ( - { name, config, ... }: { + { name, ... }: { options = { inPort = mkOption { type = types.int; @@ -456,7 +456,7 @@ in config = mkIf cfg.enable { - users.extraUsers.i2pd = { + users.users.i2pd = { group = "i2pd"; description = "I2Pd User"; home = homeDir; @@ -464,7 +464,7 @@ in uid = config.ids.uids.i2pd; }; - users.extraGroups.i2pd.gid = config.ids.gids.i2pd; + users.groups.i2pd.gid = config.ids.gids.i2pd; systemd.services.i2pd = { description = "Minimal I2P router"; diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix index 512dbd77ae4b868e9eebc47bf6a72ee0dbc35260..58ad0df4ff20ddc3b5f3d0cb0e1e7dc27eadefb7 100644 --- a/nixos/modules/services/networking/iodine.nix +++ b/nixos/modules/services/networking/iodine.nix @@ -32,7 +32,7 @@ in foo = { server = "tunnel.mdomain.com"; relay = "8.8.8.8"; - extraConfig = "-P mysecurepassword"; + extraConfig = "-v"; } } ''; @@ -57,7 +57,13 @@ in type = types.str; default = ""; description = "Additional command line parameters"; - example = "-P mysecurepassword -l 192.168.1.10 -p 23"; + example = "-l 192.168.1.10 -p 23"; + }; + + passwordFile = mkOption { + type = types.str; + default = ""; + description = "File that containts password"; }; }; })); @@ -88,7 +94,13 @@ in type = types.str; default = ""; description = "Additional command line parameters"; - example = "-P mysecurepassword -l 192.168.1.10 -p 23"; + example = "-l 192.168.1.10 -p 23"; + }; + + passwordFile = mkOption { + type = types.str; + default = ""; + description = "File that containts password"; }; }; @@ -108,10 +120,10 @@ in description = "iodine client - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + script = "${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.relay} ${cfg.server}"; serviceConfig = { RestartSec = "30s"; Restart = "always"; - ExecStart = "${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${cfg.relay} ${cfg.server}"; }; }; in @@ -124,15 +136,15 @@ in description = "iodine, ip over dns server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${cfg.server.ip} ${cfg.server.domain}"; + script = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "-P $(cat \"${cfg.server.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain}"; }; }; - users.extraUsers = singleton { + users.users = singleton { name = iodinedUser; uid = config.ids.uids.iodined; description = "Iodine daemon user"; }; - users.extraGroups.iodined.gid = config.ids.gids.iodined; + users.groups.iodined.gid = config.ids.gids.iodined; }; } diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index bd583fb020ecefcdfd38207b41756a964b89ce1c..2bd898edf89716d517b94b0bcdda0cc6e8a05ec1 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -112,14 +112,14 @@ in config = mkIf config.services.ircdHybrid.enable { - users.extraUsers = singleton + users.users = singleton { name = "ircd"; description = "IRCD owner"; group = "ircd"; uid = config.ids.uids.ircd; }; - users.extraGroups.ircd.gid = config.ids.gids.ircd; + users.groups.ircd.gid = config.ids.gids.ircd; systemd.services."ircd-hybrid" = { description = "IRCD Hybrid server"; diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index 23787bce9911d906be057eaa9456f15f38ce80b2..eb03d2e1d6321e53d37ca67d385ce7b099722ada 100644 --- a/nixos/modules/services/networking/iwd.nix +++ b/nixos/modules/services/networking/iwd.nix @@ -20,14 +20,11 @@ in { services.dbus.packages = [ pkgs.iwd ]; - systemd.services.iwd = { - description = "Wireless daemon"; - before = [ "network.target" ]; - wants = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - serviceConfig.ExecStart = "${pkgs.iwd}/bin/iwd"; - }; + systemd.packages = [ pkgs.iwd ]; + + systemd.tmpfiles.rules = [ + "d /var/lib/iwd 0700 root root -" + ]; }; meta.maintainers = with lib.maintainers; [ mic92 ]; diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix index 378cd9365848d24bfba48bf6ac4ecf6323d8e1d1..c9ac2ee259901499b62966bba922b3526ce7187b 100644 --- a/nixos/modules/services/networking/keepalived/default.nix +++ b/nixos/modules/services/networking/keepalived/default.nix @@ -8,10 +8,12 @@ let keepalivedConf = pkgs.writeText "keepalived.conf" '' global_defs { + ${optionalString cfg.enableScriptSecurity "enable_script_security"} ${snmpGlobalDefs} ${cfg.extraGlobalDefs} } + ${vrrpScriptStr} ${vrrpInstancesStr} ${cfg.extraConfig} ''; @@ -26,6 +28,22 @@ let + optionalString enableTraps "enable_traps" ); + vrrpScriptStr = concatStringsSep "\n" (map (s: + '' + vrrp_script ${s.name} { + script "${s.script}" + interval ${toString s.interval} + fall ${toString s.fall} + rise ${toString s.rise} + timeout ${toString s.timeout} + weight ${toString s.weight} + user ${s.user} ${optionalString (s.group != null) s.group} + + ${s.extraConfig} + } + '' + ) vrrpScripts); + vrrpInstancesStr = concatStringsSep "\n" (map (i: '' vrrp_instance ${i.name} { @@ -49,6 +67,18 @@ let ${concatMapStringsSep "\n" virtualIpLine i.virtualIps} } + ${optionalString (builtins.length i.trackScripts > 0) '' + track_script { + ${concatStringsSep "\n" i.trackScripts} + } + ''} + + ${optionalString (builtins.length i.trackInterfaces > 0) '' + track_interface { + ${concatStringsSep "\n" i.trackInterfaces} + } + ''} + ${i.extraConfig} } '' @@ -64,6 +94,12 @@ let notNullOrEmpty = s: !(s == null || s == ""); + vrrpScripts = mapAttrsToList (name: config: + { + inherit name; + } // config + ) cfg.vrrpScripts; + vrrpInstances = mapAttrsToList (iName: iConfig: { name = iName; @@ -86,7 +122,8 @@ let { assertion = !i.vmacXmitBase || i.useVmac; message = "services.keepalived.vrrpInstances.${i.name}.vmacXmitBase has no effect when services.keepalived.vrrpInstances.${i.name}.useVmac is not set."; } - ] ++ flatten (map (virtualIpAssertions i.name) i.virtualIps); + ] ++ flatten (map (virtualIpAssertions i.name) i.virtualIps) + ++ flatten (map (vrrpScriptAssertion i.name) i.trackScripts); virtualIpAssertions = vrrpName: ip: [ { assertion = ip.addr != ""; @@ -94,6 +131,11 @@ let } ]; + vrrpScriptAssertion = vrrpName: scriptName: { + assertion = builtins.hasAttr scriptName cfg.vrrpScripts; + message = "services.keepalived.vrrpInstances.${vrrpName} trackscript ${scriptName} is not defined in services.keepalived.vrrpScripts."; + }; + pidFile = "/run/keepalived.pid"; in @@ -110,6 +152,14 @@ in ''; }; + enableScriptSecurity = mkOption { + type = types.bool; + default = false; + description = '' + Don't run scripts configured to be run as root if any part of the path is writable by a non-root user. + ''; + }; + snmp = { enable = mkOption { @@ -181,8 +231,16 @@ in }; + vrrpScripts = mkOption { + type = types.attrsOf (types.submodule (import ./vrrp-script-options.nix { + inherit lib; + })); + default = {}; + description = "Declarative vrrp script config"; + }; + vrrpInstances = mkOption { - type = types.attrsOf (types.submodule (import ./vrrp-options.nix { + type = types.attrsOf (types.submodule (import ./vrrp-instance-options.nix { inherit lib; })); default = {}; diff --git a/nixos/modules/services/networking/keepalived/vrrp-options.nix b/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix similarity index 88% rename from nixos/modules/services/networking/keepalived/vrrp-options.nix rename to nixos/modules/services/networking/keepalived/vrrp-instance-options.nix index 79eff3ae5419809678a2e5a4f0f670d4ced49084..85b9bc3377268d3275e0ef25eeaa07ed0bb2104e 100644 --- a/nixos/modules/services/networking/keepalived/vrrp-options.nix +++ b/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix @@ -108,6 +108,20 @@ with lib; description = "Declarative vhost config"; }; + trackScripts = mkOption { + type = types.listOf types.str; + default = []; + example = [ "chk_cmd1" "chk_cmd2" ]; + description = "List of script names to invoke for health tracking."; + }; + + trackInterfaces = mkOption { + type = types.listOf types.str; + default = []; + example = [ "eth0" "eth1" ]; + description = "List of network interfaces to monitor for health tracking."; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/networking/keepalived/vrrp-script-options.nix b/nixos/modules/services/networking/keepalived/vrrp-script-options.nix new file mode 100644 index 0000000000000000000000000000000000000000..a3f794c40a89a4166ee9adecd12ac2cc6bd0dade --- /dev/null +++ b/nixos/modules/services/networking/keepalived/vrrp-script-options.nix @@ -0,0 +1,64 @@ +{ lib } : + +with lib; +with lib.types; +{ + options = { + + script = mkOption { + type = str; + example = "\${pkgs.curl} -f http://localhost:80"; + description = "(Path of) Script command to execute followed by args, i.e. cmd [args]..."; + }; + + interval = mkOption { + type = int; + default = 1; + description = "Seconds between script invocations."; + }; + + timeout = mkOption { + type = int; + default = 5; + description = "Seconds after which script is considered to have failed."; + }; + + weight = mkOption { + type = int; + default = 0; + description = "Following a failure, adjust the priority by this weight."; + }; + + rise = mkOption { + type = int; + default = 5; + description = "Required number of successes for OK transition."; + }; + + fall = mkOption { + type = int; + default = 3; + description = "Required number of failures for KO transition."; + }; + + user = mkOption { + type = str; + default = "keepalived_script"; + description = "Name of user to run the script under."; + }; + + group = mkOption { + type = nullOr str; + default = null; + description = "Name of group to run the script under. Defaults to user group."; + }; + + extraConfig = mkOption { + type = lines; + default = ""; + description = "Extra lines to be added verbatim to the vrrp_script section."; + }; + + }; + +} diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix index 834de4fdc09f25f9915c31c264b918b85236b060..40c38254a57c3a1229b796cbf66b39a88ed0f7df 100644 --- a/nixos/modules/services/networking/kippo.nix +++ b/nixos/modules/services/networking/kippo.nix @@ -73,12 +73,12 @@ rec { ${cfg.extraConfig} ''; - users.extraUsers = singleton { + users.users = singleton { name = "kippo"; description = "kippo web server privilege separation user"; uid = 108; # why does config.ids.uids.kippo give an error? }; - users.extraGroups = singleton { name = "kippo";gid=108; }; + users.groups = singleton { name = "kippo";gid=108; }; systemd.services.kippo = with pkgs; { description = "Kippo Web Server"; diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index aac02b811d716dfc4b083c5e0aa0c44012c4db48..ca34ff9df4ef3bc6fa5f25e8a44065913327b84d 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -62,13 +62,13 @@ in config = mkIf cfg.enable { environment.etc."kresd.conf".source = configFile; # not required - users.extraUsers = singleton + users.users = singleton { name = "kresd"; uid = config.ids.uids.kresd; group = "kresd"; description = "Knot-resolver daemon user"; }; - users.extraGroups = singleton + users.groups = singleton { name = "kresd"; gid = config.ids.gids.kresd; }; diff --git a/nixos/modules/services/networking/lambdabot.nix b/nixos/modules/services/networking/lambdabot.nix index 5a61a9f9678271c0dd367166c94feb79afb250b0..b7c8bd008fe1c284d421334fc68dbc3af741636f 100644 --- a/nixos/modules/services/networking/lambdabot.nix +++ b/nixos/modules/services/networking/lambdabot.nix @@ -67,7 +67,7 @@ in }; }; - users.extraUsers.lambdabot = { + users.users.lambdabot = { group = "lambdabot"; description = "Lambdabot daemon user"; home = "/var/lib/lambdabot"; @@ -75,7 +75,7 @@ in uid = config.ids.uids.lambdabot; }; - users.extraGroups.lambdabot.gid = config.ids.gids.lambdabot; + users.groups.lambdabot.gid = config.ids.gids.lambdabot; }; diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix index db1534edfd7c0c4e14b5e31afcb91712726a7b67..dec30cc92f6a5b3156ac6f84e911d57bf1a14dc3 100644 --- a/nixos/modules/services/networking/lldpd.nix +++ b/nixos/modules/services/networking/lldpd.nix @@ -20,13 +20,13 @@ in }; config = mkIf cfg.enable { - users.extraUsers._lldpd = { + users.users._lldpd = { description = "lldpd user"; group = "_lldpd"; home = "/var/run/lldpd"; isSystemUser = true; }; - users.extraGroups._lldpd = {}; + users.groups._lldpd = {}; environment.systemPackages = [ pkgs.lldpd ]; systemd.packages = [ pkgs.lldpd ]; diff --git a/nixos/modules/services/networking/mailpile.nix b/nixos/modules/services/networking/mailpile.nix index e164d41483c7ff4983b227a450d928e5e3f57ffa..c42d3d5a44cb08956ca879af3be848c7c932d8f0 100644 --- a/nixos/modules/services/networking/mailpile.nix +++ b/nixos/modules/services/networking/mailpile.nix @@ -41,14 +41,14 @@ in config = mkIf config.services.mailpile.enable { - users.extraUsers.mailpile = + users.users.mailpile = { uid = config.ids.uids.mailpile; description = "Mailpile user"; createHome = true; home = "/var/lib/mailpile"; }; - users.extraGroups.mailpile = + users.groups.mailpile = { gid = config.ids.gids.mailpile; }; diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix index 5526e2ba23ac78a25d5fd4bf8c7633eda4ed53b9..1fd63348c16c187cd00aca85688dd18cc7f0c880 100644 --- a/nixos/modules/services/networking/matterbridge.nix +++ b/nixos/modules/services/networking/matterbridge.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ options, config, pkgs, lib, ... }: with lib; @@ -6,7 +6,11 @@ let cfg = config.services.matterbridge; - matterbridgeConfToml = pkgs.writeText "matterbridge.toml" (cfg.configFile); + matterbridgeConfToml = + if cfg.configPath == null then + pkgs.writeText "matterbridge.toml" (cfg.configFile) + else + cfg.configPath; in @@ -15,17 +19,32 @@ in services.matterbridge = { enable = mkEnableOption "Matterbridge chat platform bridge"; + configPath = mkOption { + type = with types; nullOr str; + default = null; + example = "/etc/nixos/matterbridge.toml"; + description = '' + The path to the matterbridge configuration file. + ''; + }; + configFile = mkOption { type = types.str; example = '' - #WARNING: as this file contains credentials, be sure to set correct file permissions [irc] + # WARNING: as this file contains credentials, do not use this option! + # It is kept only for backwards compatibility, and would cause your + # credentials to be in the nix-store, thus with the world-readable + # permission bits. + # Use services.matterbridge.configPath instead. + + [irc] [irc.freenode] Server="irc.freenode.net:6667" Nick="matterbot" [mattermost] [mattermost.work] - #do not prefix it wit http:// or https:// + # Do not prefix it with http:// or https:// Server="yourmattermostserver.domain" Team="yourteam" Login="yourlogin" @@ -44,6 +63,10 @@ in channel="off-topic" ''; description = '' + WARNING: THIS IS INSECURE, as your password will end up in + /nix/store, thus publicly readable. Use + services.matterbridge.configPath instead. + The matterbridge configuration file in the TOML file format. ''; }; @@ -65,32 +88,31 @@ in }; }; - config = mkMerge [ - (mkIf cfg.enable { - - users.extraUsers = mkIf (cfg.user == "matterbridge") [ - { name = "matterbridge"; - group = "matterbridge"; - } ]; - - users.extraGroups = mkIf (cfg.group == "matterbridge") [ - { name = "matterbridge"; - } ]; - - systemd.services.matterbridge = { - description = "Matterbridge chat platform bridge"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}"; - Restart = "always"; - RestartSec = "10"; - }; + config = mkIf cfg.enable { + warnings = optional options.services.matterbridge.configFile.isDefined + "The option services.matterbridge.configFile is insecure and should be replaced with services.matterbridge.configPath"; + + users.users = optional (cfg.user == "matterbridge") + { name = "matterbridge"; + group = "matterbridge"; + }; + + users.groups = optional (cfg.group == "matterbridge") + { name = "matterbridge"; }; - }) - ]; -} + systemd.services.matterbridge = { + description = "Matterbridge chat platform bridge"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}"; + Restart = "always"; + RestartSec = "10"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 61d063dbfe0e863c6a36c483acba2ace44a87b04..1858f03cac1f4ca71d0e4b4fd5a24cb4f41121e0 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -1,23 +1,16 @@ # Module for MiniDLNA, a simple DLNA server. - { config, lib, pkgs, ... }: with lib; let - cfg = config.services.minidlna; - port = 8200; - in { - ###### interface - options = { - services.minidlna.enable = mkOption { type = types.bool; default = false; @@ -43,37 +36,61 @@ in ''; }; + services.minidlna.loglevel = mkOption { + type = types.str; + default = "warn"; + example = "general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn"; + description = + '' + Defines the type of messages that should be logged, and down to + which level of importance they should be considered. + + The possible types are “artwork”, “database”, “general”, “http”, + “inotify”, “metadata”, “scanner”, “ssdp” and “tivo”. + + The levels are “off”, “fatal”, “error”, “warn”, “info” and + “debug”, listed here in order of decreasing importance. “off” + turns off logging messages entirely, “fatal” logs the most + critical messages only, and so on down to “debug” that logs every + single messages. + + The types are comma-separated, followed by an equal sign (‘=’), + followed by a level that applies to the preceding types. This can + be repeated, separating each of these constructs with a comma. + + Defaults to “general,artwork,database,inotify,scanner,metadata, + http,ssdp,tivo=warn” which logs every type of message at the + “warn” level. + ''; + }; + services.minidlna.config = mkOption { type = types.lines; description = "The contents of MiniDLNA's configuration file."; }; - }; - ###### implementation - config = mkIf cfg.enable { - services.minidlna.config = '' port=${toString port} friendly_name=${config.networking.hostName} MiniDLNA db_dir=/var/cache/minidlna - log_level=warn + log_level=${cfg.loglevel} inotify=yes ${concatMapStrings (dir: '' media_dir=${dir} '') cfg.mediaDirs} ''; - users.extraUsers.minidlna = { + users.users.minidlna = { description = "MiniDLNA daemon user"; group = "minidlna"; uid = config.ids.uids.minidlna; }; - users.extraGroups.minidlna.gid = config.ids.gids.minidlna; + users.groups.minidlna.gid = config.ids.gids.minidlna; systemd.services.minidlna = { description = "MiniDLNA Server"; @@ -98,7 +115,5 @@ in " -f ${pkgs.writeText "minidlna.conf" cfg.config}"; }; }; - }; - } diff --git a/nixos/modules/services/networking/mjpg-streamer.nix b/nixos/modules/services/networking/mjpg-streamer.nix index 1286b0c7ef6c9354fd44380095780e3abe906b09..e0a6c112e3cbfb92435618726bed81b0e8475e94 100644 --- a/nixos/modules/services/networking/mjpg-streamer.nix +++ b/nixos/modules/services/networking/mjpg-streamer.nix @@ -49,7 +49,7 @@ in { config = mkIf cfg.enable { - users.extraUsers = optional (cfg.user == "mjpg-streamer") { + users.users = optional (cfg.user == "mjpg-streamer") { name = "mjpg-streamer"; uid = config.ids.uids.mjpg-streamer; group = cfg.group; diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix index 31379189f5de338a90235d098025d5df19ff0fc0..8241c32bad07e1217a787b5b8570a3b6c4cf9aca 100644 --- a/nixos/modules/services/networking/monero.nix +++ b/nixos/modules/services/networking/monero.nix @@ -197,7 +197,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "monero"; uid = config.ids.uids.monero; description = "Monero daemon user"; @@ -205,7 +205,7 @@ in createHome = true; }; - users.extraGroups = singleton { + users.groups = singleton { name = "monero"; gid = config.ids.gids.monero; }; diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix new file mode 100644 index 0000000000000000000000000000000000000000..cc81e27e93996102de644e9c89e968fabd4a2559 --- /dev/null +++ b/nixos/modules/services/networking/morty.nix @@ -0,0 +1,96 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.morty; + +in + +{ + + ###### interface + + options = { + + services.morty = { + + enable = mkEnableOption + "Morty proxy server. See https://github.com/asciimoo/morty"; + + ipv6 = mkOption { + type = types.bool; + default = true; + description = "Allow IPv6 HTTP requests?"; + defaultText = "Allow IPv6 HTTP requests."; + }; + + key = mkOption { + type = types.string; + default = ""; + description = "HMAC url validation key (hexadecimal encoded). + Leave blank to disable. Without validation key, anyone can + submit proxy requests. Leave blank to disable."; + defaultText = "No HMAC url validation. Generate with echo -n somevalue | openssl dgst -sha1 -hmac somekey"; + }; + + timeout = mkOption { + type = types.int; + default = 2; + description = "Request timeout in seconds."; + defaultText = "A resource now gets 2 seconds to respond."; + }; + + package = mkOption { + type = types.package; + default = pkgs.morty; + defaultText = "pkgs.morty"; + description = "morty package to use."; + }; + + port = mkOption { + type = types.int; + default = 3000; + description = "Listing port"; + }; + + listenAddress = mkOption { + type = types.string; + default = "127.0.0.1"; + description = "The address on which the service listens"; + defaultText = "127.0.0.1 (localhost)"; + }; + + }; + + }; + + ###### Service definition + + config = mkIf config.services.morty.enable { + + users.users.morty = + { description = "Morty user"; + createHome = true; + home = "/var/lib/morty"; + }; + + systemd.services.morty = + { + description = "Morty sanitizing proxy server."; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "morty"; + ExecStart = ''${cfg.package}/bin/morty \ + -listen ${cfg.listenAddress}:${toString cfg.port} \ + ${optionalString cfg.ipv6 "-ipv6"} \ + ${optionalString (cfg.key != "") "-key " + cfg.key} \ + ''; + }; + }; + environment.systemPackages = [ cfg.package ]; + + }; +} diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index d8135f4d0ffa4ec9fe04b77eaa2087bc7e92a935..332dc541345e8fe835065293f2aabd3ffad8abc2 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -218,7 +218,7 @@ in ) cfg.users); }; - users.extraUsers.mosquitto = { + users.users.mosquitto = { description = "Mosquitto MQTT Broker Daemon owner"; group = "mosquitto"; uid = config.ids.uids.mosquitto; @@ -226,7 +226,7 @@ in createHome = true; }; - users.extraGroups.mosquitto.gid = config.ids.gids.mosquitto; + users.groups.mosquitto.gid = config.ids.gids.mosquitto; }; } diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 13d7c3254f9db7b0ce80030dbc8809eaedf98b20..fcc813e6898f99eb22c5836a144ec68ba57e0d29 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -80,7 +80,7 @@ in pidfile = mkOption { type = types.path; - default = "/tmp/murmurd.pid"; + default = "/run/murmur/murmurd.pid"; description = "Path to PID file for Murmur daemon."; }; @@ -238,7 +238,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.murmur = { + users.users.murmur = { description = "Murmur Service user"; home = "/var/lib/murmur"; createHome = true; @@ -248,10 +248,11 @@ in systemd.services.murmur = { description = "Murmur Chat Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target "]; + after = [ "network-online.target "]; serviceConfig = { Type = "forking"; + RuntimeDirectory = "murmur"; PIDFile = cfg.pidfile; Restart = "always"; User = "murmur"; diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix index 11f7d7e5caef7f135bf815114f7c31a44500b586..8de23b442f932ee2a99af232c3dd2adc472f74bb 100644 --- a/nixos/modules/services/networking/namecoind.nix +++ b/nixos/modules/services/networking/namecoind.nix @@ -153,7 +153,7 @@ in config = ${configFile} ''; - users.extraUsers = singleton { + users.users = singleton { name = "namecoin"; uid = config.ids.uids.namecoin; description = "Namecoin daemon user"; @@ -161,7 +161,7 @@ in createHome = true; }; - users.extraGroups = singleton { + users.groups = singleton { name = "namecoin"; gid = config.ids.gids.namecoin; }; diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index da3827c35e63aef8bf536bdac7f459e35f2de5af..89d8590093dd5a3a12bf0d438bc20f5392ca1a64 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -38,19 +38,19 @@ let # NAT the marked packets. ${optionalString (cfg.internalInterfaces != []) '' iptables -w -t nat -A nixos-nat-post -m mark --mark 1 \ - -o ${cfg.externalInterface} ${dest} + ${optionalString (cfg.externalInterface != null) "-o ${cfg.externalInterface}"} ${dest} ''} # NAT packets coming from the internal IPs. ${concatMapStrings (range: '' iptables -w -t nat -A nixos-nat-post \ - -s '${range}' -o ${cfg.externalInterface} ${dest} + -s '${range}' ${optionalString (cfg.externalInterface != null) "-o ${cfg.externalInterface}"} ${dest} '') cfg.internalIPs} # NAT from external ports to internal ports. ${concatMapStrings (fwd: '' iptables -w -t nat -A nixos-nat-pre \ - -i ${cfg.externalInterface} -p ${fwd.proto} \ + -i ${toString cfg.externalInterface} -p ${fwd.proto} \ --dport ${builtins.toString fwd.sourcePort} \ -j DNAT --to-destination ${fwd.destination} @@ -81,7 +81,7 @@ let ${optionalString (cfg.dmzHost != null) '' iptables -w -t nat -A nixos-nat-pre \ - -i ${cfg.externalInterface} -j DNAT \ + -i ${toString cfg.externalInterface} -j DNAT \ --to-destination ${cfg.dmzHost} ''} @@ -134,7 +134,8 @@ in }; networking.nat.externalInterface = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; example = "eth1"; description = '' @@ -236,6 +237,15 @@ in { networking.firewall.extraCommands = mkBefore flushNat; } (mkIf config.networking.nat.enable { + assertions = [ + { assertion = (cfg.dmzHost != null) -> (cfg.externalInterface != null); + message = "networking.nat.dmzHost requires networking.nat.externalInterface"; + } + { assertion = (cfg.forwardPorts != []) -> (cfg.externalInterface != null); + message = "networking.nat.forwardPorts requires networking.nat.externalInterface"; + } + ]; + environment.systemPackages = [ pkgs.iptables ]; boot = { diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix new file mode 100644 index 0000000000000000000000000000000000000000..1d6c48dd8d378f9cc919f6cd15740eba89b0bac1 --- /dev/null +++ b/nixos/modules/services/networking/ndppd.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.ndppd; + + configFile = pkgs.runCommand "ndppd.conf" {} '' + substitute ${pkgs.ndppd}/etc/ndppd.conf $out \ + --replace eth0 ${cfg.interface} \ + --replace 1111:: ${cfg.network} + ''; +in { + options = { + services.ndppd = { + enable = mkEnableOption "daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; + interface = mkOption { + type = types.string; + default = "eth0"; + example = "ens3"; + description = "Interface which is on link-level with router."; + }; + network = mkOption { + type = types.string; + default = "1111::"; + example = "2001:DB8::/32"; + description = "Network that we proxy."; + }; + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to configuration file."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.packages = [ pkgs.ndppd ]; + environment.etc."ndppd.conf".source = if (cfg.configFile != null) then cfg.configFile else configFile; + systemd.services.ndppd = { + serviceConfig.RuntimeDirectory = [ "ndppd" ]; + wantedBy = [ "multi-user.target" ]; + }; + }; + + meta.maintainers = with maintainers; [ gnidorah ]; +} diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 10e96eb403623b977072e339ca42dd4e98a46cac..b0bc1c83d6b706f27e41bb6c1b9c666332dfbf33 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -6,20 +6,17 @@ with lib; let cfg = config.networking.networkmanager; + dynamicHostsEnabled = + cfg.dynamicHosts.enable && cfg.dynamicHosts.hostsDirs != {}; + # /var/lib/misc is for dnsmasq.leases. stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; - dns = - if cfg.useDnsmasq then "dnsmasq" - else if config.services.resolved.enable then "systemd-resolved" - else if config.services.unbound.enable then "unbound" - else "default"; - configFile = writeText "NetworkManager.conf" '' [main] plugins=keyfile dhcp=${cfg.dhcp} - dns=${dns} + dns=${cfg.dns} [keyfile] ${optionalString (cfg.unmanaged != []) @@ -37,6 +34,8 @@ let [device] wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"} + + ${cfg.extraConfig} ''; /* @@ -119,6 +118,14 @@ in { ''; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Configuration appended to the generated NetworkManager.conf. + ''; + }; + unmanaged = mkOption { type = types.listOf types.string; default = []; @@ -205,14 +212,74 @@ in { }; }; - useDnsmasq = mkOption { - type = types.bool; - default = false; + dns = mkOption { + type = types.enum [ "default" "dnsmasq" "unbound" "systemd-resolved" "none" ]; + default = "default"; description = '' - Enable NetworkManager's dnsmasq integration. NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update - resolv.conf to point to the local nameserver. + Set the DNS (resolv.conf) processing mode. + + + Options: + + + "default" + + NetworkManager will update /etc/resolv.conf to + reflect the nameservers provided by currently active connections. + + + + "dnsmasq" + + + Enable NetworkManager's dnsmasq integration. NetworkManager will + run dnsmasq as a local caching nameserver, using a "split DNS" + configuration if you are connected to a VPN, and then update + resolv.conf to point to the local nameserver. + + + It is possible to pass custom options to the dnsmasq instance by + adding them to files in the + /etc/NetworkManager/dnsmasq.d/ directory. + + + When multiple upstream servers are available, dnsmasq will + initially contact them in parallel and then use the fastest to + respond, probing again other servers after some time. This + behavior can be modified passing the + all-servers or strict-order + options to dnsmasq (see the manual page for more details). + + + Note that this option causes NetworkManager to launch and manage + its own instance of the dnsmasq daemon, which is + not the same as setting + services.dnsmasq.enable = true;. + + + + + "unbound" + + NetworkManager will talk to unbound and dnssec-triggerd, + providing a "split DNS" configuration with DNSSEC support. + /etc/resolv.conf will be managed by + dnssec-trigger daemon. + + + + "systemd-resolved" + + NetworkManager will push the DNS configuration to systemd-resolved. + + + + "none" + + NetworkManager will not modify resolv.conf. + + + ''; }; @@ -253,6 +320,52 @@ in { so you don't need to to that yourself. ''; }; + + dynamicHosts = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enabling this option requires the + option to be + set to dnsmasq. If enabled, the directories + defined by the + + option will be set up when the service starts. The dnsmasq instance + managed by NetworkManager will then watch those directories for + hosts files (see the --hostsdir option of + dnsmasq). This way a non-privileged user can add or override DNS + entries on the local system (depending on what hosts directories + that are configured).. + ''; + }; + hostsDirs = mkOption { + type = with types; attrsOf (submodule { + options = { + user = mkOption { + type = types.str; + default = "root"; + description = '' + The user that will own the hosts directory. + ''; + }; + group = mkOption { + type = types.str; + default = "root"; + description = '' + The group that will own the hosts directory. + ''; + }; + }; + }); + default = {}; + description = '' + Defines a set of directories (relative to + /run/NetworkManager/hostdirs) that dnsmasq will + watch for hosts files. + ''; + }; + }; }; }; @@ -261,10 +374,17 @@ in { config = mkIf cfg.enable { - assertions = [{ - assertion = config.networking.wireless.enable == false; - message = "You can not use networking.networkmanager with networking.wireless"; - }]; + assertions = [ + { assertion = config.networking.wireless.enable == false; + message = "You can not use networking.networkmanager with networking.wireless"; + } + { assertion = !dynamicHostsEnabled || (dynamicHostsEnabled && cfg.dns == "dnsmasq"); + message = '' + To use networking.networkmanager.dynamicHosts you also need to set + networking.networkmanager.dns = "dnsmasq" + ''; + } + ]; environment.etc = with cfg.basePackages; [ { source = configFile; @@ -298,11 +418,17 @@ in { ++ lib.imap1 (i: s: { inherit (s) source; target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; - }) cfg.dispatcherScripts; + }) cfg.dispatcherScripts + ++ optional (dynamicHostsEnabled) + { target = "NetworkManager/dnsmasq.d/dyndns.conf"; + text = concatMapStrings (n: '' + hostsdir=/run/NetworkManager/hostsdirs/${n} + '') (attrNames cfg.dynamicHosts.hostsDirs); + }; environment.systemPackages = cfg.packages; - users.extraGroups = [{ + users.groups = [{ name = "networkmanager"; gid = config.ids.gids.networkmanager; } @@ -310,7 +436,7 @@ in { name = "nm-openvpn"; gid = config.ids.gids.nm-openvpn; }]; - users.extraUsers = [{ + users.users = [{ name = "nm-openvpn"; uid = config.ids.uids.nm-openvpn; extraGroups = [ "networkmanager" ]; @@ -334,6 +460,21 @@ in { ''; }; + systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled { + wantedBy = [ "network-manager.service" ]; + before = [ "network-manager.service" ]; + partOf = [ "network-manager.service" ]; + script = concatStrings (mapAttrsToList (n: d: '' + mkdir -p "/run/NetworkManager/hostsdirs/${n}" + chown "${d.user}:${d.group}" "/run/NetworkManager/hostsdirs/${n}" + chmod 0775 "/run/NetworkManager/hostsdirs/${n}" + '') cfg.dynamicHosts.hostsDirs); + serviceConfig = { + Type = "oneshot"; + RemainAfterExist = true; + }; + }; + # Turn off NixOS' network management networking = { useDHCP = false; diff --git a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix b/nixos/modules/services/networking/nghttpx/nghttpx-options.nix index cce65be321a888fb5dc7dc26808238d7a5b97799..51f1d081b971002da4802f6186cc8bc09b9c13c5 100644 --- a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix +++ b/nixos/modules/services/networking/nghttpx/nghttpx-options.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: { options.services.nghttpx = { enable = lib.mkEnableOption "nghttpx"; diff --git a/nixos/modules/services/networking/ngircd.nix b/nixos/modules/services/networking/ngircd.nix index 6a5290ffdee2b62cdc611c170e3e8e85d9663b84..4b2fa77959225fec7bebcf2a25d2afb2c7af6e58 100644 --- a/nixos/modules/services/networking/ngircd.nix +++ b/nixos/modules/services/networking/ngircd.nix @@ -51,7 +51,7 @@ in { serviceConfig.User = "ngircd"; }; - users.extraUsers.ngircd = { + users.users.ngircd = { uid = config.ids.uids.ngircd; description = "ngircd user."; }; diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 8499e7c0f7c466e9d95d7dd8ad4911aa9d8dc6c1..e83cad949ae8c953fb869ece5503af451b05aaa6 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -64,7 +64,7 @@ in }; }; - users.extraUsers.nix-serve = { + users.users.nix-serve = { description = "Nix-serve user"; uid = config.ids.uids.nix-serve; }; diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix index 7eebecb23b0066a1ad67e0cde2297b71b55fde01..d24d6f77a4916af6ae4eec21cb433d39887e4a90 100644 --- a/nixos/modules/services/networking/nntp-proxy.nix +++ b/nixos/modules/services/networking/nntp-proxy.nix @@ -210,7 +210,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = proxyUser; uid = config.ids.uids.nntp-proxy; description = "NNTP-Proxy daemon user"; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 4241e6fcceab9e7f533176bec1183b44e988a5f8..cde47bf23eaef76765e808575d0b2ef5d7c58cc1 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -20,6 +20,7 @@ let zoneStats = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0; }; + mkZoneFileName = name: if name == "." then "root" else name; nsdEnv = pkgs.buildEnv { name = "nsd-env"; @@ -50,8 +51,9 @@ let }; writeZoneData = name: text: pkgs.writeTextFile { - inherit name text; - destination = "/zones/${name}"; + name = "nsd-zone-${mkZoneFileName name}"; + inherit text; + destination = "/zones/${mkZoneFileName name}"; }; @@ -146,7 +148,7 @@ let zoneConfigFile = name: zone: '' zone: name: "${name}" - zonefile: "${stateDir}/zones/${name}" + zonefile: "${stateDir}/zones/${mkZoneFileName name}" ${maybeString "outgoing-interface: " zone.outgoingInterface} ${forEach " rrl-whitelist: " zone.rrlWhitelist} ${maybeString "zonestats: " zone.zoneStats} @@ -250,6 +252,46 @@ let Use imports or pkgs.lib.readFile if you don't want this data in your config file. ''; }; + + dnssec = mkEnableOption "DNSSEC"; + + dnssecPolicy = { + algorithm = mkOption { + type = types.str; + default = "RSASHA256"; + description = "Which algorithm to use for DNSSEC"; + }; + keyttl = mkOption { + type = types.str; + default = "1h"; + description = "TTL for dnssec records"; + }; + coverage = mkOption { + type = types.str; + default = "1y"; + description = '' + The length of time to ensure that keys will be correct; no action will be taken to create new keys to be activated after this time. + ''; + }; + zsk = mkOption { + type = keyPolicy; + default = { keySize = 2048; + prePublish = "1w"; + postPublish = "1w"; + rollPeriod = "1mo"; + }; + description = "Key policy for zone signing keys"; + }; + ksk = mkOption { + type = keyPolicy; + default = { keySize = 4096; + prePublish = "1mo"; + postPublish = "1mo"; + rollPeriod = "0"; + }; + description = "Key policy for key signing keys"; + }; + }; maxRefreshSecs = mkOption { type = types.nullOr types.int; @@ -367,10 +409,61 @@ let and stats_noreset. ''; }; + }; + }; + keyPolicy = types.submodule { + options = { + keySize = mkOption { + type = types.int; + description = "Key size in bits"; + }; + prePublish = mkOption { + type = types.str; + description = "How long in advance to publish new keys"; + }; + postPublish = mkOption { + type = types.str; + description = "How long after deactivation to keep a key in the zone"; + }; + rollPeriod = mkOption { + type = types.str; + description = "How frequently to change keys"; + }; }; }; + dnssecZones = (filterAttrs (n: v: if v ? dnssec then v.dnssec else false) zoneConfigs); + + dnssec = length (attrNames dnssecZones) != 0; + + signZones = optionalString dnssec '' + mkdir -p ${stateDir}/dnssec + chown ${username}:${username} ${stateDir}/dnssec + chmod 0600 ${stateDir}/dnssec + + ${concatStrings (mapAttrsToList signZone dnssecZones)} + ''; + signZone = name: zone: '' + ${pkgs.bind}/bin/dnssec-keymgr -g ${pkgs.bind}/bin/dnssec-keygen -s ${pkgs.bind}/bin/dnssec-settime -K ${stateDir}/dnssec -c ${policyFile name zone.dnssecPolicy} ${name} + ${pkgs.bind}/bin/dnssec-signzone -S -K ${stateDir}/dnssec -o ${name} -O full -N date ${stateDir}/zones/${name} + ${nsdPkg}/sbin/nsd-checkzone ${name} ${stateDir}/zones/${name}.signed && mv -v ${stateDir}/zones/${name}.signed ${stateDir}/zones/${name} + ''; + policyFile = name: policy: pkgs.writeText "${name}.policy" '' + zone ${name} { + algorithm ${policy.algorithm}; + key-size zsk ${toString policy.zsk.keySize}; + key-size ksk ${toString policy.ksk.keySize}; + keyttl ${policy.keyttl}; + pre-publish zsk ${policy.zsk.prePublish}; + pre-publish ksk ${policy.ksk.prePublish}; + post-publish zsk ${policy.zsk.postPublish}; + post-publish ksk ${policy.ksk.postPublish}; + roll-period zsk ${policy.zsk.rollPeriod}; + roll-period ksk ${policy.ksk.rollPeriod}; + coverage ${policy.coverage}; + }; + ''; in { # options are ordered alphanumerically @@ -380,6 +473,14 @@ in bind8Stats = mkEnableOption "BIND8 like statistics"; + dnssecInterval = mkOption { + type = types.str; + default = "1h"; + description = '' + How often to check whether dnssec key rollover is required + ''; + }; + extraConfig = mkOption { type = types.str; default = ""; @@ -741,7 +842,6 @@ in }; - zones = mkOption { type = types.attrsOf zoneOptions; default = {}; @@ -785,19 +885,24 @@ in serverGroup1. ''; }; - }; config = mkIf cfg.enable { + assertions = singleton { + assertion = zoneConfigs ? "." -> cfg.rootServer; + message = "You have a root zone configured. If this is really what you " + + "want, please enable 'services.nsd.rootServer'."; + }; + environment.systemPackages = [ nsdPkg ]; - users.extraGroups = singleton { + users.groups = singleton { name = username; gid = config.ids.gids.nsd; }; - users.extraUsers = singleton { + users.users = singleton { name = username; description = "NSD service user"; home = stateDir; @@ -832,9 +937,9 @@ in mkdir -m 0700 -p "${stateDir}/var" cat > "${stateDir}/don't touch anything in here" << EOF - Everything in this directory except NSD's state in var is - automatically generated and will be purged and redeployed - by the nsd.service pre-start script. + Everything in this directory except NSD's state in var and dnssec + is automatically generated and will be purged and redeployed by + the nsd.service pre-start script. EOF chown ${username}:${username} -R "${stateDir}/private" @@ -848,6 +953,34 @@ in ''; }; + nixpkgs.config = mkIf dnssec { + bind.enablePython = true; + }; + + systemd.timers."nsd-dnssec" = mkIf dnssec { + description = "Automatic DNSSEC key rollover"; + + wantedBy = [ "nsd.service" ]; + + timerConfig = { + OnActiveSec = cfg.dnssecInterval; + OnUnitActiveSec = cfg.dnssecInterval; + }; + }; + + systemd.services."nsd-dnssec" = mkIf dnssec { + description = "DNSSEC key rollover"; + + wantedBy = [ "nsd.service" ]; + before = [ "nsd.service" ]; + + script = signZones; + + postStop = '' + ${pkgs.systemd}/bin/systemctl kill -s SIGHUP nsd.service + ''; + }; + }; meta.maintainers = with lib.maintainers; [ hrdinka ]; diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix index 88e6dbf22b9e2b3da8de8591a091b11ec1a9a2ae..342350d49ab32089ea0311850881f781dc7ce79b 100644 --- a/nixos/modules/services/networking/ntpd.nix +++ b/nixos/modules/services/networking/ntpd.nix @@ -67,7 +67,7 @@ in environment.systemPackages = [ pkgs.ntp ]; services.timesyncd.enable = mkForce false; - users.extraUsers = singleton + users.users = singleton { name = ntpUser; uid = config.ids.uids.ntp; description = "NTP daemon user"; diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index 4864ecf3f92fe68de0eb600dd7c26611219d404c..613b0e0fb51a55d1d898345028812121ab2469e0 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -22,7 +22,7 @@ let Deny-IP=${concatStringsSep " " cfg.deniedIPRanges} ''; - nylonOpts = { name, config, ... }: { + nylonOpts = { name, ... }: { options = { @@ -151,7 +151,7 @@ in config = mkIf (length(enabledNylons) > 0) { - users.extraUsers.nylon = { + users.users.nylon = { group = "nylon"; description = "Nylon SOCKS Proxy"; home = homeDir; @@ -159,7 +159,7 @@ in uid = config.ids.uids.nylon; }; - users.extraGroups.nylon.gid = config.ids.gids.nylon; + users.groups.nylon.gid = config.ids.gids.nylon; systemd.services = fold (a: b: a // b) {} nylonUnits; diff --git a/nixos/modules/services/networking/ocserv.nix b/nixos/modules/services/networking/ocserv.nix new file mode 100644 index 0000000000000000000000000000000000000000..61473a9fabf90f9742b20c853686a52f5a635ae1 --- /dev/null +++ b/nixos/modules/services/networking/ocserv.nix @@ -0,0 +1,99 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + + cfg = config.services.ocserv; + +in + +{ + options.services.ocserv = { + enable = mkEnableOption "ocserv"; + + config = mkOption { + type = types.lines; + + description = '' + Configuration content to start an OCServ server. + + For a full configuration reference,please refer to the online documentation + (https://ocserv.gitlab.io/www/manual.html), the openconnect + recipes (https://github.com/openconnect/recipes) or `man ocserv`. + ''; + + example = '' + # configuration examples from $out/doc without explanatory comments. + # for a full reference please look at the installed man pages. + auth = "plain[passwd=./sample.passwd]" + tcp-port = 443 + udp-port = 443 + run-as-user = nobody + run-as-group = nogroup + socket-file = /var/run/ocserv-socket + server-cert = certs/server-cert.pem + server-key = certs/server-key.pem + keepalive = 32400 + dpd = 90 + mobile-dpd = 1800 + switch-to-tcp-timeout = 25 + try-mtu-discovery = false + cert-user-oid = 0.9.2342.19200300.100.1.1 + tls-priorities = "NORMAL:%SERVER_PRECEDENCE:%COMPAT:-VERS-SSL3.0" + auth-timeout = 240 + min-reauth-time = 300 + max-ban-score = 80 + ban-reset-time = 1200 + cookie-timeout = 300 + deny-roaming = false + rekey-time = 172800 + rekey-method = ssl + use-occtl = true + pid-file = /var/run/ocserv.pid + device = vpns + predictable-ips = true + default-domain = example.com + ipv4-network = 192.168.1.0 + ipv4-netmask = 255.255.255.0 + dns = 192.168.1.2 + ping-leases = false + route = 10.10.10.0/255.255.255.0 + route = 192.168.0.0/255.255.0.0 + no-route = 192.168.5.0/255.255.255.0 + cisco-client-compat = true + dtls-legacy = true + + [vhost:www.example.com] + auth = "certificate" + ca-cert = certs/ca.pem + server-cert = certs/server-cert-secp521r1.pem + server-key = cersts/certs/server-key-secp521r1.pem + ipv4-network = 192.168.2.0 + ipv4-netmask = 255.255.255.0 + cert-user-oid = 0.9.2342.19200300.100.1.1 + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.ocserv ]; + environment.etc."ocserv/ocserv.conf".text = cfg.config; + + security.pam.services.ocserv = {}; + + systemd.services.ocserv = { + description = "OpenConnect SSL VPN server"; + documentation = [ "man:ocserv(8)" ]; + after = [ "dbus.service" "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + PrivateTmp = true; + PIDFile = "/var/run/ocserv.pid"; + ExecStart = "${pkgs.ocserv}/bin/ocserv --foreground --pid-file /var/run/ocesrv.pid --config /etc/ocserv/ocserv.conf"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix index ba7acd879546dffd5ffbb20afb0333c15c0c8fd2..8cf34623ab5ed7ae10d3b1224ac0b24576435ac8 100644 --- a/nixos/modules/services/networking/oidentd.nix +++ b/nixos/modules/services/networking/oidentd.nix @@ -32,13 +32,13 @@ with lib; optionalString config.networking.enableIPv6 " -a ::"; }; - users.extraUsers.oidentd = { + users.users.oidentd = { description = "Ident Protocol daemon user"; group = "oidentd"; uid = config.ids.uids.oidentd; }; - users.extraGroups.oidentd.gid = config.ids.gids.oidentd; + users.groups.oidentd.gid = config.ids.gids.oidentd; }; diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix index 4bb9da54fe09a72b52da3e57d8c80986b13f9fad..57638ebc9c01842fcf1758d5b6f46b1ab93a902c 100644 --- a/nixos/modules/services/networking/openntpd.nix +++ b/nixos/modules/services/networking/openntpd.nix @@ -7,7 +7,7 @@ let package = pkgs.openntpd_nixos; - cfgFile = pkgs.writeText "openntpd.conf" '' + configFile = '' ${concatStringsSep "\n" (map (s: "server ${s}") cfg.servers)} ${cfg.extraConfig} ''; @@ -31,8 +31,8 @@ in type = with types; lines; default = ""; example = '' - listen on 127.0.0.1 - listen on ::1 + listen on 127.0.0.1 + listen on ::1 ''; description = '' Additional text appended to openntpd.conf. @@ -57,7 +57,9 @@ in # Add ntpctl to the environment for status checking environment.systemPackages = [ package ]; - users.extraUsers = singleton { + environment.etc."ntpd.conf".text = configFile; + + users.users = singleton { name = "ntp"; uid = config.ids.uids.ntp; description = "OpenNTP daemon user"; @@ -71,7 +73,7 @@ in before = [ "time-sync.target" ]; after = [ "dnsmasq.service" "bind.service" "network-online.target" ]; serviceConfig = { - ExecStart = "${package}/sbin/ntpd -f ${cfgFile} -p ${pidFile} ${cfg.extraOptions}"; + ExecStart = "${package}/sbin/ntpd -p ${pidFile} ${cfg.extraOptions}"; Type = "forking"; PIDFile = pidFile; }; diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 7a96b673c51e01c913be4f546054fdad31a7073d..b94b4026fd9146d520157cf70ddb6cb4842b9d04 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -65,7 +65,7 @@ let path = [ pkgs.iptables pkgs.iproute pkgs.nettools ]; - serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --config ${configFile}"; + serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}"; serviceConfig.Restart = "always"; serviceConfig.Type = "notify"; }; @@ -131,6 +131,9 @@ in Configuration of this OpenVPN instance. See openvpn8 for details. + + To import an external config file, use the following definition: + config = "config /path/to/config.ovpn" ''; }; diff --git a/nixos/modules/services/networking/owamp.nix b/nixos/modules/services/networking/owamp.nix new file mode 100644 index 0000000000000000000000000000000000000000..821a0258f4bece79ca3adf769c7bade2f201045b --- /dev/null +++ b/nixos/modules/services/networking/owamp.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.owamp; +in +{ + + ###### interface + + options = { + services.owamp.enable = mkEnableOption ''Enable OWAMP server''; + }; + + + ###### implementation + + config = mkIf cfg.enable { + users.users = singleton { + name = "owamp"; + group = "owamp"; + description = "Owamp daemon"; + }; + + users.groups = singleton { + name = "owamp"; + }; + + systemd.services.owamp = { + description = "Owamp server"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart="${pkgs.owamp}/bin/owampd -R /run/owamp -d /run/owamp -v -Z "; + PrivateTmp = true; + Restart = "always"; + Type="simple"; + User = "owamp"; + Group = "owamp"; + RuntimeDirectory = "owamp"; + StateDirectory = "owamp"; + AmbientCapabilities = "cap_net_bind_service"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index 26be72d2a61e894d2022b5bb04a9426645be1956..d07deb9dcc6786f8c5b87256f81a8ffacd6fb3cc 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -128,7 +128,7 @@ in { config = mkIf cfg.enable { - users.extraUsers."${username}" = { + users.users."${username}" = { home = dataDir; createHome = true; uid = config.ids.uids.pdns-recursor; diff --git a/nixos/modules/services/networking/pdnsd.nix b/nixos/modules/services/networking/pdnsd.nix index f4467b818958b2d9f62388b1626b21edb0c951e3..f5b174dd7b7b9cc24313489be7ac6dbb084f5c1f 100644 --- a/nixos/modules/services/networking/pdnsd.nix +++ b/nixos/modules/services/networking/pdnsd.nix @@ -62,14 +62,14 @@ in }; config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = pdnsdUser; uid = config.ids.uids.pdnsd; group = pdnsdGroup; description = "pdnsd user"; }; - users.extraGroups = singleton { + users.groups = singleton { name = pdnsdGroup; gid = config.ids.gids.pdnsd; }; diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix index 847fc88ead4c1fed3274c3d7a9741f9e7f5a2363..529115a1c6e146837d5ce4f2fe458bb3ee8839b3 100644 --- a/nixos/modules/services/networking/polipo.nix +++ b/nixos/modules/services/networking/polipo.nix @@ -85,7 +85,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = "polipo"; uid = config.ids.uids.polipo; description = "Polipo caching proxy user"; @@ -93,7 +93,7 @@ in createHome = true; }; - users.extraGroups = singleton + users.groups = singleton { name = "polipo"; gid = config.ids.gids.polipo; members = [ "polipo" ]; diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix index 513e6174752c1fe09bee8f9662b8c27afc55f80f..56a612b9105261d7674dbc62fa17a693163949b6 100644 --- a/nixos/modules/services/networking/pptpd.nix +++ b/nixos/modules/services/networking/pptpd.nix @@ -1,4 +1,4 @@ -{ config, stdenv, pkgs, lib, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index 8cd4a08235343aac6fc508424d5ffd577c572b96..f63f86496beee066c86d028545dfe90db3d4b23d 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -72,14 +72,14 @@ in config = mkIf config.services.prayer.enable { environment.systemPackages = [ prayer ]; - users.extraUsers = singleton + users.users = singleton { name = prayerUser; uid = config.ids.uids.prayer; description = "Prayer daemon user"; home = stateDir; }; - users.extraGroups = singleton + users.groups = singleton { name = prayerGroup; gid = config.ids.gids.prayer; }; diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index d57ebb61f6361e6ed50458d6f9bd16c89b279db4..a37ef98caec617e6d0a4485a55547d929dcda803 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -295,6 +295,24 @@ in ''; }; + dataDir = mkOption { + type = types.string; + description = "Directory where Prosody stores its data"; + default = "/var/lib/prosody"; + }; + + user = mkOption { + type = types.str; + default = "prosody"; + description = "User account under which prosody runs."; + }; + + group = mkOption { + type = types.str; + default = "prosody"; + description = "Group account under which prosody runs."; + }; + allowRegistration = mkOption { type = types.bool; default = false; @@ -421,11 +439,11 @@ in environment.etc."prosody/prosody.cfg.lua".text = '' - pidfile = "/var/lib/prosody/prosody.pid" + pidfile = "/run/prosody/prosody.pid" log = "*syslog" - data_path = "/var/lib/prosody" + data_path = "${cfg.dataDir}" plugin_paths = { ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.extraPluginPaths) } } @@ -469,15 +487,15 @@ in '') cfg.virtualHosts) } ''; - users.extraUsers.prosody = { + users.users.prosody = mkIf (cfg.user == "prosody") { uid = config.ids.uids.prosody; description = "Prosody user"; createHome = true; - group = "prosody"; - home = "/var/lib/prosody"; + inherit (cfg) group; + home = "${cfg.dataDir}"; }; - users.extraGroups.prosody = { + users.groups.prosody = mkIf (cfg.group == "prosody") { gid = config.ids.gids.prosody; }; @@ -488,9 +506,11 @@ in wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."prosody/prosody.cfg.lua".source ]; serviceConfig = { - User = "prosody"; + User = cfg.user; + Group = cfg.group; Type = "forking"; - PIDFile = "/var/lib/prosody/prosody.pid"; + RuntimeDirectory = [ "prosody" ]; + PIDFile = "/run/prosody/prosody.pid"; ExecStart = "${cfg.package}/bin/prosodyctl start"; }; }; diff --git a/nixos/modules/services/networking/quagga.nix b/nixos/modules/services/networking/quagga.nix index aab58cc77b90d4995004ec35b366f4b4fa8ab949..5acdd5af8f8f41b2b5e56cedec8ace1c341b871f 100644 --- a/nixos/modules/services/networking/quagga.nix +++ b/nixos/modules/services/networking/quagga.nix @@ -95,26 +95,25 @@ in { ###### interface - - options.services.quagga = + imports = [ { - - zebra = (serviceOptions "zebra") // { - - enable = mkOption { - type = types.bool; - default = any isEnabled services; - description = '' - Whether to enable the Zebra routing manager. - - The Zebra routing manager is automatically enabled - if any routing protocols are configured. - ''; + options.services.quagga = { + zebra = (serviceOptions "zebra") // { + enable = mkOption { + type = types.bool; + default = any isEnabled services; + description = '' + Whether to enable the Zebra routing manager. + + The Zebra routing manager is automatically enabled + if any routing protocols are configured. + ''; + }; }; - }; - - } // (genAttrs services serviceOptions); + } + { options.services.quagga = (genAttrs services serviceOptions); } + ]; ###### implementation @@ -133,7 +132,7 @@ in users.groups = { quagga = {}; # Members of the quaggavty group can use vtysh to inspect the Quagga daemons - quaggavty = {}; + quaggavty = { members = [ "quagga" ]; }; }; systemd.services = diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index bc7d6912b5ce24c233ece373a72f72fe7c7838a3..d850bb8b1305fa46cf22b35780c78e8157135578 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -72,14 +72,14 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == null) [ + users.users = mkIf (cfg.user == null) [ { name = "quassel"; description = "Quassel IRC client daemon"; group = "quassel"; uid = config.ids.uids.quassel; }]; - users.extraGroups = mkIf (cfg.user == null) [ + users.groups = mkIf (cfg.user == null) [ { name = "quassel"; gid = config.ids.gids.quassel; }]; diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index 391f4bdebbabbb3b466738233e94bff01f981586..d6fabbcd47001dfa90f75bd1de9a79acaeceb760 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -59,7 +59,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton + users.users = singleton { name = "radicale"; uid = config.ids.uids.radicale; description = "radicale user"; @@ -67,7 +67,7 @@ in createHome = true; }; - users.extraGroups = singleton + users.groups = singleton { name = "radicale"; gid = config.ids.gids.radicale; }; diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index 85d7f9e4a41b8afc76c9536bbaa310a95d75da57..020faa34922a2ae12709faf32924e9f2bb5cfb7f 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -52,7 +52,7 @@ in config = mkIf cfg.enable { - users.extraUsers.radvd = + users.users.radvd = { uid = config.ids.uids.radvd; description = "Router Advertisement Daemon User"; }; diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix index a102242eae715819b7379e123c1dac29929f7113..887772f6e5f0ca4dcaa4fb780f837328461e7bed 100644 --- a/nixos/modules/services/networking/rdnssd.nix +++ b/nixos/modules/services/networking/rdnssd.nix @@ -64,7 +64,7 @@ in }; }; - users.extraUsers.rdnssd = { + users.users.rdnssd = { description = "RDNSSD Daemon User"; uid = config.ids.uids.rdnssd; }; diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index 2956a5ecbc0405fba70991f22a3e8a5fe98f92b4..ee7f82ac7bee162c080648219cd77f117ae4fc25 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -236,7 +236,7 @@ in } ]; - users.extraUsers.rslsync = { + users.users.rslsync = { description = "Resilio Sync Service user"; home = cfg.storagePath; createHome = true; @@ -244,7 +244,7 @@ in group = "rslsync"; }; - users.extraGroups = [ { name = "rslsync"; } ]; + users.groups = [ { name = "rslsync"; } ]; systemd.services.resilio = with pkgs; { description = "Resilio Sync Service"; diff --git a/nixos/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix index cddcb09054e0528be3fc7f40f8f2079fb087b478..0a5df6987092ad567d61765006fcc2fa445c3604 100644 --- a/nixos/modules/services/networking/rpcbind.nix +++ b/nixos/modules/services/networking/rpcbind.nix @@ -37,7 +37,7 @@ with lib; wantedBy = [ "multi-user.target" ]; }; - users.extraUsers.rpc = { + users.users.rpc = { group = "nogroup"; uid = config.ids.uids.rpc; }; diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix index cacf753fdcd7c45482c5d7b25abadea0205aa91e..62b24d4377f8ac28badff820242f2a01c871c0e8 100644 --- a/nixos/modules/services/networking/sabnzbd.nix +++ b/nixos/modules/services/networking/sabnzbd.nix @@ -41,7 +41,7 @@ in config = mkIf cfg.enable { - users.extraUsers.sabnzbd = { + users.users.sabnzbd = { uid = config.ids.uids.sabnzbd; group = "sabnzbd"; description = "sabnzbd user"; @@ -49,7 +49,7 @@ in createHome = true; }; - users.extraGroups.sabnzbd = { + users.groups.sabnzbd = { gid = config.ids.gids.sabnzbd; }; diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index c7a128ae212dea77c06c512558f154686d787c2b..9412d0ef8a62e37a58f2e2ac1fb85e508ac2b323 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -47,14 +47,14 @@ in config = mkIf config.services.searx.enable { - users.extraUsers.searx = + users.users.searx = { uid = config.ids.uids.searx; description = "Searx user"; createHome = true; home = "/var/lib/searx"; }; - users.extraGroups.searx = + users.groups.searx = { gid = config.ids.gids.searx; }; diff --git a/nixos/modules/services/networking/seeks.nix b/nixos/modules/services/networking/seeks.nix index f5bc60be34576789c1da201f20be5c451fe543be..40729225b6d0a37d54306e711b845c3909ca8d19 100644 --- a/nixos/modules/services/networking/seeks.nix +++ b/nixos/modules/services/networking/seeks.nix @@ -46,14 +46,14 @@ in config = mkIf config.services.seeks.enable { - users.extraUsers.seeks = + users.users.seeks = { uid = config.ids.uids.seeks; description = "Seeks user"; createHome = true; home = "/var/lib/seeks"; }; - users.extraGroups.seeks = + users.groups.seeks = { gid = config.ids.gids.seeks; }; diff --git a/nixos/modules/services/networking/shadowsocks.nix b/nixos/modules/services/networking/shadowsocks.nix new file mode 100644 index 0000000000000000000000000000000000000000..fe6d65a5f963a30872c3cda669f3297355c063d1 --- /dev/null +++ b/nixos/modules/services/networking/shadowsocks.nix @@ -0,0 +1,112 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.shadowsocks; + + opts = { + server = cfg.localAddress; + server_port = cfg.port; + method = cfg.encryptionMethod; + mode = cfg.mode; + user = "nobody"; + fast_open = true; + } // optionalAttrs (cfg.password != null) { password = cfg.password; }; + + configFile = pkgs.writeText "shadowsocks.json" (builtins.toJSON opts); + +in + +{ + + ###### interface + + options = { + + services.shadowsocks = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run shadowsocks-libev shadowsocks server. + ''; + }; + + localAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + Local address to which the server binds. + ''; + }; + + port = mkOption { + type = types.int; + default = 8388; + description = '' + Port which the server uses. + ''; + }; + + password = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Password for connecting clients. + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Password file with a password for connecting clients. + ''; + }; + + mode = mkOption { + type = types.enum [ "tcp_only" "tcp_and_udp" "udp_only" ]; + default = "tcp_and_udp"; + description = '' + Relay protocols. + ''; + }; + + encryptionMethod = mkOption { + type = types.str; + default = "chacha20-ietf-poly1305"; + description = '' + Encryption method. See . + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + assertions = singleton + { assertion = cfg.password == null || cfg.passwordFile == null; + message = "Cannot use both password and passwordFile for shadowsocks-libev"; + }; + + systemd.services.shadowsocks-libev = { + description = "shadowsocks-libev Daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.shadowsocks-libev ] ++ optional (cfg.passwordFile != null) pkgs.jq; + serviceConfig.PrivateTmp = true; + script = '' + ${optionalString (cfg.passwordFile != null) '' + cat ${configFile} | jq --arg password "$(cat "${cfg.passwordFile}")" '. + { password: $password }' > /tmp/shadowsocks.json + ''} + exec ss-server -c ${if cfg.passwordFile != null then "/tmp/shadowsocks.json" else configFile} + ''; + }; + }; +} diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index 908de9efd6fb7e378dff08cb007e86e7b8884148..0b87140b0d8db07c838b6d65fe2f2520969624cc 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -55,7 +55,7 @@ in services.avahi.publish.enable = true; services.avahi.publish.userServices = true; - users.extraUsers = singleton + users.users = singleton { name = cfg.user; description = "Shairport user"; isSystemUser = true; diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index 3664c28577397e7243beeabba92a11f095ab439a..1ea676d0f9299a6025d348d046a8dc6df9510a8a 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, options, ... }: +{ pkgs, lib, config, ... }: with lib; @@ -82,7 +82,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "shout"; uid = config.ids.uids.shout; description = "Shout daemon user"; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index c5c131cb4c5095b5314cbe3a1609a09715eca7b4..9ba6e48f417ce4a1e4996c24a66834a33db38671 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -278,7 +278,7 @@ in "fping6".source = "${pkgs.fping}/bin/fping6"; }; environment.systemPackages = [ pkgs.fping ]; - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; isNormalUser = false; isSystemUser = true; diff --git a/nixos/modules/services/networking/sniproxy.nix b/nixos/modules/services/networking/sniproxy.nix index 4d0f36923293abd1f3982a12146a089a5fe04b3f..0345c12d3afebbf4aa3e9fe4619c3dea42b242b9 100644 --- a/nixos/modules/services/networking/sniproxy.nix +++ b/nixos/modules/services/networking/sniproxy.nix @@ -82,14 +82,14 @@ in }; }; - users.extraUsers = mkIf (cfg.user == "sniproxy") { + users.users = mkIf (cfg.user == "sniproxy") { sniproxy = { group = cfg.group; uid = config.ids.uids.sniproxy; }; }; - users.extraGroups = mkIf (cfg.group == "sniproxy") { + users.groups = mkIf (cfg.group == "sniproxy") { sniproxy = { gid = config.ids.gids.sniproxy; }; diff --git a/nixos/modules/services/networking/spiped.nix b/nixos/modules/services/networking/spiped.nix index 005d7182351ab08eff8f8e90923b0b6d8d25e1ae..e60d9abf42a6620b97ad1ca775c0638675d5d0a9 100644 --- a/nixos/modules/services/networking/spiped.nix +++ b/nixos/modules/services/networking/spiped.nix @@ -171,8 +171,8 @@ in message = "A pipe must either encrypt or decrypt"; }) cfg.config; - users.extraGroups.spiped.gid = config.ids.gids.spiped; - users.extraUsers.spiped = { + users.groups.spiped.gid = config.ids.gids.spiped; + users.users.spiped = { description = "Secure Pipe Service user"; group = "spiped"; uid = config.ids.uids.spiped; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index e50c4dbacf36fd85172f6b9f45cc9e9729ec7a30..c16fbe8a52fa2450c0d8b6885515612c67509faf 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -49,7 +49,7 @@ let ${concatMapStrings (f: readFile f + "\n") u.openssh.authorizedKeys.keyFiles} ''; }; - usersWithKeys = attrValues (flip filterAttrs config.users.extraUsers (n: u: + usersWithKeys = attrValues (flip filterAttrs config.users.users (n: u: length u.openssh.authorizedKeys.keys != 0 || length u.openssh.authorizedKeys.keyFiles != 0 )); in listToAttrs (map mkAuthKeyFile usersWithKeys); @@ -198,6 +198,10 @@ in [ { type = "rsa"; bits = 4096; path = "/etc/ssh/ssh_host_rsa_key"; } { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; } ]; + example = + [ { type = "rsa"; bits = 4096; path = "/etc/ssh/ssh_host_rsa_key"; rounds = 100; openSSHFormat = true; } + { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; rounds = 100; comment = "key comment"; } + ]; description = '' NixOS can automatically generate SSH host keys. This option specifies the path, type and size of each key. See @@ -213,6 +217,90 @@ in description = "Files from which authorized keys are read."; }; + kexAlgorithms = mkOption { + type = types.listOf types.str; + default = [ + "curve25519-sha256@libssh.org" + "diffie-hellman-group-exchange-sha256" + ]; + description = '' + Allowed key exchange algorithms + + + Defaults to recommended settings from both + + and + + ''; + }; + + ciphers = mkOption { + type = types.listOf types.str; + default = [ + "chacha20-poly1305@openssh.com" + "aes256-gcm@openssh.com" + "aes128-gcm@openssh.com" + "aes256-ctr" + "aes192-ctr" + "aes128-ctr" + ]; + description = '' + Allowed ciphers + + + Defaults to recommended settings from both + + and + + ''; + }; + + macs = mkOption { + type = types.listOf types.str; + default = [ + "hmac-sha2-512-etm@openssh.com" + "hmac-sha2-256-etm@openssh.com" + "umac-128-etm@openssh.com" + "hmac-sha2-512" + "hmac-sha2-256" + "umac-128@openssh.com" + ]; + description = '' + Allowed MACs + + + Defaults to recommended settings from both + + and + + ''; + }; + + logLevel = mkOption { + type = types.enum [ "QUIET" "FATAL" "ERROR" "INFO" "VERBOSE" "DEBUG" "DEBUG1" "DEBUG2" "DEBUG3" ]; + default = "VERBOSE"; + description = '' + Gives the verbosity level that is used when logging messages from sshd(8). The possible values are: + QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3. The default is VERBOSE. DEBUG and DEBUG1 + are equivalent. DEBUG2 and DEBUG3 each specify higher levels of debugging output. Logging with a DEBUG level + violates the privacy of users and is not recommended. + + LogLevel VERBOSE logs user's key fingerprint on login. + Needed to have a clear audit track of which key was used to log in. + ''; + }; + + useDns = mkOption { + type = types.bool; + default = false; + description = '' + Specifies whether sshd(8) should look up the remote host name, and to check that the resolved host name for + the remote IP address maps back to the very same IP address. + If this option is set to no (the default) then only addresses and not host names may be used in + ~/.ssh/authorized_keys from and sshd_config Match Host directives. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -242,7 +330,7 @@ in config = mkIf cfg.enable { - users.extraUsers.sshd = + users.users.sshd = { isSystemUser = true; description = "SSH privilege separation user"; }; @@ -250,7 +338,9 @@ in services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli"; environment.etc = authKeysFiles // - { "ssh/moduli".source = cfg.moduliFile; }; + { "ssh/moduli".source = cfg.moduliFile; + "ssh/sshd_config".text = cfg.extraConfig; + }; systemd = let @@ -272,7 +362,14 @@ in ${flip concatMapStrings cfg.hostKeys (k: '' if ! [ -f "${k.path}" ]; then - ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N "" + ssh-keygen \ + -t "${k.type}" \ + ${if k ? bits then "-b ${toString k.bits}" else ""} \ + ${if k ? rounds then "-a ${toString k.rounds}" else ""} \ + ${if k ? comment then "-C '${k.comment}'" else ""} \ + ${if k ? openSSHFormat && k.openSSHFormat then "-o" else ""} \ + -f "${k.path}" \ + -N "" fi '')} ''; @@ -281,7 +378,7 @@ in { ExecStart = (optionalString cfg.startWhenNeeded "-") + "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") + - "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}"; + "-f /etc/ssh/sshd_config"; KillMode = "process"; } // (if cfg.startWhenNeeded then { StandardInput = "socket"; @@ -318,6 +415,9 @@ in unixAuth = cfg.passwordAuthentication; }; + # These values are merged with the ones defined externally, see: + # https://github.com/NixOS/nixpkgs/pull/10155 + # https://github.com/NixOS/nixpkgs/pull/41745 services.openssh.authorizedKeysFiles = [ ".ssh/authorized_keys" ".ssh/authorized_keys2" "/etc/ssh/authorized_keys.d/%u" ]; @@ -363,23 +463,23 @@ in HostKey ${k.path} '')} - ### Recommended settings from both: - # https://stribika.github.io/2015/01/04/secure-secure-shell.html - # and - # https://wiki.mozilla.org/Security/Guidelines/OpenSSH#Modern_.28OpenSSH_6.7.2B.29 + KexAlgorithms ${concatStringsSep "," cfg.kexAlgorithms} + Ciphers ${concatStringsSep "," cfg.ciphers} + MACs ${concatStringsSep "," cfg.macs} - KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256 - Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr - MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com + LogLevel ${cfg.logLevel} + + ${if cfg.useDns then '' + UseDNS yes + '' else '' + UseDNS no + ''} - # LogLevel VERBOSE logs user's key fingerprint on login. - # Needed to have a clear audit track of which key was used to log in. - LogLevel VERBOSE ''; assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; message = "cannot enable X11 forwarding without setting xauth location";}] - ++ flip map cfg.listenAddresses ({ addr, port, ... }: { + ++ flip map cfg.listenAddresses ({ addr, ... }: { assertion = addr != null; message = "addr must be specified in each listenAddresses entry"; }); diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix index e3d65c49fbf20eb39435bcaa41786e6c86ba399f..0222e8ce8b584d4935a32bad168beb159d3e44f5 100644 --- a/nixos/modules/services/networking/sslh.nix +++ b/nixos/modules/services/networking/sslh.nix @@ -4,15 +4,14 @@ with lib; let cfg = config.services.sslh; + user = "sslh"; configFile = pkgs.writeText "sslh.conf" '' verbose: ${boolToString cfg.verbose}; foreground: true; inetd: false; numeric: false; - transparent: false; + transparent: ${boolToString cfg.transparent}; timeout: "${toString cfg.timeout}"; - user: "nobody"; - pidfile: "${cfg.pidfile}"; listen: ( @@ -50,16 +49,16 @@ in description = "Timeout in seconds."; }; - pidfile = mkOption { - type = types.path; - default = "/run/sslh.pid"; - description = "PID file path for sslh daemon."; + transparent = mkOption { + type = types.bool; + default = false; + description = "Will the services behind sslh (Apache, sshd and so on) see the external IP and ports as if the external world connected directly to them"; }; listenAddress = mkOption { type = types.str; - default = config.networking.hostName; - description = "Listening hostname."; + default = "0.0.0.0"; + description = "Listening address or hostname."; }; port = mkOption { @@ -76,14 +75,91 @@ in }; }; - config = mkIf cfg.enable { - systemd.services.sslh = { - description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.sslh}/bin/sslh -F${configFile}"; - serviceConfig.KillMode = "process"; - serviceConfig.PIDFile = "${cfg.pidfile}"; - }; - }; + config = mkMerge [ + (mkIf cfg.enable { + users.users.${user} = { + description = "sslh daemon user"; + isSystemUser = true; + }; + + systemd.services.sslh = { + description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = user; + Group = "nogroup"; + PermissionsStartOnly = true; + Restart = "always"; + RestartSec = "1s"; + ExecStart = "${pkgs.sslh}/bin/sslh -F${configFile}"; + KillMode = "process"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE CAP_NET_ADMIN CAP_SETGID CAP_SETUID"; + PrivateTmp = true; + PrivateDevices = true; + ProtectSystem = "full"; + ProtectHome = true; + }; + }; + }) + + # code from https://github.com/yrutschle/sslh#transparent-proxy-support + # the only difference is using iptables mark 0x2 instead of 0x1 to avoid conflicts with nixos/nat module + (mkIf (cfg.enable && cfg.transparent) { + # Set route_localnet = 1 on all interfaces so that ssl can use "localhost" as destination + boot.kernel.sysctl."net.ipv4.conf.default.route_localnet" = 1; + boot.kernel.sysctl."net.ipv4.conf.all.route_localnet" = 1; + + systemd.services.sslh = let + iptablesCommands = [ + # DROP martian packets as they would have been if route_localnet was zero + # Note: packets not leaving the server aren't affected by this, thus sslh will still work + { table = "raw"; command = "PREROUTING ! -i lo -d 127.0.0.0/8 -j DROP"; } + { table = "mangle"; command = "POSTROUTING ! -o lo -s 127.0.0.0/8 -j DROP"; } + # Mark all connections made by ssl for special treatment (here sslh is run as user ${user}) + { table = "nat"; command = "OUTPUT -m owner --uid-owner ${user} -p tcp --tcp-flags FIN,SYN,RST,ACK SYN -j CONNMARK --set-xmark 0x02/0x0f"; } + # Outgoing packets that should go to sslh instead have to be rerouted, so mark them accordingly (copying over the connection mark) + { table = "mangle"; command = "OUTPUT ! -o lo -p tcp -m connmark --mark 0x02/0x0f -j CONNMARK --restore-mark --mask 0x0f"; } + ]; + ip6tablesCommands = [ + { table = "raw"; command = "PREROUTING ! -i lo -d ::1/128 -j DROP"; } + { table = "mangle"; command = "POSTROUTING ! -o lo -s ::1/128 -j DROP"; } + { table = "nat"; command = "OUTPUT -m owner --uid-owner ${user} -p tcp --tcp-flags FIN,SYN,RST,ACK SYN -j CONNMARK --set-xmark 0x02/0x0f"; } + { table = "mangle"; command = "OUTPUT ! -o lo -p tcp -m connmark --mark 0x02/0x0f -j CONNMARK --restore-mark --mask 0x0f"; } + ]; + in { + path = [ pkgs.iptables pkgs.iproute pkgs.procps ]; + + preStart = '' + # Cleanup old iptables entries which might be still there + ${concatMapStringsSep "\n" ({table, command}: "while iptables -w -t ${table} -D ${command} 2>/dev/null; do echo; done") iptablesCommands} + ${concatMapStringsSep "\n" ({table, command}: "iptables -w -t ${table} -A ${command}" ) iptablesCommands} + + # Configure routing for those marked packets + ip rule add fwmark 0x2 lookup 100 + ip route add local 0.0.0.0/0 dev lo table 100 + + '' + optionalString config.networking.enableIPv6 '' + ${concatMapStringsSep "\n" ({table, command}: "while ip6tables -w -t ${table} -D ${command} 2>/dev/null; do echo; done") ip6tablesCommands} + ${concatMapStringsSep "\n" ({table, command}: "ip6tables -w -t ${table} -A ${command}" ) ip6tablesCommands} + + ip -6 rule add fwmark 0x2 lookup 100 + ip -6 route add local ::/0 dev lo table 100 + ''; + + postStop = '' + ${concatMapStringsSep "\n" ({table, command}: "iptables -w -t ${table} -D ${command}") iptablesCommands} + + ip rule del fwmark 0x2 lookup 100 + ip route del local 0.0.0.0/0 dev lo table 100 + '' + optionalString config.networking.enableIPv6 '' + ${concatMapStringsSep "\n" ({table, command}: "ip6tables -w -t ${table} -D ${command}") ip6tablesCommands} + + ip -6 rule del fwmark 0x2 lookup 100 + ip -6 route del local ::/0 dev lo table 100 + ''; + }; + }) + ]; } diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix new file mode 100644 index 0000000000000000000000000000000000000000..d770094960b29e7281ce5a7677e49dcdfd92b18f --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -0,0 +1,82 @@ +{ config, lib, pkgs, ... }: + +with lib; +with (import ./param-lib.nix lib); + +let + cfg = config.services.strongswan-swanctl; + swanctlParams = import ./swanctl-params.nix lib; +in { + options.services.strongswan-swanctl = { + enable = mkEnableOption "strongswan-swanctl service"; + + package = mkOption { + type = types.package; + default = pkgs.strongswan; + defaultText = "pkgs.strongswan"; + description = '' + The strongswan derivation to use. + ''; + }; + + strongswan.extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Contents of the strongswan.conf file. + ''; + }; + + swanctl = paramsToOptions swanctlParams; + }; + + config = mkIf cfg.enable { + + assertions = [ + { assertion = !config.services.strongswan.enable; + message = "cannot enable both services.strongswan and services.strongswan-swanctl. Choose either one."; + } + ]; + + environment.etc."swanctl/swanctl.conf".text = + paramsToConf cfg.swanctl swanctlParams; + + # The swanctl command complains when the following directories don't exist: + # See: https://wiki.strongswan.org/projects/strongswan/wiki/Swanctldirectory + system.activationScripts.strongswan-swanctl-etc = stringAfter ["etc"] '' + mkdir -p '/etc/swanctl/x509' # Trusted X.509 end entity certificates + mkdir -p '/etc/swanctl/x509ca' # Trusted X.509 Certificate Authority certificates + mkdir -p '/etc/swanctl/x509ocsp' + mkdir -p '/etc/swanctl/x509aa' # Trusted X.509 Attribute Authority certificates + mkdir -p '/etc/swanctl/x509ac' # Attribute Certificates + mkdir -p '/etc/swanctl/x509crl' # Certificate Revocation Lists + mkdir -p '/etc/swanctl/pubkey' # Raw public keys + mkdir -p '/etc/swanctl/private' # Private keys in any format + mkdir -p '/etc/swanctl/rsa' # PKCS#1 encoded RSA private keys + mkdir -p '/etc/swanctl/ecdsa' # Plain ECDSA private keys + mkdir -p '/etc/swanctl/bliss' + mkdir -p '/etc/swanctl/pkcs8' # PKCS#8 encoded private keys of any type + mkdir -p '/etc/swanctl/pkcs12' # PKCS#12 containers + ''; + + systemd.services.strongswan-swanctl = { + description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" "keys.target" ]; + wants = [ "keys.target" ]; + path = with pkgs; [ kmod iproute iptables utillinux ]; + environment.STRONGSWAN_CONF = pkgs.writeTextFile { + name = "strongswan.conf"; + text = cfg.strongswan.extraConfig; + }; + restartTriggers = [ config.environment.etc."swanctl/swanctl.conf".source ]; + serviceConfig = { + ExecStart = "${cfg.package}/sbin/charon-systemd"; + Type = "notify"; + ExecStartPost = "${cfg.package}/sbin/swanctl --load-all --noprompt"; + ExecReload = "${cfg.package}/sbin/swanctl --reload"; + Restart = "on-abnormal"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix new file mode 100644 index 0000000000000000000000000000000000000000..5e74a96664f0671e6ff6786097ef6d42ed7243fd --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -0,0 +1,162 @@ +# In the following context a parameter is an attribute set that +# contains a NixOS option and a render function. It also contains the +# attribute: '_type = "param"' so we can distinguish it from other +# sets. +# +# The render function is used to convert the value of the option to a +# snippet of strongswan.conf. Most parameters simply render their +# value to a string. For example, take the following parameter: +# +# threads = mkIntParam 10 "Threads to use for request handling."; +# +# When a users defines the corresponding option as for example: +# +# services.strongswan-swanctl.strongswan.threads = 32; +# +# It will get rendered to the following snippet in strongswan.conf: +# +# threads = 32 +# +# Some parameters however need to be able to change the attribute +# name. For example, take the following parameter: +# +# id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") "..."; +# +# A user can define the corresponding option as for example: +# +# id = { +# "foo" = "bar"; +# "baz" = "qux"; +# }; +# +# This will get rendered to the following snippet: +# +# foo-id = bar +# baz-id = qux +# +# For this reason the render function is not simply a function from +# value -> string but a function from a value to an attribute set: +# { "${name}" = string }. This allows parameters to change the attribute +# name like in the previous example. + +lib : + +with lib; +with (import ./param-lib.nix lib); + +rec { + mkParamOfType = type : strongswanDefault : description : { + _type = "param"; + option = mkOption { + type = types.nullOr type; + default = null; + description = documentDefault description strongswanDefault; + }; + render = single toString; + }; + + documentDefault = description : strongswanDefault : + if isNull strongswanDefault + then description + else description + '' + + StrongSwan default: + ''; + + single = f: name: value: { "${name}" = f value; }; + + mkStrParam = mkParamOfType types.str; + mkOptionalStrParam = mkStrParam null; + + mkEnumParam = values : mkParamOfType (types.enum values); + + mkIntParam = mkParamOfType types.int; + mkOptionalIntParam = mkIntParam null; + + # We should have floats in Nix... + mkFloatParam = mkStrParam; + + # TODO: Check for hex format: + mkHexParam = mkStrParam; + mkOptionalHexParam = mkOptionalStrParam; + + # TODO: Check for duration format: + mkDurationParam = mkStrParam; + mkOptionalDurationParam = mkOptionalStrParam; + + mkYesNoParam = strongswanDefault : description : { + _type = "param"; + option = mkOption { + type = types.nullOr types.bool; + default = null; + description = documentDefault description strongswanDefault; + }; + render = single (b: if b then "yes" else "no"); + }; + yes = true; + no = false; + + mkSpaceSepListParam = mkSepListParam " "; + mkCommaSepListParam = mkSepListParam ","; + + mkSepListParam = sep : strongswanDefault : description : { + _type = "param"; + option = mkOption { + type = types.nullOr (types.listOf types.str); + default = null; + description = documentDefault description strongswanDefault; + }; + render = single (value: concatStringsSep sep value); + }; + + mkAttrsOfParams = params : + mkAttrsOf params (types.submodule {options = paramsToOptions params;}); + + mkAttrsOfParam = param : + mkAttrsOf param param.option.type; + + mkAttrsOf = param : option : description : { + _type = "param"; + option = mkOption { + type = types.attrsOf option; + default = {}; + inherit description; + }; + render = single (attrs: + (paramsToRenderedStrings attrs + (mapAttrs (_n: _v: param) attrs))); + }; + + mkPrefixedAttrsOfParams = params : + mkPrefixedAttrsOf params (types.submodule {options = paramsToOptions params;}); + + mkPrefixedAttrsOfParam = param : + mkPrefixedAttrsOf param param.option.type; + + mkPrefixedAttrsOf = p : option : description : { + _type = "param"; + option = mkOption { + type = types.attrsOf option; + default = {}; + inherit description; + }; + render = prefix: attrs: + let prefixedAttrs = mapAttrs' (name: nameValuePair "${prefix}-${name}") attrs; + in paramsToRenderedStrings prefixedAttrs + (mapAttrs (_n: _v: p) prefixedAttrs); + }; + + mkPostfixedAttrsOfParams = params : description : { + _type = "param"; + option = mkOption { + type = types.attrsOf (types.submodule {options = paramsToOptions params;}); + default = {}; + inherit description; + }; + render = postfix: attrs: + let postfixedAttrs = mapAttrs' (name: nameValuePair "${name}-${postfix}") attrs; + in paramsToRenderedStrings postfixedAttrs + (mapAttrs (_n: _v: params) postfixedAttrs); + }; + +} diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix new file mode 100644 index 0000000000000000000000000000000000000000..fb87e81f32151e9b506bc717cb6063f7833b898a --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix @@ -0,0 +1,82 @@ +lib : + +with lib; + +rec { + paramsToConf = cfg : ps : mkConf 0 (paramsToRenderedStrings cfg ps); + + # mkConf takes an indentation level (which usually starts at 0) and a nested + # attribute set of strings and will render that set to a strongswan.conf style + # configuration format. For example: + # + # mkConf 0 {a = "1"; b = { c = { "foo" = "2"; "bar" = "3"; }; d = "4";};} => '' + # a = 1 + # b { + # c { + # foo = 2 + # bar = 3 + # } + # d = 4 + # }'' + mkConf = indent : ps : + concatMapStringsSep "\n" + (name: + let value = ps."${name}"; + indentation = replicate indent " "; + in + indentation + ( + if isAttrs value + then "${name} {\n" + + mkConf (indent + 2) value + "\n" + + indentation + "}" + else "${name} = ${value}" + ) + ) + (attrNames ps); + + replicate = n : c : concatStrings (builtins.genList (_x : c) n); + + # `paramsToRenderedStrings cfg ps` converts the NixOS configuration `cfg` + # (typically the "config" argument of a NixOS module) and the set of + # parameters `ps` (an attribute set where the values are constructed using the + # parameter constructors in ./param-constructors.nix) to a nested attribute + # set of strings (rendered parameters). + paramsToRenderedStrings = cfg : ps : + filterEmptySets ( + (mapParamsRecursive (path: name: param: + let value = attrByPath path null cfg; + in optionalAttrs (!isNull value) (param.render name value) + ) ps)); + + filterEmptySets = set : filterAttrs (n: v: !(isNull v)) (mapAttrs (name: value: + if isAttrs value + then let value' = filterEmptySets value; + in if value' == {} + then null + else value' + else value + ) set); + + # Recursively map over every parameter in the given attribute set. + mapParamsRecursive = mapAttrsRecursiveCond' (as: (!(as ? "_type" && as._type == "param"))); + + mapAttrsRecursiveCond' = cond: f: set: + let + recurse = path: set: + let + g = + name: value: + if isAttrs value && cond value + then { "${name}" = recurse (path ++ [name]) value; } + else f (path ++ [name]) name value; + in mapAttrs'' g set; + in recurse [] set; + + mapAttrs'' = f: set: + foldl' (a: b: a // b) {} (map (attr: f attr set.${attr}) (attrNames set)); + + # Extract the options from the given set of parameters. + paramsToOptions = ps : + mapParamsRecursive (_path: name: param: { "${name}" = param.option; }) ps; + +} diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix new file mode 100644 index 0000000000000000000000000000000000000000..b16d299917fee9191f1741deed224d5c443e3f25 --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -0,0 +1,1171 @@ +# See: https://wiki.strongswan.org/projects/strongswan/wiki/Swanctlconf +# +# When strongSwan is upgraded please update the parameters in this file. You can +# see which parameters should be deleted, changed or added by diffing +# swanctl.opt: +# +# git clone https://github.com/strongswan/strongswan.git +# cd strongswan +# git diff 5.5.3..5.6.0 src/swanctl/swanctl.opt + +lib: with (import ./param-constructors.nix lib); + +let + certParams = { + file = mkOptionalStrParam '' + Absolute path to the certificate to load. Passed as-is to the daemon, so + it must be readable by it. + + Configure either this or , but not both, in one section. + ''; + + handle = mkOptionalHexParam '' + Hex-encoded CKA_ID or handle of the certificate on a token or TPM, + respectively. + + Configure either this or , but not both, in one section. + ''; + + slot = mkOptionalIntParam '' + Optional slot number of the token that stores the certificate. + ''; + + module = mkOptionalStrParam '' + Optional PKCS#11 module name. + ''; + }; +in { + authorities = mkAttrsOfParams ({ + + cacert = mkOptionalStrParam '' + The certificates may use a relative path from the swanctl + x509ca directory or an absolute path. + + Configure one of , + , or + per section. + ''; + + cert_uri_base = mkOptionalStrParam '' + Defines the base URI for the Hash and URL feature supported by + IKEv2. Instead of exchanging complete certificates, IKEv2 allows one to + send an URI that resolves to the DER encoded certificate. The certificate + URIs are built by appending the SHA1 hash of the DER encoded certificates + to this base URI. + ''; + + crl_uris = mkCommaSepListParam [] '' + List of CRL distribution points (ldap, http, or file URI). + ''; + + ocsp_uris = mkCommaSepListParam [] '' + List of OCSP URIs. + ''; + + } // certParams) '' + Section defining complementary attributes of certification authorities, each + in its own subsection with an arbitrary yet unique name + ''; + + connections = mkAttrsOfParams { + + version = mkIntParam 0 '' + IKE major version to use for connection. + + 1 uses IKEv1 aka ISAKMP, + 2 uses IKEv2. + A connection using the default of 0 accepts both IKEv1 and IKEv2 as + responder, and initiates the connection actively with IKEv2. + + ''; + + local_addrs = mkCommaSepListParam [] '' + Local address(es) to use for IKE communication. Takes + single IPv4/IPv6 addresses, DNS names, CIDR subnets or IP address ranges. + + As initiator, the first non-range/non-subnet is used to initiate the + connection from. As responder, the local destination address must match at + least to one of the specified addresses, subnets or ranges. + + If FQDNs are assigned they are resolved every time a configuration lookup + is done. If DNS resolution times out, the lookup is delayed for that time. + ''; + + remote_addrs = mkCommaSepListParam [] '' + Remote address(es) to use for IKE communication. Takes + single IPv4/IPv6 addresses, DNS names, CIDR subnets or IP address ranges. + + As initiator, the first non-range/non-subnet is used to initiate the + connection to. As responder, the initiator source address must match at + least to one of the specified addresses, subnets or ranges. + + If FQDNs are assigned they are resolved every time a configuration lookup + is done. If DNS resolution times out, the lookup is delayed for that time. + To initiate a connection, at least one specific address or DNS name must + be specified. + ''; + + local_port = mkIntParam 500 '' + Local UDP port for IKE communication. By default the port of the socket + backend is used, which is usually 500. If port + 500 is used, automatic IKE port floating to port + 4500 is used to work around NAT issues. + + Using a non-default local IKE port requires support from the socket + backend in use (socket-dynamic). + ''; + + remote_port = mkIntParam 500 '' + Remote UDP port for IKE communication. If the default of port + 500 is used, automatic IKE port floating to port + 4500 is used to work around NAT issues. + ''; + + proposals = mkCommaSepListParam ["default"] '' + A proposal is a set of algorithms. For non-AEAD algorithms, this includes + for IKE an encryption algorithm, an integrity algorithm, a pseudo random + function and a Diffie-Hellman group. For AEAD algorithms, instead of + encryption and integrity algorithms, a combined algorithm is used. + + In IKEv2, multiple algorithms of the same kind can be specified in a + single proposal, from which one gets selected. In IKEv1, only one + algorithm per kind is allowed per proposal, more algorithms get implicitly + stripped. Use multiple proposals to offer different algorithms + combinations in IKEv1. + + Algorithm keywords get separated using dashes. Multiple proposals may be + specified in a list. The special value default forms a + default proposal of supported algorithms considered safe, and is usually a + good choice for interoperability. + ''; + + vips = mkCommaSepListParam [] '' + List of virtual IPs to request in IKEv2 configuration payloads or IKEv1 + Mode Config. The wildcard addresses 0.0.0.0 and + :: request an arbitrary address, specific addresses may + be defined. The responder may return a different address, though, or none + at all. + ''; + + aggressive = mkYesNoParam no '' + Enables Aggressive Mode instead of Main Mode with Identity + Protection. Aggressive Mode is considered less secure, because the ID and + HASH payloads are exchanged unprotected. This allows a passive attacker to + snoop peer identities, and even worse, start dictionary attacks on the + Preshared Key. + ''; + + pull = mkYesNoParam yes '' + If the default of yes is used, Mode Config works in pull mode, where the + initiator actively requests a virtual IP. With no, push mode is used, + where the responder pushes down a virtual IP to the initiating peer. + + Push mode is currently supported for IKEv1, but not in IKEv2. It is used + by a few implementations only, pull mode is recommended. + ''; + + dscp = mkStrParam "000000" '' + Differentiated Services Field Codepoint to set on outgoing IKE packets for + this connection. The value is a six digit binary encoded string specifying + the Codepoint to set, as defined in RFC 2474. + ''; + + encap = mkYesNoParam no '' + To enforce UDP encapsulation of ESP packets, the IKE daemon can fake the + NAT detection payloads. This makes the peer believe that NAT takes place + on the path, forcing it to encapsulate ESP packets in UDP. + + Usually this is not required, but it can help to work around connectivity + issues with too restrictive intermediary firewalls. + ''; + + mobike = mkYesNoParam yes '' + Enables MOBIKE on IKEv2 connections. MOBIKE is enabled by default on IKEv2 + connections, and allows mobility of clients and multi-homing on servers by + migrating active IPsec tunnels. + + Usually keeping MOBIKE enabled is unproblematic, as it is not used if the + peer does not indicate support for it. However, due to the design of + MOBIKE, IKEv2 always floats to port 4500 starting from the second + exchange. Some implementations don't like this behavior, hence it can be + disabled. + ''; + + dpd_delay = mkDurationParam "0s" '' + Interval to check the liveness of a peer actively using IKEv2 + INFORMATIONAL exchanges or IKEv1 R_U_THERE messages. Active DPD checking + is only enforced if no IKE or ESP/AH packet has been received for the + configured DPD delay. + ''; + + dpd_timeout = mkDurationParam "0s" '' + Charon by default uses the normal retransmission mechanism and timeouts to + check the liveness of a peer, as all messages are used for liveness + checking. For compatibility reasons, with IKEv1 a custom interval may be + specified; this option has no effect on connections using IKEv2. + ''; + + fragmentation = mkEnumParam ["yes" "accept" "force" "no"] "yes" '' + Use IKE fragmentation (proprietary IKEv1 extension or RFC 7383 IKEv2 + fragmentation). Acceptable values are yes (the default + since 5.5.1), accept (since versions:5.5.3), + force and no. + + If set to yes, and the peer + supports it, oversized IKE messages will be sent in fragments. + If set to + accept, support for fragmentation is announced to the peer but the daemon + does not send its own messages in fragments. + If set to force (only + supported for IKEv1) the initial IKE message will already be fragmented if + required. + Finally, setting the option to no will disable announcing + support for this feature. + + + Note that fragmented IKE messages sent by a peer are always processed + irrespective of the value of this option (even when set to no). + ''; + + send_certreq = mkYesNoParam yes '' + Send certificate request payloads to offer trusted root CA certificates to + the peer. Certificate requests help the peer to choose an appropriate + certificate/private key for authentication and are enabled by default. + Disabling certificate requests can be useful if too many trusted root CA + certificates are installed, as each certificate request increases the size + of the initial IKE packets. + ''; + + send_cert = mkEnumParam ["always" "never" "ifasked" ] "ifasked" '' + Send certificate payloads when using certificate authentication. + + With the default of ifasked the daemon sends + certificate payloads only if certificate requests have been received. + never disables sending of certificate payloads + altogether, + always causes certificate payloads to be sent + unconditionally whenever certificate authentication is used. + + ''; + + keyingtries = mkIntParam 1 '' + Number of retransmission sequences to perform during initial + connect. Instead of giving up initiation after the first retransmission + sequence with the default value of 1, additional + sequences may be started according to the configured value. A value of + 0 initiates a new sequence until the connection + establishes or fails with a permanent error. + ''; + + unique = mkEnumParam ["no" "never" "keep" "replace"] "no" '' + Connection uniqueness policy to enforce. To avoid multiple connections + from the same user, a uniqueness policy can be enforced. + + + + The value never does never enforce such a policy, even + if a peer included INITIAL_CONTACT notification messages, + + + whereas no replaces existing connections for the same + identity if a new one has the INITIAL_CONTACT notify. + + + keep rejects new connection attempts if the same user + already has an active connection, + + + replace deletes any existing connection if a new one + for the same user gets established. + + + To compare connections for uniqueness, the remote IKE identity is used. If + EAP or XAuth authentication is involved, the EAP-Identity or XAuth + username is used to enforce the uniqueness policy instead. + + On initiators this setting specifies whether an INITIAL_CONTACT notify is + sent during IKE_AUTH if no existing connection is found with the remote + peer (determined by the identities of the first authentication + round). Unless set to never the client will send a notify. + ''; + + reauth_time = mkDurationParam "0s" '' + Time to schedule IKE reauthentication. IKE reauthentication recreates the + IKE/ISAKMP SA from scratch and re-evaluates the credentials. In asymmetric + configurations (with EAP or configuration payloads) it might not be + possible to actively reauthenticate as responder. The IKEv2 + reauthentication lifetime negotiation can instruct the client to perform + reauthentication. + + Reauthentication is disabled by default. Enabling it usually may lead to + small connection interruptions, as strongSwan uses a break-before-make + policy with IKEv2 to avoid any conflicts with associated tunnel resources. + ''; + + rekey_time = mkDurationParam "4h" '' + IKE rekeying refreshes key material using a Diffie-Hellman exchange, but + does not re-check associated credentials. It is supported in IKEv2 only, + IKEv1 performs a reauthentication procedure instead. + + With the default value IKE rekeying is scheduled every 4 hours, minus the + configured rand_time. If a reauth_time is configured, rekey_time defaults + to zero, disabling rekeying; explicitly set both to enforce rekeying and + reauthentication. + ''; + + over_time = mkOptionalDurationParam '' + Hard IKE_SA lifetime if rekey/reauth does not complete, as time. To avoid + having an IKE/ISAKMP kept alive if IKE reauthentication or rekeying fails + perpetually, a maximum hard lifetime may be specified. If the IKE_SA fails + to rekey or reauthenticate within the specified time, the IKE_SA gets + closed. + + In contrast to CHILD_SA rekeying, over_time is relative in time to the + rekey_time and reauth_time values, as it applies to both. + + The default is 10% of the longer of and + . + ''; + + rand_time = mkOptionalDurationParam '' + Time range from which to choose a random value to subtract from + rekey/reauth times. To avoid having both peers initiating the rekey/reauth + procedure simultaneously, a random time gets subtracted from the + rekey/reauth times. + + The default is equal to the configured . + ''; + + pools = mkCommaSepListParam [] '' + List of named IP pools to allocate virtual IP addresses + and other configuration attributes from. Each name references a pool by + name from either the pools section or an external pool. + ''; + + mediation = mkYesNoParam no '' + Whether this connection is a mediation connection, that is, whether this + connection is used to mediate other connections using the IKEv2 Mediation + Extension. Mediation connections create no CHILD_SA. + ''; + + mediated_by = mkOptionalStrParam '' + The name of the connection to mediate this connection through. If given, + the connection will be mediated through the named mediation + connection. The mediation connection must have mediation enabled. + ''; + + mediation_peer = mkOptionalStrParam '' + Identity under which the peer is registered at the mediation server, that + is, the IKE identity the other end of this connection uses as its local + identity on its connection to the mediation server. This is the identity + we request the mediation server to mediate us with. Only relevant on + connections that set mediated_by. If it is not given, the remote IKE + identity of the first authentication round of this connection will be + used. + ''; + + local = mkPrefixedAttrsOfParams { + + round = mkIntParam 0 '' + Optional numeric identifier by which authentication rounds are + sorted. If not specified rounds are ordered by their position in the + config file/vici message. + ''; + + certs = mkCommaSepListParam [] '' + List of certificate candidates to use for + authentication. The certificates may use a relative path from the + swanctl x509 directory or an absolute path. + + The certificate used for authentication is selected based on the + received certificate request payloads. If no appropriate CA can be + located, the first certificate is used. + ''; + + cert = mkPostfixedAttrsOfParams certParams '' + Section for a certificate candidate to use for + authentication. Certificates in certs are transmitted as binary blobs, + these sections offer more flexibility. + ''; + + pubkeys = mkCommaSepListParam [] '' + List of raw public key candidates to use for + authentication. The public keys may use a relative path from the swanctl + pubkey directory or an absolute path. + + Even though multiple local public keys could be defined in principle, + only the first public key in the list is used for authentication. + ''; + + auth = mkStrParam "pubkey" '' + Authentication to perform locally. + + + The default pubkey uses public key authentication + using a private key associated to a usable certificate. + + + psk uses pre-shared key authentication. + + + The IKEv1 specific xauth is used for XAuth or Hybrid + authentication, + + + while the IKEv2 specific eap keyword defines EAP + authentication. + + + For xauth, a specific backend name may be appended, + separated by a dash. The appropriate xauth backend is + selected to perform the XAuth exchange. For traditional XAuth, the + xauth method is usually defined in the second + authentication round following an initial pubkey (or + psk) round. Using xauth in the + first round performs Hybrid Mode client authentication. + + + For eap, a specific EAP method name may be appended, separated by a + dash. An EAP module implementing the appropriate method is selected to + perform the EAP conversation. + + + Since 5.4.0, if both peers support RFC 7427 ("Signature Authentication + in IKEv2") specific hash algorithms to be used during IKEv2 + authentication may be configured. To do so use ike: + followed by a trust chain signature scheme constraint (see description + of the section's + keyword). For example, with ike:pubkey-sha384-sha256 + a public key signature scheme with either SHA-384 or SHA-256 would get + used for authentication, in that order and depending on the hash + algorithms supported by the peer. If no specific hash algorithms are + configured, the default is to prefer an algorithm that matches or + exceeds the strength of the signature key. If no constraints with + ike: prefix are configured any signature scheme + constraint (without ike: prefix) will also apply to + IKEv2 authentication, unless this is disabled in + strongswan.conf. To use RSASSA-PSS signatures use + rsa/pss instead of pubkey or + rsa as in e.g. + ike:rsa/pss-sha256. If pubkey or + rsa constraints are configured RSASSA-PSS signatures + will only be used if enabled in strongswan.conf(5). + + + ''; + + id = mkOptionalStrParam '' + IKE identity to use for authentication round. When using certificate + authentication, the IKE identity must be contained in the certificate, + either as subject or as subjectAltName. + ''; + + eap_id = mkOptionalStrParam '' + Client EAP-Identity to use in EAP-Identity exchange and the EAP method. + ''; + + aaa_id = mkOptionalStrParam '' + Server side EAP-Identity to expect in the EAP method. Some EAP methods, + such as EAP-TLS, use an identity for the server to perform mutual + authentication. This identity may differ from the IKE identity, + especially when EAP authentication is delegated from the IKE responder + to an AAA backend. + + For EAP-(T)TLS, this defines the identity for which the server must + provide a certificate in the TLS exchange. + ''; + + xauth_id = mkOptionalStrParam '' + Client XAuth username used in the XAuth exchange. + ''; + + } '' + Section for a local authentication round. A local authentication round + defines the rules how authentication is performed for the local + peer. Multiple rounds may be defined to use IKEv2 RFC 4739 Multiple + Authentication or IKEv1 XAuth. + + Each round is defined in a section having local as + prefix, and an optional unique suffix. To define a single authentication + round, the suffix may be omitted. + ''; + + remote = mkPrefixedAttrsOfParams { + + round = mkIntParam 0 '' + Optional numeric identifier by which authentication rounds are + sorted. If not specified rounds are ordered by their position in the + config file/vici message. + ''; + + id = mkStrParam "%any" '' + IKE identity to expect for authentication round. When using certificate + authentication, the IKE identity must be contained in the certificate, + either as subject or as subjectAltName. + ''; + + eap_id = mkOptionalStrParam '' + Identity to use as peer identity during EAP authentication. If set to + %any the EAP-Identity method will be used to ask the + client for an EAP identity. + ''; + + groups = mkCommaSepListParam [] '' + Authorization group memberships to require. The peer + must prove membership to at least one of the specified groups. Group + membership can be certified by different means, for example by + appropriate Attribute Certificates or by an AAA backend involved in the + authentication. + ''; + + cert_policy = mkCommaSepListParam [] '' + List of certificate policy OIDs the peer's certificate + must have. OIDs are specified using the numerical dotted representation. + ''; + + certs = mkCommaSepListParam [] '' + List of certificates to accept for authentication. The certificates may + use a relative path from the swanctl x509 directory + or an absolute path. + ''; + + cert = mkPostfixedAttrsOfParams certParams '' + Section for a certificate candidate to use for + authentication. Certificates in certs are transmitted as binary blobs, + these sections offer more flexibility. + ''; + + cacerts = mkCommaSepListParam [] '' + List of CA certificates to accept for + authentication. The certificates may use a relative path from the + swanctl x509ca directory or an absolute path. + ''; + + cacert = mkPostfixedAttrsOfParams certParams '' + Section for a CA certificate to accept for authentication. Certificates + in cacerts are transmitted as binary blobs, these sections offer more + flexibility. + ''; + + pubkeys = mkCommaSepListParam [] '' + List of raw public keys to accept for + authentication. The public keys may use a relative path from the swanctl + pubkey directory or an absolute path. + ''; + + revocation = mkEnumParam ["strict" "ifuri" "relaxed"] "relaxed" '' + Certificate revocation policy for CRL or OCSP revocation. + + + A strict revocation policy fails if no revocation information is + available, i.e. the certificate is not known to be unrevoked. + + + ifuri fails only if a CRL/OCSP URI is available, but certificate + revocation checking fails, i.e. there should be revocation information + available, but it could not be obtained. + + + The default revocation policy relaxed fails only if a certificate is + revoked, i.e. it is explicitly known that it is bad. + + + ''; + + auth = mkStrParam "pubkey" '' + Authentication to expect from remote. See the + section's keyword description about the details of + supported mechanisms. + + Since 5.4.0, to require a trustchain public key strength for the remote + side, specify the key type followed by the minimum strength in bits (for + example ecdsa-384 or + rsa-2048-ecdsa-256). To limit the acceptable set of + hashing algorithms for trustchain validation, append hash algorithms to + pubkey or a key strength definition (for example + pubkey-sha256-sha512, + rsa-2048-sha256-sha384-sha512 or + rsa-2048-sha256-ecdsa-256-sha256-sha384). + Unless disabled in strongswan.conf, or explicit IKEv2 + signature constraints are configured (refer to the description of the + section's keyword for + details), such key types and hash algorithms are also applied as + constraints against IKEv2 signature authentication schemes used by the + remote side. To require RSASSA-PSS signatures use + rsa/pss instead of pubkey or + rsa as in e.g. rsa/pss-sha256. If + pubkey or rsa constraints are + configured RSASSA-PSS signatures will only be accepted if enabled in + strongswan.conf(5). + + To specify trust chain constraints for EAP-(T)TLS, append a colon to the + EAP method, followed by the key type/size and hash algorithm as + discussed above (e.g. eap-tls:ecdsa-384-sha384). + ''; + + } '' + Section for a remote authentication round. A remote authentication round + defines the constraints how the peers must authenticate to use this + connection. Multiple rounds may be defined to use IKEv2 RFC 4739 Multiple + Authentication or IKEv1 XAuth. + + Each round is defined in a section having remote as + prefix, and an optional unique suffix. To define a single authentication + round, the suffix may be omitted. + ''; + + children = mkAttrsOfParams { + ah_proposals = mkCommaSepListParam [] '' + AH proposals to offer for the CHILD_SA. A proposal is a set of + algorithms. For AH, this includes an integrity algorithm and an optional + Diffie-Hellman group. If a DH group is specified, CHILD_SA/Quick Mode + rekeying and initial negotiation uses a separate Diffie-Hellman exchange + using the specified group (refer to esp_proposals for details). + + In IKEv2, multiple algorithms of the same kind can be specified in a + single proposal, from which one gets selected. In IKEv1, only one + algorithm per kind is allowed per proposal, more algorithms get + implicitly stripped. Use multiple proposals to offer different algorithms + combinations in IKEv1. + + Algorithm keywords get separated using dashes. Multiple proposals may be + specified in a list. The special value default forms + a default proposal of supported algorithms considered safe, and is + usually a good choice for interoperability. By default no AH proposals + are included, instead ESP is proposed. + ''; + + esp_proposals = mkCommaSepListParam ["default"] '' + ESP proposals to offer for the CHILD_SA. A proposal is a set of + algorithms. For ESP non-AEAD proposals, this includes an integrity + algorithm, an encryption algorithm, an optional Diffie-Hellman group and + an optional Extended Sequence Number Mode indicator. For AEAD proposals, + a combined mode algorithm is used instead of the separate + encryption/integrity algorithms. + + If a DH group is specified, CHILD_SA/Quick Mode rekeying and initial + negotiation use a separate Diffie-Hellman exchange using the specified + group. However, for IKEv2, the keys of the CHILD_SA created implicitly + with the IKE_SA will always be derived from the IKE_SA's key material. So + any DH group specified here will only apply when the CHILD_SA is later + rekeyed or is created with a separate CREATE_CHILD_SA exchange. A + proposal mismatch might, therefore, not immediately be noticed when the + SA is established, but may later cause rekeying to fail. + + Extended Sequence Number support may be indicated with the + esn and noesn values, both may be + included to indicate support for both modes. If omitted, + noesn is assumed. + + In IKEv2, multiple algorithms of the same kind can be specified in a + single proposal, from which one gets selected. In IKEv1, only one + algorithm per kind is allowed per proposal, more algorithms get + implicitly stripped. Use multiple proposals to offer different algorithms + combinations in IKEv1. + + Algorithm keywords get separated using dashes. Multiple proposals may be + specified as a list. The special value default forms + a default proposal of supported algorithms considered safe, and is + usually a good choice for interoperability. If no algorithms are + specified for AH nor ESP, the default set of algorithms for ESP is + included. + ''; + + sha256_96 = mkYesNoParam no '' + HMAC-SHA-256 is used with 128-bit truncation with IPsec. For + compatibility with implementations that incorrectly use 96-bit truncation + this option may be enabled to configure the shorter truncation length in + the kernel. This is not negotiated, so this only works with peers that + use the incorrect truncation length (or have this option enabled). + ''; + + local_ts = mkCommaSepListParam ["dynamic"] '' + List of local traffic selectors to include in CHILD_SA. Each selector is + a CIDR subnet definition, followed by an optional proto/port + selector. The special value dynamic may be used + instead of a subnet definition, which gets replaced by the tunnel outer + address or the virtual IP, if negotiated. This is the default. + + A protocol/port selector is surrounded by opening and closing square + brackets. Between these brackets, a numeric or getservent(3) protocol + name may be specified. After the optional protocol restriction, an + optional port restriction may be specified, separated by a slash. The + port restriction may be numeric, a getservent(3) service name, or the + special value opaque for RFC 4301 OPAQUE + selectors. Port ranges may be specified as well, none of the kernel + backends currently support port ranges, though. + + When IKEv1 is used only the first selector is interpreted, except if the + Cisco Unity extension plugin is used. This is due to a limitation of the + IKEv1 protocol, which only allows a single pair of selectors per + CHILD_SA. So to tunnel traffic matched by several pairs of selectors when + using IKEv1 several children (CHILD_SAs) have to be defined that cover + the selectors. The IKE daemon uses traffic selector narrowing for IKEv1, + the same way it is standardized and implemented for IKEv2. However, this + may lead to problems with other implementations. To avoid that, configure + identical selectors in such scenarios. + ''; + + remote_ts = mkCommaSepListParam ["dynamic"] '' + List of remote selectors to include in CHILD_SA. See + for a description of the selector syntax. + ''; + + rekey_time = mkDurationParam "1h" '' + Time to schedule CHILD_SA rekeying. CHILD_SA rekeying refreshes key + material, optionally using a Diffie-Hellman exchange if a group is + specified in the proposal. To avoid rekey collisions initiated by both + ends simultaneously, a value in the range of + gets subtracted to form the effective soft lifetime. + + By default CHILD_SA rekeying is scheduled every hour, minus + . + ''; + + life_time = mkOptionalDurationParam '' + Maximum lifetime before CHILD_SA gets closed. Usually this hard lifetime + is never reached, because the CHILD_SA gets rekeyed before. If that fails + for whatever reason, this limit closes the CHILD_SA. The default is 10% + more than the . + ''; + + rand_time = mkOptionalDurationParam '' + Time range from which to choose a random value to subtract from + . The default is the difference between + and . + ''; + + rekey_bytes = mkIntParam 0 '' + Number of bytes processed before initiating CHILD_SA rekeying. CHILD_SA + rekeying refreshes key material, optionally using a Diffie-Hellman + exchange if a group is specified in the proposal. + + To avoid rekey collisions initiated by both ends simultaneously, a value + in the range of gets subtracted to form the + effective soft volume limit. + + Volume based CHILD_SA rekeying is disabled by default. + ''; + + life_bytes = mkOptionalIntParam '' + Maximum bytes processed before CHILD_SA gets closed. Usually this hard + volume limit is never reached, because the CHILD_SA gets rekeyed + before. If that fails for whatever reason, this limit closes the + CHILD_SA. The default is 10% more than . + ''; + + rand_bytes = mkOptionalIntParam '' + Byte range from which to choose a random value to subtract from + . The default is the difference between + and . + ''; + + rekey_packets = mkIntParam 0 '' + Number of packets processed before initiating CHILD_SA rekeying. CHILD_SA + rekeying refreshes key material, optionally using a Diffie-Hellman + exchange if a group is specified in the proposal. + + To avoid rekey collisions initiated by both ends simultaneously, a value + in the range of gets subtracted to form + the effective soft packet count limit. + + Packet count based CHILD_SA rekeying is disabled by default. + ''; + + life_packets = mkOptionalIntParam '' + Maximum number of packets processed before CHILD_SA gets closed. Usually + this hard packets limit is never reached, because the CHILD_SA gets + rekeyed before. If that fails for whatever reason, this limit closes the + CHILD_SA. + + The default is 10% more than . + ''; + + rand_packets = mkOptionalIntParam '' + Packet range from which to choose a random value to subtract from + . The default is the difference between + and . + ''; + + updown = mkOptionalStrParam '' + Updown script to invoke on CHILD_SA up and down events. + ''; + + hostaccess = mkYesNoParam yes '' + Hostaccess variable to pass to updown script. + ''; + + mode = mkEnumParam [ "tunnel" + "transport" + "transport_proxy" + "beet" + "pass" + "drop" + ] "tunnel" '' + IPsec Mode to establish CHILD_SA with. + + + tunnel negotiates the CHILD_SA in IPsec Tunnel Mode, + + + whereas transport uses IPsec Transport Mode. + + + transport_proxy signifying the special Mobile IPv6 + Transport Proxy Mode. + + + beet is the Bound End to End Tunnel mixture mode, + working with fixed inner addresses without the need to include them in + each packet. + + + Both transport and beet modes are + subject to mode negotiation; tunnel mode is + negotiated if the preferred mode is not available. + + + pass and drop are used to install + shunt policies which explicitly bypass the defined traffic from IPsec + processing or drop it, respectively. + + + ''; + + policies = mkYesNoParam yes '' + Whether to install IPsec policies or not. Disabling this can be useful in + some scenarios e.g. MIPv6, where policies are not managed by the IKE + daemon. Since 5.3.3. + ''; + + policies_fwd_out = mkYesNoParam no '' + Whether to install outbound FWD IPsec policies or not. Enabling this is + required in case there is a drop policy that would match and block + forwarded traffic for this CHILD_SA. Since 5.5.1. + ''; + + dpd_action = mkEnumParam ["clear" "trap" "restart"] "clear" '' + Action to perform for this CHILD_SA on DPD timeout. The default clear + closes the CHILD_SA and does not take further action. trap installs a + trap policy, which will catch matching traffic and tries to re-negotiate + the tunnel on-demand. restart immediately tries to re-negotiate the + CHILD_SA under a fresh IKE_SA. + ''; + + ipcomp = mkYesNoParam no '' + Enable IPComp compression before encryption. If enabled, IKE tries to + negotiate IPComp compression to compress ESP payload data prior to + encryption. + ''; + + inactivity = mkDurationParam "0s" '' + Timeout before closing CHILD_SA after inactivity. If no traffic has been + processed in either direction for the configured timeout, the CHILD_SA + gets closed due to inactivity. The default value of 0 disables inactivity + checks. + ''; + + reqid = mkIntParam 0 '' + Fixed reqid to use for this CHILD_SA. This might be helpful in some + scenarios, but works only if each CHILD_SA configuration is instantiated + not more than once. The default of 0 uses dynamic reqids, allocated + incrementally. + ''; + + priority = mkIntParam 0 '' + Optional fixed priority for IPsec policies. This could be useful to + install high-priority drop policies. The default of 0 uses dynamically + calculated priorities based on the size of the traffic selectors. + ''; + + interface = mkOptionalStrParam '' + Optional interface name to restrict outbound IPsec policies. + ''; + + mark_in = mkStrParam "0/0x00000000" '' + Netfilter mark and mask for input traffic. On Linux, Netfilter may + require marks on each packet to match an SA/policy having that option + set. This allows installing duplicate policies and enables Netfilter + rules to select specific SAs/policies for incoming traffic. Note that + inbound marks are only set on policies, by default, unless + is enabled. The special value + %unique sets a unique mark on each CHILD_SA instance, + beyond that the value %unique-dir assigns a different + unique mark for each + + An additional mask may be appended to the mark, separated by + /. The default mask if omitted is + 0xffffffff. + ''; + + mark_in_sa = mkYesNoParam no '' + Whether to set on the inbound SA. By default, + the inbound mark is only set on the inbound policy. The tuple destination + address, protocol and SPI is unique and the mark is not required to find + the correct SA, allowing to mark traffic after decryption instead (where + more specific selectors may be used) to match different policies. Marking + packets before decryption is still possible, even if no mark is set on + the SA. + ''; + + mark_out = mkStrParam "0/0x00000000" '' + Netfilter mark and mask for output traffic. On Linux, Netfilter may + require marks on each packet to match a policy/SA having that option + set. This allows installing duplicate policies and enables Netfilter + rules to select specific policies/SAs for outgoing traffic. The special + value %unique sets a unique mark on each CHILD_SA + instance, beyond that the value %unique-dir assigns a + different unique mark for each CHILD_SA direction (in/out). + + An additional mask may be appended to the mark, separated by + /. The default mask if omitted is + 0xffffffff. + ''; + + tfc_padding = mkParamOfType (with lib.types; either int (enum ["mtu"])) 0 '' + Pads ESP packets with additional data to have a consistent ESP packet + size for improved Traffic Flow Confidentiality. The padding defines the + minimum size of all ESP packets sent. The default value of + 0 disables TFC padding, the special value + mtu adds TFC padding to create a packet size equal to + the Path Maximum Transfer Unit. + ''; + + replay_window = mkIntParam 32 '' + IPsec replay window to configure for this CHILD_SA. Larger values than + the default of 32 are supported using the Netlink + backend only, a value of 0 disables IPsec replay + protection. + ''; + + hw_offload = mkEnumParam ["yes" "no" "auto"] "no" '' + Enable hardware offload for this CHILD_SA, if supported by the IPsec + implementation. The value yes enforces offloading + and the installation will fail if it's not supported by either kernel or + device. The value auto enables offloading, if it's + supported, but the installation does not fail otherwise. + ''; + + start_action = mkEnumParam ["none" "trap" "start"] "none" '' + Action to perform after loading the configuration. + + + The default of none loads the connection only, which + then can be manually initiated or used as a responder configuration. + + + The value trap installs a trap policy, which triggers + the tunnel as soon as matching traffic has been detected. + + + The value start initiates the connection actively. + + + When unloading or replacing a CHILD_SA configuration having a + different from none, + the inverse action is performed. Configurations with + start get closed, while such with + trap get uninstalled. + ''; + + close_action = mkEnumParam ["none" "trap" "start"] "none" '' + Action to perform after a CHILD_SA gets closed by the peer. + + + The default of none does not take any action, + + + trap installs a trap policy for the CHILD_SA. + + + start tries to re-create the CHILD_SA. + + + + does not provide any guarantee that the + CHILD_SA is kept alive. It acts on explicit close messages only, but not + on negotiation failures. Use trap policies to reliably re-create failed + CHILD_SAs. + ''; + + } '' + CHILD_SA configuration sub-section. Each connection definition may have + one or more sections in its subsection. The + section name defines the name of the CHILD_SA configuration, which must be + unique within the connection (denoted <child> below). + ''; + } '' + Section defining IKE connection configurations, each in its own subsection + with an arbitrary yet unique name + ''; + + secrets = let + mkEapXauthParams = mkPrefixedAttrsOfParams { + secret = mkOptionalStrParam '' + Value of the EAP/XAuth secret. It may either be an ASCII string, a hex + encoded string if it has a 0x prefix or a Base64 encoded string if it + has a 0s prefix in its value. + ''; + + id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + Identity the EAP/XAuth secret belongs to. Multiple unique identities may + be specified, each having an id prefix, if a secret + is shared between multiple users. + ''; + + } '' + EAP secret section for a specific secret. Each EAP secret is defined in a + unique section having the eap prefix. EAP secrets are + used for XAuth authentication as well. + ''; + + in { + + eap = mkEapXauthParams; + xauth = mkEapXauthParams; + + ntlm = mkPrefixedAttrsOfParams { + secret = mkOptionalStrParam '' + Value of the NTLM secret, which is the NT Hash of the actual secret, + that is, MD4(UTF-16LE(secret)). The resulting 16-byte value may either + be given as a hex encoded string with a 0x prefix or as a Base64 encoded + string with a 0s prefix. + ''; + + id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + Identity the NTLM secret belongs to. Multiple unique identities may be + specified, each having an id prefix, if a secret is shared between + multiple users. + ''; + } '' + NTLM secret section for a specific secret. Each NTLM secret is defined in + a unique section having the ntlm prefix. NTLM secrets + may only be used for EAP-MSCHAPv2 authentication. + ''; + + ike = mkPrefixedAttrsOfParams { + secret = mkOptionalStrParam '' + Value of the IKE preshared secret. It may either be an ASCII string, a + hex encoded string if it has a 0x prefix or a Base64 encoded string if + it has a 0s prefix in its value. + ''; + + id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + IKE identity the IKE preshared secret belongs to. Multiple unique + identities may be specified, each having an id + prefix, if a secret is shared between multiple peers. + ''; + } '' + IKE preshared secret section for a specific secret. Each IKE PSK is + defined in a unique section having the ike prefix. + ''; + + private = mkPrefixedAttrsOfParams { + file = mkOptionalStrParam '' + File name in the private folder for which this passphrase should be used. + ''; + + secret = mkOptionalStrParam '' + Value of decryption passphrase for private key. + ''; + } '' + Private key decryption passphrase for a key in the + private folder. + ''; + + rsa = mkPrefixedAttrsOfParams { + file = mkOptionalStrParam '' + File name in the rsa folder for which this passphrase + should be used. + ''; + secret = mkOptionalStrParam '' + Value of decryption passphrase for RSA key. + ''; + } '' + Private key decryption passphrase for a key in the rsa + folder. + ''; + + ecdsa = mkPrefixedAttrsOfParams { + file = mkOptionalStrParam '' + File name in the ecdsa folder for which this + passphrase should be used. + ''; + secret = mkOptionalStrParam '' + Value of decryption passphrase for ECDSA key. + ''; + } '' + Private key decryption passphrase for a key in the + ecdsa folder. + ''; + + pkcs8 = mkPrefixedAttrsOfParams { + file = mkOptionalStrParam '' + File name in the pkcs8 folder for which this + passphrase should be used. + ''; + secret = mkOptionalStrParam '' + Value of decryption passphrase for PKCS#8 key. + ''; + } '' + Private key decryption passphrase for a key in the + pkcs8 folder. + ''; + + pkcs12 = mkPrefixedAttrsOfParams { + file = mkOptionalStrParam '' + File name in the pkcs12 folder for which this + passphrase should be used. + ''; + secret = mkOptionalStrParam '' + Value of decryption passphrase for PKCS#12 container. + ''; + } '' + PKCS#12 decryption passphrase for a container in the + pkcs12 folder. + ''; + + token = mkPrefixedAttrsOfParams { + handle = mkOptionalHexParam '' + Hex-encoded CKA_ID or handle of the private key on the token or TPM, + respectively. + ''; + + slot = mkOptionalIntParam '' + Optional slot number to access the token. + ''; + + module = mkOptionalStrParam '' + Optional PKCS#11 module name to access the token. + ''; + + pin = mkOptionalStrParam '' + Optional PIN required to access the key on the token. If none is + provided the user is prompted during an interactive + --load-creds call. + ''; + } ''Definition for a private key that's stored on a token/smartcard/TPM.''; + + }; + + pools = mkAttrsOfParams { + addrs = mkOptionalStrParam '' + Subnet or range defining addresses allocated in pool. Accepts a single + CIDR subnet defining the pool to allocate addresses from or an address + range (<from>-<to>). Pools must be unique and non-overlapping. + ''; + + dns = mkCommaSepListParam [] "Address or CIDR subnets"; + nbns = mkCommaSepListParam [] "Address or CIDR subnets"; + dhcp = mkCommaSepListParam [] "Address or CIDR subnets"; + netmask = mkCommaSepListParam [] "Address or CIDR subnets"; + server = mkCommaSepListParam [] "Address or CIDR subnets"; + subnet = mkCommaSepListParam [] "Address or CIDR subnets"; + split_include = mkCommaSepListParam [] "Address or CIDR subnets"; + split_exclude = mkCommaSepListParam [] "Address or CIDR subnets"; + } '' + Section defining named pools. Named pools may be referenced by connections + with the pools option to assign virtual IPs and other configuration + attributes. Each pool must have a unique name (denoted <name> below). + ''; +} diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix new file mode 100644 index 0000000000000000000000000000000000000000..3fbf6eb60e9d745e5ea7efcd46938a1f7f35f406 --- /dev/null +++ b/nixos/modules/services/networking/stubby.nix @@ -0,0 +1,214 @@ +{ config, lib, pkgs, ...}: + +with lib; + +let + cfg = config.services.stubby; + + fallbacks = concatMapStringsSep "\n " (x: "- ${x}") cfg.fallbackProtocols; + listeners = concatMapStringsSep "\n " (x: "- ${x}") cfg.listenAddresses; + + # By default, the recursive resolvers maintained by the getdns + # project itself are enabled. More information about both getdns's servers, + # as well as third party options for upstream resolvers, can be found here: + # https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Test+Servers + # + # You can override these values by supplying a yaml-formatted array of your + # preferred upstream resolvers in the following format: + # + # 106 # - address_data: IPv4 or IPv6 address of the upstream + # port: Port for UDP/TCP (default is 53) + # tls_auth_name: Authentication domain name checked against the server + # certificate + # tls_pubkey_pinset: An SPKI pinset verified against the keys in the server + # certificate + # - digest: Only "sha256" is currently supported + # value: Base64 encoded value of the sha256 fingerprint of the public + # key + # tls_port: Port for TLS (default is 853) + + defaultUpstream = '' + - address_data: 145.100.185.15 + tls_auth_name: "dnsovertls.sinodun.com" + tls_pubkey_pinset: + - digest: "sha256" + value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4= + - address_data: 145.100.185.16 + tls_auth_name: "dnsovertls1.sinodun.com" + tls_pubkey_pinset: + - digest: "sha256" + value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA= + - address_data: 185.49.141.37 + tls_auth_name: "getdnsapi.net" + tls_pubkey_pinset: + - digest: "sha256" + value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q= + - address_data: 2001:610:1:40ba:145:100:185:15 + tls_auth_name: "dnsovertls.sinodun.com" + tls_pubkey_pinset: + - digest: "sha256" + value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4= + - address_data: 2001:610:1:40ba:145:100:185:16 + tls_auth_name: "dnsovertls1.sinodun.com" + tls_pubkey_pinset: + - digest: "sha256" + value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA= + - address_data: 2a04:b900:0:100::38 + tls_auth_name: "getdnsapi.net" + tls_pubkey_pinset: + - digest: "sha256" + value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q= + ''; + + # Resolution type is not changeable here because it is required per the + # stubby documentation: + # + # "resolution_type: Work in stub mode only (not recursive mode) - required for Stubby + # operation." + # + # https://dnsprivacy.org/wiki/display/DP/Configuring+Stubby + + confFile = pkgs.writeText "stubby.yml" '' + resolution_type: GETDNS_RESOLUTION_STUB + dns_transport_list: + ${fallbacks} + tls_authentication: ${cfg.authenticationMode} + tls_query_padding_blocksize: ${toString cfg.queryPaddingBlocksize} + edns_client_subnet_private: ${if cfg.subnetPrivate then "1" else "0"} + idle_timeout: ${toString cfg.idleTimeout} + listen_addresses: + ${listeners} + round_robin_upstreams: ${if cfg.roundRobinUpstreams then "1" else "0"} + ${cfg.extraConfig} + upstream_recursive_servers: + ${cfg.upstreamServers} + ''; +in + +{ + options = { + services.stubby = { + + enable = mkEnableOption "Stubby DNS resolver"; + + fallbackProtocols = mkOption { + default = [ "GETDNS_TRANSPORT_TLS" ]; + type = with types; listOf (enum [ + "GETDNS_TRANSPORT_TLS" + "GETDNS_TRANSPORT_TCP" + "GETDNS_TRANSPORT_UDP" + ]); + description = '' + Ordered list composed of one or more transport protocols. + Strict mode should only use GETDNS_TRANSPORT_TLS. + Other options are GETDNS_TRANSPORT_UDP and + GETDNS_TRANSPORT_TCP. + ''; + }; + + authenticationMode = mkOption { + default = "GETDNS_AUTHENTICATION_REQUIRED"; + type = types.enum [ + "GETDNS_AUTHENTICATION_REQUIRED" + "GETDNS_AUTHENTICATION_NONE" + ]; + description = '' + Selects the Strict or Opportunistic usage profile. + For strict, set to GETDNS_AUTHENTICATION_REQUIRED. + for opportunistic, use GETDNS_AUTHENTICATION_NONE. + ''; + }; + + queryPaddingBlocksize = mkOption { + default = 128; + type = types.int; + description = '' + EDNS0 option to pad the size of the DNS query to the given blocksize. + ''; + }; + + subnetPrivate = mkOption { + default = true; + type = types.bool; + description = '' + EDNS0 option for ECS client privacy. Default is + true. If set, this option prevents the client + subnet from being sent to authoritative nameservers. + ''; + }; + + idleTimeout = mkOption { + default = 10000; + type = types.int; + description = "EDNS0 option for keepalive idle timeout expressed in + milliseconds."; + }; + + listenAddresses = mkOption { + default = [ "127.0.0.1" "0::1" ]; + type = with types; listOf str; + description = '' + Sets the listen address for the stubby daemon. + Uses port 53 by default. + Ise IP@port to specify a different port. + ''; + }; + + roundRobinUpstreams = mkOption { + default = true; + type = types.bool; + description = '' + Instructs stubby to distribute queries across all available name + servers. Default is true. Set to + false in order to use the first available. + ''; + }; + + upstreamServers = mkOption { + default = defaultUpstream; + type = types.lines; + description = '' + Add additional upstreams. See stubby + 1 for an + example of the entry formatting. In Strict mode, at least one of the + following settings must be supplied for each nameserver: + tls_auth_name or + tls_pubkey_pinset. + ''; + }; + + debugLogging = mkOption { + default = false; + type = types.bool; + description = "Enable or disable debug level logging."; + }; + + extraConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Add additional configuration options. see + stubby1 + for more options. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.stubby ]; + systemd.services.stubby = { + description = "Stubby local DNS resolver"; + after = [ "network.target" ]; + before = [ "nss-lookup.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; + ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString cfg.debugLogging "-l"}"; + DynamicUser = true; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix index dc90a4bcc62075866ef9c59cf3ccd8253bb2d748..3c4321ab9e9d69ea8b44f938f5af4fd81456c0e5 100644 --- a/nixos/modules/services/networking/supplicant.nix +++ b/nixos/modules/services/networking/supplicant.nix @@ -183,7 +183,7 @@ in example = literalExample '' { "wlan0 wlan1" = { - configFile = "/etc/wpa_supplicant"; + configFile.path = "/etc/wpa_supplicant.conf"; userControlled.group = "network"; extraConf = ''' ap_scan=1 diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix index 2cfb9fc9b923471e0ab335e9d32b094fd9994c8a..64eb110683290b813ef70a19cf3daefce8697442 100644 --- a/nixos/modules/services/networking/supybot.nix +++ b/nixos/modules/services/networking/supybot.nix @@ -45,7 +45,7 @@ in environment.systemPackages = [ pkgs.pythonPackages.limnoria ]; - users.extraUsers = singleton { + users.users = singleton { name = "supybot"; uid = config.ids.uids.supybot; group = "supybot"; @@ -54,7 +54,7 @@ in createHome = true; }; - users.extraGroups.supybot = { + users.groups.supybot = { name = "supybot"; gid = config.ids.gids.supybot; }; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index e485c073cbddff28a53a9ba7159872d3fe5b32cb..c610b3b666062b6f27d4451245d569fb92a1c6f3 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -103,7 +103,7 @@ in { systemd.packages = [ pkgs.syncthing ]; users = mkIf (cfg.user == defaultUser) { - extraUsers."${defaultUser}" = + users."${defaultUser}" = { group = cfg.group; home = cfg.dataDir; createHome = true; @@ -111,7 +111,7 @@ in { description = "Syncthing daemon user"; }; - extraGroups."${defaultUser}".gid = + groups."${defaultUser}".gid = config.ids.gids.syncthing; }; diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix index ee005e11aa326691540166a357fb54bfd4ac2a8c..a0ccb99500941ff57c4f98ab77ae931a86c80ca8 100644 --- a/nixos/modules/services/networking/tcpcrypt.nix +++ b/nixos/modules/services/networking/tcpcrypt.nix @@ -29,7 +29,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "tcpcryptd"; uid = config.ids.uids.tcpcryptd; description = "tcpcrypt daemon user"; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index e3c9b5282b8c49d93469aba9fe9d5572655ac97c..35cdddc590b80ed0c00053a202329e1217402564 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -163,12 +163,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ data.package ]; - restartTriggers = - let - drvlist = [ config.environment.etc."tinc/${network}/tinc.conf".source ] - ++ mapAttrsToList (host: _: config.environment.etc."tinc/${network}/hosts/${host}".source) data.hosts; - in # drvlist might be too long to be used directly - [ (builtins.hashString "sha256" (concatMapStrings (d: d.outPath) drvlist)) ]; + restartTriggers = [ config.environment.etc."tinc/${network}/tinc.conf".source ]; serviceConfig = { Type = "simple"; Restart = "always"; @@ -207,13 +202,14 @@ in ${concatStringsSep "\n" (mapAttrsToList (network: data: optionalString (versionAtLeast data.package.version "1.1pre") '' makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" \ - --add-flags "--pidfile=/run/tinc.${network}.pid" + --add-flags "--pidfile=/run/tinc.${network}.pid" \ + --add-flags "--config=/etc/tinc/${network}" '') cfg.networks)} ''; }; in [ cli-wrappers ]; - users.extraUsers = flip mapAttrs' cfg.networks (network: _: + users.users = flip mapAttrs' cfg.networks (network: _: nameValuePair ("tinc.${network}") ({ description = "Tinc daemon user for ${network}"; isSystemUser = true; diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix index 184888ef05da0192320a942c7476e8e23826694c..7d5db71601ef572675c4301c60a594adba7de6b7 100644 --- a/nixos/modules/services/networking/tinydns.nix +++ b/nixos/modules/services/networking/tinydns.nix @@ -32,7 +32,7 @@ with lib; config = mkIf config.services.tinydns.enable { environment.systemPackages = [ pkgs.djbdns ]; - users.extraUsers.tinydns = {}; + users.users.tinydns = {}; systemd.services.tinydns = { description = "djbdns tinydns server"; diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix index cb0e6b1586514e09c82203ec5cf4d045fb7f7978..1d34921516903b7ddd14d72b31ddb3f5a79088bf 100644 --- a/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -56,7 +56,7 @@ in config = mkIf config.services.toxBootstrapd.enable { - users.extraUsers = singleton + users.users = singleton { name = "tox-bootstrapd"; uid = config.ids.uids.tox-bootstrapd; description = "Tox bootstrap daemon user"; diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index 5e13402d7645f6e6a5fa2328246c16e91ad8aa4b..b7655f4bec62f73b08c48bf4a147d2b5aa9d3dd2 100644 --- a/nixos/modules/services/networking/toxvpn.nix +++ b/nixos/modules/services/networking/toxvpn.nix @@ -1,4 +1,4 @@ -{ config, stdenv, pkgs, lib, ... }: +{ config, pkgs, lib, ... }: with lib; @@ -57,7 +57,7 @@ with lib; environment.systemPackages = [ pkgs.toxvpn ]; - users.extraUsers = { + users.users = { toxvpn = { uid = config.ids.uids.toxvpn; home = "/var/lib/toxvpn"; diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixos/modules/services/networking/tvheadend.nix index cdd8747ba89824f1da1e815d44377624b0f64302..ccf879996631db739d97382bf9e71cea0e235a40 100644 --- a/nixos/modules/services/networking/tvheadend.nix +++ b/nixos/modules/services/networking/tvheadend.nix @@ -1,9 +1,9 @@ -{ config, coreutils, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; let cfg = config.services.tvheadend; - pidFile = "${config.users.extraUsers.tvheadend.home}/tvheadend.pid"; + pidFile = "${config.users.users.tvheadend.home}/tvheadend.pid"; in { @@ -25,7 +25,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.tvheadend = { + users.users.tvheadend = { description = "Tvheadend Service user"; home = "/var/lib/tvheadend"; createHome = true; diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index f069a9883a7f5de9130eb37e552bddb5a76e41ac..1a35979ad44c42185454fcaee351f27d5698138b 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -60,7 +60,7 @@ in }; interfaces = mkOption { - default = [ "127.0.0.1" "::1" ]; + default = [ "127.0.0.1" ] ++ optional config.networking.enableIPv6 "::1"; type = types.listOf types.str; description = "What addresses the server should listen on."; }; @@ -112,8 +112,8 @@ in mkdir -m 0755 -p ${stateDir}/dev/ cp ${confFile} ${stateDir}/unbound.conf ${optionalString cfg.enableRootTrustAnchor '' - ${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!" - chown unbound ${stateDir} ${rootTrustAnchorFile} + ${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!" + chown unbound ${stateDir} ${rootTrustAnchorFile} ''} touch ${stateDir}/dev/random ${pkgs.utillinux}/bin/mount --bind -n /dev/urandom ${stateDir}/dev/random @@ -126,9 +126,14 @@ in ProtectSystem = true; ProtectHome = true; PrivateDevices = true; + Restart = "always"; + RestartSec = "5s"; }; }; + # If networkmanager is enabled, ask it to interface with unbound. + networking.networkmanager.dns = "unbound"; + }; } diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 8e5f0bfc070d4f4e3d5cfdcff065a1e87edcc480..ac10e77ba3063abab40964620593fec619dc8b50 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -4,22 +4,22 @@ let cfg = config.services.unifi; stateDir = "/var/lib/unifi"; cmd = '' - @${pkgs.jre}/bin/java java \ + @${cfg.jrePackage}/bin/java java \ ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ -jar ${stateDir}/lib/ace.jar ''; mountPoints = [ { - what = "${pkgs.unifi}/dl"; + what = "${cfg.unifiPackage}/dl"; where = "${stateDir}/dl"; } { - what = "${pkgs.unifi}/lib"; + what = "${cfg.unifiPackage}/lib"; where = "${stateDir}/lib"; } { - what = "${pkgs.mongodb}/bin"; + what = "${cfg.mongodbPackage}/bin"; where = "${stateDir}/bin"; } { @@ -41,6 +41,33 @@ in ''; }; + services.unifi.jrePackage = mkOption { + type = types.package; + default = pkgs.jre8; + defaultText = "pkgs.jre8"; + description = '' + The JRE package to use. Check the release notes to ensure it is supported. + ''; + }; + + services.unifi.unifiPackage = mkOption { + type = types.package; + default = pkgs.unifiLTS; + defaultText = "pkgs.unifiLTS"; + description = '' + The unifi package to use. + ''; + }; + + services.unifi.mongodbPackage = mkOption { + type = types.package; + default = pkgs.mongodb; + defaultText = "pkgs.mongodb"; + description = '' + The mongodb package to use. + ''; + }; + services.unifi.dataDir = mkOption { type = types.str; default = "${stateDir}/data"; @@ -87,7 +114,7 @@ in config = mkIf cfg.enable { - users.extraUsers.unifi = { + users.users.unifi = { uid = config.ids.uids.unifi; description = "UniFi controller daemon user"; home = "${stateDir}"; @@ -137,7 +164,7 @@ in rm -rf "${stateDir}/webapps" mkdir -p "${stateDir}/webapps" chown unifi "${stateDir}/webapps" - ln -s "${pkgs.unifi}/webapps/ROOT" "${stateDir}/webapps/ROOT" + ln -s "${cfg.unifiPackage}/webapps/ROOT" "${stateDir}/webapps/ROOT" ''; postStop = '' diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 6b3d658bd852701fec264ce254d552d701a5a593..1f9107c3ce9c85292f425541afbd7c22e0916f85 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -193,7 +193,7 @@ in message = "vsftpd: If forceLocalLoginsSSL or forceLocalDataSSL is true then a rsaCertFile must be provided!"; }; - users.extraUsers = + users.users = [ { name = "vsftpd"; uid = config.ids.uids.vsftpd; description = "VSFTPD user"; @@ -207,7 +207,7 @@ in home = cfg.anonymousUserHome; }; - users.extraGroups.ftp.gid = config.ids.gids.ftp; + users.groups.ftp.gid = config.ids.gids.ftp; # If you really have to access root via FTP use mkOverride or userlistDeny # = false and whitelist root diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 24accd41511c28ee7f3e03e75fb4ffc4a05051e5..1b87b77f9768de24c7fa13853a8fa2f3fb699d95 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -10,7 +10,7 @@ let # interface options - interfaceOpts = { name, ... }: { + interfaceOpts = { ... }: { options = { @@ -53,30 +53,30 @@ let }; preSetup = mkOption { - example = literalExample ['' + example = literalExample '' ${pkgs.iproute}/bin/ip netns add foo - '']; - default = []; - type = with types; listOf str; + ''; + default = ""; + type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; description = '' - A list of commands called at the start of the interface setup. + Commands called at the start of the interface setup. ''; }; postSetup = mkOption { - example = literalExample ['' - ${pkgs.bash} -c 'printf "nameserver 10.200.100.1" | ${pkgs.openresolv}/bin/resolvconf -a wg0 -m 0' - '']; - default = []; - type = with types; listOf str; - description = "A list of commands called at the end of the interface setup."; + example = literalExample '' + printf "nameserver 10.200.100.1" | ${pkgs.openresolv}/bin/resolvconf -a wg0 -m 0 + ''; + default = ""; + type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; + description = "Commands called at the end of the interface setup."; }; postShutdown = mkOption { - example = literalExample ["${pkgs.openresolv}/bin/resolvconf -d wg0"]; - default = []; - type = with types; listOf str; - description = "A list of commands called after shutting down the interface."; + example = literalExample "${pkgs.openresolv}/bin/resolvconf -d wg0"; + default = ""; + type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; + description = "Commands called after shutting down the interface."; }; table = mkOption { @@ -182,9 +182,6 @@ let }; - ipCommand = "${pkgs.iproute}/bin/ip"; - wgCommand = "${pkgs.wireguard}/bin/wg"; - generateUnit = name: values: # exactly one way to specify the private key must be set assert (values.privateKey != null) != (values.privateKeyFile != null); @@ -196,49 +193,53 @@ let after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; environment.DEVICE = name; + path = with pkgs; [ kmod iproute wireguard-tools ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStart = flatten([ - values.preSetup + }; + + script = '' + modprobe wireguard + + ${values.preSetup} - "-${ipCommand} link del dev ${name}" - "${ipCommand} link add dev ${name} type wireguard" + ip link add dev ${name} type wireguard - (map (ip: - "${ipCommand} address add ${ip} dev ${name}" - ) values.ips) + ${concatMapStringsSep "\n" (ip: + "ip address add ${ip} dev ${name}" + ) values.ips} - ("${wgCommand} set ${name} private-key ${privKey}" + - optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}") + wg set ${name} private-key ${privKey} ${ + optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}"} - (map (peer: + ${concatMapStringsSep "\n" (peer: assert (peer.presharedKeyFile == null) || (peer.presharedKey == null); # at most one of the two must be set let psk = if peer.presharedKey != null then pkgs.writeText "wg-psk" peer.presharedKey else peer.presharedKeyFile; in - "${wgCommand} set ${name} peer ${peer.publicKey}" + - optionalString (psk != null) " preshared-key ${psk}" + - optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" + - optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" + - optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}" - ) values.peers) - - "${ipCommand} link set up dev ${name}" - - (optionals (values.allowedIPsAsRoutes != false) (map (peer: - (map (allowedIP: - "${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}" - ) peer.allowedIPs) - ) values.peers)) - - values.postSetup - ]); - ExecStop = flatten([ - "${ipCommand} link del dev ${name}" - values.postShutdown - ]); - }; + "wg set ${name} peer ${peer.publicKey}" + + optionalString (psk != null) " preshared-key ${psk}" + + optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" + + optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" + + optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}" + ) values.peers} + + ip link set up dev ${name} + + ${optionalString (values.allowedIPsAsRoutes != false) (concatStringsSep "\n" (concatMap (peer: + (map (allowedIP: + "ip route replace ${allowedIP} dev ${name} table ${values.table}" + ) peer.allowedIPs) + ) values.peers))} + + ${values.postSetup} + ''; + + preStop = '' + ip link del dev ${name} + ${values.postShutdown} + ''; }; in @@ -278,7 +279,7 @@ in config = mkIf (cfg.interfaces != {}) { boot.extraModulePackages = [ kernel.wireguard ]; - environment.systemPackages = [ pkgs.wireguard ]; + environment.systemPackages = [ pkgs.wireguard-tools ]; systemd.services = mapAttrs' generateUnit cfg.interfaces; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 4bae05b6dd3029e78c153145d451d391ed34a978..c788528fa47be150a86b731b3764589853747bb3 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -8,6 +8,7 @@ let ${optionalString cfg.userControlled.enable '' ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group} update_config=1''} + ${cfg.extraConfig} ${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let key = if psk != null then ''"${psk}"'' @@ -165,6 +166,17 @@ in { description = "Members of this group can control wpa_supplicant."; }; }; + extraConfig = mkOption { + type = types.str; + default = ""; + example = '' + p2p_disabled=1 + ''; + description = '' + Extra lines appended to the configuration file. + See wpa_supplicant.conf(5) for available options. + ''; + }; }; }; diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix index 5e006c13f0d0638af817eea922e835bfc627252a..46111a76af808bd844befe93cb9eba2cfcd56325 100644 --- a/nixos/modules/services/networking/xl2tpd.nix +++ b/nixos/modules/services/networking/xl2tpd.nix @@ -1,4 +1,4 @@ -{ config, stdenv, pkgs, lib, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index bf23c6ae61921ada17440c65946818754513bbfc..0e882873b4ba9516e7ac48ed0b9ab87cfded3204 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -97,6 +97,7 @@ in # xrdp can run X11 program even if "services.xserver.enable = false" environment.pathsToLink = [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ]; + fonts.enableDefaultFonts = mkDefault true; systemd = { services.xrdp = { diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix index 274bbca53fa33bf40c0b0cb6e6fb0b31a35adad8..06ccd7032e6c08885c4ceccda391a640c93a2ba8 100644 --- a/nixos/modules/services/networking/zerobin.nix +++ b/nixos/modules/services/networking/zerobin.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, nodes, ... }: +{ config, pkgs, lib, ... }: with lib; let cfg = config.services.zerobin; diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index cd1617b8e2bac9146e1c4e3291e3414e099b279c..a4cd368397e71fc9b684d203b878dc42feea4745 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -17,6 +17,15 @@ in ''; }; + options.services.zerotierone.port = mkOption { + default = 9993; + example = 9993; + type = types.int; + description = '' + Network port used by ZeroTier. + ''; + }; + options.services.zerotierone.package = mkOption { default = pkgs.zerotierone; defaultText = "pkgs.zerotierone"; @@ -40,17 +49,17 @@ in touch "/var/lib/zerotier-one/networks.d/${netId}.conf" '') cfg.joinNetworks); serviceConfig = { - ExecStart = "${cfg.package}/bin/zerotier-one"; + ExecStart = "${cfg.package}/bin/zerotier-one -p${toString cfg.port}"; Restart = "always"; KillMode = "process"; }; }; # ZeroTier does not issue DHCP leases, but some strangers might... - networking.dhcpcd.denyInterfaces = [ "zt0" ]; + networking.dhcpcd.denyInterfaces = [ "zt*" ]; - # ZeroTier receives UDP transmissions on port 9993 by default - networking.firewall.allowedUDPPorts = [ 9993 ]; + # ZeroTier receives UDP transmissions + networking.firewall.allowedUDPPorts = [ cfg.port ]; environment.systemPackages = [ cfg.package ]; }; diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 72313ab2ee1444d4c60dd259531cd6a42196ffca..f817db2ad000b47efe834bee24c5a29c830d7fb0 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -26,7 +26,6 @@ let }; # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`. - notNull = a: ! isNull a; mkZncConf = confOpts: '' Version = 1.6.3 ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules} @@ -36,6 +35,7 @@ let IPv4 = true IPv6 = true SSL = ${boolToString confOpts.useSSL} + ${lib.optionalString (confOpts.uriPrefix != null) "URIPrefix = ${confOpts.uriPrefix}"} @@ -310,6 +310,16 @@ in ''; }; + uriPrefix = mkOption { + type = types.nullOr types.str; + default = null; + example = "/znc/"; + description = '' + An optional URI prefix for the ZNC web interface. Can be + used to make ZNC available behind a reverse proxy. + ''; + }; + extraZncConf = mkOption { default = ""; type = types.lines; @@ -402,7 +412,7 @@ in script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}"; }; - users.extraUsers = optional (cfg.user == defaultUser) + users.users = optional (cfg.user == defaultUser) { name = defaultUser; description = "ZNC server daemon owner"; group = defaultUser; @@ -411,7 +421,7 @@ in createHome = true; }; - users.extraGroups = optional (cfg.user == defaultUser) + users.groups = optional (cfg.user == defaultUser) { name = defaultUser; gid = config.ids.gids.znc; members = [ defaultUser ]; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index ecab8cfc7df9f3d21c038c00e52fd1a79302084e..dbf18ec1d1149ba9e1d33144a7e556ad8fbbe902 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -83,6 +83,8 @@ let WebInterface ${if cfg.webInterface then "Yes" else "No"} + LogLevel ${cfg.logLevel} + ${cfg.extraConf} ''; @@ -122,6 +124,16 @@ in ''; }; + startWhenNeeded = mkOption { + type = types.bool; + default = false; + description = '' + If set, CUPS is socket-activated; that is, + instead of having it permanently running as a daemon, + systemd will start it on the first incoming connection. + ''; + }; + listenAddresses = mkOption { type = types.listOf types.str; default = [ "localhost:631" ]; @@ -165,6 +177,15 @@ in ''; }; + logLevel = mkOption { + type = types.str; + default = "info"; + example = "debug"; + description = '' + Specifies the cupsd logging verbosity. + ''; + }; + extraFilesConf = mkOption { type = types.lines; default = ""; @@ -180,7 +201,7 @@ in example = '' BrowsePoll cups.example.com - LogLevel debug + MaxCopies 42 ''; description = '' Extra contents of the configuration file of the CUPS daemon @@ -257,7 +278,7 @@ in config = mkIf config.services.printing.enable { - users.extraUsers = singleton + users.users = singleton { name = "cups"; uid = config.ids.uids.cups; group = "lp"; @@ -276,8 +297,13 @@ in systemd.packages = [ cups.out ]; + systemd.sockets.cups = mkIf cfg.startWhenNeeded { + wantedBy = [ "sockets.target" ]; + listenStreams = map (x: replaceStrings ["localhost"] ["127.0.0.1"] (removePrefix "*:" x)) cfg.listenAddresses; + }; + systemd.services.cups = - { wantedBy = [ "multi-user.target" ]; + { wantedBy = optionals (!cfg.startWhenNeeded) [ "multi-user.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; @@ -345,8 +371,6 @@ in services.printing.extraConf = '' - LogLevel info - DefaultAuthType Basic diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix index 77a3f6b51e801929a92b70a315b7eb86d633c6d0..a32907647a0d5802e74c4d0cd5d6bf0f5f74cefa 100644 --- a/nixos/modules/services/scheduling/atd.nix +++ b/nixos/modules/services/scheduling/atd.nix @@ -57,14 +57,14 @@ in security.pam.services.atd = {}; - users.extraUsers = singleton + users.users = singleton { name = "atd"; uid = config.ids.uids.atd; description = "atd user"; home = "/var/empty"; }; - users.extraGroups = singleton + users.groups = singleton { name = "atd"; gid = config.ids.gids.atd; }; diff --git a/nixos/modules/services/scheduling/chronos.nix b/nixos/modules/services/scheduling/chronos.nix index 6c39997fec88e49e4ea26b23a0c346236b18b607..9a8ed4c09ac1c4827544fa17574d20244a734ede 100644 --- a/nixos/modules/services/scheduling/chronos.nix +++ b/nixos/modules/services/scheduling/chronos.nix @@ -49,6 +49,6 @@ in { }; }; - users.extraUsers.chronos.uid = config.ids.uids.chronos; + users.users.chronos.uid = config.ids.uids.chronos; }; } diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index e3b6b638f5a715d83f67d196fa90f13b1688aa84..ae3828977753e0125174a3af8136af3b840df4f7 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -115,7 +115,7 @@ in ]; environment.systemPackages = [ pkgs.fcron ]; - users.extraUsers.fcron = { + users.users.fcron = { uid = config.ids.uids.fcron; home = "/var/spool/fcron"; group = "fcron"; @@ -128,6 +128,7 @@ in owner = "fcron"; group = "fcron"; setgid = true; + setuid = true; }; fcrondyn = { source = "${pkgs.fcron}/bin/fcrondyn"; diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix index 19c9a708f21fb96ec418fe9a166278c3f1ca80ea..0961a67770e1b72de15b964312ed5f03e305592a 100644 --- a/nixos/modules/services/scheduling/marathon.nix +++ b/nixos/modules/services/scheduling/marathon.nix @@ -93,6 +93,6 @@ in { }; }; - users.extraUsers.${cfg.user} = { }; + users.users.${cfg.user} = { }; }; } diff --git a/nixos/modules/services/search/elasticsearch-curator.nix b/nixos/modules/services/search/elasticsearch-curator.nix new file mode 100644 index 0000000000000000000000000000000000000000..43785c392feed500eacce7b4ef8ef9d99d85db12 --- /dev/null +++ b/nixos/modules/services/search/elasticsearch-curator.nix @@ -0,0 +1,93 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.elasticsearch-curator; + curatorConfig = pkgs.writeTextFile { + name = "config.yaml"; + text = '' + --- + # Remember, leave a key empty if there is no value. None will be a string, + # not a Python "NoneType" + client: + hosts: ${builtins.toJSON cfg.hosts} + port: ${toString cfg.port} + url_prefix: + use_ssl: False + certificate: + client_cert: + client_key: + ssl_no_validate: False + http_auth: + timeout: 30 + master_only: False + logging: + loglevel: INFO + logfile: + logformat: default + blacklist: ['elasticsearch', 'urllib3'] + ''; + }; + curatorAction = pkgs.writeTextFile { + name = "action.yaml"; + text = cfg.actionYAML; + }; +in { + + options.services.elasticsearch-curator = { + + enable = mkEnableOption "elasticsearch curator"; + interval = mkOption { + description = "The frequency to run curator, a systemd.time such as 'hourly'"; + default = "hourly"; + type = types.str; + }; + hosts = mkOption { + description = "a list of elasticsearch hosts to connect to"; + type = types.listOf types.str; + default = ["localhost"]; + }; + port = mkOption { + description = "the port that elasticsearch is listening on"; + type = types.int; + default = 9200; + }; + actionYAML = mkOption { + description = "curator action.yaml file contents, alternatively use curator-cli which takes a simple action command"; + example = '' + --- + actions: + 1: + action: delete_indices + description: >- + Delete indices older than 45 days (based on index name), for logstash- + prefixed indices. Ignore the error if the filter does not result in an + actionable list of indices (ignore_empty_list) and exit cleanly. + options: + ignore_empty_list: True + disable_action: False + filters: + - filtertype: pattern + kind: prefix + value: logstash- + - filtertype: age + source: name + direction: older + timestring: '%Y.%m.%d' + unit: days + unit_count: 45 + ''; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.elasticsearch-curator = { + startAt = cfg.interval; + serviceConfig = { + ExecStart = ''${pkgs.python36Packages.elasticsearch-curator}/bin/curator --config ${curatorConfig} ${curatorAction}''; + }; + }; + }; +} diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index adef500b7b5cde4b85936f591fc03ec2fb042b51..6b688c640d59b75c6d88e8a150931e953a468dfc 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -5,42 +5,35 @@ with lib; let cfg = config.services.elasticsearch; - es5 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "5" >= 0; - es6 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "6" >= 0; + es6 = builtins.compareVersions cfg.package.version "6" >= 0; esConfig = '' network.host: ${cfg.listenAddress} cluster.name: ${cfg.cluster_name} - ${if es5 then '' - http.port: ${toString cfg.port} - transport.tcp.port: ${toString cfg.tcp_port} - '' else '' - network.port: ${toString cfg.port} - network.tcp.port: ${toString cfg.tcp_port} - # TODO: find a way to enable security manager - security.manager.enabled: false - ''} + http.port: ${toString cfg.port} + transport.tcp.port: ${toString cfg.tcp_port} ${cfg.extraConf} ''; - configDir = pkgs.buildEnv { - name = "elasticsearch-config"; - paths = [ - (pkgs.writeTextDir "elasticsearch.yml" esConfig) - (if es5 then (pkgs.writeTextDir "log4j2.properties" cfg.logging) - else (pkgs.writeTextDir "logging.yml" cfg.logging)) - ]; - # Elasticsearch 5.x won't start when the scripts directory does not exist - postBuild = if es5 then "${pkgs.coreutils}/bin/mkdir -p $out/scripts" else ""; + configDir = cfg.dataDir + "/config"; + + elasticsearchYml = pkgs.writeTextFile { + name = "elasticsearch.yml"; + text = esConfig; + }; + + loggingConfigFilename = "log4j2.properties"; + loggingConfigFile = pkgs.writeTextFile { + name = loggingConfigFilename; + text = cfg.logging; }; esPlugins = pkgs.buildEnv { name = "elasticsearch-plugins"; paths = cfg.plugins; - # Elasticsearch 5.x won't start when the plugins directory does not exist - postBuild = if es5 then "${pkgs.coreutils}/bin/mkdir -p $out/plugins" else ""; + postBuild = "${pkgs.coreutils}/bin/mkdir -p $out/plugins"; }; in { @@ -56,8 +49,8 @@ in { package = mkOption { description = "Elasticsearch package to use."; - default = pkgs.elasticsearch2; - defaultText = "pkgs.elasticsearch2"; + default = pkgs.elasticsearch; + defaultText = "pkgs.elasticsearch"; type = types.package; }; @@ -98,30 +91,18 @@ in { logging = mkOption { description = "Elasticsearch logging configuration."; - default = - if es5 then '' - logger.action.name = org.elasticsearch.action - logger.action.level = info - - appender.console.type = Console - appender.console.name = console - appender.console.layout.type = PatternLayout - appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n - - rootLogger.level = info - rootLogger.appenderRef.console.ref = console - '' else '' - rootLogger: INFO, console - logger: - action: INFO - com.amazonaws: WARN - appender: - console: - type: console - layout: - type: consolePattern - conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n" - ''; + default = '' + logger.action.name = org.elasticsearch.action + logger.action.level = info + + appender.console.type = Console + appender.console.name = console + appender.console.layout.type = PatternLayout + appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n + + rootLogger.level = info + rootLogger.appenderRef.console.ref = console + ''; type = types.str; }; @@ -190,7 +171,24 @@ in { ln -sfT ${esPlugins}/plugins ${cfg.dataDir}/plugins ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules - if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi + + # elasticsearch needs to create the elasticsearch.keystore in the config directory + # so this directory needs to be writable. + mkdir -m 0700 -p ${configDir} + + # Note that we copy config files from the nix store instead of symbolically linking them + # because otherwise X-Pack Security will raise the following exception: + # java.security.AccessControlException: + # access denied ("java.io.FilePermission" "/var/lib/elasticsearch/config/elasticsearch.yml" "read") + + cp ${elasticsearchYml} ${configDir}/elasticsearch.yml + # Make sure the logging configuration for old elasticsearch versions is removed: + rm -f "${configDir}/logging.yml" + cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename} + mkdir -p ${configDir}/scripts + ${optionalString es6 "cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options"} + + if [ "$(id -u)" = 0 ]; then chown -R elasticsearch:elasticsearch ${cfg.dataDir}; fi ''; }; diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix index a94a851e80eca496d7254504d339c1e3e0d92157..6740928db9a70e0bfe49b9f1f43ad983c708a2e5 100644 --- a/nixos/modules/services/search/hound.nix +++ b/nixos/modules/services/search/hound.nix @@ -88,12 +88,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "hound") { + users.groups = optional (cfg.group == "hound") { name = "hound"; gid = config.ids.gids.hound; }; - users.extraUsers = optional (cfg.user == "hound") { + users.users = optional (cfg.user == "hound") { name = "hound"; description = "hound code search"; createHome = true; diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index 9d7d2d7991896483e6b9cc610aa1e9bc6febae82..ca36bba58c02662dd69e992a35390053ec272967 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -5,43 +5,7 @@ with lib; let cfg = config.services.kibana; - atLeast54 = versionAtLeast (builtins.parseDrvName cfg.package.name).version "5.4"; - - cfgFile = if atLeast54 then cfgFile5 else cfgFile4; - - cfgFile4 = pkgs.writeText "kibana.json" (builtins.toJSON ( - (filterAttrsRecursive (n: v: v != null) ({ - host = cfg.listenAddress; - port = cfg.port; - ssl_cert_file = cfg.cert; - ssl_key_file = cfg.key; - - kibana_index = cfg.index; - default_app_id = cfg.defaultAppId; - - elasticsearch_url = cfg.elasticsearch.url; - kibana_elasticsearch_username = cfg.elasticsearch.username; - kibana_elasticsearch_password = cfg.elasticsearch.password; - kibana_elasticsearch_cert = cfg.elasticsearch.cert; - kibana_elasticsearch_key = cfg.elasticsearch.key; - ca = cfg.elasticsearch.ca; - - bundled_plugin_ids = [ - "plugins/dashboard/index" - "plugins/discover/index" - "plugins/doc/index" - "plugins/kibana/index" - "plugins/markdown_vis/index" - "plugins/metric_vis/index" - "plugins/settings/index" - "plugins/table_vis/index" - "plugins/vis_types/index" - "plugins/visualize/index" - ]; - } // cfg.extraConf) - ))); - - cfgFile5 = pkgs.writeText "kibana.json" (builtins.toJSON ( + cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON ( (filterAttrsRecursive (n: v: v != null) ({ server.host = cfg.listenAddress; server.port = cfg.port; @@ -193,7 +157,7 @@ in { environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { + users.users = singleton { name = "kibana"; uid = config.ids.uids.kibana; description = "Kibana service user"; diff --git a/nixos/modules/services/security/certmgr.nix b/nixos/modules/services/security/certmgr.nix new file mode 100644 index 0000000000000000000000000000000000000000..22d5817ec4f0d4b7eca495ea7f48fc97cc81db3c --- /dev/null +++ b/nixos/modules/services/security/certmgr.nix @@ -0,0 +1,194 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.certmgr; + + specs = mapAttrsToList (n: v: rec { + name = n + ".json"; + path = if isAttrs v then pkgs.writeText name (builtins.toJSON v) else v; + }) cfg.specs; + + allSpecs = pkgs.linkFarm "certmgr.d" specs; + + certmgrYaml = pkgs.writeText "certmgr.yaml" (builtins.toJSON { + dir = allSpecs; + default_remote = cfg.defaultRemote; + svcmgr = cfg.svcManager; + before = cfg.validMin; + interval = cfg.renewInterval; + inherit (cfg) metricsPort metricsAddress; + }); + + specPaths = map dirOf (concatMap (spec: + if isAttrs spec then + collect isString (filterAttrsRecursive (n: v: isAttrs v || n == "path") spec) + else + [ spec ] + ) (attrValues cfg.specs)); + + preStart = '' + ${concatStringsSep " \\\n" (["mkdir -p"] ++ map escapeShellArg specPaths)} + ${pkgs.certmgr}/bin/certmgr -f ${certmgrYaml} check + ''; +in +{ + options.services.certmgr = { + enable = mkEnableOption "certmgr"; + + defaultRemote = mkOption { + type = types.str; + default = "127.0.0.1:8888"; + description = "The default CA host:port to use."; + }; + + validMin = mkOption { + default = "72h"; + type = types.str; + description = "The interval before a certificate expires to start attempting to renew it."; + }; + + renewInterval = mkOption { + default = "30m"; + type = types.str; + description = "How often to check certificate expirations and how often to update the cert_next_expires metric."; + }; + + metricsAddress = mkOption { + default = "127.0.0.1"; + type = types.str; + description = "The address for the Prometheus HTTP endpoint."; + }; + + metricsPort = mkOption { + default = 9488; + type = types.ints.u16; + description = "The port for the Prometheus HTTP endpoint."; + }; + + specs = mkOption { + default = {}; + example = literalExample '' + { + exampleCert = + let + domain = "example.com"; + secret = name: "/var/lib/secrets/''${name}.pem"; + in { + service = "nginx"; + action = "reload"; + authority = { + file.path = secret "ca"; + }; + certificate = { + path = secret domain; + }; + private_key = { + owner = "root"; + group = "root"; + mode = "0600"; + path = secret "''${domain}-key"; + }; + request = { + CN = domain; + hosts = [ "mail.''${domain}" "www.''${domain}" ]; + key = { + algo = "rsa"; + size = 2048; + }; + names = { + O = "Example Organization"; + C = "USA"; + }; + }; + }; + otherCert = "/var/certmgr/specs/other-cert.json"; + } + ''; + type = with types; attrsOf (either (submodule { + options = { + service = mkOption { + type = nullOr str; + default = null; + description = "The service on which to perform <action> after fetching."; + }; + + action = mkOption { + type = addCheck str (x: cfg.svcManager == "command" || elem x ["restart" "reload" "nop"]); + default = "nop"; + description = "The action to take after fetching."; + }; + + # These ought all to be specified according to certmgr spec def. + authority = mkOption { + type = attrs; + description = "certmgr spec authority object."; + }; + + certificate = mkOption { + type = nullOr attrs; + description = "certmgr spec certificate object."; + }; + + private_key = mkOption { + type = nullOr attrs; + description = "certmgr spec private_key object."; + }; + + request = mkOption { + type = nullOr attrs; + description = "certmgr spec request object."; + }; + }; + }) path); + description = '' + Certificate specs as described by: + + These will be added to the Nix store, so they will be world readable. + ''; + }; + + svcManager = mkOption { + default = "systemd"; + type = types.enum [ "circus" "command" "dummy" "openrc" "systemd" "sysv" ]; + description = '' + This specifies the service manager to use for restarting or reloading services. + See: . + For how to use the "command" service manager in particular, + see: . + ''; + }; + + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.specs != {}; + message = "Certmgr specs cannot be empty."; + } + { + assertion = !any (hasAttrByPath [ "authority" "auth_key" ]) (attrValues cfg.specs); + message = '' + Inline services.certmgr.specs are added to the Nix store rendering them world readable. + Specify paths as specs, if you want to use include auth_key - or use the auth_key_file option." + ''; + } + ]; + + systemd.services.certmgr = { + description = "certmgr"; + path = mkIf (cfg.svcManager == "command") [ pkgs.bash ]; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + inherit preStart; + + serviceConfig = { + Restart = "always"; + RestartSec = "10s"; + ExecStart = "${pkgs.certmgr}/bin/certmgr -f ${certmgrYaml}"; + }; + }; + }; +} diff --git a/nixos/modules/services/security/cfssl.nix b/nixos/modules/services/security/cfssl.nix new file mode 100644 index 0000000000000000000000000000000000000000..ee6d5d91fe155580b0ed65310fee2ab103e47c05 --- /dev/null +++ b/nixos/modules/services/security/cfssl.nix @@ -0,0 +1,209 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.cfssl; +in { + options.services.cfssl = { + enable = mkEnableOption "the CFSSL CA api-server"; + + dataDir = mkOption { + default = "/var/lib/cfssl"; + type = types.path; + description = "Cfssl work directory."; + }; + + address = mkOption { + default = "127.0.0.1"; + type = types.str; + description = "Address to bind."; + }; + + port = mkOption { + default = 8888; + type = types.ints.u16; + description = "Port to bind."; + }; + + ca = mkOption { + defaultText = "\${cfg.dataDir}/ca.pem"; + type = types.str; + description = "CA used to sign the new certificate -- accepts '[file:]fname' or 'env:varname'."; + }; + + caKey = mkOption { + defaultText = "file:\${cfg.dataDir}/ca-key.pem"; + type = types.str; + description = "CA private key -- accepts '[file:]fname' or 'env:varname'."; + }; + + caBundle = mkOption { + default = null; + type = types.nullOr types.path; + description = "Path to root certificate store."; + }; + + intBundle = mkOption { + default = null; + type = types.nullOr types.path; + description = "Path to intermediate certificate store."; + }; + + intDir = mkOption { + default = null; + type = types.nullOr types.path; + description = "Intermediates directory."; + }; + + metadata = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Metadata file for root certificate presence. + The content of the file is a json dictionary (k,v): each key k is + a SHA-1 digest of a root certificate while value v is a list of key + store filenames. + ''; + }; + + remote = mkOption { + default = null; + type = types.nullOr types.str; + description = "Remote CFSSL server."; + }; + + configFile = mkOption { + default = null; + type = types.nullOr types.str; + description = "Path to configuration file. Do not put this in nix-store as it might contain secrets."; + }; + + responder = mkOption { + default = null; + type = types.nullOr types.path; + description = "Certificate for OCSP responder."; + }; + + responderKey = mkOption { + default = null; + type = types.nullOr types.str; + description = "Private key for OCSP responder certificate. Do not put this in nix-store."; + }; + + tlsKey = mkOption { + default = null; + type = types.nullOr types.str; + description = "Other endpoint's CA private key. Do not put this in nix-store."; + }; + + tlsCert = mkOption { + default = null; + type = types.nullOr types.path; + description = "Other endpoint's CA to set up TLS protocol."; + }; + + mutualTlsCa = mkOption { + default = null; + type = types.nullOr types.path; + description = "Mutual TLS - require clients be signed by this CA."; + }; + + mutualTlsCn = mkOption { + default = null; + type = types.nullOr types.str; + description = "Mutual TLS - regex for whitelist of allowed client CNs."; + }; + + tlsRemoteCa = mkOption { + default = null; + type = types.nullOr types.path; + description = "CAs to trust for remote TLS requests."; + }; + + mutualTlsClientCert = mkOption { + default = null; + type = types.nullOr types.path; + description = "Mutual TLS - client certificate to call remote instance requiring client certs."; + }; + + mutualTlsClientKey = mkOption { + default = null; + type = types.nullOr types.path; + description = "Mutual TLS - client key to call remote instance requiring client certs. Do not put this in nix-store."; + }; + + dbConfig = mkOption { + default = null; + type = types.nullOr types.path; + description = "Certificate db configuration file. Path must be writeable."; + }; + + logLevel = mkOption { + default = 1; + type = types.enum [ 0 1 2 3 4 5 ]; + description = "Log level (0 = DEBUG, 5 = FATAL)."; + }; + }; + + config = mkIf cfg.enable { + users.extraGroups.cfssl = { + gid = config.ids.gids.cfssl; + }; + + users.extraUsers.cfssl = { + description = "cfssl user"; + createHome = true; + home = cfg.dataDir; + group = "cfssl"; + uid = config.ids.uids.cfssl; + }; + + systemd.services.cfssl = { + description = "CFSSL CA API server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + WorkingDirectory = cfg.dataDir; + StateDirectory = cfg.dataDir; + StateDirectoryMode = 700; + Restart = "always"; + User = "cfssl"; + + ExecStart = with cfg; let + opt = n: v: optionalString (v != null) ''-${n}="${v}"''; + in + lib.concatStringsSep " \\\n" [ + "${pkgs.cfssl}/bin/cfssl serve" + (opt "address" address) + (opt "port" (toString port)) + (opt "ca" ca) + (opt "ca-key" caKey) + (opt "ca-bundle" caBundle) + (opt "int-bundle" intBundle) + (opt "int-dir" intDir) + (opt "metadata" metadata) + (opt "remote" remote) + (opt "config" configFile) + (opt "responder" responder) + (opt "responder-key" responderKey) + (opt "tls-key" tlsKey) + (opt "tls-cert" tlsCert) + (opt "mutual-tls-ca" mutualTlsCa) + (opt "mutual-tls-cn" mutualTlsCn) + (opt "mutual-tls-client-key" mutualTlsClientKey) + (opt "mutual-tls-client-cert" mutualTlsClientCert) + (opt "tls-remote-ca" tlsRemoteCa) + (opt "db-config" dbConfig) + (opt "loglevel" (toString logLevel)) + ]; + }; + }; + + services.cfssl = { + ca = mkDefault "${cfg.dataDir}/ca.pem"; + caKey = mkDefault "${cfg.dataDir}/ca-key.pem"; + }; + }; +} diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 4161c61ed375eee5868d3d4f92d18c9b7242ba70..9ad0095252dea55d28e6136d547fca39c5724288 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -79,7 +79,7 @@ in config = mkIf (cfg.updater.enable || cfg.daemon.enable) { environment.systemPackages = [ pkg ]; - users.extraUsers = singleton { + users.users = singleton { name = clamavUser; uid = config.ids.uids.clamav; group = clamavGroup; @@ -87,7 +87,7 @@ in home = stateDir; }; - users.extraGroups = singleton { + users.groups = singleton { name = clamavGroup; gid = config.ids.gids.clamav; }; diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix index a12aa01503e3e0c83199e7d055f0a6b256188262..b1ca4ab2345263d37988990cd2b7f2b301896465 100644 --- a/nixos/modules/services/security/fprot.nix +++ b/nixos/modules/services/security/fprot.nix @@ -53,14 +53,14 @@ in { target = "f-prot.conf"; }; - users.extraUsers = singleton + users.users = singleton { name = fprotUser; uid = config.ids.uids.fprot; description = "F-Prot daemon user"; home = stateDir; }; - users.extraGroups = singleton + users.groups = singleton { name = fprotGroup; gid = config.ids.gids.fprot; }; diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix index 919c2c2b0e15f881cd681c3cf04c07b7b0bf21d0..5bca15833544bfa66a8df69e32362c0a2cff2fc9 100644 --- a/nixos/modules/services/security/munge.nix +++ b/nixos/modules/services/security/munge.nix @@ -35,7 +35,15 @@ in environment.systemPackages = [ pkgs.munge ]; - systemd.services.munged = { + users.users.munge = { + description = "Munge daemon user"; + isSystemUser = true; + group = "munge"; + }; + + users.groups.munge = {}; + + systemd.services.munged = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; @@ -44,14 +52,20 @@ in preStart = '' chmod 0700 ${cfg.password} mkdir -p /var/lib/munge -m 0711 + chown -R munge:munge /var/lib/munge mkdir -p /var/log/munge -m 0700 + chown -R munge:munge /var/log/munge mkdir -p /run/munge -m 0755 + chown -R munge:munge /run/munge ''; serviceConfig = { ExecStart = "${pkgs.munge}/bin/munged --syslog --key-file ${cfg.password}"; PIDFile = "/run/munge/munged.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + PermissionsStartOnly = "true"; + User = "munge"; + Group = "munge"; }; }; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index ef48d52e7a94b010d09cb7116c83eea1e775da92..0c5fe8c0ef5ffc7d5a918319294cf43014e102e0 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -6,70 +6,82 @@ with lib; let cfg = config.services.oauth2_proxy; - # Use like: - # repeatedArgs (arg: "--arg=${arg}") args - repeatedArgs = concatMapStringsSep " "; - # oauth2_proxy provides many options that are only relevant if you are using # a certain provider. This set maps from provider name to a function that # takes the configuration and returns a string that can be inserted into the # command-line to launch oauth2_proxy. providerSpecificOptions = { - azure = cfg: '' - --azure-tenant=${cfg.azure.tenant} \ - --resource=${cfg.azure.resource} \ - ''; - - github = cfg: '' - ${optionalString (!isNull cfg.github.org) "--github-org=${cfg.github.org}"} \ - ${optionalString (!isNull cfg.github.team) "--github-org=${cfg.github.team}"} \ - ''; - - google = cfg: '' - --google-admin-email=${cfg.google.adminEmail} \ - --google-service-account=${cfg.google.serviceAccountJSON} \ - ${repeatedArgs (group: "--google-group=${group}") cfg.google.groups} \ - ''; + azure = cfg: { + azure.tenant = cfg.azure.tenant; + resource = cfg.azure.resource; + }; + + github = cfg: { github = { + inherit (cfg.github) org team; + }; }; + + google = cfg: { google = with cfg.google; optionalAttrs (groups != []) { + admin-email = adminEmail; + service-account = serviceAccountJSON; + group = groups; + }; }; }; authenticatedEmailsFile = pkgs.writeText "authenticated-emails" cfg.email.addresses; - getProviderOptions = cfg: provider: providerSpecificOptions.${provider} or (_: "") cfg; - - mkCommandLine = cfg: '' - --provider='${cfg.provider}' \ - ${optionalString (!isNull cfg.email.addresses) "--authenticated-emails-file='${authenticatedEmailsFile}'"} \ - --approval-prompt='${cfg.approvalPrompt}' \ - ${optionalString (cfg.passBasicAuth && !isNull cfg.basicAuthPassword) "--basic-auth-password='${cfg.basicAuthPassword}'"} \ - --client-id='${cfg.clientID}' \ - --client-secret='${cfg.clientSecret}' \ - ${optionalString (!isNull cfg.cookie.domain) "--cookie-domain='${cfg.cookie.domain}'"} \ - --cookie-expire='${cfg.cookie.expire}' \ - --cookie-httponly=${boolToString cfg.cookie.httpOnly} \ - --cookie-name='${cfg.cookie.name}' \ - --cookie-secret='${cfg.cookie.secret}' \ - --cookie-secure=${boolToString cfg.cookie.secure} \ - ${optionalString (!isNull cfg.cookie.refresh) "--cookie-refresh='${cfg.cookie.refresh}'"} \ - ${optionalString (!isNull cfg.customTemplatesDir) "--custom-templates-dir='${cfg.customTemplatesDir}'"} \ - ${repeatedArgs (x: "--email-domain='${x}'") cfg.email.domains} \ - --http-address='${cfg.httpAddress}' \ - ${optionalString (!isNull cfg.htpasswd.file) "--htpasswd-file='${cfg.htpasswd.file}' --display-htpasswd-form=${boolToString cfg.htpasswd.displayForm}"} \ - ${optionalString (!isNull cfg.loginURL) "--login-url='${cfg.loginURL}'"} \ - --pass-access-token=${boolToString cfg.passAccessToken} \ - --pass-basic-auth=${boolToString cfg.passBasicAuth} \ - --pass-host-header=${boolToString cfg.passHostHeader} \ - --proxy-prefix='${cfg.proxyPrefix}' \ - ${optionalString (!isNull cfg.profileURL) "--profile-url='${cfg.profileURL}'"} \ - ${optionalString (!isNull cfg.redeemURL) "--redeem-url='${cfg.redeemURL}'"} \ - ${optionalString (!isNull cfg.redirectURL) "--redirect-url='${cfg.redirectURL}'"} \ - --request-logging=${boolToString cfg.requestLogging} \ - ${optionalString (!isNull cfg.scope) "--scope='${cfg.scope}'"} \ - ${repeatedArgs (x: "--skip-auth-regex='${x}'") cfg.skipAuthRegexes} \ - ${optionalString (!isNull cfg.signatureKey) "--signature-key='${cfg.signatureKey}'"} \ - --upstream='${cfg.upstream}' \ - ${optionalString (!isNull cfg.validateURL) "--validate-url='${cfg.validateURL}'"} \ - ${optionalString cfg.tls.enable "--tls-cert='${cfg.tls.certificate}' --tls-key='${cfg.tls.key}' --https-address='${cfg.tls.httpsAddress}'"} \ - '' + getProviderOptions cfg cfg.provider; + getProviderOptions = cfg: provider: providerSpecificOptions.${provider} or (_: {}) cfg; + + allConfig = with cfg; { + inherit (cfg) provider scope upstream; + approval-prompt = approvalPrompt; + basic-auth-password = basicAuthPassword; + client-id = clientID; + client-secret = clientSecret; + custom-templates-dir = customTemplatesDir; + email-domain = email.domains; + http-address = httpAddress; + login-url = loginURL; + pass-access-token = passAccessToken; + pass-basic-auth = passBasicAuth; + pass-host-header = passHostHeader; + proxy-prefix = proxyPrefix; + profile-url = profileURL; + redeem-url = redeemURL; + redirect-url = redirectURL; + request-logging = requestLogging; + skip-auth-regex = skipAuthRegexes; + signature-key = signatureKey; + validate-url = validateURL; + htpasswd-file = htpasswd.file; + cookie = { + inherit (cookie) domain secure expire name secret refresh; + httponly = cookie.httpOnly; + }; + set-xauthrequest = setXauthrequest; + } // lib.optionalAttrs (!isNull cfg.email.addresses) { + authenticated-emails-file = authenticatedEmailsFile; + } // lib.optionalAttrs (cfg.passBasicAuth) { + basic-auth-password = cfg.basicAuthPassword; + } // lib.optionalAttrs (!isNull cfg.htpasswd.file) { + display-htpasswd-file = cfg.htpasswd.displayForm; + } // lib.optionalAttrs tls.enable { + tls-cert = tls.certificate; + tls-key = tls.key; + https-address = tls.httpsAddress; + } // (getProviderOptions cfg cfg.provider) // cfg.extraConfig; + + mapConfig = key: attr: + if (!isNull attr && attr != []) then ( + if isDerivation attr then mapConfig key (toString attr) else + if (builtins.typeOf attr) == "set" then concatStringsSep " " + (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else + if (builtins.typeOf attr) == "list" then concatMapStringsSep " " (mapConfig key) attr else + if (builtins.typeOf attr) == "bool" then "--${key}=${boolToString attr}" else + if (builtins.typeOf attr) == "string" then "--${key}='${attr}'" else + "--${key}=${toString attr}") + else ""; + + configString = concatStringsSep " " (mapAttrsToList mapConfig allConfig); in { options.services.oauth2_proxy = { @@ -110,7 +122,7 @@ in }; clientID = mkOption { - type = types.str; + type = types.nullOr types.str; description = '' The OAuth Client ID. ''; @@ -118,7 +130,7 @@ in }; clientSecret = mkOption { - type = types.str; + type = types.nullOr types.str; description = '' The OAuth Client Secret. ''; @@ -272,7 +284,8 @@ in #################################################### # UPSTREAM Configuration upstream = mkOption { - type = types.commas; + type = with types; coercedTo string (x: [x]) (listOf string); + default = []; description = '' The http url(s) of the upstream endpoint or file:// paths for static files. Routing is based on the path. @@ -365,7 +378,7 @@ in }; secret = mkOption { - type = types.str; + type = types.nullOr types.str; description = '' The seed string for secure cookies. ''; @@ -494,11 +507,44 @@ in ''; }; + setXauthrequest = mkOption { + type = types.nullOr types.bool; + default = false; + description = '' + Set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode). Setting this to 'null' means using the upstream default (false). + ''; + }; + + extraConfig = mkOption { + default = {}; + description = '' + Extra config to pass to oauth2_proxy. + ''; + }; + + keyFile = mkOption { + type = types.nullOr types.string; + default = null; + description = '' + oauth2_proxy allows passing sensitive configuration via environment variables. + Make a file that contains lines like + OAUTH2_PROXY_CLIENT_SECRET=asdfasdfasdf.apps.googleuserscontent.com + and specify the path here. + ''; + example = "/run/keys/oauth2_proxy"; + }; + }; config = mkIf cfg.enable { - users.extraUsers.oauth2_proxy = { + services.oauth2_proxy = mkIf (!isNull cfg.keyFile) { + clientID = mkDefault null; + clientSecret = mkDefault null; + cookie.secret = mkDefault null; + }; + + users.users.oauth2_proxy = { description = "OAuth2 Proxy"; }; @@ -511,7 +557,8 @@ in serviceConfig = { User = "oauth2_proxy"; Restart = "always"; - ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${mkCommandLine cfg}"; + ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}"; + EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile; }; }; diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix new file mode 100644 index 0000000000000000000000000000000000000000..a9ad5497a657aa15d7744d94e966f8ea77647563 --- /dev/null +++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix @@ -0,0 +1,64 @@ +{ config, lib, ... }: +with lib; +let + cfg = config.services.oauth2_proxy.nginx; +in +{ + options.services.oauth2_proxy.nginx = { + proxy = mkOption { + type = types.string; + default = config.services.oauth2_proxy.httpAddress; + description = '' + The address of the reverse proxy endpoint for oauth2_proxy + ''; + }; + virtualHosts = mkOption { + type = types.listOf types.string; + default = []; + description = '' + A list of nginx virtual hosts to put behind the oauth2 proxy + ''; + }; + }; + config.services.oauth2_proxy = mkIf (cfg.virtualHosts != [] && (hasPrefix "127.0.0.1:" cfg.proxy)) { + enable = true; + }; + config.services.nginx = mkMerge ((optional (cfg.virtualHosts != []) { + recommendedProxySettings = true; # needed because duplicate headers + }) ++ (map (vhost: { + virtualHosts.${vhost} = { + locations."/oauth2/" = { + proxyPass = cfg.proxy; + extraConfig = '' + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Auth-Request-Redirect $request_uri; + ''; + }; + locations."/oauth2/auth" = { + proxyPass = cfg.proxy; + extraConfig = '' + proxy_set_header X-Scheme $scheme; + # nginx auth_request includes headers but not body + proxy_set_header Content-Length ""; + proxy_pass_request_body off; + ''; + }; + locations."/".extraConfig = '' + auth_request /oauth2/auth; + error_page 401 = /oauth2/sign_in; + + # pass information via X-User and X-Email headers to backend, + # requires running with --set-xauthrequest flag + auth_request_set $user $upstream_http_x_auth_request_user; + auth_request_set $email $upstream_http_x_auth_request_email; + proxy_set_header X-User $user; + proxy_set_header X-Email $email; + + # if you enabled --cookie-refresh, this is needed for it to work with auth_request + auth_request_set $auth_cookie $upstream_http_set_cookie; + add_header Set-Cookie $auth_cookie; + ''; + + }; + }) cfg.virtualHosts)); +} diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index 7f09e8893c4d0556641e6e530026f87a2c7fc2aa..137c3d610186caadb783beb6c4a2331abf74b7fe 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -133,6 +133,7 @@ in { ReadOnlyDirectories = "/"; ReadWriteDirectories = "/run/sshguard /var/lib/sshguard"; RuntimeDirectory = "sshguard"; + StateDirectory = "sshguard"; CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; }; }; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 2c727de210270f014033b8b45234e99de5448c30..def77ba69e58bc0f44fb25f1080b55b8859747ae 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -39,7 +39,7 @@ let ''} ${optint "ControlPort" cfg.controlPort} - ${optionalString cfg.controlSocket.enable "ControlSocket ${torRunDirectory}/control GroupWritable RelaxDirModeCheck"} + ${optionalString cfg.controlSocket.enable "ControlPort unix:${torRunDirectory}/control GroupWritable RelaxDirModeCheck"} '' # Client connection config + optionalString cfg.client.enable '' @@ -360,7 +360,7 @@ in - WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVISE. + WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVICE. Consult with your lawer when in doubt. @@ -578,7 +578,7 @@ in ]; } ''; - type = types.loaOf (types.submodule ({name, config, ...}: { + type = types.loaOf (types.submodule ({name, ...}: { options = { name = mkOption { @@ -638,7 +638,7 @@ in authorizeClient = mkOption { default = null; description = "If configured, the hidden service is accessible for authorized clients only."; - type = types.nullOr (types.submodule ({config, ...}: { + type = types.nullOr (types.submodule ({...}: { options = { @@ -686,8 +686,8 @@ in always create a container/VM with a separate Tor daemon instance. ''; - users.extraGroups.tor.gid = config.ids.gids.tor; - users.extraUsers.tor = + users.groups.tor.gid = config.ids.gids.tor; + users.users.tor = { description = "Tor Daemon User"; createHome = true; home = torDirectory; @@ -695,23 +695,38 @@ in uid = config.ids.uids.tor; }; + # We have to do this instead of using RuntimeDirectory option in + # the service below because systemd has no way to set owners of + # RuntimeDirectory and putting this into the service below + # requires that service to relax it's sandbox since this needs + # writable /run + systemd.services.tor-init = + { description = "Tor Daemon Init"; + wantedBy = [ "tor.service" ]; + after = [ "local-fs.target" ]; + script = '' + install -m 0700 -o tor -g tor -d ${torDirectory} ${torDirectory}/onion + install -m 0750 -o tor -g tor -d ${torRunDirectory} + ''; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + }; + systemd.services.tor = { description = "Tor Daemon"; path = [ pkgs.tor ]; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "tor-init.service" "network.target" ]; restartTriggers = [ torRcFile ]; - # Translated from the upstream contrib/dist/tor.service.in - preStart = '' - install -o tor -g tor -d ${torDirectory}/onion ${torRunDirectory} - ${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config - ''; - serviceConfig = { Type = "simple"; - ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile} --RunAsDaemon 0"; + # Translated from the upstream contrib/dist/tor.service.in + ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config"; + ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; KillSignal = "SIGINT"; TimeoutSec = 30; @@ -719,18 +734,18 @@ in LimitNOFILE = 32768; # Hardening - # Note: DevicePolicy is set to 'closed', although the - # minimal permissions are really: - # DeviceAllow /dev/null rw - # DeviceAllow /dev/urandom r - # .. but we can't specify DeviceAllow multiple times. 'closed' - # is close enough. - PrivateTmp = "yes"; - DevicePolicy = "closed"; - InaccessibleDirectories = "/home"; - ReadOnlyDirectories = "/"; - ReadWriteDirectories = [torDirectory torRunDirectory]; + # this seems to unshare /run despite what systemd.exec(5) says + PrivateTmp = mkIf (!cfg.controlSocket.enable) "yes"; + PrivateDevices = "yes"; + ProtectHome = "yes"; + ProtectSystem = "strict"; + InaccessiblePaths = "/home"; + ReadOnlyPaths = "/"; + ReadWritePaths = [ torDirectory torRunDirectory ]; NoNewPrivileges = "yes"; + + # tor.service.in has this in, but this line it fails to spawn a namespace when using hidden services + #CapabilityBoundingSet = "CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE"; }; }; diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix index 146afec344ab904d0c7eeacf5ad05d4859bb074a..0b28bc894458dc152d190816a33b079dc18d613e 100644 --- a/nixos/modules/services/security/vault.nix +++ b/nixos/modules/services/security/vault.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: with lib; + let cfg = config.services.vault; @@ -24,15 +25,22 @@ let ${cfg.telemetryConfig} } ''} + ${cfg.extraConfig} ''; in + { options = { - services.vault = { - enable = mkEnableOption "Vault daemon"; + package = mkOption { + type = types.package; + default = pkgs.vault; + defaultText = "pkgs.vault"; + description = "This option specifies the vault package to use."; + }; + address = mkOption { type = types.str; default = "127.0.0.1:8200"; @@ -58,7 +66,7 @@ in default = '' tls_min_version = "tls12" ''; - description = "extra configuration"; + description = "Extra text appended to the listener section."; }; storageBackend = mkOption { @@ -84,6 +92,12 @@ in default = ""; description = "Telemetry configuration"; }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Extra text appended to vault.hcl."; + }; }; }; @@ -97,13 +111,13 @@ in } ]; - users.extraUsers.vault = { + users.users.vault = { name = "vault"; group = "vault"; uid = config.ids.uids.vault; description = "Vault daemon user"; }; - users.extraGroups.vault.gid = config.ids.gids.vault; + users.groups.vault.gid = config.ids.gids.vault; systemd.services.vault = { description = "Vault server daemon"; @@ -122,7 +136,7 @@ in User = "vault"; Group = "vault"; PermissionsStartOnly = true; - ExecStart = "${pkgs.vault}/bin/vault server -config ${configFile}"; + ExecStart = "${cfg.package}/bin/vault server -config ${configFile}"; PrivateDevices = true; PrivateTmp = true; ProtectSystem = "full"; diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index d513e44dcfbad6909abd48295947b7c922ed85b5..1a700828ce77cad82d1ac472f1e11daac7846b58 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -104,8 +104,9 @@ in systemd.services.cloud-init = { description = "Initial cloud-init job (metadata service crawler)"; wantedBy = [ "multi-user.target" ]; - wants = [ "local-fs.target" "cloud-init-local.service" "sshd.service" "sshd-keygen.service" ]; - after = [ "local-fs.target" "network.target" "cloud-init-local.service" ]; + wants = [ "local-fs.target" "network-online.target" "cloud-init-local.service" + "sshd.service" "sshd-keygen.service" ]; + after = [ "local-fs.target" "network-online.target" "cloud-init-local.service" ]; before = [ "sshd.service" "sshd-keygen.service" ]; requires = [ "network.target "]; path = path; @@ -121,8 +122,8 @@ in systemd.services.cloud-config = { description = "Apply the settings specified in cloud-config"; wantedBy = [ "multi-user.target" ]; - wants = [ "network.target" ]; - after = [ "network.target" "syslog.target" "cloud-config.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" "syslog.target" "cloud-config.target" ]; path = path; serviceConfig = @@ -137,8 +138,8 @@ in systemd.services.cloud-final = { description = "Execute cloud user/final scripts"; wantedBy = [ "multi-user.target" ]; - wants = [ "network.target" ]; - after = [ "network.target" "syslog.target" "cloud-config.service" "rc-local.service" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" "syslog.target" "cloud-config.service" "rc-local.service" ]; requires = [ "cloud-config.target" ]; path = path; serviceConfig = diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 643bec18814297a1e356627b976bbea0ce4bf389..e0458021844216bb19e8d9ecef7c0d038d72dc10 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -71,14 +71,14 @@ in target = "dbus-1"; }; - users.extraUsers.messagebus = { + users.users.messagebus = { uid = config.ids.uids.messagebus; description = "D-Bus system message bus daemon user"; home = homeDir; group = "messagebus"; }; - users.extraGroups.messagebus.gid = config.ids.gids.messagebus; + users.groups.messagebus.gid = config.ids.gids.messagebus; systemd.packages = [ pkgs.dbus.daemon ]; @@ -100,6 +100,7 @@ in # Don't restart dbus-daemon. Bad things tend to happen if we do. reloadIfChanged = true; restartTriggers = [ configDir ]; + environment = { LD_LIBRARY_PATH = config.system.nssModules.path; }; }; systemd.user = { diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix index 4f2e2fdf662b2ddf549c80c48d8b111d6c72dc59..d151385d2f9beee25de08afc79936a99e6cddc64 100644 --- a/nixos/modules/services/system/kerberos.nix +++ b/nixos/modules/services/system/kerberos.nix @@ -2,7 +2,7 @@ let - inherit (lib) mkOption mkIf singleton; + inherit (lib) mkOption mkIf; inherit (pkgs) heimdalFull; @@ -41,8 +41,8 @@ in flags = "REUSE NAMEINARGS"; protocol = "tcp"; user = "root"; - server = "${pkgs.tcp_wrappers}/sbin/tcpd"; - serverArgs = "${pkgs.heimdalFull}/sbin/kadmind"; + server = "${pkgs.tcp_wrappers}/bin/tcpd"; + serverArgs = "${pkgs.heimdalFull}/bin/kadmind"; }; systemd.services.kdc = { @@ -51,13 +51,13 @@ in preStart = '' mkdir -m 0755 -p ${stateDir} ''; - script = "${heimdalFull}/sbin/kdc"; + script = "${heimdalFull}/bin/kdc"; }; systemd.services.kpasswdd = { description = "Kerberos Password Changing daemon"; wantedBy = [ "multi-user.target" ]; - script = "${heimdalFull}/sbin/kpasswdd"; + script = "${heimdalFull}/bin/kpasswdd"; }; }; diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix index b9355bbb94419a6fdacc0fe0be9849c0e8fe6e8a..c7e897c9644813d6d4c6d6bf3c56c5ea0ba2dc37 100644 --- a/nixos/modules/services/system/localtime.nix +++ b/nixos/modules/services/system/localtime.nix @@ -22,14 +22,8 @@ in { config = mkIf cfg.enable { services.geoclue2.enable = true; - security.polkit.extraConfig = '' - polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.timedate1.set-timezone" - && subject.user == "localtimed") { - return polkit.Result.YES; - } - }); - ''; + # so polkit will pick up the rules + environment.systemPackages = [ pkgs.localtime ]; users.users = [{ name = "localtimed"; diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index eb4b5281c7c6e7ba184b85f480e953ef7f2b3b0e..fd1570d11980795451e2c5b9daa231d42af2f857 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -7,8 +7,6 @@ let nssModulesPath = config.system.nssModules.path; cfg = config.services.nscd; - inherit (lib) singleton; - in { @@ -41,7 +39,7 @@ in config = mkIf cfg.enable { environment.etc."nscd.conf".text = cfg.config; - users.extraUsers.nscd = + users.users.nscd = { isSystemUser = true; description = "Name service cache daemon user"; }; diff --git a/nixos/modules/services/system/saslauthd.nix b/nixos/modules/services/system/saslauthd.nix index 281716cf1860c846902f6f75bb61d3986487b81d..c8ddca9a0db63451faeccc8ba46dcdbbc5f2c724 100644 --- a/nixos/modules/services/system/saslauthd.nix +++ b/nixos/modules/services/system/saslauthd.nix @@ -4,7 +4,6 @@ with lib; let - nssModulesPath = config.system.nssModules.path; cfg = config.services.saslauthd; in diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix index b20d60968032d8d4ea492800694bf59ce3385dc6..3c9978ab22692642f9dd6d2355bad61c23744f45 100644 --- a/nixos/modules/services/system/uptimed.nix +++ b/nixos/modules/services/system/uptimed.nix @@ -20,7 +20,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.uptimed = { + users.users.uptimed = { description = "Uptimed daemon user"; home = stateDir; createHome = true; diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index ec1e97f4125ed128cf5139f4aeaf290756e01978..84f0437b9411c2d405fc2f4065ff157969da39c7 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -11,10 +11,7 @@ in { options = { services = { deluge = { - enable = mkOption { - default = false; - description = "Start the Deluge daemon"; - }; + enable = mkEnableOption "Deluge daemon"; openFilesLimit = mkOption { default = openFilesLimit; @@ -25,14 +22,7 @@ in { }; }; - deluge.web = { - enable = mkOption { - default = false; - description = '' - Start Deluge Web daemon. - ''; - }; - }; + deluge.web.enable = mkEnableOption "Deluge Web daemon"; }; }; @@ -65,7 +55,7 @@ in { environment.systemPackages = [ pkgs.deluge ]; - users.extraUsers.deluge = { + users.users.deluge = { group = "deluge"; uid = config.ids.uids.deluge; home = "/var/lib/deluge/"; @@ -73,6 +63,6 @@ in { description = "Deluge Daemon user"; }; - users.extraGroups.deluge.gid = config.ids.gids.deluge; + users.groups.deluge.gid = config.ids.gids.deluge; }; } diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix index 4b9038e3e251c5cdf7775312ec782f76937c8711..ca63f529a5dfba8d47dc85a93d81d83235b3ee65 100644 --- a/nixos/modules/services/torrent/flexget.nix +++ b/nixos/modules/services/torrent/flexget.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, timezone, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/torrent/peerflix.nix b/nixos/modules/services/torrent/peerflix.nix index 2e3dd9902d7296f0ccb6868ea717ee30ef9f91d7..bed6661f84d61711fe1a01728a91fa84982352ae 100644 --- a/nixos/modules/services/torrent/peerflix.nix +++ b/nixos/modules/services/torrent/peerflix.nix @@ -58,6 +58,6 @@ in { }; }; - users.extraUsers.peerflix.uid = config.ids.uids.peerflix; + users.users.peerflix.uid = config.ids.uids.peerflix; }; } diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 1cf85af2a06c354ac5cdfe51b9e410d031a23fac..96413d2dd563f0036ef41120619a858cfd82b802 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -13,14 +13,21 @@ let settingsDir = "${homeDir}/.config/transmission-daemon"; settingsFile = pkgs.writeText "settings.json" (builtins.toJSON fullSettings); - # Strings must be quoted, ints and bools must not (for settings.json). - toOption = x: - if isBool x then boolToString x - else if isInt x then toString x - else toString ''"${x}"''; - # for users in group "transmission" to have access to torrents fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings; + + # Directories transmission expects to exist and be ug+rwx. + directoriesToManage = [ homeDir settingsDir fullSettings.download-dir fullSettings.incomplete-dir ]; + + preStart = pkgs.writeScript "transmission-pre-start" '' + #!${pkgs.runtimeShell} + set -ex + for DIR in ${escapeShellArgs directoriesToManage}; do + mkdir -p "$DIR" + chmod 770 "$DIR" + done + cp -f ${settingsFile} ${settingsDir}/settings.json + ''; in { options = { @@ -89,9 +96,7 @@ in # 1) Only the "transmission" user and group have access to torrents. # 2) Optionally update/force specific fields into the configuration file. - serviceConfig.ExecStartPre = '' - ${pkgs.runtimeShell} -c "mkdir -p ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && chmod 770 ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json" - ''; + serviceConfig.ExecStartPre = preStart; serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}"; serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; serviceConfig.User = "transmission"; @@ -102,8 +107,8 @@ in # It's useful to have transmission in path, e.g. for remote control environment.systemPackages = [ pkgs.transmission ]; - users.extraGroups.transmission.gid = config.ids.gids.transmission; - users.extraUsers.transmission = { + users.groups.transmission.gid = config.ids.gids.transmission; + users.users.transmission = { group = "transmission"; uid = config.ids.uids.transmission; description = "Transmission BitTorrent user"; @@ -136,6 +141,7 @@ in ${getLib pkgs.libcap}/lib/libcap*.so* mr, ${getLib pkgs.attr}/lib/libattr*.so* mr, ${getLib pkgs.lz4}/lib/liblz4*.so* mr, + ${getLib pkgs.libkrb5}/lib/lib*.so* mr, @{PROC}/sys/kernel/random/uuid r, @{PROC}/sys/vm/overcommit_memory r, diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 88e488425bcedeb0a9647edfec4545287e08497c..59c45fcb44ee1b0061f7f856f5b34d6af36f5a74 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: let - inherit (lib) mkOption types mkIf optionalString; + inherit (lib) mkOption types mkIf; cfg = config.services.kmscon; diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index 84c41b6e53c2de04b0910362ba682d4734035a11..f896d92fd6fc3b90bad0dd67242e3984937aed46 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -137,12 +137,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.confluence = { description = "Atlassian Confluence"; diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index 0ac941b6ec99b3c6116978385d99b5989eabf9b6..b6cb9f3b7c418afdb2f4dff17bb09c0e276fced2 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -103,12 +103,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.atlassian-crowd = { description = "Atlassian Crowd"; @@ -126,12 +126,13 @@ in }; preStart = '' - mkdir -p ${cfg.home}/{logs,work,database} + rm -rf ${cfg.home}/work + mkdir -p ${cfg.home}/{logs,database,work} mkdir -p /run/atlassian-crowd ln -sf ${cfg.home}/{database,work,server.xml} /run/atlassian-crowd - chown -R ${cfg.user} ${cfg.home} + chown -R ${cfg.user}:${cfg.group} ${cfg.home} sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 81ee8154326c7a970e5908893593bfd5ff5d9d8e..f5ec0a5f31b8bcec63a280de0f90c60198e4893d 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -141,12 +141,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.atlassian-jira = { description = "Atlassian JIRA"; @@ -155,7 +155,7 @@ in requires = [ "postgresql.service" ]; after = [ "postgresql.service" ]; - path = [ cfg.jrePackage ]; + path = [ cfg.jrePackage pkgs.bash ]; environment = { JIRA_USER = cfg.user; diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix index d5329ef03c897f08e46df1af1d0cc16340f2e030..fb95e024817cfea8cca8b60c65f03db0f51f4a29 100644 --- a/nixos/modules/services/web-apps/frab.nix +++ b/nixos/modules/services/web-apps/frab.nix @@ -6,7 +6,6 @@ let cfg = config.services.frab; package = pkgs.frab; - ruby = package.ruby; databaseConfig = builtins.toJSON { production = cfg.database; }; @@ -174,14 +173,14 @@ in config = mkIf cfg.enable { environment.systemPackages = [ frab-rake ]; - users.extraUsers = [ + users.users = [ { name = cfg.user; group = cfg.group; home = "${cfg.statePath}"; } ]; - users.extraGroups = [ { name = cfg.group; } ]; + users.groups = [ { name = cfg.group; } ]; systemd.services.frab = { after = [ "network.target" "gitlab.service" ]; diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index ef6ac9698e219b21ba9b954183f85ac2033c6692..fbbd7715c6b3aae1377cd76e9292215fe8c8f604 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, services, ... }: +{ config, lib, pkgs, ... }: with lib; let cfg = config.services.matomo; @@ -109,13 +109,13 @@ in { message = "Either services.matomo.nginx or services.matomo.nginx.webServerUser is mandatory"; }]; - users.extraUsers.${user} = { + users.users.${user} = { isSystemUser = true; createHome = true; home = dataDir; group = user; }; - users.extraGroups.${user} = {}; + users.groups.${user} = {}; systemd.services.matomo_setup_update = { # everything needs to set up and up to date before matomo php files are executed @@ -241,6 +241,6 @@ in { meta = { doc = ./matomo-doc.xml; - maintainers = with stdenv.lib.maintainers; [ florianjacob ]; + maintainers = with lib.maintainers; [ florianjacob ]; }; } diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index be74a2b1955be0332f80b304325e60db5e3e3cc0..8c7fc4056adc91ff7ef9a3b82dff73dadb57eaa2 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -25,7 +25,7 @@ in { options = { services.mattermost = { - enable = mkEnableOption "Mattermost chat platform"; + enable = mkEnableOption "Mattermost chat server"; statePath = mkOption { type = types.str; @@ -146,14 +146,14 @@ in config = mkMerge [ (mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == "mattermost") (singleton { + users.users = optionalAttrs (cfg.user == "mattermost") (singleton { name = "mattermost"; group = cfg.group; uid = config.ids.uids.mattermost; home = cfg.statePath; }); - users.extraGroups = optionalAttrs (cfg.group == "mattermost") (singleton { + users.groups = optionalAttrs (cfg.group == "mattermost") (singleton { name = "mattermost"; gid = config.ids.gids.mattermost; }); @@ -167,7 +167,7 @@ in ''; systemd.services.mattermost = { - description = "Mattermost chat platform service"; + description = "Mattermost chat service"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" "postgresql.service" ]; @@ -201,13 +201,13 @@ in PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; - ExecStart = "${pkgs.mattermost}/bin/mattermost-platform"; + ExecStart = "${pkgs.mattermost}/bin/mattermost"; WorkingDirectory = "${cfg.statePath}"; - JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service"; Restart = "always"; RestartSec = "10"; LimitNOFILE = "49152"; }; + unitConfig.JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service"; }; }) (mkIf cfg.matterircd.enable { diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix index f6a5ce73a12b0c1e701115e8e0aa2f1253b39baa..050f8757fa5fa8851e5a7555ea0377c32a373c21 100644 --- a/nixos/modules/services/web-apps/nexus.nix +++ b/nixos/modules/services/web-apps/nexus.nix @@ -13,6 +13,12 @@ in services.nexus = { enable = mkEnableOption "Sonatype Nexus3 OSS service"; + package = mkOption { + type = types.package; + default = pkgs.nexus; + description = "Package which runs Nexus3"; + }; + user = mkOption { type = types.str; default = "nexus"; @@ -42,16 +48,44 @@ in default = 8081; description = "Port to listen on."; }; + + jvmOpts = mkOption { + type = types.lines; + default = '' + -Xms1200M + -Xmx1200M + -XX:MaxDirectMemorySize=2G + -XX:+UnlockDiagnosticVMOptions + -XX:+UnsyncloadClass + -XX:+LogVMOutput + -XX:LogFile=${cfg.home}/nexus3/log/jvm.log + -XX:-OmitStackTraceInFastThrow + -Djava.net.preferIPv4Stack=true + -Dkaraf.home=${cfg.package} + -Dkaraf.base=${cfg.package} + -Dkaraf.etc=${cfg.package}/etc/karaf + -Djava.util.logging.config.file=${cfg.package}/etc/karaf/java.util.logging.properties + -Dkaraf.data=${cfg.home}/nexus3 + -Djava.io.tmpdir=${cfg.home}/nexus3/tmp + -Dkaraf.startLocalConsole=false + ''; + + description = '' + Options for the JVM written to `nexus.jvmopts`. + Please refer to the docs (https://help.sonatype.com/repomanager3/installation/configuring-the-runtime-environment) + for further information. + ''; + }; }; }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.nexus = { description = "Sonatype Nexus3"; @@ -63,13 +97,13 @@ in environment = { NEXUS_USER = cfg.user; NEXUS_HOME = cfg.home; + + VM_OPTS_FILE = pkgs.writeText "nexus.vmoptions" cfg.jvmOpts; }; preStart = '' mkdir -p ${cfg.home}/nexus3/etc - ln -sf ${cfg.home} /run/sonatype-work - chown -R ${cfg.user}:${cfg.group} ${cfg.home} if [ ! -f ${cfg.home}/nexus3/etc/nexus.properties ]; then @@ -77,14 +111,14 @@ in echo "application-port=${toString cfg.listenPort}" >> ${cfg.home}/nexus3/etc/nexus.properties echo "application-host=${toString cfg.listenAddress}" >> ${cfg.home}/nexus3/etc/nexus.properties else - sed 's/^application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties - sed 's/^# application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties - sed 's/^application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties - sed 's/^# application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties + sed 's/^application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties + sed 's/^# application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties + sed 's/^application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties + sed 's/^# application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties fi ''; - script = "${pkgs.nexus}/bin/nexus run"; + script = "${cfg.package}/bin/nexus run"; serviceConfig = { User = cfg.user; @@ -96,5 +130,5 @@ in }; }; - meta.maintainers = with stdenv.lib.maintainers; [ ironpinguin ]; + meta.maintainers = with lib.maintainers; [ ironpinguin ]; } diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index cee725e8fe5ff91d673448bb60c5e69f2e33fb54..bc6689bdb271222543dc1aedcecd5416b360864a 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -358,13 +358,13 @@ in ''; }; - users.extraUsers.restya-board = { + users.users.restya-board = { isSystemUser = true; createHome = false; home = runDir; group = "restya-board"; }; - users.extraGroups.restya-board = {}; + users.groups.restya-board = {}; services.postgresql.enable = mkIf (isNull cfg.database.host) true; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 8f7a56189a0744c54b19652bc7b1297873f8ecfd..2b171aa1b2b29e64a6f3ec22c031750f5ab1e69d 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -76,6 +76,8 @@ let define('SMTP_FROM_NAME', '${escape ["'" "\\"] cfg.email.fromName}'); define('SMTP_FROM_ADDRESS', '${escape ["'" "\\"] cfg.email.fromAddress}'); define('DIGEST_SUBJECT', '${escape ["'" "\\"] cfg.email.digestSubject}'); + + ${cfg.extraConfig} ''; in { @@ -431,6 +433,26 @@ let ''; }; + pluginPackages = mkOption { + type = types.listOf types.package; + default = []; + description = '' + List of plugins to install. The list elements are expected to + be derivations. All elements in this derivation are automatically + copied to the plugins.local directory. + ''; + }; + + themePackages = mkOption { + type = types.listOf types.package; + default = []; + description = '' + List of themes to install. The list elements are expected to + be derivations. All elements in this derivation are automatically + copied to the themes.local directory. + ''; + }; + logDestination = mkOption { type = types.enum ["" "sql" "syslog"]; default = "sql"; @@ -441,6 +463,14 @@ let error.log). ''; }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional lines to append to config.php. + ''; + }; }; }; @@ -466,10 +496,10 @@ let ''; }; - services.nginx = { + # NOTE: No configuration is done if not using virtual host + services.nginx = mkIf (cfg.virtualHost != null) { enable = true; - # NOTE: No configuration is done if not using virtual host - virtualHosts = mkIf (cfg.virtualHost != null) { + virtualHosts = { "${cfg.virtualHost}" = { root = "${cfg.root}"; @@ -517,6 +547,16 @@ let rm -rf "${cfg.root}/*" mkdir -m 755 -p "${cfg.root}" cp -r "${pkgs.tt-rss}/"* "${cfg.root}" + ${optionalString (cfg.pluginPackages != []) '' + for plugin in ${concatStringsSep " " cfg.pluginPackages}; do + cp -r "$plugin"/* "${cfg.root}/plugins.local/" + done + ''} + ${optionalString (cfg.themePackages != []) '' + for theme in ${concatStringsSep " " cfg.themePackages}; do + cp -r "$theme"/* "${cfg.root}/themes.local/" + done + ''} ln -sf "${tt-rss-config}" "${cfg.root}/config.php" chown -R "${cfg.user}" "${cfg.root}" chmod -R 755 "${cfg.root}" @@ -584,8 +624,8 @@ let }; users = optionalAttrs (cfg.user == "tt_rss") { - extraUsers.tt_rss.group = "tt_rss"; - extraGroups.tt_rss = {}; + users.tt_rss.group = "tt_rss"; + groups.tt_rss = {}; }; }; } diff --git a/nixos/modules/services/web-apps/virtlyst.nix b/nixos/modules/services/web-apps/virtlyst.nix new file mode 100644 index 0000000000000000000000000000000000000000..e5c0bff2168ae31e657228269e7a856011b36e39 --- /dev/null +++ b/nixos/modules/services/web-apps/virtlyst.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.virtlyst; + stateDir = "/var/lib/virtlyst"; + + ini = pkgs.writeText "virtlyst-config.ini" '' + [wsgi] + master = true + threads = auto + http-socket = ${cfg.httpSocket} + application = ${pkgs.virtlyst}/lib/libVirtlyst.so + chdir2 = ${stateDir} + static-map = /static=${pkgs.virtlyst}/root/static + + [Cutelyst] + production = true + DatabasePath = virtlyst.sqlite + TemplatePath = ${pkgs.virtlyst}/root/src + + [Rules] + cutelyst.* = true + virtlyst.* = true + ''; + +in + +{ + + options.services.virtlyst = { + enable = mkEnableOption "Virtlyst libvirt web interface"; + + adminPassword = mkOption { + type = types.str; + description = '' + Initial admin password with which the database will be seeded. + ''; + }; + + httpSocket = mkOption { + type = types.str; + default = "localhost:3000"; + description = '' + IP and/or port to which to bind the http socket. + ''; + }; + }; + + config = mkIf cfg.enable { + users.users.virtlyst = { + home = stateDir; + createHome = true; + group = mkIf config.virtualisation.libvirtd.enable "libvirtd"; + }; + + systemd.services.virtlyst = { + wantedBy = [ "multi-user.target" ]; + environment = { + VIRTLYST_ADMIN_PASSWORD = cfg.adminPassword; + }; + serviceConfig = { + ExecStart = "${pkgs.cutelyst}/bin/cutelyst-wsgi2 --ini ${ini}"; + User = "virtlyst"; + WorkingDirectory = stateDir; + }; + }; + }; + +} diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix new file mode 100644 index 0000000000000000000000000000000000000000..6ad38028a64133f7b2957499163f3fb69a347b2a --- /dev/null +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -0,0 +1,177 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.youtrack; + + extraAttr = concatStringsSep " " (mapAttrsToList (k: v: "-D${k}=${v}") (stdParams // cfg.extraParams)); + mergeAttrList = lib.foldl' lib.mergeAttrs {}; + + stdParams = mergeAttrList [ + (optionalAttrs (cfg.baseUrl != null) { + "jetbrains.youtrack.baseUrl" = cfg.baseUrl; + }) + { + "java.aws.headless" = "true"; + "jetbrains.youtrack.disableBrowser" = "true"; + } + ]; +in +{ + options.services.youtrack = { + + enable = mkEnableOption "YouTrack service"; + + address = mkOption { + description = '' + The interface youtrack will listen on. + ''; + default = "127.0.0.1"; + type = types.string; + }; + + baseUrl = mkOption { + description = '' + Base URL for youtrack. Will be auto-detected and stored in database. + ''; + type = types.nullOr types.string; + default = null; + }; + + extraParams = mkOption { + default = {}; + description = '' + Extra parameters to pass to youtrack. See + https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html + for more information. + ''; + example = { + "jetbrains.youtrack.overrideRootPassword" = "tortuga"; + }; + type = types.attrsOf types.string; + }; + + package = mkOption { + description = '' + Package to use. + ''; + type = types.package; + default = pkgs.youtrack; + defaultText = "pkgs.youtrack"; + }; + + port = mkOption { + description = '' + The port youtrack will listen on. + ''; + default = 8080; + type = types.int; + }; + + statePath = mkOption { + description = '' + Where to keep the youtrack database. + ''; + type = types.string; + default = "/var/lib/youtrack"; + }; + + virtualHost = mkOption { + description = '' + Name of the nginx virtual host to use and setup. + If null, do not setup anything. + ''; + default = null; + type = types.nullOr types.string; + }; + + jvmOpts = mkOption { + description = '' + Extra options to pass to the JVM. + See https://www.jetbrains.com/help/youtrack/standalone/Configure-JVM-Options.html + for more information. + ''; + type = types.string; + example = "-XX:MetaspaceSize=250m"; + default = ""; + }; + + maxMemory = mkOption { + description = '' + Maximum Java heap size + ''; + type = types.string; + default = "1g"; + }; + + maxMetaspaceSize = mkOption { + description = '' + Maximum java Metaspace memory. + ''; + type = types.string; + default = "350m"; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.youtrack = { + environment.HOME = cfg.statePath; + environment.YOUTRACK_JVM_OPTS = "${extraAttr}"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + User = "youtrack"; + Group = "youtrack"; + ExecStart = ''${cfg.package}/bin/youtrack --J-Xmx${cfg.maxMemory} --J-XX:MaxMetaspaceSize=${cfg.maxMetaspaceSize} ${cfg.jvmOpts} ${cfg.address}:${toString cfg.port}''; + }; + }; + + users.users.youtrack = { + description = "Youtrack service user"; + isSystemUser = true; + home = cfg.statePath; + createHome = true; + group = "youtrack"; + }; + + users.groups.youtrack = {}; + + services.nginx = mkIf (cfg.virtualHost != null) { + upstreams.youtrack.servers."${cfg.address}:${toString cfg.port}" = {}; + virtualHosts.${cfg.virtualHost}.locations = { + "/" = { + proxyPass = "http://youtrack"; + extraConfig = '' + client_max_body_size 10m; + proxy_http_version 1.1; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + ''; + }; + + "/api/eventSourceBus" = { + proxyPass = "http://youtrack"; + extraConfig = '' + proxy_cache off; + proxy_buffering off; + proxy_read_timeout 86400s; + proxy_send_timeout 86400s; + proxy_set_header Connection ""; + chunked_transfer_encoding off; + client_max_body_size 10m; + proxy_http_version 1.1; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + ''; + }; + + }; + }; + + }; +} diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index f9f2511f45dc70b29350beebffd5163e17139b79..73607c6f9a3bb8fdd20c31e26d284534932977a5 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -98,11 +98,6 @@ let allSubservices = mainSubservices ++ concatMap subservicesFor mainCfg.virtualHosts; - # !!! should be in lib - writeTextInDir = name: text: - pkgs.runCommand name {inherit text;} "mkdir -p $out; echo -n \"$text\" > $out/$name"; - - enableSSL = any (vhost: vhost.enableSSL) allHosts; @@ -656,16 +651,16 @@ in message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; } ]; - warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port}";}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts); + warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port};}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts); - users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton + users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton { name = "wwwrun"; group = mainCfg.group; description = "Apache httpd user"; uid = config.ids.uids.wwwrun; }); - users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") (singleton + users.groups = optionalAttrs (mainCfg.group == "wwwrun") (singleton { name = "wwwrun"; gid = config.ids.gids.wwwrun; }); diff --git a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix index 6f1f67970f6cb3c6a5edf25f24d222f8f6e6a39c..77194f3474928270d813f60579392d0ab179763b 100644 --- a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix +++ b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, serverInfo, php, ... }: +{ config, lib, pkgs, serverInfo, ... }: with lib; diff --git a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix index 6dd91be00a73f6acc29dd27b418551c23a0192c6..4b8ee2b17ea73f3d0652d499903ce0412807a87a 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix @@ -1,4 +1,4 @@ -{ config, pkgs, serverInfo, lib, ... }: +{ config, pkgs, lib, ... }: let inherit (pkgs) mercurial; diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index 82b8bf3e30db5614d06cf67cd6a122a5226a824e..6345a9a569355545f9c6f9d177d25212d5783488 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -4,17 +4,6 @@ with lib; let - httpd = serverInfo.serverConfig.package; - - version24 = !versionOlder httpd.version "2.4"; - - allGranted = if version24 then '' - Require all granted - '' else '' - Order allow,deny - Allow from all - ''; - owncloudConfig = pkgs.writeText "config.php" '' systemd.time + 7. + ''; + }; + + password = mkOption { + type = types.str; + default = "hydron"; + example = "dumbpass"; + description = "Password for the hydron database."; + }; + + passwordFile = mkOption { + type = types.path; + default = "/run/keys/hydron-password-file"; + example = "/home/okina/hydron/keys/pass"; + description = "Password file for the hydron database."; + }; + + postgresArgs = mkOption { + type = types.str; + description = "Postgresql connection arguments."; + example = '' + { + "driver": "postgres", + "connection": "user=hydron password=dumbpass dbname=hydron sslmode=disable" + } + ''; + }; + + postgresArgsFile = mkOption { + type = types.path; + default = "/run/keys/hydron-postgres-args"; + example = "/home/okina/hydron/keys/postgres"; + description = "Postgresql connection arguments file."; + }; + + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "127.0.0.1:8010"; + description = "Listen on a specific IP address and port."; + }; + + importPaths = mkOption { + type = types.listOf types.path; + default = []; + example = [ "/home/okina/Pictures" ]; + description = "Paths that hydron will recursively import."; + }; + + fetchTags = mkOption { + type = types.bool; + default = true; + description = "Fetch tags for imported images and webm from gelbooru."; + }; + }; + + config = mkIf cfg.enable { + security.sudo.enable = cfg.enable; + services.postgresql.enable = cfg.enable; + services.hydron.passwordFile = mkDefault (pkgs.writeText "hydron-password-file" cfg.password); + services.hydron.postgresArgsFile = mkDefault (pkgs.writeText "hydron-postgres-args" cfg.postgresArgs); + services.hydron.postgresArgs = mkDefault '' + { + "driver": "postgres", + "connection": "user=hydron password=${cfg.password} dbname=hydron sslmode=disable" + } + ''; + + systemd.services.hydron = { + description = "hydron"; + after = [ "network.target" "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + # Ensure folder exists or create it and permissions are correct + mkdir -p ${escapeShellArg cfg.dataDir}/{.hydron,images} + ln -sf ${escapeShellArg cfg.postgresArgsFile} ${escapeShellArg cfg.dataDir}/.hydron/db_conf.json + chmod 750 ${escapeShellArg cfg.dataDir} + chown -R hydron:hydron ${escapeShellArg cfg.dataDir} + + # Ensure the database is correct or create it + ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \ + -SDR hydron || true + ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \ + -T template0 -E UTF8 -O hydron hydron || true + ${pkgs.sudo}/bin/sudo -u hydron ${postgres.package}/bin/psql \ + -c "ALTER ROLE hydron WITH PASSWORD '$(cat ${escapeShellArg cfg.passwordFile})';" || true + ''; + + serviceConfig = { + PermissionsStartOnly = true; + User = "hydron"; + Group = "hydron"; + ExecStart = "${pkgs.hydron}/bin/hydron serve" + + optionalString (cfg.listenAddress != null) " -a ${cfg.listenAddress}"; + }; + }; + + systemd.services.hydron-fetch = { + description = "Import paths into hydron and possibly fetch tags"; + + serviceConfig = { + Type = "oneshot"; + User = "hydron"; + Group = "hydron"; + ExecStart = "${pkgs.hydron}/bin/hydron import " + + optionalString cfg.fetchTags "-f " + + (escapeShellArg cfg.dataDir) + "/images " + (escapeShellArgs cfg.importPaths); + }; + }; + + systemd.timers.hydron-fetch = { + description = "Automatically import paths into hydron and possibly fetch tags"; + after = [ "network.target" "hydron.service" ]; + wantedBy = [ "timers.target" ]; + + timerConfig = { + Persistent = true; + OnCalendar = cfg.interval; + }; + }; + + users = { + groups.hydron.gid = config.ids.gids.hydron; + + users.hydron = { + description = "hydron server service user"; + home = cfg.dataDir; + createHome = true; + group = "hydron"; + uid = config.ids.uids.hydron; + }; + }; + }; + + imports = [ + (mkRenamedOptionModule [ "services" "hydron" "baseDir" ] [ "services" "hydron" "dataDir" ]) + ]; + + meta.maintainers = with maintainers; [ chiiruno ]; +} diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix index 710fecc0c05c96c60a91268a7f62f479c3a7bae6..e6a054c296dc9b9340490c247d99d4398ef317d2 100644 --- a/nixos/modules/services/web-servers/lighttpd/cgit.nix +++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix @@ -4,8 +4,15 @@ with lib; let cfg = config.services.lighttpd.cgit; + pathPrefix = if stringLength cfg.subdir == 0 then "" else "/" + cfg.subdir; configFile = pkgs.writeText "cgitrc" '' + # default paths to static assets + css=${pathPrefix}/cgit.css + logo=${pathPrefix}/cgit.png + favicon=${pathPrefix}/favicon.ico + + # user configuration ${cfg.configText} ''; in @@ -18,8 +25,17 @@ in type = types.bool; description = '' If true, enable cgit (fast web interface for git repositories) as a - sub-service in lighttpd. cgit will be accessible at - http://yourserver/cgit + sub-service in lighttpd. + ''; + }; + + subdir = mkOption { + default = "cgit"; + example = ""; + type = types.str; + description = '' + The subdirectory in which to serve cgit. The web application will be + accessible at http://yourserver/''${subdir} ''; }; @@ -48,14 +64,14 @@ in services.lighttpd.enableModules = [ "mod_cgi" "mod_alias" "mod_setenv" ]; services.lighttpd.extraConfig = '' - $HTTP["url"] =~ "^/cgit" { + $HTTP["url"] =~ "^/${cfg.subdir}" { cgi.assign = ( "cgit.cgi" => "${pkgs.cgit}/cgit/cgit.cgi" ) alias.url = ( - "/cgit.css" => "${pkgs.cgit}/cgit/cgit.css", - "/cgit.png" => "${pkgs.cgit}/cgit/cgit.png", - "/cgit" => "${pkgs.cgit}/cgit/cgit.cgi" + "${pathPrefix}/cgit.css" => "${pkgs.cgit}/cgit/cgit.css", + "${pathPrefix}/cgit.png" => "${pkgs.cgit}/cgit/cgit.png", + "${pathPrefix}" => "${pkgs.cgit}/cgit/cgit.cgi" ) setenv.add-environment = ( "CGIT_CONFIG" => "${configFile}" diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index d23e810dcc6265a4c41f3ac336a59e343a3ecd36..7a3df26e47a6ce129a4a2b8a090c57d0690ac866 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -245,12 +245,12 @@ in serviceConfig.KillSignal = "SIGINT"; }; - users.extraUsers.lighttpd = { + users.users.lighttpd = { group = "lighttpd"; description = "lighttpd web server privilege separation user"; uid = config.ids.uids.lighttpd; }; - users.extraGroups.lighttpd.gid = config.ids.gids.lighttpd; + users.groups.lighttpd.gid = config.ids.gids.lighttpd; }; } diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix index 37128d90401d7f56bb1ad946b0dec39e744372fe..c494d6966a7f581303de6d17d952bef115b1bf6e 100644 --- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix +++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix @@ -4,6 +4,9 @@ with lib; let cfg = config.services.gitweb; + package = pkgs.gitweb.override (optionalAttrs cfg.gitwebTheme { + gitwebTheme = true; + }); in { @@ -34,8 +37,8 @@ in "^/gitweb$" => "/gitweb/" ) alias.url = ( - "/gitweb/static/" => "${pkgs.git}/share/gitweb/static/", - "/gitweb/" => "${pkgs.git}/share/gitweb/gitweb.cgi" + "/gitweb/static/" => "${package}/static/", + "/gitweb/" => "${package}/gitweb.cgi" ) setenv.add-environment = ( "GITWEB_CONFIG" => "${cfg.gitwebConfigFile}", diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix deleted file mode 100644 index 8c813d116a5284289d5d7e25c79e141aeb30599f..0000000000000000000000000000000000000000 --- a/nixos/modules/services/web-servers/lighttpd/inginious.nix +++ /dev/null @@ -1,261 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; - -let - cfg = config.services.lighttpd.inginious; - inginious = pkgs.inginious; - execName = "inginious-${if cfg.useLTI then "lti" else "webapp"}"; - - inginiousConfigFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "inginious.yaml" '' - # Backend; can be: - # - "local" (run containers on the same machine) - # - "remote" (connect to distant docker daemon and auto start agents) (choose this if you use boot2docker) - # - "remote_manual" (connect to distant and manually installed agents) - backend: "${cfg.backendType}" - - ## TODO (maybe): Add an option for the "remote" backend in this NixOS module. - # List of remote docker daemon to which the backend will try - # to connect (backend: remote only) - #docker_daemons: - # - # Host of the docker daemon *from the webapp* - # remote_host: "some.remote.server" - # # Port of the distant docker daemon *from the webapp* - # remote_docker_port: "2375" - # # A mandatory port used by the backend and the agent that will be automatically started. - # # Needs to be available on the remote host, and to be open in the firewall. - # remote_agent_port: "63456" - # # Does the remote docker requires tls? Defaults to false. - # # Parameter can be set to true or path to the certificates - # #use_tls: false - # # Link to the docker daemon *from the host that runs the docker daemon*. Defaults to: - # #local_location: "unix:///var/run/docker.sock" - # # Path to the cgroups "mount" *from the host that runs the docker daemon*. Defaults to: - # #cgroups_location: "/sys/fs/cgroup" - # # Name that will be used to reference the agent - # #"agent_name": "inginious-agent" - - # List of remote agents to which the backend will try - # to connect (backend: remote_manual only) - # Example: - #agents: - # - host: "192.168.59.103" - # port: 5001 - agents: - ${lib.concatMapStrings (agent: - " - host: \"${agent.host}\"\n" + - " port: ${agent.port}\n" - ) cfg.remoteAgents} - - # Location of the task directory - tasks_directory: "${cfg.tasksDirectory}" - - # Super admins: list of user names that can do everything in the backend - superadmins: - ${lib.concatMapStrings (x: " - \"${x}\"\n") cfg.superadmins} - - # Aliases for containers - # Only containers listed here can be used by tasks - containers: - ${lib.concatStrings (lib.mapAttrsToList (name: fullname: - " ${name}: \"${fullname}\"\n" - ) cfg.containers)} - - # Use single minified javascript file (production) or multiple files (dev) ? - use_minified_js: true - - ## TODO (maybe): Add NixOS options for these parameters. - - # MongoDB options - #mongo_opt: - # host: localhost - # database: INGInious - - # Disable INGInious? - #maintenance: false - - #smtp: - # sendername: 'INGInious ' - # host: 'smtp.gmail.com' - # port: 587 - # username: 'configme@gmail.com' - # password: 'secret' - # starttls: True - - ## NixOS extra config - - ${cfg.extraConfig} - ''; -in -{ - options.services.lighttpd.inginious = { - enable = mkEnableOption "INGInious, an automated code testing and grading system."; - - configFile = mkOption { - type = types.nullOr types.path; - default = null; - example = literalExample ''pkgs.writeText "configuration.yaml" "# custom config options ...";''; - description = ''The path to an INGInious configuration file.''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - example = '' - # Load the dummy auth plugin. - plugins: - - plugin_module: inginious.frontend.webapp.plugins.auth.demo_auth - users: - # register the user "test" with the password "someverycomplexpassword" - test: someverycomplexpassword - ''; - description = ''Extra option in YaML format, to be appended to the config file.''; - }; - - tasksDirectory = mkOption { - type = types.path; - example = "/var/lib/INGInious/tasks"; - description = '' - Path to the tasks folder. - Defaults to the provided test tasks folder (readonly). - ''; - }; - - useLTI = mkOption { - type = types.bool; - default = false; - description = ''Whether to start the LTI frontend in place of the webapp.''; - }; - - superadmins = mkOption { - type = types.uniq (types.listOf types.str); - default = [ "admin" ]; - example = [ "john" "pepe" "emilia" ]; - description = ''List of user logins allowed to administrate the whole server.''; - }; - - containers = mkOption { - type = types.attrsOf types.str; - default = { - default = "ingi/inginious-c-default"; - }; - example = { - default = "ingi/inginious-c-default"; - sekexe = "ingi/inginious-c-sekexe"; - java = "ingi/inginious-c-java"; - oz = "ingi/inginious-c-oz"; - pythia1compat = "ingi/inginious-c-pythia1compat"; - }; - description = '' - An attrset describing the required containers - These containers will be available in INGInious using their short name (key) - and will be automatically downloaded before INGInious starts. - ''; - }; - - hostPattern = mkOption { - type = types.str; - default = "^inginious."; - example = "^inginious.mydomain.xyz$"; - description = '' - The domain that serves INGInious. - INGInious uses absolute paths which makes it difficult to relocate in its own subdir. - The default configuration will serve INGInious when the server is accessed with a hostname starting with "inginious.". - If left blank, INGInious will take the precedence over all the other lighttpd sites, which is probably not what you want. - ''; - }; - - backendType = mkOption { - type = types.enum [ "local" "remote_manual" ]; # TODO: support backend "remote" - default = "local"; - description = '' - Select how INGINious accesses to grading containers. - The default "local" option ensures that Docker is started and provisioned. - Fore more information, see http://inginious.readthedocs.io/en/latest/install_doc/config_reference.html - Not all backends are supported. Use services.inginious.configFile for full flexibility. - ''; - }; - - remoteAgents = mkOption { - type = types.listOf (types.attrsOf types.str); - default = []; - example = [ { host = "192.0.2.25"; port = "1345"; } ]; - description = ''A list of remote agents, used only when services.inginious.backendType is "remote_manual".''; - }; - }; - - config = mkIf cfg.enable ( - mkMerge [ - # For a local install, we need docker. - (mkIf (cfg.backendType == "local") { - virtualisation.docker = { - enable = true; - # We need docker to listen on port 2375. - listenOptions = ["127.0.0.1:2375" "/var/run/docker.sock"]; - storageDriver = mkDefault "overlay"; - }; - - users.extraUsers."lighttpd".extraGroups = [ "docker" ]; - - # Ensure that docker has pulled the required images. - systemd.services.inginious-prefetch = { - script = let - images = lib.unique ( - [ "centos" "ingi/inginious-agent" ] - ++ lib.mapAttrsToList (_: image: image) cfg.containers - ); - in lib.concatMapStrings (image: '' - ${pkgs.docker}/bin/docker pull ${image} - '') images; - - serviceConfig.Type = "oneshot"; - wants = [ "docker.service" ]; - after = [ "docker.service" ]; - wantedBy = [ "lighttpd.service" ]; - before = [ "lighttpd.service" ]; - }; - }) - - # Common - { - services.lighttpd.inginious.tasksDirectory = mkDefault "${inginious}/lib/python2.7/site-packages/inginious/tasks"; - # To access inginous tools (like inginious-test-task) - environment.systemPackages = [ inginious ]; - - services.mongodb.enable = true; - - services.lighttpd.enable = true; - services.lighttpd.enableModules = [ "mod_access" "mod_alias" "mod_fastcgi" "mod_redirect" "mod_rewrite" ]; - services.lighttpd.extraConfig = '' - $HTTP["host"] =~ "${cfg.hostPattern}" { - fastcgi.server = ( "/${execName}" => - (( - "socket" => "/run/lighttpd/inginious-fastcgi.socket", - "bin-path" => "${inginious}/bin/${execName} --config=${inginiousConfigFile}", - "max-procs" => 1, - "bin-environment" => ( "REAL_SCRIPT_NAME" => "" ), - "check-local" => "disable" - )) - ) - url.rewrite-once = ( - "^/.well-known/.*" => "$0", - "^/static/.*" => "$0", - "^/.*$" => "/${execName}$0", - "^/favicon.ico$" => "/static/common/favicon.ico", - ) - alias.url += ( - "/static/webapp/" => "${inginious}/lib/python2.7/site-packages/inginious/frontend/webapp/static/", - "/static/common/" => "${inginious}/lib/python2.7/site-packages/inginious/frontend/common/static/" - ) - } - ''; - - systemd.services.lighttpd.preStart = '' - mkdir -p /run/lighttpd - chown lighttpd.lighttpd /run/lighttpd - ''; - - systemd.services.lighttpd.wants = [ "mongodb.service" "docker.service" ]; - systemd.services.lighttpd.after = [ "mongodb.service" "docker.service" ]; - } - ]); -} diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix new file mode 100644 index 0000000000000000000000000000000000000000..11aebcb91d88a44a444cf4335348f470202b0e8e --- /dev/null +++ b/nixos/modules/services/web-servers/meguca.nix @@ -0,0 +1,158 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.meguca; + postgres = config.services.postgresql; +in with lib; { + options.services.meguca = { + enable = mkEnableOption "meguca"; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/meguca"; + example = "/home/okina/meguca"; + description = "Location where meguca stores it's database and links."; + }; + + password = mkOption { + type = types.str; + default = "meguca"; + example = "dumbpass"; + description = "Password for the meguca database."; + }; + + passwordFile = mkOption { + type = types.path; + default = "/run/keys/meguca-password-file"; + example = "/home/okina/meguca/keys/pass"; + description = "Password file for the meguca database."; + }; + + reverseProxy = mkOption { + type = types.nullOr types.str; + default = null; + example = "192.168.1.5"; + description = "Reverse proxy IP."; + }; + + sslCertificate = mkOption { + type = types.nullOr types.str; + default = null; + example = "/home/okina/meguca/ssl.cert"; + description = "Path to the SSL certificate."; + }; + + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "127.0.0.1:8000"; + description = "Listen on a specific IP address and port."; + }; + + cacheSize = mkOption { + type = types.nullOr types.int; + default = null; + example = 256; + description = "Cache size in MB."; + }; + + postgresArgs = mkOption { + type = types.str; + example = "user=meguca password=dumbpass dbname=meguca sslmode=disable"; + description = "Postgresql connection arguments."; + }; + + postgresArgsFile = mkOption { + type = types.path; + default = "/run/keys/meguca-postgres-args"; + example = "/home/okina/meguca/keys/postgres"; + description = "Postgresql connection arguments file."; + }; + + compressTraffic = mkOption { + type = types.bool; + default = false; + description = "Compress all traffic with gzip."; + }; + + assumeReverseProxy = mkOption { + type = types.bool; + default = false; + description = "Assume the server is behind a reverse proxy, when resolving client IPs."; + }; + + httpsOnly = mkOption { + type = types.bool; + default = false; + description = "Serve and listen only through HTTPS."; + }; + }; + + config = mkIf cfg.enable { + security.sudo.enable = cfg.enable; + services.postgresql.enable = cfg.enable; + services.meguca.passwordFile = mkDefault (pkgs.writeText "meguca-password-file" cfg.password); + services.meguca.postgresArgsFile = mkDefault (pkgs.writeText "meguca-postgres-args" cfg.postgresArgs); + services.meguca.postgresArgs = mkDefault "user=meguca password=${cfg.password} dbname=meguca sslmode=disable"; + + systemd.services.meguca = { + description = "meguca"; + after = [ "network.target" "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + # Ensure folder exists or create it and links and permissions are correct + mkdir -p ${escapeShellArg cfg.dataDir} + ln -sf ${pkgs.meguca}/share/meguca/www ${escapeShellArg cfg.dataDir} + chmod 750 ${escapeShellArg cfg.dataDir} + chown -R meguca:meguca ${escapeShellArg cfg.dataDir} + + # Ensure the database is correct or create it + ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \ + -SDR meguca || true + ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \ + -T template0 -E UTF8 -O meguca meguca || true + ${pkgs.sudo}/bin/sudo -u meguca ${postgres.package}/bin/psql \ + -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${escapeShellArg cfg.passwordFile})';" || true + ''; + + script = '' + cd ${escapeShellArg cfg.dataDir} + + ${pkgs.meguca}/bin/meguca -d "$(cat ${escapeShellArg cfg.postgresArgsFile})"'' + + optionalString (cfg.reverseProxy != null) " -R ${cfg.reverseProxy}" + + optionalString (cfg.sslCertificate != null) " -S ${cfg.sslCertificate}" + + optionalString (cfg.listenAddress != null) " -a ${cfg.listenAddress}" + + optionalString (cfg.cacheSize != null) " -c ${toString cfg.cacheSize}" + + optionalString (cfg.compressTraffic) " -g" + + optionalString (cfg.assumeReverseProxy) " -r" + + optionalString (cfg.httpsOnly) " -s" + " start"; + + serviceConfig = { + PermissionsStartOnly = true; + Type = "forking"; + User = "meguca"; + Group = "meguca"; + ExecStop = "${pkgs.meguca}/bin/meguca stop"; + }; + }; + + users = { + groups.meguca.gid = config.ids.gids.meguca; + + users.meguca = { + description = "meguca server service user"; + home = cfg.dataDir; + createHome = true; + group = "meguca"; + uid = config.ids.uids.meguca; + }; + }; + }; + + imports = [ + (mkRenamedOptionModule [ "services" "meguca" "baseDir" ] [ "services" "meguca" "dataDir" ]) + ]; + + meta.maintainers = with maintainers; [ chiiruno ]; +} diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix index a888f623616e0985762e13dc3f9f51db9d7a5042..4e7082c6769051478981d13035f4d5529a95c7c4 100644 --- a/nixos/modules/services/web-servers/mighttpd2.nix +++ b/nixos/modules/services/web-servers/mighttpd2.nix @@ -119,13 +119,13 @@ in { }; }; - users.extraUsers.mighttpd2 = { + users.users.mighttpd2 = { group = "mighttpd2"; uid = config.ids.uids.mighttpd2; isSystemUser = true; }; - users.extraGroups.mighttpd2.gid = config.ids.gids.mighttpd2; + users.groups.mighttpd2.gid = config.ids.gids.mighttpd2; }; meta.maintainers = with lib.maintainers; [ fgaz ]; diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix index 843f0d986877bf6d6a9cc57841ed091aca4eb57d..f78a966989b69fbf4d194b08d8f3acc14ea54c25 100644 --- a/nixos/modules/services/web-servers/minio.nix +++ b/nixos/modules/services/web-servers/minio.nix @@ -85,7 +85,7 @@ in ''; serviceConfig = { PermissionsStartOnly = true; - ExecStart = "${cfg.package}/bin/minio server --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}"; + ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}"; Type = "simple"; User = "minio"; Group = "minio"; @@ -101,11 +101,11 @@ in }; }; - users.extraUsers.minio = { + users.users.minio = { group = "minio"; uid = config.ids.uids.minio; }; - users.extraGroups.minio.gid = config.ids.uids.minio; + users.groups.minio.gid = config.ids.uids.minio; }; } diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index dee877f1c11436880083ad6da29bad253c2be205..17b169f7c69617e6306cd7c97e63fb185720296e 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -9,15 +9,16 @@ let serverName = if vhostConfig.serverName != null then vhostConfig.serverName else vhostName; + acmeDirectory = config.security.acme.directory; in vhostConfig // { inherit serverName; } // (optionalAttrs vhostConfig.enableACME { - sslCertificate = "/var/lib/acme/${serverName}/fullchain.pem"; - sslCertificateKey = "/var/lib/acme/${serverName}/key.pem"; + sslCertificate = "${acmeDirectory}/${serverName}/fullchain.pem"; + sslCertificateKey = "${acmeDirectory}/${serverName}/key.pem"; }) // (optionalAttrs (vhostConfig.useACMEHost != null) { - sslCertificate = "/var/lib/acme/${vhostConfig.useACMEHost}/fullchain.pem"; - sslCertificateKey = "/var/lib/acme/${vhostConfig.useACMEHost}/key.pem"; + sslCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem"; + sslCertificateKey = "${acmeDirectory}/${vhostConfig.useACMEHost}/key.pem"; }) ) cfg.virtualHosts; enableIPv6 = config.networking.enableIPv6; @@ -37,6 +38,7 @@ let ${toString (flip mapAttrsToList upstream.servers (name: server: '' server ${name} ${optionalString server.backup "backup"}; ''))} + ${upstream.extraConfig} } '')); @@ -90,8 +92,18 @@ let gzip on; gzip_disable "msie6"; gzip_proxied any; - gzip_comp_level 9; - gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + gzip_comp_level 5; + gzip_types + application/atom+xml + application/javascript + application/json + application/xml + application/xml+rss + image/svg+xml + text/css + text/javascript + text/plain + text/xml; gzip_vary on; ''} @@ -217,7 +229,10 @@ let ssl_certificate_key ${vhost.sslCertificateKey}; ''} - ${optionalString (vhost.basicAuth != {}) (mkBasicAuth vhostName vhost.basicAuth)} + ${optionalString (vhost.basicAuthFile != null || vhost.basicAuth != {}) '' + auth_basic secured; + auth_basic_user_file ${if vhost.basicAuthFile != null then vhost.basicAuthFile else mkHtpasswd vhostName vhost.basicAuth}; + ''} ${mkLocations vhost.locations} @@ -247,16 +262,11 @@ let ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"} } '') locations); - mkBasicAuth = vhostName: authDef: let - htpasswdFile = pkgs.writeText "${vhostName}.htpasswd" ( - concatStringsSep "\n" (mapAttrsToList (user: password: '' - ${user}:{PLAIN}${password} - '') authDef) - ); - in '' - auth_basic secured; - auth_basic_user_file ${htpasswdFile}; - ''; + mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" ( + concatStringsSep "\n" (mapAttrsToList (user: password: '' + ${user}:{PLAIN}${password} + '') authDef) + ); in { @@ -493,6 +503,13 @@ in ''; default = {}; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + These lines go to the end of the upstream verbatim. + ''; + }; }; }); description = '' @@ -606,13 +623,13 @@ in listToAttrs acmePairs ); - users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton + users.users = optionalAttrs (cfg.user == "nginx") (singleton { name = "nginx"; group = cfg.group; uid = config.ids.uids.nginx; }); - users.extraGroups = optionalAttrs (cfg.group == "nginx") (singleton + users.groups = optionalAttrs (cfg.group == "nginx") (singleton { name = "nginx"; gid = config.ids.gids.nginx; }); diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix index 344c1f7b8aa488035b72146d9ccb091e3b3463ba..272fd1480185ead4e337ebb2196c4ba621ce3928 100644 --- a/nixos/modules/services/web-servers/nginx/gitweb.nix +++ b/nixos/modules/services/web-servers/nginx/gitweb.nix @@ -4,6 +4,9 @@ with lib; let cfg = config.services.gitweb; + package = pkgs.gitweb.override (optionalAttrs cfg.gitwebTheme { + gitwebTheme = true; + }); in { @@ -22,36 +25,30 @@ in config = mkIf config.services.nginx.gitweb.enable { - systemd.sockets.gitweb = { - description = "GitWeb Listen Socket"; - listenStreams = [ "/run/gitweb.sock" ]; - socketConfig = { - Accept = "false"; - SocketUser = "nginx"; - SocketGroup = "nginx"; - SocketMode = "0600"; - }; - wantedBy = [ "sockets.target" ]; - }; systemd.services.gitweb = { description = "GitWeb service"; - script = "${git}/share/gitweb/gitweb.cgi --fcgi"; + script = "${package}/gitweb.cgi --fastcgi --nproc=1"; + environment = { + FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock"; + }; serviceConfig = { - Type = "simple"; - StandardInput = "socket"; User = "nginx"; Group = "nginx"; + RuntimeDirectory = [ "gitweb" ]; }; + wantedBy = [ "multi-user.target" ]; }; services.nginx = { virtualHosts.default = { - locations."/gitweb" = { - root = "${pkgs.git}/share/gitweb"; + locations."/gitweb/static/" = { + alias = "${package}/static/"; + }; + locations."/gitweb/" = { extraConfig = '' include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile}; - fastcgi_pass unix:/run/gitweb.sock; + fastcgi_pass unix:/run/gitweb/gitweb.sock; ''; }; }; diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index bf18108a1a3cb428233f8f1cb773516078e1fd53..1075b00768fd6d252cf22e2a9a53850420cbd10e 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -3,7 +3,7 @@ # has additional options that affect the web server as a whole, like # the user/group to run under.) -{ config, lib }: +{ lib, ... }: with lib; { @@ -62,6 +62,7 @@ with lib; This is useful if you have many subdomains and want to avoid hitting the rate limit. Alternately, you can generate a certificate through . + Note that this option does not create any certificates, nor it does add subdomains to existing ones – you will need to create them manually using . ''; }; @@ -193,6 +194,14 @@ with lib; ''; }; + basicAuthFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Basic Auth password file for a vhost. + ''; + }; + locations = mkOption { type = types.attrsOf (types.submodule (import ./location-options.nix { inherit lib; diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index aa94e0e976c96f6565d115818c6a1e6ea9952a74..d92ba72a833624d7589d50e9ab29fc340a504c5c 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -108,9 +108,9 @@ in }; webapps = mkOption { - type = types.listOf types.package; + type = types.listOf types.path; default = [ tomcat.webapps ]; - defaultText = "[ tomcat.webapps ]"; + defaultText = "[ pkgs.tomcat85.webapps ]"; description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; }; @@ -118,8 +118,15 @@ in type = types.listOf (types.submodule { options = { name = mkOption { - type = types.listOf types.str; + type = types.str; description = "name of the virtualhost"; + }; + webapps = mkOption { + type = types.listOf types.path; + description = '' + List containing web application WAR files and/or directories containing + web applications and configuration files for the virtual host. + ''; default = []; }; }; @@ -166,12 +173,12 @@ in config = mkIf config.services.tomcat.enable { - users.extraGroups = singleton + users.groups = singleton { name = "tomcat"; gid = config.ids.gids.tomcat; }; - users.extraUsers = singleton + users.users = singleton { name = "tomcat"; uid = config.ids.uids.tomcat; description = "Tomcat user"; diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index b6c7fef21fb29821540bc39d5db8e49cdb1e291d..700202b1d28fa043668123032622771761c88ea7 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -114,12 +114,12 @@ in { }; }; - users.extraUsers.traefik = { + users.users.traefik = { group = "traefik"; home = cfg.dataDir; createHome = true; }; - users.extraGroups.traefik = {}; + users.groups.traefik = {}; }; } diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index 14596bb3add00d89633a65a905c2918cef36b853..3f858d90fa46507195255fab2de090fd1eeef384 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -27,13 +27,7 @@ let else if hasPython3 then uwsgi.python3 else null; - pythonPackages = pkgs.pythonPackages.override { - inherit python; - }; - - penv = python.buildEnv.override { - extraLibs = (c.pythonPackages or (self: [])) pythonPackages; - }; + pythonEnv = python.withPackages (c.pythonPackages or (self: [])); uwsgiCfg = { uwsgi = @@ -42,7 +36,7 @@ let inherit plugins; } // removeAttrs c [ "type" "pythonPackages" ] // optionalAttrs (python != null) { - pythonpath = "${penv}/${python.sitePackages}"; + pythonpath = "${pythonEnv}/${python.sitePackages}"; env = # Argh, uwsgi expects list of key-values there instead of a dictionary. let env' = c.env or []; @@ -51,7 +45,7 @@ let then substring (stringLength "PATH=") (stringLength x) x else null; oldPaths = filter (x: x != null) (map getPath env'); - in env' ++ [ "PATH=${optionalString (oldPaths != []) "${last oldPaths}:"}${penv}/bin" ]; + in env' ++ [ "PATH=${optionalString (oldPaths != []) "${last oldPaths}:"}${pythonEnv}/bin" ]; } else if c.type == "emperor" then { @@ -152,13 +146,13 @@ in { }; }; - users.extraUsers = optionalAttrs (cfg.user == "uwsgi") (singleton + users.users = optionalAttrs (cfg.user == "uwsgi") (singleton { name = "uwsgi"; group = cfg.group; uid = config.ids.uids.uwsgi; }); - users.extraGroups = optionalAttrs (cfg.group == "uwsgi") (singleton + users.groups = optionalAttrs (cfg.group == "uwsgi") (singleton { name = "uwsgi"; gid = config.ids.gids.uwsgi; }); diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix index bc74d62b116a1a63dae46bb7a3be73cd124b7ee9..63f967185c2d221d802f51e536fb08eb1d5b0e35 100644 --- a/nixos/modules/services/web-servers/varnish/default.nix +++ b/nixos/modules/services/web-servers/varnish/default.nix @@ -103,11 +103,11 @@ in }) ]; - users.extraUsers.varnish = { + users.users.varnish = { group = "varnish"; uid = config.ids.uids.varnish; }; - users.extraGroups.varnish.gid = config.ids.uids.varnish; + users.groups.varnish.gid = config.ids.uids.varnish; }; } diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index 496e34db4a96c1a8042974a541334e40fb6eaa82..4cad2a2ff7775dbbca98c8d03724dbd3f7f89f17 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -6,7 +6,7 @@ let cfg = config.services.zope2; - zope2Opts = { name, config, ... }: { + zope2Opts = { name, ... }: { options = { name = mkOption { @@ -103,7 +103,7 @@ in config = mkIf (cfg.instances != {}) { - users.extraUsers.zope2.uid = config.ids.uids.zope2; + users.users.zope2.uid = config.ids.uids.zope2; systemd.services = let diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index f435e85f6b835565d175a6e9e217017c62aaecd7..cce35aa28ba84fabc53ad19ae29785a5340b4cdd 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -96,13 +96,13 @@ in else if any (w: w.name == defaultDM) cfg.session.list then defaultDM else - throw '' - Default desktop manager (${defaultDM}) not found. - Probably you want to change - services.xserver.desktopManager.default = "${defaultDM}"; - to one of + builtins.trace '' + Default desktop manager (${defaultDM}) not found at evaluation time. + These are the known valid session names: ${concatMapStringsSep "\n " (w: "services.xserver.desktopManager.default = \"${w.name}\";") cfg.session.list} - ''; + It's also possible the default can be found in one of these packages: + ${concatMapStringsSep "\n " (p: p.name) config.services.xserver.displayManager.extraSessionFilePackages} + '' defaultDM; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 10e8ef0ed381798e377ebd887d98d7e71d067312..c339d24b098aada7bf90f3e421f4762b20f57e00 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -10,7 +10,6 @@ let let pkgName = drv: (builtins.parseDrvName drv.name).name; ysNames = map pkgName ys; - res = (filter (x: !(builtins.elem (pkgName x) ysNames)) xs); in filter (x: !(builtins.elem (pkgName x) ysNames)) xs; @@ -58,8 +57,12 @@ in { sessionPath = mkOption { default = []; example = literalExample "[ pkgs.gnome3.gpaste ]"; - description = "Additional list of packages to be added to the session search path. - Useful for gnome shell extensions or gsettings-conditionated autostart."; + description = '' + Additional list of packages to be added to the session search path. + Useful for GNOME Shell extensions or GSettings-conditional autostart. + + Note that this should be a last resort; patching the package is preferred (see GPaste). + ''; apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ]; }; @@ -94,6 +97,8 @@ in { services.udisks2.enable = true; services.accounts-daemon.enable = true; services.geoclue2.enable = mkDefault true; + # GNOME should have its own geoclue agent + services.geoclue2.enableDemoAgent = false; services.dleyna-renderer.enable = mkDefault true; services.dleyna-server.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; @@ -120,24 +125,17 @@ in { services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ]; systemd.packages = [ pkgs.gnome3.vino ]; + services.flatpak.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ]; - services.xserver.desktopManager.session = singleton - { name = "gnome3"; - bgSupport = true; - start = '' - # Set GTK_DATA_PREFIX so that GTK+ can find the themes - export GTK_DATA_PREFIX=${config.system.path} - - # find theme engines - export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 - - export XDG_MENU_PREFIX=gnome- + services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]; + services.xserver.displayManager.sessionCommands = '' + if test "$XDG_CURRENT_DESKTOP" = "GNOME"; then ${concatMapStrings (p: '' if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} @@ -148,34 +146,28 @@ in { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib fi '') cfg.sessionPath} + fi + ''; - # Override default mimeapps - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share - - # Override gsettings-desktop-schema - export NIX_GSETTINGS_OVERRIDES_DIR=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - - # Let nautilus find extensions - export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/ - - # Find the mouse - export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons + environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1"; - # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ - ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update + # Override default mimeapps + environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ]; - ${pkgs.gnome3.gnome-session}/bin/gnome-session ${optionalString cfg.debug "--debug"} & - waitPID=$! - ''; - }; + # Override GSettings schemas + environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; - services.xserver.updateDbusEnvironment = true; + # Let nautilus find extensions + # TODO: Create nautilus-with-extensions package + environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0"; environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath - ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages); + ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [ + pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ + ]; # Use the correct gnome3 packageSet networking.networkmanager.basePackages = diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index fb907618d35b7141070fe18032e599f882a1502f..896f70c86ebb6c5af058c9ac7ee5ddb2af7b8360 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -41,6 +41,18 @@ in name = "lxqt"; bgSupport = true; start = '' + # Upstream installs default configuration files in + # $prefix/share/lxqt instead of $prefix/etc/xdg, (arguably) + # giving distributors freedom to ship custom default + # configuration files more easily. In order to let the session + # manager find them the share subdirectory is added to the + # XDG_CONFIG_DIRS environment variable. + # + # For an explanation see + # https://github.com/lxqt/lxqt/issues/1521#issuecomment-405097453 + # + export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS''${XDG_CONFIG_DIRS:+:}${config.system.path}/share + exec ${pkgs.lxqt.lxqt-session}/bin/startlxqt ''; }; @@ -53,14 +65,11 @@ in config.environment.lxqt.excludePackages); # Link some extra directories in /run/current-system/software/share - environment.pathsToLink = [ - "/share/desktop-directories" - "/share/icons" - "/share/lxqt" - ]; + environment.pathsToLink = [ "/share" ]; environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ]; + services.upower.enable = config.powerManagement.enable; }; } diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 91d091d7d7e257512f46d51fb3a38d9aef17358c..83d1957a646a0e14e868e41412e363dbf0e609ae 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -7,7 +7,7 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager.plasma5; - inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg; + inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5; in @@ -221,6 +221,11 @@ in security.pam.services.sddm.enableKwallet = true; security.pam.services.slim.enableKwallet = true; + # Update the start menu for each user that has `isNormalUser` set. + system.activationScripts.plasmaSetup = stringAfter [ "users" "groups" ] + (concatStringsSep "\n" + (mapAttrsToList (name: value: "${pkgs.su}/bin/su ${name} -c ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5") + (filterAttrs (n: v: v.isNormalUser) config.users.users))); }) ]; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 7dcc600d2664f90200827571cb2568dccd80744a..ae155470419d546060ecdedaab06322f9fbadb94 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -43,12 +43,6 @@ in default = true; description = "Enable the XFWM (default) window manager."; }; - - screenLock = mkOption { - type = types.enum [ "xscreensaver" "xlockmore" "slock" ]; - default = "xlockmore"; - description = "Application used by XFCE to lock the screen."; - }; }; }; @@ -92,7 +86,7 @@ in thunar-volman # TODO: drop ] ++ (if config.hardware.pulseaudio.enable then [ xfce4-mixer-pulse xfce4-volumed-pulse ] - else [ xfce4-mixer xfce4-volumed ]) + else [ xfce4-mixer xfce4-volumed ]) # TODO: NetworkManager doesn't belong here ++ optionals config.networking.networkmanager.enable [ networkmanagerapplet ] ++ optionals config.powerManagement.enable [ xfce4-power-manager ] diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index 29752ff405e2d9000666e921b8d5ba9723e9406c..6ff1ef0e4c9a3b5cc240d13a851666b51c9eca87 100644 --- a/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -12,6 +12,7 @@ in options = { services.xserver.desktopManager.xterm.enable = mkOption { + type = types.bool; default = true; description = "Enable a xterm terminal as a desktop manager."; }; diff --git a/nixos/modules/services/x11/display-managers/auto.nix b/nixos/modules/services/x11/display-managers/auto.nix index c02ccdf12b65b4a3ad0432ac127a6f80efdd6756..d2aae64bf2252e3d89ee680fc78c3acd1079a0c5 100644 --- a/nixos/modules/services/x11/display-managers/auto.nix +++ b/nixos/modules/services/x11/display-managers/auto.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 43ed21c95feeb7d90135a7e933a8fda47586a498..66886f23737d4734987bd1e20892efe22d4932f1 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -27,55 +27,26 @@ let Xft.hintstyle: hintslight ''; - # file provided by services.xserver.displayManager.session.script - xsession = wm: dm: pkgs.writeScript "xsession" + # file provided by services.xserver.displayManager.session.wrapper + xsessionWrapper = pkgs.writeScript "xsession-wrapper" '' #! ${pkgs.bash}/bin/bash - # Expected parameters: - # $1 = + - - # Actual parameters (FIXME): - # SDDM is calling this script like the following: - # $1 = /nix/store/xxx-xsession (= $0) - # $2 = + - # SLiM is using the following parameter: - # $1 = /nix/store/xxx-xsession + - # LightDM keeps the double quotes: - # $1 = /nix/store/xxx-xsession "+" - # The fake/auto display manager doesn't use any parameters and GDM is - # broken. - # If you want to "debug" this script don't print the parameters to stdout - # or stderr because this script will be executed multiple times and the - # output won't be visible in the log when the script is executed for the - # first time (e.g. append them to a file instead)! - - # All of the above cases are handled by the following hack (FIXME). - # Since this line is *very important* for *all display managers* it is - # very important to test changes to the following line with all display - # managers: - if [ "''${1:0:1}" = "/" ]; then eval exec "$1" "$2" ; fi - - # Now it should be safe to assume that the script was called with the - # expected parameters. + # Shared environment setup for graphical sessions. . /etc/profile cd "$HOME" - # The first argument of this script is the session type. - sessionType="$1" - if [ "$sessionType" = default ]; then sessionType=""; fi - ${optionalString cfg.startDbusSession '' if test -z "$DBUS_SESSION_BUS_ADDRESS"; then - exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$sessionType" + exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$@" fi ''} ${optionalString cfg.displayManager.job.logToJournal '' if [ -z "$_DID_SYSTEMD_CAT" ]; then export _DID_SYSTEMD_CAT=1 - exec ${config.systemd.package}/bin/systemd-cat -t xsession "$0" "$sessionType" + exec ${config.systemd.package}/bin/systemd-cat -t xsession "$0" "$@" fi ''} @@ -85,12 +56,10 @@ let # Start PulseAudio if enabled. ${optionalString (config.hardware.pulseaudio.enable) '' - ${optionalString (!config.hardware.pulseaudio.systemWide) - "${config.hardware.pulseaudio.package.out}/bin/pulseaudio --start" - } - # Publish access credentials in the root window. - ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" + if ${config.hardware.pulseaudio.package.out}/bin/pulseaudio --dump-modules | grep module-x11-publish &> /dev/null; then + ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" + fi ''} # Tell systemd about our $DISPLAY and $XAUTHORITY. @@ -101,6 +70,7 @@ let ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS # Load X defaults. + # FIXME: Check XDG_SESSION_TYPE against x11 ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} if test -e ~/.Xresources; then ${xorg.xrdb}/bin/xrdb -merge ~/.Xresources @@ -132,11 +102,32 @@ let # Allow the user to setup a custom session type. if test -x ~/.xsession; then exec ~/.xsession + fi + + if test "$1"; then + # Run the supplied session command. Remove any double quotes with eval. + eval exec "$@" else - if test "$sessionType" = "custom"; then - sessionType="" # fall-thru if there is no ~/.xsession - fi + # Fall back to the default window/desktopManager + exec ${cfg.displayManager.session.script} fi + ''; + + # file provided by services.xserver.displayManager.session.script + xsession = wm: dm: pkgs.writeScript "xsession" + '' + #! ${pkgs.bash}/bin/bash + + # Legacy session script used to construct .desktop files from + # `services.xserver.displayManager.session` entries. Called from + # `sessionWrapper`. + + # Expected parameters: + # $1 = + + + # The first argument of this script is the session type. + sessionType="$1" + if [ "$sessionType" = default ]; then sessionType=""; fi # The session type is "+", so # extract those (see: @@ -186,19 +177,22 @@ let allowSubstitutes = false; } '' - mkdir -p "$out" + mkdir -p "$out/share/xsessions" ${concatMapStrings (n: '' - cat - > "$out/${n}.desktop" << EODESKTOP + cat - > "$out/share/xsessions/${n}.desktop" << EODESKTOP [Desktop Entry] Version=1.0 Type=XSession TryExec=${cfg.displayManager.session.script} Exec=${cfg.displayManager.session.script} "${n}" - X-GDM-BypassXsession=true Name=${n} Comment= EODESKTOP '') names} + + ${concatMapStrings (pkg: '' + ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions + '') cfg.displayManager.extraSessionFilePackages} ''; in @@ -245,6 +239,14 @@ in ''; }; + extraSessionFilePackages = mkOption { + type = types.listOf types.package; + default = []; + description = '' + A list of packages containing xsession files to be passed to the display manager. + ''; + }; + session = mkOption { default = []; example = literalExample @@ -280,6 +282,7 @@ in (filter (w: d.name != "none" || w.name != "none") wm)); desktops = mkDesktops names; script = xsession wm dm; + wrapper = xsessionWrapper; }; }; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 70fc7388c2acdfc1ea1f38b282378b089cf26b99..78dc39f7f62fa49e4f05af12e68bdab86a32ae8e 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -89,7 +89,7 @@ in services.xserver.displayManager.slim.enable = false; - users.extraUsers.gdm = + users.users.gdm = { name = "gdm"; uid = config.ids.uids.gdm; group = "gdm"; @@ -97,7 +97,7 @@ in description = "GDM user"; }; - users.extraGroups.gdm.gid = config.ids.gids.gdm; + users.groups.gdm.gid = config.ids.gids.gdm; # GDM needs different xserverArgs, presumable because using wayland by default. services.xserver.tty = null; @@ -109,7 +109,7 @@ in environment = { GDM_X_SERVER_EXTRA_ARGS = toString (filter (arg: arg != "-terminate") cfg.xserverArgs); - GDM_SESSIONS_DIR = "${cfg.session.desktops}"; + GDM_SESSIONS_DIR = "${cfg.session.desktops}/share/xsessions"; # Find the mouse XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons"; }; @@ -135,6 +135,9 @@ in systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ]; + # Allow choosing an user account + services.accounts-daemon.enable = true; + services.dbus.packages = [ gdm ]; systemd.user.services.dbus.wantedBy = [ "default.target" ]; @@ -170,6 +173,8 @@ in ${optionalString cfg.gdm.debug "Enable=true"} ''; + environment.etc."gdm/Xsession".source = config.services.xserver.displayManager.session.wrapper; + # GDM LFS PAM modules, adapted somehow to NixOS security.pam.services = { gdm-launch-environment.text = '' diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 2a71d23386072902efe8150a80c2e4042a4df5d2..013956c0546647ecfdeb4da05d7955b4c3e9302a 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -8,7 +8,7 @@ let ldmcfg = dmcfg.lightdm; cfg = ldmcfg.greeters.gtk; - inherit (pkgs) stdenv lightdm writeScript writeText; + inherit (pkgs) writeText; theme = cfg.theme.package; icons = cfg.iconTheme.package; @@ -23,7 +23,7 @@ let makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ --prefix PATH : "${pkgs.glibc.bin}/bin" \ - --set GDK_PIXBUF_MODULE_FILE "${pkgs.gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ + --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \ --set GTK_EXE_PREFIX "${theme}" \ --set GTK_DATA_PREFIX "${theme}" \ @@ -68,8 +68,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.gnome-themes-standard; - defaultText = "pkgs.gnome3.gnome-themes-standard"; + default = pkgs.gnome3.gnome-themes-extra; + defaultText = "pkgs.gnome3.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix new file mode 100644 index 0000000000000000000000000000000000000000..ba8151a60f201f435d83018d05d9bdbb727ba77f --- /dev/null +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix @@ -0,0 +1,100 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + dmcfg = config.services.xserver.displayManager; + ldmcfg = dmcfg.lightdm; + cfg = ldmcfg.greeters.mini; + + xgreeters = pkgs.linkFarm "lightdm-mini-greeter-xgreeters" [{ + path = "${pkgs.lightdm-mini-greeter}/share/xgreeters/lightdm-mini-greeter.desktop"; + name = "lightdm-mini-greeter.desktop"; + }]; + + miniGreeterConf = pkgs.writeText "lightdm-mini-greeter.conf" + '' + [greeter] + user = ${cfg.user} + show-password-label = true + password-label-text = Password: + show-input-cursor = true + + [greeter-hotkeys] + mod-key = meta + shutdown-key = s + restart-key = r + hibernate-key = h + suspend-key = u + + [greeter-theme] + font = Sans + font-size = 1em + text-color = "#080800" + error-color = "#F8F8F0" + background-image = "${ldmcfg.background}" + background-color = "#1B1D1E" + window-color = "#F92672" + border-color = "#080800" + border-width = 2px + layout-space = 15 + password-color = "#F8F8F0" + password-background-color = "#1B1D1E" + + ${cfg.extraConfig} + ''; + +in +{ + options = { + + services.xserver.displayManager.lightdm.greeters.mini = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable lightdm-mini-greeter as the lightdm greeter. + + Note that this greeter starts only the default X session. + You can configure the default X session by + and + . + ''; + }; + + user = mkOption { + type = types.str; + default = "root"; + description = '' + The user to login as. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the lightdm-mini-greeter.conf + configuration file. + ''; + }; + + }; + + }; + + config = mkIf (ldmcfg.enable && cfg.enable) { + + services.xserver.displayManager.lightdm.greeters.gtk.enable = false; + + services.xserver.displayManager.lightdm.greeter = mkDefault { + package = xgreeters; + name = "lightdm-mini-greeter"; + }; + + environment.etc."lightdm/lightdm-mini-greeter.conf".source = miniGreeterConf; + + }; +} diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 9d30155a72348d9c24b3dc1ee492ae0559f03fea..dc82f7086c82c488cb5a5b33b3df8409c22f02c6 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -13,9 +13,9 @@ let wmDefault = xcfg.windowManager.default; hasDefaultUserSession = dmDefault != "none" || wmDefault != "none"; - inherit (pkgs) stdenv lightdm writeScript writeText; + inherit (pkgs) lightdm writeScript writeText; - # lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup + # lightdm runs with clearenv(), but we need a few things in the environment for X to startup xserverWrapper = writeScript "xserver-wrapper" '' #! ${pkgs.bash}/bin/bash @@ -42,14 +42,14 @@ let '' [LightDM] ${optionalString cfg.greeter.enable '' - greeter-user = ${config.users.extraUsers.lightdm.name} + greeter-user = ${config.users.users.lightdm.name} greeters-directory = ${cfg.greeter.package} ''} - sessions-directory = ${dmcfg.session.desktops} + sessions-directory = ${dmcfg.session.desktops}/share/xsessions [Seat:*] xserver-command = ${xserverWrapper} - session-wrapper = ${dmcfg.session.script} + session-wrapper = ${dmcfg.session.wrapper} ${optionalString cfg.greeter.enable '' greeter-session = ${cfg.greeter.name} ''} @@ -72,6 +72,7 @@ in # preferred. imports = [ ./lightdm-greeters/gtk.nix + ./lightdm-greeters/mini.nix ]; options = { @@ -175,21 +176,13 @@ in LightDM auto-login requires services.xserver.displayManager.lightdm.autoLogin.user to be set ''; } - { assertion = cfg.autoLogin.enable -> elem defaultSessionName dmcfg.session.names; + { assertion = cfg.autoLogin.enable -> dmDefault != "none" || wmDefault != "none"; message = '' LightDM auto-login requires that services.xserver.desktopManager.default and services.xserver.windowMananger.default are set to valid values. The current default session: ${defaultSessionName} is not valid. ''; } - { assertion = hasDefaultUserSession -> elem defaultSessionName dmcfg.session.names; - message = '' - services.xserver.desktopManager.default and - services.xserver.windowMananger.default are not set to valid - values. The current default session: ${defaultSessionName} - is not valid. - ''; - } { assertion = !cfg.greeter.enable -> (cfg.autoLogin.enable && cfg.autoLogin.timeout == 0); message = '' LightDM can only run without greeter if automatic login is enabled and the timeout for it @@ -216,9 +209,12 @@ in services.dbus.enable = true; services.dbus.packages = [ lightdm ]; - # lightdm uses the accounts daemon to rember language/window-manager per user + # lightdm uses the accounts daemon to remember language/window-manager per user services.accounts-daemon.enable = true; + # Enable the accounts daemon to find lightdm's dbus interface + environment.systemPackages = [ lightdm ]; + security.pam.services.lightdm = { allowNullPassword = true; startSession = true; @@ -251,14 +247,14 @@ in session include lightdm ''; - users.extraUsers.lightdm = { + users.users.lightdm = { createHome = true; home = "/var/lib/lightdm-data"; group = "lightdm"; uid = config.ids.uids.lightdm; }; - users.extraGroups.lightdm.gid = config.ids.gids.lightdm; + users.groups.lightdm.gid = config.ids.gids.lightdm; services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves.. services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there }; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 2d4cb8aa20a57680bb7bcf017810361a9b2224a2..2b03ed81b5ed5168cb6bf51625173d93b8d16da9 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -19,17 +19,6 @@ let Xsetup = pkgs.writeScript "Xsetup" '' #!/bin/sh - - # Prior to Qt 5.9.2, there is a QML cache invalidation bug which sometimes - # strikes new Plasma 5 releases. If the QML cache is not invalidated, SDDM - # will segfault without explanation. We really tore our hair out for awhile - # before finding the bug: - # https://bugreports.qt.io/browse/QTBUG-62302 - # We work around the problem by deleting the QML cache before startup. It - # will be regenerated, causing a small but perceptible delay when SDDM - # starts. - rm -fr /var/lib/sddm/.cache/sddm-greeter/qmlcache - ${cfg.setupScript} ''; @@ -60,11 +49,15 @@ let MinimumVT=${toString (if xcfg.tty != null then xcfg.tty else 7)} ServerPath=${xserverWrapper} XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr - SessionCommand=${dmcfg.session.script} - SessionDir=${dmcfg.session.desktops} + SessionCommand=${dmcfg.session.wrapper} + SessionDir=${dmcfg.session.desktops}/share/xsessions XauthPath=${pkgs.xorg.xauth}/bin/xauth DisplayCommand=${Xsetup} DisplayStopCommand=${Xstop} + EnableHidpi=${if cfg.enableHidpi then "true" else "false"} + + [Wayland] + EnableHidpi=${if cfg.enableHidpi then "true" else "false"} ${optionalString cfg.autoLogin.enable '' [Autologin] @@ -95,6 +88,17 @@ in ''; }; + enableHidpi = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable automatic HiDPI mode. + + + Versions up to 0.17 are broken so this only works from 0.18 onwards. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -253,7 +257,7 @@ in ''; }; - users.extraUsers.sddm = { + users.users.sddm = { createHome = true; home = "/var/lib/sddm"; group = "sddm"; @@ -261,8 +265,9 @@ in }; environment.etc."sddm.conf".source = cfgFile; + environment.pathsToLink = [ "/share/sddm/themes" ]; - users.extraGroups.sddm.gid = config.ids.gids.sddm; + users.groups.sddm.gid = config.ids.gids.sddm; environment.systemPackages = [ sddm ]; services.dbus.packages = [ sddm ]; @@ -270,5 +275,20 @@ in # To enable user switching, allow sddm to allocate TTYs/displays dynamically. services.xserver.tty = null; services.xserver.display = null; + + systemd.tmpfiles.rules = [ + # Prior to Qt 5.9.2, there is a QML cache invalidation bug which sometimes + # strikes new Plasma 5 releases. If the QML cache is not invalidated, SDDM + # will segfault without explanation. We really tore our hair out for awhile + # before finding the bug: + # https://bugreports.qt.io/browse/QTBUG-62302 + # We work around the problem by deleting the QML cache before startup. + # This was supposedly fixed in Qt 5.9.2 however it has been reported with + # 5.10 and 5.11 as well. The initial workaround was to delete the directory + # in the Xsetup script but that doesn't do anything. + # Instead we use tmpfiles.d to ensure it gets wiped. + # This causes a small but perceptible delay when SDDM starts. + "e ${config.users.users.sddm.home}/.cache - - - 0" + ]; }; } diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index f645a5c2f0781fd55936f031ae7ae5c78529822b..51ce5f4e24376cebd8949f4c42cffce8cfc20137 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -13,8 +13,8 @@ let xauth_path ${dmcfg.xauthBin} default_xserver ${dmcfg.xserverBin} xserver_arguments ${toString dmcfg.xserverArgs} - sessiondir ${dmcfg.session.desktops} - login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.script} "%session" + sessiondir ${dmcfg.session.desktops}/share/xsessions + login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.wrapper} "%session" halt_cmd ${config.systemd.package}/sbin/shutdown -h now reboot_cmd ${config.systemd.package}/sbin/shutdown -r now logfile /dev/stderr diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index d0a87f183b6fb934f8d2e290610479cae157d8f1..58fe702d4969c1971938baaadd41e992a6a637ad 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -116,7 +116,7 @@ in { }; scrollMethod = mkOption { - type = types.enum [ "twofinger" "edge" "none" ]; + type = types.enum [ "twofinger" "edge" "button" "none" ]; default = "twofinger"; example = "edge"; description = @@ -205,7 +205,7 @@ in { }) ]; - services.udev.packages = [ pkgs.libinput ]; + services.udev.packages = [ pkgs.libinput.out ]; services.xserver.config = '' diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 30d853841ea4497f61fdce407da9dcde09300341..b7dd7debcb63f1f440a677c49cd2ca9d8d480b8c 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -116,6 +116,9 @@ in { } ]; + # needed so that .desktop files are installed, which geoclue cares about + environment.systemPackages = [ cfg.package ]; + services.geoclue2.enable = mkIf (cfg.provider == "geoclue2") true; systemd.user.services.redshift = diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index 09a7f386876feb79923233c8f3f04fc08b083614..503c14c9b6245659b2c474450bde898c91322b4a 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -5,7 +5,7 @@ # not, a X server (Xvfb) is started for that user. The Xvfb instances # persist across VNC sessions. -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index 71eb02ec595498181630ba331a72db19c1430608..089e9f769f0a569a6cd8edd3d703b08f55d7c19f 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -37,6 +37,11 @@ in apply = pkg: if pkg == null then pkgs.awesome else pkg; }; + noArgb = mkOption { + default = false; + type = types.bool; + description = "Disable client transparency support, which can be greatly detrimental to performance in some setups"; + }; }; }; @@ -50,7 +55,7 @@ in { name = "awesome"; start = '' - ${awesome}/bin/awesome ${makeSearchPath cfg.luaModules} & + ${awesome}/bin/awesome ${lib.optionalString cfg.noArgb "--no-argb"} ${makeSearchPath cfg.luaModules} & waitPID=$! ''; }; diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix index 6783ac3479e6e67e8ac1e1727df323d72d66eab0..23cd4f6529a60786009052bdb6a64c82d2d348b0 100644 --- a/nixos/modules/services/x11/window-managers/bspwm.nix +++ b/nixos/modules/services/x11/window-managers/bspwm.nix @@ -59,7 +59,7 @@ in start = '' export _JAVA_AWT_WM_NONREPARENTING=1 SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""} & - ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} + ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} & waitPID=$! ''; }; diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index e617e55a7a57a8166508deaf040d2d9bef2618b3..06c59342b45a8f94b89a99060cf542a347e331b1 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index 436eccbaf0c2c39332775e4ad161b843ee03ba03..5175fd7f3b1f8a6af2a0de07b3643e1ba8ff591f 100644 --- a/nixos/modules/services/x11/window-managers/metacity.nix +++ b/nixos/modules/services/x11/window-managers/metacity.nix @@ -5,9 +5,7 @@ with lib; let cfg = config.services.xserver.windowManager.metacity; - xorg = config.services.xserver.package; - gnome = pkgs.gnome; - + inherit (pkgs) gnome3; in { @@ -20,16 +18,12 @@ in services.xserver.windowManager.session = singleton { name = "metacity"; start = '' - env LD_LIBRARY_PATH=${lib.makeLibraryPath [ xorg.libX11 xorg.libXext ]}:/usr/lib/ - # !!! Hack: load the schemas for Metacity. - GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf.out}/bin/gconftool-2 \ - --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */ - ${gnome.metacity}/bin/metacity & + ${gnome3.metacity}/bin/metacity & waitPID=$! ''; }; - environment.systemPackages = [ gnome.metacity ]; + environment.systemPackages = [ gnome3.metacity ]; }; diff --git a/nixos/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix index 07ef77151e9568bee3cd1311e3591de933b3f8d3..165772d1aa097f5596bd311850094518df881a7d 100644 --- a/nixos/modules/services/x11/window-managers/openbox.nix +++ b/nixos/modules/services/x11/window-managers/openbox.nix @@ -2,7 +2,6 @@ with lib; let - inherit (lib) mkOption mkIf; cfg = config.services.xserver.windowManager.openbox; in diff --git a/nixos/modules/services/x11/window-managers/stumpwm.nix b/nixos/modules/services/x11/window-managers/stumpwm.nix index 3d3f2e0028c07c5118a9a8c4a09e636ddc761573..27a17178476a05a3c4a584d6aa240c6e4b0ee34e 100644 --- a/nixos/modules/services/x11/window-managers/stumpwm.nix +++ b/nixos/modules/services/x11/window-managers/stumpwm.nix @@ -15,10 +15,10 @@ in services.xserver.windowManager.session = singleton { name = "stumpwm"; start = '' - ${pkgs.stumpwm}/bin/stumpwm & + ${pkgs.lispPackages.stumpwm}/bin/stumpwm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.stumpwm ]; + environment.systemPackages = [ pkgs.lispPackages.stumpwm ]; }; } diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix index 30c8df7822457f4427d6d09b32bd9ff94c7e1297..9b50a99bf23f181d090328d781d349143041ae0a 100644 --- a/nixos/modules/services/x11/window-managers/wmii.nix +++ b/nixos/modules/services/x11/window-managers/wmii.nix @@ -1,8 +1,7 @@ -{ config, lib, pkgs, options, modulesPath, ... }: +{ config, lib, pkgs, ... }: with lib; let - inherit (lib) mkOption mkIf singleton; cfg = config.services.xserver.windowManager.wmii; wmii = pkgs.wmii_hg; in diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index e7918cf9d315f55d6f3a0ad23db6c3bd595005f7..b45e510f6b8394f3d573f6fde9612ca98b8e5a65 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, pkgs_i686, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -240,7 +240,17 @@ in type = types.listOf types.str; # !!! We'd like "nv" here, but it segfaults the X server. default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ]; - example = [ "vesa" ]; + example = [ + "ati_unfree" "amdgpu" "amdgpu-pro" + "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" + ]; + # TODO(@oxij): think how to easily add the rest, like those nvidia things + relatedPackages = concatLists + (mapAttrsToList (n: v: + optional (hasPrefix "xf86video" n) { + path = [ "xorg" n ]; + title = removePrefix "xf86video" n; + }) pkgs.xorg); description = '' The names of the video drivers the configuration supports. They will be tried in order until one that @@ -626,9 +636,7 @@ in environment = { - XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime. - LD_LIBRARY_PATH = concatStringsSep ":" ( - [ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" "/run/opengl-driver/lib" ] + LD_LIBRARY_PATH = concatStringsSep ":" ([ "/run/opengl-driver/lib" ] ++ concatLists (catAttrs "libPath" cfg.drivers)); } // cfg.displayManager.job.environment; diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 87a4ab2a586df7e539fd83ca65d2545035ce7cc0..b3fe6caf62dc94c9e49f6fcdf107fc234190e411 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -4,6 +4,7 @@ use strict; use warnings; use File::Basename; use File::Slurp; +use Net::DBus; use Sys::Syslog qw(:standard :macros); use Cwd 'abs_path'; @@ -67,17 +68,15 @@ EOF $SIG{PIPE} = "IGNORE"; sub getActiveUnits { - # FIXME: use D-Bus or whatever to query this, since parsing the - # output of list-units is likely to break. - # Use current version of systemctl binary before daemon is reexeced. - my $lines = `LANG= /run/current-system/sw/bin/systemctl list-units --full --no-legend`; + my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1"); + my $units = $mgr->ListUnitsByPatterns([], []); my $res = {}; - foreach my $line (split '\n', $lines) { - chomp $line; - last if $line eq ""; - $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next; - next if $1 eq "UNIT"; - $res->{$1} = { load => $2, state => $3, substate => $4 }; + for my $item (@$units) { + my ($id, $description, $load_state, $active_state, $sub_state, + $following, $unit_path, $job_id, $job_type, $job_path) = @$item; + next unless $following eq ''; + next if $job_id == 0 and $active_state eq 'inactive'; + $res->{$id} = { load => $load_state, state => $active_state, substate => $sub_state }; } return $res; } @@ -167,6 +166,24 @@ while (my ($unit, $state) = each %{$activePrev}) { if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") { + # Ignore (i.e. never stop) these units: + if ($unit eq "system.slice") { + # TODO: This can be removed a few months after 18.09 is out + # (i.e. after everyone switched away from 18.03). + # Problem: Restarting (stopping) system.slice would not only + # stop X11 but also most system units/services. We obviously + # don't want this happening to users when they switch from 18.03 + # to 18.09 or nixos-unstable. + # Reason: The following change in systemd: + # https://github.com/systemd/systemd/commit/d8e5a9338278d6602a0c552f01f298771a384798 + # The commit adds system.slice to the perpetual units, which + # means removing the unit file and adding it to the source code. + # This is done so that system.slice can't be stopped anymore but + # in our case it ironically would cause this script to stop + # system.slice because the unit was removed (and an older + # systemd version is still running). + next; + } my $unitInfo = parseUnit($prevUnitFile); $unitsToStop{$unit} = 1 if boolIsTrue($unitInfo->{'X-StopOnRemoval'} // "yes"); } @@ -395,6 +412,18 @@ system("@systemd@/bin/systemctl", "reset-failed"); # Make systemd reload its units. system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3; +# Reload user units +open my $listActiveUsers, '-|', '@systemd@/bin/loginctl', 'list-users', '--no-legend'; +while (my $f = <$listActiveUsers>) { + next unless $f =~ /^\s*(?\d+)\s+(?\S+)/; + my ($uid, $name) = ($+{uid}, $+{user}); + print STDERR "reloading user units for $name...\n"; + + system("su", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload"); +} + +close $listActiveUsers; + # Set the new tmpfiles print STDERR "setting up tmpfiles\n"; system("@systemd@/bin/systemd-tmpfiles", "--create", "--remove", "--exclude-prefix=/dev") == 0 or $res = 3; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 091a2e412eeda91be63803ed45fbc0a1ddc90615..9d410a8b9ca4b713365b92c21ec69e595244cdf6 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -46,7 +46,7 @@ let ln -s ${kernelPath} $out/kernel ln -s ${config.system.modulesTree} $out/kernel-modules - ${optionalString (pkgs.stdenv.platform.kernelDTB or false) '' + ${optionalString (pkgs.stdenv.hostPlatform.platform.kernelDTB or false) '' ln -s ${config.boot.kernelPackages.kernel}/dtbs $out/dtbs ''} @@ -74,7 +74,7 @@ let echo -n "$configurationName" > $out/configuration-name echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version echo -n "$nixosLabel" > $out/nixos-version - echo -n "$system" > $out/system + echo -n "${pkgs.stdenv.hostPlatform.system}" > $out/system mkdir $out/fine-tune childCount=0 @@ -127,7 +127,8 @@ let configurationName = config.boot.loader.grub.configurationName; # Needed by switch-to-configuration. - perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; + + perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ])); } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}"); # Replace runtime dependencies @@ -174,7 +175,7 @@ in system.boot.loader.kernelFile = mkOption { internal = true; - default = pkgs.stdenv.platform.kernelTarget; + default = pkgs.stdenv.hostPlatform.platform.kernelTarget; type = types.str; description = '' Name of the kernel file to be passed to the bootloader. @@ -225,7 +226,7 @@ in default = []; example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { }; }) ]"; type = types.listOf (types.submodule ( - { options, ... }: { + { ... }: { options.original = mkOption { type = types.package; description = "The original package to override."; diff --git a/nixos/modules/system/boot/coredump.nix b/nixos/modules/system/boot/coredump.nix index b27a35b6257da4e802c04a4926e1b67625e6567b..30f367da766634477a1f7a96e536ad1c5082c6c0 100644 --- a/nixos/modules/system/boot/coredump.nix +++ b/nixos/modules/system/boot/coredump.nix @@ -15,8 +15,11 @@ with lib; Enables storing core dumps in systemd. Note that this alone is not enough to enable core dumps. The maximum file size for core dumps must be specified in limits.conf as well. See - as well as the limits.conf(5) - man page. + and the limits.conf(5) + man page (these specify the core dump limits for user login sessions) + and (where e.g. + DefaultLimitCORE=1000000 can be specified to set + the core dump limit for systemd system-level services). ''; }; diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix index c4c6d82dc5c8100f59cf514aa9a8e92a093de067..8c9b1502558af1c464e8cc9ecc1851a263492439 100644 --- a/nixos/modules/system/boot/grow-partition.nix +++ b/nixos/modules/system/boot/grow-partition.nix @@ -30,10 +30,17 @@ with lib; boot.initrd.postDeviceCommands = '' rootDevice="${config.fileSystems."/".device}" - if [ -e "$rootDevice" ]; then + if waitDevice "$rootDevice"; then rootDevice="$(readlink -f "$rootDevice")" - parentDevice="$(lsblk -npo PKNAME "$rootDevice")" - TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}" + parentDevice="$rootDevice" + while [ "''${parentDevice%[0-9]}" != "''${parentDevice}" ]; do + parentDevice="''${parentDevice%[0-9]}"; + done + partNum="''${rootDevice#''${parentDevice}}" + if [ "''${parentDevice%[0-9]p}" != "''${parentDevice}" ] && [ -b "''${parentDevice%p}" ]; then + parentDevice="''${parentDevice%p}" + fi + TMPDIR=/run sh $(type -P growpart) "$parentDevice" "$partNum" udevadm settle fi ''; diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix index 33862b0965cc20658434290ae45ffc4927ecdc4b..384ae909b70115a910950bbb4824083cfa8fc66e 100644 --- a/nixos/modules/system/boot/initrd-network.nix +++ b/nixos/modules/system/boot/initrd-network.nix @@ -12,6 +12,7 @@ let if [ "$1" = bound ]; then ip address add "$ip/$mask" dev "$interface" if [ -n "$router" ]; then + ip route add "$router" dev "$interface" # just in case if "$router" is not within "$ip/$mask" (e.g. Hetzner Cloud) ip route add default via "$router" dev "$interface" fi if [ -n "$dns" ]; then diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 8b3dc2d90eb333abbd7362a8a1a230ff5b50a897..53e993603e273db23f814351fcce309e04df8bc0 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -79,7 +79,7 @@ in boot.initrd.network.ssh.authorizedKeys = mkOption { type = types.listOf types.str; - default = config.users.extraUsers.root.openssh.authorizedKeys.keys; + default = config.users.users.root.openssh.authorizedKeys.keys; description = '' Authorized keys for the root user on initrd. ''; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 3bd7d35582691f6eb6324ac7328c451c1edad815..8ea05ed14687e878e8737bd911e573107a99726b 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -77,8 +77,8 @@ in type = types.int; default = 4; description = '' - The kernel console log level. Log messages with a priority - numerically less than this will not appear on the console. + The kernel console loglevel. All Kernel Messages with a log level smaller + than this setting will be printed to the console. ''; }; diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix index 3fc1af28f628e7353272aedf37e347db934c31a2..3e5d7b40f2c582da1661d03cd2c4f1d3c3ffb680 100644 --- a/nixos/modules/system/boot/kexec.nix +++ b/nixos/modules/system/boot/kexec.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, lib, ... }: { config = lib.mkIf (pkgs.kexectools.meta.available) { diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix index f8a00784034ab17295528feef6216b200a6a528c..2d27611946e2c49c65dd6e0db3186a7945177763 100644 --- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -13,7 +13,7 @@ let }; # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk - platform = pkgs.stdenv.platform; + inherit (pkgs.stdenv.hostPlatform) platform; in diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index e2cff1c1bd9457c9413954e989fc1e1625a05e62..42da658572219822113c6d2fccd0b36159a6425a 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -64,9 +64,10 @@ let )) + ":" + (makeSearchPathOutput "bin" "sbin" [ pkgs.mdadm pkgs.utillinux ]); - font = if lib.last (lib.splitString "." cfg.font) == "pf2" + font = if cfg.font == null then "" + else (if lib.last (lib.splitString "." cfg.font) == "pf2" then cfg.font - else "${convertedFont}"; + else "${convertedFont}"); }); bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {} @@ -308,10 +309,22 @@ in type = types.nullOr types.path; example = literalExample "./my-background.png"; description = '' - Background image used for GRUB. It must be a 640x480, + Background image used for GRUB. + Set to null to run GRUB in text mode. + + + For grub 1: + It must be a 640x480, 14-colour image in XPM format, optionally compressed with - gzip or bzip2. Set to - null to run GRUB in text mode. + gzip or bzip2. + + + + For grub 2: + File must be one of .png, .tga, .jpg, or .jpeg. JPEG images must + not be progressive. + The image will be scaled if necessary to fit the screen. + ''; }; @@ -372,8 +385,9 @@ in }; default = mkOption { - default = 0; - type = types.int; + default = "0"; + type = types.either types.int types.str; + apply = toString; description = '' Index of the default menu item to be booted. ''; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 8bd203106f55dbc7749e6ef8d4387da77a13c0cb..d1ff6e6bf5256bb3cddf7a09ad22adaf404351c3 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -54,7 +54,7 @@ my $splashImage = get("splashImage"); my $configurationLimit = int(get("configurationLimit")); my $copyKernels = get("copyKernels") eq "true"; my $timeout = int(get("timeout")); -my $defaultEntry = int(get("default")); +my $defaultEntry = get("default"); my $fsIdentifier = get("fsIdentifier"); my $grubEfi = get("grubEfi"); my $grubTargetEfi = get("grubTargetEfi"); @@ -281,30 +281,36 @@ else { else insmod vbe fi - insmod font - if loadfont " . $grubBoot->path . "/converted-font.pf2; then - insmod gfxterm - if [ \"\${grub_platform}\" = \"efi\" ]; then - set gfxmode=$gfxmodeEfi - set gfxpayload=keep - else - set gfxmode=$gfxmodeBios - set gfxpayload=text - fi - terminal_output gfxterm - fi "; if ($font) { copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath\n"; + $conf .= " + insmod font + if loadfont " . $grubBoot->path . "/converted-font.pf2; then + insmod gfxterm + if [ \"\${grub_platform}\" = \"efi\" ]; then + set gfxmode=$gfxmodeEfi + set gfxpayload=keep + else + set gfxmode=$gfxmodeBios + set gfxpayload=text + fi + terminal_output gfxterm + fi + "; } if ($splashImage) { - # FIXME: GRUB 1.97 doesn't resize the background image if it - # doesn't match the video resolution. - copy $splashImage, "$bootPath/background.png" or die "cannot copy $splashImage to $bootPath\n"; + # Keeps the image's extension. + my ($filename, $dirs, $suffix) = fileparse($splashImage, qr"\..[^.]*$"); + # The module for jpg is jpeg. + if ($suffix eq ".jpg") { + $suffix = ".jpeg"; + } + copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath\n"; $conf .= " - insmod png - if background_image " . $grubBoot->path . "/background.png; then + insmod " . substr($suffix, 1) . " + if background_image " . $grubBoot->path . "/background$suffix; then set color_normal=white/black set color_highlight=black/white else diff --git a/nixos/modules/system/boot/loader/loader.nix b/nixos/modules/system/boot/loader/loader.nix index 28cceafea7caca20bdcefbebc53ff76dd25a7d73..7fbda9ef0f576566031a691c27957c9272270b79 100644 --- a/nixos/modules/system/boot/loader/loader.nix +++ b/nixos/modules/system/boot/loader/loader.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh index f627d093eafb98898f0a96aded02ed52b0631002..8adc8a6a7e114e90a079eeffdcd6fca8bb8959c4 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh +++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh @@ -109,11 +109,15 @@ copyForced $fwdir/bootcode.bin /boot/bootcode.bin copyForced $fwdir/fixup.dat /boot/fixup.dat copyForced $fwdir/fixup_cd.dat /boot/fixup_cd.dat copyForced $fwdir/fixup_db.dat /boot/fixup_db.dat +copyForced $fwdir/fixup_x.dat /boot/fixup_x.dat copyForced $fwdir/start.elf /boot/start.elf copyForced $fwdir/start_cd.elf /boot/start_cd.elf copyForced $fwdir/start_db.elf /boot/start_db.elf copyForced $fwdir/start_x.elf /boot/start_x.elf +# Add the config.txt +copyForced @configTxt@ /boot/config.txt + # Remove obsolete files from /boot and /boot/old. for fn in /boot/old/*linux* /boot/old/*initrd-initrd* /boot/bcm*.dtb; do if ! test "${filesCopied[$fn]}" = 1; then diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix new file mode 100644 index 0000000000000000000000000000000000000000..47f25a9c2b1befc45d56ece4b86db545862ec2f1 --- /dev/null +++ b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix @@ -0,0 +1,34 @@ +{ config, pkgs, configTxt }: + +let + cfg = config.boot.loader.raspberryPi; + isAarch64 = pkgs.stdenv.isAarch64; + + uboot = + if cfg.version == 1 then + pkgs.ubootRaspberryPi + else if cfg.version == 2 then + pkgs.ubootRaspberryPi2 + else + if isAarch64 then + pkgs.ubootRaspberryPi3_64bit + else + pkgs.ubootRaspberryPi3_32bit; + + extlinuxConfBuilder = + import ../generic-extlinux-compatible/extlinux-conf-builder.nix { + inherit pkgs; + }; +in +pkgs.substituteAll { + src = ./builder_uboot.sh; + isExecutable = true; + inherit (pkgs) bash; + path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; + firmware = pkgs.raspberrypifw; + inherit uboot; + inherit configTxt; + inherit extlinuxConfBuilder; + version = cfg.version; +} + diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh new file mode 100644 index 0000000000000000000000000000000000000000..36bf1506627458c72ac3ea167e6c3bf527ab1e09 --- /dev/null +++ b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh @@ -0,0 +1,29 @@ +#! @bash@/bin/sh -e + +copyForced() { + local src="$1" + local dst="$2" + cp $src $dst.tmp + mv $dst.tmp $dst +} + +# Call the extlinux builder +"@extlinuxConfBuilder@" "$@" + +# Add the firmware files +fwdir=@firmware@/share/raspberrypi/boot/ +copyForced $fwdir/bootcode.bin /boot/bootcode.bin +copyForced $fwdir/fixup.dat /boot/fixup.dat +copyForced $fwdir/fixup_cd.dat /boot/fixup_cd.dat +copyForced $fwdir/fixup_db.dat /boot/fixup_db.dat +copyForced $fwdir/fixup_x.dat /boot/fixup_x.dat +copyForced $fwdir/start.elf /boot/start.elf +copyForced $fwdir/start_cd.elf /boot/start_cd.elf +copyForced $fwdir/start_db.elf /boot/start_db.elf +copyForced $fwdir/start_x.elf /boot/start_x.elf + +# Add the uboot file +copyForced @uboot@/u-boot.bin /boot/u-boot-rpi.bin + +# Add the config.txt +copyForced @configTxt@ /boot/config.txt diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index f246d04284caa9831bb5d5a037ca4a2f1e4d09a0..9bec24c53f5bfecad316be435b900eb9da5fdefa 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -5,42 +5,108 @@ with lib; let cfg = config.boot.loader.raspberryPi; - builder = pkgs.substituteAll { + builderGeneric = pkgs.substituteAll { src = ./builder.sh; isExecutable = true; inherit (pkgs) bash; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; firmware = pkgs.raspberrypifw; version = cfg.version; + inherit configTxt; }; - platform = pkgs.stdenv.platform; + inherit (pkgs.stdenv.hostPlatform) platform; + + builderUboot = import ./builder_uboot.nix { inherit config; inherit pkgs; inherit configTxt; }; + + builder = + if cfg.uboot.enable then + "${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr} -c" + else + builderGeneric; + + blCfg = config.boot.loader; + timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; + + isAarch64 = pkgs.stdenv.isAarch64; + optional = pkgs.stdenv.lib.optionalString; + + configTxt = + pkgs.writeText "config.txt" ('' + # U-Boot used to need this to work, regardless of whether UART is actually used or not. + # TODO: check when/if this can be removed. + enable_uart=1 + + # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel + # when attempting to show low-voltage or overtemperature warnings. + avoid_warnings=1 + '' + optional isAarch64 '' + # Boot in 64-bit mode. + arm_control=0x200 + '' + optional cfg.uboot.enable '' + kernel=u-boot-rpi.bin + '' + optional (cfg.firmwareConfig != null) cfg.firmwareConfig); in { options = { - boot.loader.raspberryPi.enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to create files with the system generations in - /boot. - /boot/old will hold files from old generations. - ''; - }; + boot.loader.raspberryPi = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to create files with the system generations in + /boot. + /boot/old will hold files from old generations. + ''; + }; - boot.loader.raspberryPi.version = mkOption { - default = 2; - type = types.enum [ 1 2 3 ]; - description = '' - ''; - }; + version = mkOption { + default = 2; + type = types.enum [ 1 2 3 ]; + description = '' + ''; + }; + + uboot = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable using uboot as bootmanager for the raspberry pi. + ''; + }; + + configurationLimit = mkOption { + default = 20; + example = 10; + type = types.int; + description = '' + Maximum number of configurations in the boot menu. + ''; + }; + + }; + firmwareConfig = mkOption { + default = null; + type = types.nullOr types.string; + description = '' + Extra options that will be appended to /boot/config.txt file. + For possible values, see: https://www.raspberrypi.org/documentation/configuration/config-txt/ + ''; + }; + }; }; - config = mkIf config.boot.loader.raspberryPi.enable { + config = mkIf cfg.enable { + assertions = singleton { + assertion = !pkgs.stdenv.isAarch64 || cfg.version == 3; + message = "Only Raspberry Pi 3 supports aarch64."; + }; + system.build.installBootLoader = builder; system.boot.loader.id = "raspberrypi"; system.boot.loader.kernelFile = platform.kernelTarget; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 3333569c36bec059ac1f6511859b96b644db5b9a..6016a85ea06104ae49d918afaea70cea3928609b 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -42,7 +42,8 @@ def write_loader_conf(profile, generation): else: f.write("default nixos-generation-%d\n" % (generation)) if not @editor@: - f.write("editor 0"); + f.write("editor 0\n"); + f.write("console-mode @consoleMode@\n"); os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") def profile_path(profile, generation, name): diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index a5a88a99be8f93026583cee8f0d942a45c8d2ee4..feed863efd6629b44f6e7816d27ef3ff08335443 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -22,6 +22,8 @@ let editor = if cfg.editor then "True" else "False"; + inherit (cfg) consoleMode; + inherit (efi) efiSysMountPoint canTouchEfiVariables; }; in { @@ -52,6 +54,38 @@ in { compatibility. ''; }; + + consoleMode = mkOption { + default = "keep"; + + type = types.enum [ "0" "1" "2" "auto" "max" "keep" ]; + + description = '' + The resolution of the console. The following values are valid: + + + + + "0": Standard UEFI 80x25 mode + + + "1": 80x50 mode, not supported by all devices + + + "2": The first non-standard mode provided by the device firmware, if any + + + "auto": Pick a suitable mode automatically using heuristics + + + "max": Pick the highest-numbered available mode + + + "keep": Keep the mode selected by firmware (the default) + + + ''; + }; }; config = mkIf cfg.enable { diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 54dfb53fd30ffba7c716ca46a89a86e31225cc6d..27c1f891f485a25ba06e58bf0f0e67a5156a00dc 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -5,61 +5,171 @@ with lib; let luks = config.boot.initrd.luks; - openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, fallbackToPassword, ... }: assert name' == name; '' + commonFunctions = '' + die() { + echo "$@" >&2 + exit 1 + } - # Wait for a target (e.g. device, keyFile, header, ...) to appear. wait_target() { local name="$1" local target="$2" + local secs="''${3:-10}" + local desc="''${4:-$name $target to appear}" if [ ! -e $target ]; then - echo -n "Waiting 10 seconds for $name $target to appear" + echo -n "Waiting $secs seconds for $desc..." local success=false; - for try in $(seq 10); do + for try in $(seq $secs); do echo -n "." sleep 1 - if [ -e $target ]; then success=true break; fi + if [ -e $target ]; then + success=true + break + fi done - if [ $success = true ]; then + if [ $success == true ]; then echo " - success"; + return 0 else echo " - failure"; + return 1 fi fi + return 0 } + wait_yubikey() { + local secs="''${1:-10}" + + ykinfo -v 1>/dev/null 2>&1 + if [ $? != 0 ]; then + echo -n "Waiting $secs seconds for Yubikey to appear..." + local success=false + for try in $(seq $secs); do + echo -n . + sleep 1 + ykinfo -v 1>/dev/null 2>&1 + if [ $? == 0 ]; then + success=true + break + fi + done + if [ $success == true ]; then + echo " - success"; + return 0 + else + echo " - failure"; + return 1 + fi + fi + return 0 + } + ''; + + preCommands = '' + # A place to store crypto things + + # A ramfs is used here to ensure that the file used to update + # the key slot with cryptsetup will never get swapped out. + # Warning: Do NOT replace with tmpfs! + mkdir -p /crypt-ramfs + mount -t ramfs none /crypt-ramfs + + # For Yubikey salt storage + mkdir -p /crypt-storage + + # Disable all input echo for the whole stage. We could use read -s + # instead but that would ocasionally leak characters between read + # invocations. + stty -echo + ''; + + postCommands = '' + stty echo + umount /crypt-storage 2>/dev/null + umount /crypt-ramfs 2>/dev/null + ''; + + openCommand = name': { name, device, header, keyFile, keyFileSize, keyFileOffset, allowDiscards, yubikey, fallbackToPassword, ... }: assert name' == name; + let + csopen = "cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} ${optionalString (header != null) "--header=${header}"}"; + cschange = "cryptsetup luksChangeKey ${device} ${optionalString (header != null) "--header=${header}"}"; + in '' # Wait for luksRoot (and optionally keyFile and/or header) to appear, e.g. # if on a USB drive. - wait_target "device" ${device} - - ${optionalString (keyFile != null) '' - wait_target "key file" ${keyFile} - ''} + wait_target "device" ${device} || die "${device} is unavailable" ${optionalString (header != null) '' - wait_target "header" ${header} + wait_target "header" ${header} || die "${header} is unavailable" ''} + do_open_passphrase() { + local passphrase + + while true; do + echo -n "Passphrase for ${device}: " + passphrase= + while true; do + if [ -e /crypt-ramfs/passphrase ]; then + echo "reused" + passphrase=$(cat /crypt-ramfs/passphrase) + break + else + # ask cryptsetup-askpass + echo -n "${device}" > /crypt-ramfs/device + + # and try reading it from /dev/console with a timeout + IFS= read -t 1 -r passphrase + if [ -n "$passphrase" ]; then + ${if luks.reusePassphrases then '' + # remember it for the next device + echo -n "$passphrase" > /crypt-ramfs/passphrase + '' else '' + # Don't save it to ramfs. We are very paranoid + ''} + echo + break + fi + fi + done + echo -n "Verifiying passphrase for ${device}..." + echo -n "$passphrase" | ${csopen} --key-file=- + if [ $? == 0 ]; then + echo " - success" + ${if luks.reusePassphrases then '' + # we don't rm here because we might reuse it for the next device + '' else '' + rm -f /crypt-ramfs/passphrase + ''} + break + else + echo " - failure" + # ask for a different one + rm -f /crypt-ramfs/passphrase + fi + done + } + + # LUKS open_normally() { - echo luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \ - ${optionalString (header != null) "--header=${header}"} \ - > /.luksopen_args - ${optionalString (keyFile != null) '' - ${optionalString fallbackToPassword "if [ -e ${keyFile} ]; then"} - echo " --key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}" \ - >> /.luksopen_args - ${optionalString fallbackToPassword '' + ${if (keyFile != null) then '' + if wait_target "key file" ${keyFile}; then + ${csopen} --key-file=${keyFile} \ + ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"} \ + ${optionalString (keyFileOffset != null) "--keyfile-offset=${toString keyFileOffset}"} else - echo "keyfile ${keyFile} not found -- fallback to interactive unlocking" + ${if fallbackToPassword then "echo" else "die"} "${keyFile} is unavailable" + echo " - failing back to interactive password prompt" + do_open_passphrase fi + '' else '' + do_open_passphrase ''} - ''} - cryptsetup-askpass - rm /.luksopen_args } - ${optionalString (luks.yubikeySupport && (yubikey != null)) '' - + ${if luks.yubikeySupport && (yubikey != null) then '' + # Yubikey rbtohex() { ( od -An -vtx1 | tr -d ' \n' ) } @@ -68,8 +178,7 @@ let ( tr '[:lower:]' '[:upper:]' | sed -e 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf ) } - open_yubikey() { - + do_open_yubikey() { # Make all of these local to this function # to prevent their values being leaked local salt @@ -85,19 +194,18 @@ let local new_response local new_k_luks - mkdir -p ${yubikey.storage.mountPoint} - mount -t ${yubikey.storage.fsType} ${toString yubikey.storage.device} ${yubikey.storage.mountPoint} + mount -t ${yubikey.storage.fsType} ${yubikey.storage.device} /crypt-storage || \ + die "Failed to mount Yubikey salt storage device" - salt="$(cat ${yubikey.storage.mountPoint}${yubikey.storage.path} | sed -n 1p | tr -d '\n')" - iterations="$(cat ${yubikey.storage.mountPoint}${yubikey.storage.path} | sed -n 2p | tr -d '\n')" + salt="$(cat /crypt-storage${yubikey.storage.path} | sed -n 1p | tr -d '\n')" + iterations="$(cat /crypt-storage${yubikey.storage.path} | sed -n 2p | tr -d '\n')" challenge="$(echo -n $salt | openssl-wrap dgst -binary -sha512 | rbtohex)" response="$(ykchalresp -${toString yubikey.slot} -x $challenge 2>/dev/null)" for try in $(seq 3); do - ${optionalString yubikey.twoFactor '' echo -n "Enter two-factor passphrase: " - read -s k_user + read -r k_user echo ''} @@ -107,9 +215,9 @@ let k_luks="$(echo | pbkdf2-sha512 ${toString yubikey.keyLength} $iterations $response | rbtohex)" fi - echo -n "$k_luks" | hextorb | cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} --key-file=- + echo -n "$k_luks" | hextorb | ${csopen} --key-file=- - if [ $? == "0" ]; then + if [ $? == 0 ]; then opened=true break else @@ -118,11 +226,7 @@ let fi done - if [ "$opened" == false ]; then - umount ${yubikey.storage.mountPoint} - echo "Maximum authentication errors reached" - exit 1 - fi + [ "$opened" == false ] && die "Maximum authentication errors reached" echo -n "Gathering entropy for new salt (please enter random keys to generate entropy if this blocks for long)..." for i in $(seq ${toString yubikey.saltLength}); do @@ -147,67 +251,50 @@ let new_k_luks="$(echo | pbkdf2-sha512 ${toString yubikey.keyLength} $new_iterations $new_response | rbtohex)" fi - mkdir -p ${yubikey.ramfsMountPoint} - # A ramfs is used here to ensure that the file used to update - # the key slot with cryptsetup will never get swapped out. - # Warning: Do NOT replace with tmpfs! - mount -t ramfs none ${yubikey.ramfsMountPoint} + echo -n "$new_k_luks" | hextorb > /crypt-ramfs/new_key + echo -n "$k_luks" | hextorb | ${cschange} --key-file=- /crypt-ramfs/new_key - echo -n "$new_k_luks" | hextorb > ${yubikey.ramfsMountPoint}/new_key - echo -n "$k_luks" | hextorb | cryptsetup luksChangeKey ${device} --key-file=- ${yubikey.ramfsMountPoint}/new_key - - if [ $? == "0" ]; then - echo -ne "$new_salt\n$new_iterations" > ${yubikey.storage.mountPoint}${yubikey.storage.path} + if [ $? == 0 ]; then + echo -ne "$new_salt\n$new_iterations" > /crypt-storage${yubikey.storage.path} else echo "Warning: Could not update LUKS key, current challenge persists!" fi - rm -f ${yubikey.ramfsMountPoint}/new_key - umount ${yubikey.ramfsMountPoint} - rm -rf ${yubikey.ramfsMountPoint} + rm -f /crypt-ramfs/new_key + umount /crypt-storage + } - umount ${yubikey.storage.mountPoint} + open_yubikey() { + if wait_yubikey ${toString yubikey.gracePeriod}; then + do_open_yubikey + else + echo "No yubikey found, falling back to non-yubikey open procedure" + open_normally + fi } - ${optionalString (yubikey.gracePeriod > 0) '' - echo -n "Waiting ${toString yubikey.gracePeriod} seconds as grace..." - for i in $(seq ${toString yubikey.gracePeriod}); do - sleep 1 - echo -n . - done - echo "ok" + open_yubikey + '' else '' + open_normally ''} + ''; - yubikey_missing=true - ykinfo -v 1>/dev/null 2>&1 - if [ $? != "0" ]; then - echo -n "waiting 10 seconds for yubikey to appear..." - for try in $(seq 10); do - sleep 1 - ykinfo -v 1>/dev/null 2>&1 - if [ $? == "0" ]; then - yubikey_missing=false - break - fi - echo -n . - done - echo "ok" - else - yubikey_missing=false - fi - - if [ "$yubikey_missing" == true ]; then - echo "no yubikey found, falling back to non-yubikey open procedure" - open_normally - else - open_yubikey - fi - ''} + askPass = pkgs.writeScriptBin "cryptsetup-askpass" '' + #!/bin/sh - # open luksRoot and scan for logical volumes - ${optionalString ((!luks.yubikeySupport) || (yubikey == null)) '' - open_normally - ''} + ${commonFunctions} + + while true; do + wait_target "luks" /crypt-ramfs/device 10 "LUKS to request a passphrase" || die "Passphrase is not requested now" + device=$(cat /crypt-ramfs/device) + + echo -n "Passphrase for $device: " + IFS= read -rs passphrase + echo + + rm /crypt-ramfs/device + echo -n "$passphrase" > /crypt-ramfs/passphrase + done ''; preLVM = filterAttrs (n: v: v.preLVM) luks.devices; @@ -255,6 +342,22 @@ in ''; }; + boot.initrd.luks.reusePassphrases = mkOption { + type = types.bool; + default = true; + description = '' + When opening a new LUKS device try reusing last successful + passphrase. + + Useful for mounting a number of devices that use the same + passphrase without retyping it several times. + + Such setup can be useful if you use cryptsetup + luksSuspend. Different LUKS devices will still have + different master keys even when using the same passphrase. + ''; + }; + boot.initrd.luks.devices = mkOption { default = { }; example = { "luksroot".device = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; }; @@ -316,6 +419,19 @@ in ''; }; + keyFileOffset = mkOption { + default = null; + example = 4096; + type = types.nullOr types.int; + description = '' + The offset of the key file. Use this in combination with + keyFileSize to use part of a file as key file + (often the case if a raw device or partition is used as a key file). + If not specified, the key begins at the first byte of + keyFile. + ''; + }; + # FIXME: get rid of this option. preLVM = mkOption { default = true; @@ -383,15 +499,9 @@ in }; gracePeriod = mkOption { - default = 2; + default = 10; type = types.int; - description = "Time in seconds to wait before attempting to find the Yubikey."; - }; - - ramfsMountPoint = mkOption { - default = "/crypt-ramfs"; - type = types.str; - description = "Path where the ramfs used to update the LUKS key will be mounted during early boot."; + description = "Time in seconds to wait for the Yubikey."; }; /* TODO: Add to the documentation of the current module: @@ -414,12 +524,6 @@ in description = "The filesystem of the unencrypted device."; }; - mountPoint = mkOption { - default = "/crypt-storage"; - type = types.str; - description = "Path where the unencrypted device will be mounted during early boot."; - }; - path = mkOption { default = "/crypt-storage/default"; type = types.str; @@ -432,8 +536,8 @@ in }; }); }; - - }; })); + }; + })); }; boot.initrd.luks.yubikeySupport = mkOption { @@ -454,7 +558,6 @@ in ["firewire_ohci" "firewire_core" "firewire_sbp2"]; # Some modules that may be needed for mounting anything ciphered - # Also load input_leds to get caps lock light working (#12456) boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ] ++ luks.cryptoModules # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged @@ -464,18 +567,8 @@ in # copy the cryptsetup binary and it's dependencies boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.cryptsetup}/bin/cryptsetup - - cat > $out/bin/cryptsetup-askpass <systemd.network + 5 for details. + ''; + }; + + bond = mkOption { + default = [ ]; + type = types.listOf types.str; + description = '' + A list of bond interfaces to be added to the network section of the + unit. See systemd.network + 5 for details. + ''; + }; + + vrf = mkOption { + default = [ ]; + type = types.listOf types.str; + description = '' + A list of vrf interfaces to be added to the network section of the + unit. See systemd.network + 5 for details. + ''; + }; + vlan = mkOption { default = [ ]; type = types.listOf types.str; @@ -522,7 +656,7 @@ let }; - networkConfig = { name, config, ... }: { + networkConfig = { config, ... }: { config = { matchConfig = optionalAttrs (config.name != null) { Name = config.name; @@ -618,6 +752,9 @@ let ${concatStringsSep "\n" (map (s: "Gateway=${s}") def.gateway)} ${concatStringsSep "\n" (map (s: "DNS=${s}") def.dns)} ${concatStringsSep "\n" (map (s: "NTP=${s}") def.ntp)} + ${concatStringsSep "\n" (map (s: "Bridge=${s}") def.bridge)} + ${concatStringsSep "\n" (map (s: "Bond=${s}") def.bond)} + ${concatStringsSep "\n" (map (s: "VRF=${s}") def.vrf)} ${concatStringsSep "\n" (map (s: "VLAN=${s}") def.vlan)} ${concatStringsSep "\n" (map (s: "MACVLAN=${s}") def.macvlan)} ${concatStringsSep "\n" (map (s: "VXLAN=${s}") def.vxlan)} @@ -712,6 +849,9 @@ in systemd.services.systemd-networkd = { wantedBy = [ "multi-user.target" ]; restartTriggers = map (f: f.source) (unitFiles); + # prevent race condition with interface renaming (#39069) + requires = [ "systemd-udev-settle.service" ]; + after = [ "systemd-udev-settle.service" ]; }; systemd.services.systemd-networkd-wait-online = { diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index f8fb8a64cb9b8a3c0b805e713d259d9c7a9e7da9..e4223bae7d32f9b8ddc49e78ff8f4d213a9609a4 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -87,9 +87,10 @@ in systemd.services.plymouth-kexec.wantedBy = [ "kexec.target" ]; systemd.services.plymouth-halt.wantedBy = [ "halt.target" ]; + systemd.services.plymouth-quit-wait.wantedBy = [ "multi-user.target" ]; systemd.services.plymouth-quit = { wantedBy = [ "multi-user.target" ]; - after = [ "display-manager.service" "multi-user.target" ]; + after = [ "display-manager.service" ]; }; systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ]; systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ]; diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 4d9de020c84e24101463f52bf9d8f47d41462940..fc68904ae080983e76b2ff4257c9ec49523f40a6 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let @@ -147,6 +147,8 @@ in ${config.services.resolved.extraConfig} ''; + # If networkmanager is enabled, ask it to interface with resolved. + networking.networkmanager.dns = "systemd-resolved"; }; } diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 964ec68cfe2f81ea838dbe35aed507a49f1fbcf9..de8451bbe31b76c5579ba4487a5fc81b36ea2376 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -74,6 +74,32 @@ ln -s /proc/mounts /etc/mtab # to shut up mke2fs touch /etc/udev/hwdb.bin # to shut up udev touch /etc/initrd-release +# Function for waiting a device to appear. +waitDevice() { + local device="$1" + + # USB storage devices tend to appear with some delay. It would be + # great if we had a way to synchronously wait for them, but + # alas... So just wait for a few seconds for the device to + # appear. + if test ! -e $device; then + echo -n "waiting for device $device to appear..." + try=20 + while [ $try -gt 0 ]; do + sleep 1 + # also re-try lvm activation now that new block devices might have appeared + lvm vgchange -ay + # and tell udev to create nodes for the new LVs + udevadm trigger --action=add + if test -e $device; then break; fi + echo -n "." + try=$((try - 1)) + done + echo + [ $try -ne 0 ] + fi +} + # Mount special file systems. specialMount() { local device="$1" @@ -225,6 +251,9 @@ checkFS() { # Skip fsck for bcachefs - not implemented yet. if [ "$fsType" = bcachefs ]; then return 0; fi + # Skip fsck for nilfs2 - not needed by design and no fsck tool for this filesystem. + if [ "$fsType" = nilfs2 ]; then return 0; fi + # Skip fsck for inherently readonly filesystems. if [ "$fsType" = squashfs ]; then return 0; fi @@ -377,40 +406,7 @@ lustrateRoot () { exec 4>&- } -# Function for waiting a device to appear. -waitDevice() { - local device="$1" - # USB storage devices tend to appear with some delay. It would be - # great if we had a way to synchronously wait for them, but - # alas... So just wait for a few seconds for the device to - # appear. - if test ! -e $device; then - echo -n "waiting for device $device to appear..." - try=20 - while [ $try -gt 0 ]; do - sleep 1 - # also re-try lvm activation now that new block devices might have appeared - lvm vgchange -ay - # and tell udev to create nodes for the new LVs - udevadm trigger --action=add - if test -e $device; then break; fi - echo -n "." - try=$((try - 1)) - done - echo - [ $try -ne 0 ] - fi -} - - -# Try to resume - all modules are loaded now. -if test -e /sys/power/tuxonice/resume; then - if test -n "$(cat /sys/power/tuxonice/resume)"; then - echo 0 > /sys/power/tuxonice/user_interface/enabled - echo 1 > /sys/power/tuxonice/do_resume || echo "failed to resume..." - fi -fi if test -e /sys/power/resume -a -e /sys/power/disk; then if test -n "@resumeDevice@" && waitDevice "@resumeDevice@"; then diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 55bb6d3449c5c71712866b2ec69c620dc9656ffe..f58b68cb3353d8abc6688bd759a7340968437726 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -11,7 +11,6 @@ let udev = config.systemd.package; - kernelPackages = config.boot.kernelPackages; modulesTree = config.system.modulesTree; firmware = config.hardware.firmware; @@ -56,6 +55,12 @@ let left=("''${left[@]:3}") if [ -z ''${seen[$next]+x} ]; then seen[$next]=1 + + # Ignore the dynamic linker which for some reason appears as a DT_NEEDED of glibc but isn't in glibc's RPATH. + case "$next" in + ld*.so.?) continue;; + esac + IFS=: read -ra paths <<< $rpath res= for path in "''${paths[@]}"; do @@ -158,7 +163,7 @@ let # Strip binaries further than normal. chmod -R u+w $out - stripDirs "lib bin" "-s" + stripDirs "$STRIP" "lib bin" "-s" # Run patchelf to make the programs refer to the copied libraries. find $out/bin $out/lib -type f | while read i; do @@ -174,7 +179,7 @@ let fi done - if [ -z "${toString pkgs.stdenv.isCross}" ]; then + if [ -z "${toString (pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform)}" ]; then # Make sure that the patchelf'ed binaries still work. echo "testing patched programs..." $out/bin/ash -c 'echo hello world' | grep "hello world" @@ -243,6 +248,14 @@ let isExecutable = true; + postInstall = '' + echo checking syntax + # check both with bash + ${pkgs.bash}/bin/sh -n $target + # and with ash shell, just in case + ${extraUtils}/bin/ash -n $target + ''; + inherit udevRules extraUtils modulesClosure; inherit (config.boot) resumeDevice; diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index b83012dfda7ef4e0808bc0b5d3b6469a206bca03..49764b75a55796b481e820f9cfd9637ab196dcc0 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -159,6 +159,6 @@ exec {logOutFd}>&- {logErrFd}>&- # Start systemd. echo "starting systemd..." -PATH=/run/current-system/systemd/lib/systemd \ +PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \ LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \ exec systemd diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index 78afbd8dbc12ba49f5dce9b1fe07adeaaa3c1f15..55e6b19c67fd2c37c16f92d29a3a13cefa54b782 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -4,9 +4,6 @@ with lib; let - kernel = config.boot.kernelPackages.kernel; - activateConfiguration = config.system.activationScripts.script; - bootStage2 = pkgs.substituteAll { src = ./stage-2-init.sh; shellDebug = "${pkgs.bashInteractive}/bin/bash"; @@ -20,6 +17,7 @@ let pkgs.utillinux pkgs.openresolv ]; + fsPackagesPath = lib.makeBinPath config.system.fsPackages; postBootCommands = pkgs.writeText "local-cmds" '' ${config.boot.postBootCommands} diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index 7c01f8ea9b7fd8d14437ce281fd63765adf17dd9..9c8d4a026b4af3b1dca64bdf99271a45ea2d50cf 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -2,9 +2,10 @@ with lib; -let cfg = config.systemd; in - -rec { +let + cfg = config.systemd; + lndir = "${pkgs.xorg.lndir}/bin/lndir"; +in rec { shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s); @@ -72,15 +73,29 @@ rec { optional (attr ? ${name} && !(min <= attr.${name} && max >= attr.${name})) "Systemd ${group} field `${name}' is outside the range [${toString min},${toString max}]"; + assertMinimum = name: min: group: attr: + optional (attr ? ${name} && attr.${name} < min) + "Systemd ${group} field `${name}' must be greater than or equal to ${toString min}"; + assertOnlyFields = fields: group: attr: let badFields = filter (name: ! elem name fields) (attrNames attr); in optional (badFields != [ ]) "Systemd ${group} has extra fields [${concatStringsSep " " badFields}]."; - checkUnitConfig = group: checks: v: - let errors = concatMap (c: c group v) checks; in - if errors == [] then true - else builtins.trace (concatStringsSep "\n" errors) false; + assertInt = name: group: attr: + optional (attr ? ${name} && !isInt attr.${name}) + "Systemd ${group} field `${name}' is not an integer"; + + checkUnitConfig = group: checks: attrs: let + # We're applied at the top-level type (attrsOf unitOption), so the actual + # unit options might contain attributes from mkOverride that we need to + # convert into single values before checking them. + defs = mapAttrs (const (v: + if v._type or "" == "override" then v.content else v + )) attrs; + errors = concatMap (c: c group defs) checks; + in if errors == [] then true + else builtins.trace (concatStringsSep "\n" errors) false; toOption = x: if x == true then "true" @@ -136,7 +151,13 @@ rec { for i in ${toString cfg.packages}; do for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do if ! [[ "$fn" =~ .wants$ ]]; then - ln -s $fn $out/ + if [[ -d "$fn" ]]; then + targetDir="$out/$(basename "$fn")" + mkdir -p "$targetDir" + ${lndir} "$fn" "$targetDir" + else + ln -s $fn $out/ + fi fi done done @@ -151,7 +172,7 @@ rec { if [ "$(readlink -f $i/$fn)" = /dev/null ]; then ln -sfn /dev/null $out/$fn else - mkdir $out/$fn.d + mkdir -p $out/$fn.d ln -s $i/$fn $out/$fn.d/overrides.conf fi else diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix index 8fa9f8b795e5d755bf17d7945858c0b484afc57d..83fef83543600bbe3d544ae2d908b8f79b2bb219 100644 --- a/nixos/modules/system/boot/systemd-nspawn.nix +++ b/nixos/modules/system/boot/systemd-nspawn.nix @@ -6,9 +6,6 @@ with import ./systemd-lib.nix { inherit config lib pkgs; }; let cfg = config.systemd.nspawn; - assertions = [ - # boot = true -> processtwo != true - ]; checkExec = checkUnitConfig "Exec" [ (assertOnlyFields [ @@ -110,7 +107,7 @@ in { config = let - units = mapAttrs' (n: v: nameValuePair "${n}.nspawn" (instanceToUnit n v)) cfg; + units = mapAttrs' (n: v: let nspawnFile = "${n}.nspawn"; in nameValuePair nspawnFile (instanceToUnit nspawnFile v)) cfg; in mkIf (cfg != {}) { environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] []; diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 43a9c28bb69404491c1e3ceb418460a72d06492a..2cff25a8c854f587e5637fc778aba38b92e0016d 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -217,7 +217,7 @@ in rec { environment = mkOption { default = {}; - type = types.attrs; # FIXME + type = with types; attrsOf (nullOr (either str (either path package))); example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; description = "Environment variables passed to the service's processes."; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index b8a2d42e0fbc28c52976827ba578b53e85f6a1e5..12e029ae57f876f0d85cb302efed51b087d90a9a 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -65,13 +65,12 @@ let "systemd-user-sessions.service" "dbus-org.freedesktop.machine1.service" "user@.service" + "user-runtime-dir@.service" # Journal. "systemd-journald.socket" "systemd-journald.service" "systemd-journal-flush.service" - "systemd-journal-gatewayd.socket" - "systemd-journal-gatewayd.service" "systemd-journal-catalog-update.service" "systemd-journald-audit.socket" "systemd-journald-dev-log.socket" @@ -137,7 +136,6 @@ let # Slices / containers. "slices.target" - "system.slice" "user.slice" "machine.slice" "machines.target" @@ -161,8 +159,10 @@ let "systemd-binfmt.service" "systemd-exit.service" "systemd-update-done.service" - ] - ++ cfg.additionalUpstreamSystemUnits; + ] ++ optionals config.services.journald.enableHttpGateway [ + "systemd-journal-gatewayd.socket" + "systemd-journal-gatewayd.service" + ] ++ cfg.additionalUpstreamSystemUnits; upstreamSystemWants = [ "sysinit.target.wants" @@ -189,14 +189,11 @@ let "timers.target" ]; - boolToString = value: if value then "yes" else "no"; - makeJobScript = name: text: - let mkScriptName = s: (replaceChars [ "\\" ] [ "-" ] (shellEscape s) ); - x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${mkScriptName name}"; inherit text; }; - in "${x}/bin/${mkScriptName name}"; + let mkScriptName = s: "unit-script-" + (replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape s) ); + in pkgs.writeTextFile { name = mkScriptName name; executable = true; inherit text; }; - unitConfig = { name, config, ... }: { + unitConfig = { config, ... }: { config = { unitConfig = optionalAttrs (config.requires != []) @@ -278,7 +275,7 @@ let ]; }; - mountConfig = { name, config, ... }: { + mountConfig = { config, ... }: { config = { mountConfig = { What = config.what; @@ -291,7 +288,7 @@ let }; }; - automountConfig = { name, config, ... }: { + automountConfig = { config, ... }: { config = { automountConfig = { Where = config.where; @@ -516,7 +513,7 @@ in }; systemd.globalEnvironment = mkOption { - type = types.attrs; + type = with types; attrsOf (nullOr (either str (either path package))); default = {}; example = { TZ = "CET"; }; description = '' @@ -549,7 +546,7 @@ in }; services.journald.rateLimitInterval = mkOption { - default = "10s"; + default = "30s"; type = types.str; description = '' Configures the rate limiting interval that is applied to all @@ -562,7 +559,7 @@ in }; services.journald.rateLimitBurst = mkOption { - default = 100; + default = 1000; type = types.int; description = '' Configures the rate limiting burst limit (number of messages per @@ -799,13 +796,13 @@ in mkdir -m 0700 -p /var/log/journal ''; - users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network; - users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network; - users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve; - users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve; + users.users.systemd-network.uid = config.ids.uids.systemd-network; + users.groups.systemd-network.gid = config.ids.gids.systemd-network; + users.users.systemd-resolve.uid = config.ids.uids.systemd-resolve; + users.groups.systemd-resolve.gid = config.ids.gids.systemd-resolve; # Target for ‘charon send-keys’ to hook into. - users.extraGroups.keys.gid = config.ids.gids.keys; + users.groups.keys.gid = config.ids.gids.keys; systemd.targets.keys = { description = "Security Keys"; @@ -836,13 +833,14 @@ in system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET" - "SYSFS" "PROC_FS" "FHANDLE" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL" + "SYSFS" "PROC_FS" "FHANDLE" "CRYPTO_USER_API_HASH" "CRYPTO_HMAC" + "CRYPTO_SHA256" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL" "TMPFS_XATTR" "SECCOMP" ]; - users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal; - users.extraUsers.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; - users.extraGroups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; + users.groups.systemd-journal.gid = config.ids.gids.systemd-journal; + users.users.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; + users.groups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; # Generate timer units for all services that have a ‘startAt’ value. systemd.timers = diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index f643723ab1416b61a4b1d686b79cb77b1d59ac28..8d8bfe5900a9824bee9da452537348fb6de2e929 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; @@ -34,11 +34,11 @@ with lib; environment.etc."systemd/timesyncd.conf".text = '' [Time] - NTP=${concatStringsSep " " config.services.ntp.servers} + NTP=${concatStringsSep " " config.services.timesyncd.servers} ''; - users.extraUsers.systemd-timesync.uid = config.ids.uids.systemd-timesync; - users.extraGroups.systemd-timesync.gid = config.ids.gids.systemd-timesync; + users.users.systemd-timesync.uid = config.ids.uids.systemd-timesync; + users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync; }; diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix index 3bfdf89e0cf5f9bc8a54fdf76ef8570b393304d4..8bab91c721fdcc5a97844a2912bf6b1f41555876 100644 --- a/nixos/modules/tasks/bcache.nix +++ b/nixos/modules/tasks/bcache.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index da0c9408d891938f320b6d41e3b6c00bc4b217db..11ed5d7e4d0c73ead154dfbf4d115311bba4e3cd 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -7,7 +7,6 @@ let encDevs = filter (dev: dev.encrypted.enable) fileSystems; keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs; keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs; - isIn = needle: haystack: filter (p: p == needle) haystack != []; anyEncrypted = fold (j: v: v || j.encrypted.enable) false encDevs; diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixos/modules/tasks/filesystems/exfat.nix index 963bc940b4fa110f04eb058518ec04669ef6d9d8..1527f993fdd4ff68cf9af70f0298ed12a77bf07a 100644 --- a/nixos/modules/tasks/filesystems/exfat.nix +++ b/nixos/modules/tasks/filesystems/exfat.nix @@ -5,7 +5,7 @@ with lib; { config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) { - system.fsPackages = [ pkgs.exfat-utils pkgs.fuse_exfat ]; + system.fsPackages = [ pkgs.exfat ]; }; } diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix index 3a8999c242bdcbe58b9f0697cace66d21fef17fb..a14a3ac38549cc36ae6c9438059d8e916beab1fe 100644 --- a/nixos/modules/tasks/filesystems/ext.nix +++ b/nixos/modules/tasks/filesystems/ext.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { config = { diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 30c54ddd0e4e8b88f0856bc766fa18dff35a1248..2b3b09d725c74061a005b716584e914fc9f60af4 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -9,7 +9,6 @@ with lib; let - cfgSpl = config.boot.spl; cfgZfs = config.boot.zfs; cfgSnapshots = config.services.zfs.autoSnapshot; cfgSnapFlags = cfgSnapshots.flags; @@ -24,12 +23,8 @@ let kernel = config.boot.kernelPackages; - packages = if config.boot.zfs.enableLegacyCrypto then { - spl = kernel.splLegacyCrypto; - zfs = kernel.zfsLegacyCrypto; - zfsUser = pkgs.zfsLegacyCrypto; - } else if config.boot.zfs.enableUnstable then { - spl = kernel.splUnstable; + packages = if config.boot.zfs.enableUnstable then { + spl = null; zfs = kernel.zfsUnstable; zfsUser = pkgs.zfsUnstable; } else { @@ -58,6 +53,45 @@ let snapshotNames = [ "frequent" "hourly" "daily" "weekly" "monthly" ]; + # When importing ZFS pools, there's one difficulty: These scripts may run + # before the backing devices (physical HDDs, etc.) of the pool have been + # scanned and initialized. + # + # An attempted import with all devices missing will just fail, and can be + # retried, but an import where e.g. two out of three disks in a three-way + # mirror are missing, will succeed. This is a problem: When the missing disks + # are later discovered, they won't be automatically set online, rendering the + # pool redundancy-less (and far slower) until such time as the system reboots. + # + # The solution is the below. poolReady checks the status of an un-imported + # pool, to see if *every* device is available -- in which case the pool will be + # in state ONLINE, as opposed to DEGRADED, FAULTED or MISSING. + # + # The import scripts then loop over this, waiting until the pool is ready or a + # sufficient amount of time has passed that we can assume it won't be. In the + # latter case it makes one last attempt at importing, allowing the system to + # (eventually) boot even with a degraded pool. + importLib = {zpoolCmd, awkCmd, cfgZfs}: '' + poolReady() { + pool="$1" + state="$("${zpoolCmd}" import | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")" + if [[ "$state" = "ONLINE" ]]; then + return 0 + else + echo "Pool $pool in state $state, waiting" + return 1 + fi + } + poolImported() { + pool="$1" + "${zpoolCmd}" list "$pool" >/dev/null 2>/dev/null + } + poolImport() { + pool="$1" + "${zpoolCmd}" import -d "${cfgZfs.devNodes}" -N $ZFS_FORCE "$pool" + } + ''; + in { @@ -79,27 +113,6 @@ in ''; }; - enableLegacyCrypto = mkOption { - type = types.bool; - default = false; - description = '' - Enabling this option will allow you to continue to use the old format for - encrypted datasets. With the inclusion of stability patches the format of - encrypted datasets has changed. They can still be accessed and mounted but - in read-only mode mounted. It is highly recommended to convert them to - the new format. - - This option is only for convenience to people that cannot convert their - datasets to the new format yet and it will be removed in due time. - - For migration strategies from old format to this new one, check the Wiki: - https://nixos.wiki/wiki/NixOS_on_ZFS#Encrypted_Dataset_Format_Change - - See https://github.com/zfsonlinux/zfs/pull/6864 for more details about - the stability patches. - ''; - }; - extraPools = mkOption { type = types.listOf types.str; default = []; @@ -171,8 +184,12 @@ in default = config.boot.zfs.enableUnstable; description = '' Request encryption keys or passwords for all encrypted datasets on import. - Dataset encryption is only supported in zfsUnstable at the moment. + For root pools the encryption key can be supplied via both an + interactive prompt (keylocation=prompt) and from a file + (keylocation=file://). Note that for data pools the encryption key can + be only loaded from a file and not via interactive prompt since the + import is processed in a background systemd service. ''; }; @@ -305,13 +322,15 @@ in } ]; + virtualisation.lxd.zfsSupport = true; + boot = { - kernelModules = [ "spl" "zfs" ] ; - extraModulePackages = with packages; [ spl zfs ]; + kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; + extraModulePackages = with packages; [ zfs ] ++ optional (!cfgZfs.enableUnstable) spl; }; boot.initrd = mkIf inInitrd { - kernelModules = [ "spl" "zfs" ]; + kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; extraUtilsCommands = '' copy_bin_and_libs ${packages.zfsUser}/sbin/zfs @@ -333,19 +352,26 @@ in ;; esac done - ''] ++ (map (pool: '' + ''] ++ [(importLib { + # See comments at importLib definition. + zpoolCmd = "zpool"; + awkCmd = "awk"; + inherit cfgZfs; + })] ++ (map (pool: '' echo -n "importing root ZFS pool \"${pool}\"..." - trial=0 - until msg="$(zpool import -d ${cfgZfs.devNodes} -N $ZFS_FORCE '${pool}' 2>&1)"; do - sleep 0.25 - echo -n . - trial=$(($trial + 1)) - if [[ $trial -eq 60 ]]; then - break + # Loop across the import until it succeeds, because the devices needed may not be discovered yet. + if ! poolImported "${pool}"; then + for trial in `seq 1 60`; do + poolReady "${pool}" > /dev/null && msg="$(poolImport "${pool}" 2>&1)" && break + sleep 1 + echo -n . + done + echo + if [[ -n "$msg" ]]; then + echo "$msg"; fi - done - echo - if [[ -n "$msg" ]]; then echo "$msg"; fi + poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. + fi ${lib.optionalString cfgZfs.requestEncryptionCredentials '' zfs load-key -a ''} @@ -389,9 +415,26 @@ in Type = "oneshot"; RemainAfterExit = true; }; - script = '' - zpool_cmd="${packages.zfsUser}/sbin/zpool" - ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}" + script = (importLib { + # See comments at importLib definition. + zpoolCmd="${packages.zfsUser}/sbin/zpool"; + awkCmd="${pkgs.gawk}/bin/awk"; + inherit cfgZfs; + }) + '' + poolImported "${pool}" && exit + echo -n "importing ZFS pool \"${pool}\"..." + # Loop across the import until it succeeds, because the devices needed may not be discovered yet. + for trial in `seq 1 60`; do + poolReady "${pool}" && poolImport "${pool}" && break + sleep 1 + done + poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. + if poolImported "${pool}"; then + ${optionalString cfgZfs.requestEncryptionCredentials "\"${packages.zfsUser}/sbin/zfs\" load-key -r \"${pool}\""} + echo "Successfully imported ${pool}" + else + exit 1 + fi ''; }; @@ -401,6 +444,9 @@ in nameValuePair "zfs-sync-${pool}" { description = "Sync ZFS pool \"${pool}\""; wantedBy = [ "shutdown.target" ]; + unitConfig = { + DefaultDependencies = false; + }; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -409,12 +455,15 @@ in ${packages.zfsUser}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}" ''; }; + createZfsService = serv: + nameValuePair serv { + after = [ "systemd-modules-load.service" ]; + wantedBy = [ "zfs.target" ]; + }; - in listToAttrs (map createImportService dataPools ++ map createSyncService allPools) // { - "zfs-mount" = { after = [ "systemd-modules-load.service" ]; }; - "zfs-share" = { after = [ "systemd-modules-load.service" ]; }; - "zfs-zed" = { after = [ "systemd-modules-load.service" ]; }; - }; + in listToAttrs (map createImportService dataPools ++ + map createSyncService allPools ++ + map createZfsService [ "zfs-mount" "zfs-share" "zfs-zed" ]); systemd.targets."zfs-import" = let @@ -423,6 +472,7 @@ in { requires = services; after = services; + wantedBy = [ "zfs.target" ]; }; systemd.targets."zfs".wantedBy = [ "multi-user.target" ]; @@ -452,7 +502,7 @@ in }) snapshotNames); systemd.timers = let - timer = name: if name == "frequent" then "*:15,30,45" else name; + timer = name: if name == "frequent" then "*:0,15,30,45" else name; in builtins.listToAttrs (map (snapName: { name = "zfs-snapshot-${snapName}"; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index c7d56790fa0c139423a9eeff60112e27fe3abd1c..f3f6a19318a2f1b39812903551dd2f350983dd13 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -7,7 +7,6 @@ let cfg = config.networking; interfaces = attrValues cfg.interfaces; - hasVirtuals = any (i: i.virtual) interfaces; slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds) ++ concatMap (i: i.interfaces) (attrValues cfg.bridges) @@ -191,7 +190,7 @@ let if out=$(ip addr add "${cidr}" dev "${i.name}" 2>&1); then echo "done" elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then - echo "failed" + echo "'ip addr add "${cidr}" dev "${i.name}"' failed: $out" exit 1 fi '' @@ -209,10 +208,10 @@ let '' echo "${cidr}" >> $state echo -n "adding route ${cidr}... " - if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" 2>&1); then + if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" proto static 2>&1); then echo "done" elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then - echo "failed" + echo "'ip route add "${cidr}" ${options} ${via} dev "${i.name}"' failed: $out" exit 1 fi '' diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index c640e886fca855bc5727cb1a2fed8201cb5c260c..2318bdd1d58263ea52c8abc594eb03980f9544bb 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, utils, ... }: +{ config, lib, utils, ... }: with utils; with lib; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 14f9b95675151fd1bccbeffcf0ec2367f01f1bb5..20a740ce1f0caabf18ba92089e2bde4c35d78c71 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, utils, stdenv, ... }: +{ config, options, lib, pkgs, utils, ... }: with lib; with utils; @@ -46,22 +46,6 @@ let ''; }); - # Collect all interfaces that are defined for a device - # as device:interface key:value pairs. - wlanDeviceInterfaces = - let - allDevices = unique (mapAttrsToList (_: v: v.device) cfg.wlanInterfaces); - interfacesOfDevice = d: filterAttrs (_: v: v.device == d) cfg.wlanInterfaces; - in - genAttrs allDevices (d: interfacesOfDevice d); - - # Convert device:interface key:value pairs into a list, and if it exists, - # place the interface which is named after the device at the beginning. - wlanListDeviceFirst = device: interfaces: - if hasAttr device interfaces - then mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n==device) interfaces) ++ mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n!=device) interfaces) - else mapAttrsToList (n: v: v // {_iName = n;}) interfaces; - # We must escape interfaces due to the systemd interpretation subsystemDevice = interface: "sys-subsystem-net-devices-${escapeSystemdPath interface}.device"; @@ -1069,7 +1053,7 @@ in }; } // (listToAttrs (flip map interfaces (i: let - deviceDependency = if config.boot.isContainer + deviceDependency = if (config.boot.isContainer || i.name == "lo") then [] else [ (subsystemDevice i.name) ]; in diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix index 484c0a0186d7ffb14c3bd26dccb6d3a6b24c78d1..a9d987780ee1c34c60c75c65fc82aa5a970a1eed 100644 --- a/nixos/modules/tasks/scsi-link-power-management.nix +++ b/nixos/modules/tasks/scsi-link-power-management.nix @@ -1,8 +1,21 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; -let cfg = config.powerManagement.scsiLinkPolicy; in +let + + cfg = config.powerManagement.scsiLinkPolicy; + + kernel = config.boot.kernelPackages.kernel; + + allowedValues = [ + "min_power" + "max_performance" + "medium_power" + "med_power_with_dipm" + ]; + +in { ###### interface @@ -11,10 +24,13 @@ let cfg = config.powerManagement.scsiLinkPolicy; in powerManagement.scsiLinkPolicy = mkOption { default = null; - type = types.nullOr (types.enum [ "min_power" "max_performance" "medium_power" ]); + type = types.nullOr (types.enum allowedValues); description = '' SCSI link power management policy. The kernel default is "max_performance". + + "med_power_with_dipm" is supported by kernel versions + 4.15 and newer. ''; }; @@ -24,6 +40,12 @@ let cfg = config.powerManagement.scsiLinkPolicy; in ###### implementation config = mkIf (cfg != null) { + + assertions = singleton { + assertion = (cfg == "med_power_with_dipm") -> versionAtLeast kernel.version "4.15"; + message = "med_power_with_dipm is not supported for kernels older than 4.15"; + }; + services.udev.extraRules = '' SUBSYSTEM=="scsi_host", ACTION=="add", KERNEL=="host*", ATTR{link_power_management_policy}="${cfg}" ''; diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix index d6cb1c96ef46a7830d517d671e834b952f7ae4c2..93e03c44c868bf4f64a46f54dd926c27bbda34a4 100644 --- a/nixos/modules/tasks/swraid.nix +++ b/nixos/modules/tasks/swraid.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { @@ -6,7 +6,7 @@ services.udev.packages = [ pkgs.mdadm ]; - boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid456" ]; + boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid10" "raid456" ]; boot.initrd.extraUdevRulesCommands = '' cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/ diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 1f8f2891e98cc11e32f90c3a998e96ea40fe5bbe..b154cf9f5f08582bca400d4c09449478f02e1f98 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; @@ -55,6 +55,15 @@ with lib; ''; }; + device = mkOption { + default = "TPPS/2 IBM TrackPoint"; + type = types.str; + description = '' + The device name of the trackpoint. You can check with xinput. + Some newer devices (example x1c6) use "TPPS/2 Elan TrackPoint". + ''; + }; + }; }; @@ -68,12 +77,12 @@ with lib; (mkIf cfg.enable { services.udev.extraRules = '' - ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString cfg.speed}", ATTR{device/sensitivity}="${toString cfg.sensitivity}" + ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="${cfg.device}", ATTR{device/speed}="${toString cfg.speed}", ATTR{device/sensitivity}="${toString cfg.sensitivity}" ''; system.activationScripts.trackpoint = '' - ${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint" + ${config.systemd.package}/bin/udevadm trigger --attr-match=name="${cfg.device}" ''; }) @@ -81,7 +90,7 @@ with lib; services.xserver.inputClassSections = ['' Identifier "Trackpoint Wheel Emulation" - MatchProduct "${if cfg.fakeButtons then "PS/2 Generic Mouse" else "ETPS/2 Elantech TrackPoint|Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint"}" + MatchProduct "${if cfg.fakeButtons then "PS/2 Generic Mouse" else "ETPS/2 Elantech TrackPoint|Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint|${cfg.device}"}" MatchDevicePath "/dev/input/event*" Option "EmulateWheel" "true" Option "EmulateWheelButton" "2" diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix index dfe8b430e04588f1ede9e177f117c8d6ee85da5f..25490d671152aab00738b129d8845b8319c21c62 100644 --- a/nixos/modules/testing/service-runner.nix +++ b/nixos/modules/testing/service-runner.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: with lib; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 41dec2af9ed431e94052b13e41e558b31c875119..ed4cfa7805e2d5d07143ebdc05b7333ce8fcded3 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -6,10 +6,6 @@ with lib; with import ../../lib/qemu-flags.nix { inherit pkgs; }; -let - kernel = config.boot.kernelPackages.kernel; -in - { # This option is a dummy that if used in conjunction with @@ -58,6 +54,9 @@ in systemd.services."serial-getty@${qemuSerialDevice}".enable = false; systemd.services."serial-getty@hvc0".enable = false; + # Only use a serial console, no TTY. + virtualisation.qemu.consoles = [ qemuSerialDevice ]; + boot.initrd.preDeviceCommands = '' echo 600 > /proc/sys/kernel/hung_task_timeout_secs @@ -103,8 +102,12 @@ in MaxLevelConsole=debug ''; - # Don't clobber the console with duplicate systemd messages. - systemd.extraConfig = "ShowStatus=no"; + systemd.extraConfig = '' + # Don't clobber the console with duplicate systemd messages. + ShowStatus=no + # Allow very slow start + DefaultTimeoutStartSec=300 + ''; boot.consoleLogLevel = 7; @@ -123,9 +126,12 @@ in networking.usePredictableInterfaceNames = false; # Make it easy to log in as root when running the test interactively. - users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; + users.users.root.initialHashedPassword = mkOverride 150 ""; services.xserver.displayManager.job.logToJournal = true; + + # set default stateVersion to avoid warnings during eval + system.stateVersion = mkDefault "18.03"; }; } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index f74c42a777f53a069405191754a24579a026a78c..e9e935e90202e09113d2f5cbd817ed50ea798e48 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -48,13 +48,6 @@ let cfg = config.ec2; in boot.loader.grub.extraPerEntryConfig = mkIf (!cfg.hvm) "root (hd0)"; boot.loader.timeout = 0; - boot.initrd.postDeviceCommands = - '' - # Force udev to exit to prevent random "Device or resource busy - # while trying to open /dev/xvda" errors from fsck. - udevadm control --exit || true - ''; - boot.initrd.network.enable = true; # Mount all formatted ephemeral disks and activate all swap devices. diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 349fd3adfc96cec8d3730249d67f58519b794962..15de8638bbab5f52fda808edf1c075402f09688a 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: { options = { ec2 = { diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index 201d5f71ba34d085a9148e5814bd39ee5cab6b53..b7ab54aab7ec8aaac2d6ce7b84d0f24dcc06a732 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -66,6 +66,10 @@ in default = false; description = "Whether to enable verbose logging."; }; + mountResourceDisk = mkOption { + default = true; + description = "Whether the agent should format (ext4) and mount the resource disk to /mnt/resource."; + }; }; ###### implementation @@ -112,7 +116,7 @@ in Provisioning.ExecuteCustomData=n # Format if unformatted. If 'n', resource disk will not be mounted. - ResourceDisk.Format=y + ResourceDisk.Format=${if cfg.mountResourceDisk then "y" else "n"} # File system on the resource disk # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here. @@ -181,7 +185,7 @@ in after = [ "network-online.target" "sshd.service" ]; wants = [ "network-online.target" ]; - path = [ pkgs.e2fsprogs ]; + path = [ pkgs.e2fsprogs pkgs.bash ]; description = "Windows Azure Agent Service"; unitConfig.ConditionPathExists = "/etc/waagent.conf"; serviceConfig = { diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index 5cd2304a29535b58248e7500c4acdca709ce2a19..03239991b95a57e19fe396218928a58c0063e96c 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: with lib; { diff --git a/nixos/modules/virtualisation/azure-config-user.nix b/nixos/modules/virtualisation/azure-config-user.nix index de1b3857923f946ed0612b98208ada41683a5561..267ba50ae025a6e16675ece245f17a7367f12aa6 100644 --- a/nixos/modules/virtualisation/azure-config-user.nix +++ b/nixos/modules/virtualisation/azure-config-user.nix @@ -1,4 +1,4 @@ -{ config, pkgs, modulesPath, ... }: +{ modulesPath, ... }: { # To build the configuration or use nix-env, you need to run diff --git a/nixos/modules/virtualisation/azure-config.nix b/nixos/modules/virtualisation/azure-config.nix index 5c9f18ef52a5e78ee3b9ba4e42f00137962d23b0..780bd1b78dce5b286b88c56e743e12a8042f0d3b 100644 --- a/nixos/modules/virtualisation/azure-config.nix +++ b/nixos/modules/virtualisation/azure-config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, modulesPath, ... }: +{ modulesPath, ... }: { imports = [ "${modulesPath}/virtualisation/azure-image.nix" ]; diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index cb756842f369520bba642b60c0d8056228c6727c..dd2108ccc379fecfa5f0c1601ee7880196b516d2 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -2,13 +2,13 @@ with lib; let - diskSize = 30720; + diskSize = 2048; in { system.build.azureImage = import ../../lib/make-disk-image.nix { name = "azure-image"; postVM = '' - ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd + ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/disk.vhd ''; configFile = ./azure-config-user.nix; format = "raw"; diff --git a/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch b/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch deleted file mode 100644 index 81d29feea3de6ea099dca162f226133f9b4e78e3..0000000000000000000000000000000000000000 --- a/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Makefile b/Makefile -index d6b9dc1..ce7c493 100644 ---- a/Makefile -+++ b/Makefile -@@ -384,8 +384,7 @@ install-confdir: - install-sysconfig: install-datadir install-confdir - $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" - --install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ --install-datadir install-localstatedir -+install: all $(if $(BUILD_DOCS),install-doc) install-datadir - ifneq ($(TOOLS),) - $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) - endif diff --git a/nixos/modules/virtualisation/brightbox-config.nix b/nixos/modules/virtualisation/brightbox-config.nix index 528ffecc0bf2528f301ffc3d3d3dc410fb35435c..0a018e4cd69541cb7fbf07be3bb25978fef4a99b 100644 --- a/nixos/modules/virtualisation/brightbox-config.nix +++ b/nixos/modules/virtualisation/brightbox-config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, modulesPath, ... }: +{ modulesPath, ... }: { imports = [ "${modulesPath}/virtualisation/brightbox-image.nix" ]; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index e54a5fe7d40cd7f1bb4845d005e22a8cfdeadcda..b91165ce3b8272fb3f2beae01d7b062ba9810576 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -112,7 +112,7 @@ let # If the host is 64-bit and the container is 32-bit, add a # --personality flag. - ${optionalString (config.nixpkgs.system == "x86_64-linux") '' + ${optionalString (config.nixpkgs.localSystem.system == "x86_64-linux") '' if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then extraFlags+=" --personality=x86" fi @@ -255,9 +255,9 @@ let }; - system = config.nixpkgs.system; + system = config.nixpkgs.localSystem.system; - bindMountOpts = { name, config, ... }: { + bindMountOpts = { name, ... }: { options = { mountPoint = mkOption { @@ -284,7 +284,7 @@ let }; - allowedDeviceOpts = { name, config, ... }: { + allowedDeviceOpts = { ... }: { options = { node = mkOption { example = "/dev/net/tun"; @@ -575,6 +575,16 @@ in ''; }; + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--drop-capability=CAP_SYS_CHROOT" ]; + description = '' + Extra flags passed to the systemd-nspawn command. + See systemd-nspawn(1) for details. + ''; + }; + } // networkOptions; config = mkMerge @@ -596,7 +606,7 @@ in { config, pkgs, ... }: { services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql96; - + system.stateVersion = "17.03"; }; }; @@ -714,7 +724,9 @@ in ${optionalString cfg.autoStart '' AUTO_START=1 ''} - EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts}" + EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts + + optionalString (cfg.extraFlags != []) + (" " + concatStringsSep " " cfg.extraFlags)}" ''; }) config.containers; diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixos/modules/virtualisation/docker-image.nix index 9535e3e0d6778a51802e1d1c4deae87ab3290083..2f304094d55bb95a542f9e27414b3c5e4fe50717 100644 --- a/nixos/modules/virtualisation/docker-image.nix +++ b/nixos/modules/virtualisation/docker-image.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { imports = [ diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index a9a2095499a731256f48fb578b0d5c3449d80ebd..a1a32c1c59a1f17a14b719ca27b6258607998d98 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -141,7 +141,7 @@ in config = mkIf cfg.enable (mkMerge [{ environment.systemPackages = [ cfg.package ]; - users.extraGroups.docker.gid = config.ids.gids.docker; + users.groups.docker.gid = config.ids.gids.docker; systemd.packages = [ cfg.package ]; systemd.services.docker = { diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index baffad79b0019ffac7853ca77a7fa47a47ca7186..76facac39fc6e8341a7685eee28f6c07a9d26e3e 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -240,22 +240,22 @@ let self = { "17.09".sa-east-1.hvm-ebs = "ami-4762202b"; "17.09".ap-south-1.hvm-ebs = "ami-4e376021"; - # 18.03.131792.becbe4dbe16 - "18.03".eu-west-1.hvm-ebs = "ami-cda4fab4"; - "18.03".eu-west-2.hvm-ebs = "ami-d96786be"; - "18.03".eu-west-3.hvm-ebs = "ami-6b0cba16"; - "18.03".eu-central-1.hvm-ebs = "ami-5e2b75b5"; - "18.03".us-east-1.hvm-ebs = "ami-d464cba9"; - "18.03".us-east-2.hvm-ebs = "ami-fd221298"; - "18.03".us-west-1.hvm-ebs = "ami-ff0d1d9f"; - "18.03".us-west-2.hvm-ebs = "ami-c05c3bb8"; - "18.03".ca-central-1.hvm-ebs = "ami-cc72f4a8"; - "18.03".ap-southeast-1.hvm-ebs = "ami-b61633ca"; - "18.03".ap-southeast-2.hvm-ebs = "ami-530fc131"; - "18.03".ap-northeast-1.hvm-ebs = "ami-90d6c0ec"; - "18.03".ap-northeast-2.hvm-ebs = "ami-a1248bcf"; - "18.03".sa-east-1.hvm-ebs = "ami-b090c6dc"; - "18.03".ap-south-1.hvm-ebs = "ami-32c9ec5d"; + # 18.03.132946.1caae7247b8 + "18.03".eu-west-1.hvm-ebs = "ami-065c46ec"; + "18.03".eu-west-2.hvm-ebs = "ami-64f31903"; + "18.03".eu-west-3.hvm-ebs = "ami-5a8d3d27"; + "18.03".eu-central-1.hvm-ebs = "ami-09faf9e2"; + "18.03".us-east-1.hvm-ebs = "ami-8b3538f4"; + "18.03".us-east-2.hvm-ebs = "ami-150b3170"; + "18.03".us-west-1.hvm-ebs = "ami-ce06ebad"; + "18.03".us-west-2.hvm-ebs = "ami-586c3520"; + "18.03".ca-central-1.hvm-ebs = "ami-aca72ac8"; + "18.03".ap-southeast-1.hvm-ebs = "ami-aa0b4d40"; + "18.03".ap-southeast-2.hvm-ebs = "ami-d0f254b2"; + "18.03".ap-northeast-1.hvm-ebs = "ami-456511a8"; + "18.03".ap-northeast-2.hvm-ebs = "ami-3366d15d"; + "18.03".sa-east-1.hvm-ebs = "ami-163e1f7a"; + "18.03".ap-south-1.hvm-ebs = "ami-6a390b05"; latest = self."18.03"; }; in self diff --git a/nixos/modules/virtualisation/gce-images.nix b/nixos/modules/virtualisation/gce-images.nix index 8a9bda1b60c2c8002a958cf08505336bc47dff52..575bbaadbcdb3825126338b279b13c9d2cb3a2de 100644 --- a/nixos/modules/virtualisation/gce-images.nix +++ b/nixos/modules/virtualisation/gce-images.nix @@ -3,6 +3,7 @@ let self = { "15.09" = "gs://nixos-cloud-images/nixos-15.09.425.7870f20-x86_64-linux.raw.tar.gz"; "16.03" = "gs://nixos-cloud-images/nixos-image-16.03.847.8688c17-x86_64-linux.raw.tar.gz"; "17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz"; + "18.03" = "gs://nixos-cloud-images/nixos-image-18.03.132536.fdb5ba4cdf9-x86_64-linux.raw.tar.gz"; - latest = self."17.03"; + latest = self."18.03"; }; in self diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix index f6bca1aa8579b95304837e7c805280c9884e62d1..8f20100bc1b18a8711d46f1e3689ba241f58ce51 100644 --- a/nixos/modules/virtualisation/google-compute-config.nix +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { imports = [ ]; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index eaf8b14cd8e106a7da24004369bc18256794fb11..de2c43b8a40adbb11b4dfeb48c000025e1422ba2 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -57,6 +57,12 @@ in # Always include cryptsetup so that NixOps can use it. environment.systemPackages = [ pkgs.cryptsetup ]; + # Make sure GCE image does not replace host key that NixOps sets + environment.etc."default/instance_configs.cfg".text = lib.mkDefault '' + [InstanceSetup] + set_host_keys = false + ''; + # Rely on GCP's firewall instead networking.firewall.enable = mkDefault false; @@ -69,6 +75,9 @@ in networking.usePredictableInterfaceNames = false; + # GC has 1460 MTU + networking.interfaces.eth0.mtu = 1460; + # allow the google-accounts-daemon to manage users users.mutableUsers = true; # and allow users to sudo without password @@ -212,7 +221,7 @@ in echo "Obtaining SSH keys..." mkdir -m 0700 -p /root/.ssh AUTH_KEYS=$(${mktemp}) - ${wget} -O $AUTH_KEYS --header="Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys + ${wget} -O $AUTH_KEYS http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys if [ -s $AUTH_KEYS ]; then # Read in key one by one, split in case Google decided @@ -237,6 +246,18 @@ in false fi rm -f $AUTH_KEYS + SSH_HOST_KEYS_DIR=$(${mktemp} -d) + ${wget} -O $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh_host_ed25519_key + ${wget} -O $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key.pub http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh_host_ed25519_key_pub + if [ -s $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key -a -s $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key.pub ]; then + mv -f $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key* /etc/ssh/ + chmod 600 /etc/ssh/ssh_host_ed25519_key + chmod 644 /etc/ssh/ssh_host_ed25519_key.pub + else + echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed." + false + fi + rm -rf $SSH_HOST_KEYS_DIR ''; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix new file mode 100644 index 0000000000000000000000000000000000000000..fc0bedb68bd08cb34f18233eebe025a569bfa7f0 --- /dev/null +++ b/nixos/modules/virtualisation/kvmgt.nix @@ -0,0 +1,64 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.virtualisation.kvmgt; + kernelPackages = config.boot.kernelPackages; + vgpuOptions = { + uuid = mkOption { + type = types.string; + description = "UUID of VGPU device. You can generate one with libossp_uuid."; + }; + }; +in { + options = { + virtualisation.kvmgt = { + enable = mkEnableOption '' + KVMGT (iGVT-g) VGPU support. Allows Qemu/KVM guests to share host's Intel integrated graphics card. + Currently only one graphical device can be shared + ''; + # multi GPU support is under the question + device = mkOption { + type = types.string; + default = "0000:00:02.0"; + description = "PCI ID of graphics card. You can figure it with ls /sys/class/mdev_bus."; + }; + vgpus = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = vgpuOptions; } ]); + description = '' + Virtual GPUs to be used in Qemu. You can find devices via ls /sys/bus/pci/devices/*/mdev_supported_types + and find info about device via cat /sys/bus/pci/devices/*/mdev_supported_types/i915-GVTg_V5_4/description + ''; + example = { + "i915-GVTg_V5_8" = { + uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525"; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = singleton { + assertion = versionAtLeast kernelPackages.kernel.version "4.16"; + message = "KVMGT is not properly supported for kernels older than 4.16"; + }; + boot.kernelParams = [ "i915.enable_gvt=1" ]; + systemd.services = mapAttrs' (name: value: + nameValuePair "kvmgt-${name}" { + description = "KVMGT VGPU ${name}"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.runtimeShell} -c 'echo ${value.uuid} > /sys/bus/pci/devices/${cfg.device}/mdev_supported_types/${name}/create'"; + ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/bus/pci/devices/${cfg.device}/${value.uuid}/remove'"; + }; + wantedBy = [ "multi-user.target" ]; + } + ) cfg.vgpus; + }; + + meta.maintainers = with maintainers; [ gnidorah ]; +} diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 024db7f87c2e8ea2fab803477de8186a88ea31b5..3e38662f5b0fd2e447dcc14443e08c86e0e2780c 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -17,6 +17,10 @@ let ${optionalString cfg.qemuOvmf '' nvram = ["/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd"] ''} + ${optionalString (!cfg.qemuRunAsRoot) '' + user = "qemu-libvirtd" + group = "qemu-libvirtd" + ''} ${cfg.qemuVerbatimConfig} ''; @@ -56,6 +60,18 @@ in { ''; }; + virtualisation.libvirtd.qemuRunAsRoot = mkOption { + type = types.bool; + default = true; + description = '' + If true, libvirtd runs qemu as root. + If false, libvirtd runs qemu as unprivileged user qemu-libvirtd. + Changing this option to false may cause file permission issues + for existing guests. To fix these, manually change ownership + of affected files in /var/lib/libvirt/qemu to qemu-libvirtd. + ''; + }; + virtualisation.libvirtd.qemuVerbatimConfig = mkOption { type = types.lines; default = '' @@ -104,11 +120,19 @@ in { config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ libvirt netcat-openbsd cfg.qemuPackage ]; + environment.systemPackages = with pkgs; [ libvirt libressl.nc cfg.qemuPackage ]; boot.kernelModules = [ "tun" ]; - users.extraGroups.libvirtd.gid = config.ids.gids.libvirtd; + users.groups.libvirtd.gid = config.ids.gids.libvirtd; + + # libvirtd runs qemu as this user and group by default + users.extraGroups.qemu-libvirtd.gid = config.ids.gids.qemu-libvirtd; + users.extraUsers.qemu-libvirtd = { + uid = config.ids.uids.qemu-libvirtd; + isNormalUser = false; + group = "qemu-libvirtd"; + }; systemd.packages = [ pkgs.libvirt ]; diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index 0208787e7795c700f1b99eed83f1819749482061..d4936484018722f588d9089d45335e5ec6c14d77 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ lib, ... }: with lib; @@ -8,7 +8,7 @@ with lib; ]; # Allow the user to login as root without password. - users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; + users.users.root.initialHashedPassword = mkOverride 150 ""; # Some more help text. services.mingetty.helpLine = diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index 2310fe984325b06246d5c45696d87f9fe4f6363a..9b5adaf08249e4020a197bfbe90f8210d37f6d56 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -74,6 +74,9 @@ in systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; security.apparmor.packages = [ pkgs.lxc ]; - security.apparmor.profiles = [ "${pkgs.lxc}/etc/apparmor.d/lxc-containers" ]; + security.apparmor.profiles = [ + "${pkgs.lxc}/etc/apparmor.d/lxc-containers" + "${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start" + ]; }; } diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 4988886baf60d6535ca0ecf081ba0ac6eac063c8..505c11abd2087eee470c14dc5bcd734c9dc9d067 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -15,28 +15,34 @@ in options = { - virtualisation.lxd.enable = - mkOption { + virtualisation.lxd = { + enable = mkOption { type = types.bool; default = false; - description = - '' - This option enables lxd, a daemon that manages - containers. Users in the "lxd" group can interact with - the daemon (e.g. to start or stop containers) using the - lxc command line tool, among others. - ''; + description = '' + This option enables lxd, a daemon that manages + containers. Users in the "lxd" group can interact with + the daemon (e.g. to start or stop containers) using the + lxc command line tool, among others. + ''; }; - + zfsSupport = mkOption { + type = types.bool; + default = false; + description = '' + enables lxd to use zfs as a storage for containers. + This option is enabled by default if a zfs pool is configured + with nixos. + ''; + }; + }; }; - ###### implementation config = mkIf cfg.enable { - environment.systemPackages = - [ pkgs.lxd ]; + environment.systemPackages = [ pkgs.lxd ]; security.apparmor = { enable = true; @@ -47,31 +53,31 @@ in packages = [ pkgs.lxc ]; }; - systemd.services.lxd = - { description = "LXD Container Management Daemon"; + systemd.services.lxd = { + description = "LXD Container Management Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-udev-settle.service" ]; - # TODO(wkennington): Add lvm2 and thin-provisioning-tools - path = with pkgs; [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ]; + path = lib.optional cfg.zfsSupport pkgs.zfs; - preStart = '' - mkdir -m 0755 -p /var/lib/lxc/rootfs - ''; + preStart = '' + mkdir -m 0755 -p /var/lib/lxc/rootfs + ''; - serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd"; - serviceConfig.Type = "simple"; - serviceConfig.KillMode = "process"; # when stopping, leave the containers alone + serviceConfig = { + ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --group lxd"; + Type = "simple"; + KillMode = "process"; # when stopping, leave the containers alone }; - users.extraGroups.lxd.gid = config.ids.gids.lxd; + }; + + users.groups.lxd.gid = config.ids.gids.lxd; - users.extraUsers.root = { + users.users.root = { subUidRanges = [ { startUid = 1000000; count = 65536; } ]; subGidRanges = [ { startGid = 1000000; count = 65536; } ]; }; - }; - } diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix index c1d2a314daf2d25d2772fe3d2a650b656c8719fa..cecf2a3f144c1ae5ad2dca91479ed8f06c6e1f46 100644 --- a/nixos/modules/virtualisation/nova-config.nix +++ b/nixos/modules/virtualisation/nova-config.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 38b138e0632636ca47aa68e244599bb1d1c36ea1..bb8b9172f23f006d196274581578aeb5cc8982b9 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -51,9 +51,6 @@ in { # Where the communication sockets live runDir = "/var/run/openvswitch"; - # Where the config database live (can't be in nix-store) - stateDir = "/var/db/openvswitch"; - # The path to the an initialized version of the database db = pkgs.stdenv.mkDerivation { name = "vswitch.db"; diff --git a/nixos/modules/virtualisation/qemu-guest-agent.nix b/nixos/modules/virtualisation/qemu-guest-agent.nix new file mode 100644 index 0000000000000000000000000000000000000000..e0d2b3dc509de3e765bbd30089bacfef970946db --- /dev/null +++ b/nixos/modules/virtualisation/qemu-guest-agent.nix @@ -0,0 +1,36 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.qemuGuest; +in { + + options.services.qemuGuest = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the qemu guest agent."; + }; + }; + + config = mkIf cfg.enable ( + mkMerge [ + { + + services.udev.extraRules = '' + SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", TAG+="systemd" ENV{SYSTEMD_WANTS}="qemu-guest-agent.service" + ''; + + systemd.services.qemu-guest-agent = { + description = "Run the QEMU Guest Agent"; + serviceConfig = { + ExecStart = "${pkgs.kvm.ga}/bin/qemu-ga"; + Restart = "always"; + RestartSec = 0; + }; + }; + } + ] + ); +} diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index ee327ed805b275456f4e63386114dec867d32b99..4e9c87222d0a853fa2491b98e0a040993a265f0e 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -23,9 +23,24 @@ let cfg = config.virtualisation; - qemuGraphics = if cfg.graphics then "" else "-nographic"; - kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}"; - ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ]; + qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic"; + + consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles; + + # XXX: This is very ugly and in the future we really should use attribute + # sets to build ALL of the QEMU flags instead of this mixed mess of Nix + # expressions and shell script stuff. + mkDiskIfaceDriveFlag = idx: driveArgs: let + inherit (cfg.qemu) diskInterface; + # The drive identifier created by incrementing the index by one using the + # shell. + drvId = "drive$((${idx} + 1))"; + # NOTE: DO NOT shell escape, because this may contain shell variables. + commonArgs = "index=${idx},id=${drvId},${driveArgs}"; + isSCSI = diskInterface == "scsi"; + devArgs = "${diskInterface}-hd,drive=${drvId}"; + args = "-drive ${commonArgs},if=none -device lsi53c895a -device ${devArgs}"; + in if isSCSI then args else "-drive ${commonArgs},if=${diskInterface}"; # Shell script to start the VM. startVM = @@ -68,7 +83,7 @@ let if ! test -e "empty$idx.qcow2"; then ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M" fi - extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx.qcow2,if=${cfg.qemu.diskInterface},werror=report" + extraDisks="$extraDisks ${mkDiskIfaceDriveFlag "$idx" "file=$(pwd)/empty$idx.qcow2,werror=report"}" idx=$((idx + 1)) '')} @@ -77,28 +92,29 @@ let -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ -smp ${toString config.virtualisation.cores} \ + -device virtio-rng-pci \ ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \ ${if cfg.useBootLoader then '' - -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ - -drive index=1,id=drive2,file=$TMPDIR/disk.img,media=disk \ + ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \ + ${mkDiskIfaceDriveFlag "1" "file=$TMPDIR/disk.img,media=disk"} \ ${if cfg.useEFIBoot then '' -pflash $TMPDIR/bios.bin \ '' else '' ''} '' else '' - -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ + ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ - -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \ + -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS" \ ''} \ $extraDisks \ ${qemuGraphics} \ ${toString config.virtualisation.qemu.options} \ $QEMU_OPTS \ - $@ + "$@" ''; @@ -140,9 +156,6 @@ let --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \ --hybrid 2 \ --recompute-chs /dev/vda - . /sys/class/block/vda2/uevent - mknod /dev/vda2 b $MAJOR $MINOR - . /sys/class/block/vda/uevent ${pkgs.dosfstools}/bin/mkfs.fat -F16 /dev/vda2 export MTOOLS_SKIP_CHECK=1 ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot @@ -232,9 +245,10 @@ in default = true; description = '' - Whether to run QEMU with a graphics window, or access - the guest computer serial port through the host tty. - ''; + Whether to run QEMU with a graphics window, or in nographic mode. + Serial console will be enabled on both settings, but this will + change the preferred console. + ''; }; virtualisation.cores = @@ -316,6 +330,23 @@ in description = "Options passed to QEMU."; }; + consoles = mkOption { + type = types.listOf types.str; + default = let + consoles = [ "${qemuSerialDevice},115200n8" "tty0" ]; + in if cfg.graphics then consoles else reverseList consoles; + example = [ "console=tty1" ]; + description = '' + The output console devices to pass to the kernel command line via the + console parameter, the primary console is the last + item of this list. + + By default it enables both serial console and + tty0. The preferred console (last one) is based on + the value of . + ''; + }; + networkingOptions = mkOption { default = [ @@ -337,10 +368,16 @@ in mkOption { default = "virtio"; example = "scsi"; - type = types.str; + type = types.enum [ "virtio" "scsi" "ide" ]; + description = "The interface used for the virtual hard disks."; + }; + + guestAgent.enable = + mkOption { + default = true; + type = types.bool; description = '' - The interface used for the virtual hard disks - (virtio or scsi). + Enable the Qemu guest agent. ''; }; }; @@ -437,7 +474,7 @@ in # FIXME: Consolidate this one day. virtualisation.qemu.options = mkMerge [ (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ]) - (mkIf (pkgs.stdenv.isArm || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ]) + (mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ]) ]; # Mount the host filesystem via 9P, and bind-mount the Nix store @@ -494,6 +531,8 @@ in # Don't run ntpd in the guest. It should get the correct time from KVM. services.timesyncd.enable = false; + services.qemuGuest.enable = cfg.qemu.guestAgent.enable; + system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; } '' mkdir -p $out/bin diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix index 98be4f680c3a73b91994a063f6ec98caa816845a..fd662b52df5245a367ee0918f6cdc4be69b2ff7a 100644 --- a/nixos/modules/virtualisation/rkt.nix +++ b/nixos/modules/virtualisation/rkt.nix @@ -59,6 +59,6 @@ in }; }; - users.extraGroups.rkt = {}; + users.groups.rkt = {}; }; } diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 5da4b7e3bafd540c0050256259399e4c40f4386c..78c6f740788e41355868f9693231a9b60aee50a0 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -44,7 +44,7 @@ in boot.supportedFilesystems = [ "vboxsf" ]; boot.initrd.supportedFilesystems = [ "vboxsf" ]; - users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf; + users.groups.vboxsf.gid = config.ids.gids.vboxsf; systemd.services.virtualbox = { description = "VirtualBox Guest Services"; diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 7413e12c8f3d012d4c4dfd92cc836726c2e49ffe..60779579402c38cac4d75c38338579033523261a 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -5,8 +5,9 @@ with lib; let cfg = config.virtualisation.virtualbox.host; - virtualbox = pkgs.virtualbox.override { + virtualbox = cfg.package.override { inherit (cfg) enableHardening headless; + extensionPack = if cfg.enableExtensionPack then pkgs.virtualboxExtpack else null; }; kernelModules = config.boot.kernelPackages.virtualbox.override { @@ -17,9 +18,7 @@ in { options.virtualisation.virtualbox.host = { - enable = mkOption { - type = types.bool; - default = false; + enable = mkEnableOption "VirtualBox" // { description = '' Whether to enable VirtualBox. @@ -30,6 +29,26 @@ in ''; }; + enableExtensionPack = mkEnableOption "VirtualBox extension pack" // { + description = '' + Whether to install the Oracle Extension Pack for VirtualBox. + + + You must set nixpkgs.config.allowUnfree = true in + order to use this. This requires you accept the VirtualBox PUEL. + + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.virtualbox; + defaultText = "pkgs.virtualbox"; + description = '' + Which VirtualBox package to use. + ''; + }; + addNetworkInterface = mkOption { type = types.bool; default = true; @@ -86,7 +105,7 @@ in "VirtualBox" ])); - users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers; + users.groups.vboxusers.gid = config.ids.gids.vboxusers; services.udev.extraRules = '' diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 64f145f77ca39917cfdd589e1b898badba248853..475852d1546c7d8216a39ac3745298fe8bc1a17b 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -17,12 +17,40 @@ in { The size of the VirtualBox base image in MiB. ''; }; + memorySize = mkOption { + type = types.int; + default = 1536; + description = '' + The amount of RAM the VirtualBox appliance can use in MiB. + ''; + }; + vmDerivationName = mkOption { + type = types.str; + default = "nixos-ova-${config.system.nixos.label}-${pkgs.stdenv.system}"; + description = '' + The name of the derivation for the VirtualBox appliance. + ''; + }; + vmName = mkOption { + type = types.str; + default = "NixOS ${config.system.nixos.label} (${pkgs.stdenv.system})"; + description = '' + The name of the VirtualBox appliance. + ''; + }; + vmFileName = mkOption { + type = types.str; + default = "nixos-${config.system.nixos.label}-${pkgs.stdenv.system}.ova"; + description = '' + The file name of the VirtualBox appliance. + ''; + }; }; }; config = { system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix { - name = "nixos-ova-${config.system.nixos.label}-${pkgs.stdenv.system}"; + name = cfg.vmDerivationName; inherit pkgs lib config; partitionTableType = "legacy"; @@ -37,11 +65,11 @@ in { VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage echo "creating VirtualBox VM..." - vmName="NixOS ${config.system.nixos.label} (${pkgs.stdenv.system})" + vmName="${cfg.vmName}"; VBoxManage createvm --name "$vmName" --register \ --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"} VBoxManage modifyvm "$vmName" \ - --memory 1536 --acpi on --vram 32 \ + --memory ${toString cfg.memorySize} --acpi on --vram 32 \ ${optionalString (pkgs.stdenv.system == "i686-linux") "--pae on"} \ --nictype1 virtio --nic1 nat \ --audiocontroller ac97 --audio alsa \ @@ -53,7 +81,7 @@ in { echo "exporting VirtualBox VM..." mkdir -p $out - fn="$out/nixos-${config.system.nixos.label}-${pkgs.stdenv.system}.ova" + fn="$out/${cfg.vmFileName}" VBoxManage export "$vmName" --output "$fn" rm -v $diskImage diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix index b46002c10b541a96625d70ce3232faf476d6633a..c00b984c2ce046caf2c50e1cdc65d224ca4257db 100644 --- a/nixos/modules/virtualisation/xen-domU.nix +++ b/nixos/modules/virtualisation/xen-domU.nix @@ -1,6 +1,6 @@ # Common configuration for Xen DomU NixOS virtual machines. -{ config, pkgs, ... }: +{ ... }: { boot.loader.grub.version = 2; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index e010b532a688b1f6a40d436acbdc8fccde02638c..66b253c230f1d9f2da03e76bf7fa982df6659afc 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -58,6 +58,8 @@ in rec { nixos.ova.x86_64-linux or [] #(all nixos.tests.containers) + (all nixos.tests.containers-imperative) + (all nixos.tests.containers-ipv4) nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) @@ -86,18 +88,21 @@ in rec { (all nixos.tests.env) (all nixos.tests.ipv6) (all nixos.tests.i3wm) - (all nixos.tests.keymap.azerty) - (all nixos.tests.keymap.colemak) - (all nixos.tests.keymap.dvorak) - (all nixos.tests.keymap.dvp) - (all nixos.tests.keymap.neo) - (all nixos.tests.keymap.qwertz) + # 2018-06-06: keymap tests temporarily removed from tested job + # since non-deterministic failure are blocking the channel (#41538) + #(all nixos.tests.keymap.azerty) + #(all nixos.tests.keymap.colemak) + #(all nixos.tests.keymap.dvorak) + #(all nixos.tests.keymap.dvp) + #(all nixos.tests.keymap.neo) + #(all nixos.tests.keymap.qwertz) (all nixos.tests.plasma5) #(all nixos.tests.lightdm) (all nixos.tests.login) (all nixos.tests.misc) (all nixos.tests.mutableUsers) (all nixos.tests.nat.firewall) + (all nixos.tests.nat.firewall-conntrack) (all nixos.tests.nat.standalone) (all nixos.tests.networking.scripted.loopback) (all nixos.tests.networking.scripted.static) @@ -112,6 +117,10 @@ in rec { (all nixos.tests.nfs4) (all nixos.tests.openssh) (all nixos.tests.php-pcre) + (all nixos.tests.predictable-interface-names.predictable) + (all nixos.tests.predictable-interface-names.unpredictable) + (all nixos.tests.predictable-interface-names.predictableNetworkd) + (all nixos.tests.predictable-interface-names.unpredictableNetworkd) (all nixos.tests.printing) (all nixos.tests.proxy) (all nixos.tests.sddm.default) diff --git a/nixos/release.nix b/nixos/release.nix index 22deea6fee0570a3587fbfd90bd4bbe5d9a1ad7a..b80ab44eced5cf87fd1968ca0a5513497a7570e2 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -45,7 +45,7 @@ let makeIso = - { module, type, maintainers ? ["eelco"], system }: + { module, type, system, ... }: with import nixpkgs { inherit system; }; @@ -56,7 +56,7 @@ let makeSdImage = - { module, maintainers ? ["dezgeg"], system }: + { module, system, ... }: with import nixpkgs { inherit system; }; @@ -83,7 +83,7 @@ let in tarball // { meta = { - description = "NixOS system tarball for ${system} - ${stdenv.platform.name}"; + description = "NixOS system tarball for ${system} - ${stdenv.hostPlatform.platform.name}"; maintainers = map (x: lib.maintainers.${x}) maintainers; }; inherit config; @@ -96,7 +96,7 @@ let buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix { inherit system; modules = [ module versionModule ] ++ singleton - ({ config, lib, ... }: + ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; }); @@ -106,7 +106,7 @@ let let configEvaled = import lib/eval-config.nix config; build = configEvaled.config.system.build; - kernelTarget = configEvaled.pkgs.stdenv.platform.kernelTarget; + kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget; in pkgs.symlinkJoin { name = "netboot"; @@ -117,26 +117,26 @@ let ]; postBuild = '' mkdir -p $out/nix-support - echo "file ${kernelTarget} $out/${kernelTarget}" >> $out/nix-support/hydra-build-products - echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products - echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products + echo "file ${kernelTarget} ${build.kernel}/${kernelTarget}" >> $out/nix-support/hydra-build-products + echo "file initrd ${build.netbootRamdisk}/initrd" >> $out/nix-support/hydra-build-products + echo "file ipxe ${build.netbootIpxeScript}/netboot.ipxe" >> $out/nix-support/hydra-build-products ''; preferLocalBuild = true; }; - in rec { channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; }; - manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual); - manualEpub = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualEpub)); - manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages); - options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux; + manual = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manual); + manualEpub = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualEpub)); + manpages = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manpages); + manualGeneratedSources = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.generatedSources); + options = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux; # Build the initial ramdisk so Hydra can keep track of its size over time. - initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk); + initialRamdisk = buildFromConfig ({ ... }: { }) (config: config.system.build.initialRamdisk); netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot { inherit system; @@ -166,8 +166,12 @@ in rec { inherit system; }); - sd_image = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage { - module = ./modules/installer/cd-dvd/sd-image-aarch64.nix; + sd_image = forMatchingSystems [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ] (system: makeSdImage { + module = { + armv6l-linux = ./modules/installer/cd-dvd/sd-image-raspberrypi.nix; + armv7l-linux = ./modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix; + aarch64-linux = ./modules/installer/cd-dvd/sd-image-aarch64.nix; + }.${system}; inherit system; }); @@ -191,9 +195,10 @@ in rec { dummy = forAllSystems (system: pkgs.runCommand "dummy" { toplevel = (import lib/eval-config.nix { inherit system; - modules = singleton ({ config, pkgs, ... }: + modules = singleton ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; + system.stateVersion = mkDefault "18.03"; }); }).config.system.build.toplevel; preferLocalBuild = true; @@ -243,6 +248,7 @@ in rec { tests.avahi = callTest tests/avahi.nix {}; tests.beegfs = callTest tests/beegfs.nix {}; tests.bittorrent = callTest tests/bittorrent.nix {}; + tests.bind = callTest tests/bind.nix {}; tests.blivet = callTest tests/blivet.nix {}; tests.boot = callSubTests tests/boot.nix {}; tests.boot-stage1 = callTest tests/boot-stage1.nix {}; @@ -250,6 +256,8 @@ in rec { tests.buildbot = callTest tests/buildbot.nix {}; tests.cadvisor = callTestOnMatchingSystems ["x86_64-linux"] tests/cadvisor.nix {}; tests.ceph = callTestOnMatchingSystems ["x86_64-linux"] tests/ceph.nix {}; + tests.certmgr = callSubTests tests/certmgr.nix {}; + tests.cfssl = callTestOnMatchingSystems ["x86_64-linux"] tests/cfssl.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 {}; @@ -264,9 +272,13 @@ 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.deluge = callTest tests/deluge.nix {}; + tests.dhparams = callTest tests/dhparams.nix {}; tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {}; tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {}; + tests.docker-tools-overlay = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools-overlay.nix {}; tests.docker-edge = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-edge.nix {}; + tests.docker-registry = callTest tests/docker-registry.nix {}; tests.dovecot = callTest tests/dovecot.nix {}; tests.dnscrypt-proxy = callTestOnMatchingSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {}; tests.ecryptfs = callTest tests/ecryptfs.nix {}; @@ -277,9 +289,11 @@ in rec { tests.env = callTest tests/env.nix {}; tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; + tests.flatpak = callTest tests/flatpak.nix {}; tests.firewall = callTest tests/firewall.nix {}; - tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {}; + tests.fsck = callTest tests/fsck.nix {}; tests.fwupd = callTest tests/fwupd.nix {}; + tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; tests.gjs = callTest tests/gjs.nix {}; @@ -289,25 +303,30 @@ in rec { tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {}; tests.grafana = callTest tests/grafana.nix {}; tests.graphite = callTest tests/graphite.nix {}; + tests.hadoop.hdfs = callTestOnMatchingSystems [ "x86_64-linux" ] tests/hadoop/hdfs.nix {}; + tests.hadoop.yarn = callTestOnMatchingSystems [ "x86_64-linux" ] tests/hadoop/yarn.nix {}; tests.hardened = callTest tests/hardened.nix { }; + tests.haproxy = callTest tests/haproxy.nix {}; tests.hibernate = callTest tests/hibernate.nix {}; + tests.hitch = callTest tests/hitch {}; tests.home-assistant = callTest tests/home-assistant.nix { }; tests.hound = callTest tests/hound.nix {}; tests.hocker-fetchdocker = callTest tests/hocker-fetchdocker {}; + tests.hydra = callTest tests/hydra {}; tests.i3wm = callTest tests/i3wm.nix {}; + tests.iftop = callTest tests/iftop.nix {}; tests.initrd-network-ssh = callTest tests/initrd-network-ssh {}; tests.installer = callSubTests tests/installer.nix {}; tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; + tests.ostree = callTest tests/ostree.nix {}; + tests.osquery = callTest tests/osquery.nix {}; tests.plasma5 = callTest tests/plasma5.nix {}; tests.plotinus = callTest tests/plotinus.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; - tests.kafka_0_9 = callTest tests/kafka_0_9.nix {}; - tests.kafka_0_10 = callTest tests/kafka_0_10.nix {}; - tests.kafka_0_11 = callTest tests/kafka_0_11.nix {}; - tests.kafka_1_0 = callTest tests/kafka_1_0.nix {}; + tests.kafka = callSubTests tests/kafka.nix {}; tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {}; tests.kernel-latest = callTest tests/kernel-latest.nix {}; tests.kernel-lts = callTest tests/kernel-lts.nix {}; @@ -322,9 +341,11 @@ in rec { #tests.logstash = callTest tests/logstash.nix {}; tests.mathics = callTest tests/mathics.nix {}; tests.matrix-synapse = callTest tests/matrix-synapse.nix {}; + tests.memcached = callTest tests/memcached.nix {}; tests.mesos = callTest tests/mesos.nix {}; tests.misc = callTest tests/misc.nix {}; tests.mongodb = callTest tests/mongodb.nix {}; + tests.mpd = callTest tests/mpd.nix {}; tests.mumble = callTest tests/mumble.nix {}; tests.munin = callTest tests/munin.nix {}; tests.mutableUsers = callTest tests/mutable-users.nix {}; @@ -339,6 +360,7 @@ in rec { tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; }; # TODO: put in networking.nix after the test becomes more complete tests.networkingProxy = callTest tests/networking-proxy.nix {}; + tests.nexus = callTest tests/nexus.nix { }; tests.nfs3 = callTest tests/nfs.nix { version = 3; }; tests.nfs4 = callTest tests/nfs.nix { version = 4; }; tests.nginx = callTest tests/nginx.nix { }; @@ -349,9 +371,9 @@ in rec { tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; tests.openldap = callTest tests/openldap.nix {}; + tests.opensmtpd = callTest tests/opensmtpd.nix {}; tests.owncloud = callTest tests/owncloud.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.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 {}; @@ -364,7 +386,7 @@ in rec { tests.prometheus = callTest tests/prometheus.nix {}; tests.prosody = callTest tests/prosody.nix {}; tests.proxy = callTest tests/proxy.nix {}; - # tests.quagga = callTest tests/quagga.nix {}; + tests.quagga = callTest tests/quagga.nix {}; tests.quake3 = callTest tests/quake3.nix {}; tests.rabbitmq = callTest tests/rabbitmq.nix {}; tests.radicale = callTest tests/radicale.nix {}; @@ -375,51 +397,58 @@ in rec { tests.sddm = callSubTests tests/sddm.nix {}; tests.simple = callTest tests/simple.nix {}; tests.slim = callTest tests/slim.nix {}; + tests.slurm = callTest tests/slurm.nix {}; tests.smokeping = callTest tests/smokeping.nix {}; tests.snapper = callTest tests/snapper.nix {}; tests.statsd = callTest tests/statsd.nix {}; + tests.strongswan-swanctl = callTest tests/strongswan-swanctl.nix {}; tests.sudo = callTest tests/sudo.nix {}; tests.systemd = callTest tests/systemd.nix {}; tests.switchTest = callTest tests/switch-test.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; + tests.tor = callTest tests/tor.nix {}; + tests.transmission = callTest tests/transmission.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; tests.vault = callTest tests/vault.nix {}; tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {}; tests.wordpress = callTest tests/wordpress.nix {}; tests.xautolock = callTest tests/xautolock.nix {}; + tests.xdg-desktop-portal = callTest tests/xdg-desktop-portal.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; tests.xrdp = callTest tests/xrdp.nix {}; + tests.xss-lock = callTest tests/xss-lock.nix {}; tests.yabar = callTest tests/yabar.nix {}; tests.zookeeper = callTest tests/zookeeper.nix {}; + tests.morty = callTest tests/morty.nix { }; /* Build a bunch of typical closures so that Hydra can keep track of the evolution of closure sizes. */ closures = { - smallContainer = makeClosure ({ pkgs, ... }: + smallContainer = makeClosure ({ ... }: { boot.isContainer = true; services.openssh.enable = true; }); - tinyContainer = makeClosure ({ pkgs, ... }: + tinyContainer = makeClosure ({ ... }: { boot.isContainer = true; imports = [ modules/profiles/minimal.nix ]; }); - ec2 = makeClosure ({ pkgs, ... }: + ec2 = makeClosure ({ ... }: { imports = [ modules/virtualisation/amazon-image.nix ]; }); - kde = makeClosure ({ pkgs, ... }: + kde = makeClosure ({ ... }: { services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; }); - xfce = makeClosure ({ pkgs, ... }: + xfce = makeClosure ({ ... }: { services.xserver.enable = true; services.xserver.desktopManager.xfce.enable = true; }); diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index d7452744e17b2e0d05b66c8a744b4f31f722d177..c7fd4910e0722ef09e3b322f6beb23cfcd65c662 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -1,5 +1,5 @@ let - commonConfig = { config, lib, pkgs, nodes, ... }: { + commonConfig = { lib, nodes, ... }: { networking.nameservers = [ nodes.letsencrypt.config.networking.primaryIPAddress ]; @@ -12,7 +12,9 @@ let ''; }); - pythonPackages = (super.python.override { + # Override certifi so that it accepts fake certificate for Let's Encrypt + # Need to override the attribute used by simp_le, which is python3Packages + python3Packages = (super.python3.override { packageOverrides = lib.const (pysuper: { certifi = pysuper.certifi.overridePythonAttrs (attrs: { postPatch = (attrs.postPatch or "") + '' @@ -29,7 +31,7 @@ in import ./make-test.nix { name = "acme"; nodes = { - letsencrypt = ./common/letsencrypt.nix; + letsencrypt = ./common/letsencrypt; webserver = { config, pkgs, ... }: { imports = [ commonConfig ]; @@ -54,9 +56,11 @@ in import ./make-test.nix { }; testScript = '' + $letsencrypt->waitForUnit("default.target"); $letsencrypt->waitForUnit("boulder.service"); - startAll; + $webserver->waitForUnit("default.target"); $webserver->waitForUnit("acme-certificates.target"); + $client->waitForUnit("default.target"); $client->succeed('curl https://example.com/ | grep -qF "hello world"'); ''; } diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix index e1dee71fddf231db8c676088e202d4260f711908..fedfde233e8de3197baf09876dd349783dc905c8 100644 --- a/nixos/tests/ammonite.nix +++ b/nixos/tests/ammonite.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { amm = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.ammonite ]; }; diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix index 5260c8ddfb827199d07f49e7d160a1385c514619..9f367d4c1d2a6664689f9f41baabccc8975a4c00 100644 --- a/nixos/tests/atd.nix +++ b/nixos/tests/atd.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, lib, ... }: +import ./make-test.nix ({ pkgs, ... }: { name = "atd"; @@ -7,9 +7,9 @@ import ./make-test.nix ({ pkgs, lib, ... }: }; machine = - { config, pkgs, ... }: + { ... }: { services.atd.enable = true; - users.extraUsers.alice = { isNormalUser = true; }; + users.users.alice = { isNormalUser = true; }; }; # "at" has a resolution of 1 minute diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index 976a770e887c272c2475b255de4a0d8c35412020..dfb60998941b14575b38cca8733a99f685039ea9 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = let - cfg = { config, pkgs, ... }: { + cfg = { ... }: { services.avahi = { enable = true; nssmdns = true; diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix index 433910feafe306475cc68702ecd9b5177680bd26..9c241fd2301a44e5c451219a2339a0983b13f81c 100644 --- a/nixos/tests/beegfs.nix +++ b/nixos/tests/beegfs.nix @@ -1,9 +1,9 @@ -import ./make-test.nix ({ pkgs, ... } : +import ./make-test.nix ({ ... } : let connAuthFile="beegfs/auth-def.key"; - client = { config, pkgs, lib, ... } : { + client = { pkgs, ... } : { networking.firewall.enable = false; services.beegfsEnable = true; services.beegfs.default = { @@ -31,7 +31,7 @@ let }; - server = service : { config, pkgs, lib, ... } : { + server = service : { pkgs, ... } : { networking.firewall.enable = false; boot.initrd.postDeviceCommands = '' ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb diff --git a/nixos/tests/bind.nix b/nixos/tests/bind.nix new file mode 100644 index 0000000000000000000000000000000000000000..1f8c1dc7be40904fd576f26eeab4294f15641717 --- /dev/null +++ b/nixos/tests/bind.nix @@ -0,0 +1,27 @@ +import ./make-test.nix { + name = "bind"; + + machine = { pkgs, lib, ... }: { + services.bind.enable = true; + services.bind.extraOptions = "empty-zones-enable no;"; + services.bind.zones = lib.singleton { + name = "."; + file = pkgs.writeText "root.zone" '' + $TTL 3600 + . IN SOA ns.example.org. admin.example.org. ( 1 3h 1h 1w 1d ) + . IN NS ns.example.org. + + ns.example.org. IN A 192.168.0.1 + ns.example.org. IN AAAA abcd::1 + + 1.0.168.192.in-addr.arpa IN PTR ns.example.org. + ''; + }; + }; + + testScript = '' + $machine->waitForUnit('bind.service'); + $machine->waitForOpenPort(53); + $machine->succeed('host 192.168.0.1 127.0.0.1 | grep -qF ns.example.org'); + ''; +} diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 50c98664660a9676d02aeb717cbc38b43bd5a7f0..609b1ff7a83a2966d5078efb9ef3aaf6f47a9966 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -30,7 +30,7 @@ in nodes = { tracker = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.transmission pkgs.opentracker ]; # We need Apache on the tracker to serve the torrents. @@ -42,7 +42,7 @@ in }; router = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.miniupnpd ]; virtualisation.vlans = [ 1 2 ]; networking.nat.enable = true; @@ -52,7 +52,7 @@ in }; client1 = - { config, pkgs, nodes, ... }: + { pkgs, nodes, ... }: { environment.systemPackages = [ pkgs.transmission ]; virtualisation.vlans = [ 2 ]; networking.defaultGateway = @@ -61,7 +61,7 @@ in }; client2 = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.transmission ]; networking.firewall.enable = false; }; diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index 36731773de27e3fc8b822200cbce6952bbb28ece..9b39abdfa8edf25259b2b8f8b838203868ddf097 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -41,7 +41,7 @@ in { }; nodes = { - client = { config, pkgs, ... }: { + client = { ... }: { services.borgbackup.jobs = { local = rec { @@ -84,7 +84,7 @@ in { }; }; - server = { config, pkgs, ... }: { + server = { ... }: { services.openssh = { enable = true; passwordAuthentication = false; diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index 828846f17c899beaea168fcd731eecfcdccf4a49..cf408dc7fec923cd535abed0453d3791afd39ecb 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... } : { name = "buildbot"; nodes = { - bbmaster = { config, pkgs, ... }: { + bbmaster = { pkgs, ... }: { services.buildbot-master = { enable = true; package = pkgs.buildbot-full; @@ -22,7 +22,7 @@ import ./make-test.nix ({ pkgs, ... } : { environment.systemPackages = with pkgs; [ git buildbot-full ]; }; - bbworker = { config, pkgs, ... }: { + bbworker = { pkgs, ... }: { services.buildbot-worker = { enable = true; masterUrl = "bbmaster:9989"; @@ -30,7 +30,7 @@ import ./make-test.nix ({ pkgs, ... } : { environment.systemPackages = with pkgs; [ git buildbot-worker ]; }; - gitrepo = { config, pkgs, ... }: { + gitrepo = { pkgs, ... }: { services.openssh.enable = true; networking.firewall.allowedTCPPorts = [ 22 9418 ]; environment.systemPackages = with pkgs; [ git ]; diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix index f0083ab18e45e2155bb6925e9c592217503cdc04..e60bae4b7003382fc6d63d81c4cc7256d2b79839 100644 --- a/nixos/tests/cadvisor.nix +++ b/nixos/tests/cadvisor.nix @@ -5,11 +5,11 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = { - machine = { config, pkgs, ... }: { + machine = { ... }: { services.cadvisor.enable = true; }; - influxdb = { config, pkgs, lib, ... }: with lib; { + influxdb = { lib, ... }: with lib; { services.cadvisor.enable = true; services.cadvisor.storageDriver = "influxdb"; services.influxdb.enable = true; diff --git a/nixos/tests/cassandra.nix b/nixos/tests/cassandra.nix index b729e6b158bcbfd2ddf4a18bdc55326cd25c9766..60d0c6d7606825157ad463d16516a1c5ce14cafa 100644 --- a/nixos/tests/cassandra.nix +++ b/nixos/tests/cassandra.nix @@ -1,68 +1,71 @@ import ./make-test.nix ({ pkgs, ...}: let - user = "cassandra"; - nodeCfg = nodes: selfIP: cassandraOpts: - { - services.cassandra = { - enable = true; - listenAddress = selfIP; - rpcAddress = "0.0.0.0"; - seeds = [ "192.168.1.1" ]; - package = pkgs.cassandra_2_0; - jre = pkgs.openjdk; - clusterName = "ci ahoy"; - authenticator = "PasswordAuthenticator"; - authorizer = "CassandraAuthorizer"; - user = user; - } // cassandraOpts; - nixpkgs.config.allowUnfree = true; + # Change this to test a different version of Cassandra: + testPackage = pkgs.cassandra; + cassandraCfg = + { enable = true; + listenAddress = null; + listenInterface = "eth1"; + rpcAddress = null; + rpcInterface = "eth1"; + extraConfig = + { start_native_transport = true; + seed_provider = + [{ class_name = "org.apache.cassandra.locator.SimpleSeedProvider"; + parameters = [ { seeds = "cass0"; } ]; + }]; + }; + package = testPackage; + }; + nodeCfg = extra: {pkgs, config, ...}: + { environment.systemPackages = [ testPackage ]; + networking.firewall.enable = false; + services.cassandra = cassandraCfg // extra; virtualisation.memorySize = 1024; }; - in { name = "cassandra-ci"; nodes = { - cass0 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.1" {}; - cass1 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.2" {}; - cass2 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.3" { - extraParams = [ - ''JVM_OPTS="$JVM_OPTS -Dcassandra.replace_address=192.168.1.2"'' - ]; - listenAddress = "192.168.1.3"; - }; + cass0 = nodeCfg {}; + cass1 = nodeCfg {}; + cass2 = nodeCfg { jvmOpts = [ "-Dcassandra.replace_address=cass1" ]; }; }; testScript = '' - subtest "start seed", sub { + subtest "timers exist", sub { + $cass0->succeed("systemctl list-timers | grep cassandra-full-repair.timer"); + $cass0->succeed("systemctl list-timers | grep cassandra-incremental-repair.timer"); + }; + subtest "can connect via cqlsh", sub { $cass0->waitForUnit("cassandra.service"); - $cass0->waitForOpenPort(9160); - $cass0->execute("echo show version | cqlsh localhost -u cassandra -p cassandra"); - sleep 2; - $cass0->succeed("echo show version | cqlsh localhost -u cassandra -p cassandra"); - $cass1->start; + $cass0->waitUntilSucceeds("nc -z cass0 9042"); + $cass0->succeed("echo 'show version;' | cqlsh cass0"); }; - subtest "cassandra user/group", sub { - $cass0->succeed("id \"${user}\" >/dev/null"); - $cass1->succeed("id \"${user}\" >/dev/null"); + subtest "nodetool is operational", sub { + $cass0->waitForUnit("cassandra.service"); + $cass0->waitUntilSucceeds("nc -z localhost 7199"); + $cass0->succeed("nodetool status --resolve-ip | egrep '^UN[[:space:]]+cass0'"); }; - subtest "bring up cassandra cluster", sub { + subtest "bring up cluster", sub { $cass1->waitForUnit("cassandra.service"); - $cass0->waitUntilSucceeds("nodetool status | grep -c UN | grep 2"); + $cass1->waitUntilSucceeds("nodetool status | egrep -c '^UN' | grep 2"); + $cass0->succeed("nodetool status --resolve-ip | egrep '^UN[[:space:]]+cass1'"); }; subtest "break and fix node", sub { - $cass0->block; - $cass0->waitUntilSucceeds("nodetool status | grep -c DN | grep 1"); - $cass0->unblock; - $cass0->waitUntilSucceeds("nodetool status | grep -c UN | grep 2"); + $cass1->block; + $cass0->waitUntilSucceeds("nodetool status --resolve-ip | egrep -c '^DN[[:space:]]+cass1'"); + $cass0->succeed("nodetool status | egrep -c '^UN' | grep 1"); + $cass1->unblock; + $cass1->waitUntilSucceeds("nodetool status | egrep -c '^UN' | grep 2"); + $cass0->succeed("nodetool status | egrep -c '^UN' | grep 2"); }; subtest "replace crashed node", sub { $cass1->crash; - $cass2->start; $cass2->waitForUnit("cassandra.service"); - $cass0->waitUntilFails("nodetool status | grep UN | grep 192.168.1.2"); - $cass0->waitUntilSucceeds("nodetool status | grep UN | grep 192.168.1.3"); + $cass0->waitUntilFails("nodetool status --resolve-ip | egrep '^UN[[:space:]]+cass1'"); + $cass0->waitUntilSucceeds("nodetool status --resolve-ip | egrep '^UN[[:space:]]+cass2'"); }; ''; }) diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix index b9993062c079adcd4e7e303e851a86f30b78ccca..dd45f0157b01a93e766ec41e77ca37fc0ecf7d75 100644 --- a/nixos/tests/ceph.nix +++ b/nixos/tests/ceph.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({pkgs, ...}: rec { }; nodes = { - aio = { config, pkgs, ... }: { + aio = { pkgs, ... }: { virtualisation = { emptyDiskImages = [ 20480 20480 ]; vlans = [ 1 ]; @@ -55,7 +55,7 @@ import ./make-test.nix ({pkgs, ...}: rec { }; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' startAll; $aio->waitForUnit("network.target"); diff --git a/nixos/tests/certmgr.nix b/nixos/tests/certmgr.nix new file mode 100644 index 0000000000000000000000000000000000000000..8354c46b85f7ea756e576e71f67e828623b6b4f2 --- /dev/null +++ b/nixos/tests/certmgr.nix @@ -0,0 +1,148 @@ +{ system ? builtins.currentSystem }: + +with import ../lib/testing.nix { inherit system; }; +let + mkSpec = { host, service ? null, action }: { + inherit action; + authority = { + file = { + group = "nobody"; + owner = "nobody"; + path = "/tmp/${host}-ca.pem"; + }; + label = "www_ca"; + profile = "three-month"; + remote = "localhost:8888"; + }; + certificate = { + group = "nobody"; + owner = "nobody"; + path = "/tmp/${host}-cert.pem"; + }; + private_key = { + group = "nobody"; + mode = "0600"; + owner = "nobody"; + path = "/tmp/${host}-key.pem"; + }; + request = { + CN = host; + hosts = [ host "www.${host}" ]; + key = { + algo = "rsa"; + size = 2048; + }; + names = [ + { + C = "US"; + L = "San Francisco"; + O = "Example, LLC"; + ST = "CA"; + } + ]; + }; + inherit service; + }; + + mkCertmgrTest = { svcManager, specs, testScript }: makeTest { + name = "certmgr-" + svcManager; + nodes = { + machine = { config, lib, pkgs, ... }: { + networking.firewall.allowedTCPPorts = with config.services; [ cfssl.port certmgr.metricsPort ]; + networking.extraHosts = "127.0.0.1 imp.example.org decl.example.org"; + + services.cfssl.enable = true; + systemd.services.cfssl.after = [ "cfssl-init.service" "networking.target" ]; + + systemd.services.cfssl-init = { + description = "Initialize the cfssl CA"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "cfssl"; + Type = "oneshot"; + WorkingDirectory = config.services.cfssl.dataDir; + }; + script = '' + ${pkgs.cfssl}/bin/cfssl genkey -initca ${pkgs.writeText "ca.json" (builtins.toJSON { + hosts = [ "ca.example.com" ]; + key = { + algo = "rsa"; size = 4096; }; + names = [ + { + C = "US"; + L = "San Francisco"; + O = "Internet Widgets, LLC"; + OU = "Certificate Authority"; + ST = "California"; + } + ]; + })} | ${pkgs.cfssl}/bin/cfssljson -bare ca + ''; + }; + + services.nginx = { + enable = true; + virtualHosts = lib.mkMerge (map (host: { + ${host} = { + sslCertificate = "/tmp/${host}-cert.pem"; + sslCertificateKey = "/tmp/${host}-key.pem"; + extraConfig = '' + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ''; + onlySSL = true; + serverName = host; + root = pkgs.writeTextDir "index.html" "It works!"; + }; + }) [ "imp.example.org" "decl.example.org" ]); + }; + + systemd.services.nginx.wantedBy = lib.mkForce []; + + systemd.services.certmgr.after = [ "cfssl.service" ]; + services.certmgr = { + enable = true; + inherit svcManager; + inherit specs; + }; + + }; + }; + inherit testScript; + }; +in +{ + systemd = mkCertmgrTest { + svcManager = "systemd"; + specs = { + decl = mkSpec { host = "decl.example.org"; service = "nginx"; action ="restart"; }; + imp = toString (pkgs.writeText "test.json" (builtins.toJSON ( + mkSpec { host = "imp.example.org"; service = "nginx"; action = "restart"; } + ))); + }; + testScript = '' + $machine->waitForUnit('cfssl.service'); + $machine->waitUntilSucceeds('ls /tmp/decl.example.org-ca.pem'); + $machine->waitUntilSucceeds('ls /tmp/decl.example.org-key.pem'); + $machine->waitUntilSucceeds('ls /tmp/decl.example.org-cert.pem'); + $machine->waitUntilSucceeds('ls /tmp/imp.example.org-ca.pem'); + $machine->waitUntilSucceeds('ls /tmp/imp.example.org-key.pem'); + $machine->waitUntilSucceeds('ls /tmp/imp.example.org-cert.pem'); + $machine->waitForUnit('nginx.service'); + $machine->succeed('[ "1" -lt "$(journalctl -u nginx | grep "Starting Nginx" | wc -l)" ]'); + $machine->succeed('curl --cacert /tmp/imp.example.org-ca.pem https://imp.example.org'); + $machine->succeed('curl --cacert /tmp/decl.example.org-ca.pem https://decl.example.org'); + ''; + }; + + command = mkCertmgrTest { + svcManager = "command"; + specs = { + test = mkSpec { host = "command.example.org"; action = "touch /tmp/command.executed"; }; + }; + testScript = '' + $machine->waitForUnit('cfssl.service'); + $machine->waitUntilSucceeds('stat /tmp/command.executed'); + ''; + }; + +} diff --git a/nixos/tests/cfssl.nix b/nixos/tests/cfssl.nix new file mode 100644 index 0000000000000000000000000000000000000000..513ed8c457418d226917f2fce9a2cf80bd51455f --- /dev/null +++ b/nixos/tests/cfssl.nix @@ -0,0 +1,67 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "cfssl"; + + machine = { config, lib, pkgs, ... }: + { + networking.firewall.allowedTCPPorts = [ config.services.cfssl.port ]; + + services.cfssl.enable = true; + systemd.services.cfssl.after = [ "cfssl-init.service" ]; + + systemd.services.cfssl-init = { + description = "Initialize the cfssl CA"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "cfssl"; + Type = "oneshot"; + WorkingDirectory = config.services.cfssl.dataDir; + }; + script = with pkgs; '' + ${cfssl}/bin/cfssl genkey -initca ${pkgs.writeText "ca.json" (builtins.toJSON { + hosts = [ "ca.example.com" ]; + key = { + algo = "rsa"; size = 4096; }; + names = [ + { + C = "US"; + L = "San Francisco"; + O = "Internet Widgets, LLC"; + OU = "Certificate Authority"; + ST = "California"; + } + ]; + })} | ${cfssl}/bin/cfssljson -bare ca + ''; + }; + }; + + testScript = + let + cfsslrequest = with pkgs; writeScript "cfsslrequest" '' + curl -X POST -H "Content-Type: application/json" -d @${csr} \ + http://localhost:8888/api/v1/cfssl/newkey | ${cfssl}/bin/cfssljson /tmp/certificate + ''; + csr = pkgs.writeText "csr.json" (builtins.toJSON { + CN = "www.example.com"; + hosts = [ "example.com" "www.example.com" ]; + key = { + algo = "rsa"; + size = 2048; + }; + names = [ + { + C = "US"; + L = "San Francisco"; + O = "Example Company, LLC"; + OU = "Operations"; + ST = "California"; + } + ]; + }); + in + '' + $machine->waitForUnit('cfssl.service'); + $machine->waitUntilSucceeds('${cfsslrequest}'); + $machine->succeed('ls /tmp/certificate-key.pem'); + ''; +}) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 3a2c6516476679fc58101ad3ce6aa126fbbaf905..c341e83961a8e9fd01519d67ea2a9b78c3650096 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -94,6 +94,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec { ''}"); if ($status == 0) { $ret = 1; + + # XXX: Somehow Chromium is not accepting keystrokes for a few + # seconds after a new window has appeared, so let's wait a while. + $machine->sleep(10); + last; } $machine->sleep(1); @@ -151,11 +156,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec { $machine->screenshot("sandbox_info"); - $machine->succeed(ru "${xdo "submit-url" '' + $machine->succeed(ru "${xdo "find-window" '' search --sync --onlyvisible --name "sandbox status" windowfocus --sync ''}"); - $machine->succeed(ru "${xdo "submit-url" '' + $machine->succeed(ru "${xdo "copy-sandbox-info" '' key --delay 1000 Ctrl+a Ctrl+c ''}"); @@ -166,6 +171,26 @@ mapAttrs (channel: chromiumPkg: makeTest rec { && $clipboard =~ /network namespaces.*yes/mi && $clipboard =~ /seccomp.*sandbox.*yes/mi && $clipboard =~ /you are adequately sandboxed/mi; + + $machine->sleep(1); + $machine->succeed(ru "${xdo "find-window-after-copy" '' + search --onlyvisible --name "sandbox status" + ''}"); + + my $clipboard = $machine->succeed(ru "echo void | ${pkgs.xclip}/bin/xclip -i"); + $machine->succeed(ru "${xdo "copy-sandbox-info" '' + key --delay 1000 Ctrl+a Ctrl+c + ''}"); + + my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o"); + die "copying twice in a row does not work properly: $clipboard" + unless $clipboard =~ /namespace sandbox.*yes/mi + && $clipboard =~ /pid namespaces.*yes/mi + && $clipboard =~ /network namespaces.*yes/mi + && $clipboard =~ /seccomp.*sandbox.*yes/mi + && $clipboard =~ /you are adequately sandboxed/mi; + + $machine->screenshot("afer_copy_from_chromium"); }; $machine->shutdown; diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 4d3b58abc6e557992fc9094c845cdfbe0ace02d1..ab5f8e0bcf3e542583167ab9a159956cf8911c4c 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -2,10 +2,9 @@ let carolKey = "2d2a338b46f8e4a8c462f0c385b481292a05f678e19a2b82755258cf0f0af7e2"; carolPubKey = "n932l3pjvmhtxxcdrqq2qpw5zc58f01vvjx01h4dtd1bb0nnu2h0.k"; carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52"; - carolIp4 = "192.168.0.9"; basicConfig = - { config, pkgs, ... }: + { ... }: { services.cjdns.enable = true; # Turning off DHCP isn't very realistic but makes @@ -30,7 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = rec { # Alice finds peers over over ETHInterface. alice = - { config, ... }: + { ... }: { imports = [ basicConfig ]; services.cjdns.ETHInterface.bind = "eth1"; @@ -42,11 +41,9 @@ import ./make-test.nix ({ pkgs, ...} : { # Bob explicitly connects to Carol over UDPInterface. bob = - { config, lib, nodes, ... }: + { ... }: - let carolIp4 = lib.mkForce nodes.carol.config.networking.interfaces.eth1; in - - { imports = [ basicConfig ]; + { imports = [ basicConfig ]; networking.interfaces.eth1.ipv4.addresses = [ { address = "192.168.0.2"; prefixLength = 24; } @@ -66,11 +63,8 @@ import ./make-test.nix ({ pkgs, ...} : { # Carol listens on ETHInterface and UDPInterface, # but knows neither Alice or Bob. carol = - { config, lib, nodes, ... }: - let - carolIp4 = (lib.mkForce nodes.carol.config.networking.interfaces.eth1); - in - { imports = [ basicConfig ]; + { ... }: + { imports = [ basicConfig ]; environment.etc."cjdns.keys".text = '' CJDNS_PRIVATE_KEY=${carolKey} diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index 2a258e4bff542bb65b9a5c9ad29fa8e29f77dde0..303e74086460f0a3dc2ea11efb56c29d153f47b8 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -31,7 +31,7 @@ in makeTest { maintainers = [ lewo ]; }; machine = - { config, pkgs, ... }: + { ... }: { virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ]; services.cloud-init.enable = true; diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt/default.nix similarity index 88% rename from nixos/tests/common/letsencrypt.nix rename to nixos/tests/common/letsencrypt/default.nix index 10cde45d18a8bc98ee904ab87b9438a33d2b0729..73aac51a01261aa9bbb805ccf9df6253f1f1dba5 100644 --- a/nixos/tests/common/letsencrypt.nix +++ b/nixos/tests/common/letsencrypt/default.nix @@ -17,7 +17,7 @@ # A configuration example of a full node setup using this would be this: # # { -# letsencrypt = import ./common/letsencrypt.nix; +# letsencrypt = import ./common/letsencrypt; # # example = { nodes, ... }: { # networking.nameservers = [ @@ -30,14 +30,14 @@ # } # # By default, this module runs a local resolver, generated using resolver.nix -# from the same directory to automatically discover all zones in the network. +# from the parent directory to automatically discover all zones in the network. # # If you do not want this and want to use your own resolver, you can just # override networking.nameservers like this: # # { # letsencrypt = { nodes, ... }: { -# imports = [ ./common/letsencrypt.nix ]; +# imports = [ ./common/letsencrypt ]; # networking.nameservers = [ # nodes.myresolver.config.networking.primaryIPAddress # ]; @@ -164,8 +164,8 @@ let -e 's,exec \./bin/,,' \ test/startservers.py - cat "${snakeOilCa}/ca.key" > test/test-ca.key - cat "${snakeOilCa}/ca.pem" > test/test-ca.pem + cat ${lib.escapeShellArg snakeOilCerts.ca.key} > test/test-ca.key + cat ${lib.escapeShellArg snakeOilCerts.ca.cert} > test/test-ca.pem ''; # Until vendored pkcs11 is go 1.9 compatible @@ -173,6 +173,21 @@ let rm -r go/src/github.com/letsencrypt/boulder/vendor/github.com/miekg/pkcs11 ''; + # XXX: Temporarily brought back putting the source code in the output, + # since e95f17e2720e67e2eabd59d7754c814d3e27a0b2 was removing that from + # buildGoPackage. + preInstall = '' + mkdir -p $out + pushd "$NIX_BUILD_TOP/go" + while read f; do + echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' \ + || continue + mkdir -p "$(dirname "$out/share/go/$f")" + cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f" + done < <(find . -type f) + popd + ''; + extraSrcs = map mkGoDep [ { goPackagePath = "github.com/miekg/pkcs11"; rev = "6dbd569b952ec150d1425722dbbe80f2c6193f83"; @@ -191,51 +206,15 @@ let 1:/var/lib/softhsm/slot1.db ''; - snakeOilCa = pkgs.runCommand "snakeoil-ca" { - buildInputs = [ pkgs.openssl ]; - } '' - mkdir "$out" - openssl req -newkey rsa:4096 -x509 -sha256 -days 36500 \ - -subj '/CN=Snakeoil CA' -nodes \ - -out "$out/ca.pem" -keyout "$out/ca.key" - ''; + snakeOilCerts = import ./snakeoil-certs.nix; - createAndSignCert = fqdn: let - snakeoilCertConf = pkgs.writeText "snakeoil.cnf" '' - [req] - default_bits = 4096 - prompt = no - default_md = sha256 - req_extensions = req_ext - distinguished_name = dn - [dn] - CN = ${fqdn} - [req_ext] - subjectAltName = DNS:${fqdn} - ''; - in pkgs.runCommand "snakeoil-certs-${fqdn}" { - buildInputs = [ pkgs.openssl ]; - } '' - mkdir "$out" - openssl genrsa -out "$out/snakeoil.key" 4096 - openssl req -new -key "$out/snakeoil.key" \ - -config ${lib.escapeShellArg snakeoilCertConf} \ - -out snakeoil.csr - openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \ - -CA "${snakeOilCa}/ca.pem" -CAkey "${snakeOilCa}/ca.key" \ - -extfile ${lib.escapeShellArg snakeoilCertConf} \ - -out "$out/snakeoil.pem" -days 36500 - ''; - - wfeCerts = createAndSignCert wfeDomain; wfeDomain = "acme-v01.api.letsencrypt.org"; - wfeCertFile = "${wfeCerts}/snakeoil.pem"; - wfeKeyFile = "${wfeCerts}/snakeoil.key"; + wfeCertFile = snakeOilCerts.${wfeDomain}.cert; + wfeKeyFile = snakeOilCerts.${wfeDomain}.key; - siteCerts = createAndSignCert siteDomain; siteDomain = "letsencrypt.org"; - siteCertFile = "${siteCerts}/snakeoil.pem"; - siteKeyFile = "${siteCerts}/snakeoil.key"; + siteCertFile = snakeOilCerts.${siteDomain}.cert; + siteKeyFile = snakeOilCerts.${siteDomain}.key; # Retrieved via: # curl -s -I https://acme-v01.api.letsencrypt.org/terms \ @@ -325,7 +304,7 @@ let serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; script = let - netcat = "${pkgs.netcat-openbsd}/bin/nc"; + netcat = "${pkgs.libressl.nc}/bin/nc"; portCheck = "${netcat} -z 127.0.0.1 ${toString attrs.waitForPort}"; in "while ! ${portCheck}; do :; done"; }; @@ -348,7 +327,7 @@ let }) components; in { - imports = [ ./resolver.nix ]; + imports = [ ../resolver.nix ]; options.test-support.letsencrypt.caCert = lib.mkOption { type = lib.types.path; @@ -364,7 +343,7 @@ in { resolver.enable = let isLocalResolver = config.networking.nameservers == [ "127.0.0.1" ]; in lib.mkOverride 900 isLocalResolver; - letsencrypt.caCert = "${snakeOilCa}/ca.pem"; + letsencrypt.caCert = snakeOilCerts.ca.cert; }; # This has priority 140, because modules/testing/test-instrumentation.nix @@ -386,6 +365,10 @@ in { services.nginx.enable = true; services.nginx.recommendedProxySettings = true; + # This fixes the test on i686 + services.nginx.commonHttpConfig = '' + server_names_hash_bucket_size 64; + ''; services.nginx.virtualHosts.${wfeDomain} = { onlySSL = true; enableACME = false; @@ -452,7 +435,7 @@ in { serviceConfig.RemainAfterExit = true; script = let ports = lib.range 8000 8005 ++ lib.singleton 80; - netcat = "${pkgs.netcat-openbsd}/bin/nc"; + netcat = "${pkgs.libressl.nc}/bin/nc"; mkPortCheck = port: "${netcat} -z 127.0.0.1 ${toString port}"; checks = "(${lib.concatMapStringsSep " && " mkPortCheck ports})"; in "while ! ${checks}; do :; done"; diff --git a/nixos/tests/common/letsencrypt/mkcerts.nix b/nixos/tests/common/letsencrypt/mkcerts.nix new file mode 100644 index 0000000000000000000000000000000000000000..3b4a589e41427d8542362040e6a0f31e7193518a --- /dev/null +++ b/nixos/tests/common/letsencrypt/mkcerts.nix @@ -0,0 +1,69 @@ +{ pkgs ? import {} +, lib ? pkgs.lib + +, domains ? [ "acme-v01.api.letsencrypt.org" "letsencrypt.org" ] +}: + +pkgs.runCommand "letsencrypt-snakeoil-ca" { + nativeBuildInputs = [ pkgs.openssl ]; +} '' + addpem() { + local file="$1"; shift + local storeFileName="$(IFS=.; echo "$*")" + + echo -n " " >> "$out" + + # Every following argument is an attribute, so let's recurse and check + # every attribute whether it must be quoted and write it into $out. + while [ -n "$1" ]; do + if expr match "$1" '^[a-zA-Z][a-zA-Z0-9]*$' > /dev/null; then + echo -n "$1" >> "$out" + else + echo -n '"' >> "$out" + echo -n "$1" | sed -e 's/["$]/\\&/g' >> "$out" + echo -n '"' >> "$out" + fi + shift + [ -z "$1" ] || echo -n . >> "$out" + done + + echo " = builtins.toFile \"$storeFileName\" '''" >> "$out" + sed -e 's/^/ /' "$file" >> "$out" + + echo " ''';" >> "$out" + } + + echo '# Generated via mkcert.sh in the same directory.' > "$out" + echo '{' >> "$out" + + openssl req -newkey rsa:4096 -x509 -sha256 -days 36500 \ + -subj '/CN=Snakeoil CA' -nodes -out ca.pem -keyout ca.key + + addpem ca.key ca key + addpem ca.pem ca cert + + ${lib.concatMapStrings (fqdn: let + opensslConfig = pkgs.writeText "snakeoil.cnf" '' + [req] + default_bits = 4096 + prompt = no + default_md = sha256 + req_extensions = req_ext + distinguished_name = dn + [dn] + CN = ${fqdn} + [req_ext] + subjectAltName = DNS:${fqdn} + ''; + in '' + export OPENSSL_CONF=${lib.escapeShellArg opensslConfig} + openssl genrsa -out snakeoil.key 4096 + openssl req -new -key snakeoil.key -out snakeoil.csr + openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \ + -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500 + addpem snakeoil.key ${lib.escapeShellArg fqdn} key + addpem snakeoil.pem ${lib.escapeShellArg fqdn} cert + '') domains} + + echo '}' >> "$out" +'' diff --git a/nixos/tests/common/letsencrypt/mkcerts.sh b/nixos/tests/common/letsencrypt/mkcerts.sh new file mode 100755 index 0000000000000000000000000000000000000000..cc7f8ca650dd43c1161c8fa9372af9ac3ec721cb --- /dev/null +++ b/nixos/tests/common/letsencrypt/mkcerts.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix bash -i bash +set -e +cd "$(dirname "$0")" +storepath="$(nix-build --no-out-link mkcerts.nix)" +cat "$storepath" > snakeoil-certs.nix diff --git a/nixos/tests/common/letsencrypt/snakeoil-certs.nix b/nixos/tests/common/letsencrypt/snakeoil-certs.nix new file mode 100644 index 0000000000000000000000000000000000000000..c3d29ab8f16333e7e0e3d71d044f86b78d077cb5 --- /dev/null +++ b/nixos/tests/common/letsencrypt/snakeoil-certs.nix @@ -0,0 +1,253 @@ +# Generated via mkcert.sh in the same directory. +{ + ca.key = builtins.toFile "ca.key" '' + -----BEGIN PRIVATE KEY----- + MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDfdVxC/4HwhuzD + 9or9CDDu3TBQE5lirJI5KYmfMZtfgdzEjgOzmR9AVSkn2rQeCqzM5m+YCzPO+2y7 + 0Fdk7vDORi1OdhYfUQIW6/TZ27xEjx4t82j9i705yUqTJZKjMbD830geXImJ6VGj + Nv/WisTHmwBspWKefYQPN68ZvYNCn0d5rYJg9uROZPJHSI0MYj9iERWIPN+xhZoS + xN74ILJ0rEOQfx2GHDhTr99vZYAFqbAIfh35fYulRWarUSekI+rDxa83FD8q9cMg + OP84KkLep2dRXXTbUWErGUOpHP55M9M7ws0RVNdl9PUSbDgChl7yYlHCde3261q/ + zGp5dMV/t/jXXNUgRurvXc4gUKKjS4Sffvg0XVnPs3sMlZ4JNmycK9klgISVmbTK + VcjRRJv8Bva2NQVsJ9TIryV0QEk94DucgsC3LbhQfQdmnWVcEdzwrZHNpk9az5mn + w42RuvZW9L19T7xpIrdLSHaOis4VEquZjkWIhfIz0DVMeXtYEQmwqFG23Ww0utcp + mCW4FPvpyYs5GAPmGWfrlMxsLD/7eteot3AheC+56ZBoVBnI8FFvIX2qci+gfVDu + CjvDmbyS/0NvxLGqvSC1GUPmWP3TR5Fb1H8Rp+39zJHRmH+qYWlhcv6p7FlY2/6d + 9Rkw8WKRTSCB7yeUdNNPiPopk6N4NwIDAQABAoICAQCzV0ei5dntpvwjEp3eElLj + glYiDnjOPt5kTjgLsg6XCmyau7ewzrXMNgz/1YE1ky+4i0EI8AS2nAdafQ2HDlXp + 11zJWfDLVYKtztYGe1qQU6TPEEo1I4/M7waRLliP7XO0n6cL5wzjyIQi0CNolprz + 8CzZBasutGHmrLQ1nmnYcGk2+NBo7f2yBUaFe27of3mLRVbYrrKBkU5kveiNkABp + r0/SipKxbbivQbm7d+TVpqiHSGDaOa54CEksOcfs7n6efOvw8qj326KtG9GJzDE6 + 7XP4U19UHe40XuR0t7Zso/FmRyO6QzNUutJt5LjXHezZ75razTcdMyr0QCU8MUHH + jXZxQCsbt+9AmdxUMBm1SMNVBdHYM8oiNHynlgsEj9eM6jxDEss/Uc3FeKoHl+XL + L6m28guIB8NivqjVzZcwhxvdiQCzYxjyqMC+/eX7aaK4NIlX2QRMoDL6mJ58Bz/8 + V2Qxp2UNVwKJFWAmpgXC+sq6XV/TP3HkOvd0OK82Nid2QxEvfE/EmOhU63qAjgUR + QnteLEcJ3MkGGurs05pYBDE7ejKVz6uu2tHahFMOv+yanGP2gfivnT9a323/nTqH + oR5ffMEI1u/ufpWU7sWXZfL/mH1L47x87k+9wwXHCPeSigcy+hFI7t1+rYsdCmz9 + V6QtmxZHMLanwzh5R0ipcQKCAQEA8kuZIz9JyYP6L+5qmIUxiWESihVlRCSKIqLB + fJ5sQ06aDBV2sqS4XnoWsHuJWUd39rulks8cg8WIQu8oJwVkFI9EpARt/+a1fRP0 + Ncc9qiBdP6VctQGgKfe5KyOfMzIBUl3zj2cAmU6q+CW1OgdhnEl4QhgBe5XQGquZ + Alrd2P2jhJbMO3sNFgzTy7xPEr3KqUy+L4gtRnGOegKIh8EllmsyMRO4eIrZV2z3 + XI+S2ZLyUn3WHYkaJqvUFrbfekgBBmbk5Ead6ImlsLsBla6MolKrVYV1kN6KT+Y+ + plcxNpWY8bnWfw5058OWPLPa9LPfReu9rxAeGT2ZLmAhSkjGxQKCAQEA7BkBzT3m + SIzop9RKl5VzYbVysCYDjFU9KYMW5kBIw5ghSMnRmU7kXIZUkc6C1L/v9cTNFFLw + ZSF4vCHLdYLmDysW2d4DU8fS4qdlDlco5A00g8T1FS7nD9CzdkVN/oix6ujw7RuI + 7pE1K3JELUYFBc8AZ7mIGGbddeCwnM+NdPIlhWzk5s4x4/r31cdk0gzor0kE4e+d + 5m0s1T4O/Iak6rc0MGDeTejZQg04p1eAJFYQ6OY23tJhH/kO8CMYnQ4fidfCkf8v + 85v4EC1MCorFR7J65uSj8MiaL7LTXPvLAkgFls1c3ijQ2tJ8qXvqmfo0by33T1OF + ZGyaOP9/1WQSywKCAQB47m6CfyYO5EZNAgxGD8SHsuGT9dXTSwF/BAjacB/NAEA2 + 48eYpko3LWyBrUcCPn+LsGCVg7XRtxepgMBjqXcoI9G4o1VbsgTHZtwus0D91qV0 + DM7WsPcFu1S6SU8+OCkcuTPFUT2lRvRiYj+vtNttK+ZP5rdmvYFermLyH/Q2R3ID + zVgmH+aKKODVASneSsgJ8/nAs5EVZbwc/YKzbx2Zk+s7P4KE95g+4G4dzrMW0RcN + QS1LFJDu2DhFFgU4fRO15Ek9/lj2JS2DpfLGiJY8tlI5nyDsq4YRFvQSBdbUTZpG + m+CJDegffSlRJtuT4ur/dQf5hmvfYTVBRk2XS/eZAoIBAB143a22PWnvFRfmO02C + 3X1j/iYZCLZa6aCl+ZTSj4LDGdyRPPXrUDxwlFwDMHfIYfcHEyanV9T4Aa9SdKh9 + p6RbF6YovbeWqS+b/9RzcupM77JHQuTbDwL9ZXmtGxhcDgGqBHFEz6ogPEfpIrOY + GwZnmcBY+7E4HgsZ+lII4rqng6GNP2HEeZvg91Eba+2AqQdAkTh3Bfn+xOr1rT8+ + u5WFOyGS5g1JtN0280yIcrmWeNPp8Q2Nq4wnNgMqDmeEnNFDOsmo1l6NqMC0NtrW + CdxyXj82aXSkRgMQSqw/zk7BmNkDV8VvyOqX/fHWQynnfuYmEco4Pd2UZQgadOW5 + cVMCggEBANGz1fC+QQaangUzsVNOJwg2+CsUFYlAKYA3pRKZPIyMob2CBXk3Oln/ + YqOq6j373kG2AX74EZT07JFn28F27JF3r+zpyS/TYrfZyO1lz/5ZejPtDTmqBiVd + qa2coaPKwCOz64s77A9KSPyvpvyuTfRVa8UoArHcrQsPXMHgEhnFRsbxgmdP582A + kfYfoJBSse6dQtS9ZnREJtyWJlBNIBvsuKwzicuIgtE3oCBcIUZpEa6rBSN7Om2d + ex8ejCcS7qpHeULYspXbm5ZcwE4glKlQbJDTKaJ9mjiMdvuNFUZnv1BdMQ3Tb8zf + Gvfq54FbDuB10XP8JdLrsy9Z6GEsmoE= + -----END PRIVATE KEY----- + ''; + ca.cert = builtins.toFile "ca.cert" '' + -----BEGIN CERTIFICATE----- + MIIFATCCAumgAwIBAgIJANydi4uFZr0LMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV + BAMMC1NuYWtlb2lsIENBMCAXDTE4MDcxMjAwMjIxNloYDzIxMTgwNjE4MDAyMjE2 + WjAWMRQwEgYDVQQDDAtTbmFrZW9pbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP + ADCCAgoCggIBAN91XEL/gfCG7MP2iv0IMO7dMFATmWKskjkpiZ8xm1+B3MSOA7OZ + H0BVKSfatB4KrMzmb5gLM877bLvQV2Tu8M5GLU52Fh9RAhbr9NnbvESPHi3zaP2L + vTnJSpMlkqMxsPzfSB5ciYnpUaM2/9aKxMebAGylYp59hA83rxm9g0KfR3mtgmD2 + 5E5k8kdIjQxiP2IRFYg837GFmhLE3vggsnSsQ5B/HYYcOFOv329lgAWpsAh+Hfl9 + i6VFZqtRJ6Qj6sPFrzcUPyr1wyA4/zgqQt6nZ1FddNtRYSsZQ6kc/nkz0zvCzRFU + 12X09RJsOAKGXvJiUcJ17fbrWr/Manl0xX+3+Ndc1SBG6u9dziBQoqNLhJ9++DRd + Wc+zewyVngk2bJwr2SWAhJWZtMpVyNFEm/wG9rY1BWwn1MivJXRAST3gO5yCwLct + uFB9B2adZVwR3PCtkc2mT1rPmafDjZG69lb0vX1PvGkit0tIdo6KzhUSq5mORYiF + 8jPQNUx5e1gRCbCoUbbdbDS61ymYJbgU++nJizkYA+YZZ+uUzGwsP/t616i3cCF4 + L7npkGhUGcjwUW8hfapyL6B9UO4KO8OZvJL/Q2/Esaq9ILUZQ+ZY/dNHkVvUfxGn + 7f3MkdGYf6phaWFy/qnsWVjb/p31GTDxYpFNIIHvJ5R000+I+imTo3g3AgMBAAGj + UDBOMB0GA1UdDgQWBBQ3vPWzjLmu5krbSpfhBAht9KL3czAfBgNVHSMEGDAWgBQ3 + vPWzjLmu5krbSpfhBAht9KL3czAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA + A4ICAQDF9HyC1ZFN3Ob+JA9Dj5+Rcobi7JIA5F8uW3Q92LfPoVaUGEkBrwJSiTFX + 47zvP/ySBJIpZ9rzHMbJ+1L+eJgczF1uQ91inthCKo1THTPo5TgBrpJj0YAIunsj + 9eH1tBnfWFYdVIDZoTSiwPtgIvglpyuK/eJXEe+FRzubhtdc9w1Hlzox1sd0TQuy + Pl9KFHg7BlFZfCPig1mkB8pfwjBDgVhv5DKJ9cJXh3R5zSoiyuS2b+qYSvw8YTHq + 0WNKWUthb7BVAYE3OmcbOHgUAUjtJ6EIGIB9z/SoLe90CofXLXFR5dppuVLKCMBA + kgL4luBIu7t8mcnN2yzobvcGHy8RVY6F5abCCy6gackLzjOzvH1SYOxP8yN74aKB + ANgcqdWspb8JYoU8lEbA8dhBVrsgBf7XeJlrZvMdcUENlJ2PI0JWr9WvlRAM9rYY + EY1alJqBCp6530Ggd6/f0V64cEqptejUdmN9L0zboxKjQf4LjpUNraGvg8tw/xkY + 4dT1U2HlVnhOyBVkx/tE6zIK/RU16oMqwpjCdfbK/TuWCNc/emJz5PMlp81zm83+ + dExpWwuV4rt6OQbZ/GSatNLJXOw+pkLjaEhnHgrsgI+HqAUXg3ByKol+1e76wN51 + k1ZKpB6mk4kejySGPYBHiJwED0IyXu9gUfalSczXFO4ySAvhCg== + -----END CERTIFICATE----- + ''; + "acme-v01.api.letsencrypt.org".key = builtins.toFile "acme-v01.api.letsencrypt.org.key" '' + -----BEGIN RSA PRIVATE KEY----- + MIIJKQIBAAKCAgEAvG+sL4q0VkgSClBTn4NkPiUrtXx5oLyZ+CCM1jrQx/xotUt5 + X2S4/7vMnAK/yRLsR7R2PhXO8CZPqJ7B6OfAgaDTgvipJkZYPZQSMP3KOinM3WJL + ssqKh7/HOxZIf0iyUXewrnX5eTAo/CLsUnhBjBD7E99nmQz/leLWSl82sSYDkO3n + Uk3/1qJZA8iddb4uH0IEQWcNKev3WoQQzwiVrXBiftlRQOJy5JJXm5m8229MCpMA + 1AUWmpdu6sl3/gFFdsDhUFq/a7LFrVyaUCMRIHg9szAB7ZFkixr9umQs8jKwuo98 + 3JHB11h2SirwgfIzHHmyhaWhCt22ucTwEXGhq63LtrzZvLsfP8Ql5S+AuqGTH0v8 + meuc784leAjulBZjkpuIFwDnVv9+YeUEbqJeo1hSHrILddora3nkH4E2dJWmLpqp + iPr++GRi+BNgYKW/BQLTJ7C6v+vUs+kdPgYJH5z7oP6f0YZkT0Wkubp/UEz7UV2d + fjz57d77DYx5rFWGYzJriWR/xltgL1zDpjwjwG1FDpRqwlyYbBFpjQhxI+X0aT98 + m6fCzBDQHDb/+JgvsjTHh6OZatahFAwzFIEfrceDv1BG8sBWIaZGhLzYiWQxafl8 + oXbWv1T6I1jpsTlCdCSkWzaJb4ZjxI9Ga1ynVu8F16+GR2a71wKWu7UbZQsCAwEA + AQKCAgBYvrs4FLoD3KNqahRIDqhaQEVKjtn1Yn2dBy9tAXwsg2qI34fE7nnWLwsY + +o56U0gmKQ57BOhV36Uqg8JNP0BBjI2wpA19simCrsa2fgAMznzmUpHWHV+KuT5K + TJ9OGt2oUpdKQtOASLc0r/neiTZNkf29iTyQLzf7zj4f/qGSYpXRXsnP0F5KJmGH + z6agujWckQnSB4eCk9gFsCb+akubyE8K8Kw8w6lajrVl2czBB7SnUj5UnCTeH62k + M8goP08Is6QppON8BFDm6bLfRPSe9yIPzu9JhGz2unp+mwkz872Zz1P9yUOieM4U + 9g4ZFQkPQx1ZpfynUm3pJZ/uhzadBabnIvMe/1qwDAEDifh/WzEM76/2kBpQkHtS + qcjwjAElfWnP8aBr1Pj42/cVJy3dbDqb0OawFHx/8xSO2CkY4Gq2h3OYv1XpPv3g + S9qqKhvuaT+aD0YjKhP4FYc2vvQSJwdZL8vqOyma8JGmc+r7jakIPCyOx3oPVqnS + L2P7DuJ1FcGIZyYOU3UUSzKndDU9fVC8YoLWvHDlwm4RK9UPtdsBY8mEu6BlaAwL + zEQG+fbcFnEkHPiJeAohYUCHiqCihLt0pqGwZi+QrudPQE6C47YijGZWJu4VVLjB + B2L9iDQKsN4FnBJ9egJIwWBLX3XXQfjC43UGm1A5sBvD+ScsCQKCAQEA7GxU7/SW + 4YJ+wBXrp7Z3vzlc5mTT5U4L2muWZLhIjT/jmpHpZ4c9a5DY/K9OYcu8XJ+7kx2B + N40cU3ZkT2ZbB5/BUCEmi3Wzy3R/KZshHDzvvSZHcXJqVBtv+HGJgR5ssFqAw8c6 + gJtDls+JE9Sz+nhLk0ZZ4658vbTQfG1lmtzrbC3Kz2xK8RPTdOU5Or7fayeaEKEW + ECBJPE41ME2UTdB/E85vyYoee0MBijjAs19QKqvoNbyrsZ5bihcIDYsrvjCmkdW1 + 20IUrSF3ZYJ9bb+CxHeRyNqwvRxPYSkzdMjZHx+xEAvJgw51QqmIi2QQf/qB+ych + cSbE/0Jhx4QbDQKCAQEAzAoenEOgmZvUegFUu8C6gWeibMjl3Y9SikQ4CoQO/zWr + aoCr5BpbzbtOffwnPfgk9wCGvXf6smOdrLUP1K2QAhBr/vJh7ih2MonvpYr5HPP7 + maVARR66IgtxXP2ER2I9+9p2OQdecGRP2fUn2KCDQIASHSSY/VjBb8LLJgryC/DS + r2b0+m1e2qXfNWt/BYTQZhD/8B/jl/2pl/jI2ne3rkeiwEm7lqZaDt3Q8gC+qoP5 + /IdG1Gob7UTMCbICWy1aGuzRYUmbpg0Vq4DAV1RtgBySB5oNq5PMBHYpOxedM2nM + NxHvf0u6wsxVULwQ4IfWUqUTspjxDmIgogSzmOGadwKCAQEA558if4tynjBImUtg + egirvG4oc5doeQhDWJN63eYlPizPgUleD41RQSbBTp04/1qoiV38WJ7ZT2Ex1Rry + H0+58vgyXZx8tLh1kufpBQv0HkQc44SzDZP4U7olspMZEaSK+yNPb36p9AEo8IEW + XJVQVhywffK4cfUqRHj2oFBU8KlrA6rBPQFtUk4IJkfED6ecHtDHgW8vvFDFLw23 + 0kDPAIU5WmAu6JYmUsBMq+v57kF8urF8Z9kVpIfuSpVR0GL+UfA74DgtWEefFhbp + cEutMm4jYPN7ofmOmVc49Yl13f4/qNxVjdDedUUe4FZTbax09cyotzOY8c/3w9R3 + Ew57qQKCAQAa5jqi30eM+L5KV2KUXhQ4ezEupk2np/15vQSmXkKb4rd2kwAWUmNH + /Cmc8mE6CjzVU3xv/iFO41MmMbikkT0rCH80XUAL5cmvX//4ExpEduX0m5SdiC+B + zYBkggeuYYVKbsKnQhFxP8hHM8rNBFxJZJj+vpRs0gaudT/TBB5k9JrSBQDHAyQ+ + Lx/+Ku3UDG5tBlC3l3ypzQdOwb25D49nqooKT64rbkLxMs0ZGoAIet26LRtpZZPI + 9AjyPkWRP6lhY1c3PD0I5zC0K4Uv/jFxclLOLcEfnZyH+gv1fmd7H7eMixDH93Pn + uoiE3EZdU4st2hV+tisRel5S/cuvnA6BAoIBAQDJISK8H0hwYp+J4/WUv/WLtrm4 + Mhmn8ItdEPAyCljycU6oLHJy4fgmmfRHeoO1i3jb87ks2GghegFBbJNzugfoGxIM + dLWIV+uFXWs24fMJ/J6lqN1JtAj7HjvqkXp061X+MdIJ0DsACygzFfJOjv+Ij77Q + Q1OBTSPfb0EWFNOuIJr9i2TwdN9eW/2ZMo1bPuwe4ttPEIBssfIC02dn2KD1RTqM + 1l+L97vVFk7CoSJZf5rLeysLVyUeGdDcoEcRA6fKhfB/55h+iqrZNvySX1HrR6on + PQcxDRPJD7f9rMsTzVl3DOxzvXAU3lIcZtPZps97IwXceAAh2e1kZNNv/cxj + -----END RSA PRIVATE KEY----- + ''; + "acme-v01.api.letsencrypt.org".cert = builtins.toFile "acme-v01.api.letsencrypt.org.cert" '' + -----BEGIN CERTIFICATE----- + MIIEtDCCApwCAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls + IENBMCAXDTE4MDcxMjAwMjIxN1oYDzIxMTgwNjE4MDAyMjE3WjAnMSUwIwYDVQQD + DBxhY21lLXYwMS5hcGkubGV0c2VuY3J5cHQub3JnMIICIjANBgkqhkiG9w0BAQEF + AAOCAg8AMIICCgKCAgEAvG+sL4q0VkgSClBTn4NkPiUrtXx5oLyZ+CCM1jrQx/xo + tUt5X2S4/7vMnAK/yRLsR7R2PhXO8CZPqJ7B6OfAgaDTgvipJkZYPZQSMP3KOinM + 3WJLssqKh7/HOxZIf0iyUXewrnX5eTAo/CLsUnhBjBD7E99nmQz/leLWSl82sSYD + kO3nUk3/1qJZA8iddb4uH0IEQWcNKev3WoQQzwiVrXBiftlRQOJy5JJXm5m8229M + CpMA1AUWmpdu6sl3/gFFdsDhUFq/a7LFrVyaUCMRIHg9szAB7ZFkixr9umQs8jKw + uo983JHB11h2SirwgfIzHHmyhaWhCt22ucTwEXGhq63LtrzZvLsfP8Ql5S+AuqGT + H0v8meuc784leAjulBZjkpuIFwDnVv9+YeUEbqJeo1hSHrILddora3nkH4E2dJWm + LpqpiPr++GRi+BNgYKW/BQLTJ7C6v+vUs+kdPgYJH5z7oP6f0YZkT0Wkubp/UEz7 + UV2dfjz57d77DYx5rFWGYzJriWR/xltgL1zDpjwjwG1FDpRqwlyYbBFpjQhxI+X0 + aT98m6fCzBDQHDb/+JgvsjTHh6OZatahFAwzFIEfrceDv1BG8sBWIaZGhLzYiWQx + afl8oXbWv1T6I1jpsTlCdCSkWzaJb4ZjxI9Ga1ynVu8F16+GR2a71wKWu7UbZQsC + AwEAATANBgkqhkiG9w0BAQsFAAOCAgEAzeGlFMz1Bo+bbpZDQ60HLdw7qDp3SPJi + x5LYG860yzbh9ghvyc59MIm5E6vB140LRJAs+Xo6VdVSTC4jUA2kI9k1BQsbZKds + XT0RqA7HkqcLS3t3JWFkkKbCshMGZTSZ//hpbaUG1qEAfUfmZw1lAxqSa0kqavbP + awf7k8qHbqcj7WORCdH7fjKAjntEQwIpl1GEkAdCSghOJz2/o9aWmiGZt27OM/sG + MLSrcmL3QBElCjOxg14P8rnsmZ+VEp6MO93otoJ4dJL7fN7vTIh5ThbS384at/4l + 4KK/y7XctUzAtWzhnodjk/NSgrrGX2kseOGOWEM1sZc9xtinHH2tpOMqtLVOkgHD + Lul+TArqgqeoOdEM/9OL64kgOrO/JzxBq+egLUi4wgAul2wmtecKZK1dkwYZHeqW + 74i55yeBp+TTomnPr0ZBns6xKFYldJVzC34OB+2YVDxe8y9XtWtuQOxFw0LQHhNb + zy5aBverWzZFwiIIjJoVHTQq848uKBJec0YILfMinS1Wjif4xqW/IMfi+GFS0oka + sKCGNE/8ur9u/Jm6cbto3f2dtV8/vkhiITQgwzM2jalyuVJ9jyPxG7EvbTvZORgw + pRvBRTd4/eE7I1L+UDe6x8EjR/MrqfF9FWVGOZo4vPTyNbrSWYBh6s9kYy56ds1l + IRxst1BXEfI= + -----END CERTIFICATE----- + ''; + "letsencrypt.org".key = builtins.toFile "letsencrypt.org.key" '' + -----BEGIN RSA PRIVATE KEY----- + MIIJKAIBAAKCAgEAwPvhlwemgPi6919sSD7Pz6l6CRfU1G/fDc0AvsMN/nTmiGND + pqn9ef1CA+RtLtOuPc1LLyEovcfu75/V+6KSgO4k19E2CrFCFwjEOWDGF4DgclT3 + 751WGmFJgzPEfZfhbOrmQfQau86KxAtNZVp9FxcKbuLyQ/sNNxfNMB+7IHbVhwvz + VcndHpYZEP6kdnwvNLP22bouX5q3avxWStln01uZ0BfUm4XwxaUNIU7t0Dv56FK9 + C9hW9AZae0do0BJBWRF7xSwLeDJqn9uZz+sX0X/tIaaSQSBuZySj0He5ZKzdUO0t + px2xTS2Brl3Y2BOJaOE98HubWvdKoslLt4X2rVrMxGa86SmFzcyDL1RSowcP/ruy + y555l7pepL5s4cmMgRBBXj5tXhqUTVOn5WO+JClLk+rtvtAT4rogJmMqEKmMw2t7 + LNy1W9ri/378QG/i3AGaLIL/7GsPbuRO51Sdti4QMVe2zNFze72mzNmj1SXokWy7 + +ZvjUMp55oEjRRsTPUZdNOEHJWy6Os2znuqL7ZpIHCxBG8FKnkCViXRJqAA8bzcE + hR+pLamLIOHlv4kdzJ6phHkSvK68qvbRReUmOjJgSupVBI9jhK+fHay/UWR4zfJQ + ed99H8ZOoiXlrLCVs+VPDynUUKrzF1nYyolNzi/NS4e4AbnfWgyC5JKRpjUCAwEA + AQKCAgB0fNYL+zM3MGxy+2d6KGf6GnuuV3NBlBGY3ACyJT0iNmAdPYXNaVi2tPeP + L+fz1xSa+3uBhEt6Wt/QRrO8g8JZDuawWvl69MpG6yS+2bpY35MbkExkl50sqULd + bncRtIb+3r+EWht099RtR8E9B6TwNhk3G8hO3pB4i+ZwQQcMLo7vSHhmdUYCu2mA + B6UwW/+GmYbMoARz8wj6DDzuS1LPksBCis/r3KqcMue9Dk6gXkOYR7ETIFBEVj1x + ooYS6qIFaHdEajS2JgCUY9LxXR/wdn6lzE0GANSDb+tt34bJzUp+Gdxvvo2SX4Ci + xsUokIpmA2gG7CW3gAPORSFuMu/VYZtvt+owNYlODXRPuGi/eLDknFRB/S4Nx0J0 + WZZq5uTgJdQainyKYtDZALia5X4cc5I2hNetCorG9jNZIsSunbIAG+htx2FI3eqK + jwOUiHE8SCZ6YdXoDQjg2w+g8jeB23eqkPyzunpZphYiKay7VFeLwQEMC2a791ln + +MbHhhpRAc1uAoU2reB2fxKyaPlOfAWVMgUOGlgpVOuEVeMoc1CwjajaFztGG7fI + 8EHNoyAftCdXnTaLZk2KZnnIDHHzFXR62TE1GJFD1fdI1pHAloCbgA4h+Dtwm1Uu + iAEEfvVU/E5wbtAzv6pY32+OKX5kyHAbM5/e918B8ZxmHG1J9QKCAQEA6FwxsRG3 + 526NnZak540yboht5kV12BNBChjmARv/XgZ7o1VsfwjaosErMvasUBcHDEYOC/oE + ZgPAyrMVsYm0xe/5FSIFLJVeYXTr0rmCNhVtBCHx3IS94BCXreNnz0qoEWnb5E09 + Z1O42D0yGcLXklg6QaJfb7EdHh03F3dSVMHyDR3JlAQHRINeuP6LlQpbvRD3adH5 + QWr2M3k+Stuq2OJdG7eUS1dreCxRShLuDjDhiZekdl/TB3LM0prOaWrKBrryN2g6 + mjiasH6I5zRD3LQP5zg57Thb8afHqA4Fb85Frt6ltfFlPTIoxXZ5drVhmRWfXXnQ + POnj8T+w4zVjvwKCAQEA1J4ivyFkCL0JTSY3/PtwAQvBBj3GazzU6P+urWeH74Vh + WK17Ae40iOUHGyy80Db/fVY4VLQTpxvAeG91Gj5Nd/AucXJgOrisabcEz6N/xUs5 + sjJNgXuNKTAgjYBu0bqLXxgZj43zT8JhA6KW7RuYU0PtHMRragz4RbK9NWDaVvJb + xSR5QoVLS00PerUa0SfupEYKCrlSTP6FOM5YNkCuSMt7X6/m9cR0WwVINKvUQBiT + ObrN+KeBmF9awpQQnQOq/GbCl3kf6VyPQqYFhdrWSg52w33c2tBVYrtHJpeXGcin + akw4KKcj4rdU2qxMuuRiD5paagshbLdGsYMTbSzjCwKCAQEAh89DGAyUIcfDLAWd + st0bSfGh0oJsw3NVg3JUFPfpRWqiny/Rr1pcd95RwoLc6h7bdrgHg8aJBZtR9ue/ + WTp0l3CQdGKjBZD0TiAJqevViIjzZAP3Gn3XgPwRu4f75/Pp0eu+o2zl49vSYUk7 + XEU+vIGm4y/leiHaM/y9c5DBZVrKgBIV/NZx7QCfv56/tMgOIK6m/YnFlw/OgP1v + hE9qR0PfSdD98x9QaDf290WjMFYvrL0eWjXd4S+fOcVTude55z8jTXE1N2i4OUpr + +D7bH0d7OBjr+pQDYXZAQyCW2ueEYRYvYu2Jz7/ehrOdgN25AsHZmMgXB1NpcFta + pyJQfwKCAQByoPMwworRH0GVg4Zp8RFYrwKZH9MK29gZ6kc9m/Sw0OND0PvhdZCD + QZ8MKpl9VDl4VHS4TgHOdWrWQ5kJ1g8kG6yeY0C4R/pEYHTKkWaAcucfSHl61qar + TxQt1dFpZz5evXqCZ9CG7tApCo5+NQNx2MxMVyVmHqn3wb66uYXdnHqXlet+Tqji + ZyByUpOrsfC6RjyBvZo+gnZGwxDR5xtPiczxML+/PvRQYk+kfgNHrzgoxqrnZT+8 + a6ReBT/TtzeHLsu4qIfo44slLqcJnIstkBC9ouzgV7PBMCDTEKVZNFH2QDOCz2HM + iHTKFFyl4h1wNhKK24dguor1hyqBENMzAoIBAAQvQHwRWIVlfCMRI170Ls8AXB9Z + MMdZJ37bh6kmJpkV3+HB1ZkKwofHKR9h/3xLt5iYXzqT+/zA4EAsFFs1A93+tkzh + yPrN5iTSJicophZSlA4ObX1hMkgshvl7ZB1fRM5WyiszBOfm8W7eAxaK8nY2oAoP + tI7rioo6CFBNMCGbOl4gEX6YJ4OsVSm+efCRSDDw+3HW8H2YgqufBzAULk1Jcj5t + ZvraXpC5qZ92VtsH0cGA1ovNDAmoOV4AAvtZVpLQsXwaphad/Fbn/ItGrrluvvFC + HuldRzYtl/AQtoirK86LTY3aAmcwVFuiYvDQMzjzkJvVMmRCFZBcUIaz2oI= + -----END RSA PRIVATE KEY----- + ''; + "letsencrypt.org".cert = builtins.toFile "letsencrypt.org.cert" '' + -----BEGIN CERTIFICATE----- + MIIEpzCCAo8CAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls + IENBMCAXDTE4MDcxMjAwMjIxOVoYDzIxMTgwNjE4MDAyMjE5WjAaMRgwFgYDVQQD + DA9sZXRzZW5jcnlwdC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC + AQDA++GXB6aA+Lr3X2xIPs/PqXoJF9TUb98NzQC+ww3+dOaIY0Omqf15/UID5G0u + 0649zUsvISi9x+7vn9X7opKA7iTX0TYKsUIXCMQ5YMYXgOByVPfvnVYaYUmDM8R9 + l+Fs6uZB9Bq7zorEC01lWn0XFwpu4vJD+w03F80wH7sgdtWHC/NVyd0elhkQ/qR2 + fC80s/bZui5fmrdq/FZK2WfTW5nQF9SbhfDFpQ0hTu3QO/noUr0L2Fb0Blp7R2jQ + EkFZEXvFLAt4Mmqf25nP6xfRf+0hppJBIG5nJKPQd7lkrN1Q7S2nHbFNLYGuXdjY + E4lo4T3we5ta90qiyUu3hfatWszEZrzpKYXNzIMvVFKjBw/+u7LLnnmXul6kvmzh + yYyBEEFePm1eGpRNU6flY74kKUuT6u2+0BPiuiAmYyoQqYzDa3ss3LVb2uL/fvxA + b+LcAZosgv/saw9u5E7nVJ22LhAxV7bM0XN7vabM2aPVJeiRbLv5m+NQynnmgSNF + GxM9Rl004QclbLo6zbOe6ovtmkgcLEEbwUqeQJWJdEmoADxvNwSFH6ktqYsg4eW/ + iR3MnqmEeRK8rryq9tFF5SY6MmBK6lUEj2OEr58drL9RZHjN8lB5330fxk6iJeWs + sJWz5U8PKdRQqvMXWdjKiU3OL81Lh7gBud9aDILkkpGmNQIDAQABMA0GCSqGSIb3 + DQEBCwUAA4ICAQAkx3jcryukAuYP7PQxMy3LElOl65ZFVqxDtTDlr7DvAkWJzVCb + g08L6Tu+K0rKh2RbG/PqS0+8/jBgc4IwSOPfDDAX+sinfj0kwXG34WMzB0G3fQzU + 2BMplJDOaBcNqHG8pLP1BG+9HAtR/RHe9p2Jw8LG2qmZs6uemPT/nCTNoyIL4oxh + UncjETV4ayCHDKD1XA7/icgddYsnfLQHWuIMuCrmQCHo0uQAd7qVHfUWZ+gcsZx0 + jTNCcaI8OTS2S65Bjaq2HaM7GMcUYNUD2vSyNQeQbha4ZeyZ9bPyFzznPMmrPXQe + MJdkbJ009RQIG9As79En4m+l+/6zrdx4DNdROqaL6YNiSebWMnuFHpMW/rCnhrT/ + HYadijHOiJJGj9tWSdC4XJs7fvZW3crMPUYxpOvl01xW2ZlgaekILi1FAjSMQVoV + NhWstdGCKJdthJqLL5MtNdfgihKcmgkJqKFXTkPv7sgAQCopu6X+S+srCgn856Lv + 21haRWZa8Ml+E0L/ticT8Fd8Luysc6K9TJ4mT8ENC5ywvgDlEkwBD3yvINXm5lg1 + xOIxv/Ye5gFk1knuM7OzpUFBrXUHdVVxflCUqNAhFPbcXwjgEQ+A+S5B0vI6Ohue + ZnR/wuiou6Y+Yzh8XfqL/3H18mGDdjyMXI1B6l4Judk000UVyr46cnI7mw== + -----END CERTIFICATE----- + ''; +} diff --git a/nixos/tests/common/resolver.nix b/nixos/tests/common/resolver.nix index a1901c5c8167c4cff2b82183b0bd36db15ada135..6be8d1d18e62214d915124c269fcf372295cf29e 100644 --- a/nixos/tests/common/resolver.nix +++ b/nixos/tests/common/resolver.nix @@ -18,7 +18,7 @@ defining this option needs to be explicitly imported. The reason this option exists is for the - nixos/tests/common/letsencrypt.nix module, which + nixos/tests/common/letsencrypt module, which needs that option to disable the resolver once the user has set its own resolver. ''; diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix index 93aeb60e456af2580f66b4f0d1321606ce273281..9cd531a1f96c8db94b686bedd6ce5c660bfbe315 100644 --- a/nixos/tests/common/user-account.nix +++ b/nixos/tests/common/user-account.nix @@ -1,12 +1,12 @@ -{ lib, ... }: +{ ... }: -{ users.extraUsers.alice = +{ users.users.alice = { isNormalUser = true; description = "Alice Foobar"; password = "foobar"; }; - users.extraUsers.bob = + users.users.bob = { isNormalUser = true; description = "Bob Foobar"; password = "foobar"; diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index dfef46a2ada495fc4ba814881b80e5f69949c9ce..bd8bd5dee9c88050067f7816235b4afbf817f397 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix index df3f3354b2d994f6f9733b13b5b333dd8b6aa7ff..8f874b3585dc4113e1c70a532fa1b617e3f3dc45 100644 --- a/nixos/tests/containers-extra_veth.nix +++ b/nixos/tests/containers-extra_veth.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix index df1ef6d149364bd8a2b0b8941e944a75c2ca6262..8cf298c6225837befd3c3ff85390ad531a3647c6 100644 --- a/nixos/tests/containers-hosts.nix +++ b/nixos/tests/containers-hosts.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, lib, ... }: + { lib, ... }: { virtualisation.memorySize = 256; virtualisation.vlans = []; diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 20902913e9a7b3a2488829c5e59856120ca489f4..913d8bed19d09be69ca4d0a07109eeffc145dfc5 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -9,18 +9,28 @@ import ./make-test.nix ({ pkgs, ...} : { machine = { config, pkgs, lib, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; + + # XXX: Sandbox setup fails while trying to hardlink files from the host's + # store file system into the prepared chroot directory. + nix.useSandbox = false; + virtualisation.writableStore = true; - virtualisation.memorySize = 768; + virtualisation.memorySize = 1024; # Make sure we always have all the required dependencies for creating a # container available within the VM, because we don't have network access. virtualisation.pathsInNixDB = let emptyContainer = import ../lib/eval-config.nix { - inherit (config.nixpkgs) system; + inherit (config.nixpkgs.localSystem) system; modules = lib.singleton { - containers.foo.config = {}; + containers.foo.config = { + system.stateVersion = "18.03"; + }; }; }; - in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ]; + in [ + pkgs.stdenv pkgs.stdenvNoCC emptyContainer.config.containers.foo.path + pkgs.libxslt + ]; }; testScript = diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix index 31d05990a679bced0fc7db074f791fdcba306483..4affe3d9d56dc34594757fd30a32ddf093ec51a0 100644 --- a/nixos/tests/containers-ipv4.nix +++ b/nixos/tests/containers-ipv4.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; @@ -21,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.httpd.adminAddr = "foo@example.org"; networking.firewall.allowedTCPPorts = [ 80 ]; networking.firewall.allowPing = true; + system.stateVersion = "18.03"; }; }; diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix index f676ed122bb3a6e55b6dea41bf1df7efbaeaeaec..7db389a18e72695444e6524c52db42ac900b568c 100644 --- a/nixos/tests/containers-ipv6.nix +++ b/nixos/tests/containers-ipv6.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix index 390dc4ad2c29c9e6eb199a4ab9b63eeac28db7da..2bdb926a8e2b7fe5870005198765915561b243e9 100644 --- a/nixos/tests/containers-macvlans.nix +++ b/nixos/tests/containers-macvlans.nix @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { machine1 = - { config, pkgs, lib, ... }: + { lib, ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; @@ -55,7 +55,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine2 = - { config, pkgs, ... }: + { ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix index bde8e175f9532121ed8e3f59016596d9601bb585..1e312f59f437ea4adaccff77687f92b7bf34c168 100644 --- a/nixos/tests/containers-physical_interfaces.nix +++ b/nixos/tests/containers-physical_interfaces.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - server = { config, pkgs, ... }: + server = { ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; @@ -23,7 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; }; - bridged = { config, pkgs, ... }: { + bridged = { ... }: { virtualisation.memorySize = 128; virtualisation.vlans = [ 1 ]; @@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - bonded = { config, pkgs, ... }: { + bonded = { ... }: { virtualisation.memorySize = 128; virtualisation.vlans = [ 1 ]; @@ -62,7 +62,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - bridgedbond = { config, pkgs, ... }: { + bridgedbond = { ... }: { virtualisation.memorySize = 128; virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix index 78cc445c2dd069b762ec528c6fc59b2069171cce..be83f82445edc8338731f14ef4363f8be8d4fc54 100644 --- a/nixos/tests/containers-portforward.nix +++ b/nixos/tests/containers-portforward.nix @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix index 5fb42f2272b357ef67e6440bce3a49a76c60a0b0..9726ca0cb0e7663d36d509d82bcbea1eb5240421 100644 --- a/nixos/tests/containers-reloadable.nix +++ b/nixos/tests/containers-reloadable.nix @@ -21,11 +21,11 @@ in { }; nodes = { - client = { lib, pkgs, ... }: { + client = { ... }: { imports = [ client_base ]; }; - client_c1 = { lib, pkgs, ... }: { + client_c1 = { lib, ... }: { imports = [ client_base ]; containers.test1.config = { @@ -34,7 +34,7 @@ in { services.httpd.adminAddr = "nixos@example.com"; }; }; - client_c2 = { lib, pkgs, ... }: { + client_c2 = { lib, ... }: { imports = [ client_base ]; containers.test1.config = { @@ -45,7 +45,6 @@ in { }; testScript = {nodes, ...}: let - originalSystem = nodes.client.config.system.build.toplevel; c1System = nodes.client_c1.config.system.build.toplevel; c2System = nodes.client_c2.config.system.build.toplevel; in '' diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix index f68c9b07759b2185ea2085289b37336653bed06d..aeb0a6e68e216063c5d8743f0854e52123cdbd04 100644 --- a/nixos/tests/containers-restart_networking.nix +++ b/nixos/tests/containers-restart_networking.nix @@ -17,7 +17,7 @@ let }; }; }; -in import ./make-test.nix ({ pkgs, lib, ...} : +in import ./make-test.nix ({ pkgs, ...} : { name = "containers-restart_networking"; meta = with pkgs.stdenv.lib.maintainers; { @@ -25,7 +25,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} : }; nodes = { - client = { lib, pkgs, ... }: client_base // { + client = { lib, ... }: client_base // { virtualisation.vlans = [ 1 ]; networking.bridges.br0 = { @@ -38,7 +38,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} : }; }; - client_eth1 = { lib, pkgs, ... }: client_base // { + client_eth1 = { lib, ... }: client_base // { networking.bridges.br0 = { interfaces = [ "eth1" ]; rstp = false; @@ -48,7 +48,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} : br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; }; }; - client_eth1_rstp = { lib, pkgs, ... }: client_base // { + client_eth1_rstp = { lib, ... }: client_base // { networking.bridges.br0 = { interfaces = [ "eth1" ]; rstp = true; diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index 873dd364369fb27a55dde8241df5c7ccd93e4c13..05c21f4907bf5d7dcc0bbce75023b5a7ae82e4e1 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/couchdb.nix b/nixos/tests/couchdb.nix index a3f675236bc6fc2cc3d7c3255d7aaf47459fbb87..48ea48eebbb31cc777b1662c9b72fef0914f160d 100644 --- a/nixos/tests/couchdb.nix +++ b/nixos/tests/couchdb.nix @@ -10,14 +10,14 @@ with lib; nodes = { couchdb1 = - { pkgs, config, ... }: + { pkgs, ... }: { environment.systemPackages = with pkgs; [ jq ]; services.couchdb.enable = true; }; couchdb2 = - { pkgs, config, ... }: + { pkgs, ... }: { environment.systemPackages = with pkgs; [ jq ]; services.couchdb.enable = true; diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix new file mode 100644 index 0000000000000000000000000000000000000000..b4be5e465cc03a2383691c9c1356e2a9784d08b3 --- /dev/null +++ b/nixos/tests/deluge.nix @@ -0,0 +1,29 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "deluge"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ flokli ]; + }; + + nodes = { + server = + { ... }: + + { services.deluge = { + enable = true; + web.enable = true; + }; + networking.firewall.allowedTCPPorts = [ 8112 ]; + }; + + client = { }; + }; + + testScript = '' + startAll; + + $server->waitForUnit("deluged"); + $server->waitForUnit("delugeweb"); + $client->waitForUnit("network.target"); + $client->waitUntilSucceeds("curl --fail http://server:8112"); + ''; +}) diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix new file mode 100644 index 0000000000000000000000000000000000000000..d11dfeec5d0c178af286bfa4dd7601e8de4ff265 --- /dev/null +++ b/nixos/tests/dhparams.nix @@ -0,0 +1,144 @@ +let + common = { pkgs, ... }: { + security.dhparams.enable = true; + environment.systemPackages = [ pkgs.openssl ]; + }; + +in import ./make-test.nix { + name = "dhparams"; + + nodes.generation1 = { pkgs, config, ... }: { + imports = [ common ]; + security.dhparams.params = { + # Use low values here because we don't want the test to run for ages. + foo.bits = 16; + # Also use the old format to make sure the type is coerced in the right + # way. + bar = 17; + }; + + systemd.services.foo = { + description = "Check systemd Ordering"; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + # This is to make sure that the dhparams generation of foo occurs + # before this service so we need this service to start as early as + # possible to provoke a race condition. + DefaultDependencies = false; + + # We check later whether the service has been started or not. + ConditionPathExists = config.security.dhparams.params.foo.path; + }; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + # The reason we only provide an ExecStop here is to ensure that we don't + # accidentally trigger an error because a file system is not yet ready + # during very early startup (we might not even have the Nix store + # available, for example if future changes in NixOS use systemd mount + # units to do early file system initialisation). + serviceConfig.ExecStop = "${pkgs.coreutils}/bin/true"; + }; + }; + + nodes.generation2 = { + imports = [ common ]; + security.dhparams.params.foo.bits = 18; + }; + + nodes.generation3 = common; + + nodes.generation4 = { + imports = [ common ]; + security.dhparams.stateful = false; + security.dhparams.params.foo2.bits = 18; + security.dhparams.params.bar2.bits = 19; + }; + + nodes.generation5 = { + imports = [ common ]; + security.dhparams.defaultBitSize = 30; + security.dhparams.params.foo3 = {}; + security.dhparams.params.bar3 = {}; + }; + + testScript = { nodes, ... }: let + getParamPath = gen: name: let + node = "generation${toString gen}"; + in nodes.${node}.config.security.dhparams.params.${name}.path; + + assertParamBits = gen: name: bits: let + path = getParamPath gen name; + in '' + $machine->nest('check bit size of ${path}', sub { + my $out = $machine->succeed('openssl dhparam -in ${path} -text'); + $out =~ /^\s*DH Parameters:\s+\((\d+)\s+bit\)\s*$/m; + die "bit size should be ${toString bits} but it is $1 instead." + if $1 != ${toString bits}; + }); + ''; + + switchToGeneration = gen: let + node = "generation${toString gen}"; + inherit (nodes.${node}.config.system.build) toplevel; + switchCmd = "${toplevel}/bin/switch-to-configuration test"; + in '' + $machine->nest('switch to generation ${toString gen}', sub { + $machine->succeed('${switchCmd}'); + $main::machine = ''$${node}; + }); + ''; + + in '' + my $machine = $generation1; + + $machine->waitForUnit('multi-user.target'); + + subtest "verify startup order", sub { + $machine->succeed('systemctl is-active foo.service'); + }; + + subtest "check bit sizes of dhparam files", sub { + ${assertParamBits 1 "foo" 16} + ${assertParamBits 1 "bar" 17} + }; + + ${switchToGeneration 2} + + subtest "check whether bit size has changed", sub { + ${assertParamBits 2 "foo" 18} + }; + + subtest "ensure that dhparams file for 'bar' was deleted", sub { + $machine->fail('test -e ${getParamPath 1 "bar"}'); + }; + + ${switchToGeneration 3} + + subtest "ensure that 'security.dhparams.path' has been deleted", sub { + $machine->fail( + 'test -e ${nodes.generation3.config.security.dhparams.path}' + ); + }; + + ${switchToGeneration 4} + + subtest "check bit sizes dhparam files", sub { + ${assertParamBits 4 "foo2" 18} + ${assertParamBits 4 "bar2" 19} + }; + + subtest "check whether dhparam files are in the Nix store", sub { + $machine->succeed( + 'expr match ${getParamPath 4 "foo2"} ${builtins.storeDir}', + 'expr match ${getParamPath 4 "bar2"} ${builtins.storeDir}', + ); + }; + + ${switchToGeneration 5} + + subtest "check whether defaultBitSize works as intended", sub { + ${assertParamBits 5 "foo3" 30} + ${assertParamBits 5 "bar3" 30} + }; + ''; +} diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix index 845623368250cf405125d2b28ee6c392f3dc8f60..13bc9d3d9168d26cf7c6e7ffd95a76c6119b3b92 100644 --- a/nixos/tests/dnscrypt-proxy.nix +++ b/nixos/tests/dnscrypt-proxy.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: { # A client running the recommended setup: DNSCrypt proxy as a forwarder # for a caching DNS client. client = - { config, pkgs, ... }: + { ... }: let localProxyPort = 43; in { security.apparmor.enable = true; @@ -26,7 +26,8 @@ import ./make-test.nix ({ pkgs, ... }: { $client->waitForUnit("dnsmasq"); # The daemon is socket activated; sending a single ping should activate it. + $client->fail("systemctl is-active dnscrypt-proxy"); $client->execute("${pkgs.iputils}/bin/ping -c1 example.com"); - $client->succeed("systemctl is-active dnscrypt-proxy"); + $client->waitUntilSucceeds("systemctl is-active dnscrypt-proxy"); ''; }) diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix index 38d25daff194c34104c9c0d5420740f54575734a..b306c149be91a48b09291e7d07ef215ebbc09b57 100644 --- a/nixos/tests/docker-edge.nix +++ b/nixos/tests/docker-edge.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { docker = - { config, pkgs, ... }: + { pkgs, ... }: { virtualisation.docker.enable = true; virtualisation.docker.package = pkgs.docker-edge; diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index 109fca440e57e0813ba9a888fcaa7bedc72fe2b7..8936421072a992ff0079cb9ee42f2dbcc0d1318d 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -3,23 +3,25 @@ import ./make-test.nix ({ pkgs, ...} : { name = "docker-registry"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ globin ]; + maintainers = [ globin ma27 ironpinguin ]; }; nodes = { - registry = { config, pkgs, ... }: { + registry = { ... }: { services.dockerRegistry.enable = true; + services.dockerRegistry.enableDelete = true; services.dockerRegistry.port = 8080; services.dockerRegistry.listenAddress = "0.0.0.0"; + services.dockerRegistry.enableGarbageCollect = true; networking.firewall.allowedTCPPorts = [ 8080 ]; }; - client1 = { config, pkgs, ...}: { + client1 = { ... }: { virtualisation.docker.enable = true; virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; }; - client2 = { config, pkgs, ...}: { + client2 = { ... }: { virtualisation.docker.enable = true; virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; }; @@ -33,11 +35,29 @@ import ./make-test.nix ({ pkgs, ...} : { $registry->start(); $registry->waitForUnit("docker-registry.service"); + $registry->waitForOpenPort("8080"); $client1->succeed("docker push registry:8080/scratch"); $client2->start(); $client2->waitForUnit("docker.service"); $client2->succeed("docker pull registry:8080/scratch"); $client2->succeed("docker images | grep scratch"); + + $client2->succeed( + 'curl -fsS -X DELETE registry:8080/v2/scratch/manifests/$(curl -fsS -I -H"Accept: application/vnd.docker.distribution.manifest.v2+json" registry:8080/v2/scratch/manifests/latest | grep Docker-Content-Digest | sed -e \'s/Docker-Content-Digest: //\' | tr -d \'\r\')' + ); + + $registry->systemctl("start docker-registry-garbage-collect.service"); + $registry->waitUntilFails("systemctl status docker-registry-garbage-collect.service"); + $registry->waitForUnit("docker-registry.service"); + + $registry->fail( + 'ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data' + ); + + $client1->succeed("docker push registry:8080/scratch"); + $registry->succeed( + 'ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data' + ); ''; }) diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix new file mode 100644 index 0000000000000000000000000000000000000000..637957bd3e8b3082a29bf110e4ef47c40a27ee29 --- /dev/null +++ b/nixos/tests/docker-tools-overlay.nix @@ -0,0 +1,32 @@ +# this test creates a simple GNU image with docker tools and sees if it executes + +import ./make-test.nix ({ pkgs, ... }: +{ + name = "docker-tools-overlay"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lnl7 ]; + }; + + nodes = { + docker = + { ... }: + { + virtualisation.docker.enable = true; + virtualisation.docker.storageDriver = "overlay"; # defaults to overlay2 + }; + }; + + testScript = + '' + $docker->waitForUnit("sockets.target"); + + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version"); + + # Check if the nix store has correct user permissions depending on what + # storage driver is used, incorrectly built images can show up as readonly. + # drw------- 3 0 0 3 Apr 14 11:36 /nix + # drw------- 99 0 0 100 Apr 14 11:36 /nix/store + $docker->succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version"); + ''; +}) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 9135bca0f4f6b40eb732e2b1eab9f26f76f133fa..db4eacc37287f6079d9476ece5d0e86d16074e98 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -3,12 +3,12 @@ import ./make-test.nix ({ pkgs, ... }: { name = "docker-tools"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ]; + maintainers = [ lnl7 ]; }; nodes = { docker = - { config, pkgs, ... }: { + { ... }: { virtualisation = { diskSize = 2048; docker.enable = true; @@ -21,12 +21,12 @@ import ./make-test.nix ({ pkgs, ... }: { $docker->waitForUnit("sockets.target"); $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); - $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} /bin/bash --version"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version"); $docker->succeed("docker rmi ${pkgs.dockerTools.examples.bash.imageName}"); # Check if the nix store is correctly initialized by listing dependencies of the installed Nix binary $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nix}'"); - $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.nix.imageName} /bin/nix-store -qR ${pkgs.nix}"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.nix.imageName} nix-store -qR ${pkgs.nix}"); $docker->succeed("docker rmi ${pkgs.dockerTools.examples.nix.imageName}"); # To test the pullImage tool @@ -45,5 +45,11 @@ import ./make-test.nix ({ pkgs, ... }: { $docker->succeed("docker load --input='${pkgs.dockerTools.examples.onTopOfPulledImage}'"); $docker->succeed("docker run --rm ontopofpulledimage hello"); $docker->succeed("docker rmi ontopofpulledimage"); + + # Regression test for issue #34779 + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.runAsRootExtraCommands}'"); + $docker->succeed("docker run --rm runasrootextracommands cat extraCommands"); + $docker->succeed("docker run --rm runasrootextracommands cat runAsRoot"); + $docker->succeed("docker rmi '${pkgs.dockerTools.examples.runAsRootExtraCommands.imageName}'"); ''; }) diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index c6c8f4cdb5fb9c4590cabe87b6104b300a3a112f..d67b2f8743d80644e38bcbd661da77bb0f7d9715 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { docker = - { config, pkgs, ... }: + { pkgs, ... }: { virtualisation.docker.enable = true; virtualisation.docker.package = pkgs.docker; diff --git a/nixos/tests/dovecot.nix b/nixos/tests/dovecot.nix index 3814855ed8e70ad609a774747e7a68a51dde5a1c..156079d1d585d57f1ea9f6326097f5bf5ffd450b 100644 --- a/nixos/tests/dovecot.nix +++ b/nixos/tests/dovecot.nix @@ -18,6 +18,18 @@ import ./make-test.nix { MAIL ''; + sendTestMailViaDeliveryAgent = pkgs.writeScriptBin "send-lda" '' + #!${pkgs.stdenv.shell} + + exec ${pkgs.dovecot}/libexec/dovecot/deliver -d bob <waitForUnit('postfix.service'); $machine->waitForUnit('dovecot2.service'); $machine->succeed('send-testmail'); + $machine->succeed('send-lda'); $machine->waitUntilFails('[ "$(postqueue -p)" != "Mail queue is empty" ]'); $machine->succeed('test-imap'); $machine->succeed('test-pop'); diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index f585fa2ec237bb83e60f4f531520e828b450bc77..8271747ccc631aa29e65c75897f2e5c4417d25de 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -68,7 +68,9 @@ let # again when it deletes link-local addresses.) Ideally we'd # turn off the DHCP server, but qemu does not have an option # to do that. - my $startCommand = "qemu-kvm -m 768 -net nic,vlan=0,model=virtio -net 'user,vlan=0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"; + my $startCommand = "qemu-kvm -m 768"; + $startCommand .= " -device virtio-net-pci,netdev=vlan0"; + $startCommand .= " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"; $startCommand .= " -drive file=$diskImage,if=virtio,werror=report"; $startCommand .= " \$QEMU_OPTS"; diff --git a/nixos/tests/ecryptfs.nix b/nixos/tests/ecryptfs.nix index 041be0f5a62460f2007a1fb2f23bc19ea6150209..3f02cecb8662d9508157f48154b48320852494e3 100644 --- a/nixos/tests/ecryptfs.nix +++ b/nixos/tests/ecryptfs.nix @@ -1,8 +1,8 @@ -import ./make-test.nix ({ pkgs, ... }: +import ./make-test.nix ({ ... }: { name = "ecryptfs"; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { imports = [ ./common/user-account.nix ]; boot.kernelModules = [ "ecryptfs" ]; security.pam.enableEcryptfs = true; diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index ed656b3628b9edc8f96a73484ecdae5c01a80861..15be72b80bbad5d99518eaffd4150a48fdb409a9 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -1,4 +1,4 @@ -{ system ? builtins.currentSystem }: +{ system ? builtins.currentSystem, enableUnfree ? false }: with import ../lib/testing.nix { inherit system; }; with pkgs.lib; let @@ -11,7 +11,7 @@ let }; nodes = { one = - { config, pkgs, ... }: { + { pkgs, ... }: { # Not giving the machine at least 2060MB results in elasticsearch failing with the following error: # # OpenJDK 64-Bit Server VM warning: @@ -63,6 +63,33 @@ let package = elk.kibana; elasticsearch.url = esUrl; }; + + elasticsearch-curator = { + enable = true; + actionYAML = '' + --- + actions: + 1: + action: delete_indices + description: >- + Delete indices older than 1 second (based on index name), for logstash- + prefixed indices. Ignore the error if the filter does not result in an + actionable list of indices (ignore_empty_list) and exit cleanly. + options: + ignore_empty_list: True + disable_action: False + filters: + - filtertype: pattern + kind: prefix + value: logstash- + - filtertype: age + source: name + direction: older + timestring: '%Y.%m.%d' + unit: seconds + unit_count: 1 + ''; + }; }; }; }; @@ -91,6 +118,11 @@ let # See if logstash messages arive in elasticsearch. $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0"); $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0"); + + # Test elasticsearch-curator. + $one->systemctl("stop logstash"); + $one->systemctl("start elasticsearch-curator"); + $one->waitUntilSucceeds("! curl --silent --show-error '${esUrl}/_cat/indices' | grep logstash | grep -q ^$1"); ''; }; in mapAttrs mkElkTest { @@ -99,9 +131,16 @@ in mapAttrs mkElkTest { logstash = pkgs.logstash5; kibana = pkgs.kibana5; }; - "ELK-6" = { - elasticsearch = pkgs.elasticsearch6; - logstash = pkgs.logstash6; - kibana = pkgs.kibana6; - }; + "ELK-6" = + if enableUnfree + then { + elasticsearch = pkgs.elasticsearch6; + logstash = pkgs.logstash6; + kibana = pkgs.kibana6; + } + else { + elasticsearch = pkgs.elasticsearch6-oss; + logstash = pkgs.logstash6-oss; + kibana = pkgs.kibana6-oss; + }; } diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix index 466e772a881f3240ce86b47a55ca83d9d89ac7e9..3594e35e343c5f0261093206e75bb704c939cdf5 100644 --- a/nixos/tests/emacs-daemon.nix +++ b/nixos/tests/emacs-daemon.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { enableOCR = true; machine = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/x11.nix ]; services.emacs = { diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix index c6b0424e97b93870802fddfd0c0587545c7086d7..064c498204aecec3b8e21e8f6f8afdb51f30f68e 100644 --- a/nixos/tests/env.nix +++ b/nixos/tests/env.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ nequissimus ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages; environment.etc."plainFile".text = '' diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix index 3971997a9bf794c1c0caca7e2f49147433a5510b..3c4de5950a79f9f69077bb131ab32403c0bc2c3a 100644 --- a/nixos/tests/etcd-cluster.nix +++ b/nixos/tests/etcd-cluster.nix @@ -102,7 +102,7 @@ in { }; nodes = { - node1 = { config, pkgs, nodes, ... }: { + node1 = { ... }: { require = [nodeConfig]; services.etcd = { initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"]; @@ -110,7 +110,7 @@ in { }; }; - node2 = { config, pkgs, ... }: { + node2 = { ... }: { require = [nodeConfig]; services.etcd = { initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"]; @@ -118,7 +118,7 @@ in { }; }; - node3 = { config, pkgs, ... }: { + node3 = { ... }: { require = [nodeConfig]; services.etcd = { initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380" "node3=https://node3:2380"]; diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix index f8a6791a834f7f79f81dc1ceb8f4c3712ddd2e1c..6c23b31779bc5accb95a57cdc77b94129a77e552 100644 --- a/nixos/tests/etcd.nix +++ b/nixos/tests/etcd.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = { - node = { config, pkgs, nodes, ... }: { + node = { ... }: { services.etcd.enable = true; }; }; diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix index bb7daae118c0845864ce9415b0a49e7fb659d80b..24b74df85ad1d6f7c6b1804d968558722ab2fb67 100644 --- a/nixos/tests/ferm.nix +++ b/nixos/tests/ferm.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { client = - { config, pkgs, ... }: + { pkgs, ... }: with pkgs.lib; { networking = { @@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; server = - { config, pkgs, ... }: + { pkgs, ... }: with pkgs.lib; { networking = { diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index e1b628c91445625cec04d701bdcf045c31566f58..58a80243ea9c729a445c64bcbb62bbdec0e77ff7 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/x11.nix ]; environment.systemPackages = [ pkgs.firefox pkgs.xdotool ]; diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix index 1119a5312eb5b54efb1f350a83fdfcd839ec1bd5..7207a880d8e2f4ec7c9a1c8ef33eff801e27a744 100644 --- a/nixos/tests/firewall.nix +++ b/nixos/tests/firewall.nix @@ -8,7 +8,7 @@ import ./make-test.nix ( { pkgs, ... } : { nodes = { walled = - { config, pkgs, nodes, ... }: + { ... }: { networking.firewall.enable = true; networking.firewall.logRefusedPackets = true; services.httpd.enable = true; @@ -20,13 +20,13 @@ import ./make-test.nix ( { pkgs, ... } : { # original walled configuration so that there is a change in the service # file. walled2 = - { config, pkgs, nodes, ... }: + { ... }: { networking.firewall.enable = true; networking.firewall.rejectPackets = true; }; attacker = - { config, pkgs, ... }: + { ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; networking.firewall.enable = false; diff --git a/nixos/tests/flannel.nix b/nixos/tests/flannel.nix index 7f27903a3026c2a72743c7409bd50af69add966f..fb66fe282090e1fd97a75a42b1b82c79c2819a61 100644 --- a/nixos/tests/flannel.nix +++ b/nixos/tests/flannel.nix @@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { networking.firewall.allowedUDPPorts = [ 8472 ]; }; in { - etcd = { config, pkgs, ... }: { + etcd = { ... }: { services = { etcd = { enable = true; @@ -31,11 +31,11 @@ import ./make-test.nix ({ pkgs, ...} : rec { networking.firewall.allowedTCPPorts = [ 2379 ]; }; - node1 = { config, ... }: { + node1 = { ... }: { require = [flannelConfig]; }; - node2 = { config, ... }: { + node2 = { ... }: { require = [flannelConfig]; }; }; diff --git a/nixos/tests/flatpak.nix b/nixos/tests/flatpak.nix new file mode 100644 index 0000000000000000000000000000000000000000..096b37e6e2cb723c7b31ec12c420a1b0a2951495 --- /dev/null +++ b/nixos/tests/flatpak.nix @@ -0,0 +1,24 @@ +# run installed tests +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "flatpak"; + meta = { + maintainers = pkgs.flatpak.meta.maintainers; + }; + + machine = { pkgs, ... }: { + imports = [ ./common/x11.nix ]; + services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work + environment.gnome3.excludePackages = pkgs.gnome3.optionalPackages; + services.flatpak.enable = true; + environment.systemPackages = with pkgs; [ gnupg gnome-desktop-testing ostree python2 ]; + virtualisation.memorySize = 2047; + virtualisation.diskSize = 1024; + }; + + testScript = '' + $machine->waitForX(); + $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.flatpak.installedTests}/share' --timeout 3600"); + ''; +}) diff --git a/nixos/tests/fleet.nix b/nixos/tests/fleet.nix deleted file mode 100644 index 67c95446526f88c08b5797e52a3780b4d8a21abe..0000000000000000000000000000000000000000 --- a/nixos/tests/fleet.nix +++ /dev/null @@ -1,76 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : rec { - name = "simple"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ offline ]; - }; - - nodes = { - node1 = - { config, pkgs, ... }: - { - services = { - etcd = { - enable = true; - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://node1:7001"]; - initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; - }; - }; - - services.fleet = { - enable = true; - metadata.name = "node1"; - }; - - networking.firewall.allowedTCPPorts = [ 7001 ]; - }; - - node2 = - { config, pkgs, ... }: - { - services = { - etcd = { - enable = true; - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://node2:7001"]; - initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; - }; - }; - - services.fleet = { - enable = true; - metadata.name = "node2"; - }; - - networking.firewall.allowedTCPPorts = [ 7001 ]; - }; - }; - - service = builtins.toFile "hello.service" '' - [Unit] - Description=Hello World - - [Service] - ExecStart=/bin/sh -c "while true; do echo \"Hello, world\"; /var/run/current-system/sw/bin/sleep 1; done" - - [X-Fleet] - MachineMetadata=name=node2 - ''; - - testScript = - '' - startAll; - $node1->waitForUnit("fleet.service"); - $node2->waitForUnit("fleet.service"); - - $node2->waitUntilSucceeds("fleetctl list-machines | grep node1"); - $node1->waitUntilSucceeds("fleetctl list-machines | grep node2"); - - $node1->succeed("cp ${service} hello.service && fleetctl submit hello.service"); - $node1->succeed("fleetctl list-unit-files | grep hello"); - $node1->succeed("fleetctl start hello.service"); - $node1->waitUntilSucceeds("fleetctl list-units | grep running"); - $node1->succeed("fleetctl stop hello.service"); - $node1->succeed("fleetctl destroy hello.service"); - ''; -}) diff --git a/nixos/tests/fsck.nix b/nixos/tests/fsck.nix new file mode 100644 index 0000000000000000000000000000000000000000..f943bb7f235008f475d52358968a398187011a5b --- /dev/null +++ b/nixos/tests/fsck.nix @@ -0,0 +1,29 @@ +import ./make-test.nix { + name = "fsck"; + + machine = { lib, ... }: { + virtualisation.emptyDiskImages = [ 1 ]; + + fileSystems = lib.mkVMOverride { + "/mnt" = { + device = "/dev/vdb"; + fsType = "ext4"; + autoFormat = true; + }; + }; + }; + + testScript = '' + $machine->waitForUnit('default.target'); + + subtest "root fs is fsckd", sub { + $machine->succeed('journalctl -b | grep "fsck.ext4.*/dev/vda"'); + }; + + subtest "mnt fs is fsckd", sub { + $machine->succeed('journalctl -b | grep "fsck.*/dev/vdb.*clean"'); + $machine->succeed('grep "Requires=systemd-fsck@dev-vdb.service" /run/systemd/generator/mnt.mount'); + $machine->succeed('grep "After=systemd-fsck@dev-vdb.service" /run/systemd/generator/mnt.mount'); + }; + ''; +} diff --git a/nixos/tests/fwupd.nix b/nixos/tests/fwupd.nix index bf4ef25130b3da722e088c1b602ddfc024720736..2e64149b2db3aab89efc569d11b30dd31cccb952 100644 --- a/nixos/tests/fwupd.nix +++ b/nixos/tests/fwupd.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: { maintainers = pkgs.fwupd.meta.maintainers; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { services.fwupd.enable = true; environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; environment.variables.XDG_DATA_DIRS = [ "${pkgs.fwupd.installedTests}/share" ]; diff --git a/nixos/tests/gdk-pixbuf.nix b/nixos/tests/gdk-pixbuf.nix new file mode 100644 index 0000000000000000000000000000000000000000..b20f61b5ffe26010dcdb96544a537485df513d71 --- /dev/null +++ b/nixos/tests/gdk-pixbuf.nix @@ -0,0 +1,19 @@ +# run installed tests +import ./make-test.nix ({ pkgs, ... }: { + name = "gdk-pixbuf"; + + meta = { + maintainers = pkgs.gdk_pixbuf.meta.maintainers; + }; + + machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; + environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ]; + + virtualisation.memorySize = 4096; # Tests allocate a lot of memory trying to exploit a CVE + }; + + testScript = '' + $machine->succeed("gnome-desktop-testing-runner"); + ''; +}) diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 7268636b62ad0c7dd0bd818097ec4312b8b0e768..3af2cbcd098850b5799c85b2f76432fe45728b67 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - gitlab = { config, pkgs, ... }: { + gitlab = { ... }: { virtualisation.memorySize = 768; services.nginx = { diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix index 4b4e081acc5fb1f26775e90361f77aeba3e2a86e..690e456ed7c86e561312a79dee65038b19410a62 100644 --- a/nixos/tests/gitolite.nix +++ b/nixos/tests/gitolite.nix @@ -58,7 +58,7 @@ in nodes = { server = - { config, pkgs, lib, ... }: + { ... }: { services.gitolite = { enable = true; @@ -68,7 +68,7 @@ in }; client = - { config, pkgs, lib, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.git ]; programs.ssh.extraConfig = '' @@ -78,8 +78,8 @@ in # there's nobody around that can input password PreferredAuthentications publickey ''; - users.extraUsers.alice = { isNormalUser = true; }; - users.extraUsers.bob = { isNormalUser = true; }; + users.users.alice = { isNormalUser = true; }; + users.users.bob = { isNormalUser = true; }; }; }; diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix index 4b459e93e1be613fc395a317d551a94a766d3141..1f590f337fd9034e92d1d803cbb70c3bc3f99f80 100644 --- a/nixos/tests/gnome3-gdm.nix +++ b/nixos/tests/gnome3-gdm.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/user-account.nix ]; @@ -26,15 +26,22 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = '' + # wait for gdm to start and bring up X + $machine->waitForUnit("display-manager.service"); $machine->waitForX; - $machine->sleep(15); + + # wait for alice to be logged in + $machine->waitForUnit("default.target","alice"); # Check that logging in has given the user ownership of devices. $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); - $machine->succeed("xauth merge ~alice/.Xauthority"); + # open a terminal and check it's there + $machine->succeed("su - alice -c 'DISPLAY=:0.0 XAUTHORITY=/run/user/\$UID/gdm/Xauthority gnome-terminal'"); + $machine->succeed("xauth merge /run/user/1000/gdm/Xauthority"); $machine->waitForWindow(qr/Terminal/); + + # wait to get a nice screenshot $machine->sleep(20); $machine->screenshot("screen"); ''; diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index 492fa61484a0f82e6a6e153c614d5e302614e3b5..af2404bf530c8d933f30020b2fcb9d9126d29ecd 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -5,15 +5,17 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; - services.xserver.displayManager.auto.enable = true; - services.xserver.displayManager.auto.user = "alice"; + services.xserver.displayManager.lightdm.enable = true; + services.xserver.displayManager.lightdm.autoLogin.enable = true; + services.xserver.displayManager.lightdm.autoLogin.user = "alice"; services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.default = "gnome"; virtualisation.memorySize = 1024; }; @@ -21,7 +23,9 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = '' $machine->waitForX; - $machine->sleep(15); + + # wait for alice to be logged in + $machine->waitForUnit("default.target","alice"); # Check that logging in has given the user ownership of devices. $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); diff --git a/nixos/tests/gocd-agent.nix b/nixos/tests/gocd-agent.nix index 5cadff0899504397e20244926b8d83264b2b2b14..50470379576b1039c79bbb7b9a36530cd7890fba 100644 --- a/nixos/tests/gocd-agent.nix +++ b/nixos/tests/gocd-agent.nix @@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { gocd_agent = - { config, pkgs, ... }: + { ... }: { virtualisation.memorySize = 2046; services.gocd-agent = { diff --git a/nixos/tests/gocd-server.nix b/nixos/tests/gocd-server.nix index b473d4ad61c79f3d39a08d80f24936869dc0425a..80cf04ed64049339968226d60d7e7a1051db8a1d 100644 --- a/nixos/tests/gocd-server.nix +++ b/nixos/tests/gocd-server.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : nodes = { gocd_server = - { config, pkgs, ... }: + { ... }: { virtualisation.memorySize = 2046; services.gocd-server.enable = true; diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix index d45776c3ee29333b898ab1fa3c29e178df99900b..9dc765a879bcf99d71745b9f6a61d99c48e1c979 100644 --- a/nixos/tests/grafana.nix +++ b/nixos/tests/grafana.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ lib, ... }: maintainers = [ willibutz ]; }; - machine = { config, pkgs, ... }: { + machine = { ... }: { services.grafana = { enable = true; addr = "localhost"; diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index a22ef224580a7852a9e82de7105ec8012864ebcf..27a87bdbb9f29177fb4c8a730410865a5c8f39e8 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -1,19 +1,22 @@ -import ./make-test.nix ({ pkgs, ...} : +import ./make-test.nix ({ pkgs, ... } : { name = "graphite"; nodes = { one = - { config, pkgs, ... }: { + { ... }: { + virtualisation.memorySize = 1024; time.timeZone = "UTC"; services.graphite = { web.enable = true; api = { enable = true; port = 8082; + finders = [ pkgs.python27Packages.influxgraph ]; }; carbon.enableCache = true; seyren.enable = true; pager.enable = true; + beacon.enable = true; }; }; }; @@ -21,12 +24,18 @@ import ./make-test.nix ({ pkgs, ...} : testScript = '' startAll; $one->waitForUnit("default.target"); - $one->requireActiveUnit("graphiteWeb.service"); - $one->requireActiveUnit("graphiteApi.service"); - $one->requireActiveUnit("graphitePager.service"); - $one->requireActiveUnit("carbonCache.service"); - $one->requireActiveUnit("seyren.service"); - $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003"); - $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo") + $one->waitForUnit("graphiteWeb.service"); + $one->waitForUnit("graphiteApi.service"); + $one->waitForUnit("graphitePager.service"); + $one->waitForUnit("graphite-beacon.service"); + $one->waitForUnit("carbonCache.service"); + $one->waitForUnit("seyren.service"); + # The services above are of type "simple". systemd considers them active immediately + # even if they're still in preStart (which takes quite long for graphiteWeb). + # Wait for ports to open so we're sure the services are up and listening. + $one->waitForOpenPort(8080); + $one->waitForOpenPort(2003); + $one->succeed("echo \"foo 1 `date +%s`\" | nc -N localhost 2003"); + $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2"); ''; }) diff --git a/nixos/tests/hadoop/hdfs.nix b/nixos/tests/hadoop/hdfs.nix new file mode 100644 index 0000000000000000000000000000000000000000..e7d72a56e1e7bf3e22928f22e8b7e018e9a2e4d9 --- /dev/null +++ b/nixos/tests/hadoop/hdfs.nix @@ -0,0 +1,54 @@ +import ../make-test.nix ({...}: { + nodes = { + namenode = {pkgs, ...}: { + services.hadoop = { + package = pkgs.hadoop_3_1; + hdfs.namenode.enabled = true; + coreSite = { + "fs.defaultFS" = "hdfs://namenode:8020"; + }; + hdfsSite = { + "dfs.replication" = 1; + "dfs.namenode.rpc-bind-host" = "0.0.0.0"; + "dfs.namenode.http-bind-host" = "0.0.0.0"; + }; + }; + networking.firewall.allowedTCPPorts = [ + 9870 # namenode.http-address + 8020 # namenode.rpc-address + ]; + }; + datanode = {pkgs, ...}: { + services.hadoop = { + package = pkgs.hadoop_3_1; + hdfs.datanode.enabled = true; + coreSite = { + "fs.defaultFS" = "hdfs://namenode:8020"; + }; + }; + networking.firewall.allowedTCPPorts = [ + 9864 # datanode.http.address + 9866 # datanode.address + 9867 # datanode.ipc.address + ]; + }; + }; + + testScript = '' + startAll + + $namenode->waitForUnit("hdfs-namenode"); + $namenode->waitForUnit("network.target"); + $namenode->waitForOpenPort(8020); + $namenode->waitForOpenPort(9870); + + $datanode->waitForUnit("hdfs-datanode"); + $datanode->waitForUnit("network.target"); + $datanode->waitForOpenPort(9864); + $datanode->waitForOpenPort(9866); + $datanode->waitForOpenPort(9867); + + $namenode->succeed("curl http://namenode:9870"); + $datanode->succeed("curl http://datanode:9864"); + ''; +}) diff --git a/nixos/tests/hadoop/yarn.nix b/nixos/tests/hadoop/yarn.nix new file mode 100644 index 0000000000000000000000000000000000000000..031592301f172f2b10dcad00d62967823de58549 --- /dev/null +++ b/nixos/tests/hadoop/yarn.nix @@ -0,0 +1,46 @@ +import ../make-test.nix ({...}: { + nodes = { + resourcemanager = {pkgs, ...}: { + services.hadoop.package = pkgs.hadoop_3_1; + services.hadoop.yarn.resourcemanager.enabled = true; + services.hadoop.yarnSite = { + "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler"; + }; + networking.firewall.allowedTCPPorts = [ + 8088 # resourcemanager.webapp.address + 8031 # resourcemanager.resource-tracker.address + ]; + }; + nodemanager = {pkgs, ...}: { + services.hadoop.package = pkgs.hadoop_3_1; + services.hadoop.yarn.nodemanager.enabled = true; + services.hadoop.yarnSite = { + "yarn.resourcemanager.hostname" = "resourcemanager"; + "yarn.nodemanager.log-dirs" = "/tmp/userlogs"; + "yarn.nodemanager.address" = "0.0.0.0:8041"; + }; + networking.firewall.allowedTCPPorts = [ + 8042 # nodemanager.webapp.address + 8041 # nodemanager.address + ]; + }; + + }; + + testScript = '' + startAll; + + $resourcemanager->waitForUnit("yarn-resourcemanager"); + $resourcemanager->waitForUnit("network.target"); + $resourcemanager->waitForOpenPort(8031); + $resourcemanager->waitForOpenPort(8088); + + $nodemanager->waitForUnit("yarn-nodemanager"); + $nodemanager->waitForUnit("network.target"); + $nodemanager->waitForOpenPort(8042); + $nodemanager->waitForOpenPort(8041); + + $resourcemanager->succeed("curl http://localhost:8088"); + $nodemanager->succeed("curl http://localhost:8042"); + ''; +}) diff --git a/nixos/tests/haka.nix b/nixos/tests/haka.nix index 40548f34690f6b220a0f0f779d7f80cc7d96a477..6277ebb4933fdedfff8595de1048e6a0eb471433 100644 --- a/nixos/tests/haka.nix +++ b/nixos/tests/haka.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { haka = - { config, pkgs, ... }: + { ... }: { services.haka.enable = true; }; diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix new file mode 100644 index 0000000000000000000000000000000000000000..22a83e9d1eabf113b5f18bd3205d7a4c1ebc3ef9 --- /dev/null +++ b/nixos/tests/haproxy.nix @@ -0,0 +1,41 @@ +import ./make-test.nix ({ pkgs, ...}: { + name = "haproxy"; + nodes = { + machine = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + services.haproxy = { + enable = true; + config = '' + defaults + timeout connect 10s + + backend http_server + mode http + server httpd [::1]:8000 + + frontend http + bind *:80 + mode http + use_backend http_server + ''; + }; + services.httpd = { + enable = true; + documentRoot = pkgs.writeTextDir "index.txt" "We are all good!"; + adminAddr = "notme@yourhost.local"; + listen = [{ + ip = "::1"; + port = 8000; + }]; + }; + }; + }; + testScript = '' + startAll; + $machine->waitForUnit('multi-user.target'); + $machine->waitForUnit('haproxy.service'); + $machine->waitForUnit('httpd.service'); + $machine->succeed('curl -k http://localhost:80/index.txt | grep "We are all good!"'); + + ''; +}) diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index cb33b69e7199037902081f1b737330953f2c2c73..2700b8e5935a97da99386c3e45ad2700ed240474 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, lib, pkgs, ... }: + { lib, pkgs, ... }: with lib; { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; }; users.users.sybil = { isNormalUser = true; group = "wheel"; }; @@ -25,16 +25,18 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = '' + $machine->waitForUnit("multi-user.target"); + # Test hidepid subtest "hidepid", sub { $machine->succeed("grep -Fq hidepid=2 /proc/mounts"); - $machine->succeed("[ `su - sybil -c 'pgrep -c -u root'` = 0 ]"); - $machine->succeed("[ `su - alice -c 'pgrep -c -u root'` != 0 ]"); + # cannot use pgrep -u here, it segfaults when access to process info is denied + $machine->succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]"); + $machine->succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]"); }; # Test kernel module hardening subtest "lock-modules", sub { - $machine->waitForUnit("multi-user.target"); # note: this better a be module we normally wouldn't load ... $machine->fail("modprobe dccp"); }; diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index a95235887e897c45e4993ad5fb92c8aa78bc043a..1f98bb739f210226038906a930ca5dcdb075c6a7 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -16,7 +16,7 @@ import ./make-test.nix (pkgs: { systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444 -k"; }; - probe = { config, lib, pkgs, ...}: { + probe = { pkgs, ...}: { environment.systemPackages = [ pkgs.netcat ]; }; }; @@ -37,7 +37,7 @@ import ./make-test.nix (pkgs: { $machine->waitForShutdown; $machine->start; $probe->waitForUnit("network.target"); - $probe->waitUntilSucceeds("echo test | nc machine 4444 -q 0"); + $probe->waitUntilSucceeds("echo test | nc machine 4444 -N"); ''; }) diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cb24c4dcffc246a76d0ead143c4b541c95e18483 --- /dev/null +++ b/nixos/tests/hitch/default.nix @@ -0,0 +1,33 @@ +import ../make-test.nix ({ pkgs, ... }: +{ + name = "hitch"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ jflanglois ]; + }; + machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs.curl ]; + services.hitch = { + enable = true; + backend = "[127.0.0.1]:80"; + pem-files = [ + ./example.pem + ]; + }; + + services.httpd = { + enable = true; + documentRoot = ./example; + adminAddr = "noone@testing.nowhere"; + }; + }; + + testScript = + '' + startAll; + + $machine->waitForUnit('multi-user.target'); + $machine->waitForUnit('hitch.service'); + $machine->waitForOpenPort(443); + $machine->succeed('curl -k https://localhost:443/index.txt | grep "We are all good!"'); + ''; +}) diff --git a/nixos/tests/hitch/example.pem b/nixos/tests/hitch/example.pem new file mode 100644 index 0000000000000000000000000000000000000000..fde6f3cbd19addb8ce84ffe32ab4d040e8b09c18 --- /dev/null +++ b/nixos/tests/hitch/example.pem @@ -0,0 +1,53 @@ +-----BEGIN CERTIFICATE----- +MIIEKTCCAxGgAwIBAgIJAIFAWQXSZ7lIMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD +VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEVMBMGA1UEBwwMUmVkd29vZCBD +aXR5MRkwFwYDVQQKDBBUZXN0aW5nIDEyMyBJbmMuMRQwEgYDVQQLDAtJVCBTZXJ2 +aWNlczEYMBYGA1UEAwwPdGVzdGluZy5ub3doZXJlMSQwIgYJKoZIhvcNAQkBFhVu +b29uZUB0ZXN0aW5nLm5vd2hlcmUwHhcNMTgwNDIzMDcxMTI5WhcNMTkwNDIzMDcx +MTI5WjCBqjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFTATBgNV +BAcMDFJlZHdvb2QgQ2l0eTEZMBcGA1UECgwQVGVzdGluZyAxMjMgSW5jLjEUMBIG +A1UECwwLSVQgU2VydmljZXMxGDAWBgNVBAMMD3Rlc3Rpbmcubm93aGVyZTEkMCIG +CSqGSIb3DQEJARYVbm9vbmVAdGVzdGluZy5ub3doZXJlMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAxQq6AA9o/QErMbQwfgDF4mqXcvglRTwPr2zPE6Rv +1g0ncRBSMM8iKbPapHM6qHNfg2e1fU2SFqzD6HkyZqHHLCgLzkdzswEcEjsMqiUP +OR++5g4CWoQrdTi31itzYzCjnQ45BrAMrLEhBQgDTNwrEE+Tit0gpOGggtj/ktLk +OD8BKa640lkmWEUGF18fd3rYTUC4hwM5qhAVXTe21vj9ZWsgprpQKdN61v0dCUap +C5eAgvZ8Re+Cd0Id674hK4cJ4SekqfHKv/jLyIg3Vsdc9nkhmiC4O6KH5f1Zzq2i +E4Kd5mnJDFxfSzIErKWmbhriLWsj3KEJ983AGLJ9hxQTAwIDAQABo1AwTjAdBgNV +HQ4EFgQU76Mm6DP/BePJRQUNrJ9z038zjocwHwYDVR0jBBgwFoAU76Mm6DP/BePJ +RQUNrJ9z038zjocwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAAZzt +VdPaUqrvDAh5rMYqzYMJ3tj6daNYoX6CbTFoevK5J5D4FESM0D/FMKgpNiVz39kB +8Cjaw5rPHMHY61rHz7JRDK1sWXsonwzCF21BK7Tx0G1CIfLpYHWYb/FfdWGROx+O +hPgKuoMRWQB+txozkZp5BqWJmk5MOyFCDEXhMOmrfsJq0IYU6QaH3Lsf1oJRy4yU +afFrT9o3DLOyYLG/j/HXijCu8DVjZVa4aboum79ecYzPjjGF1posrFUnvQiuAeYy +t7cuHNUB8gW9lWR5J7tP8fzFWtIcyT2oRL8u3H+fXf0i4bW73wtOBOoeULBzBNE7 +6rphcSrQunSZQIc+hg== +-----END CERTIFICATE----- +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDFCroAD2j9ASsx +tDB+AMXiapdy+CVFPA+vbM8TpG/WDSdxEFIwzyIps9qkczqoc1+DZ7V9TZIWrMPo +eTJmoccsKAvOR3OzARwSOwyqJQ85H77mDgJahCt1OLfWK3NjMKOdDjkGsAyssSEF +CANM3CsQT5OK3SCk4aCC2P+S0uQ4PwEprrjSWSZYRQYXXx93ethNQLiHAzmqEBVd +N7bW+P1layCmulAp03rW/R0JRqkLl4CC9nxF74J3Qh3rviErhwnhJ6Sp8cq/+MvI +iDdWx1z2eSGaILg7oofl/VnOraITgp3mackMXF9LMgSspaZuGuItayPcoQn3zcAY +sn2HFBMDAgMBAAECggEAcaR8HijFHpab+PC5vxJnDuz3KEHiDQpU6ZJR5DxEnCm+ +A8GsBaaRR4gJpCspO5o/DiS0Ue55QUanPt8XqIXJv7fhBznCiw0qyYDxDviMzR94 +FGskBFySS+tIa+dnh1+4HY7kaO0Egl0udB5o+N1KoP+kUsSyXSYcUxsgW+fx5FW9 +22Ya3HNWnWxMCSfSGGlTFXGj2whf25SkL25dM9iblO4ZOx4MX8kaXij7TaYy8hMM +Vf6/OMnXqtPKho+ctZZVKZkE9PxdS4f/pnp5EsdoOZwNBtfQ1WqVLWd3DlGWhnsH +7L8ZSP2HkoI4Pd1wtkpOKZc+yM2bFXWa8WY4TcmpUQKBgQD33HxGdtmtZehrexSA +/ZwWJlMslUsNz4Ivv6s7J4WCRhdh94+r9TWQP/yHdT9Ry5bvn84I5ZLUdp+aA962 +mvjz+GIglkCGpA7HU/hqurB1O63pj2cIDB8qhV21zjVIoqXcQ7IBJ+tqD79nF8vm +h3KfuHUhuu1rayGepbtIyNhLdwKBgQDLgw4TJBg/QB8RzYECk78QnfZpCExsQA/z +YJpc+dF2/nsid5R2u9jWzfmgHM2Jjo2/+ofRUaTqcFYU0K57CqmQkOLIzsbNQoYt +e2NOANNVHiZLuzTZC2r3BrrkNbo3YvQzhAesUA5lS6LfrxBLUKiwo2LU9NlmJs3b +UPVFYI0/1QKBgCswxIcS1sOcam+wNtZzWuuRKhUuvrFdY3YmlBPuwxj8Vb7AgMya +IgdM3xhLmgkKzPZchm6OcpOLSCxyWDDBuHfq5E6BYCUWGW0qeLNAbNdA2wFD99Qz +KIskSjwP/sD1dql3MmF5L1CABf5U6zb0i0jBv8ds50o8lNMsVgJM3UPpAoGBAL1+ +nzllb4pdi1CJWKnspoizfQCZsIdPM0r71V/jYY36MO+MBtpz2NlSWzAiAaQm74gl +oBdgfT2qMg0Zro11BSRONEykdOolGkj5TiMQk7b65s+3VeMPRZ8UTis2d9kgs5/Q +PVDODkl1nwfGu1ZVmW04BUujXVZHpYCkJm1eFMetAoGAImE7gWj+qRMhpbtCCGCg +z06gDKvMrF6S+GJsvUoSyM8oUtfdPodI6gWAC65NfYkIiqbpCaEVNzfui73f5Lnz +p5X1IbzhuH5UZs/k5A3OR2PPDbPs3lqEw7YJdBdLVRmO1o824uaXaJJwkL/1C+lq +8dh1wV3CnynNmZApkz4vpzQ= +-----END PRIVATE KEY----- diff --git a/nixos/tests/hitch/example/index.txt b/nixos/tests/hitch/example/index.txt new file mode 100644 index 0000000000000000000000000000000000000000..0478b1c26351790689f3ec228c46d9ec5e8eff6f --- /dev/null +++ b/nixos/tests/hitch/example/index.txt @@ -0,0 +1 @@ +We are all good! diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix index 12c58a01224322add8698a305eda5cbf8d5c09d0..78343f0e02f0f95a072631c025986779c8995f1b 100644 --- a/nixos/tests/hocker-fetchdocker/machine.nix +++ b/nixos/tests/hocker-fetchdocker/machine.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { nixpkgs.config.packageOverrides = pkgs': { hello-world-container = pkgs'.callPackage ./hello-world-container.nix { }; }; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 2e45dc78471f0822df99d0f4cb719001ef78d483..2d74b59bca462297d6397be995b76c90f155aa51 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -2,7 +2,8 @@ import ./make-test.nix ({ pkgs, ... }: let configDir = "/var/lib/foobar"; - apiPassword = "secret"; + apiPassword = "some_secret"; + mqttPassword = "another_secret"; in { name = "home-assistant"; @@ -12,7 +13,7 @@ in { nodes = { hass = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = with pkgs; [ mosquitto @@ -33,7 +34,9 @@ in { }; frontend = { }; http.api_password = apiPassword; - mqtt = { }; # Use hbmqtt as broker + mqtt = { # Use hbmqtt as broker + password = mqttPassword; + }; binary_sensor = [ { platform = "mqtt"; @@ -51,9 +54,9 @@ in { startAll; $hass->waitForUnit("home-assistant.service"); - # Since config is specified using a Nix attribute set, - # configuration.yaml is a link to the Nix store - $hass->succeed("test -L ${configDir}/configuration.yaml"); + # The config is specified using a Nix attribute set, + # but then converted from JSON to YAML + $hass->succeed("test -f ${configDir}/configuration.yaml"); # Check that Home Assistant's web interface and API can be reached $hass->waitForOpenPort(8123); @@ -62,15 +65,16 @@ in { # Toggle a binary sensor using MQTT $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"off\"'"); - $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${apiPassword}' -m let_there_be_light"); + $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -m let_there_be_light"); $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'"); - # Check that no errors were logged - $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR"); - # Print log to ease debugging my $log = $hass->succeed("cat ${configDir}/home-assistant.log"); print "\n### home-assistant.log ###\n"; print "$log\n"; + + # Check that no errors were logged + # The timer can get out of sync due to Hydra's load, so this error is ignored + $hass->fail("cat ${configDir}/home-assistant.log | grep -vF 'Timer got out of sync' | grep -qF ERROR"); ''; }) diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix index 82fd44e8e36fb19f6fe7d048558256f27a6ae0f5..f21c0ad58a85048e996c6d2b601c84daea292868 100644 --- a/nixos/tests/hound.nix +++ b/nixos/tests/hound.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... } : { meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ grahamc ]; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { services.hound = { enable = true; config = '' diff --git a/nixos/tests/hydra.nix b/nixos/tests/hydra.nix deleted file mode 100644 index 6abd7a5ad30040723f97ac2f098c4554f52bb0f1..0000000000000000000000000000000000000000 --- a/nixos/tests/hydra.nix +++ /dev/null @@ -1,32 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "hydra-init-localdb"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ pstn ]; - }; - - machine = - { config, pkgs, ... }: - - { - services.hydra = { - enable = true; - - #Hydra needs those settings to start up, so we add something not harmfull. - hydraURL = "example.com"; - notificationSender = "example@example.com"; - }; - }; - - testScript = - '' - # let the system boot up - $machine->waitForUnit("multi-user.target"); - # test whether the database is running - $machine->succeed("systemctl status postgresql.service"); - # test whether the actual hydra daemons are running - $machine->succeed("systemctl status hydra-queue-runner.service"); - $machine->succeed("systemctl status hydra-init.service"); - $machine->succeed("systemctl status hydra-evaluator.service"); - $machine->succeed("systemctl status hydra-send-stats.service"); - ''; -}) diff --git a/nixos/tests/hydra/create-trivial-project.sh b/nixos/tests/hydra/create-trivial-project.sh new file mode 100755 index 0000000000000000000000000000000000000000..3cca5665acc56bfc9b95b6af373320143e321ed3 --- /dev/null +++ b/nixos/tests/hydra/create-trivial-project.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env bash +# +# This script creates a project, a jobset with an input of type local +# path. This local path is a directory that contains a Nix expression +# to define a job. +# The EXPR-PATH environment variable must be set with the local path. + +set -e + +URL=http://localhost:3000 +USERNAME="admin" +PASSWORD="admin" +PROJECT_NAME="trivial" +JOBSET_NAME="trivial" +EXPR_PATH=${EXPR_PATH:-} + +if [ -z $EXPR_PATH ]; then + echo "Environment variable EXPR_PATH must be set" + exit 1 +fi + +mycurl() { + curl --referer $URL -H "Accept: application/json" -H "Content-Type: application/json" $@ +} + +cat >data.json <data.json <data.json < $out; exit 0"]; + }; + } + ''; + + createTrivialProject = pkgs.stdenv.mkDerivation { + name = "create-trivial-project"; + unpackPhase = ":"; + buildInputs = [ pkgs.makeWrapper ]; + installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; + postFixup = '' + wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} + ''; + }; + +in { + name = "hydra-init-localdb"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ pstn lewo ma27 ]; + }; + + machine = + { pkgs, ... }: + + { + virtualisation.memorySize = 1024; + time.timeZone = "UTC"; + + environment.systemPackages = [ createTrivialProject pkgs.jq ]; + services.hydra = { + enable = true; + + #Hydra needs those settings to start up, so we add something not harmfull. + hydraURL = "example.com"; + notificationSender = "example@example.com"; + }; + nix = { + buildMachines = [{ + hostName = "localhost"; + systems = [ "x86_64-linux" ]; + }]; + + binaryCaches = []; + }; + }; + + testScript = + '' + # let the system boot up + $machine->waitForUnit("multi-user.target"); + # test whether the database is running + $machine->succeed("systemctl status postgresql.service"); + # test whether the actual hydra daemons are running + $machine->succeed("systemctl status hydra-queue-runner.service"); + $machine->succeed("systemctl status hydra-init.service"); + $machine->succeed("systemctl status hydra-evaluator.service"); + $machine->succeed("systemctl status hydra-send-stats.service"); + + $machine->succeed("hydra-create-user admin --role admin --password admin"); + + # create a project with a trivial job + $machine->waitForOpenPort(3000); + + # make sure the build as been successfully built + $machine->succeed("create-trivial-project.sh"); + + $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'); + ''; +}) diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix index 4685992d7a0537ad3dd3b27792d720d4a92d2f3e..e51aee30fdb007ab0d993e4c5e68c05b8b8256e0 100644 --- a/nixos/tests/i3wm.nix +++ b/nixos/tests/i3wm.nix @@ -4,30 +4,32 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ aszlig ]; }; - machine = { lib, pkgs, ... }: { + machine = { lib, ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; services.xserver.displayManager.auto.user = "alice"; services.xserver.windowManager.default = lib.mkForce "i3"; services.xserver.windowManager.i3.enable = true; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' $machine->waitForX; $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); $machine->waitForWindow(qr/first configuration/); - $machine->sleep(1); + $machine->sleep(2); $machine->screenshot("started"); $machine->sendKeys("ret"); - $machine->sleep(1); + $machine->sleep(2); $machine->sendKeys("alt"); - $machine->sleep(1); + $machine->sleep(2); $machine->screenshot("configured"); $machine->sendKeys("ret"); + # make sure the config file is created before we continue + $machine->waitForFile("/home/alice/.config/i3/config"); $machine->sleep(2); $machine->sendKeys("alt-ret"); $machine->waitForWindow(qr/machine.*alice/); - $machine->sleep(1); + $machine->sleep(2); $machine->screenshot("terminal"); ''; }) diff --git a/nixos/tests/iftop.nix b/nixos/tests/iftop.nix new file mode 100644 index 0000000000000000000000000000000000000000..a4f524ceb27bf9de647e03f4fe3881a746def966 --- /dev/null +++ b/nixos/tests/iftop.nix @@ -0,0 +1,34 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +with lib; + +{ + name = "iftop"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + + nodes = { + withIftop = { + imports = [ ./common/user-account.nix ]; + programs.iftop.enable = true; + }; + withoutIftop = { + imports = [ ./common/user-account.nix ]; + environment.systemPackages = [ pkgs.iftop ]; + }; + }; + + testScript = '' + subtest "machine with iftop enabled", sub { + $withIftop->waitForUnit("default.target"); + # limit to eth1 (eth0 is the test driver's control interface) + # and don't try name lookups + $withIftop->succeed("su -l alice -c 'iftop -t -s 1 -n -i eth1'"); + }; + subtest "machine without iftop", sub { + $withoutIftop->waitForUnit("default.target"); + # check that iftop is there but user alice lacks capabilities + $withoutIftop->succeed("iftop -t -s 1 -n -i eth1"); + $withoutIftop->fail("su -l alice -c 'iftop -t -s 1 -n -i eth1'"); + }; + ''; +}) diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix index ee126091667a92c292afc86dd39fbdb4954b787c..440049d9511174bd8412ced0423dc289ea1424a4 100644 --- a/nixos/tests/influxdb.nix +++ b/nixos/tests/influxdb.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - one = { config, pkgs, ... }: { + one = { ... }: { services.influxdb.enable = true; }; }; diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix index b1f3d147e86264317b110a3c717d5ee6be3ee43f..b2209f297a4f80b00ce2fd6701398ce554422af6 100644 --- a/nixos/tests/initrd-network-ssh/default.nix +++ b/nixos/tests/initrd-network-ssh/default.nix @@ -1,4 +1,4 @@ -import ../make-test.nix ({ pkgs, lib, ... }: +import ../make-test.nix ({ lib, ... }: { name = "initrd-network-ssh"; @@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, lib, ... }: nodes = with lib; rec { server = - { config, pkgs, ... }: + { config, ... }: { boot.kernelParams = [ "ip=${config.networking.primaryIPAddress}:::255.255.255.0::eth1:none" @@ -33,7 +33,7 @@ import ../make-test.nix ({ pkgs, lib, ... }: }; client = - { config, pkgs, ... }: + { config, ... }: { environment.etc.knownHosts = { text = concatStrings [ diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix index db9f572d3c2f6b0dbb4a9cd24dba41dea113aa50..ed9b82e2da773df8e53a3939a72aff6bf091063c 100644 --- a/nixos/tests/initrd-network.nix +++ b/nixos/tests/initrd-network.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ]; - machine = { config, pkgs, ... }: { + machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; boot.initrd.network.enable = true; boot.initrd.network.postCommands = diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index acf248d0a5a664c393fb2e44a0613651fb9d75cf..507665190a26bda06f9c8a257d00f5540b88c114 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -43,7 +43,7 @@ let boot.loader.systemd-boot.enable = true; ''} - users.extraUsers.alice = { + users.users.alice = { isNormalUser = true; home = "/home/alice"; description = "Alice Foobar"; @@ -51,14 +51,13 @@ let hardware.enableAllFirmware = lib.mkForce false; + services.udisks2.enable = lib.mkDefault false; + ${replaceChars ["\n"] ["\n "] extraConfig} } ''; - channelContents = [ pkgs.rlwrap ]; - - # The test script boots a NixOS VM, installs NixOS on an empty hard # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create @@ -204,7 +203,7 @@ let # The configuration of the machine used to run "nixos-install". machine = - { config, lib, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/profiles/installation-device.nix @@ -235,12 +234,13 @@ let libxml2.bin libxslt.bin docbook5 - docbook5_xsl + docbook_xsl_ns unionfs-fuse ntp nixos-artwork.wallpapers.gnome-dark perlPackages.XMLLibXML perlPackages.ListCompare + xorg.lndir # add curl so that rather than seeing the test attempt to download # curl's tarball, we see what it's trying to download @@ -249,6 +249,8 @@ let ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ]; + services.udisks2.enable = mkDefault false; + nix.binaryCaches = mkForce [ ]; nix.extraOptions = '' @@ -465,7 +467,7 @@ in { enableOCR = true; preBootCommands = '' $machine->start; - $machine->waitForText(qr/Enter passphrase/); + $machine->waitForText(qr/Passphrase for/); $machine->sendChars("supersecret\n"); ''; }; diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index c6bc61545245c20d9f7afbf20c37baac0188ffe9..3cff7e99ff88796eb50fe4ad221065c69df89980 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { adder = - { config, pkgs, ... }: + { ... }: { services.ipfs = { enable = true; @@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : { networking.firewall.allowedTCPPorts = [ 4001 ]; }; getter = - { config, pkgs, ... }: + { ... }: { services.ipfs = { enable = true; diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix index 7a98fd85cfda9db8057c49985ffa4425b3e4ab22..97f348a9beebe0b7f0efad935f6a64c7aae8b19b 100644 --- a/nixos/tests/ipv6.nix +++ b/nixos/tests/ipv6.nix @@ -8,17 +8,17 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = - { client = { config, pkgs, ... }: { }; + { client = { ... }: { }; server = - { config, pkgs, ... }: + { ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; networking.firewall.allowedTCPPorts = [ 80 ]; }; router = - { config, pkgs, ... }: + { ... }: { services.radvd.enable = true; services.radvd.config = '' diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index ed55b2ff58716d3c08dd6dd71d5098f79fd7ee99..4f2d2085cd1a99108bfa8b9ad0c55154a54f4496 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -12,22 +12,22 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { master = - { config, pkgs, ... }: + { ... }: { services.jenkins.enable = true; # should have no effect services.jenkinsSlave.enable = true; - users.extraUsers.jenkins.extraGroups = [ "users" ]; + users.users.jenkins.extraGroups = [ "users" ]; systemd.services.jenkins.serviceConfig.TimeoutStartSec = "6min"; }; slave = - { config, pkgs, ... }: + { ... }: { services.jenkinsSlave.enable = true; - users.extraUsers.jenkins.extraGroups = [ "users" ]; + users.users.jenkins.extraGroups = [ "users" ]; }; }; diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix new file mode 100644 index 0000000000000000000000000000000000000000..c9fd74620efb1329deea892e6aeffc4b6d708239 --- /dev/null +++ b/nixos/tests/kafka.nix @@ -0,0 +1,69 @@ +{ system ? builtins.currentSystem }: +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; + +let + makeKafkaTest = name: kafkaPackage: (makeTest { + inherit name; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + zookeeper1 = { ... }: { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + virtualisation.memorySize = 1024; + }; + kafka = { ... }: { + services.apache-kafka = { + enable = true; + extraProperties = '' + offsets.topic.replication.factor = 1 + zookeeper.session.timeout.ms = 600000 + ''; + package = kafkaPackage; + zookeeper = "zookeeper1:2181"; + # These are the default options, but UseCompressedOops doesn't work with 32bit JVM + jvmOptions = [ + "-server" "-Xmx1G" "-Xms1G" "-XX:+UseParNewGC" "-XX:+UseConcMarkSweepGC" "-XX:+CMSClassUnloadingEnabled" + "-XX:+CMSScavengeBeforeRemark" "-XX:+DisableExplicitGC" "-Djava.awt.headless=true" "-Djava.net.preferIPv4Stack=true" + ] ++ optionals (! pkgs.stdenv.isi686 ) [ "-XX:+UseCompressedOops" ]; + }; + + networking.firewall.allowedTCPPorts = [ 9092 ]; + # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048) + virtualisation.memorySize = 2047; + }; + }; + + testScript = '' + startAll; + + $zookeeper1->waitForUnit("default.target"); + $zookeeper1->waitForUnit("zookeeper.service"); + $zookeeper1->waitForOpenPort(2181); + + $kafka->waitForUnit("default.target"); + $kafka->waitForUnit("apache-kafka.service"); + $kafka->waitForOpenPort(9092); + + $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); + $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); + '' + (if name == "kafka_0_9" then '' + $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); + '' else '' + $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); + ''); + }); + +in with pkgs; { + kafka_0_9 = makeKafkaTest "kafka_0_9" apacheKafka_0_9; + kafka_0_10 = makeKafkaTest "kafka_0_10" apacheKafka_0_10; + kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11; + kafka_1_0 = makeKafkaTest "kafka_1_0" apacheKafka_1_0; + kafka_1_1 = makeKafkaTest "kafka_1_1" apacheKafka_1_1; +} diff --git a/nixos/tests/kafka_0_10.nix b/nixos/tests/kafka_0_10.nix deleted file mode 100644 index 6e7820f64bc4b3d848c475ccd30c76013ec6fd68..0000000000000000000000000000000000000000 --- a/nixos/tests/kafka_0_10.nix +++ /dev/null @@ -1,48 +0,0 @@ -import ./make-test.nix ({ pkgs, lib, ... } : -let - kafkaPackage = pkgs.apacheKafka_0_10; -in { - name = "kafka_0_10"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - nodes = { - zookeeper1 = { config, ... }: { - services.zookeeper = { - enable = true; - }; - - networking.firewall.allowedTCPPorts = [ 2181 ]; - }; - kafka = { config, ... }: { - services.apache-kafka = { - enable = true; - extraProperties = '' - offsets.topic.replication.factor = 1 - ''; - package = kafkaPackage; - zookeeper = "zookeeper1:2181"; - }; - - networking.firewall.allowedTCPPorts = [ 9092 ]; - virtualisation.memorySize = 2048; - }; - }; - - testScript = '' - startAll; - - $zookeeper1->waitForUnit("zookeeper"); - $zookeeper1->waitForUnit("network.target"); - $zookeeper1->waitForOpenPort(2181); - - $kafka->waitForUnit("apache-kafka"); - $kafka->waitForUnit("network.target"); - $kafka->waitForOpenPort(9092); - - $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); - $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); - $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); - ''; -}) diff --git a/nixos/tests/kafka_0_11.nix b/nixos/tests/kafka_0_11.nix deleted file mode 100644 index 39f9c36bb22969f68d194f6cd294af8cdc72173c..0000000000000000000000000000000000000000 --- a/nixos/tests/kafka_0_11.nix +++ /dev/null @@ -1,48 +0,0 @@ -import ./make-test.nix ({ pkgs, lib, ... } : -let - kafkaPackage = pkgs.apacheKafka_0_11; -in { - name = "kafka_0_11"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - nodes = { - zookeeper1 = { config, ... }: { - services.zookeeper = { - enable = true; - }; - - networking.firewall.allowedTCPPorts = [ 2181 ]; - }; - kafka = { config, ... }: { - services.apache-kafka = { - enable = true; - extraProperties = '' - offsets.topic.replication.factor = 1 - ''; - package = kafkaPackage; - zookeeper = "zookeeper1:2181"; - }; - - networking.firewall.allowedTCPPorts = [ 9092 ]; - virtualisation.memorySize = 2048; - }; - }; - - testScript = '' - startAll; - - $zookeeper1->waitForUnit("zookeeper"); - $zookeeper1->waitForUnit("network.target"); - $zookeeper1->waitForOpenPort(2181); - - $kafka->waitForUnit("apache-kafka"); - $kafka->waitForUnit("network.target"); - $kafka->waitForOpenPort(9092); - - $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); - $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); - $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); - ''; -}) diff --git a/nixos/tests/kafka_0_9.nix b/nixos/tests/kafka_0_9.nix deleted file mode 100644 index fee82aba2bda317884f069291a2cd5a81ee195c2..0000000000000000000000000000000000000000 --- a/nixos/tests/kafka_0_9.nix +++ /dev/null @@ -1,48 +0,0 @@ -import ./make-test.nix ({ pkgs, lib, ... } : -let - kafkaPackage = pkgs.apacheKafka_0_9; -in { - name = "kafka_0_9"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - nodes = { - zookeeper1 = { config, ... }: { - services.zookeeper = { - enable = true; - }; - - networking.firewall.allowedTCPPorts = [ 2181 ]; - }; - kafka = { config, ... }: { - services.apache-kafka = { - enable = true; - extraProperties = '' - offsets.topic.replication.factor = 1 - ''; - package = kafkaPackage; - zookeeper = "zookeeper1:2181"; - }; - - networking.firewall.allowedTCPPorts = [ 9092 ]; - virtualisation.memorySize = 2048; - }; - }; - - testScript = '' - startAll; - - $zookeeper1->waitForUnit("zookeeper"); - $zookeeper1->waitForUnit("network.target"); - $zookeeper1->waitForOpenPort(2181); - - $kafka->waitForUnit("apache-kafka"); - $kafka->waitForUnit("network.target"); - $kafka->waitForOpenPort(9092); - - $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); - $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); - $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); - ''; -}) diff --git a/nixos/tests/kafka_1_0.nix b/nixos/tests/kafka_1_0.nix deleted file mode 100644 index 936840dbcfdc6a7dfb2eeabcddc344f94a62263c..0000000000000000000000000000000000000000 --- a/nixos/tests/kafka_1_0.nix +++ /dev/null @@ -1,48 +0,0 @@ -import ./make-test.nix ({ pkgs, lib, ... } : -let - kafkaPackage = pkgs.apacheKafka_1_0; -in { - name = "kafka_1_0"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - nodes = { - zookeeper1 = { config, ... }: { - services.zookeeper = { - enable = true; - }; - - networking.firewall.allowedTCPPorts = [ 2181 ]; - }; - kafka = { config, ... }: { - services.apache-kafka = { - enable = true; - extraProperties = '' - offsets.topic.replication.factor = 1 - ''; - package = kafkaPackage; - zookeeper = "zookeeper1:2181"; - }; - - networking.firewall.allowedTCPPorts = [ 9092 ]; - virtualisation.memorySize = 2048; - }; - }; - - testScript = '' - startAll; - - $zookeeper1->waitForUnit("zookeeper"); - $zookeeper1->waitForUnit("network.target"); - $zookeeper1->waitForOpenPort(2181); - - $kafka->waitForUnit("apache-kafka"); - $kafka->waitForUnit("network.target"); - $kafka->waitForOpenPort(9092); - - $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); - $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); - $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); - ''; -}) diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix index 07427d7f2a8935e9378cb47349d7e6a1a28b460a..652fbf055373ee5e111bed4719e0df3cc6edd807 100644 --- a/nixos/tests/kernel-copperhead.nix +++ b/nixos/tests/kernel-copperhead.nix @@ -4,16 +4,16 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ nequissimus ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_hardened_copperhead; + boot.kernelPackages = pkgs.linuxPackages_copperhead_lts; }; testScript = '' $machine->succeed("uname -a"); $machine->succeed("uname -s | grep 'Linux'"); - $machine->succeed("uname -a | grep '${pkgs.linuxPackages_hardened_copperhead.kernel.modDirVersion}'"); + $machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_lts.kernel.modDirVersion}'"); $machine->succeed("uname -a | grep 'hardened'"); ''; }) diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix index 1350426654d70ac78f787881cc5339b959427659..f30bd2e2e76052a6b54174339f983d2f7233e8ff 100644 --- a/nixos/tests/kernel-latest.nix +++ b/nixos/tests/kernel-latest.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ nequissimus ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_latest; }; diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix index 2aab4ce0b49e1b348226ae2a3880b78e818f3af4..28717fa6a844810d31531c8fc01b917d3562fe77 100644 --- a/nixos/tests/kernel-lts.nix +++ b/nixos/tests/kernel-lts.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ nequissimus ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages; }; diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix index 0f5ddef7b1aae16e9cc608e0289ad1141f4d316e..db596189d46d0cca52741faa144c5cf463545c70 100644 --- a/nixos/tests/kexec.nix +++ b/nixos/tests/kexec.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ eelco chaoflow ]; }; - machine = { config, pkgs, ... }: + machine = { ... }: { virtualisation.vlans = [ ]; }; testScript = diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index caa5f7107c23afaf5104efbdd3c4415e648495ae..be880388314c17e945cea4c7ed3c641b46ab95fd 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -3,46 +3,36 @@ with import ../lib/testing.nix { inherit system; }; let + readyFile = "/tmp/readerReady"; + resultFile = "/tmp/readerResult"; + testReader = pkgs.writeScript "test-input-reader" '' #!${pkgs.stdenv.shell} - readInput() { - touch /tmp/reader.ready - echo "Waiting for '$1' to be typed" - read -r -n1 c - if [ "$c" = "$2" ]; then - echo "SUCCESS: Got back '$c' as expected." - echo 0 >&2 - else - echo "FAIL: Expected '$2' but got '$c' instead." - echo 1 >&2 - fi - } - - main() { - error=0 - while [ $# -gt 0 ]; do - ret="$((readInput "$2" "$3" | systemd-cat -t "$1") 2>&1)" - if [ $ret -ne 0 ]; then error=1; fi - shift 3 - done - return $error - } - - main "$@"; echo -n $? > /tmp/reader.exit + rm -f ${resultFile} ${resultFile}.tmp + logger "testReader: START: Waiting for $1 characters, expecting '$2'." + touch ${readyFile} + read -r -N $1 chars + rm -f ${readyFile} + + if [ "$chars" == "$2" ]; then + logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}.tmp + else + logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}.tmp + fi + # rename after the file is written to prevent a race condition + mv ${resultFile}.tmp ${resultFile} ''; - mkReaderInput = testname: { qwerty, expect }: with pkgs.lib; let - lq = length qwerty; - le = length expect; - msg = "`qwerty' (${lq}) and `expect' (${le}) lists" - + " need to be of the same length!"; - result = flatten (zipListsWith (a: b: [testname a b]) qwerty expect); - in if lq != le then throw msg else result; mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; let - readerInput = flatten (mapAttrsToList mkReaderInput tests); + combinedTests = foldAttrs (acc: val: acc ++ val) [] (builtins.attrValues tests); perlStr = val: "'${escape ["'" "\\"] val}'"; - perlReaderInput = concatMapStringsSep ", " perlStr readerInput; + lq = length combinedTests.qwerty; + le = length combinedTests.expect; + msg = "length mismatch between qwerty (${toString lq}) and expect (${toString le}) lists!"; + send = concatMapStringsSep ", " perlStr combinedTests.qwerty; + expect = if (lq == le) then concatStrings combinedTests.expect else throw msg; + in makeTest { name = "keymap-${layout}"; @@ -50,38 +40,40 @@ let machine.i18n.consoleKeyMap = mkOverride 900 layout; machine.services.xserver.layout = mkOverride 900 layout; machine.imports = [ ./common/x11.nix extraConfig ]; - machine.services.xserver.displayManager.slim.enable = true; testScript = '' - sub waitCatAndDelete ($) { - return $machine->succeed( - "for i in \$(seq 600); do if [ -e '$_[0]' ]; then ". - "cat '$_[0]' && rm -f '$_[0]' && exit 0; ". - "fi; sleep 0.1; done; echo timed out after 60 seconds >&2; exit 1" - ); - }; sub mkTest ($$) { my ($desc, $cmd) = @_; - my @testdata = (${perlReaderInput}); - my $shellTestdata = join ' ', map { "'".s/'/'\\'''/gr."'" } @testdata; - subtest $desc, sub { - $machine->succeed("$cmd ${testReader} $shellTestdata &"); - while (my ($testname, $qwerty, $expect) = splice(@testdata, 0, 3)) { - waitCatAndDelete "/tmp/reader.ready"; - $machine->sendKeys($qwerty); - }; - my $exitcode = waitCatAndDelete "/tmp/reader.exit"; - die "tests for $desc failed" if $exitcode ne 0; + # prepare and start testReader + $machine->execute("rm -f ${readyFile} ${resultFile}"); + $machine->succeed("$cmd ${testReader} ${toString le} ".q(${escapeShellArg expect} & )); + + if ($desc eq "Xorg keymap") { + # make sure the xterm window is open and has focus + $machine->waitForWindow(qr/testterm/); + $machine->waitUntilSucceeds("${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible --class testterm windowfocus --sync"); + } + + # wait for reader to be ready + $machine->waitForFile("${readyFile}"); + $machine->sleep(1); + + # send all keys + foreach ((${send})) { $machine->sendKeys($_); }; + + # wait for result and check + $machine->waitForFile("${resultFile}"); + $machine->succeed("grep -q 'PASS:' ${resultFile}"); }; - } + }; $machine->waitForX; mkTest "VT keymap", "openvt -sw --"; - mkTest "Xorg keymap", "DISPLAY=:0 xterm -fullscreen -e"; + mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e"; ''; }; diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix index 980b3e762dc6c44104a355f9426305bec854643f..7d7926309c95bdded33635cc6a2f990003c297de 100644 --- a/nixos/tests/krb5/deprecated-config.nix +++ b/nixos/tests/krb5/deprecated-config.nix @@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: { + { ... }: { krb5 = { enable = true; defaultRealm = "ATHENA.MIT.EDU"; diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix index d5328720931e8b9d6a0c94278a93b8e5d7b3a5d9..f01cf6988eef773330136305f1538b2b0f054777 100644 --- a/nixos/tests/krb5/example-config.nix +++ b/nixos/tests/krb5/example-config.nix @@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: { + { pkgs, ... }: { krb5 = { enable = true; kerberos = pkgs.krb5Full; diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index 27b99aacab7d149b50298693419c8f2d82ace4ec..e4bc5b326d345101aa38613cb59634c7aa99ec73 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -24,7 +24,7 @@ let { config, pkgs, lib, nodes, ... }: mkMerge [ { - virtualisation.memorySize = mkDefault 768; + virtualisation.memorySize = mkDefault 1536; virtualisation.diskSize = mkDefault 4096; networking = { inherit domain extraHosts; diff --git a/nixos/tests/kubernetes/certs.nix b/nixos/tests/kubernetes/certs.nix index 520c728b65ee288756f483e9bf3f7f57b1e1e847..85e92f6330c90fdcd8704fdd81995c59e7d87ab8 100644 --- a/nixos/tests/kubernetes/certs.nix +++ b/nixos/tests/kubernetes/certs.nix @@ -1,9 +1,9 @@ { pkgs ? import {}, - internalDomain ? "cloud.yourdomain.net", externalDomain ? "myawesomecluster.cluster.yourdomain.net", serviceClusterIp ? "10.0.0.1", - kubelets + kubelets, + ... }: let runWithCFSSL = name: cmd: diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 8c488d271bcd2934fcb80341397b1c4da6baab4c..30e1acd255a0873997f8d00512b6f54c5a0d7615 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -60,7 +60,7 @@ let config.Entrypoint = "/bin/tail"; }; - extraConfiguration = { config, pkgs, lib, nodes, ... }: { + extraConfiguration = { config, pkgs, ... }: { environment.systemPackages = [ pkgs.bind.host ]; # virtualisation.docker.extraOptions = "--dns=${config.services.kubernetes.addons.dns.clusterIp}"; services.dnsmasq.enable = true; diff --git a/nixos/tests/kubernetes/kubernetes-common.nix b/nixos/tests/kubernetes/kubernetes-common.nix index ddf427e1b01abb70f72880229e046a807944ecd2..125c176f1132ca128b13ef5ac35e3ccde7387a13 100644 --- a/nixos/tests/kubernetes/kubernetes-common.nix +++ b/nixos/tests/kubernetes/kubernetes-common.nix @@ -6,7 +6,6 @@ let featureGates = ["AllAlpha"]; flannel.enable = true; addons.dashboard.enable = true; - verbose = true; caFile = "${certs.master}/ca.pem"; apiserver = { diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix index b39f4124c958a373d5ece54fed00a20f24baa268..035a819241748cceb2b8eded728b6f844ee91e49 100644 --- a/nixos/tests/ldap.nix +++ b/nixos/tests/ldap.nix @@ -37,7 +37,7 @@ let memberUid: ${ldapUser} ''; mkClient = useDaemon: - { config, pkgs, lib, ... }: + { lib, ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; @@ -61,7 +61,7 @@ in nodes = { server = - { config, pkgs, lib, ... }: + { pkgs, ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index 97ec79406b8843baac293e7899f1d0a2235bba2c..8a9a7408d292950bcadfe26488e955d57fb0b59e 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ aszlig ]; }; - machine = { lib, ... }: { + machine = { ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.lightdm.enable = true; @@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : { enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; in '' startAll; $machine->waitForText(qr/${user.description}/); diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index a6a460fb0a7d734a533c9636dcca997f6d243308..3dbb494b6895720a811d587fe0e03029446ccb30 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: }; machine = - { config, pkgs, lib, ... }: + { pkgs, lib, ... }: { boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest; }; diff --git a/nixos/tests/mathics.nix b/nixos/tests/mathics.nix index 310b751b4d84420f0878059f565bfe85fdc2f476..fcbeeb18a7271f04d6ef0212e13d6347f5f8a5c4 100644 --- a/nixos/tests/mathics.nix +++ b/nixos/tests/mathics.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; nodes = { - machine = { config, pkgs, ... }: { + machine = { ... }: { services.mathics.enable = true; services.mathics.port = 8888; }; diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index 113fb622588b3ea1409f4330c1b88c3867fe2815..8504a7c0d057cfcdee3897a256436630a7402308 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -6,12 +6,13 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = { - server_postgres = args: { + # Since 0.33.0, matrix-synapse doesn't allow underscores in server names + serverpostgres = args: { services.matrix-synapse.enable = true; services.matrix-synapse.database_type = "psycopg2"; }; - server_sqlite = args: { + serversqlite = args: { services.matrix-synapse.enable = true; services.matrix-synapse.database_type = "sqlite3"; }; @@ -19,12 +20,12 @@ import ./make-test.nix ({ pkgs, ... } : { testScript = '' startAll; - $server_postgres->waitForUnit("matrix-synapse.service"); - $server_postgres->waitUntilSucceeds("curl -Lk https://localhost:8448/"); - $server_postgres->requireActiveUnit("postgresql.service"); - $server_sqlite->waitForUnit("matrix-synapse.service"); - $server_sqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/"); - $server_sqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]"); + $serverpostgres->waitForUnit("matrix-synapse.service"); + $serverpostgres->waitUntilSucceeds("curl -Lk https://localhost:8448/"); + $serverpostgres->requireActiveUnit("postgresql.service"); + $serversqlite->waitForUnit("matrix-synapse.service"); + $serversqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/"); + $serversqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]"); ''; }) diff --git a/nixos/tests/memcached.nix b/nixos/tests/memcached.nix new file mode 100644 index 0000000000000000000000000000000000000000..b120599c51dd806e4bc342b2232339824cdaf42a --- /dev/null +++ b/nixos/tests/memcached.nix @@ -0,0 +1,28 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "memcached"; + + nodes = { + machine = + { ... }: + { + imports = [ ../modules/profiles/minimal.nix ]; + services.memcached.enable = true; + }; + }; + + testScript = let + testScript = pkgs.writeScript "testScript.py" '' + #!${pkgs.python3.withPackages (p: [p.memcached])}/bin/python + + import memcache + c = memcache.Client(['localhost:11211']) + c.set('key', 'value') + assert 'value' == c.get('key') + ''; + in '' + startAll; + $machine->waitForUnit("memcached.service"); + $machine->waitForOpenPort("11211"); + $machine->succeed("${testScript}"); + ''; +}) diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix index 34671df047c8ce228948842d9c89d6f03da8f65e..2e6dc0eda063c852fa3f7b2d08cfbc567472908b 100644 --- a/nixos/tests/mesos.nix +++ b/nixos/tests/mesos.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { }; nodes = { - master = { config, pkgs, ... }: { + master = { ... }: { networking.firewall.enable = false; services.zookeeper.enable = true; services.mesos.master = { @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { }; }; - slave = { config, pkgs, ... }: { + slave = { ... }: { networking.firewall.enable = false; networking.nat.enable = true; virtualisation.docker.enable = true; @@ -33,6 +33,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { simpleDocker = pkgs.dockerTools.buildImage { name = "echo"; + tag = "latest"; contents = [ pkgs.stdenv.shellPackage pkgs.coreutils ]; config = { Env = [ @@ -66,9 +67,11 @@ import ./make-test.nix ({ pkgs, ...} : rec { testScript = '' startAll; + $master->waitForUnit("zookeeper.service"); $master->waitForUnit("mesos-master.service"); + $slave->waitForUnit("docker.service"); $slave->waitForUnit("mesos-slave.service"); - + $master->waitForOpenPort(2181); $master->waitForOpenPort(5050); $slave->waitForOpenPort(5051); diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index 07a292a9baa57b275a7c268e8d21c83d71028436..40a599546650ac0edf0bd2bc2680fd6a2c6403ca 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { services.minio = { enable = true; accessKey = "BKIKJAA5BMMU2RHO6IBB"; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 179c95e764366304428d7d1424b144f015c7f054..b0bc1d083b16d0e6bc026cbdac81d81dcc1c1e00 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { foo = pkgs.writeText "foo" "Hello World"; machine = - { config, lib, pkgs, ... }: + { lib, ... }: with lib; { swapDevices = mkOverride 0 [ { device = "/root/swapfile"; size = 128; } ]; diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index 18535f51af9b39e66660f32eff12e75c14878fec..2f380ff543e979f8facc87b120cf5fac90b7cea5 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -13,7 +13,7 @@ in { nodes = { one = - { config, pkgs, ... }: + { ... }: { services = { mongodb.enable = true; diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix new file mode 100644 index 0000000000000000000000000000000000000000..eab123bd50f8697a8f0ccfb53f805847a66dd71e --- /dev/null +++ b/nixos/tests/morty.nix @@ -0,0 +1,32 @@ +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "morty"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ leenaars ]; + }; + + nodes = + { mortyProxyWithKey = + + { ... }: + { services.morty = { + enable = true; + key = "78a9cd0cfee20c672f78427efb2a2a96036027f0"; + port = 3001; + }; + }; + + }; + + testScript = + { ... }: + '' + $mortyProxyWithKey->waitForUnit("default.target"); + + $mortyProxyWithKey->waitForOpenPort(3001); + $mortyProxyWithKey->succeed("curl -L 127.0.0.1:3001 | grep MortyProxy"); + + ''; + +}) diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix new file mode 100644 index 0000000000000000000000000000000000000000..ac2b810defe36b06c788ea479e7b6a6654159352 --- /dev/null +++ b/nixos/tests/mpd.nix @@ -0,0 +1,119 @@ +import ./make-test.nix ({ pkgs, ... }: + let + track = pkgs.fetchurl { + # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in + # License: http://creativecommons.org/licenses/by-sa/4.0/ + + name = "Blue_Wave_Theory-Skyhawk_Beach.mp3"; + url = https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3; + sha256 = "0xw417bxkx4gqqy139bb21yldi37xx8xjfxrwaqa0gyw19dl6mgp"; + }; + + defaultCfg = rec { + user = "mpd"; + group = "mpd"; + dataDir = "/var/lib/mpd"; + musicDirectory = "${dataDir}/music"; + }; + + defaultMpdCfg = with defaultCfg; { + inherit dataDir musicDirectory user group; + enable = true; + }; + + musicService = { user, group, musicDirectory }: { + description = "Sets up the music file(s) for MPD to use."; + requires = [ "mpd.service" ]; + after = [ "mpd.service" ]; + wantedBy = [ "default.target" ]; + script = '' + mkdir -p ${musicDirectory} && chown -R ${user}:${group} ${musicDirectory} + cp ${track} ${musicDirectory} + chown ${user}:${group} ${musicDirectory}/$(basename ${track}) + ''; + }; + + mkServer = { mpd, musicService, }: + { boot.kernelModules = [ "snd-dummy" ]; + sound.enable = true; + services.mpd = mpd; + systemd.services.musicService = musicService; + }; + in { + name = "mpd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ emmanuelrosa ]; + }; + + nodes = + { client = + { ... }: { }; + + serverALSA = + { ... }: (mkServer { + mpd = defaultMpdCfg // { + network.listenAddress = "any"; + extraConfig = '' + audio_output { + type "alsa" + name "ALSA" + mixer_type "null" + } + ''; + }; + + musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; }; + }) // { networking.firewall.allowedTCPPorts = [ 6600 ]; }; + + serverPulseAudio = + { ... }: (mkServer { + mpd = defaultMpdCfg // { + extraConfig = '' + audio_output { + type "pulse" + name "The Pulse" + } + ''; + }; + + musicService = with defaultCfg; musicService { inherit user group musicDirectory; }; + }) // { hardware.pulseaudio.enable = true; }; + }; + + testScript = '' + my $mpc = "${pkgs.mpc_cli}/bin/mpc --wait"; + + # Connects to the given server and attempts to play a tune. + sub play_some_music { + my $server = $_[0]; + + $server->waitForUnit("mpd.service"); + $server->succeed("$mpc update"); + my @tracks = $server->execute("$mpc ls"); + + for my $track (split(/\n/, $tracks[1])) { + $server->succeed("$mpc add $track"); + }; + + my @added_tracks = $server->execute("$mpc listall"); + (length $added_tracks[1]) > 0 or die "Failed to add audio tracks to the playlist."; + + $server->succeed("$mpc play"); + + my @status = $server->execute("$mpc status"); + my @output = split(/\n/, $status[1]); + $output[1] =~ /.*playing.*/ or die "Audio track is not playing, as expected."; + + $server->succeed("$mpc stop"); + }; + + play_some_music($serverALSA); + play_some_music($serverPulseAudio); + + $client->succeed("$mpc -h serverALSA status"); + + # The PulseAudio-based server is configured not to accept external client connections + # to perform the following test: + $client->fail("$mpc -h serverPulseAudio status"); + ''; +}) diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index 7959b85a0cf009d68c7cb34fcd2552ef099eb681..8146453bfd55149310230148389993b10675063e 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : let - client = { config, pkgs, ... }: { + client = { pkgs, ... }: { imports = [ ./common/x11.nix ]; environment.systemPackages = [ pkgs.mumble ]; }; @@ -13,7 +13,7 @@ in }; nodes = { - server = { config, pkgs, ... }: { + server = { config, ... }: { services.murmur.enable = true; services.murmur.registerName = "NixOS tests"; networking.firewall.allowedTCPPorts = [ config.services.murmur.port ]; diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 40fafc625146a064798ed3ad3d312f53b428b231..9f66005292ab51afff38036df8582b7197e292fa 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -9,19 +9,26 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { one = - { config, pkgs, ... }: + { config, ... }: { services = { - munin-node.enable = true; - munin-cron = { + munin-node = { enable = true; - hosts = '' - [${config.networking.hostName}] - address localhost + # disable a failing plugin to prevent irrelevant error message, see #23049 + extraConfig = '' + ignore_file ^apc_nis$ ''; }; + munin-cron = { + enable = true; + hosts = '' + [${config.networking.hostName}] + address localhost + ''; + }; }; - systemd.services.munin-node.serviceConfig.TimeoutStartSec = "3min"; + # long timeout to prevent hydra failure on high load + systemd.services.munin-node.serviceConfig.TimeoutStartSec = "10min"; }; }; @@ -29,7 +36,10 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $one->waitForUnit("munin-node.service"); + # make sure the node is actually listening + $one->waitForOpenPort(4949); $one->succeed('systemctl start munin-cron'); + # wait for munin-cron output $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd"); $one->waitForFile("/var/www/munin/one/index.html"); ''; diff --git a/nixos/tests/mutable-users.nix b/nixos/tests/mutable-users.nix index 4f11a4b8366908930858919e027f07246d0dd127..e590703ab2f48f5644605244cf3d7e615f78a5ac 100644 --- a/nixos/tests/mutable-users.nix +++ b/nixos/tests/mutable-users.nix @@ -7,10 +7,10 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - machine = { config, lib, pkgs, ... }: { + machine = { ... }: { users.mutableUsers = false; }; - mutable = { config, lib, pkgs, ... }: { + mutable = { ... }: { users.mutableUsers = true; }; }; diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix index f5bcc460cba790a2325e4b93f8c83104ebf90894..81482dfef7e5625f624883fab17bf33275cb13a6 100644 --- a/nixos/tests/mysql-backup.nix +++ b/nixos/tests/mysql-backup.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = { - master = { config, pkgs, ... }: { + master = { pkgs, ... }: { services.mysql = { enable = true; initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; @@ -23,17 +23,25 @@ import ./make-test.nix ({ pkgs, ... } : { testScript = '' startAll; + # Delete backup file that may be left over from a previous test run. + # This is not needed on Hydra but useful for repeated local test runs. + $master->execute("rm -f /var/backup/mysql/testdb.gz"); + # Need to have mysql started so that it can be populated with data. $master->waitForUnit("mysql.service"); - # Wait for testdb to be populated. - $master->sleep(10); + # Wait for testdb to be fully populated (5 rows). + $master->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"); - # Do a backup and wait for it to finish. + # Do a backup and wait for it to start $master->startJob("mysql-backup.service"); $master->waitForJob("mysql-backup.service"); - # Check that data appears in backup + # wait for backup to fail, because of database 'doesnotexist' + $master->waitUntilFails("systemctl is-active -q mysql-backup.service"); + + # wait for backup file and check that data appears in backup + $master->waitForFile("/var/backup/mysql/testdb.gz"); $master->succeed("${pkgs.gzip}/bin/zcat /var/backup/mysql/testdb.gz | grep hello"); # Check that a failed backup is logged diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index 75c6d793febc35e82d60da033d5d3ecf63bcb028..84d70cf3524646f5a762b9b9250069095138f886 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -13,7 +13,7 @@ in nodes = { master = - { pkgs, config, ... }: + { pkgs, ... }: { services.mysql.enable = true; @@ -27,7 +27,7 @@ in }; slave1 = - { pkgs, config, nodes, ... }: + { pkgs, nodes, ... }: { services.mysql.enable = true; @@ -40,7 +40,7 @@ in }; slave2 = - { pkgs, config, nodes, ... }: + { pkgs, nodes, ... }: { services.mysql.enable = true; @@ -57,18 +57,25 @@ in $master->start; $master->waitForUnit("mysql"); $master->waitForOpenPort(3306); + # Wait for testdb to be fully populated (5 rows). + $master->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"); + $slave1->start; $slave2->start; $slave1->waitForUnit("mysql"); $slave1->waitForOpenPort(3306); $slave2->waitForUnit("mysql"); $slave2->waitForOpenPort(3306); - $slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); + + # wait for replications to finish + $slave1->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"); + $slave2->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"); + $slave2->succeed("systemctl stop mysql"); $master->succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N"); $slave2->succeed("systemctl start mysql"); $slave2->waitForUnit("mysql"); $slave2->waitForOpenPort(3306); - $slave2->succeed("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456"); + $slave2->waitUntilSucceeds("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456"); ''; }) diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index baaebf9f10db281d038b0fdbadc934ff7bc18d61..7251c4a86499fde7e534bbad38f2f083c278f3e2 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { master = - { pkgs, config, ... }: + { pkgs, ... }: { services.mysql.enable = true; @@ -19,7 +19,6 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $master->waitForUnit("mysql"); - $master->sleep(10); # Hopefully this is long enough!! $master->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); ''; }) diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 7057158a829bbbe290a2de48ef521b63282fef4c..9c280fe8b5b6671049010713df628186240c2ab9 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -30,7 +30,7 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, nodes = { client = - { config, pkgs, nodes, ... }: + { pkgs, nodes, ... }: lib.mkMerge [ { virtualisation.vlans = [ 1 ]; networking.firewall.allowPing = true; @@ -44,19 +44,19 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ]; router = - { config, pkgs, ... }: lib.mkMerge [ + { ... }: lib.mkMerge [ routerBase { networking.nat.enable = true; } ]; routerDummyNoNat = - { config, pkgs, ... }: lib.mkMerge [ + { ... }: lib.mkMerge [ routerBase { networking.nat.enable = false; } ]; server = - { config, pkgs, ... }: + { ... }: { virtualisation.vlans = [ 2 ]; networking.firewall.enable = false; services.httpd.enable = true; diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index 58733c1b3379b6b305cd425539e42acfd9905ee0..9bd147968e4b1acd0318e3940546b1704a5dc34c 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { netdata = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = with pkgs; [ curl jq ]; services.netdata.enable = true; @@ -19,8 +19,15 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $netdata->waitForUnit("netdata.service"); - # check if netdata can read disk ops for root owned processes. - # if > 0, successful. verifies both netdata working and + + # wait for the service to listen before sending a request + $netdata->waitForOpenPort(19999); + + # check if the netdata main page loads. + $netdata->succeed("curl --fail http://localhost:19999/"); + + # check if netdata can read disk ops for root owned processes. + # if > 0, successful. verifies both netdata working and # apps.plugin has elevated capabilities. my $cmd = <<'CMD'; curl -s http://localhost:19999/api/v1/data\?chart=users.pwrites | \ diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix index 4c572573140443f934f4ea27f6da374546aaad37..ab908c96e5eea233650261cfb3fd48ecd81b19e9 100644 --- a/nixos/tests/networking-proxy.nix +++ b/nixos/tests/networking-proxy.nix @@ -19,13 +19,13 @@ in import ./make-test.nix ({ pkgs, ...} : { nodes = { # no proxy machine = - { config, pkgs, ... }: + { ... }: default-config; # proxy default machine2 = - { config, pkgs, ... }: + { ... }: default-config // { networking.proxy.default = "http://user:pass@host:port"; @@ -33,7 +33,7 @@ in import ./make-test.nix ({ pkgs, ...} : { # specific proxy options machine3 = - { config, pkgs, ... }: + { ... }: default-config // { @@ -51,7 +51,7 @@ in import ./make-test.nix ({ pkgs, ...} : { # mix default + proxy options machine4 = - { config, pkgs, ... }: + { ... }: default-config // { networking.proxy = { diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 5cb40af5799e4033de8957eb8d879839a3430fd3..ff088ad2621b54ebe0e2f3a7210eb09e0f9f800f 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -81,7 +81,7 @@ let static = { name = "Static"; nodes.router = router; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -98,7 +98,7 @@ let ]; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -134,7 +134,7 @@ let dhcpSimple = { name = "SimpleDHCP"; nodes.router = router; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -150,7 +150,7 @@ let }; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -189,7 +189,7 @@ let dhcpOneIf = { name = "OneInterfaceDHCP"; nodes.router = router; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -202,7 +202,7 @@ let interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -229,7 +229,7 @@ let ''; }; bond = let - node = address: { config, pkgs, ... }: with pkgs.lib; { + node = address: { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -249,7 +249,7 @@ let name = "Bond"; nodes.client1 = node "192.168.1.1"; nodes.client2 = node "192.168.1.2"; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -266,7 +266,7 @@ let ''; }; bridge = let - node = { address, vlan }: { config, pkgs, ... }: with pkgs.lib; { + node = { address, vlan }: { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ vlan ]; networking = { useNetworkd = networkd; @@ -280,7 +280,7 @@ let name = "Bridge"; nodes.client1 = node { address = "192.168.1.2"; vlan = 1; }; nodes.client2 = node { address = "192.168.1.3"; vlan = 2; }; - nodes.router = { config, pkgs, ... }: with pkgs.lib; { + nodes.router = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -293,7 +293,7 @@ let [ { address = "192.168.1.1"; prefixLength = 24; } ]; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -319,7 +319,7 @@ let macvlan = { name = "MACVLAN"; nodes.router = router; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -329,7 +329,7 @@ let interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -356,7 +356,7 @@ let ''; }; sit = let - node = { address4, remote, address6 }: { config, pkgs, ... }: with pkgs.lib; { + node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -377,7 +377,7 @@ let name = "Sit"; nodes.client1 = node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; }; nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -398,7 +398,7 @@ let ''; }; vlan = let - node = address: { config, pkgs, ... }: with pkgs.lib; { + node = address: { pkgs, ... }: with pkgs.lib; { #virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -418,7 +418,7 @@ let name = "vlan"; nodes.client1 = node "192.168.1.1"; nodes.client2 = node "192.168.1.2"; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -448,8 +448,8 @@ let testScript = '' my $targetList = <<'END'; - tap0: tap UNKNOWN_FLAGS:800 user 0 - tun0: tun UNKNOWN_FLAGS:800 user 0 + tap0: tap persist user 0 + tun0: tun persist user 0 END # Wait for networking to come up @@ -476,7 +476,7 @@ let }; privacy = { name = "Privacy"; - nodes.router = { config, pkgs, ... }: { + nodes.router = { ... }: { virtualisation.vlans = [ 1 ]; boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; networking = { @@ -502,7 +502,7 @@ let ''; }; }; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -514,7 +514,7 @@ let }; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -552,15 +552,15 @@ let testScript = '' my $targetIPv4Table = <<'END'; - 10.0.0.0/16 scope link mtu 1500 + 10.0.0.0/16 proto static scope link mtu 1500 192.168.1.0/24 proto kernel scope link src 192.168.1.2 - 192.168.2.0/24 via 192.168.1.1 + 192.168.2.0/24 via 192.168.1.1 proto static END my $targetIPv6Table = <<'END'; 2001:1470:fffd:2097::/64 proto kernel metric 256 pref medium - 2001:1470:fffd:2098::/64 via fdfd:b3f0::1 metric 1024 pref medium - fdfd:b3f0::/48 metric 1024 pref medium + 2001:1470:fffd:2098::/64 via fdfd:b3f0::1 proto static metric 1024 pref medium + fdfd:b3f0::/48 proto static metric 1024 pref medium END $machine->start; diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix index 1f19fc0867a49df04bd6c09b5f2b2f87ac48b504..bf49d2247bd869fd0e0b438868dbb04029b6ef2c 100644 --- a/nixos/tests/nexus.nix +++ b/nixos/tests/nexus.nix @@ -1,34 +1,32 @@ # verifies: # 1. nexus service starts on server -# 2. nexus user can be extended on server -# 3. nexus service not can startup on server (creating database and all other initial stuff) +# 2. nexus service can startup on server (creating database and all other initial stuff) +# 3. the web application is reachable via HTTP import ./make-test.nix ({ pkgs, ...} : { name = "nexus"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ironpinguin ]; + maintainers = [ ironpinguin ma27 ]; }; nodes = { server = - { config, pkgs, ... }: - { virtualisation.memorySize = 2048; + { ... }: + { virtualisation.memorySize = 2047; # qemu-system-i386 has a 2047M limit + virtualisation.diskSize = 2048; services.nexus.enable = true; - - users.extraUsers.nexus.extraGroups = [ "users" ]; }; + }; testScript = '' startAll; $server->waitForUnit("nexus"); - - print $server->execute("sudo -u nexus groups"); - $server->mustSucceed("sudo -u nexus groups | grep nexus | grep users"); - $server->waitForOpenPort(8081); + + $server->succeed("curl -f 127.0.0.1:8081"); ''; }) diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index 6ed1995f262a2c12e45fea6198acf46c8ea4c379..1992f240e7b00fbde800d48752530ee686c3ea0f 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, version ? 4, ... }: let client = - { config, pkgs, ... }: + { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/data"; device = "server:/data"; @@ -27,7 +27,7 @@ in client2 = client; server = - { config, pkgs, ... }: + { ... }: { services.nfs.server.enable = true; services.nfs.server.exports = '' diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index 7f7bc0f0b4fe1f81d674f57fdcc842fe2b24b4d1..32b113649237a860fa7da4b5fca4cc24cdef23f4 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -10,7 +10,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { webserver = - { config, pkgs, ... }: + { ... }: { services.nginx.enable = true; services.nginx.commonHttpConfig = '' log_format ceeformat '@cee: {"status":"$status",' diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix index 21b86f6dae279b676df47e26cf4211b23941f5fc..2b56aee0a2e7a3c001aa79ca1a98a86373dbc91c 100644 --- a/nixos/tests/novacomd.nix +++ b/nixos/tests/novacomd.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ dtzWill ]; }; - machine = { config, pkgs, ... }: { + machine = { ... }: { services.novacomd.enable = true; }; diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix index ad4d4f8224353d1be28f49e7c6a7bd54ee14001a..c3c91e71b5ca85730486de918670ff52045472e6 100644 --- a/nixos/tests/nsd.nix +++ b/nixos/tests/nsd.nix @@ -41,6 +41,7 @@ in import ./make-test.nix ({ pkgs, ...} : { { address = "dead:beef::1"; prefixLength = 64; } ]; services.nsd.enable = true; + services.nsd.rootServer = true; services.nsd.interfaces = lib.mkForce []; services.nsd.zones."example.com.".data = '' @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600 @@ -55,6 +56,11 @@ in import ./make-test.nix ({ pkgs, ...} : { @ A 9.8.7.6 @ AAAA fedc::bbaa ''; + services.nsd.zones.".".data = '' + @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600 + root A 1.8.7.4 + root AAAA acbd::4 + ''; }; }; @@ -86,6 +92,9 @@ in import ./make-test.nix ({ pkgs, ...} : { assertHost($_, "a", "deleg.example.com", qr/address 9.8.7.6$/); assertHost($_, "aaaa", "deleg.example.com", qr/address fedc::bbaa$/); + + assertHost($_, "a", "root", qr/address 1.8.7.4$/); + assertHost($_, "aaaa", "root", qr/address acbd::4$/); }; } ''; diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix new file mode 100644 index 0000000000000000000000000000000000000000..5079779f35b424a729a1ee9ab5c96bb3fa05066d --- /dev/null +++ b/nixos/tests/opensmtpd.nix @@ -0,0 +1,115 @@ +import ./make-test.nix { + name = "opensmtpd"; + + nodes = { + smtp1 = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + networking = { + firewall.allowedTCPPorts = [ 25 ]; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + environment.systemPackages = [ pkgs.opensmtpd ]; + services.opensmtpd = { + enable = true; + extraServerArgs = [ "-v" ]; + serverConfiguration = '' + listen on 0.0.0.0 + # DO NOT DO THIS IN PRODUCTION! + # Setting up authentication requires a certificate which is painful in + # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A + # WELL-CONTROLLED ENVIRONMENT! + accept from any for any relay + ''; + }; + }; + + smtp2 = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + networking = { + firewall.allowedTCPPorts = [ 25 143 ]; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.2"; prefixLength = 24; } + ]; + }; + environment.systemPackages = [ pkgs.opensmtpd ]; + services.opensmtpd = { + enable = true; + extraServerArgs = [ "-v" ]; + serverConfiguration = '' + listen on 0.0.0.0 + accept from any for local deliver to mda \ + "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}" + ''; + }; + services.dovecot2 = { + enable = true; + enableImap = true; + mailLocation = "maildir:~/mail"; + protocols = [ "imap" ]; + }; + }; + + client = { pkgs, ... }: { + networking = { + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.3"; prefixLength = 24; } + ]; + }; + environment.systemPackages = let + sendTestMail = pkgs.writeScriptBin "send-a-test-mail" '' + #!${pkgs.python3.interpreter} + import smtplib, sys + + with smtplib.SMTP('192.168.1.1') as smtp: + smtp.sendmail('alice@[192.168.1.1]', 'bob@[192.168.1.2]', """ + From: alice@smtp1 + To: bob@smtp2 + Subject: Test + + Hello World + """) + ''; + + checkMailLanded = pkgs.writeScriptBin "check-mail-landed" '' + #!${pkgs.python3.interpreter} + import imaplib + + with imaplib.IMAP4('192.168.1.2', 143) as imap: + imap.login('bob', 'foobar') + imap.select() + status, refs = imap.search(None, 'ALL') + assert status == 'OK' + assert len(refs) == 1 + status, msg = imap.fetch(refs[0], 'BODY[TEXT]') + assert status == 'OK' + content = msg[0][1] + print("===> content:", content) + split = content.split(b'\r\n') + print("===> split:", split) + lastline = split[-3] + print("===> lastline:", lastline) + assert lastline.strip() == b'Hello World' + ''; + in [ sendTestMail checkMailLanded ]; + }; + }; + + testScript = '' + startAll; + + $client->waitForUnit("network.target"); + $smtp1->waitForUnit('opensmtpd'); + $smtp2->waitForUnit('opensmtpd'); + $smtp2->waitForUnit('dovecot2'); + + $client->succeed('send-a-test-mail'); + $smtp1->waitUntilFails('smtpctl show queue | egrep .'); + $smtp2->waitUntilFails('smtpctl show queue | egrep .'); + $client->succeed('check-mail-landed >&2'); + ''; +} diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index b2d254e9d9d942cfee5ef5270dd20788dcad03f7..c66b90b802d53cc04ae94789e35eb9c4d93f22de 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -11,31 +11,31 @@ in { nodes = { server = - { config, pkgs, ... }: + { ... }: { services.openssh.enable = true; security.pam.services.sshd.limits = [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; - users.extraUsers.root.openssh.authorizedKeys.keys = [ + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; server_lazy = - { config, pkgs, ... }: + { ... }: { services.openssh = { enable = true; startWhenNeeded = true; }; security.pam.services.sshd.limits = [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; - users.extraUsers.root.openssh.authorizedKeys.keys = [ + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; client = - { config, pkgs, ... }: { }; + { ... }: { }; }; diff --git a/nixos/tests/osquery.nix b/nixos/tests/osquery.nix new file mode 100644 index 0000000000000000000000000000000000000000..281dbcff664382be478ec98c9f7d734fa687eb0d --- /dev/null +++ b/nixos/tests/osquery.nix @@ -0,0 +1,28 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +with lib; + +{ + name = "osquery"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + machine = { + services.osquery.enable = true; + services.osquery.loggerPath = "/var/log/osquery/logs"; + services.osquery.pidfile = "/var/run/osqueryd.pid"; + }; + + testScript = '' + $machine->start; + $machine->waitForUnit("osqueryd.service"); + + $machine->succeed("echo 'SELECT address FROM etc_hosts LIMIT 1;' | osqueryi | grep '127.0.0.1'"); + $machine->succeed( + "echo 'SELECT value FROM osquery_flags WHERE name = \"logger_path\";' | osqueryi | grep /var/log/osquery/logs" + ); + + $machine->succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"pidfile\";' | osqueryi | grep /var/run/osqueryd.pid"); + ''; +}) diff --git a/nixos/tests/ostree.nix b/nixos/tests/ostree.nix new file mode 100644 index 0000000000000000000000000000000000000000..8b19004874e767a950998e207abab0a9ea9b6d32 --- /dev/null +++ b/nixos/tests/ostree.nix @@ -0,0 +1,21 @@ +# run installed tests +import ./make-test.nix ({ pkgs, lib, ... }: { + name = "ostree"; + + meta = { + maintainers = pkgs.ostree.meta.maintainers; + }; + + # TODO: Wrap/patch the tests directly in the package + machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + gnome-desktop-testing ostree gnupg (python3.withPackages (p: with p; [ pyyaml ])) + ]; + + environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk_pixbuf atk ]); # for GJS tests + }; + + testScript = '' + $machine->succeed("gnome-desktop-testing-runner -d ${pkgs.ostree.installedTests}/share"); + ''; +}) diff --git a/nixos/tests/owncloud.nix b/nixos/tests/owncloud.nix index 0dcdea40b0646e4a2f180e485f0c2758a147276f..c968569f2008cc0ebb54e04ea7b24478c22cfca0 100644 --- a/nixos/tests/owncloud.nix +++ b/nixos/tests/owncloud.nix @@ -1,10 +1,10 @@ -import ./make-test.nix ({ pkgs, ... }: +import ./make-test.nix ({ ... }: { name = "owncloud"; nodes = { web = - { config, pkgs, ... }: + { ... }: { services.postgresql.enable = true; services.httpd = { diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix index 4364d6e354a656e72f31c9cb63e04520308babcf..b9d489950e7220b68e0ea0e4e6ed598ff46ce31e 100644 --- a/nixos/tests/pam-oath-login.nix +++ b/nixos/tests/pam-oath-login.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: +import ./make-test.nix ({ ... }: let oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3"; @@ -12,8 +12,6 @@ let # and picking a the first 4: oathSnakeOilPassword1 = "143349"; oathSnakeOilPassword2 = "801753"; - oathSnakeOilPassword3 = "019933"; - oathSnakeOilPassword4 = "403895"; alicePassword = "foobar"; # Generated via: mkpasswd -m sha-512 and passing in "foobar" @@ -24,13 +22,13 @@ in name = "pam-oath-login"; machine = - { config, pkgs, lib, ... }: + { ... }: { security.pam.oath = { enable = true; }; - users.extraUsers.alice = { + users.users.alice = { isNormalUser = true; name = "alice"; uid = 1000; diff --git a/nixos/tests/panamax.nix b/nixos/tests/panamax.nix deleted file mode 100644 index 088aa79f8c6156eebfdb578cc69bc64d1f6aae3e..0000000000000000000000000000000000000000 --- a/nixos/tests/panamax.nix +++ /dev/null @@ -1,21 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "panamax"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ offline ]; - }; - - machine = { config, pkgs, ... }: { - services.panamax.enable = true; - }; - - testScript = - '' - startAll; - $machine->waitForUnit("panamax-api.service"); - $machine->waitForUnit("panamax-ui.service"); - $machine->waitForOpenPort(3000); - $machine->waitForOpenPort(8888); - $machine->succeed("curl --fail http://localhost:8888/ > /dev/null"); - $machine->shutdown; - ''; -}) diff --git a/nixos/tests/partition.nix b/nixos/tests/partition.nix index 291d9b278d3b11d7643eaf7cc1545519bab8b157..01a08995950f68528bf37c833d925c0aca365b00 100644 --- a/nixos/tests/partition.nix +++ b/nixos/tests/partition.nix @@ -65,7 +65,7 @@ let in { name = "partitiion"; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.pythonPackages.nixpart0 pkgs.file pkgs.btrfs-progs pkgs.xfsprogs pkgs.lvm2 diff --git a/nixos/tests/peerflix.nix b/nixos/tests/peerflix.nix index eb729f22f913e03fd993cb3d7c4c6fbc76ed9bc9..fae37fedaac78f2be2ee9ffbb3c1b11eb382d542 100644 --- a/nixos/tests/peerflix.nix +++ b/nixos/tests/peerflix.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { peerflix = - { config, pkgs, ... }: + { ... }: { services.peerflix.enable = true; }; diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix index d186c42a2a98e2824984e828842a60e1e484f645..a2d81288c812207e102d0be75f2301b40162d25a 100644 --- a/nixos/tests/pgjwt.nix +++ b/nixos/tests/pgjwt.nix @@ -14,7 +14,7 @@ with pkgs; { }; nodes = { - master = { pkgs, config, ... }: + master = { ... }: { services.postgresql = { enable = true; diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix index fdc39393faeafa5bea64f53073aa539139ff0c52..20b3b838aba83cd33c8ae2aee69ac94c4bf1d1b7 100644 --- a/nixos/tests/phabricator.nix +++ b/nixos/tests/phabricator.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: { nodes = { storage = - { config, pkgs, ... }: + { ... }: { services.nfs.server.enable = true; services.nfs.server.exports = '' /repos 192.168.1.0/255.255.255.0(rw,no_root_squash) @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; webserver = - { config, pkgs, ... }: + { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/repos"; device = "storage:/repos"; @@ -52,7 +52,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; client = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/x11.nix ]; services.xserver.desktopManager.plasma5.enable = true; }; diff --git a/nixos/tests/php-pcre.nix b/nixos/tests/php-pcre.nix index f618a39a22931b044479f1c9a748412984d1d01a..19bde9babad5df8d4ff7aa24264f9fd60077eb33 100644 --- a/nixos/tests/php-pcre.nix +++ b/nixos/tests/php-pcre.nix @@ -1,9 +1,9 @@ let testString = "can-use-subgroups"; in -import ./make-test.nix ({ pkgs, ...}: { +import ./make-test.nix ({ ...}: { name = "php-httpd-pcre-jit-test"; - machine = { config, lib, pkgs, ... }: { + machine = { lib, pkgs, ... }: { time.timeZone = "UTC"; services.httpd = { enable = true; @@ -34,7 +34,7 @@ import ./make-test.nix ({ pkgs, ...}: { }; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' $machine->waitForUnit('httpd.service'); # Ensure php evaluation by matching on the var_dump syntax diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index f3bd4c5915b010eedfd7b7e3c971c9338f660b7f..eb705536827e7740afb71afb0f8f1e8916df35af 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -6,13 +6,28 @@ import ./make-test.nix ({ pkgs, ...} : maintainers = [ ttuegel ]; }; - machine = { lib, ... }: { + machine = { ... }: + let + sddm_theme = pkgs.stdenv.mkDerivation { + name = "breeze-ocr-theme"; + phases = "buildPhase"; + buildCommand = '' + mkdir -p $out/share/sddm/themes/ + cp -r ${pkgs.plasma-workspace}/share/sddm/themes/breeze $out/share/sddm/themes/breeze-ocr-theme + chmod -R +w $out/share/sddm/themes/breeze-ocr-theme + printf "[General]\ntype=color\ncolor=#1d99f3\nbackground=\n" > $out/share/sddm/themes/breeze-ocr-theme/theme.conf + ''; + }; + in + { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; + services.xserver.displayManager.sddm.theme = "breeze-ocr-theme"; services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.default = "plasma5"; virtualisation.memorySize = 1024; + environment.systemPackages = [ sddm_theme ]; # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why. nixpkgs.config.packageOverrides = superPkgs: { @@ -26,11 +41,10 @@ import ./make-test.nix ({ pkgs, ...} : enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; xdo = "${pkgs.xdotool}/bin/xdotool"; in '' startAll; - # Wait for display manager to start $machine->waitForText(qr/${user.description}/); $machine->screenshot("sddm"); diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix index 557d65f7960a95c78e47bc3dc72e31a5fbcfcf51..609afe7b2145f47c2e04438289ae4defb40568fd 100644 --- a/nixos/tests/plotinus.nix +++ b/nixos/tests/plotinus.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/x11.nix ]; programs.plotinus.enable = true; @@ -15,11 +15,11 @@ import ./make-test.nix ({ pkgs, ... }: { testScript = '' $machine->waitForX; - $machine->execute("xterm -e 'gnome-calculator' &"); - $machine->waitForWindow(qr/Calculator/); - $machine->execute("xdotool key ctrl+shift+p"); - $machine->sleep(1); # wait for the popup - $machine->execute("xdotool key p r e f e r e n c e s Return"); + $machine->succeed("gnome-calculator &"); + $machine->waitForWindow(qr/gnome-calculator/); + $machine->succeed("xdotool search --sync --onlyvisible --class gnome-calculator windowfocus --sync key ctrl+shift+p"); + $machine->sleep(5); # wait for the popup + $machine->succeed("xdotool key --delay 100 p r e f e r e n c e s Return"); $machine->waitForWindow(qr/Preferences/); $machine->screenshot("screen"); ''; diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 7fe905eb4254f7d18c521843a2a45b7ac6dcfaa8..f8b63c5b6a27bf3203e6e981040f20d24e577e10 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { master = - { pkgs, config, ... }: + { pkgs, ... }: { services.postgresql = let mypg = pkgs.postgresql100; in { diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 0ce37b55bb7b33cb972b7ce45a34119e577a8985..f1f09277f342a5a693fa2f1fa96e4292d2617004 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -22,10 +22,13 @@ let maintainers = [ zagy ]; }; - machine = {pkgs, config, ...}: + machine = {...}: { services.postgresql.package=postgresql-package; services.postgresql.enable = true; + + services.postgresqlBackup.enable = true; + services.postgresqlBackup.databases = [ "postgres" ]; }; testScript = '' @@ -46,6 +49,10 @@ let $machine->succeed(check_count("SELECT * FROM sth;", 5)); $machine->fail(check_count("SELECT * FROM sth;", 4)); $machine->succeed(check_count("SELECT xpath(\'/test/text()\', doc) FROM xmltest;", 1)); + + # Check backup service + $machine->succeed("systemctl start postgresqlBackup-postgres.service"); + $machine->succeed("zcat /var/backup/postgresql/postgres.sql.gz | grep 'ok'"); $machine->shutdown; ''; diff --git a/nixos/tests/powerdns.nix b/nixos/tests/powerdns.nix index 0d5b0f715f52b0e4fc4b4df407c3a9471d2f3062..8addcc784012d0fc75267d20d9b239944fb7c546 100644 --- a/nixos/tests/powerdns.nix +++ b/nixos/tests/powerdns.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: { name = "powerdns"; - nodes.server = { config, pkgs, ... }: { + nodes.server = { ... }: { services.powerdns.enable = true; }; diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index b4c2039923cf02d5fea04768315ba7706d5c4a3a..0d73436c1c3f5544816b4e3a8a502c789f2d4acb 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -1,27 +1,24 @@ -{ system ? builtins.currentSystem -, pkgs ? import ../.. { inherit system; } -}: -with import ../lib/testing.nix { inherit system; }; -let boolToString = x: if x then "yes" else "no"; in -let testWhenSetTo = predictable: withNetworkd: -makeTest { - name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; - meta = {}; +{ system ? builtins.currentSystem }: - machine = { config, pkgs, ... }: { - networking.usePredictableInterfaceNames = pkgs.stdenv.lib.mkForce predictable; - networking.useNetworkd = withNetworkd; - networking.dhcpcd.enable = !withNetworkd; - }; +let + inherit (import ../lib/testing.nix { inherit system; }) makeTest pkgs; +in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { + name = pkgs.lib.optionalString (!predictable) "un" + "predictable" + + pkgs.lib.optionalString withNetworkd "Networkd"; + value = makeTest { + name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; + meta = {}; + + machine = { lib, ... }: { + networking.usePredictableInterfaceNames = lib.mkForce predictable; + networking.useNetworkd = withNetworkd; + networking.dhcpcd.enable = !withNetworkd; + }; - testScript = '' - print $machine->succeed("ip link"); - $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}"); - $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}"); - ''; -}; in -with pkgs.stdenv.lib.lists; -with pkgs.stdenv.lib.attrsets; -listToAttrs (map (drv: nameValuePair drv.name drv) ( -crossLists testWhenSetTo [[true false] [true false]] -)) + testScript = '' + print $machine->succeed("ip link"); + $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}"); + $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}"); + ''; + }; +}) [[true false] [true false]]) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 9890088306136e2c00e69936cef6dda1a70fcbb4..d85abf3c105cc566ba97e803ecdb81f5035d221a 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({pkgs, ... }: { nodes = { server = - { config, pkgs, ... }: + { ... }: { services.printing.enable = true; services.printing.listenAddresses = [ "*:631" ]; services.printing.defaultShared = true; @@ -24,7 +24,7 @@ import ./make-test.nix ({pkgs, ... }: { }; client = - { config, pkgs, nodes, ... }: + { ... }: { services.printing.enable = true; }; diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index 374fb2d634b4b36d6d118b7f229ebb909971606b..87a6510f40fd8e6c66709fa433328234ff4fa205 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -2,7 +2,7 @@ import ./make-test.nix { name = "prometheus"; nodes = { - one = { config, pkgs, ... }: { + one = { ... }: { services.prometheus = { enable = true; scrapeConfigs = [{ diff --git a/nixos/tests/prosody.nix b/nixos/tests/prosody.nix index fcebfaf74e12642b3e2f856d6af76fc9ddf217c1..5d33aaf8d65decccfdb2944f7443e1c1be3aeff0 100644 --- a/nixos/tests/prosody.nix +++ b/nixos/tests/prosody.nix @@ -1,7 +1,7 @@ import ./make-test.nix { name = "prosody"; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { services.prosody = { enable = true; # TODO: use a self-signed certificate diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix index 3fee1d325384958e52d97a53a1522ba9c7810f32..18195312028229adab63fdc8cc792e80753528fb 100644 --- a/nixos/tests/proxy.nix +++ b/nixos/tests/proxy.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : let backend = - { config, pkgs, ... }: + { pkgs, ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; @@ -21,7 +21,7 @@ in nodes = { proxy = - { config, pkgs, nodes, ... }: + { nodes, ... }: { services.httpd.enable = true; services.httpd.adminAddr = "bar@example.org"; @@ -57,7 +57,7 @@ in backend1 = backend; backend2 = backend; - client = { config, pkgs, ... }: { }; + client = { ... }: { }; }; testScript = diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix index 613180942c41567076113d2bd9c0084a0cc47d37..0ff14a21584a443c0534f59dd9fa491c38f0a224 100644 --- a/nixos/tests/quagga.nix +++ b/nixos/tests/quagga.nix @@ -30,14 +30,14 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { client = - { config, pkgs, nodes, ... }: + { nodes, ... }: { virtualisation.vlans = [ 1 ]; networking.defaultGateway = ifAddr nodes.router1 "eth1"; }; router1 = - { config, pkgs, nodes, ... }: + { ... }: { virtualisation.vlans = [ 1 2 ]; boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; @@ -49,7 +49,7 @@ import ./make-test.nix ({ pkgs, ... }: }; router2 = - { config, pkgs, nodes, ... }: + { ... }: { virtualisation.vlans = [ 3 2 ]; boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; @@ -61,7 +61,7 @@ import ./make-test.nix ({ pkgs, ... }: }; server = - { config, pkgs, nodes, ... }: + { nodes, ... }: { virtualisation.vlans = [ 3 ]; networking.defaultGateway = ifAddr nodes.router2 "eth1"; @@ -73,7 +73,7 @@ import ./make-test.nix ({ pkgs, ... }: }; testScript = - { nodes, ... }: + { ... }: '' startAll; diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index 22d71595cb488edd6474339a227b3ec86bf375ec..75c82cca63f5f15233ecc3e6e7cdfc36ac849faf 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -29,7 +29,7 @@ rec { #makeCoverageReport = true; client = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/x11.nix ]; hardware.opengl.driSupport = true; @@ -40,7 +40,7 @@ rec { nodes = { server = - { config, pkgs, ... }: + { pkgs, ... }: { systemd.services."quake3-server" = { wantedBy = [ "multi-user.target" ]; diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 23a7e2ed538f20d17da1e9d477f372318c5e018b..34ab05787867ab0708c11c3721c1a14a928fad5f 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; nodes = { - one = { config, pkgs, ... }: { + one = { ... }: { services.rabbitmq.enable = true; }; }; diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index 8ac0639c6a8cebc96509cdee7b09c0466d9b980f..bf22fc9291af8bfe4dce4b1c3c46250ae893ee24 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -28,7 +28,7 @@ let in - import ./make-test.nix ({ pkgs, lib, ... }@args: { + import ./make-test.nix ({ lib, ... }@args: { name = "radicale"; meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ]; diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix index 18d028232ac24e32bb6025d1c7c030d745bcc6d0..68a9b7315b3501ef6b49c309fb8bf6e742f3c5ce 100644 --- a/nixos/tests/riak.nix +++ b/nixos/tests/riak.nix @@ -3,7 +3,7 @@ import ./make-test.nix { nodes = { master = - { pkgs, config, ... }: + { pkgs, ... }: { services.riak.enable = true; diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix index a6dfece44a92e0b14bb015070377c54a955871e2..bd90dc3080bd9b8e16c2632395d223fc3ab3f1e9 100644 --- a/nixos/tests/run-in-machine.nix +++ b/nixos/tests/run-in-machine.nix @@ -5,7 +5,7 @@ with import ../lib/testing.nix { inherit system; }; let output = runInMachine { drv = pkgs.hello; - machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ }; + machine = { ... }: { /* services.sshd.enable = true; */ }; }; in pkgs.runCommand "verify-output" { inherit output; } '' if [ ! -e "$output/bin/hello" ]; then diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix index cfe64a75a63523a3dc001b48316237645c0400a9..d0b53db8eeb6180bc966c39087f46d41d18479d2 100644 --- a/nixos/tests/rxe.nix +++ b/nixos/tests/rxe.nix @@ -1,7 +1,7 @@ -import ./make-test.nix ({ pkgs, ... } : +import ./make-test.nix ({ ... } : let - node = { config, pkgs, lib, ... } : { + node = { pkgs, ... } : { networking = { firewall = { allowedUDPPorts = [ 4791 ]; # open RoCE port diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix index e446284fc0efdcb093e57f3d594e9cfceb64ee25..2802e00a5b1a2cc5c293c0e206a0d33b78a6cc67 100644 --- a/nixos/tests/samba.nix +++ b/nixos/tests/samba.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { client = - { config, pkgs, ... }: + { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride { "/public" = { fsType = "cifs"; @@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ... }: }; server = - { config, pkgs, ... }: + { ... }: { services.samba.enable = true; services.samba.shares.public = { path = "/public"; diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index 1ce2b81578426cb422396e7452cafb8f5a38c9f1..7b9fdc0b3441555515f3e8849d617fd13d08cac2 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -9,7 +9,7 @@ let default = { name = "sddm"; - machine = { lib, ... }: { + machine = { ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; @@ -21,7 +21,7 @@ let enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; in '' startAll; $machine->waitForText(qr/select your user/i); @@ -39,7 +39,7 @@ let maintainers = [ ttuegel ]; }; - machine = { lib, ... }: { + machine = { ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.sddm = { @@ -54,7 +54,7 @@ let services.xserver.desktopManager.default = "none"; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' startAll; $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix index 04d624adcfe978394151145c0880f0dfe6c6d17b..84c5621d962fbf5b1e9829049565bb01e8a38d6d 100644 --- a/nixos/tests/simple.nix +++ b/nixos/tests/simple.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ eelco ]; }; - machine = { config, pkgs, ... }: { + machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; }; diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix index 7b939d836381a403737364e1d893180276fdb4fb..42c87dfa039d240b10bb68fccc5374573ab35075 100644 --- a/nixos/tests/slim.nix +++ b/nixos/tests/slim.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ aszlig ]; }; - machine = { pkgs, lib, ... }: { + machine = { pkgs, ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.windowManager.default = "icewm"; @@ -48,7 +48,7 @@ import ./make-test.nix ({ pkgs, ...} : { enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; in '' startAll; $machine->waitForText(qr/Username:/); diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index 0dd00dfb04c26de653698f7ab9a957019762fac5..60f44c3c8459c3b8f4f309f36d1fd6874a3984db 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -1,7 +1,6 @@ -import ./make-test.nix ({ pkgs, ... }: +import ./make-test.nix ({ ... }: let mungekey = "mungeverryweakkeybuteasytointegratoinatest"; slurmconfig = { - client.enable = true; controlMachine = "control"; nodeName = '' control @@ -15,41 +14,54 @@ in { nodes = let computeNode = - { config, pkgs, ...}: + { ...}: { # TODO slrumd port and slurmctld port should be configurations and # automatically allowed by the firewall. networking.firewall.enable = false; - services.munge.enable = true; - services.slurm = slurmconfig; + services.slurm = { + client.enable = true; + } // slurmconfig; }; in { + control = - { config, pkgs, ...}: + { ...}: { networking.firewall.enable = false; - services.munge.enable = true; services.slurm = { server.enable = true; } // slurmconfig; }; + + submit = + { ...}: + { + networking.firewall.enable = false; + services.slurm = { + enableStools = true; + } // slurmconfig; + }; + node1 = computeNode; node2 = computeNode; node3 = computeNode; }; + testScript = '' startAll; # Set up authentification across the cluster - foreach my $node (($control,$node1,$node2,$node3)) + foreach my $node (($submit,$control,$node1,$node2,$node3)) { $node->waitForUnit("default.target"); $node->succeed("mkdir /etc/munge"); $node->succeed("echo '${mungekey}' > /etc/munge/munge.key"); $node->succeed("chmod 0400 /etc/munge/munge.key"); + $node->succeed("chown munge:munge /etc/munge/munge.key"); $node->succeed("systemctl restart munged"); } @@ -62,7 +74,7 @@ in { }; subtest "can_start_slurmd", sub { - foreach my $node (($control,$node1,$node2,$node3)) + foreach my $node (($node1,$node2,$node3)) { $node->succeed("systemctl restart slurmd.service"); $node->waitForUnit("slurmd"); @@ -74,7 +86,7 @@ in { subtest "run_distributed_command", sub { # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes). # The output must contain the 3 different names - $control->succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq"); + $submit->succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq"); }; ''; }) diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix index 4c77e4b786130ca536e225e94516ac76ed172fb6..07d22805112787f0cd2275db0520b2da1db3d51a 100644 --- a/nixos/tests/smokeping.nix +++ b/nixos/tests/smokeping.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { sm = - { pkgs, config, ... }: + { ... }: { services.smokeping = { enable = true; diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix index a9d7dc61cb603ab876cbd58f2832ead5f199711b..666961249ced1734db645be166e6d7d57f141fb8 100644 --- a/nixos/tests/statsd.nix +++ b/nixos/tests/statsd.nix @@ -8,7 +8,7 @@ with lib; maintainers = [ ma27 ]; }; - nodes.statsd1 = { + machine = { services.statsd.enable = true; services.statsd.backends = [ "statsd-influxdb-backend" "console" ]; services.statsd.extraConfig = '' @@ -33,8 +33,19 @@ with lib; }; testScript = '' - $statsd1->start(); - $statsd1->waitForUnit("statsd.service"); - $statsd1->succeed("nc -z 127.0.0.1 8126"); + $machine->start(); + $machine->waitForUnit("statsd.service"); + $machine->waitForOpenPort(8126); + + # check state of the `statsd` server + $machine->succeed('[ "health: up" = "$(echo health | nc 127.0.0.1 8126 -w 120 -N)" ];'); + + # confirm basic examples for metrics derived from docs: + # https://github.com/etsy/statsd/blob/v0.8.0/README.md#usage and + # https://github.com/etsy/statsd/blob/v0.8.0/docs/admin_interface.md + $machine->succeed("echo 'foo:1|c' | nc -u -w 0 127.0.0.1 8125"); + $machine->succeed("echo counters | nc -w 120 127.0.0.1 8126 -N | grep foo"); + $machine->succeed("echo 'delcounters foo' | nc -w 120 127.0.0.1 8126 -N"); + $machine->fail("echo counters | nc -w 120 127.0.0.1 8126 -N | grep foo"); ''; }) diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix new file mode 100644 index 0000000000000000000000000000000000000000..8bbebd4230032137fdf1f408702d0eee2affbc6c --- /dev/null +++ b/nixos/tests/strongswan-swanctl.nix @@ -0,0 +1,148 @@ +# This strongswan-swanctl test is based on: +# https://www.strongswan.org/testing/testresults/swanctl/rw-psk-ipv4/index.html +# https://github.com/strongswan/strongswan/tree/master/testing/tests/swanctl/rw-psk-ipv4 +# +# The roadwarrior carol sets up a connection to gateway moon. The authentication +# is based on pre-shared keys and IPv4 addresses. Upon the successful +# establishment of the IPsec tunnels, the specified updown script automatically +# inserts iptables-based firewall rules that let pass the tunneled traffic. In +# order to test both tunnel and firewall, carol pings the client alice behind +# the gateway moon. +# +# alice moon carol +# eth1------vlan_0------eth1 eth2------vlan_1------eth1 +# 192.168.0.1 192.168.0.3 192.168.1.3 192.168.1.2 +# +# See the NixOS manual for how to run this test: +# https://nixos.org/nixos/manual/index.html#sec-running-nixos-tests-interactively + +import ./make-test.nix ({ pkgs, ...} : + +let + allowESP = "iptables --insert INPUT --protocol ESP --jump ACCEPT"; + + # Shared VPN settings: + vlan0 = "192.168.0.0/24"; + carolIp = "192.168.1.2"; + moonIp = "192.168.1.3"; + version = 2; + secret = "0sFpZAZqEN6Ti9sqt4ZP5EWcqx"; + esp_proposals = [ "aes128gcm128-x25519" ]; + proposals = [ "aes128-sha256-x25519" ]; +in { + name = "strongswan-swanctl"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ basvandijk ]; + nodes = { + + alice = { ... } : { + virtualisation.vlans = [ 0 ]; + networking = { + dhcpcd.enable = false; + defaultGateway = "192.168.0.3"; + }; + }; + + moon = { config, ...} : + let strongswan = config.services.strongswan-swanctl.package; + in { + virtualisation.vlans = [ 0 1 ]; + networking = { + dhcpcd.enable = false; + firewall = { + allowedUDPPorts = [ 4500 500 ]; + extraCommands = allowESP; + }; + nat = { + enable = true; + internalIPs = [ vlan0 ]; + internalInterfaces = [ "eth1" ]; + externalIP = moonIp; + externalInterface = "eth2"; + }; + }; + environment.systemPackages = [ strongswan ]; + services.strongswan-swanctl = { + enable = true; + swanctl = { + connections = { + "rw" = { + local_addrs = [ moonIp ]; + local."main" = { + auth = "psk"; + }; + remote."main" = { + auth = "psk"; + }; + children = { + "net" = { + local_ts = [ vlan0 ]; + updown = "${strongswan}/libexec/ipsec/_updown iptables"; + inherit esp_proposals; + }; + }; + inherit version; + inherit proposals; + }; + }; + secrets = { + ike."carol" = { + id."main" = carolIp; + inherit secret; + }; + }; + }; + }; + }; + + carol = { config, ...} : + let strongswan = config.services.strongswan-swanctl.package; + in { + virtualisation.vlans = [ 1 ]; + networking = { + dhcpcd.enable = false; + firewall.extraCommands = allowESP; + }; + environment.systemPackages = [ strongswan ]; + services.strongswan-swanctl = { + enable = true; + swanctl = { + connections = { + "home" = { + local_addrs = [ carolIp ]; + remote_addrs = [ moonIp ]; + local."main" = { + auth = "psk"; + id = carolIp; + }; + remote."main" = { + auth = "psk"; + id = moonIp; + }; + children = { + "home" = { + remote_ts = [ vlan0 ]; + start_action = "trap"; + updown = "${strongswan}/libexec/ipsec/_updown iptables"; + inherit esp_proposals; + }; + }; + inherit version; + inherit proposals; + }; + }; + secrets = { + ike."moon" = { + id."main" = moonIp; + inherit secret; + }; + }; + }; + }; + }; + + }; + testScript = '' + startAll(); + $carol->waitUntilSucceeds("ping -c 1 alice"); + ''; +}) diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix index a8e33a6f7e59c7ec724144c7dd38d576a1b26d4e..6175155cdfc9cc502cd967960d0a1a4ed7cd0807 100644 --- a/nixos/tests/subversion.nix +++ b/nixos/tests/subversion.nix @@ -39,7 +39,7 @@ in nodes = { webserver = - { config, pkgs, ... }: + { ... }: { services.httpd.enable = true; @@ -55,7 +55,7 @@ in }; client = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.subversion ]; diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix index 35addb0ee80562a5c99822023e413c81d858cb01..fc16b99cc19ca08c0e8612b7323daaac6c6239d6 100644 --- a/nixos/tests/sudo.nix +++ b/nixos/tests/sudo.nix @@ -11,10 +11,10 @@ in }; machine = - { config, lib, pkgs, ... }: + { lib, ... }: with lib; { - users.extraGroups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; + users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; users.users = { test0 = { isNormalUser = true; extraGroups = [ "wheel" ]; }; test1 = { isNormalUser = true; password = password; }; diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 46f2563af8d996cbb1814cc1fc9f690a88c1dc84..32010838e67b40df294ece86104944012d17591b 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -7,10 +7,10 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - machine = { config, lib, pkgs, ... }: { + machine = { ... }: { users.mutableUsers = false; }; - other = { config, lib, pkgs, ... }: { + other = { ... }: { users.mutableUsers = true; }; }; diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index 2df6f341c4efe8976eb6e127089ee0002cfc242b..65aa553b314843fc8df9acbda774e06f7cb0f6af 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -46,6 +46,8 @@ import ./make-test.nix { testScript = '' $machine->waitForX; + # wait for user services + $machine->waitForUnit("default.target","alice"); # Regression test for https://github.com/NixOS/nixpkgs/issues/35415 subtest "configuration files are recognized by systemd", sub { diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix index 75be97a507d01e8e02fc7c780286b888bd82cfb3..ab9b589f8593061bc5ec81931a0986d6cb3a2adc 100644 --- a/nixos/tests/taskserver.nix +++ b/nixos/tests/taskserver.nix @@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ... }: let crlTemplate = pkgs.writeText "snakeoil-crl.template" '' expiration_days = -1 ''; - userCertTemplace = pkgs.writeText "snakoil-user-cert.template" '' + userCertTemplate = pkgs.writeText "snakeoil-user-cert.template" '' organization = snakeoil cn = server expiration_days = -1 @@ -49,7 +49,7 @@ import ./make-test.nix ({ pkgs, ... }: let certtool -p --bits 4096 | sed -n \ -e '/^----* *BEGIN/,/^----* *END/p' > "$out/alice.key" - certtool -c --template "$userCertTemplace" \ + certtool -c --template "$userCertTemplate" \ --load-privkey "$out/alice.key" \ --load-ca-privkey ca.key \ --load-ca-certificate "$cacert" \ @@ -82,8 +82,9 @@ in { # This is to avoid assigning a different network address to the new # generation. networking = lib.mapAttrs (lib.const lib.mkForce) { + interfaces.eth1.ipv4 = nodes.server.config.networking.interfaces.eth1.ipv4; inherit (nodes.server.config.networking) - hostName interfaces primaryIPAddress extraHosts; + hostName primaryIPAddress extraHosts; }; }; diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index 475c947e72d98d16e030fdaec2ca96685d843db5..af63c7ee8e029904094875b25a978beb60640e37 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { server = - { pkgs, config, ... }: + { ... }: { services.tomcat.enable = true; services.httpd.enable = true; diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix new file mode 100644 index 0000000000000000000000000000000000000000..0cb44ddff248591af99e32591912b73cf3355f6d --- /dev/null +++ b/nixos/tests/tor.nix @@ -0,0 +1,28 @@ +import ./make-test.nix ({ lib, ... }: with lib; + +rec { + name = "tor"; + meta.maintainers = with maintainers; [ joachifm ]; + + common = + { ... }: + { boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ]; + networking.firewall.enable = false; + networking.useDHCP = false; + }; + + nodes.client = + { pkgs, ... }: + { imports = [ common ]; + environment.systemPackages = with pkgs; [ netcat ]; + services.tor.enable = true; + services.tor.client.enable = true; + services.tor.controlPort = 9051; + }; + + testScript = '' + $client->waitForUnit("tor.service"); + $client->waitForOpenPort(9051); + $client->succeed("echo GETINFO version | nc 127.0.0.1 9051") =~ /514 Authentication required./ or die; + ''; +}) diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index 5da5717d7f865673e0a545e76c1530b789c946f7..4599885acde69a21a8872e880463f06ebeec35a6 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: { nodes = { storage = - { config, pkgs, ... }: + { ... }: { services.nfs.server.enable = true; services.nfs.server.exports = '' /repos 192.168.1.0/255.255.255.0(rw,no_root_squash) @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; postgresql = - { config, pkgs, ... }: + { pkgs, ... }: { services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql; services.postgresql.enableTCPIP = true; @@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; webserver = - { config, pkgs, ... }: + { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/repos"; device = "storage:/repos"; @@ -43,7 +43,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; client = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/x11.nix ]; services.xserver.desktopManager.plasma5.enable = true; }; diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix new file mode 100644 index 0000000000000000000000000000000000000000..f1c238730ebb81aa8041d6ac7369c7136c77588e --- /dev/null +++ b/nixos/tests/transmission.nix @@ -0,0 +1,21 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "transmission"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ coconnor ]; + }; + + machine = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + networking.firewall.allowedTCPPorts = [ 9091 ]; + + services.transmission.enable = true; + }; + + testScript = + '' + startAll; + $machine->waitForUnit("transmission"); + $machine->shutdown; + ''; +}) diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 72d51c0051c07751ae4575589cd481c10bf1422c..8bbbe286efcf8f5548044e5f4d6761cb23aeee01 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -16,7 +16,7 @@ in }; machine = - { config, pkgs, ... }: + { ... }: { services.udisks2.enable = true; imports = [ ./common/user-account.nix ]; @@ -37,7 +37,8 @@ in $machine->fail("udisksctl info -b /dev/sda1"); # Attach a USB stick and wait for it to show up. - $machine->sendMonitorCommand("usb_add disk:$stick"); + $machine->sendMonitorCommand("drive_add 0 id=stick,if=none,file=$stick,format=raw"); + $machine->sendMonitorCommand("device_add usb-storage,id=stick,drive=stick"); $machine->waitUntilSucceeds("udisksctl info -b /dev/sda1"); $machine->succeed("udisksctl info -b /dev/sda1 | grep 'IdLabel:.*USBSTICK'"); @@ -52,7 +53,7 @@ in $machine->fail("[ -d /run/media/alice/USBSTICK ]"); # Remove the USB stick. - $machine->sendMonitorCommand("usb_del 0.3"); # FIXME + $machine->sendMonitorCommand("device_del stick"); $machine->waitUntilFails("udisksctl info -b /dev/sda1"); $machine->fail("[ -e /dev/sda ]"); ''; diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix index 515d5c8bac251382069bf4b632de75ccb74c79da..caf0cbb2abfe0bc3faaac8a5e7c94f0c4d299436 100644 --- a/nixos/tests/vault.nix +++ b/nixos/tests/vault.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... }: meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ lnl7 ]; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.vault ]; environment.variables.VAULT_ADDR = "http://127.0.0.1:8200"; services.vault.enable = true; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 249571fcedec1dde76ca5a7594721739219ffb4f..ce84576edca170f17a0ac294bac3bead56f674e0 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -1,4 +1,4 @@ -{ system ? builtins.currentSystem, debug ? false }: +{ system ? builtins.currentSystem, debug ? false, enableUnfree ? false }: with import ../lib/testing.nix { inherit system; }; with pkgs.lib; @@ -293,6 +293,11 @@ let "--hostonlyadapter2 vboxnet0" ]; + # The VirtualBox Oracle Extension Pack lets you use USB 3.0 (xHCI). + enableExtensionPackVMFlags = [ + "--usbxhci on" + ]; + dhcpScript = pkgs: '' ${pkgs.dhcp}/bin/dhclient \ -lf /run/dhcp.leases \ @@ -323,20 +328,26 @@ let headless.services.xserver.enable = false; }; - mkVBoxTest = name: testScript: makeTest { + vboxVMsWithExtpack = mapAttrs createVM { + testExtensionPack.vmFlags = enableExtensionPackVMFlags; + }; + + mkVBoxTest = useExtensionPack: vms: name: testScript: makeTest { name = "virtualbox-${name}"; machine = { lib, config, ... }: { imports = let mkVMConf = name: val: val.machine // { key = "${name}-config"; }; - vmConfigs = mapAttrsToList mkVMConf vboxVMs; + vmConfigs = mapAttrsToList mkVMConf vms; in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs; virtualisation.memorySize = 2048; virtualisation.virtualbox.host.enable = true; services.xserver.displayManager.auto.user = "alice"; - users.extraUsers.alice.extraGroups = let + users.users.alice.extraGroups = let inherit (config.virtualisation.virtualbox.host) enableHardening; in lib.mkIf enableHardening (lib.singleton "vboxusers"); + virtualisation.virtualbox.host.enableExtensionPack = useExtensionPack; + nixpkgs.config.allowUnfree = useExtensionPack; }; testScript = '' @@ -353,7 +364,7 @@ let return join("\n", grep { $_ !~ /^UUID:/ } split(/\n/, $_[0]))."\n"; } - ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vboxVMs)} + ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vms)} $machine->waitForX; @@ -363,11 +374,31 @@ let ''; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aszlig wkennington ]; + maintainers = [ aszlig wkennington cdepillabout ]; }; }; -in mapAttrs mkVBoxTest { + unfreeTests = mapAttrs (mkVBoxTest true vboxVMsWithExtpack) { + enable-extension-pack = '' + createVM_testExtensionPack; + vbm("startvm testExtensionPack"); + waitForStartup_testExtensionPack; + $machine->screenshot("cli_started"); + waitForVMBoot_testExtensionPack; + $machine->screenshot("cli_booted"); + + $machine->nest("Checking for privilege escalation", sub { + $machine->fail("test -e '/root/VirtualBox VMs'"); + $machine->fail("test -e '/root/.config/VirtualBox'"); + $machine->succeed("test -e '/home/alice/VirtualBox VMs'"); + }); + + shutdownVM_testExtensionPack; + destroyVM_testExtensionPack; + ''; + }; + +in mapAttrs (mkVBoxTest false vboxVMs) { simple-gui = '' createVM_simple; $machine->succeed(ru "VirtualBox &"); @@ -473,4 +504,4 @@ in mapAttrs mkVBoxTest { destroyVM_test1; destroyVM_test2; ''; -} +} // (if enableUnfree then unfreeTests else {}) diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index c51306a8c7a04d4921a9bbd8455b94e4fbb8240b..5003e25a7d5b6534360f3c3f903425e169b36f70 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { web = - { config, pkgs, ... }: + { pkgs, ... }: { services.mysql = { enable = true; @@ -18,9 +18,6 @@ import ./make-test.nix ({ pkgs, ... }: enable = true; logPerVirtualHost = true; adminAddr="js@lastlog.de"; - extraModules = [ - { name = "php7"; path = "${pkgs.php}/modules/libphp7.so"; } - ]; virtualHosts = [ { @@ -30,7 +27,7 @@ import ./make-test.nix ({ pkgs, ... }: { serviceType = "wordpress"; dbPassword = "wordpress"; - wordpressUploads = "/data/uploads"; + dbHost = "127.0.0.1"; languages = [ "de_DE" "en_GB" ]; } ]; @@ -41,7 +38,7 @@ import ./make-test.nix ({ pkgs, ... }: }; testScript = - { nodes, ... }: + { ... }: '' startAll; diff --git a/nixos/tests/xdg-desktop-portal.nix b/nixos/tests/xdg-desktop-portal.nix new file mode 100644 index 0000000000000000000000000000000000000000..79ebb83c49a59860d11e17d69f55bc09684c9481 --- /dev/null +++ b/nixos/tests/xdg-desktop-portal.nix @@ -0,0 +1,17 @@ +# run installed tests +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "xdg-desktop-portal"; + meta = { + maintainers = pkgs.xdg-desktop-portal.meta.maintainers; + }; + + machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; + }; + + testScript = '' + $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.xdg-desktop-portal.installedTests}/share'"); + ''; +}) diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index c8b18f1226580a24ae54130f58748536354129e0..47717e8cf7d917bcf044e20250ef2bb3bc315427 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/user-account.nix ]; diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index 3ea455c393c40ae400d36ec91751d3c075f40498..61fa7c1a67d34c6c8d9fe1d6474e13cc6b956b28 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' $machine->waitForX; $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix index c997e36cc442c822e1c4b8f97fbdf5f72d83b9f0..0106aefe8318d50d783f27ff873f3185d3b2c5bd 100644 --- a/nixos/tests/xrdp.nix +++ b/nixos/tests/xrdp.nix @@ -5,14 +5,14 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - server = { lib, pkgs, ... }: { + server = { pkgs, ... }: { imports = [ ./common/user-account.nix ]; services.xrdp.enable = true; services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm"; networking.firewall.allowedTCPPorts = [ 3389 ]; }; - client = { lib, pkgs, ... }: { + client = { pkgs, ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; services.xserver.displayManager.auto.user = "alice"; environment.systemPackages = [ pkgs.freerdp ]; @@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' startAll; $client->waitForX; diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix new file mode 100644 index 0000000000000000000000000000000000000000..045667bdcdec0fc48eb8e677d7d6f97ad98da0ed --- /dev/null +++ b/nixos/tests/xss-lock.nix @@ -0,0 +1,25 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +with lib; + +{ + name = "xss-lock"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + + machine = { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + programs.xss-lock.enable = true; + programs.xss-lock.lockerCommand = "${pkgs.xlockmore}/bin/xlock"; + services.xserver.displayManager.auto.user = "alice"; + }; + + testScript = '' + $machine->start; + $machine->waitForX; + $machine->waitForUnit("xss-lock.service", "alice"); + + $machine->fail("pgrep xlock"); + $machine->succeed("su -l alice -c 'xset dpms force standby'"); + $machine->waitUntilSucceeds("pgrep xlock"); + ''; +}) diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix index 40ca91e8064d5b4a4b13d4d8feb3973026302159..06fe5bc2b27846d14fba900b733f02ccd7df0072 100644 --- a/nixos/tests/yabar.nix +++ b/nixos/tests/yabar.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, lib }: +import ./make-test.nix ({ pkgs, lib, ... }: with lib; diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index a6908024de9bbaff2a8e446c89e812b6fa2fb760..1434038e90c197083de69d8592fe18f1f21a1ca2 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -17,7 +17,7 @@ let maintainers = [ adisbladis ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { virtualisation.emptyDiskImages = [ 4096 ]; networking.hostId = "deadbeef"; diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix index d247654adadeff7c6bb968fe2da3c526bd4cdaa1..f343ebd39e4423ef6e6319574fe0a395d7b04ba7 100644 --- a/nixos/tests/zookeeper.nix +++ b/nixos/tests/zookeeper.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - server = { pkgs, config, ... }: { + server = { ... }: { services.zookeeper = { enable = true; }; diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix index cfbb1f24b19857dbbdc4d11df10fa7ee706574d5..0489c8b649f54dd0f63c7670596026c1e8d29bf8 100644 --- a/pkgs/applications/altcoins/aeon/default.nix +++ b/pkgs/applications/altcoins/aeon/default.nix @@ -1,7 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, git, doxygen, graphviz +, boost, miniupnpc, openssl, unbound, cppzmq +, zeromq, pcsclite, readline +}: let - version = "0.9.14.0"; + version = "0.12.0.0"; in stdenv.mkDerivation { name = "aeon-${version}"; @@ -10,19 +13,24 @@ stdenv.mkDerivation { owner = "aeonix"; repo = "aeon"; rev = "v${version}"; - sha256 = "0pl9nfhihj0wsdgvvpv5f14k4m2ikk8s3xw6nd8ymbnpxfzyxynr"; + fetchSubmodules = true; + sha256 = "1schzlscslhqq7zcd68b1smqlaf7k789x1rwpplm7qi5iz9a8cfr"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ]; - buildInputs = [ boost miniupnpc openssl unbound ]; + buildInputs = [ + boost miniupnpc openssl unbound + cppzmq zeromq pcsclite readline + ]; - installPhase = '' - install -D src/aeond "$out/bin/aeond" - install src/simpleminer "$out/bin/aeon-simpleminer" - install src/simplewallet "$out/bin/aeon-simplewallet" - install src/connectivity_tool "$out/bin/aeon-connectivity-tool" - ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" + ]; + + hardeningDisable = [ "fortify" ]; meta = with stdenv.lib; { description = "Private, secure, untraceable currency"; diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index 219ab5d4f805842abdd8a3129d48109debd5c4bc..bd365e16730499420cd29aac83af6c293c347caa 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.16.2"; + version = "0.17.1"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "0d5npn4p321jqsbqjxkbv0ncvs2hp9vdp30np6n8n53f896cxl92"; + sha256 = "1kq9n3s9vhkmfaizsyi2cb91ibi06gb6wx0hkcb9hg3nrrvcka3y"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix index d9040377ebe340cb5087a004208915245525397b..5a67dc565aa76a6c105c39515f5ffbba0c623a6b 100644 --- a/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent -, withGui }: +, withGui +, Foundation, ApplicationServices, AppKit }: with stdenv.lib; @@ -19,7 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qt4 qrencode ] + ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; patches = [ ./bitcoin-unlimited-const-comparators.patch @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. - + The Bitcoin Unlimited (BU) project seeks to provide a voice to all stakeholders in the Bitcoin ecosystem. @@ -55,7 +57,7 @@ stdenv.mkDerivation rec { If you support an increase in the blocksize limit by any means - or just support Bitcoin conflict resolution as originally envisioned by its founder - - consider running a Bitcoin Unlimited client. + consider running a Bitcoin Unlimited client. ''; homepage = https://www.bitcoinunlimited.info/; maintainers = with maintainers; [ DmitryTsygankov ]; diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index ccc55d17bcf6b091d324e1d6a0a27515a27a41b4..feb2924f8651910b13e4daf0428826802d72cf0f 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl, libevent -, withGui }: +, withGui +, Foundation, ApplicationServices, AppKit }: with stdenv.lib; stdenv.mkDerivation rec{ @@ -18,7 +19,8 @@ stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib libevent miniupnpc utillinux protobuf curl ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qt4 qrencode ] + ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" @@ -36,7 +38,7 @@ stdenv.mkDerivation rec{ Bitcoin XT is an implementation of a Bitcoin full node, based upon the source code of Bitcoin Core. It is built by taking the latest stable Core release, applying a series of patches, and then doing deterministic - builds so anyone can check the downloads correspond to the source code. + builds so anyone can check the downloads correspond to the source code. ''; homepage = https://bitcoinxt.software/; maintainers = with maintainers; [ jefdaj ]; diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 0acd616eeaffcf73763447c82de317ca1bacd3fd..24bc3875dd5eed41a37e0a96be38e729a77e114d 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.16.0"; + version = "0.16.2"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc"; + sha256 = "1n07qykx5hc0ph8fwn7hfrbsrjv19fdzvs5h0nysq4wfgn5wa40r"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -25,6 +25,10 @@ stdenv.mkDerivation rec{ "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; + # Fails with "This application failed to start because it could not + # find or load the Qt platform plugin "minimal"" + doCheck = false; + meta = { description = "Peer-to-peer electronic cash system"; longDescription= '' diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix new file mode 100644 index 0000000000000000000000000000000000000000..d7e4ee233a86220eea35c92f7445abbb897559e1 --- /dev/null +++ b/pkgs/applications/altcoins/clightning.nix @@ -0,0 +1,47 @@ +{ stdenv, python3, pkgconfig, which, libtool, autoconf, automake, + autogen, sqlite, gmp, zlib, fetchFromGitHub }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "clightning-${version}"; + version = "0.6"; + + src = fetchFromGitHub { + fetchSubmodules = true; + owner = "ElementsProject"; + repo = "lightning"; + rev = "v${version}"; + sha256 = "1xbi8c7kn21wj255fxnb9s0sqnzbn3wsz4p96z084k8mw1nc71vn"; + }; + + enableParallelBuilding = true; + + buildInputs = [ which sqlite gmp zlib autoconf libtool automake autogen python3 pkgconfig ]; + + makeFlags = [ "prefix=$(out)" ]; + + configurePhase = '' + ./configure --prefix=$out --disable-developer --disable-valgrind + ''; + + postPatch = '' + echo "" > tools/refresh-submodules.sh + patchShebangs tools/generate-wire.py + ''; + + doCheck = false; + + meta = { + description = "A Bitcoin Lightning Network implementation in C"; + longDescription= '' + c-lightning is a standard compliant implementation of the Lightning + Network protocol. The Lightning Network is a scalability solution for + Bitcoin, enabling secure and instant transfer of funds between any two + parties for any amount. + ''; + homepage = https://github.com/ElementsProject/lightning; + maintainers = with maintainers; [ jb55 ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix index 6ad66a24397f3ab500419ec6fe75a8dc6e05d944..a89725f6e30f05f719dded78fd0ab38a8c4f26c4 100644 --- a/pkgs/applications/altcoins/dapp.nix +++ b/pkgs/applications/altcoins/dapp.nix @@ -2,7 +2,7 @@ , seth, git, solc, shellcheck, nodejs, hevm }: stdenv.mkDerivation rec { - name = "dapp"; + name = "dapp-${version}"; version = "0.5.7"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/altcoins/dcrd.nix index 8a8c4a7f1021d1cc33202a21c042823d4c75252c..cc3e83befa64a9820d152280a22c4787819e02a0 100644 --- a/pkgs/applications/altcoins/dcrd.nix +++ b/pkgs/applications/altcoins/dcrd.nix @@ -29,5 +29,6 @@ buildGoPackage rec { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; license = with lib.licenses; [ isc ]; + broken = stdenv.isLinux; # 2018-04-10 }; } diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/altcoins/dcrwallet.nix index aa6e8a0315e75dcc559c6bf5102dab7cbd38ada9..8d966684b23c5ec884cc98ff1b04ce296bd8f1bd 100644 --- a/pkgs/applications/altcoins/dcrwallet.nix +++ b/pkgs/applications/altcoins/dcrwallet.nix @@ -38,5 +38,6 @@ buildGoPackage rec { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; license = with lib.licenses; [ isc ]; + broken = stdenv.isLinux; # 2018-04-10 }; } diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index d7cce586b9b783d914d374e202cf41e98c5f94bc..95d79a8650fd0cfdb992ec041931ea18d023e47f 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: +{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }: rec { @@ -6,18 +6,31 @@ rec { bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; + clightning = callPackage ./clightning.nix { }; bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; }; - bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; - bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; + bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = true; + }; + bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = false; + }; bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; }; bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; }; - bitcoin-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = true; }; - bitcoind-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = false; }; + bitcoin-xt = callPackage ./bitcoin-xt.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + boost = boost165; withGui = true; + }; + bitcoind-xt = callPackage ./bitcoin-xt.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + boost = boost165; withGui = false; + }; btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; }; btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; }; @@ -38,10 +51,13 @@ rec { freicoin = callPackage ./freicoin.nix { boost = boost155; }; go-ethereum = callPackage ./go-ethereum.nix { + buildGoPackage = buildGo110Package; inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; }; - go-ethereum-classic = callPackage ./go-ethereum-classic { }; + go-ethereum-classic = callPackage ./go-ethereum-classic { + buildGoPackage = buildGo110Package; + }; litecoin = callPackage ./litecoin.nix { withGui = true; }; litecoind = callPackage ./litecoin.nix { withGui = false; }; @@ -51,6 +67,8 @@ rec { memorycoin = callPackage ./memorycoin.nix { boost = boost165; withGui = true; }; memorycoind = callPackage ./memorycoin.nix { boost = boost165; withGui = false; }; + mist = callPackage ./mist.nix { }; + namecoin = callPackage ./namecoin.nix { withGui = true; }; namecoind = callPackage ./namecoin.nix { withGui = false; }; @@ -72,4 +90,7 @@ rec { parity = callPackage ./parity { }; parity-beta = callPackage ./parity/beta.nix { }; + parity-ui = callPackage ./parity-ui { }; + + particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; }; } diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/altcoins/dero.nix index dff7bc0b0dc415f7ea529c19511a3d5b20a1ff91..8405ea8f842b97f4ea6031bacfab539278d6c01e 100644 --- a/pkgs/applications/altcoins/dero.nix +++ b/pkgs/applications/altcoins/dero.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost -, libunwind, lmdb, miniupnpc, readline }: +, lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { name = "dero-${version}"; diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index 33c2e598fca920413a466a5e4c7f2eeb06cc09a3..0452f40133458df36a9c35756c17bf72b9cf2164 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , pkgconfig, autoreconfHook , db5, openssl, boost, zlib, miniupnpc -, glib, protobuf, utillinux, qt4, qrencode +, protobuf, utillinux, qt4, qrencode , withGui }: with stdenv.lib; diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix index 0659c4fa258505901c3a32c140d71cf44c6efec4..35fd4bc718c8962b65985ce7347a82716ffeb779 100644 --- a/pkgs/applications/altcoins/ethsign/default.nix +++ b/pkgs/applications/altcoins/ethsign/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit, clang }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "ethsign-${version}"; diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix index b753e2d48c977c2844bedff219acb070ecb3de41..1e9192bc6e4006bb012b15acd4c15ebbf2237129 100644 --- a/pkgs/applications/altcoins/freicoin.nix +++ b/pkgs/applications/altcoins/freicoin.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }: +{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, qt4, qmake4Hook }: stdenv.mkDerivation rec { version = "0.8.6-2"; diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix index 679312d9a8e9b01bf2a6b5e2a2101f7bb2ce9058..7461e4c376ab672939f27e5443ff9439f76e913c 100644 --- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix +++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-ethereum-classic-${version}"; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 65e1dbc9b198e170af902220b579d2303f9c0683..02e0412449a02201b1dcd75dd125b17980f79beb 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, libobjc, IOKit }: +{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit }: buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.8.3"; + version = "1.8.13"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -12,22 +12,11 @@ buildGoPackage rec { # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; - # Only install binaries in $out, source is not interesting and takes ~50M - outputs = [ "out" ]; - preFixup = '' - export bin="''${out}" - ''; - installPhase = '' - mkdir -p $out/bin $out - dir="$NIX_BUILD_TOP/go/bin" - [ -e "$dir" ] && cp -r $dir $out - ''; - src = fetchFromGitHub { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "1vdrf3fi4arr6aivyp5myj4jy7apqbiqa6brr3jplmc07q1yijnf"; + sha256 = "123jkyb293z7ww3sa9ji5rw7xd229isi03k4ayyh5p7rr0dg8al0"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix index 51e5f6bcb298766ad8d9faaf4da5d8261bc8c2cb..e7f47d0f220050973f487d60e9a579dedf38ae00 100644 --- a/pkgs/applications/altcoins/hevm.nix +++ b/pkgs/applications/altcoins/hevm.nix @@ -5,12 +5,12 @@ , lens-aeson, memory, monad-par, mtl, optparse-generic, process , QuickCheck, quickcheck-text, readline, rosezipper, scientific , stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text -, text-format, time, unordered-containers, vector, vty +, text-format, unordered-containers, vector, vty , restless-git , fetchFromGitHub, lib, makeWrapper -, ncurses, zlib, bzip2, solc, coreutils +, zlib, bzip2, solc, coreutils , bash }: @@ -55,6 +55,7 @@ lib.overrideDerivation (mkDerivation rec { description = "Ethereum virtual machine evaluator"; license = stdenv.lib.licenses.agpl3; maintainers = [stdenv.lib.maintainers.dbrock]; + broken = true; # 2018-04-10 }) (attrs: { buildInputs = attrs.buildInputs ++ [solc]; nativeBuildInputs = attrs.nativeBuildInputs ++ [makeWrapper]; diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix index 12cf5dcb71c1f06c2ab500b505b2a5cefd288ed5..b930923e8f45df658fd370eef158efc9d5ab4275 100644 --- a/pkgs/applications/altcoins/litecoin.nix +++ b/pkgs/applications/altcoins/litecoin.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "litecoin-project"; repo = "litecoin"; rev = "v${version}"; - sha256 = "01q0lj0grabyfh67ar984m9lv9xs0rakadkci8jpfbp8xw166r40"; + sha256 = "1g79sbplkn2bnb17i2kyh1d64bjl3ihbx83n0xssvjaajn56hbzw"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index b9335dbabe528494d01deddb43cf2d61e212317a..944c82250d4755d11868e23a5edc111528edbf9a 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec{ homepage = http://www.bitcoin.org/; maintainers = with maintainers; [ AndersonTorres ]; license = licenses.mit; - platforms = subtractLists [ "aarch64-linux" ] platforms.unix; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix new file mode 100644 index 0000000000000000000000000000000000000000..5f89b0a0c17355d8ba78315a0d7ec09a7fa72b9e --- /dev/null +++ b/pkgs/applications/altcoins/mist.nix @@ -0,0 +1,72 @@ +{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv, gtk2 }: + +let + version = "0.11.1"; + name = "mist"; + + throwSystem = throw "Unsupported system: ${stdenv.system}"; + + meta = with stdenv.lib; { + description = "Browse and use Ðapps on the Ethereum network"; + homepage = https://github.com/ethereum/mist; + license = licenses.gpl3; + maintainers = with maintainers; []; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; + + urlVersion = builtins.replaceStrings ["."] ["-"] version; + + desktopItem = makeDesktopItem rec { + name = "Mist"; + exec = "mist"; + icon = "mist"; + desktopName = name; + genericName = "Mist Browser"; + categories = "Network;"; + }; + + mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation { + inherit name version meta; + + src = { + i686-linux = fetchurl { + url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux32-${urlVersion}.zip"; + sha256 = "1ffzp9aa0g6w3d5pzp69fljk3sd51cbqdgxa1x16vj106sqm0gj7"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux64-${urlVersion}.zip"; + sha256 = "0yx4x72l8gk68yh9saki48zgqx8k92xnkm79dc651wdpd5c25cz3"; + }; + }.${stdenv.system} or throwSystem; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out/lib/mist $out/bin + unzip -d $out/lib/mist $src + ln -s $out/lib/mist/mist $out/bin + fixupPhase + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:${gtk2}/lib:$out/lib/mist" \ + $out/lib/mist/mist + ''; + }); +in +buildFHSUserEnv { + name = "mist"; + inherit meta; + + targetPkgs = pkgs: with pkgs; [ + mist + ]; + + extraInstallCommands = '' + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* $out/share/applications + ''; + + runScript = "mist"; +} diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 8be24522f5648d3ffe6169cf38ecd30598566c26..cbba1ecba145d9a8e8e8f13226bb7ad01bf1d67a 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, git +{ stdenv, fetchFromGitHub, fetchpatch +, cmake, pkgconfig, git , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline , CoreData, IOKit, PCSC @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig git ]; + patches = [ + # fix daemon crash, remove with 0.12.1.0 update + (fetchpatch { + url = "https://github.com/monero-project/monero/commit/08343ab.diff"; + sha256 = "0f1snrl2mk2czwk1ysympzr8ismjx39fcqgy13276vcmw0cfqi83"; + }) + ]; + buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix index f734958116953632cc5e0255f2f9fb528cc09193..93f9faf833a1d16201a003d2a44b379652ad80ed 100644 --- a/pkgs/applications/altcoins/namecoin.nix +++ b/pkgs/applications/altcoins/namecoin.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode +{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode, hexdump , withGui }: with stdenv.lib; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig + hexdump ]; buildInputs = [ @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { libqrencode ]; + enableParallelBuilding = true; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; diff --git a/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch b/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch new file mode 100644 index 0000000000000000000000000000000000000000..5bbec1d39bea2d433c91db2c4c0e77fb7497f825 --- /dev/null +++ b/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b43f02f6..4470abbf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,7 +119,7 @@ endif (RAIBLOCKS_SECURE_RPC) + + include_directories (${CMAKE_SOURCE_DIR}) + +-set(Boost_USE_STATIC_LIBS ON) ++add_definitions(-DBOOST_LOG_DYN_LINK) + set(Boost_USE_MULTITHREADED ON) + + if (BOOST_CUSTOM) diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7491e8306285b240a7f6cb14f3a7061d9984073a --- /dev/null +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -0,0 +1,57 @@ +{lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}: + +stdenv.mkDerivation rec { + + name = "nano-wallet-${version}"; + version = "15.2"; + + src = fetchFromGitHub { + owner = "nanocurrency"; + repo = "raiblocks"; + rev = "V${version}"; + sha256 = "0ngsnaczw5y709zk52flp6m2c83q3kxfgz0bzi8rzfjxp10ncnz3"; + fetchSubmodules = true; + }; + + # Use a patch to force dynamic linking + patches = [ + ./CMakeLists.txt.patch + ]; + + cmakeFlags = let + options = { + BOOST_ROOT = "${boost}"; + Boost_USE_STATIC_LIBS = "OFF"; + RAIBLOCKS_GUI = "ON"; + RAIBLOCKS_TEST = "ON"; + Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5"; + Qt5Core_DIR = "${qtbase.dev}/lib/cmake/Qt5Core"; + Qt5Gui_INCLUDE_DIRS = "${qtbase.dev}/include/QtGui"; + Qt5Widgets_INCLUDE_DIRS = "${qtbase.dev}/include/QtWidgets"; + }; + optionToFlag = name: value: "-D${name}=${value}"; + in lib.mapAttrsToList optionToFlag options; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost libGL qtbase ]; + + buildPhase = '' + make nano_wallet + ''; + + checkPhase = '' + ./core_test + ''; + + meta = { + inherit version; + description = "Wallet for Nano cryptocurrency"; + homepage = https://nano.org/en/wallet/; + license = lib.licenses.bsd2; + # Fails on Darwin. See: + # https://github.com/NixOS/nixpkgs/pull/39295#issuecomment-386800962 + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jluttine ]; + }; + +} diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8566e6037d6f286dc45c0e923c36859fca7a5c4e --- /dev/null +++ b/pkgs/applications/altcoins/parity-ui/default.nix @@ -0,0 +1,50 @@ +{ stdenv, pkgs, fetchurl, makeWrapper, nodePackages }: + +let + +uiEnv = pkgs.callPackage ./env.nix { }; + +in stdenv.mkDerivation rec { + name = "parity-ui-${version}"; + version = "0.2.8"; + + src = fetchurl { + url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb"; + sha256 = "1nyarq73jdknhax68cq2i868sznghzj70kvk4ixypxnjb1q6a53a"; + name = "${name}.deb"; + }; + + nativeBuildInputs = [ makeWrapper nodePackages.asar ]; + + buildCommand = '' + mkdir -p $out/usr/ + ar p $src data.tar.xz | tar -C $out -xJ . + substituteInPlace $out/usr/share/applications/parity-ui.desktop \ + --replace "/opt/Parity UI" $out/bin + mv $out/usr/* $out/ + mv "$out/opt/Parity UI" $out/share/parity-ui + rm -r $out/usr/ + rm -r $out/opt/ + + fixupPhase + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" \ + $out/share/parity-ui/parity-ui + + find $out/share/parity-ui -name "*.node" -exec patchelf --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" {} \; + + paxmark m $out/share/parity-ui/parity-ui + + mkdir -p $out/bin + ln -s $out/share/parity-ui/parity-ui $out/bin/parity-ui + ''; + + meta = with stdenv.lib; { + description = "UI for Parity. Fast, light, robust Ethereum implementation"; + homepage = http://parity.io; + license = licenses.gpl3; + maintainers = [ maintainers.sorpaas ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix new file mode 100644 index 0000000000000000000000000000000000000000..625a008af9176aae6f30e0e3fbb919845698f1e9 --- /dev/null +++ b/pkgs/applications/altcoins/parity-ui/env.nix @@ -0,0 +1,19 @@ +{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig +, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr +, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }: + +let + packages = [ + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify + xorg.libxcb libsecret gnome2.GConf + ]; + + libPathNative = lib.makeLibraryPath packages; + libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; + libPath = "${libPathNative}:${libPath64}"; + +in { inherit packages libPath; } diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index ed78133a759cf17ed913b04a01590a40d0d4c85b..fe58579e6b57e1b224139f765dd6d2c3684c4ecf 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,7 +1,7 @@ let - version = "1.10.0"; - sha256 = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g"; - cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m"; - patches = [ ./patches/vendored-sources-1.10.patch ]; + version = "2.0.1"; + sha256 = "0rfq0izpswfwbyvr5kb6zjyf6sd7l1706c0sp7ccy6ykdfb4v6zs"; + cargoSha256 = "1ij17bfwvikqi5aj71j1nwf3jhkf3y9a0kwydajviwal47p9grl9"; + patches = [ ./patches/vendored-sources-2.0.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 99179932109470f794bd93a3476af50fe6a21da2..993bc3615aa8c5361086645e60a2af69203fadb0 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.9.5"; - sha256 = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7"; - cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva"; - patches = [ ./patches/vendored-sources-1.9.patch ]; + version = "1.11.8"; + sha256 = "0qk5vl8ql3pr9pz5iz7whahwqi1fcbsf8kphn6z4grgc87id7b19"; + cargoSha256 = "0p2idd36cyzp2ax81k533bdma4hz0ws2981qj2s7jnhvmj4941l8"; + patches = [ ./patches/vendored-sources-1.11.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix index 9c9d1d4293e0a5e04f212834c35a189cc027fb36..55665034ccf9f8d83e75f6a4aff177b76b0bcb5b 100644 --- a/pkgs/applications/altcoins/parity/parity.nix +++ b/pkgs/applications/altcoins/parity/parity.nix @@ -10,6 +10,8 @@ , pkgconfig , openssl , systemd +, cmake +, perl }: rustPlatform.buildRustPackage rec { @@ -18,12 +20,15 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "paritytech"; - repo = "parity"; + repo = "parity-ethereum"; rev = "v${version}"; inherit sha256; }; - buildInputs = [ pkgconfig systemd.lib systemd.dev openssl openssl.dev ]; + buildInputs = [ + pkgconfig cmake perl + systemd.lib systemd.dev openssl openssl.dev + ]; # Some checks failed doCheck = false; diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch similarity index 87% rename from pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch rename to pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch index 3e8e032f30c2e97bbf61edb2b5e402f04d901b39..733f6880ad9d66bcc6cfa1a82ce22795b14e1425 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch @@ -1,8 +1,8 @@ diff --git a/.cargo/config b/.cargo/config -index 72652ad2f..b21c6aa7b 100644 +index 72652ad2f..57c5c2f8f 100644 --- a/.cargo/config +++ b/.cargo/config -@@ -1,3 +1,113 @@ +@@ -1,3 +1,108 @@ [target.x86_64-pc-windows-msvc] # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643 rustflags = ["-Ctarget-feature=+crt-static"] @@ -42,24 +42,29 @@ index 72652ad2f..b21c6aa7b 100644 +rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/app-dirs-rs"] ++git = "https://github.com/paritytech/app-dirs-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/bn"] +git = "https://github.com/paritytech/bn" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/hidapi-rs"] -+git = "https://github.com/paritytech/hidapi-rs" ++[source."https://github.com/paritytech/daemonize"] ++git = "https://github.com/paritytech/daemonize" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/hyper"] -+git = "https://github.com/paritytech/hyper" ++[source."https://github.com/paritytech/hidapi-rs"] ++git = "https://github.com/paritytech/hidapi-rs" +branch = "master" +replace-with = "vendored-sources" + +[source."https://github.com/paritytech/jsonrpc.git"] +git = "https://github.com/paritytech/jsonrpc.git" -+branch = "parity-1.10" ++branch = "parity-1.11" +replace-with = "vendored-sources" + +[source."https://github.com/paritytech/libusb-rs"] @@ -72,6 +77,11 @@ index 72652ad2f..b21c6aa7b 100644 +branch = "master" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/ring"] ++git = "https://github.com/paritytech/ring" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/rust-ctrlc.git"] +git = "https://github.com/paritytech/rust-ctrlc.git" +branch = "master" @@ -97,21 +107,6 @@ index 72652ad2f..b21c6aa7b 100644 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/wasm-utils"] -+git = "https://github.com/paritytech/wasm-utils" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/wasmi"] -+git = "https://github.com/paritytech/wasmi" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/tailhook/rotor"] -+git = "https://github.com/tailhook/rotor" -+branch = "master" -+replace-with = "vendored-sources" -+ +[source."https://github.com/tomusdrw/ws-rs"] +git = "https://github.com/tomusdrw/ws-rs" +branch = "master" diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch similarity index 73% rename from pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch rename to pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch index d91b103c6cef9915f21768897191e816efd372a4..9af64559d97177114229b364291392923cd6ef91 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch @@ -1,25 +1,17 @@ diff --git a/.cargo/config b/.cargo/config -new file mode 100644 -index 000000000..0efb69724 ---- /dev/null +index 72652ad2f..3c0eca89a 100644 +--- a/.cargo/config +++ b/.cargo/config -@@ -0,0 +1,100 @@ +@@ -1,3 +1,93 @@ + [target.x86_64-pc-windows-msvc] + # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643 + rustflags = ["-Ctarget-feature=+crt-static"] + +[source."https://github.com/alexcrichton/mio-named-pipes"] +git = "https://github.com/alexcrichton/mio-named-pipes" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"] -+git = "https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"] -+git = "https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git" -+branch = "master" -+replace-with = "vendored-sources" -+ +[source."https://github.com/nikvolf/parity-tokio-ipc"] +git = "https://github.com/nikvolf/parity-tokio-ipc" +branch = "master" @@ -30,24 +22,29 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/app-dirs-rs"] ++git = "https://github.com/paritytech/app-dirs-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/bn"] +git = "https://github.com/paritytech/bn" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/hidapi-rs"] -+git = "https://github.com/paritytech/hidapi-rs" ++[source."https://github.com/paritytech/daemonize"] ++git = "https://github.com/paritytech/daemonize" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/hyper"] -+git = "https://github.com/paritytech/hyper" ++[source."https://github.com/paritytech/hidapi-rs"] ++git = "https://github.com/paritytech/hidapi-rs" +branch = "master" +replace-with = "vendored-sources" + +[source."https://github.com/paritytech/jsonrpc.git"] +git = "https://github.com/paritytech/jsonrpc.git" -+branch = "parity-1.9" ++branch = "parity-1.11" +replace-with = "vendored-sources" + +[source."https://github.com/paritytech/libusb-rs"] @@ -60,6 +57,16 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/parity-common"] ++git = "https://github.com/paritytech/parity-common" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/ring"] ++git = "https://github.com/paritytech/ring" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/rust-ctrlc.git"] +git = "https://github.com/paritytech/rust-ctrlc.git" +branch = "master" @@ -85,23 +92,7 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/wasm-utils"] -+git = "https://github.com/paritytech/wasm-utils" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/wasmi"] -+git = "https://github.com/paritytech/wasmi" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/tailhook/rotor"] -+git = "https://github.com/tailhook/rotor" -+branch = "master" -+replace-with = "vendored-sources" -+ +[source."https://github.com/tomusdrw/ws-rs"] +git = "https://github.com/tomusdrw/ws-rs" +branch = "master" +replace-with = "vendored-sources" -+ diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix new file mode 100644 index 0000000000000000000000000000000000000000..a06f373683a917248179decfc5baefcefbdd35a1 --- /dev/null +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -0,0 +1,44 @@ +{ stdenv +, autoreconfHook +, boost +, db48 +, fetchurl +, libevent +, miniupnpc +, openssl +, pkgconfig +, zeromq +, zlib +, unixtools +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "particl-core-${version}"; + version = "0.16.2.0"; + + src = fetchurl { + url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; + sha256 = "1d2vvg7avlhsg0rcpd5pbzafnk1w51a2y29xjjkpafi6iqs2l617"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ + openssl db48 boost zlib miniupnpc libevent zeromq + unixtools.hexdump + ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + + meta = { + description = "Privacy-Focused Marketplace & Decentralized Application Platform"; + longDescription= '' + An open source, decentralized privacy platform built for global person to person eCommerce. + ''; + homepage = https://particl.io/; + maintainers = with maintainers; [ demyanrogozhin ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix index 4a4665291d6e8864cda85478177b9ddb11165fca..4c3f9fe0760bb1f4688495368940300e014caffd 100644 --- a/pkgs/applications/altcoins/stellar-core.nix +++ b/pkgs/applications/altcoins/stellar-core.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, autoconf, libtool, automake, pkgconfig, git +{ stdenv, fetchgit, autoconf, libtool, automake, pkgconfig, git , bison, flex, postgresql }: let diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index dfa27aa9f2ebe036713c359b65372d7bf89ac460..ed7a8481f693c5486f84f6fbfbd3064cb12fbe95 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, makeWrapper, python, alsaUtils, timidity }: +{ stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: stdenv.mkDerivation rec { version = "16.06"; name = "mma-${version}"; src = fetchurl { - url = "http://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; + url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww"; }; - buildInputs = [ makeWrapper python alsaUtils timidity ]; + buildInputs = [ makeWrapper python3 alsaUtils timidity ]; patchPhase = '' sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec @@ -18,7 +18,7 @@ sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' util/mma-splitrec.py sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py - find . -type f | xargs sed -i 's@/usr/bin/env python@${python}/bin/python@g' + find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g' ''; installPhase = '' diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index b74d85b9dbfa0f66bd453fe803ceecd89b268e6b..7f2080c6fd63e2564a13fad5b0bb799a56e83b2a 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3 -, lame, flac, eject, mkcue, glyr -, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID +{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3 +, lame, flac, glyr +, perl, MusicBrainz, MusicBrainzDiscID , makeWrapper }: let version = "2.8.1"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { name = "abcde-${version}"; src = fetchurl { - url = "http://abcde.einval.com/download/abcde-${version}.tar.gz"; + url = "https://abcde.einval.com/download/abcde-${version}.tar.gz"; sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774"; }; @@ -35,7 +35,7 @@ in buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ perl DigestSHA MusicBrainz MusicBrainzDiscID ]; + propagatedBuildInputs = [ perl MusicBrainz MusicBrainzDiscID ]; installFlags = [ "sysconfdir=$(out)/etc" ]; diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index 7ac1025c5027a6057ea897567eb9bca4b3e11ab5..68a9bb63e2e026074845fecfee24af5d3f65cf1b 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.9.5"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "0wfp8ihldyq2dhdyy7ld7z0zzfvnwam1dvbxnpd9d6xgc4k3j4nv"; }; diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index c37963c77f3eff5030b608fd7d363d79b68979eb..737e73421c9bd490be998cef7d144210e03d561d 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -1,5 +1,5 @@ { stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper -, overrideCC, qt5, requireFile, unzip, wine +, qt5, requireFile, unzip, wine }: let diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..855d31aadbb0888b5441d1644158f79d8843f39c --- /dev/null +++ b/pkgs/applications/audio/amarok/default.nix @@ -0,0 +1,42 @@ +{ mkDerivation, fetchgit, lib +, extra-cmake-modules, kdoctools +, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine +, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem +, fftw, phonon, plasma-framework, threadweaver +, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras +}: + +let + pname = "amarok"; + version = "2.9.0-20180618"; + +in mkDerivation { + name = "${pname}-${version}"; + + src = fetchgit { + # master has the Qt5 version as of April 2018 but a formal release has not + # yet been made so change this back to the proper upstream when such a + # release is out + url = git://anongit.kde.org/amarok.git; + # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + rev = "5d43efa454b6a6c9c833a6f3d7f8ff3cae738c96"; + sha256 = "0fyrbgldg4wbb2darm4aav5fpzbacxzfjrdqwkhv9xr13j7zsvm3"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + propagatedBuildInputs = [ + qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine + karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem + phonon plasma-framework threadweaver + curl fftw ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static + pcre snappy taglib taglib_extras + ]; + + enableParallelBuilding = true; + + meta = with lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix deleted file mode 100644 index a4ac2943bfbc292264a8c22ce92fc7068138542d..0000000000000000000000000000000000000000 --- a/pkgs/applications/audio/amarok/kf5.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ mkDerivation, fetchgit, lib -, extra-cmake-modules, kdoctools -, qca-qt5, qjson, qtscript, qtwebkit -, kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor -, phonon, plasma-framework, threadweaver -, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras -}: - -let - pname = "amarok"; - version = "2.8.91-20170228"; - -in mkDerivation { - name = "${pname}-${version}"; - - src = fetchgit { - url = git://anongit.kde.org/amarok.git; - # go back to the KDE mirror when kf5 is merged into master - # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - rev = "323e2d5b43245c4c06e0b83385d37ef0d32920cb"; - sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh"; - }; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - qca-qt5 qjson qtscript qtwebkit - kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor - phonon plasma-framework threadweaver - curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static - pcre snappy taglib taglib_extras - ]; - enableParallelBuilding = true; - - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index bc72c3e13144e379fc66ecd9d714a1d747b73182..7858631f7973f67577314599f784729c90031813 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }: +{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python3 }: stdenv.mkDerivation rec { name = "ams-lv2-${version}"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairo fftw gtkmm2 lv2 lvtk python ]; + buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "${python3.interpreter} waf configure --prefix=$out"; - buildPhase = "python waf"; + buildPhase = "${python3.interpreter} waf"; - installPhase = "python waf install"; + installPhase = "${python3.interpreter} waf install"; meta = with stdenv.lib; { description = "An LV2 port of the internal modules found in Alsa Modular Synth"; diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index bb0615df25b86c52fb343485f239c51a486a0cf2..9c42c98ba5e33811b950f54b95fadb96739b09fa 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.9.2"; + version = "2.9.3"; name = "asunder-${version}"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2"; - sha256 = "0vjbxrrjih4c673sc39wj5whp81xp9kmnwqxwzfnmhkky970rg5r"; + sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 6e411c8448f6f39c7fc32829cf48f782dca47307..19cb55d93c98d9d90af72674ab561beed9fbc715 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "3.9"; src = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; + url = "https://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm"; }; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index b0c47972e3856c40177a70f57c9a8b7104f15adc..1989fd1400d43f60f89fcc3f66e4dc0f72856fb6 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, glib, zlib, perl, intltool, - libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, +{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, + libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ autoconf, automake, libtool }: diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index ac13371dd930fb7eea47eeb59e92e713386a2653..2ac7e3af7ab21afd363f9ea8bb40e72116db2e1e 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -1,41 +1,29 @@ -{ stdenv, fetchurl, lib -, pkgconfig, intltool, autoconf, gnome3 -, glib, dbus, gtk3, libdbusmenu-gtk3, libappindicator-gtk3, gst_all_1 +{ stdenv, fetchurl +, pkgconfig, intltool, gnome3 +, glib, dbus, gtk3, libappindicator-gtk3, gst_all_1 , librsvg, wrapGAppsHook , pulseaudioSupport ? true, libpulseaudio ? null }: -with lib; - stdenv.mkDerivation rec { name = "audio-recorder-${version}"; - version = "1.9.7"; + version = "2.1.3"; src = fetchurl { - name = "${name}-zesty.tar.gz"; - url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ezesty.tar.gz"; - sha256 = "163c0vs5qj72y62731yp6sl6s0indh2szhjg02mxigv9b68dx89c"; + name = "${name}.tar.gz"; + url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ebionic.tar.gz"; + sha256 = "160pnmnmc9zwzyclsci3w1qwlgxkfx1y3x5ck6i587w78570an1r"; }; - nativeBuildInputs = [ pkgconfig intltool autoconf wrapGAppsHook ]; - - buildInputs = with gst_all_1; [ - glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 (stdenv.lib.getLib gnome3.dconf) - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav - ] ++ optional pulseaudioSupport libpulseaudio; + # https://bugs.launchpad.net/audio-recorder/+bug/1784622 + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - postPatch = '' - substituteInPlace configure.ac \ - --replace 'PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED)' \ - 'PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0)' - autoconf - intltoolize - ''; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; - preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $GST_PLUGIN_SYSTEM_PATH_1_0 - --prefix GIO_EXTRA_MODULES : ${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules) - ''; + buildInputs = [ + glib dbus gtk3 librsvg libappindicator-gtk3 + ] ++ (with gst_all_1; [ + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav + ]) ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; meta = with stdenv.lib; { description = "Audio recorder for GNOME and Unity Desktops"; diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix index d1c0c2afa83b9fa1317304249f032d80da640590..8a4e8893c8d3fab2257cb31df6a406b49d5ca3d8 100644 --- a/pkgs/applications/audio/banshee/default.nix +++ b/pkgs/applications/audio/banshee/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base +{ stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base , gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-ffmpeg, glib , mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.6.2"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz"; + url = "https://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz"; sha256 = "1y30p8wxx5li39i5gpq2wib0ympy8llz0gyi6ri9bp730ndhhz7p"; }; @@ -48,8 +48,10 @@ stdenv.mkDerivation rec { -i $out/bin/banshee ''; meta = with lib; { + homepage = "http://banshee.fm/"; description = "A music player written in C# using GNOME technologies"; platforms = platforms.linux; maintainers = [ maintainers.zohl ]; + license = licenses.mit; }; } diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 7f62d53af9efcc54a867fac7d49682bb1122eed6..29cecb1699980675965bb18ca59c80ea6bda622b 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "beast-0.7.1"; src = fetchurl { - url = "http://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2"; + url = "https://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2"; sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l"; }; diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index 32daf000dc5994c8a7c0a22319acc55afe18531a..5f3229dc157c767bb758dfb0c9c1755b77c93fca 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2"; src = fetchurl { - url = "http://devel.tlrmx.org/audio/source/${name}.tar.gz"; + url = "https://devel.tlrmx.org/audio/source/${name}.tar.gz"; sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7"; }; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index e5a5cc7c9c6acdb6b6f1384da54f71f5618e3351..829bb4c67caa5b3824e960c845071c5cfa9ab2ab 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -3,11 +3,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "2.2.2"; + version = "2.3.5"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22"; + sha256 = "1v62z08hqla8fz5m7hl9ynf2hpr0j0arm0nb5lpd99qrv36ibrsc"; }; buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..87dbb31099588bc0643aa6f1c48e6e693a8b02f8 --- /dev/null +++ b/pkgs/applications/audio/cadence/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchurl +, pkgconfig +, qtbase +, makeWrapper +, jack2Full +, python3Packages +, a2jmidid +}: + + stdenv.mkDerivation rec { + version = "0.9.0"; + name = "cadence"; + + src = fetchurl { + url = "https://github.com/falkTX/Cadence/archive/v${version}.tar.gz"; + sha256 = "07z1mnb0bmldb3i31bgw816pnvlvr9gawr51rpx3mhixg5wpiqzb"; + }; + + buildInputs = [ + makeWrapper + pkgconfig + qtbase + ]; + + apps = [ + "cadence" + "cadence-jacksettings" + "cadence-pulse2loopback" + "claudia" + "cadence-aloop-daemon" + "cadence-logs" + "cadence-render" + "catarina" + "claudia-launcher" + "cadence-pulse2jack" + "cadence-session-start" + "catia" + ]; + + makeFlags = '' + PREFIX="" + DESTDIR=$(out) + ''; + + propagatedBuildInputs = with python3Packages; [ pyqt5 ]; + + postInstall = '' + # replace with our own wrappers. + for app in $apps; do + rm $out/bin/$app + makeWrapper ${python3Packages.python.interpreter} $out/bin/$app \ + --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \ + --add-flags "-O $out/share/cadence/src/$app.py" + done + ''; + + meta = { + homepage = https://github.com/falkTX/Cadence/; + description = "Collection of tools useful for audio production"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ genesis ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 82c32903bd86502746600d117677095b03fc4eb4..94b43fc544ac4b0ca64e4e3f4e652fad64130fd8 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib +{ stdenv, fetchurl, fetchpatch, cairo, expat, fftwSinglePrec, fluidsynth, glib , gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { @@ -6,10 +6,19 @@ stdenv.mkDerivation rec { version = "0.90.0"; src = fetchurl { - url = "http://calf-studio-gear.org/files/${name}.tar.gz"; + url = "https://calf-studio-gear.org/files/${name}.tar.gz"; sha256 = "0dijv2j7vlp76l10s4v8gbav26ibaqk8s24ci74vrc398xy00cib"; }; + patches = [ + # Fix memory leak in limiter + # https://github.com/flathub/com.github.wwmm.pulseeffects/issues/12 + (fetchpatch { + url = https://github.com/calf-studio-gear/calf/commit/7afdefc0d0489a6227fd10f15843d81dc82afd62.patch; + sha256 = "056662iw6hp4ykwk4jyrzg5yarcn17ni97yc060y5kcnzy29ddg6"; + }) + ]; + buildInputs = [ cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH libglade lv2 pkgconfig diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 35214502e09a51fd80b5a8b2d6168beadd3c2b1e..e379072b7e760a704084b73bd32c8b530145daff 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -28,7 +28,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "2.2.0"; + version = "2.3.2"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -42,18 +42,9 @@ in stdenv.mkDerivation rec { owner = "CDrummond"; repo = "cantata"; rev = "v${version}"; - sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; + sha256 = "11hjday5vj0wzkc8yb5wbs05jwa8mvgxswd5qvhpci0zkl975yzn"; }; - patches = [ - # patch is needed for 2.2.0 with qt 5.10 (doesn't harm earlier versions) - (fetchpatch { - url = "https://github.com/CDrummond/cantata/commit/4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a.patch"; - sha256 = "1z21ax3542z7hm628xv110lmplaspb407jzgfk16xkphww5qyphj"; - name = "fix_qt_510.patch"; - }) - - ]; buildInputs = [ vlc qtbase qtmultimedia qtsvg ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index 27724bc28e990277e4d03253c4c2e2209a2edc7e..2d90599346fb46db6b0f24194af063bd8cd0c07e 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -9,9 +9,13 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = "https://anonscm.debian.org/cgit/pkg-multimedia/caps.git/plain/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch"; + url = "https://salsa.debian.org/multimedia-team/caps/raw/9a99c225/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch"; sha256 = "1b1pb5yfskiw8zi1lkj572l2ajpirh4amq538vggwvlpv1fqfway"; }) + (fetchurl { + url = "https://salsa.debian.org/multimedia-team/caps/raw/a411203d/debian/patches/0002-Use-standard-exp10f-instead-of-pow10f.patch"; + sha256 = "18ciklnscabr77l8b89xmbagkk79w4iqfpzr2yhn2ywv2jp8akx9"; + }) ]; configurePhase = '' diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 1420627c02a085672e33368c679864ac163f8fcd..439175b090a8a8a44f4e41a41313c33d7be2cd47 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "cava-${version}"; - version = "0.6.0"; + version = "0.6.1"; buildInputs = [ alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "01maaq5pfd4a7zilgarwr1nl7jbqyrvir6w7ikchggsckrlk23wr"; + sha256 = "1kvhqgijs29909w3sq9m0bslx2zxxn4b3i07kdz4hb0dqkppxpjy"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index d4d302f07d21a8070b090ad9aab1bf0ffbf88a81..c419d141d1baae40bc1c478bb2ed7ac3f3103087 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; }) - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch + ++ [./fix_private_keyword.patch]; buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; @@ -33,9 +34,10 @@ stdenv.mkDerivation rec { cp ${gnu-config}/config.guess configure.guess ''; - meta = { - homepage = http://xiph.org/paranoia; + meta = with stdenv.lib; { + homepage = https://xiph.org/paranoia; description = "A tool and library for reading digital audio from CDs"; - platforms = stdenv.lib.platforms.unix; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch b/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch new file mode 100644 index 0000000000000000000000000000000000000000..3e9cbe2bd8c2183daf9d6cc53cce69c5376d6ebd --- /dev/null +++ b/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch @@ -0,0 +1,468 @@ +--- cdparanoia-III-10.2/interface/cdda_interface.h (revision 15337) ++++ cdparanoia-III-10.2/interface/cdda_interface.h (revision 15338) +@@ -85,5 +85,5 @@ + int is_mmc; + +- cdda_private_data_t *private; ++ cdda_private_data_t *private_data; + void *reserved; + unsigned char inqbytes[4]; +--- cdparanoia-III-10.2/interface/cooked_interface.c (revision 15337) ++++ cdparanoia-III-10.2/interface/cooked_interface.c (revision 15338) +@@ -14,11 +14,11 @@ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->private_data->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->private_data->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; +--- cdparanoia-III-10.2/interface/interface.c (revision 15337) ++++ cdparanoia-III-10.2/interface/interface.c (revision 15338) +@@ -40,7 +40,7 @@ + if(d->cdda_fd!=-1)close(d->cdda_fd); + if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->private_data){ ++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); ++ free(d->private_data); + } + +@@ -128,5 +128,5 @@ + } + } +- if(ms)*ms=d->private->last_milliseconds; ++ if(ms)*ms=d->private_data->last_milliseconds; + return(sectors); + } +--- cdparanoia-III-10.2/interface/scan_devices.c (revision 15337) ++++ cdparanoia-III-10.2/interface/scan_devices.c (revision 15338) +@@ -265,9 +265,9 @@ + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); +@@ -675,13 +675,13 @@ + d->nsectors=-1; + d->messagedest = messagedest; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + if(use_sgio){ + d->interface=SGIO_SCSI; +- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); ++ d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); + g_fd=d->cdda_fd=dup(d->ioctl_fd); + }else{ +@@ -697,6 +697,6 @@ + + /* malloc our big buffer for scsi commands */ +- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE); ++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; + } + +@@ -773,7 +773,7 @@ + if(g_fd!=-1)close(g_fd); + if(d){ +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->private_data){ ++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); ++ free(d->private_data); + } + free(d); +@@ -822,5 +822,5 @@ + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + d->drive_model=copystring("File based test interface"); + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); +--- cdparanoia-III-10.2/interface/scsi_interface.c (revision 15337) ++++ cdparanoia-III-10.2/interface/scsi_interface.c (revision 15338) +@@ -16,11 +16,11 @@ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->private_data->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->private_data->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; +@@ -97,5 +97,5 @@ + fd_set fdset; + struct timeval tv; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->private_data->sg_hd; + int flag=0; + +@@ -186,5 +186,5 @@ + int tret1,tret2; + int status = 0; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->private_data->sg_hd; + long writebytes=SG_OFF+cmd_len+in_size; + +@@ -196,5 +196,5 @@ + memset(sg_hd,0,sizeof(sg_hd)); + memset(sense_buffer,0,SG_MAX_SENSE); +- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); ++ memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size); + sg_hd->twelve_byte = cmd_len == 12; + sg_hd->result = 0; +@@ -210,5 +210,5 @@ + + if(bytecheck && out_size>in_size){ +- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); ++ memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); + /* the size does not remove cmd_len due to the way the kernel + driver copies buffers */ +@@ -244,5 +244,5 @@ + + sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); +- tret1=clock_gettime(d->private->clock,&tv1); ++ tret1=clock_gettime(d->private_data->clock,&tv1); + errno=0; + status = write(d->cdda_fd, sg_hd, writebytes ); +@@ -290,5 +290,5 @@ + } + +- tret2=clock_gettime(d->private->clock,&tv2); ++ tret2=clock_gettime(d->private_data->clock,&tv2); + errno=0; + status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); +@@ -314,5 +314,5 @@ + long i,flag=0; + for(i=in_size;iprivate->sg_buffer[i]!=bytefill){ ++ if(d->private_data->sg_buffer[i]!=bytefill){ + flag=1; + break; +@@ -327,7 +327,7 @@ + errno=0; + if(tret1<0 || tret2<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; + } + return(0); +@@ -348,5 +348,5 @@ + memset(&hdr,0,sizeof(hdr)); + memset(sense,0,sizeof(sense)); +- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); ++ memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size); + + hdr.cmdp = cmd; +@@ -356,5 +356,5 @@ + hdr.timeout = 50000; + hdr.interface_id = 'S'; +- hdr.dxferp = d->private->sg_buffer; ++ hdr.dxferp = d->private_data->sg_buffer; + hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ + +@@ -401,5 +401,5 @@ + long i,flag=0; + for(i=in_size;iprivate->sg_buffer[i]!=bytefill){ ++ if(d->private_data->sg_buffer[i]!=bytefill){ + flag=1; + break; +@@ -413,5 +413,5 @@ + + /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ +- /* d->private->last_milliseconds = hdr.duration; */ ++ /* d->private_data->last_milliseconds = hdr.duration; */ + + errno = 0; +@@ -446,7 +446,7 @@ + handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); + +- key = d->private->sg_buffer[2] & 0xf; +- ASC = d->private->sg_buffer[12]; +- ASCQ = d->private->sg_buffer[13]; ++ key = d->private_data->sg_buffer[2] & 0xf; ++ ASC = d->private_data->sg_buffer[12]; ++ ASCQ = d->private_data->sg_buffer[13]; + + if(key == 2 && ASC == 4 && ASCQ == 1) return 0; +@@ -493,5 +493,5 @@ + + { +- unsigned char *b=d->private->sg_buffer; ++ unsigned char *b=d->private_data->sg_buffer; + if(b[0])return(1); /* Handles only up to 256 bytes */ + if(b[6])return(1); /* Handles only up to 256 bytes */ +@@ -605,6 +605,6 @@ + if(mode_sense(d,12,0x01))return(-1); + +- d->orgdens = d->private->sg_buffer[4]; +- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); ++ d->orgdens = d->private_data->sg_buffer[4]; ++ return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]); + } + +@@ -665,6 +665,6 @@ + } + +- first=d->private->sg_buffer[2]; +- last=d->private->sg_buffer[3]; ++ first=d->private_data->sg_buffer[2]; ++ last=d->private_data->sg_buffer[3]; + tracks=last-first+1; + +@@ -684,5 +684,5 @@ + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; +@@ -705,5 +705,5 @@ + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; +@@ -739,5 +739,5 @@ + + /* copy to our structure and convert start sector */ +- tracks = d->private->sg_buffer[1]; ++ tracks = d->private_data->sg_buffer[1]; + if (tracks > MAXTRK) { + cderror(d,"003: CDROM reporting illegal number of tracks\n"); +@@ -755,31 +755,31 @@ + } + +- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; ++ d->disc_toc[i].bFlags = d->private_data->sg_buffer[10]; + d->disc_toc[i].bTrack = i + 1; + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- (((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5])); ++ (((signed char)(d->private_data->sg_buffer[2])<<24) | ++ (d->private_data->sg_buffer[3]<<16)| ++ (d->private_data->sg_buffer[4]<<8)| ++ (d->private_data->sg_buffer[5])); + } + + d->disc_toc[i].bFlags = 0; + d->disc_toc[i].bTrack = i + 1; +- memcpy (&foo, d->private->sg_buffer+2, 4); +- memcpy (&bar, d->private->sg_buffer+6, 4); ++ memcpy (&foo, d->private_data->sg_buffer+2, 4); ++ memcpy (&bar, d->private_data->sg_buffer+6, 4); + d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + + be32_to_cpu(bar)); + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- ((((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5]))+ ++ ((((signed char)(d->private_data->sg_buffer[2])<<24) | ++ (d->private_data->sg_buffer[3]<<16)| ++ (d->private_data->sg_buffer[4]<<8)| ++ (d->private_data->sg_buffer[5]))+ + +- ((((signed char)(d->private->sg_buffer[6])<<24) | +- (d->private->sg_buffer[7]<<16)| +- (d->private->sg_buffer[8]<<8)| +- (d->private->sg_buffer[9])))); ++ ((((signed char)(d->private_data->sg_buffer[6])<<24) | ++ (d->private_data->sg_buffer[7]<<16)| ++ (d->private_data->sg_buffer[8]<<8)| ++ (d->private_data->sg_buffer[9])))); + + +@@ -818,5 +818,5 @@ + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -837,5 +837,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -855,5 +855,5 @@ + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -873,5 +873,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -891,5 +891,5 @@ + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -909,5 +909,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -923,5 +923,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -937,5 +937,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -951,5 +951,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -965,5 +965,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -979,5 +979,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -993,5 +993,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -1027,5 +1027,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -1040,5 +1040,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -1053,5 +1053,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -1276,5 +1276,5 @@ + long i; + for(i=2351;i>=0;i--) +- if(d->private->sg_buffer[i]!=(unsigned char)'\177') ++ if(d->private_data->sg_buffer[i]!=(unsigned char)'\177') + return(((i+3)>>2)<<2); + +@@ -1285,5 +1285,5 @@ + long i,flag=0; + for(i=0;i<2352;i++) +- if(d->private->sg_buffer[i]!=0){ ++ if(d->private_data->sg_buffer[i]!=0){ + flag=1; + break; +@@ -1622,5 +1622,5 @@ + if(mode_sense(d,22,0x2A)==0){ + +- b=d->private->sg_buffer; ++ b=d->private_data->sg_buffer; + b+=b[3]+4; + +@@ -1670,5 +1670,5 @@ + return(NULL); + } +- return (d->private->sg_buffer); ++ return (d->private_data->sg_buffer); + } + +@@ -1726,6 +1726,6 @@ + + d->error_retry=1; +- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); ++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; + d->report_all=1; + return(0); +--- cdparanoia-III-10.2/interface/test_interface.c (revision 15337) ++++ cdparanoia-III-10.2/interface/test_interface.c (revision 15338) +@@ -67,7 +67,7 @@ + + if(beginprivate->last_milliseconds=20; ++ d->private_data->last_milliseconds=20; + else +- d->private->last_milliseconds=sectors; ++ d->private_data->last_milliseconds=sectors; + + #ifdef CDDA_TEST_UNDERRUN diff --git a/pkgs/applications/audio/chuck/clang.patch b/pkgs/applications/audio/chuck/clang.patch new file mode 100644 index 0000000000000000000000000000000000000000..77227ef0fd44a6c3936909bc25ed40b5f81fa3c7 --- /dev/null +++ b/pkgs/applications/audio/chuck/clang.patch @@ -0,0 +1,58 @@ +diff --git a/src/ugen_osc.cpp b/src/ugen_osc.cpp +index 6b93c6b..dbefe4f 100644 +--- a/src/ugen_osc.cpp ++++ b/src/ugen_osc.cpp +@@ -1232,7 +1232,7 @@ CK_DLL_CTRL( gen5_coeffs ) + Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(in_args<0) return; ++ if(in_args!=0) return; + size = in_args->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1287,7 +1287,7 @@ CK_DLL_CTRL( gen7_coeffs ) + Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(in_args<0) return; ++ if(in_args!=0) return; + size = in_args->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1340,7 +1340,7 @@ CK_DLL_CTRL( gen9_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(weights<0) return; ++ if(weights!=0) return; + size = weights->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1390,7 +1390,7 @@ CK_DLL_CTRL( gen10_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(weights<0) return; ++ if(weights!=0) return; + size = weights->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1441,7 +1441,7 @@ CK_DLL_CTRL( gen17_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen17coeffs, %d\n", weights); +- if(weights<0) return; ++ if(weights!=0) return; + size = weights->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1502,7 +1502,7 @@ CK_DLL_CTRL( curve_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen17coeffs, %d\n", weights); +- if(weights<0) goto done; ++ if(weights!=0) goto done; + + nargs = weights->size(); + if (nargs < 5 || (nargs % 3) != 2) { // check number of args diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index fd7f0c2b07c2016303b56c28cfbd29c2b7619b14..c10556260c718e84c40e0d66782e0cfe58f54c36 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which }: +{ stdenv, lib, fetchurl, alsaLib, bison, flex, libsndfile, which +, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel +, xcbuild +}: stdenv.mkDerivation rec { version = "1.3.5.2"; @@ -9,26 +12,28 @@ stdenv.mkDerivation rec { sha256 = "02z7sglax3j09grj5s1skmw8z6wz7b21hjrm95nrrdpwbxabh079"; }; - buildInputs = [ bison flex libsndfile which ] - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + nativeBuildInputs = [ flex bison which ]; - patches = [ ./darwin-limits.patch ]; + buildInputs = [ libsndfile ] + ++ lib.optional (!stdenv.isDarwin) alsaLib + ++ lib.optional stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ]; + + patches = [ ./clang.patch ./darwin-limits.patch ]; + + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-missing-sysroot"; + NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework MultitouchSupport"; postPatch = '' substituteInPlace src/makefile --replace "/usr/bin" "$out/bin" - substituteInPlace src/makefile.osx --replace "xcodebuild" "/usr/bin/xcodebuild" - substituteInPlace src/makefile.osx --replace "weak_framework" "framework" + substituteInPlace src/makefile.osx \ + --replace "weak_framework" "framework" \ + --replace "MACOSX_DEPLOYMENT_TARGET=10.5" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" ''; - buildPhase = - stdenv.lib.optionals stdenv.isLinux ["make -C src linux-alsa"] ++ - stdenv.lib.optionals stdenv.isDarwin ["make -C src osx"]; - - installPhase = '' - install -Dm755 ./src/chuck $out/bin/chuck - ''; + makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ]; + buildFlags = [ (if stdenv.isDarwin then "osx" else "linux-alsa") ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Programming language for real-time sound synthesis and music creation"; homepage = http://chuck.cs.princeton.edu; license = licenses.gpl2; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 92a33035c827af9ef2696f6ac0d5a30dea50fdd6..611828753e46646fe2703c398dedf83039a578cc 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchurl, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm , qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf -, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }: +, qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }: let - withSpotify = config.clementine.spotify or false; withIpod = config.clementine.ipod or false; withMTP = config.clementine.mtp or true; withCD = config.clementine.cd or true; @@ -12,8 +11,6 @@ let version = "1.3.1"; - exeName = "clementine"; - src = fetchurl { url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz; sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq"; @@ -70,12 +67,21 @@ let free = stdenv.mkDerivation { name = "clementine-free-${version}"; - inherit src patches nativeBuildInputs buildInputs postPatch; + inherit src patches nativeBuildInputs postPatch; + + buildInputs = buildInputs ++ [ makeWrapper ]; cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ]; enableParallelBuilding = true; + passthru.unfree = unfree; + + postInstall = '' + wrapProgram $out/bin/clementine \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + meta = with stdenv.lib; { homepage = http://www.clementine-player.org; description = "A multiplatform music player"; @@ -85,8 +91,8 @@ let }; }; - # Spotify blob for Clementine - blob = stdenv.mkDerivation { + # Unfree Spotify blob for Clementine + unfree = stdenv.mkDerivation { name = "clementine-blob-${version}"; # Use the same patches and sources as Clementine inherit src nativeBuildInputs postPatch; @@ -95,7 +101,7 @@ let ./clementine-spotify-blob.patch ]; - buildInputs = buildInputs ++ [ libspotify ]; + buildInputs = buildInputs ++ [ libspotify makeWrapper gst_plugins ]; # Only build and install the Spotify blob preBuild = '' cd ext/clementine-spotifyblob @@ -104,6 +110,14 @@ let mkdir -p $out/libexec/clementine mv $out/bin/clementine-spotifyblob $out/libexec/clementine rmdir $out/bin + + makeWrapper ${free}/bin/clementine $out/bin/clementine \ + --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine + + mkdir -p $out/share + for dir in applications icons kde4; do + ln -s "$free/share/$dir" "$out/share/$dir" + done ''; enableParallelBuilding = true; meta = with stdenv.lib; { @@ -116,34 +130,4 @@ let }; }; -in - -with stdenv.lib; - -runCommand "clementine-${version}" -{ - inherit blob free; - buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks - dontPatchELF = true; - dontStrip = true; - meta = { - description = "A multiplatform music player" - + " (" + (optionalString withSpotify "with Spotify, ") - + "with gstreamer plugins: " - + concatStrings (intersperse ", " (map (x: x.name) gst_plugins)) - + ")"; - license = licenses.gpl3Plus; - inherit (free.meta) homepage platforms maintainers; - }; -} -'' - mkdir -p $out/bin - makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ - ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - - mkdir -p $out/share - for dir in applications icons kde4; do - ln -s "$free/share/$dir" "$out/share/$dir" - done -'' +in free diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0383af06795e80ae02c4a303b7f24ed80ab46376 --- /dev/null +++ b/pkgs/applications/audio/crip/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, fetchurl +, makeWrapper + +, perl +, perlPackages + +, cdparanoia +, coreutils +, eject +, flac +, gnugrep +, nano +, sox +, vorbis-tools +, vorbisgain +, which +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "crip-3.9"; + src = fetchurl { + url = "http://bach.dynet.com/crip/src/${name}.tar.gz"; + sha256 = "0pk9152wll6fmkj1pki3fz3ijlf06jyk32v31yarwvdkwrk7s9xz"; + }; + + buildInputs = [ perl perlPackages.CDDB_get ]; + nativeBuildInputs = [ makeWrapper ]; + + toolDeps = makeBinPath [ + cdparanoia + coreutils + eject + flac + gnugrep + sox + vorbis-tools + vorbisgain + which + ]; + + scripts = [ "crip" "editcomment" "editfilenames" ]; + + installPhase = '' + mkdir -p $out/bin/ + + for script in ${escapeShellArgs scripts}; do + cp $script $out/bin/ + + substituteInPlace $out/bin/$script \ + --replace '$editor = "vim";' '$editor = "${nano}/bin/nano";' + + wrapProgram $out/bin/$script \ + --set PERL5LIB "${makePerlPath [ perlPackages.CDDB_get ]}" \ + --set PATH "${toolDeps}" + done + ''; + + meta = { + homepage = http://bach.dynet.com/crip/; + description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; + license = stdenv.lib.licenses.gpl1; + platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.endgame ]; + }; +} diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 191074eba27aecb8d9b2d0389a28f9ac77cf8aba..c8ac0a938efa84f27a5d77883ec441bb00068754 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "csound-${version}"; - version = "6.10.0"; + version = "6.11.0"; enableParallelBuilding = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "1mak183y8bn097z9q3k7f1kwvawkngkc4ch9hv6gqhgfy1cjln8n"; + sha256 = "1nnfl8dqvc5b3f94zbvdg6bxr2wlp7as78hb31awxmvfwwihpv18"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 4dced0cfafae57250cc7ab1d74ca342225df1ee3..e2fcc3c4626a5ab604abc80331506548c3b2bdfe 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson +{ stdenv, fetchurl, intltool, pkgconfig, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null , gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix new file mode 100644 index 0000000000000000000000000000000000000000..dab3a97f6e7345472e9ab46af66b8058f540833c --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }: + +stdenv.mkDerivation rec { + name = "deadbeef-headerbar-gtk3-plugin-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "saivert"; + repo = "ddb_misc_headerbar_GTK3"; + rev = "v${version}"; + sha256 = "1v1schvnps7ypjqgcbqi74a45w8r2gbhrawz7filym22h1qr9wn0"; + }; + + nativeBuildInputs = [ autoconf automake libtool pkgconfig libxml2 ]; + buildInputs = [ deadbeef glib gtk3 ]; + + # Choose correct installation path + # https://github.com/saivert/ddb_misc_headerbar_GTK3/commit/50ff75f76aa9d40761e352311670a894bfcd5cf6#r30319680 + makeFlags = [ "pkglibdir=$(out)/lib/deadbeef" ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "Plug-in that adds GTK 3 header bar to the DeaDBeeF music player"; + homepage = https://github.com/saivert/ddb_misc_headerbar_GTK3; + license = licenses.gpl2Plus; + maintainers = [ maintainers.jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index c6509b5f460ee7e3063b93afbb9e5521f0e6170d..4e2e75953f35d7b3f8670a7a3537d33e285bc2fe 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "deadbeef-mpris2-plugin-${version}"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz"; - sha256 = "083fbvi06y85khr8hdm4rl5alxdanjbbyphizyr4hi93d7a0jg75"; + sha256 = "1j631z34rwxf6wdjpsf8c2f1saq6qas1qmkgsg63m6zzpwqyizw0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/pkgs/applications/audio/deadbeef/wrapper.nix index 5b14302204e7f7d77371352b2162b7376d161432..cd45ef5926b07621cb0ca94c4162e94cea153889 100644 --- a/pkgs/applications/audio/deadbeef/wrapper.nix +++ b/pkgs/applications/audio/deadbeef/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, deadbeef, makeWrapper, plugins }: +{ symlinkJoin, deadbeef, makeWrapper, plugins }: symlinkJoin { name = "deadbeef-with-plugins-${deadbeef.version}"; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index be941bc3db292fb845b6eaab3c7721fcb81b73b9..6c1536c0a6109caff20241056fe9743d212730b8 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; src = fetchurl { - url = "http://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; + url = "https://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; sha256 = "18zcs4xmfj4vpzi15dj7k5bjzzzlr3sjf9xhrrgy4samrrdpqzfh"; }; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 5c9211e7f3bbbe8fd768f9051aed20c5319ae629..5885e0f73f53e05ef35287777defc5a5b1da6c3a 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchFromGitHub, alsaLib, fftwSinglePrec, freetype, libjack2 -, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: +, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { - name = "distrho-ports-unstable-2018-01-01"; + name = "distrho-ports-${version}"; + version = "2018-04-16"; src = fetchFromGitHub { owner = "DISTRHO"; repo = "DISTRHO-Ports"; - rev = "b200e7409aa9f6612c4d948932f6ce6f0a087f5a"; - sha256 = "0672r0a9s6skzkxpjdraziwh5k8ivrfzvi4zcpkcg3zrv2hia2vz"; + rev = version; + sha256 = "0l4zwl4mli8jzch32a1fh7c88r9q17xnkxsdw17ds5hadnxlk12v"; }; patchPhase = '' @@ -46,6 +47,6 @@ stdenv.mkDerivation rec { TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger ''; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix index 3e315e2d1a75f3ecc74e8f2b11ad69cc0d5eae94..ea0ce8cb5f30de803f9a951f3f935c695460c162 100644 --- a/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/pkgs/applications/audio/dr14_tmeter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3Packages, pkgs }: python3Packages.buildPythonApplication rec { - name = "dr14_tmeter-${version}"; + pname = "dr14_tmeter"; version = "1.0.16"; disabled = !python3Packages.isPy3k; diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b3d9fd580288a988dcc9894b6e5d7664cdbbb650 --- /dev/null +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, libjack2, libGL, pkgconfig, xorg }: + +stdenv.mkDerivation rec { + name = "dragonfly-reverb-${src.rev}"; + + src = fetchgit { + url = "https://github.com/michaelwillis/dragonfly-reverb"; + rev = "0.9.1"; + sha256 = "1dbykx044h768bbzabdagl4jh65gqgfsxsrarjrkp07sqnhlnhpd"; + }; + + patchPhase = '' + patchShebangs dpf/utils/generate-ttl.sh + ''; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libjack2 xorg.libX11 libGL + ]; + + installPhase = '' + mkdir -p $out/lib/lv2/ + cp -a bin/DragonflyReverb.lv2/ $out/lib/lv2/ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/michaelwillis/dragonfly-reverb; + description = "A hall-style reverb based on freeverb3 algorithms"; + maintainers = [ maintainers.magnetophon ]; + license = licenses.gpl2; + platforms = ["x86_64-linux"]; + }; +} diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index c42d290c59937709ece32406c52aadb24dc44833..18673a2186ccc4c9b9030dc6be12769e18e88820 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.14"; + version = "0.9.15"; name = "drumgizmo-${version}"; src = fetchurl { - url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; - sha256 = "1q2jghjz0ygaja8dgvxp914if8yyzpa204amdcwb9yyinpxsahz4"; + url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; + sha256 = "13bgqyw74pq3ss63zd9bjmgr4dah792pcphyqmr7bnvrgfjr6bx6"; }; configureFlags = [ "--enable-lv2" ]; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 3594fd881b282e5babd87d43c43eca25607c8850..555a44e89ebc42df5e5c93fe41a24fac88c789c7 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "1vm8lrk3lykdic6fyfpl12jx1xg6rcaid242s8sij30p1ix4zdab"; + sha256 = "1z9l43z91d01b9rzam2cj9qmmg6s5y65fjvb83ms4iaa1p0mnwrn"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 1ca2570fd4bdd18dc49339f2de7b6ece6bb5148a..f3bcff7a2c51a42f7a55210dbe4366b12a77fd0d 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib -, libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas +, libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas , gnome3, wrapGAppsHook }: @@ -18,10 +18,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ - gtk3 glib libid3tag id3lib taglib libvorbis libogg flac + gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac gsettings-desktop-schemas gnome3.defaultIconTheme ]; + doCheck = false; # fails 1 out of 9 tests + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index 36ce40490222de2b1a2eae601d01c0cbed4cfec4..a9d84eb6e6c56bac5f24a4d84fa30ed919b89aa3 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "2.9.1"; src = fetchurl { - url = "http://ecasound.seul.org/download/ecasound-${version}.tar.gz"; + url = "https://ecasound.seul.org/download/ecasound-${version}.tar.gz"; sha256 = "1wyws3xc4f9pglrrqv6k9137sarv4asizqrxz8h0dn44rnzfiz1r"; }; diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index 6affb16e073fd5f9831908a391fea99ff2dd6c5b..90ea4c58ea4aa15ab80e0366f0e9711a60e85037 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -7,14 +7,13 @@ mkDerivation rec { name = "elisa-${version}"; - # 0.1 is expected in early/mid 2018-04 - version = "0.0.20180320"; + version = "0.2.1"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; - rev = "9dd35d7244a8a3553275152f5b50fbe6d272ce64"; - sha256 = "0mjqvcpk2y4jlwkka8gzl50wgqjjx9bzpbrj79cr0ib3jyviss4k"; + rev = "v${version}"; + sha256 = "0b3rx3gh6adlrbmgj75dicqv6qzzn4fyfxbf1nwh3zd2hi0ca89w"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 3faeeb12d4c654cc5b59e37d8c42be69482c9ebe..651604c71a11d0dcc0442cae44d493191c27e293 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }: +{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig +, xorg }: stdenv.mkDerivation rec { name = "eq10q-${version}"; version = "2.2"; @@ -10,6 +11,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; + patches = [ + (fetchpatch { + # glibc 2.27 compatibility + url = https://sources.debian.org/data/main/e/eq10q/2.2~repack0-2.1/debian/patches/05-pow10.patch; + sha256 = "07b0wf6k4xqgigv4h095bzfaw8r218wa36r9w1817jcys13r6c5r"; + }) + ]; + installFlags = '' DESTDIR=$(out) ''; diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 4875ee8b57da3fce6eb5d1d3cf8124c6cacfb1eb..bf5bb7815856ebffbc6c2b2dc09eaa39406a36ef 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -49,7 +49,7 @@ let # faust.wrapWithBuildEnv. postInstall = '' # syntax error when eval'd directly - pattern="faust2!(svg)" + pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" (shopt -s extglob; rm "$out"/bin/$pattern) ''; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index f0564f37d6b13082385db630f1fa1026f92a28fc..cfb37e5761a770cb58383550184f5da1f8633ee5 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , makeWrapper , pkgconfig -, clang , llvm , emscripten , openssl @@ -73,12 +72,19 @@ let sed '52iLLVM_VERSION=${stdenv.lib.getVersion llvm}' -i compiler/Makefile.unix ''; + postPatch = '' + # fix build with llvm 5.0.2 by adding it to the list of known versions + # TODO: check if still needed on next update + substituteInPlace compiler/Makefile.unix \ + --replace "5.0.0 5.0.1" "5.0.0 5.0.1 5.0.2" + ''; + # Remove most faust2appl scripts since they won't run properly # without additional paths setup. See faust.wrap, # faust.wrapWithBuildEnv. postInstall = '' # syntax error when eval'd directly - pattern="faust2!(svg)" + pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" (shopt -s extglob; rm "$out"/bin/$pattern) ''; @@ -193,6 +199,7 @@ let propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; + postFixup = '' # export parts of the build environment diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix new file mode 100644 index 0000000000000000000000000000000000000000..b8ff73f2cb32d3449b48a05aa242c200c9e555fd --- /dev/null +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub +, llvm, qt48Full, libqrencode, libmicrohttpd, libjack2, alsaLib, faust, curl +, bc, coreutils, which +}: + +stdenv.mkDerivation rec { + name = "faustlive-${version}"; + version = "2017-12-05"; + src = fetchFromGitHub { + owner = "grame-cncm"; + repo = "faustlive"; + rev = "281fcb852dcd94f8c57ade1b2a7a3937542e1b2d"; + sha256 = "0sw44yd9928rid9ib0b5mx2x129m7zljrayfm6jz6hrwdc5q3k9a"; + }; + + buildInputs = [ + llvm qt48Full libqrencode libmicrohttpd libjack2 alsaLib faust curl + bc coreutils which + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + preBuild = "patchShebangs Build/Linux/buildversion"; + + meta = with stdenv.lib; { + description = "A standalone just-in-time Faust compiler"; + longDescription = '' + FaustLive is a standalone just-in-time Faust compiler. It tries to bring + together the convenience of a standalone interpreted language with the + efficiency of a compiled language. It's ideal for fast prototyping. + ''; + homepage = http://faust.grame.fr/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 99aedae19124bde1833fb274d4e8f586a1e4cc47..fb5390cb46effd75db09fe41496240b3c9033d74 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = https://xiph.org/flac/; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; - maintainers = [ ]; + license = licenses.bsd3; }; } diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index cc453347aea4cbca6e01228de6ca3cb9be17641f..8f3facec09b1edbadf40efed0b7e9ed34e0ba96f 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper -, shntool, flac, opusTools, vorbisTools, mp3gain, lame, wavpack, vorbisgain +, shntool, flac, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain , gtk3 }: stdenv.mkDerivation rec { name = "flacon-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "0l0xbzpy4nnr08z7gqvb4ngrjwzpspa382cbcrpkya3nd40987kr"; + sha256 = "1sw2v2w3s79lbzhkf96m8lwvag824am7rwfzzsi8bz6sa6krmj0m"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/flacon \ --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \ - --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbisTools + --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbis-tools mp3gain lame wavpack vorbisgain ]}" ''; diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 246e02c53c720e3737a0799c051433ecf39f560a..fb4454269d7868d91ddd5a544ad2df4aef55048e 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.0.16"; + version = "4.0.18"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "1gcahm1lv3yfscaxanrx6q7dydxjznw98vdc0f8zgdb15na3f0g7"; + sha256 = "0a3z9xj9gsa6fskiai9410kwqfb6156km59y36a31mhyddzk27p7"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 789ee35f260ea899b901045a96227fb61110fe0f..27ca539850e2526e59c593ed84c6c0c612652d24 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "fluidsynth-${version}"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "0krvmb1idnf95l2ydzfcb08ayyx3n4m71hf9fgwv3srzaikvpf3q"; + sha256 = "04jlgq1d1hd8r9cnmkl3lgf1fgm7kgy4hh9nfddap41fm1wp121p"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index f1bdcd8c5242528e9ddfb51c3aef772ff91888c7..a61f7dc0a9051942af1dc3f7c04749bdaf8d4d45 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, freeglut, libGLU, qtbase, qtmultimedia, qmake +{ stdenv, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 367b1db139d5485e2bc9906e59259db5f1891b02..d7a46143939dd4f9b5f31efa1b7a3b580f71ccdd 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5"; }; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 25704d2628019da5a7e05d45dc6734eb7406a5ac..4266b8c69bb856f406a0e68453b55ec349745875 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { name = "freewheeling-${version}"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "free-wheeling"; repo = "freewheeling"; rev = "v${version}"; - sha256 = "01hmp0jxzxpb5sl0x91hdlwmbw9n4yffrpra4f89s4n8cixrz3d9"; + sha256 = "1xflbbnjdibjmyxb1zq8liylaw5k03nnl1z3272jh204pqh17ri9"; }; nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index b92d4f6eb1e8a52941044581db50a1a9bfa186da..e9ce20f6c80acb46653da9ecc402103e68174f2d 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchurl { - url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni"; }; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index c2adc58f9ce564d99c780ad701f42ad52923c844..099e4428016e5b24523fb893ecbf92dbdfb7e6b9 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://gmpclient.org; + homepage = https://gmpclient.org; description = "A GTK2 frontend for Music Player Daemon"; license = licenses.gpl2; maintainers = [ maintainers.rickynils ]; diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 72bec52b2663a0cbadf7039867df96fe6b8c7d4f..4cd3010ec3d388f97c12a293104a76072f78f735 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -1,12 +1,9 @@ -{ stdenv, fetchurl, readline, patchelf, ncurses, qt48, libidn, expat, flac -, libvorbis }: +{ stdenv, fetchurl +, flac, expat, libidn, qtbase, qtwebkit, libvorbis }: +assert stdenv.system == "x86_64-linux"; -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; -let - archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; -in stdenv.mkDerivation rec { - version = "beta_1.0.243.1116-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.467.4929-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; @@ -16,37 +13,58 @@ stdenv.mkDerivation rec { # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-amd64/Packages # which will contain the links to all available *.debs for the arch. - src = if stdenv.system == "x86_64-linux" - then fetchurl { - url = archUrl name "amd64"; - sha256 = "54f97f449136e173492d36084f2c01244b84f02d6e223fb8a40661093e0bec7c"; - } - else fetchurl { - url = archUrl name "i386"; - sha256 = "121a7939015e2270afa3f1c73554102e2b4f2e6a31482ff7be5e7c28dd101d3c"; - }; + src = fetchurl { + url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_amd64.deb"; + sha256 = "0yaprpbp44var88kdj1h11fqkhgcklixr69jyia49v9m22529gg2"; + }; unpackPhase = '' ar vx ${src} - tar -xvf data.tar.lzma + tar xvf data.tar.xz + tar xvf control.tar.gz ''; - buildInputs = [ patchelf ]; + prePatch = '' + sed -i "s@\(Exec=\).*@\1$out/bin/google-musicmanager@" opt/google/musicmanager/google-musicmanager.desktop + ''; - buildPhase = '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/opt/google/musicmanager:${stdenv.lib.makeLibraryPath [ readline ncurses stdenv.cc.libc.out qt48 stdenv.cc.cc libidn expat flac libvorbis ]}" opt/google/musicmanager/MusicManager + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/lib + mkdir -p $out/share/applications + + cp -r opt $out + find -name "*.so*" -exec cp "{}" $out/lib \; + ln -s $out/opt/google/musicmanager/google-musicmanager $out/bin + ln -s $out/opt/google/musicmanager/google-musicmanager.desktop $out/share/applications + + for i in 16 32 48 128 + do + iconDirectory=$out/usr/share/icons/hicolor/"$i"x"$i"/apps + + mkdir -p $iconDirectory + ln -s $out/opt/google/musicmanager/product_logo_"$i".png $iconDirectory/google-musicmanager.png + done ''; - dontPatchELF = true; - dontStrip = true; + postFixup = '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/minidump_upload):${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + $out/opt/google/musicmanager/minidump_upload - installPhase = '' - mkdir -p "$out" - cp -r opt "$out" - mkdir "$out/bin" - ln -s "$out/opt/google/musicmanager/google-musicmanager" "$out/bin" + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/MusicManager):$out/lib:${stdenv.lib.makeLibraryPath [ + flac + expat + libidn + qtbase + qtwebkit + libvorbis + stdenv.cc.cc.lib + ]}" \ + $out/opt/google/musicmanager/MusicManager ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 6c7d6dba455c929641a60e0818326d1e7edfc39e..5951572dd24602a2061294822522e4cf19ae1523 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -1,10 +1,10 @@ { stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype -, fetchurl, GConf, gdk_pixbuf, glib, gtk2, libpulseaudio, makeWrapper, nspr +, fetchurl, GConf, gdk_pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr , nss, pango, udev, xorg }: let - version = "4.5.0"; + version = "4.6.1"; deps = [ alsaLib @@ -19,6 +19,7 @@ let gdk_pixbuf glib gtk2 + gtk3 libpulseaudio nspr nss @@ -46,7 +47,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; - sha256 = "06h9g1yhd5q7gg8v55q143fr65frxg0khfgckr03gsaw0swin51q"; + sha256 = "0dyn2fxhcri9d9nmcprszs6yg79gsr09bjfzzb1p10yjmi77cj2g"; }; dontBuild = true; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 0cf5a3610038d48e1ab5232a377c388dc532c278..1ada45e62925311a1ad9b2c11f87d5ec77ffee74 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -4,16 +4,15 @@ }: python3Packages.buildPythonApplication rec { - name = "gpodder-${version}"; - version = "3.10.1"; - + pname = "gpodder"; + version = "3.10.3"; format = "other"; src = fetchFromGitHub { owner = "gpodder"; repo = "gpodder"; rev = version; - sha256 = "1cqhm5h0kkdb2m691dbj8i3bixl7bw0iww2pl6k1jkz8mgafyd9d"; + sha256 = "0j0amjq1wvr5p10vckg900a8xfnxw6z028qw72ayh58216m5jb5l"; }; postPatch = with stdenv.lib; '' diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index d111502651ed2a14abaa1e56ed9de798213c7826..ed34c3118c68ddf0dc2823685be7d1216825ac99 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchFromGitHub, pkgconfig -, gcc , python3 , gsettings-desktop-schemas , desktop-file-utils diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index fae8d3e4b6057624f5e64074212b7a502a6dc7d9..0434b00c7053b7ea41ccfd45031c933cf02e6ae2 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, pythonPackages, gettext, klick}: pythonPackages.buildPythonApplication rec { - name = "gtklick-${version}"; - namePrefix = ""; + pname = "gtklick"; version = "0.6.4"; src = fetchurl { - url = "http://das.nasophon.de/download/${name}.tar.gz"; + url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; sha256 = "7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137"; }; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index e0e620bd05f941b9bb6f348b77b5f2d552d645d0..6546fd7866ea96ee82f21d0e88dbc71ffb1be193 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, - gnome3, gtk3, glib, gettext, perl, perlXMLParser, flex, libid3tag, - libvorbis, hicolor-icon-theme, gdk_pixbuf }: + gnome3, gtk3, gettext, perl, perlXMLParser, flex, libid3tag, + libvorbis, gdk_pixbuf }: stdenv.mkDerivation rec { version = "2.1.5"; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index bcb301687089eadb777606b6e33020da234862f7..041f847585d21d01d4ecf1894eeb723399e887ff 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -2,7 +2,7 @@ , avahi, bluez, boost, eigen, fftw, glib, glib-networking , glibmm, gsettings-desktop-schemas, gtkmm2, libjack2 , ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom -, wrapGAppsHook, zita-convolver, zita-resampler +, wrapGAppsHook, zita-convolver, zita-resampler, curl , optimizationSupport ? false # Enable support for native CPU extensions }: @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.36.1"; + version = "0.37.3"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "1g5949jwh2n755xjs3kcbdb8a1wxr5mn0m115wdnk27dxcdn93b0"; + sha256 = "1wfm8wrwrnqpb4ihy75n7l9i6vml536jlq9pdx2pblbc4ba3paac"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { avahi bluez boost eigen fftw glib glibmm glib-networking.out gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf libsndfile lilv lv2 serd sord sratom zita-convolver - zita-resampler + zita-resampler curl ]; configureFlags = [ diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index 9fe0820e5d6f7adb63e19803c90170e3b27c0504..cae40929f95a7527965233cf263849cdffda6a7d 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: stdenv.mkDerivation rec { - name = "infamousPlugins-v${version}"; + name = "infamousPlugins-${version}"; version = "0.2.04"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index cc613541a256071d078b1963a08ce74e62e3e78f..84be6b866faefff3e9f4ab067d756a214c455819 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ir.lv2-${version}"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "tomszilagyi"; repo = "ir.lv2"; rev = "${version}"; - sha256 = "16vy06qb0vgwg4yx15grzh5m2q3cbzm3jd0p37g2qb8rgvjhladg"; + sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6"; }; buildInputs = [ fftw gtk2 lv2 libsamplerate libsndfile zita-convolver ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir "$out/include" mkdir -p "$out/share/doc" - make PREFIX="$out" install + make PREFIX="$out" INSTDIR="$out/lib/lv2" install install -Dm755 convert4chan "$out/bin/convert4chan" ''; diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index b0fbced2211381a725d30cbf3a7f8e2d54849c45..2410106cff035f4948aa70e5cffd3ac2c2659aef 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xorg, zita-alsa-pcmi }: +{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }: stdenv.mkDerivation rec { name = "jaaa-${version}"; version = "0.8.4"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "0jyll4rkb6vja2widc340ww078rr24c6nmxbxdqvbxw409nccd01"; }; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index e4d20db78682ae88f121b3c5e4108d4dc1a69fee..f11bba34c74caaad818dbd5519c4e0fa0bfaaaf6 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.73"; src = fetchurl { - url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz"; + url = "https://archive.notam02.no/arkiv/src/${name}.tar.gz"; sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; }; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 99c3e48ae84dc24bddfbc8f1e81f8c0cf3661744..f78110e8bbbf4a35ba1ec388fe234156213baa81 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.6.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili"; }; diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix index 4efdaa86084a776ff6f38b4e8b282a3df662d61c..cdf25c08378a6b8f39406107e854f3986cfb047b 100644 --- a/pkgs/applications/audio/japa/default.nix +++ b/pkgs/applications/audio/japa/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "japa-${version}"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "1jhj7s4vqk5c4lchdall0kslvj5sh91902hhfjvs6r3a5nrhwcp0"; }; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 680542dc405b9a4dd5b6805b0eefe8c0306ce5bd..31369bd1e6385677d3a13e0a70c94d04ff9826d7 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl -, pkgconfig, cmake -, docbook_xml_dtd_45, docbook_xsl, libxslt -, python, ffmpeg, mp4v2, flac, libogg, libvorbis -, phonon, automoc4, chromaprint, id3lib, taglib -, qt, zlib, readline +, pkgconfig, cmake, python, ffmpeg, phonon, automoc4 +, chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt +, id3lib, taglib, mp4v2, flac, libogg, libvorbis +, zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols , makeWrapper }: stdenv.mkDerivation rec { name = "kid3-${version}"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; - sha256 = "1kv795prc4d3f2cbzskvdi73l6nx4cfcd32x255wq1s74zp1k73p"; + sha256 = "1bbnd6jgahdiqmsbw6c3x4h517m50db592fnq1w0v4k5aaav4i26"; }; buildInputs = with stdenv.lib; - [ pkgconfig cmake python ffmpeg docbook_xml_dtd_45 docbook_xsl libxslt - phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis - qt zlib readline makeWrapper ]; + [ pkgconfig cmake python ffmpeg phonon automoc4 + chromaprint docbook_xml_dtd_45 docbook_xsl libxslt + id3lib taglib mp4v2 flac libogg libvorbis zlib readline + qtbase qttools qtmultimedia qtquickcontrols makeWrapper ]; cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; NIX_LDFLAGS = "-lm -lpthread"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins + wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt5/plugins ''; enableParallelBuilding = true; @@ -73,4 +73,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } -# TODO: Qt5 support - not so urgent! diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index d0ffbf29bcb222c1b86ebf37d1718231d3d806e8..296a4f86a84811648a9b498a802a175dc5cfe466 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "ladspa-sdk-${version}"; version = "1.13"; src = fetchurl { - url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; }; diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix index e41d2ba96750b7a8870e7c34baa895a94fa2a4eb..01acc0d01f7ec85dc163a1ebde2739a0c00e3ec0 100644 --- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "ladspa.h-${version}"; version = "1.13"; src = fetchurl { - url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; }; diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index d0c3eab69154f13b67c16a6df5b39a85448048c8..e22bca29bc974b847f8ffcbf6f98fc34a4fe2c36 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -1,8 +1,7 @@ -{ stdenv, fetchurl, pythonPackages }: +{ fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "lastfmsubmitd-${version}"; - namePrefix = ""; + pname = "lastfmsubmitd"; version = "1.0.6"; src = fetchurl { diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix index fff16649333933c46e52ec4f016938897bc9e350..d2ef7434c4dbdee4447f23939d684964c32bc707 100644 --- a/pkgs/applications/audio/lastwatch/default.nix +++ b/pkgs/applications/audio/lastwatch/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchgit, python2Packages }: python2Packages.buildPythonApplication rec { - name = "lastwatch-${version}"; - namePrefix = ""; + pname = "lastwatch"; version = "0.4.1"; src = fetchgit { diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 65df1b89430e713b8472d74beb73e2db693d4012..389db3d548d6465e0f1d00bb79d0a6051d3c4257 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool gtk2 alsaLib libglade ]; - configureFlags = "--disable-jack"; + configureFlags = [ "--disable-jack" ]; meta = { description = "Not a Guitar-Only tuner"; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 7f368fe6c2815b129c2c799644b5a5f07331aa73..f173e41321f082ecfe197364ab99a835ca58922c 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "2.1.0"; src = fetchurl { - url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf"; }; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 25d7f2ed015b359300fe18bf1fe6f5fc4c78ef38..0ff864c0048bced200b1b94fdf33a6dc74726cf5 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13 , fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null -, qtbase, qttools, SDL ? null }: +, qtbase, qtx11extras, qttools, SDL ? null }: stdenv.mkDerivation rec { name = "lmms-${version}"; - version = "1.2.0-rc4"; + version = "1.2.0-rc6"; src = fetchFromGitHub { owner = "LMMS"; repo = "lmms"; rev = "v${version}"; - sha256 = "1n3py18zqbvfnkdiz4wc6z60xaajpkd3kn1wxmby5dmc4vccvjj5"; + sha256 = "1pqir5srfrknfd8nmbz565ymq18ffw8d8k9pbmzggaxvlcr12b25"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake qttools pkgconfig ]; @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { libvorbis portaudio qtbase + qtx11extras SDL # TODO: switch to SDL2 in the next version ]; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ffaa9457527568fa731c6e7d48d64dce9004be15 --- /dev/null +++ b/pkgs/applications/audio/lollypop/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook +, appstream-glib, desktop-file-utils, gobjectIntrospection +, python36Packages, gnome3, glib, gst_all_1 }: + +stdenv.mkDerivation rec { + version = "0.9.522"; + name = "lollypop-${version}"; + + src = fetchgit { + url = "https://gitlab.gnome.org/World/lollypop"; + rev = "refs/tags/${version}"; + fetchSubmodules = true; + sha256 = "0f2brwv884cvmxj644jcj9sg5hix3wvnjy2ndg0fh5cxyqz0kwn5"; + }; + + nativeBuildInputs = with python36Packages; [ + appstream-glib + desktop-file-utils + gobjectIntrospection + meson + ninja + pkgconfig + wrapGAppsHook + wrapPython + ]; + + buildInputs = [ glib ] ++ (with gnome3; [ + gsettings-desktop-schemas gtk3 libsecret libsoup totem-pl-parser + ]) ++ (with gst_all_1; [ + gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly + gstreamer + ]); + + pythonPath = with python36Packages; [ + beautifulsoup4 + gst-python + pillow + pycairo + pydbus + pygobject3 + pylast + ]; + + postFixup = "wrapPythonPrograms"; + + postPatch = '' + chmod +x ./meson_post_install.py + patchShebangs ./meson_post_install.py + ''; + + meta = with stdenv.lib; { + description = "A modern music player for GNOME"; + homepage = https://wiki.gnome.org/Apps/Lollypop; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index d7cc88905c535df5422431ed69a9b1456d28ff0b..740763889ffd2dce2aea967734dae3bddc1f5690 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: stdenv.mkDerivation rec { name = "VoiceOfFaust-${version}"; version = "1.1.4"; diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index c7d0caec8bf5ab4b855b30f2400bc6c82cb127d1..e27aab6e898b5fa2db1739a0c4f8a94bc40c15c0 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.2"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4"; }; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 3a77c7bbbf2466b49a13cc6311631ef7c9419d5b..88b636679cbd133ecb226f36d3cb5cd384ba135c 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pkgconfig libpulseaudio makeWrapper ]; - configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa"; + configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ]; postInstall = '' wrapProgram $out/bin/mhwaveedit \ diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix index fa4ea6343e915916e624573156fa5bd16e053f34..4dfc7b13046ef1877cf4c59e7fcbd94c2f70e24b 100644 --- a/pkgs/applications/audio/mi2ly/default.nix +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix new file mode 100644 index 0000000000000000000000000000000000000000..293d1b0b6c82bc2b09f6ad62edd1451c23265b95 --- /dev/null +++ b/pkgs/applications/audio/midas/generic.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, lib, libX11, libXext, alsaLib, freetype, brand, type, version, homepage, sha256, ... }: +stdenv.mkDerivation rec { + inherit type; + baseName = "${type}-Edit"; + name = "${lib.toLower baseName}-${version}"; + + src = fetchurl { + url = "http://downloads.music-group.com/software/behringer/${type}/${type}-Edit_LINUX_64bit_${version}.tar.gz"; + inherit sha256; + }; + + sourceRoot = "."; + dontBuild = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out/bin + cp ${baseName} $out/bin + ''; + preFixup = let + # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation + libPath = lib.makeLibraryPath [ + libX11 # libX11.so.6 + libXext # libXext.so.6 + alsaLib # libasound.so.2 + freetype # libfreetype.so.6 + stdenv.cc.cc.lib # libstdc++.so.6 + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + $out/bin/${baseName} + ''; + + meta = with stdenv.lib; { + inherit homepage; + description = "Editor for the ${brand} ${type} digital mixer"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = [ maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/midas/m32edit.nix b/pkgs/applications/audio/midas/m32edit.nix new file mode 100644 index 0000000000000000000000000000000000000000..c8a751c235b1c8d118971bb3641d85fb09e6112d --- /dev/null +++ b/pkgs/applications/audio/midas/m32edit.nix @@ -0,0 +1,9 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + brand = "Midas"; + type = "M32"; + version = "3.2"; + sha256 = "1cds6qinz37086l6pmmgrzrxadygjr2z96sjjyznnai2wz4z2nrd"; + homepage = http://www.musictri.be/Categories/Midas/Mixers/Digital/M32/p/P0B3I/downloads; +}) diff --git a/pkgs/applications/audio/midas/x32edit.nix b/pkgs/applications/audio/midas/x32edit.nix new file mode 100644 index 0000000000000000000000000000000000000000..4aacfcc89a368e05ae03afaa5ddff8fe7756d4f5 --- /dev/null +++ b/pkgs/applications/audio/midas/x32edit.nix @@ -0,0 +1,9 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + brand = "Behringer"; + type = "X32"; + version = "3.2"; + sha256 = "1lzmhd0sqnlzc0khpwm82sfi48qhv7rg153a57qjih7hhhy41mzk"; + homepage = http://www.musictri.be/Categories/Behringer/Mixers/Digital/X32/p/P0ASF/downloads; +}) diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index f077afec8b209548c627ce377c89a9adf2f1578f..42fa8b7621a5df0227aa8058b0cc2b21548e93aa 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libmikmod, ncurses, alsaLib }: +{ stdenv, fetchurl, libmikmod, ncurses }: stdenv.mkDerivation rec { name = "mikmod-3.2.8"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Tracker music player for the terminal"; homepage = http://mikmod.shlomifish.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a4cd0c944dc242b2ab0f7d2908dc6fb0fee233e4 --- /dev/null +++ b/pkgs/applications/audio/mimic/default.nix @@ -0,0 +1,35 @@ +{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig +, alsaLib, libtool, icu +, pulseaudioSupport ? true, libpulseaudio }: + +stdenv.mkDerivation rec { + name = "mimic-${version}"; + version = "1.2.0.2"; + + src = fetchFromGitHub { + rev = version; + repo = "mimic"; + owner = "MycroftAI"; + sha256 = "1wkpbwk88lsahzkc7pzbznmyy0lc02vsp0vkj8f1ags1gh0lc52j"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + alsaLib + libtool + icu + ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + + meta = { + description = "Mycroft's TTS engine, based on CMU's Flite (Festival Lite)"; + homepage = https://mimic.mycroft.ai/; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.noneucat ]; + }; +} + diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix index cee3469e3f5320612ff4c0f3c484f56103aeb4c4..b9b840682d74337a51d16b6cb3d0edd7129cae68 100644 --- a/pkgs/applications/audio/mimms/default.nix +++ b/pkgs/applications/audio/mimms/default.nix @@ -1,31 +1,31 @@ { fetchurl, stdenv, pythonPackages, libmms }: -let version = "3.2"; -in - pythonPackages.buildPythonApplication { - name = "mimms-${version}"; - src = fetchurl { - url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; - sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml"; - }; +pythonPackages.buildPythonApplication rec { + pname = "mimms"; + version = "3.2"; - postInstall = '' - wrapProgram $out/bin/mimms \ - --prefix LD_LIBRARY_PATH : ${libmms}/lib - ''; + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; + sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml"; + }; + + postInstall = '' + wrapProgram $out/bin/mimms \ + --prefix LD_LIBRARY_PATH : ${libmms}/lib + ''; - meta = { - homepage = https://savannah.nongnu.org/projects/mimms/; - license = stdenv.lib.licenses.gpl3; - description = "An mms (e.g. mms://) stream downloader"; + meta = { + homepage = https://savannah.nongnu.org/projects/mimms/; + license = stdenv.lib.licenses.gpl3; + description = "An mms (e.g. mms://) stream downloader"; - longDescription = '' - mimms is a program designed to allow you to download streams - using the MMS protocol and save them to your computer, as - opposed to watching them live. Similar functionality is - available in full media player suites such as Xine, MPlayer, - and VLC, but mimms is quick and easy to use and, for the time - being, remains a useful program. - ''; - }; - } + longDescription = '' + mimms is a program designed to allow you to download streams + using the MMS protocol and save them to your computer, as + opposed to watching them live. Similar functionality is + available in full media player suites such as Xine, MPlayer, + and VLC, but mimms is quick and easy to use and, for the time + being, remains a useful program. + ''; + }; +} diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index f511fa65914997a5cdce40069ca86f2bcbfcb8fb..746e306d3771c033143faea7ebeee7e4f0dd8ca7 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,34 +1,24 @@ -{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2 +{ stdenv, fetchFromGitHub, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite -, taglib, vampSDK +, taglib, upower, vampSDK }: stdenv.mkDerivation rec { name = "mixxx-${version}"; - version = "2.0.0"; + version = "2.1.3"; - src = fetchurl { - url = "http://downloads.mixxx.org/${name}/${name}-src.tar.gz"; - sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71"; + src = fetchFromGitHub { + owner = "mixxxdj"; + repo = "mixxx"; + rev = "release-${version}"; + sha256 = "1fm8lkbnxka4haidf6yr8mb3r6vaxmc97hhrp8pcx0fvq2mnzvy2"; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/m/mixxx/2.0.0~dfsg-7.1/debian/patches/0007-fix_gcc6_issue.patch"; - sha256 = "0kpyv10wcjcvbijk6vpq54gx9sqzrq4kq2qilc1czmisp9qdy5sd"; - }) - (fetchpatch { - url = "https://622776.bugs.gentoo.org/attachment.cgi?id=487284"; - name = "sqlite.patch"; - sha256 = "1qqbd8nrxrjcc1dwvyqfq1k2yz3l071sfcgd2dmpk6j8d4j5kx31"; - }) - ]; - buildInputs = [ chromaprint fftw flac faad2 mp4v2 libid3tag libmad libopus libshout libsndfile libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4 - rubberband scons sqlite taglib vampSDK + rubberband scons sqlite taglib upower vampSDK ]; sconsFlags = [ @@ -56,7 +46,7 @@ stdenv.mkDerivation rec { homepage = https://mixxx.org; description = "Digital DJ mixing software"; license = licenses.gpl2Plus; - maintainers = [ maintainers.aszlig maintainers.goibhniu ]; + maintainers = [ maintainers.aszlig maintainers.goibhniu maintainers.bfortz ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 55f3a667e06fa78b1126881a61e0e5c7ffba402d..1b3e89d4885e41bfef552a0e073d9e61095789b7 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { patches = [ ./buildfix.diff ]; src = fetchurl { - url = "http://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz"; + url = "https://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz"; sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz"; }; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index ad280d382d02f0005c9cc109be5b9893f5b250a5..753a273a08cc3a100ce29550178f36787eb45c0d 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -3,8 +3,7 @@ }: pythonPackages.buildPythonApplication rec { - name = "mopidy-${version}"; - + pname = "mopidy"; version = "2.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy/gmusic.nix similarity index 82% rename from pkgs/applications/audio/mopidy-gmusic/default.nix rename to pkgs/applications/audio/mopidy/gmusic.nix index e58cddd42942e6303d73e24dcb1fa992e4f16130..5566c4b07b21d64b2abb2a9d6bff1469b6a47f90 100644 --- a/pkgs/applications/audio/mopidy-gmusic/default.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-gmusic-${version}"; - version = "2.0.0"; + pname = "mopidy-gmusic"; + version = "3.0.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz"; - sha256 = "1xryw2aixfza3brxlgjdlg0lghlb17g7kay9zy56mlzp0jr7m87j"; + sha256 = "0a2s4xrrhnkv85rx4w5bj6ih9xm34jy0q71fdvbzmi827g9dw5sz"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy/iris.nix similarity index 81% rename from pkgs/applications/audio/mopidy-iris/default.nix rename to pkgs/applications/audio/mopidy/iris.nix index 4ba0088dd04d4c8701d5e3fcb13cacd4e0eb7a89..482e3652ec09a9afc6a45736cb8c891638c6c533 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.14.2"; + version = "3.25.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "19affzk45wby50gwxwzqgwa7h7618lcs48ngdsa06sd66s8x2fza"; + sha256 = "148ksv87lw3l3dwncmlq8qzv6xik29axdgaljdcp0g4pd98a7dlk"; }; propagatedBuildInputs = [ @@ -17,8 +17,11 @@ pythonPackages.buildPythonApplication rec { pylast spotipy raven + tornado ]); + postPatch = "sed -i /tornado/d setup.py"; + # no tests implemented doCheck = false; diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy/local-images.nix similarity index 94% rename from pkgs/applications/audio/mopidy-local-images/default.nix rename to pkgs/applications/audio/mopidy/local-images.nix index 063821544aed48f2ae44e18e17a9bffa9647023f..3e10904f3e69c3297fb750255bbff5b87e6195e7 100644 --- a/pkgs/applications/audio/mopidy-local-images/default.nix +++ b/pkgs/applications/audio/mopidy/local-images.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }: pythonPackages.buildPythonApplication rec { - name = "mopidy-local-images-${version}"; - + pname = "mopidy-local-images"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mopidy-local-sqlite/default.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix similarity index 93% rename from pkgs/applications/audio/mopidy-local-sqlite/default.nix rename to pkgs/applications/audio/mopidy/local-sqlite.nix index 7aebc43dabbb5de73d6b76c5910248eb08892840..6d0cc370ff3463ae8b187387fb4bbcef7e8f9257 100644 --- a/pkgs/applications/audio/mopidy-local-sqlite/default.nix +++ b/pkgs/applications/audio/mopidy/local-sqlite.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-local-sqlite-${version}"; - + pname = "mopidy-local-sqlite"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy/moped.nix similarity index 100% rename from pkgs/applications/audio/mopidy-moped/default.nix rename to pkgs/applications/audio/mopidy/moped.nix diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy/mopify.nix similarity index 92% rename from pkgs/applications/audio/mopidy-mopify/default.nix rename to pkgs/applications/audio/mopidy/mopify.nix index d55e711cf330259ac0d7d499bb5e375042231b50..b657f69e26eec318844b9d04eab8251dbf878591 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: +{ stdenv, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Mopify"; diff --git a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix similarity index 91% rename from pkgs/applications/audio/mopidy-musicbox-webclient/default.nix rename to pkgs/applications/audio/mopidy/musicbox-webclient.nix index d2f525bffd1dcfb991e8b9ed5ca140f42cebba26..b0abefd7a1fd0f9a719d55b359e89d3418605f0b 100644 --- a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-musicbox-webclient-${version}"; - + pname = "mopidy-musicbox-webclient"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mopidy-soundcloud/default.nix b/pkgs/applications/audio/mopidy/soundcloud.nix similarity index 77% rename from pkgs/applications/audio/mopidy-soundcloud/default.nix rename to pkgs/applications/audio/mopidy/soundcloud.nix index 098812961649e3ba8381f79757b8a98cf329cbb6..8002feb0f90166fe84ad592df172c24b846023b5 100644 --- a/pkgs/applications/audio/mopidy-soundcloud/default.nix +++ b/pkgs/applications/audio/mopidy/soundcloud.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-soundcloud-${version}"; - - version = "2.0.2"; + pname = "mopidy-soundcloud"; + version = "2.1.0"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-soundcloud"; rev = "v${version}"; - sha256 = "13n44975n1wwcf7qg1c7drc2bavhjnr9hnq1v0n5hdgyx8ji67gi"; + sha256 = "131qdm9i0j3ayff0js11qcmbjv50ws5s6iiqr6x5b66ymjl4scfv"; }; propagatedBuildInputs = [ mopidy ]; diff --git a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix similarity index 92% rename from pkgs/applications/audio/mopidy-spotify-tunigo/default.nix rename to pkgs/applications/audio/mopidy/spotify-tunigo.nix index 034a07bf027d2d343cb59e234147debf1b2c5871..4b75af5ed5798ef67571d1529863a3e3d7c1f4d4 100644 --- a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix +++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: pythonPackages.buildPythonApplication rec { - name = "mopidy-spotify-tunigo-${version}"; - + pname = "mopidy-spotify-tunigo"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy/spotify.nix similarity index 94% rename from pkgs/applications/audio/mopidy-spotify/default.nix rename to pkgs/applications/audio/mopidy/spotify.nix index 64b5ee629b339fddc7856ef68b107120b81600d4..9a6e1bef994c3d5990de7cc655656a0ec824f914 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-spotify-${version}"; + pname = "mopidy-spotify"; version = "3.1.0"; src = fetchurl { diff --git a/pkgs/applications/audio/mopidy-youtube/default.nix b/pkgs/applications/audio/mopidy/youtube.nix similarity index 93% rename from pkgs/applications/audio/mopidy-youtube/default.nix rename to pkgs/applications/audio/mopidy/youtube.nix index d3eb8539a19c070467dc30d1b00a6d7a1d4c09ee..b8e22a41cabf07990f5ce5f93e543e19f4acc70a 100644 --- a/pkgs/applications/audio/mopidy-youtube/default.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-youtube-${version}"; - + pname = "mopidy-youtube"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index ac945bee7f743f2d982e1e11323210b445b3bfda..efaef97257e0a1c028107084066873a30bdccbed 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index ee0ebf234ce5a82c9acccbdc18bd13aac798abd2..3ffc5265f7a034f31e0b9002ca9224fff22159ee 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://mpg321.sourceforge.net/; license = licenses.gpl2; maintainers = [ maintainers.rycee ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9687ff3106bdc469191153aac00aa61ce06d5e86 --- /dev/null +++ b/pkgs/applications/audio/muse/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, fetchFromGitHub +, libjack2 +, qt5 +, cmake +, libsndfile +, libsamplerate +, ladspaH +, fluidsynth +, alsaLib +, rtaudio +, lash +, dssi +, liblo +, pkgconfig +, gitAndTools +}: + +stdenv.mkDerivation rec { + name = "muse-sequencer-${version}"; + version = "3.0.2"; + + meta = with stdenv.lib; { + homepage = http://www.muse-sequencer.org; + description = "MIDI/Audio sequencer with recording and editing capabilities"; + longDescription = '' + MusE is a MIDI/Audio sequencer with recording and editing capabilities + written originally by Werner Schweer now developed and maintained + by the MusE development team. + + MusE aims to be a complete multitrack virtual studio for Linux, + it is published under the GNU General Public License. + ''; + license = stdenv.lib.licenses.gpl2; + }; + + src = + fetchFromGitHub { + owner = "muse-sequencer"; + repo = "muse"; + rev = "02d9dc6abd757c3c1783fdd46dacd3c4ef2c0a6d"; + sha256 = "0pn0mcg79z3bhjwxbss3ylypdz3gg70q5d1ij3x8yw65ryxbqf51"; + }; + + + buildInputs = [ + libjack2 + qt5.qtsvg + qt5.qttools + cmake + libsndfile + libsamplerate + ladspaH + fluidsynth + alsaLib + rtaudio + lash + dssi + liblo + pkgconfig + gitAndTools.gitFull + ]; + + sourceRoot = "source/muse3"; + + buildPhase = '' + cd .. + bash compile_muse.sh + ''; + + installPhase = '' + mkdir $out + cd build + make install + ''; +} diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index f56ca009f1e081fd8b3be386d10836034739b975..28381fcfee6254efb1a2729f44a53958c29c6adf 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,59 +1,37 @@ -{ stdenv, fetchzip, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, qtbase, qtdeclarative, qtscript, qtsvg, qttools +, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools , qtwebkit, qtxmlpatterns }: stdenv.mkDerivation rec { name = "musescore-${version}"; - version = "2.1.0"; + version = "2.3.2"; - src = fetchzip { - url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"; - sha256 = "1rlxz2nzilz7n6c0affnjk2wcxl4b8949qxs0xi555gxg01kybls"; + src = fetchFromGitHub { + owner = "musescore"; + repo = "MuseScore"; + rev = "v${version}"; + sha256 = "0ncv0xfmq87plqa43cm0fpidlwzz1nq5s7h7139llrbc36yp3pr1"; }; - hardeningDisable = [ "relro" "bindnow" ]; - - makeFlags = [ - "PREFIX=$(out)" - ]; - cmakeFlags = [ - "-DAEOLUS=OFF" - "-DZERBERUS=ON" - "-DOSC=ON=ON" - "-DOMR=OFF" # TODO: add OMR support, CLEF_G not declared error - "-DOCR=OFF" # Not necessary without OMR - "-DSOUNDFONT3=ON" - "-DHAS_AUDIOFILE=ON" - "-DBUILD_JACK=ON" - ]; - - preBuild = '' - make lrelease - ''; - - postBuild = '' - make manpages - ''; + ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON"; nativeBuildInputs = [ cmake pkgconfig ]; - enableParallelBuilding = true; - buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis - portaudio qtbase qtdeclarative qtscript qtsvg qttools - qtwebkit qtxmlpatterns #tesseract + portaudio portmidi # tesseract + qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns ]; meta = with stdenv.lib; { description = "Music notation and composition software"; homepage = https://musescore.org/; license = licenses.gpl2; + maintainers = with maintainers; [ vandenoever ]; platforms = platforms.linux; - maintainers = [ maintainers.vandenoever ]; repositories.git = https://github.com/musescore/MuseScore; }; } diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 93e909fc604bcad6601d87df002644c138a6af8c..ffd5b9a5858248996a1bb7f2f7bd7a1098af6923 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -3,20 +3,18 @@ stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.29"; + version = "0.30"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1b2kbx2phbf4s2qpy7mx72c87xranljr0yam6z9m1i1kvcnp8q1q"; + sha256 = "0s2bynm5szrk8bjhg200mvsm2ny0wz9s10nx7r69y9y4jsxr8624"; }; buildInputs = [ glib ncurses mpd_clientlib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = https://www.musicpd.org/clients/ncmpc/; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 10c3bb2a195d897faae2f666e8d3acb3ffd315dd..87f5f94bb30b2d7b2f9ddd5e325299dd1c4d8ae5 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "1zw8d07b2bkssbsybg6jnmpq001w525viajrnz4jvfml3l55gyad"; + sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 6b50ee1426ce52ff003860dd562d30cdf25ebb9a..e65604e974afd5b9b9c626b7ccb2e497da954e53 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "nova-filters-${version}"; src = fetchurl { - url = http://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; + url = https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 5cecdc8187d8e14ca23fca8a42e113ed226d4f34..ece0a70a7e973cf153a9405ccc36b0a20ba8e066 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "0c519qk2g0dk8gqf9ywqfp7dnr4b25lsnxxbf2l1spnnvf8nysvh"; + sha256 = "1alfl0l5qdll0w5lwhrwzj5dina1big1zmjg5imi9h06dzhz51xl"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index fe9ed12390a5bc73a0f8770ad2fab8abf85fb5ed..23ba3582ce61b3a789b0e402807a65975f7a2d1e 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,21 +1,16 @@ -{ fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm -, dbus-glib, GConf, gconfmm, intltool }: +{ fetchurl, stdenv, meson, ninja, gettext, pkgconfig, pulseaudioFull, gtkmm3, dbus-glib, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "paprefs-0.9.10"; + name = "paprefs-1.0"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; - sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; + url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; + sha256 = "0y77i9gaaassvvjrpwb4xbgqcmr51zmj5rh4z8zm687i5izf84md"; }; - buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ]; + nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - propagatedUserEnvPkgs = [ GConf ]; - - configureFlags = [ "--disable-lynx" ]; + buildInputs = [ pulseaudioFull gtkmm3 dbus-glib ]; meta = with stdenv.lib; { description = "PulseAudio Preferences"; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index d113b8a49b31305526b60787127f0df243dd6aee..4f64be02fd521e3db9a0bfc03a0770450d6972cb 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "pavucontrol-3.0"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; sha256 = "14486c6lmmirkhscbfygz114f6yzf97h35n3h3pdr27w4mdfmlmk"; }; diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 3670fb8347d69c607fbbc630cdfaef89efc302e4..faa914e13287046058af082325103a25201179f6 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "helmholtz"; src = fetchurl { - url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip"; + url = "https://www.katjaas.nl/helmholtz/helmholtz~.zip"; name = "helmholtz.zip"; curlOpts = "--user-agent ''"; sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 4f285552576c67df8d14d56cd0bc1325015f46c2..37d692a3ab5a69c12294ab559a3da21f16afbcc9 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "20160130"; src = fetchurl { - url = "http://www.chnry.net/data/puremapping-${version}-generic.zip"; + url = "https://www.chnry.net/data/puremapping-${version}-generic.zip"; name = "puremapping"; sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7"; }; diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index 8b7c2121bd791336e45b13635b1a7050ea7fb97e..d56462ccc8443156aac4a18912335825276d91d5 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.2.4"; src = fetchurl { - url = "http://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; + url = "https://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp"; }; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 8e591487111b9b81a226ab30a0e81f9650dcddc0..1518ed9b79421d599e30ccc7e24b688d7878584b 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libao, readline, json_c, libgcrypt, libav, curl }: +{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, libav, curl }: stdenv.mkDerivation rec { name = "pianobar-2016.06.02"; @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { homepage = http://6xq.net/projects/pianobar/; platforms = platforms.linux; license = licenses.mit; # expat version - maintainers = with maintainers; [ eduarrrd ]; }; } diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 677c60399e52169d3dee633f30dcb04a6c1073db..d7e6173da9ad169fb47a1496f37651ac6f22e3eb 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,11 +1,10 @@ -{ stdenv, python2Packages, fetchurl, gettext, chromaprint }: +{ stdenv, python2Packages, fetchurl, gettext }: let - version = "1.4.2"; pythonPackages = python2Packages; -in pythonPackages.buildPythonApplication { - name = "picard-${version}"; - namePrefix = ""; +in pythonPackages.buildPythonApplication rec { + pname = "picard"; + version = "1.4.2"; src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz"; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 55b9435baaa5f631ada9c622b93cf9ae5ab34097..1d3fffb549d79757cd1c3149313377ab74ef68eb 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -4,7 +4,6 @@ pythonPackages.buildPythonApplication rec { pname = "pithos"; version = "1.1.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index ada12eefaf7ebf1d94e649be75f88747e89da00d..d322553fdaad60529d83605728026b08e2679626 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "praat-${version}"; - version = "6.0.38"; + version = "6.0.42"; src = fetchurl { url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "1l01mdhd0kf6mnyrg8maydr56cpw4312gryk303kr0a4w0gwzhhc"; + sha256 = "1llcj1cq4k60lnr6jkdshd4l9nkg9yc2xmaqiinqryxrb58jmpcv"; }; configurePhase = '' diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 00f58750408b38093afd2b978d9217b4f86118a2..915d7fcbd98b80bba3c2e358c5f39defbc559bfc 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }: +{ stdenv, fetchFromGitHub, python2Packages, chromaprint }: python2Packages.buildPythonApplication rec { - name = "puddletag-${version}"; + pname = "puddletag"; version = "1.2.0"; src = fetchFromGitHub { @@ -27,17 +27,6 @@ python2Packages.buildPythonApplication rec { doCheck = false; # there are no tests dontStrip = true; # we are not generating any binaries - installPhase = '' - runHook preInstall - - siteDir=$(toPythonPath $out) - mkdir -p $siteDir - PYTHONPATH=$PYTHONPATH:$siteDir - ${python2Packages.python.interpreter} setup.py install --prefix $out - - runHook postInstall - ''; - meta = with stdenv.lib; { homepage = https://puddletag.net; description = "An audio tag editor similar to the Windows program, Mp3tag"; diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1ad57efda7a07c253455b3afac9554f4db6be0ae --- /dev/null +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, bc, dbus, gawk, gnused, libnotify, pulseaudio }: + +let + path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudio ]; + pname = "pulseaudio-ctl"; + +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "1.66"; + + src = fetchFromGitHub { + owner = "graysky2"; + repo = pname; + rev = "v${version}"; + sha256 = "19a24w7y19551ar41q848w7r1imqkl9cpff4dpb7yry7qp1yjg0y"; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace /usr $out + + substituteInPlace common/${pname}.in \ + --replace '$0' ${pname} + ''; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/${pname} \ + --prefix PATH : ${path} + ''; + + meta = with stdenv.lib; { + description = "Control pulseaudio volume from the shell or mapped to keyboard shortcuts. No need for alsa-utils."; + homepage = https://bbs.archlinux.org/viewtopic.php?id=124513; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..313f737cd422926b92547efb951accecd87d6f4c --- /dev/null +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -0,0 +1,107 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, itstool +, libxml2 +, desktop-file-utils +, wrapGAppsHook +, gst_all_1 +, pulseaudio +, gtk3 +, glib +, glibmm +, gtkmm3 +, lilv +, lv2 +, serd +, sord +, sratom +, libbs2b +, libsamplerate +, libsndfile +, libebur128 +, boost +, fftwFloat +, calf +, zita-convolver +, zam-plugins +, rubberband +, mda_lv2 +, hicolor-icon-theme +}: + +let + lv2Plugins = [ + calf # limiter, compressor exciter, bass enhancer and others + mda_lv2 # loudness + ]; + ladspaPlugins = [ + rubberband # pitch shifting + zam-plugins # maximizer + ]; +in stdenv.mkDerivation rec { + name = "pulseeffects-${version}"; + version = "4.2.8"; + + src = fetchFromGitHub { + owner = "wwmm"; + repo = "pulseeffects"; + rev = "v${version}"; + sha256 = "0ckl0640n6lhk0gcmnmwngajkf46rrd8bxfh7xy5sq6qmm01dhdd"; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + libxml2 + itstool + desktop-file-utils + wrapGAppsHook + ]; + + buildInputs = [ + pulseaudio + glib + glibmm + gtk3 + gtkmm3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + lilv lv2 serd sord sratom + libbs2b + libebur128 + libsamplerate + libsndfile + boost + fftwFloat + zita-convolver + hicolor-icon-theme + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + preFixup = '' + addToSearchPath GST_PLUGIN_SYSTEM_PATH_1_0 $out/lib/gstreamer-1.0 + + gappsWrapperArgs+=( + --set LV2_PATH "${stdenv.lib.makeSearchPath "lib/lv2" lv2Plugins}" + --set LADSPA_PATH "${stdenv.lib.makeSearchPath "lib/ladspa" ladspaPlugins}" + ) + ''; + + meta = with stdenv.lib; { + description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; + homepage = https://github.com/wwmm/pulseeffects; + license = licenses.gpl3; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 73f50e45d3df8ed2c8c7259e84bd57d7f5391b6d..6aca7e9ce22611bc18fc302bf3960739429a86d8 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -15,13 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libjack2 fftw ]; - configureFlags = '' - --enable-alsa - --enable-jack - --enable-fftw - --disable-portaudio - - ''; + configureFlags = [ + "--enable-alsa" + "--enable-jack" + "--enable-fftw" + "--disable-portaudio" + ]; # https://github.com/pure-data/pure-data/issues/188 # --disable-oss diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix index 9c0a48db51cc0b43478aa9ddde49dfa88fb4da8f..80968e2700b497a854dc82ca789a81f8e6d16497 100644 --- a/pkgs/applications/audio/puredata/wrapper.nix +++ b/pkgs/applications/audio/puredata/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, puredata, makeWrapper, plugins }: +{ symlinkJoin, puredata, makeWrapper, plugins }: let puredataFlags = map (x: "-path ${x}/") plugins; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 925078fb3a157bc21ec99f1023ac927cdb7d8a05..83608014f14251a9aa6fc238bb328957d2ce0cf4 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.5.3"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "0lx81dfwanc10vrny1vzi0wx73ph82dlz99ffjzsigj3cqzz6x4s"; + sha256 = "0x08af8m5l8qy9av3dlldsg58ny9nc69h1s4i6hqkvj24jwy6fw1"; }; buildInputs = [ diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 831a30bc4fe2ee359b84eb16fda67f8fa2c8211b..37677cc211cc270fd0550a704d32bc7bb0961995 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.5.2"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "0nxbvjgx11ljy1nxqknyq7pla55ky2ybi1jbisvq2cqxa34jsxf6"; + sha256 = "0y2w3rymvc35r291sp2qaxn36wjwvxzk2iaw9y30q9fqc0vlpdns"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 6b816cdeec1074505be766a99e750066306eeb6b..dc12baefed140251a11bcd819488f71e373e56bd 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.2.0"; + name = "qmmp-1.2.2"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "17kci7srgbkk62dgxlmg3lv2y7z04jsinpgx6jmxjpnpblpcj840"; + sha256 = "01nnyg8m3p3px1fj3lfsqqv9zh1388dwx1bm2qv4v87jywimgp79"; }; buildInputs = diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 518fef0c4f5e9feb49506fcb0a5ff5e8424c1bcd..8ad251652d0e5edf3a168ec2f901d28a2dca28d6 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "qsampler-${version}"; - version = "0.5.0"; + version = "0.5.2"; src = fetchurl { url = "mirror://sourceforge/qsampler/${name}.tar.gz"; - sha256 = "0kn1mv31ygjjsric03pkbv7r8kg3bri9ldx2ajc9pyx0p8ggnbmc"; + sha256 = "0xb0j57k03pkdl7yl5mcv1i21ljnxcq6b9h3zp6mris916lj45zq"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 71f41f87009e65c0d73da0db5eaa7ae1c2938ca9..26adc63943498e865c02803f8542c16af3662355 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.5.0"; + version = "0.5.2"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "1sr6vrz8z9r99j9xcix86lgcqldragb2ajmq1bnhr58d99sda584"; + sha256 = "1rfkaxq1pyc4hv3l0i6wicianbcbm1wp53kh9i5d4jsljgisd1dv"; }; # cmake is looking for qsynth.desktop.in and fails if it doesn't find it - # seems like a bug and can presumable go in the next version after 0.5.0 + # seems like a bug and can presumable go in the next version after 0.5.2 postPatch = '' mv src/qsynth.desktop src/qsynth.desktop.in ''; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index fd328669846f1c26255f0f240b8d41b6e1d91a0a..f1a22bd839a0da6e3963b7c795acdef71b60c285 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, python2Packages, wrapGAppsHook, gettext, intltool, libsoup, gnome3, - tag ? "", +{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, intltool, libsoup, gnome3, gtk3, gdk_pixbuf, + tag ? "", xvfb_run, dbus, glibcLocales, glib, gobjectIntrospection, gst_all_1, withGstPlugins ? true, xineBackend ? false, xineLib, withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, @@ -7,38 +7,53 @@ keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }: let optionals = stdenv.lib.optionals; in -python2Packages.buildPythonApplication rec { - name = "quodlibet${tag}-${version}"; - version = "3.9.1"; +python3.pkgs.buildPythonApplication rec { + pname = "quodlibet${tag}"; + version = "4.1.0"; # XXX, tests fail + # https://github.com/quodlibet/quodlibet/issues/2820 doCheck = false; src = fetchurl { url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"; - sha256 = "d2b42df5d439213973dc97149fddc779a6c90cec389c24baf1c0bdcc39ffe591"; + sha256 = "1vcxx4sz5i4ag74pjpdfw7jkwxfb8jhvn8igcjwd5cccw4gscm2z"; }; nativeBuildInputs = [ wrapGAppsHook gettext intltool ]; - # ++ (with python2Packages; [ pytest pyflakes pycodestyle polib ]); # test deps - buildInputs = [ gnome3.defaultIconTheme libsoup webkitgtk keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi ] + checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ]; + + buildInputs = [ gnome3.defaultIconTheme libsoup glib gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobjectIntrospection ] ++ (if xineBackend then [ xineLib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); - propagatedBuildInputs = with python2Packages; - [ pygobject3 pycairo mutagen pygtk gst-python feedparser faulthandler futures ] + propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo mutagen gst-python feedparser ] ++ optionals withDbusPython [ dbus-python ] ++ optionals withPyInotify [ pyinotify ] ++ optionals withMusicBrainzNgs [ musicbrainzngs ] ++ optionals stdenv.isDarwin [ pyobjc ] ++ optionals withPahoMqtt [ paho-mqtt ]; - makeWrapperArgs = optionals (kakasi != null) [ "--prefix PATH : ${kakasi}/bin" ]; + LC_ALL = "en_US.UTF-8"; + + checkPhase = '' + runHook preCheck + checkHomeDir=$(mktemp -d) + mkdir -p $checkHomeDir/.cache/thumbnails/normal # Required by TThumb.test_recreate_broken_cache_file + env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" \ + HOME=$checkHomeDir \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + py.test + runHook postCheck + ''; + + preFixup = stdenv.lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; - meta = { + meta = with stdenv.lib; { description = "GTK+-based audio player written in Python, using the Mutagen tagging library"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Quod Libet is a GTK+-based audio player written in Python, using @@ -54,7 +69,7 @@ python2Packages.buildPythonApplication rec { & internet radio, and all major audio formats. ''; - maintainers = with stdenv.lib.maintainers; [ coroa sauyon ]; + maintainers = with maintainers; [ coroa sauyon ]; homepage = https://quodlibet.readthedocs.io/en/latest/; }; } diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 60c8f90b6d15029e59beccc20820628ff1225a97..82bc42143c67e9d78d12272850ed6e6699617596 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -23,7 +23,7 @@ # rt2rtng , python2 # Testing -, gmock +, gtest # Fixup , wrapGAppsHook , makeWrapper @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { name = "radiotray-ng-${version}"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "0hqg6vn8hv5pic96klf1d9vj8fibrgiqnqb5vwrg3wvakx0y32kr"; + sha256 = "1sq7bc0dswv3vv56w527z268ib0pyhdxyf25388vnj1fv0c146wc"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; @@ -58,11 +58,10 @@ stdenv.mkDerivation rec { libxdg_basedir lsb-release wxGTK - ] ++ stdenv.lib.optional doCheck gmock - ++ gstInputs + ] ++ gstInputs ++ pythonInputs; - prePatch = '' + postPatch = '' for x in debian/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do substituteInPlace $x --replace /usr $out done @@ -74,13 +73,16 @@ stdenv.mkDerivation rec { --replace radiotray-ng-notification radiotray-ng-on ''; - cmakeFlags = stdenv.lib.optional doCheck "-DBUILD_TESTS=ON"; + cmakeFlags = [ + "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" + ]; enableParallelBuilding = true; - doCheck = true; - + checkInputs = [ gtest ]; checkPhase = "ctest"; + # doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = false; # fails to pick up supplied gtest, tries to download it instead preFixup = '' gappsWrapperArgs+=(--suffix PATH : ${stdenv.lib.makeBinPath [ dbus ]}) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..28aaf8a5354f4d57757da8c61b557eba1ae6d477 --- /dev/null +++ b/pkgs/applications/audio/reaper/default.nix @@ -0,0 +1,81 @@ +{ stdenv, fetchurl, autoPatchelfHook, makeWrapper +, alsaLib, xorg +, fetchFromGitHub, pkgconfig, gnome3 +, gnome2, gdk_pixbuf, cairo, glib, freetype +, libpulseaudio +}: + +let + libSwell = stdenv.mkDerivation { + name = "libSwell"; + + src = fetchFromGitHub { + owner = "justinfrankel"; + repo = "WDL"; + rev = "e87f5bdee7327b63398366fde6ec0a3f08bf600d"; + sha256 = "147idjqc6nc23w9krl8a9w571k5jx190z3id6ir6cr8zsx0lakdb"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnome3.gtk ]; + + buildPhase = '' + cd WDL/swell + make + ''; + + installPhase = '' + mv libSwell.so $out + ''; + }; + +in stdenv.mkDerivation rec { + name = "reaper-${version}"; + version = "5.94"; + + src = fetchurl { + url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; + sha256 = "16g5q12wh1cfbl9wq03vb7vpsd870k7i7883z0wn492x7y9syz8z"; + }; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + buildInputs = [ + alsaLib + stdenv.cc.cc.lib + + xorg.libX11 + xorg.libXi + + gnome3.gtk + gdk_pixbuf + gnome2.pango + cairo + glib + freetype + ]; + + dontBuild = true; + + installPhase = '' + ./install-reaper.sh --install $out/opt + rm $out/opt/REAPER/uninstall-reaper.sh + + cp ${libSwell.out} $out/opt/REAPER/libSwell.so + + wrapProgram $out/opt/REAPER/reaper \ + --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib + + mkdir $out/bin + ln -s $out/opt/REAPER/reaper $out/bin/ + ln -s $out/opt/REAPER/reamote-server $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Digital audio workstation"; + homepage = https://www.reaper.fm/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index d02c551be8afb478fb482fde6002e1268d698c27..24a2f1a8a60143f291bbae2aaea685b99237d1ae 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }: +{ stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }: + +with stdenv.lib; # To use the full release version: # 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version @@ -6,31 +8,35 @@ # 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. # Note: Renoise creates an individual build for each license which screws somewhat with the # use of functions like requireFile as the hash will be different for every user. -let fileversion = "3_1_0"; +let + urlVersion = replaceStrings [ "." ] [ "_" ]; in + stdenv.mkDerivation rec { - name = "renoise"; - buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; + name = "renoise-${version}"; + version = "3.1.0"; src = if stdenv.system == "x86_64-linux" then if builtins.isNull releasePath then fetchurl { - url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86_64.tar.bz2"; - sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; + url = "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2"; + sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; } else releasePath else if stdenv.system == "i686-linux" then if builtins.isNull releasePath then fetchurl { - url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86.tar.bz2"; - sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; + url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2"; + sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; } else releasePath else throw "Platform is not supported by Renoise"; + buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; + installPhase = '' cp -r Resources $out @@ -55,6 +61,8 @@ stdenv.mkDerivation rec { meta = { description = "Modern tracker-based DAW"; homepage = http://www.renoise.com/; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; + maintainers = []; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index a23324c7fdacda9a7f786336ac81f817b4e6310c..8dab9e32f982a47f0f4223adfbb52df698a7873e 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -24,6 +24,15 @@ in stdenv.mkDerivation rec { sha256 = "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2"; }; + patches = [ + # build with GStreamer 1.14 https://bugzilla.gnome.org/show_bug.cgi?id=788706 + (fetchurl { + name = "fmradio-Fix-build-with-GStreamer-master.patch"; + url = https://bugzilla.gnome.org/attachment.cgi?id=361178; + sha256 = "1h09mimlglj9hcmc3pfp0d6c277mqh2khwv9fryk43pkv3904d2w"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool perl perlPackages.XMLParser diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 28a69d5a3b76d51d4971e4716b3174c6d52e69dd..0ff23102e75528e916e2388762a3c96e769081a5 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchFromGitHub, +{ stdenv, fetchFromGitHub, automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile }: diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index d881afa7f5f056ad15be1d51af2aa1d58cf6942e..e57d85de05a952f001facbc69a6a75e31cbfcb5f 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.rosegardenmusic.com/; + homepage = https://www.rosegardenmusic.com/; description = "Music composition and editing environment"; longDescription = '' Rosegarden is a music composition and editing environment based around diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 4eeb893ee969dc96cb8f99040f1005776d955dd2..f6ff38b0042b83fefe12105e54a380d4cc11e529 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "0g67vm9ilmq5nlvk0f3abia9pbinr4ck5v4mll6igni1rxz2n7wk"; + sha256 = "0rfcp4v971qfhw1hb43hw12wlxmg2q13l0m1h93pyfi5l4mfjkds"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 22786304faa9b83e64001a665e2a6dc84715a85e..ab1a6e387383a24d10750c327002b966630c11cd 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { export ac_cv_prog_ac_ct_WINDRES= ''; - configureFlags = "--enable-dependency-tracking"; + configureFlags = [ "--enable-dependency-tracking" ]; buildInputs = [ alsaLib python SDL ]; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 4d8435454239f197a4f33b046266d920cee96644..1047734a2c183d40a41f4f369aa7cae585d1ca1c 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "setbfree-${version}"; - version = "0.8.5"; + version = "0.8.8"; src = fetchurl { url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "0qfccny0hh9lq54272mzmxvfz2jmzcgigjkjwn6v9h6n00gi5bw4"; + sha256 = "1ldxwds99azingkjh246kz7x3j7307jhr0fls5rjjbcfchpg7v99"; }; patchPhase = '' diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b857c5b683584c47f37aaa635a578825530d41aa --- /dev/null +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, libsidplayfp }: + +stdenv.mkDerivation rec { + version = "1.4.4"; + name = "sidplayfp-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${name}.tar.gz"; + sha256 = "0arsrg3f0fsinal22qjmj3r6500bcbgqnx26fsz049ldl716kz1m"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsidplayfp ]; + + meta = with stdenv.lib; { + description = "A SID player using libsidplayfp"; + homepage = https://sourceforge.net/projects/sidplay-residfp/; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ dezgeg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3afd73493b05dbbff2fb278f2ebab17b8ee1e40b --- /dev/null +++ b/pkgs/applications/audio/snapcast/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +, asio, alsaLib, avahi, libogg, libvorbis, flac }: + +let + + popl = stdenv.mkDerivation rec { + name = "popl-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "popl"; + rev = "v${version}"; + sha256 = "1zgjgcingyi1xw61azxxasaidbgqidncml5c2y2cj90mz23yam1i"; + }; + nativeBuildInputs = [ cmake ]; + }; + + aixlog = stdenv.mkDerivation rec { + name = "aixlog-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "aixlog"; + rev = "v${version}"; + sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr"; + }; + nativeBuildInputs = [ cmake ]; + }; + +in + +stdenv.mkDerivation rec { + name = "snapcast-${version}"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "snapcast"; + rev = "v${version}"; + sha256 = "14f5jrsarjdk2mixmznmighrh22j6flp7y47r9j3qzxycmm1mcf6"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ asio popl aixlog alsaLib avahi libogg libvorbis flac ]; + + meta = with lib; { + description = "Synchronous multi-room audio player"; + homepage = https://github.com/badaix/snapcast; + maintainers = with maintainers; [ fpletz ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 660f342dc9d96f8ad9c91eb0641cfad2ce52edb0..7c96fd364c1827c4b52c7e686e3aaecae70af4d4 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.2"; + name = "snd-18.6"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0b0ija3cf2c9sqh3cclk5a7i73vagfkyw211aykfd76w7ibirs3r"; + sha256 = "1jyqkkz2a6zw0jn9y15xd3027r8glkpw794fjk6hd3al1byjhz2z"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 55c3dfa92e301d2f432a154b68ae538d2ea5dd40..0affe5dc89d4e7fef9859d056da75dc56df6dabe 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook +{ stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook , python3Packages, gnome3, gtk3, gobjectIntrospection}: let - inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2; + inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2; in buildPythonApplication rec { - name = "sonata-${version}"; + pname = "sonata"; version = "1.7b1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index bdb9911d36508083fbcf10e92763837c10b1f45d..d5f613b4594550b4e26b469aa6241679e7aded09 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "2.4.1"; src = fetchurl { - url = "http://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz"; + url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz"; sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb"; }; diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index 86eefc395569001f5b81761c51718b26159654fc..6614e37022470f3683999ae355b1df6aefa09c05 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "spectrojack-${version}"; - version = "0.4"; + version = "0.4.1"; src = fetchurl { url = "http://sed.free.fr/spectrojack/${name}.tar.gz"; - sha256 = "0p5aa55hnazv5djw0431mza068h7mjkb9pnglxfpqkx5z0czisdx"; + sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjack2 fftwFloat gtk2 ]; diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..372e507ed0e909c9d5aaffa1380504f0f9a52662 --- /dev/null +++ b/pkgs/applications/audio/split2flac/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, shntool, cuetools +, flac, faac, mp4v2, wavpack, mac +, imagemagick, libiconv, enca, lame, pythonPackages, vorbis-tools +, aacgain, mp3gain, vorbisgain +}: + +let + wrapSplit2flac = format: '' + makeWrapper $out/bin/.split2flac-wrapped $out/bin/split2${format} \ + --set SPLIT2FLAC_FORMAT ${format} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + shntool cuetools + flac faac mp4v2 wavpack mac + imagemagick libiconv enca lame pythonPackages.mutagen vorbis-tools + aacgain mp3gain vorbisgain + ]} + ''; + +in stdenv.mkDerivation rec { + name = "split2flac-${version}"; + version = "122"; + + src = fetchFromGitHub { + owner = "ftrvxmtrx"; + repo = "split2flac"; + rev = version; + sha256 = "1a71amamip25hhqx7wwzfcl3d5snry9xsiha0kw73iq2m83r2k63"; + }; + + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + patchPhase = '' + substituteInPlace split2flac \ + --replace 'FORMAT="''${0##*split2}"' 'FORMAT=''${SPLIT2FLAC_FORMAT:-flac}' + ''; + + installPhase = '' + mkdir -p $out/share/bash-completion/completions + cp split2flac-bash-completion.sh \ + $out/share/bash-completion/completions/split2flac-bash-completion.sh + + mkdir -p $out/bin + cp split2flac $out/bin/.split2flac-wrapped + + ${wrapSplit2flac "flac"} + ${wrapSplit2flac "mp3"} + ${wrapSplit2flac "ogg"} + ${wrapSplit2flac "m4a"} + ${wrapSplit2flac "wav"} + ''; + + meta = with stdenv.lib; { + description = "Split flac/ape/wv/wav + cue sheet into separate tracks"; + homepage = https://github.com/ftrvxmtrx/split2flac; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 7b78ceddda2914be46c3b8c241586f3fcce004b1..04bdff3c8135321ec1fb929e5d3fed808dc120fa 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,15 +1,18 @@ -{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype -, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }: - -assert stdenv.system == "x86_64-linux"; +{ fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype +, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }: let - # Please update the stable branch! - # Latest version number can be found at: - # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ - # Be careful not to pick the testing version. - version = "1.0.72.117.g6bd7cc73-35"; + # "rev" decides what is actually being downloaded + version = "1.0.80.474.gef6b503e-7"; + # To get the latest stable revision: + # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' + # To get general information: + # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' + # More exapmles of api usage: + # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py + rev = "16"; + deps = [ alsaLib @@ -22,7 +25,6 @@ let ffmpeg_0_10 fontconfig freetype - GConf gdk_pixbuf glib gtk2 @@ -52,12 +54,20 @@ in stdenv.mkDerivation { name = "spotify-${version}"; + # fetch from snapcraft instead of the debian repository most repos fetch from. + # That is a bit more cumbersome. But the debian repository only keeps the last + # two versions, while snapcraft should provide versions indefinately: + # https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512 + + # This is the next-best thing, since we're not allowed to re-distribute + # spotify ourselves: + # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { - url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0yicwvg6jx8r657ff53326akq3g4ayiinlracjw5jrcs8x9whjap"; + url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; + sha512 = "45b7ab574b30fb368e0b6f4dd60addbfd1ddc02173b4f98b31c524eed49073432352a361e75959ce8e2f752231e93c79ca1b538c4bd295c935d1e2e0585d147f"; }; - buildInputs = [ dpkg makeWrapper ]; + buildInputs = [ squashfsTools makeWrapper ]; doConfigure = false; doBuild = false; @@ -66,7 +76,23 @@ stdenv.mkDerivation { unpackPhase = '' runHook preUnpack - dpkg-deb -x $src . + unsquashfs "$src" '/usr/share/spotify' '/usr/bin/spotify' '/meta/snap.yaml' + cd squashfs-root + if ! grep -q 'grade: stable' meta/snap.yaml; then + # Unfortunately this check is not reliable: At the moment (2018-07-26) the + # latest version in the "edge" channel is also marked as stable. + echo "The snap package is marked as unstable:" + grep 'grade: ' meta/snap.yaml + echo "You probably chose the wrong revision." + exit 1 + fi + if ! grep -q '${version}' meta/snap.yaml; then + echo "Package version differs from version found in snap metadata:" + grep 'version: ' meta/snap.yaml + echo "While the nix package specifies: ${version}." + echo "You probably chose the wrong revision or forgot to update the nix version." + exit 1 + fi runHook postUnpack ''; @@ -78,6 +104,8 @@ stdenv.mkDerivation { mkdir -p $libdir mv ./usr/* $out/ + cp meta/snap.yaml $out + # Work around Spotify referring to a specific minor version of # OpenSSL. @@ -95,7 +123,7 @@ stdenv.mkDerivation { librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome2.zenity}/bin" + --prefix PATH : "${gnome3.zenity}/bin" # Desktop file mkdir -p "$out/share/applications/" diff --git a/pkgs/applications/audio/spotify/update.sh b/pkgs/applications/audio/spotify/update.sh new file mode 100644 index 0000000000000000000000000000000000000000..114245f6d46cd9fc0dcce34b66090ef96c453643 --- /dev/null +++ b/pkgs/applications/audio/spotify/update.sh @@ -0,0 +1,49 @@ +channel="stable" # stable/candidate/edge +nixpkgs="$(git rev-parse --show-toplevel)" +spotify_nix="$nixpkgs/pkgs/applications/audio/spotify/default.nix" + + + +# create bash array from snap info +snap_info=($( + curl -H 'X-Ubuntu-Series: 16' \ + "https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=$channel" \ + | jq --raw-output \ + '.revision,.download_sha512,.version,.last_updated' +)) + +revision="${snap_info[0]}" +sha512="${snap_info[1]}" +version="${snap_info[2]}" +last_updated="${snap_info[3]}" + +# find the last commited version +version_pre=$( + git grep 'version\s*=' HEAD "$spotify_nix" \ + | sed -Ene 's/.*"(.*)".*/\1/p' +) + +if [[ "$version_pre" = "$version" ]]; then + echo "Spotify is already up ot date" + exit 0 +fi + +echo "Updating from ${version_pre} to ${version}, released on ${last_updated}" + +# search-andreplace revision, hash and version +sed --regexp-extended \ + -e 's/rev\s*=\s*"[0-9]+"\s*;/rev = "'"${revision}"'";/' \ + -e 's/sha512\s*=\s*".{128}"\s*;/sha512 = "'"${sha512}"'";/' \ + -e 's/version\s*=\s*".*"\s*;/version = "'"${version}"'";/' \ + -i "$spotify_nix" + +if ! nix-build -A spotify "$nixpkgs"; then + echo "The updated spotify failed to build." + exit 1 +fi + +git add "$spotify_nix" +# show diff for review +git diff HEAD +# prepare commit message, but allow edit +git commit --edit --message "spotify: $version_pre -> $version" diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index ccbceddefd2fcff5b9ce9e6b437db55e66c53906..47b0bf2e736cae8d810cba29780ff2bae95c35d8 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -5,7 +5,7 @@ let arch = if stdenv.isAarch64 then "arm64" - else if stdenv.isArm + else if stdenv.isAarch32 then "arm_armhf_raspberry_pi" else if stdenv.is64bit then "x86_64" diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index 26ea4614920393bf68557c5fe958a0982cd699c3..6fa0eb7f8f2b090bd8344f532c92c47e521f5af7 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }: stdenv.mkDerivation rec { - name = "swh-lv2-v${version}"; + name = "swh-lv2-${version}"; version = "1.0.16"; src = fetchurl { diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 53875389a4c3bf58071b498111445f46b53aed6b..8ed71ce6c390163b895711ce4ad81fea8541450a 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1skynjg6ip0qfbqqkybfjh6xcwxagq89ghl08f7sp7j0sz5qdcwp"; + sha256 = "1r60l286n8y4a4rrlnbc3h7xk4s2pvqykvskls89prxg0lkpz7kl"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index d450cce7b86f16ef053f33560a43b52e18c6f20f..535d53d99eeb078f0ad8f07b331a16e2e30d67f6 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "0.8.2"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv"; }; diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 4140c5da5a459c196b4bb4536c8304fe2cee76a1..78bd43383539921c05988ae9d3df3c07a5cf6623 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { homepage = http://tomahawk-player.org/; license = licenses.gpl3Plus; platforms = platforms.all; + broken = true; # 2018-06-25 }; } diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index f47c8fa2eec772c100bf8e4883ea5aa38e6bf610..d7d5b65375e9ba905eb0e90bbec175f021e7e83b 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo libdvdread pkgconfig x264 libmpeg2 xvidcore ]; - configureFlags = "--disable-ffmpeg --disable-libavcodec --disable-libavformat - --enable-lzo --enable-ogg --enable-vorbis --enable-theora --enable-libxml2 - --enable-x264 --enable-libmpeg2 --enable-xvid"; + configureFlags = [ + "--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat" + "--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2" + "--enable-x264" "--enable-libmpeg2" "--enable-xvid" + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index de39c8ecc1cb6fdd1a200731523627fd82ba7c08..7db3b7ec23768c409faf98426cfd3827f74f740c 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -8,8 +8,11 @@ in stdenv.mkDerivation rec { url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which libao ]; + nativeBuildInputs = [ pkgconfig which ]; + buildInputs = [ libao ]; + + enableParallelBuilding = true; + hardeningDisable = [ "format" ]; meta = with stdenv.lib; { description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..74e041868dbc6f243053b74f727ad521841acf9d --- /dev/null +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -0,0 +1,79 @@ +{ stdenv, makeWrapper, fetchFromBitbucket, fetchFromGitHub, pkgconfig +, alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi +, libzip, rtaudio, rtmidi, speex }: + +let + glfw-git = glfw.overrideAttrs (oldAttrs: { + name = "glfw-git-20180529"; + src = fetchFromGitHub { + owner = "glfw"; + repo = "glfw"; + rev = "0be4f3f75aebd9d24583ee86590a38e741db0904"; + sha256 = "0zbcjgc7ks25yi949k0wjknfl00a4dqmz45mhp00k62vlq2sj0i5"; + }; + buildInputs = oldAttrs.buildInputs ++ [ libXext libXi ]; + }); + pfft-source = fetchFromBitbucket { + owner = "jpommier"; + repo = "pffft"; + rev = "29e4f76ac53bef048938754f32231d7836401f79"; + sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1"; + }; +in +with stdenv.lib; stdenv.mkDerivation rec { + name = "VCV-Rack-${version}"; + version = "0.6.2b"; + + src = fetchFromGitHub { + owner = "VCVRack"; + repo = "Rack"; + rev = "v${version}"; + sha256 = "17ynhxcci6dyn1yi871fd8yli4924fh12pmk510djwkcj5crhas6"; + fetchSubmodules = true; + }; + + prePatch = '' + ln -s ${pfft-source} dep/jpommier-pffft-source + + mkdir -p dep/include + + cp dep/jpommier-pffft-source/*.h dep/include + cp dep/nanosvg/src/*.h dep/include + cp dep/nanovg/src/*.h dep/include + cp dep/osdialog/*.h dep/include + cp dep/oui-blendish/*.h dep/include + + substituteInPlace include/audio.hpp --replace "" "" + substituteInPlace compile.mk --replace "-march=nocona" "" + substituteInPlace Makefile \ + --replace "-Wl,-Bstatic" "" \ + --replace "-lglfw3" "-lglfw" + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex ]; + + buildFlags = "Rack"; + + installPhase = '' + install -D -m755 -t $out/bin Rack + cp -r res $out/ + + mkdir -p $out/share/rack + cp LICENSE.txt LICENSE-dist.txt $out/share/rack + + # Override the default global resource file directory + wrapProgram $out/bin/Rack --add-flags "-g $out" + ''; + + meta = with stdenv.lib; { + description = "Open-source virtual modular synthesizer"; + homepage = http://vcvrack.com/; + # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or unfree + license = [ licenses.bsd3 licenses.cc-by-nc-40 licenses.unfree ]; + maintainers = with maintainers; [ moredread ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 37ccbb1425ff966bdf95accfa265cb26a64438fc..96a6081c4d8fc84e6fc5a52ae86b46670127bc31 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "boysetsfrog"; repo = "vimpc"; - # Using commit-hash as there is not tag available - # https://github.com/boysetsfrog/vimpc/issues/70 - rev = "63556da6b94ab27d7e3f542399f5e0975a5812ba"; + rev = "v${version}"; sha256 = "1495a702df4nja8mlxq98mkbic2zv88sjiinimf9qddrfb38jxk6"; }; diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 6b9af119859eff111265b9a2922a6ee7a0eed20f..f815ac02e6e56346a285f65934237d6812a66af2 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { A set of command-line tools to manipulate Ogg Vorbis audio files, notably the `ogg123' player and the `oggenc' encoder. ''; - homepage = http://xiph.org/vorbis/; + homepage = https://xiph.org/vorbis/; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 4c4f958ec493712c971070b6b6429a659b7ab5ca..7c57b884c8eb668507358f9d3d17f7f74af22d4e 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20170428"; + version = "20180812"; name = "x42-plugins-${version}"; src = fetchurl { - url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg"; + url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; + sha256 = "0gzwzxpa2k2w9c6j3pspwi9slfyd57wb192d6yqcg92pfmnxy9dz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index c3e8efae7fe9d589b7f3be0720dadd73a45005d2..b800df016c9ae1a2485d7bba57378c33977fa902 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, pkgconfig, mpd_clientlib, openssl }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }: stdenv.mkDerivation rec { name = "ympd-${version}"; @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ cmake mpd_clientlib openssl ]; meta = { - homepage = http://www.ympd.org; + homepage = https://www.ympd.org; description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS"; maintainers = [ stdenv.lib.maintainers.siddharthist ]; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 678345a91ddd72b552193c25c2ad0679e2b999bf..65a3bbfdc01115718b352706a2fafe7efb753018 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.7"; + version = "1.5.8.2"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "1w916mmi6hh547a7icrgx6qr2kwxlxwlm6ampql427rshcz9r61k"; + sha256 = "1kg7d6mnzdwzsqhrf7pmrf1hzgfpbpm5lv8xkaz32wiv391qrnxc"; }; buildInputs = [ diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix index 9bed504103a14286669358a07a2e0f0f08edf246..529b0dbd42b6de74580d39e3feb2d71160cfc862 100644 --- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix +++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, - procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, - fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, libudev, - libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, +{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, + procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, + fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev, + libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages, maxRam ? "1024m" }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = "1512021600670_4503"; pname = "CrashPlanSmb"; name = "${pname}_${version}_${rev}"; - + src = fetchurl { url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz"; sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { vardir = "/var/lib/crashplan"; manifestdir = "${vardir}/manifest"; - + postPatch = '' # patch scripts/CrashPlanEngine substituteInPlace scripts/CrashPlanEngine \ @@ -85,10 +85,10 @@ stdenv.mkDerivation rec { postFixup = '' patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan - wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ - stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype - fontconfig dbus gconf nss nspr alsaLib cups expat libudev - libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite + wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ + stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype + fontconfig dbus gconf nss nspr alsaLib cups expat udev + libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libXtst libXScrnSaver]}" ''; diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index e840c6eeda0a0bf110bdb18e734455fd450953de..2c76891b3f9edff7ec561beac002563baf14cade 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: +{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, gtk2, glib, libXtst }: stdenv.mkDerivation rec { version = "4.8.3"; diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index ef7aa96beb063b713371a2a789186ddd94df38bf..797a00f4fc4a42b12b66405a58040cddf522e887 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "deja-dup-${version}"; - version = "36.3"; + version = "38.0"; src = fetchurl { - url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz"; - sha256 = "08pwybzp7ynfcf0vqxfc3p8ir4gnzcv4v4cq5bwidbff9crklhrc"; + url = "https://launchpad.net/deja-dup/${stdenv.lib.versions.major version}/${version}/+download/deja-dup-${version}.tar.xz"; + sha256 = "1l3sa24v0v6xf312h36jikfi8zyx6z3nmc7pjzgdp7l89gkdm65v"; }; patches = [ @@ -19,8 +19,13 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit coreutils; }) + ./hardcode-gsettings.patch ]; + postPatch = '' + substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas + ''; + nativeBuildInputs = [ meson ninja pkgconfig vala_0_40 gettext itstool appstream-glib desktop-file-utils libxml2 wrapGAppsHook diff --git a/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch new file mode 100644 index 0000000000000000000000000000000000000000..50bf2ba4fbd525c7f00ed7e9df1160b08488f1cd --- /dev/null +++ b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch @@ -0,0 +1,38 @@ +--- a/deja-dup/nautilus/NautilusExtension.c ++++ b/deja-dup/nautilus/NautilusExtension.c +@@ -24,6 +24,8 @@ + #include + + GList *dirs = NULL; ++GSettingsSchemaSource *schema_source = NULL; ++GSettingsSchema *schema = NULL; + GSettings *settings = NULL; + + // This will treat a < b iff a is 'lower' in the file tree than b +@@ -313,7 +315,13 @@ + bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR); + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + +- settings = g_settings_new("org.gnome.DejaDup"); ++ schema_source = g_settings_schema_source_new_from_directory ("@DEJA_DUP_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default (), TRUE, NULL); ++ ++ schema = g_settings_schema_source_lookup (schema_source, ++ "org.gnome.DejaDup", FALSE); ++ ++ settings = g_settings_new_full (schema, NULL, NULL); + g_signal_connect(settings, "changed::include-list", + update_include_excludes, NULL); + g_signal_connect(settings, "changed::exclude-list", +@@ -329,7 +337,11 @@ + + void nautilus_module_shutdown(void) + { ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); + g_object_unref(settings); ++ schema_source = NULL; ++ schema = NULL; + settings = NULL; + + update_include_excludes(); /* will clear it now that settings is NULL */ diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ef80aa00563fa009c074b372053096f6876c83c4 --- /dev/null +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }: + +stdenv.mkDerivation rec { + name = "lightdm-mini-greeter-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "prikhi"; + repo = "lightdm-mini-greeter"; + rev = version; + sha256 = "1g3lrh034w38hiq96b0xmghmlf87hcycwdh06dwkdksr0hl08wxy"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ lightdm gtk3 ]; + + configureFlags = [ "--sysconfdir=/etc" ]; + makeFlags = [ "configdir=$(out)/etc" ]; + + postInstall = '' + substituteInPlace "$out/share/xgreeters/lightdm-mini-greeter.desktop" \ + --replace "Exec=lightdm-mini-greeter" "Exec=$out/bin/lightdm-mini-greeter" + ''; + + meta = with stdenv.lib; { + description = "A minimal, configurable, single-user GTK3 LightDM greeter"; + homepage = https://github.com/prikhi/lightdm-mini-greeter; + license = licenses.gpl3; + maintainers = with maintainers; [ mnacamura ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 6765c5f9dfd00b9fc2973b87f95f555994927ae7..4bf81dcdd26ae995428c4daeef9c47889e0cb629 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,34 +1,61 @@ -{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, coreutils -, qt4 ? null +{ stdenv, fetchFromGitHub, pam, pkgconfig, autoconf, automake, libtool, libxcb +, glib, libXdmcp, itstool, intltool, libxklavier, libgcrypt, audit, busybox +, polkit, accountsservice, gtk-doc, gnome3, gobjectIntrospection, vala +, withQt4 ? false, qt4 , withQt5 ? false, qtbase }: with stdenv.lib; -let - ver_branch = "1.24"; - version = "1.24.0"; -in stdenv.mkDerivation rec { - name = "lightdm-${version}"; + pname = "lightdm"; + version = "1.26.0"; - src = fetchurl { - url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "18j33bm54i8k7ncxcs69zqi4105s62n58jrydqn3ikrb71s9nl6d"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "CanonicalLtd"; + repo = pname; + rev = version; + sha256 = "1mhj6l025cnf2dzxnbzlk0qa9fm4gj2aw58qh5fl4ky87dp4wdyb"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ + autoconf + automake + gnome3.yelp-tools + gnome3.yelp-xsl + gobjectIntrospection + gtk-doc + intltool + itstool + libtool + pkgconfig + vala + ]; + buildInputs = [ - pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt - qt4 libaudit - ] ++ optional withQt5 qtbase; + accountsservice + audit + glib + libgcrypt + libxcb + libXdmcp + libxklavier + pam + polkit + ] ++ optional withQt4 qt4 + ++ optional withQt5 qtbase; + + + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--disable-tests" - ] ++ optional (qt4 != null) "--enable-liblightdm-qt" + "--disable-static" + ] ++ optional withQt4 "--enable-liblightdm-qt" ++ optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ @@ -37,14 +64,17 @@ stdenv.mkDerivation rec { ]; prePatch = '' + substituteInPlace autogen.sh \ + --replace "which" "${busybox}/bin/which" + substituteInPlace src/shared-data-manager.c \ - --replace /bin/rm ${coreutils}/bin/rm + --replace /bin/rm ${busybox}/bin/rm ''; meta = { - homepage = https://launchpad.net/lightdm; + homepage = https://github.com/CanonicalLtd/lightdm; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ ocharles wkennington ]; + maintainers = with maintainers; [ ocharles wkennington worldofpeace ]; }; } diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix similarity index 95% rename from pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix rename to pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 3227151ce21e1dae2f4f956b4b88831d3c75a6bb..7ae854cee3cc717b49962da06bac43cd2e6583dd 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lightdm exo intltool makeWrapper ] + buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index a7e8799c9c1cf9d97bdf2671fd1f24cbc9266503..c9fd4f9c4ab9a94654c8f0518276db23fc1f26af 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,5 +1,5 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch -, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir +{ mkDerivation, lib, fetchFromGitHub +, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }: @@ -16,12 +16,15 @@ in mkDerivation rec { sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq"; }; - patches = [ ./sddm-ignore-config-mtime.patch ]; + patches = [ + ./sddm-ignore-config-mtime.patch + ./qt511.patch + ]; postPatch = - # Module Qt5::Test must be included in `find_package` before it is used. + # Fix missing include for gettimeofday() '' - sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|' + sed -e '1i#include ' -i src/helper/HelperApp.cpp ''; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; @@ -59,5 +62,6 @@ in mkDerivation rec { homepage = https://github.com/sddm/sddm; maintainers = with maintainers; [ abbradar ttuegel ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/display-managers/sddm/qt511.patch b/pkgs/applications/display-managers/sddm/qt511.patch new file mode 100644 index 0000000000000000000000000000000000000000..6430e60ed417f02b65ba66b83dabe7fa41b92a3b --- /dev/null +++ b/pkgs/applications/display-managers/sddm/qt511.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 005c9ad..71b46d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,7 +93,7 @@ find_package(XCB REQUIRED) + find_package(XKB REQUIRED) + + # Qt 5 +-find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools) ++find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test) + + # find qt5 imports dir + get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index c9d935a..bb85ddd 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE) + + include_directories(../src/common) + +- + set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp) + add_executable(ConfigurationTest ${ConfigurationTest_SRCS}) + add_test(NAME Configuration COMMAND ConfigurationTest) + +-qt5_use_modules(ConfigurationTest Test) ++target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test) diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 5160e02963f26492214c3b6a830818bd51d00ddf..e504c09e43e6b8b1c611d59d4464ef42aa06d0db 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng -, fontconfig, freetype, pam, dbus_libs, makeWrapper }: +, fontconfig, freetype, pam, dbus, makeWrapper }: stdenv.mkDerivation rec { name = "slim-1.3.6"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig libjpeg libpng fontconfig freetype - pam dbus_libs + pam dbus xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper ]; @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index f963fe378d51b2f38ea4720cd5b686c3a70f8897..cd031ce5ac8cb7262d4733734f3c37f43054884e 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,18 +1,23 @@ -{ pname, version, build, sha256Hash, meta }: +{ channel, pname, version, build, sha256Hash }: + { bash , buildFHSUserEnv , coreutils , fetchurl , findutils , file +, fontsConf , git , glxinfo , gnugrep +, gnused , gnutar +, gtk2, gnome_vfs, glib, GConf , gzip , fontconfig , freetype , libpulseaudio +, libGL , libX11 , libXext , libXi @@ -29,13 +34,12 @@ , writeTextFile , xkeyboard_config , zlib -, gtk2, gnome_vfs, glib, GConf -, fontsConf }: let + drvName = "android-studio-${channel}-${version}"; androidStudio = stdenv.mkDerivation { - name = "${pname}-${version}"; + name = drvName; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; @@ -57,6 +61,7 @@ let findutils gnugrep which + gnused # For Android emulator file @@ -95,6 +100,7 @@ let # For Android emulator libpulseaudio libX11 + libGL # For GTKLookAndFeel gtk2 @@ -111,17 +117,32 @@ let # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS # environment is used as a work around for that. fhsEnv = buildFHSUserEnv { - name = "${pname}-fhs-env"; + name = "${drvName}-fhs-env"; multiPkgs = pkgs: [ pkgs.ncurses5 ]; }; in writeTextFile { - name = "${pname}-${version}"; + name = "${drvName}-wrapper"; + # TODO: Rename preview -> beta (and add -stable suffix?): destination = "/bin/${pname}"; executable = true; text = '' #!${bash}/bin/bash - ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh + ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh ''; - } // { inherit meta; } + } // { + meta = with stdenv.lib; { + description = "The Official IDE for Android (${channel} channel)"; + longDescription = '' + Android Studio is the official IDE for Android app development, based on + IntelliJ IDEA. + ''; + homepage = if channel == "stable" + then https://developer.android.com/studio/index.html + else https://developer.android.com/studio/preview/index.html; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ primeos ]; + }; + } diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 72794df5fdef205950362c30a4840f6b0a565eda..199793a44fb78de9021c99ff094f8fb8e13bd103 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeFontsConf, gnome2 }: +{ stdenv, callPackage, makeFontsConf, gnome2 }: let mkStudio = opts: callPackage (import ./common.nix opts) { @@ -7,63 +7,44 @@ let }; inherit (gnome2) GConf gnome_vfs; }; - latestVersion = { - version = "3.2.0.8"; # "Android Studio 3.2 Canary 9" - build = "173.4688006"; - sha256Hash = "13kln5s45qzdi54gca0bvdiwl2mi6lg8zgp7f36a24zbmvdmnslv"; + stableVersion = { + version = "3.1.4.0"; # "Android Studio 3.1.4" + build = "173.4907809"; + sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2"; + }; + betaVersion = { + version = "3.2.0.24"; # "Android Studio 3.2 RC 2" + build = "181.4974118"; + sha256Hash = "0sj848pzpsbmnfi2692gg73v6m72hr1pwlk5x8q912w60iypi3pz"; + }; + latestVersion = { # canary & dev + version = "3.3.0.7"; # "Android Studio 3.3 Canary 8" + build = "182.4978721"; + sha256Hash = "0xa19wrw1a6y7f2jdv8699yqv7g34h3zdw3wc0ql0447afzwg9a9"; }; in rec { # Old alias preview = beta; - # Attributes are named by the corresponding release channels + # Attributes are named by their corresponding release channels - stable = mkStudio { + stable = mkStudio (stableVersion // { + channel = "stable"; pname = "android-studio"; - #pname = "android-studio-stable"; # TODO: Rename and provide symlink - version = "3.1.0.16"; # "Android Studio 3.1" - build = "173.4670197"; - sha256Hash = "1i0ldyadrcyy5pl9vjpm2k755mf08xi9x5qz8655qsbiajzqf9fy"; - - meta = with stdenv.lib; { - description = "The Official IDE for Android (stable channel)"; - longDescription = '' - Android Studio is the official IDE for Android app development, based on - IntelliJ IDEA. - ''; - homepage = https://developer.android.com/studio/index.html; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ primeos ]; - }; - }; + }); - beta = mkStudio { + beta = mkStudio (betaVersion // { + channel = "beta"; pname = "android-studio-preview"; - #pname = "android-studio-beta"; # TODO: Rename and provide symlink - version = "3.1.0.16"; # "Android Studio 3.1" - build = "173.4670197"; - sha256Hash = "1i0ldyadrcyy5pl9vjpm2k755mf08xi9x5qz8655qsbiajzqf9fy"; - - meta = stable.meta // { - description = "The Official IDE for Android (beta channel)"; - homepage = https://developer.android.com/studio/preview/index.html; - }; - }; + }); dev = mkStudio (latestVersion // { + channel = "dev"; pname = "android-studio-dev"; - - meta = beta.meta // { - description = "The Official IDE for Android (dev channel)"; - }; }); canary = mkStudio (latestVersion // { + channel = "canary"; pname = "android-studio-canary"; - - meta = beta.meta // { - description = "The Official IDE for Android (canary channel)"; - }; }); } diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix deleted file mode 100644 index 0734da173e5f443063f0e78a54b3c7d052b8ef71..0000000000000000000000000000000000000000 --- a/pkgs/applications/editors/atom/beta.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: - -stdenv.mkDerivation rec { - name = "atom-beta-${version}"; - version = "1.24.0-beta3"; - - src = fetchurl { - url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "02nnjjwlkxafi2fbi4gz276nqkmi92kf3q414vw1k3kc8q5zvxrs"; - name = "${name}.deb"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/usr/ - ar p $src data.tar.xz | tar -C $out -xJ ./usr - substituteInPlace $out/usr/share/applications/atom-beta.desktop \ - --replace /usr/share/atom-beta $out/bin - mv $out/usr/* $out/ - rm -r $out/share/lintian - rm -r $out/usr/ - sed -i "s/'atom-beta'/'.atom-beta-wrapped'/" $out/bin/atom-beta - wrapProgram $out/bin/atom-beta \ - --prefix "PATH" : "${gvfs}/bin" - - fixupPhase - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$out/share/atom-beta" \ - $out/share/atom-beta/atom - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}" \ - $out/share/atom-beta/resources/app/apm/bin/node - - #rm -f $out/share/atom-beta/resources/app/node_modules/dugite/git/bin/git - #ln -s ${pkgs.git}/bin/git $out/share/atom-beta/resources/app/node_modules/dugite/git/bin/git - - find $out/share/atom-beta -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom-beta" {} \; - - paxmark m $out/share/atom-beta/atom - paxmark m $out/share/atom-beta/resources/app/apm/bin/node - ''; - - meta = with stdenv.lib; { - description = "A hackable text editor for the 21st Century"; - homepage = https://atom.io/; - license = licenses.mit; - maintainers = [ maintainers.offline maintainers.nequissimus ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 8c7ff7b5eae674299cb1a1447f03559a10308a7d..d5e0259d2adc11f4f22d54426c104963aa074f95 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,51 +1,85 @@ -{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: +{ stdenv, pkgs, fetchurl, makeWrapper, wrapGAppsHook, gvfs, gtk3, atomEnv }: -stdenv.mkDerivation rec { - name = "atom-${version}"; - version = "1.25.0"; +let + common = pname: {version, sha256, beta ? null}: + let fullVersion = version + stdenv.lib.optionalString (beta != null) "-beta${toString beta}"; + name = "${pname}-${fullVersion}"; + in stdenv.mkDerivation { + inherit name; + version = fullVersion; - src = fetchurl { - url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "04iiw0qzl9025l4lasz42w5nfnvsmc7vwcf4a9c2hvl9xsyckajh"; - name = "${name}.deb"; + src = fetchurl { + url = "https://github.com/atom/atom/releases/download/v${fullVersion}/atom-amd64.deb"; + name = "${name}.deb"; + inherit sha256; + }; + + nativeBuildInputs = [ + wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + ]; + + buildInputs = [ + gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix "PATH" : "${gvfs}/bin" \ + ) + ''; + + buildCommand = '' + mkdir -p $out/usr/ + ar p $src data.tar.xz | tar -C $out -xJ ./usr + substituteInPlace $out/usr/share/applications/${pname}.desktop \ + --replace /usr/share/${pname} $out/bin + mv $out/usr/* $out/ + rm -r $out/share/lintian + rm -r $out/usr/ + sed -i "s/${pname})/.${pname}-wrapped)/" $out/bin/${pname} + + fixupPhase + + share=$out/share/${pname} + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:$share" \ + $share/atom + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}" \ + $share/resources/app/apm/bin/node + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $share/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux + + dugite=$share/resources/app.asar.unpacked/node_modules/dugite + rm -f $dugite/git/bin/git + ln -s ${pkgs.git}/bin/git $dugite/git/bin/git + rm -f $dugite/git/libexec/git-core/git + ln -s ${pkgs.git}/bin/git $dugite/git/libexec/git-core/git + + find $share -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$share" {} \; + + paxmark m $share/atom + paxmark m $share/resources/app/apm/bin/node + ''; + + meta = with stdenv.lib; { + description = "A hackable text editor for the 21st Century"; + homepage = https://atom.io/; + license = licenses.mit; + maintainers = with maintainers; [ offline nequissimus synthetica ysndr ]; + platforms = platforms.x86_64; + }; + }; +in stdenv.lib.mapAttrs common { + atom = { + version = "1.30.0"; + sha256 = "1hqizfn9c249l51rlpfgk0h374maqgw6pagswlh4xa278qzb6qzs"; }; - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/usr/ - ar p $src data.tar.xz | tar -C $out -xJ ./usr - substituteInPlace $out/usr/share/applications/atom.desktop \ - --replace /usr/share/atom $out/bin - mv $out/usr/* $out/ - rm -r $out/share/lintian - rm -r $out/usr/ - wrapProgram $out/bin/atom \ - --prefix "PATH" : "${gvfs}/bin" - - fixupPhase - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$out/share/atom" \ - $out/share/atom/atom - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}" \ - $out/share/atom/resources/app/apm/bin/node - - rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git - ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git - - find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \; - - paxmark m $out/share/atom/atom - paxmark m $out/share/atom/resources/app/apm/bin/node - ''; - - meta = with stdenv.lib; { - description = "A hackable text editor for the 21st Century"; - homepage = https://atom.io/; - license = licenses.mit; - maintainers = [ maintainers.offline maintainers.nequissimus ]; - platforms = [ "x86_64-linux" ]; + atom-beta = { + version = "1.31.0"; + beta = 0; + sha256 = "11nlaz89rg6lgzsxp83qdqk4bnn2cij2p5aqjd9a3phd7v70xmy5"; }; } diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index c7e1dfe27364b546731b14bd6e022105a968de92..da78c39324a5e8c2aeadcd8b1948b42c96a04298 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig +, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 + stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9f1db1464482b27a104db16f2d8c7a3be7424c6f --- /dev/null +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -0,0 +1,30 @@ +{ stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "bonzomatic"; + version = "2018-03-29"; + + src = fetchFromGitHub { + owner = "Gargaj"; + repo = pname; + rev = version; + sha256 = "12mdfjvbhdqz1585772rj4cap8m4ijfci6ib62jysxjf747k41fg"; + }; + + buildInputs = [ cmake makeWrapper alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ]; + + postFixup = '' + wrapProgram $out/bin/Bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib" + ''; + + meta = with stdenv.lib; { + description = "A live-coding tool for writing 2D fragment/pixel shaders"; + license = with licenses; [ + unlicense + unfreeRedistributable # contains libbass.so in repository + ]; + maintainers = [ maintainers.nocent ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 23cb16c0733ffad0d747248226eac9521338b37a..1065564f7b4c3bbb691599577ddc2bfc111580aa 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf -, cups, libgcrypt_1_5, systemd, makeWrapper, dbus }: +{ stdenv, fetchurl, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf +, cups, libgcrypt_1_5, systemd, dbus }: with stdenv.lib; let diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..33d80a577dbef6ae29e9122fbf4ec67a1acd9c45 --- /dev/null +++ b/pkgs/applications/editors/dit/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, coreutils, ncurses, lua }: + +stdenv.mkDerivation rec { + name = "dit-${version}"; + version = "0.4"; + + src = fetchurl { + url = "https://hisham.hm/dit/releases/${version}/${name}.tar.gz"; + sha256 = "0bwczbv7annbbpg7bgbsqd5kwypn81sza4v7v99fin94wwmcn784"; + }; + + buildInputs = [ coreutils ncurses lua ]; + + prePatch = '' + patchShebangs tools/GenHeaders + ''; + + # needs GNU tail for tail -r + postPatch = '' + substituteInPlace Prototypes.h --replace 'tail' "$(type -P tail)" + ''; + + meta = with stdenv.lib; { + description = "A console text editor for Unix that you already know how to use"; + homepage = https://hisham.hm/dit/; + license = licenses.gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 1688e606222dceaf29e5ac3842529e8381cea8f3..c719c7b2da1aa430c39c654be96c0eff0475845c 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper -, freetype, fontconfig, libX11, libXext, libXrender, zlib +{ stdenv, fetchurl, makeDesktopItem, makeWrapper +, freetype, fontconfig, libX11, libXrender, zlib , glib, gtk3, libXtst, jdk, gsettings-desktop-schemas , webkitgtk ? null # for internal web browser -, buildEnv, writeText, runCommand +, buildEnv, runCommand , callPackage }: @@ -96,7 +96,7 @@ rec { ### Eclipse Platform - eclipse-platform = eclipse-platform-47; # always point to latest + eclipse-platform = eclipse-platform-48; # always point to latest eclipse-platform-46 = buildEclipse { name = "eclipse-platform-4.6.2"; @@ -114,16 +114,31 @@ rec { }; eclipse-platform-47 = buildEclipse { - name = "eclipse-platform-4.7.2"; + name = "eclipse-platform-4.7.3a"; description = "Eclipse Platform Oxygen"; sources = { "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk-x86_64.tar.gz; - sha256 = "1zl406brvhh25dkd2pi1kvz5386gzkybpwik03aadpzmjrbm9730"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz; + sha512 = "caf86cd6efaf66258c75434f1adf552587a7395d57dba4cfd20f86196308cf942866d931f4b352f9d39a6fbf14444fcd2167e6bfd146a28c96c229bb9988156a"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk.tar.gz; - sha256 = "0v0i13ah8d8zmcv0ip1ia5ifnfnl76aibiqpv4q4lih5d1qsa79d"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk.tar.gz; + sha512 = "c633da467774e4ab40f8d51d07b8e7d8403f26f23365c3c3ceeaeec1039b8c23c7508cee1f786bf52db64c7b84e0f91cb31a2848a74ac8271f8504934407bd5c"; + }; + }; + }; + + eclipse-platform-48 = buildEclipse { + name = "eclipse-platform-4.8"; + description = "Eclipse Platform Photon"; + sources = { + "x86_64-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk-x86_64.tar.gz; + sha512 = "ccce2b954938479e42ef3f9b78f74b24ae4cae7499546fa4f9a55ec1849e1acfd06315d4529b11474a8b3d1142c9409c581edfa571baaf1342ab062f02467af2"; + }; + "i686-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk.tar.gz; + sha512 = "f5f407727e22b848931cf38f71b1a0c30a9778aa227c3df137dcceec2fba2ecc309cbfa8b4a660b814d2edb60f65110381497b4325781cab4d6402784139e32b"; }; }; }; @@ -150,7 +165,7 @@ rec { ### Eclipse SDK - eclipse-sdk = eclipse-sdk-47; # always point to latest + eclipse-sdk = eclipse-sdk-48; # always point to latest eclipse-sdk-46 = buildEclipse { name = "eclipse-sdk-4.6.2"; @@ -168,16 +183,31 @@ rec { }; eclipse-sdk-47 = buildEclipse { - name = "eclipse-sdk-4.7.2"; + name = "eclipse-sdk-4.7.3a"; description = "Eclipse Oxygen Classic"; sources = { "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk-x86_64.tar.gz; - sha256 = "1j5d72rkl3lq3rpnvq1spsa0zlzbmbkgadfhbz868sqqbavrwbzv"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk-x86_64.tar.gz; + sha512 = "d77e42aca16d26526cef32e363d038258bb8a4616d9dbe6e76dd3656dc2217369436390a82555bde4566bbbdb631813bbaca08602f7bb885cb30e8a26a14873f"; + }; + "i686-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk.tar.gz; + sha512 = "b0b936fd4142ae86ec5c30535cd5e4caf6fe313d814ae5b16f300635e4163a79b748b1eee11792a135114f2265678a74821ec80c2bfd69872769b6d0ccbcde3a"; + }; + }; + }; + + eclipse-sdk-48 = buildEclipse { + name = "eclipse-sdk-4.8"; + description = "Eclipse Photon Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk-x86_64.tar.gz; + sha512 = "357ea9e7f426c68ced693f1c7b76eae23f9e3c7893de1f12d17994ec17b447896b5daa7292d5fbf6d9c4e5b7fd637ca5b2a6ba8ce40a2a7c2fe06f2124d31b75"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk.tar.gz; - sha256 = "117436ni79v1kiync8b3wkfkb8a5rv3sbqp6qnwbmanwkvnyvfvc"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk.tar.gz; + sha512 = "c7cae7baa3978d48477090bb9941e85b4c7484021ece9c5c77a7e859e57e5c1f13556262f92b561cfb11f828b934bad7a6018be7b8fd9454e3991e8d5cae9917"; }; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 1710c0e35531e51613c0e75b583038059ddb7722..84371d1524938fe49f5a5d6b79c6a16c2f207388 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -432,11 +432,11 @@ rec { jsonedit = buildEclipsePlugin rec { name = "jsonedit-${version}"; - version = "1.1.0"; + version = "1.1.1"; srcFeature = fetchurl { url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar"; - sha256 = "1qqbzh9sv0s9p0irim7kimvzdkw0hg6yv090bz5ifpzqdxc4v9r5"; + sha256 = "0zkg8d8x3l5jpfxi0mz9dn62wmy4fjgpwdikj280fvsklmcw5b86"; }; srcPlugins = @@ -448,13 +448,13 @@ rec { }; in map fetch [ - { n = "core"; h = "1fl4api6j0wp4vfbyabxqsrjvvpclp8p3b4xnxxpn4v8g12q526m"; } - { n = "editor"; h = "1kn15qampdlpxblj2bv94b3bb15qfwng27lk0n578585yqmb3p66"; } - { n = "folding"; h = "1qnzdx4xx9ma3p6lg1ab8xf3nik1yrww33nksi0j3vnvh8i9ihdm"; } - { n = "model"; h = "0n8855ma1h2as0skrrp2qy3sdkmnhl5vlqxcjv8xlc3faa72174a"; } - { n = "outline"; h = "07i2spmzghs49pkxl8z9c29n6l38x26v20prkh4a7i1rf9whg1q8"; } - { n = "preferences"; h = "0d1m8pb903wpc4vvhsp0gx0h65r432ax898wif3a23c5wxj4nh9i"; } - { n = "text"; h = "0z80d9qgpbx88jrq8b4r478lrcrf52gxqkl94l13wrk7rszjpldh"; } + { n = "core"; h = "0svs0aswnhl26cqw6bmw30cisx4cr50kc5njg272sy5c1dqjm1zq"; } + { n = "editor"; h = "1q62dinrbb18aywbvii4mlr7rxa20rdsxxd6grix9y8h9776q4l5"; } + { n = "folding"; h = "1qh4ijfb1gl9xza5ydi87v1kyima3a9sh7lncwdy1way3pdhln1y"; } + { n = "model"; h = "1pr6k2pdfdwx8jqs7gx7wzn3gxsql3sk6lnjha8m15lv4al6d4kj"; } + { n = "outline"; h = "1jgr2g16j3id8v367jbgd6kx6g2w636fbzmd8jvkvkh7y1jgjqxm"; } + { n = "preferences"; h = "027fhaqa5xbil6dmhvkbpha3pgw6dpmc2im3nlliyds57mdmdb1h"; } + { n = "text"; h = "0clywylyidrxlqs0n816nhgjmk1c3xl7sn904ki4q050amfy0wb2"; } ]; propagatedBuildInputs = [ antlr-runtime_4_7 ]; @@ -470,12 +470,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.7.2"; + version = "4.8"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/org.eclipse.jdt-4.7.2.zip; - sha256 = "1yzqnjs88cdyyqv8f1g8fbfyccci29f3pzxxvaz7szxicwzn59mz"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/org.eclipse.jdt-4.8.zip; + sha256 = "1my0d1114mx5gzxmwqlx0rcny39ly97ixlwx53ljk6qcryhdnr88"; }; meta = with stdenv.lib; { @@ -487,6 +487,29 @@ rec { }; }; + jdt-codemining = buildEclipsePlugin rec { + name = "jdt-codemining-${version}"; + version = "1.0.0.201806221018"; + + srcFeature = fetchurl { + url = "http://oss.opensagres.fr/jdt-codemining/snapshot/features/jdt-codemining-feature_${version}.jar"; + sha256 = "1vy30rsb9xifn4r1r2n84d48g6riadzli1xvhfs1mf5pkm5ljwl6"; + }; + + srcPlugin = fetchurl { + url = "http://oss.opensagres.fr/jdt-codemining/snapshot/plugins/org.eclipse.jdt.codemining_${version}.jar"; + sha256 = "0qdzlqcjcm2i4mwhmcdml0am83z1dayrcmf37ji7vmw6iwdk1xmp"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/angelozerr/jdt-codemining; + description = "Provides JDT Java CodeMining"; + license = licenses.epl10; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + rustdt = buildEclipseUpdateSite rec { name = "rustdt-${version}"; version = "0.6.2"; @@ -530,18 +553,14 @@ rec { }; }; - spotbugs = buildEclipsePlugin rec { + spotbugs = buildEclipseUpdateSite rec { name = "spotbugs-${version}"; - version = "3.1.2.r201802250230-59118d9"; - - srcFeature = fetchurl { - url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "1p0pz7znpfi5h1wr60sl8clkpd7rzkh7krmc0nxc6w43gkgkg9h4"; - }; + version = "3.1.6"; - srcPlugin = fetchurl { - url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "1z3jjbcjif4qip1gx2dhfcm9fyhps96ms7z3ngbdcakgw7wai9v4"; + src = fetchzip { + stripRoot = false; + url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip"; + sha256 = "1qsams12n64slp00nfc9v943sy9bzffzm7anqqaz2hjw64iia7fh"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index a6611d2f167d7b34d1c2925025db68a258628867..28775e48e1a7f1ac50c96395acd0460890a39306 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "edbrowse-${version}"; - version = "3.7.2"; + version = "3.7.4"; buildInputs = [ curl pcre readline openssl duktape perl html-tidy ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "CMB"; repo = "edbrowse"; rev = "v${version}"; - sha256 = "00wi0m91zf8p8wk4ixlz99dndgv4xqy93m2vsiwdr3khw3jwipp2"; + sha256 = "0i9ivyfy1dd16c89f392kwx6wxgkkpyq2hl32jhzra0fb0zyl0k6"; }; meta = with stdenv.lib; { description = "Command Line Editor Browser"; diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index b9bd529930f23e858aae72f38ea848ae37f316fe..078b8a03b5d99c2dd599339e90a025449e110235 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { done ''; - configureFlags = "--ioctl=termios"; + configureFlags = [ "--ioctl=termios" ]; meta = { homepage = http://elvis.vi-editor.org/; diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix index 0ab11b5bf2043fbc15ebaf2542a57e36d8115b5b..689bcfc9adfdd7a2b60ac80f3ac75f54492fea8a 100644 --- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix +++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./install-infodir.patch ]; buildInputs = [emacs texinfo ctags]; - configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp"; + configureFlags = [ "--with-package-dir=$$out/share/emacs/site-lisp" ]; preInstall = "mkdir -p $out/info"; installTargets = "install-pkg texinfo"; postInstall = '' diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index c173684fab4cd1bbc303e98f88b51f48c1e64cf9..091635feda6faba87380ea5a1458f169766255dc 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix index 673b590f56eb8322c47131225f8e1003ec7f8d48..aed976051f2012435ac65e2bdc5066ee5fc86556 100644 --- a/pkgs/applications/editors/emacs-modes/cask/default.nix +++ b/pkgs/applications/editors/emacs-modes/cask/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, emacs, python }: stdenv.mkDerivation rec { - version = "0.8.1"; + version = "0.8.4"; name = "cask-${version}"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; rev = "v${version}"; - sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b"; + sha256 = "1p37lq8xpyq0rc7phxgsw3b73h8vf9rkpa5959rb5k46w6ps9686"; }; buildInputs = [ emacs python ]; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index b550f31ff99b55f68013602e0f82fef82d3ddb92..146e4128f7d0f23043f04317e9b10bba297f2ee2 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -1,6 +1,9 @@ -{ callPackage }: { - ace-window = callPackage ({ avy, elpaBuild, fetchurl, lib }: elpaBuild { +{ callPackage }: + { + ace-window = callPackage ({ avy, elpaBuild, fetchurl, lib }: + elpaBuild { pname = "ace-window"; + ename = "ace-window"; version = "0.9.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/ace-window-0.9.0.el"; @@ -12,8 +15,10 @@ license = lib.licenses.free; }; }) {}; - ack = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + ack = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "ack"; + ename = "ack"; version = "1.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/ack-1.5.tar"; @@ -25,9 +30,15 @@ license = lib.licenses.free; }; }) {}; - ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }: - elpaBuild { + ada-mode = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib + , wisi }: + elpaBuild { pname = "ada-mode"; + ename = "ada-mode"; version = "5.3.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/ada-mode-5.3.1.tar"; @@ -39,8 +50,10 @@ license = lib.licenses.free; }; }) {}; - ada-ref-man = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + ada-ref-man = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "ada-ref-man"; + ename = "ada-ref-man"; version = "2012.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/ada-ref-man-2012.3.tar"; @@ -52,8 +65,10 @@ license = lib.licenses.free; }; }) {}; - adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "adaptive-wrap"; + ename = "adaptive-wrap"; version = "0.5.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.2.el"; @@ -65,8 +80,10 @@ license = lib.licenses.free; }; }) {}; - adjust-parens = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + adjust-parens = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "adjust-parens"; + ename = "adjust-parens"; version = "3.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/adjust-parens-3.0.tar"; @@ -78,9 +95,14 @@ license = lib.licenses.free; }; }) {}; - aggressive-indent = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + aggressive-indent = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { pname = "aggressive-indent"; + ename = "aggressive-indent"; version = "1.8.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/aggressive-indent-1.8.3.el"; @@ -93,8 +115,9 @@ }; }) {}; ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "ahungry-theme"; + ename = "ahungry-theme"; version = "1.10.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/ahungry-theme-1.10.0.tar"; @@ -106,8 +129,10 @@ license = lib.licenses.free; }; }) {}; - all = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + all = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "all"; + ename = "all"; version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/all-1.0.el"; @@ -119,8 +144,10 @@ license = lib.licenses.free; }; }) {}; - ampc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + ampc = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "ampc"; + ename = "ampc"; version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/ampc-0.2.el"; @@ -133,12 +160,13 @@ }; }) {}; arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "arbitools"; - version = "0.94"; + ename = "arbitools"; + version = "0.95"; src = fetchurl { - url = "https://elpa.gnu.org/packages/arbitools-0.94.el"; - sha256 = "00iq8rr1275p48ic5mibcx657li723q8r7ax4g21w6bzwsj3gksd"; + url = "https://elpa.gnu.org/packages/arbitools-0.95.el"; + sha256 = "1v6i9d35xqag9a8j12n3xjircwzndjwgb84qm7rsgbns60v3ci8y"; }; packageRequires = [ cl-lib ]; meta = { @@ -147,12 +175,13 @@ }; }) {}; ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "ascii-art-to-unicode"; - version = "1.11"; + ename = "ascii-art-to-unicode"; + version = "1.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.11.el"; - sha256 = "1z1vjpskvhynja41cv5z6xrz3rmpdzz51avv2gzrpxxa4k6iaz8s"; + url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.12.el"; + sha256 = "1w9h2lyriafxj71r79774gh822cz8mry3gdfzyj6ym6v9mvqypna"; }; packageRequires = []; meta = { @@ -160,8 +189,10 @@ license = lib.licenses.free; }; }) {}; - async = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + async = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "async"; + ename = "async"; version = "1.9.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/async-1.9.2.tar"; @@ -173,8 +204,10 @@ license = lib.licenses.free; }; }) {}; - auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + auctex = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "auctex"; + ename = "auctex"; version = "12.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/auctex-12.1.1.tar"; @@ -186,8 +219,10 @@ license = lib.licenses.free; }; }) {}; - aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "aumix-mode"; + ename = "aumix-mode"; version = "7"; src = fetchurl { url = "https://elpa.gnu.org/packages/aumix-mode-7.el"; @@ -199,12 +234,14 @@ license = lib.licenses.free; }; }) {}; - auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "auto-correct"; - version = "1.1.3"; + ename = "auto-correct"; + version = "1.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auto-correct-1.1.3.el"; - sha256 = "09r58p8na1ai2v9zllb92lvsjlq2jfzwvj0ipck1py0i4xfsm7aq"; + url = "https://elpa.gnu.org/packages/auto-correct-1.1.4.el"; + sha256 = "1ml35l6lk4sf51sh6cal1ylsn61iddz0s01wwly199i3nim0qnw8"; }; packageRequires = []; meta = { @@ -212,8 +249,10 @@ license = lib.licenses.free; }; }) {}; - auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "auto-overlays"; + ename = "auto-overlays"; version = "0.10.9"; src = fetchurl { url = "https://elpa.gnu.org/packages/auto-overlays-0.10.9.tar"; @@ -226,8 +265,9 @@ }; }) {}; avy = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "avy"; + ename = "avy"; version = "0.4.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/avy-0.4.0.tar"; @@ -239,8 +279,10 @@ license = lib.licenses.free; }; }) {}; - bbdb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + bbdb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "bbdb"; + ename = "bbdb"; version = "3.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/bbdb-3.2.tar"; @@ -252,8 +294,10 @@ license = lib.licenses.free; }; }) {}; - beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild { + beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: + elpaBuild { pname = "beacon"; + ename = "beacon"; version = "1.3.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/beacon-1.3.3.el"; @@ -266,8 +310,9 @@ }; }) {}; bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }: - elpaBuild { + elpaBuild { pname = "bug-hunter"; + ename = "bug-hunter"; version = "1.3.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/bug-hunter-1.3.1.el"; @@ -279,8 +324,10 @@ license = lib.licenses.free; }; }) {}; - caps-lock = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + caps-lock = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "caps-lock"; + ename = "caps-lock"; version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/caps-lock-1.0.el"; @@ -292,8 +339,10 @@ license = lib.licenses.free; }; }) {}; - captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + captain = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "captain"; + ename = "captain"; version = "1.0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/captain-1.0.3.el"; @@ -306,8 +355,9 @@ }; }) {}; chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "chess"; + ename = "chess"; version = "2.0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/chess-2.0.4.tar"; @@ -319,8 +369,10 @@ license = lib.licenses.free; }; }) {}; - cl-generic = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + cl-generic = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "cl-generic"; + ename = "cl-generic"; version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/cl-generic-0.3.el"; @@ -332,8 +384,10 @@ license = lib.licenses.free; }; }) {}; - cl-lib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + cl-lib = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "cl-lib"; + ename = "cl-lib"; version = "0.6.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/cl-lib-0.6.1.el"; @@ -345,8 +399,10 @@ license = lib.licenses.free; }; }) {}; - cl-print = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + cl-print = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "cl-print"; + ename = "cl-print"; version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/cl-print-1.0.el"; @@ -359,8 +415,9 @@ }; }) {}; cobol-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "cobol-mode"; + ename = "cobol-mode"; version = "1.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/cobol-mode-1.0.0.el"; @@ -372,8 +429,10 @@ license = lib.licenses.free; }; }) {}; - coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "coffee-mode"; + ename = "coffee-mode"; version = "0.4.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/coffee-mode-0.4.1.1.el"; @@ -385,8 +444,10 @@ license = lib.licenses.free; }; }) {}; - compact-docstrings = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + compact-docstrings = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "compact-docstrings"; + ename = "compact-docstrings"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/compact-docstrings-0.1.el"; @@ -398,8 +459,10 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "company"; + ename = "company"; version = "0.9.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/company-0.9.6.tar"; @@ -412,8 +475,9 @@ }; }) {}; company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "company-ebdb"; + ename = "company-ebdb"; version = "1"; src = fetchurl { url = "https://elpa.gnu.org/packages/company-ebdb-1.el"; @@ -425,9 +489,14 @@ license = lib.licenses.free; }; }) {}; - company-math = callPackage ({ company, elpaBuild, fetchurl, lib, math-symbol-lists }: - elpaBuild { + company-math = callPackage ({ company + , elpaBuild + , fetchurl + , lib + , math-symbol-lists }: + elpaBuild { pname = "company-math"; + ename = "company-math"; version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/company-math-1.1.tar"; @@ -439,9 +508,14 @@ license = lib.licenses.free; }; }) {}; - company-statistics = callPackage ({ company, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + company-statistics = callPackage ({ company + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { pname = "company-statistics"; + ename = "company-statistics"; version = "0.2.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/company-statistics-0.2.3.tar"; @@ -454,8 +528,9 @@ }; }) {}; context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "context-coloring"; + ename = "context-coloring"; version = "8.1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/context-coloring-8.1.0.tar"; @@ -468,8 +543,9 @@ }; }) {}; counsel-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, ivy, lib }: - elpaBuild { + elpaBuild { pname = "counsel-ebdb"; + ename = "counsel-ebdb"; version = "1"; src = fetchurl { url = "https://elpa.gnu.org/packages/counsel-ebdb-1.el"; @@ -481,8 +557,10 @@ license = lib.licenses.free; }; }) {}; - crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + crisp = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "crisp"; + ename = "crisp"; version = "1.3.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/crisp-1.3.4.el"; @@ -494,8 +572,10 @@ license = lib.licenses.free; }; }) {}; - csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "csv-mode"; + ename = "csv-mode"; version = "1.7"; src = fetchurl { url = "https://elpa.gnu.org/packages/csv-mode-1.7.el"; @@ -507,8 +587,10 @@ license = lib.licenses.free; }; }) {}; - cycle-quotes = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + cycle-quotes = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "cycle-quotes"; + ename = "cycle-quotes"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/cycle-quotes-0.1.tar"; @@ -521,8 +603,9 @@ }; }) {}; darkroom = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "darkroom"; + ename = "darkroom"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/darkroom-0.1.el"; @@ -534,8 +617,10 @@ license = lib.licenses.free; }; }) {}; - dash = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + dash = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "dash"; + ename = "dash"; version = "2.12.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/dash-2.12.0.tar"; @@ -548,8 +633,9 @@ }; }) {}; dbus-codegen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "dbus-codegen"; + ename = "dbus-codegen"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/dbus-codegen-0.1.el"; @@ -561,9 +647,14 @@ license = lib.licenses.free; }; }) {}; - debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }: - elpaBuild { + debbugs = callPackage ({ cl-lib ? null + , elpaBuild + , fetchurl + , lib + , soap-client }: + elpaBuild { pname = "debbugs"; + ename = "debbugs"; version = "0.15"; src = fetchurl { url = "https://elpa.gnu.org/packages/debbugs-0.15.tar"; @@ -575,8 +666,10 @@ license = lib.licenses.free; }; }) {}; - delight = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + delight = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "delight"; + ename = "delight"; version = "1.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/delight-1.5.el"; @@ -589,8 +682,9 @@ }; }) {}; dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }: - elpaBuild { + elpaBuild { pname = "dict-tree"; + ename = "dict-tree"; version = "0.14"; src = fetchurl { url = "https://elpa.gnu.org/packages/dict-tree-0.14.el"; @@ -603,8 +697,9 @@ }; }) {}; diff-hl = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "diff-hl"; + ename = "diff-hl"; version = "1.8.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/diff-hl-1.8.4.tar"; @@ -616,8 +711,10 @@ license = lib.licenses.free; }; }) {}; - diffview = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + diffview = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "diffview"; + ename = "diffview"; version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/diffview-1.0.el"; @@ -630,8 +727,9 @@ }; }) {}; dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "dired-du"; + ename = "dired-du"; version = "0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/dired-du-0.5.tar"; @@ -644,8 +742,9 @@ }; }) {}; dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "dismal"; + ename = "dismal"; version = "1.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/dismal-1.5.tar"; @@ -657,8 +756,10 @@ license = lib.licenses.free; }; }) {}; - djvu = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + djvu = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "djvu"; + ename = "djvu"; version = "0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/djvu-0.5.el"; @@ -670,8 +771,10 @@ license = lib.licenses.free; }; }) {}; - docbook = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + docbook = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "docbook"; + ename = "docbook"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/docbook-0.1.el"; @@ -683,8 +786,10 @@ license = lib.licenses.free; }; }) {}; - dts-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + dts-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "dts-mode"; + ename = "dts-mode"; version = "0.1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/dts-mode-0.1.0.el"; @@ -697,8 +802,9 @@ }; }) {}; easy-kill = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "easy-kill"; + ename = "easy-kill"; version = "0.9.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/easy-kill-0.9.3.tar"; @@ -711,12 +817,13 @@ }; }) {}; ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: - elpaBuild { + elpaBuild { pname = "ebdb"; - version = "0.5"; + ename = "ebdb"; + version = "0.5.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.5.tar"; - sha256 = "1apsb08ml50nacqa6i86zwa2xxdfqry380bksp16zv63cj86b67g"; + url = "https://elpa.gnu.org/packages/ebdb-0.5.4.tar"; + sha256 = "1dripbiwplyjalzmkr8awaimhkp9f6c2bhnm3c77027k2b87w4lf"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -725,8 +832,9 @@ }; }) {}; ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }: - elpaBuild { + elpaBuild { pname = "ebdb-gnorb"; + ename = "ebdb-gnorb"; version = "1.0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.el"; @@ -739,8 +847,9 @@ }; }) {}; ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }: - elpaBuild { + elpaBuild { pname = "ebdb-i18n-chn"; + ename = "ebdb-i18n-chn"; version = "1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.2.el"; @@ -752,8 +861,10 @@ license = lib.licenses.free; }; }) {}; - ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "ediprolog"; + ename = "ediprolog"; version = "1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/ediprolog-1.2.el"; @@ -765,13 +876,34 @@ license = lib.licenses.free; }; }) {}; - el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }: - elpaBuild { + eglot = callPackage ({ elpaBuild, emacs, fetchurl, jsonrpc, lib }: + elpaBuild { + pname = "eglot"; + ename = "eglot"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/eglot-1.1.tar"; + sha256 = "01h4wh87lrd9l50y20gjjkgg760v8ixvbcb3q8jykl29989zw62y"; + }; + packageRequires = [ emacs jsonrpc ]; + meta = { + homepage = "https://elpa.gnu.org/packages/eglot.html"; + license = lib.licenses.free; + }; + }) {}; + el-search = callPackage ({ cl-print + , elpaBuild + , emacs + , fetchurl + , lib + , stream }: + elpaBuild { pname = "el-search"; - version = "1.6.3"; + ename = "el-search"; + version = "1.7.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.6.3.tar"; - sha256 = "1yd8qlq95fb5qfmg3m16i9d5nsmkkgr12q0981r5ng06pc0j4al6"; + url = "https://elpa.gnu.org/packages/el-search-1.7.3.tar"; + sha256 = "0nxjgi027mjjn53nm9ara4nyr7kyqjawsmfaygsxqjv0mbykjmd1"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -779,8 +911,10 @@ license = lib.licenses.free; }; }) {}; - eldoc-eval = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + eldoc-eval = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "eldoc-eval"; + ename = "eldoc-eval"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/eldoc-eval-0.1.el"; @@ -792,8 +926,10 @@ license = lib.licenses.free; }; }) {}; - electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "electric-spacing"; + ename = "electric-spacing"; version = "5.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/electric-spacing-5.0.el"; @@ -805,8 +941,10 @@ license = lib.licenses.free; }; }) {}; - enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "enwc"; + ename = "enwc"; version = "2.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/enwc-2.0.tar"; @@ -818,8 +956,10 @@ license = lib.licenses.free; }; }) {}; - epoch-view = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + epoch-view = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "epoch-view"; + ename = "epoch-view"; version = "0.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/epoch-view-0.0.1.el"; @@ -831,9 +971,14 @@ license = lib.licenses.free; }; }) {}; - ergoemacs-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, undo-tree }: - elpaBuild { + ergoemacs-mode = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , undo-tree }: + elpaBuild { pname = "ergoemacs-mode"; + ename = "ergoemacs-mode"; version = "5.14.7.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/ergoemacs-mode-5.14.7.3.tar"; @@ -845,9 +990,16 @@ license = lib.licenses.free; }; }) {}; - excorporate = callPackage ({ elpaBuild, emacs, fetchurl, fsm, lib, soap-client, url-http-ntlm }: - elpaBuild { + excorporate = callPackage ({ elpaBuild + , emacs + , fetchurl + , fsm + , lib + , soap-client + , url-http-ntlm }: + elpaBuild { pname = "excorporate"; + ename = "excorporate"; version = "0.7.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/excorporate-0.7.6.tar"; @@ -859,12 +1011,14 @@ license = lib.licenses.free; }; }) {}; - exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { + exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: + elpaBuild { pname = "exwm"; - version = "0.18"; + ename = "exwm"; + version = "0.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.18.tar"; - sha256 = "1shz5bf4v4gg3arjaaldics5qkg3aiiaf3ngys8lb6qyxhcpvh6q"; + url = "https://elpa.gnu.org/packages/exwm-0.19.tar"; + sha256 = "11xd2w4h3zdwkdxypvmcz8s7q72cn76lfr9js77jbizyj6b04lr0"; }; packageRequires = [ xelb ]; meta = { @@ -873,8 +1027,9 @@ }; }) {}; f90-interface-browser = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "f90-interface-browser"; + ename = "f90-interface-browser"; version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/f90-interface-browser-1.1.el"; @@ -886,9 +1041,25 @@ license = lib.licenses.free; }; }) {}; + filladapt = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "filladapt"; + ename = "filladapt"; + version = "2.12.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/filladapt-2.12.2.el"; + sha256 = "1cxyxfdjg1dsmn1jrl6b7xy03xr42fb6vyggh27s4dk417ils6yg"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/filladapt.html"; + license = lib.licenses.free; + }; + }) {}; flylisp = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "flylisp"; + ename = "flylisp"; version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/flylisp-0.2.el"; @@ -900,9 +1071,25 @@ license = lib.licenses.free; }; }) {}; + frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "frame-tabs"; + ename = "frame-tabs"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/frame-tabs-1.1.el"; + sha256 = "0fx9zc7mvyl703k7sjjcvffm2qw42ncr7r3d4fm0h45p9pi83svz"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/frame-tabs.html"; + license = lib.licenses.free; + }; + }) {}; fsm = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "fsm"; + ename = "fsm"; version = "0.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/fsm-0.2.1.el"; @@ -915,8 +1102,9 @@ }; }) {}; ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "ggtags"; + ename = "ggtags"; version = "0.8.12"; src = fetchurl { url = "https://elpa.gnu.org/packages/ggtags-0.8.12.el"; @@ -929,12 +1117,13 @@ }; }) {}; gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "gited"; - version = "0.4.1"; + ename = "gited"; + version = "0.5.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.4.1.tar"; - sha256 = "0080jcr10xvvf2rl7ar01c6zmzd0pafrs6w2l8v4cwwapyhv0dcd"; + url = "https://elpa.gnu.org/packages/gited-0.5.3.tar"; + sha256 = "1bayfclczdzrmay8swszs8lliz5p4nnmjzzz2gh68rc16isjgh2z"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -943,8 +1132,9 @@ }; }) {}; gle-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "gle-mode"; + ename = "gle-mode"; version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/gle-mode-1.1.el"; @@ -956,8 +1146,10 @@ license = lib.licenses.free; }; }) {}; - gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "gnome-c-style"; + ename = "gnome-c-style"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/gnome-c-style-0.1.tar"; @@ -970,12 +1162,13 @@ }; }) {}; gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "gnorb"; - version = "1.4.2"; + ename = "gnorb"; + version = "1.5.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.4.2.tar"; - sha256 = "1892j8gdbcny6b9psxa1lwxsb1gkj9z9z00rfc62kdw8bffmx38y"; + url = "https://elpa.gnu.org/packages/gnorb-1.5.5.tar"; + sha256 = "02l9snarsnzwp9w284wiylbd596g0f9bmahb1nybr14vh64ygh3r"; }; packageRequires = [ cl-lib ]; meta = { @@ -983,9 +1176,15 @@ license = lib.licenses.free; }; }) {}; - gnugo = callPackage ({ ascii-art-to-unicode, cl-lib ? null, elpaBuild, fetchurl, lib, xpm }: - elpaBuild { + gnugo = callPackage ({ ascii-art-to-unicode + , cl-lib ? null + , elpaBuild + , fetchurl + , lib + , xpm }: + elpaBuild { pname = "gnugo"; + ename = "gnugo"; version = "3.1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/gnugo-3.1.0.tar"; @@ -997,8 +1196,10 @@ license = lib.licenses.free; }; }) {}; - heap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + heap = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "heap"; + ename = "heap"; version = "0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/heap-0.5.el"; @@ -1011,8 +1212,9 @@ }; }) {}; helm-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, helm, lib }: - elpaBuild { + elpaBuild { pname = "helm-ebdb"; + ename = "helm-ebdb"; version = "1"; src = fetchurl { url = "https://elpa.gnu.org/packages/helm-ebdb-1.el"; @@ -1024,9 +1226,12 @@ license = lib.licenses.free; }; }) {}; - highlight-escape-sequences = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { + highlight-escape-sequences = callPackage ({ elpaBuild + , fetchurl + , lib }: + elpaBuild { pname = "highlight-escape-sequences"; + ename = "highlight-escape-sequences"; version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.3.el"; @@ -1038,8 +1243,10 @@ license = lib.licenses.free; }; }) {}; - hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "hook-helpers"; + ename = "hook-helpers"; version = "1.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar"; @@ -1051,8 +1258,10 @@ license = lib.licenses.free; }; }) {}; - html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "html5-schema"; + ename = "html5-schema"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar"; @@ -1065,8 +1274,9 @@ }; }) {}; hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "hydra"; + ename = "hydra"; version = "0.14.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/hydra-0.14.0.tar"; @@ -1078,8 +1288,10 @@ license = lib.licenses.free; }; }) {}; - hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "hyperbole"; + ename = "hyperbole"; version = "7.0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/hyperbole-7.0.2.tar"; @@ -1091,8 +1303,10 @@ license = lib.licenses.free; }; }) {}; - ioccur = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + ioccur = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "ioccur"; + ename = "ioccur"; version = "2.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/ioccur-2.4.el"; @@ -1104,8 +1318,10 @@ license = lib.licenses.free; }; }) {}; - iterators = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + iterators = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "iterators"; + ename = "iterators"; version = "0.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/iterators-0.1.1.el"; @@ -1117,8 +1333,10 @@ license = lib.licenses.free; }; }) {}; - ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "ivy"; + ename = "ivy"; version = "0.10.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/ivy-0.10.0.tar"; @@ -1130,8 +1348,10 @@ license = lib.licenses.free; }; }) {}; - javaimp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + javaimp = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "javaimp"; + ename = "javaimp"; version = "0.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/javaimp-0.6.tar"; @@ -1144,8 +1364,9 @@ }; }) {}; jgraph-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "jgraph-mode"; + ename = "jgraph-mode"; version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/jgraph-mode-1.1.el"; @@ -1158,8 +1379,9 @@ }; }) {}; js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "js2-mode"; + ename = "js2-mode"; version = "20180301"; src = fetchurl { url = "https://elpa.gnu.org/packages/js2-mode-20180301.tar"; @@ -1171,8 +1393,10 @@ license = lib.licenses.free; }; }) {}; - json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "json-mode"; + ename = "json-mode"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/json-mode-0.1.el"; @@ -1184,8 +1408,25 @@ license = lib.licenses.free; }; }) {}; - jumpc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + jsonrpc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "jsonrpc"; + ename = "jsonrpc"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.0.el"; + sha256 = "06lmmn7j2ilkvwibbpgnd8p6d63fjjnxd2ma8f4jw6vrz1f7lwvs"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/jsonrpc.html"; + license = lib.licenses.free; + }; + }) {}; + jumpc = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "jumpc"; + ename = "jumpc"; version = "3.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/jumpc-3.0.el"; @@ -1197,8 +1438,10 @@ license = lib.licenses.free; }; }) {}; - kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "kmb"; + ename = "kmb"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/kmb-0.1.el"; @@ -1210,8 +1453,10 @@ license = lib.licenses.free; }; }) {}; - landmark = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + landmark = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "landmark"; + ename = "landmark"; version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/landmark-1.0.el"; @@ -1223,8 +1468,10 @@ license = lib.licenses.free; }; }) {}; - let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "let-alist"; + ename = "let-alist"; version = "1.0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/let-alist-1.0.5.el"; @@ -1236,8 +1483,10 @@ license = lib.licenses.free; }; }) {}; - lex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + lex = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "lex"; + ename = "lex"; version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/lex-1.1.tar"; @@ -1250,8 +1499,9 @@ }; }) {}; lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "lmc"; + ename = "lmc"; version = "1.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/lmc-1.4.el"; @@ -1264,8 +1514,9 @@ }; }) {}; load-dir = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "load-dir"; + ename = "load-dir"; version = "0.0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/load-dir-0.0.5.el"; @@ -1277,8 +1528,10 @@ license = lib.licenses.free; }; }) {}; - load-relative = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + load-relative = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "load-relative"; + ename = "load-relative"; version = "1.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/load-relative-1.3.el"; @@ -1290,8 +1543,10 @@ license = lib.licenses.free; }; }) {}; - loc-changes = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + loc-changes = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "loc-changes"; + ename = "loc-changes"; version = "1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/loc-changes-1.2.el"; @@ -1304,8 +1559,9 @@ }; }) {}; loccur = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "loccur"; + ename = "loccur"; version = "1.2.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/loccur-1.2.3.el"; @@ -1317,8 +1573,10 @@ license = lib.licenses.free; }; }) {}; - markchars = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + markchars = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "markchars"; + ename = "markchars"; version = "0.2.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/markchars-0.2.0.el"; @@ -1330,8 +1588,10 @@ license = lib.licenses.free; }; }) {}; - math-symbol-lists = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + math-symbol-lists = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "math-symbol-lists"; + ename = "math-symbol-lists"; version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/math-symbol-lists-1.1.tar"; @@ -1343,8 +1603,10 @@ license = lib.licenses.free; }; }) {}; - memory-usage = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + memory-usage = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "memory-usage"; + ename = "memory-usage"; version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/memory-usage-0.2.el"; @@ -1357,8 +1619,9 @@ }; }) {}; metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "metar"; + ename = "metar"; version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/metar-0.3.el"; @@ -1370,8 +1633,10 @@ license = lib.licenses.free; }; }) {}; - midi-kbd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + midi-kbd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "midi-kbd"; + ename = "midi-kbd"; version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/midi-kbd-0.2.el"; @@ -1384,8 +1649,9 @@ }; }) {}; mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "mines"; + ename = "mines"; version = "1.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/mines-1.6.tar"; @@ -1397,8 +1663,10 @@ license = lib.licenses.free; }; }) {}; - minibuffer-line = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + minibuffer-line = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "minibuffer-line"; + ename = "minibuffer-line"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/minibuffer-line-0.1.el"; @@ -1410,8 +1678,10 @@ license = lib.licenses.free; }; }) {}; - minimap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + minimap = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "minimap"; + ename = "minimap"; version = "1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/minimap-1.2.el"; @@ -1424,12 +1694,13 @@ }; }) {}; mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "mmm-mode"; - version = "0.5.6"; + ename = "mmm-mode"; + version = "0.5.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mmm-mode-0.5.6.tar"; - sha256 = "1vwsi8sk1i16dvz940c6q7i75023hrw07sc4cpmcz06rj8r68gr0"; + url = "https://elpa.gnu.org/packages/mmm-mode-0.5.7.tar"; + sha256 = "0c4azrkgagyfm9znh7hmw93gkvddpsxlr0dwjp96winymih7mahf"; }; packageRequires = [ cl-lib ]; meta = { @@ -1438,8 +1709,9 @@ }; }) {}; multishell = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "multishell"; + ename = "multishell"; version = "1.1.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/multishell-1.1.5.tar"; @@ -1451,8 +1723,10 @@ license = lib.licenses.free; }; }) {}; - muse = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + muse = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "muse"; + ename = "muse"; version = "3.20.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/muse-3.20.2.tar"; @@ -1464,8 +1738,10 @@ license = lib.licenses.free; }; }) {}; - myers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + myers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "myers"; + ename = "myers"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/myers-0.1.el"; @@ -1477,8 +1753,10 @@ license = lib.licenses.free; }; }) {}; - nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "nameless"; + ename = "nameless"; version = "1.0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/nameless-1.0.2.el"; @@ -1491,8 +1769,9 @@ }; }) {}; names = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "names"; + ename = "names"; version = "20151201.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/names-20151201.0.tar"; @@ -1504,13 +1783,18 @@ license = lib.licenses.free; }; }) {}; - nhexl-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + nhexl-mode = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { pname = "nhexl-mode"; - version = "0.2"; + ename = "nhexl-mode"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nhexl-mode-0.2.el"; - sha256 = "0qrzpkxxdwi2b3136yj5agvaxwr9g2c58kpmjmjpfhpc6yyyx5x0"; + url = "https://elpa.gnu.org/packages/nhexl-mode-0.9.el"; + sha256 = "1xdr0z5nlfqsyrmj3cwgfp6qlirhr46ggawr7pr2ipnp64wgnmkc"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1518,8 +1802,10 @@ license = lib.licenses.free; }; }) {}; - nlinum = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + nlinum = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "nlinum"; + ename = "nlinum"; version = "1.8.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/nlinum-1.8.1.el"; @@ -1531,8 +1817,10 @@ license = lib.licenses.free; }; }) {}; - notes-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + notes-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "notes-mode"; + ename = "notes-mode"; version = "1.30"; src = fetchurl { url = "https://elpa.gnu.org/packages/notes-mode-1.30.tar"; @@ -1544,8 +1832,10 @@ license = lib.licenses.free; }; }) {}; - ntlm = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + ntlm = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "ntlm"; + ename = "ntlm"; version = "2.1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/ntlm-2.1.0.el"; @@ -1557,8 +1847,10 @@ license = lib.licenses.free; }; }) {}; - num3-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + num3-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "num3-mode"; + ename = "num3-mode"; version = "1.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/num3-mode-1.3.el"; @@ -1570,8 +1862,10 @@ license = lib.licenses.free; }; }) {}; - oauth2 = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + oauth2 = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "oauth2"; + ename = "oauth2"; version = "0.11"; src = fetchurl { url = "https://elpa.gnu.org/packages/oauth2-0.11.el"; @@ -1583,8 +1877,10 @@ license = lib.licenses.free; }; }) {}; - omn-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + omn-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "omn-mode"; + ename = "omn-mode"; version = "1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/omn-mode-1.2.el"; @@ -1597,8 +1893,9 @@ }; }) {}; on-screen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "on-screen"; + ename = "on-screen"; version = "1.3.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/on-screen-1.3.2.el"; @@ -1610,12 +1907,14 @@ license = lib.licenses.free; }; }) {}; - org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + org = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "org"; - version = "9.1.9"; + ename = "org"; + version = "9.1.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.1.9.tar"; - sha256 = "16yr0srfzsrzv2b1f2wjk8gb2pyhsgj2hxbscixirkxqz674c5cl"; + url = "https://elpa.gnu.org/packages/org-9.1.13.tar"; + sha256 = "1vx0n32gvrgy2bl2b4pvxf00cywxwm57gi46f2b2zlrnmd5n85pr"; }; packageRequires = []; meta = { @@ -1623,8 +1922,25 @@ license = lib.licenses.free; }; }) {}; - osc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "orgalist"; + ename = "orgalist"; + version = "1.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/orgalist-1.8.el"; + sha256 = "1wqwnmn08i0qkxm8b2iclvf6cydcn68h1p3h7r1kig2bdn5b8948"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/orgalist.html"; + license = lib.licenses.free; + }; + }) {}; + osc = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "osc"; + ename = "osc"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/osc-0.1.el"; @@ -1637,8 +1953,9 @@ }; }) {}; other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "other-frame-window"; + ename = "other-frame-window"; version = "1.0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/other-frame-window-1.0.4.el"; @@ -1650,8 +1967,10 @@ license = lib.licenses.free; }; }) {}; - pabbrev = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pabbrev = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "pabbrev"; + ename = "pabbrev"; version = "4.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/pabbrev-4.2.1.el"; @@ -1663,8 +1982,10 @@ license = lib.licenses.free; }; }) {}; - paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { + paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "paced"; + ename = "paced"; version = "1.1.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/paced-1.1.3.tar"; @@ -1677,8 +1998,9 @@ }; }) {}; parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "parsec"; + ename = "parsec"; version = "0.1.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/parsec-0.1.3.tar"; @@ -1690,8 +2012,10 @@ license = lib.licenses.free; }; }) {}; - pinentry = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pinentry = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "pinentry"; + ename = "pinentry"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/pinentry-0.1.el"; @@ -1703,8 +2027,10 @@ license = lib.licenses.free; }; }) {}; - poker = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + poker = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "poker"; + ename = "poker"; version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/poker-0.2.el"; @@ -1716,8 +2042,10 @@ license = lib.licenses.free; }; }) {}; - posframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + posframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "posframe"; + ename = "posframe"; version = "0.3.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/posframe-0.3.0.el"; @@ -1729,8 +2057,10 @@ license = lib.licenses.free; }; }) {}; - psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + psgml = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "psgml"; + ename = "psgml"; version = "1.3.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar"; @@ -1743,8 +2073,9 @@ }; }) {}; python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "python"; + ename = "python"; version = "0.26.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/python-0.26.1.el"; @@ -1756,8 +2087,10 @@ license = lib.licenses.free; }; }) {}; - quarter-plane = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + quarter-plane = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "quarter-plane"; + ename = "quarter-plane"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/quarter-plane-0.1.el"; @@ -1769,8 +2102,10 @@ license = lib.licenses.free; }; }) {}; - queue = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + queue = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "queue"; + ename = "queue"; version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/queue-0.2.el"; @@ -1782,12 +2117,14 @@ license = lib.licenses.free; }; }) {}; - rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "rainbow-mode"; - version = "1.0"; + ename = "rainbow-mode"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.el"; - sha256 = "1mg9dbgvg79sphpic56d11mrjwx668xffx5z5jszc9fdl5b8ygml"; + url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.1.el"; + sha256 = "0cpga4ax635rfpj7y2vmh7ank0yw00dcy20gjg1mj74r97by8csf"; }; packageRequires = []; meta = { @@ -1795,8 +2132,10 @@ license = lib.licenses.free; }; }) {}; - rbit = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + rbit = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "rbit"; + ename = "rbit"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/rbit-0.1.el"; @@ -1808,8 +2147,10 @@ license = lib.licenses.free; }; }) {}; - rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "rcirc-color"; + ename = "rcirc-color"; version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/rcirc-color-0.3.el"; @@ -1821,8 +2162,10 @@ license = lib.licenses.free; }; }) {}; - rcirc-menu = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + rcirc-menu = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "rcirc-menu"; + ename = "rcirc-menu"; version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/rcirc-menu-1.1.el"; @@ -1834,9 +2177,17 @@ license = lib.licenses.free; }; }) {}; - realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }: - elpaBuild { + realgud = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib + , load-relative + , loc-changes + , test-simple }: + elpaBuild { pname = "realgud"; + ename = "realgud"; version = "1.4.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/realgud-1.4.5.tar"; @@ -1854,8 +2205,10 @@ license = lib.licenses.free; }; }) {}; - register-list = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + register-list = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "register-list"; + ename = "register-list"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/register-list-0.1.el"; @@ -1868,8 +2221,9 @@ }; }) {}; rich-minority = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "rich-minority"; + ename = "rich-minority"; version = "1.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/rich-minority-1.0.1.el"; @@ -1881,8 +2235,10 @@ license = lib.licenses.free; }; }) {}; - rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "rnc-mode"; + ename = "rnc-mode"; version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/rnc-mode-0.2.el"; @@ -1894,9 +2250,15 @@ license = lib.licenses.free; }; }) {}; - rudel = callPackage ({ cl-generic, cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + rudel = callPackage ({ cl-generic + , cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { pname = "rudel"; + ename = "rudel"; version = "0.3.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/rudel-0.3.1.tar"; @@ -1908,8 +2270,10 @@ license = lib.licenses.free; }; }) {}; - scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "scroll-restore"; + ename = "scroll-restore"; version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/scroll-restore-1.0.el"; @@ -1921,8 +2285,10 @@ license = lib.licenses.free; }; }) {}; - sed-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + sed-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "sed-mode"; + ename = "sed-mode"; version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/sed-mode-1.0.el"; @@ -1934,8 +2300,10 @@ license = lib.licenses.free; }; }) {}; - seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + seq = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "seq"; + ename = "seq"; version = "2.20"; src = fetchurl { url = "https://elpa.gnu.org/packages/seq-2.20.tar"; @@ -1947,8 +2315,10 @@ license = lib.licenses.free; }; }) {}; - shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "shen-mode"; + ename = "shen-mode"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/shen-mode-0.1.tar"; @@ -1960,8 +2330,10 @@ license = lib.licenses.free; }; }) {}; - sisu-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + sisu-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "sisu-mode"; + ename = "sisu-mode"; version = "7.1.8"; src = fetchurl { url = "https://elpa.gnu.org/packages/sisu-mode-7.1.8.el"; @@ -1973,8 +2345,10 @@ license = lib.licenses.free; }; }) {}; - smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "smart-yank"; + ename = "smart-yank"; version = "0.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/smart-yank-0.1.1.el"; @@ -1987,8 +2361,9 @@ }; }) {}; sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "sml-mode"; + ename = "sml-mode"; version = "6.8"; src = fetchurl { url = "https://elpa.gnu.org/packages/sml-mode-6.8.el"; @@ -2001,12 +2376,13 @@ }; }) {}; soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "soap-client"; - version = "3.1.3"; + ename = "soap-client"; + version = "3.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/soap-client-3.1.3.tar"; - sha256 = "1s5m6dc7z532wchdih2ax2a791khyajjxb2xaw5rklk47yc5v3nk"; + url = "https://elpa.gnu.org/packages/soap-client-3.1.4.tar"; + sha256 = "0q59abh2dmp7z0bcn672n9c2cfhg1xvxv1h9m9pwn97jw0ylf4mc"; }; packageRequires = [ cl-lib ]; meta = { @@ -2014,8 +2390,10 @@ license = lib.licenses.free; }; }) {}; - sokoban = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + sokoban = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "sokoban"; + ename = "sokoban"; version = "1.4.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/sokoban-1.4.6.tar"; @@ -2027,8 +2405,10 @@ license = lib.licenses.free; }; }) {}; - sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "sotlisp"; + ename = "sotlisp"; version = "1.6.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/sotlisp-1.6.2.el"; @@ -2040,8 +2420,10 @@ license = lib.licenses.free; }; }) {}; - spinner = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + spinner = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "spinner"; + ename = "spinner"; version = "1.7.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/spinner-1.7.3.el"; @@ -2053,21 +2435,25 @@ license = lib.licenses.free; }; }) {}; - sql-indent = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + sql-indent = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { pname = "sql-indent"; - version = "1.1"; + ename = "sql-indent"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-indent-1.1.tar"; - sha256 = "06q41msfir178f50nk8fnyc1rwgyq5iyy17pv8mq0zqbacjbp88z"; + url = "https://elpa.gnu.org/packages/sql-indent-1.2.tar"; + sha256 = "0rbkj46gkn1dh5avrhxzhkb01ajm9q3iqfp10lgp3f4w1m2bhab4"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://elpa.gnu.org/packages/sql-indent.html"; license = lib.licenses.free; }; }) {}; - stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "stream"; + ename = "stream"; version = "2.2.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/stream-2.2.4.tar"; @@ -2079,8 +2465,10 @@ license = lib.licenses.free; }; }) {}; - svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "svg"; + ename = "svg"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/svg-0.1.el"; @@ -2093,8 +2481,9 @@ }; }) {}; svg-clock = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg }: - elpaBuild { + elpaBuild { pname = "svg-clock"; + ename = "svg-clock"; version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/svg-clock-1.0.el"; @@ -2106,8 +2495,10 @@ license = lib.licenses.free; }; }) {}; - tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }: elpaBuild { + tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }: + elpaBuild { pname = "tNFA"; + ename = "tNFA"; version = "0.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/tNFA-0.1.1.el"; @@ -2120,8 +2511,9 @@ }; }) {}; temp-buffer-browse = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "temp-buffer-browse"; + ename = "temp-buffer-browse"; version = "1.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.5.el"; @@ -2134,8 +2526,9 @@ }; }) {}; test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "test-simple"; + ename = "test-simple"; version = "1.3.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/test-simple-1.3.0.el"; @@ -2148,8 +2541,9 @@ }; }) {}; timerfunctions = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "timerfunctions"; + ename = "timerfunctions"; version = "1.4.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/timerfunctions-1.4.2.el"; @@ -2161,8 +2555,10 @@ license = lib.licenses.free; }; }) {}; - tiny = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + tiny = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "tiny"; + ename = "tiny"; version = "0.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/tiny-0.2.1.tar"; @@ -2174,8 +2570,10 @@ license = lib.licenses.free; }; }) {}; - tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "tramp-theme"; + ename = "tramp-theme"; version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/tramp-theme-0.2.el"; @@ -2187,8 +2585,10 @@ license = lib.licenses.free; }; }) {}; - transcribe = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + transcribe = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "transcribe"; + ename = "transcribe"; version = "1.5.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/transcribe-1.5.2.el"; @@ -2200,8 +2600,10 @@ license = lib.licenses.free; }; }) {}; - trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }: elpaBuild { + trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }: + elpaBuild { pname = "trie"; + ename = "trie"; version = "0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/trie-0.4.el"; @@ -2213,8 +2615,10 @@ license = lib.licenses.free; }; }) {}; - undo-tree = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + undo-tree = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "undo-tree"; + ename = "undo-tree"; version = "0.6.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/undo-tree-0.6.5.el"; @@ -2226,8 +2630,10 @@ license = lib.licenses.free; }; }) {}; - uni-confusables = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + uni-confusables = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "uni-confusables"; + ename = "uni-confusables"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/uni-confusables-0.1.tar"; @@ -2239,9 +2645,14 @@ license = lib.licenses.free; }; }) {}; - url-http-ntlm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, ntlm ? null }: - elpaBuild { + url-http-ntlm = callPackage ({ cl-lib ? null + , elpaBuild + , fetchurl + , lib + , ntlm ? null }: + elpaBuild { pname = "url-http-ntlm"; + ename = "url-http-ntlm"; version = "2.0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.4.el"; @@ -2253,9 +2664,15 @@ license = lib.licenses.free; }; }) {}; - validate = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: - elpaBuild { + validate = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib + , seq }: + elpaBuild { pname = "validate"; + ename = "validate"; version = "1.0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/validate-1.0.4.el"; @@ -2267,8 +2684,10 @@ license = lib.licenses.free; }; }) {}; - vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }: elpaBuild { + vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }: + elpaBuild { pname = "vdiff"; + ename = "vdiff"; version = "0.2.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/vdiff-0.2.3.el"; @@ -2280,8 +2699,10 @@ license = lib.licenses.free; }; }) {}; - vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "vigenere"; + ename = "vigenere"; version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/vigenere-1.0.el"; @@ -2293,8 +2714,10 @@ license = lib.licenses.free; }; }) {}; - vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + vlf = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "vlf"; + ename = "vlf"; version = "1.7.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/vlf-1.7.1.tar"; @@ -2306,8 +2729,10 @@ license = lib.licenses.free; }; }) {}; - w3 = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + w3 = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "w3"; + ename = "w3"; version = "4.0.49"; src = fetchurl { url = "https://elpa.gnu.org/packages/w3-4.0.49.tar"; @@ -2319,8 +2744,10 @@ license = lib.licenses.free; }; }) {}; - wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "wcheck-mode"; + ename = "wcheck-mode"; version = "2016.1.30"; src = fetchurl { url = "https://elpa.gnu.org/packages/wcheck-mode-2016.1.30.el"; @@ -2332,8 +2759,10 @@ license = lib.licenses.free; }; }) {}; - wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "wconf"; + ename = "wconf"; version = "0.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/wconf-0.2.1.el"; @@ -2345,8 +2774,10 @@ license = lib.licenses.free; }; }) {}; - web-server = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + web-server = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "web-server"; + ename = "web-server"; version = "0.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/web-server-0.1.1.tar"; @@ -2359,8 +2790,9 @@ }; }) {}; websocket = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "websocket"; + ename = "websocket"; version = "1.8"; src = fetchurl { url = "https://elpa.gnu.org/packages/websocket-1.8.tar"; @@ -2372,12 +2804,14 @@ license = lib.licenses.free; }; }) {}; - which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "which-key"; - version = "3.1.0"; + ename = "which-key"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/which-key-3.1.0.tar"; - sha256 = "17n09i92m7qdicybxl60j81c8fn7jcx25wds0sb7j8i364psjabq"; + url = "https://elpa.gnu.org/packages/which-key-3.3.0.tar"; + sha256 = "0436hvqdn2jafgfwdr0m9mwz8k2swl661xnrkypyrwg66j9wi1qz"; }; packageRequires = [ emacs ]; meta = { @@ -2385,8 +2819,10 @@ license = lib.licenses.free; }; }) {}; - windresize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + windresize = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "windresize"; + ename = "windresize"; version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/windresize-0.1.el"; @@ -2399,8 +2835,9 @@ }; }) {}; wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "wisi"; + ename = "wisi"; version = "1.1.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/wisi-1.1.6.tar"; @@ -2412,8 +2849,10 @@ license = lib.licenses.free; }; }) {}; - wpuzzle = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + wpuzzle = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "wpuzzle"; + ename = "wpuzzle"; version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/wpuzzle-1.1.el"; @@ -2425,8 +2864,10 @@ license = lib.licenses.free; }; }) {}; - xclip = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + xclip = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "xclip"; + ename = "xclip"; version = "1.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/xclip-1.4.el"; @@ -2439,12 +2880,13 @@ }; }) {}; xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "xelb"; - version = "0.14"; + ename = "xelb"; + version = "0.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xelb-0.14.tar"; - sha256 = "09flnbjy9ck784kprz036rwg9qk45hpv0w5hz3pz3zhwyk57fv74"; + url = "https://elpa.gnu.org/packages/xelb-0.15.tar"; + sha256 = "031rvgprsqhf344p9wsczr50vj2qcpwdmhxi80jdbrsm7wyxf3qz"; }; packageRequires = [ cl-generic emacs ]; meta = { @@ -2452,8 +2894,10 @@ license = lib.licenses.free; }; }) {}; - xpm = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + xpm = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "xpm"; + ename = "xpm"; version = "1.0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/xpm-1.0.4.tar"; @@ -2466,12 +2910,13 @@ }; }) {}; yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "yasnippet"; - version = "0.12.2"; + ename = "yasnippet"; + version = "0.13.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/yasnippet-0.12.2.tar"; - sha256 = "03cilldgq7fpzk9ix2a8q1ppilxp5gvyrym7krifvrg1g2rs1qv9"; + url = "https://elpa.gnu.org/packages/yasnippet-0.13.0.tar"; + sha256 = "1klnvyy8az3h7i7yrpbhad4ka9p9vlgf918ha1vf7i3wbcbm0s5z"; }; packageRequires = [ cl-lib ]; meta = { @@ -2479,9 +2924,28 @@ license = lib.licenses.free; }; }) {}; + yasnippet-classic-snippets = callPackage ({ elpaBuild + , fetchurl + , lib + , yasnippet }: + elpaBuild { + pname = "yasnippet-classic-snippets"; + ename = "yasnippet-classic-snippets"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/yasnippet-classic-snippets-1.0.2.tar"; + sha256 = "1kk1sf9kgj6qp3z2d9nbswigl444sqq11pdrhx0gny2jsgi3283l"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://elpa.gnu.org/packages/yasnippet-classic-snippets.html"; + license = lib.licenses.free; + }; + }) {}; ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { + elpaBuild { pname = "ztree"; + ename = "ztree"; version = "1.0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/ztree-1.0.5.tar"; diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 0cea8f0a7316cd96d4e4f713fbbb2564fb6aaf93..26f4b791cc02608314cebac002a5eee05a955152 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -25,7 +25,7 @@ self: super = removeAttrs imported [ "dash" ]; elpaBuild = import ../../../build-support/emacs/elpa.nix { - inherit fetchurl lib stdenv texinfo; + inherit lib stdenv texinfo; inherit (self) emacs; }; diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index 9585f3278211d1f9a260e4bf6f571965f53a6e83..66ac9a3d77e688a6d011725f34819b7e1537d8e8 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchgit, llvmPackages, clang }: +{ clangStdenv, fetchgit, llvmPackages }: clangStdenv.mkDerivation { name = "emacs-clang-complete-async-20130218"; diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f37d2289342ae4fc4690c665c47c67b480e95257 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, cmake, emacs, libvterm-neovim }: + +let + emacsSources = stdenv.mkDerivation { + name = emacs.name + "-sources"; + src = emacs.src; + + configurePhase = ":"; + dontBuild = true; + doCheck = false; + fixupPhase = ":"; + + installPhase = '' + mkdir -p $out + cp -a * $out + ''; + + }; + +in stdenv.mkDerivation rec { + name = "emacs-libvterm-${version}"; + version = "unstable-2017-11-24"; + + src = fetchFromGitHub { + owner = "akermu"; + repo = "emacs-libvterm"; + rev = "829ae86f60c3a54048804997edffa161c77a2f4b"; + sha256 = "1xb24kpvypvskh4vr3b45nl2m2vsczcr9rnsr2sjzf32mnapyjnp"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ emacs libvterm-neovim ]; + + cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ]; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install ../*.el $out/share/emacs/site-lisp + install ../*.so $out/share/emacs/site-lisp + ''; +} diff --git a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix index 9a07b557325537f2b42ce1dfbac97c8c19e17421..ad22faf3dff72de577007254317d9c80d98501db 100644 --- a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix +++ b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, melpaBuild }: melpaBuild { pname = "filesets-plus"; @@ -10,7 +10,7 @@ melpaBuild { name = "filesets+.el"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets-plus+"; sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g"; name = "filesets-plus"; diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix index 733393307d3ff3e0f2714a2f289b857c18de7d9c..b4ee54f3bd31d212200bca5e6ab90e78b4aa8bc6 100644 --- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix +++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "font-lock-plus"; @@ -10,7 +10,7 @@ melpaBuild { name = "font-lock+.el"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+"; sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g"; name = "font-lock-plus"; diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 6f998300290a6e0bc340b378a7714df371d3ad7d..6b10766bedb74dadb2cac3a98bf58fef37a528ec 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchFromGitHub, emacs, texinfo }: +# Use "emacsMelpa.haskell-mode" instead. + let version = "13.14-169-g0d3569d"; # git describe --tags in @@ -35,5 +37,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; + broken = true; # no longer compiles and this package is obsolete anyway }; } diff --git a/pkgs/applications/editors/emacs-modes/header2/default.nix b/pkgs/applications/editors/emacs-modes/header2/default.nix index fb2bfbe7711261eb7eb4cad567b058e466418f25..171d8c6b16aec1c2529a381cbf396436b6e863b4 100644 --- a/pkgs/applications/editors/emacs-modes/header2/default.nix +++ b/pkgs/applications/editors/emacs-modes/header2/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "header2"; @@ -10,7 +10,7 @@ melpaBuild { name = "header2.el"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/header2"; sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06"; name = "header2"; diff --git a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix index 2781898c0da68f58dee09ae47d7792e8b2647675..8b9ebcd60262765454c0c831d4390e60f52b3979 100644 --- a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix +++ b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexrgb"; @@ -10,7 +10,7 @@ melpaBuild { name = "hexrgb.el"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hexrgb"; sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06"; name = "hexrgb"; diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index f0d120dd8030ab293fa26c3a11ef8737621ce726..884d1724ef8d5e33b244afd442216c44021a05da 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -2,25 +2,25 @@ let modules = [ - { name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; } - { name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; } - { name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; } - { name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; } - { name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; } - { name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; } - { name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; } - { name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; } - { name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; } - { name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; } - { name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; } - { name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; } - { name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; } + { name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; } + { name = "icicles-chg.el"; sha256 = "0qavq9vy566l3qi9n8akrqjcgy8n6k0j8d7vsc7p1jhqvvq812gh"; } + { name = "icicles-cmd1.el"; sha256 = "0lgk6ngl9090iqvvw1c227q7p37mr73cc6ap3ky6b0nv3ql8rkyi"; } + { name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; } + { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; } + { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; } + { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; } + { name = "icicles-fn.el"; sha256 = "05v7sc2k2mjm1mbnlkpi01aaxnxnb40540y7g70dg534scjd7w36"; } + { name = "icicles-mac.el"; sha256 = "0nhbwswz6xz7q4g8flszgx12q4gi4nx1d3n4jgz6svr2kk2vmlb4"; } + { name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; } + { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; } + { name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; } + { name = "icicles-var.el"; sha256 = "1r5gb01zg8nf2qryq9saxfpnzlymmppsk7w1g09lac35c87vh8yl"; } ]; forAll = f: map f modules; in stdenv.mkDerivation rec { - version = "2017-10-28"; + version = "2018-07-02"; name = "icicles-${version}"; srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index e47da7a419346356f6ef482ac5c5e932b2c83f9a..306fe66823c842d602d43097fe210a9b69c24903 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -92,7 +92,7 @@ in license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice broken = true; }; diff --git a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix index 6c5b208eda38fd445bdce6c98de0e35dc85da399..84dae10127e9ea9f287d1c294df0e7bdfcb50d0a 100644 --- a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix +++ b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lib-requires"; @@ -10,7 +10,7 @@ melpaBuild { name = "lib-requires.el"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/lib-requires"; sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx"; name = "lib-requires"; diff --git a/pkgs/applications/editors/emacs-modes/maude/default.nix b/pkgs/applications/editors/emacs-modes/maude/default.nix index 70693d039c588e1559f951fa01fca2cedcb9b0ec..9b737a938a12441b78c18fbebd1f86ceeef7071f 100644 --- a/pkgs/applications/editors/emacs-modes/maude/default.nix +++ b/pkgs/applications/editors/emacs-modes/maude/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [emacs]; - configureFlags = "--with-lispdir=$$out/share/emacs/site-lisp"; + configureFlags = [ "--with-lispdir=$$out/share/emacs/site-lisp" ]; meta = { description = "Emacs mode for the programming language Maude"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 2a1a5cd320c35aa463d6bdd566f761c66a6d92ba..554d48ecc51e173bdba9787e923b50ac885b5617 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -1,18 +1,23 @@ -{ callPackage }: { - _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { +{ callPackage }: + { + _0blayout = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "_0blayout"; + ename = "0blayout"; version = "20161007.2307"; src = fetchFromGitHub { owner = "etu"; repo = "0blayout-mode"; - rev = "873732ddb99a3ec18845a37467ee06bce4e61d87"; - sha256 = "1ymv9lqsn5xznyhax1pizw1i6h0pr7ckxhl28pix73wvzb5fl8mn"; + rev = "4bc6ff06abf298270abb7ef40db605e08caa9287"; + sha256 = "1ddzifckgac4k6invpvvad1avdrly0k5n0jnmc738xxnpc3fk6h6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout"; sha256 = "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92"; - name = "_0blayout"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20,9 +25,15 @@ license = lib.licenses.free; }; }) {}; - _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + _0xc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "_0xc"; + ename = "0xc"; version = "20170125.1953"; src = fetchFromGitHub { owner = "AdamNiederer"; @@ -30,10 +41,10 @@ rev = "31890af88234e4e098f1c340a5990515b934c7f7"; sha256 = "1yp3wm0h6rkzxw950fnhw310npn56s9vl294sw8nyij85s2hw5qk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc"; sha256 = "0lxcz1x1dymsh9idhkn7jn8vphr724d6sb88a4g55x2m1rlmzg3w"; - name = "_0xc"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -41,19 +52,23 @@ license = lib.licenses.free; }; }) {}; - _2048-game = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + _2048-game = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "_2048-game"; + ename = "2048-game"; version = "20151026.1233"; src = fetchhg { url = "https://bitbucket.com/zck/2048.el"; rev = "ea6c3bce8ac1"; sha256 = "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/2048-game"; sha256 = "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0"; - name = "_2048-game"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61,20 +76,26 @@ license = lib.licenses.free; }; }) {}; - _4clojure = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }: - melpaBuild { + _4clojure = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild + , request }: + melpaBuild { pname = "_4clojure"; + ename = "4clojure"; version = "20131014.1507"; src = fetchFromGitHub { owner = "losingkeys"; repo = "4clojure.el"; - rev = "3cdfd356c24cd3518397d29ae833f56a4d20b4ca"; - sha256 = "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq"; + rev = "45f1aa34b8c9688885deede4fac652bd61a4b70d"; + sha256 = "14klf786m0i5ij70pnyvsirafbv8giby481vfxlfbffsyf51afp1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/4clojure"; sha256 = "09bmdxkkp676sn1sbbly44k99i47w83yznq950nkxv6x8753ifgk"; - name = "_4clojure"; + name = "recipe"; }; packageRequires = [ json request ]; meta = { @@ -82,20 +103,25 @@ license = lib.licenses.free; }; }) {}; - a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + a = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "a"; + ename = "a"; version = "20170720.553"; src = fetchFromGitHub { owner = "plexus"; repo = "a.el"; - rev = "d50b953cb0a7402107cdd6275cff9d31d09835a3"; - sha256 = "0pzkbg6vmbpvyxq8y593v6bmaflafxfkfv0qryjb0wwds1mmdmfz"; + rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361"; + sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a"; sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886"; - name = "a"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -103,9 +129,15 @@ license = lib.licenses.free; }; }) {}; - aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }: - melpaBuild { + aa-edit-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , navi2ch }: + melpaBuild { pname = "aa-edit-mode"; + ename = "aa-edit-mode"; version = "20170118.1920"; src = fetchFromGitHub { owner = "zonuexe"; @@ -113,10 +145,10 @@ rev = "1dd801225b7ad3c23ad09698f5e77f0df7012a65"; sha256 = "17kxpyfprdyj96c4ivv8bxwyls69cgh2r3gwrgj6bwinbiszh9rr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20d00f782f2db87264c7fb1aac7455e44b8b24e7/recipes/aa-edit-mode"; sha256 = "00b99ik04xx4b2a1cm1z8dl42hjnb5r32qypjyyx8924n1dhxzgn"; - name = "aa-edit-mode"; + name = "recipe"; }; packageRequires = [ emacs navi2ch ]; meta = { @@ -124,9 +156,13 @@ license = lib.licenses.free; }; }) {}; - abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + abc-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "abc-mode"; + ename = "abc-mode"; version = "20171020.319"; src = fetchFromGitHub { owner = "mkjunker"; @@ -134,10 +170,10 @@ rev = "238deedeb6c90df168045552eb463cfae9e1f88f"; sha256 = "1wkjdvsav2x9zsl25h87iyfl6r0md86i2gmxqhvf63acxqgrgb2q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaee9dc5de06747374f311d86a550d3cc15beed1/recipes/abc-mode"; sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx"; - name = "abc-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -145,20 +181,27 @@ license = lib.licenses.free; }; }) {}; - abgaben = callPackage ({ f, fetchFromGitLab, fetchurl, lib, melpaBuild, pdf-tools, s }: - melpaBuild { + abgaben = callPackage ({ f + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , pdf-tools + , s }: + melpaBuild { pname = "abgaben"; + ename = "abgaben"; version = "20171118.2246"; src = fetchFromGitLab { owner = "akoehn"; repo = "abgaben"; - rev = "20d14830f07d66e2a04bcad1498a4a6fbf4b4451"; - sha256 = "0apcbfaa70kgrpjjsfbr0lg9lcfiijpx5bms4sbzc606vlnxxn0d"; + rev = "966bfcfdd3b2e288576ffe363d676ad282902090"; + sha256 = "0zmzn8rdn1q0dfql3awivhrxd1nrvqr6mb8gv2ynaldyidgsb487"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b0aa60aa0edf33205e0fcb309be779ad8da08ec/recipes/abgaben"; sha256 = "1xywghyp6aahzin1ygwzqfg9640dliycl4g02jz3gpix8hd3g8gy"; - name = "abgaben"; + name = "recipe"; }; packageRequires = [ f pdf-tools s ]; meta = { @@ -166,9 +209,13 @@ license = lib.licenses.free; }; }) {}; - abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + abl-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "abl-mode"; + ename = "abl-mode"; version = "20170604.1309"; src = fetchFromGitHub { owner = "afroisalreadyinu"; @@ -176,10 +223,10 @@ rev = "9aff997fe7b4caded60150a832e3704ac55e69e5"; sha256 = "0yfk7s7n10lkf11dy1l0xi0bbsjbam5lqq8kj9hxpz2zkddbaljl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode"; sha256 = "0h25lc87pa8irgxflnmnmkr9dcv4kz841nfc45fcz4awrn75kkzb"; - name = "abl-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -187,9 +234,14 @@ license = lib.licenses.free; }; }) {}; - abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + abyss-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "abyss-theme"; + ename = "abyss-theme"; version = "20170808.645"; src = fetchFromGitHub { owner = "mgrbyte"; @@ -197,10 +249,10 @@ rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14"; sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme"; sha256 = "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c"; - name = "abyss-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -208,9 +260,16 @@ license = lib.licenses.free; }; }) {}; - ac-alchemist = callPackage ({ alchemist, auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-alchemist = callPackage ({ alchemist + , auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-alchemist"; + ename = "ac-alchemist"; version = "20150907.2356"; src = fetchFromGitHub { owner = "syohex"; @@ -218,10 +277,10 @@ rev = "b1891c3d41aed83f61d78a609ea97be5cc2758d9"; sha256 = "19msfx3f3px1maj41bzh139s6sv2pjk9vm3bphn7758fqhzyin0f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef9037aa41a8d9467838495bb235db32c19cc417/recipes/ac-alchemist"; sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0"; - name = "ac-alchemist"; + name = "recipe"; }; packageRequires = [ alchemist auto-complete cl-lib ]; meta = { @@ -229,9 +288,14 @@ license = lib.licenses.free; }; }) {}; - ac-c-headers = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-c-headers = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-c-headers"; + ename = "ac-c-headers"; version = "20151021.134"; src = fetchFromGitHub { owner = "zk-phi"; @@ -239,10 +303,10 @@ rev = "de13a1d35b311e6601556d8ef163de102057deea"; sha256 = "1z6rj15p5gjv0jwnnck8789n9csf1pwxfvsz37graihgfy2khj0y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7736fb9ea3a59c36c0b8b824d83bb1bb0099d43/recipes/ac-c-headers"; sha256 = "1cq5rz2w79bj185va7y13x7bciihrpsvyxwk6msmcxb4g86s9phv"; - name = "ac-c-headers"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -250,9 +314,15 @@ license = lib.licenses.free; }; }) {}; - ac-capf = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-capf = callPackage ({ auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-capf"; + ename = "ac-capf"; version = "20151031.1917"; src = fetchFromGitHub { owner = "syohex"; @@ -260,10 +330,10 @@ rev = "17571dba0a8f98111f2ab758e9bea285b263781b"; sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/929da263f57b904c50f5f17b09d4c4b480999c97/recipes/ac-capf"; sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm"; - name = "ac-capf"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib ]; meta = { @@ -271,20 +341,27 @@ license = lib.licenses.free; }; }) {}; - ac-cider = callPackage ({ auto-complete, cider, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-cider = callPackage ({ auto-complete + , cider + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-cider"; + ename = "ac-cider"; version = "20161006.19"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "ac-cider"; - rev = "fa13e067dd9c8c76151c7d140a2803da1d109b84"; - sha256 = "1pklmjldnm8bf34f5q8x983d1m72l3kf51ns9vh6z704mkhv658f"; + rev = "d8670939bbf88079263d5ace2b8bc04cf325be36"; + sha256 = "01g1h2j0rfih8v0yvvr5gjh3abcj2mz3jmfbis8a60ivmngab732"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8adefaf2e284ef91baec3dbd3e10c868de69926/recipes/ac-cider"; sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6"; - name = "ac-cider"; + name = "recipe"; }; packageRequires = [ auto-complete cider cl-lib ]; meta = { @@ -292,20 +369,29 @@ license = lib.licenses.free; }; }) {}; - ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: - melpaBuild { + ac-clang = callPackage ({ auto-complete + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pos-tip + , yasnippet }: + melpaBuild { pname = "ac-clang"; - version = "20180318.1124"; + ename = "ac-clang"; + version = "20180709.2246"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "daddbea033d3c6f934e5043cc2fff8eca3b6e5f7"; - sha256 = "1hp3xpv0kwmilfivif2smbbgknjyk8kcgp399dghdcq71qsxz3wr"; + rev = "3294b968eb1a8317049190940193f9da47c085ef"; + sha256 = "160hda911vsc2zcs56560cpv7kj0966vjzwmc0md6fkz3wrj7w0n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4"; - name = "ac-clang"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib emacs pos-tip yasnippet ]; meta = { @@ -313,9 +399,15 @@ license = lib.licenses.free; }; }) {}; - ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }: - melpaBuild { + ac-dcd = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , flycheck-dmd-dub + , lib + , melpaBuild }: + melpaBuild { pname = "ac-dcd"; + ename = "ac-dcd"; version = "20170323.601"; src = fetchFromGitHub { owner = "atilaneves"; @@ -323,10 +415,10 @@ rev = "1614aa624252e3445b0392c8a9b7197084f3e422"; sha256 = "02slswlcjh1rjc9hglvbizhvwp57xcnbhs8cmlcayw0yjwp6mnvb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64142a4b14531409f45f02a8053ed8948f48221d/recipes/ac-dcd"; sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r"; - name = "ac-dcd"; + name = "recipe"; }; packageRequires = [ auto-complete flycheck-dmd-dub ]; meta = { @@ -334,20 +426,26 @@ license = lib.licenses.free; }; }) {}; - ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-emacs-eclim = callPackage ({ auto-complete + , eclim + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-emacs-eclim"; + ename = "ac-emacs-eclim"; version = "20170924.1339"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff"; - sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13"; + rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; + sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; sha256 = "0bkh7x6zj5drdvm9ji4vwqdxv7limd9a1idy8lsg0lcca3rjq3s5"; - name = "ac-emacs-eclim"; + name = "recipe"; }; packageRequires = [ auto-complete eclim ]; meta = { @@ -355,9 +453,15 @@ license = lib.licenses.free; }; }) {}; - ac-emmet = callPackage ({ auto-complete, emmet-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-emmet = callPackage ({ auto-complete + , emmet-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-emmet"; + ename = "ac-emmet"; version = "20131015.858"; src = fetchFromGitHub { owner = "yasuyk"; @@ -365,10 +469,10 @@ rev = "88f24876ee3b759978d4614a758280b5d512d543"; sha256 = "1lkhqmfkjga7qi4r1m7mjax3pyf9m6minsn57cbzm2z2kvkhq22g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39861b4f0a458c8ccf02f7a3443c54b0e74daa11/recipes/ac-emmet"; sha256 = "09ycjllfpdgqaf5iis5bkkhal1vxvl3qkxrn2759p67s97c49f3x"; - name = "ac-emmet"; + name = "recipe"; }; packageRequires = [ auto-complete emmet-mode ]; meta = { @@ -376,20 +480,26 @@ license = lib.licenses.free; }; }) {}; - ac-emoji = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-emoji = callPackage ({ auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-emoji"; + ename = "ac-emoji"; version = "20150823.11"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-emoji"; - rev = "40a639764eb654f1b4bb705c817b66032a26ff2b"; - sha256 = "1gk84bv6w9lg5wrygd7cfab3h46j84k1dwmhzr7jay6n02q6y499"; + rev = "53677f754929ead403ccde64b714ebb6b8fc808e"; + sha256 = "0cc3jpc4pihbyznyzvf6i3xwc2x78gb5m36ba9gkvxhabsljnlfg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15f591f9cba367b071046fef5ae01bbbd0475ce3/recipes/ac-emoji"; sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw"; - name = "ac-emoji"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib ]; meta = { @@ -397,9 +507,14 @@ license = lib.licenses.free; }; }) {}; - ac-etags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-etags = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-etags"; + ename = "ac-etags"; version = "20161001.807"; src = fetchFromGitHub { owner = "syohex"; @@ -407,10 +522,10 @@ rev = "7983e631c226fe0fa53af3b2d56bf4eca3d785ce"; sha256 = "1vvgcy5hybrip4jn4pj9r3fahr6rc70k28w5aw951h0x7g7laipr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fda9c7def8bc54af4ab17dc049dd94324c8f10fa/recipes/ac-etags"; sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb"; - name = "ac-etags"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -418,20 +533,26 @@ license = lib.licenses.free; }; }) {}; - ac-geiser = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, geiser, lib, melpaBuild }: - melpaBuild { + ac-geiser = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , geiser + , lib + , melpaBuild }: + melpaBuild { pname = "ac-geiser"; + ename = "ac-geiser"; version = "20130928.2347"; src = fetchFromGitHub { owner = "xiaohanyu"; repo = "ac-geiser"; - rev = "502d18a8a0bd4b5fdd495a99299ba2a632c5cd9a"; - sha256 = "0h2kakb4f5hgzf5l2kpqngalcmc4402lkg1pvs88c8z4rqp2vfvz"; + rev = "0e2e36532336f27e3dc3b01fff55ad1a4329817d"; + sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/586ef409e3ae758b459b625d4bf0108f0525a085/recipes/ac-geiser"; sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx"; - name = "ac-geiser"; + name = "recipe"; }; packageRequires = [ auto-complete geiser ]; meta = { @@ -439,9 +560,15 @@ license = lib.licenses.free; }; }) {}; - ac-haskell-process = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: - melpaBuild { + ac-haskell-process = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "ac-haskell-process"; + ename = "ac-haskell-process"; version = "20150423.702"; src = fetchFromGitHub { owner = "purcell"; @@ -449,10 +576,10 @@ rev = "0362d4323511107ec70e7165cb612f3ab01b712f"; sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98bd259b6bfd9b49a8ae421807a4ab3821f09608/recipes/ac-haskell-process"; sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw"; - name = "ac-haskell-process"; + name = "recipe"; }; packageRequires = [ auto-complete haskell-mode ]; meta = { @@ -460,9 +587,17 @@ license = lib.licenses.free; }; }) {}; - ac-helm = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }: - melpaBuild { + ac-helm = callPackage ({ auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "ac-helm"; + ename = "ac-helm"; version = "20160318.1933"; src = fetchFromGitHub { owner = "yasuyk"; @@ -470,10 +605,10 @@ rev = "baf2b1e04bcffa835084389c0fab415f26efbf32"; sha256 = "1fyikdwn0gzng7pbmfg7zb7jphjv228776vsjc12j7g1aqz92n4l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50427d365c79aff84ac759d19ce177b4f7ed2751/recipes/ac-helm"; sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq"; - name = "ac-helm"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib helm popup ]; meta = { @@ -481,20 +616,28 @@ license = lib.licenses.free; }; }) {}; - ac-html = callPackage ({ auto-complete, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ac-html = callPackage ({ auto-complete + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ac-html"; + ename = "ac-html"; version = "20151005.31"; src = fetchFromGitHub { owner = "cheunghy"; repo = "ac-html"; - rev = "668154cba123c321d1b07c2dc8b26d14092253b8"; - sha256 = "0lz1a8a4bqxiw20jh65r7cg7jnid3vz4h8b7dkfcrzwn0agx8frw"; + rev = "3de94a46d8cb93e8e62a1b6bdebbde4d65dc7cc2"; + sha256 = "1sip87j4wvlf9pfnpr0zyyhys1dd9smh6hy3zs08ihbdh98krgs5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce370d60b2f4dd0570b631f6ca92a221e1fe2de6/recipes/ac-html"; sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa"; - name = "ac-html"; + name = "recipe"; }; packageRequires = [ auto-complete dash f s ]; meta = { @@ -502,9 +645,14 @@ license = lib.licenses.free; }; }) {}; - ac-html-angular = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: - melpaBuild { + ac-html-angular = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-completion-data }: + melpaBuild { pname = "ac-html-angular"; + ename = "ac-html-angular"; version = "20151224.2319"; src = fetchFromGitHub { owner = "osv"; @@ -512,10 +660,10 @@ rev = "6bafe09afe03112ca4183d58461c1a6f6c2b3c67"; sha256 = "1v3ia439h4n2i204n0sazzbwwm0l5k6j31gq58iv2rqrq2ysikny"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0805ba6674d1298d730770e8ea46b9bbd68cd1d3/recipes/ac-html-angular"; sha256 = "05rbxf5kbr4jlskrhvfvhf82qvb55zl5cb6z1ymfh9l3h9j9xk3s"; - name = "ac-html-angular"; + name = "recipe"; }; packageRequires = [ web-completion-data ]; meta = { @@ -523,9 +671,14 @@ license = lib.licenses.free; }; }) {}; - ac-html-bootstrap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: - melpaBuild { + ac-html-bootstrap = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-completion-data }: + melpaBuild { pname = "ac-html-bootstrap"; + ename = "ac-html-bootstrap"; version = "20160302.901"; src = fetchFromGitHub { owner = "osv"; @@ -533,10 +686,10 @@ rev = "481e6e441cd566554ce71cd8cb28c9e7ebb1c24b"; sha256 = "0ry398awbsyswc87v275x4mdyv64kr0s647y6nagqg1h3n3jhvsq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6cf8aed547ca2390395dcf52d6c542b6944697af/recipes/ac-html-bootstrap"; sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1"; - name = "ac-html-bootstrap"; + name = "recipe"; }; packageRequires = [ web-completion-data ]; meta = { @@ -544,9 +697,14 @@ license = lib.licenses.free; }; }) {}; - ac-html-csswatcher = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: - melpaBuild { + ac-html-csswatcher = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-completion-data }: + melpaBuild { pname = "ac-html-csswatcher"; + ename = "ac-html-csswatcher"; version = "20151208.1313"; src = fetchFromGitHub { owner = "osv"; @@ -554,10 +712,10 @@ rev = "b0f3e7e1a3fe49e88b6eb6432377232fc715f221"; sha256 = "0swbw62zh5rjjf73pvmp8brrrmk6bp061k793z4z83v7ic0cicrr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fba8b9bf212e6fa389eae8394d0b3bbce9eb0f92/recipes/ac-html-csswatcher"; sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn"; - name = "ac-html-csswatcher"; + name = "recipe"; }; packageRequires = [ web-completion-data ]; meta = { @@ -565,20 +723,26 @@ license = lib.licenses.free; }; }) {}; - ac-inf-ruby = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: - melpaBuild { + ac-inf-ruby = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild }: + melpaBuild { pname = "ac-inf-ruby"; + ename = "ac-inf-ruby"; version = "20131115.350"; src = fetchFromGitHub { owner = "purcell"; repo = "ac-inf-ruby"; - rev = "ee53fc9c61950da9a96df3ff5ef186f9a9faf151"; - sha256 = "13xgv1c4gr075gffq95njra7bw1fkb5yp3xdlh3qndzw4bpary1l"; + rev = "094d86761088ab0b16ddac75cf57eeb9c2afbee2"; + sha256 = "0cabg054mpxrxaw95pfh7bv7rwpfpjhyqg8ghgd8j2vvj95p1m2z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a72abe0fe1253149afb45b0d9e81b6846a926c0/recipes/ac-inf-ruby"; sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr"; - name = "ac-inf-ruby"; + name = "recipe"; }; packageRequires = [ auto-complete inf-ruby ]; meta = { @@ -586,20 +750,26 @@ license = lib.licenses.free; }; }) {}; - ac-ispell = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-ispell = callPackage ({ auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-ispell"; + ename = "ac-ispell"; version = "20151031.1926"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-ispell"; - rev = "22bace7387e9012002a6a444922f75f9913077b0"; - sha256 = "1cq73bdv3lkn8v3nx6aznygqaac9s5i7pvirl8wz9ib31hsgwpbk"; + rev = "7e054793fe77f5fa1ced59d97da9c31df9807c48"; + sha256 = "1jidg08jz6np7jfg11qzijmsrbv1i3kdsqmmnz1xlybj1933xjvq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b41acb7387ebef9af2906fa16298b64d6431bfb0/recipes/ac-ispell"; sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67"; - name = "ac-ispell"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib ]; meta = { @@ -607,9 +777,15 @@ license = lib.licenses.free; }; }) {}; - ac-js2 = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, skewer-mode }: - melpaBuild { + ac-js2 = callPackage ({ fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild + , skewer-mode }: + melpaBuild { pname = "ac-js2"; + ename = "ac-js2"; version = "20140906.442"; src = fetchFromGitHub { owner = "ScottyB"; @@ -617,10 +793,10 @@ rev = "721c482e1d4a08f4a29a74437257d573e8f69969"; sha256 = "0yn9333rjs2pzb1wk1japclsqagdcl28j0yjl3q5b70g5gi5vx7k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/255588a330e4c9a03517885092d5678375aa7850/recipes/ac-js2"; sha256 = "0gcr0xdi89nj3854v2z3nndfgazmcdzmd6wdndl0i4s7pdfl96fa"; - name = "ac-js2"; + name = "recipe"; }; packageRequires = [ js2-mode skewer-mode ]; meta = { @@ -628,20 +804,26 @@ license = lib.licenses.free; }; }) {}; - ac-math = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: - melpaBuild { + ac-math = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , math-symbol-lists + , melpaBuild }: + melpaBuild { pname = "ac-math"; + ename = "ac-math"; version = "20141116.1327"; src = fetchFromGitHub { owner = "vspinu"; repo = "ac-math"; - rev = "c012a8f620a48cb18db7d78995035d65eae28f11"; - sha256 = "0p5cdaw9v8jgnmjqpb95bxy4khwbdgg19wzg8jkr2j2p55dpfbd6"; + rev = "89478063dead68894f0d27687b63896633048c6f"; + sha256 = "0mzbc3ninsz970xly90zbxlxqy4b0s8yrp1mlj8jzpk5dzlc4g51"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ac-math"; sha256 = "02c821zabxp9qkwx252pxjmssdbmas0iwanw09r03bmiby9d4nsl"; - name = "ac-math"; + name = "recipe"; }; packageRequires = [ auto-complete math-symbol-lists ]; meta = { @@ -649,9 +831,16 @@ license = lib.licenses.free; }; }) {}; - ac-mozc = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }: - melpaBuild { + ac-mozc = callPackage ({ auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mozc }: + melpaBuild { pname = "ac-mozc"; + ename = "ac-mozc"; version = "20150227.819"; src = fetchFromGitHub { owner = "igjit"; @@ -659,10 +848,10 @@ rev = "4c6c8be4701010d9362184437c0f783e0335c631"; sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3f74039d397037e640cc371d24bdb60ac90bf1/recipes/ac-mozc"; sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f"; - name = "ac-mozc"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib mozc ]; meta = { @@ -670,20 +859,25 @@ license = lib.licenses.free; }; }) {}; - ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-octave = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-octave"; - version = "20171122.943"; + ename = "ac-octave"; + version = "20180405.2034"; src = fetchFromGitHub { owner = "coldnew"; repo = "ac-octave"; - rev = "6d09b94a86f43de84c60e9a699b5e1be61c0f138"; - sha256 = "1kg5q0bw0ymynsn3j7bjavb6wr8b0bjwm6jfj254g80y1inn4bp4"; + rev = "fe0f931f2024f43de3c4fff4b1ace672413adeae"; + sha256 = "1yj5fapbp79k88k1cxrmmf91fb0j6s4s7f2dhk2afcf7z83mqkwb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave"; sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z"; - name = "ac-octave"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -691,20 +885,27 @@ license = lib.licenses.free; }; }) {}; - ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + ac-php = callPackage ({ ac-php-core + , auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "ac-php"; + ename = "ac-php"; version = "20171201.134"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "24204333743b3ba26a9a8d51f56f1d3195ae4115"; - sha256 = "0y3pzf2zvqlsqs7255ihrswaxjq0q389yiiprlwzm86xsws8fbkw"; + rev = "f489da3ceb04ff6efd9da5c5f56d71f49966e1d4"; + sha256 = "081v4srqzzwd8v07z013m756qrxll5fpzwf8km0686nc5gcg6q9l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; sha256 = "1wqwwgdln98snlq5msdx94b7985krvqfn264hxs1h94r85kgn1ba"; - name = "ac-php"; + name = "recipe"; }; packageRequires = [ ac-php-core auto-complete yasnippet ]; meta = { @@ -712,20 +913,31 @@ license = lib.licenses.free; }; }) {}; - ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: - melpaBuild { + ac-php-core = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , php-mode + , popup + , s + , xcscope }: + melpaBuild { pname = "ac-php-core"; - version = "20180323.503"; + ename = "ac-php-core"; + version = "20180629.144"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "24204333743b3ba26a9a8d51f56f1d3195ae4115"; - sha256 = "0y3pzf2zvqlsqs7255ihrswaxjq0q389yiiprlwzm86xsws8fbkw"; + rev = "fac22638f957abf404bbee4e16d9d7b67fcd42d2"; + sha256 = "0fsd8cfwqq2jgs2f0nk5g8ybm1mim51n4cfm5n5znvrkwp7a8z2y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; sha256 = "0vk3jsxb7dgk5a6pap3bdqkqwpszil0rck1c3y0wyxrlj2y1jcvn"; - name = "ac-php-core"; + name = "recipe"; }; packageRequires = [ dash emacs f php-mode popup s xcscope ]; meta = { @@ -733,9 +945,16 @@ license = lib.licenses.free; }; }) {}; - ac-racer = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: - melpaBuild { + ac-racer = callPackage ({ auto-complete + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , racer }: + melpaBuild { pname = "ac-racer"; + ename = "ac-racer"; version = "20170114.9"; src = fetchFromGitHub { owner = "syohex"; @@ -743,10 +962,10 @@ rev = "4408c2d652dec0432e20c05e001db8222d778c6b"; sha256 = "01154kqzh3pjy57vxhv27nm69p85a1fwl7r95c7pzmzxgxigfz1p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4318daf4dbb6864ee41f41287c89010fb811641/recipes/ac-racer"; sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp"; - name = "ac-racer"; + name = "recipe"; }; packageRequires = [ auto-complete emacs racer ]; meta = { @@ -754,20 +973,26 @@ license = lib.licenses.free; }; }) {}; - ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: - melpaBuild { + ac-rtags = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , rtags }: + melpaBuild { pname = "ac-rtags"; + ename = "ac-rtags"; version = "20170522.2154"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "a595d13f60c13d67a28467b3941d5ed558102e91"; - sha256 = "0yp6h6nsbji7dmc9pnf9qi7zsqxrxa1bln90bn0y71xf6z11kbp4"; + rev = "7e6b6f21935eedbe4678ba91c5531ac162b51a5a"; + sha256 = "12629d1s8rplhjh17n3bmgnkpscq4gljgyl84j8qyhh40dwq1qk0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; sha256 = "1w9v32di9135mm598c4506gxf0xr5jyz8dyd9dhga5d60q7g9641"; - name = "ac-rtags"; + name = "recipe"; }; packageRequires = [ auto-complete rtags ]; meta = { @@ -775,9 +1000,17 @@ license = lib.licenses.free; }; }) {}; - ac-skk = callPackage ({ auto-complete, cl-lib ? null, ddskk, fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }: - melpaBuild { + ac-skk = callPackage ({ auto-complete + , cl-lib ? null + , ddskk + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tinysegmenter }: + melpaBuild { pname = "ac-skk"; + ename = "ac-skk"; version = "20141229.1719"; src = fetchFromGitHub { owner = "myuhe"; @@ -785,10 +1018,10 @@ rev = "d25a265930430d080329789fb253d786c01dfa24"; sha256 = "1nvz0jfz4x99xc5ywspl8fdpyqns5zd0j7i4bwzlwplmy3qakjwm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9d8268d2db4b38ca18156964483b0b067f6f5d/recipes/ac-skk"; sha256 = "0iycyfgv8v15ygngvyx66m3w3sv8p9h6q6j1hbpzwd8azl8fzj5z"; - name = "ac-skk"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib ddskk tinysegmenter ]; meta = { @@ -796,20 +1029,27 @@ license = lib.licenses.free; }; }) {}; - ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: - melpaBuild { + ac-slime = callPackage ({ auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , slime }: + melpaBuild { pname = "ac-slime"; + ename = "ac-slime"; version = "20171027.1400"; src = fetchFromGitHub { owner = "purcell"; repo = "ac-slime"; - rev = "6c80cb602ddad46486288f94ad7546396c6e4b1a"; - sha256 = "11w1z653klghi6inv9n92cigz8m3c67j3r18mdk39inc3izwplkj"; + rev = "a91f664510d3da24b02e87e4aa59d049483a6529"; + sha256 = "04qjj5jw7yp49nbb0p70cxlad8m4nq5mhil4k6pav74nkgjrldcl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ac-slime"; sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg"; - name = "ac-slime"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib slime ]; meta = { @@ -817,9 +1057,16 @@ license = lib.licenses.free; }; }) {}; - ac-sly = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: - melpaBuild { + ac-sly = callPackage ({ auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sly }: + melpaBuild { pname = "ac-sly"; + ename = "ac-sly"; version = "20170728.327"; src = fetchFromGitHub { owner = "qoocku"; @@ -827,10 +1074,10 @@ rev = "bf69c687c4ecf1994349d20c182e9b567399912e"; sha256 = "09g6v2yp3wl566488zsb79lklqpai9dgz6xwv1y5h6zkghxvkhpy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb26741e841d4886c14f0a059a52805732f179b1/recipes/ac-sly"; sha256 = "1ng81b5f8w2s9mm9s7h5kwyx8fdwndnlsbzx50slmqyaz2ad15mx"; - name = "ac-sly"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib sly ]; meta = { @@ -838,9 +1085,17 @@ license = lib.licenses.free; }; }) {}; - academic-phrases = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: - melpaBuild { + academic-phrases = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , s }: + melpaBuild { pname = "academic-phrases"; + ename = "academic-phrases"; version = "20180318.438"; src = fetchFromGitHub { owner = "nashamri"; @@ -848,10 +1103,10 @@ rev = "0823ed8c24b26c32f909b896a469833ec4d7b656"; sha256 = "0qfzsq8jh05w4zkr0cvq3i1hdn97bq344vcqjg46sib26x3wpz6r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe4323043fb875c0252861800e61fdd0a51ed453/recipes/academic-phrases"; sha256 = "18y6lff7xwg6hczwgavwp32848gnlmc30afra9x7m8wmdddps1bh"; - name = "academic-phrases"; + name = "recipe"; }; packageRequires = [ dash emacs ht s ]; meta = { @@ -859,9 +1114,14 @@ license = lib.licenses.free; }; }) {}; - ace-flyspell = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-flyspell = callPackage ({ avy + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-flyspell"; + ename = "ace-flyspell"; version = "20170308.2109"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -869,10 +1129,10 @@ rev = "538d4f8508d305262ba0228dfe7c819fb65b53c9"; sha256 = "1yplf5klgjjzx3cb1ihqb9f9cwn898l0vhasc3cwiqz6ldyq2na8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-flyspell"; sha256 = "1zgywb90cg64nllbbk0x9ipm6znyc5yh7vkajrrnw06r5vabyp9y"; - name = "ace-flyspell"; + name = "recipe"; }; packageRequires = [ avy ]; meta = { @@ -880,9 +1140,14 @@ license = lib.licenses.free; }; }) {}; - ace-isearch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-isearch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-isearch"; + ename = "ace-isearch"; version = "20170506.12"; src = fetchFromGitHub { owner = "tam17aki"; @@ -890,10 +1155,10 @@ rev = "0502f95e333c8059a678745e5a112542965661d1"; sha256 = "1gzvhxkx7dl7wh2fkkiq9vplfhrqyxl0vzlzf617j4gggjbkpzps"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/344f0cf784a027cde196b7d766024fb415fa1968/recipes/ace-isearch"; sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm"; - name = "ace-isearch"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -901,9 +1166,15 @@ license = lib.licenses.free; }; }) {}; - ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-jump-buffer = callPackage ({ avy + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-jump-buffer"; + ename = "ace-jump-buffer"; version = "20171031.850"; src = fetchFromGitHub { owner = "waymondo"; @@ -911,10 +1182,10 @@ rev = "ae5be0415c823f7bb66833aa4af2180d4cf99cef"; sha256 = "0zg4x5faxkp0gnjq7209hn74qkzmk8k7wbr7k8wxpssjbnmxkvd1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer"; sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi"; - name = "ace-jump-buffer"; + name = "recipe"; }; packageRequires = [ avy dash ]; meta = { @@ -922,9 +1193,15 @@ license = lib.licenses.free; }; }) {}; - ace-jump-helm-line = callPackage ({ avy, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + ace-jump-helm-line = callPackage ({ avy + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "ace-jump-helm-line"; + ename = "ace-jump-helm-line"; version = "20160918.1136"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -932,10 +1209,10 @@ rev = "1483055255df3f8ae349f7520f05b1e43ea3ed37"; sha256 = "191a2g1if1jliikbxkpwmvlp4v1sp541j71xrlymili8ygm0idq5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8925f3daa92ff39776b55642aa9ec0e49245c0c7/recipes/ace-jump-helm-line"; sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9"; - name = "ace-jump-helm-line"; + name = "recipe"; }; packageRequires = [ avy helm ]; meta = { @@ -943,9 +1220,13 @@ license = lib.licenses.free; }; }) {}; - ace-jump-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-jump-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-jump-mode"; + ename = "ace-jump-mode"; version = "20140616.115"; src = fetchFromGitHub { owner = "winterTTr"; @@ -953,10 +1234,10 @@ rev = "8351e2df4fbbeb2a4003f2fb39f46d33803f3dac"; sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ace-jump-mode"; sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6"; - name = "ace-jump-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -964,9 +1245,15 @@ license = lib.licenses.free; }; }) {}; - ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-jump-zap = callPackage ({ ace-jump-mode + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-jump-zap"; + ename = "ace-jump-zap"; version = "20170717.1149"; src = fetchFromGitHub { owner = "waymondo"; @@ -974,10 +1261,10 @@ rev = "52b5d4c6c73bd0fc833a0dcb4e803a5287d8cae8"; sha256 = "1iw90mk6hdrbskxgv67xj27qd26w5dlh4s6a6xqqsj8ld56nzbvr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap"; sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb"; - name = "ace-jump-zap"; + name = "recipe"; }; packageRequires = [ ace-jump-mode dash ]; meta = { @@ -985,9 +1272,14 @@ license = lib.licenses.free; }; }) {}; - ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-link = callPackage ({ avy + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-link"; + ename = "ace-link"; version = "20180308.100"; src = fetchFromGitHub { owner = "abo-abo"; @@ -995,10 +1287,10 @@ rev = "fae5d508ff519ba1fab21c51f46c0906fd82229f"; sha256 = "118dp8w0z475j67gvl1dj137glbli2ykbm934vdvlz6q0k94vds7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5"; - name = "ace-link"; + name = "recipe"; }; packageRequires = [ avy ]; meta = { @@ -1006,9 +1298,16 @@ license = lib.licenses.free; }; }) {}; - ace-mc = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: - melpaBuild { + ace-mc = callPackage ({ ace-jump-mode + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multiple-cursors }: + melpaBuild { pname = "ace-mc"; + ename = "ace-mc"; version = "20160408.1737"; src = fetchFromGitHub { owner = "mm--"; @@ -1016,10 +1315,10 @@ rev = "b106bf6a6c78c3e026fbe9a99a34d6239adce4fd"; sha256 = "1zgmqgh5dff914dw7i8s142znd849gv4xh86f8q8agx5r7almx14"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62e3a5f23ce219b16081cb0bba9fc4699e11fafa/recipes/ace-mc"; sha256 = "1kca6ha2glhv7lkamqx3sxp7dy05c7f6xxy3lr3v2bik8r50jss8"; - name = "ace-mc"; + name = "recipe"; }; packageRequires = [ ace-jump-mode dash multiple-cursors ]; meta = { @@ -1027,9 +1326,15 @@ license = lib.licenses.free; }; }) {}; - ace-pinyin = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: - melpaBuild { + ace-pinyin = callPackage ({ avy + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pinyinlib }: + melpaBuild { pname = "ace-pinyin"; + ename = "ace-pinyin"; version = "20170430.2326"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -1037,10 +1342,10 @@ rev = "a9df88c1e6a32a4f4895acbb8c45383693c494c1"; sha256 = "18xi669c15k0m1wb7x231ch1kzqgpi4nm54c42ajrkfq7l8kxq8w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-pinyin"; sha256 = "1b3asvzm3k66lsdkmlsgmnf8xlyic8zv294j1iahzkwm6bzqj8wd"; - name = "ace-pinyin"; + name = "recipe"; }; packageRequires = [ avy pinyinlib ]; meta = { @@ -1048,20 +1353,26 @@ license = lib.licenses.free; }; }) {}; - ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-popup-menu = callPackage ({ avy-menu + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-popup-menu"; + ename = "ace-popup-menu"; version = "20171231.2215"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; - rev = "7b436a0d9e896463d00afbeb7e49a59cc6670e9c"; - sha256 = "0ma5hq0v4kczf7mn1wkqj9pxjy47wryd697gg37l4sszl6ylcs9w"; + rev = "7b8ad628a058d32c420f7615927a34a5d51a7ad3"; + sha256 = "183gc5lidxahfzik9ima2vph2sdi2rd9805kfnghsmwhck275i2r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s"; - name = "ace-popup-menu"; + name = "recipe"; }; packageRequires = [ avy-menu emacs ]; meta = { @@ -1069,20 +1380,25 @@ license = lib.licenses.free; }; }) {}; - ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-window = callPackage ({ avy + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-window"; - version = "20180123.1111"; + ename = "ace-window"; + version = "20180607.1223"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "208ea2a4e809f0c91caf3354b44a8f4a4f1cbb73"; - sha256 = "1bkck2gbbgxhh1swzkdsyk5vp9h08dv8skc5hr4ncgxy2fq8m27g"; + rev = "92d20e7e75dbb2ba0b879d3aedb8bed51fcee6a7"; + sha256 = "0svk91yx9plr8027q57g2csqlvmxdp3rv5knpd0hl0hq0hk0j750"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa"; - name = "ace-window"; + name = "recipe"; }; packageRequires = [ avy ]; meta = { @@ -1090,19 +1406,24 @@ license = lib.licenses.free; }; }) {}; - achievements = callPackage ({ fetchhg, fetchurl, keyfreq, lib, melpaBuild }: - melpaBuild { + achievements = callPackage ({ fetchhg + , fetchurl + , keyfreq + , lib + , melpaBuild }: + melpaBuild { pname = "achievements"; + ename = "achievements"; version = "20150530.1126"; src = fetchhg { url = "https://bitbucket.com/gvol/emacs-achievements"; rev = "18a422131c12"; sha256 = "0nk1zhqx0lvckjc98b36125148zgx1l2axln8gvkdwlhrd2cc6vj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83ec19a4ebac6b2d0fd84939b393848f82620978/recipes/achievements"; sha256 = "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr"; - name = "achievements"; + name = "recipe"; }; packageRequires = [ keyfreq ]; meta = { @@ -1110,9 +1431,14 @@ license = lib.licenses.free; }; }) {}; - ack-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, mag-menu, melpaBuild }: - melpaBuild { + ack-menu = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , mag-menu + , melpaBuild }: + melpaBuild { pname = "ack-menu"; + ename = "ack-menu"; version = "20150504.1322"; src = fetchFromGitHub { owner = "chumpage"; @@ -1120,10 +1446,10 @@ rev = "f77be93a4697926ecf3195a355eb69580f695f4d"; sha256 = "02ba4d8qkvgy52g0zcbyfvsnhr9685gq569nkwa2as30xdcq3khm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ff331ed45e5b7697e4862e723408602ecc98bc7/recipes/ack-menu"; sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9"; - name = "ack-menu"; + name = "recipe"; }; packageRequires = [ mag-menu ]; meta = { @@ -1131,20 +1457,24 @@ license = lib.licenses.free; }; }) {}; - actionscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + actionscript-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "actionscript-mode"; - version = "20160820.1731"; + ename = "actionscript-mode"; + version = "20180527.1001"; src = fetchFromGitHub { owner = "austinhaas"; repo = "actionscript-mode"; - rev = "39287f00465559a58df1ea71a9dc5b15d4ac882a"; - sha256 = "19qrlnbirxay70dm5w5p2iw4wrw3acj74kixs2wkifw5sq8i5cql"; + rev = "65abd58e198458a8e46748c5962c41d80d60c4ea"; + sha256 = "0cb8kkhh43wg63abjx6d4x55f0l3r6ziqcaz8rz1zr12jffnac8z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c11e74f2156f109b713380cebf83022d7159d4a/recipes/actionscript-mode"; sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq"; - name = "actionscript-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1152,20 +1482,25 @@ license = lib.licenses.free; }; }) {}; - adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + adafruit-wisdom = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "adafruit-wisdom"; + ename = "adafruit-wisdom"; version = "20180224.1652"; src = fetchFromGitHub { owner = "gonewest818"; repo = "adafruit-wisdom.el"; - rev = "aafc01726f1b3160321d40160298a0e1b054b382"; - sha256 = "18p55zghycsx88dn0iw610fklkhi5chzycrpjb4xzs5x1l5l2v08"; + rev = "473b973885589a4843e80daf5c8503ea4cedf2ff"; + sha256 = "0xzzyvnvv0951rr5l5l1vgls3cj5884nhfgqb8w5ian28jsf28bx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom"; sha256 = "0ckh420cirspwg2yd5q9y1az03j2l1jzd67g8dpvqjkgdp485gad"; - name = "adafruit-wisdom"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1173,9 +1508,13 @@ license = lib.licenses.free; }; }) {}; - add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + add-hooks = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "add-hooks"; + ename = "add-hooks"; version = "20171216.1723"; src = fetchFromGitHub { owner = "nickmccurdy"; @@ -1183,10 +1522,10 @@ rev = "1845137703461fc44bd77cf24014ba58f19c369d"; sha256 = "02s9mv26ycypn4qfshrh17v1hsys2q9vffxj3g4lgq0lykplvkkm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; sha256 = "09a5b3prznibkb5igfn8x3vsjrlkh3534zycs8g25g4li87mcb6p"; - name = "add-hooks"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1194,20 +1533,24 @@ license = lib.licenses.free; }; }) {}; - add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + add-node-modules-path = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "add-node-modules-path"; - version = "20170914.1912"; + ename = "add-node-modules-path"; + version = "20180710.1642"; src = fetchFromGitHub { owner = "codesuki"; repo = "add-node-modules-path"; - rev = "d9266c0e2707a3cd3ecddbbc1e378b9eb56e06c0"; - sha256 = "1s03q9yrn64f5p1f2d941rd18m5kwa1776n9adr8rk3mq96v7cdp"; + rev = "f31e69ccb681f882aebb806ce6e9478e3ac39708"; + sha256 = "0p106bqmvdr8by5iv02bshm339qbrjcch2d15mrm4h3nav03v306"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path"; sha256 = "0gbl875fgqr5np6r4cs8njs6fil1qmy8a5wir88x78ybdwwxsmbl"; - name = "add-node-modules-path"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1215,9 +1558,14 @@ license = lib.licenses.free; }; }) {}; - addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + addressbook-bookmark = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "addressbook-bookmark"; + ename = "addressbook-bookmark"; version = "20171107.2234"; src = fetchFromGitHub { owner = "thierryvolpiatto"; @@ -1225,10 +1573,10 @@ rev = "4f560af8397a46772e4b39f74f44a9ec9309a224"; sha256 = "166iih6fzfizb1yxfhwzh9w9c3wi2xb25qjgialp5rwxlwdwy9dr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark"; sha256 = "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r"; - name = "addressbook-bookmark"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1236,9 +1584,14 @@ license = lib.licenses.free; }; }) {}; - adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }: - melpaBuild { + adoc-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , markup-faces + , melpaBuild }: + melpaBuild { pname = "adoc-mode"; + ename = "adoc-mode"; version = "20160314.1430"; src = fetchFromGitHub { owner = "sensorflo"; @@ -1246,10 +1599,10 @@ rev = "745884359a1b8826ede2c4cfd2f0b5478953ac40"; sha256 = "199da15f6p84809z33w3m35lrk9bgx8qpgnxsxgisli373mpzvd8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/adoc-mode"; sha256 = "0jd3zr4zpb4qqn504azl0y02cryv7n9wphv64b0fbpipr7w5hm2c"; - name = "adoc-mode"; + name = "recipe"; }; packageRequires = [ markup-faces ]; meta = { @@ -1257,9 +1610,13 @@ license = lib.licenses.free; }; }) {}; - aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + aes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aes"; + ename = "aes"; version = "20171028.2323"; src = fetchFromGitHub { owner = "Sauermann"; @@ -1267,10 +1624,10 @@ rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af"; sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes"; sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v"; - name = "aes"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1278,9 +1635,14 @@ license = lib.licenses.free; }; }) {}; - afternoon-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + afternoon-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "afternoon-theme"; + ename = "afternoon-theme"; version = "20140104.1059"; src = fetchFromGitHub { owner = "osener"; @@ -1288,10 +1650,10 @@ rev = "89b1d778a1f8b385775c122f2bd1c62f0fbf931a"; sha256 = "19d5d6qs5nwmpf26rsb86ranb5p4236qp7p2b4i88cimcmzspylb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/583256b7fa48501c8bfad305d76d2e16b6441539/recipes/afternoon-theme"; sha256 = "13xgdw8px58sxpl7nyhkcdxwqdpp13i8wghvlb3l4471plw3vqgj"; - name = "afternoon-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1299,9 +1661,16 @@ license = lib.licenses.free; }; }) {}; - ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ag = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ag"; + ename = "ag"; version = "20180225.240"; src = fetchFromGitHub { owner = "Wilfred"; @@ -1309,10 +1678,10 @@ rev = "77b4f50c5372bf219da496567b2b867261f0d354"; sha256 = "0kwp6bb8fwv76x9r35rz4mvwica1fsappp82rjr1xlhnwwdsc120"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g"; - name = "ag"; + name = "recipe"; }; packageRequires = [ cl-lib dash s ]; meta = { @@ -1320,20 +1689,25 @@ license = lib.licenses.free; }; }) {}; - aggressive-fill-paragraph = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + aggressive-fill-paragraph = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aggressive-fill-paragraph"; + ename = "aggressive-fill-paragraph"; version = "20170902.705"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "aggressive-fill-paragraph-mode"; - rev = "bcbc63d1c93cd8dc5bf2fc6eb4988fa76375c631"; - sha256 = "042xvhfc7h571rdriixdf2s2aai8qz4w1wddbbbsq3ir0n814zp3"; + rev = "c5185ad673c01e5103ab4a078095c3e2ce7ab039"; + sha256 = "11dppmpdv26m9l5cnnnylihiss2a09zyyb7kqdrk3djdqvqplqb4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/982f5936f2d83222263df2886ca0b629076366bb/recipes/aggressive-fill-paragraph"; sha256 = "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja"; - name = "aggressive-fill-paragraph"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -1341,20 +1715,26 @@ license = lib.licenses.free; }; }) {}; - aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + aggressive-indent = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aggressive-indent"; - version = "20171012.1107"; + ename = "aggressive-indent"; + version = "20180626.1721"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "1d7185d27020c3e91a7da21800716079297938ac"; - sha256 = "0397kfy0lmgdic4jc8fqhsgpv8r4lrqcfanqbfbchfxwfswbqb8p"; + rev = "8e70039c7190639c43794cb75eae118c2faaa0d1"; + sha256 = "1h46krxk7wdhfvfmhdzp6c4dh2x53np41a17372k6b74hd15mgl0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2"; - name = "aggressive-indent"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1362,18 +1742,23 @@ license = lib.licenses.free; }; }) {}; - ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + ahg = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ahg"; + ename = "ahg"; version = "20180125.944"; src = fetchhg { url = "https://bitbucket.com/agriggio/ahg"; rev = "622b519d8586"; sha256 = "14jayh9bn8f6mjiln6h7ny404g0iy8zr7b6s6faqqhd840h519mz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg"; sha256 = "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4"; - name = "ahg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1381,9 +1766,14 @@ license = lib.licenses.free; }; }) {}; - ahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ahk-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ahk-mode"; + ename = "ahk-mode"; version = "20160320.1521"; src = fetchFromGitHub { owner = "ralesi"; @@ -1391,10 +1781,10 @@ rev = "9cfc4840507f6cc8016fdede84ad90df53285359"; sha256 = "07qpwa990bgs9028rqqk344c3z4hnr1jkfzcx9fi4z5k756zmw3b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8674b54ad5e17d1da1e499c7d8113f8acd8fd5d/recipes/ahk-mode"; sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni"; - name = "ahk-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1402,9 +1792,14 @@ license = lib.licenses.free; }; }) {}; - ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ahungry-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ahungry-theme"; + ename = "ahungry-theme"; version = "20180130.1928"; src = fetchFromGitHub { owner = "ahungry"; @@ -1412,10 +1807,10 @@ rev = "a038d91ec593d1f1b19ca66a0576d59bbc24c523"; sha256 = "0f86xp7l8bv4z5dgf3pamjgqyiq3kfx9gbi9wcw0m6lbza8db15a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; sha256 = "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy"; - name = "ahungry-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1423,20 +1818,25 @@ license = lib.licenses.free; }; }) {}; - airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: - melpaBuild { + airline-themes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , powerline }: + melpaBuild { pname = "airline-themes"; - version = "20170623.958"; + ename = "airline-themes"; + version = "20180410.2106"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "0c0f8efbeaefa49ef04c0c4405b1ef79ecc5433e"; - sha256 = "08hkx5wf9qyh4d5s5z4v57d43qkzw6p8zsqijw92wy4kngv1gl78"; + rev = "8b528fbae0e557461315bed82883275d58df41f2"; + sha256 = "1xydgf9w0i2anpmjhy8m0zv1hql4gb37i11xfn6xzwna572z1ml9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih"; - name = "airline-themes"; + name = "recipe"; }; packageRequires = [ powerline ]; meta = { @@ -1444,20 +1844,27 @@ license = lib.licenses.free; }; }) {}; - airplay = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, simple-httpd }: - melpaBuild { + airplay = callPackage ({ deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , simple-httpd }: + melpaBuild { pname = "airplay"; + ename = "airplay"; version = "20130212.426"; src = fetchFromGitHub { owner = "gongo"; repo = "airplay-el"; - rev = "bd690aafcae3a887946e1bba8327597932d964ad"; - sha256 = "1lxpfswp1bjrz192px79f155dycf2kazpr7dfrcr1gyshlgxkpf7"; + rev = "46fad71d293a3e18551cf464fe6c6208a7a32d9d"; + sha256 = "1dlmkx17lafkxz3sfajylc5fml5rq339xn6v2qj463gg4n8sdgij"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f9d8229e4c91f4e3e8925b07e59d2a81cc745e/recipes/airplay"; sha256 = "095nibgs197iplphk6csvkgsrgh1fcfyy33py860v6qmihvk538f"; - name = "airplay"; + name = "recipe"; }; packageRequires = [ deferred request simple-httpd ]; meta = { @@ -1465,9 +1872,47 @@ license = lib.licenses.free; }; }) {}; - alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: - melpaBuild { + alan-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "alan-mode"; + ename = "alan-mode"; + version = "20180711.2148"; + src = fetchFromGitHub { + owner = "M-industries"; + repo = "AlanForEmacs"; + rev = "02869448b4637516064900caf135aeb4f07bc5e4"; + sha256 = "03y07041rwi7fab9slavh15xh7m4y6dbk44gd24dw5drb5kvfdiz"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6e52314db81dad3517ab400099b032260c3e3e6f/recipes/alan-mode"; + sha256 = "1528rh26kr9zj43djbrfb7vmq78spfay3k3ps5apc580ipx1a4hg"; + name = "recipe"; + }; + packageRequires = [ emacs flycheck s ]; + meta = { + homepage = "https://melpa.org/#/alan-mode"; + license = lib.licenses.free; + }; + }) {}; + alchemist = callPackage ({ company + , dash + , elixir-mode + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , s }: + melpaBuild { pname = "alchemist"; + ename = "alchemist"; version = "20180312.604"; src = fetchFromGitHub { owner = "tonini"; @@ -1475,10 +1920,10 @@ rev = "6f99367511ae209f8fe2c990779764bbb4ccb6ed"; sha256 = "12f95rwxs11sqf1w9pnf6cxc2lh2jz4nqkq33p8b5yamnl8cq9kg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369"; - name = "alchemist"; + name = "recipe"; }; packageRequires = [ company dash elixir-mode emacs pkg-info s ]; meta = { @@ -1486,20 +1931,25 @@ license = lib.licenses.free; }; }) {}; - alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + alda-mode = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "alda-mode"; - version = "20171103.1548"; - src = fetchFromGitHub { + ename = "alda-mode"; + version = "20180607.2305"; + src = fetchFromGitLab { owner = "jgkamat"; repo = "alda-mode"; - rev = "2582122c41cd34d034b6bbe71469f5ceb1de40c7"; - sha256 = "11miyk48p09327ivmsk1hiw0brnx1pgjvdrfsdfhcwhbv2cafnf9"; + rev = "ebc4232e754a3a49c937f59ebd849520b901e54c"; + sha256 = "1rnvchb2rh7yzp2nw7qs9nh9m2r9cvhmkvh1qda3avf1ha9q20hp"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; - sha256 = "0vpxiw3k0qxp6s19n93qkkyrr44rbw38ygriqdrfpp84pa09wprh"; - name = "alda-mode"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/848cb17d871287c401496e4483e400b44696e89d/recipes/alda-mode"; + sha256 = "0qvaxh4392rpxikylcnn31z13wabaydj5aa4jyn499ggqdz7liw9"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1507,20 +1957,25 @@ license = lib.licenses.free; }; }) {}; - alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + alect-themes = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "alect-themes"; - version = "20180322.1408"; + ename = "alect-themes"; + version = "20180504.1020"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "f61eec647abd9981139c720811e1c4e2501f250c"; - sha256 = "0hfhk2bnhml2sc1i7i4py06x9sph1g7qa50x6bffkxx92ry4wvl0"; + rev = "4d90833a7381123a979f73fa97a013071ca7ff00"; + sha256 = "19cb6zgg495d62wb6jn6cql5fhv8qd7rxpgxx90klp8yfizr0gmj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8"; - name = "alect-themes"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1528,20 +1983,26 @@ license = lib.licenses.free; }; }) {}; - alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: - melpaBuild { + alert = callPackage ({ fetchFromGitHub + , fetchurl + , gntp + , lib + , log4e + , melpaBuild }: + melpaBuild { pname = "alert"; - version = "20180122.1242"; + ename = "alert"; + version = "20180403.38"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "103d34c83fe77e46a6976dcaba3db678199e0c9c"; - sha256 = "1nbk768d8iqjf1mx956497hbjfxar144h3m3sd298byc54z8bvmf"; + rev = "667d9c7848c723eb392ab9bacae07966da3e3504"; + sha256 = "04nrl7kg5pprfdxjbqjyh7vw0vs22bplhhpaf30v3hw7k7nkc0ky"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118"; - name = "alert"; + name = "recipe"; }; packageRequires = [ gntp log4e ]; meta = { @@ -1549,20 +2010,25 @@ license = lib.licenses.free; }; }) {}; - align-cljlet = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + align-cljlet = callPackage ({ clojure-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "align-cljlet"; + ename = "align-cljlet"; version = "20160112.1301"; src = fetchFromGitHub { owner = "gstamp"; repo = "align-cljlet"; - rev = "602d72a7ad52788a0265e3c6da519464a98166b8"; - sha256 = "0l2rgs0rd4nmv4v7m10zhf2znzfvdifv1vlhpa3zbppg0fj8zph1"; + rev = "ebcf0a912e836579a3a9d386e22c1c4bef7fba17"; + sha256 = "1g0fp77zrnpa9dplj41my2wsin6qxpw49f7451km29mjayh2zhfj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/align-cljlet"; sha256 = "0pnhhv33rvlmb3823xpy9v5h6q99fa7fn38djbwry4rymi4jmlih"; - name = "align-cljlet"; + name = "recipe"; }; packageRequires = [ clojure-mode ]; meta = { @@ -1570,9 +2036,14 @@ license = lib.licenses.free; }; }) {}; - all-ext = callPackage ({ all, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + all-ext = callPackage ({ all + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "all-ext"; + ename = "all-ext"; version = "20170114.1805"; src = fetchFromGitHub { owner = "rubikitch"; @@ -1580,10 +2051,10 @@ rev = "9f4ef84a147cf4e0af6ef45826d6cb3558db6b88"; sha256 = "0gdrsi9n9i1ibijkgk5kyjdjdmnsccfbpifpv679371glap9f68b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/all-ext"; sha256 = "0vmpa5p7likg2xgck18sa0jvmvnhjs9v1fbl82sxx7qy2f3cggql"; - name = "all-ext"; + name = "recipe"; }; packageRequires = [ all ]; meta = { @@ -1591,9 +2062,15 @@ license = lib.licenses.free; }; }) {}; - all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize }: - melpaBuild { + all-the-icons = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , memoize }: + melpaBuild { pname = "all-the-icons"; + ename = "all-the-icons"; version = "20180125.757"; src = fetchFromGitHub { owner = "domtronn"; @@ -1601,10 +2078,10 @@ rev = "52d1f2d36468146c93aaf11399f581401a233306"; sha256 = "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; - name = "all-the-icons"; + name = "recipe"; }; packageRequires = [ emacs memoize ]; meta = { @@ -1612,9 +2089,15 @@ license = lib.licenses.free; }; }) {}; - all-the-icons-dired = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + all-the-icons-dired = callPackage ({ all-the-icons + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "all-the-icons-dired"; + ename = "all-the-icons-dired"; version = "20170418.1431"; src = fetchFromGitHub { owner = "jtbm37"; @@ -1622,10 +2105,10 @@ rev = "980b7747d6c4a7992a1ec56afad908956db0a519"; sha256 = "1pvbgyxfj4j205nj1r02045f1y4wgavdsk7f45hxkkhms1rj8jyy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/all-the-icons-dired"; sha256 = "1qj639z24ln29hv6c51g1vsa2jsy4qrlhf8c7d5w9bxcrcn2fnr9"; - name = "all-the-icons-dired"; + name = "recipe"; }; packageRequires = [ all-the-icons emacs ]; meta = { @@ -1633,20 +2116,27 @@ license = lib.licenses.free; }; }) {}; - all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + all-the-icons-gnus = callPackage ({ all-the-icons + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "all-the-icons-gnus"; - version = "20180108.153"; + ename = "all-the-icons-gnus"; + version = "20180510.2354"; src = fetchFromGitHub { owner = "nlamirault"; repo = "all-the-icons-gnus"; - rev = "61830f1da0f8ad8e9235133f5470daeb50d2de41"; - sha256 = "19hjy14yalw736cjqbgm3dv4cly545k57ac16vj6c6jalb7wi0l5"; + rev = "27f78996da0725943bcfb2d18038e6f7bddfa9c7"; + sha256 = "0yi3nbhx7cdxq2192kh5ra2n0a3qg20p342prz3a0bm3w7q2ym11"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus"; sha256 = "0vdqhpa49p8vzbad426gl0dvniapyk73kbscvjv7mdl4bwhcr309"; - name = "all-the-icons-gnus"; + name = "recipe"; }; packageRequires = [ all-the-icons dash emacs ]; meta = { @@ -1654,9 +2144,16 @@ license = lib.licenses.free; }; }) {}; - all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + all-the-icons-ivy = callPackage ({ all-the-icons + , emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "all-the-icons-ivy"; + ename = "all-the-icons-ivy"; version = "20180225.630"; src = fetchFromGitHub { owner = "asok"; @@ -1664,10 +2161,10 @@ rev = "52b3f4a8a4a038998943afaffb5ff25054f65af4"; sha256 = "1xkrqv6znf1savkg17w41d9rm7wrs8n3c4ad0arrmi522qgp78fr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy"; sha256 = "1xv67gxd2sqj6zld4i3qcid0x5qsbd7baz55m93y1ivdqi7x7gr2"; - name = "all-the-icons-ivy"; + name = "recipe"; }; packageRequires = [ all-the-icons emacs ivy ]; meta = { @@ -1675,9 +2172,21 @@ license = lib.licenses.free; }; }) {}; - amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: - melpaBuild { + amd-mode = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , js2-mode + , js2-refactor + , lib + , makey + , melpaBuild + , projectile + , s + , seq }: + melpaBuild { pname = "amd-mode"; + ename = "amd-mode"; version = "20180111.602"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -1685,10 +2194,10 @@ rev = "01fd19e0d635ccaf8e812364d8720733f2e84126"; sha256 = "040g07k2hcwqspansjqfpng0lxzkmip26ipz26q6mvkpwm2wilv4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06"; - name = "amd-mode"; + name = "recipe"; }; packageRequires = [ emacs @@ -1705,20 +2214,24 @@ license = lib.licenses.free; }; }) {}; - ample-regexps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ample-regexps = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ample-regexps"; + ename = "ample-regexps"; version = "20151023.300"; src = fetchFromGitHub { owner = "immerrr"; repo = "ample-regexps.el"; - rev = "cbe91e148cac1ee8e223874dc956ed4cf607f046"; - sha256 = "1mm4icrwx4mscp7kbbmlc34995r164dhrfczn5ybkyxjzzf76jn1"; + rev = "884c712a82773d3af500e71d20bebe52340352c5"; + sha256 = "18cicz11i19cpabrq6khnl9ks1khn6gw5a4ckaq4y65r40x0cr6g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a5c72dfb52d55b2b22c91f115b32fff14f2f61e/recipes/ample-regexps"; sha256 = "00y07pd438v7ldkn5f1w84cpxa1mvcnzjkj6sf5l5pm97xqiz7j2"; - name = "ample-regexps"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1726,9 +2239,13 @@ license = lib.licenses.free; }; }) {}; - ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ample-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ample-theme"; + ename = "ample-theme"; version = "20180207.945"; src = fetchFromGitHub { owner = "jordonbiondo"; @@ -1736,10 +2253,10 @@ rev = "366698400c555211c2082962a5d74f3dd79a78c8"; sha256 = "1kzb15aqy7n2wxibmnihya7n6ajs34jxp9iin96n758nza92m59c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme"; sha256 = "055c6jy2q761za4cl1vlqdskcd3mc1j58k8b4418q7h2lv2zc0ry"; - name = "ample-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1747,9 +2264,13 @@ license = lib.licenses.free; }; }) {}; - ample-zen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ample-zen-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ample-zen-theme"; + ename = "ample-zen-theme"; version = "20150119.1354"; src = fetchFromGitHub { owner = "mjwall"; @@ -1757,10 +2278,10 @@ rev = "b277bb7abd4b6624e8d59f02474b79af50a007bd"; sha256 = "18z9jl5d19a132k6g1dvwqfbbdh5cx66b2qxlcjsfiqxlxglc2sa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3b8c21f5dfbe9d4845a01548c8b7d9ddfe172a7/recipes/ample-zen-theme"; sha256 = "0xygk80mh05qssrbfj4h6k50pg557dyj6kzc2pdlmnr5r4gnzdn3"; - name = "ample-zen-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1768,20 +2289,26 @@ license = lib.licenses.free; }; }) {}; - amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + amx = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "amx"; - version = "20180313.857"; + ename = "amx"; + version = "20180627.1555"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "amx"; - rev = "f2b030121e59b9b3c8f05218e6c673bc6d69125e"; - sha256 = "10369f68wzpxb01bmk35yhm1z99wj0vm5d6ivdq5n6lard5afgvy"; + rev = "09e919512692dc31df079ad2cd1a3ca3ac4f1949"; + sha256 = "180841qv24z6kn3qry5216ija1h50ymm4kcmcxg4pc47bhzcjn1h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx"; sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap"; - name = "amx"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -1789,20 +2316,29 @@ license = lib.licenses.free; }; }) {}; - anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: - melpaBuild { + anaconda-mode = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pythonic + , s }: + melpaBuild { pname = "anaconda-mode"; - version = "20180209.1147"; + ename = "anaconda-mode"; + version = "20180707.1010"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "384f1c5995a96c2687cea7cf18ff5710d00a39c2"; - sha256 = "0qk1cd39pqjfm9hpgwm6xb205rgcka9jxfdkw3fcay3rmj3qyzws"; + rev = "7d28ae061c226ca2e277ecb9d0928647d9a30154"; + sha256 = "1sshdy8abqr5rihl7gjprczd4inznl28ipl812725ylmj0igrfw1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r"; - name = "anaconda-mode"; + name = "recipe"; }; packageRequires = [ dash emacs f pythonic s ]; meta = { @@ -1810,20 +2346,24 @@ license = lib.licenses.free; }; }) {}; - anaphora = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + anaphora = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "anaphora"; - version = "20140728.1536"; + ename = "anaphora"; + version = "20180618.1500"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "anaphora"; - rev = "ed99ad4502e6fccde76050496984c6454676a410"; - sha256 = "1ym43y0wqifkzpkm7ayf8cq2wz8pc2wgg9zvdyi0cn9lr9mwpbav"; + rev = "3b2da3f759b244975852e79721c4a2dbad3905cf"; + sha256 = "11fgiy029sqz7nvdm7dcal95lacryz9zql0x5h05z48nrrcl4bib"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8505db1945071a15ba0f2bb74b58d4a6875ca7d6/recipes/anaphora"; sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2"; - name = "anaphora"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1831,9 +2371,13 @@ license = lib.licenses.free; }; }) {}; - android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + android-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "android-mode"; + ename = "android-mode"; version = "20170323.115"; src = fetchFromGitHub { owner = "remvee"; @@ -1841,10 +2385,10 @@ rev = "f274da87429617b0b9c5889d46b36de64d982da4"; sha256 = "17m4hp2qb54widwadv23amc1lasnbwzh2ipc6180fnajg8zcbvyw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode"; sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc"; - name = "android-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1852,9 +2396,13 @@ license = lib.licenses.free; }; }) {}; - angry-police-captain = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + angry-police-captain = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "angry-police-captain"; + ename = "angry-police-captain"; version = "20120829.552"; src = fetchFromGitHub { owner = "rolpereira"; @@ -1862,10 +2410,10 @@ rev = "d11931c5cb63368dcc4a48797962428cca6d3e9d"; sha256 = "1m0c7ns7aiycg86cgglir8bkw730fslyg1n15m9ki0da4cnmm97a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/angry-police-captain"; sha256 = "00r3dx33h0wjxj0687ln8nbl1ff2badm3mk3r3bplfrd61z2qzld"; - name = "angry-police-captain"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1873,9 +2421,13 @@ license = lib.licenses.free; }; }) {}; - angular-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + angular-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "angular-mode"; + ename = "angular-mode"; version = "20151201.1327"; src = fetchFromGitHub { owner = "omouse"; @@ -1883,10 +2435,10 @@ rev = "8720cde86af0f1859ccc8580571e8d0ad1c52cff"; sha256 = "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b120c7f97e8d313387d2e9d9210e7fcdd10523b/recipes/angular-mode"; sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i"; - name = "angular-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1894,9 +2446,15 @@ license = lib.licenses.free; }; }) {}; - angular-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + angular-snippets = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "angular-snippets"; + ename = "angular-snippets"; version = "20140513.2223"; src = fetchFromGitHub { owner = "magnars"; @@ -1904,10 +2462,10 @@ rev = "af5ae0a4a8603b040446c28afcf6ca01a8b4bd7b"; sha256 = "0hdm1a323mzxjfdply8ri3addk146f21d8cmpd18r7dw3j3cdfrn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96a0ad5fdbc52f803846e580856fb9c58181c020/recipes/angular-snippets"; sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c"; - name = "angular-snippets"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -1915,30 +2473,41 @@ license = lib.licenses.free; }; }) {}; - anki-editor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + anki-editor = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "anki-editor"; - version = "20180210.633"; + ename = "anki-editor"; + version = "20180715.151"; src = fetchFromGitHub { owner = "louietan"; repo = "anki-editor"; - rev = "a4a018d49e7c1fb01386216be6b8572b5ca33f94"; - sha256 = "15mwbg0yrv8vs2wgn7vb2psk6qw29vivq778hxg7k9f4ak7kn7ls"; + rev = "11dbf078957a7d291f5c767cd2936d4341c1864d"; + sha256 = "009m854i4vvfq1772p9js1r48m9msvlmyaplfmzf7qfqkf6k79ad"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8155d649e4b129d0c72da6bb2b1aac66c8483491/recipes/anki-editor"; sha256 = "18c5p82llq11vg1svqvbjrcnm7695nbbc6pwwl9jdjplasar585l"; - name = "anki-editor"; + name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ dash emacs request ]; meta = { homepage = "https://melpa.org/#/anki-editor"; license = lib.licenses.free; }; }) {}; - annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + annotate = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "annotate"; + ename = "annotate"; version = "20171110.2336"; src = fetchFromGitHub { owner = "bastibe"; @@ -1946,10 +2515,10 @@ rev = "dedbd9e5d5286f1ca8ad73e489d408a20f06156c"; sha256 = "12s5jc1i78x90s34ijljd75v1z6sisfrpix852gcisb9lpibbpz7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate"; sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy"; - name = "annotate"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1957,9 +2526,13 @@ license = lib.licenses.free; }; }) {}; - annotate-depth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + annotate-depth = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "annotate-depth"; + ename = "annotate-depth"; version = "20160520.1340"; src = fetchFromGitHub { owner = "netromdk"; @@ -1967,10 +2540,10 @@ rev = "fcb24fa36287250e40d195590c4ca4a8a696277b"; sha256 = "18cav5wl3d0yq15273rqmdwvrgw96lmqiq9x5fxhf3wjb543mifl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb37bd77aea642ca72d74112bdd8a02eab8d1a80/recipes/annotate-depth"; sha256 = "1j1pwnj7k6gl1p4npxsgrib0j1rzisq40pkm2wchjh86j3ybv2l4"; - name = "annotate-depth"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1978,9 +2551,14 @@ license = lib.licenses.free; }; }) {}; - annoying-arrows-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + annoying-arrows-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "annoying-arrows-mode"; + ename = "annoying-arrows-mode"; version = "20161023.2346"; src = fetchFromGitHub { owner = "magnars"; @@ -1988,10 +2566,10 @@ rev = "3c42e9807d7696da2da2a21b63beebf9cdb3f5dc"; sha256 = "06gs5ln3w1xvq8f8k9225rwiipbh9cs0dzyyb7z05717rmqixcc4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/annoying-arrows-mode"; sha256 = "1vswlfypn6ijn0wwa3dsqkz5n3pillpmli2ha4q9snhd3a667vyh"; - name = "annoying-arrows-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -1999,20 +2577,26 @@ license = lib.licenses.free; }; }) {}; - ansi = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ansi = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ansi"; + ename = "ansi"; version = "20150703.126"; src = fetchFromGitHub { owner = "rejeep"; repo = "ansi.el"; - rev = "12b4c5d91b3da1902838f421e5af6d40e2cd57dd"; - sha256 = "19k71dj83kvc8mks6zhl45vsrsb61via53dqxjv9bny1ybh2av85"; + rev = "a042c5954453bab9a74177e2b78ad17a824caebc"; + sha256 = "1hbddxarr40ygvaw4pwaivq2l4f0brszw73w1r50lkjlggb7bl3g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ansi"; sha256 = "0b5xnv6z471jm53g37njxin6l8yflsgm80y4wxahfgy8apipcq89"; - name = "ansi"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -2020,9 +2604,15 @@ license = lib.licenses.free; }; }) {}; - ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ansible = callPackage ({ f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ansible"; + ename = "ansible"; version = "20170926.1951"; src = fetchFromGitHub { owner = "k1LoW"; @@ -2030,10 +2620,10 @@ rev = "9da54a2a426dca259ec9c2a8a60fb58e954be5bc"; sha256 = "16z286gqy18s6bff1njkjpy0swrkfyarvb5xvik49pigd8hzh495"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible"; sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g"; - name = "ansible"; + name = "recipe"; }; packageRequires = [ f s ]; meta = { @@ -2041,20 +2631,25 @@ license = lib.licenses.free; }; }) {}; - ansible-doc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ansible-doc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ansible-doc"; + ename = "ansible-doc"; version = "20160924.124"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "ansible-doc.el"; - rev = "86083a7bb2ed0468ca64e52076b06441a2f8e9e0"; - sha256 = "0lap404ch74w99n3xip176jr42b38xhyzkfnkyqg0g3wk2cd3aq8"; + rev = "bc8128a85a79b14f4a121105d87a5eddc33975ad"; + sha256 = "0z3y69sfzka764wjbx31dywdq4d6bfsafv2gmmbpmxqmwfmy8sz4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9/recipes/ansible-doc"; sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w"; - name = "ansible-doc"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2062,20 +2657,25 @@ license = lib.licenses.free; }; }) {}; - ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ansible-vault = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ansible-vault"; + ename = "ansible-vault"; version = "20170111.1318"; src = fetchFromGitHub { owner = "zellio"; repo = "ansible-vault-mode"; - rev = "71d1df3b1c2d1569b6c3091a9d54baf2ebc7019d"; - sha256 = "0l5rsxbr9k5nq86v7vyv2l0inczfmcyfp95van84dk5fa1kpm3kc"; + rev = "57cf7e6da30250587c28ebf592d7bca9a3bae1df"; + sha256 = "1m9r3vicmljypq6mhgr86lzgi26dnnlp7g0jbl9bjdk48xfg79wb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault"; sha256 = "0pmsvpc866rgcajb2ihhb62g3rwhda7vvq2kxkvr566y609vv021"; - name = "ansible-vault"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2083,9 +2683,13 @@ license = lib.licenses.free; }; }) {}; - ant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ant = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ant"; + ename = "ant"; version = "20160211.743"; src = fetchFromGitHub { owner = "apg"; @@ -2093,10 +2697,10 @@ rev = "510b5a3f57ee4b2855422d88d359a28922c1ab70"; sha256 = "0jb5vl3cq5m3r23fjhcxgxl4g011zkjkkyn5mqqxx22a1sydsvab"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ant"; sha256 = "06028xjic14yv3rfqyc3k6jyjgm6fqfrf1mv8lvbh2sri2d5ifqa"; - name = "ant"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2104,20 +2708,24 @@ license = lib.licenses.free; }; }) {}; - anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + anti-zenburn-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "anti-zenburn-theme"; - version = "20180121.353"; + ename = "anti-zenburn-theme"; + version = "20180712.1138"; src = fetchFromGitHub { owner = "m00natic"; repo = "anti-zenburn-theme"; - rev = "c80cc51bb1aaf11dd53b9d08e01d61bc9b32622f"; - sha256 = "1c97d2jkh7iawgsbcg19gha9ffnxypbcfz0sgcsgf9vy4bvnc350"; + rev = "dbafbaa86be67c1d409873f57a5c0bbe1e7ca158"; + sha256 = "1h4lachmrpjiblah4rjd2cpvz6n6qh3i5cdp4wra2dk177h7kj6h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f6f803dc99a1b1fdb5b4e79f1c9cf72b702d091/recipes/anti-zenburn-theme"; sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk"; - name = "anti-zenburn-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2125,9 +2733,13 @@ license = lib.licenses.free; }; }) {}; - anx-api = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + anx-api = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "anx-api"; + ename = "anx-api"; version = "20140208.714"; src = fetchFromGitHub { owner = "rmloveland"; @@ -2135,10 +2747,10 @@ rev = "b2411ebc966ac32c3ffc61bc22bf183834df0fa0"; sha256 = "0fzxzar8m9qznfxv3wr7vfj9y2110wf6mm5cj55k3sd5djdjhmf1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e3b329ff11818a1553c74a02475cb4110173076/recipes/anx-api"; sha256 = "1vzg3wsqyfb9rsfxrpz8k2gazjlz2nwnf4gnn1dypsjspjnzcb8r"; - name = "anx-api"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2146,9 +2758,13 @@ license = lib.licenses.free; }; }) {}; - anybar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + anybar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "anybar"; + ename = "anybar"; version = "20160816.721"; src = fetchFromGitHub { owner = "tie-rack"; @@ -2156,10 +2772,10 @@ rev = "7a0743e0d31bcb36ab1bb2e351f3e7139c422ac5"; sha256 = "1s7vnp2xzffdj4pqdqn6mrirw33ms0yqlpxzz5pwj6xrbp2x5r6s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5516e309df9ac8bf0fafb9ec9037094d82913b67/recipes/anybar"; sha256 = "0prnr8wjhishpf2zmn4b7054vfahk10w05nzsg2p6whaxywcachm"; - name = "anybar"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2167,20 +2783,24 @@ license = lib.licenses.free; }; }) {}; - anyins = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + anyins = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "anyins"; + ename = "anyins"; version = "20131229.241"; src = fetchFromGitHub { owner = "antham"; repo = "anyins"; - rev = "83844c17ac9b5b6c7655ee556b75689e4c8ea663"; - sha256 = "05lq0bllgn44zs85mgnfdcyjasm6j8m70jdcxksf798i0qdqnk7n"; + rev = "cd5e3c1abd471c8a67aafc42c4c985a2796f4b9f"; + sha256 = "0j36wrvc3kj1afigpc230d92gwszk1qrmiz38jyi9anr6an4ch3p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a367da2cb71fc0b144f9e608dc4857624991f19c/recipes/anyins"; sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c"; - name = "anyins"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2188,20 +2808,25 @@ license = lib.licenses.free; }; }) {}; - anzu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + anzu = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "anzu"; + ename = "anzu"; version = "20161017.907"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-anzu"; - rev = "e6c56ca8b23ac433f7be58b6f3f50801dd4164e4"; - sha256 = "1y6s45k3f2x30fc9d5dv1v3cypj9wylx56khs5zxczgk5ky1ffp4"; + rev = "799f26ee0e3ce598b36983f4dce539f47739e656"; + sha256 = "1rpdw0vxss071kb995xyihdx21dv18d9cn666jvsy43g49fb803p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anzu"; sha256 = "181hzwy9bc0zfhax26p20q9cjibrmi9ngps5fa3ja5g6scxfs9g1"; - name = "anzu"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2209,9 +2834,13 @@ license = lib.licenses.free; }; }) {}; - aozora-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + aozora-view = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aozora-view"; + ename = "aozora-view"; version = "20140310.617"; src = fetchFromGitHub { owner = "kawabata"; @@ -2219,10 +2848,10 @@ rev = "b0390616d19e45f15f9a2f5d5688274831e721fd"; sha256 = "0528z3axjmplg2fdbv4jxgy1p39vr4rnsm4a3ps2fanf8bwsyx3l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6c13f8a0dd90c1c1f39711a5de69c1e0b785601/recipes/aozora-view"; sha256 = "0pd2574a6dkhrfr0jf5gvv34ganp6ddylyb6cfpg2d4znwbc2r2w"; - name = "aozora-view"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2230,9 +2859,13 @@ license = lib.licenses.free; }; }) {}; - apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + apache-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "apache-mode"; + ename = "apache-mode"; version = "20170711.913"; src = fetchFromGitHub { owner = "emacs-php"; @@ -2240,10 +2873,10 @@ rev = "0906559e0cb2997405d98ea6b2195954e3935d3b"; sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode"; sha256 = "0wzfx3kaiwvya30ihq3vpdhy6znkzf25w5x43x457ifdn2vrh9zi"; - name = "apache-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2251,9 +2884,13 @@ license = lib.licenses.free; }; }) {}; - apel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + apel = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "apel"; + ename = "apel"; version = "20170122.1458"; src = fetchFromGitHub { owner = "wanderlust"; @@ -2261,10 +2898,10 @@ rev = "339eb28ffae3165255a79de9b1fd362f43cd37c3"; sha256 = "1f0zxydh2pkwbjx5bh1bzl3r5g50vqg18azvqkvv9r0nn42hkhmi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apel"; sha256 = "0zrm8m66p3aqr0108s3cj6z4xqbg2hx37z1pam4c65bqlhh74s8y"; - name = "apel"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2272,9 +2909,14 @@ license = lib.licenses.free; }; }) {}; - apib-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { + apib-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "apib-mode"; + ename = "apib-mode"; version = "20170520.658"; src = fetchFromGitHub { owner = "w-vi"; @@ -2282,10 +2924,10 @@ rev = "6cc7c6f21b8e415b1718bb6a07ab2182e9e9dde6"; sha256 = "1717f78kaqkmbhfwb9kzsv5wi2zabcbwb4wh1jklhcaalvmk3z7d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode"; sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb"; - name = "apib-mode"; + name = "recipe"; }; packageRequires = [ markdown-mode ]; meta = { @@ -2293,20 +2935,25 @@ license = lib.licenses.free; }; }) {}; - apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + apiwrap = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "apiwrap"; - version = "20180318.1515"; + ename = "apiwrap"; + version = "20180602.1531"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "d80ae8d80520786dd5527e53c0a9374534168d41"; - sha256 = "0v2bnndrhvdkk5qa3rzzdl83471i00s0cxbvrsl8ijcm6xpc0m1b"; + rev = "e4c9c57d6620a788ec8a715ff1bb50542edea3a6"; + sha256 = "0xpb8mmssajy42r2h1m9inhv1chx19wkp5p0p63nwpk7mhjj8bis"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; sha256 = "0n50n1n5pvcgcp1gmna3ci36pnbanjdbjpgv7zyarlb80hywbiyw"; - name = "apiwrap"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2314,9 +2961,13 @@ license = lib.licenses.free; }; }) {}; - apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + apples-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "apples-mode"; + ename = "apples-mode"; version = "20110120.2018"; src = fetchFromGitHub { owner = "tequilasunset"; @@ -2324,10 +2975,10 @@ rev = "83a9ab0d6ba82496e2f7df386909b1a55701fccb"; sha256 = "0br0jl6xnajdx37s5cvs13srn9lldg58y9587a11s3s651xjdq0z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca765a6a2f312f585624ec8b82dc9eb6b9bbc0c/recipes/apples-mode"; sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s"; - name = "apples-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2335,9 +2986,13 @@ license = lib.licenses.free; }; }) {}; - applescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + applescript-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "applescript-mode"; + ename = "applescript-mode"; version = "20090320.2332"; src = fetchFromGitHub { owner = "ieure"; @@ -2345,10 +3000,10 @@ rev = "8f888cd80af1e0902b5609143facd3051bc94892"; sha256 = "0d3bqx6346vmniv001jgd6wggp80kv1kqc38sdgd88862gkqnqyg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/576e42b33a5245e1aae0f0d879fd18762342db32/recipes/applescript-mode"; sha256 = "0rj03xw8yx79xj9ahdwfxicxna0a0lykn2n39xng5gnm4bh2n6z4"; - name = "applescript-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2356,9 +3011,13 @@ license = lib.licenses.free; }; }) {}; - aproject = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + aproject = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aproject"; + ename = "aproject"; version = "20150605.206"; src = fetchFromGitHub { owner = "vietor"; @@ -2366,10 +3025,10 @@ rev = "3c7d23c341862dfd77fd0a64775df12ddb44ab54"; sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de10c48976352f273e8363c2f6fa60602ee86c9b/recipes/aproject"; sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2"; - name = "aproject"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2377,20 +3036,24 @@ license = lib.licenses.free; }; }) {}; - apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + apropospriate-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "apropospriate-theme"; - version = "20180223.1526"; + ename = "apropospriate-theme"; + version = "20180718.1101"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "019ed5cf8f1e1abfead7adceeda88938dfe928b7"; - sha256 = "0x6iw9dr3zvy2xqxadlxkjhpkfgig009x0ilipdji20hpa0qhhgm"; + rev = "97a26598a4d64f8339f7b12818d67425057235be"; + sha256 = "1bi9srxc91i81v863k5fpvgxhr7hkz22jbzwajgqbs0kx5jn7417"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9"; - name = "apropospriate-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2398,19 +3061,24 @@ license = lib.licenses.free; }; }) {}; - apt-sources-list = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + apt-sources-list = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "apt-sources-list"; - version = "20180311.437"; + ename = "apt-sources-list"; + version = "20180527.541"; src = fetchgit { url = "https://git.korewanetadesu.com/apt-sources-list.git"; - rev = "fd12fbacf245714be5ca20563572cb49e2f1eb45"; - sha256 = "0kfz9gj66a9wqcdrvxg4hzndmh1j01wqfqkdrblplgni4h7907a4"; + rev = "44112833b3fa7f4d7e43708e5996782e22bb2fa3"; + sha256 = "0av8v9ibqws5vb2sg3bfk0g1pyraqjgwmcg2n23whmpbl5xdnh6k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/141a22e593415302d64cf8ebd2635a1baf35eb38/recipes/apt-sources-list"; sha256 = "1gnl6zqv6imk2qpv4lj7qyjgf1ldxib3k14gsmwqm0c1zwjsid3j"; - name = "apt-sources-list"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2418,9 +3086,17 @@ license = lib.licenses.free; }; }) {}; - arch-packer = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + arch-packer = callPackage ({ async + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "arch-packer"; + ename = "arch-packer"; version = "20170730.621"; src = fetchFromGitHub { owner = "brotzeit"; @@ -2428,10 +3104,10 @@ rev = "940e96f7d357c6570b675a0f942181c787f1bfd7"; sha256 = "0m80ka51m7a1797q6br41x96znvqfmpwzh3vk4mz66mdx2r4xk77"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/arch-packer"; sha256 = "04kv22vpcpjhc047yz6k6dizmwwdjk6vcm8imri76gi9ns1w5n5z"; - name = "arch-packer"; + name = "recipe"; }; packageRequires = [ async dash emacs s ]; meta = { @@ -2439,9 +3115,13 @@ license = lib.licenses.free; }; }) {}; - archive-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + archive-region = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "archive-region"; + ename = "archive-region"; version = "20140201.1542"; src = fetchFromGitHub { owner = "rubikitch"; @@ -2449,10 +3129,10 @@ rev = "0d357d4c42a6a248c457f358f81b20fd20fede2f"; sha256 = "03pmwgvlxxlp4wh0sg5czpx1i88i43lz8lwdbfa6l28g1sv0f264"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/archive-region"; sha256 = "1aiz6a0vdc2zm2q5r80cj5xixqfhsgmr7ldj9ff40k4sf3z5xny3"; - name = "archive-region"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2460,20 +3140,25 @@ license = lib.licenses.free; }; }) {}; - archive-rpm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + archive-rpm = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "archive-rpm"; - version = "20171016.112"; + ename = "archive-rpm"; + version = "20180706.532"; src = fetchFromGitHub { owner = "legoscia"; repo = "archive-rpm"; - rev = "e2fac6c018c19001f1f28e7c80721724684f8941"; - sha256 = "1qq0z5mmbhd0ma8v8bxy53n6ynqz5qf9n3h7566dylmdncyyv7hw"; + rev = "59f83caebbd2f92fd634f6968e6d17b50ffa3dc7"; + sha256 = "11ssqaax4jl7r3z5agzmc74sjsfvl0m3xvp015ncqzpzysla47g3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5f5653e62afdc022eac30bda3d21bd2d2625d2e/recipes/archive-rpm"; sha256 = "0s53zbn71lb008gw3f0b5w4q0pw0vgiqbffgnyib24sh03ijl7z7"; - name = "archive-rpm"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2481,41 +3166,53 @@ license = lib.licenses.free; }; }) {}; - arduino-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + arduino-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , spinner }: + melpaBuild { pname = "arduino-mode"; - version = "20180305.1916"; + ename = "arduino-mode"; + version = "20180508.1736"; src = fetchFromGitHub { owner = "stardiviner"; repo = "arduino-mode"; - rev = "40bc53149b517ebfa448b07f0b766f24d612f716"; - sha256 = "0rh8rmi7y1a4myf6pa51qhr9sa1arjfbrr6rzbsdlwcbzinfj83f"; + rev = "e39cb1c02acb6676aea35f93fbd0d86badce6a38"; + sha256 = "1sg6n4ys5lq2m7q876qi88r11c08y05ggyv9r85ahins2pbgbv95"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2db785f52c2facc55459e945ccb4d4b088506747/recipes/arduino-mode"; sha256 = "1amqah0sx95866ikdlc7h7n9hmrwaqizc0rj0gliv15kjjggv55v"; - name = "arduino-mode"; + name = "recipe"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib emacs spinner ]; meta = { homepage = "https://melpa.org/#/arduino-mode"; license = lib.licenses.free; }; }) {}; - aria2 = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + aria2 = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aria2"; + ename = "aria2"; version = "20141107.1517"; src = fetchFromGitLab { owner = "ukaszg"; repo = "aria2"; - rev = "7a944c5100812269369225af7aa9580fedab175f"; - sha256 = "1pwnx6k7b35xhwqvzd3rl6rf5ydvbrrdmbadns8w0iyz2yafdxji"; + rev = "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0"; + sha256 = "1xkgz3l7idw5bk1xlffdaddf5v1q6fm3grbryl4xvssrbwgnyisf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89a55e7c313066ae1bc0db0af5c289814c85fcb1/recipes/aria2"; sha256 = "1gsqdqs3q86k7q88rf7qamc0sp5ca00xn9kr1r717vf6qq6a0c3c"; - name = "aria2"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2523,9 +3220,14 @@ license = lib.licenses.free; }; }) {}; - ariadne = callPackage ({ bert, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ariadne = callPackage ({ bert + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ariadne"; + ename = "ariadne"; version = "20131117.911"; src = fetchFromGitHub { owner = "manzyuk"; @@ -2533,10 +3235,10 @@ rev = "6fe401c7f996bcbc2f685e7971324c6f5e5eaf15"; sha256 = "0vh9wfc3657sd12ybjcrxpg6f757x2ghkcl1lw01szmyy5vmj27h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89635cd11621b04a8575629ec1bf196fb3ea5d43/recipes/ariadne"; sha256 = "0lfhving19wcfr40gjb2gnginiz8cncixiyyxhwx08lm84qb3a7p"; - name = "ariadne"; + name = "recipe"; }; packageRequires = [ bert ]; meta = { @@ -2544,9 +3246,13 @@ license = lib.licenses.free; }; }) {}; - arjen-grey-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + arjen-grey-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "arjen-grey-theme"; + ename = "arjen-grey-theme"; version = "20170522.1347"; src = fetchFromGitHub { owner = "credmp"; @@ -2554,10 +3260,10 @@ rev = "4cd0be72b65d42390e2105cfdaa408a1ead8d8d1"; sha256 = "1n5axwn498ahb6984ir1zfl8vvwgbvq9bbrdfzydkmjljhgrp0rd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9804061cfadd26c69bb1bfe63dbe22f916f723/recipes/arjen-grey-theme"; sha256 = "18q66f7hhys2ab9ljsdp9013mp7d6v6d1lrb0d1bb035r1b4pfj7"; - name = "arjen-grey-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2565,20 +3271,24 @@ license = lib.licenses.free; }; }) {}; - artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + artbollocks-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "artbollocks-mode"; + ename = "artbollocks-mode"; version = "20170523.2122"; src = fetchFromGitHub { owner = "sachac"; repo = "artbollocks-mode"; - rev = "33a41ca4f8206f57e5498a526d3b0ea18d08bb93"; - sha256 = "06a2dp6nwy8xjr01k6d2c611qr2n9m7hdkrz9fci9r4rv1ikx5xv"; + rev = "4a907e470bf345b88c3802c1241ce2b8cf4123ee"; + sha256 = "1l1dwhdfd5bwx92k84h5v47pv9my4p4wj0wq8hrwvwzwlv8dzn2w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode"; sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp"; - name = "artbollocks-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2586,9 +3296,13 @@ license = lib.licenses.free; }; }) {}; - arview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + arview = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "arview"; + ename = "arview"; version = "20160419.1409"; src = fetchFromGitHub { owner = "afainer"; @@ -2596,10 +3310,10 @@ rev = "5437b4221b64b238c273a651d4792c577dba6d45"; sha256 = "1yvirfmvf6v5khl7zhx2ddv9bbxnx1qhwfzi0gy2nmbxlykb6s2j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31574cd756f4f93e2c6bcad5eca33a3294cccd54/recipes/arview"; sha256 = "0d935lj0x3rbar94l7288xrgbcp1wmz6r2l0b7i89r5piczyiy1y"; - name = "arview"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2607,9 +3321,15 @@ license = lib.licenses.free; }; }) {}; - asilea = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + asilea = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "asilea"; + ename = "asilea"; version = "20150105.725"; src = fetchFromGitHub { owner = "Fanael"; @@ -2617,10 +3337,10 @@ rev = "2aab1cc63b64ef08d12e84fd7ba5c94065f6039f"; sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/858e673c66e876d80f41d47d307c944d7bdb147d/recipes/asilea"; sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j"; - name = "asilea"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2628,9 +3348,15 @@ license = lib.licenses.free; }; }) {}; - asn1-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + asn1-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "asn1-mode"; + ename = "asn1-mode"; version = "20170728.1926"; src = fetchFromGitHub { owner = "kawabata"; @@ -2638,10 +3364,10 @@ rev = "d5d4a8259daf708411699bcea85d322f18beb972"; sha256 = "067khpi4ghzyifrk1vhi57n3alp67qks4k4km11hasiavi5gsjmp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694baceceb54810be8f8c7152b2ac0b4063f01c/recipes/asn1-mode"; sha256 = "0iswisb08dqz7jc5ra4wcdhbmglildgyrb547dm5362xmvm9ifmy"; - name = "asn1-mode"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -2649,9 +3375,15 @@ license = lib.licenses.free; }; }) {}; - assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }: - melpaBuild { + assess = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , m-buffer + , melpaBuild }: + melpaBuild { pname = "assess"; + ename = "assess"; version = "20170504.657"; src = fetchFromGitHub { owner = "phillord"; @@ -2659,10 +3391,10 @@ rev = "e5b0415126c6bd24bd220759ff04220d963a0195"; sha256 = "04242jhrajd9qi9dzngv33730sqhymgr0f18hf92fgb2k5649lqk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess"; sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr"; - name = "assess"; + name = "recipe"; }; packageRequires = [ emacs m-buffer ]; meta = { @@ -2670,20 +3402,24 @@ license = lib.licenses.free; }; }) {}; - async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + async = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "async"; - version = "20180119.533"; + ename = "async"; + version = "20180527.1030"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "7279cc6bdba7bfcb53ca8f5471631ae8dc3918b3"; - sha256 = "1nmi2ykwbswj6qv2s38518nijmlhjd2jvhabybqs8smc152g58sw"; + rev = "6fa6a866b4b31908166e010ac60e77927bdbfc5a"; + sha256 = "0m4nwc032xhwx3k1948zs3nz80rxnr1qsfdqmbxwm5vyx9mmqm9n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; sha256 = "0s2qrmkqqfgi1ilzbj0rfk27f89p4dycdl1lqkbsm23j0zya53w4"; - name = "async"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2691,20 +3427,26 @@ license = lib.licenses.free; }; }) {}; - async-await = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, promise }: - melpaBuild { + async-await = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , promise }: + melpaBuild { pname = "async-await"; + ename = "async-await"; version = "20170208.350"; src = fetchFromGitHub { owner = "chuntaro"; repo = "emacs-async-await"; - rev = "56ab90e4019ed1f81fd4ad9e8701b5cec7ffa795"; - sha256 = "1k6wisls6dqn63r4f4brnhrjbvzqpigw2zxdl9v8g1qcw49spk5s"; + rev = "da472e38bb7b8eaeea3f81ffd13e4006c31e9e6f"; + sha256 = "02mqlf07bq24c4gg12zgyyg3a3dqnwygxkm70w7ziwr6hv05kzdh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74ecf94e5dbb46a939d26833b7cd0efd159ca1/recipes/async-await"; sha256 = "1534rhr4j74qbndafdj9q2wggcn8gphhjn3id8p27wyxr5sh93ms"; - name = "async-await"; + name = "recipe"; }; packageRequires = [ emacs promise ]; meta = { @@ -2712,9 +3454,15 @@ license = lib.licenses.free; }; }) {}; - at = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }: - melpaBuild { + at = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , queue }: + melpaBuild { pname = "at"; + ename = "@"; version = "20140707.520"; src = fetchFromGitHub { owner = "skeeto"; @@ -2722,10 +3470,10 @@ rev = "114dfe3761bf0c9dd89f794106c3a6a436ed06cc"; sha256 = "0rnnvr8x1czphbinby2z2dga7ikwgd13d7zhgmp3ggamzyaz6nf1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/@"; sha256 = "0da0xqk8fhz8aij3zmpp4bz3plpvfq2riyy17i7ny4ralxb3g08z"; - name = "at"; + name = "recipe"; }; packageRequires = [ emacs queue ]; meta = { @@ -2733,9 +3481,13 @@ license = lib.licenses.free; }; }) {}; - atom-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + atom-dark-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "atom-dark-theme"; + ename = "atom-dark-theme"; version = "20170710.1612"; src = fetchFromGitHub { owner = "whitlockjc"; @@ -2743,10 +3495,10 @@ rev = "7fb37fd953e417acbcf7dd3f36e3167bed9bc887"; sha256 = "040xp0nqa9akjv30kgnw6l1248g2cl5yzihhfwbr8cgywqfir1lw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1f565871559d6ea4ca4bb2fbaebce58f2f383eb/recipes/atom-dark-theme"; sha256 = "1ci61blm7wc83wm2iyax017ai4jljyag5j1mvw86rimmmjzr0v8f"; - name = "atom-dark-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2754,20 +3506,24 @@ license = lib.licenses.free; }; }) {}; - atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + atom-one-dark-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "atom-one-dark-theme"; - version = "20180305.1454"; + ename = "atom-one-dark-theme"; + version = "20180607.1638"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "7b73ab795286fe121d23026dcc94d6a0a211e4c4"; - sha256 = "1w5j773zg6lz8vq9yqfx2w5076h53k0narcnknni8hd8z4qg6b6q"; + rev = "d56b0db8d03fae2b47a6dbaadb5805105e394070"; + sha256 = "0bv80pg1bnpsv6j56ydlxm9h1cnicimcbwm1nw642fnf0zxw7p8g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; sha256 = "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw"; - name = "atom-one-dark-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2775,20 +3531,27 @@ license = lib.licenses.free; }; }) {}; - atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: - melpaBuild { + atomic-chrome = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , websocket }: + melpaBuild { pname = "atomic-chrome"; - version = "20180322.301"; + ename = "atomic-chrome"; + version = "20180617.24"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "d6577d61981a8bf293928eddaa6b83d22d59bd8c"; - sha256 = "0qi5g5js885hp0xkwib12zbz84sganb8lnrps48097zlkcxppm3p"; + rev = "a505f638866f9e7b913784be0dc84f338e9ad449"; + sha256 = "081465ahis2rvlklzn2vakbwn5dgr43ks4csp3arnlj11b43f3ai"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; sha256 = "0dx12mjdc4vhbvrcl61a7j247mgs71vvy0qqj6czbpfawfl46am9"; - name = "atomic-chrome"; + name = "recipe"; }; packageRequires = [ emacs let-alist websocket ]; meta = { @@ -2796,20 +3559,29 @@ license = lib.licenses.free; }; }) {}; - attrap = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: - melpaBuild { + attrap = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , s }: + melpaBuild { pname = "attrap"; - version = "20180218.1243"; + ename = "attrap"; + version = "20180715.1205"; src = fetchFromGitHub { owner = "jyp"; repo = "attrap"; - rev = "0a733deccaf48350511346b2f5a51d328df4dfc8"; - sha256 = "1ck6m30m76jad7w4mwnpv2gl0kzsjpjvmgjblc5a4gw1wsz3i2iz"; + rev = "65f6ad55ef967ef625ca48c2d03b4ea69bf37649"; + sha256 = "13vxa6gk4yccj5zhm927ilbpmn0dlkbdrbj3d42kphnximswpism"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7420eca80a8c1776d68b1f121511cc265cc70dc/recipes/attrap"; sha256 = "1gxnrlsn9xcnnx0nhjxnhrz9bdpk2kpzjhj8jhjmwws9y361fimh"; - name = "attrap"; + name = "recipe"; }; packageRequires = [ dash emacs f flycheck s ]; meta = { @@ -2817,20 +3589,25 @@ license = lib.licenses.free; }; }) {}; - auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auctex-latexmk = callPackage ({ auctex + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auctex-latexmk"; + ename = "auctex-latexmk"; version = "20170618.936"; src = fetchFromGitHub { owner = "tom-tan"; repo = "auctex-latexmk"; - rev = "4d353522650d7685acbf1d38f7dbc504f734bd84"; - sha256 = "0qvscgffmzqk8lkcg3yk91vciim5ygk2m4crk02qn72ipkw5q13m"; + rev = "64967712b1bbfac8069aa5940fddef938a692a1a"; + sha256 = "0syd65b6x6lz6as5ih5pldmwgbmq0v3d9pay2n04vqrvsij6m3qy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; sha256 = "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327"; - name = "auctex-latexmk"; + name = "recipe"; }; packageRequires = [ auctex ]; meta = { @@ -2838,9 +3615,15 @@ license = lib.licenses.free; }; }) {}; - auctex-lua = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }: - melpaBuild { + auctex-lua = callPackage ({ auctex + , fetchFromGitHub + , fetchurl + , lib + , lua-mode + , melpaBuild }: + melpaBuild { pname = "auctex-lua"; + ename = "auctex-lua"; version = "20151121.810"; src = fetchFromGitHub { owner = "vermiculus"; @@ -2848,10 +3631,10 @@ rev = "799cd8ac10c96991bb63d9aa60528ae5d8c786b5"; sha256 = "0lgfgvnaln5rhhwgcrzwrhbj0gz8sgaf6xxdl7njf3sa6bfgngsz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/102c7b05f5bfff12ac2820cae58c0205ca450559/recipes/auctex-lua"; sha256 = "0v999jvinljkvhbn205p36a6jfzppn0xvflvzr8mid1hnqlrpjhf"; - name = "auctex-lua"; + name = "recipe"; }; packageRequires = [ auctex lua-mode ]; meta = { @@ -2859,9 +3642,13 @@ license = lib.licenses.free; }; }) {}; - audio-notes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + audio-notes-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "audio-notes-mode"; + ename = "audio-notes-mode"; version = "20170611.1459"; src = fetchFromGitHub { owner = "Malabarba"; @@ -2869,10 +3656,10 @@ rev = "fa38350829c7e97257efc746a010471d33748a68"; sha256 = "1srg6rg3j9ri2cyr4g78dfqq3fhpn6hf3mq4iz2jfqjayppfv38b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/audio-notes-mode"; sha256 = "0q88xmi7jbrx47nvbbmwggbm6i7agzpnv5y7cpdh73lg165xsz2h"; - name = "audio-notes-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2880,9 +3667,16 @@ license = lib.licenses.free; }; }) {}; - aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + aurel = callPackage ({ bui + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aurel"; + ename = "aurel"; version = "20170114.137"; src = fetchFromGitHub { owner = "alezost"; @@ -2890,10 +3684,10 @@ rev = "fc7ad208f43f8525f84a18941c9b55f956df8961"; sha256 = "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel"; sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl"; - name = "aurel"; + name = "recipe"; }; packageRequires = [ bui dash emacs ]; meta = { @@ -2901,9 +3695,13 @@ license = lib.licenses.free; }; }) {}; - aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + aurora-config-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aurora-config-mode"; + ename = "aurora-config-mode"; version = "20180216.1502"; src = fetchFromGitHub { owner = "bdd"; @@ -2911,10 +3709,10 @@ rev = "8273ec7937a21b469b9dbb6c11714255b890f410"; sha256 = "1dlhf35hhjgkd9bqbpwrb825g1z6nh14mg31jg2avv55s28j0riy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode"; sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; - name = "aurora-config-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2922,20 +3720,25 @@ license = lib.licenses.free; }; }) {}; - auth-source-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auth-source-pass = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auth-source-pass"; - version = "20180326.8"; + ename = "auth-source-pass"; + version = "20180529.657"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "5690092e40c790384692d8e8da3451e6878d8c17"; - sha256 = "1dv202z8briifd4aqn8yvn4kd6zi1cabb2p86qcjj40lzkgn6w3p"; + rev = "303b96b2a4ced825390ac0a4f48c4151fe7a8150"; + sha256 = "0jhr6b2xrmki0l0hlmw4nxslky9vnym4lnq2y7pf81gj1zfk1h3f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass"; sha256 = "0icwdwz2zy3f9ynksr81pgq482iapsbx8lpyssiklyw0xgd1k8ak"; - name = "auth-source-pass"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2943,9 +3746,13 @@ license = lib.licenses.free; }; }) {}; - auto-async-byte-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-async-byte-compile = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-async-byte-compile"; + ename = "auto-async-byte-compile"; version = "20160915.2154"; src = fetchFromGitHub { owner = "rubikitch"; @@ -2953,10 +3760,10 @@ rev = "8681e74ddb8481789c5dbb3cafabb327db4c4484"; sha256 = "1g98gla9qdqmifsxakhkbxlljy2ln1s3wfahk9zycrwgzfjlsdf4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/auto-async-byte-compile"; sha256 = "0ks6xsxzayiyd0jl8m36xlc5p57p21qbhgq2mmz50a2lhpxxfiyg"; - name = "auto-async-byte-compile"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2964,9 +3771,15 @@ license = lib.licenses.free; }; }) {}; - auto-auto-indent = callPackage ({ cl-lib ? null, es-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-auto-indent = callPackage ({ cl-lib ? null + , es-lib + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-auto-indent"; + ename = "auto-auto-indent"; version = "20131106.1103"; src = fetchFromGitHub { owner = "sabof"; @@ -2974,10 +3787,10 @@ rev = "0139378577f936d34b20276af6f022fb457af490"; sha256 = "1whbvqylwnxg8d8gn55kcky39rgyc49rakyxlbkplh813lk6lxb7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ad2ea105b895cb958ce0ab2bf2fad2b40d41b2f/recipes/auto-auto-indent"; sha256 = "08s73pnyrmklb660jl5rshncpq31z3m9fl55v7453ch8syp7gzh7"; - name = "auto-auto-indent"; + name = "recipe"; }; packageRequires = [ cl-lib es-lib ]; meta = { @@ -2985,9 +3798,15 @@ license = lib.licenses.free; }; }) {}; - auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: - melpaBuild { + auto-compile = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , packed }: + melpaBuild { pname = "auto-compile"; + ename = "auto-compile"; version = "20180321.807"; src = fetchFromGitHub { owner = "emacscollective"; @@ -2995,10 +3814,10 @@ rev = "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f"; sha256 = "013vw4sgw6hpz7kskilndv7i7ik40asrkgicghjbygwk0lj5ran3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf"; - name = "auto-compile"; + name = "recipe"; }; packageRequires = [ emacs packed ]; meta = { @@ -3006,9 +3825,15 @@ license = lib.licenses.free; }; }) {}; - auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + auto-complete = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "auto-complete"; + ename = "auto-complete"; version = "20170124.1845"; src = fetchFromGitHub { owner = "auto-complete"; @@ -3016,10 +3841,10 @@ rev = "2e83566ddfa758c69afe50b8a1c62a66f47471e3"; sha256 = "1rkqjq7wr4aavg08i8mq13w85z14xdhfmpbipj5mhwlpyrrci4bk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete"; sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3"; - name = "auto-complete"; + name = "recipe"; }; packageRequires = [ cl-lib popup ]; meta = { @@ -3027,9 +3852,15 @@ license = lib.licenses.free; }; }) {}; - auto-complete-auctex = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + auto-complete-auctex = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "auto-complete-auctex"; + ename = "auto-complete-auctex"; version = "20140223.958"; src = fetchFromGitHub { owner = "monsanto"; @@ -3037,10 +3868,10 @@ rev = "855633f668bcc4b9408396742a7cb84e0c4a2f77"; sha256 = "1wri8q5llpy1q1h4ac4kjnnkgj6fby8i9vrpr6mrb13d4gnk4gr2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77167fb2e84bed32ace9490c1ed4148719e4cf8e/recipes/auto-complete-auctex"; sha256 = "00npvryds5wd3d5a13r9prlvw6vvjlag8d32x5xf9bfmmvs0fgqh"; - name = "auto-complete-auctex"; + name = "recipe"; }; packageRequires = [ auto-complete yasnippet ]; meta = { @@ -3048,9 +3879,14 @@ license = lib.licenses.free; }; }) {}; - auto-complete-c-headers = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-complete-c-headers = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-complete-c-headers"; + ename = "auto-complete-c-headers"; version = "20150911.2023"; src = fetchFromGitHub { owner = "mooz"; @@ -3058,10 +3894,10 @@ rev = "52fef720c6f274ad8de52bef39a343421006c511"; sha256 = "12mzi6bwg702sp0f0wd1ag555blbpk252rr9rqs03bn8pkw89h4n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0174b70fec45ddec9c1e9555adc82fef59054135/recipes/auto-complete-c-headers"; sha256 = "02pkrxvzrpyjrr2fkxnl1qw06aspzv8jlp2c1piln6zcjd92l3j7"; - name = "auto-complete-c-headers"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -3069,9 +3905,14 @@ license = lib.licenses.free; }; }) {}; - auto-complete-chunk = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-complete-chunk = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-complete-chunk"; + ename = "auto-complete-chunk"; version = "20140225.146"; src = fetchFromGitHub { owner = "tkf"; @@ -3079,10 +3920,10 @@ rev = "a9aa77ffb84a1037984a7ce4dda25074272f13fe"; sha256 = "1zhbpxpl443ghpkl9i68jcjfcw1vnf8ky06pf5qjjmqbxlcyd9li"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/306e2528638d97c28372df55a9376750d3fde1d4/recipes/auto-complete-chunk"; sha256 = "1937j1xm20vfcqm9ig4nvciqfkz7rpw0nsfhlg69gkmv0nqszdr3"; - name = "auto-complete-chunk"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -3090,9 +3931,14 @@ license = lib.licenses.free; }; }) {}; - auto-complete-clang = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-complete-clang = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-complete-clang"; + ename = "auto-complete-clang"; version = "20140409.52"; src = fetchFromGitHub { owner = "brianjcj"; @@ -3100,10 +3946,10 @@ rev = "a195db1d0593b4fb97efe50885e12aa6764d998c"; sha256 = "12y6f47xbjl4gy14j2f5wlisy5vl6rhx74n27w61pjv38m0a7mi1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eab7d88a893fdf76c22f0aa5ac3577efd60fc9b4/recipes/auto-complete-clang"; sha256 = "1rnmphl7ml5ryjl5ka2l58hddir8b34iz1rm905wdwh164piljva"; - name = "auto-complete-clang"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -3111,20 +3957,24 @@ license = lib.licenses.free; }; }) {}; - auto-complete-clang-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-complete-clang-async = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-complete-clang-async"; + ename = "auto-complete-clang-async"; version = "20130526.814"; src = fetchFromGitHub { owner = "Golevka"; repo = "emacs-clang-complete-async"; - rev = "5d9c5cabbb6b31e0ac3637631c0c8b25184aa8b4"; - sha256 = "1sw0wxrjcjqk0w1llfj376g6axa5bnk2lq2vv66746bkz14h0s8f"; + rev = "5eb63c8a1e4ca3af124baf0f8f801b949888f9b8"; + sha256 = "09f8hqs9n13lkb7b352ig07b9xm1w0mbbnqfy2s5cw4cppmakf2n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23aa24b025216359c5e600eee2f2cd4ecc7556e3/recipes/auto-complete-clang-async"; sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh"; - name = "auto-complete-clang-async"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3132,20 +3982,26 @@ license = lib.licenses.free; }; }) {}; - auto-complete-distel = callPackage ({ auto-complete, distel-completion-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-complete-distel = callPackage ({ auto-complete + , distel-completion-lib + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-complete-distel"; + ename = "auto-complete-distel"; version = "20160815.2300"; src = fetchFromGitHub { owner = "sebastiw"; repo = "distel-completion"; - rev = "2ba4eea51cecfa75cf62f58180460ee9ff43131f"; - sha256 = "1761lgplngmpn1vd8syc1h4g6q1dhngamz1j3n48z07c1ylzpkdd"; + rev = "340c9c11939d5f220db05e55388bf3cb606fd190"; + sha256 = "0ji1wi3s4pgkvrg2vzycmvqfc5jwmcd9zrpxhsgszr5jxp8z0bpb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/auto-complete-distel"; sha256 = "0ca242gl8dl4rmg8qqyhgxvf46fprl2npbq2w8f6s546s9nql4jk"; - name = "auto-complete-distel"; + name = "recipe"; }; packageRequires = [ auto-complete distel-completion-lib ]; meta = { @@ -3153,9 +4009,14 @@ license = lib.licenses.free; }; }) {}; - auto-complete-exuberant-ctags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-complete-exuberant-ctags = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-complete-exuberant-ctags"; + ename = "auto-complete-exuberant-ctags"; version = "20140320.24"; src = fetchFromGitHub { owner = "k1LoW"; @@ -3163,10 +4024,10 @@ rev = "ff6121ff8b71beb5aa606d28fd389c484ed49765"; sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1cc9786ed8cea2461b592f860d8e2a0897c57068/recipes/auto-complete-exuberant-ctags"; sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd"; - name = "auto-complete-exuberant-ctags"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -3174,9 +4035,14 @@ license = lib.licenses.free; }; }) {}; - auto-complete-nxml = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-complete-nxml = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-complete-nxml"; + ename = "auto-complete-nxml"; version = "20140220.2058"; src = fetchFromGitHub { owner = "aki2o"; @@ -3184,10 +4050,10 @@ rev = "ac7b09a23e45f9bd02affb31847263de4180163a"; sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c89dcbf03a802a4361e44174a332a312e352be36/recipes/auto-complete-nxml"; sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a"; - name = "auto-complete-nxml"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -3195,20 +4061,27 @@ license = lib.licenses.free; }; }) {}; - auto-complete-pcmp = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + auto-complete-pcmp = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "auto-complete-pcmp"; + ename = "auto-complete-pcmp"; version = "20140226.2251"; src = fetchFromGitHub { owner = "aki2o"; repo = "auto-complete-pcmp"; - rev = "2595d3dab1ef3549271ca922f212928e9d830eec"; - sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26"; + rev = "dc5c0af834d327dd686d74a4171e5d9170007a6c"; + sha256 = "0ygak7hypc27d0wvciksnmg8c5njw2skf1ml60vs63a1krkax63i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f5c53a8aeaaab23e032a8e7cb5cad7e531a1662c/recipes/auto-complete-pcmp"; sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna"; - name = "auto-complete-pcmp"; + name = "recipe"; }; packageRequires = [ auto-complete log4e yaxception ]; meta = { @@ -3216,9 +4089,14 @@ license = lib.licenses.free; }; }) {}; - auto-complete-rst = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-complete-rst = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-complete-rst"; + ename = "auto-complete-rst"; version = "20140225.144"; src = fetchFromGitHub { owner = "tkf"; @@ -3226,10 +4104,10 @@ rev = "4803ce41a96224e6fa54e6741a5b5f40ebed7351"; sha256 = "107svb82cgfns9kcrmy3hh56cab81782jkbz5i9959ms81xizfb8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c948dc47f67aa47a1607cbdacdc95241d1a658f/recipes/auto-complete-rst"; sha256 = "0dazkpnzzr0imb2a01qq8l60jxhhlknzjx7wccnbm7d2rk3338m6"; - name = "auto-complete-rst"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -3237,9 +4115,15 @@ license = lib.licenses.free; }; }) {}; - auto-complete-sage = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }: - melpaBuild { + auto-complete-sage = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sage-shell-mode }: + melpaBuild { pname = "auto-complete-sage"; + ename = "auto-complete-sage"; version = "20160514.51"; src = fetchFromGitHub { owner = "stakemori"; @@ -3247,10 +4131,10 @@ rev = "51b8e3905196d266e1f8aa47881189833151b398"; sha256 = "139in1jgxg43v7ji4i1qmxbgspr71h95lzlz0fvdk78vkxc5842b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1cd78dcd58d559c47873f8fcfcab089a8493dd6/recipes/auto-complete-sage"; sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1"; - name = "auto-complete-sage"; + name = "recipe"; }; packageRequires = [ auto-complete sage-shell-mode ]; meta = { @@ -3258,9 +4142,13 @@ license = lib.licenses.free; }; }) {}; - auto-dictionary = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-dictionary = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-dictionary"; + ename = "auto-dictionary"; version = "20150410.910"; src = fetchFromGitHub { owner = "nschum"; @@ -3268,10 +4156,10 @@ rev = "b364e08009fe0062cf0927d8a0582fad5a12b8e7"; sha256 = "0rfjx0x2an28821shgb4v5djza4kwn5nnrsl2cvh3px4wrvw3izp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1711d710ac09fe407fde89ee351ccdcb78555d35/recipes/auto-dictionary"; sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16"; - name = "auto-dictionary"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3279,20 +4167,24 @@ license = lib.licenses.free; }; }) {}; - auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-dim-other-buffers = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-dim-other-buffers"; - version = "20170925.1208"; + ename = "auto-dim-other-buffers"; + version = "20180612.1641"; src = fetchFromGitHub { owner = "mina86"; repo = "auto-dim-other-buffers.el"; - rev = "d1ee176652d7f5a77608e54175b7e67c31d41381"; - sha256 = "1qqb051b16z2ay1xqx2ncy2p07cs29dv6wdy1x3n3w85yw9kh0mx"; + rev = "ec74b4803adeadf06296c84595fb6ccf4e1b4a3f"; + sha256 = "0l08kx12k97nag8khb63rz5fl1r9gahgmjg5073h25lypl74895n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/auto-dim-other-buffers"; sha256 = "0n9d23sfcmkjfqlm80vrgf856wy08ak4n4rk0z7vadq07yj46zxh"; - name = "auto-dim-other-buffers"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3300,9 +4192,13 @@ license = lib.licenses.free; }; }) {}; - auto-highlight-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-highlight-symbol = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-highlight-symbol"; + ename = "auto-highlight-symbol"; version = "20130313.243"; src = fetchFromGitHub { owner = "gennad"; @@ -3310,10 +4206,10 @@ rev = "26573de912d760e04321b350897aea70958cee8b"; sha256 = "0jfiax1qqnyznhlnqkjsr9nnv7fpjywvfhj9jq59460j0nbrgs5c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fdf73ee62f0a4e762e3a1aa94284abea8da8ce7c/recipes/auto-highlight-symbol"; sha256 = "02mkji4sxym07jf5ww5kgv1c18x0xdfn8cmvgns5h4gij64lnr66"; - name = "auto-highlight-symbol"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3321,9 +4217,13 @@ license = lib.licenses.free; }; }) {}; - auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-indent-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-indent-mode"; + ename = "auto-indent-mode"; version = "20171221.2106"; src = fetchFromGitHub { owner = "mattfidler"; @@ -3331,10 +4231,10 @@ rev = "28069360a7f89ad0286fd6a53db550752ec58488"; sha256 = "14sqmv320ryfljpxbjw9xphj6bz1ccjk3ih4cm1r8aryyhxiacii"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49af78177278e7072c70fde0eaa5bb82490ebe9d/recipes/auto-indent-mode"; sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz"; - name = "auto-indent-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3342,20 +4242,25 @@ license = lib.licenses.free; }; }) {}; - auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-minor-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-minor-mode"; - version = "20180401.245"; + ename = "auto-minor-mode"; + version = "20180527.423"; src = fetchFromGitHub { owner = "joewreschnig"; repo = "auto-minor-mode"; - rev = "c0aa31d9385ec809969288d0029c7a6db319690f"; - sha256 = "0fzw91d1ysv82g2mfwc5f1a1zq1ih9f6i26hk9jyyqp5izx9ydfw"; + rev = "c62f4e04c7b73835c399f0348bea0ade2720bcbb"; + sha256 = "0vqqy6nbb884h8qhzqvjycvfqbm9pbhqxr3dlxrhfx8m6c3iasq1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; sha256 = "1dpdylrpw1pvlmhh229b3lqs07drx9kdhw4vcv5a48qah14dz6qa"; - name = "auto-minor-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -3363,9 +4268,14 @@ license = lib.licenses.free; }; }) {}; - auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-org-md = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-org-md"; + ename = "auto-org-md"; version = "20180213.1543"; src = fetchFromGitHub { owner = "jamcha-aa"; @@ -3373,10 +4283,10 @@ rev = "9318338bdb7fe8bd698d88f3af89b2d6413efdd2"; sha256 = "1dzxc1f4yvj8xww5drcpzmn3fyi8ziimh1cmy6l3i399l1zl0njj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39f934f86b5dc04078c204bcbd268af60857e268/recipes/auto-org-md"; sha256 = "1yh9g8407kym6r0b8kr18qshxlrkw47ac17a9lvql0ksshfmnqvk"; - name = "auto-org-md"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -3384,20 +4294,26 @@ license = lib.licenses.free; }; }) {}; - auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-package-update = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-package-update"; - version = "20180323.1547"; + ename = "auto-package-update"; + version = "20180712.1345"; src = fetchFromGitHub { owner = "rranelli"; repo = "auto-package-update.el"; - rev = "85c64d11ccfffd58527ef39cac390a88c5b6d979"; - sha256 = "0pg9qw63ii4268hwzz7sj9g6rkmxr956849fpa2rwbfzfhjmns2f"; + rev = "55870d313fbe9db40b1a2b59dbc420ba66a9297e"; + sha256 = "06hnr7id7w774adip0yffxh6c2xk27j2kch03r8y0v19mnfrvb39"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78f549a299a06941edce13381f597f3a61e8c723/recipes/auto-package-update"; sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k"; - name = "auto-package-update"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -3405,9 +4321,14 @@ license = lib.licenses.free; }; }) {}; - auto-pause = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-pause = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-pause"; + ename = "auto-pause"; version = "20160426.516"; src = fetchFromGitHub { owner = "lujun9972"; @@ -3415,10 +4336,10 @@ rev = "a4d778de774ca3895542cb559a953e0d98657338"; sha256 = "1pxhqwvg059pslin6z87jd8d0q44ljwvdn6y23ffrz9kfpn3m5m2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/275d1b1bf1eb47cd9c769286c03b2b9aff9d74dd/recipes/auto-pause"; sha256 = "0cdak2kicxylj5f161kia0bzzqad426y8cj4zf04gcl0nndijyrc"; - name = "auto-pause"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -3426,20 +4347,25 @@ license = lib.licenses.free; }; }) {}; - auto-read-only = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-read-only = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-read-only"; + ename = "auto-read-only"; version = "20170305.2043"; src = fetchFromGitHub { owner = "zonuexe"; repo = "auto-read-only.el"; - rev = "79654f8fc024f383ae7af05487c1345738236500"; - sha256 = "123822s9xkzw25swn1h1szxmmajnn9rq85vasygvy5cn2l6lar3l"; + rev = "20e26d9eb017e6ab61fbd53f2ac2511b0afe3446"; + sha256 = "140w3gdbvyajy9rq82mc24mk7zsvhq4wc8yrrdwlzhzmqaflcz76"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/189e394eb9fac09783c75ff1b64facdd745a0454/recipes/auto-read-only"; sha256 = "1cvh2c7pgdxgnl0fr1lymz9pf573hj6dn8cjcb64wdczkrci7yk5"; - name = "auto-read-only"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -3447,9 +4373,13 @@ license = lib.licenses.free; }; }) {}; - auto-save-buffers-enhanced = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-save-buffers-enhanced = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-save-buffers-enhanced"; + ename = "auto-save-buffers-enhanced"; version = "20161108.2310"; src = fetchFromGitHub { owner = "kentaro"; @@ -3457,10 +4387,10 @@ rev = "461e8c816c1b7c650be5f209078b381fe55da8c6"; sha256 = "0ckjijjpqpbv9yrqfnl3x9hcdwwdgvm5r2vyx1a9nk4d3i0hd9i5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d221a217e9f6a686fa2a8b120a1f0b43c4482ce6/recipes/auto-save-buffers-enhanced"; sha256 = "123vf6nnvdhrrfjn8n8h8a11mkqmy2zm3w3yn99np0zj31x8z7bb"; - name = "auto-save-buffers-enhanced"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3468,9 +4398,15 @@ license = lib.licenses.free; }; }) {}; - auto-shell-command = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: - melpaBuild { + auto-shell-command = callPackage ({ deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popwin }: + melpaBuild { pname = "auto-shell-command"; + ename = "auto-shell-command"; version = "20160603.1938"; src = fetchFromGitHub { owner = "ongaeshi"; @@ -3478,10 +4414,10 @@ rev = "454b75a07b663095334381d5bf5625c7f136f743"; sha256 = "0ahiy5cv3a632wfiar28186l0dgibafx5jaw9nrp4h5sqkbyvmjn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea710bfa77fee7c2688eea8258ca9d2105d1896e/recipes/auto-shell-command"; sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j"; - name = "auto-shell-command"; + name = "recipe"; }; packageRequires = [ deferred popwin ]; meta = { @@ -3489,20 +4425,26 @@ license = lib.licenses.free; }; }) {}; - auto-sudoedit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-sudoedit = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-sudoedit"; - version = "20171227.156"; + ename = "auto-sudoedit"; + version = "20180428.2343"; src = fetchFromGitHub { owner = "ncaq"; repo = "auto-sudoedit"; - rev = "5a6f7da018fbb880c4c51032b39d7628a478989c"; - sha256 = "190izcami97h2yzw267crs0xny494b9b58dmmb7bqslv38ayl396"; + rev = "5a770615fe2989b3b7cb1435d0e65fa672d775d7"; + sha256 = "0pbbw4lx1k8l5x4bycqymb5s2x2739diw8nbqk9ikxqhyjn4sv67"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cf6bc8bb7b618d74427622b9b2812daa79a3767/recipes/auto-sudoedit"; sha256 = "1clp52fqxsilyi62p1cabhan55lbwax6fqlhccyjbl36yrdig3fh"; - name = "auto-sudoedit"; + name = "recipe"; }; packageRequires = [ emacs f ]; meta = { @@ -3510,20 +4452,27 @@ license = lib.licenses.free; }; }) {}; - auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }: - melpaBuild { + auto-virtualenv = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pyvenv + , s }: + melpaBuild { pname = "auto-virtualenv"; + ename = "auto-virtualenv"; version = "20170125.1117"; src = fetchFromGitHub { owner = "marcwebbie"; repo = "auto-virtualenv"; - rev = "3826db66b417788e2b2eb138717255b1f52a55c3"; - sha256 = "12691m4z0zr3prmdhmjlpcx0ajj1ddrbj9gy827xmgr0vaqbr7b2"; + rev = "fd98a2d34cb6828e59317a50f8763ee1fd672b00"; + sha256 = "1fsigqngd9a2zkkwzz86ynpr8gvm56329clw8zb8vq0058rdxsjk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ccb91515d9a8195061429ed8df3471867d211f9a/recipes/auto-virtualenv"; sha256 = "0xv51g74l5pxa3s185867dpc98m6y26xbj5wgz7f9177qchvdbhk"; - name = "auto-virtualenv"; + name = "recipe"; }; packageRequires = [ cl-lib pyvenv s ]; meta = { @@ -3531,20 +4480,27 @@ license = lib.licenses.free; }; }) {}; - auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }: - melpaBuild { + auto-virtualenvwrapper = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , virtualenvwrapper }: + melpaBuild { pname = "auto-virtualenvwrapper"; - version = "20170916.1304"; + ename = "auto-virtualenvwrapper"; + version = "20180408.310"; src = fetchFromGitHub { owner = "robert-zaremba"; repo = "auto-virtualenvwrapper.el"; - rev = "0f2cc8ea8f211c7b88f852ae6ffe677914652b92"; - sha256 = "1vm2nf7i9v56v57r7ckz8i1y3fk5s302bcfglywqysm4b8k36mp8"; + rev = "e2628408d4e67e1b1714cf7682cff9405e735c81"; + sha256 = "1cj4a6yay02gvi04lyhnfb7gws8jrappprnv36mcqlq053202wij"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper"; sha256 = "1v82z922d9sadwvyrl4iddsa19f5k43s6iwn8w146jcl0v42bkmd"; - name = "auto-virtualenvwrapper"; + name = "recipe"; }; packageRequires = [ cl-lib s virtualenvwrapper ]; meta = { @@ -3552,20 +4508,25 @@ license = lib.licenses.free; }; }) {}; - auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + auto-yasnippet = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "auto-yasnippet"; - version = "20160925.225"; + ename = "auto-yasnippet"; + version = "20180503.1208"; src = fetchFromGitHub { owner = "abo-abo"; repo = "auto-yasnippet"; - rev = "d1ccfea87312c6dd8cf8501ab5b71b1d3d44d95b"; - sha256 = "1i8k2qiyzd5rq0zplk4xb5nfa5mp0ibxbzwqj6c7877waq7244xk"; + rev = "438c160b94975e9332b4ae3845e986ae6166dd47"; + sha256 = "07i46xfphvsspd0ls5jjlch650h24h79yfvhbmizrpyrh3616smd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d33c0aee6a5d27217bbae28fc8f448c3badc8a4b/recipes/auto-yasnippet"; sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa"; - name = "auto-yasnippet"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -3573,20 +4534,26 @@ license = lib.licenses.free; }; }) {}; - autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + autobookmarks = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "autobookmarks"; - version = "20180131.535"; + ename = "autobookmarks"; + version = "20180531.1206"; src = fetchFromGitHub { owner = "Fuco1"; repo = "autobookmarks"; - rev = "93610f22500ac207f86e159d411de15082a8befb"; - sha256 = "1ydqc2ry43sibf8xa99w2w6prxh5gmlmcinp0z67yhdcz4dh4v2v"; + rev = "e971aa49d97da9f7ed760b37e0b674e45f1c5673"; + sha256 = "04453h3s9g7ka028s4f97z606czq3vsvphrmba533jkl8lk3hpi8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks"; sha256 = "11zhg3y9fb5mq67fwsnjrql9mnwkp3hwib7fpllb3yyf2yywc8zp"; - name = "autobookmarks"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -3594,9 +4561,13 @@ license = lib.licenses.free; }; }) {}; - autodisass-java-bytecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + autodisass-java-bytecode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "autodisass-java-bytecode"; + ename = "autodisass-java-bytecode"; version = "20151005.912"; src = fetchFromGitHub { owner = "gbalats"; @@ -3604,10 +4575,10 @@ rev = "3d61dbe266133c950b39e880f78d142751c7dc4c"; sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a094845521d76754a29435012af5fba9f7975a8e/recipes/autodisass-java-bytecode"; sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc"; - name = "autodisass-java-bytecode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3615,20 +4586,24 @@ license = lib.licenses.free; }; }) {}; - autodisass-llvm-bitcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + autodisass-llvm-bitcode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "autodisass-llvm-bitcode"; + ename = "autodisass-llvm-bitcode"; version = "20150410.1825"; src = fetchFromGitHub { owner = "gbalats"; repo = "autodisass-llvm-bitcode"; - rev = "d2579e3a1427af2dc947c343e49eb3434078bf04"; - sha256 = "1fq4h5fmamyh7z8nq6pigx74p5v8k3qfm64k66vwsm8bl5jdkw17"; + rev = "14bb1bfe2be3b04d6e0c87a7a9d1e88ce15506d0"; + sha256 = "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/657e8f6bd0e44f11db8480ca42fb29d85fc3ec29/recipes/autodisass-llvm-bitcode"; sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01"; - name = "autodisass-llvm-bitcode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3636,20 +4611,24 @@ license = lib.licenses.free; }; }) {}; - automargin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + automargin = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "automargin"; + ename = "automargin"; version = "20131112.14"; src = fetchFromGitHub { owner = "zk-phi"; repo = "automargin"; - rev = "4901d969ad69f5244e6300baab4ba04efed800c3"; - sha256 = "02nnyncfh6g0xizy7wa8721ahpnwk451kngd6n0y0249f50p3962"; + rev = "f0dce37b7ece368dd805e03b5e2af6e571038bc6"; + sha256 = "0p95kszsllkj11dyn9vq9ycp8mlir2mzh80gj5kwmkvd10s2s3c6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0937e63ec686cc3e183bddb029a514c64934fc81/recipes/automargin"; sha256 = "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8"; - name = "automargin"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3657,9 +4636,14 @@ license = lib.licenses.free; }; }) {}; - autopair = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + autopair = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "autopair"; + ename = "autopair"; version = "20160304.437"; src = fetchFromGitHub { owner = "capitaomorte"; @@ -3667,10 +4651,10 @@ rev = "2b6d72bccb0ebba6e7e711528872b898b0c65b0a"; sha256 = "09p56vi5zgm2djglimwyhv4n4gyydjndzn46vg9qzzlxvvmw66i1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/autopair"; sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28"; - name = "autopair"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -3678,20 +4662,24 @@ license = lib.licenses.free; }; }) {}; - autotest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + autotest = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "autotest"; - version = "20171128.1812"; + ename = "autotest"; + version = "20180323.1542"; src = fetchFromGitHub { owner = "zenspider"; repo = "elisp"; - rev = "ee8a9c3052446876057ff853369d136aea7831f5"; - sha256 = "15sla4n88003fclni5nhsrw3ib7bql11ks8pb7rgjyjddqrq274r"; + rev = "24ee17ae5023362758f0762bf711d5e470dcfe73"; + sha256 = "10al1r0fs6bpz4mfikyb9rm0zgpg56n12y0mv4kz856sdbzgllcv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc2c4a590cbeccfb43003972a78f5d76ec4a9e7/recipes/autotest"; sha256 = "0f46m5pc40i531dzfnhkcn192dcs1q20y083c1c0wg2zhjcdr5iy"; - name = "autotest"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3699,20 +4687,25 @@ license = lib.licenses.free; }; }) {}; - autotetris-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + autotetris-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "autotetris-mode"; + ename = "autotetris-mode"; version = "20141114.846"; src = fetchFromGitHub { owner = "skeeto"; repo = "autotetris-mode"; - rev = "dd490d5ad6d84bd964ab349484f6a2d05651ede1"; - sha256 = "162zay36mmkkpbfvp0lagv2js4cr1z75dc1z5l2505814m5sx3az"; + rev = "7d348d33829bc89ddbd2b4d5cfe5073c3b0cbaaa"; + sha256 = "14pjsb026mgjf6l3dggy255knr7c1vfmgb6kgafmkzvr96aglcdc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c5c698b7dfb179f43b9fdf4652b96e2d7f8e7c6/recipes/autotetris-mode"; sha256 = "0k4yq4pvrs1zaf9aqxmlb6l2v4k774zbxj4zcx49w3l1h8gwxpbb"; - name = "autotetris-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -3720,9 +4713,16 @@ license = lib.licenses.free; }; }) {}; - autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + autothemer = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "autothemer"; + ename = "autothemer"; version = "20170112.1324"; src = fetchFromGitHub { owner = "sebastiansturm"; @@ -3730,10 +4730,10 @@ rev = "8c467f57571c154129d660dfccebd151c998f2d9"; sha256 = "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d7beed6ba10d7aa6a36328a696ba2d0d21dc2/recipes/autothemer"; sha256 = "1lcyqfzx7qpkr3ajk0zi0mn32yvcwn06f61vhghn9c66xambsr7f"; - name = "autothemer"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -3741,20 +4741,24 @@ license = lib.licenses.free; }; }) {}; - autumn-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + autumn-light-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "autumn-light-theme"; + ename = "autumn-light-theme"; version = "20150515.747"; src = fetchFromGitHub { owner = "aalpern"; repo = "emacs-color-theme-autumn-light"; - rev = "1e3b2a43a3001e4a97a5ff073ba3f0d2ea3888f9"; - sha256 = "1lip7282g41ghn64dvx2ab437s83cj9l8ps1rd8rbhqyz4bx5wb9"; + rev = "26a52a79e7fff401af6d24c4365bb4a250c1136a"; + sha256 = "0nc71mxp57h5dnd1vrgc9vh0lrjzq5mfm8li4b11l2gpnbv4s4wi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52a7598dc550c76f4e081fe1c4a6d8697bd30561/recipes/autumn-light-theme"; sha256 = "0g3wqv1yw3jycq30mcj3w4sn9nj6i6gyd2ljzimf547ggcai536a"; - name = "autumn-light-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3762,9 +4766,13 @@ license = lib.licenses.free; }; }) {}; - avandu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + avandu = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "avandu"; + ename = "avandu"; version = "20170101.1103"; src = fetchFromGitHub { owner = "ryuslash"; @@ -3772,10 +4780,10 @@ rev = "f44588d8e747fa880411cb4542cc39962252b90a"; sha256 = "097wls9k6qrf12nn8mpszfbqsaqc81956yqxns1sjs6dmjqi0c7z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1344e49e6a41ce390a047cb8d48090160b37b50/recipes/avandu"; sha256 = "174bd3vbvh0l9282bg8575nqc71zkg90bwbxbv1b7dz8qaaczhcy"; - name = "avandu"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3783,20 +4791,24 @@ license = lib.licenses.free; }; }) {}; - avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + avk-emacs-themes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "avk-emacs-themes"; - version = "20180205.2254"; + ename = "avk-emacs-themes"; + version = "20180406.2220"; src = fetchFromGitHub { owner = "avkoval"; repo = "avk-emacs-themes"; - rev = "1a119d0b52f0755fa14ad4d8c6e00e2e720b7732"; - sha256 = "1im1bvrcy9163414328yfmsz2hb0whqxnd6wpmh8hvh6vpbmwaj7"; + rev = "6abf91ecdaeb16a3a5529b0d5abef9756da1f68c"; + sha256 = "0hvg8yp7prfl1n71lkyr9l43f3zm1zsh8n2mh26rmdw2chippr4d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes"; sha256 = "0yimnfm50qsq505fc67b3qnxx2aiyz5a7bw87zkjrdnar12vv144"; - name = "avk-emacs-themes"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3804,20 +4816,26 @@ license = lib.licenses.free; }; }) {}; - avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + avy = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "avy"; - version = "20180322.1333"; + ename = "avy"; + version = "20180615.801"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "2d613eb050d94c1cdfb403da7446883ce6d35baa"; - sha256 = "1dmn94bigw5xnxbwmrlyj810iqjgcvqp3qlsgszj6cbg2pv75sqf"; + rev = "7c40f5e3811716b05d87a06096b190f7cf7bdc45"; + sha256 = "06bqsg9vnjyqdmn2dpy4f17b0bs57w0gg77ahyafsawlp77fz7z9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag"; - name = "avy"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3825,9 +4843,17 @@ license = lib.licenses.free; }; }) {}; - avy-flycheck = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }: - melpaBuild { + avy-flycheck = callPackage ({ avy + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "avy-flycheck"; + ename = "avy-flycheck"; version = "20160720.800"; src = fetchFromGitHub { owner = "magicdirac"; @@ -3835,10 +4861,10 @@ rev = "5522f3bbbed1801d9278ed696ec0cbba38352985"; sha256 = "1nwc8xid0k6bnnpgsrrlwx71a04llkiapjsbchp9jgcf11l5mghw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05755bed49219072d2ec98f0be5ecba4deda7cd1/recipes/avy-flycheck"; sha256 = "0xvgysbx8yxhypms6639kk3cn0x6y6njnhnn9lf6hxsi96wd9y96"; - name = "avy-flycheck"; + name = "recipe"; }; packageRequires = [ avy emacs flycheck seq ]; meta = { @@ -3846,20 +4872,26 @@ license = lib.licenses.free; }; }) {}; - avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + avy-menu = callPackage ({ avy + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "avy-menu"; + ename = "avy-menu"; version = "20171231.2220"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; - rev = "b133564cc438870d9b5505c8104611c8998fd0d5"; - sha256 = "19xqs4hyd5wkh0vd3xfbfwhf8fhq5lbzrafx4fbvai24dhjn5rhb"; + rev = "990cc94d708c923f761be083b3a57f6f844566c8"; + sha256 = "0kjxfg8wx5c8cixazih24s0mv4crk648v9bb6pd1i6lmh266rc6g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw"; - name = "avy-menu"; + name = "recipe"; }; packageRequires = [ avy emacs ]; meta = { @@ -3867,20 +4899,27 @@ license = lib.licenses.free; }; }) {}; - avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: - melpaBuild { + avy-migemo = callPackage ({ avy + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , migemo }: + melpaBuild { pname = "avy-migemo"; - version = "20180104.624"; + ename = "avy-migemo"; + version = "20180716.755"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "526494a2ae86b66a22848e5dc274480e3b4d04ca"; - sha256 = "04fkgiixfd0xgb2m0b48ngv2fmvz2vnjajfl1b59paczz8pnw96l"; + rev = "922a6dd82c0bfa316b0fbb56a9d4dd4ffa5707e7"; + sha256 = "1a4421h15ba7lsnbh8kqm3hvs06fp830wb1nvwgpsk7vmqqi2qgl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296"; - name = "avy-migemo"; + name = "recipe"; }; packageRequires = [ avy emacs migemo ]; meta = { @@ -3888,9 +4927,14 @@ license = lib.licenses.free; }; }) {}; - avy-zap = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + avy-zap = callPackage ({ avy + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "avy-zap"; + ename = "avy-zap"; version = "20160921.1444"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -3898,10 +4942,10 @@ rev = "6081738668ab726099ce1c711c580d9745dfaede"; sha256 = "0byanv32kxsd1lzvyq82xmyfx4drx5j5i10whyyq8a5hhvrpg1qy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10a2a57c78ac1d8ab621031caa21e8574daeb9a0/recipes/avy-zap"; sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx"; - name = "avy-zap"; + name = "recipe"; }; packageRequires = [ avy ]; meta = { @@ -3909,9 +4953,16 @@ license = lib.licenses.free; }; }) {}; - aws-ec2 = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tblui }: - melpaBuild { + aws-ec2 = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tblui }: + melpaBuild { pname = "aws-ec2"; + ename = "aws-ec2"; version = "20161007.1214"; src = fetchFromGitHub { owner = "Yuki-Inoue"; @@ -3919,10 +4970,10 @@ rev = "5601d4f268fc34b86a02ca90cde7d3771619a368"; sha256 = "15idbbxsghzn737s9jppnx820nnm1srcl1418458hwfy3wqhq38g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90ac00160cbf692baa1f3953122ac828356944e0/recipes/aws-ec2"; sha256 = "040c69g8rhpcmrdjjg4avdmqarxx3dfzylmz62yxhfpn02qh48xd"; - name = "aws-ec2"; + name = "recipe"; }; packageRequires = [ dash emacs tblui ]; meta = { @@ -3930,20 +4981,25 @@ license = lib.licenses.free; }; }) {}; - aws-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + aws-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "aws-snippets"; - version = "20180213.835"; + ename = "aws-snippets"; + version = "20180410.845"; src = fetchFromGitHub { owner = "baron42bba"; repo = "aws-snippets"; - rev = "619c9a401f873042e45547e8cf57f23d0c8947e4"; - sha256 = "19yrdsn76vscqgxmapxn3gv6nrxp7i20p37anylmjss3xkvblxn9"; + rev = "a2ebae582a8c8a5f5f16dbc42ecd2ded9d70fca8"; + sha256 = "08mbi5g321n4ir7a7ggxmh7qpl8pr06pg4rcsk8pklylvkf89k2w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/485aa401a6a14cd4a916474d9a7df12cdf45d591/recipes/aws-snippets"; sha256 = "1p2il4ig3nafsapa87hgghw6ri9d5qqi0hl8zjyypa06rcnag9g9"; - name = "aws-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -3951,19 +5007,24 @@ license = lib.licenses.free; }; }) {}; - axiom-environment = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + axiom-environment = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "axiom-environment"; + ename = "axiom-environment"; version = "20180401.1257"; src = fetchgit { url = "https://bitbucket.org/pdo/axiom-environment"; rev = "6842fb7f85df839acde395093647e2f91cf62fdd"; sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/axiom-environment"; sha256 = "1hzfxdwhgv0z9136k7bdjhqjrkawsjmvqch6za6p7nkpd9ikr2zb"; - name = "axiom-environment"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -3971,9 +5032,13 @@ license = lib.licenses.free; }; }) {}; - babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + babel = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "babel"; + ename = "babel"; version = "20161122.2340"; src = fetchFromGitHub { owner = "juergenhoetzel"; @@ -3981,10 +5046,10 @@ rev = "d4212e25fcbd22b8e38be13936f937a2963d34a9"; sha256 = "0lxiavjs2fbwlqbmkl2hssjzv8a8baa8vvqqfnprhnipngkkgdaf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0d748fa06b3cbe336cb01a7e3ed7b0421d885cc/recipes/babel"; sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c"; - name = "babel"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3992,20 +5057,25 @@ license = lib.licenses.free; }; }) {}; - babel-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + babel-repl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "babel-repl"; + ename = "babel-repl"; version = "20160504.1501"; src = fetchFromGitHub { owner = "hung-phan"; repo = "babel-repl"; - rev = "e619c16e349a1ee7bd0ee0d7f3650d33bff73fc3"; - sha256 = "1174r0gjpn5z3pnf32qlpqhmdfvskcd2vqgicvmqzjsrysj3fypn"; + rev = "0faa2f6518a2b46236f116ca1736a314f7d9c034"; + sha256 = "0sp0ja0346k401q5zpx3zl4pnxp4ml2jqkgk7z8i08rhdbp0c4nr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd4ac01ea16fcbc6e9343a953a2f278c5874d3d/recipes/babel-repl"; sha256 = "0h11i8w8s4ia1x0lm5n7bnc3db4bv0a7f7hzl27qrg38m3c7dl6x"; - name = "babel-repl"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4013,9 +5083,19 @@ license = lib.licenses.free; }; }) {}; - back-button = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, nav-flash, pcache, persistent-soft, smartrep, ucs-utils }: - melpaBuild { + back-button = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , list-utils + , melpaBuild + , nav-flash + , pcache + , persistent-soft + , smartrep + , ucs-utils }: + melpaBuild { pname = "back-button"; + ename = "back-button"; version = "20150804.1304"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -4023,10 +5103,10 @@ rev = "98d92984a740acd1547bd7ed05cca0affdb21c3e"; sha256 = "0rj6a8rdwa0h2ckz7h4d91hnxqcin98l4ikbfyak2whfb47z909l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/back-button"; sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85"; - name = "back-button"; + name = "recipe"; }; packageRequires = [ list-utils @@ -4041,9 +5121,39 @@ license = lib.licenses.free; }; }) {}; - backup-each-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + backlight = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "backlight"; + ename = "backlight"; + version = "20180629.1459"; + src = fetchFromGitHub { + owner = "mschuldt"; + repo = "backlight.el"; + rev = "096e632bf100d318754d6c961c90ebb0ef29dce5"; + sha256 = "0w9ng4rhsawcf96mnpy71h50j4mankmvjnfknxlmwiwlmx4sp0f1"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4b33ef75760ff02983d8c4c6f98621bb441751c3/recipes/backlight"; + sha256 = "0gzshxs9vw5wrb6pnxdaw5q4c8i0vsmc7wb0y2jyhxsr81mlxdpi"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/backlight"; + license = lib.licenses.free; + }; + }) {}; + backup-each-save = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "backup-each-save"; + ename = "backup-each-save"; version = "20180226.2157"; src = fetchFromGitHub { owner = "conornash"; @@ -4051,10 +5161,10 @@ rev = "3c414b9d6b278911c95c5b8b71819e6af6f8a02a"; sha256 = "13pliz2ra020hhxcidkyhfa0767n188l1w5r0vpvv6zqyc2p414i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caa478356d20b5b0e9a450f7b4a8b25937e583a4/recipes/backup-each-save"; sha256 = "1l7lx3vd27qypkxa0cdm8zbd9fv08xn1bf6xj6g9c49ql95xbyiv"; - name = "backup-each-save"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4062,9 +5172,13 @@ license = lib.licenses.free; }; }) {}; - backup-walker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + backup-walker = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "backup-walker"; + ename = "backup-walker"; version = "20130720.816"; src = fetchFromGitHub { owner = "lewang"; @@ -4072,10 +5186,10 @@ rev = "934a4128c122972ac32bb9952addf279a60a94da"; sha256 = "0z4d8x9lkad50720lgvr8f85p1ligv07865i30lgr9ck0q04w68v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9428a70292cf6b796d7d994ad6b73d7d45970c19/recipes/backup-walker"; sha256 = "0hfr27yiiblrd0p3zhpapbj4vijfdk7wqh406xnlwf2yvnfsqycd"; - name = "backup-walker"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4083,9 +5197,14 @@ license = lib.licenses.free; }; }) {}; - backward-forward = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + backward-forward = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "backward-forward"; + ename = "backward-forward"; version = "20161228.2150"; src = fetchFromGitLab { owner = "vancan1ty"; @@ -4093,10 +5212,10 @@ rev = "58489957a62a0da25dfb5df902624d2548d800b4"; sha256 = "14v9q58vd0iggs8x8hjh24cv58g2pbwnr6zghd2anaygbj74ij24"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cb44d7b604c50d4e07404c0dff071fbc66ea903d/recipes/backward-forward"; sha256 = "0kpy761xdk2s21s92cw03fgw5xq9glybrhnjv2v89xrg16vdvamf"; - name = "backward-forward"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4104,20 +5223,24 @@ license = lib.licenses.free; }; }) {}; - badger-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + badger-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "badger-theme"; + ename = "badger-theme"; version = "20140716.1932"; src = fetchFromGitHub { owner = "ccann"; repo = "badger-theme"; - rev = "493d672d5a5478976da7d5ca752008cc7837c57f"; - sha256 = "0mrn3sl1xq19k6v4mw98zqgs11fidnarvidmxayx805k21pana6v"; + rev = "80fb9f8ace37b2e8807da639f7da499a53ffefd4"; + sha256 = "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/298e43769c6cd855526d847e8e3b237912360777/recipes/badger-theme"; sha256 = "01h5bsqllgn6gs0wpl0y2h041007mn3ldjswkz6f3mayrgl4c6yf"; - name = "badger-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4125,9 +5248,14 @@ license = lib.licenses.free; }; }) {}; - badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + badwolf-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "badwolf-theme"; + ename = "badwolf-theme"; version = "20161004.15"; src = fetchFromGitHub { owner = "bkruczyk"; @@ -4135,10 +5263,10 @@ rev = "ea01a3d9358e968f75e3ed15dec6a2a96ce3d9a1"; sha256 = "0a6adsxvmw3mgji17is75jrq3ifmzpch8rwqqyfgc99xzndvab7l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/badwolf-theme"; sha256 = "15n33l0iaq2pk70rpw7qdm8dlwcinfclpnlr3bs7vcb1dknp4g9v"; - name = "badwolf-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4146,9 +5274,39 @@ license = lib.licenses.free; }; }) {}; - bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + banner-comment = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "banner-comment"; + ename = "banner-comment"; + version = "20180510.620"; + src = fetchFromGitHub { + owner = "WJCFerguson"; + repo = "banner-comment"; + rev = "fedbb071d043106a30e378ee58b96e349e8068ed"; + sha256 = "1d6yp96rv6p9f3b8ddrpzb3ng2v0vlqb1akcpd7dria6y6aai8l4"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb69f15cb6be38a86abf4d15450a29c9a819068/recipes/banner-comment"; + sha256 = "0i5nkfdwfr9mcir2ijdhw563azmr5p7hyl6rfy1r04fzs8j7w2pc"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/banner-comment"; + license = lib.licenses.free; + }; + }) {}; + bar-cursor = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bar-cursor"; + ename = "bar-cursor"; version = "20180226.1645"; src = fetchFromGitHub { owner = "ajsquared"; @@ -4156,10 +5314,10 @@ rev = "20cb59bedc3532a712fe7feeff3660ebd72a8107"; sha256 = "06b0nkcp8yjixps72nrgk2zmljc9f71cdr96jdpgssydfhn4pcdf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/932e7b128f092ec724ebf18c9c5ca84e16edc82c/recipes/bar-cursor"; sha256 = "0f7z3mlnh3p28pmn1bnqbszcy1j68dwm8xra1wz8jgykvrdlyf2s"; - name = "bar-cursor"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4167,20 +5325,25 @@ license = lib.licenses.free; }; }) {}; - bart-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bart-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bart-mode"; + ename = "bart-mode"; version = "20180131.1829"; src = fetchFromGitHub { owner = "mschuldt"; repo = "bart-mode"; - rev = "6feeb8f9badbc2ce4b60499bf7bf4acdae4cfed7"; - sha256 = "1i1fcrwcswdqwb59154yzijccv7n0fqvm0ck3d8dqx5vczzmqixh"; + rev = "f6b82f0df2e2b863be7b9383a22413a2fc77f9e0"; + sha256 = "09z1fk5wbdlqps1102l9fcccz4vb0wcxbbrc4w2r2xrphwjxy6wc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f9cb09c07cb9fdef15de3e8dbfb6725d97dff6f/recipes/bart-mode"; sha256 = "0wyfsf7kqfghnci9rlk9x0rkai6x7hy3vfzkgh7s2yz081p1kfam"; - name = "bart-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4188,20 +5351,24 @@ license = lib.licenses.free; }; }) {}; - base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + base16-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "base16-theme"; - version = "20180320.2254"; + ename = "base16-theme"; + version = "20180524.1311"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "69a96c1061d1d783a44f70fd811d49541762caf9"; - sha256 = "1mg158w81vivar7lrya8qk46zghs2b7inmdckjcs8qw7w078cwav"; + rev = "c9acfddcc0a3a3753223d4e8742de6af284154cc"; + sha256 = "10kwilq2fn3bdh21zzw8h30kr1xalrjm7nbi003315qham2dkyh2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; sha256 = "115dhr3gfvdz5wv76fwpv3b4dywiwbk69qrhkfhij8vpcfybrpzx"; - name = "base16-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4209,20 +5376,24 @@ license = lib.licenses.free; }; }) {}; - bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bash-completion = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bash-completion"; - version = "20180303.1144"; + ename = "bash-completion"; + version = "20180519.920"; src = fetchFromGitHub { owner = "szermatt"; repo = "emacs-bash-completion"; - rev = "6aedd690006e07199b2fcd319b9b840a527650e5"; - sha256 = "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0"; + rev = "fbdc78b8770833752ac4bda28e2c3ea764bf8e76"; + sha256 = "1ihmj2nx8sr4cfx03xrpmiqjljri6wv5ib8rgnl8ip42nqhv2g6c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion"; sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj"; - name = "bash-completion"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4230,20 +5401,26 @@ license = lib.licenses.free; }; }) {}; - basic-c-compile = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + basic-c-compile = callPackage ({ cl-lib ? null + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "basic-c-compile"; + ename = "basic-c-compile"; version = "20170302.312"; src = fetchFromGitHub { owner = "nick96"; repo = "basic-c-compile"; - rev = "0129786aeee50d7bb0020d9fc2b7508875d403e8"; - sha256 = "0q6scyva1psyam7jzygqcr1wayf70vrp237hm01q5i9cin8j4j1z"; + rev = "335e96e19647ad7245fb68cf7e68cf86c5023d23"; + sha256 = "1sq6mmg5361z30psn6x2ylpr8yxsbg3d47qai9px7p889p63384l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/basic-c-compile"; sha256 = "0g595d1vd97b5qqydpb6cr3ibgcm08cw8c154h35vz3cl4w86mwd"; - name = "basic-c-compile"; + name = "recipe"; }; packageRequires = [ cl-lib f ]; meta = { @@ -4251,20 +5428,26 @@ license = lib.licenses.free; }; }) {}; - basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + basic-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "basic-mode"; - version = "20171204.1217"; + ename = "basic-mode"; + version = "20180612.1152"; src = fetchFromGitHub { owner = "dykstrom"; repo = "basic-mode"; - rev = "b7e851f844e9a5264e44936d1675133b4c3ed39c"; - sha256 = "0q29inrdk9i4rgx3a0km62lzn796hh24365cc3kzylx74g53a3qf"; + rev = "024505ae0a37756e3259773383852ed208120bde"; + sha256 = "0fsy09m3mwvdxhlg4p0g95j1nsx8pp9ggslawpd4rj0rn6ffbq6d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode"; sha256 = "1l0ylzww7jg6l804fdrklhay4is0wx1drfi9l9wn7gcdjh76mr6g"; - name = "basic-mode"; + name = "recipe"; }; packageRequires = [ emacs seq ]; meta = { @@ -4272,20 +5455,25 @@ license = lib.licenses.free; }; }) {}; - basic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + basic-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "basic-theme"; + ename = "basic-theme"; version = "20160817.127"; src = fetchFromGitHub { owner = "fgeller"; repo = "basic-theme.el"; - rev = "e2a855bd39f4b78296228d4b790f9123156f7d7e"; - sha256 = "1dfk73bkyhmhxnizbcp5zky8qyrgl7cf0dl9y6drqqc1lrcgz3jl"; + rev = "9d0fd5f56898a5237c1de3363ad416aeab7f880e"; + sha256 = "1bnv8kkg6yy09kxns78xlbl0vwc5dz0azvgvry2a0361f48f0315"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/451d1b67fefec5d3a346b1261d1284e8df6927a0/recipes/basic-theme"; sha256 = "16rgff1d0s65alh328lr93zc06zmgbzgwx1rf3k3l4d10ki4cc27"; - name = "basic-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4293,9 +5481,13 @@ license = lib.licenses.free; }; }) {}; - bats-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bats-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bats-mode"; + ename = "bats-mode"; version = "20160513.2315"; src = fetchFromGitHub { owner = "dougm"; @@ -4303,10 +5495,10 @@ rev = "d519f7c89f5ae17dfc33400596df4564b478315f"; sha256 = "1ikb4rb20ng1yq95g3ydwpk37axmiw38rjzn1av9m4cs81qby4jv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d742fb825e163beb33c3873aa48a1c411711e312/recipes/bats-mode"; sha256 = "1l5winy30w8fs3f5cylc3a3j3mfkvchwanlgsin7q76jivn87h7w"; - name = "bats-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4314,9 +5506,14 @@ license = lib.licenses.free; }; }) {}; - bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bazel-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bazel-mode"; + ename = "bazel-mode"; version = "20180222.2253"; src = fetchFromGitHub { owner = "codesuki"; @@ -4324,10 +5521,10 @@ rev = "b7aa14516feaed40ee4910eafa81db719de0fe56"; sha256 = "16yjxs62h8dm63nzc04i60bnbyhm2vrpvn98ap8rad6wib2ka3vj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode"; sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586"; - name = "bazel-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4335,20 +5532,25 @@ license = lib.licenses.free; }; }) {}; - bbcode-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bbcode-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bbcode-mode"; - version = "20180326.1410"; + ename = "bbcode-mode"; + version = "20180505.227"; src = fetchFromGitHub { owner = "lassik"; repo = "bbcode-mode"; - rev = "4a6df9eff9da9cb98d53164a585f2c69d8399e3a"; - sha256 = "1gzx7s96fd6r9xgzp29d1w102rxkyr1mywhyvzcdslszbcrjc0r1"; + rev = "ee30d43f9029e0919a06be0dde0ed16f201647c1"; + sha256 = "046rdjpsm0lmkyaiv3y59hab3m8mdcj4asz5n06vb83a5xibm68s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode"; sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb"; - name = "bbcode-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -4356,18 +5558,23 @@ license = lib.licenses.free; }; }) {}; - bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + bbdb = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bbdb"; - version = "20180330.2018"; + ename = "bbdb"; + version = "20180502.2038"; src = fetchgit { url = "https://git.savannah.nongnu.org/git/bbdb.git"; - rev = "e0eff7e1ee5003f7c557a83d655a7fc0b6b45fcc"; - sha256 = "0qalxasfckqqgngsafplrp9j1pcism17bn0h53qs8pfj9gxkng5q"; + rev = "2da950300bb22fa713cede74b71041df315ecc2e"; + sha256 = "1vz1c3f5wlhfq4d80fahqm3a8jsfl22bs3w4pfl25ivpg1l7m9bn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb"; sha256 = "0mm8n3dbi8lap3pjr97n2f675iy7sg476sm1vxygbc3j67rq1zb2"; - name = "bbdb"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4375,9 +5582,16 @@ license = lib.licenses.free; }; }) {}; - bbdb- = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + bbdb- = callPackage ({ bbdb + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "bbdb-"; + ename = "bbdb-"; version = "20140221.1554"; src = fetchFromGitHub { owner = "aki2o"; @@ -4385,10 +5599,10 @@ rev = "2839e84c894de2513af41053e80a277a1b483d22"; sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01e7a8cc1dde506cb2fcfd9270f15dc61c43ec17/recipes/bbdb-"; sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf"; - name = "bbdb-"; + name = "recipe"; }; packageRequires = [ bbdb log4e yaxception ]; meta = { @@ -4396,9 +5610,16 @@ license = lib.licenses.free; }; }) {}; - bbdb-csv-import = callPackage ({ bbdb, dash, fetchFromGitLab, fetchurl, lib, melpaBuild, pcsv }: - melpaBuild { + bbdb-csv-import = callPackage ({ bbdb + , dash + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , pcsv }: + melpaBuild { pname = "bbdb-csv-import"; + ename = "bbdb-csv-import"; version = "20180121.1649"; src = fetchFromGitLab { owner = "iankelling"; @@ -4406,10 +5627,10 @@ rev = "dbc2e0fe9e8ae65e494011044d905ae79b3cee3e"; sha256 = "0n52arydcsmarkpqqwxvw686cypl7iz73kzizirdjhcqmzimx9pl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/bbdb-csv-import"; sha256 = "0r7pc2ypd1ydqrnvcqmsg69rm047by7k0zhm563538ra82597wnm"; - name = "bbdb-csv-import"; + name = "recipe"; }; packageRequires = [ bbdb dash pcsv ]; meta = { @@ -4417,9 +5638,14 @@ license = lib.licenses.free; }; }) {}; - bbdb-ext = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bbdb-ext = callPackage ({ bbdb + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bbdb-ext"; + ename = "bbdb-ext"; version = "20151220.1213"; src = fetchFromGitHub { owner = "vapniks"; @@ -4427,10 +5653,10 @@ rev = "fee97b1b3faa83edaea00fbc5ad3cbca5e791a55"; sha256 = "1ydf89mmp3zjfqdymnrwg18wclyf7psarz9f2k82pl58h0khh71g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1ba0575cb6f0270bab8bf00726842b2a4d0bef3/recipes/bbdb-ext"; sha256 = "0fnxcvzdyh0602rdfz3lz3vmvza4s0syz1vn2fgsn2lg3afqq7li"; - name = "bbdb-ext"; + name = "recipe"; }; packageRequires = [ bbdb ]; meta = { @@ -4438,9 +5664,14 @@ license = lib.licenses.free; }; }) {}; - bbdb-vcard = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bbdb-vcard = callPackage ({ bbdb + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bbdb-vcard"; + ename = "bbdb-vcard"; version = "20150713.1350"; src = fetchFromGitHub { owner = "tohojo"; @@ -4448,10 +5679,10 @@ rev = "c3aafd4160854a38fd92afcdade32b9a13abe82c"; sha256 = "1zlf9xhpirln72xr7v6kgndkg5wyz5ipsl4gpq9lbmp92jlgbwlj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd5d9027c49beae89f78d2a30dfa4bd070dff1bd/recipes/bbdb-vcard"; sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj"; - name = "bbdb-vcard"; + name = "recipe"; }; packageRequires = [ bbdb ]; meta = { @@ -4459,9 +5690,14 @@ license = lib.licenses.free; }; }) {}; - bbdb2erc = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bbdb2erc = callPackage ({ bbdb + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bbdb2erc"; + ename = "bbdb2erc"; version = "20170221.554"; src = fetchFromGitHub { owner = "unhammer"; @@ -4469,10 +5705,10 @@ rev = "15db2bd29df0f6ee32c499fdeffb960b6a7f97a0"; sha256 = "0jlm6qffhh84vy5wmkxmsm5i4dp87cfh7zr5kvrw72zyww986kn4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/bbdb2erc"; sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd"; - name = "bbdb2erc"; + name = "recipe"; }; packageRequires = [ bbdb ]; meta = { @@ -4480,9 +5716,15 @@ license = lib.licenses.free; }; }) {}; - bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bbyac = callPackage ({ browse-kill-ring + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bbyac"; + ename = "bbyac"; version = "20180206.641"; src = fetchFromGitHub { owner = "baohaojun"; @@ -4490,10 +5732,10 @@ rev = "9f0de9cad13801891ffb590dc09f51ff9a7cb225"; sha256 = "0q0i1j8ljfd61rk6d5fys7wvdbym9pz5nhwyfvmm0ijmy19d1ppz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac"; sha256 = "1pb12b8xrcgyniwqc90z3kr3rq9kkzxjawwcz7xwzymq39fx0897"; - name = "bbyac"; + name = "recipe"; }; packageRequires = [ browse-kill-ring cl-lib ]; meta = { @@ -4501,9 +5743,13 @@ license = lib.licenses.free; }; }) {}; - bdo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bdo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bdo"; + ename = "bdo"; version = "20140126.101"; src = fetchFromGitHub { owner = "chrisdone"; @@ -4511,10 +5757,10 @@ rev = "c96cb6aa9e97fa3491185c50dee0f77a13241010"; sha256 = "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bdo"; sha256 = "1n2kpaps6992nxl0v1003czcbw1k4xq906an56694wkh05az505j"; - name = "bdo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4522,20 +5768,25 @@ license = lib.licenses.free; }; }) {}; - beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + beacon = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "beacon"; - version = "20171017.1540"; + ename = "beacon"; + version = "20180706.1025"; src = fetchFromGitHub { owner = "Malabarba"; repo = "beacon"; - rev = "729338b02a0e331a4faf475da9f54771a3470106"; - sha256 = "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy"; + rev = "8dfe64496be3cb79d5b83891f95b70b1b699470b"; + sha256 = "169asr7dz9xn22sxm38xxfafl6k9qnv4ir5k5hzvc9l2xp05w3z3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon"; sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq"; - name = "beacon"; + name = "recipe"; }; packageRequires = [ seq ]; meta = { @@ -4543,20 +5794,25 @@ license = lib.licenses.free; }; }) {}; - beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + beeminder = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "beeminder"; - version = "20160209.1903"; + ename = "beeminder"; + version = "20180413.1229"; src = fetchFromGitHub { owner = "Sodaware"; repo = "beeminder.el"; - rev = "a4e159250bac89bc25ced8523a5eac2a951cd5b6"; - sha256 = "0ki9q3ylssjabh15dr49k7dxv88snpj4564g0myp3c61qzyy82lk"; + rev = "3fcee7a7003a37171ddb59171c7f4b5dd4b34349"; + sha256 = "0phiyv4n5y052fgxngl3yy74akb378sr6manx21s360gnxzcblwd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/beeminder"; sha256 = "1cb8xmgsv23b464hpchm9f9i64p3fyf7aillrwk1aa2l1008kyww"; - name = "beeminder"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -4564,9 +5820,14 @@ license = lib.licenses.free; }; }) {}; - beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + beginend = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "beginend"; + ename = "beginend"; version = "20171003.548"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -4574,10 +5835,10 @@ rev = "2762796b54c7fd8613b02c041b2b9afeb13eb9fa"; sha256 = "1g1mml0npypfk0vhicy4s7fa5df76xqpb80llxcfbnl2si9fzyfb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq"; - name = "beginend"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4585,20 +5846,48 @@ license = lib.licenses.free; }; }) {}; - benchmark-init = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + belarus-holidays = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "belarus-holidays"; + ename = "belarus-holidays"; + version = "20180615.611"; + src = fetchgit { + url = "https://bitbucket.org/EugeneMakei/belarus-holidays.el"; + rev = "410a7dcf46fdcbee762a0c0aa0c7af03230b9656"; + sha256 = "186dka9ba9hx1xhd0lfj1x1njikixm09wd4xiqawgdczgfwyv4sq"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6987c5fbafc602ff6b48c347b4e3e7c4471681e8/recipes/belarus-holidays"; + sha256 = "0ls4y0bjdz37zvzp2xppsa4qdgmpwkz2l6ycjf9134brdnhm9gqy"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/belarus-holidays"; + license = lib.licenses.free; + }; + }) {}; + benchmark-init = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "benchmark-init"; + ename = "benchmark-init"; version = "20150905.238"; src = fetchFromGitHub { owner = "dholm"; repo = "benchmark-init-el"; - rev = "7a0f263282bbc86b01b662636306f22813082647"; - sha256 = "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94"; + rev = "8e4c32f32ec869fe521fb4d3c0a69406830b4178"; + sha256 = "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54b9ae6fc10b0c56fcc7a0ad73743ffc85a3e9a0/recipes/benchmark-init"; sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal"; - name = "benchmark-init"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4606,20 +5895,24 @@ license = lib.licenses.free; }; }) {}; - benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + benchstat = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "benchstat"; + ename = "benchstat"; version = "20171013.2012"; src = fetchFromGitHub { owner = "Quasilyte"; repo = "benchstat.el"; - rev = "a5b67cf7972ca2bbc9f5bc6a0f521ab02b76d4f0"; - sha256 = "02v5l9qvzcr58qr973phgj1c846pqp3cj16khn4h9v3f3gb180n1"; + rev = "fee86f521f22ef0f99564903d63e2023b591fc7f"; + sha256 = "1rzb6ai5f5mf9kn0nnjfxjn3l3h5b9ksbkqr1bi52fagryxrfgl2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat"; sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9"; - name = "benchstat"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4627,9 +5920,13 @@ license = lib.licenses.free; }; }) {}; - bert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bert = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bert"; + ename = "bert"; version = "20131117.214"; src = fetchFromGitHub { owner = "manzyuk"; @@ -4637,10 +5934,10 @@ rev = "a3eec6980a725aa4abd2019e4c00246450260490"; sha256 = "06izbc0ksyhgh4gsjiifhj11v0gx9x5xjx9aqci5mc4kc6mg05sf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89635cd11621b04a8575629ec1bf196fb3ea5d43/recipes/bert"; sha256 = "1zhz1dcy1nf84p244x6lc4ajancv5fgmqmbrm080yhb2ral1z8x7"; - name = "bert"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4648,9 +5945,13 @@ license = lib.licenses.free; }; }) {}; - better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + better-defaults = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "better-defaults"; + ename = "better-defaults"; version = "20170613.2104"; src = fetchFromGitHub { owner = "technomancy"; @@ -4658,10 +5959,10 @@ rev = "12d9e6dbf24a8a3369b19650d74471b17b27f78d"; sha256 = "1rx3p6syp6axnxbscg0l73yihgwdq7bdnkcrvfikz79yflxrsnmq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bb729c1ad8602a5c0c27e81c9442981a54a924a/recipes/better-defaults"; sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm"; - name = "better-defaults"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4669,20 +5970,25 @@ license = lib.licenses.free; }; }) {}; - better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + better-shell = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "better-shell"; - version = "20180209.1207"; + ename = "better-shell"; + version = "20180625.616"; src = fetchFromGitHub { owner = "killdash9"; repo = "better-shell"; - rev = "2e9f2f3e7945c27988c50d8de43e681662d6a467"; - sha256 = "1ccvfpfdkqb1ga7jqq0kgvifa5gqnilb4nn8ghlbxik1901xvr5z"; + rev = "cfcd9d57f87ad68cd72bf4935fd1aaa1d9f059a9"; + sha256 = "1z2c2w7p9clijzsfjhcghl76ycy6s0lyymxglzzk7js5np8idmdr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell"; sha256 = "0si8nj18i3jlhdb8m6f21rmi0lxians34vhw4xhvxw2yr9l85lj6"; - name = "better-shell"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4690,9 +5996,13 @@ license = lib.licenses.free; }; }) {}; - bf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bf-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bf-mode"; + ename = "bf-mode"; version = "20130403.742"; src = fetchFromGitHub { owner = "emacs-jp"; @@ -4700,10 +6010,10 @@ rev = "7cc4d09aed64d9db6be95646f5f5067de68f8895"; sha256 = "02b2m0cq04ynjcmr4j8gpdzjv9mpf1fysn736xv724xgaymj396n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f7fe1763891c7343c0ad0c7970b8a3c9035b4e8a/recipes/bf-mode"; sha256 = "0b1yf9bx1ldkzry7v5qvcnl059rq62a50dvpa10i2f5v0y96n1q9"; - name = "bf-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4711,20 +6021,25 @@ license = lib.licenses.free; }; }) {}; - bfbuilder = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bfbuilder = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bfbuilder"; + ename = "bfbuilder"; version = "20150924.950"; src = fetchFromGitHub { owner = "zk-phi"; repo = "bfbuilder"; - rev = "49560bdef131fa5672dab660e0c62376dbdcd906"; - sha256 = "1y9fxs1nbf0xsn8mw45m9ghmji3h64wdbfnyr1npmf5fb27rmd17"; + rev = "bb4c8a7be39af97ea5016099b320edd6d2b78149"; + sha256 = "1n87db51ff3bqk3dk6rzipcl9mxr74a6wwkkpxq607wjxhxz0b9y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e77dd911b850846f1719b2ee943b74028d94f04/recipes/bfbuilder"; sha256 = "16ckybqd0a8l75ascm3k4cdzp969lzq7m050aymdyjhwif6ld2r7"; - name = "bfbuilder"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -4732,9 +6047,15 @@ license = lib.licenses.free; }; }) {}; - biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + biblio = callPackage ({ biblio-core + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "biblio"; + ename = "biblio"; version = "20161014.1604"; src = fetchFromGitHub { owner = "cpitclaudel"; @@ -4742,10 +6063,10 @@ rev = "a5a68fcf677f286f205f32dc7486f6c9f66aa6af"; sha256 = "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fbaa8c59b0e64d13beb0e0f18b0734afa84f51/recipes/biblio"; sha256 = "0ym7xvcfd7hh3qdpfb8zpa7w8s4lpg0vngh9d0ns3s3lnhz4mi0g"; - name = "biblio"; + name = "recipe"; }; packageRequires = [ biblio-core emacs ]; meta = { @@ -4753,20 +6074,28 @@ license = lib.licenses.free; }; }) {}; - biblio-core = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, seq }: - melpaBuild { + biblio-core = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "biblio-core"; + ename = "biblio-core"; version = "20160901.1115"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "biblio.el"; - rev = "a5a68fcf677f286f205f32dc7486f6c9f66aa6af"; - sha256 = "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz"; + rev = "0036495a2e0d4b02b9e957e498f9437e394d6ed9"; + sha256 = "1f0p5fgvabdpafil7s8sy82hgcfzg1skxfgj72ylv3crq36bn4vp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f086d3e8fd6a95ce198e148cd3ede35dd73fb8/recipes/biblio-core"; sha256 = "0zpfamrb2gka41h834a05hxdbw4h55777kh6rhjikjfmy765nl97"; - name = "biblio-core"; + name = "recipe"; }; packageRequires = [ dash emacs let-alist seq ]; meta = { @@ -4774,20 +6103,27 @@ license = lib.licenses.free; }; }) {}; - bibliothek = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pdf-tools }: - melpaBuild { + bibliothek = callPackage ({ a + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pdf-tools }: + melpaBuild { pname = "bibliothek"; - version = "20180327.1422"; + ename = "bibliothek"; + version = "20180429.1515"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "8118551aaf0472900cdfdc13449b55b33ab56289"; - sha256 = "153cch134c6rvqfcpikidlpxcbxk8nys2ig1xxpbn9ncn4fqkaf3"; + rev = "ffe03506694c94de0444995f973a925deccc400a"; + sha256 = "02wcvka96zdlq3myfar7dqywfil2b77bc6ydmgcphwn3as3kl08r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8308e72c4437237fded29db1f60b3eba0edd26/recipes/bibliothek"; sha256 = "011wnya65vfnn17fn1vhq0sk8c1mli81x0nb44yi6zl1hwxivb55"; - name = "bibliothek"; + name = "recipe"; }; packageRequires = [ a emacs pdf-tools ]; meta = { @@ -4795,20 +6131,26 @@ license = lib.licenses.free; }; }) {}; - bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bibretrieve = callPackage ({ auctex + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bibretrieve"; - version = "20171125.727"; + ename = "bibretrieve"; + version = "20180617.1108"; src = fetchFromGitHub { owner = "pzorin"; repo = "bibretrieve"; - rev = "da7b8c49e723e2327ab1d8625824389fb5324a80"; - sha256 = "02rr46wfhv3mdmzlqznvxwms4rzq25xl1dqicbr75xwg5mjbg8si"; + rev = "e8ccdc9b9bfec0c5c658f2e9ac3fb81a137549d7"; + sha256 = "0l85kdnzm8lxva47sm4bbyv7xd52qxfgxippsbg2n12vqqiqf50z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e548e0cf8babaf32f1db58099599a72cebdbb84d/recipes/bibretrieve"; sha256 = "1mf884c6adx7rq5c2z5wrnjpb6znljy30mscxskwqiyfs8c62mii"; - name = "bibretrieve"; + name = "recipe"; }; packageRequires = [ auctex emacs ]; meta = { @@ -4816,9 +6158,15 @@ license = lib.licenses.free; }; }) {}; - bibslurp = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + bibslurp = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "bibslurp"; + ename = "bibslurp"; version = "20151202.1546"; src = fetchFromGitHub { owner = "mkmcc"; @@ -4826,10 +6174,10 @@ rev = "aeba96368f2a06959e4fe945375ce2a54d34b189"; sha256 = "077shjz9sd0k0akvxzzgjd8a626ck650xxlhp2ws4gs7rjd7a823"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f473e839d6325f193c641792671f43fbf83b6d/recipes/bibslurp"; sha256 = "178nhng87bdi8s0r2bdh2gk31w9mmjkyi6ncnddk3v7p8fsh4jjp"; - name = "bibslurp"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -4837,9 +6185,13 @@ license = lib.licenses.free; }; }) {}; - bibtex-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bibtex-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bibtex-utils"; + ename = "bibtex-utils"; version = "20170817.1219"; src = fetchFromGitHub { owner = "plantarum"; @@ -4847,10 +6199,10 @@ rev = "ed5ccce46c2088a28a2f0c49caa679d2f20567f0"; sha256 = "0cy0w4986lngzhzmfvk9r5xf0qa9bdz2ybzgv3nkwl48pjqvvi15"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5764b6a880e8143db66e9011cc1c2bf0bcd61082/recipes/bibtex-utils"; sha256 = "13llsyyvy0xc9s51cqqc1rz13m3qdqh8jw07gwywfbixlma59z8l"; - name = "bibtex-utils"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4858,9 +6210,40 @@ license = lib.licenses.free; }; }) {}; - bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bicycle = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "bicycle"; + ename = "bicycle"; + version = "20180624.12"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "bicycle"; + rev = "ab48f01ec8a3ebcb2f6cf36ea7f3cb8aef3da263"; + sha256 = "13rmk3004jnnbfqvi9xh22si5dw02fswlryhkafagfzbnscc6gvb"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec9b4138ffaf81b556e01b85ce4b112e77909260/recipes/bicycle"; + sha256 = "16ikqbmsjyknj3580wdnp8ffs85bq9idf9hvxm0ihgw5gy469xqj"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bicycle"; + license = lib.licenses.free; + }; + }) {}; + bifocal = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bifocal"; + ename = "bifocal"; version = "20171004.1124"; src = fetchFromGitHub { owner = "riscy"; @@ -4868,10 +6251,10 @@ rev = "a8b222b069a6bd64531b4780905989797bad8abe"; sha256 = "0c6vzh35lj3pg9wd4v2fy6xdmcg9kq3n5br6rp4lx257gxglzpwh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal"; sha256 = "07qrxsby611l3cwsmw3d53h1n7cd1vg53j4vlc2isg56l2m4qks5"; - name = "bifocal"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4879,9 +6262,14 @@ license = lib.licenses.free; }; }) {}; - binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + binclock = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "binclock"; + ename = "binclock"; version = "20170802.416"; src = fetchFromGitHub { owner = "davep"; @@ -4889,10 +6277,10 @@ rev = "87042230d7f3fe3e9a77fae0dbab7d8f7e7794ad"; sha256 = "0bbcn3aif3qvmgbga7znivcbgn1n79278x7xvbha52zpj584xp8d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock"; sha256 = "1s0072kcd1xp8355j8aph94gb3a1wqmzx1hhfp9d6bzqf6cij8gk"; - name = "binclock"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -4900,20 +6288,26 @@ license = lib.licenses.free; }; }) {}; - bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: - melpaBuild { + bind-chord = callPackage ({ bind-key + , fetchFromGitHub + , fetchurl + , key-chord + , lib + , melpaBuild }: + melpaBuild { pname = "bind-chord"; + ename = "bind-chord"; version = "20171204.1210"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "512aa50b025018cb8574498d868814f73c02bb9b"; - sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; + rev = "33127b706e66fb20dfa40d94eb553dd7d6ef9197"; + sha256 = "1iz7ibdvf3bnfkwfhakigvrdzg69qgx3z7qayq54spx3rpxf7x0b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord"; sha256 = "1hyhs3iypyg5730a20axcfzrrglm4nbgdz8x1ifkaa0iy5zc9hb0"; - name = "bind-chord"; + name = "recipe"; }; packageRequires = [ bind-key key-chord ]; meta = { @@ -4921,20 +6315,24 @@ license = lib.licenses.free; }; }) {}; - bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bind-key = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bind-key"; - version = "20171210.2125"; + ename = "bind-key"; + version = "20180512.2130"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "512aa50b025018cb8574498d868814f73c02bb9b"; - sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; + rev = "c03d153e5882109e24c016d3afa6940af673ede6"; + sha256 = "0zyl8dfg8acf99966sp8i5iky1mvn2h016viqk48s0hjv9va0wii"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm"; - name = "bind-key"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4942,9 +6340,14 @@ license = lib.licenses.free; }; }) {}; - bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bind-map = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bind-map"; + ename = "bind-map"; version = "20161207.711"; src = fetchFromGitHub { owner = "justbur"; @@ -4952,10 +6355,10 @@ rev = "bf4181e3a41463684adfffc6c5c305b30480e30f"; sha256 = "0vrk17yg3jbww92p433p64ijmjf7cjg2wmzi9w418235w1xdfzz8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map"; sha256 = "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358"; - name = "bind-map"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4963,9 +6366,13 @@ license = lib.licenses.free; }; }) {}; - bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bing-dict = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bing-dict"; + ename = "bing-dict"; version = "20170604.1831"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -4973,10 +6380,10 @@ rev = "d4b261739e53e8ed8fa5db3d3946de82c0ab8e34"; sha256 = "0dn6rifr0njpw3mwbyn21bw88lp0kzwwjp7ivgbbl1bxshj0ybhk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bing-dict"; sha256 = "1cqjndq8xm2bwjvdj95dn377bp9r6rrkp1z4a45faj408mipahli"; - name = "bing-dict"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4984,9 +6391,13 @@ license = lib.licenses.free; }; }) {}; - birds-of-paradise-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + birds-of-paradise-plus-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "birds-of-paradise-plus-theme"; + ename = "birds-of-paradise-plus-theme"; version = "20130419.1429"; src = fetchFromGitHub { owner = "jimeh"; @@ -4994,10 +6405,10 @@ rev = "bb9f9d4ef7f7872a388ec4eee1253069adcadb6f"; sha256 = "1n5icy29ks5rxrxp7v4sf0523z7wxn0fh9lx4y6jb7ppdjnff12s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3932853232c269f158806aebe416b456c752a9bb/recipes/birds-of-paradise-plus-theme"; sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m"; - name = "birds-of-paradise-plus-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5005,9 +6416,13 @@ license = lib.licenses.free; }; }) {}; - bison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bison-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bison-mode"; + ename = "bison-mode"; version = "20160616.2252"; src = fetchFromGitHub { owner = "Wilfred"; @@ -5015,10 +6430,10 @@ rev = "314af3b7af7eb897fd3932616cb8600a85228cea"; sha256 = "0ymjgwyi73vl81i7v1g2ad09lxp4mhp47r6zcijqa5hbx9l1skik"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d08592cabbc0779c67c260f9648d2273c0dd9e3e/recipes/bison-mode"; sha256 = "097gimlzmyrsfnl76cbzyyi9dm0d2y3f9107672h56ncri35mh66"; - name = "bison-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5026,20 +6441,28 @@ license = lib.licenses.free; }; }) {}; - bitbake = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, s }: - melpaBuild { + bitbake = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mmm-mode + , s }: + melpaBuild { pname = "bitbake"; + ename = "bitbake"; version = "20180326.58"; src = fetchFromGitHub { owner = "canatella"; repo = "bitbake-el"; - rev = "e5088c4b3dfb4feb96850fbc281b4207d23c7713"; - sha256 = "0x765j9vks8r34kkqr9chlfy7dng71rciighk12fgiksqsl82qb0"; + rev = "040498f9375f3b3eb67514c6497f43b77acd764f"; + sha256 = "0jpgc4ps82qwagmh3lh49m11f8b3nbjgaw9wy43q9q1mslx14hf3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da099b66180ed537f8962ab4ca727d2441f9691d/recipes/bitbake"; sha256 = "1k2n1i8g0jc78sp1icm64rlhi1q0vqar2a889nldp134a1l7bfah"; - name = "bitbake"; + name = "recipe"; }; packageRequires = [ dash emacs mmm-mode s ]; meta = { @@ -5047,20 +6470,27 @@ license = lib.licenses.free; }; }) {}; - bitbucket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: - melpaBuild { + bitbucket = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , s }: + melpaBuild { pname = "bitbucket"; + ename = "bitbucket"; version = "20170404.2146"; src = fetchFromGitHub { owner = "tjaartvdwalt"; repo = "bitbucket.el"; - rev = "5e663da1bd38a14c1ecf4d66a79d4321ac833bcf"; - sha256 = "1sikayb6i1k40zdl4j9n04xcmsf74py5vmcjbvli7k8b3ar7l5l5"; + rev = "db001a9d936e6b5c3cc5d5ec22794e234e0d162d"; + sha256 = "0iwmhnnscj3axxzgcb9ma7n5wn3zpjiwkh1dxrlk2kcclbzlbjha"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf87389e6a5d868850d27e077202e1e52eaf4aa/recipes/bitbucket"; sha256 = "1d0v6hvmxky3k2m89b7xm1igx9fmzvhdpn1bi8zln61m4zgr3yz0"; - name = "bitbucket"; + name = "recipe"; }; packageRequires = [ emacs request s ]; meta = { @@ -5068,20 +6498,24 @@ license = lib.licenses.free; }; }) {}; - bitlbee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bitlbee = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bitlbee"; + ename = "bitlbee"; version = "20151202.1600"; src = fetchFromGitHub { owner = "pjones"; repo = "bitlbee-el"; - rev = "3a92a4119e0c007df2c7dcf1b1c3a5f23ee40e05"; - sha256 = "0mccvpf8f87i7rqga3s4slrqz80rp3kyj071rrimhzpx8pnsrxx9"; + rev = "f3342da46b0864ae8db4e82b553d9e617b090534"; + sha256 = "1qbp15w4g9j9qhrgb04dwqa76i8sh1nbfd8gbpgp91sz9gackgkq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/bitlbee"; sha256 = "1lmbmlshr8b645qsb88rswmbbcbbawzl04xdjlygq4dnpkxc8w0f"; - name = "bitlbee"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5089,9 +6523,14 @@ license = lib.licenses.free; }; }) {}; - blackboard-bold-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + blackboard-bold-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "blackboard-bold-mode"; + ename = "blackboard-bold-mode"; version = "20160812.1906"; src = fetchFromGitHub { owner = "grettke"; @@ -5099,10 +6538,10 @@ rev = "5299cb064ba71baa3e331b8560bf8dd38cbbc4ed"; sha256 = "00xbcgx4snz4sd7q7ys24rsnf5wdxjn402v8y5dgn4ayx88y1rrj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/blackboard-bold-mode"; sha256 = "08fmzm5lblkk503zr4d6hkp45075pwwd8zinngasrsf1r01isksj"; - name = "blackboard-bold-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -5110,9 +6549,14 @@ license = lib.licenses.free; }; }) {}; - blackboard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + blackboard-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "blackboard-theme"; + ename = "blackboard-theme"; version = "20161215.2256"; src = fetchFromGitHub { owner = "don9z"; @@ -5120,10 +6564,10 @@ rev = "d8b984f2541bb86eb4363a2b4c94631e49843d4a"; sha256 = "1jh2960yab6rhdq7ci1slpmnr43619cza0g8bfbq759yz5b7xryh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eca8cbcc1282bb061f769daf86b1938d1f30f704/recipes/blackboard-theme"; sha256 = "19cnfxrm85985ic55y5x7nwxdynjp7djyd33dhj8r7s92cs25fn7"; - name = "blackboard-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5131,9 +6575,40 @@ license = lib.licenses.free; }; }) {}; - blgrep = callPackage ({ clmemo, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + blacken = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "blacken"; + ename = "blacken"; + version = "20180615.803"; + src = fetchFromGitHub { + owner = "proofit404"; + repo = "blacken"; + rev = "d98199e8ab94550f5036aac2293cfb1f745003fa"; + sha256 = "0fnrjgnc148cjs6b3qkyvpmlsmpdh3xi5xn4hxg7cpwqrx3s36d7"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/69d9802996a338be937d61678f2cadf3497f6b85/recipes/blacken"; + sha256 = "16lbs76jkhcq0vg09x1n8mrd4pgz5bdjsprr9260xr7g3dx8xacc"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/blacken"; + license = lib.licenses.free; + }; + }) {}; + blgrep = callPackage ({ clmemo + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "blgrep"; + ename = "blgrep"; version = "20150401.716"; src = fetchFromGitHub { owner = "ataka"; @@ -5141,10 +6616,10 @@ rev = "605beda210610a5829750a987f5fcebea97af546"; sha256 = "1pslwyaq18d1z7fay2ih3n27i6b49ss62drqqb095l1jxk42xxm0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78ed9dc4a7ff57524e79213973157ab364ae14d/recipes/blgrep"; sha256 = "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm"; - name = "blgrep"; + name = "recipe"; }; packageRequires = [ clmemo ]; meta = { @@ -5152,9 +6627,14 @@ license = lib.licenses.free; }; }) {}; - bliss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bliss-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bliss-theme"; + ename = "bliss-theme"; version = "20170808.607"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -5162,10 +6642,10 @@ rev = "c3cf6d8a666ab26909b7da158f9e94df71a5fbbf"; sha256 = "1bpyhsjfdjfa1iw9kv7fsl30vz48qllqgjg1rsxdl3vcripcbc9z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/bliss-theme"; sha256 = "1kzvi6zymfgirr41l8r2kazfz1y4xkigbp5qa1fafcdmw81anmdh"; - name = "bliss-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5173,20 +6653,24 @@ license = lib.licenses.free; }; }) {}; - bln-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bln-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bln-mode"; + ename = "bln-mode"; version = "20170112.527"; src = fetchFromGitHub { owner = "mgrachten"; repo = "bln-mode"; - rev = "6c20b3269e88952c19ca9ad151221c7e2e27b465"; - sha256 = "04ggaybf1yi0ynqfr6vslx0ld5n6zs2ymmk63hr6lp2jb6dyhdhx"; + rev = "1de92cec97a4693b8b932713e333730118db9183"; + sha256 = "0dlcxh3acaiw3q9sa74jw4bpz7fv9lvpws68gw1qhs39f1plyzfx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee12ef97df241b7405feee69c1e66b3c1a67204b/recipes/bln-mode"; sha256 = "0w4abaqx9gz04ls1hn1qz8qg9jpvi80b9jb597ddjcbnwqq9z83r"; - name = "bln-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5194,9 +6678,14 @@ license = lib.licenses.free; }; }) {}; - blockdiag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + blockdiag-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "blockdiag-mode"; + ename = "blockdiag-mode"; version = "20160426.2224"; src = fetchFromGitHub { owner = "xcezx"; @@ -5204,10 +6693,10 @@ rev = "f3b21ba433d60327cebd103ae4492200750e24a9"; sha256 = "111i897dnkbx4xq62jfkqq4li4gm16lxbgkgg2gn13zv0f0lzgvy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a0adb94f2a435e846944a1c544e6591b131a10e/recipes/blockdiag-mode"; sha256 = "0v48w4slzx8baxrf10jrzcpqmcv9d3z2pz0xqn8czlzm2f6id3ya"; - name = "blockdiag-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5215,9 +6704,18 @@ license = lib.licenses.free; }; }) {}; - blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: - melpaBuild { + blog-admin = callPackage ({ cl-lib ? null + , ctable + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names + , s }: + melpaBuild { pname = "blog-admin"; + ename = "blog-admin"; version = "20170923.709"; src = fetchFromGitHub { owner = "CodeFalling"; @@ -5225,10 +6723,10 @@ rev = "b5f2e1dad7d68ec903619f7280bb0bcb7e398a1e"; sha256 = "0fgzmmjxhl8i9yqx1bvb7hgkk9w4ylx73xy990qf1bl7fg21v636"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin"; sha256 = "03wnci5903c6jikkvlzc2vfma9h9qk673cc3wm756rx94jxinmyk"; - name = "blog-admin"; + name = "recipe"; }; packageRequires = [ cl-lib ctable f names s ]; meta = { @@ -5236,9 +6734,18 @@ license = lib.licenses.free; }; }) {}; - blog-minimal = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, org, s, simple-httpd }: - melpaBuild { + blog-minimal = callPackage ({ fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , mustache + , org + , s + , simple-httpd }: + melpaBuild { pname = "blog-minimal"; + ename = "blog-minimal"; version = "20170311.555"; src = fetchFromGitHub { owner = "thiefuniverse"; @@ -5246,10 +6753,10 @@ rev = "d679d74039ecc114b037800c8a94303265b9542a"; sha256 = "1x14xwnv22dc99gzbn6z48dhxpy46a7lrby2p59aizpwpysi64yk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/56217a33b0669a782621dd65d83419ae371ed60a/recipes/blog-minimal"; sha256 = "1qj25b6n3slvmbqvzfd37v4xmy1vvz37686jdr29bw5qk4prgxff"; - name = "blog-minimal"; + name = "recipe"; }; packageRequires = [ ht mustache org s simple-httpd ]; meta = { @@ -5257,20 +6764,24 @@ license = lib.licenses.free; }; }) {}; - bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bm"; - version = "20170815.1609"; + ename = "bm"; + version = "20180703.343"; src = fetchFromGitHub { owner = "joodland"; repo = "bm"; - rev = "b1bc10b1e9f01c48a7eedb9b08a22d05e7baed3c"; - sha256 = "16kfzi6chf28jyrsmz0jba3qq3mvxqambsdh09vr76ivmwbv48gh"; + rev = "d224b6cd8341db4c2e11263c346dd44fb37fcd88"; + sha256 = "18xwm1xj436bwa2l3dkfx6hlj19y6f0xqd3jbd06j4g3idpryqma"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm"; sha256 = "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g"; - name = "bm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5278,9 +6789,18 @@ license = lib.licenses.free; }; }) {}; - bmx-mode = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + bmx-mode = callPackage ({ cl-lib ? null + , company + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "bmx-mode"; + ename = "bmx-mode"; version = "20180324.857"; src = fetchFromGitHub { owner = "josteink"; @@ -5288,10 +6808,10 @@ rev = "7450c29f5c1f5f67b02bca1c89f06cdf01855f41"; sha256 = "0knxsmlp1agfs5sj5iz13b8igjx4gpk1lj36wzh1rdiwcxicnr49"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f456d2b2b8f5a33bcb0f2ffd19e6e0276950f24/recipes/bmx-mode"; sha256 = "04g8l4cw20k3yhbija9mz1l4nx3bzhzj7nb35s0xdyvwbc2mhrwb"; - name = "bmx-mode"; + name = "recipe"; }; packageRequires = [ cl-lib company dash emacs s ]; meta = { @@ -5299,9 +6819,14 @@ license = lib.licenses.free; }; }) {}; - bnfc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bnfc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bnfc"; + ename = "bnfc"; version = "20160605.1227"; src = fetchFromGitHub { owner = "jmitchell"; @@ -5309,10 +6834,10 @@ rev = "1b58df1dd0cb9b81900632fb2843a03b94f56fdb"; sha256 = "0lmqrcy80nw6vmf81kh6q39x8pwhzrj6lbk31xpl8mvwnpqaykmn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7871b6372a391ace76edea40c6f92ceb10b70bf9/recipes/bnfc"; sha256 = "0h6qhyi7vcikg7zhv8lywdz033kp27a8z1ymq5wgs4aqs184igm6"; - name = "bnfc"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5320,9 +6845,14 @@ license = lib.licenses.free; }; }) {}; - bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bog = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bog"; + ename = "bog"; version = "20180113.759"; src = fetchFromGitHub { owner = "kyleam"; @@ -5330,10 +6860,10 @@ rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611"; sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl"; - name = "bog"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -5341,9 +6871,14 @@ license = lib.licenses.free; }; }) {}; - bolt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bolt-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bolt-mode"; + ename = "bolt-mode"; version = "20180310.10"; src = fetchFromGitHub { owner = "mpontus"; @@ -5351,10 +6886,10 @@ rev = "85a5a752bfbebb4aed884326c25db64c000e9934"; sha256 = "03nxcmpm5n8jcca39ivrl7cjqz3gzsl3w6qc30hcp278qf2jq6va"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec9e35f0e37db90d906fccd08fb25b673c88d3b8/recipes/bolt-mode"; sha256 = "03x89k8v0m9kv1fhyys2gwympb70qlmg7gdib8wsmdxs34ys5igz"; - name = "bolt-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5362,9 +6897,15 @@ license = lib.licenses.free; }; }) {}; - bongo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bongo = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bongo"; + ename = "bongo"; version = "20171118.1842"; src = fetchFromGitHub { owner = "dbrock"; @@ -5372,10 +6913,10 @@ rev = "3d246be1e8d14865f5253567ab8fee5d4e9c470c"; sha256 = "1zxk6x08gmir3qv07xanlsd2fb777jdbfzdksv1qh6srxbk3qfjq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/692428769cd792dc0644641682c2793103dd00c6/recipes/bongo"; sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv"; - name = "bongo"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -5383,9 +6924,13 @@ license = lib.licenses.free; }; }) {}; - bonjourmadame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bonjourmadame = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bonjourmadame"; + ename = "bonjourmadame"; version = "20170919.434"; src = fetchFromGitHub { owner = "pierre-lecocq"; @@ -5393,10 +6938,10 @@ rev = "d3df185fce78aefa689fded8e56a654f0fde4ac0"; sha256 = "1acn63hd7s2z8viy52hmhncdic7m86rcqczxnz9aivikqy4hfnsi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34c4cfd7bbf5b442a9304598ba0a23ba9b8dfae4/recipes/bonjourmadame"; sha256 = "0d36yradh37359fjk59s54hxkbh4qcc17sblj2ylcdyw7181iwfn"; - name = "bonjourmadame"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5404,20 +6949,29 @@ license = lib.licenses.free; }; }) {}; - boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: - melpaBuild { + boogie-friends = callPackage ({ cl-lib ? null + , company + , dash + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "boogie-friends"; + ename = "boogie-friends"; version = "20171024.1955"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie-friends"; - rev = "ff9903783013f3598b6f44c99d47b25c5cdbed00"; - sha256 = "0vc1pym7x6aafd88rrmm8yibq5y9wrx6b1pbgsfr7spcdq0hwwvg"; + rev = "7fea709f13c6cb93e4ed672955484201ebe6c123"; + sha256 = "1sfw59vd2ah054va5q52wf22cdrinv5m207prfzdqs9bsq1qfdac"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends"; sha256 = "0cfs7gvjxsx2027dbzh4yypz500nmk503ikiiprbww8jyvc8grk7"; - name = "boogie-friends"; + name = "recipe"; }; packageRequires = [ cl-lib company dash flycheck yasnippet ]; meta = { @@ -5425,20 +6979,25 @@ license = lib.licenses.free; }; }) {}; - bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bool-flip = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bool-flip"; + ename = "bool-flip"; version = "20161215.739"; src = fetchFromGitHub { owner = "michaeljb"; repo = "bool-flip"; - rev = "f58a9a7b9ab875bcfbd57c8262697ae404eb4485"; - sha256 = "06q86a6dhc7jvq25yqqq3dsmrbm67h0ayb6nhd0q5l90yrmfqfjh"; + rev = "0f7cc9b387429239fb929896511727d4e49a795b"; + sha256 = "1051gy7izy25jwh079231d4lh9azchbqc6nvfrkv8s9ck407a65a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f56377a7c3f4b75206ad9ba570c35dbf752079e9/recipes/bool-flip"; sha256 = "1xfspqxshx7m8gh6g1snkaahka9f71fnq7hx81nik4s9s8pmxj9c"; - name = "bool-flip"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5446,9 +7005,17 @@ license = lib.licenses.free; }; }) {}; - boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: - melpaBuild { + boon = callPackage ({ dash + , emacs + , expand-region + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multiple-cursors }: + melpaBuild { pname = "boon"; + ename = "boon"; version = "20180319.526"; src = fetchFromGitHub { owner = "jyp"; @@ -5456,10 +7023,10 @@ rev = "b4cf42bbc531032404da88e8671c7495f0f7a5b0"; sha256 = "163j41j29nm29w567iq662k9anivqc20yxghm8w49w7i5hsbq9dh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb"; - name = "boon"; + name = "recipe"; }; packageRequires = [ dash emacs expand-region multiple-cursors ]; meta = { @@ -5467,20 +7034,28 @@ license = lib.licenses.free; }; }) {}; - borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + borg = callPackage ({ dash + , emacs + , epkg + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "borg"; - version = "20180325.1457"; + ename = "borg"; + version = "20180702.1353"; src = fetchFromGitHub { owner = "emacscollective"; repo = "borg"; - rev = "b03e8d19874809e813c9631d29260bac73f51e01"; - sha256 = "15djx2c0agpmmy5ls61p0hwnv2plvb8k190xrrj925w9ypg2qp92"; + rev = "738f749a9eeb9abecad17d38ce9a3e45c040cede"; + sha256 = "0929d5bcqv39bq37sxgcf8z2y9zj89mjcdz632xy4qykiinhnwan"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; sha256 = "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr"; - name = "borg"; + name = "recipe"; }; packageRequires = [ dash emacs epkg magit ]; meta = { @@ -5488,9 +7063,14 @@ license = lib.licenses.free; }; }) {}; - borland-blue-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + borland-blue-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "borland-blue-theme"; + ename = "borland-blue-theme"; version = "20160117.521"; src = fetchFromGitHub { owner = "fourier"; @@ -5498,10 +7078,10 @@ rev = "db74eefebbc89d3c62575f8f50b319e87b4a3470"; sha256 = "0yzfxxv2bw4x320268bixfc7yf97851804bz3829vbdhnr4kp6y5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2ff5916fd2caee778479bc2ad3ef13ee514052c/recipes/borland-blue-theme"; sha256 = "1sc8qngm40bwdym8k1dgbahg48i73c00zxd99kqqwm9fnd6nm7qx"; - name = "borland-blue-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5509,9 +7089,14 @@ license = lib.licenses.free; }; }) {}; - boron-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + boron-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "boron-theme"; + ename = "boron-theme"; version = "20170808.608"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -5519,10 +7104,10 @@ rev = "87ae1a765e07429fec25d2f29b004f84b52d2e0a"; sha256 = "1kdf71af1s67vshgwkdgi7swxx942i605awhmhrhdjbkra29v4yn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/boron-theme"; sha256 = "1rrqlq08jnh9ihb99ji1vvmamj742assnm4a7xqz6gp7f248nb81"; - name = "boron-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5530,9 +7115,14 @@ license = lib.licenses.free; }; }) {}; - boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + boxquote = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "boxquote"; + ename = "boxquote"; version = "20170802.417"; src = fetchFromGitHub { owner = "davep"; @@ -5540,10 +7130,10 @@ rev = "7e47e0e2853bc1215739b2e28f260e9eed93b2c5"; sha256 = "1aqhg24gajvllbqxb0zxrnx6sddas37k2ldfinqyszd856sjhsg3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote"; sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s"; - name = "boxquote"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -5551,9 +7141,14 @@ license = lib.licenses.free; }; }) {}; - bpe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bpe = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bpe"; + ename = "bpe"; version = "20141228.1405"; src = fetchFromGitHub { owner = "yuutayamada"; @@ -5561,10 +7156,10 @@ rev = "7b5b25f83506e6c9f4075d3803fa32404943a189"; sha256 = "0chmarbpqingdma54d6chbr6v6jg8lapbw56cpvcpbl04fz980r0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a99263c2672d4c2433835cf948101130126e14b/recipes/bpe"; sha256 = "08zfqcgs7i2ram2qpy8vrzksx5722aahr66vdi4d9bcxm03s19fm"; - name = "bpe"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5572,9 +7167,14 @@ license = lib.licenses.free; }; }) {}; - bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bpr = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bpr"; + ename = "bpr"; version = "20180220.1044"; src = fetchFromGitHub { owner = "ilya-babanov"; @@ -5582,10 +7182,10 @@ rev = "af84a83dea09d86e77d87ac30604f2c5b4bf4117"; sha256 = "1r2prq9j6fmzzkl1f3r9drn6lna2wzd9qv127x7z5g6n8pgb6ipx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr"; sha256 = "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2"; - name = "bpr"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5593,9 +7193,14 @@ license = lib.licenses.free; }; }) {}; - bracketed-paste = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bracketed-paste = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bracketed-paste"; + ename = "bracketed-paste"; version = "20160407.1648"; src = fetchFromGitHub { owner = "hchbaw"; @@ -5603,10 +7208,10 @@ rev = "843ce3bbb63d560face889e13a57a2f7543957d5"; sha256 = "1l6j2zs12psc15cfhqq6hm1bg012jr49zd2i36cmappbsiax1l8m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6446db573d97ceb21cd39ce05fb39627113bbd74/recipes/bracketed-paste"; sha256 = "1v7zwi29as0218vy6ch21iqqcxfhyh373m3dbcdzm2pb8bpcg58j"; - name = "bracketed-paste"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5614,9 +7219,14 @@ license = lib.licenses.free; }; }) {}; - brainfuck-mode = callPackage ({ fetchFromGitHub, fetchurl, langdoc, lib, melpaBuild }: - melpaBuild { + brainfuck-mode = callPackage ({ fetchFromGitHub + , fetchurl + , langdoc + , lib + , melpaBuild }: + melpaBuild { pname = "brainfuck-mode"; + ename = "brainfuck-mode"; version = "20150113.42"; src = fetchFromGitHub { owner = "tom-tan"; @@ -5624,10 +7234,10 @@ rev = "36e69552bb3b97a4f888d362c59845651bd0d492"; sha256 = "1nzgjgzidyrplfs4jl8nikd5wwvb4rmrnm51qxmw9y2if0hpq0jd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/279ae8faabbfa2f894999e1534a964606722a150/recipes/brainfuck-mode"; sha256 = "08jzx329mrr3c2pifs3hb4i79dsw606b0iviagaaja8s808m40cd"; - name = "brainfuck-mode"; + name = "recipe"; }; packageRequires = [ langdoc ]; meta = { @@ -5635,9 +7245,14 @@ license = lib.licenses.free; }; }) {}; - broadcast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + broadcast = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "broadcast"; + ename = "broadcast"; version = "20151204.1812"; src = fetchFromGitHub { owner = "killdash9"; @@ -5645,10 +7260,10 @@ rev = "f6f9cd2e0e3f8c31d6b8e7446c27eb0e50b25f16"; sha256 = "0w6b9rxdciy1365kgf6fh3vgrjr8xd5ar6xcn0g4h56f2zg9hdmj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ed51896112e702a8b853059884aad50d37738c2/recipes/broadcast"; sha256 = "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib"; - name = "broadcast"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5656,20 +7271,27 @@ license = lib.licenses.free; }; }) {}; - browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + browse-at-remote = callPackage ({ cl-lib ? null + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "browse-at-remote"; - version = "20180227.52"; + ename = "browse-at-remote"; + version = "20180621.2331"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "browse-at-remote"; - rev = "47bab994640f086939c30cc6416e770ad067e950"; - sha256 = "0vhia7xmszcb3lxrb8wh93a3knjfzj48h8nhj4fh8zj1pjz6args"; + rev = "0a06018e3500f36917284d552917702de3c5fae5"; + sha256 = "1vci2azq00n2vx1kf0adhzddqj607l5341ym4p6ndk6xhdhqhkbs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote"; sha256 = "0s088ba047azba60rlfn3jbqr321vnm953i7dqw2gj9xml90kbm4"; - name = "browse-at-remote"; + name = "recipe"; }; packageRequires = [ cl-lib f s ]; meta = { @@ -5677,9 +7299,13 @@ license = lib.licenses.free; }; }) {}; - browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + browse-kill-ring = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "browse-kill-ring"; + ename = "browse-kill-ring"; version = "20171219.1108"; src = fetchFromGitHub { owner = "browse-kill-ring"; @@ -5687,10 +7313,10 @@ rev = "8debc43e41d7e51532698331c6f283905890b904"; sha256 = "18yg35raks0kbzg5wjay6liingdcv4glyzl9n14sgr9vzc7h96f9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/294dc32a672e6b6b0ebfc46cdf0ff9ceacf73e89/recipes/browse-kill-ring"; sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4"; - name = "browse-kill-ring"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5698,20 +7324,25 @@ license = lib.licenses.free; }; }) {}; - browse-url-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }: - melpaBuild { + browse-url-dwim = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , string-utils }: + melpaBuild { pname = "browse-url-dwim"; + ename = "browse-url-dwim"; version = "20140731.1222"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "browse-url-dwim"; - rev = "3d611dbb167c286109ac53995ad68286d87aafb9"; - sha256 = "1rcihwdxrzhgcz573rh1yp3770ihkwqjqvd39yhic1d3sgwxz2hy"; + rev = "11f1c53126619c7ef1bb5f5d6914ce0b3cce0e30"; + sha256 = "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/browse-url-dwim"; sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf"; - name = "browse-url-dwim"; + name = "recipe"; }; packageRequires = [ string-utils ]; meta = { @@ -5719,9 +7350,15 @@ license = lib.licenses.free; }; }) {}; - bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bshell = callPackage ({ buffer-manage + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bshell"; + ename = "bshell"; version = "20170903.1137"; src = fetchFromGitHub { owner = "plandes"; @@ -5729,10 +7366,10 @@ rev = "884a8b906617d305e9d5d2c3750618d2f86f9aed"; sha256 = "16qh71yhpxs5cxjmkiqiia8xrxa0ym2n32znp4yc7xiv2xfw2ss4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell"; sha256 = "1ds8xvh74i6wqswjp8i30knr74l4gbalkb2jil8qjb9wp9l1gw9z"; - name = "bshell"; + name = "recipe"; }; packageRequires = [ buffer-manage emacs ]; meta = { @@ -5740,9 +7377,15 @@ license = lib.licenses.free; }; }) {}; - btc-ticker = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }: - melpaBuild { + btc-ticker = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild + , request }: + melpaBuild { pname = "btc-ticker"; + ename = "btc-ticker"; version = "20151113.659"; src = fetchFromGitHub { owner = "niedbalski"; @@ -5750,10 +7393,10 @@ rev = "845235b545f070d0812cd1654cbaa4997565824f"; sha256 = "022j0gw5qkxjz8f70vqjxysifv2mz6cigf9n5z03zmpvwwvxmx2z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f78796a8835ec44f4d13c99559fd4d113c6f4f29/recipes/btc-ticker"; sha256 = "1vfnx114bvnly1k3fmcpkqq4m9558wqr5c9k9yj8f046dgfh8dp1"; - name = "btc-ticker"; + name = "recipe"; }; packageRequires = [ json request ]; meta = { @@ -5761,9 +7404,19 @@ license = lib.licenses.free; }; }) {}; - bts = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, pos-tip, s, widget-mvc, yaxception }: - melpaBuild { + bts = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , pos-tip + , s + , widget-mvc + , yaxception }: + melpaBuild { pname = "bts"; + ename = "bts"; version = "20151109.533"; src = fetchFromGitHub { owner = "aki2o"; @@ -5771,10 +7424,10 @@ rev = "df42d58a36447697f93b56e69f5e700b2baef1f9"; sha256 = "1qgasaqhqm0birjmb6k6isd2f5pn58hva8db8qfhva9g5kg1f38w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2f9c2f465b06c97cd03c5644155cd6c7fade24/recipes/bts"; sha256 = "1i1lbjracrgdxr52agxhxxgkra4w291dmz85s195lcx38rva7ib3"; - name = "bts"; + name = "recipe"; }; packageRequires = [ dash log4e pos-tip s widget-mvc yaxception ]; meta = { @@ -5782,9 +7435,15 @@ license = lib.licenses.free; }; }) {}; - bts-github = callPackage ({ bts, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: - melpaBuild { + bts-github = callPackage ({ bts + , fetchFromGitHub + , fetchurl + , gh + , lib + , melpaBuild }: + melpaBuild { pname = "bts-github"; + ename = "bts-github"; version = "20170401.549"; src = fetchFromGitHub { owner = "aki2o"; @@ -5792,10 +7451,10 @@ rev = "ef2cf9202dc2128e5efdb613bfde9276a8cd95ad"; sha256 = "173i9n4c8mg93gpc7ljxh3nhm4lq2c04yhrvjz6fwwwqvmnkha5f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f3e87699181877e50d75a89e2ee76e403fc9317/recipes/bts-github"; sha256 = "03lz12bbkjqbs82alc97k6s1pmk721qip3h9cifq8a5ww5cbq9ln"; - name = "bts-github"; + name = "recipe"; }; packageRequires = [ bts gh ]; meta = { @@ -5803,9 +7462,14 @@ license = lib.licenses.free; }; }) {}; - bubbleberry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bubbleberry-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bubbleberry-theme"; + ename = "bubbleberry-theme"; version = "20141017.244"; src = fetchFromGitHub { owner = "jasonm23"; @@ -5813,10 +7477,10 @@ rev = "22e9adf4586414024e4592972022ec297321b320"; sha256 = "1aha8rzilv4k300rr4l9qjfygydfwllkbw17lhm8jz0kh9w6bd28"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e359b4463b10ac713c2d024c43a1682fca2959af/recipes/bubbleberry-theme"; sha256 = "056pcr9ynsl34wqa2pw6sh4bdl5kpp1r0pl1vvw15p4866l9bdz3"; - name = "bubbleberry-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5824,9 +7488,13 @@ license = lib.licenses.free; }; }) {}; - buckwalter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buckwalter = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buckwalter"; + ename = "buckwalter"; version = "20180107.843"; src = fetchFromGitHub { owner = "joehakimrahme"; @@ -5834,10 +7502,10 @@ rev = "2aa5451c3682c268adebc6b1191a796466732f53"; sha256 = "0g270jyf2fd3x8p0jcd86j751spfphgsmwjxl61rk1x1kiql4icd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dd38487731cc978e104afa39f8954cfc33ba27f/recipes/buckwalter"; sha256 = "08pnmfy910n5l00kmkn4533x48m3scsxzyra0nl6iry2n39y2kr1"; - name = "buckwalter"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5845,9 +7513,13 @@ license = lib.licenses.free; }; }) {}; - buffer-buttons = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buffer-buttons = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buffer-buttons"; + ename = "buffer-buttons"; version = "20150106.639"; src = fetchFromGitHub { owner = "rpav"; @@ -5855,10 +7527,10 @@ rev = "2feb8494fa7863b98256bc85da670d74a3a8a975"; sha256 = "1p5a29bpjqr1gs6sb6rr7y0j06nlva23wxkwfskap25zvjpgwbvq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d518e81c8342a93455108e769c8b42747982c924/recipes/buffer-buttons"; sha256 = "1p0ydbrff9197sann3s0d7hpav7r9g461w4llncafmy31w7m1dn6"; - name = "buffer-buttons"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5866,9 +7538,13 @@ license = lib.licenses.free; }; }) {}; - buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buffer-flip = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buffer-flip"; + ename = "buffer-flip"; version = "20180307.1451"; src = fetchFromGitHub { owner = "killdash9"; @@ -5876,10 +7552,10 @@ rev = "e093360e05164c78255866c1ac8f966aa38ba514"; sha256 = "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip"; sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098"; - name = "buffer-flip"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5887,20 +7563,27 @@ license = lib.licenses.free; }; }) {}; - buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buffer-manage = callPackage ({ choice-program + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buffer-manage"; - version = "20170916.957"; + ename = "buffer-manage"; + version = "20180528.913"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "4a0d526ca45264971796efe67c6e41d8aa659e4c"; - sha256 = "15p089qfz8ra6f2lhny492hiricgs39w7w5iak2zlqm6k88cl1j8"; + rev = "8bbe342a4dafcfdaf305baea98bd4208036ab89a"; + sha256 = "027d71ppkcq60lkzgal8wv4xpjs4hzgih5ry9q2d4g0dr7wkjp3j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb"; - name = "buffer-manage"; + name = "recipe"; }; packageRequires = [ choice-program dash emacs ]; meta = { @@ -5908,9 +7591,13 @@ license = lib.licenses.free; }; }) {}; - buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buffer-move = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buffer-move"; + ename = "buffer-move"; version = "20160615.1103"; src = fetchFromGitHub { owner = "lukhas"; @@ -5918,10 +7605,10 @@ rev = "cb517ecf8409b5fdcda472d7190c6021f0c49751"; sha256 = "0gxy58v8nyv6pmzfn8552m8a14f5lzcbkndp5xpzq4g9qvmifmj6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e30e053eab078a8bef73e42b90299231ea0997ee/recipes/buffer-move"; sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg"; - name = "buffer-move"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5929,19 +7616,24 @@ license = lib.licenses.free; }; }) {}; - buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + buffer-sets = callPackage ({ cl-lib ? null + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buffer-sets"; + ename = "buffer-sets"; version = "20170717.2040"; src = fetchgit { url = "https://git.flintfam.org/swf-projects/buffer-sets.git"; rev = "4a4ccb0d6916c3e9fba737bb7b48e8aac921954e"; sha256 = "1rg6iwswi82w8938pavwhvvr2z3ismb42asam2fkad47h2sgn0gz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61d07bbe7201fc991c7ab7ee6299a89d63ddb5e5/recipes/buffer-sets"; sha256 = "1xj9fn2x4kbx8kp999wvz1j68znp7j81zl6rnbaipbx7hjpqrsin"; - name = "buffer-sets"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -5949,20 +7641,24 @@ license = lib.licenses.free; }; }) {}; - buffer-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buffer-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buffer-utils"; + ename = "buffer-utils"; version = "20140512.700"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "buffer-utils"; - rev = "685b13457e3a2085b7584e41365d2aa0779a1b6f"; - sha256 = "1mnf0dgr6g58k0jyia7985jsinrla04vm5sjl2iajwphbhadjk8p"; + rev = "32e1f23817b9c6caedb53e5359baad29e99eaa2b"; + sha256 = "0fajk0qjm1cq1a7ps2fa584g23bjlbccxv7s0x6n5yqpgn1f79ax"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/buffer-utils"; sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2"; - name = "buffer-utils"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5970,9 +7666,15 @@ license = lib.licenses.free; }; }) {}; - buffer-watcher = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buffer-watcher = callPackage ({ cl-lib ? null + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buffer-watcher"; + ename = "buffer-watcher"; version = "20170913.139"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -5980,10 +7682,10 @@ rev = "b32c67c8a5d724257d759f4c903d0dedc32246ef"; sha256 = "0mygs48mk2z8cw1csz2wfyn7kln9662d16hwpmbxs5x8k71aq8jx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8681776d467951d14d8247e6939bd9a6f2a80ec/recipes/buffer-watcher"; sha256 = "0v096021xk7k821bxb5zddw6sljqa6fs8f7s8j0w3pv6lmhra1ln"; - name = "buffer-watcher"; + name = "recipe"; }; packageRequires = [ cl-lib f ]; meta = { @@ -5991,20 +7693,25 @@ license = lib.licenses.free; }; }) {}; - bufshow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bufshow = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bufshow"; + ename = "bufshow"; version = "20130726.1138"; src = fetchFromGitHub { owner = "pjones"; repo = "bufshow"; - rev = "d60a554e7239e6f7520d9c3436d5ecdbc9cf6957"; - sha256 = "1rh848adjqdl42rw8yf1fqbr143m0pnbrlznx0d97v4vszvbby2s"; + rev = "42d7fb74c3f914e127d5447c63d209bf19f5d517"; + sha256 = "1gmk0p9rkhkpzg38rf642w2qancj5gb43dhqnhh3asgmij7f6nk3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/543a734795eed11aa47a8e1348d14e362b341af0/recipes/bufshow"; sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h"; - name = "bufshow"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -6012,9 +7719,13 @@ license = lib.licenses.free; }; }) {}; - bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bug-reference-github = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bug-reference-github"; + ename = "bug-reference-github"; version = "20180128.514"; src = fetchFromGitHub { owner = "arnested"; @@ -6022,10 +7733,10 @@ rev = "f570a0532bfb44f095b42cf68ab1f69799101137"; sha256 = "09rbxgrk7jp9xajya6nccj0ak7fc48wyxq4sfmjmy3q1qfszdsc3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dfce86371692dddef78a6c1d772138b487b82cb/recipes/bug-reference-github"; sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6"; - name = "bug-reference-github"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6033,9 +7744,15 @@ license = lib.licenses.free; }; }) {}; - bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bui = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bui"; + ename = "bui"; version = "20171215.930"; src = fetchFromGitHub { owner = "alezost"; @@ -6043,10 +7760,10 @@ rev = "af1a237b4d1ed31780dd37bcbef51fc8ca9b0603"; sha256 = "1ccw90a68dahcrkr94xi9apnxjmvzjvd33w78bsr2jyfd82ggsw1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; sha256 = "0a4g55k02hi3cwvk4d35lk2x5kc4fabskl2025i83hx0rqw4w3f1"; - name = "bui"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -6054,20 +7771,25 @@ license = lib.licenses.free; }; }) {}; - build-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + build-helper = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "build-helper"; + ename = "build-helper"; version = "20161009.1055"; src = fetchFromGitHub { owner = "afonso360"; repo = "build-helper"; - rev = "7a6fe71125a26ed1c492dab77cc688a7fe1d68ac"; - sha256 = "0pipdzjf7arli6b88fp21as5d4v8ylsy19hixywhfgb7917qsrkv"; + rev = "d1962858734253eca791721ccf62d1c4a10719f5"; + sha256 = "07bhagf206p8q0nmz3sy2frd3zzi96snm3bm0rp6mffai0p58vps"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af56cde18ae0efb0ae91c818e6804c55cdb3b8c2/recipes/build-helper"; sha256 = "1asgpf2k4i7p88ask1i6ra4krhsxr6j2d2qv0gfxlsa5p330mmgh"; - name = "build-helper"; + name = "recipe"; }; packageRequires = [ projectile ]; meta = { @@ -6075,9 +7797,14 @@ license = lib.licenses.free; }; }) {}; - build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + build-status = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "build-status"; + ename = "build-status"; version = "20171111.1147"; src = fetchFromGitHub { owner = "sshaw"; @@ -6085,10 +7812,10 @@ rev = "ef44185d9dd748ea578d68398f3f729a8adb45b5"; sha256 = "00zcmmdccgzb5cp1nd9kjpiqs3zd9rh0z7aj9kmwsffaq339g55n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status"; sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92"; - name = "build-status"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -6096,9 +7823,15 @@ license = lib.licenses.free; }; }) {}; - bundler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: - melpaBuild { + bundler = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild }: + melpaBuild { pname = "bundler"; + ename = "bundler"; version = "20160815.215"; src = fetchFromGitHub { owner = "tobiassvn"; @@ -6106,10 +7839,10 @@ rev = "f981f67c33b42243e57a78c358dffff70022b56b"; sha256 = "1hfcvlkwa3hh70qan3q5mvld1hqqbnmbwqycvlqi6qr8dcdfl3cx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ade7d0f0f0e553b48634e60ecaf7b91d0776d5f0/recipes/bundler"; sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4"; - name = "bundler"; + name = "recipe"; }; packageRequires = [ cl-lib inf-ruby ]; meta = { @@ -6117,20 +7850,24 @@ license = lib.licenses.free; }; }) {}; - bury-successful-compilation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bury-successful-compilation = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bury-successful-compilation"; + ename = "bury-successful-compilation"; version = "20150328.1728"; src = fetchFromGitHub { owner = "EricCrosson"; repo = "bury-successful-compilation"; - rev = "52da2c07419beceab9b4d426d76adb3dcf2548d1"; - sha256 = "1qdkx14rwabrfm9kzp4w9gvk9h4qg8f5b3qdwlyn863d2y7q468g"; + rev = "7b16dc71b43914928cc16da674e69d7af975238a"; + sha256 = "08ny1iycsgpal99g180w9yvk6ql8qn2kkc9xk9lmfv5p1wqm3l4w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f66e2e23c7a1fa0ce6fa8a0e814242b7c46c299c/recipes/bury-successful-compilation"; sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3"; - name = "bury-successful-compilation"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6138,9 +7875,13 @@ license = lib.licenses.free; }; }) {}; - buster-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buster-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buster-mode"; + ename = "buster-mode"; version = "20140928.513"; src = fetchFromGitHub { owner = "magnars"; @@ -6148,10 +7889,10 @@ rev = "de6958ef8369400922618b8d1e99abfa91b97ac5"; sha256 = "1viq7cb41r8klr8i38c5zjrhdnww31gh4j51xdgy4v2lc3z321zi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/buster-mode"; sha256 = "0nylkxy9qlj1h5v0pja4g315xcj5qzvkys4dsnzbh3xq4xzyj6xj"; - name = "buster-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6159,9 +7900,14 @@ license = lib.licenses.free; }; }) {}; - buster-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + buster-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "buster-snippets"; + ename = "buster-snippets"; version = "20151125.210"; src = fetchFromGitHub { owner = "magnars"; @@ -6169,10 +7915,10 @@ rev = "bb8769dae132659858e74d52f3f4e8790399423a"; sha256 = "11djqlw4qf3qs2rwiz7dn5q2zw5i8sykwdf4hg4awsgv8g0bbxn6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67dabf33096113e68fe282309246094711751e1f/recipes/buster-snippets"; sha256 = "0k36c2k7wwix10rgmjxipc77fkn9jahjyvl191af6w41wla47x4x"; - name = "buster-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -6180,9 +7926,13 @@ license = lib.licenses.free; }; }) {}; - busybee-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + busybee-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "busybee-theme"; + ename = "busybee-theme"; version = "20170719.228"; src = fetchFromGitHub { owner = "mswift42"; @@ -6190,10 +7940,10 @@ rev = "66b2315b030582d0ebee605cf455d386d8c30fcd"; sha256 = "1cvj5m45f5ky3w86khh6crvdqrdjxg2z6b34jlm32qpgmn0s5g45"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36e2089b998d98575aa6dd3cc79fb7f6847f7aa3/recipes/busybee-theme"; sha256 = "0w0z5x2fbnalv404av3mapfkqbfgyk81a1mzvngll8x0pirbyi10"; - name = "busybee-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6201,9 +7951,16 @@ license = lib.licenses.free; }; }) {}; - butler = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + butler = callPackage ({ deferred + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "butler"; + ename = "butler"; version = "20150811.1708"; src = fetchFromGitHub { owner = "AshtonKem"; @@ -6211,10 +7968,10 @@ rev = "8ceb35737107572455cca9a61ff46b3ff78f1016"; sha256 = "0pp604r2gzzdpfajw920607pklwflk842difdyl4hy9w87fgc0jg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c86e3f5083e59568afac69eed9aa8c1a0bd76e2e/recipes/butler"; sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq"; - name = "butler"; + name = "recipe"; }; packageRequires = [ deferred emacs json ]; meta = { @@ -6222,20 +7979,24 @@ license = lib.licenses.free; }; }) {}; - buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buttercup = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buttercup"; - version = "20180223.937"; + ename = "buttercup"; + version = "20180629.523"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "4106adc5051965a3d066dfb5594e3d3ba0303b3f"; - sha256 = "01pvga1b54p7l9fjj388hdvjkmmp2gf5la7l74xjaxfk7v5rrifv"; + rev = "39d625ce53bb1e1b9b03d9c9c70aa81e94fcc66a"; + sha256 = "1y97af0kl0yiirnajn44jcz865acndjwkr3zhpf65lm0bbaxfp2a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb"; - name = "buttercup"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6243,9 +8004,13 @@ license = lib.licenses.free; }; }) {}; - button-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + button-lock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "button-lock"; + ename = "button-lock"; version = "20150223.554"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -6253,10 +8018,10 @@ rev = "f9082feb329432fcf2ac49a95e64bed9fda24d58"; sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83459421dd2eb3d60ec668c3d5bb38d99ee64aff/recipes/button-lock"; sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp"; - name = "button-lock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6264,9 +8029,13 @@ license = lib.licenses.free; }; }) {}; - c-c-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + c-c-combo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "c-c-combo"; + ename = "c-c-combo"; version = "20151223.1855"; src = fetchFromGitHub { owner = "CestDiego"; @@ -6274,10 +8043,10 @@ rev = "a261a833499a7fdc29610863b3aafc74818770ba"; sha256 = "040mcq2cwzbrf96f9mghb4314cd8xwp7ki2ix9fxpmbwiy323ld5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da105eab0e7a5a3a1fc562973d99cbbbe9019b5f/recipes/c-c-combo"; sha256 = "09rvh6n2hqls7qki5dc34s2hmcmlvdsbgzcxgglhcmrhwx5w4vxn"; - name = "c-c-combo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6285,9 +8054,13 @@ license = lib.licenses.free; }; }) {}; - c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + c-eldoc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "c-eldoc"; + ename = "c-eldoc"; version = "20170917.1502"; src = fetchFromGitHub { owner = "nflath"; @@ -6295,10 +8068,10 @@ rev = "79d09769362228058246f5e6fa183d121f7fb322"; sha256 = "1398lfd18zn2xym36p71yavgggqbb15xz9m7gah4w4k2bk15aczk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/c-eldoc"; sha256 = "13grkww14w39y2x6mrbfa9nzljsnl5l7il8dnj6sjdyv0hz9x8vm"; - name = "c-eldoc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6306,9 +8079,13 @@ license = lib.licenses.free; }; }) {}; - c0-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + c0-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "c0-mode"; + ename = "c0-mode"; version = "20151110.1052"; src = fetchFromGitHub { owner = "catern"; @@ -6316,10 +8093,10 @@ rev = "c214093c36864d6208fcb9e6a72413ed17ed5d60"; sha256 = "10k90r4ckkkdjn9pqcbfyp6ynvrd5k0ngqcn5d0v1qvkn6jifxjx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/268115452d9c22a6f2627cec1eb122b47e85b88c/recipes/c0-mode"; sha256 = "0s3h4b3lpz4jsk222yyfdxh780dvykhaqgyv6r3ambz95vrmmpl4"; - name = "c0-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6327,9 +8104,15 @@ license = lib.licenses.free; }; }) {}; - cabledolphin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + cabledolphin = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "cabledolphin"; + ename = "cabledolphin"; version = "20160204.138"; src = fetchFromGitHub { owner = "legoscia"; @@ -6337,10 +8120,10 @@ rev = "fffc192cafa61558e924323d6da8166fe5f2a6f9"; sha256 = "1h395hvia7r76zlgr10qdr9q2159qyrs89znhkp2czikwm8kjiqk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8bd2715aec4793abc37d6899adabd568955a08/recipes/cabledolphin"; sha256 = "04slrx0vkcm66q59158limn0cpxn18ghlqyx7z8nrn7frrc03z03"; - name = "cabledolphin"; + name = "recipe"; }; packageRequires = [ emacs seq ]; meta = { @@ -6348,9 +8131,13 @@ license = lib.licenses.free; }; }) {}; - cache = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cache = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cache"; + ename = "cache"; version = "20111019.1600"; src = fetchFromGitHub { owner = "nflath"; @@ -6358,10 +8145,10 @@ rev = "7499586b6c8224df9f5c5bc4dec96b008258d580"; sha256 = "1hp6dk84vvgkmj5lzghvqlpq3axwzgx9c7gly2yx6497fgf9jlby"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cache"; sha256 = "15pj7f4n0lk8qqsfafdj19iy0hz4xpfcf2fnby7ziq2dldyqrax9"; - name = "cache"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6369,9 +8156,14 @@ license = lib.licenses.free; }; }) {}; - cacoo = callPackage ({ concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cacoo = callPackage ({ concurrent + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cacoo"; + ename = "cacoo"; version = "20120319.1659"; src = fetchFromGitHub { owner = "kiwanami"; @@ -6379,10 +8171,10 @@ rev = "c9fa04fbe97639b24698709530361c2bb5f3273c"; sha256 = "07kzhyqr8ycjvkknijqhsfr26zd5jc8wxm9sl8bp6pzn4jbs1dmx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd55f5c29876c2483001cd9deaca68cab5054b9/recipes/cacoo"; sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z"; - name = "cacoo"; + name = "recipe"; }; packageRequires = [ concurrent ]; meta = { @@ -6390,20 +8182,25 @@ license = lib.licenses.free; }; }) {}; - cake-inflector = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + cake-inflector = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "cake-inflector"; + ename = "cake-inflector"; version = "20140415.158"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-cake-inflector"; - rev = "a1d338ec4840b1b1bc14f7f9298c07e2c1d2d8fc"; - sha256 = "0m8ss9aky24f5i6b8fyy8mhv9ygj158crjyddnj9xx73vsjf96bs"; + rev = "d9c6298fbca53efeb6f0f37140395659d9a6d7cc"; + sha256 = "09p04bssiqyp74947ivsl09x93bd6ik48ycgimafmx8aycnrjfla"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77c46238b632047160d6dfac9b257f57b0c4283b/recipes/cake-inflector"; sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf"; - name = "cake-inflector"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -6411,9 +8208,14 @@ license = lib.licenses.free; }; }) {}; - cakecrumbs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cakecrumbs = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cakecrumbs"; + ename = "cakecrumbs"; version = "20180222.1845"; src = fetchFromGitHub { owner = "kuanyui"; @@ -6421,10 +8223,10 @@ rev = "76cfbfacfaa9d2128fc9218338a0ba2bb47349ab"; sha256 = "18ni6krymzm1af2vmw2n82s0ifny6pn1p0qifn3646xx4p210a4z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c970907affeb4a21fa1b7c350edf171dbdcd8de5/recipes/cakecrumbs"; sha256 = "1s5j8w0y47qpdq4f34l7hmdhxp560wg1lgzqz6p3p3lg1l89sv47"; - name = "cakecrumbs"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -6432,9 +8234,14 @@ license = lib.licenses.free; }; }) {}; - cal-china-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cal-china-x = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cal-china-x"; + ename = "cal-china-x"; version = "20180211.1101"; src = fetchFromGitHub { owner = "xwl"; @@ -6442,10 +8249,10 @@ rev = "e9b309065829af3a9a0c526509bd64d9228fdced"; sha256 = "0wipcsr0dry2r9sw7lcz5hw16b5gpax7qr2nbdlcwj3j9axqipyg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1098d34012fa72f8c8c30d5f0f495fdbe1d3d65/recipes/cal-china-x"; sha256 = "06mh2p14m2axci8vy1hr7jpy53jj215z0djyn8h7zpr0k62ajhka"; - name = "cal-china-x"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -6453,9 +8260,13 @@ license = lib.licenses.free; }; }) {}; - calendar-norway = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calendar-norway = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calendar-norway"; + ename = "calendar-norway"; version = "20160827.1316"; src = fetchFromGitHub { owner = "unhammer"; @@ -6463,10 +8274,10 @@ rev = "8501b2ee515e995f345365391b03f44c812cabdf"; sha256 = "0lch835rq2rqyh0vyi75dhyl7hm6bv27f2z753wggh0jyg6qxi7a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5d01230027d5cec9da2545a9ce9270a611f6567/recipes/calendar-norway"; sha256 = "1i23ks0bnq62bvn3szvqf0ikcam4s92yvr998mkjxhdhc94zd19c"; - name = "calendar-norway"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6474,9 +8285,13 @@ license = lib.licenses.free; }; }) {}; - calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calfw = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calfw"; + ename = "calfw"; version = "20180117.1645"; src = fetchFromGitHub { owner = "kiwanami"; @@ -6484,10 +8299,10 @@ rev = "03abce97620a4a7f7ec5f911e669da9031ab9088"; sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw"; sha256 = "0am1nafc16zax8082gjlz0pi85lryjhrx0v80nzgr23iybj5mfx4"; - name = "calfw"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6495,20 +8310,24 @@ license = lib.licenses.free; }; }) {}; - calfw-cal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calfw-cal = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calfw-cal"; + ename = "calfw-cal"; version = "20170320.506"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "03abce97620a4a7f7ec5f911e669da9031ab9088"; - sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch"; + rev = "136dce009a26e7d8a8064af422c2cf8170e852c5"; + sha256 = "1hiip8hfl7myimgba7ggs1ki1pk3ag7nyfa8j2zzm87n93g5xia4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal"; sha256 = "1wylkd7jl1ifq56jj04l5b9wfrjkhwncxzrjgnbgg1cl2klf6v4m"; - name = "calfw-cal"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6516,9 +8335,13 @@ license = lib.licenses.free; }; }) {}; - calfw-gcal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calfw-gcal = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calfw-gcal"; + ename = "calfw-gcal"; version = "20120111.200"; src = fetchFromGitHub { owner = "myuhe"; @@ -6526,10 +8349,10 @@ rev = "14aab20687d6cc9e6c5ddb9e11984c4e14c3d870"; sha256 = "14n5rci4bkbl7037xvkd69gfxnjlgvd2j1xzciqcgz92f06ir3xi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/calfw-gcal"; sha256 = "0pzjs8kvf9vxdzziq7zd59vniq21k4a6yygpv4fz2by3s3bvnrid"; - name = "calfw-gcal"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6537,20 +8360,24 @@ license = lib.licenses.free; }; }) {}; - calfw-howm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calfw-howm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calfw-howm"; + ename = "calfw-howm"; version = "20170703.1704"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "03abce97620a4a7f7ec5f911e669da9031ab9088"; - sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch"; + rev = "bcfc0c546c3c58e1f635a9a29efdf56c9421a3ce"; + sha256 = "0n7kn0g7mxylp28w5llrz22w12qjvypa1g82660qr2d9ga9mb0v9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm"; sha256 = "08cv16cq211sy2v1i0gk7d81f0gyywv0i9szmamnrbjif3rrv2m0"; - name = "calfw-howm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6558,20 +8385,24 @@ license = lib.licenses.free; }; }) {}; - calfw-ical = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calfw-ical = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calfw-ical"; + ename = "calfw-ical"; version = "20150703.119"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "03abce97620a4a7f7ec5f911e669da9031ab9088"; - sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch"; + rev = "a67fa1023b3fddc1d1f38114c1d207376c8e6289"; + sha256 = "0g8s3pgivqk1vqdgkndznkl48c4m5yiahkjxyqyv2781hdb4f6xa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical"; sha256 = "1bh9ahwp9b5knjxph79kl19fgs48x3w7dga299l0xvbxq2jhs95q"; - name = "calfw-ical"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6579,20 +8410,24 @@ license = lib.licenses.free; }; }) {}; - calfw-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calfw-org = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calfw-org"; + ename = "calfw-org"; version = "20160302.1858"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "03abce97620a4a7f7ec5f911e669da9031ab9088"; - sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch"; + rev = "e03ae470788778e7714b73520014eadc03a88abd"; + sha256 = "0rhasr818qijd2pcgifi0j3q4fkbiw2ck1nivajk7m810p53bxbj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org"; sha256 = "1cfpjh08djz3k067w3580yb15p1csks3gzch9c4cbrbcjvg8inh5"; - name = "calfw-org"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6600,20 +8435,29 @@ license = lib.licenses.free; }; }) {}; - call-graph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }: - melpaBuild { + call-graph = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , hierarchy + , ivy + , lib + , melpaBuild + , tree-mode }: + melpaBuild { pname = "call-graph"; - version = "20180327.2003"; + ename = "call-graph"; + version = "20180509.635"; src = fetchFromGitHub { owner = "beacoder"; repo = "call-graph"; - rev = "f000f7f620eff965bf289216f66cfb27ddb1815d"; - sha256 = "1qgfz6v4yaa7c9cn82jqkh0s1mmzyr5zlrxd6g4hiv4f1pvf0is2"; + rev = "1ba83f20e56cfe77f6165df4ffde1d152647ec3b"; + sha256 = "0qs3wg6ls4s400hdcimwf9lj9mz6g39sk3nqxvp4fk01jjzcas39"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph"; sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc"; - name = "call-graph"; + name = "recipe"; }; packageRequires = [ cl-lib emacs hierarchy ivy tree-mode ]; meta = { @@ -6621,20 +8465,24 @@ license = lib.licenses.free; }; }) {}; - calmer-forest-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calmer-forest-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calmer-forest-theme"; + ename = "calmer-forest-theme"; version = "20130925.2210"; src = fetchFromGitHub { owner = "caldwell"; repo = "calmer-forest-theme"; - rev = "87ba7bae389084d13fe3bc34e0c923017eda6ba0"; - sha256 = "0n6y4z3qg04qnlsrjysf8ldxl2f2bk7n8crijydwabyy672qxd9h"; + rev = "31a0bed8e5db1e314557175a719a10804ac089f4"; + sha256 = "1rqd46ngnjln6vvcx7vsmwsjn4r3wfdpip6gqjqbsznav2g74bra"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edb51491e575ef64a705cd0b972de07993f185cf/recipes/calmer-forest-theme"; sha256 = "0riz5n8fzvxdnzgg650xqc2zwc4xvhwjlrrzls5h0pl5adaxz96p"; - name = "calmer-forest-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6642,20 +8490,27 @@ license = lib.licenses.free; }; }) {}; - camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { + camcorder = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names }: + melpaBuild { pname = "camcorder"; + ename = "camcorder"; version = "20160404.2134"; src = fetchFromGitHub { owner = "Malabarba"; repo = "camcorder.el"; - rev = "b13d939990e6709492efefc0945798adc1c0fcb9"; - sha256 = "0y8hw463w77rvf7cn5bqjnfww8h8kfkn37wi1kfjfq8hyirw4zrb"; + rev = "c96b3392c99b9f83c968bffa330ec4356c41518e"; + sha256 = "0am8asrzjs3iwak9c86fxb4zwgx5smbb9ywp0zn4y7j37blygswj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/camcorder"; sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi"; - name = "camcorder"; + name = "recipe"; }; packageRequires = [ cl-lib emacs names ]; meta = { @@ -6663,20 +8518,24 @@ license = lib.licenses.free; }; }) {}; - caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + caml = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "caml"; + ename = "caml"; version = "20171209.1232"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "8767cbafb1390685d08f294496492b97996468a3"; - sha256 = "0by86qm6pic3d0iqqdswhdlgicg7nxmh3mqwn0pz38dwfa57rqky"; + rev = "ca71bda2ac7e5143f58fa9a1693f97e709a91332"; + sha256 = "1ksx2ym5s68m87rnjjkdwhp5ci6cfw0yhmjjmq1r4a0d0r77x4lr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c"; - name = "caml"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6684,20 +8543,24 @@ license = lib.licenses.free; }; }) {}; - capture = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + capture = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "capture"; + ename = "capture"; version = "20130828.944"; src = fetchFromGitHub { owner = "pashinin"; repo = "capture.el"; - rev = "1bb26060311da76767f70096218313fc93b0c806"; - sha256 = "08cp45snhyir5w8gyp6xws1q7c54pz06q099l0m3zmwn9277g68z"; + rev = "9140c207b48b3520a2f06674b3e1bee2fc92b80c"; + sha256 = "1fqqiari3r2dib65gc1jayhj5rca249g1ll9lxdcc7mfifjc4pqk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdfe43be6c5f77845e82745534a1b1a9eb190466/recipes/capture"; sha256 = "1hxrvyq8my5886q7wj5w3mhyja7d6cf19gyclap492ci7kmrkdk2"; - name = "capture"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6705,30 +8568,69 @@ license = lib.licenses.free; }; }) {}; - cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: - melpaBuild { + carbon-now-sh = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "carbon-now-sh"; + ename = "carbon-now-sh"; + version = "20180331.1035"; + src = fetchFromGitHub { + owner = "veelenga"; + repo = "carbon-now-sh.el"; + rev = "b5f1e5487301b230078f3ab8032e19969d738aea"; + sha256 = "1x987rvbz56ppjys7xbkzkn53cdjzxay3nkvr9w555kc24qsg2qf"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b79bb8af3c149b2d131813c5308141e0e06adccf/recipes/carbon-now-sh"; + sha256 = "1casq1b71rlwanayixs6rrn96jn1w7bzkq77lg0ini5hrfd3w18p"; + name = "recipe"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/carbon-now-sh"; + license = lib.licenses.free; + }; + }) {}; + cargo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild + , rust-mode }: + melpaBuild { pname = "cargo"; - version = "20171218.855"; + ename = "cargo"; + version = "20180521.408"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "ba652e464ccdd0860fbc5d932c2ae86c9a31a200"; - sha256 = "1wyk40c61hlkmx3v82hn89chvrx7fyyyc1j2wlhizi7x5cv3c497"; + rev = "10093586bdac7252e65e11851f26da8ba4720608"; + sha256 = "03imznfy9ry2n83hj3qgw8m0030w66z6789raxywv394274pxm4c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx"; - name = "cargo"; + name = "recipe"; }; - packageRequires = [ emacs rust-mode ]; + packageRequires = [ emacs markdown-mode rust-mode ]; meta = { homepage = "https://melpa.org/#/cargo"; license = lib.licenses.free; }; }) {}; - caroline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + caroline-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "caroline-theme"; + ename = "caroline-theme"; version = "20160317.2220"; src = fetchFromGitHub { owner = "xjackk"; @@ -6736,10 +8638,10 @@ rev = "222fd483db304509f9e422dc82883d808e023ceb"; sha256 = "055w1spba0q9rqqg4rjds0iakr9d8xg66959xahxq8268mq5446n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/caroline-theme"; sha256 = "178nxcz73lmvnjcr6x6as25d8m5knc21jpr66b4rg0rmlmhchkal"; - name = "caroline-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -6747,20 +8649,28 @@ license = lib.licenses.free; }; }) {}; - caseformat = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + caseformat = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "caseformat"; + ename = "caseformat"; version = "20160115.815"; src = fetchFromGitHub { owner = "HKey"; repo = "caseformat"; - rev = "92a31f6a7cae0b4e2af106cd6f2b0abe6c2d8921"; - sha256 = "1cp9i69npvyn72fqv0w8q1hlkcawkhbah4jblc341ycxwxb48mkl"; + rev = "e4961889309408b3425da9b69c16ddfadd17a674"; + sha256 = "08bypv8dijzv05hml4lzzy0ynhsgkma9bspw8sq3zgz5q92gnvrk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba158fbeebcda6b6122b18c97ab8042b1c0a0bc0/recipes/caseformat"; sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk"; - name = "caseformat"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs s ]; meta = { @@ -6768,20 +8678,31 @@ license = lib.licenses.free; }; }) {}; - cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: - melpaBuild { + cask = callPackage ({ cl-lib ? null + , dash + , epl + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , package-build + , s + , shut-up }: + melpaBuild { pname = "cask"; - version = "20180119.1906"; + ename = "cask"; + version = "20180626.1249"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "3cbb32d25ea5691e64bd150188643808846b3688"; - sha256 = "1jxqy8sb2asyck6wp68lbczffpf6b3bg87r965nhxac7kgqhvq4d"; + rev = "d731e96f40c34a0fd85db04977c9756d60bd221f"; + sha256 = "045qixxkrvz48giwc83aykld78gmbckndy32prh8dl6ch7digh23"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5"; - name = "cask"; + name = "recipe"; }; packageRequires = [ cl-lib dash epl f package-build s shut-up ]; meta = { @@ -6789,20 +8710,25 @@ license = lib.licenses.free; }; }) {}; - cask-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cask-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cask-mode"; + ename = "cask-mode"; version = "20160410.749"; src = fetchFromGitHub { owner = "Wilfred"; repo = "cask-mode"; - rev = "7c6719d3bb4fe552958634bd5a11abc56681f3a7"; - sha256 = "0gywc2mzdzq3ny0jjffa3151vi7zb9i8ddy5d63x4yhicf5sxlh1"; + rev = "c97755267b7215f02df7b0c16b4210c04aee6566"; + sha256 = "162vvyycvv9pd93hsb8blbjqf22d40xinm5340b3vnsqgg33l4jl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d8bc1afaf69b4f29ba1bb0243c25574bc1197cc/recipes/cask-mode"; sha256 = "0fs9zyihipr3klnh3w22h43qz0wnxplm62x4kx7pm1chq9bc9kz6"; - name = "cask-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -6810,9 +8736,21 @@ license = lib.licenses.free; }; }) {}; - cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: - melpaBuild { + cask-package-toolset = callPackage ({ ansi + , cl-lib ? null + , commander + , dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , shut-up }: + melpaBuild { pname = "cask-package-toolset"; + ename = "cask-package-toolset"; version = "20170921.1556"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; @@ -6820,10 +8758,10 @@ rev = "2c74cd827e88c7f8360581a841e45f0b794510e7"; sha256 = "1hk5q6p1j7cqg5srr3v21xfyy7aas4hfj1a66h21c2xvfjra3hxw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset"; sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g"; - name = "cask-package-toolset"; + name = "recipe"; }; packageRequires = [ ansi cl-lib commander dash emacs f s shut-up ]; meta = { @@ -6831,20 +8769,26 @@ license = lib.licenses.free; }; }) {}; - caskxy = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + caskxy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "caskxy"; + ename = "caskxy"; version = "20140513.839"; src = fetchFromGitHub { owner = "aki2o"; repo = "caskxy"; - rev = "dc18dcab7ed526070ab76de071c9c5272e6ac40e"; - sha256 = "15sq5vrkhb7c5j6ny6wy4bkyl5pggch4l7zw46an29rzni3pffr3"; + rev = "279f3ab79bd77fe69cb3148a79896b9bf118a9b3"; + sha256 = "1j1lw5zifp7q1ykm6si0nzxfp7n3z2lzla2njkkxmc2s6m7w4x1a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d61aea505e4913879f68081497e85542e9fd786/recipes/caskxy"; sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s"; - name = "caskxy"; + name = "recipe"; }; packageRequires = [ log4e yaxception ]; meta = { @@ -6852,19 +8796,24 @@ license = lib.licenses.free; }; }) {}; - catmacs = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + catmacs = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "catmacs"; + ename = "catmacs"; version = "20170826.457"; src = fetchgit { url = "https://bitbucket.org/pymaximus/catmacs"; - rev = "65d3e0563abe6ff9577202cf2278074d4130fbdd"; - sha256 = "0954qck9j417c17niy28ccrhmsbjyh95z4dbqc5j4mib06j37587"; + rev = "6ea9ee195661fe95355413856476c45dcc8e24e8"; + sha256 = "057fqmpzhpslhcyvz4s7lp2v448fy7xicfk9kaw3fjhlrnkhi603"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e62e45ea234a574ed602f27c3c6bc240bcd4fa43/recipes/catmacs"; sha256 = "0ym1szmq9ib75yiyy5jw647fcs7gg0d5dkskqc293pg81qf3im50"; - name = "catmacs"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -6872,9 +8821,14 @@ license = lib.licenses.free; }; }) {}; - cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cbm = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cbm"; + ename = "cbm"; version = "20171116.440"; src = fetchFromGitHub { owner = "akermu"; @@ -6882,10 +8836,10 @@ rev = "5b41c936ba9f6d170309a85ffebc9939c1050b31"; sha256 = "091ln3d0jhdgahbwfdm1042b19886n3kwipw5gk8d0jnq5vwrkws"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm"; sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn"; - name = "cbm"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -6893,20 +8847,24 @@ license = lib.licenses.free; }; }) {}; - ccc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ccc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ccc"; + ename = "ccc"; version = "20151205.543"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "16d156562aef72f02ced58087335ed72d520d878"; - sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx"; + rev = "e18c04d63712a5b40853bee3ca3f1bde8ba5bdba"; + sha256 = "17grxms81xb00bhg8j2yzc3j74njakgv4r80w0vj8fp1357j12xd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; sha256 = "0fckhmz4svcg059v4acbn13yf3ijs09fxmq1axc1b9bm3xxig2cq"; - name = "ccc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6914,9 +8872,41 @@ license = lib.licenses.free; }; }) {}; - cd-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ccls = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { + pname = "ccls"; + ename = "ccls"; + version = "20180708.2207"; + src = fetchFromGitHub { + owner = "MaskRay"; + repo = "emacs-ccls"; + rev = "4c8f377f7aa957a33a0097dc212e765246f799db"; + sha256 = "09gll0c1jy0ljv2jb7qmpgyh0n4jdm4xhj10lcny0xx32nyfa86y"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/be27a4022d58860917a659fce2b7d7791fbea4e2/recipes/ccls"; + sha256 = "0kiv0n6pdpa75wjcimpwccwbjbhga4gjnphjrkpj4qz5qv42rbnm"; + name = "recipe"; + }; + packageRequires = [ dash emacs lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/ccls"; + license = lib.licenses.free; + }; + }) {}; + cd-compile = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cd-compile"; + ename = "cd-compile"; version = "20141108.1157"; src = fetchFromGitHub { owner = "jamienicol"; @@ -6924,10 +8914,10 @@ rev = "10284ccae86afda4a37b09ba90acd1e2efedec9f"; sha256 = "1a93cim1w96aaj81clhjv25r7v9bwqm9a818mn8lk4aj1bmhgc4c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bca4c9e8b071497ac50a85741bf46be6eaae2135/recipes/cd-compile"; sha256 = "1a24rv1jbb883vwhjkw6qxv3h3qy039iqkhkx3jkq1ydidr9f0hv"; - name = "cd-compile"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6935,20 +8925,24 @@ license = lib.licenses.free; }; }) {}; - cdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cdb = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cdb"; + ename = "cdb"; version = "20151205.543"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "16d156562aef72f02ced58087335ed72d520d878"; - sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx"; + rev = "e18c04d63712a5b40853bee3ca3f1bde8ba5bdba"; + sha256 = "17grxms81xb00bhg8j2yzc3j74njakgv4r80w0vj8fp1357j12xd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; sha256 = "1gx34062h25gqsl3j1fjlklha19snvmfaw068q6bv6x9r92niqnf"; - name = "cdb"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6956,20 +8950,24 @@ license = lib.licenses.free; }; }) {}; - cdlatex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cdlatex = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cdlatex"; + ename = "cdlatex"; version = "20140707.426"; src = fetchFromGitHub { owner = "cdominik"; repo = "cdlatex"; - rev = "ff534912b93fc2c7a6b191b1c8d6d699a46bbb01"; - sha256 = "1pvlq98qll44g1ag8w5rkbppk1b8l8inkwn5qzrlsjr8pngyhljz"; + rev = "1d491c2dddb05cdace1ae0e1f56a36009b065d85"; + sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cdlatex"; sha256 = "021gj0jw93r8gk0cacw1ldfibpwr6fpkcrnign7b4nqqnb3135k9"; - name = "cdlatex"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6977,9 +8975,17 @@ license = lib.licenses.free; }; }) {}; - cdnjs = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + cdnjs = callPackage ({ dash + , deferred + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "cdnjs"; + ename = "cdnjs"; version = "20161031.822"; src = fetchFromGitHub { owner = "yasuyk"; @@ -6987,10 +8993,10 @@ rev = "ce19880d3ec3d81e6c665d0b1dfea99cc7a3f908"; sha256 = "02j45ngddx7n5gvy42r8y3s22bmxlnvg2pqjfh0li8m599fnd11h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66e4ce4e2c7e4aaac9dc0ce476c4759b000ff5d6/recipes/cdnjs"; sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7"; - name = "cdnjs"; + name = "recipe"; }; packageRequires = [ dash deferred f pkg-info ]; meta = { @@ -6998,9 +9004,13 @@ license = lib.licenses.free; }; }) {}; - cedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cedit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cedit"; + ename = "cedit"; version = "20141231.814"; src = fetchFromGitHub { owner = "zk-phi"; @@ -7008,10 +9018,10 @@ rev = "0878d851b6307c162bfbddd2bb02789e5e27bc2c"; sha256 = "1f8gdj3p54q3410c66716y3l7i7nnkmq6hqz0dg1a1sc6jwdij3v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0de4796054f0c616849904bacf05c74c7d2cdcf6/recipes/cedit"; sha256 = "169sy7a1bgczwfxkkzjiggb7vdjxhrx7i3a39g6zv9f1zs6byk6m"; - name = "cedit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7019,20 +9029,28 @@ license = lib.licenses.free; }; }) {}; - celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + celery = callPackage ({ dash-functional + , deferred + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "celery"; + ename = "celery"; version = "20170225.124"; src = fetchFromGitHub { owner = "ardumont"; repo = "emacs-celery"; - rev = "51197d74f5eaa8ae09144af7663a2f4277f07d16"; - sha256 = "1845qz0ih30z1jgm1zi11q4gvw9gy6w3vyj2mc1aiv5r170qj8as"; + rev = "b3378dd81e5a717432123fb13d70201da5dc841a"; + sha256 = "0xm9dhcw7p60rckq9i4aqpv050n2244yi8w5rvqlqb2i4pnkb0fh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b896b2b89d990a7ce2f4bf4ce0aee0d126f3e55/recipes/celery"; sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h"; - name = "celery"; + name = "recipe"; }; packageRequires = [ dash-functional deferred emacs s ]; meta = { @@ -7040,20 +9058,25 @@ license = lib.licenses.free; }; }) {}; - celestial-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + celestial-mode-line = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "celestial-mode-line"; - version = "20171210.1045"; + ename = "celestial-mode-line"; + version = "20180518.122"; src = fetchFromGitHub { owner = "ecraven"; repo = "celestial-mode-line"; - rev = "018b5eb215be58fbae971d9013599966eaa569dc"; - sha256 = "0d92k706qhv1bz11wvnkb5iaanxf2wraxwgzkx8kijpxl771zdqj"; + rev = "3f5794aca99b977f1592cf1ab4516ae7922196a1"; + sha256 = "01kdpfjnfnjll40n1zdp641gw8pk2vnv93a59lyx1mw1f30yvfr6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdb1d057f76166ba32d5028f18eec7d09857f990/recipes/celestial-mode-line"; sha256 = "1s6vn71mxfvvafjs25j12z1gnmxnkvnw716zy5ifx1bs8s5960kq"; - name = "celestial-mode-line"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7061,20 +9084,24 @@ license = lib.licenses.free; }; }) {}; - centered-cursor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + centered-cursor-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "centered-cursor-mode"; + ename = "centered-cursor-mode"; version = "20180112.755"; src = fetchFromGitHub { owner = "andre-r"; repo = "centered-cursor-mode.el"; - rev = "75b479ffbfc5e3fed25d86a72afa2f1d2dcbd4b5"; - sha256 = "0xsnnjql7am94imr8v5aps2azlcvqn9lgq33cnwnwz6y8ffszmpf"; + rev = "319636448ffb7dba5fade3b2599ed9c1fd3bf8c8"; + sha256 = "1fib5db8rjyjrr86nw1jvf30pz2zva0v21khyz7fkh2nkf8b3a7i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode"; sha256 = "1yy50p3xprkqiak3vfly5s5kpbbdmxmw6fhgz13fw97553hr3w5x"; - name = "centered-cursor-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7082,20 +9109,25 @@ license = lib.licenses.free; }; }) {}; - centered-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + centered-window = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "centered-window"; + ename = "centered-window"; version = "20171127.149"; src = fetchFromGitHub { owner = "anler"; repo = "centered-window-mode"; - rev = "24f7c5be9def20879f46659082d497e67b55d7af"; - sha256 = "0387x0z2l0yvbhkvh3rf3h2ddk7bvwgkpvpngwhhsjbc4hh4k3hz"; + rev = "1234a364c9fa3a54087884ced2a7357b93fbb5d7"; + sha256 = "1z3zi6zy1z68g4sfiv21l998n04hbbqp660khind6ap8yjjn8ik8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58bfd795d4d620f0c83384fb03008e129c71dc09/recipes/centered-window"; sha256 = "0w6na4ld79bpmkiv6glbrphc32v6g2rcrpi28259i94jhgy1kxqk"; - name = "centered-window"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7103,9 +9135,13 @@ license = lib.licenses.free; }; }) {}; - centimacro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + centimacro = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "centimacro"; + ename = "centimacro"; version = "20140306.627"; src = fetchFromGitHub { owner = "abo-abo"; @@ -7113,10 +9149,10 @@ rev = "1b97a9b558ed9c49d5da1bfbf29b2506575c2742"; sha256 = "0zqrpaq9c3lm12jxnvysh8f3m3193k22zaj0ycscdqd1jpq4wcgh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de048d6e5d11a42d92de1938fd74fd37146a5a89/recipes/centimacro"; sha256 = "1qbyfi6s4hdp5sv394w3sib8g2kx06i06q8gh6hdv5pis5kq9fx6"; - name = "centimacro"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7124,20 +9160,27 @@ license = lib.licenses.free; }; }) {}; - cerbere = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: - melpaBuild { + cerbere = callPackage ({ f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , s }: + melpaBuild { pname = "cerbere"; + ename = "cerbere"; version = "20140418.715"; src = fetchFromGitHub { owner = "nlamirault"; repo = "cerbere"; - rev = "dd2105c372b469954e665a5aa0c3766b4922ce6a"; - sha256 = "0i8939rycyq7baa043ksdv90mg3ik2amgkjf6iv4cx9r6c1xkzwx"; + rev = "ef573b05f4c2a067b8234003aaa4b2a76fffea5c"; + sha256 = "17jg5d5afh9zpnjx8wkys8bjllxq99j0yhz8j3fvkskisvhkz1im"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4145e270a2113f30f8bb4d0f6c335f1c76f77b1c/recipes/cerbere"; sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06"; - name = "cerbere"; + name = "recipe"; }; packageRequires = [ f pkg-info s ]; meta = { @@ -7145,20 +9188,25 @@ license = lib.licenses.free; }; }) {}; - ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ceylon-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ceylon-mode"; - version = "20170806.919"; + ename = "ceylon-mode"; + version = "20180606.624"; src = fetchFromGitHub { owner = "lucaswerkmeister"; repo = "ceylon-mode"; - rev = "1267447a38648502627005bfad0a3aef3572ef7d"; - sha256 = "1qj0dxfwh4yn9q01j22nq3ssg8l0s9v437l685gfly3ac5fp83ry"; + rev = "948515672bc596dc118e8e3ede3ede5ec6a3c95a"; + sha256 = "1a9f9h5kywfy8c2kmaxc9vf5zcykbhghpi3ra2l3z5hm0knq54ay"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode"; sha256 = "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4"; - name = "ceylon-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7166,20 +9214,24 @@ license = lib.licenses.free; }; }) {}; - cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cfengine-code-style = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cfengine-code-style"; + ename = "cfengine-code-style"; version = "20171115.1308"; src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "fb827edc6fd0baa6502f5655dd743e59b71ff395"; - sha256 = "03aiqvzr9qmqsi9h9yjjqbvr9d7wchip9hmadhadr62cb43c9bc7"; + rev = "10e43677e99a29d8072bb120e7cd7b9d03b1218f"; + sha256 = "0mncl7wb2vi620snk4z01k0wdbvvd5b2nw9nlnfr9a4hkn3fg44r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a"; - name = "cfengine-code-style"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7187,9 +9239,15 @@ license = lib.licenses.free; }; }) {}; - cff = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cff = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cff"; + ename = "cff"; version = "20160118.1218"; src = fetchFromGitHub { owner = "fourier"; @@ -7197,10 +9255,10 @@ rev = "b6ab2a28e64ef06f281ec74cfe3114e450644dfa"; sha256 = "019vqjmq6hb2f5lddqy0ya5q0fd47xix29cashlchz0r034rc32r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4e056132be11481aa26e89d5af1cd03925f92d1/recipes/cff"; sha256 = "04b2ck1jkhsrka6dbyn6rpsmmc2bn13kpyhzibd781hj73d93jgc"; - name = "cff"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -7208,9 +9266,16 @@ license = lib.licenses.free; }; }) {}; - cfml-mode = callPackage ({ cftag-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: - melpaBuild { + cfml-mode = callPackage ({ cftag-mode + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mmm-mode }: + melpaBuild { pname = "cfml-mode"; + ename = "cfml-mode"; version = "20170903.1949"; src = fetchFromGitHub { owner = "am2605"; @@ -7218,10 +9283,10 @@ rev = "86e77dcbb583191a3e755bdc29534f33d82bfc56"; sha256 = "0b0261ap0jiys9d0x31xg7x36kpq06fni2c0cjhi58wpcykq3s1p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d28507e1109195004a371fa201d914b995c2b4e/recipes/cfml-mode"; sha256 = "0q88lxhkzzab4jjihk0livdpn6lsmd8l2s4brcbl8402m285sylp"; - name = "cfml-mode"; + name = "recipe"; }; packageRequires = [ cftag-mode emacs mmm-mode ]; meta = { @@ -7229,20 +9294,27 @@ license = lib.licenses.free; }; }) {}; - cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cframe = callPackage ({ buffer-manage + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cframe"; + ename = "cframe"; version = "20170917.1509"; src = fetchFromGitHub { owner = "plandes"; repo = "cframe"; - rev = "bb99672502046e87c8f029ce98c637f762a4fc54"; - sha256 = "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4"; + rev = "61844d948e4464625f7023de62aeb27ca742b36f"; + sha256 = "1v413kvygfkdiqi9zg6ypihf2vcks0vs80qshg0ynm5zy27f984y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe"; sha256 = "0pngdaflk1pk2xmwbij4b520b3mlacnjab4r3jby0phah44ziv4l"; - name = "cframe"; + name = "recipe"; }; packageRequires = [ buffer-manage dash emacs ]; meta = { @@ -7250,20 +9322,25 @@ license = lib.licenses.free; }; }) {}; - cftag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cftag-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cftag-mode"; + ename = "cftag-mode"; version = "20170811.2240"; src = fetchFromGitHub { owner = "am2605"; repo = "cfml-mode"; - rev = "86e77dcbb583191a3e755bdc29534f33d82bfc56"; - sha256 = "0b0261ap0jiys9d0x31xg7x36kpq06fni2c0cjhi58wpcykq3s1p"; + rev = "395c5a9422f7bda619fd67875a8a2173aaf9c807"; + sha256 = "1q0hy0baf8vcnnbanpl3za4q5ykxm33fyq2n863jp9v6b6wbc71d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0914d33ebf58847fa3906b1f0d53e97ac335b334/recipes/cftag-mode"; sha256 = "0qnq8h5nwhw464ax8qpbsvflpaar44zw0mh2y7kc358v27n3qy6c"; - name = "cftag-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7271,9 +9348,13 @@ license = lib.licenses.free; }; }) {}; - cg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cg = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cg"; + ename = "cg"; version = "20171123.301"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -7281,10 +9362,10 @@ rev = "e19f3bf60b9c8dbcff053b008fa3ace17fc073fe"; sha256 = "13j7x6ngjga2idixw02llmykzsrihsxnfdj5jkx5sdkvrmqymmfz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/cg"; sha256 = "0yl2w48953vym4gxcxvjfaq3jgsv5jlya9vq3iwlfxqpapd3r3k9"; - name = "cg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7292,20 +9373,25 @@ license = lib.licenses.free; }; }) {}; - challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + challenger-deep-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "challenger-deep-theme"; - version = "20180223.644"; + ename = "challenger-deep-theme"; + version = "20180525.918"; src = fetchFromGitHub { owner = "MaxSt"; repo = "challenger-deep"; - rev = "8194c3ade7ba73f6ddfea7dec55f77b5b6fdbcab"; - sha256 = "0rsx9gqkxxkk597liyghw0sjrvmfid4j1kbmz5ff8irm259g7psy"; + rev = "62d05f01c3dc4653f46527448b3b2058daba86c0"; + sha256 = "019n14m1nfiw2xshsmkiszmj7qc5dyd949xj3bfcxrj6a2prsgqw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; sha256 = "1apjc32wy7h7fadxckdbfa6wzd360c7v6dig9gikjbsxm8xgdg60"; - name = "challenger-deep-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7313,9 +9399,14 @@ license = lib.licenses.free; }; }) {}; - change-inner = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + change-inner = callPackage ({ expand-region + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "change-inner"; + ename = "change-inner"; version = "20150707.844"; src = fetchFromGitHub { owner = "magnars"; @@ -7323,10 +9414,10 @@ rev = "52c543a4b9808c0d15b565fcdf646c9779de33e8"; sha256 = "1m9sq93bwajbld3lnlzkjbsby5zlm9sxjzqynryyvsb9zr1d0a9z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/change-inner"; sha256 = "09y076vhhvp21jsvw9f5z4yk6cnmmjavg7600flxg5g27ydgix57"; - name = "change-inner"; + name = "recipe"; }; packageRequires = [ expand-region ]; meta = { @@ -7334,20 +9425,24 @@ license = lib.licenses.free; }; }) {}; - chapel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chapel-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chapel-mode"; + ename = "chapel-mode"; version = "20160504.108"; src = fetchFromGitHub { owner = "russel"; repo = "Emacs-Chapel-Mode"; - rev = "6e095edd7639f5f0a81e14d6412410b49466697e"; - sha256 = "0r3yja2ak3z62lav2s8vimmjyi4rd5s82fbs8r6p2k0shm6lj7hz"; + rev = "816a1a54ff5ffdd20b6a4d249ace774740a3924c"; + sha256 = "0kp18xlc1005hbkfhng03y4xgaicqf6b5vwgnwbbw9s5qzirmhix"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff32db72ad55a7191b5105192480e17535c7edde/recipes/chapel-mode"; sha256 = "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz"; - name = "chapel-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7355,20 +9450,26 @@ license = lib.licenses.free; }; }) {}; - char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + char-menu = callPackage ({ avy-menu + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "char-menu"; + ename = "char-menu"; version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "82f0422179737bcb9f93481aebaf1071d54fc859"; - sha256 = "1r5nymx7yj4l4wjhsx6gxvh9rqx322x5n54cqg71mssxiwccpdv3"; + rev = "3235f8e3c88848ce10d25f84a5da39061fd35c0d"; + sha256 = "05pjfj6g4gdbdj4z63283j5qzkvhvrzsx1jhbc5iih0nsffwapc3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l"; - name = "char-menu"; + name = "recipe"; }; packageRequires = [ avy-menu emacs ]; meta = { @@ -7376,20 +9477,24 @@ license = lib.licenses.free; }; }) {}; - charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + charmap = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "charmap"; + ename = "charmap"; version = "20160309.146"; src = fetchFromGitHub { owner = "lateau"; repo = "charmap"; - rev = "bd4b3e466d7a9433cf35167e3a68ec74fe631bb2"; - sha256 = "0vqsfk83lg3gvcv62jsgxxwz7icpkpswgg30hmcq0qfg0dfwwcl9"; + rev = "e0477f08c56c93c420e01452bba64b0da732f309"; + sha256 = "05k19q7iihvhi0gflmkpsg5q3ydkdlvf0xh7kjk4lx9yvi0am7m2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11c549fca81c4276054f614d86d17fa7af4ab32e/recipes/charmap"; sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84"; - name = "charmap"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7397,9 +9502,13 @@ license = lib.licenses.free; }; }) {}; - chatwork = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chatwork = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chatwork"; + ename = "chatwork"; version = "20170510.2142"; src = fetchFromGitHub { owner = "ataka"; @@ -7407,10 +9516,10 @@ rev = "fea231d479f06bf40dbfcf45de143eecc9ed744c"; sha256 = "163xr18lm4awfgh4lcp7pr04jirpvlk8w1g4445zbxbpjfvv268z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77ae72e62b8771e890525c063522e7091ca8f674/recipes/chatwork"; sha256 = "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p"; - name = "chatwork"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7418,9 +9527,14 @@ license = lib.licenses.free; }; }) {}; - cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cheat-sh = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cheat-sh"; + ename = "cheat-sh"; version = "20170802.418"; src = fetchFromGitHub { owner = "davep"; @@ -7428,10 +9542,10 @@ rev = "e90445124f3f145a047779e42d070a3c5e150f70"; sha256 = "06avap8w833syhz7pdpsm73nbsgbwzmpagd7f3khzaf6r6c90jmn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; sha256 = "0f6wqyh3c3ap0l6khikqlw8sqqi6fsl468gn157faza4x63j9z80"; - name = "cheat-sh"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7439,9 +9553,15 @@ license = lib.licenses.free; }; }) {}; - cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cheatsheet = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cheatsheet"; + ename = "cheatsheet"; version = "20170126.1350"; src = fetchFromGitHub { owner = "darksmile"; @@ -7449,10 +9569,10 @@ rev = "e4f8e0110167ea16a17a74517d1f10cb7ff805b8"; sha256 = "1vy2qmx9872hfrfcycpsmy0si481rwv4q4gwiy8f2w04zb92szbn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7/recipes/cheatsheet"; sha256 = "11z3svlzvmhdy0pkxbx9qz9bnq056cgkbfyw9z34aq1yxazi2cpq"; - name = "cheatsheet"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -7460,20 +9580,26 @@ license = lib.licenses.free; }; }) {}; - checkbox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + checkbox = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "checkbox"; + ename = "checkbox"; version = "20141116.1658"; src = fetchFromGitHub { owner = "camdez"; repo = "checkbox.el"; - rev = "335afa4404adf72973195a580458927004664d98"; - sha256 = "0660ix17ksxy5a5v8yqy7adr9d4bs6p1mnkc6lpyw96k4pn62h45"; + rev = "2afc2011fa35ccfa0ce9ef46cb1896911fa340d1"; + sha256 = "09ypxhfad3v1pz0xhw4xgxvfj7ad2kb3ff9zy1mnw7fzsa7gw6nj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81c4a9d10238836865716f5ea45f8e0e625a87c6/recipes/checkbox"; sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa"; - name = "checkbox"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -7481,9 +9607,16 @@ license = lib.licenses.free; }; }) {}; - chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + chee = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "chee"; + ename = "chee"; version = "20171123.1433"; src = fetchFromGitHub { owner = "eikek"; @@ -7491,10 +9624,10 @@ rev = "669ff9ee429f24c3c2d03b83d9cb9aec5f86bb8b"; sha256 = "1k64mjzqmjirsld40dvmpq4llpb7ggx80r1hvsjqazc4mr16pbri"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee"; - sha256 = "1njldlp9bnwq7izmdlz5a97kfgxxnycv43djrvx4b01j4v2yz4zv"; - name = "chee"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/25b445a1dea5e8f1042bed6b5372471c25129fd8/recipes/chee"; + sha256 = "1sw84qaca2cwgrw332wfqjp3kg3axgi9n6wx5a6h2n3liq5yr1wj"; + name = "recipe"; }; packageRequires = [ dash f s ]; meta = { @@ -7502,9 +9635,14 @@ license = lib.licenses.free; }; }) {}; - cheerilee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xelb }: - melpaBuild { + cheerilee = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xelb }: + melpaBuild { pname = "cheerilee"; + ename = "cheerilee"; version = "20160313.1135"; src = fetchFromGitHub { owner = "Vannil"; @@ -7512,10 +9650,10 @@ rev = "41bd81b5b0bb657241ceda5be6af5e07254d7376"; sha256 = "1jdlp5cnsiza55vx4kxacqgk7yqg9fvd9swhwdxkczadb2d5l9p1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da435df8d78b7c8d4834e00e35c69248a7043c0a/recipes/cheerilee"; sha256 = "15igjlnq35cg9nslyqa63i1inqipx3y8g7zg4r26m69k25simqrv"; - name = "cheerilee"; + name = "recipe"; }; packageRequires = [ xelb ]; meta = { @@ -7523,20 +9661,24 @@ license = lib.licenses.free; }; }) {}; - chef-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chef-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chef-mode"; - version = "20111121.700"; + ename = "chef-mode"; + version = "20180628.753"; src = fetchFromGitHub { owner = "mpasternacki"; repo = "chef-mode"; - rev = "c333dd3f9229c4f35fe8c4495b21049ba730cc42"; - sha256 = "1mnskri5r1lyzzcag60x7amn00613jyl7by7hd4sqm2a7zd4r5aa"; + rev = "048d691cb63981ae235763d4a6ced4af5c729924"; + sha256 = "1niin51xwkd8q3wbwcgb0gyk3sw1829qj2p2zv7fm8ljy1jicn2d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4044056af824d552a2852ef1f2e7166899f56d8c/recipes/chef-mode"; sha256 = "1pz82s82d4z3vkm8mpmwdxb9pd11kq09g23mg461lzqxjjw734rr"; - name = "chef-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7544,20 +9686,25 @@ license = lib.licenses.free; }; }) {}; - cherry-blossom-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cherry-blossom-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cherry-blossom-theme"; + ename = "cherry-blossom-theme"; version = "20150621.2042"; src = fetchFromGitHub { owner = "inlinestyle"; repo = "emacs-cherry-blossom-theme"; - rev = "eea7653e00f35973857ee23b27bc2fae5e753e50"; - sha256 = "0m97xr6lddy2jdmd4bl4kbp2568p4n110yfa9k7fqc20ihq8jkyd"; + rev = "e5ea23694c0f20ab670c0aa87214c27f2232d922"; + sha256 = "0gmbsiyh075gmv3cq9675wf6mpls5wlwgcavha31cdbsdb9frsk1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/401ae22f11f7ee808eb696a4c1f869cd824702c0/recipes/cherry-blossom-theme"; sha256 = "1i3kafj3m7iij5mr0vhg45zdnkl9pg9ndrq0b0i3k3mw7d5siq7w"; - name = "cherry-blossom-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7565,9 +9712,13 @@ license = lib.licenses.free; }; }) {}; - chicken-scheme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chicken-scheme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chicken-scheme"; + ename = "chicken-scheme"; version = "20141116.1139"; src = fetchFromGitHub { owner = "dleslie"; @@ -7575,10 +9726,10 @@ rev = "19b0b08b5592063e852cae094b394c7d1f923639"; sha256 = "0j61lvr99viaharg4553whcppp7lxhimkk5lps0izz9mnd8y2wm5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03f4992471185bf41720ff6fc725fd5fa1291a41/recipes/chicken-scheme"; sha256 = "0ns49p7nsifpi7wrzr02ljrr0p6hxanrg54zaixakvjkxwcgfabr"; - name = "chicken-scheme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7586,9 +9737,14 @@ license = lib.licenses.free; }; }) {}; - chinese-conv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chinese-conv = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chinese-conv"; + ename = "chinese-conv"; version = "20170807.1428"; src = fetchFromGitHub { owner = "gucong"; @@ -7596,10 +9752,10 @@ rev = "b56815bbb163d642e97fa73093b5a7e87cc32574"; sha256 = "1bc3yn8y60y6a4vpqv39arn1pkcpl4s4n0sz9446f6m1lcal4c3r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a798158829f8fd84dd3e5e3ec5987d98ff54e641/recipes/chinese-conv"; sha256 = "1lqpq7pg0nqqqj29f8is6c724vl75wscmm1v08j480pfks3l8cnr"; - name = "chinese-conv"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -7607,20 +9763,24 @@ license = lib.licenses.free; }; }) {}; - chinese-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chinese-number = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chinese-number"; + ename = "chinese-number"; version = "20161007.2209"; src = fetchFromGitHub { owner = "zhcosin"; repo = "chinese-number"; - rev = "7311c2a0c5eea5f016a90d733dfe75144c302fb2"; - sha256 = "01i7nycjnx4cpfgwakj14jv9dwybjl5jnslcxic9pr1n77mz53wk"; + rev = "1d0c440181848dfcd1d1e618b2650fb0562a32ac"; + sha256 = "1zm0wjhqsb11szvxs2rnq63396cbi6ffynpbn07p6gk5agxzfy0j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/chinese-number"; sha256 = "01ia2l5vrg8fhaxcvk8pv9qfm08xs0fbyc9j57nbdk9wxnd9i45s"; - name = "chinese-number"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7628,9 +9788,13 @@ license = lib.licenses.free; }; }) {}; - chinese-wbim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chinese-wbim = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chinese-wbim"; + ename = "chinese-wbim"; version = "20150623.2050"; src = fetchFromGitHub { owner = "zilongshanren"; @@ -7638,10 +9802,10 @@ rev = "57ff61ff3895d77335709d24b40cefc4d10b0095"; sha256 = "0cx1g6drkr8gyqqdxjf7j4wprxcbq30gam2racgnvdicgij0apwg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b6b1d100ddf29d6936569d61bf4be19a24d002d/recipes/chinese-wbim"; sha256 = "1pax3kpmvg170mpvfrjbpj9czq0xykmfbany2f7vbn96jb5xfmsb"; - name = "chinese-wbim"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7649,9 +9813,14 @@ license = lib.licenses.free; }; }) {}; - chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chinese-word-at-point = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chinese-word-at-point"; + ename = "chinese-word-at-point"; version = "20170811.241"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -7659,10 +9828,10 @@ rev = "8223d7439e005555b86995a005b225ae042f0538"; sha256 = "13gva1ld4f9wwb2m4fpk6bd9342qvvmaf5i1r3x3h84czmk0nq1r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9b7785eca577218feade982c979694389f37ec3/recipes/chinese-word-at-point"; sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4"; - name = "chinese-word-at-point"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -7670,9 +9839,15 @@ license = lib.licenses.free; }; }) {}; - chinese-yasdcv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: - melpaBuild { + chinese-yasdcv = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pyim }: + melpaBuild { pname = "chinese-yasdcv"; + ename = "chinese-yasdcv"; version = "20171014.1844"; src = fetchFromGitHub { owner = "tumashu"; @@ -7680,10 +9855,10 @@ rev = "5ab830daf1273d5a5cddcb94b56a9737f12d996f"; sha256 = "1mv1n6m73aamxj18i851ww53q7p4ydiqgaapxyvjbm6sx8ddz9ak"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv"; sha256 = "1y2qywldf8b8b0km1lcf74p0w6rd8gr86qcj7ikwhhbvd19dfglm"; - name = "chinese-yasdcv"; + name = "recipe"; }; packageRequires = [ cl-lib pyim ]; meta = { @@ -7691,9 +9866,15 @@ license = lib.licenses.free; }; }) {}; - choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + choice-program = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "choice-program"; + ename = "choice-program"; version = "20171004.931"; src = fetchFromGitHub { owner = "plandes"; @@ -7701,10 +9882,10 @@ rev = "27607ec1fe241c58fbc1f861454a8e2ec1fd7b15"; sha256 = "0q8krgsydrc2xc29y60qljifdvxfmxnvbncxsh64xhrzsnrgwmq5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program"; sha256 = "0a21yd3b8sb15vms9mclaa7xnnk0as08p6q38mwdwjp9sgcfyh1b"; - name = "choice-program"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -7712,9 +9893,13 @@ license = lib.licenses.free; }; }) {}; - chronos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chronos = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chronos"; + ename = "chronos"; version = "20150602.829"; src = fetchFromGitHub { owner = "dxknight"; @@ -7722,10 +9907,10 @@ rev = "b360d9dae57aa553cf2a14ffa0756a51ad71de09"; sha256 = "1mqdz3rvx0jm80fgzw3s3lqn448kqrlrifdwcg36cqq4qmkpalq4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53648c5699fc03e50774270f9560c727e2c22873/recipes/chronos"; sha256 = "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d"; - name = "chronos"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7733,9 +9918,14 @@ license = lib.licenses.free; }; }) {}; - chruby = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chruby = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chruby"; + ename = "chruby"; version = "20180114.852"; src = fetchFromGitHub { owner = "plexus"; @@ -7743,10 +9933,10 @@ rev = "42bc6d521f832eca8e2ba210f30d03ad5529788f"; sha256 = "06pvjw40qk017py9km26vjrh90acycnkr5r04nxf664qqkjlg2mc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1989a3c6fa4cd7aaf6b0b202f197eb7db51936b9/recipes/chruby"; sha256 = "0pk6vdvmifiq52n452lbrkklxa69c40bfyzra9qhrghxr2q5v3mk"; - name = "chruby"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -7754,9 +9944,13 @@ license = lib.licenses.free; }; }) {}; - chyla-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chyla-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chyla-theme"; + ename = "chyla-theme"; version = "20180302.858"; src = fetchFromGitHub { owner = "chyla"; @@ -7764,10 +9958,10 @@ rev = "ae5e7ecace2ab474151eb0ac5ef07fba2dc32f8a"; sha256 = "1gqzwwr3fnhd9iqn7zmqpxgxvmrhq7g849ndjwizksk0bfj3b596"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c55eebf8df165360ce1e5d18e484c90f296fe52/recipes/chyla-theme"; sha256 = "1mgr6483bjjwk8bi6kijyw61s52nq6g2svhy5n1jnffi3gaw7hl5"; - name = "chyla-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7775,30 +9969,55 @@ license = lib.licenses.free; }; }) {}; - cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: - melpaBuild { + cider = callPackage ({ clojure-mode + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , queue + , seq + , sesman + , spinner }: + melpaBuild { pname = "cider"; - version = "20180331.1751"; + ename = "cider"; + version = "20180719.542"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "c4f164329c96c03b0002a40f088163d05093d988"; - sha256 = "08fp9ys8clilm4my1jxpjzglbz1qijrjh71h0sjr2a4g0kzb071n"; + rev = "4b7aea3523fb91e8172dfdd538b01da8c0d7686f"; + sha256 = "0lcczp066lxpq5s4f23bsvn15lkzivw6f0xi5ih7kf74c1fq1nn2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx"; - name = "cider"; + name = "recipe"; }; - packageRequires = [ clojure-mode emacs pkg-info queue seq spinner ]; + packageRequires = [ + clojure-mode + emacs + pkg-info + queue + seq + sesman + spinner + ]; meta = { homepage = "https://melpa.org/#/cider"; license = lib.licenses.free; }; }) {}; - cider-decompile = callPackage ({ cider, fetchFromGitHub, fetchurl, javap-mode, lib, melpaBuild }: - melpaBuild { + cider-decompile = callPackage ({ cider + , fetchFromGitHub + , fetchurl + , javap-mode + , lib + , melpaBuild }: + melpaBuild { pname = "cider-decompile"; + ename = "cider-decompile"; version = "20151121.2137"; src = fetchFromGitHub { owner = "clojure-emacs"; @@ -7806,10 +10025,10 @@ rev = "5d87035f3c3c14025e8f01c0c53d0ce2c8f56651"; sha256 = "1w4y65s3m2irga4iqfqqkcmvl6ss24zmaxqzbfib8jmi84r4lpac"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b7f7f23bb15922ce7a7dad1ae23093db72aa10c/recipes/cider-decompile"; sha256 = "0jhsm31zcfwkbpsdh1lvmjm1fv2m7y849930sjvf5nxv3ffhx3b4"; - name = "cider-decompile"; + name = "recipe"; }; packageRequires = [ cider javap-mode ]; meta = { @@ -7817,20 +10036,27 @@ license = lib.licenses.free; }; }) {}; - cider-eval-sexp-fu = callPackage ({ emacs, eval-sexp-fu, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: - melpaBuild { + cider-eval-sexp-fu = callPackage ({ emacs + , eval-sexp-fu + , fetchFromGitHub + , fetchurl + , highlight + , lib + , melpaBuild }: + melpaBuild { pname = "cider-eval-sexp-fu"; + ename = "cider-eval-sexp-fu"; version = "20160907.100"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider-eval-sexp-fu"; - rev = "5687e7b33e17f2be40b036dac82da4a5bc6705fb"; - sha256 = "0wyx51vggs76wj1gawwv1za6sa5gv1pj60vmc1ymzaw153ryhdq8"; + rev = "06fefc17ea8a87997d1f18b25e78d874b10299ad"; + sha256 = "1lhf5g5gi31pv2c80fsnw62zfikj3prbs6xwaikbywp48dzhx02y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/947f4d106d70f95ca8aac124ab0d90b2975208df/recipes/cider-eval-sexp-fu"; sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq"; - name = "cider-eval-sexp-fu"; + name = "recipe"; }; packageRequires = [ emacs eval-sexp-fu highlight ]; meta = { @@ -7838,9 +10064,15 @@ license = lib.licenses.free; }; }) {}; - cider-hydra = callPackage ({ cider, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: - melpaBuild { + cider-hydra = callPackage ({ cider + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild }: + melpaBuild { pname = "cider-hydra"; + ename = "cider-hydra"; version = "20161018.2254"; src = fetchFromGitHub { owner = "clojure-emacs"; @@ -7848,10 +10080,10 @@ rev = "6bb341143fe16f12be2262b2bcd003a246962676"; sha256 = "094641g6rzm4y6k8ph1bbkfiwpp37wk1q9mcylbah01qlqd9c9qm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51d5e6471f88337c478ee5c189f037aaec937f56/recipes/cider-hydra"; sha256 = "1qjgfrj3ck70vkyc9c00mif0jq5hc2yan2hql31qzbpqzg3pi2r7"; - name = "cider-hydra"; + name = "recipe"; }; packageRequires = [ cider hydra ]; meta = { @@ -7859,9 +10091,18 @@ license = lib.licenses.free; }; }) {}; - cider-spy = callPackage ({ cider, cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet }: - melpaBuild { + cider-spy = callPackage ({ cider + , cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , noflet }: + melpaBuild { pname = "cider-spy"; + ename = "cider-spy"; version = "20160313.740"; src = fetchFromGitHub { owner = "jonpither"; @@ -7869,10 +10110,10 @@ rev = "0224608d240e9900e588b6df049c2a87c24fc936"; sha256 = "1x96f5wc916dcwb75a34b6x1mas20gdgy34c7rg59n91ydn1mfaf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cider-spy"; sha256 = "086yxz90mgc5si9k4j15nkc51k0lfk1dx1kq3r3swhyw3cwn7vh3"; - name = "cider-spy"; + name = "recipe"; }; packageRequires = [ cider cl-lib dash emacs noflet ]; meta = { @@ -7880,9 +10121,14 @@ license = lib.licenses.free; }; }) {}; - ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ciel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ciel"; + ename = "ciel"; version = "20170330.526"; src = fetchFromGitHub { owner = "cs14095"; @@ -7890,10 +10136,10 @@ rev = "8c73f78d60ef52d3c395a9629963a63439b8a83e"; sha256 = "1jaxqri8l7y1lqj830h5alxn37skjpb56j6ax8qf9926n8qz3arm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel"; sha256 = "0rz7z3shhsvky91b581nn3hw760nlsc94fl35flm1973kvm9lvdp"; - name = "ciel"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7901,20 +10147,24 @@ license = lib.licenses.free; }; }) {}; - cil-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cil-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cil-mode"; + ename = "cil-mode"; version = "20160622.730"; src = fetchFromGitHub { owner = "ForNeVeR"; repo = "cil-mode"; - rev = "a78a88ca9a66a82f069329a96e34b67478ae2d9b"; + rev = "8023b45ec60961bf4c3a3d8a564727c463ed09d1"; sha256 = "06p6hz6jrnvnlbxdr1pjgf5wh4n34kf6al4589qg1s88r2lf86bl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ccbf4a7c9df3c85207c7160ee68ecc4ba4f3801a/recipes/cil-mode"; sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y"; - name = "cil-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7922,9 +10172,17 @@ license = lib.licenses.free; }; }) {}; - cinspect = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, python-environment }: - melpaBuild { + cinspect = callPackage ({ cl-lib ? null + , deferred + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , python-environment }: + melpaBuild { pname = "cinspect"; + ename = "cinspect"; version = "20150715.1933"; src = fetchFromGitHub { owner = "inlinestyle"; @@ -7932,10 +10190,10 @@ rev = "4e199a90f89b335cccda1518aa0963e0a1d4fbab"; sha256 = "190n4kdcqdwglhnawnj9mqjarmcaqylxipc07whmrii0jv279kjw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e5b5bdbfeb59ed8e98e50d0cc773d78c72d1699/recipes/cinspect"; sha256 = "0djh61mrfgcm3767ll1l5apw6646j4fdcaripksrmvn5aqfn8rjj"; - name = "cinspect"; + name = "recipe"; }; packageRequires = [ cl-lib deferred emacs python-environment ]; meta = { @@ -7943,20 +10201,25 @@ license = lib.licenses.free; }; }) {}; - circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + circadian = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "circadian"; - version = "20180307.954"; + ename = "circadian"; + version = "20180708.643"; src = fetchFromGitHub { owner = "GuidoSchmidt"; repo = "circadian.el"; - rev = "26ffd83a5931bb3fb04f01cb780715a05c8dd33e"; - sha256 = "0z8jkbycvia8ha1yv9v8zrcpqn0jqlb5myqx3qcvykn9yysmv2lq"; + rev = "9894361dcd6ffb6d4629b4cbbabda2153699eb8e"; + sha256 = "0wpsykmai3idz0bgfl07hwl9nr4x9sgprvqgw8jln4dz2wf5gdic"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; sha256 = "13797y1w1636bibisz5i5p2xp0smd3apnhc1nx8ijm75smx679id"; - name = "circadian"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7964,20 +10227,25 @@ license = lib.licenses.free; }; }) {}; - circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + circe = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "circe"; - version = "20180223.929"; + ename = "circe"; + version = "20180525.531"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "9aaad726ea0b0cce4d911eec92ab8fd2a6455fe6"; - sha256 = "1nyw9phrh1qpc7j6b8fkald18y3rldydb666r6ppphggly6lh4vd"; + rev = "fedfa7eb8516a53fa70b6a1f4fce4b5ab66ea91f"; + sha256 = "10gi14kwxd81blddpvqh95lgmpbfgp0m955naxix3bs3r6a75n4s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07"; - name = "circe"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -7985,9 +10253,16 @@ license = lib.licenses.free; }; }) {}; - circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + circe-notifications = callPackage ({ alert + , circe + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "circe-notifications"; + ename = "circe-notifications"; version = "20180102.1518"; src = fetchFromGitHub { owner = "eqyiel"; @@ -7995,10 +10270,10 @@ rev = "291149ac12877bbd062da993479d3533a26862b0"; sha256 = "18mva5nn919c86sgk6kdh437vdnlh9bk7fg10xqcpics1yv3viaw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications"; sha256 = "06y525x5yc0xgbw0cf16mc72ca9bv8j8z4gpgznbad2qp7psf53c"; - name = "circe-notifications"; + name = "recipe"; }; packageRequires = [ alert circe emacs ]; meta = { @@ -8006,9 +10281,45 @@ license = lib.licenses.free; }; }) {}; - cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + citeproc = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , queue + , s + , string-inflection }: + melpaBuild { + pname = "citeproc"; + ename = "citeproc"; + version = "20180429.57"; + src = fetchFromGitHub { + owner = "andras-simonyi"; + repo = "citeproc-el"; + rev = "44f147d228d2d652cdd404d31e987e14519c3eef"; + sha256 = "01cr362zgswplv0582hrw4y0wz5xgknd2a74ylffax38ws4lydd1"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc"; + sha256 = "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq"; + name = "recipe"; + }; + packageRequires = [ dash emacs f org queue s string-inflection ]; + meta = { + homepage = "https://melpa.org/#/citeproc"; + license = lib.licenses.free; + }; + }) {}; + cl-format = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cl-format"; + ename = "cl-format"; version = "20160412.1745"; src = fetchFromGitHub { owner = "alvinfrancis"; @@ -8016,10 +10327,10 @@ rev = "4380cb8009c47cc6d9098b383082b93b1aefa460"; sha256 = "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cl-format"; sha256 = "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy"; - name = "cl-format"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8027,9 +10338,14 @@ license = lib.licenses.free; }; }) {}; - cl-lib-highlight = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cl-lib-highlight = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cl-lib-highlight"; + ename = "cl-lib-highlight"; version = "20140127.1312"; src = fetchFromGitHub { owner = "skeeto"; @@ -8037,10 +10353,10 @@ rev = "fd1b308e6e989791d1df14438efa6b77d20f7c7e"; sha256 = "1mc8kayw8fmvpl0z09v6i68s2lharlwpzff0cvcsfn0an2imj2d0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/696c79669478b0d1c9769cc6f0fe581ee056cf32/recipes/cl-lib-highlight"; sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8"; - name = "cl-lib-highlight"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -8048,20 +10364,25 @@ license = lib.licenses.free; }; }) {}; - clang-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clang-format = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clang-format"; - version = "20171202.1318"; + ename = "clang-format"; + version = "20180406.814"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "clang-format"; - rev = "e2facf890156ad57a122ed5e79e5a40cc03c8cae"; - sha256 = "09pq0zf5im6kkjwyzdz3np3b4dd5va3as1syygvjnl5dlh6gkjcs"; + rev = "d11600d94e9aaeb807b4ab7b4ae8069d8bd5f075"; + sha256 = "0zlw1qdchzpr93wqmkn7590w0frmhvd82jjfl1dngwa8j14pf97k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format"; sha256 = "1w2w8hhyxp73s1ziyd0n7f1yi0x46v93630xxpjnf9bgr1psfk5f"; - name = "clang-format"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -8069,9 +10390,13 @@ license = lib.licenses.free; }; }) {}; - clean-aindent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clean-aindent-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clean-aindent-mode"; + ename = "clean-aindent-mode"; version = "20171017.1343"; src = fetchFromGitHub { owner = "pmarinov"; @@ -8079,10 +10404,10 @@ rev = "a97bcae8f43a9ff64e95473e4ef0d8bafe829211"; sha256 = "07dgx09j6nn5dl9vpqfcs5yqm79kza3h3r1lb7r09wpkmrg0c2cr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee9dac7c10e652f026643620418dfea9237a0d23/recipes/clean-aindent-mode"; sha256 = "1whzbs2gg2ar24kw29ffv94dgvrlfy2v4zdn0g7ksjjmmdr8ahh4"; - name = "clean-aindent-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8090,9 +10415,14 @@ license = lib.licenses.free; }; }) {}; - clean-buffers = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clean-buffers = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clean-buffers"; + ename = "clean-buffers"; version = "20160529.1559"; src = fetchFromGitHub { owner = "lujun9972"; @@ -8100,10 +10430,10 @@ rev = "1be6c54e3095761b6b64bf749faae3dfce94e72a"; sha256 = "1h7kmj53fqwfzam3ywz3yn4abl2n94v0lxnyv7x4qzwi2ggizc3l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fcabd17d7de9af443198ac9c2996bfbd94324de/recipes/clean-buffers"; sha256 = "025sxrqxm24yg1wpfncrjw1nm91h0h7jy2xd5g20xqlinqqvdihj"; - name = "clean-buffers"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -8111,9 +10441,13 @@ license = lib.licenses.free; }; }) {}; - clear-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clear-text = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clear-text"; + ename = "clear-text"; version = "20160406.1343"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -8121,10 +10455,10 @@ rev = "b50669b6077d6948f72cb3c649281d206e0c2f2b"; sha256 = "0y5z2pfhzpv67w2lnw1q06mflww90sfcilj89kqx2jhhrnrnn2ka"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2ae86a3001587ba753fcd0ca5137cb65d38910d/recipes/clear-text"; sha256 = "1cx2lbcbhd024pq9njan7xrlvj3k4c3wdsvgbz5qyna0k06ix8dv"; - name = "clear-text"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8132,9 +10466,13 @@ license = lib.licenses.free; }; }) {}; - clevercss = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clevercss = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clevercss"; + ename = "clevercss"; version = "20131228.1755"; src = fetchFromGitHub { owner = "jschaf"; @@ -8142,10 +10480,10 @@ rev = "b8a3c0dd674367c62b1a1ffec84d88fe0c0219bc"; sha256 = "19q6zbnl9fg4cwgi56d7p4qp6y3g0fdyihinpakby49xv2n2k8dx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec88232feb9d0a04278d5f615bb0ee0833ecb8ca/recipes/clevercss"; sha256 = "189f2l4za1j9ds0bhxrzyp7da9p6svh5dx2vnzf4vql7qhjk3gf0"; - name = "clevercss"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8153,20 +10491,25 @@ license = lib.licenses.free; }; }) {}; - click-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + click-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "click-mode"; - version = "20170105.20"; + ename = "click-mode"; + version = "20180610.1744"; src = fetchFromGitHub { owner = "bmalehorn"; repo = "click-mode"; - rev = "3c31e65b0b8476a15a3e2394fa05477ce42ea790"; - sha256 = "0117qn81gbjnx48wl53riqz65yxr8h691fa8j7bgrz32xnjpxz77"; + rev = "b94ea8cce89cf0e753b2ab915202d49ffc470fb6"; + sha256 = "0bz0wp40khha96k74g9vgnzm7xzsrh0wh4vks205pjhaxabhb5vh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1859bb26e3efd66394d7d9f4d2296cbeeaf5ba4d/recipes/click-mode"; sha256 = "1p5dz4a74w5zxdlw17h5z9dglapia4p29880liw3bif2c7dzkg0r"; - name = "click-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -8174,9 +10517,15 @@ license = lib.licenses.free; }; }) {}; - cliphist = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + cliphist = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "cliphist"; + ename = "cliphist"; version = "20171112.2138"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -8184,10 +10533,10 @@ rev = "e454254f8bd9dbaea28e95c786d7297a2d4e920a"; sha256 = "1lxsy78kmrrb82y7nlaaaq2qsly7f3wa8jw1bagjax4rwvld0vim"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29"; - name = "cliphist"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -8195,9 +10544,13 @@ license = lib.licenses.free; }; }) {}; - clipmon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clipmon = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clipmon"; + ename = "clipmon"; version = "20180129.254"; src = fetchFromGitHub { owner = "bburns"; @@ -8205,10 +10558,10 @@ rev = "95dc56c7ed84a654ec90f4740eb6df1050de8cf1"; sha256 = "0mfb4k0i71y49hn0xk5a1mv4zaj249qcan0y0nzvgf7mmvr32n9w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4dc92d73705ebb61ff8218f3483dd2da51ce8d32/recipes/clipmon"; sha256 = "1gvy1722px4fh88jyb8xx7k1dgyjgq7zjadr5fghdir42l0byw7i"; - name = "clipmon"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8216,9 +10569,14 @@ license = lib.licenses.free; }; }) {}; - clippy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: - melpaBuild { + clippy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pos-tip }: + melpaBuild { pname = "clippy"; + ename = "clippy"; version = "20161028.1254"; src = fetchFromGitHub { owner = "Fuco1"; @@ -8226,10 +10584,10 @@ rev = "ad4b5dba4cede6d4b21533186303d3d3e9a2510f"; sha256 = "0rnqwzbr5hdap276ana0iz3lk2ih8kkj1m9cydavqqdrwzk4ldrm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3743596c4b6387351684b1bf00f17275b8e59e8/recipes/clippy"; sha256 = "0nqmc8f2qrsp25vzc66xw6b232n7fyw6g06mwn2cdpm3d2pgb7rg"; - name = "clippy"; + name = "recipe"; }; packageRequires = [ pos-tip ]; meta = { @@ -8237,9 +10595,13 @@ license = lib.licenses.free; }; }) {}; - clips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clips-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clips-mode"; + ename = "clips-mode"; version = "20170909.123"; src = fetchFromGitHub { owner = "grettke"; @@ -8247,10 +10609,10 @@ rev = "dd38e2822640a38f7d8bfec4f69d8dd24be27074"; sha256 = "1q2jz72wi8d2pdrjic9kwqixp5sczjkkx8rf67rgaz37ysjpcbf6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d28484bf5e9ad72778ad63f73deeea1eb1263236/recipes/clips-mode"; sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf"; - name = "clips-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8258,20 +10620,35 @@ license = lib.licenses.free; }; }) {}; - clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }: - melpaBuild { + 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 = "20180330.213"; + ename = "clj-refactor"; + version = "20180708.57"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "b2304321c36275c54fea40560af470f9dc8de31f"; - sha256 = "0d4kvwmkqxz9vwrz0gy1z5037jqhvganh3cbrlgp7ljdzk97c6sr"; + rev = "443f0860d1d1c209cf4baae998f55df0616a819f"; + sha256 = "1qykm5z0iiv7vsmkgpd4mvxs0ml42z132bxg7ap8an9mvxixrvhj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz"; - name = "clj-refactor"; + name = "recipe"; }; packageRequires = [ cider @@ -8291,9 +10668,16 @@ license = lib.licenses.free; }; }) {}; - cljr-helm = callPackage ({ cl-lib ? null, clj-refactor, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + cljr-helm = callPackage ({ cl-lib ? null + , clj-refactor + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "cljr-helm"; + ename = "cljr-helm"; version = "20160913.128"; src = fetchFromGitHub { owner = "philjackson"; @@ -8301,10 +10685,10 @@ rev = "f2fc7b698a56e4a44d5dfbc6a55d77a93c0fa9a4"; sha256 = "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d99b67e295ef59916211bf22b57b4d093e3d53ab/recipes/cljr-helm"; sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc"; - name = "cljr-helm"; + name = "recipe"; }; packageRequires = [ cl-lib clj-refactor helm-core ]; meta = { @@ -8312,9 +10696,13 @@ license = lib.licenses.free; }; }) {}; - cljsbuild-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cljsbuild-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cljsbuild-mode"; + ename = "cljsbuild-mode"; version = "20160402.1000"; src = fetchFromGitHub { owner = "kototama"; @@ -8322,10 +10710,10 @@ rev = "fa2315660cb3ce944b5e16c679dcf5afd6a97f4c"; sha256 = "0flnfivz6w3pkham3g08m3xzy3jg1rzvxfa00vkr7ll8iyv4ypqc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba/recipes/cljsbuild-mode"; sha256 = "0qvb990dgq4v75lwnd661wxszbdbhlgxpsyv4zaj6h10gp1vi214"; - name = "cljsbuild-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8333,9 +10721,13 @@ license = lib.licenses.free; }; }) {}; - clmemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clmemo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clmemo"; + ename = "clmemo"; version = "20160326.923"; src = fetchFromGitHub { owner = "ataka"; @@ -8343,10 +10735,10 @@ rev = "846a81b984d71edf8278a4d9f9b886e44d5b8365"; sha256 = "152qf7i5bf7xvr35gyawl8abkh7v5dsz957zxslrbbnc8bb1k6bz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e98b438990dc0dbda264fb4bf7a3237a2661baab/recipes/clmemo"; sha256 = "03qa79ip0gqinj1kk898lcvixk98hf6gknz0yc2fnqcrm642k2vs"; - name = "clmemo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8354,9 +10746,14 @@ license = lib.licenses.free; }; }) {}; - cloc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cloc = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cloc"; + ename = "cloc"; version = "20170728.1124"; src = fetchFromGitHub { owner = "cosmicexplorer"; @@ -8364,10 +10761,10 @@ rev = "f30f0472e465cc8d433d2473e9d3b8dfe2c94491"; sha256 = "0g8hklc0914dsi3ks7g251w58ixa78qsh87dx914cc8sahpc0ws2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd7a641efd13aa0bd7509d8a5b0a28e3a0493c8/recipes/cloc"; sha256 = "1ny5wixa9x4fq5jvhs01jmyvwkfvwwi9aamrcqsl42s9sx6ygz7a"; - name = "cloc"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -8375,20 +10772,26 @@ license = lib.licenses.free; }; }) {}; - clocker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + clocker = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "clocker"; + ename = "clocker"; version = "20160125.1505"; src = fetchFromGitHub { owner = "roman"; repo = "clocker.el"; - rev = "4a4831ed4e42e18976edd16b844cb16cb78f3c17"; - sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0"; + rev = "07338bc4b850d262eb263ac306ae3366cac6e078"; + sha256 = "0f6qav92lyp36irdlamcxhzfd4p1i4iq18d5cmr7fgfwi894ikcg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dadd3f5abad2e1f7863c4d654ff065f641395f64/recipes/clocker"; sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k"; - name = "clocker"; + name = "recipe"; }; packageRequires = [ dash projectile ]; meta = { @@ -8396,20 +10799,25 @@ license = lib.licenses.free; }; }) {}; - clojars = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: - melpaBuild { + clojars = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request-deferred }: + melpaBuild { pname = "clojars"; + ename = "clojars"; version = "20161109.1448"; src = fetchFromGitHub { owner = "joshuamiller"; repo = "clojars.el"; - rev = "8f4ca8a283d4e9acaab912bb7217ffb5800b01a7"; - sha256 = "1j7ib7iyv4l8f3cgzyqz7jpwwa1bml343imqj5ynr7jzasv7pz52"; + rev = "d9a3ecb61f055e1c3497e424193d867bc3125da1"; + sha256 = "1h1yff0b2n9rwpqwhba23jpqbdpnivx0bhs7b48gl66wpsg7307l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f766319c3e18a41017684ea503b0382e96ab31b/recipes/clojars"; sha256 = "1skvd29347hwapgdqznbzwfcp2nf077qkdzknxc8ylmqa32yf5w1"; - name = "clojars"; + name = "recipe"; }; packageRequires = [ request-deferred ]; meta = { @@ -8417,9 +10825,15 @@ license = lib.licenses.free; }; }) {}; - clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + clojure-cheatsheet = callPackage ({ cider + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "clojure-cheatsheet"; + ename = "clojure-cheatsheet"; version = "20180201.4"; src = fetchFromGitHub { owner = "clojure-emacs"; @@ -8427,10 +10841,10 @@ rev = "85c382317a56bbdfac03ae95999c28fc0cde65d7"; sha256 = "0w9l6nz583qyldz44jqdh4414rgm6n2fzbaj5hsr5j1bkdizq7xl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0569da79bd8145df334965c5d4364a50b6b548fa/recipes/clojure-cheatsheet"; sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv"; - name = "clojure-cheatsheet"; + name = "recipe"; }; packageRequires = [ cider helm ]; meta = { @@ -8438,20 +10852,25 @@ license = lib.licenses.free; }; }) {}; - clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clojure-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clojure-mode"; - version = "20180329.2109"; + ename = "clojure-mode"; + version = "20180709.648"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "58e909365c89a4e31b5f6c790f261be788cac409"; - sha256 = "066w6mb37ihv92a5l7gwcld7divbylj29n619q02lazqfwbssfwr"; + rev = "e9da8797e577651b96875228e3804ef11b3c9ff0"; + sha256 = "0dpvmyanhbm164ma3ryhsqchi66vjwpyv97qq92zrd8arv8njnbh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np"; - name = "clojure-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -8459,20 +10878,25 @@ license = lib.licenses.free; }; }) {}; - clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clojure-mode-extra-font-locking = callPackage ({ clojure-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clojure-mode-extra-font-locking"; + ename = "clojure-mode-extra-font-locking"; version = "20180114.911"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "58e909365c89a4e31b5f6c790f261be788cac409"; - sha256 = "066w6mb37ihv92a5l7gwcld7divbylj29n619q02lazqfwbssfwr"; + rev = "9bbc8d59b3b4dfe3f0564f0d06832a309b4e4e4e"; + sha256 = "0brwcxlz337bd1y1vjlix2aq6qjzqqrl0g9hag5lmpkimnbbnbv1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n"; - name = "clojure-mode-extra-font-locking"; + name = "recipe"; }; packageRequires = [ clojure-mode ]; meta = { @@ -8480,20 +10904,26 @@ license = lib.licenses.free; }; }) {}; - clojure-quick-repls = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clojure-quick-repls = callPackage ({ cider + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clojure-quick-repls"; + ename = "clojure-quick-repls"; version = "20150814.36"; src = fetchFromGitHub { owner = "symfrog"; repo = "clojure-quick-repls"; - rev = "730311dd3ac4e0aceb0204f818b422017873467f"; - sha256 = "1qxhgqldvzzbpr3cxkj3a1zhpjck04pcqli9nnnb75hawi7vi8si"; + rev = "8fe4e44939e8a01a4cdf60c0001d9a6abf8a73c3"; + sha256 = "1wqml4psqqkzp8afccli4y2agbm8sz1fykycl3553cb2cidxgjga"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e618430057eb3ac235ab4a44767524919c870036/recipes/clojure-quick-repls"; sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0"; - name = "clojure-quick-repls"; + name = "recipe"; }; packageRequires = [ cider dash ]; meta = { @@ -8501,9 +10931,14 @@ license = lib.licenses.free; }; }) {}; - clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + clojure-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "clojure-snippets"; + ename = "clojure-snippets"; version = "20180314.608"; src = fetchFromGitHub { owner = "mpenet"; @@ -8511,10 +10946,10 @@ rev = "6068dca90467a0f4ebc2cd39338a173d6f5ddc04"; sha256 = "0vvadcydpsz4b17dlm1jd4fbddzfqibh3mlzv3k4gvp67vv10cqy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets"; sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij"; - name = "clojure-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -8522,20 +10957,28 @@ license = lib.licenses.free; }; }) {}; - clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, simple-httpd }: - melpaBuild { + clomacs = callPackage ({ cider + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , simple-httpd }: + melpaBuild { pname = "clomacs"; - version = "20180211.421"; + ename = "clomacs"; + version = "20180722.757"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "2fa47d068f4955424e810cbe94d861a103efc259"; - sha256 = "0m57hvq8s6cigv7ajmim71320bj06a2wk9v82pbvxpjqyyijpkym"; + rev = "be07dc637553b86b6d5cfbbe7dcb4acaf897135e"; + sha256 = "0h05424xfj3higzjrigzkgmp7pal8zivgjy8kfndj2sjy5kyz5g9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh"; - name = "clomacs"; + name = "recipe"; }; packageRequires = [ cider emacs s simple-httpd ]; meta = { @@ -8543,20 +10986,26 @@ license = lib.licenses.free; }; }) {}; - closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + closql = callPackage ({ emacs + , emacsql-sqlite + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "closql"; - version = "20180318.1222"; + ename = "closql"; + version = "20180627.1931"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "bfd5a5e4d32bc00e439c86f42859964d4fa91dc3"; - sha256 = "1ivdlabnkm5dsdjpi68mgvvif5bg8pc2igjyr2jrkwl7jnz51dz8"; + rev = "faed079570c2e70b0e4988177e35b7990afa4752"; + sha256 = "0ni2akjb1n5w6vz3b210c3bya9mbyyxiygn8hna707qnszd0li8r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; sha256 = "13ybna20w2d1b3n0y5p1ybhkw0j0zh5nd43p1yvf8h1haj983l87"; - name = "closql"; + name = "recipe"; }; packageRequires = [ emacs emacsql-sqlite ]; meta = { @@ -8564,9 +11013,13 @@ license = lib.licenses.free; }; }) {}; - closure-lint-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + closure-lint-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "closure-lint-mode"; + ename = "closure-lint-mode"; version = "20101118.1324"; src = fetchFromGitHub { owner = "r0man"; @@ -8574,10 +11027,10 @@ rev = "bc3d2fd5c35580bf1b8af43b12484c95a343b4b5"; sha256 = "0v0wdq0b5jz4x0d7dl3ilgf3aqp2hk375db366ij6gxwd0b9i3na"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/closure-lint-mode"; sha256 = "11kxgvfwngdjryrrihlpn0509axwv4zwkxzs4h1pw5vi7sv1n6xd"; - name = "closure-lint-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8585,9 +11038,13 @@ license = lib.licenses.free; }; }) {}; - cloud-to-butt-erc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cloud-to-butt-erc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cloud-to-butt-erc"; + ename = "cloud-to-butt-erc"; version = "20130627.1608"; src = fetchFromGitHub { owner = "leathekd"; @@ -8595,10 +11052,10 @@ rev = "6710c03d1bc91736435cbfe845924940cae34e5c"; sha256 = "07kvnb6p35swkyj92c4wymsqq4r2885wdpqhv7nhicvi6n658kpf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b12354152cce6e9a281dc26018c763b6f93e3cee/recipes/cloud-to-butt-erc"; sha256 = "061mmw39dq8sqzi2589lf7svy15n2iyiwbfiram48r2yhma5dd0f"; - name = "cloud-to-butt-erc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8606,9 +11063,14 @@ license = lib.licenses.free; }; }) {}; - clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clues-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clues-theme"; + ename = "clues-theme"; version = "20161213.327"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -8616,10 +11078,10 @@ rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7"; sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/clues-theme"; sha256 = "0b0gypmxx8qjd8hgxf4kbvci1nwacsxl7rm5s1bcnk9cwc6k2jpr"; - name = "clues-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -8627,9 +11089,14 @@ license = lib.licenses.free; }; }) {}; - cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cm-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cm-mode"; + ename = "cm-mode"; version = "20170203.1307"; src = fetchFromGitHub { owner = "joostkremers"; @@ -8637,10 +11104,10 @@ rev = "276d49c859822265070ae5dfbb403fd7d8d06436"; sha256 = "0mqbjw9wiaq735v307hd7g0g6i3a4k7h71bi4g9rr2jbgiljmql4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode"; sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x"; - name = "cm-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -8648,9 +11115,14 @@ license = lib.licenses.free; }; }) {}; - cmake-font-lock = callPackage ({ cmake-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cmake-font-lock = callPackage ({ cmake-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cmake-font-lock"; + ename = "cmake-font-lock"; version = "20170117.1225"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -8658,10 +11130,10 @@ rev = "8be491b4b13338078e524e2fe6213c93e18a101e"; sha256 = "0h96c670gki6csqfrhlnjxkpzx0m92l6pcsdhx93l3qbh23imcmm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/383a7f191c10916ad40284fba94f967765ffeb7e/recipes/cmake-font-lock"; sha256 = "0ws4kd94m8fh55d7whsf3rj9qrxjp1wsgxh0valsjxyp2ck9zrz0"; - name = "cmake-font-lock"; + name = "recipe"; }; packageRequires = [ cmake-mode ]; meta = { @@ -8669,20 +11141,29 @@ license = lib.licenses.free; }; }) {}; - cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: - melpaBuild { + cmake-ide = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , levenshtein + , lib + , melpaBuild + , s + , seq }: + melpaBuild { pname = "cmake-ide"; - version = "20180320.413"; + ename = "cmake-ide"; + version = "20180713.813"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "5dea1e8e002f26fb43aedbed11b83dc80071b771"; - sha256 = "06nad57cp9wgyj3xfdah6hjhfffgqcblw5nz2pa0ay86kmwxcac1"; + rev = "0fa6258692908c4c461d46827db0be6cf0a5d5b1"; + sha256 = "0jnhxz6f04f4ckxljhn0sraw3z6w2w8yjfksx2wdggwi1qhvn3vh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg"; - name = "cmake-ide"; + name = "recipe"; }; packageRequires = [ cl-lib emacs levenshtein s seq ]; meta = { @@ -8690,20 +11171,24 @@ license = lib.licenses.free; }; }) {}; - cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cmake-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cmake-mode"; - version = "20180104.1137"; + ename = "cmake-mode"; + version = "20180709.726"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "323d6b4c75baa450fe12f8609cd8f9db2260b1db"; - sha256 = "0bsgrbnm8vg8mzkb8p93ba8ss5cg5hkwrag5a6wa4r2ya05ww6gl"; + rev = "8d478c0003cc9bb4836038fc1a27d3bbd40348d2"; + sha256 = "0i4rs8m7qf9milc9csy38r7m0j5xqy2q75fqmyxd4xpfmkf4a2v7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7"; - name = "cmake-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8711,9 +11196,13 @@ license = lib.licenses.free; }; }) {}; - cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cmake-project = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cmake-project"; + ename = "cmake-project"; version = "20171121.315"; src = fetchFromGitHub { owner = "alamaison"; @@ -8721,10 +11210,10 @@ rev = "d3f408f226eff3f77f7e00dd519f4efc78fd292d"; sha256 = "1r8a3arpkkn91k619z4b6ywnq15glc4n1ji33l0q2m59f5sfk8mp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0857c4db1027981ea73bc32bcaa15e5df53edea3/recipes/cmake-project"; sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3"; - name = "cmake-project"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8732,9 +11221,16 @@ license = lib.licenses.free; }; }) {}; - cmd-to-echo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shell-split-string }: - melpaBuild { + cmd-to-echo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , shell-split-string }: + melpaBuild { pname = "cmd-to-echo"; + ename = "cmd-to-echo"; version = "20161203.1333"; src = fetchFromGitHub { owner = "mallt"; @@ -8742,10 +11238,10 @@ rev = "e0e874fc0e1ad6d291e39ed76023445297ad438a"; sha256 = "0wi097yk9p1xcfmps1g58xvvlv60akwky4y0pxdz6pa31w9jd1q8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cmd-to-echo"; sha256 = "1b4mw1ips4695ixgw2hyinq9ry3bx4d1842kr7k6155a1v34s4zh"; - name = "cmd-to-echo"; + name = "recipe"; }; packageRequires = [ emacs s shell-split-string ]; meta = { @@ -8753,9 +11249,13 @@ license = lib.licenses.free; }; }) {}; - cmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cmm-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cmm-mode"; + ename = "cmm-mode"; version = "20150224.2346"; src = fetchFromGitHub { owner = "bgamari"; @@ -8763,10 +11263,10 @@ rev = "c3ad514dff3eb30434f6b20d953276d4c00de1ee"; sha256 = "0xdcw329d2gssx86iajwrgpr7yv69b9nflmzjgb4jvg4pskj4pgx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/07579854200302cf69e120648f4983961e628f7d/recipes/cmm-mode"; sha256 = "184b8x19cnvx8z4dr9alv62wchzc7vr7crzz8jiyqw9d544zs50h"; - name = "cmm-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8774,9 +11274,14 @@ license = lib.licenses.free; }; }) {}; - cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cnfonts = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cnfonts"; + ename = "cnfonts"; version = "20171205.111"; src = fetchFromGitHub { owner = "tumashu"; @@ -8784,10 +11289,10 @@ rev = "4583e30d5058773606b830072df38a038d40203a"; sha256 = "04vc3p4320h3ncxm8s21ijv524w5m0j5gx1f5pyw91k3avvz9hbx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts"; sha256 = "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w"; - name = "cnfonts"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -8795,9 +11300,14 @@ license = lib.licenses.free; }; }) {}; - cobalt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cobalt = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cobalt"; + ename = "cobalt"; version = "20180304.355"; src = fetchFromGitHub { owner = "cobalt-org"; @@ -8805,10 +11315,10 @@ rev = "634ace275697e188746ca22a30ff94380ec756be"; sha256 = "1mrydmzldgabkkdpmlwfrfb6iddj4by7scc14k9bak5y6hj6ix7l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2435d98e7564d333c8224b67ac6ad9c95debda1/recipes/cobalt"; sha256 = "0r3fx1xx24x4qapbj2p8krc67rjmrjm88y89baf1x2swk7xdza92"; - name = "cobalt"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -8816,9 +11326,13 @@ license = lib.licenses.free; }; }) {}; - cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cobra-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cobra-mode"; + ename = "cobra-mode"; version = "20140116.1316"; src = fetchFromGitHub { owner = "Nekroze"; @@ -8826,10 +11340,10 @@ rev = "acd6e53f6286af5176471d01f25257e5ddb6dd01"; sha256 = "1sx8grp3j7zcma3nb7zj6kijkdqx166vw1qgmm29hvx48bys6vlp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e986942c391f50fb633097f2f31969a8aeecb99e/recipes/cobra-mode"; sha256 = "11jscpbclxlq2xqy2nsfa4y575bp8h0kpkp8cfjqb05lm5ybcp89"; - name = "cobra-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8837,20 +11351,51 @@ license = lib.licenses.free; }; }) {}; - code-library = callPackage ({ fetchFromGitHub, fetchurl, gist, lib, melpaBuild }: - melpaBuild { + code-archive = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "code-archive"; + ename = "code-archive"; + version = "20180705.1913"; + src = fetchFromGitHub { + owner = "mschuldt"; + repo = "code-archive"; + rev = "735ba47be3db59d9af784f2a47f8585caa55a6fd"; + sha256 = "1q022cw22xzn2ragx113ir04z37ff8y66fgc7hzcs32xs3l03g6z"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a8d0832eff966874d90e1d5ac1043c03e96b1c25/recipes/code-archive"; + sha256 = "0rj7cvwzhgam25jxjw5aqx9cxa86008gx2mwcyjlbnjrkhcbi97a"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/code-archive"; + license = lib.licenses.free; + }; + }) {}; + code-library = callPackage ({ fetchFromGitHub + , fetchurl + , gist + , lib + , melpaBuild }: + melpaBuild { pname = "code-library"; + ename = "code-library"; version = "20160426.518"; src = fetchFromGitHub { owner = "lujun9972"; repo = "code-library"; - rev = "32d59c5c845d6dbdda18f9bd1c03a58d55417fc5"; - sha256 = "1n00bb39jgx02zdgla85zx0a338xir0zh0af6xca14kg5bx07vsv"; + rev = "3c79338eae5c892bfb4e4882298422d9fd65d2d7"; + sha256 = "0gc56pdyzcnv3q1a82c79i8w58q9r6ccfix9s1s6msjxzxkznap5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/197bdc508c4fd9712125553a108ca6c9fedcaefc/recipes/code-library"; sha256 = "0gi8lz2q0vis4nyziykq15jp3m3vykfwycbk6amhf1ybkn9k3ywj"; - name = "code-library"; + name = "recipe"; }; packageRequires = [ gist ]; meta = { @@ -8858,20 +11403,24 @@ license = lib.licenses.free; }; }) {}; - codebug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + codebug = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "codebug"; + ename = "codebug"; version = "20140929.1437"; src = fetchFromGitHub { owner = "shano"; repo = "emacs-codebug"; - rev = "ac0e4331ba94ccb5203fa492570e1ca6b90c3d52"; - sha256 = "11v671c4338bsizbmm7ypp4x9s5hiwyddsg2ig6h157gfv2597pp"; + rev = "d95e5182fa1465406964873d9db1fdac77206f5b"; + sha256 = "1a3ifz9bv4ai9hiyvx0x3f9ygnrv6aqgpa6hxidhxdgg4ph5i4di"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35cd654bd7b390518eb5ddca8842bdfcc9e9e6f1/recipes/codebug"; sha256 = "1cb2wvawp3wqslhgbmbw9xwcqgwfscqg0jfgqzi3nr42mjp9zgqj"; - name = "codebug"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8879,20 +11428,25 @@ license = lib.licenses.free; }; }) {}; - codesearch = callPackage ({ elog, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + codesearch = callPackage ({ elog + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "codesearch"; - version = "20171122.431"; + ename = "codesearch"; + version = "20180508.822"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-codesearch"; - rev = "4e6a2382c26d1218a4a007d31de2bab8ef9d2e7c"; - sha256 = "030zbx1glr6m7sxy89c833iw1v3bgjkcg835c38hlazra1vq783p"; + rev = "e40efc62e9333db0593bd81b5c78d08b19bfb193"; + sha256 = "04xivg6f19mlpsv77jwasg4ii9vlv8amblm03siwhx53ib9wlcyc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0da1c6971ac2d3e9ee67731d00a9e8ca2d169826/recipes/codesearch"; sha256 = "1zm7fqwiknk07c8aks1silnkxifkfbdzvbzg77wrap48k8mnw03l"; - name = "codesearch"; + name = "recipe"; }; packageRequires = [ elog ]; meta = { @@ -8900,9 +11454,15 @@ license = lib.licenses.free; }; }) {}; - codic = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + codic = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "codic"; + ename = "codic"; version = "20150926.427"; src = fetchFromGitHub { owner = "syohex"; @@ -8910,10 +11470,10 @@ rev = "52bbb6997ef4ab9fb7fea43bbfff7f04671aa557"; sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/codic"; sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn"; - name = "codic"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -8921,9 +11481,14 @@ license = lib.licenses.free; }; }) {}; - coffee-fof = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + coffee-fof = callPackage ({ coffee-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "coffee-fof"; + ename = "coffee-fof"; version = "20131012.530"; src = fetchFromGitHub { owner = "yasuyk"; @@ -8931,10 +11496,10 @@ rev = "211529594bc074721c6cbc4edb73a63cc05f89ac"; sha256 = "010v886ak0rbbhqwxwj6m0mkgh19s232igy7wwbv07l2pdqszf3p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9024e5a71c992509a1dea5f673a31b806d5e175e/recipes/coffee-fof"; sha256 = "02cqza46qp8y69jd33cg4nmcgvrpwz23vyxqnmzwwvlmnbky96yc"; - name = "coffee-fof"; + name = "recipe"; }; packageRequires = [ coffee-mode ]; meta = { @@ -8942,20 +11507,25 @@ license = lib.licenses.free; }; }) {}; - coffee-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + coffee-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "coffee-mode"; + ename = "coffee-mode"; version = "20170324.240"; src = fetchFromGitHub { owner = "defunkt"; repo = "coffee-mode"; - rev = "86ab8aae8662e8eff54d3013010b9c693b16eac5"; - sha256 = "0hf06wp6cpsm7fivwkph6xvc2r39xww8q3aibp4nprlrwcmmv2al"; + rev = "a4d07f123e42e8c8e356e825e922bc83929fc3cb"; + sha256 = "0w3b3mwv5rlp305j7321izki9lrbnc8ks0v7r9m1ih26b8zci1gv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode"; sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1"; - name = "coffee-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -8963,20 +11533,26 @@ license = lib.licenses.free; }; }) {}; - coin-ticker = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + coin-ticker = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "coin-ticker"; + ename = "coin-ticker"; version = "20170611.27"; src = fetchFromGitHub { owner = "eklitzke"; repo = "coin-ticker-mode"; - rev = "9efab90fe4e6f29464af14e0d8fd1e20c0147b80"; - sha256 = "0xnrh6v4s2s3fgvw0v9fl48dlk4r2p6axp7xf41gzb1ai81yczhv"; + rev = "45108e239e1d129c0cc1ff37f2870cf73087780b"; + sha256 = "1xqp9p19az4ajbaj734vn0fn6z3hbq44m4clj5xvd0rddai9c57n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd783998658b69159e39d9440da7a0dd04135e49/recipes/coin-ticker"; sha256 = "0v4zyswhghknlsal9xfsgwf8ckjwrjkjrg8w7p6yjqrxmfsbw93b"; - name = "coin-ticker"; + name = "recipe"; }; packageRequires = [ emacs request ]; meta = { @@ -8984,9 +11560,14 @@ license = lib.licenses.free; }; }) {}; - colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + colemak-evil = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "colemak-evil"; + ename = "colemak-evil"; version = "20171015.1607"; src = fetchFromGitHub { owner = "patbl"; @@ -8994,10 +11575,10 @@ rev = "192c779281ae1fbf2405dcdb55b3c5b2a1d0b3d1"; sha256 = "1clnvr7n6mx5b8pq1c6zchq7n1g8ip8hwgzc61ywrmiyv0v8rnc6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f0750a3f9537782ee61d6e56c51ce7b86def12e/recipes/colemak-evil"; sha256 = "1bfzs5px1k6g3cnwjdaq2m78bbnfy3lxhjzkcch7zdv3nyacwl5z"; - name = "colemak-evil"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -9005,9 +11586,14 @@ license = lib.licenses.free; }; }) {}; - colonoscopy-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + colonoscopy-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "colonoscopy-theme"; + ename = "colonoscopy-theme"; version = "20170808.609"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -9015,10 +11601,10 @@ rev = "64bbb322b13dae91ce9f1e3581f836f94f800ead"; sha256 = "1r0is6zjkzikm565fvmj0gx8ms5ig9l5xihnka4fig7jy6ak33z5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/colonoscopy-theme"; sha256 = "0x9bfr4j0sp41jkgnyjlaxnnjjrc102x6sznn6cgcmqk5qhswl4q"; - name = "colonoscopy-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9026,20 +11612,26 @@ license = lib.licenses.free; }; }) {}; - color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-identifiers-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-identifiers-mode"; - version = "20180308.1739"; + ename = "color-identifiers-mode"; + version = "20180504.926"; src = fetchFromGitHub { owner = "ankurdave"; repo = "color-identifiers-mode"; - rev = "2407ddea7873f55216d9512ca2fb5eef268d5eba"; - sha256 = "0zah7w0dhgzwlgspvlb3gzsg6d2dqpxnmqm1kjjjdh3y0qimmy0g"; + rev = "60ae3ab0fdffe0efae7e08950d7b2a96f4ea49e2"; + sha256 = "0f2ji7ip1cm25fbna6yib37fjc4f1pafh9zld6a61ajgy1b3wjda"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode"; sha256 = "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq"; - name = "color-identifiers-mode"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -9047,9 +11639,13 @@ license = lib.licenses.free; }; }) {}; - color-moccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-moccur = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-moccur"; + ename = "color-moccur"; version = "20141222.1635"; src = fetchFromGitHub { owner = "myuhe"; @@ -9057,10 +11653,10 @@ rev = "4f1c59ffd1ccc2ab1a171cd6b721e8cb9e002fb7"; sha256 = "1p1f30qz4nd5a8ym2iwrgp6vhws0dls2qlc0apblj9nj3b0ziv0x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19105272fd8def5c7b22bfe5eeed5212e6ccae9c/recipes/color-moccur"; sha256 = "17b9walfc5c9qfdvl9pcwb2gjikc3wxk1d3v878ckypmxd38vciq"; - name = "color-moccur"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9068,20 +11664,24 @@ license = lib.licenses.free; }; }) {}; - color-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-theme"; - version = "20070910.1007"; + ename = "color-theme"; + version = "20080305.34"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "color-theme"; - rev = "eeb07560b30aaf7934dfd21f5c2518a479905cd9"; - sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz"; + rev = "f6bbc9eb7a136dd5f6e094cf1e9072b78a05e2de"; + sha256 = "1jlwz8wyilrry13pihmpa9v7zn4l4r6hrxr8qf3l7yinbhzs70p1"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/color-theme"; - sha256 = "1c1n0m4hhj2sxi08vjvayypf9g5i2hyng53ry950yfdqgzq7nk8i"; - name = "color-theme"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/be81fe3d1594473cb857d6d8d1345b60e512b802/recipes/color-theme"; + sha256 = "1j5gdx452fzk20cdcy09spp1vbzxdqq573j3yamnw7gkppbc6298"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9089,9 +11689,13 @@ license = lib.licenses.free; }; }) {}; - color-theme-approximate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-theme-approximate = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-theme-approximate"; + ename = "color-theme-approximate"; version = "20140227.2036"; src = fetchFromGitHub { owner = "tungd"; @@ -9099,10 +11703,10 @@ rev = "f54301ca39bc5d2ffb000f233f8114184a3e7d71"; sha256 = "1b0ymwszqsjcihcbfp7s4fjam983ixh3yb7sdc0rmqlyric1zwxq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/color-theme-approximate"; sha256 = "1wdnia9q42x7vky3ks555iic5s50g4mx7ss5ppaljvgxvbxyxqh1"; - name = "color-theme-approximate"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9110,20 +11714,25 @@ license = lib.licenses.free; }; }) {}; - color-theme-buffer-local = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-theme-buffer-local = callPackage ({ color-theme + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-theme-buffer-local"; + ename = "color-theme-buffer-local"; version = "20170125.2201"; src = fetchFromGitHub { owner = "vic"; repo = "color-theme-buffer-local"; - rev = "e606dec66f16a06140b9aad625a4fd52bca4f936"; - sha256 = "0c04fy3hc8wc0aabilqx9mcipmd41rmshqjxc3z8m1w0bm4288g1"; + rev = "faf7415c99e132094f1f09c6b6974ec118a18d87"; + sha256 = "1zk5clvkrq2grmm1bws2l5vbv1ycp41978bb902c563aws2rb8c0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e43060d80b3345ef4e8df9f5a9d66af8a44a9c41/recipes/color-theme-buffer-local"; sha256 = "1448rffyzn5k5mr31hwd28wlj7if7rp5sjlqcsvbxd2mnbgkgjz0"; - name = "color-theme-buffer-local"; + name = "recipe"; }; packageRequires = [ color-theme ]; meta = { @@ -9131,9 +11740,14 @@ license = lib.licenses.free; }; }) {}; - color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-theme-modern = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-theme-modern"; + ename = "color-theme-modern"; version = "20161219.344"; src = fetchFromGitHub { owner = "emacs-jp"; @@ -9141,10 +11755,10 @@ rev = "42a79266f1d7b473e9328e67a455e505e6c3eff5"; sha256 = "0mw5rnzzc4yfcflg59viy81ziws680r44xr05qg032b5x02l8ar9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2db82e101916d8709b711034da5ca6e4072e1077/recipes/color-theme-modern"; sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm"; - name = "color-theme-modern"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9152,20 +11766,24 @@ license = lib.licenses.free; }; }) {}; - color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-theme-sanityinc-solarized"; + ename = "color-theme-sanityinc-solarized"; version = "20160429.1903"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-solarized"; - rev = "6dd1d67a8e88a7bd586572cabe519b99a90fc3ee"; - sha256 = "08bxyrpx7shgzgnmklshgdfa457imdmn5rv4j3pyp8pfwf0zg9h5"; + rev = "6d1cf921881a0db6286ad6904aff2d17b2a335b3"; + sha256 = "0cw1al8dan7vglkm33wkznvmyma903ckd95l1ns6qmf1d55lnpig"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized"; sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf"; - name = "color-theme-sanityinc-solarized"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9173,20 +11791,24 @@ license = lib.licenses.free; }; }) {}; - color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20180302.1412"; + ename = "color-theme-sanityinc-tomorrow"; + version = "20180713.212"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "6be4fea186f2865d6d027eade7d4a15d35e9a88b"; - sha256 = "1lil6n0fd3d8wajdr8qzgw5np1v3nzympsjrn3dk7zwwdf8b1zk4"; + rev = "0360984a8a170df8a1dc0870cf547c0e3c4b5b71"; + sha256 = "0ff8jmzp02lmqp8pb0pa0wbqq3p59ypd3ljzwk1nbmzjw0xx8z6d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd"; - name = "color-theme-sanityinc-tomorrow"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9194,9 +11816,14 @@ license = lib.licenses.free; }; }) {}; - color-theme-solarized = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-theme-solarized = callPackage ({ color-theme + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-theme-solarized"; + ename = "color-theme-solarized"; version = "20171024.825"; src = fetchFromGitHub { owner = "sellout"; @@ -9204,10 +11831,10 @@ rev = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee"; sha256 = "16d7adqi07lzzr0qipl1fbag9l8kiyr3xrqxi528pimcisbg85d3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17096b452740bf6b7afa38e62df8e623494aa6b2/recipes/color-theme-solarized"; sha256 = "011rzq38ffmq7f2nzwrq96wwz67p82p1f0p5nib4nwqa47xlx7kf"; - name = "color-theme-solarized"; + name = "recipe"; }; packageRequires = [ color-theme ]; meta = { @@ -9215,9 +11842,14 @@ license = lib.licenses.free; }; }) {}; - color-theme-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-theme-x = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-theme-x"; + ename = "color-theme-x"; version = "20180226.1646"; src = fetchFromGitHub { owner = "ajsquared"; @@ -9225,10 +11857,10 @@ rev = "6c2264aa6c5d9a72caeae67ebaa4472090e70350"; sha256 = "1fyz8bampcqzpbyg0l1g0nvv2m5n8000xy5yl05217dlxb448nnd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/321900baf4149f8b58b075b9fb27716cf708f2a2/recipes/color-theme-x"; sha256 = "0nb2hqmmj1rhqjcbv5m8r9g2bf993lp45ka9rrxqp0pkmyd9fvs2"; - name = "color-theme-x"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -9236,20 +11868,25 @@ license = lib.licenses.free; }; }) {}; - colormaps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + colormaps = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "colormaps"; + ename = "colormaps"; version = "20171008.1524"; src = fetchFromGitHub { owner = "lepisma"; repo = "colormaps.el"; - rev = "19fbb64a6288d505b9cf45c9b5a3eed0bfb135e2"; - sha256 = "0kbhy8bpxqdr1kjczz2vm7chfpjprx2frpbh1gh9i1gwwx5k4myp"; + rev = "3a88961ba66b09a49ea5aa92b2b8776b2c92d68c"; + sha256 = "083hks2zzalizdsgabiwc1kd114r748v5i3w3kfk8pv37i2gay35"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4c795d9e323b08bc8354a6933a061644705a2ec/recipes/colormaps"; sha256 = "16plhgpfz1wb58p6h8wxjhplhgv0mbj3f2xj34p6vydh44l8w8q2"; - name = "colormaps"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9257,9 +11894,13 @@ license = lib.licenses.free; }; }) {}; - column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + column-enforce-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "column-enforce-mode"; + ename = "column-enforce-mode"; version = "20171030.1200"; src = fetchFromGitHub { owner = "jordonbiondo"; @@ -9267,10 +11908,10 @@ rev = "2341a2b6a33d4b8b74c35062ec9cfe1bffd61944"; sha256 = "0rcxb7daxxrp5f1i5cbv25viwawbbsn4ij1mnlclp5wz7ilcy2rs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91bebef8e97665a5d076c557d559367911a25ea2/recipes/column-enforce-mode"; sha256 = "1qh7kwr65spbbnzvq744gkksx50x04zs0nwn5ly60swc05d05lcg"; - name = "column-enforce-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9278,20 +11919,52 @@ license = lib.licenses.free; }; }) {}; - comint-intercept = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + com-css-sort = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "com-css-sort"; + ename = "com-css-sort"; + version = "20180607.1808"; + src = fetchFromGitHub { + owner = "jcs090218"; + repo = "com-css-sort"; + rev = "1564c035039a053936d186b4db7a71b34db99200"; + sha256 = "15caqg1sdd5kc81ipi9x2crqfhm6sdgwgvvk0gxx8dsr93rg22zy"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5189ae21fc97f6b96024a3279a26e43ddc23ae29/recipes/com-css-sort"; + sha256 = "0hga2m735lvyj1wzybgp6wh1yv98xnandvavvg7g7mscvf2sl89f"; + name = "recipe"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/com-css-sort"; + license = lib.licenses.free; + }; + }) {}; + comint-intercept = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "comint-intercept"; + ename = "comint-intercept"; version = "20170317.528"; src = fetchFromGitHub { owner = "hying-caritas"; repo = "comint-intercept"; - rev = "a329abf01fa8e0c6b02b46b29bcb421a21120dc5"; - sha256 = "0qswlafav415fh1dwqjsjmqlbnsjdl9gl3nzzya76ql5f0gb7svb"; + rev = "84c41e60e1ea3e9d5da1eb99e9926a52b6658d6d"; + sha256 = "0jyi698abpjdaxb9l9ndq599w77svp7vgd3b708kn461gmqmkxv7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d38188ec2d6e16714de9bb24ebd1ea89c7df3da/recipes/comint-intercept"; sha256 = "1m2fn02n7aphlqmiaxgwp8jqg60sq4001cnkdxn5wb3w1hxy5qvq"; - name = "comint-intercept"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9299,9 +11972,13 @@ license = lib.licenses.free; }; }) {}; - command-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + command-log-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "command-log-mode"; + ename = "command-log-mode"; version = "20160412.2147"; src = fetchFromGitHub { owner = "lewang"; @@ -9309,10 +11986,10 @@ rev = "af600e6b4129c8115f464af576505ea8e789db27"; sha256 = "06hll2frlx4sg9fj13a7ipq9y24isbjkjm6034xswhak40m7g1ii"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8426ca3c543178018f7feae6f0076af67a898483/recipes/command-log-mode"; sha256 = "11jq6055bvpwvrm0b8cgab25wa2mcyylpz4j56h1nqj7cnhb6ppj"; - name = "command-log-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9320,9 +11997,14 @@ license = lib.licenses.free; }; }) {}; - command-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + command-queue = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "command-queue"; + ename = "command-queue"; version = "20160328.1025"; src = fetchFromGitHub { owner = "Yuki-Inoue"; @@ -9330,10 +12012,10 @@ rev = "f327c6f852592229a755ec6de0c62c6aeafd6659"; sha256 = "0216hzdl4h1jssw5g2y95z4yx7abqsaxpk1s78r35w5cnx7kplrc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8fd6a70036e88039c850d280fbac782d04790a5f/recipes/command-queue"; sha256 = "1jaywdg8vcf1v6ayy1zd5mjs0x3s96845ig9ssb08397lfqasx1k"; - name = "command-queue"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9341,20 +12023,28 @@ license = lib.licenses.free; }; }) {}; - commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + commander = callPackage ({ cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "commander"; + ename = "commander"; version = "20140120.1052"; src = fetchFromGitHub { owner = "rejeep"; repo = "commander.el"; - rev = "c93985dc318fe89e5a29abc21d19fb41e2fd14d2"; - sha256 = "0mlabiraagqwl17payils5589fr2mivvkzrfic6ndsipryab6rfc"; + rev = "2c8a57b9c619e29ccbe2d5a85921b9c689e95bf9"; + sha256 = "1j6hhyzww7wfwk6bllbb5mk4hw4qs8hsgfbfdifsam9c6i4spm45"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b308e05dd85856addbc04a9438f5026803cebd7/recipes/commander"; sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393"; - name = "commander"; + name = "recipe"; }; packageRequires = [ cl-lib dash f s ]; meta = { @@ -9362,9 +12052,13 @@ license = lib.licenses.free; }; }) {}; - comment-dwim-2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + comment-dwim-2 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "comment-dwim-2"; + ename = "comment-dwim-2"; version = "20170809.1354"; src = fetchFromGitHub { owner = "remyferre"; @@ -9372,10 +12066,10 @@ rev = "8da8aba4cab4a0a1eef3aea2de219227526876e4"; sha256 = "1bvgdm52bp39gdcqxb02bnxssmih887jgr82m3c09yfwkpnr2qry"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac6ac97875117013515a36c9a4452fbd6c0d74c/recipes/comment-dwim-2"; sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj"; - name = "comment-dwim-2"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9383,20 +12077,25 @@ license = lib.licenses.free; }; }) {}; - comment-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + comment-tags = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "comment-tags"; + ename = "comment-tags"; version = "20170910.1035"; src = fetchFromGitHub { owner = "vincekd"; repo = "comment-tags"; - rev = "7d914097f0a03484af71e621db533737fc692f58"; - sha256 = "0s86a7078arck9z4gzkp2hnxyklprl0zh5hsw7nkyyscjydly80i"; + rev = "7ae64a8d7aca098f360e03e9a3e780e27715c6e3"; + sha256 = "16bdc1kv2a15mn8ms170ahb4apz5csbwnxy227pg46kwfmxxqs2m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ac71f4ffc19bce4f571001f9270d5be855dfc3c/recipes/comment-tags"; sha256 = "13slv150zch0b7zpxa2dbqjzpqh0iy559m6rc0zs0dwdagzryp3i"; - name = "comment-tags"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9404,9 +12103,15 @@ license = lib.licenses.free; }; }) {}; - commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: - melpaBuild { + commenter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "commenter"; + ename = "commenter"; version = "20160219.827"; src = fetchFromGitHub { owner = "yuutayamada"; @@ -9414,10 +12119,10 @@ rev = "6d1885419434ba779270c6fda0e30d390bb074bd"; sha256 = "1jwd3whag39qhzhbsfivzdlcr6vj37dv5ychkhmilw8v6dfdnpdb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/437afab17b22c0c559617afa06923b5bc73a3ae8/recipes/commenter"; sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3"; - name = "commenter"; + name = "recipe"; }; packageRequires = [ emacs let-alist ]; meta = { @@ -9425,9 +12130,14 @@ license = lib.licenses.free; }; }) {}; - commify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + commify = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "commify"; + ename = "commify"; version = "20161106.1534"; src = fetchFromGitHub { owner = "ddoherty03"; @@ -9435,10 +12145,10 @@ rev = "78732c2fa6c1a10288b7436d7c561ec9ebdd41be"; sha256 = "1kb3cbjp69niq8ravh273dma0mnkf1v2ja372ahxfsq1janrkkm6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fec4b048e1dc78a07acce7d2e6527b9f417d06d5/recipes/commify"; sha256 = "1jc6iqa4hna3277hx13scfcqzkr43yv6gndbxv7qf4ydi01ysd0m"; - name = "commify"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -9446,9 +12156,14 @@ license = lib.licenses.free; }; }) {}; - common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + common-lisp-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "common-lisp-snippets"; + ename = "common-lisp-snippets"; version = "20180226.723"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -9456,10 +12171,10 @@ rev = "1ddf808311ba4d9e8444a1cb50bd5ee75e4111f6"; sha256 = "0zalsvs47hv33dmbs94srpb8q354sr52sxbad182p69dn1khlwyp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets"; sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl"; - name = "common-lisp-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -9467,20 +12182,25 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company"; - version = "20180329.1441"; + ename = "company"; + version = "20180704.701"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "ddfdcb78c1f7abc25e1a2db1eb68721b20d00a95"; - sha256 = "0s0yqafd1awavlv52gzzi01mwfyjdb24iqi9jw53hw01s5823wmg"; + rev = "1f836b6b16d313bddef2cccebf49f42d36c58e28"; + sha256 = "1r3x8shwhc24c8vkrcach99lfhpy180713f89frzn2cbmwyklyh4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4"; - name = "company"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9488,20 +12208,29 @@ license = lib.licenses.free; }; }) {}; - company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + company-anaconda = callPackage ({ anaconda-mode + , cl-lib ? null + , company + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "company-anaconda"; - version = "20171222.342"; + ename = "company-anaconda"; + version = "20180610.2321"; src = fetchFromGitHub { owner = "proofit404"; repo = "company-anaconda"; - rev = "4519b1c9888b0d9665f0805e08362280a4945081"; - sha256 = "1vsh9m1q6jc4c9xy9xri1764n8fkpz8mz6np6gcmn86jfw5dk0fk"; + rev = "ef6cbe26af1ee526a38139ed21cec8569c1b989d"; + sha256 = "1dk1gzd59abh123xqb7r8h5flf4f29mljh48qzkx0r7ppqdzqgnz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda"; sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl"; - name = "company-anaconda"; + name = "recipe"; }; packageRequires = [ anaconda-mode cl-lib company dash s ]; meta = { @@ -9509,20 +12238,26 @@ license = lib.licenses.free; }; }) {}; - company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-ansible = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-ansible"; - version = "20180401.640"; + ename = "company-ansible"; + version = "20180701.1113"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "42753d43333c6e4ad83797f0234149b76b463369"; - sha256 = "1g93vnizl42k52ar47g7yn2csjyzsqvwb6siwbpfvjgbsr5d5d01"; + rev = "c6dc714e3a15f89671ae5e8fe668858b20ef63e8"; + sha256 = "01nly13i2bs77lrvkm26i96vrrigbxpb9cakski9fv3xrvfxq9bv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d"; - name = "company-ansible"; + name = "recipe"; }; packageRequires = [ company emacs ]; meta = { @@ -9530,20 +12265,31 @@ license = lib.licenses.free; }; }) {}; - company-arduino = callPackage ({ arduino-mode, cl-lib ? null, company, company-c-headers, company-irony, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: - melpaBuild { + company-arduino = callPackage ({ arduino-mode + , cl-lib ? null + , company + , company-c-headers + , company-irony + , emacs + , fetchFromGitHub + , fetchurl + , irony + , lib + , melpaBuild }: + melpaBuild { pname = "company-arduino"; + ename = "company-arduino"; version = "20160306.939"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "company-arduino"; - rev = "d7e369702b8eee63e6dfdeba645ce28b6dc66fb1"; - sha256 = "06v7y7gxlxrxdaqy8c93niy1di80r738cq7rkghnhqi174pwl1wv"; + rev = "5958b917cc5cc729dc64d74d947da5ee91c48980"; + sha256 = "08766m35s0r2fyv32y0h3sns9d5jykbgg24d2z8czklnc8hay7jc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45350f816c4f5249792d29f97ef91f8c0685b983/recipes/company-arduino"; sha256 = "1bch447lllikip1xd90kdgssgc67sl04a70fxqkqlrc1bs6gkkws"; - name = "company-arduino"; + name = "recipe"; }; packageRequires = [ arduino-mode @@ -9559,9 +12305,16 @@ license = lib.licenses.free; }; }) {}; - company-auctex = callPackage ({ auctex, company, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + company-auctex = callPackage ({ auctex + , company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "company-auctex"; + ename = "company-auctex"; version = "20180330.1118"; src = fetchFromGitHub { owner = "alexeyr"; @@ -9569,10 +12322,10 @@ rev = "f24de90a14c46fc3b924875c658b319c7f209aff"; sha256 = "0izi2p8whif6nlbippjw0zxkd0zilmgj2n0arx6k0zi7k4vbfsb7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/189e1a60894db0787a4468b120fbab84be1b5d59/recipes/company-auctex"; sha256 = "1jia80sqmm83kzjcf1h1d9iz2k4k9albzvfka5hx6hpa4h8nm5q4"; - name = "company-auctex"; + name = "recipe"; }; packageRequires = [ auctex company yasnippet ]; meta = { @@ -9580,19 +12333,26 @@ license = lib.licenses.free; }; }) {}; - company-axiom = callPackage ({ axiom-environment, company, emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + company-axiom = callPackage ({ axiom-environment + , company + , emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-axiom"; + ename = "company-axiom"; version = "20171024.1310"; src = fetchgit { url = "https://bitbucket.org/pdo/axiom-environment"; - rev = "6842fb7f85df839acde395093647e2f91cf62fdd"; - sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8"; + rev = "11ae39b2fcb344932b3f4b6a9fb6341880e3b8fa"; + sha256 = "1mygz9cd79w56sk3szh0mkgnng7mgr5jqqfd32yfjc3spvs6yzlh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/company-axiom"; sha256 = "061n8zn11r5a9m96sqnw8kx252n1m401cmcyqla8n9valjbnvsag"; - name = "company-axiom"; + name = "recipe"; }; packageRequires = [ axiom-environment company emacs ]; meta = { @@ -9600,9 +12360,16 @@ license = lib.licenses.free; }; }) {}; - company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: - melpaBuild { + company-bibtex = callPackage ({ cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parsebib }: + melpaBuild { pname = "company-bibtex"; + ename = "company-bibtex"; version = "20171104.2344"; src = fetchFromGitHub { owner = "gbgar"; @@ -9610,10 +12377,10 @@ rev = "225c6f5c0c070c94c8cdbbd452ea548cd94d76f4"; sha256 = "0bv2jcmyirdxm158w2766l3q7kh7h71l9milwc9fl8qfz7wb5l80"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-bibtex"; sha256 = "1b96p5qyxl6jlq0kz0dbma5pwvgqcy4x4gmpknjqrjabafbq1ynn"; - name = "company-bibtex"; + name = "recipe"; }; packageRequires = [ cl-lib company parsebib ]; meta = { @@ -9621,9 +12388,44 @@ license = lib.licenses.free; }; }) {}; - company-c-headers = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-box = callPackage ({ company + , dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "company-box"; + ename = "company-box"; + version = "20180607.845"; + src = fetchFromGitHub { + owner = "sebastiencs"; + repo = "company-box"; + rev = "6e047e6fd7226a1b8292a74985db82bbccc679c7"; + sha256 = "0m6rzwg08jcr9kibzxf18rsxjb13igscjyf5zkx1cx7y16zv1i6b"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a54879f4dd4dcb6867680567731547d604ad02bb/recipes/company-box"; + sha256 = "0v39gja3jp8b2xfn9da93xsh8mihizwbg0gqp2yyczaxjm8ga23i"; + name = "recipe"; + }; + packageRequires = [ company dash dash-functional emacs ]; + meta = { + homepage = "https://melpa.org/#/company-box"; + license = lib.licenses.free; + }; + }) {}; + company-c-headers = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-c-headers"; + ename = "company-c-headers"; version = "20170531.1330"; src = fetchFromGitHub { owner = "randomphrase"; @@ -9631,10 +12433,10 @@ rev = "e959d43bebf0a524f7378669983a39ee1379cc21"; sha256 = "18fi1jp3scz5rrf877qd1ciwx29bzndb85ifnx4ki0jvznvfas8n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d97b5c53967e0ff767b3654c52622f4b5ddf1985/recipes/company-c-headers"; sha256 = "1715vnjr5cjiq8gjcd3idnpnijg5cg3sw3f8gr5x2ixcrip1hx3a"; - name = "company-c-headers"; + name = "recipe"; }; packageRequires = [ company emacs ]; meta = { @@ -9642,9 +12444,16 @@ license = lib.licenses.free; }; }) {}; - company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-cabal = callPackage ({ cl-lib ? null + , company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-cabal"; + ename = "company-cabal"; version = "20170917.617"; src = fetchFromGitHub { owner = "iquiw"; @@ -9652,10 +12461,10 @@ rev = "62112a7259e24bd6c08885629a185afe512b7d3d"; sha256 = "1gf45xwjzdm8i4q6c6khk4dbg1mmp2r0awz2sjr4dcr2dbd1n7mg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal"; sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra"; - name = "company-cabal"; + name = "recipe"; }; packageRequires = [ cl-lib company emacs ]; meta = { @@ -9663,30 +12472,45 @@ license = lib.licenses.free; }; }) {}; - company-childframe = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, posframe }: - melpaBuild { + company-childframe = callPackage ({ company-posframe + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-childframe"; - version = "20180205.2236"; + ename = "company-childframe"; + version = "20180704.2246"; src = fetchFromGitHub { owner = "tumashu"; repo = "company-childframe"; - rev = "fb799c3c8f8099a0ec7d21beb3b90136704c741e"; - sha256 = "121qqb797vfpfxxkk0gvh5x4p03lb6aarjfydl88ah6rw5087dij"; + rev = "562eaa1e3a0c39dd36f10cda37a3724384fde1df"; + sha256 = "0g40i3qwh0wnspwd4a5p08ndfjj21zmqv155c7ngp7bxnhvkn6vh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4fda072eb1e3f4feb9ad9834104f748f5b749a0d/recipes/company-childframe"; sha256 = "1l8bd9fnw49apvwjgrlfywascbczavpaxns2ydymmb6ksj00rvzy"; - name = "company-childframe"; + name = "recipe"; }; - packageRequires = [ company emacs posframe ]; + packageRequires = [ company-posframe emacs ]; meta = { homepage = "https://melpa.org/#/company-childframe"; license = lib.licenses.free; }; }) {}; - company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + company-coq = callPackage ({ cl-lib ? null + , company + , company-math + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "company-coq"; + ename = "company-coq"; version = "20180307.510"; src = fetchFromGitHub { owner = "cpitclaudel"; @@ -9694,10 +12518,10 @@ rev = "c2bd34f79472c27ee6f819820558c8b26f774748"; sha256 = "1dvd7w93gly70x7j7dsn2n90w7n76k2bp96p4zlzxad94kvdj2a8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; sha256 = "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa"; - name = "company-coq"; + name = "recipe"; }; packageRequires = [ cl-lib company company-math dash yasnippet ]; meta = { @@ -9705,9 +12529,19 @@ license = lib.licenses.free; }; }) {}; - company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, ivy, lib, melpaBuild, popwin, yasnippet }: - melpaBuild { + company-dcd = callPackage ({ cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , flycheck-dmd-dub + , ivy + , lib + , melpaBuild + , popwin + , yasnippet }: + melpaBuild { pname = "company-dcd"; + ename = "company-dcd"; version = "20170516.210"; src = fetchFromGitHub { owner = "tsukimizake"; @@ -9715,10 +12549,10 @@ rev = "4832188a9e42287539a69c372fe1643166a6a7aa"; sha256 = "07caaff8chabrgl4hqanq13p5qhzqx5fcg2synl8856d7v1456vc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad5be8c53911271fba03a88da7e9d518c6508ffe/recipes/company-dcd"; sha256 = "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd"; - name = "company-dcd"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -9733,9 +12567,16 @@ license = lib.licenses.free; }; }) {}; - company-dict = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }: - melpaBuild { + company-dict = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parent-mode }: + melpaBuild { pname = "company-dict"; + ename = "company-dict"; version = "20180216.156"; src = fetchFromGitHub { owner = "hlissner"; @@ -9743,10 +12584,10 @@ rev = "7ab6331d8095e9b93c726da754102fd708c0002e"; sha256 = "18lfqankivzdijsklyi49a1v6nqixbmk4d1m6syqd63qj849aixa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict"; sha256 = "1377b40f1j4rmw7lnhy1zsm6r234ds5zsn02v1ajm3bzrpkkmin0"; - name = "company-dict"; + name = "recipe"; }; packageRequires = [ company emacs parent-mode ]; meta = { @@ -9754,9 +12595,14 @@ license = lib.licenses.free; }; }) {}; - company-distel = callPackage ({ distel-completion-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-distel = callPackage ({ distel-completion-lib + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-distel"; + ename = "company-distel"; version = "20161002.2339"; src = fetchFromGitHub { owner = "sebastiw"; @@ -9764,10 +12610,10 @@ rev = "2ba4eea51cecfa75cf62f58180460ee9ff43131f"; sha256 = "1761lgplngmpn1vd8syc1h4g6q1dhngamz1j3n48z07c1ylzpkdd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/company-distel"; sha256 = "1jklxwkm2dvpcasmy9vl48dxq3q9s4dlk159ica39z0kqpkpzmgw"; - name = "company-distel"; + name = "recipe"; }; packageRequires = [ distel-completion-lib ]; meta = { @@ -9775,20 +12621,28 @@ license = lib.licenses.free; }; }) {}; - company-edbi = callPackage ({ cl-lib ? null, company, edbi, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + company-edbi = callPackage ({ cl-lib ? null + , company + , edbi + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "company-edbi"; + ename = "company-edbi"; version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "company-edbi"; - rev = "ffaeff75d0457285d16d11db772881542a6026ad"; - sha256 = "16v4wzb9sp9ryfhgl3rk108pqvam2v6rh6hl6008083g557nmhq1"; + rev = "08dc69ccfbcf10ca83f7075e9b735c6885cd7e11"; + sha256 = "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d881ff0927d5bd7f8192f58927ceabb9bad4beb/recipes/company-edbi"; sha256 = "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm"; - name = "company-edbi"; + name = "recipe"; }; packageRequires = [ cl-lib company edbi s ]; meta = { @@ -9796,20 +12650,27 @@ license = lib.licenses.free; }; }) {}; - company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-emacs-eclim = callPackage ({ cl-lib ? null + , company + , eclim + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-emacs-eclim"; + ename = "company-emacs-eclim"; version = "20170104.743"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff"; - sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13"; + rev = "94508ebd071ff1052d68a20f7f1bf1038439fe43"; + sha256 = "0l72zw93wv8ncn98d6ybnykhi3a60bc0kyx6z699wfhnnhhxhl0p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; sha256 = "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig"; - name = "company-emacs-eclim"; + name = "recipe"; }; packageRequires = [ cl-lib company eclim ]; meta = { @@ -9817,9 +12678,15 @@ license = lib.licenses.free; }; }) {}; - company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-emoji = callPackage ({ cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-emoji"; + ename = "company-emoji"; version = "20161230.1937"; src = fetchFromGitHub { owner = "dunn"; @@ -9827,10 +12694,10 @@ rev = "8dc88ffe0773ef44321f245d39430c14a1bc2b82"; sha256 = "1y8l9wnc13g79znyw2qsbm33da2bhkj270ppikkg9h4x2qpmxilq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji"; sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3"; - name = "company-emoji"; + name = "recipe"; }; packageRequires = [ cl-lib company ]; meta = { @@ -9838,9 +12705,16 @@ license = lib.licenses.free; }; }) {}; - company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }: - melpaBuild { + company-erlang = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , ivy-erlang-complete + , lib + , melpaBuild }: + melpaBuild { pname = "company-erlang"; + ename = "company-erlang"; version = "20170122.2138"; src = fetchFromGitHub { owner = "s-kostyaev"; @@ -9848,10 +12722,10 @@ rev = "bc0524a16f17b66c7397690e4ca0e004f09ea6c5"; sha256 = "04wm3i65fpzln7sdcny88hfjfm0n7wy44ffsr3697x4l95d0bnyh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219/recipes/company-erlang"; sha256 = "0qlc89c05523kjzsb7j3yfi022la47kgixl74ggkafhn60scwdm7"; - name = "company-erlang"; + name = "recipe"; }; packageRequires = [ company emacs ivy-erlang-complete ]; meta = { @@ -9859,9 +12733,15 @@ license = lib.licenses.free; }; }) {}; - company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-flow = callPackage ({ company + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-flow"; + ename = "company-flow"; version = "20180225.1359"; src = fetchFromGitHub { owner = "aaronjensen"; @@ -9869,10 +12749,10 @@ rev = "76ef585c70d2a3206c2eadf24ba61e59124c3a16"; sha256 = "0zs9cblnbkxa0dxw4lyllmybqizxcdx96gv8jlhx20nrjpi78piw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; sha256 = "07brjfgiwv4dxjf0sca84allcy3qlp4jrkz7ki1qc5wmb5sd209l"; - name = "company-flow"; + name = "recipe"; }; packageRequires = [ company dash ]; meta = { @@ -9880,20 +12760,27 @@ license = lib.licenses.free; }; }) {}; - company-flx = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: - melpaBuild { + company-flx = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , flx + , lib + , melpaBuild }: + melpaBuild { pname = "company-flx"; + ename = "company-flx"; version = "20180102.2118"; src = fetchFromGitHub { owner = "PythonNut"; repo = "company-flx"; - rev = "16ca0d2f84e8e768bf2db8c5cfe421230a00bded"; - sha256 = "09zaaqi8587n1fv5pxnrdmdll319s8f66xkc41p51gcs2p7qa5w1"; + rev = "05efcafb488f587bb6e60923078d97227462eb68"; + sha256 = "12cg8amyk1pg1d2n8fb0mmls14jzwx08hq6s6g7wyd9s7y96hkhb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f27d718ee67f8c91b208a35adbbcdac67bbb89ce/recipes/company-flx"; sha256 = "1r4jcfzrhdpclblfrmi4qbl8dnhc2d7d4c1425xnslg7bhwd2vxn"; - name = "company-flx"; + name = "recipe"; }; packageRequires = [ company emacs flx ]; meta = { @@ -9901,9 +12788,17 @@ license = lib.licenses.free; }; }) {}; - company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }: - melpaBuild { + company-ghc = callPackage ({ cl-lib ? null + , company + , emacs + , fetchFromGitHub + , fetchurl + , ghc + , lib + , melpaBuild }: + melpaBuild { pname = "company-ghc"; + ename = "company-ghc"; version = "20170918.133"; src = fetchFromGitHub { owner = "iquiw"; @@ -9911,10 +12806,10 @@ rev = "dab111cb5067c545ccdc6b2d0ba70c1c4bbce060"; sha256 = "0ygw3dhlz247qzmcsbnkkdry2w2ni60j1rbyqprnzp8sd5yk97r1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc"; sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn"; - name = "company-ghc"; + name = "recipe"; }; packageRequires = [ cl-lib company emacs ghc ]; meta = { @@ -9922,9 +12817,15 @@ license = lib.licenses.free; }; }) {}; - company-ghci = callPackage ({ company, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: - melpaBuild { + company-ghci = callPackage ({ company + , fetchFromGitHub + , fetchurl + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "company-ghci"; + ename = "company-ghci"; version = "20160310.1800"; src = fetchFromGitHub { owner = "juiko"; @@ -9932,10 +12833,10 @@ rev = "c2d74a41166e76de2e78c87f582ba3a1179b2aa6"; sha256 = "02gq083lpbszy8pf7s5j61bjlm0hacv4md4g17n0q6448rix9yny"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ghci"; sha256 = "0q71qil4sndg72s2g5yg17w3n102wlba37y9jbx0l7hisa5l11gi"; - name = "company-ghci"; + name = "recipe"; }; packageRequires = [ company haskell-mode ]; meta = { @@ -9943,9 +12844,16 @@ license = lib.licenses.free; }; }) {}; - company-glsl = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, glsl-mode, lib, melpaBuild }: - melpaBuild { + company-glsl = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , glsl-mode + , lib + , melpaBuild }: + melpaBuild { pname = "company-glsl"; + ename = "company-glsl"; version = "20171015.1049"; src = fetchFromGitHub { owner = "GuidoSchmidt"; @@ -9953,10 +12861,10 @@ rev = "a262c12c3bcd0807718c4edcaf2b054e30ef0e26"; sha256 = "0338bym8ifvkgpbc4vyzf3nmlp6rc8lihyxcbym5m08612ln78mk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abab3b5a9762639812e2aabf9d288ed367dcdc22/recipes/company-glsl"; sha256 = "0lzy3xln5780yjwhhcz6vnc2j0k0rc7jfvqc8bv0xfabikgadmkn"; - name = "company-glsl"; + name = "recipe"; }; packageRequires = [ company emacs glsl-mode ]; meta = { @@ -9964,20 +12872,26 @@ license = lib.licenses.free; }; }) {}; - company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + company-go = callPackage ({ company + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "company-go"; + ename = "company-go"; version = "20170825.943"; src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "d7aee89652f1bd8ca319c64d6dee1bc1dfd9b6ef"; - sha256 = "1mbz80y0qa6vyvjs33hxsrq5vc2mza5rjhi6rvbxzy2a3lrx4cig"; + rev = "84b76ec55b44739143088371a34ef30a4719dfe4"; + sha256 = "0ig9jsx9gv3cya11r0w07xpby9rzlh3iz02mir0z7ffnf8qawmrc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29"; - name = "company-go"; + name = "recipe"; }; packageRequires = [ company go-mode ]; meta = { @@ -9985,20 +12899,27 @@ license = lib.licenses.free; }; }) {}; - company-inf-ruby = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: - melpaBuild { + company-inf-ruby = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild }: + melpaBuild { pname = "company-inf-ruby"; + ename = "company-inf-ruby"; version = "20140805.1354"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-inf-ruby"; - rev = "fe3e4863bc971fbb81edad447efad5795ead1b17"; - sha256 = "0fnv4rvvs9rqzrs86g23jcrpg0rcgk25299hm6jm08ia0kjjby1m"; + rev = "9c2eab3bb82e8838c54013026e6ffb51cccbd37e"; + sha256 = "0sns1j74mbwkamiyfcq0jp6flzqknm0vbhr6vvg5nsw5b9lfir0a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec0f597ceed00c68faa030ff0bc5676c513919f1/recipes/company-inf-ruby"; sha256 = "0cb1w0sxgb5jf0p2a5s2i4d511lsjjhyaqkqlwjz8nk4w14n0zxm"; - name = "company-inf-ruby"; + name = "recipe"; }; packageRequires = [ company emacs inf-ruby ]; meta = { @@ -10006,9 +12927,17 @@ license = lib.licenses.free; }; }) {}; - company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: - melpaBuild { + company-irony = callPackage ({ cl-lib ? null + , company + , emacs + , fetchFromGitHub + , fetchurl + , irony + , lib + , melpaBuild }: + melpaBuild { pname = "company-irony"; + ename = "company-irony"; version = "20170905.1346"; src = fetchFromGitHub { owner = "Sarcasm"; @@ -10016,10 +12945,10 @@ rev = "52aca45bcd0f2cb0648fcafa2bbb4f8ad4b2fee7"; sha256 = "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony"; sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km"; - name = "company-irony"; + name = "recipe"; }; packageRequires = [ cl-lib company emacs irony ]; meta = { @@ -10027,20 +12956,27 @@ license = lib.licenses.free; }; }) {}; - company-irony-c-headers = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: - melpaBuild { + company-irony-c-headers = callPackage ({ cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , irony + , lib + , melpaBuild }: + melpaBuild { pname = "company-irony-c-headers"; + ename = "company-irony-c-headers"; version = "20151018.209"; src = fetchFromGitHub { owner = "hotpxl"; repo = "company-irony-c-headers"; - rev = "72c386aeb079fb261d9ec02e39211272f76bbd97"; - sha256 = "1f462v8xq2hdsr4ks4i79icpfz6fjpb4q7khnx6si55agxj3rvaq"; + rev = "ba304fe7eebdff90bbc7dea063b45b82638427fa"; + sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f9f62d8ef438a9ba4872bd7731768eddc5905de/recipes/company-irony-c-headers"; sha256 = "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8"; - name = "company-irony-c-headers"; + name = "recipe"; }; packageRequires = [ cl-lib company irony ]; meta = { @@ -10048,20 +12984,28 @@ license = lib.licenses.free; }; }) {}; - company-jedi = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }: - melpaBuild { + company-jedi = callPackage ({ cl-lib ? null + , company + , emacs + , fetchFromGitHub + , fetchurl + , jedi-core + , lib + , melpaBuild }: + melpaBuild { pname = "company-jedi"; + ename = "company-jedi"; version = "20151216.1921"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-company-jedi"; - rev = "2f54e791e10f5dc0ff164bfe97f1878359fab6f6"; - sha256 = "0bpqswcc6a65wms0pdk9rsad9jiigmx2l1jaqr8bz4va945qdlhg"; + rev = "ad49407451c7f28fe137f9c8f3a7fc89e8693a1b"; + sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/company-jedi"; sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj"; - name = "company-jedi"; + name = "recipe"; }; packageRequires = [ cl-lib company emacs jedi-core ]; meta = { @@ -10069,20 +13013,31 @@ license = lib.licenses.free; }; }) {}; - company-lean = callPackage ({ company, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lean-mode, lib, melpaBuild, s }: - melpaBuild { + company-lean = callPackage ({ company + , dash + , dash-functional + , emacs + , f + , fetchFromGitHub + , fetchurl + , lean-mode + , lib + , melpaBuild + , s }: + melpaBuild { pname = "company-lean"; + ename = "company-lean"; version = "20171102.754"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "ae90bd280588c96d540892d0f42247db5a126f51"; - sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa"; + rev = "c0af876c967fc969d67c467bc6767210d19c5d87"; + sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean"; sha256 = "1hqkn7w5dyznf7i3r3132q8x31r74q188jsm5kdrjqgbwak2p91a"; - name = "company-lean"; + name = "recipe"; }; packageRequires = [ company dash dash-functional emacs f lean-mode s ]; meta = { @@ -10090,20 +13045,29 @@ license = lib.licenses.free; }; }) {}; - company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: - melpaBuild { + company-lsp = callPackage ({ company + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild + , s }: + melpaBuild { pname = "company-lsp"; - version = "20180216.2325"; + ename = "company-lsp"; + version = "20180617.1033"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "4512d062c38922d8b8cf402ca6043c246e915694"; - sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk"; + rev = "1cb1990dcd1feabf87a726a0b2a15c6f79eb5525"; + sha256 = "09mg2yvvl5mmwbav1d5k5flk2jcz6a684r6bv8vspfs32wpz0kwg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l"; - name = "company-lsp"; + name = "recipe"; }; packageRequires = [ company dash emacs lsp-mode s ]; meta = { @@ -10111,9 +13075,17 @@ license = lib.licenses.free; }; }) {}; - company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }: - melpaBuild { + company-lua = callPackage ({ company + , f + , fetchFromGitHub + , fetchurl + , lib + , lua-mode + , melpaBuild + , s }: + melpaBuild { pname = "company-lua"; + ename = "company-lua"; version = "20171108.1506"; src = fetchFromGitHub { owner = "ptrv"; @@ -10121,10 +13093,10 @@ rev = "29f6819de4d691e5fd0b62893a9f4fbc1c6fcb52"; sha256 = "0ny2dcc7c585p7v3j6q0rpkbj1qmf2ismy8a5020jpr585xvz0hh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8191ab2aaa72041be46091e363d216cf1b73fde/recipes/company-lua"; sha256 = "13sm7ya2ndqxwdjarhxbmg7fvr3413c7p3n6yf1i4rabbliqsf2c"; - name = "company-lua"; + name = "recipe"; }; packageRequires = [ company f lua-mode s ]; meta = { @@ -10132,9 +13104,15 @@ license = lib.licenses.free; }; }) {}; - company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: - melpaBuild { + company-math = callPackage ({ company + , fetchFromGitHub + , fetchurl + , lib + , math-symbol-lists + , melpaBuild }: + melpaBuild { pname = "company-math"; + ename = "company-math"; version = "20171016.814"; src = fetchFromGitHub { owner = "vspinu"; @@ -10142,10 +13120,10 @@ rev = "3481f03ebb6a613ff85b71ca8edd2d5842c49012"; sha256 = "0nbnqgl2jly1n5nx20hr2i84r2shxjb3axv2p597b5kw2bdbsva5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87"; - name = "company-math"; + name = "recipe"; }; packageRequires = [ company math-symbol-lists ]; meta = { @@ -10153,20 +13131,27 @@ license = lib.licenses.free; }; }) {}; - company-nand2tetris = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }: - melpaBuild { + company-nand2tetris = callPackage ({ cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nand2tetris }: + melpaBuild { pname = "company-nand2tetris"; + ename = "company-nand2tetris"; version = "20171201.1013"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "33acee34d24b1c6a87db833b7d23449cf858f64f"; - sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw"; + rev = "fe37ee41367ceff6f7d7a472a5f80cf1285e1e01"; + sha256 = "0g1gwayas7claa9cn3mv8dnlz46n78014qxb2ix25428dnsrridy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris"; sha256 = "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886"; - name = "company-nand2tetris"; + name = "recipe"; }; packageRequires = [ cl-lib company nand2tetris ]; meta = { @@ -10174,20 +13159,52 @@ license = lib.licenses.free; }; }) {}; - company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-nginx = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "company-nginx"; + ename = "company-nginx"; + version = "20180603.1702"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "company-nginx"; + rev = "3074a5d322562f36867ef67bffeb25f1c0d8aca9"; + sha256 = "04nq6cihb5kymi3rjfx53337fx4g042cw1jxiv016sq88z24lznx"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fb8843cddfa9133ea9e2790e8a1d8051cd4dabea/recipes/company-nginx"; + sha256 = "15pxz0v3zpshwri0v15yh995k7ih9h46y81n4xywlyyh34wys3sj"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/company-nginx"; + license = lib.licenses.free; + }; + }) {}; + company-ngram = callPackage ({ cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-ngram"; + ename = "company-ngram"; version = "20170129.1113"; src = fetchFromGitHub { owner = "kshramt"; repo = "company-ngram"; - rev = "09a68b802e64799e95f205b438d469bbd78cd2e6"; - sha256 = "0qg1ws7xi418lbnx130xqkwgpsl0p218gqxwy0fpwky01iahwcw9"; + rev = "d15182df3eac72b29772802759b77c9eafef5066"; + sha256 = "05108s2a3c857n9j3c34hdni3fyq149pva4m3f51lis4wqrm4zv7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; sha256 = "1y9k9s8c248m91xld4f5l75j4swml333rpwq590bsx7mrsq131xx"; - name = "company-ngram"; + name = "recipe"; }; packageRequires = [ cl-lib company ]; meta = { @@ -10195,20 +13212,27 @@ license = lib.licenses.free; }; }) {}; - company-nixos-options = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nixos-options }: - melpaBuild { + company-nixos-options = callPackage ({ cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nixos-options }: + melpaBuild { pname = "company-nixos-options"; + ename = "company-nixos-options"; version = "20160215.57"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "7007363e773a419203a69798fb0e0731b2eb0f73"; - sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb"; + rev = "a4e1d9ea9f2e773170caa3afbe54ecdf73d04ec8"; + sha256 = "1zcm74691bsay0l9vk2ffxgamrz8zyfmwkb9y915qylfwb48gyr2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options"; sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0"; - name = "company-nixos-options"; + name = "recipe"; }; packageRequires = [ cl-lib company nixos-options ]; meta = { @@ -10216,20 +13240,27 @@ license = lib.licenses.free; }; }) {}; - company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-php = callPackage ({ ac-php-core + , cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-php"; - version = "20171226.1924"; + ename = "company-php"; + version = "20180510.1500"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "24204333743b3ba26a9a8d51f56f1d3195ae4115"; - sha256 = "0y3pzf2zvqlsqs7255ihrswaxjq0q389yiiprlwzm86xsws8fbkw"; + rev = "e452a20a9f94113260b9cba9af7fb44cc8c647ef"; + sha256 = "08gvn4gq2j349rz24ask6nzqnvw15p9c8r2lby4n6n0zc6iaxzm5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; sha256 = "1gnhklfkg17vxfx7fw65lr4nr07jx71y84mhs9zszwcr9p840hh5"; - name = "company-php"; + name = "recipe"; }; packageRequires = [ ac-php-core cl-lib company ]; meta = { @@ -10237,9 +13268,18 @@ license = lib.licenses.free; }; }) {}; - company-plsense = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + company-plsense = callPackage ({ cl-lib ? null + , company + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "company-plsense"; + ename = "company-plsense"; version = "20180117.1658"; src = fetchFromGitHub { owner = "CeleritasCelery"; @@ -10247,10 +13287,10 @@ rev = "b48e3181e08ec597269621d621aa06636f02d883"; sha256 = "14rawd5xfgnkhdpp43mz4a5mf480949ny5hr5w6v5djmsibqxw5s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf9d671d81e07c704676c557a9f0d686067ce5c/recipes/company-plsense"; sha256 = "0k8k2vpkknd4nyxzwdj7698lgm5d85byxd49x7w5nrxmh2h1w3c7"; - name = "company-plsense"; + name = "recipe"; }; packageRequires = [ cl-lib company dash emacs s ]; meta = { @@ -10258,20 +13298,26 @@ license = lib.licenses.free; }; }) {}; - company-pollen = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, pollen-mode }: - melpaBuild { + company-pollen = callPackage ({ company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pollen-mode }: + melpaBuild { pname = "company-pollen"; + ename = "company-pollen"; version = "20160812.810"; src = fetchFromGitHub { owner = "lijunsong"; repo = "pollen-mode"; - rev = "de762bd7f9760185dae8ef025ca9a9126ae78de0"; - sha256 = "19bi50nlmwnh4kz3b1hrgc7ks0g84bld9aifws2l3wyc3xsj8cqa"; + rev = "9779f7f13b1e0cfb58af01af5d8ee9e783bb8a43"; + sha256 = "1i49js8y09d6bd5jp4fkl7z7gldaw2bfg5m2f504av73gqzqkxf8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/company-pollen"; sha256 = "1pz5d8j7scrv2ci9mxvyikwsk8badkrbp8dznnb5qq1ycqv24bl1"; - name = "company-pollen"; + name = "recipe"; }; packageRequires = [ company pollen-mode ]; meta = { @@ -10279,9 +13325,71 @@ license = lib.licenses.free; }; }) {}; - company-qml = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, qml-mode }: - melpaBuild { + company-posframe = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , posframe }: + melpaBuild { + pname = "company-posframe"; + ename = "company-posframe"; + version = "20180610.1010"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "company-posframe"; + rev = "47861f501891d3c67958353c25f4dce13b386c3d"; + sha256 = "03fs5w72wfnk0mr31q5kczlpk0rbim850pj6wzr0f6zn8j0p2lci"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/68c1203ae710e5f7af3f0e5e2877aba6deaf1ac8/recipes/company-posframe"; + sha256 = "1pd68m3hcn6wggw8a026x5kxn73f3zs278vs96q6cb5gbxyyhirs"; + name = "recipe"; + }; + packageRequires = [ company emacs posframe ]; + meta = { + homepage = "https://melpa.org/#/company-posframe"; + license = lib.licenses.free; + }; + }) {}; + company-prescient = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , prescient }: + melpaBuild { + pname = "company-prescient"; + ename = "company-prescient"; + version = "20180626.1050"; + src = fetchFromGitHub { + owner = "raxod502"; + repo = "prescient.el"; + rev = "515959a2523b43608c9d06dcf8adde8911ce42b9"; + sha256 = "1k8xk154sql3b2b7hpyxslcgl88aaxq5ak2sr760jsq2qk7878bw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b92c34e493bbefab1d7747b0855d1ab2f984cb7c/recipes/company-prescient"; + sha256 = "0cp918ihbjqxfgqnifknl5hphmvq5bl42dhp5ylvijsfa8kvbsb9"; + name = "recipe"; + }; + packageRequires = [ company emacs prescient ]; + meta = { + homepage = "https://melpa.org/#/company-prescient"; + license = lib.licenses.free; + }; + }) {}; + company-qml = callPackage ({ company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , qml-mode }: + melpaBuild { pname = "company-qml"; + ename = "company-qml"; version = "20170428.1008"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -10289,10 +13397,10 @@ rev = "4af4f32a7ad86d86bb9293fb0b675aec513b5736"; sha256 = "09d733r07gr4cxp7npyhi93xchvirxh1v00fr487v4a0mdaahpxf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b53477eaba4ef62f8317c9454e15ac015442fed/recipes/company-qml"; sha256 = "0sva7i93dam8mc2z3cp785vmgcg7cphrpkwyvqyqhq8w51qg8mxx"; - name = "company-qml"; + name = "recipe"; }; packageRequires = [ company qml-mode ]; meta = { @@ -10300,20 +13408,27 @@ license = lib.licenses.free; }; }) {}; - company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: - melpaBuild { + company-quickhelp = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pos-tip }: + melpaBuild { pname = "company-quickhelp"; - version = "20180323.1200"; + ename = "company-quickhelp"; + version = "20180525.303"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "1580b107ebecb98cf5c21a5b7185d4bfe761047d"; - sha256 = "0d237si89c4r325zirqvivq5k9b59hyahnfjlgc3fy9cnr07xqg3"; + rev = "479676cade80a9f03802ca3d956591820ed5c537"; + sha256 = "0hbqpnaf4hnin3nmdzmfj3v22kk9a97b6zssqs96ns36d9h52xcp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g"; - name = "company-quickhelp"; + name = "recipe"; }; packageRequires = [ company emacs pos-tip ]; meta = { @@ -10321,9 +13436,17 @@ license = lib.licenses.free; }; }) {}; - company-racer = callPackage ({ cl-lib ? null, company, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-racer = callPackage ({ cl-lib ? null + , company + , deferred + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-racer"; + ename = "company-racer"; version = "20171204.1910"; src = fetchFromGitHub { owner = "emacs-pe"; @@ -10331,10 +13454,10 @@ rev = "a00381c9d416f375f783fcb6ae8d40669ce1f567"; sha256 = "13m3yzn4xbyl13z7h1cl6vqjbzikjycy7wydpy4a44yhr466zjr5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4671a674dbc1620a41e0ff99508892a25eec2ad/recipes/company-racer"; sha256 = "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4"; - name = "company-racer"; + name = "recipe"; }; packageRequires = [ cl-lib company deferred emacs ]; meta = { @@ -10342,20 +13465,57 @@ license = lib.licenses.free; }; }) {}; - company-restclient = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, know-your-http-well, lib, melpaBuild, restclient }: - melpaBuild { + company-reftex = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "company-reftex"; + ename = "company-reftex"; + version = "20180713.141"; + src = fetchFromGitHub { + owner = "TheBB"; + repo = "company-reftex"; + rev = "d96ce340851499452c8d4d64bee80a3d7f9e9275"; + sha256 = "1bh9h6frp6yibw1qyca1f2s375s5pn27ry2n4j036c5r4kx4wpx6"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/84c938612d46d45b5bb05ee35178eaa2284023e0/recipes/company-reftex"; + sha256 = "0xfl8cfpd2bdk91aj0nygp5gm808pnbi7zjdp4z6l21dsrawhbxz"; + name = "recipe"; + }; + packageRequires = [ company emacs s ]; + meta = { + homepage = "https://melpa.org/#/company-reftex"; + license = lib.licenses.free; + }; + }) {}; + company-restclient = callPackage ({ cl-lib ? null + , company + , emacs + , fetchFromGitHub + , fetchurl + , know-your-http-well + , lib + , melpaBuild + , restclient }: + melpaBuild { pname = "company-restclient"; + ename = "company-restclient"; version = "20151202.401"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-restclient"; - rev = "ef67ba2f613ce3d61b70011c9d0a303a754ffc5b"; - sha256 = "0af1h6n1rgyni686hrrakmmbgymjg8dc1i9g2jc27dxkxz0nk454"; + rev = "12f05ab964ca811b5b8dcbe4f19e2eeba119cbe1"; + sha256 = "0bra9rsxng3zbxk0q1sny3rabf2iwzz00snr65xswayjddigp33k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient"; sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb"; - name = "company-restclient"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -10369,20 +13529,27 @@ license = lib.licenses.free; }; }) {}; - company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: - melpaBuild { + company-rtags = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , rtags }: + melpaBuild { pname = "company-rtags"; + ename = "company-rtags"; version = "20170924.2244"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "a595d13f60c13d67a28467b3941d5ed558102e91"; - sha256 = "0yp6h6nsbji7dmc9pnf9qi7zsqxrxa1bln90bn0y71xf6z11kbp4"; + rev = "e4060b551575be378344c0cc1aedf11446b4f264"; + sha256 = "01xc5r2am0xck7q6jal3zyrqbzpx68fzqi9af7zb1klyw2s5v807"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f"; - name = "company-rtags"; + name = "recipe"; }; packageRequires = [ company emacs rtags ]; meta = { @@ -10390,20 +13557,28 @@ license = lib.licenses.free; }; }) {}; - company-shell = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-shell = callPackage ({ cl-lib ? null + , company + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-shell"; + ename = "company-shell"; version = "20170517.2241"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "company-shell"; - rev = "6ae625f80d90e0779c79de38e8f83a336c1d00fa"; - sha256 = "0da9y7x1xvaahsslcmgji6hr3cbn779i504cfrmsabbr3wmkn3fy"; + rev = "acdbf8cba6ad9831d81a77bab7bbfd50f19edd86"; + sha256 = "1dk927da7g4a39sva9bda978bx6hpiz5kf341fj8sb7xhryvh5r2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell"; sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz"; - name = "company-shell"; + name = "recipe"; }; packageRequires = [ cl-lib company dash emacs ]; meta = { @@ -10411,41 +13586,57 @@ license = lib.licenses.free; }; }) {}; - company-solidity = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-solidity = callPackage ({ cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , solidity-mode }: + melpaBuild { pname = "company-solidity"; - version = "20180328.1656"; + ename = "company-solidity"; + version = "20180407.1344"; src = fetchFromGitHub { owner = "ssmolkin1"; repo = "company-solidity"; - rev = "0d15727a29adaeb87ce30459053bf434c9d8b6d0"; - sha256 = "1rg7x6px3pzckzyivg7x2ml6r18c6anbjrk9y6xxsxmy5wvbml37"; + rev = "8ea7b96c7a17f4a11ca47021067350bc3c6606c5"; + sha256 = "1gz43k7jckk520nvx124i4ap8bi61ah70wj3d40cbq77a3z8lmkw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef246601ff6d92d6dfcd809f637e50d9838da0b8/recipes/company-solidity"; sha256 = "076z5jqh486k2lkh9rgbhs71bws4fba68pjybr9yyf0sdc5m7kc6"; - name = "company-solidity"; + name = "recipe"; }; - packageRequires = [ cl-lib company ]; + packageRequires = [ cl-lib company solidity-mode ]; meta = { homepage = "https://melpa.org/#/company-solidity"; license = lib.licenses.free; }; }) {}; - company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: - melpaBuild { + company-sourcekit = callPackage ({ company + , dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sourcekit }: + melpaBuild { pname = "company-sourcekit"; + ename = "company-sourcekit"; version = "20170126.353"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781"; - sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n"; + rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; + sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit"; sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs"; - name = "company-sourcekit"; + name = "recipe"; }; packageRequires = [ company dash dash-functional emacs sourcekit ]; meta = { @@ -10453,9 +13644,15 @@ license = lib.licenses.free; }; }) {}; - company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-statistics = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-statistics"; + ename = "company-statistics"; version = "20170210.1133"; src = fetchFromGitHub { owner = "company-mode"; @@ -10463,10 +13660,10 @@ rev = "e62157d43b2c874d2edbd547c3bdfb05d0a7ae5c"; sha256 = "12mwviz1mwx4ywks2lkmybbgh1wny67wkzlq5y3ml8gvyc288n3i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics"; sha256 = "1fl4ldj17m3xhi6xbw3bp9c2jir34xv3jh9daiw8g912fv2l5dcj"; - name = "company-statistics"; + name = "recipe"; }; packageRequires = [ company emacs ]; meta = { @@ -10474,20 +13671,26 @@ license = lib.licenses.free; }; }) {}; - company-suggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-suggest = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-suggest"; - version = "20180325.931"; + ename = "company-suggest"; + version = "20180527.931"; src = fetchFromGitHub { owner = "juergenhoetzel"; repo = "company-suggest"; - rev = "e1679bd2cff0396bda0eba7dc48469332bd54251"; - sha256 = "00cy1lhnlwz99zmxhk7403qq4wi8abk483syw5z1xvhdx1fxgq04"; + rev = "81fe56fae3a3d2d3cd1be09d7eb96422a4ad6f09"; + sha256 = "0ys9m11l8csyv2p0f7b13b9l5wqn73y5m4c29rj4xf2yy5b9p8sr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9579e3366db055364829e20d3ce228bf17060b0a/recipes/company-suggest"; sha256 = "1w5fp4mydc4av14sjb8di6jjvzfqwnasnxpf9720pk0rsj05i972"; - name = "company-suggest"; + name = "recipe"; }; packageRequires = [ company emacs ]; meta = { @@ -10495,20 +13698,30 @@ license = lib.licenses.free; }; }) {}; - company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }: - melpaBuild { + company-tern = callPackage ({ cl-lib ? null + , company + , dash + , dash-functional + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , tern }: + melpaBuild { pname = "company-tern"; + ename = "company-tern"; version = "20161004.1147"; src = fetchFromGitHub { owner = "proofit404"; repo = "company-tern"; - rev = "10ac058b065ae73c1f30e9fb7d969dd1a79387be"; - sha256 = "1pjyiy95axv92yxzks4ac871vcqxjnp7n2116nkdrdzzpmlb1x9h"; + rev = "b20b3e490bf277c8480712210e3c92ea489859ef"; + sha256 = "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern"; sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh"; - name = "company-tern"; + name = "recipe"; }; packageRequires = [ cl-lib company dash dash-functional s tern ]; meta = { @@ -10516,20 +13729,27 @@ license = lib.licenses.free; }; }) {}; - company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }: - melpaBuild { + company-terraform = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , terraform-mode }: + melpaBuild { pname = "company-terraform"; - version = "20180131.1503"; + ename = "company-terraform"; + version = "20180703.533"; src = fetchFromGitHub { owner = "rafalcieslak"; repo = "emacs-company-terraform"; - rev = "74dad245567e06e758e1112c0d75f3eccf48e32c"; - sha256 = "0y4giv3i947258j5pv6wpzk95zry8sn8ra66m1237lk0k9zhpfdf"; + rev = "9c1146bfe23d4c461f4a59577faf4e46fcca7fe9"; + sha256 = "10b23azzgy51zrrmyi29mgy74f2zkrqrqvlk0r2iz9f7fydk8dpp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform"; sha256 = "198ppqn6f7y9bg582z5s4cl9gg1q9ibsr7mmn68b50zvma7ankzh"; - name = "company-terraform"; + name = "recipe"; }; packageRequires = [ company emacs terraform-mode ]; meta = { @@ -10537,20 +13757,27 @@ license = lib.licenses.free; }; }) {}; - company-try-hard = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-try-hard = callPackage ({ company + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-try-hard"; + ename = "company-try-hard"; version = "20150902.1506"; src = fetchFromGitHub { owner = "Wilfred"; repo = "company-try-hard"; - rev = "70b94cfc40c576af404e743133979048e1bd2610"; - sha256 = "1isnk2i64kppsr23nr6qm5kwxxwcp4xazjwvm2chyzl4vbvp03p2"; + rev = "0401e8afa6bd4d3e9d2cf18e58955b83aef93005"; + sha256 = "18hy60fm3b3dmp29cmzbs6grlihkwifjbzv30gprwj5f6x7m8knf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d65c26aee15a27cbf27fa81110b607bf38099079/recipes/company-try-hard"; sha256 = "1rwn521dc8kxh43vcd3rf0h8jc53d4gmid3szj2msi0da1sk0mmj"; - name = "company-try-hard"; + name = "recipe"; }; packageRequires = [ company dash emacs ]; meta = { @@ -10558,20 +13785,28 @@ license = lib.licenses.free; }; }) {}; - company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: - melpaBuild { + company-web = callPackage ({ cl-lib ? null + , company + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-completion-data }: + melpaBuild { pname = "company-web"; - version = "20171111.1049"; + ename = "company-web"; + version = "20180402.455"; src = fetchFromGitHub { owner = "osv"; repo = "company-web"; - rev = "935c65de0411ebbcb4f2223f31e756e093eaae07"; - sha256 = "0kw0fc1lg7qd23fx26y9m543sql32n1dlvr4rg7bmq6im7dwz4hy"; + rev = "f0cc9187c9c34f72ad71f5649a69c74f996bae9a"; + sha256 = "1xcwwcy2866vzaqgn7hrl7j8k48mk74i4shm40v7ybacws47s9nr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web"; sha256 = "1q2am684l4d038a3ymyy6gg2ds9lq5mcfc4in8dmvap5grdhia4b"; - name = "company-web"; + name = "recipe"; }; packageRequires = [ cl-lib company dash web-completion-data ]; meta = { @@ -10579,20 +13814,25 @@ license = lib.licenses.free; }; }) {}; - company-ycm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ycm }: - melpaBuild { + company-ycm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , ycm }: + melpaBuild { pname = "company-ycm"; + ename = "company-ycm"; version = "20140904.1117"; src = fetchFromGitHub { owner = "neuromage"; repo = "ycm.el"; - rev = "4da8a14abcd0f4fa3235042ade2e12b5068c0601"; - sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj"; + rev = "b2cb611503cf8d256fa19fc76362d7d5d9449d01"; + sha256 = "1xmmk5pg59w8cc1s9v3c65l8m388yl25ngjd0vibi22lm1k5ri8j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44e168f757cb51249db2deb9f781eff99cf6fb7c/recipes/company-ycm"; sha256 = "1q4d63c7nr3g7q0smd55pp636vqa9lf1pkwjn9iq265369npvina"; - name = "company-ycm"; + name = "recipe"; }; packageRequires = [ ycm ]; meta = { @@ -10600,20 +13840,31 @@ license = lib.licenses.free; }; }) {}; - company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: - melpaBuild { + company-ycmd = callPackage ({ company + , dash + , deferred + , f + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , s + , ycmd }: + melpaBuild { pname = "company-ycmd"; - version = "20171010.2258"; + ename = "company-ycmd"; + version = "20180520.353"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2"; - sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl"; + rev = "966594701c1eef1f6d4dad0c71c6d43a029977d7"; + sha256 = "05b8l82l3p15r072zhmmwpcnxyyyrhzka5gc3vkzz2sa7wa7sp7j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; sha256 = "1dycbp2q8grvv94mwp9n8s7xpz2zjs05l3lf471j3nlbk6xfsn5d"; - name = "company-ycmd"; + name = "recipe"; }; packageRequires = [ company dash deferred f let-alist s ycmd ]; meta = { @@ -10621,9 +13872,14 @@ license = lib.licenses.free; }; }) {}; - composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + composable = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "composable"; + ename = "composable"; version = "20170723.2347"; src = fetchFromGitHub { owner = "paldepind"; @@ -10631,10 +13887,10 @@ rev = "ac981974f89607393cc61314aaa19672d45b0650"; sha256 = "0xg46r6ibga27cdycbysm80n2ayi8vmxcff1b6bqjjrsc0wbdnac"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable"; sha256 = "1fs4pczjn9sv12sladf6zbkz0cmzxr0jaqkiwryydal1l5nqqxcy"; - name = "composable"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -10642,20 +13898,30 @@ license = lib.licenses.free; }; }) {}; - composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-runtime, request, s, seq }: - melpaBuild { + composer = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , php-runtime + , request + , s + , seq }: + melpaBuild { pname = "composer"; - version = "20180111.942"; + ename = "composer"; + version = "20180415.743"; src = fetchFromGitHub { owner = "emacs-php"; repo = "composer.el"; - rev = "e34ebe795d267e28965c85bd84cbb16b18165bd8"; - sha256 = "1vqjraldl2an10q1w91l7rx66mpsvqvjgg3j1k7xcvw07570aabl"; + rev = "1d43edd8079e84df5e1b46c65e6783cb3ff9debd"; + sha256 = "0k6345mc2ppckbbmji4wkynlfgy00kr945ah8j2b62hqgm73h575"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer"; sha256 = "01w9cywhfngkrl9az8kfpzm12nc0zwmax01pyxlbi2l2icmvp5s1"; - name = "composer"; + name = "recipe"; }; packageRequires = [ emacs f php-runtime request s seq ]; meta = { @@ -10663,20 +13929,26 @@ license = lib.licenses.free; }; }) {}; - concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + concurrent = callPackage ({ deferred + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "concurrent"; + ename = "concurrent"; version = "20161228.1930"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "2239671d94b38d92e9b28d4e12fd79814cfb9c16"; - sha256 = "0vz59lm7pfz0gbsgrb44y555js85wbdjn0zm6p8wfqjiqf63ds3i"; + rev = "9668749635472a63e7a9282e2124325405199b79"; + sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf"; - name = "concurrent"; + name = "recipe"; }; packageRequires = [ deferred emacs ]; meta = { @@ -10684,9 +13956,18 @@ license = lib.licenses.free; }; }) {}; - conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: - melpaBuild { + conda = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pythonic + , s }: + melpaBuild { pname = "conda"; + ename = "conda"; version = "20171122.716"; src = fetchFromGitHub { owner = "necaris"; @@ -10694,10 +13975,10 @@ rev = "0bba56d80bb959a20838a024b174d1cf1e2cfd07"; sha256 = "0gr3z9s4qzvkmh7wziw5x77w9vch1riqjv5g1kl995yv7v5lxmnp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; sha256 = "1hi292h6ccl7vkvyxcwwcdxw8q2brv3hy0mnlikzj2qy5pbnfg4y"; - name = "conda"; + name = "recipe"; }; packageRequires = [ dash emacs f pythonic s ]; meta = { @@ -10705,9 +13986,13 @@ license = lib.licenses.free; }; }) {}; - config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + config-general-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "config-general-mode"; + ename = "config-general-mode"; version = "20171024.1140"; src = fetchFromGitHub { owner = "tlinden"; @@ -10715,10 +14000,10 @@ rev = "b4a8e6ba0bb027a77e4a0f701409f3e57bb2e4c0"; sha256 = "115sk0h6i1bfnxw1v11719926cvnq7gyisjcysvkam40hp3d5fx5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode"; sha256 = "1408xyzmb5aj1yrlgkymwy5x6rb1a9ynkx2m6hgj38qj6dz44cyy"; - name = "config-general-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10726,9 +14011,14 @@ license = lib.licenses.free; }; }) {}; - config-parser = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + config-parser = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "config-parser"; + ename = "config-parser"; version = "20160426.519"; src = fetchFromGitHub { owner = "lujun9972"; @@ -10736,10 +14026,10 @@ rev = "85d559e7889d8f5b98b8794b79426ae25ec3caa5"; sha256 = "09vq7hcsw4027whn3xrnfz9hkgkakva619hyz0zfgpvppqah9n1p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8fc040eebe72b278e3bd69212b207446cf4a5f06/recipes/config-parser"; sha256 = "0wncg1v4wccb9j16rcmwz8fcmrscj7knfisq0r4qqx3skrmpccah"; - name = "config-parser"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -10747,20 +14037,25 @@ license = lib.licenses.free; }; }) {}; - confluence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: - melpaBuild { + confluence = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xml-rpc }: + melpaBuild { pname = "confluence"; + ename = "confluence"; version = "20151020.1828"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "confluence"; - rev = "4518d270a07760644c4204985c83d234ece4738b"; - sha256 = "1lrq23cxlp2vkyv7g56r06bp7chhw10kii3ymkydf24y4pyn1zpg"; + rev = "442d6e14b51f8322fb7f0fe30682d2429f48ed73"; + sha256 = "18859zi60s2y79add998vxh084znbdxxq31m12flg7makxlamyh7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/confluence"; sha256 = "0xa2g168mm31kh5h7smhx35cjsk1js88nzs19yakjljf56b1khlf"; - name = "confluence"; + name = "recipe"; }; packageRequires = [ xml-rpc ]; meta = { @@ -10768,9 +14063,13 @@ license = lib.licenses.free; }; }) {}; - conkeror-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + conkeror-minor-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "conkeror-minor-mode"; + ename = "conkeror-minor-mode"; version = "20150114.804"; src = fetchFromGitHub { owner = "Malabarba"; @@ -10778,10 +14077,10 @@ rev = "476e81c27b056e21c192391fe674a2bf875466b0"; sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/conkeror-minor-mode"; sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933"; - name = "conkeror-minor-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10789,20 +14088,27 @@ license = lib.licenses.free; }; }) {}; - conllu-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsec }: - melpaBuild { + conllu-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parsec }: + melpaBuild { pname = "conllu-mode"; - version = "20180304.637"; + ename = "conllu-mode"; + version = "20180722.454"; src = fetchFromGitHub { owner = "odanoburu"; repo = "conllu-mode"; - rev = "5c1f4de04d5cba9ff4fc3246c507f74f50a2aa6c"; - sha256 = "0zr8pglciqc1af06qsvqjks823wbb7s33g3qvhajxlfcz10iyd98"; + rev = "fa2769b010c6e600711a04f083d1573505c61c2e"; + sha256 = "16hasrrsz566bpr4xcjmby3hxf4ad2msb9bx8cs6fndvxgy1zvyk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode"; sha256 = "1wffvvs8d0xcnz6mcm9rbr8imyj4npyc148yh0gzfzlgjm0fiz1v"; - name = "conllu-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs parsec ]; meta = { @@ -10810,20 +14116,24 @@ license = lib.licenses.free; }; }) {}; - connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + connection = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "connection"; + ename = "connection"; version = "20140717.2029"; src = fetchFromGitHub { owner = "myrkr"; repo = "dictionary-el"; - rev = "a23b8f4a422d0de69a006ed010eff5795319db98"; - sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm"; + rev = "a5619fb275520d699eaae214e41ebcfde23c17f3"; + sha256 = "176w46j3m343vlkjn9jyaaz3ikzdzxffrvhalgc76ydw9wyivbf8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/connection"; sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q"; - name = "connection"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10831,20 +14141,27 @@ license = lib.licenses.free; }; }) {}; - contextual = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + contextual = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "contextual"; + ename = "contextual"; version = "20160131.1037"; src = fetchFromGitHub { owner = "lshift-de"; repo = "contextual"; - rev = "9e009614fb72ef14964d7107abd44de5aed21659"; - sha256 = "0ykc3lzdypf543dgm7jpi70z08kz9hwhn2gvp06ylb22id8b3fai"; + rev = "8134a2d8034c624f4fdbbb0b3893de12f4257909"; + sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44e5b799e411b8e2d89c8e9aeb4720126ac908b7/recipes/contextual"; sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx"; - name = "contextual"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -10852,9 +14169,13 @@ license = lib.licenses.free; }; }) {}; - contextual-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + contextual-menubar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "contextual-menubar"; + ename = "contextual-menubar"; version = "20180204.2309"; src = fetchFromGitHub { owner = "aaronjensen"; @@ -10862,10 +14183,10 @@ rev = "f76f55232ac07df76ef9a334a0c527dfab97c40b"; sha256 = "0zks4w99nbhz1xvr67isgg6yjghpzbh5s5wd839zi0ly30x4riqf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cba21d98f3abbf1f45d1fdd9164d4660b7d3e368/recipes/contextual-menubar"; sha256 = "0r9bsnvf45h7gsdfhsz7h02nskjvflfa2yjarjv9fcl7aipz8rr6"; - name = "contextual-menubar"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10873,20 +14194,26 @@ license = lib.licenses.free; }; }) {}; - contrast-color = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + contrast-color = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "contrast-color"; + ename = "contrast-color"; version = "20160903.1107"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "contrast-color-el"; - rev = "c5fb77a211ebbef3185ada37bea7420534c33f94"; - sha256 = "06grlp93n50d7c5z43fia0d6r1hmfpnqa062fzrz8gypy5kqxi1f"; + rev = "6ff1b807e09ef6a775e4ab1032bb2ea3fc442d9e"; + sha256 = "1qvx00yrkl0zf2bnb46gw18nrhg3gwlc0az622bh5brckpn9dasv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a13602e10a5fa889d0e094eff5b74a39023a477/recipes/contrast-color"; sha256 = "0pa88mfla7g7wpia0q1lkv2dncw63ivvh83hf73f75a22rvl8jcx"; - name = "contrast-color"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -10894,20 +14221,24 @@ license = lib.licenses.free; }; }) {}; - control-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + control-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "control-mode"; + ename = "control-mode"; version = "20160624.1010"; src = fetchFromGitHub { owner = "stephendavidmarsh"; repo = "control-mode"; - rev = "72d6179b60adc438aada74083b2bf4264b575de3"; - sha256 = "0pqdh9bx2j9kla57sn349m90azk02wajapmazdm26cjdc2npw7jh"; + rev = "6bf487144119b03f9cc54168f70e3d7d8d84e22b"; + sha256 = "0y6a0fcz6ic5ai5jibyd740mclzx88x3l6wp2vs8rw6qs15cr7xf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/control-mode"; sha256 = "1biq4p2w8rqcbvr09gxbchjqlaixjf1fzv7xv8lpv81dlhi7dgz6"; - name = "control-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10915,9 +14246,14 @@ license = lib.licenses.free; }; }) {}; - copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + copy-as-format = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "copy-as-format"; + ename = "copy-as-format"; version = "20171215.1616"; src = fetchFromGitHub { owner = "sshaw"; @@ -10925,10 +14261,10 @@ rev = "971957166fe64d914ec4be209b4f80efeeabbb19"; sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; sha256 = "1yij5mqm0dg6326yms0a2w8gs42kdxq0ih8dhkpdar54r0bk3m8k"; - name = "copy-as-format"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -10936,20 +14272,28 @@ license = lib.licenses.free; }; }) {}; - copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + copy-file-on-save = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "copy-file-on-save"; - version = "20180217.914"; + ename = "copy-file-on-save"; + version = "20180604.719"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-auto-deployment"; - rev = "1ad10401711a3bf0a0894eeed357b402238be113"; - sha256 = "1ydpsh5j9j168crn30lpzv73rw2z80prp0hn2rybgrhvqfs3rbx6"; + rev = "5af6d5fcc35ddf9050eada96fd5f334bf0661b62"; + sha256 = "1q9liby1dmwwmg2jz13gx2ld47bpcqb9c7vx4qgky75wb5c2q1xz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; sha256 = "1mcwgkhd241aijnmzrrqqn9f7hiq5k1w4fj83v50aixrcs049gc3"; - name = "copy-file-on-save"; + name = "recipe"; }; packageRequires = [ cl-lib emacs f s ]; meta = { @@ -10957,9 +14301,16 @@ license = lib.licenses.free; }; }) {}; - copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + copyit = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "copyit"; + ename = "copyit"; version = "20161126.429"; src = fetchFromGitHub { owner = "zonuexe"; @@ -10967,10 +14318,10 @@ rev = "f50d033b129d467fb517a351adf3f16cabd82a62"; sha256 = "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit"; sha256 = "1m28irqixzl44c683dxvc5x6l3qcqlpy6jzk6629paqkdi5mx1c0"; - name = "copyit"; + name = "recipe"; }; packageRequires = [ cl-lib emacs s ]; meta = { @@ -10978,20 +14329,27 @@ license = lib.licenses.free; }; }) {}; - copyit-pandoc = callPackage ({ copyit, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pandoc }: - melpaBuild { + copyit-pandoc = callPackage ({ copyit + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pandoc }: + melpaBuild { pname = "copyit-pandoc"; + ename = "copyit-pandoc"; version = "20160624.1328"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emacs-copyit"; - rev = "f50d033b129d467fb517a351adf3f16cabd82a62"; - sha256 = "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n"; + rev = "c973d3650208a033aaf845989d023f9c6e572ddd"; + sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit-pandoc"; sha256 = "03v448gh6glq126r95w4y6s2p08jgjhkc6zgsplx0v9d5f2mwaqk"; - name = "copyit-pandoc"; + name = "recipe"; }; packageRequires = [ copyit emacs pandoc ]; meta = { @@ -10999,9 +14357,16 @@ license = lib.licenses.free; }; }) {}; - coq-commenter = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + coq-commenter = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "coq-commenter"; + ename = "coq-commenter"; version = "20170822.1609"; src = fetchFromGitHub { owner = "ailrun"; @@ -11009,10 +14374,10 @@ rev = "7fe9a2cc0ebdb0b1e54a24eb7971d757fb588ac3"; sha256 = "1rq0j6ds9snv21k2lzyja96qxxz8nrai5aj1k1si9zshld28mapx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/coq-commenter"; sha256 = "19726z8yvgwjikbl95smdl60k58a5yf7cjbinnb7251d8mhd8562"; - name = "coq-commenter"; + name = "recipe"; }; packageRequires = [ cl-lib dash s ]; meta = { @@ -11020,20 +14385,24 @@ license = lib.licenses.free; }; }) {}; - corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + corral = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "corral"; + ename = "corral"; version = "20160502.1"; src = fetchFromGitHub { owner = "nivekuil"; repo = "corral"; - rev = "e7ab6aa118e46b93d4933d1364bc273f57cd6911"; - sha256 = "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7"; + rev = "8813288de240956641b37deafaaa4811548246df"; + sha256 = "06l2imhxm6dijkqlhk9s0vsa5a0ghybpy7qk7wpkgv0dlm3k3w7n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b0d7e326f0401de0488b77d39af7bd7b8e8fdd4/recipes/corral"; sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da"; - name = "corral"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11041,9 +14410,14 @@ license = lib.licenses.free; }; }) {}; - cosmo = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + cosmo = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cosmo"; + ename = "cosmo"; version = "20170922.44"; src = fetchFromGitLab { owner = "montanari"; @@ -11051,10 +14425,10 @@ rev = "dd83b09a49a2843606b28279b674b2207040b36b"; sha256 = "0phcg81g3dy67s1hfymvj0lkcpwygwql8iixf940nv31qllgzvd7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ab914dfefcddf6ecd65261bc11bd3eb12929c79/recipes/cosmo"; sha256 = "1pk34d0kv1jm2fq72qa5lj0y39x1yf2nbkjjg8jcj8ari28h9vfk"; - name = "cosmo"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -11062,20 +14436,26 @@ license = lib.licenses.free; }; }) {}; - counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: - melpaBuild { + counsel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , swiper }: + melpaBuild { pname = "counsel"; - version = "20180328.1326"; + ename = "counsel"; + version = "20180719.1303"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f8cdaa7f3c733b88865650d10d9138bcb40a9ba8"; - sha256 = "0gfaj5ygjmvrmghyqghp7i6wf5abiayb28av4291plpyl0liz78h"; + rev = "89bae2f783918609c074f7c594dcc19ce19b8d45"; + sha256 = "0a2r5x7la9hx42wiyf5fjalb29r1ykr2r3q2lhgf6lc3h2qnrhmx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6"; - name = "counsel"; + name = "recipe"; }; packageRequires = [ emacs swiper ]; meta = { @@ -11083,9 +14463,15 @@ license = lib.licenses.free; }; }) {}; - counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + counsel-bbdb = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-bbdb"; + ename = "counsel-bbdb"; version = "20171129.1737"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -11093,10 +14479,10 @@ rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1"; sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp"; - name = "counsel-bbdb"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -11104,9 +14490,45 @@ license = lib.licenses.free; }; }) {}; - counsel-css = callPackage ({ cl-lib ? null, counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + counsel-codesearch = callPackage ({ codesearch + , counsel + , emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { + pname = "counsel-codesearch"; + ename = "counsel-codesearch"; + version = "20180713.304"; + src = fetchFromGitHub { + owner = "abingham"; + repo = "emacs-counsel-codesearch"; + rev = "cb9f3df541e84b4b13905c3ad3658cad2f34b0cf"; + sha256 = "1invag9nnbsxajli6xph9fgdihs9j3hwkw2s8w297808if5gxnr3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d3404c3cdfa6654ad80378ab258f0df68a6beeb9/recipes/counsel-codesearch"; + sha256 = "0y547cfxjq59zvi36av0rd1wdydf8d96ma438ja0x726f53nxd3g"; + name = "recipe"; + }; + packageRequires = [ codesearch counsel emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/counsel-codesearch"; + license = lib.licenses.free; + }; + }) {}; + counsel-css = callPackage ({ cl-lib ? null + , counsel + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-css"; + ename = "counsel-css"; version = "20180302.236"; src = fetchFromGitHub { owner = "hlissner"; @@ -11114,10 +14536,10 @@ rev = "0536af00236cdce1ed08b40dd46c917e8b4b8869"; sha256 = "04qm5dqxnl4s0axbrin7a7dpj3h8rx096q01bwzfs10qsdx3l7c0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/519a05a9f0e43f3e1dfac75759346476bfc40772/recipes/counsel-css"; sha256 = "1sckfq8kv68q1anqmslrvhcf83m7b5r0clny6q33b9x0qypkv9xp"; - name = "counsel-css"; + name = "recipe"; }; packageRequires = [ cl-lib counsel emacs ]; meta = { @@ -11125,9 +14547,18 @@ license = lib.licenses.free; }; }) {}; - counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }: - melpaBuild { + counsel-dash = callPackage ({ counsel + , dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , helm-dash + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-dash"; + ename = "counsel-dash"; version = "20160729.829"; src = fetchFromGitHub { owner = "nathankot"; @@ -11135,10 +14566,10 @@ rev = "07fa74a94ff4da5b6c8c4810f5e143e701b480d2"; sha256 = "17h2m9zsadq270mkq12kmdzmpbfjiwjbg8n1rg2apqnm1ndgcwf8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8af4d854f972bfed3d2122b4c089f72d8b5f2a/recipes/counsel-dash"; sha256 = "0pzh8ww1p2jb859gdjr5ypya3rwhiyg3c79xhx8filxrqxgjv5fk"; - name = "counsel-dash"; + name = "recipe"; }; packageRequires = [ counsel dash dash-functional emacs helm-dash ]; meta = { @@ -11146,20 +14577,26 @@ license = lib.licenses.free; }; }) {}; - counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + counsel-etags = callPackage ({ counsel + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-etags"; - version = "20180324.2005"; + ename = "counsel-etags"; + version = "20180605.613"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "267c071724fcc665359f2f4472392507facaab2c"; - sha256 = "0039l9pdndl0y06xjvxpgcc71kqpwhny2lhy5a68p6n1ndi958z9"; + rev = "9437ce4e4adb7140df6af0a4528069b9e54de44b"; + sha256 = "14q7w6pz3pslwr4s1f2b8wiq6k1jvp09mwml9x2j5ljw7j3145pi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; sha256 = "1h3dlczm1m21d4h41vz9ngg5fi02g6f95qalfxdnsvz0d4w4yxk0"; - name = "counsel-etags"; + name = "recipe"; }; packageRequires = [ counsel emacs ]; meta = { @@ -11167,9 +14604,15 @@ license = lib.licenses.free; }; }) {}; - counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + counsel-gtags = callPackage ({ counsel + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-gtags"; + ename = "counsel-gtags"; version = "20170326.559"; src = fetchFromGitHub { owner = "syohex"; @@ -11177,10 +14620,10 @@ rev = "220ebb48419ee6891ecbf9ea8fe130b494b17ee2"; sha256 = "12ml45gwfh0lyvmf24pvryylrjx5g60yqpbjfcak7zvy7x5wmc1s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags"; sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax"; - name = "counsel-gtags"; + name = "recipe"; }; packageRequires = [ counsel emacs ]; meta = { @@ -11188,20 +14631,28 @@ license = lib.licenses.free; }; }) {}; - counsel-notmuch = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, notmuch, s }: - melpaBuild { + counsel-notmuch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , notmuch + , s }: + melpaBuild { pname = "counsel-notmuch"; - version = "20171223.145"; + ename = "counsel-notmuch"; + version = "20180713.1740"; src = fetchFromGitHub { owner = "fuxialexander"; repo = "counsel-notmuch"; - rev = "ac1aaead81c6860d7b8324cc1c00bcd52de5e9ca"; - sha256 = "19frcrz6bx7d7v1hkg0xv7zmbk2sydlsdzn1s96cqzjk1illchkz"; + rev = "f4c864eca400abe0bb7420bcee80f2f8259ca0ff"; + sha256 = "0f5w4m5qripca5agbgil0qvd4h9ypi63kpz90n744v60r3lddcjl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54fe0be4e8e8b90cd2dc3cc8b9c573694c8f773b/recipes/counsel-notmuch"; sha256 = "1n4jp9fa5fbv55am0w1b832ncdih8gi6xflwabpwqqj4k5mj94p1"; - name = "counsel-notmuch"; + name = "recipe"; }; packageRequires = [ emacs ivy notmuch s ]; meta = { @@ -11209,20 +14660,81 @@ license = lib.licenses.free; }; }) {}; - counsel-osx-app = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + counsel-org-capture-string = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { + pname = "counsel-org-capture-string"; + ename = "counsel-org-capture-string"; + version = "20180707.217"; + src = fetchFromGitHub { + owner = "akirak"; + repo = "counsel-org-capture-string"; + rev = "14144773a23fd42ddee3522ffae44260c55ab9d5"; + sha256 = "0zknmcxhf97kflxm5bv9gjl9n390jjrbdz13600afs4kvzdad4z1"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/380d58ac9487f2fb1d4a791008fa60fb7165e7e3/recipes/counsel-org-capture-string"; + sha256 = "1jqp4qscv8shx1kfnrm6642a83ba3rpzm7v9hz46j3aw6f3psw9g"; + name = "recipe"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/counsel-org-capture-string"; + license = lib.licenses.free; + }; + }) {}; + counsel-org-clock = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { + pname = "counsel-org-clock"; + ename = "counsel-org-clock"; + version = "20180623.617"; + src = fetchFromGitHub { + owner = "akirak"; + repo = "counsel-org-clock"; + rev = "7b172847f19571fa8f4092899bff75fab0821b07"; + sha256 = "08ci1pb0w1aalhhsg8v0b37xapy72svfkzclk54f3813vxd2naxs"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d21e10ba82b4ae0f8101031be16bc5f7e80ba5d5/recipes/counsel-org-clock"; + sha256 = "16pai05qqaw31ghdy1h164qy56mqsdsf2925i0qhlhysslkki8gh"; + name = "recipe"; + }; + packageRequires = [ dash emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/counsel-org-clock"; + license = lib.licenses.free; + }; + }) {}; + counsel-osx-app = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-osx-app"; + ename = "counsel-osx-app"; version = "20160821.109"; src = fetchFromGitHub { owner = "d12frosted"; repo = "counsel-osx-app"; - rev = "b1c54cbc033c4939966910d85ce035503079e108"; - sha256 = "0p3j60hjai3v8yny9zlzbxppy0pl9s3yf4x6z5rac6n86xx0iix8"; + rev = "5cc93ec684f837dc31ce20e7625407f2c0445691"; + sha256 = "03gnxk2midiczq5w1k69ddhnlhml1pnwr9yjaw3b30dgv6r29dpw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/926d0ab3d62d7114d6997944521b66ab969f6830/recipes/counsel-osx-app"; sha256 = "0zc74szalyazbvi0lh3zy08kb8kzlwcwnc8d1sj5n23ymvvs5nn3"; - name = "counsel-osx-app"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -11230,20 +14742,26 @@ license = lib.licenses.free; }; }) {}; - counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + counsel-projectile = callPackage ({ counsel + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "counsel-projectile"; - version = "20180316.1608"; + ename = "counsel-projectile"; + version = "20180718.842"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "d428d08015f83fe91c058abf7f1fa95657e90483"; - sha256 = "177w7v9hxx7p5l25hap4n4x8axzvp019a4xhkla8r1i821bxbqjw"; + rev = "6ffcf45767543c72e817d9de8bca9db9156a48be"; + sha256 = "1zdnw9n32fgrpwqkd2v153gdhyq183avr78hj57cq48hp6vfwfa1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; sha256 = "1gshphxaa902kq878rnizn3k1zycakwqkciz92z3xxb3bdyy0hnl"; - name = "counsel-projectile"; + name = "recipe"; }; packageRequires = [ counsel projectile ]; meta = { @@ -11251,20 +14769,26 @@ license = lib.licenses.free; }; }) {}; - counsel-pydoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + counsel-pydoc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-pydoc"; + ename = "counsel-pydoc"; version = "20171018.1342"; src = fetchFromGitHub { owner = "co-dh"; repo = "pydoc_utils"; - rev = "1d8ff8ca3b9d69453cde423b1887fbb490a95c9e"; - sha256 = "06kf93y8wb9nwvs70xi4lkd5x4g6sl8f83diy2wl7ha657dwx3m8"; + rev = "08a4a1020da3d06604156303024c8a5e31ec36e4"; + sha256 = "0658pm99vnm50xq2c79mdbywrgmbs0wwl90hnc493652bznrsgmc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/110939c12b4e042a486e97be4c2a2426c5978ca6/recipes/counsel-pydoc"; sha256 = "1a3vwh4jf5y03z95bd4blk75n6wjd24l6yw6vpr3991bi4qrxclz"; - name = "counsel-pydoc"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -11272,9 +14796,15 @@ license = lib.licenses.free; }; }) {}; - counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + counsel-spotify = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-spotify"; + ename = "counsel-spotify"; version = "20180319.2022"; src = fetchFromGitHub { owner = "Lautaro-Garcia"; @@ -11282,10 +14812,10 @@ rev = "9033e207dccdfea7fe590d2e102d50fcd2bd22e3"; sha256 = "00mjcp3x558gh7f8yrj8y4ivq3pvml7y46rms8xah5zxavg6q52b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b386462518a5ebb6454f4d01582df98395239bcc/recipes/counsel-spotify"; sha256 = "1xs4km5vjhn6dnlmrscz7airip07n1ppybp8mr17hinb8scfpv47"; - name = "counsel-spotify"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -11293,9 +14823,15 @@ license = lib.licenses.free; }; }) {}; - counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + counsel-tramp = callPackage ({ counsel + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-tramp"; + ename = "counsel-tramp"; version = "20180311.2327"; src = fetchFromGitHub { owner = "masasam"; @@ -11303,10 +14839,10 @@ rev = "3f5ae75a6bde00bffeb2877b4ed4bd45610c0dfa"; sha256 = "06dhhjrgpikzpdl1hck0ckjbx8yzx8jbymb3ajfxglgvrvid4l1k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp"; sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5"; - name = "counsel-tramp"; + name = "recipe"; }; packageRequires = [ counsel emacs ]; meta = { @@ -11314,20 +14850,26 @@ license = lib.licenses.free; }; }) {}; - counsel-world-clock = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }: - melpaBuild { + counsel-world-clock = callPackage ({ fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , s }: + melpaBuild { pname = "counsel-world-clock"; + ename = "counsel-world-clock"; version = "20171201.2337"; src = fetchFromGitHub { owner = "kchenphy"; repo = "counsel-world-clock"; - rev = "04153fbb21e51b1cfd042bdfc6ed1e8355a1edd7"; - sha256 = "1gmsqhc6dsq823jbg9g19x7bsz5n7ssnqjzhsd8pnnm561g60dcm"; + rev = "9834461002e1ea0c1669705e7a2b99dec969bb30"; + sha256 = "1gkbcq7fkh08cwmbf1q99s2m5hcja73vl8bfdx2iif74f81p89jf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9da8c45e7d06647f9591d80e83f851a7f3af85/recipes/counsel-world-clock"; sha256 = "151vm7g7g0jwjlp0wrwlxrjnh9qsckc10whkfgaz9czzvvmsf4cv"; - name = "counsel-world-clock"; + name = "recipe"; }; packageRequires = [ ivy s ]; meta = { @@ -11335,30 +14877,44 @@ license = lib.licenses.free; }; }) {}; - cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + cov = callPackage ({ elquery + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "cov"; - version = "20170405.1508"; + ename = "cov"; + version = "20180415.1331"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "cov"; - rev = "519239cc37d3ad0204fecac99f42e1694ce57d3d"; - sha256 = "1kb2rmxx91q4cwm1npzyiykwg5jxhhz7waykh5vqxr5y81hr5nza"; + rev = "2371d01e6b2928eb6cee6b7bfa8d50f96c47e750"; + sha256 = "1z1092xyn2zlmggp7dkr7cynmvrr4hjdsq2pgnri5lizp3bjyd4x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov"; sha256 = "02wk8ikanl5lcwqb9wqc8xx5vwzhn2hpqpxdchg5mdi7fifa1rni"; - name = "cov"; + name = "recipe"; }; - packageRequires = [ emacs f s ]; + packageRequires = [ elquery emacs f s ]; meta = { homepage = "https://melpa.org/#/cov"; license = lib.licenses.free; }; }) {}; - coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }: - melpaBuild { + coverage = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , ov }: + melpaBuild { pname = "coverage"; + ename = "coverage"; version = "20180226.2057"; src = fetchFromGitHub { owner = "trezona-lecomte"; @@ -11366,10 +14922,10 @@ rev = "c73d984168955ca0f47f44b0464aa45282df42b6"; sha256 = "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd70e138534551dd12ba4d165ba56fbd1e033241/recipes/coverage"; sha256 = "0ja7wsx2sj0h01sk1l3c0aidbs1ld4gj3kiwq6brs7r018sz45pm"; - name = "coverage"; + name = "recipe"; }; packageRequires = [ cl-lib ov ]; meta = { @@ -11377,20 +14933,26 @@ license = lib.licenses.free; }; }) {}; - coverlay = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + coverlay = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "coverlay"; - version = "20160507.955"; + ename = "coverlay"; + version = "20180518.1555"; src = fetchFromGitHub { owner = "twada"; repo = "coverlay.el"; - rev = "11068e2e4ed971b757ac0294528d4beb91124e58"; - sha256 = "1q6cx6kq68xxqcx7zd9l4szy038i5ifjb82fxs3sn5fv00q0j9vd"; + rev = "8205a845d58755dd7640b2e2b5991bf842998935"; + sha256 = "1mppan4ml4dblwxdgr8pli7nj864frc7n7c6h47q4vfb4flg29n0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coverlay"; sha256 = "1n0fblacwps94mhbdwpi22frhqp3pxg4323ghb79rvszb7in9i8j"; - name = "coverlay"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -11398,9 +14960,13 @@ license = lib.licenses.free; }; }) {}; - cp5022x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cp5022x = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cp5022x"; + ename = "cp5022x"; version = "20120323.1635"; src = fetchFromGitHub { owner = "awasira"; @@ -11408,10 +14974,10 @@ rev = "ea7327dd75e54539576916f592ae1be98179ae35"; sha256 = "1z67x4a0aricd9q6i2w33k74alddl6w0rijjhzyxwml7ibhbvphz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/761fcb0ff07d9746d68e9946c8b46e50c67cd1d8/recipes/cp5022x"; sha256 = "0v1jhkix01l299m67jag43rnps68m19zy83vvdglxa8dj3naz5dl"; - name = "cp5022x"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11419,20 +14985,25 @@ license = lib.licenses.free; }; }) {}; - cpanfile-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cpanfile-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cpanfile-mode"; + ename = "cpanfile-mode"; version = "20161001.10"; src = fetchFromGitHub { owner = "zakame"; repo = "cpanfile-mode"; - rev = "eda675703525198df1f76ddf250bffa40217ec5d"; - sha256 = "07xivp1i9f884gs17lhp5jm0zk916c7gwazxnkm6m8rl3z2mcq0l"; + rev = "b09908b4342b3aa97940159dbe91ac074ec98e0b"; + sha256 = "12nbfgvhd8gxakq787i1v3h2kcn1r76f9lhqx44gjwqy3yx201i5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673e828a076ad806cdb69102a9d55f80ace45670/recipes/cpanfile-mode"; sha256 = "1sflykfrhx9sn5dqlaa4s7w34nczh4xqwcig5rmlpwj9yl2mk2dm"; - name = "cpanfile-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -11440,9 +15011,13 @@ license = lib.licenses.free; }; }) {}; - cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cpputils-cmake = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cpputils-cmake"; + ename = "cpputils-cmake"; version = "20170819.259"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -11450,10 +15025,10 @@ rev = "4fa37dd075c716f98b67b96f3b6e022730df1c1b"; sha256 = "194vayk2hvqm2nv1rr3myiadrfvk8fpch1qlbic9bzbgfrl74i41"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake"; sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60"; - name = "cpputils-cmake"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11461,9 +15036,14 @@ license = lib.licenses.free; }; }) {}; - cql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cql-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cql-mode"; + ename = "cql-mode"; version = "20160720.2039"; src = fetchFromGitHub { owner = "Yuki-Inoue"; @@ -11471,10 +15051,10 @@ rev = "2529ade55c125a89d8215f096a74733a90611c5d"; sha256 = "1ikmz037bv7h0bjrr8qia5g127a0vd223y04ndbyd950gqc1lx4h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1084dd0ec0f2e8fe6fa8e97b322833c14e8e59d1/recipes/cql-mode"; sha256 = "0wdal8w0i73xjak2g0wazs54z957f4lj4n8qdmzpcylzpl1lqd88"; - name = "cql-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -11482,20 +15062,27 @@ license = lib.licenses.free; }; }) {}; - cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: - melpaBuild { + cquery = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { pname = "cquery"; - version = "20180319.2313"; + ename = "cquery"; + version = "20180619.1953"; src = fetchFromGitHub { owner = "cquery-project"; repo = "emacs-cquery"; - rev = "383656d3cb368481594fd7a13d0395a8640afbac"; - sha256 = "1qdicqwafnhfqkl3ihvc67w4wnhyp089wbf54v1plrcw75ywdlmf"; + rev = "fd881d5db6bc555b22993e8d3e517d30a56ea763"; + sha256 = "0n8962x68jcdff1wmq30fs5rbfgx9br2d10ylv3hfrg40abd0sad"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery"; sha256 = "01mw6aqiazpzcn6h5h5xcnra8a04yg1ibvpfajx70m5iw9f5w6l6"; - name = "cquery"; + name = "recipe"; }; packageRequires = [ dash emacs lsp-mode ]; meta = { @@ -11503,9 +15090,13 @@ license = lib.licenses.free; }; }) {}; - crappy-jsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + crappy-jsp-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "crappy-jsp-mode"; + ename = "crappy-jsp-mode"; version = "20140311.231"; src = fetchFromGitHub { owner = "magnars"; @@ -11513,10 +15104,10 @@ rev = "6c45ab92b452411cc0fab9bcee2f456276b4fc40"; sha256 = "12g6l6xlbs9h24q5lk8yjgk91xqd7r3v7r6czy10r09cmfjmkxbb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/crappy-jsp-mode"; sha256 = "17m404kdz9avihz52xd7hn5qx06a6k74gmn0gbhly4gl84w3zc6y"; - name = "crappy-jsp-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11524,9 +15115,14 @@ license = lib.licenses.free; }; }) {}; - creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + creamsody-theme = callPackage ({ autothemer + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "creamsody-theme"; + ename = "creamsody-theme"; version = "20170222.258"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -11534,10 +15130,10 @@ rev = "32fa3f4e461da92700523b1b20e7b28974c19a26"; sha256 = "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7"; - name = "creamsody-theme"; + name = "recipe"; }; packageRequires = [ autothemer ]; meta = { @@ -11545,20 +15141,26 @@ license = lib.licenses.free; }; }) {}; - creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + creds = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "creds"; + ename = "creds"; version = "20140510.1006"; src = fetchFromGitHub { owner = "ardumont"; repo = "emacs-creds"; - rev = "b059397a7d59481f05fbb1bb9c8d3c2c69226482"; - sha256 = "0l4bvk3m355b25d7pdnhczn3fckbq0rg2l4r0a0d94004ksvylqa"; + rev = "00ebefd10005c170b790a01380cb6a98f798ce5c"; + sha256 = "169ai0xkh3988racnhaapxw0v1pbxvcaq470x1qacdzdpka4a7bs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81b032049ccc3837e8693f010b39716912f76bba/recipes/creds"; sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk"; - name = "creds"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -11566,9 +15168,15 @@ license = lib.licenses.free; }; }) {}; - creole = callPackage ({ fetchFromGitHub, fetchurl, kv, lib, melpaBuild, noflet }: - melpaBuild { + creole = callPackage ({ fetchFromGitHub + , fetchurl + , kv + , lib + , melpaBuild + , noflet }: + melpaBuild { pname = "creole"; + ename = "creole"; version = "20140924.800"; src = fetchFromGitHub { owner = "nicferrier"; @@ -11576,10 +15184,10 @@ rev = "7d5cffe93857f6c75ca09ac79c0e47b8d4410e53"; sha256 = "18c4jfjnhb7asdhwj41g06cp9rz5xd7bbx2s1xvk6gahay27rlrv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/creole"; sha256 = "1q1c6f953g39xal1p7rj8dlcx2crk5cz1q07zp8bgp5jx4nd2z9n"; - name = "creole"; + name = "recipe"; }; packageRequires = [ kv noflet ]; meta = { @@ -11587,9 +15195,13 @@ license = lib.licenses.free; }; }) {}; - creole-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + creole-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "creole-mode"; + ename = "creole-mode"; version = "20130721.1750"; src = fetchFromGitHub { owner = "nicferrier"; @@ -11597,10 +15209,10 @@ rev = "b5e79b2ec5f19fb5aacf689b5febc3e0b61515c4"; sha256 = "0japww5x89vd1ahjm2bc3biz6wxv94vvqq5fyyzkqsblgk5bys0h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f04f93ab9482dbabfdbe3f0c8186c62a9a80c8b3/recipes/creole-mode"; sha256 = "1lj9a0bgn7lmc2wyjzzvmpaz1f1spj02l51ki2wydjbfhxq61k0s"; - name = "creole-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11608,9 +15220,17 @@ license = lib.licenses.free; }; }) {}; - cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + cricbuzz = callPackage ({ dash + , enlive + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "cricbuzz"; + ename = "cricbuzz"; version = "20171227.1607"; src = fetchFromGitHub { owner = "lepisma"; @@ -11618,10 +15238,10 @@ rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889"; sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip"; - name = "cricbuzz"; + name = "recipe"; }; packageRequires = [ dash enlive f s ]; meta = { @@ -11629,9 +15249,14 @@ license = lib.licenses.free; }; }) {}; - crm-custom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + crm-custom = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "crm-custom"; + ename = "crm-custom"; version = "20160116.1606"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; @@ -11639,10 +15264,10 @@ rev = "f1aaccf64306a5f99d9bf7ba815d7ea41c15518d"; sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e0752ba601a8d518d3c7fb54fd008602e7dc19f/recipes/crm-custom"; sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c"; - name = "crm-custom"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -11650,20 +15275,25 @@ license = lib.licenses.free; }; }) {}; - crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + crux = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "crux"; - version = "20180113.251"; + ename = "crux"; + version = "20180611.2355"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "3e07035660f953cb08847362378267f5859bbe69"; - sha256 = "07l49l5fb7sv2ncvakr7nq616vw6nwrpl9czvqi46dnwvcdpjaxl"; + rev = "c79985f69b7cd96edb505199bd751f71ce6d4e58"; + sha256 = "0k58k3vzcxcgjaz230m18piq3gfw8w0h1g3n4jpp447indzwn4rr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c"; - name = "crux"; + name = "recipe"; }; packageRequires = [ seq ]; meta = { @@ -11671,9 +15301,13 @@ license = lib.licenses.free; }; }) {}; - cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cryptol-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cryptol-mode"; + ename = "cryptol-mode"; version = "20180321.1108"; src = fetchFromGitHub { owner = "thoughtpolice"; @@ -11681,10 +15315,10 @@ rev = "91f8ad617e5db2fad57a7be1da211f22f3b51550"; sha256 = "12jd2wc5icnkbvxjam7kgr8bdjavxjsy79vwi0hi3gzwiirx4ifg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode"; sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2"; - name = "cryptol-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11692,20 +15326,25 @@ license = lib.licenses.free; }; }) {}; - cryptsy-public-api = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + cryptsy-public-api = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "cryptsy-public-api"; + ename = "cryptsy-public-api"; version = "20141008.528"; src = fetchFromGitHub { owner = "Sodaware"; repo = "cryptsy-public-api.el"; - rev = "795c204452f880c0087663e7c35faf26ea34af4d"; - sha256 = "19lfgxay02ngi815cw5mcdksymgfm2mnjs974idr7788kmwqmfij"; + rev = "c65abdbb2fac49913c27b5183e3fad1092f78b3d"; + sha256 = "1hiip5q2vg729kzidj0jmq4idvqxhbkwvncfj9qnn51rmr23n17z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/cryptsy-public-api"; sha256 = "1331nrx57136k09a7p6imv0k9g6w8ibpwn5xmv33dxc22hsmc41j"; - name = "cryptsy-public-api"; + name = "recipe"; }; packageRequires = [ json ]; meta = { @@ -11713,20 +15352,25 @@ license = lib.licenses.free; }; }) {}; - crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + crystal-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "crystal-mode"; - version = "20180306.1821"; + ename = "crystal-mode"; + version = "20180606.755"; src = fetchFromGitHub { owner = "crystal-lang-tools"; repo = "emacs-crystal-mode"; - rev = "490f213c17e67ac28e7de19a0cfa62652d44b5de"; - sha256 = "0isz91ikwc5175y9a984j8j9nmli0qf2j0shljk576ywlybiy00a"; + rev = "7af6afdf8b90b13b419b58bbe9e096eb20527e5c"; + sha256 = "1v6h8i9avgqirg7mcac33vycjyslmvg760dk3mf1sv76xx78v5vz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode"; sha256 = "1fgpz7zab6nc6kvjzjsbvrbg8shf4by0f20cvjvyky8kym72q0hk"; - name = "crystal-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -11734,20 +15378,24 @@ license = lib.licenses.free; }; }) {}; - csgo-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + csgo-conf-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "csgo-conf-mode"; + ename = "csgo-conf-mode"; version = "20161209.819"; src = fetchFromGitHub { owner = "wynro"; repo = "emacs-csgo-conf-mode"; - rev = "57e7224f87a3ccc76b5564cc95fa0ff43bb6807c"; - sha256 = "14wzh3rlq7xb8djncbjkfiq9hl5frp7gp42sz2ic7aky4qajbcdv"; + rev = "df45ca833eb68c394dd03acce5733a33c3b06bf8"; + sha256 = "0bq9dr1zq1lkdy80jqvxpb0igdnz9jqjh7pif3190mh7m46zyr7y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2298e3f840da549707ec3270c8303f4f63a674dc/recipes/csgo-conf-mode"; sha256 = "0djx6jraqlh9da2jqagj72vjnc8n3px2jp23jdy9rk40z10m5sbr"; - name = "csgo-conf-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11755,20 +15403,24 @@ license = lib.licenses.free; }; }) {}; - csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + csharp-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "csharp-mode"; - version = "20180315.203"; + ename = "csharp-mode"; + version = "20180708.652"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "79e0a606f60a2620631623285dbbbd8591cbd2f8"; - sha256 = "1h36ns0kcz8p7nafczdyz1bvbz8fp3ci72c7ikyl703kkyqpk0px"; + rev = "5e47b7764b3f4c97c260a902e8072d444dbd0f1b"; + sha256 = "1dnhpxcinrwc7dmwgzbg4lnly05h38f00zrfsjincvii6d8rjiw0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0"; - name = "csharp-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11776,20 +15428,27 @@ license = lib.licenses.free; }; }) {}; - csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: - melpaBuild { + csound-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multi + , shut-up }: + melpaBuild { pname = "csound-mode"; - version = "20180119.1726"; + ename = "csound-mode"; + version = "20180505.1225"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "4fc4e77263d31604c86be799163d96cdad57c610"; - sha256 = "167s332b9pbbxv24kyhrx543954a86bffxngjhp0cl0slmd81g2m"; + rev = "5137de36e49b41ec428f35d9bfa08b5cc82e066c"; + sha256 = "0v4yv4v6l0m1rkj3cb35f6hqhvbwh48ii6vb9xnc99r984jrs4f4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; sha256 = "047a78nhkn6qycsz8w9a0r1xyz5wyf4rds3z5yx9sn5wkv54w95d"; - name = "csound-mode"; + name = "recipe"; }; packageRequires = [ emacs multi shut-up ]; meta = { @@ -11797,9 +15456,14 @@ license = lib.licenses.free; }; }) {}; - css-autoprefixer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + css-autoprefixer = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "css-autoprefixer"; + ename = "css-autoprefixer"; version = "20180311.900"; src = fetchFromGitHub { owner = "kkweon"; @@ -11807,10 +15471,10 @@ rev = "386a5defc8543a3b87820f1761c075c7d1d93b38"; sha256 = "0ymba9bhzfi7kkrha4d4sn0hrc3sid4b5k8lhakwwdwafhym0jjb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/122e3813a5b8a57303345e9cd855f4d85eced6f0/recipes/css-autoprefixer"; sha256 = "0q40k8jvs4nc57kcljsx5qzylz9ms0kbr3dic3mr3bj0w062b1qg"; - name = "css-autoprefixer"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -11818,9 +15482,13 @@ license = lib.licenses.free; }; }) {}; - css-comb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + css-comb = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "css-comb"; + ename = "css-comb"; version = "20160415.2259"; src = fetchFromGitHub { owner = "channikhabra"; @@ -11828,10 +15496,10 @@ rev = "6fa45e5af8a8bd3af6c1154cde3540e32c4206ee"; sha256 = "0nvl6y90p9crk12j7aw0cqdjhli7xbrx3hqckxsnvrnxy4zax7nk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc24de7f847feaa128168d0fd8b2110242cca6/recipes/css-comb"; sha256 = "1axwrvbc3xl1ixhh72bii3hhbi9d96y6i1my1rpvwqyd6f7wb2cf"; - name = "css-comb"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11839,9 +15507,13 @@ license = lib.licenses.free; }; }) {}; - css-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + css-eldoc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "css-eldoc"; + ename = "css-eldoc"; version = "20150124.1923"; src = fetchFromGitHub { owner = "zenozeng"; @@ -11849,10 +15521,10 @@ rev = "c558ac4c470742c98a37290e6b409db28183df30"; sha256 = "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/css-eldoc"; sha256 = "0k0yzpqwfh5rg8sbv60simdslag514768i0naimm8vyrvv87fzny"; - name = "css-eldoc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11860,9 +15532,13 @@ license = lib.licenses.free; }; }) {}; - cssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cssh = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cssh"; + ename = "cssh"; version = "20150810.1009"; src = fetchFromGitHub { owner = "dimitri"; @@ -11870,10 +15546,10 @@ rev = "2fe2754235225a59b63f08b130cfd4352e2e1c3f"; sha256 = "1xf2hy077frfz8qf91c0l0qppcjxzr4bsbb622bx6fidqkpa3a1a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da3fcf6252f83d80de8a3ec564244e6cd22391eb/recipes/cssh"; sha256 = "10yvvyzqr06jvijmzis9clb1slzp2mn80yclis8wvrmg4p8djljk"; - name = "cssh"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11881,9 +15557,13 @@ license = lib.licenses.free; }; }) {}; - csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + csv = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "csv"; + ename = "csv"; version = "20161113.710"; src = fetchFromGitLab { owner = "u11"; @@ -11891,10 +15571,10 @@ rev = "aa1dfa1263565d5fac3879c21d8ddf5f8915e411"; sha256 = "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/233f9de5f65fd8374f2c1912503c30905aa6691d/recipes/csv"; sha256 = "1rvi5p27lsb284zqgv4cdqkbqc9r92axmvg7sv52rm7qcj8njwqd"; - name = "csv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11902,9 +15582,13 @@ license = lib.licenses.free; }; }) {}; - ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ctable = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ctable"; + ename = "ctable"; version = "20171005.1711"; src = fetchFromGitHub { owner = "kiwanami"; @@ -11912,10 +15596,10 @@ rev = "b8830d1ca95abb100a81bc32011bd17d5ecba000"; sha256 = "0pg303pnqscrsbx9579hc815angszsgf9vpd2z2f8p4f4ka6a00h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/ctable"; sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1"; - name = "ctable"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11923,9 +15607,13 @@ license = lib.licenses.free; }; }) {}; - ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ctags-update = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ctags-update"; + ename = "ctags-update"; version = "20170728.58"; src = fetchFromGitHub { owner = "jixiuf"; @@ -11933,10 +15621,10 @@ rev = "783bf91eba1cd27cbb739067a24e15e5e04564e6"; sha256 = "1navj3cm5gmp0h8wyk281i1gjry1kj0i73wlz1fjwkqm6awxfz4w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update"; sha256 = "07548jjpx4var2817y47i6br8iicjlj66n1b33h0av6r1h514nci"; - name = "ctags-update"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11944,9 +15632,13 @@ license = lib.licenses.free; }; }) {}; - ctl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ctl-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ctl-mode"; + ename = "ctl-mode"; version = "20151202.206"; src = fetchFromGitHub { owner = "yyr"; @@ -11954,10 +15646,10 @@ rev = "1a13051db21b999c7682a015b33a03096ff9d891"; sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38d2279fd05bb48f0d0e2276c605cd92892d0196/recipes/ctl-mode"; sha256 = "0fydq779b0y6hmh8srfdimr5rl9mk3sj08rbvlljxv3kqv5ajczj"; - name = "ctl-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11965,9 +15657,16 @@ license = lib.licenses.free; }; }) {}; - ctxmenu = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }: - melpaBuild { + ctxmenu = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , popup + , yaxception }: + melpaBuild { pname = "ctxmenu"; + ename = "ctxmenu"; version = "20140303.1342"; src = fetchFromGitHub { owner = "aki2o"; @@ -11975,10 +15674,10 @@ rev = "5c2376859562b98c07c985d2b483658e4c0e888e"; sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc4f51bb6ce8fa9e37c0aeb51696b1980aece0c/recipes/ctxmenu"; sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp"; - name = "ctxmenu"; + name = "recipe"; }; packageRequires = [ log4e popup yaxception ]; meta = { @@ -11986,20 +15685,26 @@ license = lib.licenses.free; }; }) {}; - cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cubicaltt = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cubicaltt"; + ename = "cubicaltt"; version = "20171108.602"; src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "7f3c7a7cfe60f98da46e6958bec62bac4675ccd2"; - sha256 = "096523m3spfqw72zp2rzcf1b54997yzs7qxwvr3awhicah1z6mv0"; + rev = "a867f3d66172020e30dd0614bd7b50f90b6fddd7"; + sha256 = "1d53i4dscssfmcdspjf692jhsvjfzxb8d6wvs7a4m8f6z31ygkvl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; sha256 = "1wgy6965cnw201wx4a2pn71sa40mh2712y0d0470klr156krj0n9"; - name = "cubicaltt"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -12007,20 +15712,24 @@ license = lib.licenses.free; }; }) {}; - cubicle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cubicle-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cubicle-mode"; + ename = "cubicle-mode"; version = "20171009.1257"; src = fetchFromGitHub { owner = "cubicle-model-checker"; repo = "cubicle"; - rev = "c2fba597da83b9ddc1195f1c8710d5330db24735"; - sha256 = "0gprqhm38y5dcpkmhy1i6rv7pa5l8271b71284p1g90p2iyvm89g"; + rev = "9d108b900e0123236b4991c2d06b5061f34feee8"; + sha256 = "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode"; sha256 = "0xcmd0s6dfryl1ihfaqq0pfqc906yzzwk3d3nv8g6b6w78pv1lzv"; - name = "cubicle-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12028,9 +15737,14 @@ license = lib.licenses.free; }; }) {}; - cucumber-goto-step = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }: - melpaBuild { + cucumber-goto-step = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcre2el }: + melpaBuild { pname = "cucumber-goto-step"; + ename = "cucumber-goto-step"; version = "20131209.2119"; src = fetchFromGitHub { owner = "gstamp"; @@ -12038,10 +15752,10 @@ rev = "f2713ffb26ebe1b757d1f2ea80e900b55e5895aa"; sha256 = "184plai32sn0indvi1dma6ykz907zgnrdyxdw6f5mghwca96g5kx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d78d7abccfd9bcebf6888032639923327ad25309/recipes/cucumber-goto-step"; sha256 = "1ydsd455dvaw6a180b6570bfgg0kxn01sn6cb57smqj835am6gx8"; - name = "cucumber-goto-step"; + name = "recipe"; }; packageRequires = [ pcre2el ]; meta = { @@ -12049,9 +15763,13 @@ license = lib.licenses.free; }; }) {}; - cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cuda-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cuda-mode"; + ename = "cuda-mode"; version = "20151213.1921"; src = fetchFromGitHub { owner = "chachi"; @@ -12059,10 +15777,10 @@ rev = "9ae9eacfdba3559b5456342d0d03296290df8ff5"; sha256 = "1ms0z5zplcbdwwdbgsjsbm32i57z9i2i8j9y3wm0pwzyz4zr36zy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d21cf17a4a9ae391e2e9cf9be3399095fa23ef55/recipes/cuda-mode"; sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300"; - name = "cuda-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12070,9 +15788,14 @@ license = lib.licenses.free; }; }) {}; - cursor-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cursor-test = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cursor-test"; + ename = "cursor-test"; version = "20131207.932"; src = fetchFromGitHub { owner = "ainame"; @@ -12080,10 +15803,10 @@ rev = "e09956e048b88fd2ee8dd90b5678baed8b04d31b"; sha256 = "0wmnhizv4jfcl1w9za4ydxf6xwxgm5vwmn1zi5vn70zmv4d6r49l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6439f7561cfab4f6f3beb132d2a65e94b3deba9e/recipes/cursor-test"; sha256 = "1c1d5xq4alamlwyqxjx557aykz5dw87acp0lyglsrzzkdynbwlb1"; - name = "cursor-test"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -12091,20 +15814,26 @@ license = lib.licenses.free; }; }) {}; - cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: - melpaBuild { + cwl-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yaml-mode }: + melpaBuild { pname = "cwl-mode"; + ename = "cwl-mode"; version = "20171205.145"; src = fetchFromGitHub { owner = "tom-tan"; repo = "cwl-mode"; - rev = "bdeb9c0734126f940db80bfb8b1dc735dab671c7"; - sha256 = "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3"; + rev = "2fa8c8db68a8665ed555126975edd8749bcfc009"; + sha256 = "0zgnnvf8k5zcigykcf6slgcjmwb1l0jdfaqm19r34wp3md8wf0v1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode"; sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j"; - name = "cwl-mode"; + name = "recipe"; }; packageRequires = [ emacs yaml-mode ]; meta = { @@ -12112,20 +15841,24 @@ license = lib.licenses.free; }; }) {}; - cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cyberpunk-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cyberpunk-theme"; - version = "20170724.924"; + ename = "cyberpunk-theme"; + version = "20180608.2209"; src = fetchFromGitHub { owner = "n3mo"; repo = "cyberpunk-theme.el"; - rev = "88eff8a42d6ed8ba7782ae003ec9597aed4fd019"; - sha256 = "0pzdm5nbhykssc633injz6jw422ksy632fhz0szd03a6kfx49iby"; + rev = "f8967e46b8bdb3eaf7b72474f2d70997dc1152e9"; + sha256 = "0vrkb07vh5b1azih86s0j917frdp5g6qg1pipddcr6lacgb7n0zl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme"; sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9"; - name = "cyberpunk-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12133,9 +15866,13 @@ license = lib.licenses.free; }; }) {}; - cycbuf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cycbuf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cycbuf"; + ename = "cycbuf"; version = "20131203.1237"; src = fetchFromGitHub { owner = "martinp26"; @@ -12143,10 +15880,10 @@ rev = "1079b41c3eb27d65b66d4399959bb6253f84858e"; sha256 = "1d5i8sm1xrsp4v4myidfyb40hm3wp7hgva7dizg9gbb7prmn1p5w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39f1919271df023898e60f5e7635928dc905083f/recipes/cycbuf"; sha256 = "0gyj48h5wgjawqq3j4hgk5a8d23nffmhd1q53kg7b9vfsda51hbw"; - name = "cycbuf"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12154,9 +15891,13 @@ license = lib.licenses.free; }; }) {}; - cycle-resize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cycle-resize = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cycle-resize"; + ename = "cycle-resize"; version = "20160521.857"; src = fetchFromGitHub { owner = "pierre-lecocq"; @@ -12164,10 +15905,10 @@ rev = "7d255d6fe85f12c967a0f7fcfcf18633be194c88"; sha256 = "1bmdjr99g50dzr4y1jxixfjhqmhrzblmpiyjhh5l5gqmdhammm4k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8806af6662c8250c7533f643fe1c277ff0466651/recipes/cycle-resize"; sha256 = "0vp57plwqx4nf3pbv5g4frjriq8niiia9xc3bv6c3gzd4a0zm7xi"; - name = "cycle-resize"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12175,20 +15916,25 @@ license = lib.licenses.free; }; }) {}; - cycle-themes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cycle-themes = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cycle-themes"; + ename = "cycle-themes"; version = "20150402.2009"; src = fetchFromGitHub { owner = "toroidal-code"; repo = "cycle-themes.el"; - rev = "6e125d11fdbc6b78fc9f219eb2609a5e29815898"; - sha256 = "125s6vwbb9zpx6h3vrxnn7nr8pb45vhxd70ba2r3f87dlxah93am"; + rev = "2660c3178be7b28c2cb5dde2dd70a4bd51dae3a2"; + sha256 = "0wc9wssridy49vshwj7xgrcfmalrv1r9wlr8nvs9d8m3ds39dzh6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f24c358fd616a86f6594001deddee4d62dbb0bc6/recipes/cycle-themes"; sha256 = "1whp9q26sgyf59wygbrvdf9gc94bn4dmhr2f2qivpajx550fjfbc"; - name = "cycle-themes"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -12196,20 +15942,25 @@ license = lib.licenses.free; }; }) {}; - cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cyphejor = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cyphejor"; + ename = "cyphejor"; version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "df449180d28691c9bdbef7bcb25aee75b2af50ca"; - sha256 = "1bni88xdm69m4pq79wq2wb3n50c955amimvlbc63xs1ik3ih52q0"; + rev = "d2faf26420ac16c4056f6eda067b845d33e102cd"; + sha256 = "0vg0n8xcqiv28i3xmnxzji77dbnyxrld4ncdzpa3hpc1j92s9a09"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g"; - name = "cyphejor"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -12217,9 +15968,13 @@ license = lib.licenses.free; }; }) {}; - cypher-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cypher-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cypher-mode"; + ename = "cypher-mode"; version = "20151110.342"; src = fetchFromGitHub { owner = "fxbois"; @@ -12227,10 +15982,10 @@ rev = "ce8543d7877c736c574a17b49874c9dcdc7a06d6"; sha256 = "0vbcq807jpjssabmyjcdkpp6nnx1288is2c6x79dkrviw2xxw3qf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef558e7425adfe87202475babfbc1a679dc4cde5/recipes/cypher-mode"; sha256 = "174rfbm7yzkznkfjmh9bdnm5fgqv9bjwm85h39317pv1g8c3mgv0"; - name = "cypher-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12238,20 +15993,24 @@ license = lib.licenses.free; }; }) {}; - cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cython-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cython-mode"; + ename = "cython-mode"; version = "20180213.854"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "d52624db23a1b13aad75691c8ad3e9b0a1b34439"; - sha256 = "1fyxsvl1qr8i3n92ydkn5b3iw6xk2hsp6rbchjhgymx4g45zx4n0"; + rev = "9f3f99fd6378ffb17976d74356fd3ba7e22f85b3"; + sha256 = "164ksml3i5gmcwripjsn5byfvnnjf86wrkkd9saw481ym6imii3c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i"; - name = "cython-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12259,20 +16018,24 @@ license = lib.licenses.free; }; }) {}; - czech-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + czech-holidays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "czech-holidays"; + ename = "czech-holidays"; version = "20160113.952"; src = fetchFromGitHub { owner = "hydandata"; repo = "czech-holidays"; - rev = "d136fa09a152b3cd80db6d55c7b4ddfe07b90fbf"; - sha256 = "1ck1a61m0kjynqwzbw9hnc7y2a6gd6l1430wm7mw3qqsq959qwm6"; + rev = "d19828122cf3322bcf50601cefa4ac385d2d8f82"; + sha256 = "1ykcsfh5pj6b7ywdfggs8iqzfax0fyjnmr0ba76xwsj0vdrk3072"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7224fd77b3d8a37fac2fe0cf832e3487513afd8c/recipes/czech-holidays"; sha256 = "10c0zscbn7pr9xqdqksy4kh0cxjg9bhw8p4qzlk18fd4c8rhqn84"; - name = "czech-holidays"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12280,30 +16043,39 @@ license = lib.licenses.free; }; }) {}; - d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + d-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "d-mode"; - version = "20180215.727"; + ename = "d-mode"; + version = "20180502.710"; src = fetchFromGitHub { owner = "Emacs-D-Mode-Maintainers"; repo = "Emacs-D-Mode"; - rev = "8d0ed0460189d0e91fa454866c1ed7b9b36f99e2"; - sha256 = "0pdg6s10vcr95r2azin1svkdgn8grlgwi4di30d0f3vcq8jmmfhi"; + rev = "026fceb78e13d67778d72d90ba83f337d0144707"; + sha256 = "0yxmhdfxp6zplfpq52krx86n5sfa60rc1fjcd09g5f1621m31y70"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode"; sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2"; - name = "d-mode"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/d-mode"; license = lib.licenses.free; }; }) {}; - dactyl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dactyl-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dactyl-mode"; + ename = "dactyl-mode"; version = "20140906.1025"; src = fetchFromGitHub { owner = "luxbock"; @@ -12311,10 +16083,10 @@ rev = "cc55fe6b987271d9647492b8df4c812d884f661f"; sha256 = "0fp40cyamchc9qq5vbpxgq3yp6vs8p3ncg46mjzr54psy3fc86dm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72d503380511d2d6580b9522b6e0bd2d800bdebe/recipes/dactyl-mode"; sha256 = "0ppcabddcpwshfd04x42nbrbkagbyi1bg4vslysnlxn4kaxjs7pm"; - name = "dactyl-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12322,9 +16094,14 @@ license = lib.licenses.free; }; }) {}; - dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dad-joke = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dad-joke"; + ename = "dad-joke"; version = "20170927.2358"; src = fetchFromGitHub { owner = "davep"; @@ -12332,10 +16109,10 @@ rev = "bee47e7b746b403228fa7d7361cb095de19ac9ba"; sha256 = "14snnnjs28jg6k8x6g90m3dbcx10306ipcd256d3l6czk9p17vpd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke"; sha256 = "1cg8iaq79w5zx1s3dirdl7ymcp162mmsy5c4vly90v20yrijblad"; - name = "dad-joke"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -12343,20 +16120,25 @@ license = lib.licenses.free; }; }) {}; - daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + daemons = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "daemons"; - version = "20180310.1147"; + ename = "daemons"; + version = "20180610.810"; src = fetchFromGitHub { owner = "cbowdon"; repo = "daemons.el"; - rev = "75b54be70a909282b20c872b5f01d30e18e19f84"; - sha256 = "0jv1i66b035yvj2mj83ihylk6vv7skljnr6kxa15zzj4daw9462c"; + rev = "dcf42cb3178d7245d6d49de346d5e2b44e5b7498"; + sha256 = "00bkzfaw3bqykcks610vk9wlpa2z360xn32bpsrycacwfv29j7g4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons"; sha256 = "14givkrw9p0m261hawahzi0n8jarapb63kv1s62faq57mqnq23jr"; - name = "daemons"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -12364,9 +16146,13 @@ license = lib.licenses.free; }; }) {}; - dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dakrone-light-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dakrone-light-theme"; + ename = "dakrone-light-theme"; version = "20170808.1440"; src = fetchFromGitHub { owner = "dakrone"; @@ -12374,10 +16160,10 @@ rev = "06f198dc8b4ca7421990b30a23d89c8e0b8c5de4"; sha256 = "01vqlsv44h2ah79c8jqv8vkqvgmhqx2w3qbq07l7fx3zkpgjfmpy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a88022a5f68d2fe01e08c2e99cfe380e3697b7/recipes/dakrone-light-theme"; sha256 = "1njlpvfa4ar14zn51fdmby55vjgfkpskizg5rif2f3zn6y4np2xw"; - name = "dakrone-light-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12385,9 +16171,13 @@ license = lib.licenses.free; }; }) {}; - dakrone-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dakrone-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dakrone-theme"; + ename = "dakrone-theme"; version = "20170801.1233"; src = fetchFromGitHub { owner = "dakrone"; @@ -12395,10 +16185,10 @@ rev = "232ad1be5f3572dcbdf528f1655109aa355a6937"; sha256 = "0p51zni42hv090vv6mk9v0v88achmgxlsmlr40y8y6ng57w51r4s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dcc07077b47d7c710c7f2d4919d791ed16ed5b26/recipes/dakrone-theme"; sha256 = "0ma4rfmgwd6k24jzn6pgk46b88jfix7mz0ib7c7r90h5vmpiq814"; - name = "dakrone-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12406,20 +16196,24 @@ license = lib.licenses.free; }; }) {}; - danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + danneskjold-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "danneskjold-theme"; - version = "20180327.254"; + ename = "danneskjold-theme"; + version = "20180708.724"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "ae26f45800d9e2ad5d76d50bf1902edc1e36d0f7"; - sha256 = "1b8mp4xhcswhzk2r5w0s84kkiil1wzl2s32nfbiphpqg7f0863dj"; + rev = "abc8c7fbe7ab071b8260e3355051304bb36adbd7"; + sha256 = "1zd6z66hfdb992r85mvjlaqfavyw5g4g6vak38zj8ycbjdj28p59"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; sha256 = "0cwab7qp293g92n9mjjz2vpg1pz2q3d40hfszf29rci89wsf3yxl"; - name = "danneskjold-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12427,20 +16221,31 @@ license = lib.licenses.free; }; }) {}; - dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lcr, lib, melpaBuild, s }: - melpaBuild { + dante = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , flycheck + , haskell-mode + , lcr + , lib + , melpaBuild + , s }: + melpaBuild { pname = "dante"; - version = "20180224.1246"; + ename = "dante"; + version = "20180515.1312"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "33c8c4afac616e6de30111f8a7f11d572496a838"; - sha256 = "0zv6vqzw299ydgwxiky8b2nlb8cyzzw9zsx44ixaqqf73f63bv1n"; + rev = "0fd72ef60fe01aafbd11720cf3df2e7015847ff4"; + sha256 = "1faxalr54vzxiqbf8vr2nmxkpypyv5w67bjnlvqnyy9hzr5i3qwj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; - name = "dante"; + name = "recipe"; }; packageRequires = [ dash emacs f flycheck haskell-mode lcr s ]; meta = { @@ -12448,20 +16253,24 @@ license = lib.licenses.free; }; }) {}; - darcsum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + darcsum = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "darcsum"; + ename = "darcsum"; version = "20140315.2110"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "darcsum"; - rev = "00c252b51cb24c25fb74f529960ebd631514a4c1"; - sha256 = "1vbfdmc56ma2ycxhza681ninhdxgvxm9j5xb9374xiqmb6g0vykq"; + rev = "5bb38e444cc12940c6933a43792a89accdc2ad0e"; + sha256 = "11h2i0wn118anb9n3kab2hsv78zpiw4d95jal7c9xzhv6xxrz4g0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/darcsum"; sha256 = "0p3hwmwjjqwgkjws5b7gkad4yxh0gs2hr03ar18y43yahwgihvnv"; - name = "darcsum"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12469,9 +16278,13 @@ license = lib.licenses.free; }; }) {}; - darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + darcula-theme = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "darcula-theme"; + ename = "darcula-theme"; version = "20171227.1045"; src = fetchFromGitLab { owner = "fommil"; @@ -12479,10 +16292,10 @@ rev = "d9b82b58ded9014985be6658f4ab17e26ed9e93e"; sha256 = "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; sha256 = "1n9mpkdyf5jpxc5azfs38ccp9p0b5ii87sz4c7z4khs94y0gxqh3"; - name = "darcula-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12490,9 +16303,14 @@ license = lib.licenses.free; }; }) {}; - dark-krystal-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dark-krystal-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dark-krystal-theme"; + ename = "dark-krystal-theme"; version = "20170808.600"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -12500,10 +16318,10 @@ rev = "79084b99665dc9ffb0ec62cc092349a5ecebebbc"; sha256 = "1d3cdsaba71qxdqrbj1jrlq8a0iw3h50l5grcdjvxixdnf5nsa4c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/dark-krystal-theme"; sha256 = "056aql35502sgvdpbgphpqdxzbjf4ay01rra6pm11c1dya8avv0j"; - name = "dark-krystal-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -12511,20 +16329,24 @@ license = lib.licenses.free; }; }) {}; - dark-mint-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dark-mint-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dark-mint-theme"; + ename = "dark-mint-theme"; version = "20160301.2242"; src = fetchFromGitHub { owner = "shaunvxc"; repo = "dark-mint-theme"; - rev = "95c30a26de31549cd341184ba9ab2be8fdc67eba"; - sha256 = "052k8mqxx8lkadxyz6rwa7l741rwbd1blk2ggpsj2s1g6p9l68a1"; + rev = "c8ad39b7115baf889b54c3e9bffe32daeab93c29"; + sha256 = "1bz7n9ijk69kqc1sv74prm2d74gd4xj0vzkbgbwdsin1llkg00zv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de74e734ae75df051475e60e79d4f5ad5bc128ae/recipes/dark-mint-theme"; sha256 = "0rljpwycarbn8rnac9vz7n23j69wmx35gn5dx77v0f0ws8ni4k9m"; - name = "dark-mint-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12532,20 +16354,24 @@ license = lib.licenses.free; }; }) {}; - dark-souls = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dark-souls = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dark-souls"; + ename = "dark-souls"; version = "20140314.428"; src = fetchFromGitHub { owner = "tomjakubowski"; repo = "dark-souls.el"; - rev = "94122b1215423e58dcf18584a2bd022029d54d4b"; - sha256 = "1w0y2j0j9n107dbk7ksr9bipshjfs9dk08qbs9m6h5aqh4hmwa4r"; + rev = "2c9437265b52f966b2fb13a410a12f3b1e167cb7"; + sha256 = "0d4zjbkzjcvlc1jaszicbln0dvwacbj6k1fb1bn34vgbabhckdys"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/535577ce57bd772aca9f66e27485b0f58a7d35c5/recipes/dark-souls"; sha256 = "1ilsn657mpl7v8vkbzqf3gp0gmvy0dgynfsn8w4cb49qaiy337xc"; - name = "dark-souls"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12553,20 +16379,24 @@ license = lib.licenses.free; }; }) {}; - darkburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + darkburn-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "darkburn-theme"; + ename = "darkburn-theme"; version = "20170423.952"; src = fetchFromGitHub { owner = "gorauskas"; repo = "darkburn-theme"; - rev = "0af794ff7fac19778ac8a7efb92455c6f6c2158f"; - sha256 = "0nv917r8pbj6mfncjl8d7hq4763c69q491d4iwnff1n3wzlcp42s"; + rev = "b59053533246330e9107721da7977a0af312c915"; + sha256 = "1ffmip31dnv3zzh1h9cpchl6lya49zn2j13acx6rj9r01ndlbrar"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a04dd517e02bc4b4a62d956aa901a727354202b0/recipes/darkburn-theme"; sha256 = "18hwdnwmkf640vcyx8d66i424wwazbzjq3k0w0xjmwsn2mpyhm9w"; - name = "darkburn-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12574,9 +16404,13 @@ license = lib.licenses.free; }; }) {}; - darkmine-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + darkmine-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "darkmine-theme"; + ename = "darkmine-theme"; version = "20160405.2324"; src = fetchFromGitHub { owner = "pierre-lecocq"; @@ -12584,10 +16418,10 @@ rev = "7f7e82ca03bcad52911fa41fb3e204e32d6ee63e"; sha256 = "0d2g4iyp8gyfrcc1gkvl40p1shlw1sadswzhry0m1lgbyxiiklrz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e527d1335f5fd2aba5b00255a7d69adbc20585ff/recipes/darkmine-theme"; sha256 = "06vzldyqlmfd11g8dqrqh5x244ikfa20qwpsmbgsiry3041k8iw5"; - name = "darkmine-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12595,20 +16429,24 @@ license = lib.licenses.free; }; }) {}; - darkokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + darkokai-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "darkokai-theme"; - version = "20170728.339"; + ename = "darkokai-theme"; + version = "20180513.1857"; src = fetchFromGitHub { owner = "sjrmanning"; repo = "darkokai"; - rev = "d881d51acf0a7f806ae68d48305e30941a741a0e"; - sha256 = "008kn8gllhzlv49br0bs3469insjpcgr3r7iijz1frgy6wrpmdjp"; + rev = "bd5efef1edd42664bb731abd398d5d71a5d2d145"; + sha256 = "05k892zkdfzz05bypf4qdjm49n5gmf7swml2w80zc88dall3hmk9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81387a5a70f7c42fbae16b52db765136795a37e1/recipes/darkokai-theme"; sha256 = "0jw71xl4ihkyq4m0w8c35x5hr8ic07wcabmvpwmvspnj8hkfccwf"; - name = "darkokai-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12616,20 +16454,25 @@ license = lib.licenses.free; }; }) {}; - darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + darktooth-theme = callPackage ({ autothemer + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "darktooth-theme"; - version = "20171206.639"; + ename = "darktooth-theme"; + version = "20180721.2039"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "dc90fc7d526d7e65256e050e3b373908a27b6c45"; - sha256 = "0rpg7mn8h47hqcm24avcy8r7v8k8by1wjk5xk9j24bbv77aswj9k"; + rev = "6060fe63e407fbd08a3acf8af05bdc6ea0bd422e"; + sha256 = "1y7kjfjxj560chb5rh4rs9x3k2z20vc5vbg974a1aj37ipla4qlb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs"; - name = "darktooth-theme"; + name = "recipe"; }; packageRequires = [ autothemer ]; meta = { @@ -12637,20 +16480,29 @@ license = lib.licenses.free; }; }) {}; - dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: - melpaBuild { + dart-mode = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , s }: + melpaBuild { pname = "dart-mode"; - version = "20180219.1614"; + ename = "dart-mode"; + version = "20180721.2225"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "4feac341db7d2b80841fedcf1798dee9070d68bf"; - sha256 = "031f9lkxyhirasj7m0rj67gk8rh3ry640qcppw2p88k937kc6765"; + rev = "9c9a63ed7bbf2b9d3521ead8c302489789552f9d"; + sha256 = "12izfp7516d201shnj0fgd4g9ca2ji2rigiifz7bp0ysmbbpy8nr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla"; - name = "dart-mode"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs flycheck s ]; meta = { @@ -12658,20 +16510,24 @@ license = lib.licenses.free; }; }) {}; - dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dash = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dash"; - version = "20180310.1317"; + ename = "dash"; + version = "20180413.30"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "87d5feac1a08ea09e55e52442dc5e497817b4f08"; - sha256 = "05rm9rs4083ccsscwi7kl094ij5lz7hgs9kvxdsrjmvxj4fqdqm7"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz"; - name = "dash"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12679,20 +16535,24 @@ license = lib.licenses.free; }; }) {}; - dash-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dash-at-point = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dash-at-point"; - version = "20140626.35"; + ename = "dash-at-point"; + version = "20180710.656"; src = fetchFromGitHub { owner = "stanaka"; repo = "dash-at-point"; - rev = "ed872b4fcbe02ef1a5bac0337afe19a7a747f34c"; - sha256 = "0zd50sr51mmvndjb9qfc3sn502nhc939rhd454jbkmlrzqsxvphj"; + rev = "4d795a23a8428c421d5107f1b005c9d8e0d1816c"; + sha256 = "09rxyr22qxc9pdrkg0c4smifh2r797ggz5hg74q8j8jybvixsbls"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2b0c544a76802df5ff3b1bf68a0418a653ea98/recipes/dash-at-point"; sha256 = "0x4nq42nbh2qgbg111lgbknc7w7m7lxd14mp9s8dcrpwsaxz960m"; - name = "dash-at-point"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12700,20 +16560,26 @@ license = lib.licenses.free; }; }) {}; - dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dash-functional = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dash-functional"; + ename = "dash-functional"; version = "20180107.818"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "87d5feac1a08ea09e55e52442dc5e497817b4f08"; - sha256 = "05rm9rs4083ccsscwi7kl094ij5lz7hgs9kvxdsrjmvxj4fqdqm7"; + rev = "528e5a51f1af668e3075f2beccd2b39785ccb2ba"; + sha256 = "0c65wkyzqsi0jignbhl0j9hh0711069x0l54sqbfb72viy0sppck"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p"; - name = "dash-functional"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -12721,20 +16587,26 @@ license = lib.licenses.free; }; }) {}; - dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: - melpaBuild { + dashboard = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , page-break-lines }: + melpaBuild { pname = "dashboard"; - version = "20180328.807"; + ename = "dashboard"; + version = "20180704.2325"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "5be3f45b0f5e84aa7db3988827c5cf0a8134176d"; - sha256 = "10ac6d2b97jpqrkfd3rnxj1n6a0lzh1n2dxmmz5i2yy5pjfabc5q"; + rev = "41d959b752a294a18122817fb3ec2a2a9cf22856"; + sha256 = "0xcqaf39szm3wqga1lkr4rsh48sv7qxldznfy8vxxa57xama80l3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; sha256 = "08pdpjfrg8v80gljy146cwpz624dshhbz8843zl1zszwp2p00kqy"; - name = "dashboard"; + name = "recipe"; }; packageRequires = [ emacs page-break-lines ]; meta = { @@ -12742,20 +16614,24 @@ license = lib.licenses.free; }; }) {}; - date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + date-at-point = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "date-at-point"; + ename = "date-at-point"; version = "20150308.543"; src = fetchFromGitHub { owner = "alezost"; repo = "date-at-point.el"; - rev = "38df823d05df08ec0748a4185113fae5f99090e9"; - sha256 = "024jx6q0dik4w2wb8nrk1q73asvjgrsl5mslns0ci3zsya343rch"; + rev = "258c0268cc4357640c2af78774ba9667beff28ee"; + sha256 = "0cry52p29lr4lcwvpl96gam85m7d9jkskwmysb71mk6cg57zyjx5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6dbeddd236f312fac1d5542dfd2edf81df8fad2/recipes/date-at-point"; sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0"; - name = "date-at-point"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12763,20 +16639,27 @@ license = lib.licenses.free; }; }) {}; - date-field = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + date-field = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "date-field"; + ename = "date-field"; version = "20141128.1705"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-date-field"; - rev = "11c9170d1f7b343233f7716d4c0a62be024c1654"; - sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w"; + rev = "3b0af9c49293fc4346078ed2e13a6ebf41bbe54e"; + sha256 = "1skvkbbqvwbw58ahdbf2m1z7s0kfi5v7c0lavc9ifrs91pqpqx9z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe790729a67d2210cbccefce43805daa20db647d/recipes/date-field"; sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk"; - name = "date-field"; + name = "recipe"; }; packageRequires = [ dash log4e yaxception ]; meta = { @@ -12784,9 +16667,15 @@ license = lib.licenses.free; }; }) {}; - datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + datetime = callPackage ({ emacs + , extmap + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "datetime"; + ename = "datetime"; version = "20180325.1004"; src = fetchFromGitHub { owner = "doublep"; @@ -12794,10 +16683,10 @@ rev = "d8674ac11f9ebb702e5bbac10a4a6e5542958ef5"; sha256 = "19d4wximzwdcs0i2r48k6m60wwxcx5f89jw75k4hr0wvx0352a82"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime"; sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj"; - name = "datetime"; + name = "recipe"; }; packageRequires = [ emacs extmap ]; meta = { @@ -12805,9 +16694,13 @@ license = lib.licenses.free; }; }) {}; - datetime-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + datetime-format = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "datetime-format"; + ename = "datetime-format"; version = "20160612.1015"; src = fetchFromGitHub { owner = "emacs-php"; @@ -12815,10 +16708,10 @@ rev = "e6427538b547cbe02e1bd6ed4b765c73620bdae8"; sha256 = "1573z8wq5m8qzbzmnsz2fmbwrj9c0ava0jjfchzmwm2b3jyvqh5r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/datetime-format"; sha256 = "19qccjz2lzh01glgkixya7bxd6pvyjqgmw8bmqlwag6cb68bwsyv"; - name = "datetime-format"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12826,9 +16719,16 @@ license = lib.licenses.free; }; }) {}; - datomic-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, yasnippet }: - melpaBuild { + datomic-snippets = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , yasnippet }: + melpaBuild { pname = "datomic-snippets"; + ename = "datomic-snippets"; version = "20180116.752"; src = fetchFromGitHub { owner = "magnars"; @@ -12836,10 +16736,10 @@ rev = "731fbd31b814ef1521bd7eb1558eeab6a4c2e01b"; sha256 = "0sbrvd3z32wrpnmarwf9ya0b2c99pg82mxhvjw4b7hggxx65lqsj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4da8ec133ec5e1204966c1b12c9bc0ca1b50d643/recipes/datomic-snippets"; sha256 = "0lax0pj4k9c9n0gmrvil240pc9p25535q3n5m8nb2ar4sli8dn8r"; - name = "datomic-snippets"; + name = "recipe"; }; packageRequires = [ dash s yasnippet ]; meta = { @@ -12847,9 +16747,16 @@ license = lib.licenses.free; }; }) {}; - dayone = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, uuid }: - melpaBuild { + dayone = callPackage ({ fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , mustache + , uuid }: + melpaBuild { pname = "dayone"; + ename = "dayone"; version = "20160105.440"; src = fetchFromGitHub { owner = "mori-dev"; @@ -12857,10 +16764,10 @@ rev = "ab628274f0806451f23bce16f62a6a11cbf91a2b"; sha256 = "1j0mk8vyr6sniliq0ix77jldx8vzl73nd5yhh82klzgyymal58ms"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7c34ae046b75994cf04d16642bf28d4645d1821/recipes/dayone"; sha256 = "0hi09dj00h6g5r84jxglwkgbijhfxknx4mq5gcl5jzjis5affk8l"; - name = "dayone"; + name = "recipe"; }; packageRequires = [ ht mustache uuid ]; meta = { @@ -12868,9 +16775,14 @@ license = lib.licenses.free; }; }) {}; - db = callPackage ({ fetchFromGitHub, fetchurl, kv, lib, melpaBuild }: - melpaBuild { + db = callPackage ({ fetchFromGitHub + , fetchurl + , kv + , lib + , melpaBuild }: + melpaBuild { pname = "db"; + ename = "db"; version = "20140421.1411"; src = fetchFromGitHub { owner = "nicferrier"; @@ -12878,10 +16790,10 @@ rev = "b3a423fb8e72f9013009cbe033d654df2ce31438"; sha256 = "0syv4kr319d34yqi4q61b8jh5yy22wvd148x1m3pc511znh2ry5k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79ac40439b65c217e1caaa7175d26556b6a6c889/recipes/db"; sha256 = "05jhga9n6gh1bmj8gda14sb703gn7jgjlvy55mlr5kdb2z3rqw1n"; - name = "db"; + name = "recipe"; }; packageRequires = [ kv ]; meta = { @@ -12889,9 +16801,15 @@ license = lib.licenses.free; }; }) {}; - db-pg = callPackage ({ db, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: - melpaBuild { + db-pg = callPackage ({ db + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pg }: + melpaBuild { pname = "db-pg"; + ename = "db-pg"; version = "20130131.1102"; src = fetchFromGitHub { owner = "nicferrier"; @@ -12899,10 +16817,10 @@ rev = "7d5ab86b74b05fe003b3b434d4835f37f3f3eded"; sha256 = "15r0qwjkl33p8kh2k5kxz9wnbkv1k470b1h0i6svvljkx9ynk68a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4eb90ea7b8ed5c529c74c3faeaf3eac3955eb31/recipes/db-pg"; sha256 = "06nfibw01ijv7nr0m142y80jbbpg9kk1dh19s5wq7i6fqf7g08xg"; - name = "db-pg"; + name = "recipe"; }; packageRequires = [ db pg ]; meta = { @@ -12910,20 +16828,26 @@ license = lib.licenses.free; }; }) {}; - ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ddskk = callPackage ({ ccc + , cdb + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ddskk"; - version = "20170709.839"; + ename = "ddskk"; + version = "20180706.2232"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "16d156562aef72f02ced58087335ed72d520d878"; - sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx"; + rev = "cb727af4ca4e119be6e9509f14bfd61d9c6b758a"; + sha256 = "0qpgj1zvx2y8rmba4pqiypqi6dalg5lalhfafcvhsnnz1553fp7n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; sha256 = "01pb00p126q7swsl12yjrhghln2wgaj65jhjr0k7dkk64x4psyc9"; - name = "ddskk"; + name = "recipe"; }; packageRequires = [ ccc cdb ]; meta = { @@ -12931,20 +16855,55 @@ license = lib.licenses.free; }; }) {}; - debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: - melpaBuild { + deadgrep = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , s + , spinner }: + melpaBuild { + pname = "deadgrep"; + ename = "deadgrep"; + version = "20180714.1716"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "deadgrep"; + rev = "0b00536799b6ee6d64676a0eed670bf771d4e746"; + sha256 = "0fdflr7spkcrgn6pssajhh7dbpwbhxqqx22lv38a45zzbpxrirp0"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/93389fae7233b83ea904e17bdaf83f8247cda3d8/recipes/deadgrep"; + sha256 = "01m5ds7lic9g11a5iwzw86k6xcv56wbbzjm1343ckbbi255h9i09"; + name = "recipe"; + }; + packageRequires = [ dash emacs projectile s spinner ]; + meta = { + homepage = "https://melpa.org/#/deadgrep"; + license = lib.licenses.free; + }; + }) {}; + debpaste = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xml-rpc }: + melpaBuild { pname = "debpaste"; + ename = "debpaste"; version = "20160113.1547"; src = fetchFromGitHub { owner = "alezost"; repo = "debpaste.el"; - rev = "6f2a400665062468ebd03a2ce1de2a73d9084958"; - sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq"; + rev = "038f0ff7824f4e3dd455e2232eeca70fa8abcec5"; + sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/debpaste"; sha256 = "0h3hx3vgdhchmndabmzprddq3bxd80jnv4xvma9v6k1v07bl721v"; - name = "debpaste"; + name = "recipe"; }; packageRequires = [ xml-rpc ]; meta = { @@ -12952,9 +16911,14 @@ license = lib.licenses.free; }; }) {}; - debug-print = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + debug-print = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "debug-print"; + ename = "debug-print"; version = "20140125.1619"; src = fetchFromGitHub { owner = "kenoss"; @@ -12962,10 +16926,10 @@ rev = "d817fd9ea2d3f8d2c1ace4d8af155684f3a99dc5"; sha256 = "1n99nrp42slmyp5228d1nz174bysjn122jgs8fn1x0qxywg7jyxp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaaa43f6ce7db654b651969797978164143b269/recipes/debug-print"; sha256 = "01dsqq2qdsbxny6j9dhvg770493awxjhk1m85c14ysgh6sl199rm"; - name = "debug-print"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -12973,9 +16937,13 @@ license = lib.licenses.free; }; }) {}; - decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + decide = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "decide"; + ename = "decide"; version = "20180316.1101"; src = fetchFromGitHub { owner = "lifelike"; @@ -12983,10 +16951,10 @@ rev = "257f0e39ac60ca375942950b44eeaee04cb9d961"; sha256 = "0hiv3wlqidj1qd8z5jy800spzrpbca2vgq4zg1lkzvbcmhqvcqqm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide"; sha256 = "1gjkays48lhrifi9jwja5n2dpxjbl7f9rmka1nsqg9vf7s59vhhc"; - name = "decide"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12994,20 +16962,27 @@ license = lib.licenses.free; }; }) {}; - decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + decl = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "decl"; + ename = "decl"; version = "20171212.658"; src = fetchFromGitHub { owner = "preetpalS"; repo = "decl.el"; - rev = "ff7f8a4f1225cbdf141c86172104e67a4cf58c86"; - sha256 = "1ns1ni6aalr541df3a0ylqy0gj68fcsxdfvm4m1ga5532kxnswnj"; + rev = "f16b96e322c646d6018dfbd3c3ba8b2b75fcb9e1"; + sha256 = "07zg8grnqxg27fpksy8b94ry25ljrkag4ffq15d78k8nqmqmf3b8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl"; sha256 = "0wdhmp226wmrjvjgpbz8ihvhxxv3rrxh97sdqm3mgsav3n071n6k"; - name = "decl"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -13015,9 +16990,13 @@ license = lib.licenses.free; }; }) {}; - dedicated = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dedicated = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dedicated"; + ename = "dedicated"; version = "20090428.1231"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -13025,10 +17004,10 @@ rev = "8275fb672f9cc4ba6682ebda0ef91db827e32992"; sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/dedicated"; sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9"; - name = "dedicated"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13036,9 +17015,13 @@ license = lib.licenses.free; }; }) {}; - dedukti-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dedukti-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dedukti-mode"; + ename = "dedukti-mode"; version = "20171103.512"; src = fetchFromGitHub { owner = "rafoo"; @@ -13046,10 +17029,10 @@ rev = "d7c3505a1046187de3c3aeb144455078d514594e"; sha256 = "1842wikq24c8rg0ac84vb1qby9ng1nssxswyyni4kq85lng5lcrp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/767a685fbe8ae86177e90a17dac3815d41d74df4/recipes/dedukti-mode"; sha256 = "17adfmrhfks5f45ddr6ygjq870ac50vfzc5872ycv414zg0w4sa9"; - name = "dedukti-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13057,20 +17040,24 @@ license = lib.licenses.free; }; }) {}; - default-text-scale = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + default-text-scale = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "default-text-scale"; - version = "20170826.2215"; + ename = "default-text-scale"; + version = "20180520.2349"; src = fetchFromGitHub { owner = "purcell"; repo = "default-text-scale"; - rev = "968e985e219235f3e744d6d967e592acbaf6e0a8"; - sha256 = "0zds01c3q5yny6ab1fxfkzzgn1kgl3q23lxxap905f4qd70v922h"; + rev = "512d701df5e2079cad33329184fd7683c3b0b0af"; + sha256 = "1zwrjlaxsxx7snyvyklhrchkbqg14lhr9xk7rhhik8fp4dy4f5yj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db5e0b70e2d9c80aa41ae2c397f822789c2d3cc2/recipes/default-text-scale"; sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi"; - name = "default-text-scale"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13078,9 +17065,14 @@ license = lib.licenses.free; }; }) {}; - deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + deferred = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "deferred"; + ename = "deferred"; version = "20170901.630"; src = fetchFromGitHub { owner = "kiwanami"; @@ -13088,10 +17080,10 @@ rev = "2239671d94b38d92e9b28d4e12fd79814cfb9c16"; sha256 = "0vz59lm7pfz0gbsgrb44y555js85wbdjn0zm6p8wfqjiqf63ds3i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred"; sha256 = "1i8jfapzmw86iqwhnnlqmcj6zh4hyhizdcwjxcnxdj6kvxmwyysm"; - name = "deferred"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -13099,20 +17091,25 @@ license = lib.licenses.free; }; }) {}; - define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + define-word = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "define-word"; - version = "20180327.1935"; + ename = "define-word"; + version = "20180706.1329"; src = fetchFromGitHub { owner = "abo-abo"; repo = "define-word"; - rev = "f0da313420a3b27f761fcafd01ccd9e32b71bd0d"; - sha256 = "0xvsv2wzkgys99vx1x2by9isagihi97bwbxmrwhfrz47pphdmj5r"; + rev = "637cd29837d4bd5567e17a11a479fd2edfb0e2c1"; + sha256 = "1gni89sgs7bnl0h42jyqcph9mhgingybwcmf29j8zm440zii5f9p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word"; sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a"; - name = "define-word"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -13120,9 +17117,14 @@ license = lib.licenses.free; }; }) {}; - defproject = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + defproject = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "defproject"; + ename = "defproject"; version = "20151201.1419"; src = fetchFromGitHub { owner = "kotfic"; @@ -13130,10 +17132,10 @@ rev = "674d48a5e34cb4bba76faa38ee901322ec649086"; sha256 = "07jzr571q02l0lg5d40rnmzg16hmybi1nkjgslmvlx46z3c4xvyr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86465b351e668d6c19a6fc8e1b1a4aa7904cd139/recipes/defproject"; sha256 = "1gld2fkssrjh4smpp54017549d6aw3n1zisp5s4kkb6cmszwj5gm"; - name = "defproject"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -13141,20 +17143,24 @@ license = lib.licenses.free; }; }) {}; - deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + deft = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "deft"; - version = "20180112.1155"; + ename = "deft"; + version = "20180619.857"; src = fetchFromGitHub { owner = "jrblevin"; repo = "deft"; - rev = "c4b30d780bfa732ff52d85f0311e4a045f44a7b4"; - sha256 = "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2"; + rev = "24ac778ab8c8247f7677dd20dd301f6eba85bd8d"; + sha256 = "1m26wplsjgvv2s4mcb47haqjni49xmpjy52rddkmh6p7frhayxi2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp"; - name = "deft"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13162,9 +17168,13 @@ license = lib.licenses.free; }; }) {}; - delim-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + delim-kill = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "delim-kill"; + ename = "delim-kill"; version = "20100516.2320"; src = fetchFromGitHub { owner = "thomas11"; @@ -13172,10 +17182,10 @@ rev = "1dbe47344f2d2cbc8c54beedf0cf0bf10fd203c1"; sha256 = "06a20sd8nc273azrgha40l1fbqvv9qmxsmkjiqbf6dcf1blkwjyf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/delim-kill"; sha256 = "1pplc456771hi52ap1p87y7pabxlvm6raszcxjvnxff3xzw56pig"; - name = "delim-kill"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13183,20 +17193,26 @@ license = lib.licenses.free; }; }) {}; - demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + demangle-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "demangle-mode"; - version = "20170923.1501"; + ename = "demangle-mode"; + version = "20180515.1945"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "79231b05f97da147d66120f947656f856a3a64fb"; - sha256 = "0whr18qwi5bmz39n8x836sjgky20qhw59qha59c11dvly1qs5nnq"; + rev = "374c84a0b190f0f0ea76b956035003228077d1e0"; + sha256 = "02z2mjillglyv65ijdlc62hbjddp3xv185xg7s93xz7ymg04c394"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk"; - name = "demangle-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -13204,20 +17220,24 @@ license = lib.licenses.free; }; }) {}; - demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + demo-it = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "demo-it"; - version = "20170628.1503"; + ename = "demo-it"; + version = "20180403.2032"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "1e8b42ff6479fa541eeec5699b4727af136d40da"; - sha256 = "1x9crsc8n5pqyp60h46gz6wz98qaj3bygk11vd39qpfh2hxdxxi6"; + rev = "4f74e6f1bb6519587303e20fe59470853b1a0352"; + sha256 = "15j4f7jjjhrcjycxwzqnwqhm3fyvjnisd41k5lw13dnhbmp1gzx6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; sha256 = "063v115xy9mcga4qv16v538k12rn9maz92khzwa35wx56bwz4gg7"; - name = "demo-it"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13225,9 +17245,14 @@ license = lib.licenses.free; }; }) {}; - describe-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yabin }: - melpaBuild { + describe-number = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yabin }: + melpaBuild { pname = "describe-number"; + ename = "describe-number"; version = "20151031.1755"; src = fetchFromGitHub { owner = "netromdk"; @@ -13235,10 +17260,10 @@ rev = "40618345a37831804b29589849a785ef5aa5ac24"; sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5ed9063f7e9f540bc90c1df4e3604d4af9bcfe5/recipes/describe-number"; sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji"; - name = "describe-number"; + name = "recipe"; }; packageRequires = [ yabin ]; meta = { @@ -13246,20 +17271,53 @@ license = lib.licenses.free; }; }) {}; - desktop-plus = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + desktop-environment = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "desktop-environment"; + ename = "desktop-environment"; + version = "20180423.153"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "desktop-environment"; + rev = "62fbceded526b8e35c90803bcf80e33ebfe8473a"; + sha256 = "1j2kvdj3k9amj93w8cbh49rbf3vhnkbisw67hjhif62ajc19ip4k"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe988e0dd4a1272ecf7b2fe758ef0c81e2acad2/recipes/desktop-environment"; + sha256 = "0iai1awpkv4n8k263854mx95c8yh2vvif6z91mgn6hck8774v9zp"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/desktop-environment"; + license = lib.licenses.free; + }; + }) {}; + desktop-plus = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "desktop-plus"; + ename = "desktop+"; version = "20170107.1332"; src = fetchFromGitHub { owner = "ffevotte"; repo = "desktop-plus"; - rev = "88055cee526a000056201898499cebbd35e3ea76"; - sha256 = "1nkljslx8cwmm4z18mhnwrc1lmd6lxdyhk8bwhzms7g1p6yi99d8"; + rev = "d26f369bda96860eef18365cdb5c79f39a2c765c"; + sha256 = "19z44rm2071hq3664gngywhr7k4wcbdzbixmwjl2x0sp0bdzg2v6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b009b42c73490d56d4613dcf5a57447fb4ccab4/recipes/desktop+"; sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8"; - name = "desktop-plus"; + name = "recipe"; }; packageRequires = [ dash emacs f ]; meta = { @@ -13267,9 +17325,13 @@ license = lib.licenses.free; }; }) {}; - desktop-registry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + desktop-registry = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "desktop-registry"; + ename = "desktop-registry"; version = "20140119.1343"; src = fetchFromGitHub { owner = "ryuslash"; @@ -13277,10 +17339,10 @@ rev = "244c2e7f9f0a1050aa8a47ad0b38f4e4584682dd"; sha256 = "11qvhbz7149vqh61fgqqn4inw0ic6ib9lz2xgr9m54pdw9a901mp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/desktop-registry"; sha256 = "1sfj0w6hlrx37js63fn1v5xc9ngmahv07g42z68717md6w3c8g0v"; - name = "desktop-registry"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13288,9 +17350,13 @@ license = lib.licenses.free; }; }) {}; - devdocs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + devdocs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "devdocs"; + ename = "devdocs"; version = "20170731.150"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -13298,10 +17364,10 @@ rev = "a2d51e824f0cc48a9dd611cc740bc8b86143e611"; sha256 = "0nzh7pgvj4cs5d29lrrmbas29xdslgqzsqjmpapzqzbnrgprnbx8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a54ff5faeefabf484ef175433cfc2b8317993f74/recipes/devdocs"; sha256 = "04a1yspk3dwx0lzyg03lrbvig4g6sqmavzwicshdyr7q1bny7ikn"; - name = "devdocs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13309,9 +17375,13 @@ license = lib.licenses.free; }; }) {}; - dfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dfmt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dfmt"; + ename = "dfmt"; version = "20170728.323"; src = fetchFromGitHub { owner = "qsimpleq"; @@ -13319,10 +17389,10 @@ rev = "21b9094e907b7ac53f5ecb4ff4539613a9d12434"; sha256 = "11r1i8nlz98z49fqb447abg1pv6838q54ly19wyg82k52875ms7m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a343a752d25185b30b10805c4012f3b21a03651e/recipes/dfmt"; sha256 = "06g9yimw6q4wl2prspr8vjyv2pxk8bb0451wplpp70h5ajfwy3dz"; - name = "dfmt"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13330,20 +17400,25 @@ license = lib.licenses.free; }; }) {}; - dhall-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dhall-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dhall-mode"; - version = "20171204.1327"; + ename = "dhall-mode"; + version = "20180715.213"; src = fetchFromGitHub { owner = "psibi"; repo = "dhall-mode"; - rev = "bc6aec777594beeac6ba4c6dbfb1c889341589c9"; - sha256 = "0vfkdj1fyykmylh6gg9igpiylb2n7bd4iqq1gl5mdqid8gsv4sgl"; + rev = "5aa24b844ee0371024b7b65d1682984d3c1d82bf"; + sha256 = "0ql595j63n6r7381sw8hvkcy2dsly3fxw8qb5g0w2g2f7902905x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode"; sha256 = "1zkspjwllcw9k4nlnif6jdwzl08ki39vmx90apw029n87xhvx7mp"; - name = "dhall-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -13351,9 +17426,41 @@ license = lib.licenses.free; }; }) {}; - dic-lookup-w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stem, w3m }: - melpaBuild { + diary-manager = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "diary-manager"; + ename = "diary-manager"; + version = "20180626.1058"; + src = fetchFromGitHub { + owner = "raxod502"; + repo = "diary-manager"; + rev = "01851f42aee0526995ea88c3d42b7fe12e1cb7fd"; + sha256 = "1q1zrqawrr844lzjc5l480im6rjdyagir0dr805vgyv31fhp1vmw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a014f4d862a2480f7edb1266f79ce0801cca13c2/recipes/diary-manager"; + sha256 = "1sk0pvadx4jmv93dj796ysn3jh2wvywayd7dd20v22kdvnlii73d"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/diary-manager"; + license = lib.licenses.free; + }; + }) {}; + dic-lookup-w3m = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , stem + , w3m }: + melpaBuild { pname = "dic-lookup-w3m"; + ename = "dic-lookup-w3m"; version = "20170803.354"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -13361,10 +17468,10 @@ rev = "79aca5eb9c78e67cb85a386060d48113caad5ec3"; sha256 = "18l2s37bnnzbgw22mivgw5isxck2y0n3nk7735r4ir5y5wqx88mr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dic-lookup-w3m"; sha256 = "1kwbmzzf8sj4bn5kicmlp2hzv8ydcikwmdy7s40ggkgf1mk9zvqr"; - name = "dic-lookup-w3m"; + name = "recipe"; }; packageRequires = [ stem w3m ]; meta = { @@ -13372,20 +17479,27 @@ license = lib.licenses.free; }; }) {}; - dictcc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + dictcc = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "dictcc"; + ename = "dictcc"; version = "20171213.1334"; src = fetchFromGitHub { owner = "cqql"; repo = "dictcc.el"; - rev = "7b988413f7719820cd846827525142a23f401e50"; - sha256 = "0fiv0qgpqwp6ccakr1wh713pm2ylyvl2i54557fym80zgi9iff96"; + rev = "a77cf1fadadcbde762466970b503c8a8916b35b2"; + sha256 = "0aaah14nc8ajqhbjmwp7257k2n8ay6g87spb734kxfs8irzg52fa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc"; sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm"; - name = "dictcc"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ivy ]; meta = { @@ -13393,9 +17507,15 @@ license = lib.licenses.free; }; }) {}; - dictionary = callPackage ({ connection, fetchFromGitHub, fetchurl, lib, link, melpaBuild }: - melpaBuild { + dictionary = callPackage ({ connection + , fetchFromGitHub + , fetchurl + , lib + , link + , melpaBuild }: + melpaBuild { pname = "dictionary"; + ename = "dictionary"; version = "20140717.2029"; src = fetchFromGitHub { owner = "myrkr"; @@ -13403,10 +17523,10 @@ rev = "a23b8f4a422d0de69a006ed010eff5795319db98"; sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/dictionary"; sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w"; - name = "dictionary"; + name = "recipe"; }; packageRequires = [ connection link ]; meta = { @@ -13414,9 +17534,15 @@ license = lib.licenses.free; }; }) {}; - diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + diff-hl = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "diff-hl"; + ename = "diff-hl"; version = "20180201.355"; src = fetchFromGitHub { owner = "dgutov"; @@ -13424,10 +17550,10 @@ rev = "190622d3fa2c3237529ec073a8fa00aee06023a1"; sha256 = "0jh270anr2ralixgwsc3wn48jnw3qwz6m18lg0sgwgzyajh0fpb9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; sha256 = "135jgjfaiq6kj72ji5k22v4pqc8gjjmcv80r5rkjbjigzlvcvvj2"; - name = "diff-hl"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -13435,9 +17561,17 @@ license = lib.licenses.free; }; }) {}; - difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: - melpaBuild { + difflib = callPackage ({ cl-generic + , emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , s }: + melpaBuild { pname = "difflib"; + ename = "difflib"; version = "20171227.718"; src = fetchFromGitHub { owner = "dieggsy"; @@ -13445,10 +17579,10 @@ rev = "b08850251812d71e62fd6956081299590acdf37b"; sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib"; sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6"; - name = "difflib"; + name = "recipe"; }; packageRequires = [ cl-generic emacs ht s ]; meta = { @@ -13456,20 +17590,24 @@ license = lib.licenses.free; }; }) {}; - diffscuss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + diffscuss-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "diffscuss-mode"; + ename = "diffscuss-mode"; version = "20141014.1657"; src = fetchFromGitHub { owner = "hut8labs"; repo = "diffscuss"; - rev = "e0aacd8b3d9f886f27222c1397f0655e849e0af7"; - sha256 = "14ccak3cmv36pd085188lypal9gd3flyikcrxn0wi6hn60w2dgvr"; + rev = "bbc6dbed4b97d1eb9ae5dae021ed1e066129bd98"; + sha256 = "0ppsgfzmdg0r418n2x0qxwhyqs7hjj8fgazc4xzgs8fsg4j3h7mr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17f89560f98f11810205ba58841cd5566766b436/recipes/diffscuss-mode"; sha256 = "06jd7wh4yzryz0yjwa4a0xddz7srl5mif8ff1wvcpxsb66m2zbvh"; - name = "diffscuss-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13477,9 +17615,13 @@ license = lib.licenses.free; }; }) {}; - diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + diffview = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "diffview"; + ename = "diffview"; version = "20150928.2211"; src = fetchFromGitHub { owner = "mgalgs"; @@ -13487,10 +17629,10 @@ rev = "031b70913e755c5e55222680f80185032a7d1728"; sha256 = "0diw887x4q7kbgdvxbbnxdw51z33kqwxw3v9m45fczxbywyi4cxf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea5dd4c9c114618ac20f565c878f509ce8d9872/recipes/diffview"; sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k"; - name = "diffview"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13498,9 +17640,13 @@ license = lib.licenses.free; }; }) {}; - digistar-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + digistar-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "digistar-mode"; + ename = "digistar-mode"; version = "20160218.1155"; src = fetchFromGitHub { owner = "retroj"; @@ -13508,10 +17654,10 @@ rev = "15288b1e1a04b79b5ab7097fdd26d48b2ff41076"; sha256 = "0qxdfv1p0140fqcxh677hhxwpx1fihvwhvh76pysn4q4pcfr6ldr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/851fa17152b664df99b80a654e5c055bb5227181/recipes/digistar-mode"; sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s"; - name = "digistar-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13519,19 +17665,24 @@ license = lib.licenses.free; }; }) {}; - digit-groups = callPackage ({ dash, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + digit-groups = callPackage ({ dash + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "digit-groups"; + ename = "digit-groups"; version = "20160816.1926"; src = fetchhg { url = "https://bitbucket.com/adamsmd/digit-groups"; rev = "ee1d6de37260"; sha256 = "0rkajjlw820gfx1kclkcvdq7milhiid2yzvn9hd275ydskrhhwlp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eea9d435c7c1889b16549a0ef3f66483b2de3605/recipes/digit-groups"; sha256 = "1wy1hf15qi9v0wz2rykpf40v3g2n4mha6h207m0zn8l8rb79hwjq"; - name = "digit-groups"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -13539,20 +17690,80 @@ license = lib.licenses.free; }; }) {}; - dim = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + digitalocean = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { + pname = "digitalocean"; + ename = "digitalocean"; + version = "20180603.225"; + src = fetchFromGitLab { + owner = "olymk2"; + repo = "emacs-digitalocean"; + rev = "1cac663c4bcb7f8325783954df6c0caf3dc20f6e"; + sha256 = "0iinc4c3bpqqwp077437hl4z1ja7fwc1qq2ldbi7xbz4cn819f2l"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bc81950b42e4fdc9e6710ba1b859f0fba98be3fa/recipes/digitalocean"; + sha256 = "086v4wrzkjgjks6lfp2hn97pcbplxmc7y7bbiriw4gixgqds6yx9"; + name = "recipe"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/digitalocean"; + license = lib.licenses.free; + }; + }) {}; + digitalocean-helm = callPackage ({ digitalocean + , emacs + , fetchFromGitLab + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { + pname = "digitalocean-helm"; + ename = "digitalocean-helm"; + version = "20180610.46"; + src = fetchFromGitLab { + owner = "olymk2"; + repo = "emacs-digitalocean-helm"; + rev = "b125c9882eded7d73ec109d152b26625f333440b"; + sha256 = "072v1800gjv566fqjxp8dvzkilwhbvl7lc5fqc0mr4xw8lpldkx9"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bc81950b42e4fdc9e6710ba1b859f0fba98be3fa/recipes/digitalocean-helm"; + sha256 = "0q1ir6i9x1ql5c8vg1bff9px2jpwb0rxfiavk9fj3mqbjdifrz0w"; + name = "recipe"; + }; + packageRequires = [ digitalocean emacs helm ]; + meta = { + homepage = "https://melpa.org/#/digitalocean-helm"; + license = lib.licenses.free; + }; + }) {}; + dim = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dim"; + ename = "dim"; version = "20160818.249"; src = fetchFromGitHub { owner = "alezost"; repo = "dim.el"; - rev = "79b81724b951fedffdd3113f473c18990af837a9"; - sha256 = "1fclhpcrsi09z2np7q3dq3hhb3pqxsvv1l2dqis27afxnb1zshr3"; + rev = "110624657fec0c8a7b3589108230e6a635302ae0"; + sha256 = "1qiqkppfpgyqm1z31i956gj96670kjxs7m33knmhngqk7i5yc94i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a740ab40cab3a1890f56df808f41a2d541aa77c/recipes/dim"; sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52"; - name = "dim"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -13560,20 +17771,24 @@ license = lib.licenses.free; }; }) {}; - dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dim-autoload = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dim-autoload"; + ename = "dim-autoload"; version = "20180318.1327"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; - rev = "788320fe089fafbdf1cb09d2ab4d29d64a804e21"; - sha256 = "0iyhjww7p274x418n1iw1xj2fkmn5k9icav0jyzbwmy83a2nmr52"; + rev = "2ff7ded0c9f8bb582fb9018bea47ead44d048cf8"; + sha256 = "0lbfgfx3015b1kspqrsnlpvzl7i06yxafj1i2lpcy7ay4fv5rp54"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload"; sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9"; - name = "dim-autoload"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13581,20 +17796,24 @@ license = lib.licenses.free; }; }) {}; - diminish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + diminish = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "diminish"; + ename = "diminish"; version = "20170419.1036"; src = fetchFromGitHub { owner = "myrjola"; repo = "diminish.el"; - rev = "565a983a39d2e2cffab5df13b34f3b6116723208"; - sha256 = "173lzj9l7a4wcfvdq6akvfyyyriy5c30b4vhhv51hs051dmn02d0"; + rev = "d5c61a14e1a5590a65f83c099a5bd42fcadff24d"; + sha256 = "0c0p4b3nfnczmkjx64qz2w9dk0b7srfnhrnd902qn9z55k4n0wg8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1bfb4acb381cada46458cf60eae9b88d007294d5/recipes/diminish"; sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43"; - name = "diminish"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13602,20 +17821,25 @@ license = lib.licenses.free; }; }) {}; - dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dimmer = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dimmer"; + ename = "dimmer"; version = "20180217.2011"; src = fetchFromGitHub { owner = "gonewest818"; repo = "dimmer.el"; - rev = "d033fdda154e688e45cca35902dbff9915351b98"; - sha256 = "1d457029zyabfjhzrgayibdmxfmia5yr7rqn50kc16k3aavw32f7"; + rev = "a418acf718697b5b1824856c9872aa7f4075b96d"; + sha256 = "1rqga5mc2yapxsnk16fcpaj8vjxb6w6mbjxm59vv9l5ddkfagfsf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r"; - name = "dimmer"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -13623,20 +17847,30 @@ license = lib.licenses.free; }; }) {}; - dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }: - melpaBuild { + dionysos = callPackage ({ alert + , cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , libmpdee + , melpaBuild + , pkg-info + , s }: + melpaBuild { pname = "dionysos"; + ename = "dionysos"; version = "20160810.356"; src = fetchFromGitHub { owner = "nlamirault"; repo = "dionysos"; - rev = "0aac21caadabc5a7f09e18a9dcb02f3dec26588b"; - sha256 = "1g6p9cr3p85i7ay3jmvn7f8c5k8d49fcynb3ymns7rgsf3ypvpyc"; + rev = "98bc789d20e41020d6e62d63d3c78f8032fa4bf2"; + sha256 = "1hma72dyn3w6cwd3vrgg4hdlrxgwqs55cjyxb05vs9csz7r42208"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/890445eca3c555acd2639a6f509c8e83b687f2bd/recipes/dionysos"; sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz"; - name = "dionysos"; + name = "recipe"; }; packageRequires = [ alert cl-lib dash libmpdee pkg-info s ]; meta = { @@ -13644,9 +17878,13 @@ license = lib.licenses.free; }; }) {}; - dircmp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dircmp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dircmp"; + ename = "dircmp"; version = "20141204.956"; src = fetchFromGitHub { owner = "matthewlmcclure"; @@ -13654,10 +17892,10 @@ rev = "558ee0b601c2de9d247612085aafe2926f56a09f"; sha256 = "0mcsfsybpsxhzkd2m9bzc0np49azm6qf5x4x9h9lbxc8vfgh4z8s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b146db5977003cb48bc37317f3df19b8a8c7fc30/recipes/dircmp"; sha256 = "0cnj7b0s8vc83sh9sai1cldw54krk5qbz1qmlvvd1whryf2pc95c"; - name = "dircmp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13665,9 +17903,14 @@ license = lib.licenses.free; }; }) {}; - dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-atool = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-atool"; + ename = "dired-atool"; version = "20180302.2340"; src = fetchFromGitHub { owner = "HKey"; @@ -13675,10 +17918,10 @@ rev = "b92e0106827d34fa686e189c7e9a537a3a947a8b"; sha256 = "1i40zd7y1jf9skr3wi2zqv4awrgff244p1h89r707aq67v1j19yk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool"; sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w"; - name = "dired-atool"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -13686,20 +17929,26 @@ license = lib.licenses.free; }; }) {}; - dired-avfs = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-avfs = callPackage ({ dash + , dired-hacks-utils + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-avfs"; + ename = "dired-avfs"; version = "20161012.404"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; + sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; sha256 = "1q42pvrpmd525887iicd3m5gw4w2a78xb72v7fjfl30ay1kir4bm"; - name = "dired-avfs"; + name = "recipe"; }; packageRequires = [ dash dired-hacks-utils ]; meta = { @@ -13707,20 +17956,26 @@ license = lib.licenses.free; }; }) {}; - dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-collapse = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-collapse"; - version = "20171107.47"; + ename = "dired-collapse"; + version = "20180530.727"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "71a1cf4d791e640df1f05b5589f79e45c460da64"; + sha256 = "18l563jp9brflmsf7s5i6yklrs2nzcs93xm6h1w2wswzdssdna2b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; sha256 = "1k8h5cl8r68rnr1a3jnbc0ydflzm5mad7v7f1q60wks5hv61dsd1"; - name = "dired-collapse"; + name = "recipe"; }; packageRequires = [ dash f ]; meta = { @@ -13728,9 +17983,13 @@ license = lib.licenses.free; }; }) {}; - dired-dups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-dups = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-dups"; + ename = "dired-dups"; version = "20130527.1425"; src = fetchFromGitHub { owner = "vapniks"; @@ -13738,10 +17997,10 @@ rev = "694ad128c822c59348ced16c4a0c1356d43da47a"; sha256 = "1lcmpzwj43gix2q56bh2gw3gfqh8vl5j3mqr8s7v3k0aw816j0ni"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d01ad74959e17b5708ba9fa6a4958d4cda4e232/recipes/dired-dups"; sha256 = "05s02gw8b339yvsr7vvka1r2140y7mbjzs8px4kn4acgb5y7rk71"; - name = "dired-dups"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13749,9 +18008,13 @@ license = lib.licenses.free; }; }) {}; - dired-efap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-efap = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-efap"; + ename = "dired-efap"; version = "20140122.856"; src = fetchFromGitHub { owner = "juan-leon"; @@ -13759,10 +18022,10 @@ rev = "624757b2e54d9a13e2183118d6c113e37684b90c"; sha256 = "0jj9da880b4zwxba140fldai1x9p2sxc6hdf3wz6lnbvz1pyn1mv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5669ca2adc48f3349eb59276850e6174e37f9de7/recipes/dired-efap"; sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00"; - name = "dired-efap"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13770,20 +18033,25 @@ license = lib.licenses.free; }; }) {}; - dired-explorer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-explorer = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-explorer"; - version = "20170614.1956"; + ename = "dired-explorer"; + version = "20180606.1921"; src = fetchFromGitHub { owner = "jidaikobo-shibata"; repo = "dired-explorer"; - rev = "b02b08d73821512853c6a14113c794dded1df75a"; - sha256 = "1kc2j9iw4rsxkbssn6idfi1avxshn23aiv006a0yx8bhgwclnbq4"; + rev = "3ade0a31b5340271d05e9bf443f2504960f6c6dd"; + sha256 = "0lbm326na005k3pa11rqq5nbhvm55dydi2a7fzs3bzlqwbx7d6fq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acd40e02185847dfdcd70b3cacea703133e4356d/recipes/dired-explorer"; sha256 = "12mymmcl663ci543vqzg8jai8kgfbb3gw5wsbcm4ln3j8d5fgzd9"; - name = "dired-explorer"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -13791,20 +18059,24 @@ license = lib.licenses.free; }; }) {}; - dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-fdclone = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-fdclone"; - version = "20170413.747"; + ename = "dired-fdclone"; + version = "20180402.2308"; src = fetchFromGitHub { owner = "knu"; repo = "dired-fdclone.el"; - rev = "f55b69e5cd1d45699a0f37468ac8e20fa7a0cff6"; - sha256 = "193mf90d5vds8hswkxasda267ifr6w55vn4pph15lkbmp33wa50n"; + rev = "903d7a736d240ef7352989a4e5d0ff9129c2ee3c"; + sha256 = "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone"; sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9"; - name = "dired-fdclone"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13812,9 +18084,13 @@ license = lib.licenses.free; }; }) {}; - dired-filetype-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-filetype-face = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-filetype-face"; + ename = "dired-filetype-face"; version = "20160822.655"; src = fetchFromGitHub { owner = "jixiuf"; @@ -13822,10 +18098,10 @@ rev = "72b3c88e8b82b3f8681d940757f7b2992bd80793"; sha256 = "1sp6fr3qha5zas65q06b61bgqx0nfiarcgpydqv0drkn6dpaps8b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e6c8015af3d5f013272308a97e089a4e3ca847d/recipes/dired-filetype-face"; sha256 = "1g9wzkkqmlkxlxwx43446q9mlam035zwq0wzpf7m6394rw2xlwx6"; - name = "dired-filetype-face"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13833,20 +18109,28 @@ license = lib.licenses.free; }; }) {}; - dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-filter = callPackage ({ cl-lib ? null + , dash + , dired-hacks-utils + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-filter"; + ename = "dired-filter"; version = "20171010.204"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "64b3dbb0e8f631d1e11becd0458406404894550b"; + sha256 = "1nxn1517pf2i17bi0h5m5p2x8cvv30zgg6i6h8cjm4bwl1nx1ymc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; sha256 = "1mw94210i57wrqfyif6rh689xbwbpv1qp6bgc0j7z6g4xypvd52p"; - name = "dired-filter"; + name = "recipe"; }; packageRequires = [ cl-lib dash dired-hacks-utils f ]; meta = { @@ -13854,20 +18138,25 @@ license = lib.licenses.free; }; }) {}; - dired-hacks-utils = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-hacks-utils = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-hacks-utils"; + ename = "dired-hacks-utils"; version = "20160527.1436"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "9bb7100d80b96bdfa2154c2b2f509d5b9f6cd7cd"; + sha256 = "1pxvfrkxr4x0vbp313lhbwhrqhsv8kj3b8sbx89sym8f8fdn33js"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; sha256 = "1vgl0wqf7gc2nbiqjn0rkrdlnxfm3wrgspx5b3cixv2n8rqx8kyi"; - name = "dired-hacks-utils"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -13875,9 +18164,14 @@ license = lib.licenses.free; }; }) {}; - dired-hide-dotfiles = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-hide-dotfiles = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-hide-dotfiles"; + ename = "dired-hide-dotfiles"; version = "20170314.1339"; src = fetchFromGitHub { owner = "mattiasb"; @@ -13885,10 +18179,10 @@ rev = "b715f643ec805b3b8aca334595e6589320f04a49"; sha256 = "1n6l25lrhp1x8nhc54kqal96wq96kkfyvz5yzvlw1qd3yk4s567i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba64a50f85fdb0ad54149dfed4051b4c1a719cbb/recipes/dired-hide-dotfiles"; sha256 = "0yy131cvj9a9sz02ari7pzwf22r5y7acyg757h3jvih317v6jyp0"; - name = "dired-hide-dotfiles"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -13896,9 +18190,14 @@ license = lib.licenses.free; }; }) {}; - dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-icon = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-icon"; + ename = "dired-icon"; version = "20170222.2126"; src = fetchFromGitLab { owner = "xuhdev"; @@ -13906,10 +18205,10 @@ rev = "f60e10757a5011235b519231ad35974ff25963ed"; sha256 = "0r9qmr2l5kjwh1frp0k87nyaf13f7f9fjjf9yf9z92djqapfm9dd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a96249947cba52cd75515b3dc83b0842fedf624/recipes/dired-icon"; sha256 = "0nyiqcywc1p8kw3psisl4zxwmf2g0x82kanka85zxxdz15s509j1"; - name = "dired-icon"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -13917,9 +18216,13 @@ license = lib.licenses.free; }; }) {}; - dired-imenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-imenu = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-imenu"; + ename = "dired-imenu"; version = "20140109.810"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -13927,10 +18230,10 @@ rev = "610e21fe0988c85931d34894d3eee2442c79ab0a"; sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e346de86b7f7fd5dad548f0936cde54ac11e3f79/recipes/dired-imenu"; sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1"; - name = "dired-imenu"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13938,9 +18241,14 @@ license = lib.licenses.free; }; }) {}; - dired-k = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-k = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-k"; + ename = "dired-k"; version = "20170313.803"; src = fetchFromGitHub { owner = "syohex"; @@ -13948,10 +18256,10 @@ rev = "c50e8f73358060a448bff66db2d330b52bbeffc1"; sha256 = "14yvsv7cvfviszii0bj0qf094rmnwzssinrqrkpxg4jil2n4bb9d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k"; sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8"; - name = "dired-k"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -13959,20 +18267,24 @@ license = lib.licenses.free; }; }) {}; - dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-launch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-launch"; - version = "20171004.1027"; + ename = "dired-launch"; + version = "20180607.1141"; src = fetchFromGitHub { owner = "thomp"; repo = "dired-launch"; - rev = "f71826804221bafc4f9f2f75a800400a72c24b8b"; - sha256 = "1cyg1bbn2jj101wz2jjzk832mfk5yhnc4a9m817lnalf73j0nkrs"; + rev = "ad45940f76ef2f6c3bb55e998829b311de191dae"; + sha256 = "057nqlvqnq30gxfidmynp33040bgdq4gbwk0qdm294c5ap2af5yj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; sha256 = "0vhf0iai60mp8sp7snishz6nrw0bcriq4cx64f41lk1adjb2mqaw"; - name = "dired-launch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13980,20 +18292,26 @@ license = lib.licenses.free; }; }) {}; - dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-narrow = callPackage ({ dash + , dired-hacks-utils + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-narrow"; + ename = "dired-narrow"; version = "20170309.329"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "342d75f1240ebe17959ec25a5b050b40156e10cb"; + sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; sha256 = "1rgqiscbizalh78jwc53zbj599dd13a6vzdgf75vzllc1w7jsg6d"; - name = "dired-narrow"; + name = "recipe"; }; packageRequires = [ dash dired-hacks-utils ]; meta = { @@ -14001,20 +18319,26 @@ license = lib.licenses.free; }; }) {}; - dired-open = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-open = callPackage ({ dash + , dired-hacks-utils + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-open"; + ename = "dired-open"; version = "20160205.1213"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "49bb19a92a4256057f151da9ad6d0a91d46dacc0"; + sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; sha256 = "0a4ksz2jkva4gvhprywjc1fzrbf95xdk8gn25nv1h1c1ckhr91qx"; - name = "dired-open"; + name = "recipe"; }; packageRequires = [ dash dired-hacks-utils ]; meta = { @@ -14022,9 +18346,14 @@ license = lib.licenses.free; }; }) {}; - dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }: - melpaBuild { + dired-quick-sort = callPackage ({ fetchFromGitLab + , fetchurl + , hydra + , lib + , melpaBuild }: + melpaBuild { pname = "dired-quick-sort"; + ename = "dired-quick-sort"; version = "20161208.1312"; src = fetchFromGitLab { owner = "xuhdev"; @@ -14032,10 +18361,10 @@ rev = "1845f978d313f750a5b70b832457ed803c4ffbdb"; sha256 = "014frvpszixn8cx7rdx704glmjbslv3py3kw0pb0xqf50k4scynf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort"; sha256 = "01vrk3wqq2zmcblyp9abi2lvrzr2a5ca8r8gjjnr5223037ppl3l"; - name = "dired-quick-sort"; + name = "recipe"; }; packageRequires = [ hydra ]; meta = { @@ -14043,20 +18372,26 @@ license = lib.licenses.free; }; }) {}; - dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-rainbow = callPackage ({ dash + , dired-hacks-utils + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-rainbow"; + ename = "dired-rainbow"; version = "20171202.1448"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; + sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; sha256 = "1b9yh8p2x1dg7dyqhjhnqqiiymyl6bwsam65j0lpvbdx8r4iw882"; - name = "dired-rainbow"; + name = "recipe"; }; packageRequires = [ dash dired-hacks-utils ]; meta = { @@ -14064,20 +18399,26 @@ license = lib.licenses.free; }; }) {}; - dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-ranger = callPackage ({ dash + , dired-hacks-utils + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-ranger"; - version = "20171229.753"; + ename = "dired-ranger"; + version = "20180401.1506"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; sha256 = "19lbbzqflqda5b0alqfzdhpbgqssghqb4n4viq8x4l1fac8mby6h"; - name = "dired-ranger"; + name = "recipe"; }; packageRequires = [ dash dired-hacks-utils ]; meta = { @@ -14085,20 +18426,80 @@ license = lib.licenses.free; }; }) {}; - dired-sidebar = callPackage ({ dired-subtree, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-recent = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "dired-recent"; + ename = "dired-recent"; + version = "20180527.1259"; + src = fetchFromGitHub { + owner = "vifon"; + repo = "dired-recent.el"; + rev = "22104c87593f24ec513dfdf97fc4c8c91defec33"; + sha256 = "0ddpsfq1frzx9nkiakkrxm8x6xg8f5fpvqlln8ksys7x2cmzk092"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d717543b63f9eb1ed6b8f78de84da717d3b8e4bc/recipes/dired-recent"; + sha256 = "1hspi9bazbij9h05qaljgn5035p409w28mzvmrl4j6isx306s61l"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dired-recent"; + license = lib.licenses.free; + }; + }) {}; + dired-rsync = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "dired-rsync"; + ename = "dired-rsync"; + version = "20180625.1448"; + src = fetchFromGitHub { + owner = "stsquad"; + repo = "dired-rsync"; + rev = "1eb7488f36528166992fe50a89dbbfa6d8a0e58b"; + sha256 = "0dc30xx9k2l1x2mj8mzkzx7ppv5nzpsyp3wxrhbbjwhnv5micc5q"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ce9f41ad832cef527dde97f829a8b8339e6ac48b/recipes/dired-rsync"; + sha256 = "0lykj7nfpaspwn90macvr7iir4jlrx88i0s9spii7iic2fnm51ql"; + name = "recipe"; + }; + packageRequires = [ dash emacs s ]; + meta = { + homepage = "https://melpa.org/#/dired-rsync"; + license = lib.licenses.free; + }; + }) {}; + dired-sidebar = callPackage ({ dired-subtree + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-sidebar"; - version = "20180312.1715"; + ename = "dired-sidebar"; + version = "20180709.2204"; src = fetchFromGitHub { owner = "jojojames"; repo = "dired-sidebar"; - rev = "df9d46615930ad3709303babd45bc12b96d0945c"; - sha256 = "0yj0jlm695v1kzdlvi0lqa0phafvgn1y9bwbin5cikygvn2wjjxw"; + rev = "e40075bbb43c4012b49fea2b40dbef1d3be3d82e"; + sha256 = "0jz57p47np4wn01y7ggsavgg9nnl1rnmqcl0y32w2c8xk22rhjlp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar"; sha256 = "19a4gsx9wmpc94jd992c7dj5mxfnnij2nc6qnb2lhk8ad69h1lmc"; - name = "dired-sidebar"; + name = "recipe"; }; packageRequires = [ dired-subtree emacs ]; meta = { @@ -14106,9 +18507,13 @@ license = lib.licenses.free; }; }) {}; - dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-single = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-single"; + ename = "dired-single"; version = "20170804.544"; src = fetchFromGitHub { owner = "crocket"; @@ -14116,10 +18521,10 @@ rev = "0dcc645de6397bf12c33229de67a503e4490c618"; sha256 = "16073xjfx7cvv9g8dlyxwa4ca6x35vwarqq43mrl05nxcq0rfzv3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41669decbb7ad5c4dbe152a863f16d87e7bba493/recipes/dired-single"; sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf"; - name = "dired-single"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14127,20 +18532,26 @@ license = lib.licenses.free; }; }) {}; - dired-subtree = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-subtree = callPackage ({ dash + , dired-hacks-utils + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-subtree"; + ename = "dired-subtree"; version = "20170910.1521"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "3e7d46f898eba8611eafbfecf5333cc2325f89f5"; + sha256 = "1z2jc221cbgmy0rqb4ns5pq6fmfl7li3p9xhy6if2v8r82m5yn4q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; sha256 = "1vqcnkh3g6dwi2hwfkb534q0j19pkqzqk3yb7ah8ck4z4ln4ppfk"; - name = "dired-subtree"; + name = "recipe"; }; packageRequires = [ dash dired-hacks-utils ]; meta = { @@ -14148,9 +18559,13 @@ license = lib.licenses.free; }; }) {}; - dired-toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-toggle = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-toggle"; + ename = "dired-toggle"; version = "20140907.1349"; src = fetchFromGitHub { owner = "fasheng"; @@ -14158,10 +18573,10 @@ rev = "84efb9ec9c327e4da53cdb7cda5b51dcd0ede0e5"; sha256 = "1yx20h16hc1b04knsqhrxni0j8qgwnq7i5b0dlggq3dakcvqfxma"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17ae4c5ff42e0c48e53d93c88853f649f59034e6/recipes/dired-toggle"; sha256 = "18v571kp440n5g1d7pj86rr8dgbbm324f9vblkdbdvn13c5dczf5"; - name = "dired-toggle"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14169,9 +18584,13 @@ license = lib.licenses.free; }; }) {}; - dired-toggle-sudo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-toggle-sudo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-toggle-sudo"; + ename = "dired-toggle-sudo"; version = "20151109.206"; src = fetchFromGitHub { owner = "renard"; @@ -14179,10 +18598,10 @@ rev = "02449dbda4e168f99fe5352c9628df5d39e11483"; sha256 = "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5cdee2d52c0c53566fdd77a5d42edf365764acff/recipes/dired-toggle-sudo"; sha256 = "0fy05af9aq9791ij4j9pscdk5j44pbg0kmhpqli41qiazjw7v2va"; - name = "dired-toggle-sudo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14190,9 +18609,14 @@ license = lib.licenses.free; }; }) {}; - diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + diredfl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "diredfl"; + ename = "diredfl"; version = "20180210.1814"; src = fetchFromGitHub { owner = "purcell"; @@ -14200,10 +18624,10 @@ rev = "9b2a89951cee8bdf5c0cb67f9c3ad6ac73abf9cb"; sha256 = "0x4qhxysmcwllkbia6xkfmlpddxhfxxvawywp57zs8c00193nn1z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; sha256 = "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn"; - name = "diredfl"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -14211,20 +18635,24 @@ license = lib.licenses.free; }; }) {}; - diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + diredful = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "diredful"; + ename = "diredful"; version = "20160529.1317"; src = fetchFromGitHub { owner = "thamer"; repo = "diredful"; - rev = "c08e163d9d6c62f7b07e94d54c96c2e364e67e0e"; - sha256 = "1h2hnm8r3anfbk5x7d2dnv38bdllsbwaam6ivpbgzn12r23wrsr2"; + rev = "b17b3087e0084a5571a9ac4d47ccfc36d96b109e"; + sha256 = "1d8n8wj5k82a1sfg93kn3ajci804mpp9j206x5f185zd48wb25z8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76f3d178e7c3982b53c7ee0096c839397534d732/recipes/diredful"; sha256 = "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x"; - name = "diredful"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14232,20 +18660,27 @@ license = lib.licenses.free; }; }) {}; - direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: - melpaBuild { + direnv = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , with-editor }: + melpaBuild { pname = "direnv"; - version = "20180307.748"; + ename = "direnv"; + version = "20180513.123"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "78bb6894348b1d958aa8947837db4b3bceaa55bb"; - sha256 = "1i37pylq6gh9144vhf0lxqnkzcwqhaq7vm18f64qajvcv3rj5s84"; + rev = "6cf079fe8171bdf4bebefe02e8353d7f13847ebd"; + sha256 = "0vw9s70h5zjz5k225mzm893sv5pdb4lz5x7fc4r98iva0wipldgn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd"; - name = "direnv"; + name = "recipe"; }; packageRequires = [ dash emacs with-editor ]; meta = { @@ -14253,9 +18688,13 @@ license = lib.licenses.free; }; }) {}; - direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + direx = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "direx"; + ename = "direx"; version = "20170422.627"; src = fetchFromGitHub { owner = "m2ym"; @@ -14263,10 +18702,10 @@ rev = "a79bfdb5980cf6ed7bfb3b41ddc471a7b6c0ede4"; sha256 = "0fl9hdnrq54awx43635p6pmc8bqyppa02gs1d76nifi0q4g9v4m7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b0903466d63b1c87abc002b0e064e36a8cddd3/recipes/direx"; sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm"; - name = "direx"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14274,9 +18713,14 @@ license = lib.licenses.free; }; }) {}; - direx-grep = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + direx-grep = callPackage ({ direx + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "direx-grep"; + ename = "direx-grep"; version = "20140515.806"; src = fetchFromGitHub { owner = "aki2o"; @@ -14284,10 +18728,10 @@ rev = "1109a512a80b2673a70b18b8568514049017faad"; sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a88a29090a0d6c636f4aeb5214433db66367d9e/recipes/direx-grep"; sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2"; - name = "direx-grep"; + name = "recipe"; }; packageRequires = [ direx ]; meta = { @@ -14295,9 +18739,15 @@ license = lib.licenses.free; }; }) {}; - dirtree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tree-mode, windata }: - melpaBuild { + dirtree = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tree-mode + , windata }: + melpaBuild { pname = "dirtree"; + ename = "dirtree"; version = "20140129.32"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -14305,10 +18755,10 @@ rev = "ba55f1e716e386fdd37cb8e7f48616e405dc7251"; sha256 = "0abs3r4zzfnf4igiakrv3bpyxz7qlnw26l57rynsk7c3w3s5ya29"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/dirtree"; sha256 = "1fm003rix3sdfx8fq3ab5s8b2q65gbkjsn1j3fg5qmhv56p7lrs9"; - name = "dirtree"; + name = "recipe"; }; packageRequires = [ tree-mode windata ]; meta = { @@ -14316,20 +18766,26 @@ license = lib.licenses.free; }; }) {}; - dirtree-prosjekt = callPackage ({ dirtree, fetchFromGitHub, fetchurl, lib, melpaBuild, prosjekt }: - melpaBuild { + dirtree-prosjekt = callPackage ({ dirtree + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , prosjekt }: + melpaBuild { pname = "dirtree-prosjekt"; + ename = "dirtree-prosjekt"; version = "20140129.104"; src = fetchFromGitHub { owner = "abingham"; repo = "prosjekt"; - rev = "a864a8be5842223043702395f311e3350c28e9db"; - sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3"; + rev = "03e06910589ba5cd736868793eb436b3233c6a26"; + sha256 = "06fw9730djlv86jj8nhd1ll9mi4z53qwn6yqpqxciqqlz64pvzid"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d359ec827573dd8c871c4f23df5d1737f1830e7/recipes/dirtree-prosjekt"; sha256 = "0pyb6c0gvc16z5rc5h0kpl8021hz2hzv86cmjsd20gbhz7imrqwk"; - name = "dirtree-prosjekt"; + name = "recipe"; }; packageRequires = [ dirtree prosjekt ]; meta = { @@ -14337,9 +18793,13 @@ license = lib.licenses.free; }; }) {}; - disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + disable-mouse = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "disable-mouse"; + ename = "disable-mouse"; version = "20171226.1715"; src = fetchFromGitHub { owner = "purcell"; @@ -14347,10 +18807,10 @@ rev = "541363bd6353b8b05375552bab884a6315ea545c"; sha256 = "1grs3cz2zdw49frvxy4vc1z3ld804kk5g2ad6ln5grprcd188bz9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse"; sha256 = "0c0ps39s6wg3grspvgck0cwxnas73nfaahfa87l0mmgsrsvas5m7"; - name = "disable-mouse"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14358,9 +18818,13 @@ license = lib.licenses.free; }; }) {}; - disaster = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + disaster = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "disaster"; + ename = "disaster"; version = "20171016.1452"; src = fetchFromGitHub { owner = "jart"; @@ -14368,10 +18832,10 @@ rev = "10a785facc60d89d78e0d5177985ab1af1741bb4"; sha256 = "0iz43jdkh5qdllqdchliys84gn9bpj6688rpc4jnycp64141m6cx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4654b3646b96f967e2c75440e664a417cd0f517/recipes/disaster"; sha256 = "1ad8q81n0s13cwmm216wqx3s92195pda1amc4wxvpb3lq7dbd3yn"; - name = "disaster"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14379,9 +18843,16 @@ license = lib.licenses.free; }; }) {}; - discourse = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: - melpaBuild { + discourse = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , s }: + melpaBuild { pname = "discourse"; + ename = "discourse"; version = "20160911.119"; src = fetchFromGitHub { owner = "lujun9972"; @@ -14389,10 +18860,10 @@ rev = "a86c7e608851e186fe12e892a573994f08c8e65e"; sha256 = "1p4crd7v94hmqzqh8bc7jx1pfhallmj4kn36f8l22z4r2mkyycxc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f5e64fc3fa3fc7d0ac14e7e5d324ee1ca77ea4c3/recipes/discourse"; sha256 = "0j11pyly7qni3gqgywd9bkzfm1dfvhbfjc7pls9n9s26nbqdzcw9"; - name = "discourse"; + name = "recipe"; }; packageRequires = [ cl-lib request s ]; meta = { @@ -14400,20 +18871,25 @@ license = lib.licenses.free; }; }) {}; - discover = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: - melpaBuild { + discover = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , makey + , melpaBuild }: + melpaBuild { pname = "discover"; + ename = "discover"; version = "20140103.1339"; src = fetchFromGitHub { owner = "mickeynp"; repo = "discover.el"; - rev = "7b0044bbb3b3bd5d811fdfb0f5ac6ec8de1239df"; - sha256 = "0f7h2rhh37lrs6xclj182li6s1fawv5m8w3hgy6qgm06dam45lka"; + rev = "bbfda2b4e429985a8fa7971d264c942767cfa816"; + sha256 = "0qxw30zrlcxhxb0alrgyiclrk44dysal8xsbz2mvgrb6jli8wg18"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e32e98758aa6fd31218e98608bd54a76c3e83/recipes/discover"; sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga"; - name = "discover"; + name = "recipe"; }; packageRequires = [ makey ]; meta = { @@ -14421,9 +18897,15 @@ license = lib.licenses.free; }; }) {}; - discover-clj-refactor = callPackage ({ clj-refactor, discover, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + discover-clj-refactor = callPackage ({ clj-refactor + , discover + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "discover-clj-refactor"; + ename = "discover-clj-refactor"; version = "20150328.759"; src = fetchFromGitHub { owner = "maio"; @@ -14431,10 +18913,10 @@ rev = "3fbd5c1162739e606d7cf5d4f5d7426547d99647"; sha256 = "0l2g58f55p8zmzv2q2hf163ggm9p0wk8hg93wlkyldrgyb94dgf4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3311371cadf00b00bfbece4e4b2f96c226f0e27d/recipes/discover-clj-refactor"; sha256 = "08bz60fxcgzab77690mmv0f7wdxcpygmasazcss427k37z9ysm7r"; - name = "discover-clj-refactor"; + name = "recipe"; }; packageRequires = [ clj-refactor discover ]; meta = { @@ -14442,9 +18924,15 @@ license = lib.licenses.free; }; }) {}; - discover-js2-refactor = callPackage ({ discover, fetchFromGitHub, fetchurl, js2-refactor, lib, melpaBuild }: - melpaBuild { + discover-js2-refactor = callPackage ({ discover + , fetchFromGitHub + , fetchurl + , js2-refactor + , lib + , melpaBuild }: + melpaBuild { pname = "discover-js2-refactor"; + ename = "discover-js2-refactor"; version = "20140129.752"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -14452,10 +18940,10 @@ rev = "3812abf61f39f3e73a9f3daefa6fed4f21a429ba"; sha256 = "1vnbn4asz3lifscvy4shzisl6r0gkgq0qsa3kpgif3853wcd2rvn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b84129a8a90f8f66a513c11c299e0acb5f3fbd3a/recipes/discover-js2-refactor"; sha256 = "139zq66cpcn4dnidf22h7x88p812ywrrz4c3c62w3915b75f71ki"; - name = "discover-js2-refactor"; + name = "recipe"; }; packageRequires = [ discover js2-refactor ]; meta = { @@ -14463,20 +18951,24 @@ license = lib.licenses.free; }; }) {}; - discover-my-major = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: - melpaBuild { + discover-my-major = callPackage ({ fetchgit + , fetchurl + , lib + , makey + , melpaBuild }: + melpaBuild { pname = "discover-my-major"; - version = "20170113.2306"; - src = fetchFromGitHub { - owner = "steckerhalter"; - repo = "discover-my-major"; - rev = "ac83b24b5130eb0944f820736012df0924cce528"; - sha256 = "1hkz2sg8wnjqmsqm0di1h9cf9hb1j6qbw30hda3w8z3m0apzr5fr"; + ename = "discover-my-major"; + version = "20180605.2211"; + src = fetchgit { + url = "https://framagit.org/steckerhalter/discover-my-major.git"; + rev = "66081546eac360c83a9c3270db92a2164288b0d0"; + sha256 = "1v95s15m37785ggs649q5a83jai0bnar1w1hkiaafwbmpzhd7hr7"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/274185fa94a3442c56593f3c8b99bdc6b9bd4994/recipes/discover-my-major"; - sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg"; - name = "discover-my-major"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/discover-my-major"; + sha256 = "1b10bwhls5bx83hzhqq1ylc2civ3bsivd6db46f3s5hpgvr4q17n"; + name = "recipe"; }; packageRequires = [ makey ]; meta = { @@ -14484,9 +18976,13 @@ license = lib.licenses.free; }; }) {}; - disk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + disk = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "disk"; + ename = "disk"; version = "20171115.2331"; src = fetchFromGitHub { owner = "kensanata"; @@ -14494,10 +18990,10 @@ rev = "283e54e3be7d08f959076240b2ab324e25632137"; sha256 = "15fkfl9kjlpsg9p5g0xhm384ipvrzclwxvqk8vz1zixq0wam2ajm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6e75695594ce17b618ad8786c8a04e283f68b11/recipes/disk"; sha256 = "1jzkqgjw8xl0jc6ssl5bsdjp2dxw88nss6szvjv7frrhsncaq28h"; - name = "disk"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14505,9 +19001,14 @@ license = lib.licenses.free; }; }) {}; - dispass = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dispass = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dispass"; + ename = "dispass"; version = "20140202.731"; src = fetchFromGitHub { owner = "ryuslash"; @@ -14515,10 +19016,10 @@ rev = "b6e8f89040ebaaf0e7609b04bc27a8979f0ae861"; sha256 = "075gj81rnhrvv061wnldixpfmlsyfbnvacnk107z6f9v3m2m3vl1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dispass"; sha256 = "09c9v41rh63hjpdh377rbfvpial33r41dn5bss3632fi34az5l9n"; - name = "dispass"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -14526,9 +19027,14 @@ license = lib.licenses.free; }; }) {}; - display-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + display-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "display-theme"; + ename = "display-theme"; version = "20140115.756"; src = fetchFromGitHub { owner = "kawabata"; @@ -14536,10 +19042,10 @@ rev = "b180b3be7a74ae4799a14e7e4bc2fe10e3ff7a15"; sha256 = "0r560bpgw5p2pfcgkgcrlpp1bprv1f23dl4y5fjk06dg93fgaysa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4dd76f49f1c10656ea0004a654d73666e1d188db/recipes/display-theme"; sha256 = "07nqscmfa6iykll1m6gyiqca1g5ncx3rx468iyf2ahygpvqvnbxa"; - name = "display-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -14547,20 +19053,24 @@ license = lib.licenses.free; }; }) {}; - distel-completion-lib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + distel-completion-lib = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "distel-completion-lib"; + ename = "distel-completion-lib"; version = "20160816.406"; src = fetchFromGitHub { owner = "sebastiw"; repo = "distel-completion"; - rev = "2ba4eea51cecfa75cf62f58180460ee9ff43131f"; - sha256 = "1761lgplngmpn1vd8syc1h4g6q1dhngamz1j3n48z07c1ylzpkdd"; + rev = "994c61dda2e3256b41fa2e53821c484b5ffd13e6"; + sha256 = "00nifdhwy89zmi50hln5p5albdx7ypm4mbdfjzhk4870crx4zjr2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/distel-completion-lib"; sha256 = "0b06z3k30b4x5zpzk0jgcs7kcaix64xx81iskm1kys57r3gskzpa"; - name = "distel-completion-lib"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14568,9 +19078,13 @@ license = lib.licenses.free; }; }) {}; - distinguished-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + distinguished-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "distinguished-theme"; + ename = "distinguished-theme"; version = "20151216.1215"; src = fetchFromGitHub { owner = "Lokaltog"; @@ -14578,10 +19092,10 @@ rev = "9b1d25ac59465a5016d187ea84b7614c95a29b3b"; sha256 = "03d8zb2is7n2y2z0k6j37cijjc3ndgasxsm9gqyq7drlq9bqwzsm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d969e91bbba522a31d6ae7a81c7783034c15b9b/recipes/distinguished-theme"; sha256 = "0h03aqgijrmisbgqga42zlb5yz4x3jn9jgr29rq8canyhayr3rk4"; - name = "distinguished-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14589,19 +19103,23 @@ license = lib.licenses.free; }; }) {}; - ditz-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + ditz-mode = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ditz-mode"; + ename = "ditz-mode"; version = "20150729.240"; src = fetchhg { url = "https://bitbucket.com/zondo/ditz-mode"; rev = "beac4c1f3b7e"; sha256 = "1cbsy4lchl41zmyxfq828cjpl3h2dwvn8xf1qgf2lbscdb6cwbwb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02e2a2a25f42929626d7237511136ba6826dad33/recipes/ditz-mode"; sha256 = "0shzm9l31n4ffjs1d26ykxsycd478lhlpl8xcwzbjryywg4gf5nd"; - name = "ditz-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14609,9 +19127,14 @@ license = lib.licenses.free; }; }) {}; - dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dix = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dix"; + ename = "dix"; version = "20170224.615"; src = fetchFromGitHub { owner = "unhammer"; @@ -14619,10 +19142,10 @@ rev = "bcc7fd7aef5d25171978c386c620e09d0ba8d2f8"; sha256 = "12ny1a89xhjcnz03s1bw96y14kqb2w6cpf2rk8lv6kri7dasfq4n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; sha256 = "0c5fmknpy6kwlz7nx0csbbia1maz0szj7yha1p7wq28s3a5426xq"; - name = "dix"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -14630,20 +19153,26 @@ license = lib.licenses.free; }; }) {}; - dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dix-evil = callPackage ({ dix + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dix-evil"; + ename = "dix-evil"; version = "20170105.623"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "bcc7fd7aef5d25171978c386c620e09d0ba8d2f8"; - sha256 = "12ny1a89xhjcnz03s1bw96y14kqb2w6cpf2rk8lv6kri7dasfq4n"; + rev = "1cfef0d3376a18c78dd1dfc1ac9ac3ad0e8c4475"; + sha256 = "0p2cvr7mjpag86wacxm6s39y7p118gh2ccqw02jzabwxlfasfbw3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; sha256 = "1jscaksnl5qmpqgkjkv6sx56llz0w4p5h7j73c4a1hld94gwklh3"; - name = "dix-evil"; + name = "recipe"; }; packageRequires = [ dix evil ]; meta = { @@ -14651,9 +19180,13 @@ license = lib.licenses.free; }; }) {}; - dizzee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dizzee = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dizzee"; + ename = "dizzee"; version = "20171201.116"; src = fetchFromGitHub { owner = "davidmiller"; @@ -14661,10 +19194,10 @@ rev = "e3cf1c2ea5d0fc00747524b6f3c5b905d0a8c8e1"; sha256 = "1i32msin8ra963w7af6612d038gxb25m1gj97kbjymjq1r8zbdrv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dizzee"; sha256 = "14y10k8s65cyn86m1z77817436m89l0xpwd1wr4d7qp3x2mmn215"; - name = "dizzee"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14672,20 +19205,25 @@ license = lib.licenses.free; }; }) {}; - django-manage = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: - melpaBuild { + django-manage = callPackage ({ fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild }: + melpaBuild { pname = "django-manage"; + ename = "django-manage"; version = "20160818.1912"; src = fetchFromGitHub { owner = "gopar"; repo = "django-manage"; - rev = "876fb2cb627d465adfdc905841279784bcdd7ee8"; - sha256 = "0yi38aif1n0s9yp87wimdbnq7vr7k5gbshfprj9ansibrjxnb6xk"; + rev = "e72b1cf2fdbb5c624d19169176e60467b4918fe2"; + sha256 = "0lyi64dfd2njlnf9dzb8i88rrw930jiq99xfn8zmh87y6qy1j79i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66f88d30a1ab9b7f9281a2b5939c7ab2711b966a/recipes/django-manage"; sha256 = "0j95g7fps28xhlrikkg61xgpbpf52xb56swmns2qdib6x1xzd6rh"; - name = "django-manage"; + name = "recipe"; }; packageRequires = [ hydra ]; meta = { @@ -14693,9 +19231,16 @@ license = lib.licenses.free; }; }) {}; - django-mode = callPackage ({ fetchFromGitHub, fetchurl, helm-make, lib, melpaBuild, projectile, s }: - melpaBuild { + django-mode = callPackage ({ fetchFromGitHub + , fetchurl + , helm-make + , lib + , melpaBuild + , projectile + , s }: + melpaBuild { pname = "django-mode"; + ename = "django-mode"; version = "20170522.14"; src = fetchFromGitHub { owner = "myfreeweb"; @@ -14703,10 +19248,10 @@ rev = "a71b8dd984e7f724b8321246e5c353a4ae5c986e"; sha256 = "0xf33ri5phy2mrb1dwvqb8waba33gj9bwmf6jhl6n0ksm43x0z40"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-mode"; sha256 = "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara"; - name = "django-mode"; + name = "recipe"; }; packageRequires = [ helm-make projectile s ]; meta = { @@ -14714,20 +19259,25 @@ license = lib.licenses.free; }; }) {}; - django-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + django-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "django-snippets"; + ename = "django-snippets"; version = "20131229.811"; src = fetchFromGitHub { owner = "myfreeweb"; repo = "django-mode"; - rev = "a71b8dd984e7f724b8321246e5c353a4ae5c986e"; - sha256 = "0xf33ri5phy2mrb1dwvqb8waba33gj9bwmf6jhl6n0ksm43x0z40"; + rev = "f1e6fea8878bebc9bc0b761376a14cd5c9feda0f"; + sha256 = "16rh2yhpfv0c3arwkcnjz0r2mw3yx7ayys6wkzwgaxvx6nxpa7y1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-snippets"; sha256 = "1qs9fw104kidbr5zbxc1q71yy033nq3wxh98vvzk4z4fppnd29sw"; - name = "django-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -14735,9 +19285,13 @@ license = lib.licenses.free; }; }) {}; - django-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + django-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "django-theme"; + ename = "django-theme"; version = "20131022.202"; src = fetchFromGitHub { owner = "andrzejsliwa"; @@ -14745,10 +19299,10 @@ rev = "86c8142b3eb1addd94a43aa6f1d98dab06401af0"; sha256 = "1azf4p6salga7269l0kf13bqlxf9idp0ys8mm20qpyjpj79p5g9w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ede3b4fb214b915a8230e7f220ffe71c73ad7c4/recipes/django-theme"; sha256 = "1rydl857zfpbvd7aziz6h7n3rrh584z2cbfxlss3wgfclzmbyhgf"; - name = "django-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14756,20 +19310,29 @@ license = lib.licenses.free; }; }) {}; - djangonaut = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, pythonic, s }: - melpaBuild { + djangonaut = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , magit-popup + , melpaBuild + , pythonic + , s }: + melpaBuild { pname = "djangonaut"; - version = "20180325.429"; + ename = "djangonaut"; + version = "20180710.1445"; src = fetchFromGitHub { owner = "proofit404"; repo = "djangonaut"; - rev = "7be5cb25bee8a9410d5c95139704620c68fd6efa"; - sha256 = "1vpj5g7x688y3qzhv6566rkgwdzi0qi1pgj4xqv0059a29i9z4yz"; + rev = "61a1ace3562c7352fd1665ceccc6b39be23daa80"; + sha256 = "02g3iij6hhhzws612l9hbvd8zlf6ggifgl8ckxaysxd80z2jc2rs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c1281f59add99abf57bc858d6e0f9b2ae5b3c5c/recipes/djangonaut"; sha256 = "0038zqazzhxz82q8l1phxc3aiiwmzksz9c15by9v0apzwpmdkj38"; - name = "djangonaut"; + name = "recipe"; }; packageRequires = [ emacs f magit-popup pythonic s ]; meta = { @@ -14777,9 +19340,15 @@ license = lib.licenses.free; }; }) {}; - dkdo = callPackage ({ dkmisc, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dkdo = callPackage ({ dkmisc + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dkdo"; + ename = "dkdo"; version = "20131110.319"; src = fetchFromGitHub { owner = "davidkeegan"; @@ -14787,10 +19356,10 @@ rev = "fd6bb105e8331fafb6385c5238c988c4c5bbe2da"; sha256 = "1nbvdnw9g3zbbb0n2sn2kxfzs5wichhl9qid3qjp8dsiq1wpv459"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d4f75f6f6349b81ddbaaf35fb5d7ddeb4cde622/recipes/dkdo"; sha256 = "0p7ybgldjs046jrkkbpli1iicfmblpxfz9lql8m8sz7lpjn7h300"; - name = "dkdo"; + name = "recipe"; }; packageRequires = [ dkmisc emacs ]; meta = { @@ -14798,9 +19367,13 @@ license = lib.licenses.free; }; }) {}; - dkl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dkl = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dkl"; + ename = "dkl"; version = "20161004.1707"; src = fetchFromGitHub { owner = "flexibeast"; @@ -14808,10 +19381,10 @@ rev = "6b4584f86037bda3383960c678d51f340229fb91"; sha256 = "1xpidgj5xk0g4ajpglhbhi02s5il8qqcvh2ccf4ac9daa1r34kxp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8bd9cf21473f676aa54e142b6f0bf0427f40d29/recipes/dkl"; sha256 = "0bcv4ld8bfj2sk3sh4j1m9qqybw3l0a6b3d12qwy8lc3b8197lr0"; - name = "dkl"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14819,20 +19392,27 @@ license = lib.licenses.free; }; }) {}; - dklrt = callPackage ({ dkmisc, emacs, fetchFromGitHub, fetchurl, ledger-mode, lib, melpaBuild }: - melpaBuild { + dklrt = callPackage ({ dkmisc + , emacs + , fetchFromGitHub + , fetchurl + , ledger-mode + , lib + , melpaBuild }: + melpaBuild { pname = "dklrt"; + ename = "dklrt"; version = "20131110.541"; src = fetchFromGitHub { owner = "davidkeegan"; repo = "dklrt"; - rev = "5d6c99f8018335256ab934b4c1049708ae2d48ba"; + rev = "4eceed270015b41d24a62a8b71bd239224a63063"; sha256 = "063nnln5m42qf190vr2z0ibacyn7n0xkxm3v5vaa4gxdvdwzhshs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71f980fdb2180df2429c898e1507dd3b989a5a2c/recipes/dklrt"; sha256 = "11ss5x9sxgxp1wx2r1m0vsp5z5qm8m4ww20ybr6bqjw0a1gax561"; - name = "dklrt"; + name = "recipe"; }; packageRequires = [ dkmisc emacs ledger-mode ]; meta = { @@ -14840,9 +19420,14 @@ license = lib.licenses.free; }; }) {}; - dkmisc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dkmisc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dkmisc"; + ename = "dkmisc"; version = "20131110.315"; src = fetchFromGitHub { owner = "davidkeegan"; @@ -14850,10 +19435,10 @@ rev = "fe3d49c6f8322b6f89466361acd97585bdfe0608"; sha256 = "1nz71g8pb19aqjcb4s94hhn6j30cc04q05kmwvcbxpjb11qqrv49"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71f980fdb2180df2429c898e1507dd3b989a5a2c/recipes/dkmisc"; sha256 = "0nnbl272hldcmhyj47r463yvj7b06rjdkpkl5xk0gw9ikyja7w0z"; - name = "dkmisc"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -14861,9 +19446,14 @@ license = lib.licenses.free; }; }) {}; - dmenu = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dmenu = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dmenu"; + ename = "dmenu"; version = "20180118.445"; src = fetchFromGitHub { owner = "lujun9972"; @@ -14871,10 +19461,10 @@ rev = "6e492cd4ee4fb39ecda92776707fc270f54d25e7"; sha256 = "085ap58qfwr7gvrx68dy72z4ph1mvwka5i7ydx58m1a3bb9rshnw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98bcdd71a160b9c04f83cc5b939031c9e7b5eb59/recipes/dmenu"; sha256 = "1w1pgaj2yasfhsd1ibvrwy11ykq8v17h913g298h3ycsvqv8gic0"; - name = "dmenu"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -14882,9 +19472,13 @@ license = lib.licenses.free; }; }) {}; - dna-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dna-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dna-mode"; + ename = "dna-mode"; version = "20170804.114"; src = fetchFromGitHub { owner = "jhgorrell"; @@ -14892,10 +19486,10 @@ rev = "471d374de22c33eaddd8e41dd8ae29753fab2f6a"; sha256 = "05zsaypyavyn7gs0jk63chkxkm2rl4nbrqgv6zxrbqcar7gv86am"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dna-mode"; sha256 = "06vprwv1v4jzqzi2nj9hbhnypnvqxmixls8yf91hzwlk3fdkdywf"; - name = "dna-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14903,9 +19497,14 @@ license = lib.licenses.free; }; }) {}; - docbook-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + docbook-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "docbook-snippets"; + ename = "docbook-snippets"; version = "20150714.925"; src = fetchFromGitHub { owner = "jhradilek"; @@ -14913,10 +19512,10 @@ rev = "b06297fdec039a541aaa6312cb328a11062cfab4"; sha256 = "1nbm3wzd12rsrhnwlcc6b72b1ala328mfpcp5bwlfcdshw6mfcrq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/07b832b72773ab41f9cbdefabd30dc1aa29d04c5/recipes/docbook-snippets"; sha256 = "1ipqfylgiw9iyjc1nckbay890clfkhda81nr00cq06sjmm71iniq"; - name = "docbook-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -14924,20 +19523,27 @@ license = lib.licenses.free; }; }) {}; - docean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + docean = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "docean"; - version = "20150927.1118"; + ename = "docean"; + version = "20180605.1044"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "docean.el"; - rev = "dcc296782b08531b768d3cf851cc7959ec486bf1"; - sha256 = "055kr0qknjgnjs7dn6gdmahrdbs8piwldbz7vg1hgq3b046x8lky"; + rev = "bbe2298fd21f7876fc2d5c52a69b931ff59df979"; + sha256 = "1fzs6k76nyz2xjvydks6v6d2ib7qqj181s7c8r57w9ylr2zqfacj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4827fa337d7d25f2aaf67aca3081fbdaeacbcbf/recipes/docean"; sha256 = "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9"; - name = "docean"; + name = "recipe"; }; packageRequires = [ cl-lib emacs request ]; meta = { @@ -14945,20 +19551,31 @@ license = lib.licenses.free; }; }) {}; - docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: - melpaBuild { + docker = callPackage ({ dash + , docker-tramp + , emacs + , fetchFromGitHub + , fetchurl + , json-mode + , lib + , magit-popup + , melpaBuild + , s + , tablist }: + melpaBuild { pname = "docker"; - version = "20180222.717"; + ename = "docker"; + version = "20180710.743"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "ec2b07255e273639ff76303778661f81c5b74000"; - sha256 = "0nlf3rw9xa9hggqkw6nxfswbqlnsgbliz9z652kp7c9hfikfmcsj"; + rev = "7aee62326f8304fc5e3fc9de84bd56afe3572ed9"; + sha256 = "1lrgi7hp5a3j6c39jv3vn7x1ak66p5r1ijifwkrj95r1x0dxj3f2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk"; - name = "docker"; + name = "recipe"; }; packageRequires = [ dash @@ -14974,9 +19591,16 @@ license = lib.licenses.free; }; }) {}; - docker-api = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: - melpaBuild { + docker-api = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , s }: + melpaBuild { pname = "docker-api"; + ename = "docker-api"; version = "20160525.20"; src = fetchFromGitHub { owner = "Silex"; @@ -14984,10 +19608,10 @@ rev = "206144346b7fa4165223349cfeb64a75d47ddd1b"; sha256 = "0phmpranrgdi2gi89nxr1ii9xbr7h2ccpx1mkpnfxnjlzkdzq2fb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3924914124370fc028a7b1ecdc154a53e73037a7/recipes/docker-api"; sha256 = "1giqiapm4hf4dhfm3x69qqpir3jg7qz3parhbx88xxqrd1z18my0"; - name = "docker-api"; + name = "recipe"; }; packageRequires = [ dash request s ]; meta = { @@ -14995,9 +19619,16 @@ license = lib.licenses.free; }; }) {}; - docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: - melpaBuild { + docker-compose-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yaml-mode }: + melpaBuild { pname = "docker-compose-mode"; + ename = "docker-compose-mode"; version = "20180324.1052"; src = fetchFromGitHub { owner = "meqif"; @@ -15005,10 +19636,10 @@ rev = "c9f131d2c90d652435d407fd36c40feebfed1dad"; sha256 = "0d5d46i6hplmy7q2ihbvcrnk9jrwa2mswgbf8yca3m4k44wgk6la"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g"; - name = "docker-compose-mode"; + name = "recipe"; }; packageRequires = [ dash emacs yaml-mode ]; meta = { @@ -15016,9 +19647,15 @@ license = lib.licenses.free; }; }) {}; - docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + docker-tramp = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "docker-tramp"; + ename = "docker-tramp"; version = "20170206.1925"; src = fetchFromGitHub { owner = "emacs-pe"; @@ -15026,10 +19663,10 @@ rev = "8e2b671eff7a81af43b76d9dfcf94ddaa8333a23"; sha256 = "1lgjvrss25d4hwgygr1amsbkh1l4kgpsdjpxxpyfgil1542haan1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker-tramp"; sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w"; - name = "docker-tramp"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -15037,20 +19674,26 @@ license = lib.licenses.free; }; }) {}; - dockerfile-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + dockerfile-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "dockerfile-mode"; - version = "20171124.1647"; + ename = "dockerfile-mode"; + version = "20180628.959"; src = fetchFromGitHub { owner = "spotify"; repo = "dockerfile-mode"; - rev = "4ab78f678e9ee40c7c5729dc8f1f5c1a847be2e7"; - sha256 = "0dc3pfqf6nrwnqsiyn49l0pgq7rm31kciwsqagnrjnc85nnbpf9m"; + rev = "64733f64ea9be1e5e534e590846869b75c62ed1f"; + sha256 = "00fk4qq3yhqia6y7pixx3qfmfxp61hdffkx6hmz6gbd6i1ibkmw4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode"; sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa"; - name = "dockerfile-mode"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -15058,9 +19701,15 @@ license = lib.licenses.free; }; }) {}; - dokuwiki = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: - melpaBuild { + dokuwiki = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xml-rpc }: + melpaBuild { pname = "dokuwiki"; + ename = "dokuwiki"; version = "20180101.1659"; src = fetchFromGitHub { owner = "accidentalrebel"; @@ -15068,10 +19717,10 @@ rev = "594c4d4904dcc2796bbbd2c0845d9e7c09ccf6f7"; sha256 = "0vqx8npw0i02dhw2yb7s4z7njw60r3xyncw4z8l6fj99pp6pfh15"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dokuwiki"; sha256 = "0wfzzxx3n75zgxk06rlq7053hla84k79mk911by4jwk6km5adk55"; - name = "dokuwiki"; + name = "recipe"; }; packageRequires = [ emacs xml-rpc ]; meta = { @@ -15079,9 +19728,13 @@ license = lib.licenses.free; }; }) {}; - dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dokuwiki-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dokuwiki-mode"; + ename = "dokuwiki-mode"; version = "20170223.501"; src = fetchFromGitHub { owner = "kai2nenobu"; @@ -15089,10 +19742,10 @@ rev = "e4e116f6fcc373e3f5937c1a7daa5c2c9c6d3fa1"; sha256 = "0bmcm7lvzm8sg2l1j7bg02jasxb8g81q9ilycblmsl1ckbfwq0yp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/dokuwiki-mode"; sha256 = "1jc3sn61mipkhgr91wp74s673jk2w5991p54jlw05qqpf5gmxd7v"; - name = "dokuwiki-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15100,9 +19753,14 @@ license = lib.licenses.free; }; }) {}; - dollaro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + dollaro = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "dollaro"; + ename = "dollaro"; version = "20151123.502"; src = fetchFromGitHub { owner = "laynor"; @@ -15110,10 +19768,10 @@ rev = "500127f0172ac7a1eec627e026b59136580a74ac"; sha256 = "1xyqsnymgdd8ic3az2lgwv7s7vld6d4pcycb234bxm4in9fixgdj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8195000cffa1913060266b17801eb7c1e472a83/recipes/dollaro"; sha256 = "06kaqzb0nh8sndhk7p5n4acn5nc27dyxw3ldgcbp81wj6ipii26h"; - name = "dollaro"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -15121,9 +19779,39 @@ license = lib.licenses.free; }; }) {}; - doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + doneburn-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "doneburn-theme"; + ename = "doneburn-theme"; + version = "20180502.1004"; + src = fetchFromGitHub { + owner = "manuel-uberti"; + repo = "doneburn-theme"; + rev = "e27a599166ed5f1993e6eabdb223a0f374516e89"; + sha256 = "0ni6v7n6wfax5f3ndyx2rhizcr067adkiqgcvwl5smdykiw7gbsp"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7fc483d5f487f462567bba22d611f90fc8a1a709/recipes/doneburn-theme"; + sha256 = "0j8fyb6wcjrfhfjp06w0bzp5vrcvydhjwkzg4c4s4j54xaw6laxx"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/doneburn-theme"; + license = lib.licenses.free; + }; + }) {}; + doom = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "doom"; + ename = "doom"; version = "20180301.1508"; src = fetchFromGitHub { owner = "kensanata"; @@ -15131,10 +19819,10 @@ rev = "e59040aefc92dd9b3134eb623624307fb9e4327b"; sha256 = "14lwq30m0s7pkwkbn6vm5gdlkww7sszc6pdhxyinkhj67b0bxpin"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0960deb3b1d106ad2ffa95a44f34cb9efc026f01/recipes/doom"; sha256 = "1ji2fdiw5b13n76nv2wvkz6v155b0qgh1rxwmv3m5nnrbmklfjh5"; - name = "doom"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -15142,20 +19830,65 @@ license = lib.licenses.free; }; }) {}; - doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + doom-modeline = callPackage ({ all-the-icons + , dash + , eldoc-eval + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , shrink-path }: + melpaBuild { + pname = "doom-modeline"; + ename = "doom-modeline"; + version = "20180712.2015"; + src = fetchFromGitHub { + owner = "seagle0128"; + repo = "doom-modeline"; + rev = "8af6cb74f6f94ec863076966fd3b2d85ce386b02"; + sha256 = "1b9k30n63milm7xzdh6ya5z4h2gz0dqm0ndfpmy9kx3992mbljqw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f610757f85fb01bd9b1dd212ddbea8f34f3ecd/recipes/doom-modeline"; + sha256 = "0pscrhhgk4wpz1f2r94ficgan4f9blbhqzvav1wjahwp7fn5m29j"; + name = "recipe"; + }; + packageRequires = [ + all-the-icons + dash + eldoc-eval + emacs + projectile + shrink-path + ]; + meta = { + homepage = "https://melpa.org/#/doom-modeline"; + license = lib.licenses.free; + }; + }) {}; + doom-themes = callPackage ({ all-the-icons + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "doom-themes"; - version = "20180328.1556"; + ename = "doom-themes"; + version = "20180720.438"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "179c0836a12a37957569f904024b6e65597fb4b6"; - sha256 = "01jhds2si4bdm05vjdb9azd8ix75p9xi80qqrhcmp3asml50ha39"; + rev = "75d43068733201b8c9c45f9e637ceaab2ff565a4"; + sha256 = "11pbk4clc3rxzibrrz8rbfx52kd3fkxdyl6wv8mi1s8p7jw4ffln"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; sha256 = "0plqhis9ki3ck1pbv4hiqk4x428fps8qsfx72mamdayyx2nncdrs"; - name = "doom-themes"; + name = "recipe"; }; packageRequires = [ all-the-icons cl-lib emacs ]; meta = { @@ -15163,9 +19896,14 @@ license = lib.licenses.free; }; }) {}; - dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dot-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dot-mode"; + ename = "dot-mode"; version = "20180312.1600"; src = fetchFromGitHub { owner = "wyrickre"; @@ -15173,10 +19911,10 @@ rev = "6ca22b73bcdae2363ee9641b822a60685df16a3e"; sha256 = "10lmwra48ihxqxyl54m3yn1zy0q5w6cxqd2n5pbs4lva1yck0z4w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dot-mode"; sha256 = "039ylmbvw0wb3i2w4qn3dhckz7y3swbid4hwjcxljy4szc709p6k"; - name = "dot-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -15184,9 +19922,14 @@ license = lib.licenses.free; }; }) {}; - dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dotenv-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dotenv-mode"; + ename = "dotenv-mode"; version = "20180207.1114"; src = fetchFromGitHub { owner = "preetpalS"; @@ -15194,10 +19937,10 @@ rev = "f4c52bcd5313379b9f2460db7f7a33119dfa96ea"; sha256 = "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode"; sha256 = "1lwfzfri6vywcjkc9wassrz0rdrg0kvljxsm6b4smlnphp6pdbbs"; - name = "dotenv-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -15205,20 +19948,24 @@ license = lib.licenses.free; }; }) {}; - dotnet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dotnet = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dotnet"; + ename = "dotnet"; version = "20170827.838"; src = fetchFromGitHub { owner = "julienXX"; repo = "dotnet.el"; - rev = "e22fd23bf2bfab980d4802b10c4d872b800f90d4"; - sha256 = "1qq0gkdr0h4b9h6l14wfk3zmw62sa2i5in23bvs6jp6y6hmffr2m"; + rev = "fc1c98025f4f9394ce9b70f9bdafd18d897f27f2"; + sha256 = "1pb45rpr2anqgxrdnp3sz3adx8gvpwvdms47gh75ran4sn191l19"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ef473594ec57a747ad7d9d57d7287bcacf4b446/recipes/dotnet"; sha256 = "06k1ikwg9bis9kk4r41bm0a0d8a31wscqyr6n99d7836p1h4jfki"; - name = "dotnet"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15226,9 +19973,14 @@ license = lib.licenses.free; }; }) {}; - download-region = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + download-region = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "download-region"; + ename = "download-region"; version = "20180123.1733"; src = fetchFromGitHub { owner = "zk-phi"; @@ -15236,10 +19988,10 @@ rev = "bbba3ecd80818d5d940d41fe89a6e2ec5dd2c53c"; sha256 = "1cwlbdmdils5rzhjpc3fqjmd3dhalk6i7bxskpahbrr9xxfq0iw4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7801d9fac121f213609a802fe9d88bdc5364d1f3/recipes/download-region"; sha256 = "1mrl2x6j708nchyh9y5avbf2cq10kpnhfj553l6akarvl5n5pvkl"; - name = "download-region"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -15247,9 +19999,13 @@ license = lib.licenses.free; }; }) {}; - downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + downplay-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "downplay-mode"; + ename = "downplay-mode"; version = "20151125.1209"; src = fetchFromGitHub { owner = "tobias"; @@ -15257,10 +20013,10 @@ rev = "4a2c3addc73c8ca3816345c3c11c08af265baedb"; sha256 = "0s7swvfd7h8r0n3cjmkps6ary9vwg61jylfm4qrkp3idsz6is548"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d67ea3c4d92b4093373d5e4ff07b7d5a3dc537/recipes/downplay-mode"; sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b"; - name = "downplay-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15268,20 +20024,24 @@ license = lib.licenses.free; }; }) {}; - dpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dpaste = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dpaste"; + ename = "dpaste"; version = "20160303.1312"; src = fetchFromGitHub { owner = "gregnewman"; repo = "dpaste.el"; - rev = "5ebabb466a6ae70882549855b6b2194fc32189f8"; - sha256 = "03n3k6a40lw9m1ycf62g6vll4gr2kr2509vjp1dkfq722xwrw7zk"; + rev = "e7a1a18de77f752eb0dbb4b878925f2265538d0b"; + sha256 = "1493fan64lfq2gb9cgr7ja9xfd8jgqfbx9k84iaplavnpmqr5348"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dpaste"; sha256 = "0wrfy9w0yf5m15vmhg4l880v92cy557g332xniqs77ab0sga4vgc"; - name = "dpaste"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15289,20 +20049,25 @@ license = lib.licenses.free; }; }) {}; - dpaste_de = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web }: - melpaBuild { + dpaste_de = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web }: + melpaBuild { pname = "dpaste_de"; + ename = "dpaste_de"; version = "20131015.525"; src = fetchFromGitHub { owner = "theju"; repo = "dpaste_de.el"; - rev = "f0c39e8864299f735642f7d9fa490689398ce39d"; - sha256 = "1avpg0cgzk8d6g1q0ryx41lkcdgkm0mkzr5xr32xm28dzrfmgd4z"; + rev = "ab041443884a7a4bfdc81b055688821e8efc9b02"; + sha256 = "0aplwchr6r1nk2hfpqw2qxyp57zzkqydyzpc0mwz88halnkskblz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dpaste_de"; sha256 = "0022dd8l7jsyl0lv9x6iz882ln71js8brqcbiqz001zv45yrgvy0"; - name = "dpaste_de"; + name = "recipe"; }; packageRequires = [ web ]; meta = { @@ -15310,9 +20075,14 @@ license = lib.licenses.free; }; }) {}; - dr-racket-like-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dr-racket-like-unicode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dr-racket-like-unicode"; + ename = "dr-racket-like-unicode"; version = "20161021.511"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -15320,10 +20090,10 @@ rev = "4953f1c8a68472e157a0dcd0a7e35a4ec2577133"; sha256 = "1i7k7d2gnzd2izplhdmjbkcxvkwnc3y3y0hrcp2rq60bjpkcl1gv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e612ede00c4b44ace741d2b6baabc61571af15c/recipes/dr-racket-like-unicode"; sha256 = "0cqcbn4hmv99d8z03xc0rqw4yh5by6g09y33h75dhl9nh95rybgf"; - name = "dr-racket-like-unicode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -15331,20 +20101,25 @@ license = lib.licenses.free; }; }) {}; - dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dracula-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dracula-theme"; - version = "20170412.845"; + ename = "dracula-theme"; + version = "20180710.624"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "62df5de68c73d34faaa0191a92ce3ebce589bf24"; - sha256 = "0wpbscqaszr2mg0hijamcz6l9nknsi12mwdbib16ghlh6y9mj4ia"; + rev = "a1c9888b7876ace60a536d27fb290e788bffc9cb"; + sha256 = "1bi257gp4rskwbvr1hkgz16r0pw4xqvaxgixzv4abb35vsc9gncx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; sha256 = "1px162v7h7136rasafq875yzw0h8n6wvzbyh73c3w093kd30bmh8"; - name = "dracula-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -15352,20 +20127,24 @@ license = lib.licenses.free; }; }) {}; - draft-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + draft-mode = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "draft-mode"; + ename = "draft-mode"; version = "20140609.756"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "gaudecker"; repo = "draft-mode"; - rev = "4779fb32daf53746459da2def7e08004492d4f18"; - sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y"; + rev = "f059c04b044f62aec764c7698adddad301bfe89c"; + sha256 = "01dspkv7g4xmmqgz6f1p190h5p4f4vrw8r9dikrjch02bb76wqir"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d5ee50f467025fb8b9a3b4577fc471a2b2ee191a/recipes/draft-mode"; - sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh"; - name = "draft-mode"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cbfefacda071c0f5ee698a4c345a2d6fea6a0d24/recipes/draft-mode"; + sha256 = "19lq1a3rj6fck3xq2vcz8fk30hpx25kyfz6c7hmq36kx4lv0mjpa"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15373,20 +20152,24 @@ license = lib.licenses.free; }; }) {}; - drag-stuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + drag-stuff = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "drag-stuff"; + ename = "drag-stuff"; version = "20161107.2349"; src = fetchFromGitHub { owner = "rejeep"; repo = "drag-stuff.el"; - rev = "6d06d846cd37c052d79acd0f372c13006aa7e7c8"; - sha256 = "1fsj88n1j50cxjzx62khzxrajsvf33si8iwgbaz6z7z8pwh91qcd"; + rev = "d49fe376d24f0f8ac5ade67b6d7fccc2487c81db"; + sha256 = "1jrr59iazih3imkl9ja1lbni9v3xv6b8gmqs015g2mxhlql35jka"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/drag-stuff"; sha256 = "1q67q20gfhixzkmddhzp6fd8z2qfpsmyyvymmaffjcscnjaz21w4"; - name = "drag-stuff"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15394,20 +20177,25 @@ license = lib.licenses.free; }; }) {}; - drawille = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + drawille = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "drawille"; + ename = "drawille"; version = "20160418.1138"; src = fetchFromGitHub { owner = "sshbio"; repo = "drawille"; - rev = "d914845725719d8293e2f0dea3c9c7e0a1e0e62a"; - sha256 = "1ynjxfvx8b6rq6d4gm1sl96rmlk5pi8j5s1rd1y0p8x2lwqcfv77"; + rev = "d582b455c01432bc80933650c52a1f586bd1b5ad"; + sha256 = "1z3akh0ywzihr0ghk6f8x9z38mwqy3zg29p0q69h4i6yzhxpdmxa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0920232421bf177f2ab8595fab7e203f40b1a34/recipes/drawille"; sha256 = "01rl21hbj3hwy072yr27jl6iql331v131d3mr9zifg9v6f3jqbil"; - name = "drawille"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -15415,9 +20203,14 @@ license = lib.licenses.free; }; }) {}; - drill-instructor-AZIK-force = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + drill-instructor-AZIK-force = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "drill-instructor-AZIK-force"; + ename = "drill-instructor-AZIK-force"; version = "20151122.2114"; src = fetchFromGitHub { owner = "myuhe"; @@ -15425,10 +20218,10 @@ rev = "008cea202dc31d7d6fb1e7d8e6334d516403b7a5"; sha256 = "0lzq0mkhhj3s5yrcbs576qxkd8h0m2ikc4iplk97ddpzh4nz4127"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb5ee8a113b98e8df8368c5e17c6d762decf8f5b/recipes/drill-instructor-AZIK-force"; sha256 = "1bb698r11m58csd2rm17fmiw691p25npphzqgjiiqbn4vx35ja7f"; - name = "drill-instructor-AZIK-force"; + name = "recipe"; }; packageRequires = [ popup ]; meta = { @@ -15436,9 +20229,13 @@ license = lib.licenses.free; }; }) {}; - drone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + drone = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "drone"; + ename = "drone"; version = "20161106.118"; src = fetchFromGitHub { owner = "olymk2"; @@ -15446,10 +20243,10 @@ rev = "1d4ee037ad3208847a4235426edf0c4a3e7b1899"; sha256 = "1dwxgzf32cvfi7b6zw3qzamj82zs2c0ap6i1w0jqqgzmkz20dqvf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b62e697798627b07000ac72c19ecd1d89c22229/recipes/drone"; sha256 = "0wjbmgic715i4nxk90nasfamk04lskl8dll9y5klk32w1lsj546q"; - name = "drone"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15457,9 +20254,15 @@ license = lib.licenses.free; }; }) {}; - dropbox = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, oauth }: - melpaBuild { + dropbox = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild + , oauth }: + melpaBuild { pname = "dropbox"; + ename = "dropbox"; version = "20170502.1722"; src = fetchFromGitHub { owner = "pavpanchekha"; @@ -15467,10 +20270,10 @@ rev = "d85bbf6caa4203d6088ea29f5c057c1e9bcacd85"; sha256 = "15fg46pb64sz17sz3bqcpvg0nlsy4fs7ppzdq7q1686q3ihczk31"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dropbox"; sha256 = "1dqjsn7wkjjvbwq3kgdd7bvwrirappwnhcwkj2ai19dpx6jd8wym"; - name = "dropbox"; + name = "recipe"; }; packageRequires = [ json oauth ]; meta = { @@ -15478,9 +20281,14 @@ license = lib.licenses.free; }; }) {}; - drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: - melpaBuild { + drupal-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , php-mode }: + melpaBuild { pname = "drupal-mode"; + ename = "drupal-mode"; version = "20171120.1509"; src = fetchFromGitHub { owner = "arnested"; @@ -15488,10 +20296,10 @@ rev = "47fda0a38a5b197f4606137d9c3b7d44aaeaa886"; sha256 = "1rg46prsymxc9lyhk7cbr53089p970mmmybiir2qsyx2s4m6mnfl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn"; - name = "drupal-mode"; + name = "recipe"; }; packageRequires = [ php-mode ]; meta = { @@ -15499,9 +20307,13 @@ license = lib.licenses.free; }; }) {}; - drupal-spell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + drupal-spell = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "drupal-spell"; + ename = "drupal-spell"; version = "20130520.955"; src = fetchFromGitHub { owner = "arnested"; @@ -15509,10 +20321,10 @@ rev = "a69f5e3b62c4c0da74ce26c1d00d5b8f7395e4ae"; sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb859d9755bde3fd852bc7d08f2fab2429ba31b3/recipes/drupal-spell"; sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3"; - name = "drupal-spell"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15520,20 +20332,24 @@ license = lib.licenses.free; }; }) {}; - dsvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dsvn = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dsvn"; + ename = "dsvn"; version = "20130120.1257"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "dsvn"; - rev = "17bce692e9bd5a43373d5cb1d66da50e1acb903b"; - sha256 = "1bv4ivv9j5r0ax4vay1kmwv753y44qj6qprr38yh7ky0fpsml34c"; + rev = "b01e3601ac26735efa3f1fedc81e9a4f6e173635"; + sha256 = "1rfl10zqksvrry3l4g4h9gp3banmfas1n3qn9lsw8nbm259w1sf4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dsvn"; sha256 = "1kgc0b8as7w1h9dsknv2h7dzr6jcrs0j0p376050pshgzcm79nm6"; - name = "dsvn"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15541,20 +20357,24 @@ license = lib.licenses.free; }; }) {}; - dtrace-script-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dtrace-script-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dtrace-script-mode"; + ename = "dtrace-script-mode"; version = "20150213.2223"; src = fetchFromGitHub { owner = "dotemacs"; repo = "dtrace-script-mode"; - rev = "801af1ef16075d31a19830ebb8404bbf3a322f10"; - sha256 = "1blfx3r2xd3idbfjrx44ma3x1d83xp67il2s2bmdwa8qz92z99lf"; + rev = "a92f76c65b9fb64d448e503b4ea7ff06085be8ee"; + sha256 = "0maj816qrrawdpj72hd33qcgl4wrn9cbqz26l4zfb124z1m35yqv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dtrace-script-mode"; sha256 = "00ar2qahgqpf4an6v9lbzgj73ylbavvigsm8kqdq94ghm4awxi4z"; - name = "dtrace-script-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15562,20 +20382,24 @@ license = lib.licenses.free; }; }) {}; - dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dtrt-indent = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dtrt-indent"; - version = "20180319.648"; + ename = "dtrt-indent"; + version = "20180628.1438"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "0ac070c9576e4ebab12cd6800ac2ac3abcecc2c1"; - sha256 = "0dambn5l0wvbhccvhh5hbz9hw66y4mp1la3wj85dl9kgr7hq1ry7"; + rev = "084dac7ab36a89d2a7d6cb8f443b1eccbfd189e2"; + sha256 = "1afb7la1nfymhi9pzf00r3hf8w6h7scv22vps8jbijg27kvssk9k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5"; - name = "dtrt-indent"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15583,9 +20407,13 @@ license = lib.licenses.free; }; }) {}; - dts-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dts-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dts-mode"; + ename = "dts-mode"; version = "20161103.523"; src = fetchFromGitHub { owner = "bgamari"; @@ -15593,10 +20421,10 @@ rev = "9ee0854446dcc6c53d2b8d2941051768dba50344"; sha256 = "1k8lljdbc90nd29xrhdrsscxavzdq532wq2mg7ljc94krj7538b1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/864a7ec64c46a0357710bc80ad4880dd35b2fda1/recipes/dts-mode"; sha256 = "1k8cbiayajbzwkm0s0kyin0qpq9yhymidz0srs4hbvsnb6hvp234"; - name = "dts-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15604,20 +20432,25 @@ license = lib.licenses.free; }; }) {}; - ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ducpel = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ducpel"; + ename = "ducpel"; version = "20140702.454"; src = fetchFromGitHub { owner = "alezost"; repo = "ducpel"; - rev = "b53b935ab95c02b82ccf38f63c89e39e99477a55"; - sha256 = "07cgwkfi69xjjxx9hs5rdblsil1h3bpbx9k7hwyv1dg3ivihm04s"; + rev = "2f2ce2df269d99261c808a5c4ebc00d6d2cddabc"; + sha256 = "19a8q9nakjzyzv7aryndifjr9c8jls9a2v7ilfjj8kscwxpjqlzb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d64adac965e1dac0f29dab9a587cd6ce9c3bb3a/recipes/ducpel"; sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc"; - name = "ducpel"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -15625,9 +20458,14 @@ license = lib.licenses.free; }; }) {}; - dumb-diff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dumb-diff = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dumb-diff"; + ename = "dumb-diff"; version = "20171211.1322"; src = fetchFromGitHub { owner = "jacktasia"; @@ -15635,10 +20473,10 @@ rev = "1a2331d283049b71a07c1b06b1e0627a950d55f4"; sha256 = "05gmpp4s9y2ql27vb5vpqn3xh35qjfxgq9gzyvg86df43qfl8wvl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf7fa0b4235247d82569ed078f92774f10afa45c/recipes/dumb-diff"; sha256 = "1h1dvxbj85kgi04lxh0bpx81f6sl1fd56lhjmq1cw9biwqw0sm0c"; - name = "dumb-diff"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -15646,20 +20484,29 @@ license = lib.licenses.free; }; }) {}; - dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: - melpaBuild { + dumb-jump = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup + , s }: + melpaBuild { pname = "dumb-jump"; - version = "20180323.1942"; + ename = "dumb-jump"; + version = "20180615.2114"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "9e4090ac9108da9a794194b831dc6226998c623b"; - sha256 = "1hablgysv2a2jlwnp7hgxglraznbc992ikd3myxfspqr3f6rzm9q"; + rev = "cad3c4040be06703a9b40aa36ba38f1dc0927a66"; + sha256 = "175nwn616xqhwayn78acf6ivkxdh3z1vfb0ihslidq1s3xsg5ypk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; sha256 = "1j90n8gydsp2v07rysz1k5vf6hspybcl27214sib1iz3hbimid1w"; - name = "dumb-jump"; + name = "recipe"; }; packageRequires = [ dash emacs f popup s ]; meta = { @@ -15667,9 +20514,13 @@ license = lib.licenses.free; }; }) {}; - dummyparens = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dummyparens = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dummyparens"; + ename = "dummyparens"; version = "20141009.324"; src = fetchFromGitHub { owner = "snosov1"; @@ -15677,10 +20528,10 @@ rev = "9798ef1d0eaa24e4fe66f8aa6022a8c62714cc89"; sha256 = "0g72nnz0j6dvllyxyrw20z1vg6p7sy46yy0fq017pa77sgqm0xzh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1f6199a9afece4d6eb581dc8e513601d55a5833/recipes/dummyparens"; sha256 = "1yah8kpqkk9ygm73iy51fzwc8q5nw0xlwqir2qld1fc5y1lkb7dk"; - name = "dummyparens"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15688,9 +20539,13 @@ license = lib.licenses.free; }; }) {}; - duplicate-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + duplicate-thing = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "duplicate-thing"; + ename = "duplicate-thing"; version = "20120515.948"; src = fetchFromGitHub { owner = "ongaeshi"; @@ -15698,10 +20553,10 @@ rev = "f6ed0232fd0653621afe450d53775a32a9d0e328"; sha256 = "1qaiwm8mf4656gc1pdj8ivgy4abkjsypr52pvf4nrdkkln9qzfli"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be28db1bfbd663af5b5c24bad50372fddd341982/recipes/duplicate-thing"; sha256 = "1jx2b6h23dj561xhizzbpxp3av69ic8zdw4kkf0py1jm3gnrmlm4"; - name = "duplicate-thing"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15709,9 +20564,14 @@ license = lib.licenses.free; }; }) {}; - dut-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dut-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dut-mode"; + ename = "dut-mode"; version = "20170729.1411"; src = fetchFromGitHub { owner = "dut-lang"; @@ -15719,10 +20579,10 @@ rev = "9235c7acaa6690942e9de8b7acd1e4be0c859dc1"; sha256 = "0fpqsm6y23anyx57gp4c6whzxrn8x03cp76iwx27c4gkq6ph1z8n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf49ceab8b25591fab2ed6574cba0e6634d1539/recipes/dut-mode"; sha256 = "0hlr5qvqcqdh2k1nyq621z6vq2yiflj4jy0pgg6lbiy3j6819mai"; - name = "dut-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -15730,19 +20590,25 @@ license = lib.licenses.free; }; }) {}; - dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + dyalog-mode = callPackage ({ cl-lib ? null + , emacs + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dyalog-mode"; - version = "20171211.722"; + ename = "dyalog-mode"; + version = "20180605.1413"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "87db00b912be"; - sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp"; + rev = "b2322f244c76"; + sha256 = "0vgi6cw14fp8iihzmnk7jifdlbqhhcgnh26r30mnvsbycmbnvf0r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq"; - name = "dyalog-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -15750,9 +20616,13 @@ license = lib.licenses.free; }; }) {}; - dylan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dylan-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dylan-mode"; + ename = "dylan-mode"; version = "20160405.1514"; src = fetchFromGitHub { owner = "dylan-lang"; @@ -15760,10 +20630,10 @@ rev = "7e8ba16bf125f0066d3e1caeefaba94a6d32ac72"; sha256 = "0fxdv594k6p4kv6nc598rw51sy4x10dvbyhzn3gni2linb3v1c5h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94481ba3ebba6a99f11efab5a33e8bc6ea2d857a/recipes/dylan-mode"; sha256 = "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy"; - name = "dylan-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15771,20 +20641,27 @@ license = lib.licenses.free; }; }) {}; - dynamic-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, melpaBuild, pcache, persistent-soft }: - melpaBuild { + dynamic-fonts = callPackage ({ fetchFromGitHub + , fetchurl + , font-utils + , lib + , melpaBuild + , pcache + , persistent-soft }: + melpaBuild { pname = "dynamic-fonts"; + ename = "dynamic-fonts"; version = "20140731.526"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "dynamic-fonts"; - rev = "ab0c65accbdb59acaed5b263327e22ec019b3e82"; - sha256 = "150dj1g49q9x9zx9wkymq30l5gc8c4mhsq91fm6q0yj6ip7hlfxh"; + rev = "004ee6014dc7dbff8f14d26015c91d9229f6eac0"; + sha256 = "04rz0nqnkv6cjvm1yb83r4nxgnpkzcxxhyxkqwdjhka2c5dbisr4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/dynamic-fonts"; sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q"; - name = "dynamic-fonts"; + name = "recipe"; }; packageRequires = [ font-utils pcache persistent-soft ]; meta = { @@ -15792,9 +20669,13 @@ license = lib.licenses.free; }; }) {}; - dynamic-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dynamic-ruler = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dynamic-ruler"; + ename = "dynamic-ruler"; version = "20160602.108"; src = fetchFromGitHub { owner = "rocher"; @@ -15802,10 +20683,10 @@ rev = "c9c0de6fe5721f06b50e01d9b4684b519c71b367"; sha256 = "09skp2d5likqjlrsfis3biqw59sjkgid5249fld9ahqm5f1wq296"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/926c43867120db429807ff5aaacc8af65a1738c8/recipes/dynamic-ruler"; sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc"; - name = "dynamic-ruler"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15813,9 +20694,13 @@ license = lib.licenses.free; }; }) {}; - dynamic-spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dynamic-spaces = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dynamic-spaces"; + ename = "dynamic-spaces"; version = "20171027.1151"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -15823,10 +20708,10 @@ rev = "97ae8480c257ba573ca3d06dbf602f9b23c41d38"; sha256 = "0qs7gqjl6ilwwmd21663345az6766j7h1pv7wvd2kyh24yfs1xkj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0b59ce66132cbe2b1f41b665dcb30bdd04bc48b/recipes/dynamic-spaces"; sha256 = "0l4hwqivzv51j7h5sgd91dxb5slylmrfrvf7r6w0k04bhld6ry0c"; - name = "dynamic-spaces"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15834,20 +20719,25 @@ license = lib.licenses.free; }; }) {}; - e2ansi = callPackage ({ face-explorer, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + e2ansi = callPackage ({ face-explorer + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "e2ansi"; - version = "20180327.1323"; + ename = "e2ansi"; + version = "20180403.1215"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "e2ansi"; - rev = "e7f8512c2c6be2b1c4cc22f00d41d073562c2249"; - sha256 = "1q4ld4qk230yglqfmgl9dg45kn1252yfrw8pjhm1m361pypcnlw8"; + rev = "f886e687d50ff58063a92d40623f2400fa913af0"; + sha256 = "0wg16hdmhbhll0ffp2hrqmr12ddai2s6gql52q6pz9k3lw6v0d5m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e655a3fdfae80ea120cdb2ce84dd4fd36f9a71e/recipes/e2ansi"; sha256 = "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94"; - name = "e2ansi"; + name = "recipe"; }; packageRequires = [ face-explorer ]; meta = { @@ -15855,9 +20745,14 @@ license = lib.licenses.free; }; }) {}; - e2wm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }: - melpaBuild { + e2wm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , window-layout }: + melpaBuild { pname = "e2wm"; + ename = "e2wm"; version = "20170214.1636"; src = fetchFromGitHub { owner = "kiwanami"; @@ -15865,10 +20760,10 @@ rev = "4353d3394c77a49f8f0291c239858c8c5e877549"; sha256 = "12midsrx07pdrsr1qbl2rpi7xyhxqx08bkz7n7gf8vsmqkpfp56s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8da85815c39f58552a968ae68ee07c08c53b0f61/recipes/e2wm"; sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la"; - name = "e2wm"; + name = "recipe"; }; packageRequires = [ window-layout ]; meta = { @@ -15876,9 +20771,16 @@ license = lib.licenses.free; }; }) {}; - e2wm-R = callPackage ({ e2wm, ess, fetchFromGitHub, fetchurl, inlineR, lib, melpaBuild }: - melpaBuild { + e2wm-R = callPackage ({ e2wm + , ess + , fetchFromGitHub + , fetchurl + , inlineR + , lib + , melpaBuild }: + melpaBuild { pname = "e2wm-R"; + ename = "e2wm-R"; version = "20151230.126"; src = fetchFromGitHub { owner = "myuhe"; @@ -15886,10 +20788,10 @@ rev = "4350601ee1a96bf89777b3f09f1b79b88e2e6e4d"; sha256 = "1g77gf24abwcvf7z52vs762s6jp978pnvza8zmzwkwfvp1mkx233"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a3ba9843bdf275815b149e4c4b0a947bbc5e614/recipes/e2wm-R"; sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh"; - name = "e2wm-R"; + name = "recipe"; }; packageRequires = [ e2wm ess inlineR ]; meta = { @@ -15897,9 +20799,14 @@ license = lib.licenses.free; }; }) {}; - e2wm-bookmark = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + e2wm-bookmark = callPackage ({ e2wm + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "e2wm-bookmark"; + ename = "e2wm-bookmark"; version = "20151122.2121"; src = fetchFromGitHub { owner = "myuhe"; @@ -15907,10 +20814,10 @@ rev = "bad816b6d8049984d69bcd277b7d325fb84d55eb"; sha256 = "121vd44f42bxqvdjswmjlghf1jalbs974b6cip2i049k1n08xgh0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45488849da42ac775e532f30f588bfabb7af3cae/recipes/e2wm-bookmark"; sha256 = "1myaqxzrgff5gxcn3zn1bsmyf5122ql1mwr05wamd450lq8nmbw5"; - name = "e2wm-bookmark"; + name = "recipe"; }; packageRequires = [ e2wm ]; meta = { @@ -15918,9 +20825,15 @@ license = lib.licenses.free; }; }) {}; - e2wm-direx = callPackage ({ direx, e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + e2wm-direx = callPackage ({ direx + , e2wm + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "e2wm-direx"; + ename = "e2wm-direx"; version = "20170509.601"; src = fetchFromGitHub { owner = "aki2o"; @@ -15928,10 +20841,10 @@ rev = "b47f19d15436cc28233a812a1150689f61d11046"; sha256 = "0lihc02b0792kk61vcmhi0jwb7c4w2hi19g6a0q1598b3rci82nf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8320cf626050cf455c97ef22e7a8ccfb253e3243/recipes/e2wm-direx"; sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg"; - name = "e2wm-direx"; + name = "recipe"; }; packageRequires = [ direx e2wm ]; meta = { @@ -15939,20 +20852,26 @@ license = lib.licenses.free; }; }) {}; - e2wm-pkgex4pl = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild, plsense-direx }: - melpaBuild { + e2wm-pkgex4pl = callPackage ({ e2wm + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , plsense-direx }: + melpaBuild { pname = "e2wm-pkgex4pl"; + ename = "e2wm-pkgex4pl"; version = "20140525.347"; src = fetchFromGitHub { owner = "aki2o"; repo = "e2wm-pkgex4pl"; - rev = "7ea994450727190c4f3cb46cb429ba41b692ecc0"; - sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d"; + rev = "b72561b75e98961f05544a2159d83592c964ba1e"; + sha256 = "1cx6kdxhq9ybwwvc1vpwcfy08yf1h4xacgimm36kp9xayvxsmq2j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f84b421cb1673d2a9fe820cee11dc4a6e72adad/recipes/e2wm-pkgex4pl"; sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil"; - name = "e2wm-pkgex4pl"; + name = "recipe"; }; packageRequires = [ e2wm plsense-direx ]; meta = { @@ -15960,9 +20879,15 @@ license = lib.licenses.free; }; }) {}; - e2wm-svg-clock = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild, svg-clock }: - melpaBuild { + e2wm-svg-clock = callPackage ({ e2wm + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , svg-clock }: + melpaBuild { pname = "e2wm-svg-clock"; + ename = "e2wm-svg-clock"; version = "20150106.506"; src = fetchFromGitHub { owner = "myuhe"; @@ -15970,10 +20895,10 @@ rev = "d425925e3afffcbe2ff74edc80b714e4319d4c94"; sha256 = "0h1fnlpvy2mqfxjv64znghmiadh9qimj9q9a60cxhyc0bq0prz6f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/784f5598910ecf208a68fa97448e148a8ebefa32/recipes/e2wm-svg-clock"; sha256 = "0q02lksrbn43s8d9rzpglqybalglpi6qi9lix0cllag6i7fzcbms"; - name = "e2wm-svg-clock"; + name = "recipe"; }; packageRequires = [ e2wm svg-clock ]; meta = { @@ -15981,20 +20906,25 @@ license = lib.licenses.free; }; }) {}; - e2wm-sww = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + e2wm-sww = callPackage ({ e2wm + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "e2wm-sww"; + ename = "e2wm-sww"; version = "20140524.158"; src = fetchFromGitHub { owner = "aki2o"; repo = "e2wm-sww"; - rev = "1063f9854bd34db5ac771cd1036cecc89834729d"; - sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g"; + rev = "db454ac3eddd53a62f2725f6e2d5ac455caf200c"; + sha256 = "1a8z94z0wp9r4kh44bn2m74k866jwq7zvjihxmmzr0rfb85q2d99"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc873e8271e9f372e08da5d0e4b77c8ba0e3a8cb/recipes/e2wm-sww"; sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8"; - name = "e2wm-sww"; + name = "recipe"; }; packageRequires = [ e2wm ]; meta = { @@ -16002,9 +20932,16 @@ license = lib.licenses.free; }; }) {}; - e2wm-term = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + e2wm-term = callPackage ({ e2wm + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "e2wm-term"; + ename = "e2wm-term"; version = "20141009.608"; src = fetchFromGitHub { owner = "aki2o"; @@ -16012,10 +20949,10 @@ rev = "65b5ac88043d5c4048920a048f3599904ca55981"; sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9a800f5af893cb670cedb47e4a723c407be8429/recipes/e2wm-term"; sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g"; - name = "e2wm-term"; + name = "recipe"; }; packageRequires = [ e2wm log4e yaxception ]; meta = { @@ -16023,20 +20960,26 @@ license = lib.licenses.free; }; }) {}; - eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + eacl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "eacl"; - version = "20180308.1656"; + ename = "eacl"; + version = "20180607.658"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "80113a9f6cc246cef67e3e20ec052788c38ab116"; - sha256 = "1pwppn0m288d6j9b7cdshgc3rxv0nfs94klc1fpsyfxqx0a6f23z"; + rev = "ccf1401b1acff67fe445c95e8be7b09e8c3ae5d8"; + sha256 = "0v02asdmhj5la9nqck2230s04gf518cjs7wa4lykf8j46bc13vac"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr"; - name = "eacl"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -16044,9 +20987,13 @@ license = lib.licenses.free; }; }) {}; - easy-after-load = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + easy-after-load = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "easy-after-load"; + ename = "easy-after-load"; version = "20170817.531"; src = fetchFromGitHub { owner = "pd"; @@ -16054,10 +21001,10 @@ rev = "29e20145da49ac9ea40463c552130777408040de"; sha256 = "00xgd39qc760lmxpbggzn98aks5nad08b5ry54pkszjlmh37yqj7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/easy-after-load"; sha256 = "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys"; - name = "easy-after-load"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16065,20 +21012,24 @@ license = lib.licenses.free; }; }) {}; - easy-escape = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + easy-escape = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "easy-escape"; + ename = "easy-escape"; version = "20161209.744"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "easy-escape"; - rev = "63fa5fcf9a53b7d3c1e872081e65afad5a722ba8"; - sha256 = "11v5pzpyrzada07laa3jh6c1hafwrpx1pxvp7r1azqy9fpi3slnz"; + rev = "8623aa9d715fe7677ea24d7164ea6e4ecdb3e65b"; + sha256 = "12shxdr03l39vj3grsncym1mv2vn39k58vvhbwc1q591adqhwalz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39e3b867fa3143e9dc7c2fefa57b5755f70b433/recipes/easy-escape"; sha256 = "1zspb79x6s151wwiian45j1nh0xps8y8yd98byyn5lbwbj2pp2gk"; - name = "easy-escape"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16086,20 +21037,26 @@ license = lib.licenses.free; }; }) {}; - easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + easy-hugo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "easy-hugo"; - version = "20180326.2215"; + ename = "easy-hugo"; + version = "20180719.20"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "161354d0f06e2cdbe63610fb11880ae54e050181"; - sha256 = "12dxb0kzb02h6zal65n6bviy3zdkqjfbzsf7ncsbbmq8f1xrajmc"; + rev = "8bf48b973905c4ab488633226b3dfb3317d8c745"; + sha256 = "0yjxg1mql7ha6wa5wdkngs6y3lqz5y5y0hbsmpvqdw61paqm2ggs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g"; - name = "easy-hugo"; + name = "recipe"; }; packageRequires = [ emacs popup ]; meta = { @@ -16107,20 +21064,25 @@ license = lib.licenses.free; }; }) {}; - easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + easy-jekyll = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "easy-jekyll"; - version = "20180327.342"; + ename = "easy-jekyll"; + version = "20180513.1107"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "faeff895ab2aa0ee9c6df18046817e8a3f0b62a1"; - sha256 = "1dp1r16rr5gqbh3aw900v2jz146c3qnlbjf5k75fazdglkbnagxk"; + rev = "84c19d0380617ce2e40a2b42ce9bedf65e52779d"; + sha256 = "1vbb60vb98nqbwrxl6p3gcvjpnjlscp0hp4k53rcgjd75w9vbnsj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv"; - name = "easy-jekyll"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -16128,20 +21090,26 @@ license = lib.licenses.free; }; }) {}; - easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + easy-kill = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "easy-kill"; + ename = "easy-kill"; version = "20151030.2229"; src = fetchFromGitHub { owner = "leoliu"; repo = "easy-kill"; - rev = "e2b667f651a3531164d24ea4cbcd8c34fba0e17f"; - sha256 = "0i2plbvaalapx3svryn5lrc68m0qj1xm0z577xxzq7i9z91nanq7"; + rev = "af565684a71b24be1f602fda5b986d841fc33b3a"; + sha256 = "1l4wl9wyjgcvl44iziicz9kzhvdw8pz1hzgd41bbmwj7jrfb3fqv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d0a74c2a7d8859e9311bc8d71f5e6cf5a8063b6/recipes/easy-kill"; sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i"; - name = "easy-kill"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -16149,9 +21117,14 @@ license = lib.licenses.free; }; }) {}; - easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + easy-kill-extras = callPackage ({ easy-kill + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "easy-kill-extras"; + ename = "easy-kill-extras"; version = "20161028.504"; src = fetchFromGitHub { owner = "knu"; @@ -16159,10 +21132,10 @@ rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd"; sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras"; sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy"; - name = "easy-kill-extras"; + name = "recipe"; }; packageRequires = [ easy-kill ]; meta = { @@ -16170,9 +21143,14 @@ license = lib.licenses.free; }; }) {}; - easy-repeat = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + easy-repeat = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "easy-repeat"; + ename = "easy-repeat"; version = "20150516.148"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -16180,10 +21158,10 @@ rev = "060f0e6801c82c40c06961dc0528a00e18947a8c"; sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1f5e0d19043f6a24ab4069c9c850e96cbe61a8f/recipes/easy-repeat"; sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06"; - name = "easy-repeat"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -16191,20 +21169,26 @@ license = lib.licenses.free; }; }) {}; - ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ebal = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ebal"; + ename = "ebal"; version = "20171231.2216"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "1740118125ae7aa6ba82d36e1fe0e69065a6fcaa"; - sha256 = "1i5r8m34zf7ya1kzgm8hsx707phq5smf2x6y2a1ykbnfkk39gmbf"; + rev = "3a7a9a66efed30416e2013da80fed2f79b91def1"; + sha256 = "0vxxswbx8l9jcv81akw1bd7ra4k51gjmv79z11fhbzf17n7y910a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg"; - name = "ebal"; + name = "recipe"; }; packageRequires = [ emacs f ]; meta = { @@ -16212,20 +21196,27 @@ license = lib.licenses.free; }; }) {}; - ebf = callPackage ({ cl-lib ? null, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ebf = callPackage ({ cl-lib ? null + , dash + , dash-functional + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ebf"; + ename = "ebf"; version = "20160211.958"; src = fetchFromGitHub { owner = "rexim"; repo = "ebf"; - rev = "4cd9c26354d8be6571354b2954d21fba882e78a2"; - sha256 = "1pgn6fcg5cnbpk93hc2vw95sna07x0s1v2i6lq9bmij2msvar611"; + rev = "b52dd2fa8c6a4a7acf4d93c16f54fbd9fbe087df"; + sha256 = "1yyx6z251bgvcfi3jzdq4cnmyd8vmz3gffbzii5bdga4ms288j5d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22e2f6383f2a7a01778c0524af19a68af57796ae/recipes/ebf"; sha256 = "072w1hczzb4z0dadvqy8px9zfnfd2z0w8nwa7q2qm5njg30rrqpb"; - name = "ebf"; + name = "recipe"; }; packageRequires = [ cl-lib dash dash-functional ]; meta = { @@ -16233,20 +21224,28 @@ license = lib.licenses.free; }; }) {}; - ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: - melpaBuild { + ebib = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parsebib + , seq }: + melpaBuild { pname = "ebib"; - version = "20180213.531"; + ename = "ebib"; + version = "20180428.1401"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "cbad0a51d7905712201d83e9f4f52a7bb047652f"; - sha256 = "1jmg63q4msy83nr0xzivay9n8nv48kawqj5jxlfq83fwkvnk1szm"; + rev = "212dea4a52f04eaa1d13a895fffea04f5884f12b"; + sha256 = "150dggfk79pk11qlzfl2sk1xaibdy0sbh6n94r7i2w235p2yg8p5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid"; - name = "ebib"; + name = "recipe"; }; packageRequires = [ dash emacs parsebib seq ]; meta = { @@ -16254,9 +21253,13 @@ license = lib.licenses.free; }; }) {}; - ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ecb = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ecb"; + ename = "ecb"; version = "20170728.1221"; src = fetchFromGitHub { owner = "ecb-home"; @@ -16264,10 +21267,10 @@ rev = "1330a44cf3c171781083b0b926ab7622f64e6e81"; sha256 = "0nx1blkvnzrxd2l7ckdihm9fvq5vkcghf6qccagkjzk4zbdalz30"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db5183f35bedbc459843ad9f442f9cb6608c5fc/recipes/ecb"; sha256 = "0z61p9zgv7gcx04m4jv16a3mn9kjvnw0rdd65kpvbmzkgls0nk8d"; - name = "ecb"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16275,20 +21278,30 @@ license = lib.licenses.free; }; }) {}; - eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: - melpaBuild { + eclim = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild + , popup + , s + , yasnippet }: + melpaBuild { pname = "eclim"; + ename = "eclim"; version = "20171113.1754"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff"; - sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13"; + rev = "4f27d04c30a026f24c0ff18c3a7d36e3fb5b57a5"; + sha256 = "1krrm123vzv6hw54kbkbh1xj6j090rdm4r2fcqp76b3hg8j8cpn1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; sha256 = "1n60ci6kjmzy2khr3gs7s8gf21j1f9zjaj5a1yy2dyygsarbxw7b"; - name = "eclim"; + name = "recipe"; }; packageRequires = [ cl-lib dash json popup s yasnippet ]; meta = { @@ -16296,9 +21309,13 @@ license = lib.licenses.free; }; }) {}; - eclipse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eclipse-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eclipse-theme"; + ename = "eclipse-theme"; version = "20160430.322"; src = fetchFromGitHub { owner = "abo-abo"; @@ -16306,10 +21323,10 @@ rev = "dc54d9312d97210823b922038076e2b1b132eff2"; sha256 = "03yyagd37l9kgdnkqrkvrcgp5njyl4an0af7cfmcdnpyjghczf4d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81fcf3536ead18a91400f6936b3f789b4b594b9c/recipes/eclipse-theme"; sha256 = "0mww0jysxqky1zkkhvhj7fn20w970n2w6501rdm5jwqfb58ivxfx"; - name = "eclipse-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16317,9 +21334,19 @@ license = lib.licenses.free; }; }) {}; - ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ecukes = callPackage ({ ansi + , commander + , dash + , espuds + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ecukes"; + ename = "ecukes"; version = "20171216.408"; src = fetchFromGitHub { owner = "ecukes"; @@ -16327,10 +21354,10 @@ rev = "3a77ba9f1064c2bca47b401974c009e65727c46e"; sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0"; - name = "ecukes"; + name = "recipe"; }; packageRequires = [ ansi commander dash espuds f s ]; meta = { @@ -16338,9 +21365,16 @@ license = lib.licenses.free; }; }) {}; - edbi = callPackage ({ concurrent, ctable, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edbi = callPackage ({ concurrent + , ctable + , epc + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edbi"; + ename = "edbi"; version = "20160224.1741"; src = fetchFromGitHub { owner = "kiwanami"; @@ -16348,10 +21382,10 @@ rev = "6f50aaf4bde75255221f2292c7a4ad3fa9d918c0"; sha256 = "0x0igyvdcm4863n7zndvcv6wgzwgn7324cbfjja6xd7r0k936zdy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/238a11afa52d2c01d69eb16ffd7d07ccd6dff403/recipes/edbi"; sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr"; - name = "edbi"; + name = "recipe"; }; packageRequires = [ concurrent ctable epc ]; meta = { @@ -16359,20 +21393,26 @@ license = lib.licenses.free; }; }) {}; - edbi-database-url = callPackage ({ edbi, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edbi-database-url = callPackage ({ edbi + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edbi-database-url"; + ename = "edbi-database-url"; version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "edbi-database-url"; - rev = "d56c580268cd93651998c4c6b1c5558e6b6ca90f"; - sha256 = "1nkfl8jngkdz8h951jig39af1wh5vrc5lqk58l2i4lc2znprj9lx"; + rev = "a6e4be7547ee8e0bb43a11ff173d6271b21b5012"; + sha256 = "0f59s0a7zpa3dny1k7x6zrymrnzba184smq8v1vvz8hkc0ym1j1v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e25bf3d65ef2fb09eb0802cfd3e3faee86a5cfdb/recipes/edbi-database-url"; sha256 = "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn"; - name = "edbi-database-url"; + name = "recipe"; }; packageRequires = [ edbi emacs ]; meta = { @@ -16380,30 +21420,42 @@ license = lib.licenses.free; }; }) {}; - edbi-django = callPackage ({ edbi, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edbi-django = callPackage ({ edbi + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pythonic }: + melpaBuild { pname = "edbi-django"; - version = "20160221.1123"; + ename = "edbi-django"; + version = "20180627.300"; src = fetchFromGitHub { owner = "proofit404"; repo = "edbi-django"; - rev = "61c70d3a727ff28c1c7d1eb61af1efba7a268b8f"; - sha256 = "0kp2g0vb7pag57n20blqfri01cnkaxa0h6adbg2bfw7vcbn3h1gd"; + rev = "5fe3fe82c8691af91dfc24ad3dc591ca228ec875"; + sha256 = "1ssznmfgr0g497j1syikzj8yndnjby7225fskkd5x2z3krjgs4id"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345cafbf5358f8179bcbcb895cace75f289c02f1/recipes/edbi-django"; sha256 = "1s59hab35hwnspyklxbhi0js0sgdn0rc7y33dqjk0psjcikqymg1"; - name = "edbi-django"; + name = "recipe"; }; - packageRequires = [ edbi emacs f ]; + packageRequires = [ edbi emacs pythonic ]; meta = { homepage = "https://melpa.org/#/edbi-django"; license = lib.licenses.free; }; }) {}; - edbi-minor-mode = callPackage ({ edbi, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edbi-minor-mode = callPackage ({ edbi + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edbi-minor-mode"; + ename = "edbi-minor-mode"; version = "20160706.747"; src = fetchFromGitHub { owner = "proofit404"; @@ -16411,10 +21463,10 @@ rev = "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec"; sha256 = "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb878b60c7ecbb1e3a47aef1d9765061c510644/recipes/edbi-minor-mode"; sha256 = "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi"; - name = "edbi-minor-mode"; + name = "recipe"; }; packageRequires = [ edbi ]; meta = { @@ -16422,9 +21474,15 @@ license = lib.licenses.free; }; }) {}; - edbi-sqlite = callPackage ({ edbi, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edbi-sqlite = callPackage ({ edbi + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edbi-sqlite"; + ename = "edbi-sqlite"; version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; @@ -16432,10 +21490,10 @@ rev = "52cb9ca1af7691b592f2cfd2f007847e7a4ccd5f"; sha256 = "1vll81386fx90lq5sy4rlxcik6mvw7zx5cc51f0yaca9bkcckp51"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edbi-sqlite"; sha256 = "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y"; - name = "edbi-sqlite"; + name = "recipe"; }; packageRequires = [ edbi emacs ]; meta = { @@ -16443,20 +21501,27 @@ license = lib.licenses.free; }; }) {}; - ede-compdb = callPackage ({ cl-lib ? null, ede ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, semantic ? null }: - melpaBuild { + ede-compdb = callPackage ({ cl-lib ? null + , ede ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , semantic ? null }: + melpaBuild { pname = "ede-compdb"; + ename = "ede-compdb"; version = "20150920.1333"; src = fetchFromGitHub { owner = "randomphrase"; repo = "ede-compdb"; - rev = "d6d8466cd62876fc90adeff5875a1a584fd846cd"; - sha256 = "1cfjw9b1lm29s5cbh0qqmkchbq2382s71w4rpb0gyf603s0yg13m"; + rev = "23c91082270fcef24ea791b848f1604e36888ff0"; + sha256 = "03xphcdw4b6z8i3dgrmq0l8m5nfpsjn0jv0y1rlabrbvxw1gpcqq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b70138b7d82aec2d60f4a7c0cd21e734a1fc52a/recipes/ede-compdb"; sha256 = "1ypi7rxbgg2qck1b571hcw5m4ipllb48g6sindpdf180kbfbfpn7"; - name = "ede-compdb"; + name = "recipe"; }; packageRequires = [ cl-lib ede semantic ]; meta = { @@ -16464,9 +21529,13 @@ license = lib.licenses.free; }; }) {}; - ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ede-php-autoload = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ede-php-autoload"; + ename = "ede-php-autoload"; version = "20170428.933"; src = fetchFromGitHub { owner = "stevenremot"; @@ -16474,10 +21543,10 @@ rev = "65e502602dbc623257a820245d41f94cf2e1f07d"; sha256 = "1569g3rnklxnnknrs9nmyjk9axrdhpr9pcz2ma925sb388jyrf5r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; sha256 = "0b7qbighncipgfaksvggpyldc5h0wxbjbiyaghglvycc4p1sfjd0"; - name = "ede-php-autoload"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16485,20 +21554,27 @@ license = lib.licenses.free; }; }) {}; - ede-php-autoload-composer-installers = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ede-php-autoload-composer-installers = callPackage ({ ede-php-autoload + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ede-php-autoload-composer-installers"; + ename = "ede-php-autoload-composer-installers"; version = "20170221.1226"; src = fetchFromGitHub { owner = "xendk"; repo = "ede-php-autoload-composer-installers"; - rev = "7840439802c7d11ee086bbf465657f3da12f9f66"; - sha256 = "1dkq0py1sybmpy59h3szafa59g5g3jp8l9az22l15qgmkpbqydh4"; + rev = "3e2fde975a06757b363e235c67e6341ebe668f60"; + sha256 = "11sjq86nm7yqxi0y5n37c2c3w0p6mc28n85j40qj8nd7b2nb9s3j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e0e9058593b32b8d9fd7873d4698b4dd516930f/recipes/ede-php-autoload-composer-installers"; sha256 = "0s7dv81niz4h8kj0648x2nbmz47hqxchfs2rjmjpy2lcbifvj268"; - name = "ede-php-autoload-composer-installers"; + name = "recipe"; }; packageRequires = [ ede-php-autoload f s ]; meta = { @@ -16506,9 +21582,16 @@ license = lib.licenses.free; }; }) {}; - ede-php-autoload-drupal = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ede-php-autoload-drupal = callPackage ({ ede-php-autoload + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ede-php-autoload-drupal"; + ename = "ede-php-autoload-drupal"; version = "20170316.1458"; src = fetchFromGitHub { owner = "xendk"; @@ -16516,10 +21599,10 @@ rev = "54a04241d94fabc4f4d16ae4dc8ba4f0c6e3b435"; sha256 = "1ckfja95zk4f7fgvycia7nxhxjgz4byrz30ic63f6kcq4dx78scs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal"; sha256 = "139sr7jy5hb8h5zmw5mw01r0dy7yvbbyaxzj62m1a589n8w6a964"; - name = "ede-php-autoload-drupal"; + name = "recipe"; }; packageRequires = [ ede-php-autoload f s ]; meta = { @@ -16527,9 +21610,13 @@ license = lib.licenses.free; }; }) {}; - edebug-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edebug-x = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edebug-x"; + ename = "edebug-x"; version = "20130615.2325"; src = fetchFromGitHub { owner = "ScottyB"; @@ -16537,10 +21624,10 @@ rev = "a2c2c42553d3bcbd5ac11898554865acbed1bc46"; sha256 = "1zgiifi1k2d9g8sarfpjzamk8g1yx4ilgn60mqhy2pznp30b5qb2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/204e40cd450f4223598be1f385f08ec82b44f70c/recipes/edebug-x"; sha256 = "0mzrip6y346mix4ny1xj8rkji1w531ix24k3cczmlmm4hm7l29ql"; - name = "edebug-x"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16548,9 +21635,13 @@ license = lib.licenses.free; }; }) {}; - edit-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edit-at-point = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edit-at-point"; + ename = "edit-at-point"; version = "20150716.624"; src = fetchFromGitHub { owner = "enoson"; @@ -16558,10 +21649,10 @@ rev = "3b800c11685102e1eab62ec71c5fc1589ebb81a7"; sha256 = "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/edit-at-point"; sha256 = "1mijasr4ww6vcjfyk7jdv4mh7w2rrspqbbmqayiy2918qg2x01df"; - name = "edit-at-point"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16569,9 +21660,15 @@ license = lib.licenses.free; }; }) {}; - edit-color-stamp = callPackage ({ cl-lib ? null, es-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edit-color-stamp = callPackage ({ cl-lib ? null + , es-lib + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edit-color-stamp"; + ename = "edit-color-stamp"; version = "20130529.1033"; src = fetchFromGitHub { owner = "sabof"; @@ -16579,10 +21676,10 @@ rev = "32dc1ca5bcf3dcf83fad5e39b55dc5b77becb3d3"; sha256 = "0vk954f44m2bq7qb122pzlb8fibrisx47ihvn3h96m8nmx0fv32r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ad2ea105b895cb958ce0ab2bf2fad2b40d41b2f/recipes/edit-color-stamp"; sha256 = "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8"; - name = "edit-color-stamp"; + name = "recipe"; }; packageRequires = [ cl-lib es-lib ]; meta = { @@ -16590,20 +21687,25 @@ license = lib.licenses.free; }; }) {}; - edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edit-indirect = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edit-indirect"; - version = "20170928.430"; + ename = "edit-indirect"; + version = "20180422.1107"; src = fetchFromGitHub { owner = "Fanael"; repo = "edit-indirect"; - rev = "032ac0ec690d4999d564fd882588c7a197efe8dd"; - sha256 = "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r"; + rev = "de645d8144e8a08f039a9c88185121ec81d957ef"; + sha256 = "0xg6p3ccch9k920xhhpyhn5mkgc0sfyxsn8l1wsc6vbbp5h7wlad"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect"; sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439"; - name = "edit-indirect"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -16611,9 +21713,16 @@ license = lib.licenses.free; }; }) {}; - edit-indirect-region-latex = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild }: - melpaBuild { + edit-indirect-region-latex = callPackage ({ edit-indirect + , emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild }: + melpaBuild { pname = "edit-indirect-region-latex"; + ename = "edit-indirect-region-latex"; version = "20161128.2245"; src = fetchFromGitHub { owner = "niitsuma"; @@ -16621,10 +21730,10 @@ rev = "05043f2c0c9838947d3ca4b51b695deb7c47612e"; sha256 = "0dgac0nk9x4sz4lisxb5badrzpcjqjwgi79hhl1y6mafzm0ncqs2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/edit-indirect-region-latex"; sha256 = "0ys0fpfk259g14wvg0nnkc3wk1dbjjd2n4a636jblgq63w6g3h79"; - name = "edit-indirect-region-latex"; + name = "recipe"; }; packageRequires = [ edit-indirect emacs ht ]; meta = { @@ -16632,9 +21741,13 @@ license = lib.licenses.free; }; }) {}; - edit-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edit-list = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edit-list"; + ename = "edit-list"; version = "20100930.743"; src = fetchFromGitHub { owner = "emacsmirror"; @@ -16642,10 +21755,10 @@ rev = "f460d3f9e208a4e606fe6ded307f1b011916ca71"; sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8aa348ce5289a8b1238f186affac1d544af755/recipes/edit-list"; sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv"; - name = "edit-list"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16653,20 +21766,24 @@ license = lib.licenses.free; }; }) {}; - edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edit-server = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edit-server"; + ename = "edit-server"; version = "20180120.752"; src = fetchFromGitHub { owner = "stsquad"; repo = "emacs_chrome"; - rev = "f01f5775760d73a8b0975d8caf009c3b1e7b2229"; - sha256 = "1rri1h1ilhmyspp8krbqh2qz4f4wigmxk8kwvg39pr4mmma3dz4f"; + rev = "de3b6483362637beeb185192bc92f23e75a15b82"; + sha256 = "06w0v2a3f2mjbhj206fdmpnisqj612swxrzg2zznk8hrgsimbnhl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server"; sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0"; - name = "edit-server"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16674,9 +21791,14 @@ license = lib.licenses.free; }; }) {}; - edit-server-htmlize = callPackage ({ edit-server, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edit-server-htmlize = callPackage ({ edit-server + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edit-server-htmlize"; + ename = "edit-server-htmlize"; version = "20130329.1548"; src = fetchFromGitHub { owner = "frobtech"; @@ -16684,10 +21806,10 @@ rev = "e7f8dadfabe869c77ca241cd6fbd4c52bd908392"; sha256 = "174xq45xc632zrb916aw7q4bch96pbi6zgy3dk77qla3ky9cfpl3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/219b037401a81ce70bd2106dabffa16d8b0c7cef/recipes/edit-server-htmlize"; sha256 = "007lv3698a88wxan7kplz2117azxxpzzgshin9c1aabg059hszlj"; - name = "edit-server-htmlize"; + name = "recipe"; }; packageRequires = [ edit-server ]; meta = { @@ -16695,20 +21817,25 @@ license = lib.licenses.free; }; }) {}; - editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + editorconfig = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "editorconfig"; - version = "20180329.2148"; + ename = "editorconfig"; + version = "20180708.228"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "f316d65a0f565aceb06c39926c20ab5533399eed"; - sha256 = "17kx6x7yw951gg0fnjr18ihdxg2yvpmbirqn6gdc83yz3i3gm0kf"; + rev = "cc5a99005d6f3834cbc7acf78a517044c5dcdad6"; + sha256 = "05pkligzkvd7imn93mxcdsrmdsjarx5309hg0cyrxra76rngx2yv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; sha256 = "0zv96m07ml8i3k7zm7sdci4hn611n3ypna7zppfkwbdyr7d5k2gc"; - name = "editorconfig"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -16716,9 +21843,14 @@ license = lib.licenses.free; }; }) {}; - editorconfig-charset-extras = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + editorconfig-charset-extras = callPackage ({ editorconfig + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "editorconfig-charset-extras"; + ename = "editorconfig-charset-extras"; version = "20180222.2057"; src = fetchFromGitHub { owner = "10sr"; @@ -16726,10 +21858,10 @@ rev = "ddf60923c6f4841cb593b2ea04c9c710a01d262f"; sha256 = "1v5a6s4x7cm6i0bxaqdpsg8vqj479lp5h45glx4ipk0icdq8cvd9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62f27dad806fa135209289933f2131ee4ce8f8bf/recipes/editorconfig-charset-extras"; sha256 = "15p9qpdwradcnjr0nf0ibhy94yi73l18xz7zxf6khmdirsirpwgh"; - name = "editorconfig-charset-extras"; + name = "recipe"; }; packageRequires = [ editorconfig ]; meta = { @@ -16737,20 +21869,25 @@ license = lib.licenses.free; }; }) {}; - editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + editorconfig-custom-majormode = callPackage ({ editorconfig + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "editorconfig-custom-majormode"; - version = "20170509.141"; + ename = "editorconfig-custom-majormode"; + version = "20180507.1942"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-custom-majormode-el"; - rev = "b5350d20b2730a0f029c9e1d651e50cf9a809fa9"; - sha256 = "1xk3c0g0a6g2p7wg26aphl6cdz45iql0s4w1qa8np2hly10a4cxy"; + rev = "ae613f0a56364afbbab19d4377c108406d5cfc7c"; + sha256 = "0sm3xdysnqzc6nc2n7rcnr478l7qdy7bv8rhq500240aprzv63y4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd47bf4630442ad1a941ad432cef64c7746aa71/recipes/editorconfig-custom-majormode"; sha256 = "0ykvjg3gwxky6w5cm0y5s63q9820b7d25fy9plw8sarxwy2a5lxy"; - name = "editorconfig-custom-majormode"; + name = "recipe"; }; packageRequires = [ editorconfig ]; meta = { @@ -16758,20 +21895,26 @@ license = lib.licenses.free; }; }) {}; - editorconfig-domain-specific = callPackage ({ cl-lib ? null, editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + editorconfig-domain-specific = callPackage ({ cl-lib ? null + , editorconfig + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "editorconfig-domain-specific"; - version = "20160705.802"; + ename = "editorconfig-domain-specific"; + version = "20180505.224"; src = fetchFromGitHub { owner = "lassik"; repo = "editorconfig-emacs-domain-specific"; - rev = "0142ddff7b3293c82b0a83ad2c3edd6ee1a84ddd"; - sha256 = "08pjm719jxanqzrs2blhaqhm4wvzqyg9y56mkgwdlpdg722gn175"; + rev = "e9824160fb2e466afa755240ee3ab7cc5657fb04"; + sha256 = "0gkwhvywfpnay7rxb2bmsnywcd89qw710bsp53sk5fvilgfwfpkj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/831a7dd7ef853ca44709eabfd48ee97113705319/recipes/editorconfig-domain-specific"; sha256 = "1rkan6q7z0qfq28zg114iik71nghd7fbs4g8qppzhgr3pwbpn73q"; - name = "editorconfig-domain-specific"; + name = "recipe"; }; packageRequires = [ cl-lib editorconfig ]; meta = { @@ -16779,9 +21922,16 @@ license = lib.licenses.free; }; }) {}; - edn = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, peg }: - melpaBuild { + edn = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , peg }: + melpaBuild { pname = "edn"; + ename = "edn"; version = "20160215.419"; src = fetchFromGitHub { owner = "expez"; @@ -16789,10 +21939,10 @@ rev = "be9e32d1b49e35247b263b0243df7cfdc8d413ab"; sha256 = "1xp2hjhn52k6l1g6ypva6dsklpawni7gvjafbz6404f9dyxflh7l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/305dd770d9db86d5ee602e6bd571b7c4f6c4ddbe/recipes/edn"; sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg"; - name = "edn"; + name = "recipe"; }; packageRequires = [ cl-lib emacs peg ]; meta = { @@ -16800,9 +21950,20 @@ license = lib.licenses.free; }; }) {}; - edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: - melpaBuild { + edts = callPackage ({ auto-complete + , auto-highlight-symbol + , dash + , erlang + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup + , s }: + melpaBuild { pname = "edts"; + ename = "edts"; version = "20171030.9"; src = fetchFromGitHub { owner = "tjarvstrand"; @@ -16810,10 +21971,10 @@ rev = "6ef4bdf571235ee1b078db321402270cabff7fda"; sha256 = "1nzf8wdv0hs4kp69cy3blwxh18c2bkxr4d4y6ggdp0vmwv41j3zi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts"; sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr"; - name = "edts"; + name = "recipe"; }; packageRequires = [ auto-complete @@ -16829,20 +21990,25 @@ license = lib.licenses.free; }; }) {}; - efire = callPackage ({ circe, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + efire = callPackage ({ circe + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "efire"; + ename = "efire"; version = "20151009.1331"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "efire"; - rev = "91a644662afb352475efad0b377713656f131e5c"; - sha256 = "1c2iyv392ap35nss4j901h33d3lx9lmq5v43flf2rid1766pam6v"; + rev = "d38dd6dd7974b7cb11bff6fd84846fd01163211a"; + sha256 = "15sc4648lkxsgv2frcfb878z86a7vynixsp1x5i5rg66bd9gzhfy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39dc592e92f0377a354d1b17f42172409a836484/recipes/efire"; sha256 = "1c8vdc58i0k7vvanwhckfc31226d3rb5xq77lh9ydgnd4i97gq2w"; - name = "efire"; + name = "recipe"; }; packageRequires = [ circe ]; meta = { @@ -16850,9 +22016,15 @@ license = lib.licenses.free; }; }) {}; - eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eg = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eg"; + ename = "eg"; version = "20170830.115"; src = fetchFromGitHub { owner = "davep"; @@ -16860,10 +22032,10 @@ rev = "1c7f1613d2aaae728ef540305f6ba030616f86bd"; sha256 = "1g2ha6q9k6dmi63i2p4aypwf5mha699wr7yy5dsck39mqk15hx0f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg"; sha256 = "1ic6qzk0zmay3vvbb8jg35irqkc0k68dmgbq4j9isiawy449zvp7"; - name = "eg"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -16871,20 +22043,24 @@ license = lib.licenses.free; }; }) {}; - egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + egg = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "egg"; - version = "20160330.2047"; + ename = "egg"; + version = "20180713.218"; src = fetchFromGitHub { owner = "byplayer"; repo = "egg"; - rev = "cadc5c7fd21142d7ea41732200ab52eac0b96d3f"; - sha256 = "1qrblglkafwzfds8x5wp4yrn1gq8iz823iilxcp9mwycbw57ajw8"; + rev = "5bf9879eec067e25a60f2363137c9e69f7b5cc68"; + sha256 = "0k7j76hqgnlci944vz1gbyifqd4fh6agmpmf5a883vimw5fpm2q9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1c97870c2641d73685f07a12f010530cc186544/recipes/egg"; sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i"; - name = "egg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16892,20 +22068,24 @@ license = lib.licenses.free; }; }) {}; - egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + egison-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "egison-mode"; + ename = "egison-mode"; version = "20160603.103"; src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "94b0e8e2066f3910d8630f9152c7618e8654fb96"; - sha256 = "0z9g2qqn3dxw79qv93jsl7jpn05fxd2mafxwg3yb8hnd8xlnb7jy"; + rev = "0f8289294b1a8de029f89643438e8384e7ee789f"; + sha256 = "1rkxz4gj11z1jpd3g71m6sbzb5j4ggm6sixk3r18wb8wv91v4fgs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi"; - name = "egison-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16913,9 +22093,47 @@ license = lib.licenses.free; }; }) {}; - ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: - melpaBuild { + eglot = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , jsonrpc + , lib + , melpaBuild }: + melpaBuild { + pname = "eglot"; + ename = "eglot"; + version = "20180722.1107"; + src = fetchFromGitHub { + owner = "joaotavora"; + repo = "eglot"; + rev = "8d61ecaa8c38a02322c281ac7072e2884d63012f"; + sha256 = "0bcs97irg1qqsnjyby0ncm0kl64yrri3vgicfyakl978pixz5hr7"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6c644530eca56f93d94fac2c9d7663c35c2b8c01/recipes/eglot"; + sha256 = "17w39hcgv4p49g841qaicjdx7xac72yxvsc83jf1rrakg713pj7y"; + name = "recipe"; + }; + packageRequires = [ emacs jsonrpc ]; + meta = { + homepage = "https://melpa.org/#/eglot"; + license = lib.licenses.free; + }; + }) {}; + ego = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , ht + , htmlize + , lib + , melpaBuild + , mustache + , org + , simple-httpd }: + melpaBuild { pname = "ego"; + ename = "ego"; version = "20180228.1704"; src = fetchFromGitHub { owner = "emacs-china"; @@ -16923,10 +22141,10 @@ rev = "719809679c1a60887735db41abae53b61f08ef59"; sha256 = "10f179kl53la4dyikzl1xysccx4gk04skzwaw3w1pgr8f5fjppxc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ego"; sha256 = "09k33ggc6n7wgykaawbmh6hyrl9dqp0azaq9zcjhjbc88nszj7fj"; - name = "ego"; + name = "recipe"; }; packageRequires = [ dash emacs ht htmlize mustache org simple-httpd ]; meta = { @@ -16934,18 +22152,23 @@ license = lib.licenses.free; }; }) {}; - eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + eide = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eide"; - version = "20180330.1330"; + ename = "eide"; + version = "20180626.1259"; src = fetchgit { - url = "https://git.tuxfamily.org/eide/emacs-ide.git"; - rev = "4023c7b19ed75e0e2a58af7b737aff23589ab6f9"; - sha256 = "0j3gdsnk64xnk028rrc3ngyzjrzsyafpdg1kxnf1p10jrig6pwyy"; + url = "https://framagit.org/eide/eide.git"; + rev = "6bd4c3b67a532527b3514c72bf2d7371172b8a93"; + sha256 = "1jrbvzf7mk8jpdm3i9vipq9wsgny3ni896s12n68d9chby5cj65n"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/34b70a5616e27ff9904a2803c86e049acfe9b26d/recipes/eide"; - sha256 = "168f4mz10byq1kdcfd029gkb3j6jk6lc4kdr4g204823x073f0ni"; - name = "eide"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a42244392719c620b47bc43a7a8501dab4b6f74e/recipes/eide"; + sha256 = "1962shxcfn3v1ljann7182ca6ciy5xfbcd6l9l8rc8gikp55qv8m"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16953,9 +22176,13 @@ license = lib.licenses.free; }; }) {}; - eimp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eimp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eimp"; + ename = "eimp"; version = "20120826.1339"; src = fetchFromGitHub { owner = "nicferrier"; @@ -16963,10 +22190,10 @@ rev = "2e7536fe6d8f7faf1bad7a8ae37faba0162c3b4f"; sha256 = "154d57yafxbcf39r89n5j43c86rp2fki3lw3gwy7ww2g6qkclcra"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/eimp"; sha256 = "00g77bg49m38cjfbh17ccnmksz05qx7yvgl6i4i4hysbr2d8pgxd"; - name = "eimp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16974,20 +22201,33 @@ license = lib.licenses.free; }; }) {}; - ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: - melpaBuild { + ein = callPackage ({ auto-complete + , cl-generic + , dash + , deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , request-deferred + , s + , skewer-mode + , websocket }: + melpaBuild { pname = "ein"; - version = "20180311.1029"; + ename = "ein"; + version = "20180626.1257"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "115c16eb9f38447790a75c71e67036c5f4be15e0"; - sha256 = "112wnfhn468gfgac1vhclm6lycsp904wmf60akcng71fqgvyzcda"; + rev = "cfd9c641c0c517738f33b7ead6de34d755ba24b1"; + sha256 = "03csx3pbgbch2s5kkckczcxd5gqghapgvhz71jihxqxsal1r6mzn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r"; - name = "ein"; + name = "recipe"; }; packageRequires = [ auto-complete @@ -17005,20 +22245,25 @@ license = lib.licenses.free; }; }) {}; - ein-mumamo = callPackage ({ ein, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ein-mumamo = callPackage ({ ein + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ein-mumamo"; + ename = "ein-mumamo"; version = "20150301.1628"; src = fetchFromGitHub { owner = "millejoh"; repo = "ein-mumamo"; - rev = "028fefec499598add1a87b92ed991891f38f0c7b"; - sha256 = "1w0b3giy9ca35pp2ni4afnqas64a2vriilab7jiw9anp3ryh6570"; + rev = "57eb0876ab3fba52c1007ce5793d5319cae629c7"; + sha256 = "1426d8lrkx5kml6m1b3pv4117z34v96d8iq24m1q5w6ar72mspxg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd8fcf7f6332f94dc37697f9412c8043da8d4f76/recipes/ein-mumamo"; sha256 = "029sk90xz9fhv2s56f5hp0aks1d6ybz517009vv4892bbzkpjv1w"; - name = "ein-mumamo"; + name = "recipe"; }; packageRequires = [ ein ]; meta = { @@ -17026,9 +22271,13 @@ license = lib.licenses.free; }; }) {}; - eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eink-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eink-theme"; + ename = "eink-theme"; version = "20170717.807"; src = fetchFromGitHub { owner = "maio"; @@ -17036,10 +22285,10 @@ rev = "4c990bb3428f725735fa1f733ef4c5ad61f632b0"; sha256 = "0jxs36qdsx58ni5185qyi1c7gchyla3dpv4v9drj1n072ls82ld4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme"; sha256 = "0z437cpf1b8bqyi7bv0w0dnc52q4f5g17530lwdcxjkr38s9b1zn"; - name = "eink-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17047,20 +22296,30 @@ license = lib.licenses.free; }; }) {}; - ejc-sql = callPackage ({ auto-complete, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: - melpaBuild { + ejc-sql = callPackage ({ auto-complete + , clomacs + , dash + , direx + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , spinner }: + melpaBuild { pname = "ejc-sql"; - version = "20180328.623"; + ename = "ejc-sql"; + version = "20180701.1105"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "7601c4492fd3d896bf6ef6624f4bfad2c25bd57d"; - sha256 = "17cs6lzkvwqn3qnz31dd2r6lpvmsrib75ryi1dsd8m2f1z5f1pwh"; + rev = "f957bb5e1e9e1aab0c7f1770f5e8144b9c26c93f"; + sha256 = "09556l03wvszx9dpndcp3rz72r0yfg1s79b84zmrbliwyq740xbz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx"; - name = "ejc-sql"; + name = "recipe"; }; packageRequires = [ auto-complete clomacs dash direx emacs spinner ]; meta = { @@ -17068,9 +22327,13 @@ license = lib.licenses.free; }; }) {}; - el-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-autoyas = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-autoyas"; + ename = "el-autoyas"; version = "20120918.617"; src = fetchFromGitHub { owner = "mattfidler"; @@ -17078,10 +22341,10 @@ rev = "bde0251ecb504f585dfa27c205c8e312655310cc"; sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc4845343dbb8f8294394f6850788e4f1fe6b99b/recipes/el-autoyas"; sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c"; - name = "el-autoyas"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17089,20 +22352,50 @@ license = lib.licenses.free; }; }) {}; - el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-fly-indent-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "el-fly-indent-mode"; + ename = "el-fly-indent-mode"; + version = "20180421.1943"; + src = fetchFromGitHub { + owner = "jiahaowork"; + repo = "el-fly-indent-mode.el"; + rev = "1dd4b907ff4d9581c18b4e38e8719e83ba0dace1"; + sha256 = "15l74s3jissjs7jpdmrgy8ys50b0ir27nm0d25lbs4yxhsmvzq2b"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/237311b98eec4b577409f55e16d8e640936d41a2/recipes/el-fly-indent-mode"; + sha256 = "00iqiawbzijm515lswbkzxf1m6ys242xrg6lzf8k40g2ygyd1q1r"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/el-fly-indent-mode"; + license = lib.licenses.free; + }; + }) {}; + el-get = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-get"; - version = "20180126.1603"; + ename = "el-get"; + version = "20180610.1821"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "e065feaa545087dd49f690a838237fe6239b00f6"; - sha256 = "18hd7x3rk335r8ps1mpg1lpymywaswpg3w2s3m36khd56m3vd4yf"; + rev = "8e96907b8b2a95485b8e1e5a450510513ed9e524"; + sha256 = "0xzkgzhdr1dda95wx6i8ygb9wylxjm2j7n53mldz2gigswl6lsja"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz"; - name = "el-get"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17110,20 +22403,27 @@ license = lib.licenses.free; }; }) {}; - el-init = callPackage ({ anaphora, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-init = callPackage ({ anaphora + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-init"; + ename = "el-init"; version = "20150728.220"; src = fetchFromGitHub { owner = "HKey"; repo = "el-init"; - rev = "6b45551b8ed473c8a0c897b743b0378a3501556c"; - sha256 = "0qk5jk0n7ga2cxqnm69rsy5cjjn5b4l4yqgaafvmmrrp70p8drmi"; + rev = "25fd21d820bca1cf576b8f70c8d5a3bc76792597"; + sha256 = "1mzla7ijmq1mgzr6bf16mjdycbf8ylsf4zdk4j6fh5kw5n4k6c5n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c18cc62ffaaf839284ed7b261cc6f375fab813/recipes/el-init"; sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5"; - name = "el-init"; + name = "recipe"; }; packageRequires = [ anaphora cl-lib emacs ]; meta = { @@ -17131,20 +22431,30 @@ license = lib.licenses.free; }; }) {}; - el-init-viewer = callPackage ({ anaphora, cl-lib ? null, ctable, dash, el-init, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-init-viewer = callPackage ({ anaphora + , cl-lib ? null + , ctable + , dash + , el-init + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-init-viewer"; + ename = "el-init-viewer"; version = "20150303.28"; src = fetchFromGitHub { owner = "HKey"; repo = "el-init-viewer"; - rev = "dbcb4418fe342dfd7da805f2d7caf1def68db7f9"; - sha256 = "0flf0pa3xwrdhfkshyr6nqrm957sgx9jkganbasqavbq1dvlw6lj"; + rev = "c40417db7808c8b8c9b2f196a69de5da7eee84a2"; + sha256 = "1dc2dr2s6agchg116189zdw96dwvik9d6dcw06jr5mh2gp4apvpa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f90e6be757783352c4a7732177ff2e2c0a066247/recipes/el-init-viewer"; sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m"; - name = "el-init-viewer"; + name = "recipe"; }; packageRequires = [ anaphora cl-lib ctable dash el-init emacs ]; meta = { @@ -17152,20 +22462,24 @@ license = lib.licenses.free; }; }) {}; - el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-mock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-mock"; + ename = "el-mock"; version = "20170824.1254"; src = fetchFromGitHub { owner = "rejeep"; repo = "el-mock.el"; - rev = "5df1d3a956544f1d3ad0bcd81daf47fff33ab8cc"; - sha256 = "06ldnrpqvbdxfzr8v7pj9xacgvkp36xjlhvjkpxldmqj1l5v8a6w"; + rev = "e65ec012a724d0f2518e6601279a07e34716cc45"; + sha256 = "0iyjcihpd79rz2pzasc5c166py34n1fp66jgbm1dxspsid3cznn7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock"; sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l"; - name = "el-mock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17173,20 +22487,25 @@ license = lib.licenses.free; }; }) {}; - el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-patch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-patch"; - version = "20171016.1743"; + ename = "el-patch"; + version = "20180720.821"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "a5999539e42fb41d2b31f09022b9efe27ae76684"; - sha256 = "0qbf851ab8h0zjqr9kvnlwcg6magsldlr835vks576g9cz62zp49"; + rev = "aaa4c4c1afaa48da9da210010f5131affbff720a"; + sha256 = "04hmhnx854519k53b8r04zmd21hi9bgs9j5yphv7kizn0cpbrjka"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; sha256 = "1imijmsni8c8fxjrzprnanf94c1pma3h5w9p75c4y99l8l3xmj7g"; - name = "el-patch"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -17194,9 +22513,15 @@ license = lib.licenses.free; }; }) {}; - el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }: - melpaBuild { + el-pocket = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web }: + melpaBuild { pname = "el-pocket"; + ename = "el-pocket"; version = "20170922.549"; src = fetchFromGitHub { owner = "pterygota"; @@ -17204,10 +22529,10 @@ rev = "a80abfb67efe68ada1d7d0a73aecee57e763baaa"; sha256 = "0q4nsgqpjmmxml5pcb6im1askk6q7c3ykzv6fgf1w8jgkvdifa6f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/el-pocket"; sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw"; - name = "el-pocket"; + name = "recipe"; }; packageRequires = [ emacs web ]; meta = { @@ -17215,9 +22540,13 @@ license = lib.licenses.free; }; }) {}; - el-spec = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-spec = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-spec"; + ename = "el-spec"; version = "20121018.4"; src = fetchFromGitHub { owner = "uk-ar"; @@ -17225,10 +22554,10 @@ rev = "1dbc465401d4aea5560318c4f13ff30920a0718d"; sha256 = "1lsq7980pwcwlg7z37hrig8ddm9nyvaqrlczv1w0vy631vc5z2az"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407e344bf4e4b3885ebb7df02ebb37feee5e2515/recipes/el-spec"; sha256 = "017syizs8qw5phwvpzzffzdnj6rh9q4n7s51qjvj8qfb3088igkh"; - name = "el-spec"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17236,20 +22565,24 @@ license = lib.licenses.free; }; }) {}; - el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-spice = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-spice"; + ename = "el-spice"; version = "20180128.921"; src = fetchFromGitHub { owner = "vedang"; repo = "el-spice"; - rev = "4e0852ebf5d8e9cbb3eaaa6ae9c53d126b53f58c"; - sha256 = "08mkn4qfxax3fgppw79117phm05hihifwj4pgll9ivrilbf75lb8"; + rev = "972dace20ec61cd27b9322432d0c7a688c6f061a"; + sha256 = "1wrb46y4s4v0lwwyriz2qn1j1l804jyb4dmadf462jxln85rml70"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4666eee9f6837d6d9dba77e04aa4c8c4a93b47b5/recipes/el-spice"; sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg"; - name = "el-spice"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17257,9 +22590,16 @@ license = lib.licenses.free; }; }) {}; - el-sprunge = callPackage ({ emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, web-server }: - melpaBuild { + el-sprunge = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild + , web-server }: + melpaBuild { pname = "el-sprunge"; + ename = "el-sprunge"; version = "20140106.1739"; src = fetchFromGitHub { owner = "eschulte"; @@ -17267,10 +22607,10 @@ rev = "37855ec60aeb4d565c49a4d711edc7341e9a22cb"; sha256 = "04k1fz0ypmfzgwamncp2vz0lq54bq6y7c8k9nm39csp2564vmbbc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/547209532faf45b35b55350783ccee532ce2bcbb/recipes/el-sprunge"; sha256 = "0rb1cr7zrfl1s5prxy3xwdqgnm8ddw33pcvk049km2qbccb08v6a"; - name = "el-sprunge"; + name = "recipe"; }; packageRequires = [ emacs htmlize web-server ]; meta = { @@ -17278,9 +22618,13 @@ license = lib.licenses.free; }; }) {}; - el-spy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-spy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-spy"; + ename = "el-spy"; version = "20131226.1208"; src = fetchFromGitHub { owner = "uk-ar"; @@ -17288,10 +22632,10 @@ rev = "b1dead9d1877660856ada22d906ac4e54695aec7"; sha256 = "016l3inzb7dby0w58najj2pvymwk6gllsxvqj2fkz3599i36p1pn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a90318a38c35e648152ec5fb2dd86c432af9553/recipes/el-spy"; sha256 = "1bgv4mgsnkmjdyay7lhkqdszvnwpjy4dxxw11kq45w866ba8645n"; - name = "el-spy"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17299,20 +22643,24 @@ license = lib.licenses.free; }; }) {}; - el-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-x = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-x"; + ename = "el-x"; version = "20140111.1401"; src = fetchFromGitHub { owner = "sigma"; repo = "el-x"; - rev = "e7c333d4fc31a90f4dca951efe21129164b42605"; - sha256 = "00wp2swrmalcifx9fsvhz9pgbf6ixvn8dpz1lq6k6pj9h24pq7wh"; + rev = "b0b69b182f7a81a550ccf9b3a14d8d91560b4f70"; + sha256 = "1dky0vydwh7l786w7gci4x17kkf6dg8gijmqzl4y0ij9zm9kfxzz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0346f6349cf39a0414cd055b06d8ed193f4972d4/recipes/el-x"; sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g"; - name = "el-x"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17320,9 +22668,13 @@ license = lib.licenses.free; }; }) {}; - el2markdown = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el2markdown = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el2markdown"; + ename = "el2markdown"; version = "20170630.1158"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -17330,10 +22682,10 @@ rev = "368d99313683cd943c99feaffca356be60bdb636"; sha256 = "1h0cr8qcvj9r3acb6bf5nyglvi5gdglwflkfl5jbzp0nm1p9iqcg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2markdown"; sha256 = "1bpfddcvg9wgc5g14clj6wyiw8rsh45rgibvlmyan2m0gmwvmqx6"; - name = "el2markdown"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17341,9 +22693,14 @@ license = lib.licenses.free; }; }) {}; - el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el2org = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el2org"; + ename = "el2org"; version = "20180311.855"; src = fetchFromGitHub { owner = "tumashu"; @@ -17351,10 +22708,10 @@ rev = "81f1c97db8911f5bdf92c729630ab509de4ec73f"; sha256 = "152y6a6qjch2w84axghzcqiswhx1cq5bq1r1gjfffh41wsddqb53"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; sha256 = "02kyvzpjws2mrp414i4zm4fmrnzgkaax6bnrlyhp17a8aqaggbnh"; - name = "el2org"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -17362,20 +22719,26 @@ license = lib.licenses.free; }; }) {}; - elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + elbank = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "elbank"; - version = "20180316.627"; + ename = "elbank"; + version = "20180316.643"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Elbank"; - rev = "28143b3076f2ac64a9db84a53e9af0ad43fe4322"; - sha256 = "0gdhdq3g34m1jqpq4m12pbf70sl5jrmj8wbakj36vh540p12f0ph"; + rev = "6dbd21e31fdf7cf62491f6d24b8198d4f91a031b"; + sha256 = "1krqvwh6a4cqbqawmydq16ardnn6ddf7wm5605794j145dd2268v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; sha256 = "1ry84aiajyrnrspf7w4yjm0rmdam8ijrz0s7291yr8c70hslc997"; - name = "elbank"; + name = "recipe"; }; packageRequires = [ emacs seq ]; meta = { @@ -17383,20 +22746,30 @@ license = lib.licenses.free; }; }) {}; - elcontext = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, osx-location, uuidgen }: - melpaBuild { + elcontext = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , ht + , hydra + , lib + , melpaBuild + , osx-location + , uuidgen }: + melpaBuild { pname = "elcontext"; - version = "20180225.2211"; + ename = "elcontext"; + version = "20180526.604"; src = fetchFromGitHub { owner = "rollacaster"; repo = "elcontext"; - rev = "d34e68f0580cc3d3eda8c85fc446c71094fc52fc"; - sha256 = "05z0xfy9s0iqzvy63bnfhdpqc04yikwairb8b00k9xkspd3sdfdl"; + rev = "f434ffc655e6349a4dd52285ff68a9194bcfc949"; + sha256 = "0gbbnx969asq73ypc5lp4qpi4iwwfzm1mmxb1fdifl2lf18p8qwv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12bcb0bfc89c1f235e4ac5d7e308e41905725dc6/recipes/elcontext"; sha256 = "1firdsrag7r02qb3kjxc3j8l9psvh117z3qwycazhxdz82z0isw7"; - name = "elcontext"; + name = "recipe"; }; packageRequires = [ emacs f ht hydra osx-location uuidgen ]; meta = { @@ -17404,20 +22777,25 @@ license = lib.licenses.free; }; }) {}; - elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elcord = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elcord"; - version = "20180306.1515"; + ename = "elcord"; + version = "20180411.1207"; src = fetchFromGitHub { owner = "Mstrodl"; repo = "elcord"; - rev = "3071250488613d8dbd79daf81ddbe3bad4b87001"; - sha256 = "0lcs0713r4vcln2im53mkfwcibr3j7ygs467rfgf163kd979gp5c"; + rev = "0cef4ca13b00d79507292d5591be8ffb7df5a9ca"; + sha256 = "1571r8iwrf4dagjr2pv7dgs1i0f20nq6jdkxm2dlwvkblcnlx3fm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord"; sha256 = "0a1f99mahaixx6j3lylc7w2zlq8f614m6xhd0x927afv3a6n50l6"; - name = "elcord"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -17425,20 +22803,52 @@ license = lib.licenses.free; }; }) {}; - eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elcouch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , json-mode + , lib + , libelcouch + , melpaBuild }: + melpaBuild { + pname = "elcouch"; + ename = "elcouch"; + version = "20180529.57"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "elcouch"; + rev = "608fe254a7ee69c43c69b905ef708189dc3e3192"; + sha256 = "0bn8xh3i962l8jzv33mmrd22fbig19bjw89hz9by5xa35q1nnvf5"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d9a35dd5a272a592d248993ea7e5dda8fdf0ab/recipes/elcouch"; + sha256 = "1dp7chvnz6gadqgyqbvdxpva3hm3sx60izsa690mp2rifjyxgqf1"; + name = "recipe"; + }; + packageRequires = [ emacs json-mode libelcouch ]; + meta = { + homepage = "https://melpa.org/#/elcouch"; + license = lib.licenses.free; + }; + }) {}; + eldoc-eval = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eldoc-eval"; - version = "20150512.506"; + ename = "eldoc-eval"; + version = "20180607.457"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "eldoc-eval"; - rev = "e87b89f89a2aed0bb3b31c014fc1b72f00413866"; - sha256 = "0vppa9xihn8777rphiw1aqp96xn16vgjwff1dwvp8z861silp8ar"; + rev = "f59a1ae7ecfa97ef659c7adb93e0673419acc485"; + sha256 = "1anpshps44zx4qrkddbxd24q63fm5y93zbwmsb1l2cwbykf5s5iz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63ba2004d3db4c5a71676dca82ad880328cf6073/recipes/eldoc-eval"; sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c"; - name = "eldoc-eval"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17446,20 +22856,27 @@ license = lib.licenses.free; }; }) {}; - eldoc-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }: - melpaBuild { + eldoc-overlay = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , inline-docs + , lib + , melpaBuild + , quick-peek }: + melpaBuild { pname = "eldoc-overlay"; + ename = "eldoc-overlay"; version = "20171219.140"; src = fetchFromGitHub { owner = "stardiviner"; repo = "eldoc-overlay"; - rev = "a391396f4cdf30a2f27a4c426b58b44ab3d0f0d0"; - sha256 = "1g1sp6ws4y28536jkf5crbkmnrl7jcbh5s3ysyys6xn8gvz0vm17"; + rev = "b13a5641f694cda92740ccdb1ee2c475507eb206"; + sha256 = "0zn68h4mcdd3j8jfrpaa5d8f0irdwly5wj6v6pm54xc8x14wc141"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f865b248002d6d3ba9653c2221072a4aa54cd740/recipes/eldoc-overlay"; sha256 = "0nn6i89xbw8vkd5ybsnc1zpnf3ra4s8pf01jdj2i59ayjs64s28x"; - name = "eldoc-overlay"; + name = "recipe"; }; packageRequires = [ emacs inline-docs quick-peek ]; meta = { @@ -17467,20 +22884,24 @@ license = lib.licenses.free; }; }) {}; - electric-case = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + electric-case = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "electric-case"; + ename = "electric-case"; version = "20150417.412"; src = fetchFromGitHub { owner = "zk-phi"; repo = "electric-case"; - rev = "bac64e772107e3dc721a9819f63b9ebdc28a81f7"; - sha256 = "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8"; + rev = "984b6a4c6c4cdcefeecb59e941f5f184cc1dedff"; + sha256 = "11rlj132xfrdp9wq0mx0dnza4k5s6ysgqs6nzjvwcw1w7a6jmwa3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/electric-case"; sha256 = "1ch108ljzg5xkk4pkfpfxm8v2yzqk79q3h2zhzzqhsydq7r07bdn"; - name = "electric-case"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17488,20 +22909,27 @@ license = lib.licenses.free; }; }) {}; - electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { + electric-operator = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names }: + melpaBuild { pname = "electric-operator"; - version = "20180322.506"; + ename = "electric-operator"; + version = "20180627.1012"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "d47149a8027907b67dfe4787a53b247be34ad4cb"; - sha256 = "0ipzhmv105621lhwjm7dvc12ap38hcg62z8z805czn6yinw6wydg"; + rev = "35db75d5c2dbed1eeab4e4126ccb84714136a307"; + sha256 = "18f043wpp8y18c4q86b0r4njl5biy2jgnnvja5vvprf6karbx5z5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2"; - name = "electric-operator"; + name = "recipe"; }; packageRequires = [ dash emacs names ]; meta = { @@ -17509,9 +22937,13 @@ license = lib.licenses.free; }; }) {}; - electric-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + electric-spacing = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "electric-spacing"; + ename = "electric-spacing"; version = "20161209.1157"; src = fetchFromGitHub { owner = "xwl"; @@ -17519,10 +22951,10 @@ rev = "9d0f8a213133f2619a4e9dfbba3b00d4348c07b0"; sha256 = "1wzf8q2k2iwnm9b5kj16bwif7g0qc7ll3cjs20gbmcnq5xmhwx9f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a78c0044f8b7a0df1af1aba407be4d7865c98c59/recipes/electric-spacing"; sha256 = "0fcsz9wmibqp6ci0pa5r4gzlrsyj5klajxpgfksa0nfj3dc94cvg"; - name = "electric-spacing"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17530,9 +22962,13 @@ license = lib.licenses.free; }; }) {}; - elein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elein = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elein"; + ename = "elein"; version = "20120120.316"; src = fetchFromGitHub { owner = "remvee"; @@ -17540,10 +22976,10 @@ rev = "d4c0c0491dbb7c90e953d7a16172107c37103605"; sha256 = "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elein"; sha256 = "01y5yrmm3biyrfgnl3qjfpn1xvjk2nabwjr8cls53ds697qpz5x2"; - name = "elein"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17551,9 +22987,14 @@ license = lib.licenses.free; }; }) {}; - elf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elf-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elf-mode"; + ename = "elf-mode"; version = "20161009.48"; src = fetchFromGitHub { owner = "abo-abo"; @@ -17561,10 +23002,10 @@ rev = "cd280d683cd3341d8bb31af6db7e3b74a133e6ab"; sha256 = "0cbvjbk2893ag1iy8ggixpirfiyhssm7fii96hb9jqdz874cdl0k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/368d1ff91f310e5ffe68f872ab0a91584a41a66e/recipes/elf-mode"; sha256 = "0xwpaqg4mc0a0d8a4dxbd1sqzvi01gfhwr75f7i3sjzx0fj8vcwd"; - name = "elf-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -17572,20 +23013,25 @@ license = lib.licenses.free; }; }) {}; - elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elfeed = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elfeed"; - version = "20180222.746"; + ename = "elfeed"; + version = "20180713.529"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "8668227f93a46fdd8d5d8746d428dd2da061e253"; - sha256 = "0v2ymm9bwwhdp4ar0da9d9g8qyw8nj47jjlqcr0d3f8sljn9d35s"; + rev = "a6fc231e47f1071cd4d1363926868761f7f0bcd8"; + sha256 = "0vlyrvzwj9rxhvnl6lawck8n2slrvhb96bxaf5pv37jqidrcsvyh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9"; - name = "elfeed"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -17593,9 +23039,19 @@ license = lib.licenses.free; }; }) {}; - elfeed-goodies = callPackage ({ ace-jump-mode, cl-lib ? null, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet, popwin, powerline }: - melpaBuild { + elfeed-goodies = callPackage ({ ace-jump-mode + , cl-lib ? null + , elfeed + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , noflet + , popwin + , powerline }: + melpaBuild { pname = "elfeed-goodies"; + ename = "elfeed-goodies"; version = "20171126.2251"; src = fetchFromGitHub { owner = "algernon"; @@ -17603,10 +23059,10 @@ rev = "fc0c3e72f9fcd7bbf5237f6f2323bc666e8240b4"; sha256 = "16qkh3cp764hayj4n003sm1q673bq7b3rzf1mii5f3xp6n8i84b7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ebb8d23961fd9bfe101f7917caa3b405493f31/recipes/elfeed-goodies"; sha256 = "0zpk6nx757hasgzcww90fzkcdn078my33p7yax7xslvi4msm37bi"; - name = "elfeed-goodies"; + name = "recipe"; }; packageRequires = [ ace-jump-mode @@ -17621,9 +23077,18 @@ license = lib.licenses.free; }; }) {}; - elfeed-org = callPackage ({ cl-lib ? null, dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: - melpaBuild { + elfeed-org = callPackage ({ cl-lib ? null + , dash + , elfeed + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , s }: + melpaBuild { pname = "elfeed-org"; + ename = "elfeed-org"; version = "20180129.507"; src = fetchFromGitHub { owner = "remyhonig"; @@ -17631,10 +23096,10 @@ rev = "b9d09a554127244d4807a3d2d90e062df63b2fd5"; sha256 = "0szij299pfxbgqfps8njnxa2w862zzn40crsbc1ppww267dbp60j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elfeed-org"; sha256 = "0rnxr2q2ib6xrdx41ams1z2ivw5zhcsmqdylyvbw62h20rlmlgm8"; - name = "elfeed-org"; + name = "recipe"; }; packageRequires = [ cl-lib dash elfeed org s ]; meta = { @@ -17642,20 +23107,27 @@ license = lib.licenses.free; }; }) {}; - elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elfeed-protocol = callPackage ({ cl-lib ? null + , elfeed + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elfeed-protocol"; - version = "20180330.344"; + ename = "elfeed-protocol"; + version = "20180409.813"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "12283230ffa5849e688350d7895f4c33c5f6d817"; - sha256 = "034m1vrnbp0pw7nd2jq2l6cj7ffmb6np7n793l75284xnvayih7g"; + rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec"; + sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; sha256 = "1gd2ny764qsnnqf3j7rbdqhh7hqd5c0fzwxx6wacd0dpbq4w56qi"; - name = "elfeed-protocol"; + name = "recipe"; }; packageRequires = [ cl-lib elfeed emacs ]; meta = { @@ -17663,20 +23135,27 @@ license = lib.licenses.free; }; }) {}; - elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: - melpaBuild { + elfeed-web = callPackage ({ elfeed + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , simple-httpd }: + melpaBuild { pname = "elfeed-web"; - version = "20180121.1036"; + ename = "elfeed-web"; + version = "20180513.524"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "8668227f93a46fdd8d5d8746d428dd2da061e253"; - sha256 = "0v2ymm9bwwhdp4ar0da9d9g8qyw8nj47jjlqcr0d3f8sljn9d35s"; + rev = "7e0abfee1470ae6323b559a7a9f843dd0076d622"; + sha256 = "01x4ww63lvn04c7f3ab5vx2s20xqisvv8213qwswz7vr9nxja5yi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n"; - name = "elfeed-web"; + name = "recipe"; }; packageRequires = [ elfeed emacs simple-httpd ]; meta = { @@ -17684,20 +23163,25 @@ license = lib.licenses.free; }; }) {}; - elgrep = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elgrep = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elgrep"; + ename = "elgrep"; version = "20180302.527"; src = fetchFromGitHub { owner = "TobiasZawada"; repo = "elgrep"; - rev = "5e982024250e75fe02aee358a542ae3ed2a472d5"; - sha256 = "0bkiay3mmk00lay2cv91qmas346ffhb2nlrg6xw083s5vk45fbbv"; + rev = "01aece62e7910c50cd199ebbe70511776043f499"; + sha256 = "0hlf3i2w1jmjj66ynxf7gvvq86yy3px24ww13hz849ai0lx5nazk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9ab623b2d634936a79ff6f4b98b31825d44b6d/recipes/elgrep"; sha256 = "0b8dma52zv57sh1jbrabfy6k5lzixs7f541s8dsqyrg0fzlq460j"; - name = "elgrep"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -17705,9 +23189,14 @@ license = lib.licenses.free; }; }) {}; - elhome = callPackage ({ fetchFromGitHub, fetchurl, initsplit, lib, melpaBuild }: - melpaBuild { + elhome = callPackage ({ fetchFromGitHub + , fetchurl + , initsplit + , lib + , melpaBuild }: + melpaBuild { pname = "elhome"; + ename = "elhome"; version = "20161025.1342"; src = fetchFromGitHub { owner = "demyanrogozhin"; @@ -17715,10 +23204,10 @@ rev = "e789e806469af3e9705f72298683c21f6c3a516d"; sha256 = "1q9glli1czbfp62aalblaak55j8rj2nl8bm8nifnnb8jrzj1qrn0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/527cc08a3424f87fe2e99119b931530840ad07ba/recipes/elhome"; sha256 = "1k7936wxgslr29511dz9az38i9vi35rcxk68gzv35v9lpj89lalh"; - name = "elhome"; + name = "recipe"; }; packageRequires = [ initsplit ]; meta = { @@ -17726,20 +23215,28 @@ license = lib.licenses.free; }; }) {}; - elisp-def = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + elisp-def = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "elisp-def"; - version = "20180331.1213"; + ename = "elisp-def"; + version = "20180410.224"; src = fetchFromGitHub { owner = "Wilfred"; repo = "elisp-def"; - rev = "7a9eb5a54d08a97394a36948071e6985cd25dabf"; - sha256 = "1pqv8fn94g57wy85fn72jfny61wfgrfmwr5s06g310g27bd3ram9"; + rev = "ff0730b8110f776862b29bf0b66e396fab2aaafb"; + sha256 = "1zdbb1mgmb8hkzsmp6l4mv61831bw8ybfsfcwalnvrw5fvfwpaik"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def"; sha256 = "1y29nsgjv9nb03g0jc5hb1a8k23r54ivdlv9h0a384cig8i91hsz"; - name = "elisp-def"; + name = "recipe"; }; packageRequires = [ dash emacs f s ]; meta = { @@ -17747,20 +23244,24 @@ license = lib.licenses.free; }; }) {}; - elisp-depend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elisp-depend = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elisp-depend"; + ename = "elisp-depend"; version = "20161230.750"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "elisp-depend"; - rev = "e4b201ac7dcee4489d58800c299fd04aaa61d07a"; - sha256 = "0i1wpz6hr934x3lcr0y9x82dm7c1j477j14jqccn8q7d4cb1lfaj"; + rev = "005fdef289fff4bd636a1deef8de6b2737e5d073"; + sha256 = "1j39b6a6qhmxpknnxx8yn3sz39ldyvf4lmvi94c4cw7pq7dmmpma"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ea159f0cc8c6e4b8483401a6e6687ab4ed73b7f/recipes/elisp-depend"; sha256 = "0zpafwnm52g6v867f1ghfb492nnmm66imcwlhm5v9hhgwy3z17jm"; - name = "elisp-depend"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17768,20 +23269,24 @@ license = lib.licenses.free; }; }) {}; - elisp-docstring-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elisp-docstring-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elisp-docstring-mode"; + ename = "elisp-docstring-mode"; version = "20170304.815"; src = fetchFromGitHub { owner = "Fuco1"; repo = "elisp-docstring-mode"; - rev = "f512e509dd690f65133e55563ebbfd2dede5034f"; - sha256 = "0al8m75p359h4n82rf0dsl22qfdg9cwwywn5pn7x6gb96c7qrqaa"; + rev = "b135d95b158048927f12184e5cfb8fe01fc44713"; + sha256 = "0jyyvrgnplbsg82miawq4fjzb9ds2wyhpqlllyg0s7q49lwsb2fi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elisp-docstring-mode"; sha256 = "0mdh3ikn6zfd3fbmifvivqih2fsijvlzalljdvm32crs9cy6fa96"; - name = "elisp-docstring-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17789,20 +23294,24 @@ license = lib.licenses.free; }; }) {}; - elisp-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elisp-format = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elisp-format"; + ename = "elisp-format"; version = "20160508.252"; src = fetchFromGitHub { owner = "Yuki-Inoue"; repo = "elisp-format"; - rev = "03cc293eb2f78ec58fc1d84279af06816a04b979"; - sha256 = "17l2xsixx3p93dmx9jsg0a3xqdg19nwp1di2pymlg41pw0kdf3x3"; + rev = "9fe516d39b349070537099a01fe34e47fbded2c8"; + sha256 = "0dmx5c2lrp8a0836zv4sv1p5h7dnmyyzm45lj3h9rqr1c8l1h7jm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff353f4228529c51577f7104cdf52c677be8a500/recipes/elisp-format"; sha256 = "1l0596y4yjn3jdyy6pgws1pgz6i12fxfy27566lmxklbxp8sxgy8"; - name = "elisp-format"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17810,9 +23319,14 @@ license = lib.licenses.free; }; }) {}; - elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elisp-lint = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elisp-lint"; + ename = "elisp-lint"; version = "20180224.1242"; src = fetchFromGitHub { owner = "gonewest818"; @@ -17820,10 +23334,10 @@ rev = "04b0d36ec0e4dc1bb54c2bf4c2d16b2af8cf6a39"; sha256 = "04hxpfgvkh4ivaxqbhnp3j68i1kqzg1v19bssnvcagll2mm4r3xg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint"; sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63"; - name = "elisp-lint"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -17831,20 +23345,27 @@ license = lib.licenses.free; }; }) {}; - elisp-refs = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: - melpaBuild { + elisp-refs = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , loop + , melpaBuild + , s }: + melpaBuild { pname = "elisp-refs"; - version = "20180331.1206"; + ename = "elisp-refs"; + version = "20180715.1602"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "788f6f65d5171b1887b3ff9e4cad900e8046b2b1"; - sha256 = "0c7hcbjqynw6k5idpmfxn6xbr192ahhk8a2g72npap97flpw6cdq"; + rev = "c3fefb803bd0a1b6de654dbd380a8487804789a5"; + sha256 = "1va1lgc6dhqif11wxsd3b5kzv01q7ys800sly2v605153ajafqw4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx"; - name = "elisp-refs"; + name = "recipe"; }; packageRequires = [ dash loop s ]; meta = { @@ -17852,20 +23373,24 @@ license = lib.licenses.free; }; }) {}; - elisp-sandbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elisp-sandbox = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elisp-sandbox"; + ename = "elisp-sandbox"; version = "20131116.1042"; src = fetchFromGitHub { owner = "joelmccracken"; repo = "elisp-sandbox"; - rev = "d894d68934ef09c42f72ac4e1173a0bedc23f139"; - sha256 = "0r70axda1piwxznksygby9vid49q4lzjwcrhx7gl5midjs961531"; + rev = "ddd669266ca36d7e4ebba73eb1ab42523787e042"; + sha256 = "1pwx0cksgf9qyd6nl1540jmp3p0adgz2sk38r5s8gbli3x109hy3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b0e7c52ff8034a1c0d1e5d7bc0c58f166986b28/recipes/elisp-sandbox"; sha256 = "1bazm1cf9ghh9b7jzqqgyfcalnrfg7vmxqbn4fiy2c76gbzlr2bp"; - name = "elisp-sandbox"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17873,20 +23398,25 @@ license = lib.licenses.free; }; }) {}; - elisp-slime-nav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elisp-slime-nav = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elisp-slime-nav"; + ename = "elisp-slime-nav"; version = "20160128.1109"; src = fetchFromGitHub { owner = "purcell"; repo = "elisp-slime-nav"; - rev = "34938422929800839e2f935aca890cd4a229ca99"; - sha256 = "00v8iqlf6pk8a0656s14jd0gv5msqy6q2af15q21f2nl4j0gl9qj"; + rev = "0e96d9f1f0d334f09414b509d44d5c000b51f432"; + sha256 = "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/elisp-slime-nav"; sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c"; - name = "elisp-slime-nav"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -17894,20 +23424,26 @@ license = lib.licenses.free; }; }) {}; - elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + elixir-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "elixir-mode"; - version = "20170918.2231"; + ename = "elixir-mode"; + version = "20180711.545"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "emacs-elixir"; - rev = "e928aaf118e399fca2df47c91712b9a469eb1764"; - sha256 = "0x0ip0mh7zn6lmzj3p3v3jlc9x1j0afrq5rfgi22zk40zkyh26zn"; + rev = "90323cd7669eb472ee1f97b9d070056ebe225d15"; + sha256 = "06kq92r9nmw95l6isc87w0yb9jmd11bm09j3hwww4sn2bv5z2686"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode"; sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf"; - name = "elixir-mode"; + name = "recipe"; }; packageRequires = [ emacs pkg-info ]; meta = { @@ -17915,9 +23451,14 @@ license = lib.licenses.free; }; }) {}; - elixir-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + elixir-yasnippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "elixir-yasnippets"; + ename = "elixir-yasnippets"; version = "20150417.539"; src = fetchFromGitHub { owner = "hisea"; @@ -17925,10 +23466,10 @@ rev = "980ca7626c14ef0573bec0035ec7942796062783"; sha256 = "1sdq4372i19wdxpdp3347a1rf5zf5w6sa0da6lr511m7ri0lj6hd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c37a13d56e9a0a4e7e2c11349ed87610a0f6b2c/recipes/elixir-yasnippets"; sha256 = "0vmkcd88wfafv31lyw0983p4qjj387qf258q7py1ij47fcmfp579"; - name = "elixir-yasnippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -17936,9 +23477,19 @@ license = lib.licenses.free; }; }) {}; - elm-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, seq }: - melpaBuild { + elm-mode = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , s + , seq }: + melpaBuild { pname = "elm-mode"; + ename = "elm-mode"; version = "20180114.9"; src = fetchFromGitHub { owner = "jcollard"; @@ -17946,10 +23497,10 @@ rev = "09c6e62e14a2c9afaad03a867c7a268b6bc68ab0"; sha256 = "0vc0m5rg9py01w07pifg3fp2z9cna6y21k2xmfns7p6i5c5fjj2g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1"; - name = "elm-mode"; + name = "recipe"; }; packageRequires = [ dash emacs f let-alist s seq ]; meta = { @@ -17957,9 +23508,14 @@ license = lib.licenses.free; }; }) {}; - elm-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + elm-yasnippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "elm-yasnippets"; + ename = "elm-yasnippets"; version = "20160331.2224"; src = fetchFromGitHub { owner = "abingham"; @@ -17967,10 +23523,10 @@ rev = "45a11a0cef0c36633fb3477d3dc4167e82779ba4"; sha256 = "1zb5yra6znkr7yaq6wqlmlr054wkv9cy1dih8h4j2gp2wnfwg968"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/340664dd1c57b539de191dd6faa9eb8ed9ae6914/recipes/elm-yasnippets"; sha256 = "0nnr0sxkxviw2i7b5s8jgvsv7lgqxqvirmvmband84q9gxlz24zb"; - name = "elm-yasnippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -17978,20 +23534,26 @@ license = lib.licenses.free; }; }) {}; - elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + elmacro = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "elmacro"; - version = "20170312.356"; + ename = "elmacro"; + version = "20180628.711"; src = fetchFromGitHub { owner = "Silex"; repo = "elmacro"; - rev = "97c8ca4041e5082df243ad6371a091759c30d0f7"; - sha256 = "0kqnnp7kfdgizs18zhsaxci210bgpr73w39dhb2y09yj40ja3yx4"; + rev = "89b9b0feabafd01fee48111d67131c4c9b5fed9a"; + sha256 = "06wkzafh6vbcjf0m3sl253mgcq32p8cdv7vsfmyx51baa36938ha"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro"; sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz"; - name = "elmacro"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -17999,9 +23561,14 @@ license = lib.licenses.free; }; }) {}; - elmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + elmine = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "elmine"; + ename = "elmine"; version = "20170511.20"; src = fetchFromGitHub { owner = "leoc"; @@ -18009,10 +23576,10 @@ rev = "432d2f2f7cb5b533f25b993d1001abcadcebe8ed"; sha256 = "02lsxj9zkcaiqlzy986n1f65cfyd8pkrdljgplsbd9p0w8ys0s94"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elmine"; sha256 = "1xkx1wwrzd2dl13z8n4qh3gl202j0i9crab5b3788z8mq0g4v4bn"; - name = "elmine"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -18020,9 +23587,21 @@ license = lib.licenses.free; }; }) {}; - elnode = callPackage ({ creole, dash, db, fakir, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, noflet, s, web }: - melpaBuild { + elnode = callPackage ({ creole + , dash + , db + , fakir + , fetchFromGitHub + , fetchurl + , kv + , lib + , melpaBuild + , noflet + , s + , web }: + melpaBuild { pname = "elnode"; + ename = "elnode"; version = "20140203.1506"; src = fetchFromGitHub { owner = "nicferrier"; @@ -18030,10 +23609,10 @@ rev = "3f2bf225853e40a2a10386ee5ae0bd6ba5d44ce9"; sha256 = "0p3cj5vgka388i4dk9r7bx8pv8mywnfij9ahgqak5jlsddflh8hw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9a76a6498c2a0b0d471d3df7ae3d510d027f08c/recipes/elnode"; sha256 = "0piy5gy9a7c8s10b99fmdyh6glhvjvdyrz0x2bv30h7wplx5szi6"; - name = "elnode"; + name = "recipe"; }; packageRequires = [ creole dash db fakir kv noflet s web ]; meta = { @@ -18041,9 +23620,14 @@ license = lib.licenses.free; }; }) {}; - elog = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elog = callPackage ({ eieio ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elog"; + ename = "elog"; version = "20160724.1555"; src = fetchFromGitHub { owner = "lujun9972"; @@ -18051,10 +23635,10 @@ rev = "a67237d9813c7591614d95e2ef31cc5e5ed3f31b"; sha256 = "0alg5nbmq56zsc032pvah92h5fw155fbfjc275k9vbh915hs6y0w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4f3d560bf56b1b4e7540dc5ae16258895c106f1f/recipes/elog"; sha256 = "0hixsi60nf0khm9xmya3saf95ahn1gydp0l5wxawsc491qwg4vqd"; - name = "elog"; + name = "recipe"; }; packageRequires = [ eieio ]; meta = { @@ -18062,20 +23646,26 @@ license = lib.licenses.free; }; }) {}; - elogcat = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + elogcat = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "elogcat"; + ename = "elogcat"; version = "20151120.1641"; src = fetchFromGitHub { owner = "youngker"; repo = "elogcat.el"; - rev = "4f311b7a07565b0d060334bc68edb36f2bff703f"; - sha256 = "1jcr8bxffvnfs0ym6zkgs79hd6a0m81r4x4jr3v5l9zwxw04sy15"; + rev = "cafe9bd5c0d6561d72066c70a55c246453693efd"; + sha256 = "117vb19z006hjs0717r5l90h4rv6rciw3cijlgg006f4qqj3g9s5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4855c75dc22a7089cf9e4fa80dbe0ccd2830fe83/recipes/elogcat"; sha256 = "0sqdqlpg4firswr742nrb6b8sz3bpijf6pbxvandq3ddpm0rx9ia"; - name = "elogcat"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -18083,20 +23673,25 @@ license = lib.licenses.free; }; }) {}; - eloud = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eloud = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eloud"; + ename = "eloud"; version = "20160731.857"; src = fetchFromGitHub { owner = "smythp"; repo = "eloud"; - rev = "82c97918585bd2a749251ae87d7732ca9d856c16"; - sha256 = "19wfn3zfi7avgnrki805acin8qd4f1jvmddgjk22j6m78l607lxn"; + rev = "c1d8274ca207cd270f8ad7f62993bd6df304d561"; + sha256 = "0ng3d82518i0d8dp8719ssinb1g7km18lcs38hzprgqy9ycqc1qb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e80fba9bc541594129756f5c668f3192919bc8/recipes/eloud"; sha256 = "1h8wd5mfi1cn9bzrckgc5mdrr5jkqsx92ay008p650wvjl689rn2"; - name = "eloud"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -18104,20 +23699,24 @@ license = lib.licenses.free; }; }) {}; - elpa-audit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elpa-audit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elpa-audit"; + ename = "elpa-audit"; version = "20141023.631"; src = fetchFromGitHub { owner = "purcell"; repo = "elpa-audit"; - rev = "727da50e626977351aff2675b6540a36818bbbe6"; - sha256 = "0wlhdzsrlj266jfvp925zrgzg2mxfba93klgky0hc8zialmmb50b"; + rev = "1ca4e6073f8c4cbb41688b69d3b3feaa1a392efc"; + sha256 = "1dadf24x6v1vk57bp6w0g2dysigy5cqjzwldc8dn129f4pfrhipy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elpa-audit"; sha256 = "18a8n22g53d8fxzr3snb2px28gvxbkx44grrx8lywaprz1f1lwdi"; - name = "elpa-audit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -18125,9 +23724,15 @@ license = lib.licenses.free; }; }) {}; - elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elpa-clone = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elpa-clone"; + ename = "elpa-clone"; version = "20170502.514"; src = fetchFromGitHub { owner = "dochang"; @@ -18135,10 +23740,10 @@ rev = "92f4c9d3570ad002575a90d0cc4a522c203a1110"; sha256 = "0m5w5wgyslvakcqpr3d198sy3561w2h002gflw0jp47v17hba1r7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone"; sha256 = "172gpmpwf75y41n3v05l47w34x83vy63bqk97fd8a6b4dkj91lqa"; - name = "elpa-clone"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -18146,9 +23751,14 @@ license = lib.licenses.free; }; }) {}; - elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elpa-mirror = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elpa-mirror"; + ename = "elpa-mirror"; version = "20180228.1636"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -18156,31 +23766,42 @@ rev = "6ca78e3fb69ef582da1a01f1d193e07ae8223142"; sha256 = "0s0c5qqg1cl63kig7kc4fx9rz4kgchxc3w3ywgh5csmgwlkpg0id"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8"; - name = "elpa-mirror"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/elpa-mirror"; license = lib.licenses.free; }; }) {}; - elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: - melpaBuild { + elpy = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , find-file-in-project + , highlight-indentation + , lib + , melpaBuild + , pyvenv + , s + , yasnippet }: + melpaBuild { pname = "elpy"; - version = "20180330.350"; + ename = "elpy"; + version = "20180720.155"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "17ea784c95b04df2cc78b17102a076b02cf89134"; - sha256 = "0gckilh50n7y7mfhadxlamks1136h3f4fa2670xmmm6mzxamn9wn"; + rev = "db0ee080424ef39b4cd2782a3dbd0afccaaafd04"; + sha256 = "0gzanxwv1g2hx80qm0m8iy1apsg51hhnh9rq1hicrwyvp1wzc24r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; sha256 = "1ri3dwnkw005plj1g5grmmq9np41sqk4s2v18pwsvr18ysnq6nnr"; - name = "elpy"; + name = "recipe"; }; packageRequires = [ company @@ -18196,9 +23817,15 @@ license = lib.licenses.free; }; }) {}; - elpygen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + elpygen = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "elpygen"; + ename = "elpygen"; version = "20171225.936"; src = fetchFromGitHub { owner = "vkazanov"; @@ -18206,10 +23833,10 @@ rev = "21929c997a05968f9eefe52b85a76ceaab3b0d81"; sha256 = "093ck4dkdvbgafb1bmkmszg1ba81ns5kjbk2iq2b5p9dvfcjjr3k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e670bd79a85c4e2a9ca3355feb8aaefa709f49cb/recipes/elpygen"; sha256 = "01fak1dz9mna3p4c2r0scb0j10qk3lvpq270jy6rvzlcbwri4akl"; - name = "elpygen"; + name = "recipe"; }; packageRequires = [ emacs yasnippet ]; meta = { @@ -18217,20 +23844,27 @@ license = lib.licenses.free; }; }) {}; - elquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + elquery = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "elquery"; - version = "20170624.1635"; + ename = "elquery"; + version = "20180513.1912"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "elquery"; - rev = "a5f7f3545330280991dd6334f4ce4f72aaa44145"; - sha256 = "0yf29d1akj1ays5rqcmgmvyfm4gx7j6yibd12x72wpf5mygv1fxi"; + rev = "7b2e40dcae09de9074fae1a7893b82b41987106b"; + sha256 = "1sfwsccpaipa5j10114jya8327nbllywgvzhxsqml0fwpg1ifyyq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/121f7d2091b83143402b44542db12e8f78275103/recipes/elquery"; sha256 = "19yik9w4kcj7i9d3bwwdszznwcrh75hxd0540iqk5by861z5f3zr"; - name = "elquery"; + name = "recipe"; }; packageRequires = [ dash emacs s ]; meta = { @@ -18238,9 +23872,14 @@ license = lib.licenses.free; }; }) {}; - elscreen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elscreen = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elscreen"; + ename = "elscreen"; version = "20180320.1902"; src = fetchFromGitHub { owner = "knu"; @@ -18248,10 +23887,10 @@ rev = "02164afab2c5fbff6e4aa7c59e0daedc6c504772"; sha256 = "1jzp7w2c9xl8x8kdxcchgp8s3ygvj70pi2vwwg1qilkya7yv61p0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6140694c1dea0a573586d23d1f63d46c9b22936/recipes/elscreen"; sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s"; - name = "elscreen"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -18259,9 +23898,16 @@ license = lib.licenses.free; }; }) {}; - elscreen-buffer-group = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elscreen-buffer-group = callPackage ({ cl-lib ? null + , elscreen + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elscreen-buffer-group"; + ename = "elscreen-buffer-group"; version = "20170808.1825"; src = fetchFromGitHub { owner = "jeffgran"; @@ -18269,10 +23915,10 @@ rev = "a3cd4d7eae3cca87bede4b39a46d3c0641f8cd06"; sha256 = "0flja2j5xqhxc0qrclnxcpyzvn7gyjynfpa3mp1hb250c313igy5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6fedb7b6ef58089da4b35ad115f699b4b24ff2/recipes/elscreen-buffer-group"; sha256 = "1clmhpk9zp6hsgz6a4jpmbrr9fr6k8b324s0x61n5yi4yzgdmc0v"; - name = "elscreen-buffer-group"; + name = "recipe"; }; packageRequires = [ cl-lib elscreen emacs ]; meta = { @@ -18280,9 +23926,15 @@ license = lib.licenses.free; }; }) {}; - elscreen-fr = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + elscreen-fr = callPackage ({ elscreen + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "elscreen-fr"; + ename = "elscreen-fr"; version = "20160920.253"; src = fetchFromGitHub { owner = "rocher"; @@ -18290,10 +23942,10 @@ rev = "b9c11f80d277086d5d5bf88623e15fc7adbbbe3c"; sha256 = "1dz8jqd2agh06hya59vbybrmgyhyz2rk6c9panrm49w37v0bwksb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18730986df5eb9816eec7ad479abe1e338d3c66f/recipes/elscreen-fr"; sha256 = "1kmga1zz9mb3hxd2sxja2vz45pix5a52yl0g9z4vmak32x9rgqrm"; - name = "elscreen-fr"; + name = "recipe"; }; packageRequires = [ elscreen seq ]; meta = { @@ -18301,20 +23953,25 @@ license = lib.licenses.free; }; }) {}; - elscreen-mew = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elscreen-mew = callPackage ({ elscreen + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elscreen-mew"; + ename = "elscreen-mew"; version = "20160504.1135"; src = fetchFromGitHub { owner = "masutaka"; repo = "elscreen-mew"; - rev = "c90a23441d836da14a1cb12788432308ba58e2b6"; - sha256 = "167kgbnh5q3pqirv0f7wpjn7yc76k8mz9qx45i7d4scmx8952d2g"; + rev = "89871fad690ae161dc076e16ef481b1965612077"; + sha256 = "14hwl5jzmm43qa4jbpsyswbz4hk1l2iwqh3ank6502bz58877k6c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47404ea3cfb591b780ca7e31095951a708b0a6b7/recipes/elscreen-mew"; sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4"; - name = "elscreen-mew"; + name = "recipe"; }; packageRequires = [ elscreen ]; meta = { @@ -18322,9 +23979,16 @@ license = lib.licenses.free; }; }) {}; - elscreen-multi-term = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi-term }: - melpaBuild { + elscreen-multi-term = callPackage ({ elscreen + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multi-term }: + melpaBuild { pname = "elscreen-multi-term"; + ename = "elscreen-multi-term"; version = "20151021.1933"; src = fetchFromGitHub { owner = "wamei"; @@ -18332,10 +23996,10 @@ rev = "7b6048a0dd80f69460a62bbc6f1af8856141a5ea"; sha256 = "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a24477cf83df7da931fa33c622ef720839529d2/recipes/elscreen-multi-term"; sha256 = "1zwrzblkag1d18xz450b7khsdssvsxyl1x6a682vy0dkn1y5qh1n"; - name = "elscreen-multi-term"; + name = "recipe"; }; packageRequires = [ elscreen emacs multi-term ]; meta = { @@ -18343,9 +24007,15 @@ license = lib.licenses.free; }; }) {}; - elscreen-separate-buffer-list = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elscreen-separate-buffer-list = callPackage ({ elscreen + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elscreen-separate-buffer-list"; + ename = "elscreen-separate-buffer-list"; version = "20161106.1958"; src = fetchFromGitHub { owner = "wamei"; @@ -18353,10 +24023,10 @@ rev = "7652d827aa1b8c1b04303c5b4b0bda5e8f85565e"; sha256 = "1cpmpms3r9lywmxgciz4xq7vjw2c1mxmpd89shssqck16563zwxf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f5e5c8e2cd45a25e47c74bef59b9114aa7685eb/recipes/elscreen-separate-buffer-list"; sha256 = "1d8kc137cd8i3wglir1rlvk7w8mrdhd3xvcihi2f2f2g5nh2n5jk"; - name = "elscreen-separate-buffer-list"; + name = "recipe"; }; packageRequires = [ elscreen emacs ]; meta = { @@ -18364,9 +24034,14 @@ license = lib.licenses.free; }; }) {}; - elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elvish-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elvish-mode"; + ename = "elvish-mode"; version = "20170913.1939"; src = fetchFromGitHub { owner = "ALSchwalm"; @@ -18374,10 +24049,10 @@ rev = "9cf31b453ac79b011b84e83ca11c964c4e647649"; sha256 = "0ryg9c8pjw98a9l4hyjqwan7kcv492vzy0xxcrcfm69zn8vnw9k0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode"; sha256 = "1f5pyadmbh2ldd51srvlhbjq2849f1f0s8qmpjnsz9bc986yga34"; - name = "elvish-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -18385,9 +24060,14 @@ license = lib.licenses.free; }; }) {}; - elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elwm = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elwm"; + ename = "elwm"; version = "20150817.307"; src = fetchFromGitHub { owner = "Fuco1"; @@ -18395,10 +24075,10 @@ rev = "c33b183f006ad476c3a44dab316f580f8b369930"; sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb45a6141b797243973695be4c0582c9ad6965d/recipes/elwm"; sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9"; - name = "elwm"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -18406,20 +24086,25 @@ license = lib.licenses.free; }; }) {}; - elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elx = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elx"; - version = "20180324.936"; + ename = "elx"; + version = "20180614.1957"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "cf1000f5d214363fe545a4ce849166194b8fb2c8"; - sha256 = "0k62qcmhav7pshrn1f55sar6lz37l26aqaqlkkd20h60fhbqp9aj"; + rev = "10a21c35915e249d5487aa3ced70fcfb749a9d0c"; + sha256 = "1jl2lp4gas89vx1xjx5gzh56fhx16mvfqwqs84cpxdbwb2qzch21"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz"; - name = "elx"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -18427,20 +24112,24 @@ license = lib.licenses.free; }; }) {}; - emacs-setup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacs-setup = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacs-setup"; + ename = "emacs-setup"; version = "20120727.726"; src = fetchFromGitHub { owner = "echosa"; repo = "emacs-setup"; - rev = "c783ec13e3b39093fffb6f6d64dccdce8ce4d375"; - sha256 = "1crpjcxwanbrd1yd4lbb5lmqwvx1mczya7ff2qr3phk497czpsqm"; + rev = "cc36ad5318c6c0e65d1b9ff8dff5ea2437675de2"; + sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abb7101b2d48af56af09d1dc85c540300dba7b3c/recipes/emacs-setup"; sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh"; - name = "emacs-setup"; + name = "recipe"; }; packageRequires = []; meta = { @@ -18448,20 +24137,25 @@ license = lib.licenses.free; }; }) {}; - emacsagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsagist = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsagist"; + ename = "emacsagist"; version = "20140331.1130"; src = fetchFromGitHub { owner = "echosa"; repo = "emacsagist"; - rev = "aba342ba59c254a88017f25e9fb7a8cd6f2fda83"; - sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2"; + rev = "539b9c4c0652d793391135ba1fc2e503dbb7deba"; + sha256 = "0n5cpmbyf8mhq03ikhzbycjwkxv3fmjwq1a9zvv3z9ik8yxnbw99"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/07612d46faebb28e1eeb8ddae2ac20e2dc0175f6/recipes/emacsagist"; sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64"; - name = "emacsagist"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -18469,9 +24163,13 @@ license = lib.licenses.free; }; }) {}; - emacsc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsc"; + ename = "emacsc"; version = "20161028.1006"; src = fetchFromGitHub { owner = "knu"; @@ -18479,10 +24177,10 @@ rev = "421e0c567358769e32f670ae8e949d99abae0c28"; sha256 = "0zmb1qdbdlrycari1r1g65c9px357wz4f2gvmcacg83504mmf3d8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/emacsc"; sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk"; - name = "emacsc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -18490,9 +24188,13 @@ license = lib.licenses.free; }; }) {}; - emacsist-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsist-view = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsist-view"; + ename = "emacsist-view"; version = "20160426.523"; src = fetchFromGitHub { owner = "lujun9972"; @@ -18500,10 +24202,10 @@ rev = "f67761259ed779a9bc95c9a4e0474522990c5c6b"; sha256 = "1vhs9725fyl2j65lk014qz76iv4hsvyim06361h4lai634hp7ck6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2157e14d68fa2875c6d5c40c20a39b9a2431c10/recipes/emacsist-view"; sha256 = "0lf280ppi3zksqvx81y8mm9479j26kd5wywfghhwk36kz410hk99"; - name = "emacsist-view"; + name = "recipe"; }; packageRequires = []; meta = { @@ -18511,20 +24213,25 @@ license = lib.licenses.free; }; }) {}; - emacsql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsql = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsql"; - version = "20180205.1835"; + ename = "emacsql"; + version = "20180712.1052"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "75ac0448a5965c82c616c862cab180c241110fd2"; - sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; + rev = "6f1e375a2ebb558138b73d2a63f2077da1028f92"; + sha256 = "046c9jr4azfz5cfpdlp160da3z9lcff12ldlvnzraxx8bzfbxqi5"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; - sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax"; - name = "emacsql"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9c3b6175b5c64f03b0b9dfdc10f393081d681309/recipes/emacsql"; + sha256 = "0c2d0kymzr53wh87fq1wy2x5ahfsymz0cw8qbrqx0k613l3mpr38"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -18532,20 +24239,26 @@ license = lib.licenses.free; }; }) {}; - emacsql-mysql = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsql-mysql = callPackage ({ emacs + , emacsql + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsql-mysql"; + ename = "emacsql-mysql"; version = "20171218.1827"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "75ac0448a5965c82c616c862cab180c241110fd2"; - sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; + rev = "ea613c5191dcaa2583d3f7d5737b31bb88a07ed5"; + sha256 = "1i733wjvpd6lhdnwr8w2k0c8s7v7r9ivsmxxgdndlhdnkm17ca5j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy"; - name = "emacsql-mysql"; + name = "recipe"; }; packageRequires = [ emacs emacsql ]; meta = { @@ -18553,20 +24266,26 @@ license = lib.licenses.free; }; }) {}; - emacsql-psql = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsql-psql = callPackage ({ emacs + , emacsql + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsql-psql"; + ename = "emacsql-psql"; version = "20171218.1827"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "75ac0448a5965c82c616c862cab180c241110fd2"; - sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; + rev = "ea613c5191dcaa2583d3f7d5737b31bb88a07ed5"; + sha256 = "1i733wjvpd6lhdnwr8w2k0c8s7v7r9ivsmxxgdndlhdnkm17ca5j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3"; - name = "emacsql-psql"; + name = "recipe"; }; packageRequires = [ emacs emacsql ]; meta = { @@ -18574,20 +24293,26 @@ license = lib.licenses.free; }; }) {}; - emacsql-sqlite = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsql-sqlite = callPackage ({ emacs + , emacsql + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsql-sqlite"; + ename = "emacsql-sqlite"; version = "20180128.1252"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "75ac0448a5965c82c616c862cab180c241110fd2"; - sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; + rev = "62d39157370219a1680265fa593f90ccd51457da"; + sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x"; - name = "emacsql-sqlite"; + name = "recipe"; }; packageRequires = [ emacs emacsql ]; meta = { @@ -18595,20 +24320,24 @@ license = lib.licenses.free; }; }) {}; - emacsshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsshot = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsshot"; + ename = "emacsshot"; version = "20161018.743"; src = fetchFromGitHub { owner = "marcowahl"; repo = "emacsshot"; - rev = "11ace77ab718292d05b82d93178380aff591468b"; - sha256 = "108zbpg51x2pljvizmdvlxsqyibbp8rinf7747asf6b7ahkxj97w"; + rev = "752244330ff829d8dbea7fcf7065f5d4708038a6"; + sha256 = "15y0vv8vm30yp3mn0x7lqq3vd7wb2qny424jx5f4m74hy2xi3svr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efdd85accc6053f92efcbfdb7ddc37b23a07a3b0/recipes/emacsshot"; sha256 = "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j"; - name = "emacsshot"; + name = "recipe"; }; packageRequires = []; meta = { @@ -18616,9 +24345,14 @@ license = lib.licenses.free; }; }) {}; - emamux = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emamux = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emamux"; + ename = "emamux"; version = "20170226.1937"; src = fetchFromGitHub { owner = "syohex"; @@ -18626,10 +24360,10 @@ rev = "39f57786b2cdd3844888df42d71c7bd251f07158"; sha256 = "184669qynz1m93s9nv5pdc8m4bnvqa56wz472nsq4xhixz44jjsv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux"; sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz"; - name = "emamux"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -18637,20 +24371,26 @@ license = lib.licenses.free; }; }) {}; - emamux-ruby-test = callPackage ({ emamux, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + emamux-ruby-test = callPackage ({ emamux + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "emamux-ruby-test"; + ename = "emamux-ruby-test"; version = "20130812.939"; src = fetchFromGitHub { owner = "syohex"; repo = "emamux-ruby-test"; - rev = "23b73c650573b340351a919da3da416acfc2ac84"; - sha256 = "1idsvilsvlxh72waalhl8vrsmh0vfvz56qcv56fc2c0pb1i90icn"; + rev = "785bfd44d097a46bb2ebe1e62ac7595fd4dc9ab5"; + sha256 = "1gcjki5rcc4gmcq6gcpdvahn4j6f39583jgq8g7ykylfqk2qhrjh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f11759710881bdf5a77bd309acb03a6699cc7fd6/recipes/emamux-ruby-test"; sha256 = "1l1hp2dggjlc287qkfyj21w9lri4agh91g5x707qqq8nicdlv3xm"; - name = "emamux-ruby-test"; + name = "recipe"; }; packageRequires = [ emamux projectile ]; meta = { @@ -18658,20 +24398,24 @@ license = lib.licenses.free; }; }) {}; - emaps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emaps = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emaps"; - version = "20160910.521"; + ename = "emaps"; + version = "20180712.1216"; src = fetchFromGitHub { owner = "GuiltyDolphin"; repo = "emaps"; - rev = "728eb6eeae46194f32a01bafa349ece520bc7a10"; - sha256 = "1asl6wkibfcxmf1kwnppbh8qpa454ssyxrqfh2d5dna3gxaa2cqm"; + rev = "823b8f72e6459c9f1a5dd62451ee4005ef71d955"; + sha256 = "1g9637j8f65q3l6k4aw5p847m891irh74kg3pa2p9w0ppsa6n3jm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4faeda02aabc0b6c5003cdf5d1fdfca0fd71b0d7/recipes/emaps"; sha256 = "151rh6lyqi0ps2w022shzjj67nkg6y4m1nfj90qyc7jgl64qb9qw"; - name = "emaps"; + name = "recipe"; }; packageRequires = []; meta = { @@ -18679,9 +24423,14 @@ license = lib.licenses.free; }; }) {}; - ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ember-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ember-mode"; + ename = "ember-mode"; version = "20171208.559"; src = fetchFromGitHub { owner = "madnificent"; @@ -18689,10 +24438,10 @@ rev = "755256782478cb724edd8f111225d7c8d342f90c"; sha256 = "02x12b26l9qyq9cmg56ys222qxbc8zldw40scq3mfhfqqk4b43g7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b/recipes/ember-mode"; sha256 = "0fwd34cim29dg802ibsfd120px9sj54d4wzp3ggmjjzwkl9ky7dx"; - name = "ember-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -18700,9 +24449,14 @@ license = lib.licenses.free; }; }) {}; - ember-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + ember-yasnippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "ember-yasnippets"; + ename = "ember-yasnippets"; version = "20160526.958"; src = fetchFromGitHub { owner = "ronco"; @@ -18710,10 +24464,10 @@ rev = "3b5bd01569646237bf1b540d097e12f9118b67f4"; sha256 = "0g7hp1aq0zznbhd234dpbblnagn34fxdasc5v4lfhm5ykw5xyb5x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c37a13d56e9a0a4e7e2c11349ed87610a0f6b2c/recipes/ember-yasnippets"; sha256 = "1jwkzcqcpy7ykdjhsqmg8ds6qyl4jglyjbgg7v301x068dsxkja6"; - name = "ember-yasnippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -18721,9 +24475,15 @@ license = lib.licenses.free; }; }) {}; - embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + embrace = callPackage ({ cl-lib ? null + , expand-region + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "embrace"; + ename = "embrace"; version = "20171031.1133"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -18731,10 +24491,10 @@ rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2"; sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace"; sha256 = "1w9zp9n91703d6jd4adl2xk574wsr7fm2a9v32b1i9bi3hr0hdjc"; - name = "embrace"; + name = "recipe"; }; packageRequires = [ cl-lib expand-region ]; meta = { @@ -18742,9 +24502,15 @@ license = lib.licenses.free; }; }) {}; - emlib = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emlib = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emlib"; + ename = "emlib"; version = "20161126.723"; src = fetchFromGitHub { owner = "narendraj9"; @@ -18752,10 +24518,10 @@ rev = "dea2af00f551ea580c641d86dd69219f7d4f3685"; sha256 = "0p52pkq3wvnhg0l7cribhc39zl1cjjxgw9qzpmwd0jw1g1lslwbm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46b3738975c8082d9eb6da9fe733edb353aa7069/recipes/emlib"; sha256 = "02l135v3pqpf6ngfq11h4rc843iwh3dgi4rr3gcc63pjl4ws2w2c"; - name = "emlib"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -18763,20 +24529,24 @@ license = lib.licenses.free; }; }) {}; - emmet-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emmet-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emmet-mode"; - version = "20161113.2158"; + ename = "emmet-mode"; + version = "20180612.2041"; src = fetchFromGitHub { owner = "smihica"; repo = "emmet-mode"; - rev = "5af39aaef59125fd80901f275c23c89493f9d133"; - sha256 = "1csfd8ixz9gk0hkakcs5qv4f3qxg605blav3a463ipw2a8alyava"; + rev = "1acb821e0142136344ccf40c1e5fb664d7db2e70"; + sha256 = "1p25h191bm0h5b3w5apg7wks51k7pb7h4dlww4jbl9ri4d33fzcl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/emmet-mode"; sha256 = "0wjv4hqddjvbdrmsxzav5rpwnm2n6lr86jzkrnav8f2kyzypdsnr"; - name = "emmet-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -18784,19 +24554,24 @@ license = lib.licenses.free; }; }) {}; - emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + emms = callPackage ({ cl-lib ? null + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms"; - version = "20180328.753"; + ename = "emms"; + version = "20180708.1823"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "ffd8c0e8a7649d4e3a0d4f9d65e114346145a2de"; - sha256 = "0ijhwvkngkgg0npz5rnzynpx60rshizw8lpf137lvqx5b07ianr9"; + rev = "9b702f38e3486d67cb67194e98ea72dda25be1af"; + sha256 = "13l0didxiagcv8rr9ifdjk92qpcghyqkqshpcr76ix4dm3mbaymk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94"; - name = "emms"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -18804,9 +24579,15 @@ license = lib.licenses.free; }; }) {}; - emms-bilibili = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emms-bilibili = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms-bilibili"; + ename = "emms-bilibili"; version = "20180102.2018"; src = fetchFromGitHub { owner = "0xDEATHCODE"; @@ -18814,10 +24595,10 @@ rev = "294bca3dfc42fe3a55fb326ab39bc0fcfc8c5090"; sha256 = "0q8z3q1agwgb3d0kpvac7a98p3q4ljjnv404cf9kihjjfxvh4vm5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/533f96d1e68eda20b2d2e7f8eb3e7fa118904970/recipes/emms-bilibili"; sha256 = "1mx3fn2x526np8awjn0ydsqh59b4aznf3sig410fbr6wk6pa6y47"; - name = "emms-bilibili"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -18825,9 +24606,14 @@ license = lib.licenses.free; }; }) {}; - emms-info-mediainfo = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emms-info-mediainfo = callPackage ({ emms + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms-info-mediainfo"; + ename = "emms-info-mediainfo"; version = "20131223.500"; src = fetchFromGitHub { owner = "fgallina"; @@ -18835,10 +24621,10 @@ rev = "bce16eae9eacd38719fea62a9755225a888da59d"; sha256 = "07qbbs2i05bqndr4dxb84z50wav8ffbc56f6saw6pdx6n0sw6n6n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d08c28c6ff4caf14f0bf4b0f40f16660dac2d5d9/recipes/emms-info-mediainfo"; sha256 = "17x8vvfhx739hcj9j1nh6j4r6zqnwa5zq9zpi9b6lxc8979k3m4w"; - name = "emms-info-mediainfo"; + name = "recipe"; }; packageRequires = [ emms ]; meta = { @@ -18846,9 +24632,14 @@ license = lib.licenses.free; }; }) {}; - emms-mark-ext = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emms-mark-ext = callPackage ({ emms + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms-mark-ext"; + ename = "emms-mark-ext"; version = "20130528.2027"; src = fetchFromGitHub { owner = "vapniks"; @@ -18856,10 +24647,10 @@ rev = "ec68129e3e9e469e5bf160c6a1b7030e322f3541"; sha256 = "03a7sn8pl0pnr05rmrrbw4hjyi8vpjqbvkvh0fqnij913a6qc64l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36b7292160d3dab1a684d09c848a6b0f68b31add/recipes/emms-mark-ext"; sha256 = "13h6hy8y0as0xfc1cg8balw63as81fzar32q9h4zhnndl3hc1081"; - name = "emms-mark-ext"; + name = "recipe"; }; packageRequires = [ emms ]; meta = { @@ -18867,9 +24658,15 @@ license = lib.licenses.free; }; }) {}; - emms-mode-line-cycle = callPackage ({ emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emms-mode-line-cycle = callPackage ({ emacs + , emms + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms-mode-line-cycle"; + ename = "emms-mode-line-cycle"; version = "20160221.320"; src = fetchFromGitHub { owner = "momomo5717"; @@ -18877,10 +24674,10 @@ rev = "2c2f395e484a1d345050ddd61ff5fab71a92a6bc"; sha256 = "0q80f0plch6k4lhs8c9qm3mfycfbp3kn5sjrk9zxgxwnn901y9mp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dab676acd774616a32a0373f30647f3cb4522afc/recipes/emms-mode-line-cycle"; sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca"; - name = "emms-mode-line-cycle"; + name = "recipe"; }; packageRequires = [ emacs emms ]; meta = { @@ -18888,20 +24685,25 @@ license = lib.licenses.free; }; }) {}; - emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emms-player-mpv = callPackage ({ emms + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms-player-mpv"; - version = "20180210.310"; + ename = "emms-player-mpv"; + version = "20180503.1427"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "6d526fe618c3cebf7fbc5f0d3f0a225de16a76c7"; - sha256 = "0jq67lngpz7iqwqfsl95r5p26cnnq7ldcj534nm86hwm6jfij564"; + rev = "9c9ffc6f00a737a6db6377681a88e5292ebcf86b"; + sha256 = "17kvkx63q30p5r2lsv6pqdm2zi8my3yn3js7j3c2qlygd9sf80pz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y"; - name = "emms-player-mpv"; + name = "recipe"; }; packageRequires = [ emms ]; meta = { @@ -18909,9 +24711,17 @@ license = lib.licenses.free; }; }) {}; - emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null + , emacs + , emms + , emms-player-simple-mpv + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms-player-mpv-jp-radios"; + ename = "emms-player-mpv-jp-radios"; version = "20180325.417"; src = fetchFromGitHub { owner = "momomo5717"; @@ -18919,10 +24729,10 @@ rev = "f6b37f5878c741124d5fca43c5b80af873541edd"; sha256 = "1sxzh1bhdwln7kcn07agayyhmgyrbmmhgc3f85336xybc6ljpqs8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; sha256 = "0gdap5cv08pz370fl92v9lyvgkbbyjhp9wsc4kyjm4f4pwx9fybv"; - name = "emms-player-mpv-jp-radios"; + name = "recipe"; }; packageRequires = [ cl-lib emacs emms emms-player-simple-mpv ]; meta = { @@ -18930,9 +24740,16 @@ license = lib.licenses.free; }; }) {}; - emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emms-player-simple-mpv = callPackage ({ cl-lib ? null + , emacs + , emms + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms-player-simple-mpv"; + ename = "emms-player-simple-mpv"; version = "20180316.849"; src = fetchFromGitHub { owner = "momomo5717"; @@ -18940,10 +24757,10 @@ rev = "101d120ccdee1c2c213fd2f0423c858b21649c00"; sha256 = "1i6rxkm0ra0jbkkwgkwxg3vk5xfl794h1gkgnlpscynz0v94b6ll"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv"; sha256 = "1lv1rhd5vya068mnnaysfh56raar79hf2g413ysrk3yhyajk6316"; - name = "emms-player-simple-mpv"; + name = "recipe"; }; packageRequires = [ cl-lib emacs emms ]; meta = { @@ -18951,9 +24768,15 @@ license = lib.licenses.free; }; }) {}; - emms-soundcloud = callPackage ({ emms, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + emms-soundcloud = callPackage ({ emms + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "emms-soundcloud"; + ename = "emms-soundcloud"; version = "20131221.345"; src = fetchFromGitHub { owner = "osener"; @@ -18961,10 +24784,10 @@ rev = "87e5cbf9609d1f26c24dc834fdeb78b33d453c2b"; sha256 = "0nx5bb5fjmaa1nhkbfnhd1aydqrq390x4rl1vfh11ilnf52wzzld"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19e423525255371cf479842885eca07e801f6d00/recipes/emms-soundcloud"; sha256 = "0nf1f719m4pvxn0mf4qyx8mzwhrhv6kchnrpiy9clx520y8x3dqi"; - name = "emms-soundcloud"; + name = "recipe"; }; packageRequires = [ emms json ]; meta = { @@ -18972,9 +24795,14 @@ license = lib.licenses.free; }; }) {}; - emms-state = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emms-state = callPackage ({ emms + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms-state"; + ename = "emms-state"; version = "20160504.105"; src = fetchFromGitHub { owner = "alezost"; @@ -18982,10 +24810,10 @@ rev = "77930300222333b71eafd495cc1fee3a3585eb23"; sha256 = "1kipxa9ax8zi9qqk19mknpg7nnlzgr734kh9bnklydipwnsy00pi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2798e22c6ccbadf73e65d8a8d901e47f55cb83/recipes/emms-state"; sha256 = "080y02hxxqfn0a0dhq5vm0r020v2q3h1612a2zkq5fxi8ssvhp9i"; - name = "emms-state"; + name = "recipe"; }; packageRequires = [ emms ]; meta = { @@ -18993,9 +24821,15 @@ license = lib.licenses.free; }; }) {}; - emoji-cheat-sheet-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + emoji-cheat-sheet-plus = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "emoji-cheat-sheet-plus"; + ename = "emoji-cheat-sheet-plus"; version = "20150617.631"; src = fetchFromGitHub { owner = "syl20bnr"; @@ -19003,10 +24837,10 @@ rev = "96a003127d646a2683d81ca906a17eace0a6413e"; sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffbfae9577673ef8d50b55624f94288e315deba4/recipes/emoji-cheat-sheet-plus"; sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv"; - name = "emoji-cheat-sheet-plus"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -19014,9 +24848,13 @@ license = lib.licenses.free; }; }) {}; - emoji-display = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emoji-display = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emoji-display"; + ename = "emoji-display"; version = "20140117.213"; src = fetchFromGitHub { owner = "ikazuhiro"; @@ -19024,10 +24862,10 @@ rev = "bb4217f6400151a9cfa6d4524b8427f01feb5193"; sha256 = "0sh4q4sb4j58ryvvmlsx7scry9inzgv2ssa87vbyzpxq0435l229"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c34abbda5acbd52f4e79ce9f87f9ae0fa1e48d5/recipes/emoji-display"; sha256 = "04cf18z26d64l0sv8qkbxjixi2wbw23awd5fznvg1cs8ixss01j9"; - name = "emoji-display"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19035,20 +24873,24 @@ license = lib.licenses.free; }; }) {}; - emoji-fontset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emoji-fontset = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emoji-fontset"; + ename = "emoji-fontset"; version = "20160726.1224"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emoji-fontset.el"; - rev = "10be897fa5165fd40fd35a89e38c759e008fa775"; - sha256 = "1aanl5dd2m8jlyq27ymhc6l9i00cpi30wwhpaf67dlvk9gk89f64"; + rev = "e460c9a08e48ec4103e38a7a04acae20880149a9"; + sha256 = "0xdlqsrwdf0smi5z9rjj46nwrrfpl0gzanf0jmdg8zzn62l6ldck"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60df435eb82fcc9a8a02a0a271bb6a2d5a161bc4/recipes/emoji-fontset"; sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d"; - name = "emoji-fontset"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19056,20 +24898,25 @@ license = lib.licenses.free; }; }) {}; - emoji-recall = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emoji-recall = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emoji-recall"; + ename = "emoji-recall"; version = "20160723.1508"; src = fetchFromGitHub { owner = "lujun9972"; repo = "emoji-recall.el"; - rev = "d9122f8fb1467309260109a1985cd14f18fdf631"; - sha256 = "13ajzafm9wmddch8ipjjkv2p13fmyd0ghdr479lll5c7xff2051x"; + rev = "1c12d18e5592eaa2138dd3034012dced277e6d99"; + sha256 = "0h65sapfa18z7xiyzsdizys204mvkzgmb3fbq75y1ddcrg9q0ikf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f03b34d3e8e5edf9888c71b6e4bd2e1a5aec016/recipes/emoji-recall"; sha256 = "06cahk2h6q3vlw2p4jmjrpzycxpm884p31yhbp77lagkqhs2fzbk"; - name = "emoji-recall"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19077,20 +24924,27 @@ license = lib.licenses.free; }; }) {}; - emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: - melpaBuild { + emojify = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "emojify"; - version = "20180320.1933"; + ename = "emojify"; + version = "20180611.838"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "a86afc14e20ec7287c2b37f5b64318c209c9bbd3"; - sha256 = "08z699ycyidm2c1yi0zhrg6nhhdf3gqx3yi6h9z4n61ns0irg8r5"; + rev = "38ae28d95b58e9fb86a3495a2dda3e5de254c4fc"; + sha256 = "1dk4kx5hvhcrmbhyx0ri9i934i8m3mcs76hk5h8qnbhdknmsh3rz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; sha256 = "1sgd32qm43hwby75a9q2pz1yfzj988i35d8p9f18zvbxypy7b2yp"; - name = "emojify"; + name = "recipe"; }; packageRequires = [ emacs ht seq ]; meta = { @@ -19098,9 +24952,14 @@ license = lib.licenses.free; }; }) {}; - emojify-logos = callPackage ({ emojify, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emojify-logos = callPackage ({ emojify + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emojify-logos"; + ename = "emojify-logos"; version = "20171125.214"; src = fetchFromGitHub { owner = "mxgoldstein"; @@ -19108,10 +24967,10 @@ rev = "96c74383a7c69e839ba41de3507154ca4ad564a1"; sha256 = "1z2rhs2kvafcfqqvq78yb5zp0pnn9s0mhng0rymfghi704cdifm6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/114d5596a7b36f47c150c413c6ecc74de36ca239/recipes/emojify-logos"; sha256 = "0kgci1svi80xnz44bvh19si8bcjllrkm9rbd8761h77iylkqs3q5"; - name = "emojify-logos"; + name = "recipe"; }; packageRequires = [ emojify ]; meta = { @@ -19119,9 +24978,13 @@ license = lib.licenses.free; }; }) {}; - empos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + empos = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "empos"; + ename = "empos"; version = "20151011.1216"; src = fetchFromGitHub { owner = "dimalik"; @@ -19129,10 +24992,10 @@ rev = "7b99ad30e56937adb7e6349777e5a2045597d564"; sha256 = "0bm0cxnv7g2dzfvfhkyy16kzn6shvy9gzypiqyjj42ng54xmhs0n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/461f7849e7be986994dd1e7cf109b66e8c37c719/recipes/empos"; sha256 = "0wbrszl9rq4is0ymxq9lxpqzlfg93gljh6almjy0hp3cs7pkzyl4"; - name = "empos"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19140,20 +25003,35 @@ license = lib.licenses.free; }; }) {}; - emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }: - melpaBuild { + emr = callPackage ({ cl-lib ? null + , clang-format + , dash + , emacs + , fetchFromGitHub + , fetchurl + , iedit + , lib + , list-utils + , melpaBuild + , paredit + , popup + , projectile + , redshank + , s }: + melpaBuild { pname = "emr"; - version = "20170811.1057"; + ename = "emr"; + version = "20180708.1011"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "emacs-refactor"; - rev = "d7009b30be810af6bb33c7d99a9b320e2aaeb698"; - sha256 = "1hx5bv1banrnsb9wrnn57b4wj981qpvnx66px7h304yr95x8bls4"; + rev = "8e556aa5a932dcf21dff985c528cff41a99ba332"; + sha256 = "18m9ypdarwisksh7pyxgvp3shv2ikvqjijdgjgm0l4jz3vrflpqw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr"; sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x"; - name = "emr"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -19173,20 +25051,24 @@ license = lib.licenses.free; }; }) {}; - enclose = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + enclose = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "enclose"; + ename = "enclose"; version = "20121008.914"; src = fetchFromGitHub { owner = "rejeep"; repo = "enclose.el"; - rev = "2747653e84af39017f503064bc66ed1812a77259"; - sha256 = "0dz5xm05d7irh1j8iy08jk521p19cjai1kw68z2nngnyf1az7cim"; + rev = "2fff3d4fcc1089f87647042d7164ba04282766ae"; + sha256 = "1x0z3fr8qd1r6wdh7gjbx5fmd7yfmh8mjnp25zkzvgxvdg4gj91l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/enclose"; sha256 = "1bkrv3cwhbiydgfjhmyjr96cvsgr9zi8n0ir1akgamccm2ln73d6"; - name = "enclose"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19194,20 +25076,25 @@ license = lib.licenses.free; }; }) {}; - encourage-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + encourage-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "encourage-mode"; + ename = "encourage-mode"; version = "20151128.105"; src = fetchFromGitHub { owner = "halbtuerke"; repo = "encourage-mode.el"; - rev = "99edacf2d94d168d3da0609860dc7253db7c9815"; - sha256 = "0k5ns40s5nskn0zialwq96qll1v5k50lfa5xh8hxbpcamsfym6h8"; + rev = "ca411e6bfd3d0edffe95852127bd995730b942e3"; + sha256 = "0fvfzm9a25cajxbvvia1dpmiq2nn7qimwsqwcirpwzq9zsn4j7f4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e90146c03a3f85313e3d338c48547ccfb73f605/recipes/encourage-mode"; sha256 = "0fwn6w7s61c08z0d8z3awclqrhszia9is30gm2kx4hwr9dhhwh63"; - name = "encourage-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19215,9 +25102,14 @@ license = lib.licenses.free; }; }) {}; - engine-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + engine-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "engine-mode"; + ename = "engine-mode"; version = "20180401.946"; src = fetchFromGitHub { owner = "hrs"; @@ -19225,10 +25117,10 @@ rev = "fd5a235b2c93b95143d676e6b654e388d7cdd956"; sha256 = "0lynwd7s1mjppynh8424qk30jzcr384wvr21bqy6ylsxs19kqg0w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode"; sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c"; - name = "engine-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -19236,20 +25128,25 @@ license = lib.licenses.free; }; }) {}; - enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + enh-ruby-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "enh-ruby-mode"; - version = "20180331.256"; + ename = "enh-ruby-mode"; + version = "20180403.1251"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "7f892339f8bb48b1dc86f3d36ab47b65cf28f8c7"; - sha256 = "1l1fr215z83v417lnbbf7z68fjbzf3k9c7d8cyzh0zijyp8y1dpw"; + rev = "fd50e71913e4dc714f71020701ab398a18b524b6"; + sha256 = "0al8bbhfjxqh40hkpiaziz5vsfy2m5saj7wcvs6xivz1ph5ass0b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns"; - name = "enh-ruby-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19257,9 +25154,13 @@ license = lib.licenses.free; }; }) {}; - enlive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + enlive = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "enlive"; + ename = "enlive"; version = "20170725.717"; src = fetchFromGitHub { owner = "zweifisch"; @@ -19267,10 +25168,10 @@ rev = "604a8ca272b6889f114e2b5a13adb5b1dc4bae86"; sha256 = "1iwfb5hxhnp4rl3rh5yayik0xl2lg82klxkvqf29536pk8ip710m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/388fa2580e687d9608b11cdc069841831b414b29/recipes/enlive"; sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz"; - name = "enlive"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19278,20 +25179,26 @@ license = lib.licenses.free; }; }) {}; - eno = callPackage ({ dash, edit-at-point, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eno = callPackage ({ dash + , edit-at-point + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eno"; + ename = "eno"; version = "20160110.234"; src = fetchFromGitHub { owner = "enoson"; repo = "eno.el"; - rev = "40075bb1ed9e62f42c5799f3d3721734742ed417"; - sha256 = "1qimqrvk0myqfi2l3viigkx1ld90qpjgi1gs6xhw2g51r8x4i3in"; + rev = "c07674329f66d6b4ea6c3a3944f801ab77ccb7e6"; + sha256 = "0var9h1nslww3zlqbl9mvrkz7c9i2g8ka22mwqc1iv92ka3w0czv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/eno"; sha256 = "1pcbvka3g32j1a2j7slw4jm80qpsk3ldziy5n4l02xpnqw6iwy6q"; - name = "eno"; + name = "recipe"; }; packageRequires = [ dash edit-at-point ]; meta = { @@ -19299,9 +25206,13 @@ license = lib.licenses.free; }; }) {}; - enotify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + enotify = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "enotify"; + ename = "enotify"; version = "20130407.648"; src = fetchFromGitHub { owner = "laynor"; @@ -19309,10 +25220,10 @@ rev = "7fd2f48ef4ff32c8f013c634ea2dd6b1d1409f80"; sha256 = "0v5p97dvzrk3j59yjc6iny71j3fdw9bb8737wnnzm098ff42dfmd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/enotify"; sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi"; - name = "enotify"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19320,20 +25231,31 @@ license = lib.licenses.free; }; }) {}; - ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: - melpaBuild { + ensime = callPackage ({ company + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup + , s + , sbt-mode + , scala-mode + , yasnippet }: + melpaBuild { pname = "ensime"; - version = "20180320.230"; + ename = "ensime"; + version = "20180615.630"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "4ee365c35a34a41c31c262d4360132037461a60a"; - sha256 = "0919ifs4xm7s7axpjrlb6ymv5xy647pbfczw03z0xwm5gx7fmra3"; + rev = "34eb11dac3ec9d1c554c2e55bf056ece6983add7"; + sha256 = "0hgbxd538xjzna97843014xkbpgs20nz7xpb6smls7rdxp5a1fpd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; sha256 = "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby"; - name = "ensime"; + name = "recipe"; }; packageRequires = [ company @@ -19349,9 +25271,16 @@ license = lib.licenses.free; }; }) {}; - envdir = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + envdir = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "envdir"; + ename = "envdir"; version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; @@ -19359,10 +25288,10 @@ rev = "f29346c55ccf11d8c75628edc6d430ed63c36917"; sha256 = "1jyhr9gv3d0rxv5iks2g9x6xbxqv1bvf1fnih96h4pgsfxz8wrp6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79c1497f709f6d23e4886359e09ab0456ed61777/recipes/envdir"; sha256 = "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8"; - name = "envdir"; + name = "recipe"; }; packageRequires = [ dash emacs f ]; meta = { @@ -19370,9 +25299,17 @@ license = lib.licenses.free; }; }) {}; - eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }: - melpaBuild { + eopengrok = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild + , s }: + melpaBuild { pname = "eopengrok"; + ename = "eopengrok"; version = "20160903.2359"; src = fetchFromGitHub { owner = "youngker"; @@ -19380,10 +25317,10 @@ rev = "78f734328aaf19c52720415c037708ece1944c4c"; sha256 = "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545/recipes/eopengrok"; sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av"; - name = "eopengrok"; + name = "recipe"; }; packageRequires = [ cl-lib dash magit s ]; meta = { @@ -19391,20 +25328,26 @@ license = lib.licenses.free; }; }) {}; - epc = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + epc = callPackage ({ concurrent + , ctable + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "epc"; + ename = "epc"; version = "20140609.2234"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-epc"; - rev = "e1bfa5ca163273859336e3cc89b4b6460f7f8cda"; - sha256 = "15nkrjgi64f829isfd6xrhl4zw8jirr8pkas7nisrbk1av868hx0"; + rev = "94cd36a3bec752263ac9b1b3a9dd2def329d2af7"; + sha256 = "0aa3d3k62rq649w57f8gb4jh0gj9h2mv5m66ikp0c35mrk3cpk1m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/epc"; sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx"; - name = "epc"; + name = "recipe"; }; packageRequires = [ concurrent ctable ]; meta = { @@ -19412,9 +25355,14 @@ license = lib.licenses.free; }; }) {}; - epic = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: - melpaBuild { + epic = callPackage ({ fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild }: + melpaBuild { pname = "epic"; + ename = "epic"; version = "20170209.1623"; src = fetchFromGitHub { owner = "yoshinari-nomura"; @@ -19422,10 +25370,10 @@ rev = "a41826c330eb0ea061d58a08cc861b0c4ac8ec4e"; sha256 = "0mvg52f2y3725hlzqcn2mh8jihnbg68wlqmq951sa3qfma7m40pp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c7162791d560846fe386746c00a9fe88c8007bb/recipes/epic"; sha256 = "0gfl8if83jbs0icz6gcjkwxvcz5v744k1kvqnbx3ga481kds9rqf"; - name = "epic"; + name = "recipe"; }; packageRequires = [ htmlize ]; meta = { @@ -19433,20 +25381,27 @@ license = lib.licenses.free; }; }) {}; - epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + epkg = callPackage ({ closql + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "epkg"; - version = "20180318.1221"; + ename = "epkg"; + version = "20180627.1353"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "432312b9583ed7b88ad9644fd1bf2183765a892e"; - sha256 = "0d882kahn7a0vri7a9r15lvmfx1zn2hsga6jfcc6jv0hqbswlb2k"; + rev = "b3dac5d4596d304f17a283c5cfe9dc77989fa96a"; + sha256 = "17qdywa8qw6n8a3r4s1cbjbmh2a4vjnxp6fqhiglbbfc1xqw2p1n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; sha256 = "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww"; - name = "epkg"; + name = "recipe"; }; packageRequires = [ closql dash emacs ]; meta = { @@ -19454,9 +25409,14 @@ license = lib.licenses.free; }; }) {}; - epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + epl = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "epl"; + ename = "epl"; version = "20180205.1249"; src = fetchFromGitHub { owner = "cask"; @@ -19464,10 +25424,10 @@ rev = "78ab7a85c08222cd15582a298a364774e3282ce6"; sha256 = "0ksilx9gzdazngxfni5i632jpb1nprcxplsbhgqirs2xdl53q8v8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl"; sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn"; - name = "epl"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -19475,9 +25435,15 @@ license = lib.licenses.free; }; }) {}; - epm = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + epm = callPackage ({ emacs + , epl + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "epm"; + ename = "epm"; version = "20161027.34"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -19485,10 +25451,10 @@ rev = "ab3d194fc4d11520d6b9bce4746d7242f3f1606a"; sha256 = "0a2197dyc4rgssqwi2bgd6cg1g23pirjpvyq9b77n1nl8jghp0sw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e12e8ae2e8e8aff7cbd75a951dd328cb9ccf58b0/recipes/epm"; sha256 = "0k94qhzxjzw5d0c53jnyx1xfciwr9qib845awyjaybzzs34s8r08"; - name = "epm"; + name = "recipe"; }; packageRequires = [ emacs epl ]; meta = { @@ -19496,20 +25462,26 @@ license = lib.licenses.free; }; }) {}; - epresent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + epresent = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "epresent"; + ename = "epresent"; version = "20160410.1901"; src = fetchFromGitHub { owner = "dakrone"; repo = "epresent"; - rev = "6c8abedcf46ff08091fa2bba52eb905c6290057d"; - sha256 = "1qa1nq63kax767gs53s75ihspirvh69l4xdm89mj57qvrbpz36z5"; + rev = "bc3443879bb0111dcde2abd2f9c578e2cd438186"; + sha256 = "1ws4hjvbwn1nf18qsbq0cl6q0rdk8fy4brrb1mcqfiag9arqmd6b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/150487558ecda0520c637ffed1ffe2fbf2dc5811/recipes/epresent"; sha256 = "176d1nwsafi6fb0dnv35bfskp0xczyzf2939gi4bz69zh0161jg8"; - name = "epresent"; + name = "recipe"; }; packageRequires = [ cl-lib org ]; meta = { @@ -19517,20 +25489,24 @@ license = lib.licenses.free; }; }) {}; - eprime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eprime-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eprime-mode"; + ename = "eprime-mode"; version = "20140513.1116"; src = fetchFromGitHub { owner = "AndrewHynes"; repo = "eprime-mode"; - rev = "17a481af26496be91c07139a9bfc05cfe722506f"; - sha256 = "1wwg46xdb488wxvglwvsy08vznrnmdmmbcvm9vb60dy3gqjmz7cw"; + rev = "a680adedff897a22142d4628af4244a2a3dfca41"; + sha256 = "0a481cr6y70kvxbsdwscv3srmvyvgk43chdzqljhhj4fgk0zsccn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37b4f3dce033fa18d23202ca4c36bc85754d547d/recipes/eprime-mode"; sha256 = "0vswjcs24f3mdyw6ai7p21ab8pdn327lr2d6css0a5nrg539cn2g"; - name = "eprime-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19538,9 +25514,14 @@ license = lib.licenses.free; }; }) {}; - eproject = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + eproject = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "eproject"; + ename = "eproject"; version = "20180312.942"; src = fetchFromGitHub { owner = "jrockway"; @@ -19548,10 +25529,10 @@ rev = "068218d2cf2138cb2e8fc29b57e773a0097a7e8b"; sha256 = "110b8gn47m5kafmvxr8q9zzrj0pdn6ikw9xsx4z1rc58i02jy307"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7e82668617a9b599f8994c720f3f123ba1e008a/recipes/eproject"; sha256 = "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4"; - name = "eproject"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -19559,9 +25540,13 @@ license = lib.licenses.free; }; }) {}; - erc-colorize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-colorize = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-colorize"; + ename = "erc-colorize"; version = "20170107.539"; src = fetchFromGitHub { owner = "thisirs"; @@ -19569,10 +25554,10 @@ rev = "d026a016dcb9d63d9ac66d30627a92a8f1681bbd"; sha256 = "1zzmsrlknrpw26kizd4dm1g604y9nkgh85xal9la70k94qcgv138"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e69214e89ec0e00b36609fce3efe22b5c1add1f9/recipes/erc-colorize"; sha256 = "1m941q7ql3yb71s71783nvz822bwhn1krmin18fvh0fbsbbnck2a"; - name = "erc-colorize"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19580,9 +25565,14 @@ license = lib.licenses.free; }; }) {}; - erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-crypt = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-crypt"; + ename = "erc-crypt"; version = "20161228.739"; src = fetchFromGitHub { owner = "atomontage"; @@ -19590,10 +25580,10 @@ rev = "731f9264a5bf08a8fc0b5ce69e72058c86f873a5"; sha256 = "13jpq5ws5dm8fyjrskk4icxwz8k5wgh396cc8f8wxrjna4wb843w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt"; sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3"; - name = "erc-crypt"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -19601,19 +25591,27 @@ license = lib.licenses.free; }; }) {}; - erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }: - melpaBuild { + erc-hipchatify = callPackage ({ alert + , emacs + , fetchhg + , fetchurl + , lib + , melpaBuild + , request + , s }: + melpaBuild { pname = "erc-hipchatify"; + ename = "erc-hipchatify"; version = "20170314.937"; src = fetchhg { url = "https://bitbucket.com/seanfarley/erc-hipchatify"; rev = "a53227513692"; sha256 = "0av0y65hz7fbiiqzmk5mmw6jv7fivhcd1w3s2xn5y5jpgps56mrc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify"; sha256 = "1a4gl05i757vvap0rzrfwms7mhw80sa84gvbwafrvj3x11rja24x"; - name = "erc-hipchatify"; + name = "recipe"; }; packageRequires = [ alert emacs request s ]; meta = { @@ -19621,20 +25619,24 @@ license = lib.licenses.free; }; }) {}; - erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-hl-nicks = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-hl-nicks"; - version = "20160202.1150"; + ename = "erc-hl-nicks"; + version = "20180415.1246"; src = fetchFromGitHub { owner = "leathekd"; repo = "erc-hl-nicks"; - rev = "be181920ce6af0ab5d00d1c638e4e598b3998643"; - sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7"; + rev = "756c4438a8245ccd3e389bf6c9850ee8453783ec"; + sha256 = "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks"; sha256 = "03hxsknf31vrja2amfa317ig4c34i5jpdq35zczrp00ap0s31nbq"; - name = "erc-hl-nicks"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19642,20 +25644,24 @@ license = lib.licenses.free; }; }) {}; - erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-image = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-image"; - version = "20180206.941"; + ename = "erc-image"; + version = "20180522.724"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-image.el"; - rev = "9f4d7b93a3c7e12ac935b50943177923a8c01d22"; - sha256 = "0dd2v91rp3lai10258bszpd9wsa1lvx08xspsnijv64axh73yf7r"; + rev = "82fb3871f02e24b1e880770b9a3d187aab43d0f0"; + sha256 = "1q8mkf612fb4fjp8h4kbr107wn083iqfdgv8f80pcmil8y33dw9i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image"; sha256 = "1k5llh2jg2wxy9v03qrhwqa6g7apkqiqa47jm24z0ydqinm6zl83"; - name = "erc-image"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19663,20 +25669,26 @@ license = lib.licenses.free; }; }) {}; - erc-scrolltoplace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, switch-buffer-functions }: - melpaBuild { + erc-scrolltoplace = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , switch-buffer-functions }: + melpaBuild { pname = "erc-scrolltoplace"; - version = "20171104.1346"; - src = fetchFromGitHub { + ename = "erc-scrolltoplace"; + version = "20180607.2306"; + src = fetchFromGitLab { owner = "jgkamat"; repo = "erc-scrolltoplace"; - rev = "7539654e4a72edcc5bba07a101961e5bf0a9d449"; - sha256 = "11zpqwh1mlfifbgnvhc63bvnhg340jgxssm3m43hr1sxsyb52lh6"; + rev = "feb0fbf1fd4bdf220ae2d31ea7c066d8e62089f9"; + sha256 = "1wb3xm45g77daw2ncs8a8w0m8d2hi591jmzwy5xli1zgrr5mm8h3"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ba300957fc00f5e53cf63dfa1e37a27b0d6d60/recipes/erc-scrolltoplace"; - sha256 = "1cr5nxdk854zcb1w0xvmi4mg45lxv011gap4i96nvdpd4qxmcxph"; - name = "erc-scrolltoplace"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/848cb17d871287c401496e4483e400b44696e89d/recipes/erc-scrolltoplace"; + sha256 = "0632i1p26z3f633iinkqka0x2dd55x02xidk9qr66jh0dzfs6q3i"; + name = "recipe"; }; packageRequires = [ emacs switch-buffer-functions ]; meta = { @@ -19684,9 +25696,13 @@ license = lib.licenses.free; }; }) {}; - erc-social-graph = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-social-graph = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-social-graph"; + ename = "erc-social-graph"; version = "20150508.504"; src = fetchFromGitHub { owner = "vibhavp"; @@ -19694,10 +25710,10 @@ rev = "e6ef3416a1c5064054bf054d9f0c1c7bf54a9cd0"; sha256 = "0k3gp4c74g5awk7v9lzb6py3dvf59nggh6dw7530cswxb6kg2psa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f347636c417aaf91728e56fd32313854fde3684/recipes/erc-social-graph"; sha256 = "07arn3k89cqxab5x5lczv8bpgrbirmlw9p6c37fgrl3df6f46h4h"; - name = "erc-social-graph"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19705,20 +25721,26 @@ license = lib.licenses.free; }; }) {}; - erc-status-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + erc-status-sidebar = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "erc-status-sidebar"; + ename = "erc-status-sidebar"; version = "20171223.1324"; src = fetchFromGitHub { owner = "drewbarbs"; repo = "erc-status-sidebar"; - rev = "9e972f4e31287362020daa81dc7af26999ea6c5b"; - sha256 = "0g7m5r5f01i73k05wny0xycrjcyhzwc314a5lb8h09kglwnmisgv"; + rev = "48ed93ca8e225b4a212d89ffc01803355f66ee0a"; + sha256 = "1pxs48rsmna177qvglyk32hy3rdfydg0spr4rzkf1gvn169ispss"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29631de8ec4140a8e35cc500902b58115faa3955/recipes/erc-status-sidebar"; sha256 = "04qh70ih74vbavq7ccwj1ixpd8s3g8rck9bxv6zhm1yv34bslw5d"; - name = "erc-status-sidebar"; + name = "recipe"; }; packageRequires = [ emacs seq ]; meta = { @@ -19726,9 +25748,13 @@ license = lib.licenses.free; }; }) {}; - erc-terminal-notifier = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-terminal-notifier = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-terminal-notifier"; + ename = "erc-terminal-notifier"; version = "20140115.224"; src = fetchFromGitHub { owner = "julienXX"; @@ -19736,10 +25762,10 @@ rev = "a3dacb935845e4a20031212bbd82b2170f68d2a8"; sha256 = "0cfqbqskh260zfq1lx1s8jz2351w2ij9m73rqim16fy7zr0s0670"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2ba978b1ba63fac3b7f1e9776ddc3b054455ac4/recipes/erc-terminal-notifier"; sha256 = "0vrxkg62qr3ki8n9mdn02sdni5fkj79fpkn0drx0a4kqp0nrrj7c"; - name = "erc-terminal-notifier"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19747,9 +25773,13 @@ license = lib.licenses.free; }; }) {}; - erc-track-score = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-track-score = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-track-score"; + ename = "erc-track-score"; version = "20130328.515"; src = fetchFromGitHub { owner = "jd"; @@ -19757,10 +25787,10 @@ rev = "5b27531ea6b1a4c4b703b270dfa9128cb5bfdaa3"; sha256 = "0n107d77z04ahypa7hn2165kkb6490v4vkzdm5zwm4lfhvlmp0x2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/erc-track-score"; sha256 = "19wjwah2n8ri6gyrsbzxnrvxwr5cj48sxrar1226n9miqvgj5whx"; - name = "erc-track-score"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19768,9 +25798,13 @@ license = lib.licenses.free; }; }) {}; - erc-tweet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-tweet = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-tweet"; + ename = "erc-tweet"; version = "20150920.558"; src = fetchFromGitHub { owner = "kidd"; @@ -19778,10 +25812,10 @@ rev = "91fed61e139fa788d66a7358f0d50acc896414b8"; sha256 = "118q4zj9dh5xnimcsi229j5pflhcd8qz0p212kc4p9dmyrx2iw0n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-tweet"; sha256 = "0nmh3r8s69hfmkz0jycn7w2icb5gnw2qbf8xjd52kigkdb2s646c"; - name = "erc-tweet"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19789,9 +25823,15 @@ license = lib.licenses.free; }; }) {}; - erc-twitch = callPackage ({ erc ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + erc-twitch = callPackage ({ erc ? null + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "erc-twitch"; + ename = "erc-twitch"; version = "20170426.2306"; src = fetchFromGitHub { owner = "vibhavp"; @@ -19799,10 +25839,10 @@ rev = "53c6af0cb72e56d897d30a40e7e5066668d6b5ec"; sha256 = "0qirx38czv8m7sgj3rm1zncmyd8z6k4xhd8ixwxl7nigfpqvvv4c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46f8640b24bade45cc729eeb370adf959f99526f/recipes/erc-twitch"; sha256 = "08vlwcxrzc2ndm52112z1r0qnz6jlmjhiwq2j3j59fbw82ys61ia"; - name = "erc-twitch"; + name = "recipe"; }; packageRequires = [ erc json ]; meta = { @@ -19810,9 +25850,13 @@ license = lib.licenses.free; }; }) {}; - erc-view-log = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-view-log = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-view-log"; + ename = "erc-view-log"; version = "20140227.1239"; src = fetchFromGitHub { owner = "Niluge-KiWi"; @@ -19820,10 +25864,10 @@ rev = "c5a25f0cbca84ed2e4f72068c02b66bd0ea3b266"; sha256 = "0bzi2sh2fhrz49j5y53h6jgf41av6rx78smb3bbk6m74is8vim2y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c0176d8e26014f7b62d14ac3adffa21a84b5741/recipes/erc-view-log"; sha256 = "1k6fawblz0d7kz1y7sa3q43s7ci28jsmzkp9vnl1nf55p9xvv4cf"; - name = "erc-view-log"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19831,9 +25875,13 @@ license = lib.licenses.free; }; }) {}; - erc-youtube = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-youtube = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-youtube"; + ename = "erc-youtube"; version = "20150603.1436"; src = fetchFromGitHub { owner = "kidd"; @@ -19841,10 +25889,10 @@ rev = "97054ba8475b442e2aa81e5a291f668b7f28697f"; sha256 = "0kh4amx3l3a14qaiyvjyak1jbybs6n49mdvzjrd1i2vd1y74zj5w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a80ee9617a30a8ad1d457a0b0c7f35e6ec1c0bb2/recipes/erc-youtube"; sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx"; - name = "erc-youtube"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19852,9 +25900,14 @@ license = lib.licenses.free; }; }) {}; - erc-yt = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-yt = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-yt"; + ename = "erc-yt"; version = "20150426.549"; src = fetchFromGitHub { owner = "yhvh"; @@ -19862,10 +25915,10 @@ rev = "43e7d49325b17a3217a6ffb4a9daf75c5ff4e6f8"; sha256 = "1dlw34kaslyvnsrahf4rm76r2b7qqqn589i4mmhr23prl8xbz9z9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ece0a6185a36d52971c35a35f5aa76ddafec3ced/recipes/erc-yt"; sha256 = "0yrwvahv4l2s1aavy6y6mjlrw8l11i00a249825ab5yaxrkzz7xc"; - name = "erc-yt"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -19873,20 +25926,24 @@ license = lib.licenses.free; }; }) {}; - ercn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ercn = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ercn"; + ename = "ercn"; version = "20150523.803"; src = fetchFromGitHub { owner = "leathekd"; repo = "ercn"; - rev = "79a4df5609046ae2e2e3375998287be6dda80615"; - sha256 = "0xw3d9fz4kmn1myrsy44ki4bgg0aclv41wldl6r9nhvkrnri41cv"; + rev = "8f2493fb40753b9c3699322c205f4dcf0a5bd67b"; + sha256 = "1hzzfh6fxx03cyb039jbhwdfd0zybfrlaqmcyf14f6dq4d3gvl92"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a12f264653d79224adeb5d0ae76518dc408ff1e9/recipes/ercn"; sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp"; - name = "ercn"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19894,9 +25951,17 @@ license = lib.licenses.free; }; }) {}; - ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }: - melpaBuild { + ereader = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , xml-plus }: + melpaBuild { pname = "ereader"; + ename = "ereader"; version = "20170809.2201"; src = fetchFromGitHub { owner = "bddean"; @@ -19904,10 +25969,10 @@ rev = "f3bbd3f13195f8fba3e3c880aab0e4c60430dcf3"; sha256 = "18yqqqxsivnq2m8mxz7ifp0bfmn3q9m11w3abryxg2snh4vb5sy6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ereader"; sha256 = "1ai27lyb9xcmjjcnppzzhb6ilsvq9d9g9z7h79lp7axq761vind4"; - name = "ereader"; + name = "recipe"; }; packageRequires = [ dash emacs s xml-plus ]; meta = { @@ -19915,9 +25980,13 @@ license = lib.licenses.free; }; }) {}; - eredis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eredis = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eredis"; + ename = "eredis"; version = "20180221.1313"; src = fetchFromGitHub { owner = "justinhj"; @@ -19925,10 +25994,10 @@ rev = "8a96034805fe0664132ce2e12deb9936503af2d4"; sha256 = "1w4z98vr7iy6yxdk3lha7flk48ckxl2baaq8kx7abkirzfl8j4hh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63f06713d06911f836fe2a4bf199b0794ac89cf0/recipes/eredis"; sha256 = "087lln2izn5bv7bprmbaciivf17vv4pz2cjl91hy2f0sww6nsiw8"; - name = "eredis"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19936,9 +26005,14 @@ license = lib.licenses.free; }; }) {}; - erefactor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erefactor = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erefactor"; + ename = "erefactor"; version = "20160121.159"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -19946,10 +26020,10 @@ rev = "bf68085e5635eb94fd85709f8e1355c1f5534745"; sha256 = "1v8x6qmhywfxs7crzv7hfl5n4zq5y3ar40l873946l4wyk0wclng"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18063e16a6f556b1871e1a5b74e353a85a794e63/recipes/erefactor"; sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7"; - name = "erefactor"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -19957,20 +26031,27 @@ license = lib.licenses.free; }; }) {}; - ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: - melpaBuild { + ergoemacs-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , undo-tree }: + melpaBuild { pname = "ergoemacs-mode"; - version = "20171030.738"; + ename = "ergoemacs-mode"; + version = "20180709.645"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "3ce23bba3cb50562693860f87f3528c471d603ba"; - sha256 = "1s3b9bridl78hh1mxmdk9nqlmqhibbaxk0a1cixmsf23s06w8w6l"; + rev = "a5d46653fd3a521276630c81bf75d3e8d224e5cb"; + sha256 = "10y79z7xakjl4x95mvf8jjqxxsgkmz0k7czl0vwhk6j8c910v871"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62"; - name = "ergoemacs-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs undo-tree ]; meta = { @@ -19978,9 +26059,15 @@ license = lib.licenses.free; }; }) {}; - ergoemacs-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline }: - melpaBuild { + ergoemacs-status = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mode-icons + , powerline }: + melpaBuild { pname = "ergoemacs-status"; + ename = "ergoemacs-status"; version = "20160317.2238"; src = fetchFromGitHub { owner = "ergoemacs"; @@ -19988,10 +26075,10 @@ rev = "d952cc2361adf6eb4d6af60950ad4ab699c81320"; sha256 = "06pdwrhflpi5rkigqnr5h3jzv3dm1p9nydpvql9w33ixm6qhjj71"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4af9606cfe09cdd294fae6b4b1f477f7861fdb7/recipes/ergoemacs-status"; sha256 = "065pw31s8dmqpag7zj40iv6dbl0qln7c65gcyp7pz9agg9rp6vbb"; - name = "ergoemacs-status"; + name = "recipe"; }; packageRequires = [ mode-icons powerline ]; meta = { @@ -19999,20 +26086,25 @@ license = lib.licenses.free; }; }) {}; - erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erlang = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erlang"; - version = "20180323.612"; + ename = "erlang"; + version = "20180618.557"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "f99860259ee557851acc865519a315f04d1d4d51"; - sha256 = "02vba3597wlxv7jf8samds6pp2x3z0w39nh2jnszfnqgqwl16b8d"; + rev = "9d5af99762b3795c763fb62c1516247bd3f8e12f"; + sha256 = "0anlp0qj2blgdjzdw8rxmpz659yzbdl3r69b6slm1c1aa77ayc17"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq"; - name = "erlang"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -20020,20 +26112,25 @@ license = lib.licenses.free; }; }) {}; - eros = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eros = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eros"; - version = "20161221.826"; + ename = "eros"; + version = "20180414.2318"; src = fetchFromGitHub { owner = "xiongtx"; repo = "eros"; - rev = "a42e45c9b2397156c684330b0fc90ee0eba773f5"; - sha256 = "0whlsq90v13fz69k3wjrwcwb9gkpfxqjd75mg3nrp85j9nwhb5i4"; + rev = "dd8910279226259e100dab798b073a52f9b4233a"; + sha256 = "08chj3a0lw4ygi2sv7wj0i6ihfbi8jhylr8p92inif8b88r6wg3k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eros"; sha256 = "0l79bn72x5m2lzglrwwngz3hax9pf8wv7ci86y5pkwaa8frxycww"; - name = "eros"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -20041,9 +26138,13 @@ license = lib.licenses.free; }; }) {}; - ert-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ert-async = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ert-async"; + ename = "ert-async"; version = "20151011.659"; src = fetchFromGitHub { owner = "rejeep"; @@ -20051,10 +26152,10 @@ rev = "f64a7ed5b0d2900c9a3d8cc33294bf8a79bc8526"; sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ec669e3fc73b0b499b84cec87d0f8621274732e/recipes/ert-async"; sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5"; - name = "ert-async"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20062,9 +26163,13 @@ license = lib.licenses.free; }; }) {}; - ert-expectations = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ert-expectations = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ert-expectations"; + ename = "ert-expectations"; version = "20121009.34"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -20072,10 +26177,10 @@ rev = "aed70e002c4305b66aed7f6d0d48e9addd2dc1e6"; sha256 = "0qgi3rj49k0hz4azg7ghcj6385p5s9gakqjhrjnhih7dxvihcgxi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/ert-expectations"; sha256 = "07mp0azb6wsa1z4s6q8jyh7dpzils0wh2bamfmxzy4gjqjwv8ncn"; - name = "ert-expectations"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20083,19 +26188,24 @@ license = lib.licenses.free; }; }) {}; - ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + ert-junit = callPackage ({ ert ? null + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ert-junit"; - version = "20180208.935"; + ename = "ert-junit"; + version = "20180511.1548"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; - rev = "e0cd3c21292e4a80fa8a9648981b61e62a996e80"; - sha256 = "0i6962j2k6qmdlrw2m5jv2pyxvciyawd954q462nv64cddaa5581"; + rev = "cd1f63627d4e6635086322f34be09ba535e26b97"; + sha256 = "0a2ddvpm8yparl3zq05mp239k5dgplcmc9s61ak9d5qn65l8mwyr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit"; sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g"; - name = "ert-junit"; + name = "recipe"; }; packageRequires = [ ert ]; meta = { @@ -20103,20 +26213,28 @@ license = lib.licenses.free; }; }) {}; - ert-modeline = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }: - melpaBuild { + ert-modeline = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , s }: + melpaBuild { pname = "ert-modeline"; + ename = "ert-modeline"; version = "20140115.215"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "ert-modeline"; - rev = "e7be2b81191afb437b70368a819770f8f750e4af"; - sha256 = "08yfq3qzscxvzyxvyvdqpkrm787278yhkdd9prbvrgjj80p8n7vq"; + rev = "7c6340834387f749519616f9601821cb73fd657b"; + sha256 = "08gk47fwd4hvl6gby3nyg3f9wq2l6phkkmq6yl04ff1qbjmvnx0p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b3a301889d6eea2470017519b080519efbe1bec/recipes/ert-modeline"; sha256 = "06pc50q9ggin20cbfafxd53x35ac3kh85dap0nbws7514f473m7b"; - name = "ert-modeline"; + name = "recipe"; }; packageRequires = [ dash emacs projectile s ]; meta = { @@ -20124,9 +26242,19 @@ license = lib.licenses.free; }; }) {}; - ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: - melpaBuild { + ert-runner = callPackage ({ ansi + , commander + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , shut-up }: + melpaBuild { pname = "ert-runner"; + ename = "ert-runner"; version = "20180215.857"; src = fetchFromGitHub { owner = "rejeep"; @@ -20134,10 +26262,10 @@ rev = "0de42343a9de834320397d169c81725b2827e41f"; sha256 = "0jc7n6mdv1kka47wmjjhgfw46l16mqlj5kkkyw16gd9g8dwcf6sr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner"; sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48"; - name = "ert-runner"; + name = "recipe"; }; packageRequires = [ ansi commander dash f s shut-up ]; meta = { @@ -20145,9 +26273,14 @@ license = lib.licenses.free; }; }) {}; - es-lib = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + es-lib = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "es-lib"; + ename = "es-lib"; version = "20141111.1030"; src = fetchFromGitHub { owner = "sabof"; @@ -20155,10 +26288,10 @@ rev = "753b27363e39c10edc9e4e452bdbbbe4d190df4a"; sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/es-lib"; sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n"; - name = "es-lib"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -20166,9 +26299,18 @@ license = lib.licenses.free; }; }) {}; - es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: - melpaBuild { + es-mode = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , s + , spark }: + melpaBuild { pname = "es-mode"; + ename = "es-mode"; version = "20180212.1425"; src = fetchFromGitHub { owner = "dakrone"; @@ -20176,10 +26318,10 @@ rev = "c5ad728ce3fc2c513108e0ada2cd0c08ab94f870"; sha256 = "0drmxxqgml36fymn4gqxbjimh8dgmm4yr68hsmsd0iz1lxglgda1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; sha256 = "0zp84k5idqkrvc9qci49ains0b86kpk97lk1jcwyj75s4xsfyp1y"; - name = "es-mode"; + name = "recipe"; }; packageRequires = [ cl-lib dash request s spark ]; meta = { @@ -20187,20 +26329,26 @@ license = lib.licenses.free; }; }) {}; - es-windows = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + es-windows = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "es-windows"; + ename = "es-windows"; version = "20140211.104"; src = fetchFromGitHub { owner = "sabof"; repo = "es-windows"; - rev = "239e30408cb1adb4bc8bd63e2df34711fa910b4f"; - sha256 = "14rsifcx2kwdmwq9zh41fkb848l0f4igp5v9pk3x4jd2yw9gay7m"; + rev = "7ebe6c6e0831373847d7adbedeaa2e506b54b2af"; + sha256 = "0cjchwrhk7bw87bg10zgcwkga50rvs0jn5v2jf6bbsxbcqx2nfc9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/944d4cd54e040d2a58e1778cb282727deee83f92/recipes/es-windows"; sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx"; - name = "es-windows"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -20208,20 +26356,25 @@ license = lib.licenses.free; }; }) {}; - esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + esa = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "esa"; - version = "20170427.845"; + ename = "esa"; + version = "20180403.825"; src = fetchFromGitHub { owner = "nabinno"; repo = "esa.el"; - rev = "8bd011cd1861113f54ad155d3c62725e1dcd37e7"; - sha256 = "1a5mrz3m0gy5r7dcw31s488jgfhrp4axcnsmma40q2x3harp0hsk"; + rev = "417e0ac55abe9b17e0b7165d0df26bc018aff42e"; + sha256 = "0hib8q9fslvw02i1y19z78fv6yy88q09lhfdfmbdyn6yal21855q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa"; sha256 = "0y4mbq0z6vp0faxq6dq5hhxnsbi685amxqbvpxkxahl1nckp76lb"; - name = "esa"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -20229,41 +26382,26 @@ license = lib.licenses.free; }; }) {}; - escreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "escreen"; - version = "20170613.1534"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "escreen"; - rev = "153dc05b2b7e6e2d4cbd7b6cbe8b10d6a70f73f3"; - sha256 = "0xz3dkvgrbgv91dxgdfcir9zld5qsqpzrmp4q6fxqa548advn9ak"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c64c21a42fd8436bd60e490980ad4ed824b212d1/recipes/escreen"; - sha256 = "0yis27362jc63jkzdndz1wpysmf1b51rrbv3swvi6b36da5i6b54"; - name = "escreen"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/escreen"; - license = lib.licenses.free; - }; - }) {}; - esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + esh-autosuggest = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "esh-autosuggest"; + ename = "esh-autosuggest"; version = "20171223.1855"; src = fetchFromGitHub { owner = "dieggsy"; repo = "esh-autosuggest"; - rev = "2fd996c1a29b21e60854a3c90d7d4fc3d5b0aded"; - sha256 = "1vkbyhkvvj5h63ybxg795m61c4157jm2v01y9m98jm4pxysmls7m"; + rev = "aa921f8975b0f95d1cb0044e6ad7f17529261610"; + sha256 = "19qhpvw5y7hvkqy8jdyrnm4m90jdxxdiaabcrjiwxmkzq3wgnx8q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest"; sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx"; - name = "esh-autosuggest"; + name = "recipe"; }; packageRequires = [ company emacs ]; meta = { @@ -20271,20 +26409,24 @@ license = lib.licenses.free; }; }) {}; - esh-buf-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + esh-buf-stack = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "esh-buf-stack"; + ename = "esh-buf-stack"; version = "20140107.218"; src = fetchFromGitHub { owner = "tom-tan"; repo = "esh-buf-stack"; - rev = "ce0ea5aadca3150eaa9d2e6ec20296add4e99176"; - sha256 = "1k8k9hl9m4vjqdw3x9wg04cy2lb9x64mq0mm0i3i6w59zrsnkn4q"; + rev = "ea5da9ce8566ffe2e013f0e588701cb0825258b6"; + sha256 = "1fllnc9awj24781h527n7b83i232i54ad5a9pczqvdr5s4kn4vfs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61e8f75aa0d5446c61aadc7ac22371e44a3761b8/recipes/esh-buf-stack"; sha256 = "0zmwlsm98m9vbjk9mldfj2nf6cip7mlvb71j33ddix76yqggp4qg"; - name = "esh-buf-stack"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20292,9 +26434,14 @@ license = lib.licenses.free; }; }) {}; - esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + esh-help = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "esh-help"; + ename = "esh-help"; version = "20170829.2111"; src = fetchFromGitHub { owner = "tom-tan"; @@ -20302,10 +26449,10 @@ rev = "8a8a9d4d9852f8bd96da3b94e95ff57097ac8ec6"; sha256 = "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help"; sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w"; - name = "esh-help"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -20313,9 +26460,13 @@ license = lib.licenses.free; }; }) {}; - eshell-autojump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-autojump = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-autojump"; + ename = "eshell-autojump"; version = "20150927.24"; src = fetchFromGitHub { owner = "coldnew"; @@ -20323,10 +26474,10 @@ rev = "c6a8b81a16576df9875e721fbbfe6690d04e7e43"; sha256 = "13crzgkx1lham1nfsg6hj2zg875majvnig0v4ydg691zk1qi4hc2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bd1a8ec9d17eff2d23e15b3686f7c0b8723126/recipes/eshell-autojump"; sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5"; - name = "eshell-autojump"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20334,9 +26485,14 @@ license = lib.licenses.free; }; }) {}; - eshell-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-bookmark = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-bookmark"; + ename = "eshell-bookmark"; version = "20170922.814"; src = fetchFromGitHub { owner = "Fuco1"; @@ -20344,10 +26500,10 @@ rev = "deda4b848b2fb979dbe73ead2cb866610e3596ed"; sha256 = "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bf4702a907727990fcc676980f2b219e22ab0c/recipes/eshell-bookmark"; sha256 = "1bybxlq1h5chrjxqjb23kq8dmgw2xrjwkrnvpbphblqzpdy5ck0s"; - name = "eshell-bookmark"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -20355,9 +26511,15 @@ license = lib.licenses.free; }; }) {}; - eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-did-you-mean = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-did-you-mean"; + ename = "eshell-did-you-mean"; version = "20150915.1252"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -20365,10 +26527,10 @@ rev = "7cb6ef8e2274d0a50a9e114d412307a6543533d5"; sha256 = "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7649eca21a21ddbbc7131f29cbbd91a00a84060/recipes/eshell-did-you-mean"; sha256 = "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz"; - name = "eshell-did-you-mean"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -20376,9 +26538,15 @@ license = lib.licenses.free; }; }) {}; - eshell-fixed-prompt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + eshell-fixed-prompt = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "eshell-fixed-prompt"; + ename = "eshell-fixed-prompt"; version = "20170804.635"; src = fetchFromGitHub { owner = "mallt"; @@ -20386,10 +26554,10 @@ rev = "4351b214de6d4e8e45279930448e2f93b491848e"; sha256 = "1zx3zn28m5dnvsnkpqd26szv9yzplnb6wyp9vfjfs3hnasrizbxc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-fixed-prompt"; sha256 = "0mhrfxf19p4qqnlnnfc0z70324c7qiiv63riaz4cn5jj1ps3v0iy"; - name = "eshell-fixed-prompt"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -20397,9 +26565,13 @@ license = lib.licenses.free; }; }) {}; - eshell-fringe-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-fringe-status = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-fringe-status"; + ename = "eshell-fringe-status"; version = "20170117.1516"; src = fetchFromGitHub { owner = "ryuslash"; @@ -20407,10 +26579,10 @@ rev = "adc6997c68e39c0d52a2af1b2fd5cf2057783797"; sha256 = "1cwn4cvjjd4l5kk7s6cxzafjmdv3s7k78i73fvscmsnpwx9p2wj0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9efd9fefab5d449b9f70d9f548aadfea52d66bc0/recipes/eshell-fringe-status"; sha256 = "1vavidnijxzhr4v39q4bxi645vsfcj6vp0wnlhznpxagshr950lg"; - name = "eshell-fringe-status"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20418,9 +26590,16 @@ license = lib.licenses.free; }; }) {}; - eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-git-prompt = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-git-prompt"; + ename = "eshell-git-prompt"; version = "20170909.752"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -20428,10 +26607,10 @@ rev = "b6bb2d7bd4e393b4170b29891cfefb72ae020aab"; sha256 = "02i00an9wa8ns66xq900la68m7pd4hwv95g83cvf22bypivx7p2y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt"; sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s"; - name = "eshell-git-prompt"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -20439,9 +26618,13 @@ license = lib.licenses.free; }; }) {}; - eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-prompt-extras = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-prompt-extras"; + ename = "eshell-prompt-extras"; version = "20180109.2234"; src = fetchFromGitHub { owner = "hiddenlotus"; @@ -20449,10 +26632,10 @@ rev = "1d8825dcc005b488c6366d0b3015fc6686194eea"; sha256 = "1nqzd24wwvyzf3bn7m7vd4xqmj4p8z51h8cnli07yja17cr5gwx6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; sha256 = "0kh4lvjkayjdz5lqvdqmdcblxizxk9kwmigjwa68kx8z6ngmfwa5"; - name = "eshell-prompt-extras"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20460,20 +26643,25 @@ license = lib.licenses.free; }; }) {}; - eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-up = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-up"; + ename = "eshell-up"; version = "20170425.1037"; src = fetchFromGitHub { owner = "peterwvj"; repo = "eshell-up"; - rev = "9c100bae5c3020e8d9307e4332d3b64e7dc28519"; - sha256 = "00zdbcncjabgj5mp47l1chymx5na18v2g4kj730dgmj3rnl3iz2q"; + rev = "b00e447ad7941ab31bcbb6bc0205fd492e887e7d"; + sha256 = "1802887ad7y6m40azfvzz6aapdzkp655jpiryimqd11kwbsinmvv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-up"; sha256 = "1jyaaw950isissjjgqflfn2bllgdfcyphpbi7il06mv9p0dzpwvy"; - name = "eshell-up"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -20481,9 +26669,14 @@ license = lib.licenses.free; }; }) {}; - eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-z = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-z"; + ename = "eshell-z"; version = "20170116.2038"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -20491,10 +26684,10 @@ rev = "c9334cbc1552234df3437f35d98e32f4d18446b8"; sha256 = "1zja4hb2lj4m5w4j9mpc7xyqgg2ivpslllffjsg8x1w8xsxpj8fh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z"; sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d"; - name = "eshell-z"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -20502,20 +26695,24 @@ license = lib.licenses.free; }; }) {}; - eslint-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eslint-fix = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eslint-fix"; - version = "20160819.36"; + ename = "eslint-fix"; + version = "20180514.0"; src = fetchFromGitHub { owner = "codesuki"; repo = "eslint-fix"; - rev = "be90d1e78b1dfd43b6b3b1c06868539e2ac27d3a"; - sha256 = "1l7pm0ywjby0giilyn6qsz1zh54sgmvmii7y9jhrva13c5kgg9an"; + rev = "f81f3b47a47460611fbdbdae1d23275ec78f2f8d"; + sha256 = "0k3asz3mdz4nm8lq37x9rgx4wb8hsfyr0hlfyhzwdb10x57jfzns"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eslint-fix"; sha256 = "0ry271jlv95nhdqx6qxmvkpa10lpwkg1q6asnliviwplq2mxw2da"; - name = "eslint-fix"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20523,20 +26720,26 @@ license = lib.licenses.free; }; }) {}; - eslintd-fix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eslintd-fix = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eslintd-fix"; - version = "20171128.453"; + ename = "eslintd-fix"; + version = "20180429.755"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "3efb041c9ad0116e745efaede7f7972bc2179a72"; - sha256 = "16siwr2d930kifdhzgbyiszphp6i5ggbyi76ya6gkzy6wh1s9b56"; + rev = "90e451af4daa190d6c0e29fb714b0501a7cce89a"; + sha256 = "01jysgdd4im4kf4afzwd4mm8x9vlpibb1w4yi2jvc0hglqddnr2g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v"; - name = "eslintd-fix"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -20544,9 +26747,13 @@ license = lib.licenses.free; }; }) {}; - espresso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + espresso-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "espresso-theme"; + ename = "espresso-theme"; version = "20170716.813"; src = fetchFromGitHub { owner = "dgutov"; @@ -20554,10 +26761,10 @@ rev = "e79c5c14732b7e34aab75dbcc968839536536c59"; sha256 = "0jdyxyc6mk0vh35wgic8ikvs9cid7b5ffqx94pkg1kpridm2wrzc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c929ec2eac0459c7018019702599e09ac908fd/recipes/espresso-theme"; sha256 = "1bsff8fnq5z0f6cwg6wprz8qi3ivsqxpxx6v6fxfammn74qqyvb5"; - name = "espresso-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20565,20 +26772,27 @@ license = lib.licenses.free; }; }) {}; - espuds = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + espuds = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "espuds"; + ename = "espuds"; version = "20160905.600"; src = fetchFromGitHub { owner = "ecukes"; repo = "espuds"; - rev = "78fc53feaf77a98d63894cd410faee2a18107b00"; - sha256 = "04479z1397vaz48bxx3f1xdvxnq1p01gg1y5f3hcbswjl8j3ahmr"; + rev = "ef854367d469c6eff459d24a544addd21a4fbd23"; + sha256 = "024msmnwlnsgqa523s3phxj1g77pyw917gz1fhz56062576nv22q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds"; sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c"; - name = "espuds"; + name = "recipe"; }; packageRequires = [ dash f s ]; meta = { @@ -20586,20 +26800,25 @@ license = lib.licenses.free; }; }) {}; - esqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcsv }: - melpaBuild { + esqlite = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcsv }: + melpaBuild { pname = "esqlite"; + ename = "esqlite"; version = "20151206.406"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-esqlite"; - rev = "bc4047e09b8f6c34802db86095cd465935670dce"; - sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn"; + rev = "fae9826cbc255b0f0686a801288f1441bda5f631"; + sha256 = "0ag444hfrpdrf3lnaz7l2plj392xgh7a2080421z3g0alc74m8h3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bbec16cd1682ac15a81304f351f9c4e6b3b70fa9/recipes/esqlite"; sha256 = "1dny5qjzl9gaj90ihzbhliwk0n0x7jz333hzf6gaw7wsjmx91wlh"; - name = "esqlite"; + name = "recipe"; }; packageRequires = [ pcsv ]; meta = { @@ -20607,20 +26826,26 @@ license = lib.licenses.free; }; }) {}; - esqlite-helm = callPackage ({ esqlite, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + esqlite-helm = callPackage ({ esqlite + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "esqlite-helm"; + ename = "esqlite-helm"; version = "20151116.50"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-esqlite"; - rev = "bc4047e09b8f6c34802db86095cd465935670dce"; - sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn"; + rev = "84d5b16198f30949c544affba751ee0d58a000d9"; + sha256 = "0z92205ryab1j2pih89pj82cdgdsz0ddp7wwia8ivxvjpd3jp751"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bbec16cd1682ac15a81304f351f9c4e6b3b70fa9/recipes/esqlite-helm"; sha256 = "00y2nwyx13xlny40afczr31lvbpnw1cgmj5wc3iycyznizg5kvhq"; - name = "esqlite-helm"; + name = "recipe"; }; packageRequires = [ esqlite helm ]; meta = { @@ -20628,30 +26853,41 @@ license = lib.licenses.free; }; }) {}; - ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: - melpaBuild { + ess = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ess"; - version = "20180401.319"; + ename = "ess"; + version = "20180720.131"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "6d0dafab3ac7a97e530d4082f874dcc24b558a68"; - sha256 = "1919sdjhkrj66r1bn9nyccj20s3b5wa8p63avk1mgyyfa3a1bnza"; + rev = "167b61af2c36c300a2f1f9ecea2c670af685451b"; + sha256 = "1bcd652hq7j5azhmy470ha4279c5ld8db1gcqww65clay7gvnbkg"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; - sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i"; - name = "ess"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/156a6fa9e6ee16174d215c1dcd524aff847b3bf0/recipes/ess"; + sha256 = "1psqrw9k7d2ha8zid2mkc6bgcyalrm3n53c00g3cgckkbahl7r6n"; + name = "recipe"; }; - packageRequires = [ julia-mode ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/ess"; license = lib.licenses.free; }; }) {}; - ess-R-data-view = callPackage ({ ctable, ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + ess-R-data-view = callPackage ({ ctable + , ess + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "ess-R-data-view"; + ename = "ess-R-data-view"; version = "20130509.458"; src = fetchFromGitHub { owner = "myuhe"; @@ -20659,10 +26895,10 @@ rev = "d6e98d3ae1e2a2ea39a56eebcdb73e99d29562e9"; sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/492c90bd0ee97c0b895efa0c5e647b2becc6db11/recipes/ess-R-data-view"; sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0"; - name = "ess-R-data-view"; + name = "recipe"; }; packageRequires = [ ctable ess popup ]; meta = { @@ -20670,9 +26906,15 @@ license = lib.licenses.free; }; }) {}; - ess-smart-equals = callPackage ({ emacs, ess, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ess-smart-equals = callPackage ({ emacs + , ess + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ess-smart-equals"; + ename = "ess-smart-equals"; version = "20150201.2201"; src = fetchFromGitHub { owner = "genovese"; @@ -20680,10 +26922,10 @@ rev = "e0f5f18f01ed252fde50d051adf1fa6254a254c9"; sha256 = "0ici253mllqyzcbhxrazfj2kl50brr8qid99fk9nlyfgh516ms1x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4403cf87e05311d7fe0360f35f9634b9fdfc6f81/recipes/ess-smart-equals"; sha256 = "0mfmxmsqr2byj56psx4h08cjc2j3aac3xqr04yd47k2mlivnyrxp"; - name = "ess-smart-equals"; + name = "recipe"; }; packageRequires = [ emacs ess ]; meta = { @@ -20691,9 +26933,14 @@ license = lib.licenses.free; }; }) {}; - ess-smart-underscore = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ess-smart-underscore = callPackage ({ ess + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ess-smart-underscore"; + ename = "ess-smart-underscore"; version = "20170222.1715"; src = fetchFromGitHub { owner = "mattfidler"; @@ -20701,10 +26948,10 @@ rev = "02e8a03553f34fe7184afff97f20e560d6f8d617"; sha256 = "0kk9n66xjm08cj6zdqxfn332fb4c2is4pdxgqamypdwsdjhcz57l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4d6166f5c80cf37c79256402fa633ad2274d065/recipes/ess-smart-underscore"; sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2"; - name = "ess-smart-underscore"; + name = "recipe"; }; packageRequires = [ ess ]; meta = { @@ -20712,20 +26959,27 @@ license = lib.licenses.free; }; }) {}; - ess-view = callPackage ({ ess, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ess-view = callPackage ({ ess + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ess-view"; - version = "20160309.1315"; + ename = "ess-view"; + version = "20180525.1503"; src = fetchFromGitHub { owner = "GioBo"; repo = "ess-view"; - rev = "5ae35d37ac625b16640401d19f9a51b340da9420"; - sha256 = "1fdg8a4nsyjhwqsslawfvij77g3fp9klpas7m8vwjsjpc85iwh3x"; + rev = "dab08b405dbda5aff71022c5cf021ea18b2bde0f"; + sha256 = "1qi7gp5aj64b7sddvcms1c1x5h7j7dcd0rw6h4liw0d0gjkq82br"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96960a8799138187b748a47ac007dc25d739fe10/recipes/ess-view"; sha256 = "1zx5sbxmbs6ya349ic7yvnx56v3km2cb27p8kan5ygisnwwq2wc4"; - name = "ess-view"; + name = "recipe"; }; packageRequires = [ ess f s ]; meta = { @@ -20733,20 +26987,26 @@ license = lib.licenses.free; }; }) {}; - esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + esup = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "esup"; - version = "20180325.2152"; + ename = "esup"; + version = "20180506.1639"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "fb061cf49bea47ba80090775d93388dc9b1b495e"; - sha256 = "1ygn927d71dxh07si38ii48l4myg42vb7xl09nbbz9c0df4m8q0a"; + rev = "1182c490a7ddc275318c9eb25b8d5bbdf9b78d2b"; + sha256 = "1nkglqr42r2s0vqkj092j131a0ykjrj6qiawgw6id60yn0grhpqb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0"; - name = "esup"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -20754,9 +27014,13 @@ license = lib.licenses.free; }; }) {}; - esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + esxml = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "esxml"; + ename = "esxml"; version = "20171129.7"; src = fetchFromGitHub { owner = "tali713"; @@ -20764,10 +27028,10 @@ rev = "5548ceba17deae0c3c6d0092672edc4de3c75ce3"; sha256 = "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml"; sha256 = "1375gryii984l33gc8f8yhl3vncjmw1w9k6xpvjgmnpx2fwr1vbq"; - name = "esxml"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20775,9 +27039,16 @@ license = lib.licenses.free; }; }) {}; - etable = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, interval-list, lib, melpaBuild }: - melpaBuild { + etable = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , interval-list + , lib + , melpaBuild }: + melpaBuild { pname = "etable"; + ename = "etable"; version = "20161028.1309"; src = fetchFromGitHub { owner = "Fuco1"; @@ -20785,10 +27056,10 @@ rev = "d502141f0c69bf95256ba5cb9cd15350c7e942d2"; sha256 = "0k0g58qzkkzall715k0864v3b7p5jnfwxqgmkj087x34frcf388k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/afee0fed80f4fa444116b12653c034d760f5f1fb/recipes/etable"; sha256 = "0m4h24mmhp680wfhb90im228mrcyxapzyi4kla8xdmss83gc0c32"; - name = "etable"; + name = "recipe"; }; packageRequires = [ dash emacs interval-list ]; meta = { @@ -20796,20 +27067,27 @@ license = lib.licenses.free; }; }) {}; - eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: - melpaBuild { + eterm-256color = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xterm-color }: + melpaBuild { pname = "eterm-256color"; - version = "20180308.1615"; + ename = "eterm-256color"; + version = "20180520.523"; src = fetchFromGitHub { owner = "dieggsy"; repo = "eterm-256color"; - rev = "dab96af559deb443c4c9c00e23389926e1607192"; - sha256 = "0ysxblc90kjcz84siprnyxwh94scflivqbxylzkvjm7hbx93rsh1"; + rev = "ef99d3a12ddce4aa06069c19e66e826f4cfc91e4"; + sha256 = "1q1m125qwga8397qx5ln326aw3x8vi2y8w065w0zccxrq7n21ds4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color"; sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b"; - name = "eterm-256color"; + name = "recipe"; }; packageRequires = [ emacs f xterm-color ]; meta = { @@ -20817,20 +27095,24 @@ license = lib.licenses.free; }; }) {}; - ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ethan-wspace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ethan-wspace"; + ename = "ethan-wspace"; version = "20170507.1330"; src = fetchFromGitHub { owner = "glasserc"; repo = "ethan-wspace"; - rev = "e055ee6730c0b03525d32e67511ef6c51e4c29e4"; - sha256 = "0ik3y60xd3ap1pg5dr5ab6bq4qh8gblpgz1iiprmv7acr3ckzc41"; + rev = "14ae43130e019034367cd2b6e2bf9a067955dd33"; + sha256 = "19i8y8ys58mvzmz0ijcdv9nnrs3b85zbgl087d68734vhp73iy78"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace"; sha256 = "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws"; - name = "ethan-wspace"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20838,9 +27120,17 @@ license = lib.licenses.free; }; }) {}; - euslisp-mode = callPackage ({ emacs, exec-path-from-shell, fetchFromGitHub, fetchurl, helm-ag, lib, melpaBuild, s }: - melpaBuild { + euslisp-mode = callPackage ({ emacs + , exec-path-from-shell + , fetchFromGitHub + , fetchurl + , helm-ag + , lib + , melpaBuild + , s }: + melpaBuild { pname = "euslisp-mode"; + ename = "euslisp-mode"; version = "20170830.1229"; src = fetchFromGitHub { owner = "iory"; @@ -20848,10 +27138,10 @@ rev = "db62a2d148482317794727982576494596365a55"; sha256 = "187ij4s7mzppgmh0ifny70mw8w31nq86rhsrmnflz26iywnkp8x2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b04fffe5e52f26e92930a112a64531228f94e340/recipes/euslisp-mode"; sha256 = "0v92lry9ynkvsvx060njaw1j5lj9sb1i3srs2hfqqwyqni5ldkri"; - name = "euslisp-mode"; + name = "recipe"; }; packageRequires = [ emacs exec-path-from-shell helm-ag s ]; meta = { @@ -20859,9 +27149,13 @@ license = lib.licenses.free; }; }) {}; - eval-expr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eval-expr = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eval-expr"; + ename = "eval-expr"; version = "20120618.2347"; src = fetchFromGitHub { owner = "jwiegley"; @@ -20869,10 +27163,10 @@ rev = "a0e69e83de41df8dbccefc1962ab4f02206a3328"; sha256 = "08zw3qrhqmnv2wxmbf74svk2cx5by4831kyw6rx13imkc4x8kngx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f56c5312cc8ffc1a8b31fc342e8e2b8827eff846/recipes/eval-expr"; sha256 = "0zkphbx7ph4p7qkfxqyr6p8420j9qkvx5wghd1sza6y0kb456872"; - name = "eval-expr"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20880,9 +27174,16 @@ license = lib.licenses.free; }; }) {}; - eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: - melpaBuild { + eval-in-repl = callPackage ({ ace-window + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , paredit }: + melpaBuild { pname = "eval-in-repl"; + ename = "eval-in-repl"; version = "20171122.543"; src = fetchFromGitHub { owner = "kaz-yos"; @@ -20890,10 +27191,10 @@ rev = "fea05a5b81d74ac53cb2a83aa83a73d9526bcc42"; sha256 = "0xm1ggdaihy1cyg4b3b9x1n93bp4qiv30p1mfzmmqm6w89z1agf0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl"; sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63"; - name = "eval-in-repl"; + name = "recipe"; }; packageRequires = [ ace-window dash paredit ]; meta = { @@ -20901,30 +27202,41 @@ license = lib.licenses.free; }; }) {}; - eval-sexp-fu = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: - melpaBuild { + eval-sexp-fu = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , highlight + , lib + , melpaBuild }: + melpaBuild { pname = "eval-sexp-fu"; - version = "20131230.1351"; + ename = "eval-sexp-fu"; + version = "20180509.1903"; src = fetchFromGitHub { owner = "hchbaw"; repo = "eval-sexp-fu.el"; - rev = "6cffd33155d10c3e58b39cbb170f42e910fd8595"; - sha256 = "1syqakdyg3ydnq9gvkjf2rw9rz3kyhzp7avhy6dvyy65pv2ndyc2"; + rev = "1cfd0f3e167d63080692fad97ffe0091b024ad73"; + sha256 = "0l20ja8s0881jlrlmba496iyizfa0j5bvc2x39rshn8qqyka2dq2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b1a896521cac1f54f7571ad5837ff215d01044d/recipes/eval-sexp-fu"; sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs"; - name = "eval-sexp-fu"; + name = "recipe"; }; - packageRequires = [ highlight ]; + packageRequires = [ cl-lib highlight ]; meta = { homepage = "https://melpa.org/#/eval-sexp-fu"; license = lib.licenses.free; }; }) {}; - evalator = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + evalator = callPackage ({ fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "evalator"; + ename = "evalator"; version = "20160212.1728"; src = fetchFromGitHub { owner = "seanirby"; @@ -20932,10 +27244,10 @@ rev = "f30da4da48c0b3f3cfa1fc1c7cfdb53ffe79df36"; sha256 = "1llxxdprs8yw2hqj4dhrkrrzmkl25h7p4rcaa2cw544fmg3kvlz1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/544a503d72c0a501f9ca854cd11181a7783294a3/recipes/evalator"; sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk"; - name = "evalator"; + name = "recipe"; }; packageRequires = [ helm-core ]; meta = { @@ -20943,9 +27255,15 @@ license = lib.licenses.free; }; }) {}; - evalator-clojure = callPackage ({ cider, evalator, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evalator-clojure = callPackage ({ cider + , evalator + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evalator-clojure"; + ename = "evalator-clojure"; version = "20160208.1348"; src = fetchFromGitHub { owner = "seanirby"; @@ -20953,10 +27271,10 @@ rev = "caa4e0a137bdfada86593128a654e16aa617ad50"; sha256 = "1q5s1ffmfh5dby92853xm8kjhgjfd5vbvcg1xbf8lswc1i41k7n7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f57089f3e5c8342092128d44451b338af8a769f/recipes/evalator-clojure"; sha256 = "10mxlgirnsq3z7l1izrf2v1l1yr4sbdjsaszz7llqv6l80y4bji3"; - name = "evalator-clojure"; + name = "recipe"; }; packageRequires = [ cider evalator ]; meta = { @@ -20964,9 +27282,16 @@ license = lib.licenses.free; }; }) {}; - eve-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, polymode }: - melpaBuild { + eve-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild + , polymode }: + melpaBuild { pname = "eve-mode"; + ename = "eve-mode"; version = "20170822.1531"; src = fetchFromGitHub { owner = "witheve"; @@ -20974,10 +27299,10 @@ rev = "a4661114d9c18725691b76321d72167ca5a9070a"; sha256 = "19s6cid42q0lm2w94a7f6sxvmy3zpjdj5r5dbwcxxp5n3qfs7nip"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0f197adfe64ef88d90d24dfd6532bf52a5bce0d/recipes/eve-mode"; sha256 = "1ch50bm452g8k1xnqcbpmpwkmg8amzv7bq0hphk3y0kiqkwd1gdh"; - name = "eve-mode"; + name = "recipe"; }; packageRequires = [ emacs markdown-mode polymode ]; meta = { @@ -20985,20 +27310,28 @@ license = lib.licenses.free; }; }) {}; - evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: - melpaBuild { + evil = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , goto-chg + , lib + , melpaBuild + , undo-tree }: + melpaBuild { pname = "evil"; - version = "20180320.1359"; + ename = "evil"; + version = "20180517.1300"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "fe3ae258901ba9b16e6d051427e1c0bd5e588e48"; - sha256 = "1wazvyrpsf0j5v04fsjzqkff906jvhvp8a9bbr5d8qmn4l103qdc"; + rev = "230b87212c81aaa68ef5547a6b998d9c365fe139"; + sha256 = "0c9zy3bpck10gcrv79kd3h7i4ygd5bgbgy773n0lg7a2r5kwn1gx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39"; - name = "evil"; + name = "recipe"; }; packageRequires = [ cl-lib emacs goto-chg undo-tree ]; meta = { @@ -21006,20 +27339,26 @@ license = lib.licenses.free; }; }) {}; - evil-anzu = callPackage ({ anzu, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-anzu = callPackage ({ anzu + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-anzu"; + ename = "evil-anzu"; version = "20170123.2318"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-evil-anzu"; - rev = "9bca6ca14d865e7e005bc02a28a09b4ae74facc9"; - sha256 = "1y0jiglcazxnvggs5ljys2iizljsihlgr46svbbwgf45ibdrw392"; + rev = "565f79ae66fc329ab9e1bf5a89fa0727981ed5cc"; + sha256 = "01gc7bj51w7952aqpb9zw9gqvjy8b8nfmhfpiah2r96gk9b0yn6j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06b0609b56016d938b28d56d9eeb6305116b38af/recipes/evil-anzu"; sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70"; - name = "evil-anzu"; + name = "recipe"; }; packageRequires = [ anzu evil ]; meta = { @@ -21027,20 +27366,25 @@ license = lib.licenses.free; }; }) {}; - evil-args = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-args = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-args"; + ename = "evil-args"; version = "20140329.1429"; src = fetchFromGitHub { owner = "wcsmith"; repo = "evil-args"; - rev = "2a88b4d19953a11227cc1e91973b92149116f44c"; - sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq"; + rev = "b554f83a31dd47cac9799725f379675f54ed0a6a"; + sha256 = "08743swy936v8fhbaplrr0wpwlp7vplvy2iwkh56p7gb5gqmlfli"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0976c82a22f1a8701b9da0b8ba4753ed48191376/recipes/evil-args"; sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w"; - name = "evil-args"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -21048,9 +27392,17 @@ license = lib.licenses.free; }; }) {}; - evil-avy = callPackage ({ avy, cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-avy = callPackage ({ avy + , cl-lib ? null + , emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-avy"; + ename = "evil-avy"; version = "20150908.48"; src = fetchFromGitHub { owner = "louy2"; @@ -21058,10 +27410,10 @@ rev = "2dd955cc3ecaa7ddeb67b295298abdc6d16dd3a5"; sha256 = "1q6znbnshk45mdglx519qlbfhb7g47qsm245i93ka4djsjy55j9l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f86bccc9f2190cfa5487cf8e9c9b7938774533ed/recipes/evil-avy"; sha256 = "1hc96dd78yxgr8cs9sk9y1i5h1qnyk110vlb3wnlxv1hwn92qvrd"; - name = "evil-avy"; + name = "recipe"; }; packageRequires = [ avy cl-lib emacs evil ]; meta = { @@ -21069,20 +27421,29 @@ license = lib.licenses.free; }; }) {}; - evil-cleverparens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit, smartparens }: - melpaBuild { + evil-cleverparens = callPackage ({ dash + , emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , paredit + , smartparens }: + melpaBuild { pname = "evil-cleverparens"; + ename = "evil-cleverparens"; version = "20170717.2113"; src = fetchFromGitHub { owner = "luxbock"; repo = "evil-cleverparens"; - rev = "8c45879d49bfa6d4e414b6c1df700a4a51cbb869"; - sha256 = "0lhnybpnk4n2yhlcnj9zxn0vi5hpjfaqfhvyfy7ckzz74g8v7iyw"; + rev = "9bce7cc5e2ab80adeafb0f1a579eb27bdb7a8d2f"; + sha256 = "1wplh9lk0cplkpik088lk5am5b8ks0rs8bp3b6wn0bn1r0l3jcxg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3b3637d6527b16ea0d606fd87b01004be446b09/recipes/evil-cleverparens"; sha256 = "10zkyaxy52ixh26hzm9v1y0gakcn5sdwz4ny8v1vcmjqjphnk799"; - name = "evil-cleverparens"; + name = "recipe"; }; packageRequires = [ dash emacs evil paredit smartparens ]; meta = { @@ -21090,9 +27451,16 @@ license = lib.licenses.free; }; }) {}; - evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-colemak-basics = callPackage ({ emacs + , evil + , evil-snipe + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-colemak-basics"; + ename = "evil-colemak-basics"; version = "20170425.509"; src = fetchFromGitHub { owner = "wbolster"; @@ -21100,10 +27468,10 @@ rev = "7844079b47f47bb1dc24c885b0ac2e67524fa960"; sha256 = "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics"; sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k"; - name = "evil-colemak-basics"; + name = "recipe"; }; packageRequires = [ emacs evil evil-snipe ]; meta = { @@ -21111,9 +27479,15 @@ license = lib.licenses.free; }; }) {}; - evil-colemak-minimal = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-colemak-minimal = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-colemak-minimal"; + ename = "evil-colemak-minimal"; version = "20171006.617"; src = fetchFromGitHub { owner = "bmallred"; @@ -21121,10 +27495,10 @@ rev = "6d98b6da60f414524a0d718f76024c26dce742b3"; sha256 = "0pd05jq4qkw5xx7xqzxzx62fsm77vjz0ry9ayaqgqw5831rbp553"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/828c744062069027f19fe5f2f233179f9149dc16/recipes/evil-colemak-minimal"; sha256 = "0qi5k17b9k227zz9binbrd22cwmlqxkay98by9yxcbyhl4hjhdyy"; - name = "evil-colemak-minimal"; + name = "recipe"; }; packageRequires = [ emacs evil ]; meta = { @@ -21132,20 +27506,27 @@ license = lib.licenses.free; }; }) {}; - evil-collection = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-collection = callPackage ({ cl-lib ? null + , emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-collection"; - version = "20180331.1020"; + ename = "evil-collection"; + version = "20180722.1341"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-collection"; - rev = "2ebc7a93c6376188d4d86347dddbbba942457bb3"; - sha256 = "19avjdm9ddxgipggg46kwbqpjmz39dpai7kx9xdk3ba4dhkcz5ic"; + rev = "6e2c59c2ddd8b2d953c6152f467f41bc213533ee"; + sha256 = "0m6dg93shs3fl3qimiiicjwfyrk6mhghb7qgd21qgdnb3yj4fw5j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b93a8e3750e4e7767498e418f46d553d814604/recipes/evil-collection"; sha256 = "1fggdlssb8sai00vbrxph8cama3r0f7w8qhmiajj4cy2il7jgmhy"; - name = "evil-collection"; + name = "recipe"; }; packageRequires = [ cl-lib emacs evil ]; meta = { @@ -21153,9 +27534,14 @@ license = lib.licenses.free; }; }) {}; - evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-commentary = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-commentary"; + ename = "evil-commentary"; version = "20170413.751"; src = fetchFromGitHub { owner = "linktohack"; @@ -21163,10 +27549,10 @@ rev = "395f91014b69844b81660c155f42eb9b1b3d199d"; sha256 = "0zjs9zyqfygnpxapvf0ymmiid40i06cxbhjzd81zw33nafgkf6r4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary"; sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz"; - name = "evil-commentary"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -21174,20 +27560,25 @@ license = lib.licenses.free; }; }) {}; - evil-dvorak = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-dvorak = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-dvorak"; + ename = "evil-dvorak"; version = "20160416.1141"; src = fetchFromGitHub { owner = "jbranso"; repo = "evil-dvorak"; - rev = "824f7c56980d72a0ff04c662223540cd66f13754"; - sha256 = "15rnxhqc56g4ydr8drvcgzvjp8blxsarm86dqc36rym7g5gnxr20"; + rev = "e7b80077d6f332452049eb3d7ea51f6c8fbf5947"; + sha256 = "1z8wl0ih3b8bahbglp5n1xjws583hkryl034b2a3p11ljq3g2ggl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69abca9985339c59ee0e2334cabf3c99e1ba1349/recipes/evil-dvorak"; sha256 = "1iq9wzcb625vs942khja39db1js8r46vrdiqcm47yfji98g39gsn"; - name = "evil-dvorak"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -21195,9 +27586,16 @@ license = lib.licenses.free; }; }) {}; - evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-easymotion = callPackage ({ avy + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-easymotion"; + ename = "evil-easymotion"; version = "20180113.2254"; src = fetchFromGitHub { owner = "PythonNut"; @@ -21205,10 +27603,10 @@ rev = "79c13ed3bce018ac09d358e642e5bd7025e93603"; sha256 = "0496dnbciq8gbivihas1y58gwd4nbfz767rr98zpwgkz8l2jvy73"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion"; sha256 = "0zixgdhc228y6yqr044cbyls0pihzacqsgvybhhar916p4h8izgv"; - name = "evil-easymotion"; + name = "recipe"; }; packageRequires = [ avy cl-lib emacs ]; meta = { @@ -21216,9 +27614,14 @@ license = lib.licenses.free; }; }) {}; - evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-ediff = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-ediff"; + ename = "evil-ediff"; version = "20170724.1223"; src = fetchFromGitHub { owner = "emacs-evil"; @@ -21226,10 +27629,10 @@ rev = "67b0e69f65c196eff5b39dacb7a9ec05bb919c74"; sha256 = "0f8g07fyzyc8pdwizyj62v0dy65ap885asph83529y0j8wnni8ps"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-ediff"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b3eff8cd4bedff3e2111d96743d94be5053826f1/recipes/evil-ediff"; sha256 = "0yglhxm670996hd7305q38y5f47y87n75hh0q7qlm2vra2m2wa5s"; - name = "evil-ediff"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -21237,20 +27640,27 @@ license = lib.licenses.free; }; }) {}; - evil-embrace = callPackage ({ emacs, embrace, evil-surround, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-embrace = callPackage ({ emacs + , embrace + , evil-surround + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-embrace"; + ename = "evil-embrace"; version = "20160519.1129"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "evil-embrace.el"; - rev = "4379adea032b25e359d01a36301b4a5afdd0d1b7"; - sha256 = "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a"; + rev = "8b2083c514af143f6d2f5d1cb4272c5bfb7437a3"; + sha256 = "1cplq9s3fw8nadcipjrix46jfcjbgg3xhz6d226wcqgmg90aclfn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace"; sha256 = "10cfkksh3llyfk26x36b7ri0x6a6hrcv275pxk7ckhs1pyhb14y7"; - name = "evil-embrace"; + name = "recipe"; }; packageRequires = [ emacs embrace evil-surround ]; meta = { @@ -21258,20 +27668,27 @@ license = lib.licenses.free; }; }) {}; - evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-escape = callPackage ({ cl-lib ? null + , emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-escape"; - version = "20170913.618"; + ename = "evil-escape"; + version = "20180623.2019"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-escape"; - rev = "25920fb2f4ef48998eecea433c04096f8d124cfe"; - sha256 = "1nbk0mlfrg8hbw119dpp2a1k2irgz811kcsrwmxv256gkx4pwmfk"; + rev = "73b30bfd912f40657b1306ee5849d215f0f9ffbd"; + sha256 = "0mqz7l1a4rxdj7g3fda17118f7y0vph4ica447ciad5vz3zx9i2z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape"; sha256 = "0jiwsgcqw8m6z4z82gx0m0r0vbvkcxc0czhn4mqjwkhhglwzgi8l"; - name = "evil-escape"; + name = "recipe"; }; packageRequires = [ cl-lib emacs evil ]; meta = { @@ -21279,9 +27696,15 @@ license = lib.licenses.free; }; }) {}; - evil-exchange = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-exchange = callPackage ({ cl-lib ? null + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-exchange"; + ename = "evil-exchange"; version = "20170510.1959"; src = fetchFromGitHub { owner = "Dewdrops"; @@ -21289,10 +27712,10 @@ rev = "47691537815150715e64e6f6ec79be7746c96120"; sha256 = "0bjpn4yqig17ddym6wqq5fm1b294q74hzcbj9a6gs97fqiwf88xa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b06397c032d24a8da4074ad97cdb30d0c468e20/recipes/evil-exchange"; sha256 = "1mvw7w23yfbfmhzj6wimslbryb0gppryw24ac0wh4fzl9rdcma4r"; - name = "evil-exchange"; + name = "recipe"; }; packageRequires = [ cl-lib evil ]; meta = { @@ -21300,20 +27723,26 @@ license = lib.licenses.free; }; }) {}; - evil-expat = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-expat = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-expat"; - version = "20180302.657"; + ename = "evil-expat"; + version = "20180719.116"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-expat"; - rev = "523edb0d1fd6ad17b777c1893cbe1f4857469a4d"; - sha256 = "10irfd546pz0sz0ckfms1md37ni44p7i12imii5ck13hga7grv7i"; + rev = "3ff831784c5f301330ecced5ebd43cce42980d2b"; + sha256 = "15x9fl7r25dygzkc6hhw5yzza7g2dwgr7gvvim913ahnzk5g9nag"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat"; sha256 = "03niji6wymhlfkvdg90gasccs4683djxcj925c8k0vdgmfr8sx32"; - name = "evil-expat"; + name = "recipe"; }; packageRequires = [ emacs evil ]; meta = { @@ -21321,9 +27750,14 @@ license = lib.licenses.free; }; }) {}; - evil-extra-operator = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-extra-operator = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-extra-operator"; + ename = "evil-extra-operator"; version = "20161212.2003"; src = fetchFromGitHub { owner = "Dewdrops"; @@ -21331,10 +27765,10 @@ rev = "e16a9b36f9901254da9af8a73871061616410fc3"; sha256 = "116srvfck3b244shxm9cmw3yvpprjgr840fvcv6jwwpfaphafxw4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0b157c3adf8a2899c4dd2ce98e8a81e4f403a3/recipes/evil-extra-operator"; sha256 = "066apin0yrjx7zr007p2h9p2nq58lz7qikzjzg0spqkb8vy7vkc5"; - name = "evil-extra-operator"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -21342,9 +27776,15 @@ license = lib.licenses.free; }; }) {}; - evil-find-char-pinyin = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: - melpaBuild { + evil-find-char-pinyin = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pinyinlib }: + melpaBuild { pname = "evil-find-char-pinyin"; + ename = "evil-find-char-pinyin"; version = "20160514.1341"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -21352,10 +27792,10 @@ rev = "04e277946d658f1a73c68dcbbadea9c21097a31c"; sha256 = "1bsy2bynzxr1ibyidv2r21xnfnxbzr0xh5m3h05s5igbmajxr12d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8755d2fca519f23f11c5cbb53443a2ad4340220e/recipes/evil-find-char-pinyin"; sha256 = "0n52ijdf5hy7mn0rab4493zs2nrf7r1qkmvf0algqaj7bfjscs79"; - name = "evil-find-char-pinyin"; + name = "recipe"; }; packageRequires = [ evil pinyinlib ]; meta = { @@ -21363,9 +27803,44 @@ license = lib.licenses.free; }; }) {}; - evil-god-state = callPackage ({ evil, fetchFromGitHub, fetchurl, god-mode, lib, melpaBuild }: - melpaBuild { + evil-fringe-mark = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , fringe-helper + , goto-chg + , lib + , melpaBuild }: + melpaBuild { + pname = "evil-fringe-mark"; + ename = "evil-fringe-mark"; + version = "20180619.1534"; + src = fetchFromGitHub { + owner = "Andrew-William-Smith"; + repo = "evil-fringe-mark"; + rev = "fdb147d5ec8fbe087c73604374b3d491f143f2b2"; + sha256 = "1cfsh0f4mfpm6pifxgk2v0h975hldvwdbx95zgw045w9sw325q5b"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/70dcc07c389d5454de64fb08cd666d489d6d5483/recipes/evil-fringe-mark"; + sha256 = "1ahlbp31ll24vzah4bv1xx58gn8y8fsjb0n9a135zwb3fjla9drb"; + name = "recipe"; + }; + packageRequires = [ emacs evil fringe-helper goto-chg ]; + meta = { + homepage = "https://melpa.org/#/evil-fringe-mark"; + license = lib.licenses.free; + }; + }) {}; + evil-god-state = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , god-mode + , lib + , melpaBuild }: + melpaBuild { pname = "evil-god-state"; + ename = "evil-god-state"; version = "20141116.1855"; src = fetchFromGitHub { owner = "gridaphobe"; @@ -21373,10 +27848,10 @@ rev = "3d44197dc0a1fb40e7b7ff8717f8a8c339ce1d40"; sha256 = "1cv24qnxxf6n1grf4n5969v8y9xll5zb9mbfdnq9iavdvhnndk2h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46b8586e9a821efb67539155f783a32867084bfa/recipes/evil-god-state"; sha256 = "1g547d58zf11qw0zz3fk5kmrzmfx1rhawyh5d2h8bll8hwygnrxf"; - name = "evil-god-state"; + name = "recipe"; }; packageRequires = [ evil god-mode ]; meta = { @@ -21384,20 +27859,26 @@ license = lib.licenses.free; }; }) {}; - evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-goggles = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-goggles"; - version = "20180210.938"; + ename = "evil-goggles"; + version = "20180702.353"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "deab4966d75321a9172947ee5cdf2329eb2c5a6b"; - sha256 = "1b4w40x23kbzry80d4rxxynasmrkbry9jj5jkc4l4rcj8lk3vbbi"; + rev = "ea5ab4012af0eb451e2c0d996455c58f1554f7c1"; + sha256 = "18f96n8kkj1lza9za46dwjrsm4ni2s1gqbgdjjiqmkl06kj04fi8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; sha256 = "151xvawyhcjp98skaif08wbxqaw602f51zgwm604hp25a111qmnq"; - name = "evil-goggles"; + name = "recipe"; }; packageRequires = [ emacs evil ]; meta = { @@ -21405,20 +27886,26 @@ license = lib.licenses.free; }; }) {}; - evil-iedit-state = callPackage ({ evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: - melpaBuild { + evil-iedit-state = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , iedit + , lib + , melpaBuild }: + melpaBuild { pname = "evil-iedit-state"; - version = "20160905.1908"; + ename = "evil-iedit-state"; + version = "20180606.2258"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-iedit-state"; - rev = "02ce7ea1414aa0f139b52f1b3350c2b7af74d0ba"; - sha256 = "0lf7ldd9i8r5f1x9jjd6mb7dr04xn87sd3sr6rqrwz925q0v0sib"; + rev = "f75cff4ecbd5beaa9ca64a6c157c4105f078daec"; + sha256 = "0f6m5wi1q6ac9mkvalm62rlnlkjz1c315a4sa93p6iw9x12llkgw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0b6b7d09c023cfe34da65fa1eb8f3fdbe7b1290/recipes/evil-iedit-state"; sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl"; - name = "evil-iedit-state"; + name = "recipe"; }; packageRequires = [ evil iedit ]; meta = { @@ -21426,20 +27913,26 @@ license = lib.licenses.free; }; }) {}; - evil-indent-plus = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-indent-plus = callPackage ({ cl-lib ? null + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-indent-plus"; + ename = "evil-indent-plus"; version = "20151109.1106"; src = fetchFromGitHub { owner = "TheBB"; repo = "evil-indent-plus"; - rev = "0c7501e6efed661242c3a20e0a6c79a6455c2c40"; - sha256 = "1g6r1ydscwjvmhh1zg4q3nap4avk8lb9msdqrh7dff6pla0r2qs6"; + rev = "33a8bcac5f90ddee054e64d60c2b68c98c269ffc"; + sha256 = "0v94kn99z6v4aigjgk3l6b6x22bv9fighisbm23b0861kwcns98f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/992ea3d372fa3569ad9f838aa2818eaee8b8033a/recipes/evil-indent-plus"; sha256 = "15vnvch0qsaram22d44k617bqhr9rrf8qc86sf20yvdyy3gi5j12"; - name = "evil-indent-plus"; + name = "recipe"; }; packageRequires = [ cl-lib evil ]; meta = { @@ -21447,9 +27940,14 @@ license = lib.licenses.free; }; }) {}; - evil-indent-textobject = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-indent-textobject = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-indent-textobject"; + ename = "evil-indent-textobject"; version = "20130831.1519"; src = fetchFromGitHub { owner = "cofi"; @@ -21457,10 +27955,10 @@ rev = "70a1154a531b7cfdbb9a31d6922482791e20a3a7"; sha256 = "0nghisnc49ivh56mddfdlcbqv3y2vqzjvkpgwv3zp80ga6ghvdmz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63cfc9c2962780dd5d27da670d5540a0441e7ca2/recipes/evil-indent-textobject"; sha256 = "172a3krid5lrx1w9xcifkhjnvlxg1nbz4w102d99d0grr9465r09"; - name = "evil-indent-textobject"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -21468,9 +27966,14 @@ license = lib.licenses.free; }; }) {}; - evil-leader = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-leader = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-leader"; + ename = "evil-leader"; version = "20140606.543"; src = fetchFromGitHub { owner = "cofi"; @@ -21478,10 +27981,10 @@ rev = "39f7014bcf8b36463e0c7512c638bda4bac6c2cf"; sha256 = "10xrlimsxk09z9cw6rxdz8qvvn1i0vhc1gdicwxri0j10p0hacl3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/evil-leader"; sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6"; - name = "evil-leader"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -21489,20 +27992,26 @@ license = lib.licenses.free; }; }) {}; - evil-ledger = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-ledger = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-ledger"; + ename = "evil-ledger"; version = "20170905.519"; src = fetchFromGitHub { owner = "atheriel"; repo = "evil-ledger"; - rev = "a282fae7921d2648a32c3207413d927d1adda8b8"; - sha256 = "0b8801mpq55x9r0sgm548wb1qn74wk3dydswrxi8bp6ga49k7rhv"; + rev = "17f3c4284fc4f8d9da4e1d805fbe712e0e02b8d4"; + sha256 = "1vjiyi1kv62w7mbvp149zncvk7p4js75m897b69gh05g68j4ckk2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/500e99a1b92f0a0c144f843cd7645872034d9fbb/recipes/evil-ledger"; sha256 = "13idy2kbzhckzfwrjnzjrf8h2881w3v8pmhlcj26xcyf4ch0dq9r"; - name = "evil-ledger"; + name = "recipe"; }; packageRequires = [ emacs evil ]; meta = { @@ -21510,9 +28019,15 @@ license = lib.licenses.free; }; }) {}; - evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-lion = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-lion"; + ename = "evil-lion"; version = "20170810.2314"; src = fetchFromGitHub { owner = "edkolev"; @@ -21520,10 +28035,10 @@ rev = "aaa3874ad54c31b4322ac5bbc63e331498b11d61"; sha256 = "1aq3ip93sxk05gfgh2zw6zckmkir0viqaqz674fcmsd2rc2051zn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion"; sha256 = "1rwmpc5ifblb41c1yhhv26ayff4nk9iza7w0wb5ganny2r82fg2v"; - name = "evil-lion"; + name = "recipe"; }; packageRequires = [ emacs evil ]; meta = { @@ -21531,9 +28046,16 @@ license = lib.licenses.free; }; }) {}; - evil-lisp-state = callPackage ({ bind-map, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: - melpaBuild { + evil-lisp-state = callPackage ({ bind-map + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , smartparens }: + melpaBuild { pname = "evil-lisp-state"; + ename = "evil-lisp-state"; version = "20160403.1948"; src = fetchFromGitHub { owner = "syl20bnr"; @@ -21541,10 +28063,10 @@ rev = "3c65fecd9917a41eaf6460f22187e2323821f3ce"; sha256 = "1n6r8xs670r5qp4b5f72nr9g8nlqcrx1v7yqqlbkgv8gns8n5xgh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-lisp-state"; sha256 = "16h6zi0kkq2zlrwqiz6avnw2ady3h9gmxyinvk5gbkskxf12d1pz"; - name = "evil-lisp-state"; + name = "recipe"; }; packageRequires = [ bind-map evil smartparens ]; meta = { @@ -21552,9 +28074,16 @@ license = lib.licenses.free; }; }) {}; - evil-lispy = callPackage ({ evil, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild }: - melpaBuild { + evil-lispy = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , hydra + , lib + , lispy + , melpaBuild }: + melpaBuild { pname = "evil-lispy"; + ename = "evil-lispy"; version = "20170304.259"; src = fetchFromGitHub { owner = "sp3ctum"; @@ -21562,10 +28091,10 @@ rev = "040a7ee130c2403a1d6dac591b94b202bb48e186"; sha256 = "008jar578yxa70nd69z4ldmknfmm1jar3wx71n3y2gnyghr759k1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/377d43f3717b8e17c3adce886aaf3e579383ec64/recipes/evil-lispy"; sha256 = "17z830b0x6lhmqkk07hfbrg63c7q7mpn4zz1ppjd1smv4mcqzyld"; - name = "evil-lispy"; + name = "recipe"; }; packageRequires = [ evil hydra lispy ]; meta = { @@ -21573,20 +28102,26 @@ license = lib.licenses.free; }; }) {}; - evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + evil-magit = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "evil-magit"; - version = "20180313.931"; + ename = "evil-magit"; + version = "20180702.853"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "69dfa5a06e8a4024803223b9873ea5d591a97294"; - sha256 = "1kd09z4qxcanvxnawhczwp3y61kn4gnaaji9chqrny633r8j64jk"; + rev = "9f32c4e190e3d67f193485f12199275ff1a047f0"; + sha256 = "0lmsc02fb9s43gs7svqq57bsznqxxzjv6s79lz2hc0rhacxb5pp9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; sha256 = "02ncki7qrl22804576h76xl4d5lvvk32lzn9gvxn63hb19r0s980"; - name = "evil-magit"; + name = "recipe"; }; packageRequires = [ evil magit ]; meta = { @@ -21594,9 +28129,14 @@ license = lib.licenses.free; }; }) {}; - evil-mark-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-mark-replace = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-mark-replace"; + ename = "evil-mark-replace"; version = "20150424.18"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -21604,10 +28144,10 @@ rev = "56cf191724a3e82239ca47a17b071c20aedb0617"; sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/089accfa2646fc4f265cb8e9b9a05dcf5aa4c4f6/recipes/evil-mark-replace"; sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0"; - name = "evil-mark-replace"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -21615,20 +28155,25 @@ license = lib.licenses.free; }; }) {}; - evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-matchit = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-matchit"; - version = "20180328.2351"; + ename = "evil-matchit"; + version = "20180526.557"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "51d8b268e597693aa9d02f2dda66840562998621"; - sha256 = "1b1iymyb2f8913xgzr13pslqcvhwyyl3370kjs43acpbgnhn2zzj"; + rev = "1c428e192b5c8698f8550d8862593bdca5ef9bfc"; + sha256 = "1xip22vlzlki769hza3wssr41m5pl47ay7721fc4y5qv9yr9pjfa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq"; - name = "evil-matchit"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -21636,20 +28181,27 @@ license = lib.licenses.free; }; }) {}; - evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-mc = callPackage ({ cl-lib ? null + , emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-mc"; - version = "20170716.1806"; + ename = "evil-mc"; + version = "20180603.2033"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "8127c3161a6d990635684a020f708b7914445593"; - sha256 = "10cy5shnd9dl9xkcl7gx4ksbbn2cqjww9ihw7ifawnwpa77bcf43"; + rev = "779e7d35bf38b482c0fccacfbffd877e5f455457"; + sha256 = "0p0jc3vlf5q8b76adxznpsfp1clhm171ddwq63vsg6b5iwk0fpdz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs"; - name = "evil-mc"; + name = "recipe"; }; packageRequires = [ cl-lib emacs evil ]; meta = { @@ -21657,9 +28209,18 @@ license = lib.licenses.free; }; }) {}; - evil-mc-extras = callPackage ({ cl-lib ? null, emacs, evil, evil-mc, evil-numbers, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-mc-extras = callPackage ({ cl-lib ? null + , emacs + , evil + , evil-mc + , evil-numbers + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-mc-extras"; + ename = "evil-mc-extras"; version = "20170202.849"; src = fetchFromGitHub { owner = "gabesoft"; @@ -21667,10 +28228,10 @@ rev = "ba3252ae129c3b79aeb70ec3d276cbda32b00421"; sha256 = "0a7mn1z0db4xi8wclqp41hcbzh017q6pndxr9mrfxb67sqs601id"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd7c9aa0f4c17e7f27836e75a0b83c44a68ad744/recipes/evil-mc-extras"; sha256 = "1px4akqaddqgfd03932d03d3rrvjr5lv5nc94xc448kqcbfn7yjk"; - name = "evil-mc-extras"; + name = "recipe"; }; packageRequires = [ cl-lib emacs evil evil-mc evil-numbers ]; meta = { @@ -21678,30 +28239,44 @@ license = lib.licenses.free; }; }) {}; - evil-mu4e = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-mu4e = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-mu4e"; - version = "20171127.1214"; + ename = "evil-mu4e"; + version = "20180613.339"; src = fetchFromGitHub { owner = "JorisE"; repo = "evil-mu4e"; - rev = "234f8a7b24e3b21b6d849d209c006a258ae056ce"; - sha256 = "0gl8gfdnq61lx6qjyswgxhbg5m3p26cps0pix3rssqb64v7lrxci"; + rev = "f4b387ccbd2c49f3bbb5401e93bfcc050ca128ef"; + sha256 = "1fiqx5q0jwh92dxj54wglw91a9pxyb58s8253pb7as9y1iwvyyhq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332f3f9c6dc106e58345abbc2d8fd99056d518c0/recipes/evil-mu4e"; sha256 = "1ks4vnga7dkz27a7gza5hakzbcsiqgkq1ysc0lcx7g82ihpmrrcq"; - name = "evil-mu4e"; + name = "recipe"; }; - packageRequires = [ dash emacs evil ]; + packageRequires = [ emacs evil ]; meta = { homepage = "https://melpa.org/#/evil-mu4e"; license = lib.licenses.free; }; }) {}; - evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: - melpaBuild { + evil-multiedit = callPackage ({ cl-lib ? null + , emacs + , evil + , fetchFromGitHub + , fetchurl + , iedit + , lib + , melpaBuild }: + melpaBuild { pname = "evil-multiedit"; + ename = "evil-multiedit"; version = "20180209.1819"; src = fetchFromGitHub { owner = "hlissner"; @@ -21709,10 +28284,10 @@ rev = "ea3d9177b74ab0bc65e55df9cc0a0b42e4ef815d"; sha256 = "17zm35r474z8ras4xy7124pcb972d385pbdv4jxyj5vq042vq07w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit"; sha256 = "0p02q9skqw2zhx7sfadqgs7vn518s72856962dam0xw4sqasplfp"; - name = "evil-multiedit"; + name = "recipe"; }; packageRequires = [ cl-lib emacs evil iedit ]; meta = { @@ -21720,41 +28295,50 @@ license = lib.licenses.free; }; }) {}; - evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-nerd-commenter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-nerd-commenter"; - version = "20171206.441"; + ename = "evil-nerd-commenter"; + version = "20180722.1625"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "41d43709210711c07de69497c5f7db646b7e7a96"; - sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14"; + rev = "275c95c89cc09c7096bd6fd0deabd49f29634f5d"; + sha256 = "07k4d1dy1nm9g54zwqzdqhibz2a2zfi7q27z7k8wq0ibjph96nwh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d"; - name = "evil-nerd-commenter"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/evil-nerd-commenter"; license = lib.licenses.free; }; }) {}; - evil-numbers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-numbers = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-numbers"; + ename = "evil-numbers"; version = "20140606.551"; src = fetchFromGitHub { owner = "cofi"; repo = "evil-numbers"; - rev = "6ea1c8c3a9b37bed63d48f1128e9a4910e68187e"; - sha256 = "1aq95hj8x13py0pwsnc6wvd8cc5yv5qin8ym9js42y5966vwj4np"; + rev = "8834eb2e8bd93561a706363946701d0d90546a9f"; + sha256 = "13jg2xbh4p02x1nj77b6csb93hh56c1nv8kslcq2hjj3caipk4m8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/evil-numbers"; sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2"; - name = "evil-numbers"; + name = "recipe"; }; packageRequires = []; meta = { @@ -21762,9 +28346,15 @@ license = lib.licenses.free; }; }) {}; - evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }: - melpaBuild { + evil-opener = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , opener }: + melpaBuild { pname = "evil-opener"; + ename = "evil-opener"; version = "20161207.1010"; src = fetchFromGitHub { owner = "0robustus1"; @@ -21772,10 +28362,10 @@ rev = "c384f67278046fdcd220275fdd212ab85672cbeb"; sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-opener"; sha256 = "0cld853pyzlaa306rpypw2wm4953i6y06irlk96bql9aa1zx977g"; - name = "evil-opener"; + name = "recipe"; }; packageRequires = [ evil opener ]; meta = { @@ -21783,9 +28373,15 @@ license = lib.licenses.free; }; }) {}; - evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-org = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-org"; + ename = "evil-org"; version = "20180323.1606"; src = fetchFromGitHub { owner = "Somelauw"; @@ -21793,10 +28389,10 @@ rev = "b6d652a9163d3430a9e0933a554bdbee5244bbf6"; sha256 = "176hrw7y7nczffbyhsa167b8rvfacsmcafm2gpkrdjqlrikbmrhl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; sha256 = "18glpsnpxap4dvnvkl59h9pnwlp20libsfbbkmvrbzsvbdyspg6z"; - name = "evil-org"; + name = "recipe"; }; packageRequires = [ emacs evil ]; meta = { @@ -21804,9 +28400,15 @@ license = lib.licenses.free; }; }) {}; - evil-paredit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: - melpaBuild { + evil-paredit = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , paredit }: + melpaBuild { pname = "evil-paredit"; + ename = "evil-paredit"; version = "20150413.1348"; src = fetchFromGitHub { owner = "roman"; @@ -21814,10 +28416,10 @@ rev = "e058fbdcf9dbf7ad6cc77f0172d7517ef233d55f"; sha256 = "0b08y4spapl4g2292j3l4cr84gjlvm3rpma3gqld4yb1sxd7v78p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88db86e1351410bcff6f3ed80681946afcec9959/recipes/evil-paredit"; sha256 = "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy"; - name = "evil-paredit"; + name = "recipe"; }; packageRequires = [ evil paredit ]; meta = { @@ -21825,9 +28427,14 @@ license = lib.licenses.free; }; }) {}; - evil-quickscope = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-quickscope = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-quickscope"; + ename = "evil-quickscope"; version = "20160202.1124"; src = fetchFromGitHub { owner = "blorbx"; @@ -21835,10 +28442,10 @@ rev = "37a20e4c56c6058abf186ad4013c155e695e876f"; sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec118caf243c74d243f533c9e12f7de0d6c43bc4/recipes/evil-quickscope"; sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489"; - name = "evil-quickscope"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -21846,20 +28453,26 @@ license = lib.licenses.free; }; }) {}; - evil-rails = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile-rails }: - melpaBuild { + evil-rails = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile-rails }: + melpaBuild { pname = "evil-rails"; + ename = "evil-rails"; version = "20160621.1558"; src = fetchFromGitHub { owner = "antono"; repo = "evil-rails"; - rev = "c8669783d8a40719b2604c58a4c06c248cab272f"; - sha256 = "0a4msvyzp29dx666qylwim9nq4z9j5rlmp7vcdhzbmqbbp5zs0bc"; + rev = "8cbf97719fdef17e98c593966d4753962e350bac"; + sha256 = "18m73hr0nqrf60vnrhbd4jjrfz8g6flzkdjixd8rzpxpmfx8vsv9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff526fe800b0535067431f1ae78c4a4b5594b23d/recipes/evil-rails"; sha256 = "0ah0nvzl30z19566kacyrsznsdm3cpij8n3bw3dfng7263rh60gj"; - name = "evil-rails"; + name = "recipe"; }; packageRequires = [ evil projectile-rails ]; meta = { @@ -21867,9 +28480,15 @@ license = lib.licenses.free; }; }) {}; - evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-replace-with-char = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-replace-with-char"; + ename = "evil-replace-with-char"; version = "20180324.1506"; src = fetchFromGitHub { owner = "ninrod"; @@ -21877,10 +28496,10 @@ rev = "ed4a12d5bff11163eb03ad2826c52fd30f51a8d3"; sha256 = "1nhnwl39wsi7akzcjqszxxw2b6j9i5y4qabcd8p387zajjpgscwk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char"; sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r"; - name = "evil-replace-with-char"; + name = "recipe"; }; packageRequires = [ emacs evil ]; meta = { @@ -21888,9 +28507,14 @@ license = lib.licenses.free; }; }) {}; - evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-replace-with-register = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-replace-with-register"; + ename = "evil-replace-with-register"; version = "20170713.225"; src = fetchFromGitHub { owner = "Dewdrops"; @@ -21898,10 +28522,10 @@ rev = "91cc7bf21a94703c441cc9212214075b226b7f67"; sha256 = "14rpn76qrf287s3y2agmddcxi27r226i53ixjvd694ss039g0r11"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bd98aebefc13da5a129d1d3f1c8878e4a70654/recipes/evil-replace-with-register"; sha256 = "0qyym6vwjs0aqf2p28rh96v30pgxg060pxyij0vrfj469wzmlrj9"; - name = "evil-replace-with-register"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -21909,20 +28533,25 @@ license = lib.licenses.free; }; }) {}; - evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-rsi = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-rsi"; + ename = "evil-rsi"; version = "20160221.1304"; src = fetchFromGitHub { owner = "linktohack"; repo = "evil-rsi"; - rev = "65ae60866be494e4622fe383e23975e04d2a42a3"; - sha256 = "0cc2yxck5brnicllcadb4m5zlzczvdy6v38q34hj8bri1kxfzslz"; + rev = "236bf6ed1e2285698db808463e5f2f69f5f5e7c0"; + sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24f438b47e8ede0ef84261424c122d2ac28b90cb/recipes/evil-rsi"; sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345"; - name = "evil-rsi"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -21930,20 +28559,25 @@ license = lib.licenses.free; }; }) {}; - evil-search-highlight-persist = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: - melpaBuild { + evil-search-highlight-persist = callPackage ({ fetchFromGitHub + , fetchurl + , highlight + , lib + , melpaBuild }: + melpaBuild { pname = "evil-search-highlight-persist"; + ename = "evil-search-highlight-persist"; version = "20170522.2034"; src = fetchFromGitHub { owner = "naclander"; repo = "evil-search-highlight-persist"; - rev = "979d2dec58d3b9c5ca5fdf4bb802a0209913794e"; - sha256 = "0ak8r7cgz5xnjyfg3w9mwxhvaw8ny3hy0i2bqn3vf5dps649iy7i"; + rev = "6e04a8c075f5fd62526d222447048faab8bfa187"; + sha256 = "1ni1bila3kjqrjcn1sm6g6h2cmf1chrh4d8nj4qfjvkb12fkw6j6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist"; sha256 = "08l8ymrp9vkpwprq9gp4562yvcnd4hfc3z7n4n5lz7h6ffv3zym3"; - name = "evil-search-highlight-persist"; + name = "recipe"; }; packageRequires = [ highlight ]; meta = { @@ -21951,9 +28585,16 @@ license = lib.licenses.free; }; }) {}; - evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: - melpaBuild { + evil-smartparens = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , smartparens }: + melpaBuild { pname = "evil-smartparens"; + ename = "evil-smartparens"; version = "20171210.713"; src = fetchFromGitHub { owner = "expez"; @@ -21961,10 +28602,10 @@ rev = "026d4a3cfce415a4dfae1457f871b385386e61d3"; sha256 = "05habba44zls2d20kgzshrq2psagay16cnvcnkqgrbhvj1rxfmrk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens"; sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza"; - name = "evil-smartparens"; + name = "recipe"; }; packageRequires = [ emacs evil smartparens ]; meta = { @@ -21972,20 +28613,27 @@ license = lib.licenses.free; }; }) {}; - evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-snipe = callPackage ({ cl-lib ? null + , emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-snipe"; - version = "20180317.233"; + ename = "evil-snipe"; + version = "20180503.141"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "37ca9749bf5604040e745d65143cb0667f052542"; - sha256 = "172zqf7qmdhyhlj48nxyxpn0cnqb9v045536sf6gfvcrv81wps0c"; + rev = "8120c2398cb5ca9a81369f7201b3db19cd71e965"; + sha256 = "0i6hjzidccxdy3dq7rrngfqlrrwb6yyc635fark3dnn90cpadwci"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn"; - name = "evil-snipe"; + name = "recipe"; }; packageRequires = [ cl-lib emacs evil ]; meta = { @@ -21993,9 +28641,14 @@ license = lib.licenses.free; }; }) {}; - evil-space = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-space = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-space"; + ename = "evil-space"; version = "20151208.428"; src = fetchFromGitHub { owner = "linktohack"; @@ -22003,10 +28656,10 @@ rev = "a9c07284d308425deee134c9d88a2d538dd229e6"; sha256 = "1x4nphjq8lvg8qsm1pj04mk9n59xc6jlxiv5s3bih1nl4xkssrxy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e5a4b9427038f90898ac0e237e71ba7152501f5/recipes/evil-space"; sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23"; - name = "evil-space"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -22014,20 +28667,27 @@ license = lib.licenses.free; }; }) {}; - evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }: - melpaBuild { + evil-string-inflection = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , string-inflection }: + melpaBuild { pname = "evil-string-inflection"; + ename = "evil-string-inflection"; version = "20180313.1055"; src = fetchFromGitHub { owner = "ninrod"; repo = "evil-string-inflection"; - rev = "00b62fb82de36e9c7b44bd644c7e11ae88f35f62"; - sha256 = "0f24722vl3sqri389hi6qj7hhfalqpjvyq4ain5hhr0gsx2dznw4"; + rev = "5512db7e0e5fd28c881cc278add50ffae1f121f0"; + sha256 = "1114yacpb0a0lp7kz0lb1mb7s1adhk370i3kj78a911i72c9szi1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection"; sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh"; - name = "evil-string-inflection"; + name = "recipe"; }; packageRequires = [ emacs evil string-inflection ]; meta = { @@ -22035,20 +28695,25 @@ license = lib.licenses.free; }; }) {}; - evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-surround = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-surround"; + ename = "evil-surround"; version = "20180102.601"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "2af81ab3ac64e4b0515a157a672d8cb89f0172b9"; - sha256 = "00bcz353cc82wpk5cai5ni99z2la4gwm0k1fvanysx1amg8vxvfy"; + rev = "5a20c9757eff64e1567d313eb254126aef2bf3b2"; + sha256 = "094vz707iyjknmhmhdlzc8sv8x86yxgx863c23nm6fjn5n5h7jmz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; sha256 = "0aphv5zinb0lzdx22qbzcr7fn6jbpkdczar7py3df6mzxw5wvcm1"; - name = "evil-surround"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -22056,9 +28721,14 @@ license = lib.licenses.free; }; }) {}; - evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-swap-keys = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-swap-keys"; + ename = "evil-swap-keys"; version = "20170726.1120"; src = fetchFromGitHub { owner = "wbolster"; @@ -22066,10 +28736,10 @@ rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a"; sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6"; - name = "evil-swap-keys"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -22077,9 +28747,15 @@ license = lib.licenses.free; }; }) {}; - evil-tabs = callPackage ({ elscreen, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-tabs = callPackage ({ elscreen + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-tabs"; + ename = "evil-tabs"; version = "20160217.720"; src = fetchFromGitHub { owner = "krisajenkins"; @@ -22087,10 +28763,10 @@ rev = "53d3314a810017b6056ab6796aef671f5ea1c063"; sha256 = "1qklx0j3fz3mp87v64yqbyyq5csfymbjfwvy2s4nk634wbnrra93"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61eea3ae1c89163736b806aa8ca4f44d17daaba3/recipes/evil-tabs"; sha256 = "0qgvpv5hcai8wmkv2fp6i2vdy7qp4gwidwpzz8j6vl9519x73s62"; - name = "evil-tabs"; + name = "recipe"; }; packageRequires = [ elscreen evil ]; meta = { @@ -22098,9 +28774,14 @@ license = lib.licenses.free; }; }) {}; - evil-terminal-cursor-changer = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-terminal-cursor-changer = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-terminal-cursor-changer"; + ename = "evil-terminal-cursor-changer"; version = "20170401.142"; src = fetchFromGitHub { owner = "7696122"; @@ -22108,10 +28789,10 @@ rev = "b49ca4393d2f3cc6014174950059b36a5cb22949"; sha256 = "1zra2h0x20whshbc4sfyj6w73jv6ak435mr9n6r6s7brqqqgpa36"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-terminal-cursor-changer"; sha256 = "16p9a1dybbqr8r717c5ssfd3p5392bqxxzqs4n0xc7v7g8v1m0cd"; - name = "evil-terminal-cursor-changer"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -22119,20 +28800,25 @@ license = lib.licenses.free; }; }) {}; - evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-test-helpers = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-test-helpers"; + ename = "evil-test-helpers"; version = "20180109.1040"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "fe3ae258901ba9b16e6d051427e1c0bd5e588e48"; - sha256 = "1wazvyrpsf0j5v04fsjzqkff906jvhvp8a9bbr5d8qmn4l103qdc"; + rev = "49d6167d6bb97454afe1d06a5324483682de8ab6"; + sha256 = "0l3hmmkys3fw5yxs4kmjx5nrbjh9w19d0bfkryhbxhc5xszydvzz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; sha256 = "0l4skyznzgr76z518q22lf90ymlsfcs02w8vqkg8az1nfl3ch7fs"; - name = "evil-test-helpers"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -22140,20 +28826,26 @@ license = lib.licenses.free; }; }) {}; - evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-text-object-python = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-text-object-python"; + ename = "evil-text-object-python"; version = "20160815.141"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-text-object-python"; - rev = "3b3fb01e7ad7eeeeae1143695547fe75148cc44f"; - sha256 = "1alin2rmx1xa1w3b1nb76bplmg10il55jxxm6jj7qs6z1izzllci"; + rev = "7aae5558be25b4a33abdede8a91da1cc7d08f1bc"; + sha256 = "0qfqfqbq3jijnmg0rp6agz9skcv2drnpyn481c7f455z46xi87kl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d0893b07bc4a057561a1c1a85b7520c50f31e12/recipes/evil-text-object-python"; sha256 = "0jdzs1yn8nrxq890427yjrxdvnzj8jy7bs3jj4w4c0fik26ngqhm"; - name = "evil-text-object-python"; + name = "recipe"; }; packageRequires = [ emacs evil ]; meta = { @@ -22161,9 +28853,15 @@ license = lib.licenses.free; }; }) {}; - evil-textobj-anyblock = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-textobj-anyblock = callPackage ({ cl-lib ? null + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-textobj-anyblock"; + ename = "evil-textobj-anyblock"; version = "20170905.1207"; src = fetchFromGitHub { owner = "noctuid"; @@ -22171,10 +28869,10 @@ rev = "ff00980f0634f95bf2ad9956b615a155ea8743be"; sha256 = "0wn5lp7kh3ip1bmqi12c9ivpjj0x602h8d7ag39qw36smv4jqvnb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36b734960313d4cb484cebaac0f112781436631c/recipes/evil-textobj-anyblock"; sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa"; - name = "evil-textobj-anyblock"; + name = "recipe"; }; packageRequires = [ cl-lib evil ]; meta = { @@ -22182,9 +28880,16 @@ license = lib.licenses.free; }; }) {}; - evil-textobj-column = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { + evil-textobj-column = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names }: + melpaBuild { pname = "evil-textobj-column"; + ename = "evil-textobj-column"; version = "20170905.1205"; src = fetchFromGitHub { owner = "noctuid"; @@ -22192,10 +28897,10 @@ rev = "835d7036d0bc9a6e44fc9b7c54ccf2a7c01428cd"; sha256 = "0g9d62sgcpzvhbrdk4hf3phphfss74mjz6xv4wd9895rzjsziwkf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de7d6dc0d9c42a89be2959d015efa30960df2de7/recipes/evil-textobj-column"; sha256 = "13q3nawx05rn3k6kzq1889vxjznr454cib96pc9lmrq7h65lym2h"; - name = "evil-textobj-column"; + name = "recipe"; }; packageRequires = [ emacs evil names ]; meta = { @@ -22203,20 +28908,25 @@ license = lib.licenses.free; }; }) {}; - evil-tutor = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-tutor = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-tutor"; + ename = "evil-tutor"; version = "20150102.2250"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-tutor"; - rev = "4e124cd3911dc0d1b6817ad2c9e59b4753638f28"; - sha256 = "00yfq8aflxvp2nnz7smgq0c5wlb7cips5irj8qs6193ixlkpffvx"; + rev = "79b47a9f444ddaa289c66e8995ee116941429c24"; + sha256 = "11hiaxiqc2f522y7rgfr6bjnmx4nrssq1q9g96w4rsb10627qvsf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b7bfffdc34e181893b8cf4d1cc091f6c3f91126/recipes/evil-tutor"; sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn"; - name = "evil-tutor"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -22224,20 +28934,26 @@ license = lib.licenses.free; }; }) {}; - evil-tutor-ja = callPackage ({ evil, evil-tutor, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-tutor-ja = callPackage ({ evil + , evil-tutor + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-tutor-ja"; + ename = "evil-tutor-ja"; version = "20160916.1832"; src = fetchFromGitHub { owner = "kenjimyzk"; repo = "evil-tutor-ja"; - rev = "99af7d82e02ce3bcdfaff47c5c80b57327a7ea8d"; - sha256 = "1cms98cy4p5dxwfc1zhgdaln8vr2nxzcj0d31imyabb4mwliabfw"; + rev = "06b9ad853a15ce6f2c53c2cf379b9ff358369f2d"; + sha256 = "1cazqdiri2b61fxnkhgksqxp0gb41wzcq8275n779rindkwaf2zk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c98605fd21b38aaa200c6a0ec4c18f8575b0d7a/recipes/evil-tutor-ja"; sha256 = "1yd8aij9q1jdmb387f1zjiq5mf68jvbgbyp5b49hmag4hw5h7vm2"; - name = "evil-tutor-ja"; + name = "recipe"; }; packageRequires = [ evil evil-tutor ]; meta = { @@ -22245,20 +28961,27 @@ license = lib.licenses.free; }; }) {}; - evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: - melpaBuild { + evil-vimish-fold = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , vimish-fold }: + melpaBuild { pname = "evil-vimish-fold"; + ename = "evil-vimish-fold"; version = "20171030.451"; src = fetchFromGitHub { owner = "alexmurray"; repo = "evil-vimish-fold"; - rev = "c617fecb91303f8c63f85a6101a503fdc88aae84"; - sha256 = "05zm0gngdamfs5cqnjq4lh7253hdj0lggdgfphl56ynblhf8qf36"; + rev = "4db872d12274fdddf7c6e9d01cf68cbad9cfcf15"; + sha256 = "05phnswbk2r7hdwawzkw6anhkfss9ig8sy469s4vsrqf7cky4gmn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold"; sha256 = "01wp4h97hjyzbpd7iighjj26m79499wp5pn8m4pa7v59f6r3sdk6"; - name = "evil-vimish-fold"; + name = "recipe"; }; packageRequires = [ emacs evil vimish-fold ]; meta = { @@ -22266,9 +28989,15 @@ license = lib.licenses.free; }; }) {}; - evil-visual-mark-mode = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-visual-mark-mode = callPackage ({ dash + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-visual-mark-mode"; + ename = "evil-visual-mark-mode"; version = "20150202.1000"; src = fetchFromGitHub { owner = "roman"; @@ -22276,10 +29005,10 @@ rev = "094ee37599492885ff3144918fcdd9b74dadaaa0"; sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/293cdd3387f26e4c8f21582d75a194963ac9cff7/recipes/evil-visual-mark-mode"; sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48"; - name = "evil-visual-mark-mode"; + name = "recipe"; }; packageRequires = [ dash evil ]; meta = { @@ -22287,9 +29016,14 @@ license = lib.licenses.free; }; }) {}; - evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-visual-replace = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-visual-replace"; + ename = "evil-visual-replace"; version = "20171015.2313"; src = fetchFromGitHub { owner = "troyp"; @@ -22297,10 +29031,10 @@ rev = "163fc827a1ffc106475da470c37fb26f4cc9b008"; sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace"; sha256 = "1dq3bd9aqpk3jq1c9yzlpjyw6mi8l428l111vrmfg156k1w22v01"; - name = "evil-visual-replace"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -22308,9 +29042,14 @@ license = lib.licenses.free; }; }) {}; - evil-visualstar = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-visualstar = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-visualstar"; + ename = "evil-visualstar"; version = "20160222.1648"; src = fetchFromGitHub { owner = "bling"; @@ -22318,10 +29057,10 @@ rev = "06c053d8f7381f91c53311b1234872ca96ced752"; sha256 = "0mkbzw12fav945icibc2293m5haxqr3hzkyli2cf4ssk6yvn0x4c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/578d33f3f8e68ef1b3ca3fb8af9b9ff77b649bd3/recipes/evil-visualstar"; sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy"; - name = "evil-visualstar"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -22329,9 +29068,15 @@ license = lib.licenses.free; }; }) {}; - evm = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evm = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evm"; + ename = "evm"; version = "20141007.456"; src = fetchFromGitHub { owner = "rejeep"; @@ -22339,10 +29084,10 @@ rev = "d0623b2355436a5fd9f7238b419782080c79196b"; sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bbcead697f745d197459f90ee05b172e35af2411/recipes/evm"; sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03"; - name = "evm"; + name = "recipe"; }; packageRequires = [ dash f ]; meta = { @@ -22350,9 +29095,13 @@ license = lib.licenses.free; }; }) {}; - ewmctrl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ewmctrl = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ewmctrl"; + ename = "ewmctrl"; version = "20170921.1917"; src = fetchFromGitHub { owner = "flexibeast"; @@ -22360,10 +29109,10 @@ rev = "3d0217c4d6cdb5c308b6cb4293574f470d4faacf"; sha256 = "0ilwvx0qryv3v6xf0gxqwnfm6pf96gxap8h9g3f6z6lk9ff4n1wi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2a7679f0961b171bf23080e628ae80f50c446e4/recipes/ewmctrl"; sha256 = "1w60pb7szai1kh06jd3qvgpzq3z1ci4a77ysnpqjfk326s6zv7hl"; - name = "ewmctrl"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22371,9 +29120,13 @@ license = lib.licenses.free; }; }) {}; - eww-lnum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eww-lnum = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eww-lnum"; + ename = "eww-lnum"; version = "20150102.712"; src = fetchFromGitHub { owner = "m00natic"; @@ -22381,10 +29134,10 @@ rev = "4b0ecec769919ecb05ca4fb15ec51911ba589929"; sha256 = "1i6zf17rwa390c33cbspz81dz86vwlphyhjjsia4gp205nfk3s20"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eww-lnum"; sha256 = "1hhc6q8zlj335v27j4dq6ms7frqpivfabs9w3vkaly5kjr60fw7c"; - name = "eww-lnum"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22392,20 +29145,26 @@ license = lib.licenses.free; }; }) {}; - exato = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + exato = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "exato"; + ename = "exato"; version = "20180305.242"; src = fetchFromGitHub { owner = "ninrod"; repo = "exato"; - rev = "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6"; - sha256 = "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm"; + rev = "39c08f56483243c28a39886a7218039a138e5f63"; + sha256 = "1q0jjaw5k9bql7bk5idin724vbcgx0iwn2dm4mg1c51cczqsd2rg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato"; sha256 = "1h2dd3yhv1n0sznznw8ncx98g53hgi1rg1zkd0nmldih2rd5qisn"; - name = "exato"; + name = "recipe"; }; packageRequires = [ emacs evil ]; meta = { @@ -22413,9 +29172,13 @@ license = lib.licenses.free; }; }) {}; - exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + exec-path-from-shell = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "exec-path-from-shell"; + ename = "exec-path-from-shell"; version = "20180323.1904"; src = fetchFromGitHub { owner = "purcell"; @@ -22423,10 +29186,10 @@ rev = "4d0af1274797ce61f5d8c209339d5b9cdc49aca6"; sha256 = "1h45vxyw0pa99fldnvca96rz1w1hl7mrgx5m51rknxascfvk6fqx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell"; sha256 = "014bfcs7znds4if1njyq4s5zrfnr6b3wj6722b4l5r58gh9mlrr5"; - name = "exec-path-from-shell"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22434,19 +29197,24 @@ license = lib.licenses.free; }; }) {}; - exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + exiftool = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "exiftool"; + ename = "exiftool"; version = "20170822.1432"; src = fetchgit { url = "https://git.systemreboot.net/exiftool.el/"; rev = "3a07dbcb975577734d4abf6d68e1ab83a01951bb"; sha256 = "10prrwvmc891vkzzgqmz0xd85xgi52ni83ydf0bvhfmcg0wmm0cc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool"; sha256 = "1zvcps64yvz8lsjhi1j0808983fv2s7kx67yjr8ps454mcl8bpab"; - name = "exiftool"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -22454,9 +29222,14 @@ license = lib.licenses.free; }; }) {}; - exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + exotica-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "exotica-theme"; + ename = "exotica-theme"; version = "20180212.1529"; src = fetchFromGitHub { owner = "jbharat"; @@ -22464,10 +29237,10 @@ rev = "ff3ef4f6fa38c93b99becad977c7810c990a4d2f"; sha256 = "1kp6q55g3dcya4y79x877vqwxa4z2rkkvhs49pkwr3wljf4af2pd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; sha256 = "1fzf1zpllkddkq02hvabbi2bh6rnanlyinb6fjwsyh39wvzhsfhs"; - name = "exotica-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -22475,9 +29248,13 @@ license = lib.licenses.free; }; }) {}; - expand-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + expand-line = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "expand-line"; + ename = "expand-line"; version = "20151005.1907"; src = fetchFromGitHub { owner = "cheunghy"; @@ -22485,10 +29262,10 @@ rev = "75a5d0241f35dd0748ab8ecb4ff16891535be372"; sha256 = "0wz4h5hrr5ci0w8pynd2nr1b2zl5hl4pa8gc16mcabik5927rf7z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c3fa6b17a8c6b08b0d77bdff0f91b7af34f4279/recipes/expand-line"; sha256 = "07nfgp6jlrb9wxqy835j79i4g88714zndidkda84z16qn2y901a9"; - name = "expand-line"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22496,20 +29273,24 @@ license = lib.licenses.free; }; }) {}; - expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + expand-region = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "expand-region"; - version = "20171217.2125"; + ename = "expand-region"; + version = "20180625.939"; src = fetchFromGitHub { owner = "magnars"; repo = "expand-region.el"; - rev = "f99b7630efcdb47c9c6182489c55fba3bcaee521"; - sha256 = "0sdk9qqxd8dkjf554p7ch2w8pd8a7c4q64c5yd8gphc8fmzc32rn"; + rev = "54e1b94fa8b65f066f731101a744287e956ae75f"; + sha256 = "113d804gmvxmg3f32w7m4dc14xpl47aw25255nyr0w5bxm7vmnah"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region"; sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg"; - name = "expand-region"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22517,20 +29298,25 @@ license = lib.licenses.free; }; }) {}; - express = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }: - melpaBuild { + express = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , string-utils }: + melpaBuild { pname = "express"; + ename = "express"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "express"; - rev = "93dae7377eace4a5413ba99aecb6f26f90798725"; - sha256 = "0ah8zayipwp760909llb9whcdvmbsdgkg0x5y4qlcicm1r9kwcc7"; + rev = "6c301e8a4b6b58a5fe59ba607865238e38cee8fd"; + sha256 = "1nhqaxagg3p26grjzg8089bmwpx2a3bbq1abw40wbqivybl6mgd5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a97f5f81af13c49f5bea31455d7da0bf2c12e4f/recipes/express"; sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9"; - name = "express"; + name = "recipe"; }; packageRequires = [ string-utils ]; meta = { @@ -22538,9 +29324,14 @@ license = lib.licenses.free; }; }) {}; - exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + exsqlaim-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "exsqlaim-mode"; + ename = "exsqlaim-mode"; version = "20170607.303"; src = fetchFromGitHub { owner = "ahmadnazir"; @@ -22548,10 +29339,10 @@ rev = "a2e0a62ec8b87193d8eaa695774bfd689324b06c"; sha256 = "1gj1q2h1ja30jizkjql12cxlppj07ykr4wxqca9msy043zdhqnkk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode"; sha256 = "0ssn48wcn3x066nsl8y78y57ndasqv5x6ifxbifdxl3f5vjhyvg7"; - name = "exsqlaim-mode"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -22559,9 +29350,14 @@ license = lib.licenses.free; }; }) {}; - extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + extempore-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "extempore-mode"; + ename = "extempore-mode"; version = "20180104.2221"; src = fetchFromGitHub { owner = "extemporelang"; @@ -22569,10 +29365,10 @@ rev = "ae5f40d4b0883a4519e460cd7720e5fcc3a68fa5"; sha256 = "1f888h7xv6zz6kq38ak1vpwjrjr2sqgwpfxwb9x0ldf3kkx4wf1w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bd3e57171f5283604e9375613a7a94416ee99a7/recipes/extempore-mode"; sha256 = "1z8nzpcj27s74kxfjz7wyr3848jpd6mbyjkssd06ri5p694j9php"; - name = "extempore-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -22580,9 +29376,13 @@ license = lib.licenses.free; }; }) {}; - extend-dnd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + extend-dnd = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "extend-dnd"; + ename = "extend-dnd"; version = "20151122.1050"; src = fetchFromGitHub { owner = "mattfidler"; @@ -22590,10 +29390,10 @@ rev = "80c966c93b82c9bb5c6225a432557c39144fc602"; sha256 = "15dwl1rb3186k328a83dz9xmslc0px60ah16fifvmr3migis9hwz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2d866ca12cb997b7fad878808c0966f3413b73d/recipes/extend-dnd"; sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417"; - name = "extend-dnd"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22601,9 +29401,14 @@ license = lib.licenses.free; }; }) {}; - extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + extmap = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "extmap"; + ename = "extmap"; version = "20180205.1047"; src = fetchFromGitHub { owner = "doublep"; @@ -22611,10 +29416,10 @@ rev = "3860b69fb19c962425d4e271ee0a24547b67d323"; sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap"; sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j"; - name = "extmap"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -22622,9 +29427,41 @@ license = lib.licenses.free; }; }) {}; - exwm-surf = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + exwm-edit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "exwm-edit"; + ename = "exwm-edit"; + version = "20180629.137"; + src = fetchFromGitHub { + owner = "agzam"; + repo = "exwm-edit"; + rev = "6ea0a64e47d06204d826e146c3c3082dec5c4007"; + sha256 = "0sz2q4nj5inh42f37jfkc5z7fdw1lgsyz2fh5ljgjcvrd9xlb24l"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f247915e02e59ebd6a2a219e55870e034d41c938/recipes/exwm-edit"; + sha256 = "0bydkznywma0x293m105amppx4qx1iyjpqdfq6np73176xfy6kc5"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/exwm-edit"; + license = lib.licenses.free; + }; + }) {}; + exwm-surf = callPackage ({ emacs + , exwm + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "exwm-surf"; + ename = "exwm-surf"; version = "20171204.340"; src = fetchFromGitHub { owner = "ecraven"; @@ -22632,10 +29469,10 @@ rev = "6c17e2c1597fe4b7b454a1dac23b9127ac951e94"; sha256 = "0rb921fq3pyzv0w1s6n0zx4j7cvv68mb50hfa8nqnppz5ii1k0lb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4fc27fae2b58c7af87dadba9217cc05f8ab4890c/recipes/exwm-surf"; sha256 = "066qbn1w63irh9b03qs0fv77x71cind22kdj6wygaznrpgwr0kny"; - name = "exwm-surf"; + name = "recipe"; }; packageRequires = [ emacs exwm ]; meta = { @@ -22643,9 +29480,20 @@ license = lib.licenses.free; }; }) {}; - exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }: - melpaBuild { + exwm-x = callPackage ({ bind-key + , cl-lib ? null + , counsel + , exwm + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , swiper + , switch-window }: + melpaBuild { pname = "exwm-x"; + ename = "exwm-x"; version = "20180227.257"; src = fetchFromGitHub { owner = "tumashu"; @@ -22653,10 +29501,10 @@ rev = "4f7946db67d6599baba6b3961e8f543a68707742"; sha256 = "00lcn5106xig2y9gyir1f1gzyp2i05rwq1lbbbah8aipkdi3z9xl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3"; - name = "exwm-x"; + name = "recipe"; }; packageRequires = [ bind-key @@ -22672,20 +29520,26 @@ license = lib.licenses.free; }; }) {}; - eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eyebrowse = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eyebrowse"; - version = "20171216.944"; + ename = "eyebrowse"; + version = "20180514.1219"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "ad94b5bed74a74769775e937e167d301f4ea70e3"; - sha256 = "1f1b70fyq9j19i41rsishrdkslwnx0af7gzwirhs25sgkpsqz2hr"; + rev = "ec7e11022032348ee23a3586a1306871f9d28b25"; + sha256 = "16mks2dr4k6bjr1xds9j2jwm7zwad4z67wa0qg9n50gyiyn4pl4g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861"; - name = "eyebrowse"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -22693,20 +29547,26 @@ license = lib.licenses.free; }; }) {}; - eyuml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: - melpaBuild { + eyuml = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , s }: + melpaBuild { pname = "eyuml"; + ename = "eyuml"; version = "20141028.1527"; src = fetchFromGitHub { owner = "antham"; repo = "eyuml"; - rev = "eb29c37316e44a14741f16e894fbcfcb7537dc80"; - sha256 = "19n2dzr3m56g76igh57cvvhqwpbcicwr7r6r4i3l8vsjch99kp6m"; + rev = "2f259c201c6cc63ee608f75cd85c1ae27f9d2532"; + sha256 = "1rgzydxv7c455vj1jm44vvs6xc4qgivqqb0g6zh5x4wdcpgdi2g9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a8d723e357da67441e65047759ccfa9cb7ef6/recipes/eyuml"; sha256 = "0ada2gcl8bw9nn0fz8g9lbqy8a8w1554q03fzd7lv8qla33ri3wx"; - name = "eyuml"; + name = "recipe"; }; packageRequires = [ request s ]; meta = { @@ -22714,9 +29574,15 @@ license = lib.licenses.free; }; }) {}; - ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ez-query-replace = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ez-query-replace"; + ename = "ez-query-replace"; version = "20170814.621"; src = fetchFromGitHub { owner = "Wilfred"; @@ -22724,10 +29590,10 @@ rev = "f5dbd2d3e5e62e6b7e7cc1a98fc4d0cd411e5afa"; sha256 = "14mikpxrsmjwdpya45cf47v2gjwxmql10xjk907x27iqqxmfif74"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c40808c7687ace84e4c59bf8c25332c94b6fdd76/recipes/ez-query-replace"; sha256 = "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx"; - name = "ez-query-replace"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -22735,20 +29601,24 @@ license = lib.licenses.free; }; }) {}; - eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eziam-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eziam-theme"; - version = "20180208.628"; + ename = "eziam-theme"; + version = "20180414.329"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "8891dc05b54c0ea848ee3bf7b42e759f73c1bb1a"; - sha256 = "1wi1qqzf630ffz0kkk12f81jmm8ii7cckf1wds3phpb67msn5ial"; + rev = "96595833110cd64c391e0ccd5230782a8f0a4e08"; + sha256 = "0nvwgxlrbfhchb7z2qnw1lj66xpzn2b6yb6mhx0k31xdfr173wch"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; sha256 = "0iz3r4r54ai8y4qhnix291ra7qfmk8dbr06f52pgmz3gzin1cqpb"; - name = "eziam-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22756,9 +29626,15 @@ license = lib.licenses.free; }; }) {}; - f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + f = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "f"; + ename = "f"; version = "20180106.122"; src = fetchFromGitHub { owner = "rejeep"; @@ -22766,10 +29642,10 @@ rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48"; sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f"; sha256 = "18qax8i24gpccif4xcxccclpwl00plxjf3zbq9dry37b1r4mj57s"; - name = "f"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -22777,9 +29653,16 @@ license = lib.licenses.free; }; }) {}; - f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + f3 = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "f3"; + ename = "f3"; version = "20180130.358"; src = fetchFromGitHub { owner = "cosmicexplorer"; @@ -22787,10 +29670,10 @@ rev = "000009ce4adf7a57eae80512f29c4ec2a1391ce5"; sha256 = "0q3ylw0i1bg7pzsv4gj72jcfjjfh57vsb3fnfnhhh5i5vladiqsf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; sha256 = "099wibgp9k6sgglaqigic5ay6qg7aqijnis5crwjl7b81ddqp610"; - name = "f3"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -22798,9 +29681,13 @@ license = lib.licenses.free; }; }) {}; - fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fabric = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fabric"; + ename = "fabric"; version = "20171115.2256"; src = fetchFromGitHub { owner = "nlamirault"; @@ -22808,10 +29695,10 @@ rev = "df79be341d0b34ed23850f9894136092fa5fea8c"; sha256 = "1mnz81k1jz2sa3zj68ihzgq66l9fcxvzb67ad62p8bvi2aksxx7z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83939d2a4d5874244a4916eee9ae6b327af18b5d/recipes/fabric"; sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m"; - name = "fabric"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22819,9 +29706,13 @@ license = lib.licenses.free; }; }) {}; - face-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + face-explorer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "face-explorer"; + ename = "face-explorer"; version = "20170710.1201"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -22829,10 +29720,10 @@ rev = "13bd4553bc4b09215a04d0267be1cb4ed834775c"; sha256 = "1zbm92imfbh1sm7j64vc1ig5yq6rdd8izkh80mci5k6nf1p3byk7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2370fdf6421dc518337e04bd2453a5f74e2df2b2/recipes/face-explorer"; sha256 = "1jfidkkizgwhkkrgvrmq5vrx5ir4zjw4zzc2alw9gkjn1ddq22q7"; - name = "face-explorer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22840,9 +29731,13 @@ license = lib.licenses.free; }; }) {}; - faceup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + faceup = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "faceup"; + ename = "faceup"; version = "20170925.1246"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -22850,10 +29745,10 @@ rev = "6c92dad56a133e14e7b27831e1bcf9b3a71ff154"; sha256 = "1yzmy7flrhrh0i10bdszx8idx6r8h6czm4vm4q0z6fp5fw94zwrx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a10bf2928b93c3908e89ca8ad9649bb468ebca05/recipes/faceup"; sha256 = "0l41xp38iji55dv20lk7r187ywcz8s1g2jmwbjwkspzmcf763xvx"; - name = "faceup"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22861,20 +29756,25 @@ license = lib.licenses.free; }; }) {}; - factlog = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + factlog = callPackage ({ deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "factlog"; + ename = "factlog"; version = "20130209.1740"; src = fetchFromGitHub { owner = "tkf"; repo = "factlog"; - rev = "6503d77ea882c995b051d22e72db336fb28770fc"; - sha256 = "19zm9my7fl1r3q48axjv2f8x9hcjk6qah4y4r92b90bzfmcdc30y"; + rev = "38f78132ae311faffba98ed5dd18d661af68678e"; + sha256 = "06ycj1c8jadkmfknsvk99s6jq3w29psl5z4m9159i6zlzaqm03qm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9075a42edee1ac7de0812d2eefcba5681859eb6e/recipes/factlog"; sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7"; - name = "factlog"; + name = "recipe"; }; packageRequires = [ deferred ]; meta = { @@ -22882,20 +29782,24 @@ license = lib.licenses.free; }; }) {}; - faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + faff-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "faff-theme"; - version = "20180322.1005"; + ename = "faff-theme"; + version = "20180702.1023"; src = fetchFromGitHub { owner = "WJCFerguson"; repo = "emacs-faff-theme"; - rev = "d123161586397fb74a928bb1b22e2b507f1beed5"; - sha256 = "136gq45c0w0c3i0fzk3js67z8p7r9k81d31s48flpsb982bf7nfz"; + rev = "596c8cfbf1a7fbc3b93643359f8d0f4c612d69be"; + sha256 = "03jrlk5n9jd3mw6k36qblzl89yj6q8ir9krvilb3da170pr6b4pa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; sha256 = "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g"; - name = "faff-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22903,9 +29807,13 @@ license = lib.licenses.free; }; }) {}; - fakespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fakespace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fakespace"; + ename = "fakespace"; version = "20120817.1706"; src = fetchFromGitHub { owner = "skeeto"; @@ -22913,10 +29821,10 @@ rev = "d1bd1f4b14b2690d7a67f9a52622ec51ed84813a"; sha256 = "11fm0h9rily5731s137mgv8rdbfqi99s6f36bgr0arwbq3f2j3fs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/778dbe1fd1d2ecebb499ad66bc950e586f231c52/recipes/fakespace"; sha256 = "09dsmrqax4wfcw8fd5jf07bjxm5dizpc2qvjkqwg74j2n352wv27"; - name = "fakespace"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22924,9 +29832,16 @@ license = lib.licenses.free; }; }) {}; - fakir = callPackage ({ dash, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, noflet }: - melpaBuild { + fakir = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , kv + , lib + , melpaBuild + , noflet }: + melpaBuild { pname = "fakir"; + ename = "fakir"; version = "20140729.952"; src = fetchFromGitHub { owner = "nicferrier"; @@ -22934,10 +29849,10 @@ rev = "1fca406ad7de80fece6319ff75d4230b648534b0"; sha256 = "1w5apzbzr1jd983b0rzsy9ldb0z0zcq6mpyb5r8czl5wd4vvj69h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0a8abd5fd77a14b957f53b5bc8474403cc1e18f/recipes/fakir"; sha256 = "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25"; - name = "fakir"; + name = "recipe"; }; packageRequires = [ dash kv noflet ]; meta = { @@ -22945,20 +29860,25 @@ license = lib.licenses.free; }; }) {}; - fancy-battery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fancy-battery = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fancy-battery"; + ename = "fancy-battery"; version = "20150101.404"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "fancy-battery.el"; - rev = "9b88ae77a01aa3edc529840338bcb2db7f445822"; - sha256 = "1k6prddw277iszh9hq145yqidwiiy9iqz656rpmqwn5hmr1vakhk"; + rev = "bcc2d7960ba207b5b4db96fe40f7d72670fdbb68"; + sha256 = "0m7rjzl9js2gjfcaqp2n5pn5ykpqnv8qfv35l5m5kpfigsi9cbb0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eae3af4145c534992d1c1ee5bb6420651c7c5d82/recipes/fancy-battery"; sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii"; - name = "fancy-battery"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -22966,9 +29886,13 @@ license = lib.licenses.free; }; }) {}; - fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fancy-narrow = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fancy-narrow"; + ename = "fancy-narrow"; version = "20171030.1716"; src = fetchFromGitHub { owner = "Malabarba"; @@ -22976,10 +29900,10 @@ rev = "9f4a587f6a5a387271fb665e13f59d41fd42504c"; sha256 = "0dl0fc3i8g193adpkr4fb2k151lw9r6gd8p27q9xgmm9brf9jf17"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow"; sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv"; - name = "fancy-narrow"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22987,9 +29911,13 @@ license = lib.licenses.free; }; }) {}; - farmhouse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + farmhouse-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "farmhouse-theme"; + ename = "farmhouse-theme"; version = "20160713.1544"; src = fetchFromGitHub { owner = "mattly"; @@ -22997,10 +29925,10 @@ rev = "7ddc1ff13b4a3d5466bd0d33ecb86100352e83a7"; sha256 = "09k6agh205kr2lif354m38l3967b0jajm14rgpl7l1vlajh8wzfd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b0d427db8ab66d2fe323366b0837595b3b59afa/recipes/farmhouse-theme"; sha256 = "0hbqdrw6x25b331qhbg3yaaa45c2b896wknsjm0a1kg142klq229"; - name = "farmhouse-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23008,20 +29936,23 @@ license = lib.licenses.free; }; }) {}; - fasd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fasd = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fasd"; - version = "20180203.745"; - src = fetchFromGitHub { - owner = "steckerhalter"; - repo = "emacs-fasd"; - rev = "f6393895bddbe9a1c77d4f6963a7e7ec6ff18bc4"; - sha256 = "1bjb20p2sp1avjmr57b3zf15w01fi7h4dd46zahhap1lrk9sxgx9"; + ename = "fasd"; + version = "20180605.2205"; + src = fetchgit { + url = "https://framagit.org/steckerhalter/emacs-fasd.git"; + rev = "020c6a4b5fd1498a84ae142d2e32c7ff678fb029"; + sha256 = "142zq0zz38j3akgc1gipqhgs05krlkig1i97pgzmi4jcqdgm3lx9"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8f0fefb25f03677080c9adeeb48046d6ea163053/recipes/fasd"; - sha256 = "0i49z50bpi7fx0dm5jywlndnq9hb0dm5a906k4017w8y7sfpfl6c"; - name = "fasd"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/fasd"; + sha256 = "0ssb1bbw3cwd4zdy08a0fymwjwgdnx0kil5x3x1b7k8kan942436"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23029,9 +29960,15 @@ license = lib.licenses.free; }; }) {}; - fastdef = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, w3m }: - melpaBuild { + fastdef = callPackage ({ fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , w3m }: + melpaBuild { pname = "fastdef"; + ename = "fastdef"; version = "20160713.629"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -23039,10 +29976,10 @@ rev = "0696f41dc150d35ce31fe8d2ea74f4173818bb55"; sha256 = "1p5vmbx7zdzxnyjzcp2vxscd3dwf7xk82wk9dfiv99svwqv2ki3w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6effb2fbccc71e8a44c53138e3c21f10dc55fbc/recipes/fastdef"; sha256 = "1cf4slxhcp2z7h9k3l31h06nnqsyb4smwnj55ivil2lm0fa0vlzj"; - name = "fastdef"; + name = "recipe"; }; packageRequires = [ ivy w3m ]; meta = { @@ -23050,9 +29987,13 @@ license = lib.licenses.free; }; }) {}; - fastnav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fastnav = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fastnav"; + ename = "fastnav"; version = "20120211.657"; src = fetchFromGitHub { owner = "gleber"; @@ -23060,10 +30001,10 @@ rev = "1019ba2b61d1a070204099b23da347278a61bc89"; sha256 = "0y95lrdqd9i2kbb266s1wdiim4m8vrn3br19d8s55ib6xlywf8cx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2a7dce6617bf4ed250dba150e6787bf48891c64/recipes/fastnav"; sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5"; - name = "fastnav"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23071,9 +30012,13 @@ license = lib.licenses.free; }; }) {}; - faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + faust-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "faust-mode"; + ename = "faust-mode"; version = "20180205.126"; src = fetchFromGitHub { owner = "rukano"; @@ -23081,10 +30026,10 @@ rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c"; sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode"; sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z"; - name = "faust-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23092,19 +30037,25 @@ license = lib.licenses.free; }; }) {}; - faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + faustine = callPackage ({ emacs + , faust-mode + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "faustine"; + ename = "faustine"; version = "20171122.402"; src = fetchgit { url = "https://bitbucket.org/yphil/faustine"; rev = "07a38963111518f86123802f9d477be0d4689a3f"; sha256 = "0dj35hwkm5v8758c4ssl873vkvplba5apjsh7l23nsmnzdji99zg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/faustine"; sha256 = "1blmz993xrwkyr7snj7rm07s07imgpdlfqi6wxkm4ns6iwa2q60s"; - name = "faustine"; + name = "recipe"; }; packageRequires = [ emacs faust-mode ]; meta = { @@ -23112,9 +30063,13 @@ license = lib.licenses.free; }; }) {}; - fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fcitx = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fcitx"; + ename = "fcitx"; version = "20170913.1900"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -23122,10 +30077,10 @@ rev = "095332fbeb994c908c533fe2ad068c0728211c3d"; sha256 = "01sm50rqajylah2hx6n5ig0xmrrhxbamzs4bg97qzxzr4nlnjcaz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx"; - name = "fcitx"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23133,9 +30088,13 @@ license = lib.licenses.free; }; }) {}; - fcopy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fcopy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fcopy"; + ename = "fcopy"; version = "20150304.603"; src = fetchFromGitHub { owner = "ataka"; @@ -23143,10 +30102,10 @@ rev = "e355f6ec889d8ecbdb096019c2dc660b1cec4941"; sha256 = "0c56j8ip2fyma9yvwaanz89jyzgi9k11xwwkflzlzc4smnvgfibr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9afd35b7c7075bef9ed878b7122ff9783fdd9fd/recipes/fcopy"; sha256 = "13337ymf8vlbk8c4jpj6paqi06xdmk39yf72s40kmfrbvgmi8qy1"; - name = "fcopy"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23154,9 +30113,13 @@ license = lib.licenses.free; }; }) {}; - feature-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + feature-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "feature-mode"; + ename = "feature-mode"; version = "20170907.748"; src = fetchFromGitHub { owner = "michaelklishin"; @@ -23164,10 +30127,10 @@ rev = "722b352c4f0b800a9356dd369c79612782b3b847"; sha256 = "0myaddivhvl8x3n2z2vjc6mc2jn1jja67mzwx1jp9gb9p958irk0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a70991695f9ff305f12cfa45e0a597f4a782ba3/recipes/feature-mode"; sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg"; - name = "feature-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23175,20 +30138,24 @@ license = lib.licenses.free; }; }) {}; - feebleline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + feebleline = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "feebleline"; - version = "20180322.1401"; + ename = "feebleline"; + version = "20180604.515"; src = fetchFromGitHub { owner = "tautologyclub"; repo = "feebleline"; - rev = "56cd8fe336b619840991dc66d9cca973ddd8500c"; - sha256 = "0p8d31942c3xlymjm2r9qppr07c8vg0842f87lzqh84sc3z7r5ql"; + rev = "9ece1c02a60ed0209cda661bcb864a7e624e8aca"; + sha256 = "0fiq16bm28c9z62fdpr7n2fpnqbcmb278b72wi3gl386w34j6xl1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782295d8c530878bd0e20cde7e7f7f8f640953dd/recipes/feebleline"; sha256 = "0c604ahhv9c89r3hj7091zhhfpbykh4c23sn6ymqw4pp0dq4pgkj"; - name = "feebleline"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23196,9 +30163,38 @@ license = lib.licenses.free; }; }) {}; - fetch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fennel-mode = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "fennel-mode"; + ename = "fennel-mode"; + version = "20180509.1852"; + src = fetchFromGitLab { + owner = "technomancy"; + repo = "fennel-mode"; + rev = "21e184b2a862290db9dcf839f0e4a2df480a642e"; + sha256 = "0l3770w47skbr95775mrwpmw6apmbjk18i6c1zcz05pc46rcr15s"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cda0732050a17b2dc70b80afd6fc6bb9cf8bb60f/recipes/fennel-mode"; + sha256 = "0lg69rjvbg7zl4jxc88m12r4rgv2mg2xdyz591mdmgvxwr2hfrv9"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fennel-mode"; + license = lib.licenses.free; + }; + }) {}; + fetch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fetch"; + ename = "fetch"; version = "20131130.2330"; src = fetchFromGitHub { owner = "crshd"; @@ -23206,10 +30202,10 @@ rev = "3f2793afcbbc32f320e572453166f9354ecc6d06"; sha256 = "0pjw9fb3n08yd38680ifdn2wlnw2k6q97lzhqb2259mywsycyqy8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e808952551936dd8eaf0158d6ca929d10712dc5/recipes/fetch"; sha256 = "1jqc6pspgcrdzm7ij46r1q6vpjq7il5dy2xyxwn2c1ky5a80paby"; - name = "fetch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23217,20 +30213,24 @@ license = lib.licenses.free; }; }) {}; - fic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fic-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fic-mode"; - version = "20160209.1011"; + ename = "fic-mode"; + version = "20180603.1335"; src = fetchFromGitHub { owner = "lewang"; repo = "fic-mode"; - rev = "8182f5be875fdefc5bd7142ab45adea89ac20705"; - sha256 = "06xd5rvn037g1kjdw7aa1n71i1mpnp4qz3a7wcmzbls0amhhnx1m"; + rev = "a05fc36ed54ba0c6dc22ac216a6a72cf191ca13d"; + sha256 = "074dfwdir2dx5cpbjk1ac8d3hkjkrylivy7agir5mnmzjm3bs9gw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/fic-mode"; sha256 = "0yy1zw0b0s93qkzyq0n17gzn33ma5h56mh40ysz6adwsi68af84c"; - name = "fic-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23238,9 +30238,13 @@ license = lib.licenses.free; }; }) {}; - fifo-class = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fifo-class = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fifo-class"; + ename = "fifo-class"; version = "20160424.2258"; src = fetchFromGitHub { owner = "mola-T"; @@ -23248,10 +30252,10 @@ rev = "8fe4cf690727f4ac7b67f29c55f845df023c3f21"; sha256 = "0dkng4zkd5xdyvqy67bnfp4z6w8byx66bssq1zl7bhga45vihfjg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b4fa87f7d5592bc264805760d191df2a3539cf1/recipes/fifo-class"; sha256 = "0yyjrvdjiq5166vrys13c3dqy5807a3x99597iw5v6mcxg37jg3h"; - name = "fifo-class"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23259,18 +30263,23 @@ license = lib.licenses.free; }; }) {}; - figlet = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + figlet = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "figlet"; + ename = "figlet"; version = "20160218.1437"; src = fetchhg { url = "https://bitbucket.com/jpkotta/figlet"; rev = "70ca269d706e"; sha256 = "1c18b1h154sdxkksqwk8snyk8n43bwzgavi75l8mnz8dnl1ciaxs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/figlet"; sha256 = "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj"; - name = "figlet"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23278,9 +30287,41 @@ license = lib.licenses.free; }; }) {}; - fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + filelock = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "filelock"; + ename = "filelock"; + version = "20180524.1515"; + src = fetchFromGitHub { + owner = "DarwinAwardWinner"; + repo = "emacs-filelock"; + rev = "17a5ca6e0dee14d2e7d92c84be91143bca9d9663"; + sha256 = "1smiad56626bc7q6vgj5gc710hnx814d4xlpxdlfzqlmj08y9dyk"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bda76dfbf37eaa17bebb4b8c34006704862db433/recipes/filelock"; + sha256 = "13ra697y0fhkjwsaqqlphcyfqkaiix5z59qw4q6rgix4k8ypj8db"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs f ]; + meta = { + homepage = "https://melpa.org/#/filelock"; + license = lib.licenses.free; + }; + }) {}; + fill-column-indicator = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fill-column-indicator"; + ename = "fill-column-indicator"; version = "20171209.1124"; src = fetchFromGitHub { owner = "alpaker"; @@ -23288,10 +30329,10 @@ rev = "d2536b1c48f78679e15a2b50cd5d8c0ffde4b155"; sha256 = "0f8h32n8mnrwijz3lrslbx521f0fkhn24cwd16r8hcjk976l5kbp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator"; sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma"; - name = "fill-column-indicator"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23299,9 +30340,39 @@ license = lib.licenses.free; }; }) {}; - fillcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fill-function-arguments = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "fill-function-arguments"; + ename = "fill-function-arguments"; + version = "20180427.1002"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "fill-function-arguments"; + rev = "fcfb2a671adaf04110586aee0c499b1f0056a8e6"; + sha256 = "07d1pi9scqcpqd9s2rifpkh5iyfmisd8rzddbrg99aj1wicg4j33"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b78eab67517b19516e5d265018afcbff0acfa9ec/recipes/fill-function-arguments"; + sha256 = "1gigzzz2csl3a55jmjx391a5k3ymixnwpblsn0pfgkkk4p3674q0"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/fill-function-arguments"; + license = lib.licenses.free; + }; + }) {}; + fillcode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fillcode"; + ename = "fillcode"; version = "20171029.925"; src = fetchFromGitHub { owner = "snarfed"; @@ -23309,10 +30380,10 @@ rev = "d0a9e20f5fcc24a786d09ea19bfb9237681ba823"; sha256 = "1mf2gfcjaqbw523vkfbzs2nl1y9bn9gbgmbvn2phbyj78gzq18za"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85eb403503aa83799a6072bfe21bf66c8177ca73/recipes/fillcode"; sha256 = "0bfsw55vjhx88jpy6npnzfwinvggivbvkk7fa3iwzq19005fkag2"; - name = "fillcode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23320,20 +30391,28 @@ license = lib.licenses.free; }; }) {}; - finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + finalize = callPackage ({ cl-generic + , cl-lib ? null + , eieio ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "finalize"; + ename = "finalize"; version = "20170418.1245"; src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-finalize"; - rev = "846731531e7d1d80451787992e07bfe7dedbe9ff"; - sha256 = "0kqsqmfvnh0slx0hmrsw66rh62sgzyhzck7ii9zylkq72wj60fgl"; + rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27"; + sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize"; sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq"; - name = "finalize"; + name = "recipe"; }; packageRequires = [ cl-generic cl-lib eieio emacs ]; meta = { @@ -23341,9 +30420,14 @@ license = lib.licenses.free; }; }) {}; - find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: - melpaBuild { + find-by-pinyin-dired = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pinyinlib }: + melpaBuild { pname = "find-by-pinyin-dired"; + ename = "find-by-pinyin-dired"; version = "20180209.1818"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -23351,10 +30435,10 @@ rev = "3b4781148dddc84a701ad76c0934ed991ecd59d5"; sha256 = "03fw1si115padxss6zb9fr0dsyq1bxlhxikgh4i5swp4jd4331k5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired"; sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq"; - name = "find-by-pinyin-dired"; + name = "recipe"; }; packageRequires = [ pinyinlib ]; meta = { @@ -23362,20 +30446,26 @@ license = lib.licenses.free; }; }) {}; - find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + find-file-in-project = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "find-file-in-project"; - version = "20180331.546"; + ename = "find-file-in-project"; + version = "20180705.1832"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "ad6c8fce30ac927b4c2297894b6436e1cf724501"; - sha256 = "1mq544h03laphwvcff2qaxdbb7krmnw1vxmnc9jchz8ascx2x28n"; + rev = "1c54325cb60bde7496dad4e19f4c2a857999df58"; + sha256 = "1pxqqpj6cdwbhca6vaj98d86f1l0vl09zp054wf0sv759l25ac0l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy"; - name = "find-file-in-project"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -23383,20 +30473,24 @@ license = lib.licenses.free; }; }) {}; - find-file-in-repository = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + find-file-in-repository = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "find-file-in-repository"; + ename = "find-file-in-repository"; version = "20151113.519"; src = fetchFromGitHub { owner = "hoffstaetter"; repo = "find-file-in-repository"; - rev = "8a8c84a6dbe7a2bba4564c3b58c92d157abfa3f8"; + rev = "898fd7ea2727772ba09383a2ece7f3f7f1e77e29"; sha256 = "090m5647dpc8r8fwi3mszvc8kp0420ma5sv0lmqr2fpxyn9ybkjh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58705ac6201b73851ce4ce9ebeb0e65463765961/recipes/find-file-in-repository"; sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6"; - name = "find-file-in-repository"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23404,9 +30498,13 @@ license = lib.licenses.free; }; }) {}; - find-temp-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + find-temp-file = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "find-temp-file"; + ename = "find-temp-file"; version = "20170107.539"; src = fetchFromGitHub { owner = "thisirs"; @@ -23414,10 +30512,10 @@ rev = "513005d19d72d71f34481ee00158dd57bd93206f"; sha256 = "129jnn16vxmp6r9gx8k4rvv6spag5q0if52b5fhsybicnsl35mrz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c01efd0cb3e3bab4661a358c084b645dc7e31736/recipes/find-temp-file"; sha256 = "0c98zm94958rb9kdvqr3pad744nh63y3vy3lshfm0lsg85k9j62p"; - name = "find-temp-file"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23425,20 +30523,24 @@ license = lib.licenses.free; }; }) {}; - find-things-fast = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + find-things-fast = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "find-things-fast"; + ename = "find-things-fast"; version = "20150519.1526"; src = fetchFromGitHub { owner = "eglaysher"; repo = "find-things-fast"; - rev = "efc7c189019ed65430e2f9e910e8e0a5ca9d2d03"; - sha256 = "1r6cs7p43pi6n2inbrv9q924m679izxwxqgyr4sjjj3lg6an4cnx"; + rev = "281dcb5a2e2db1013246dcac5111808352a8ea95"; + sha256 = "0h523dgjicmn4rpbk82ryq3mq5vfl5b50wvn0p2mh74g35mc0zwl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b63336dd150e791f3139d675af735b60054eb2b/recipes/find-things-fast"; sha256 = "1fs3wf61lzm1hxh5sx8pr74g7g9np3npdwg7xmk81b5f2jx2vy6m"; - name = "find-things-fast"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23446,9 +30548,13 @@ license = lib.licenses.free; }; }) {}; - findr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + findr = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "findr"; + ename = "findr"; version = "20130127.1232"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -23456,10 +30562,10 @@ rev = "1ddbc0464bb05dcda392b62666ad17239a2152d3"; sha256 = "0wx4hd4agrfvk0igyash658cbf7v3bv01rlspllsvzr59fl3faqq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/findr"; sha256 = "0pw72bdpmc0ymlgjmwwrslhynij5a5b9sc3rx6vyprpv1ad4ac2c"; - name = "findr"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23467,20 +30573,24 @@ license = lib.licenses.free; }; }) {}; - fingers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fingers = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fingers"; + ename = "fingers"; version = "20160817.129"; src = fetchFromGitHub { owner = "fgeller"; repo = "fingers.el"; - rev = "fed0f742afb1d72eaef29d8da394467550a030fa"; - sha256 = "1mx05zfdrkwb50l7f0iycsqw23b1gxzacfnssclb42xdjxxmyhdj"; + rev = "7de351448a6f5ea7aa7a25db6c90d5138f87eb16"; + sha256 = "1hwlnvry3pl3h2kz0d03d9225gn2dk4x3nhalk8854fr2jflrpqy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2afd4983d1a5820daafb31e96d54b214a79849f/recipes/fingers"; sha256 = "1r8fy6q6isjxz9mvaa8in4imdghzla3gg1l93dfm1v2rlr7bhzbg"; - name = "fingers"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23488,9 +30598,15 @@ license = lib.licenses.free; }; }) {}; - fiplr = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: - melpaBuild { + fiplr = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , grizzl + , lib + , melpaBuild }: + melpaBuild { pname = "fiplr"; + ename = "fiplr"; version = "20140723.2345"; src = fetchFromGitHub { owner = "grizzl"; @@ -23498,10 +30614,10 @@ rev = "bb6b90ba3c558988c195048c4c40140b2ee17530"; sha256 = "14yy7kr2iv549xaf5gkav48lk2hzmvipwbs0rzljzw60il6k05hk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/fiplr"; sha256 = "1a4w0yqdkz477lfyin4lb9k9qkfpx4350kfxmrqx6dj3aadkikca"; - name = "fiplr"; + name = "recipe"; }; packageRequires = [ cl-lib grizzl ]; meta = { @@ -23509,9 +30625,14 @@ license = lib.licenses.free; }; }) {}; - firecode-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + firecode-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "firecode-theme"; + ename = "firecode-theme"; version = "20170808.611"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -23519,10 +30640,10 @@ rev = "8b7b03ecdd41e70dab145b98906017e1392eaef4"; sha256 = "1vrpnv7555mbsksflgdkg7hc65fjcyzvzv2261y043rlh2qrn0sy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/firecode-theme"; sha256 = "10lxd93lkrvz8884dv4sh6fzzg355j7ab4p5dpvwry79rhs7f739"; - name = "firecode-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -23530,20 +30651,27 @@ license = lib.licenses.free; }; }) {}; - firefox-controller = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, moz, popwin }: - melpaBuild { + firefox-controller = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , moz + , popwin }: + melpaBuild { pname = "firefox-controller"; + ename = "firefox-controller"; version = "20160320.1147"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "emacs-firefox-controller"; - rev = "a8af8cbf70afaf6b89a26d6ac69af8e92afc181f"; - sha256 = "0icgl88pwizwzkdqsxbwhnc6pdyqsfd7wgjnkvg3206i7hcqwpsp"; + rev = "5b1bedec83206f41672b1b65bba859f235bff48b"; + sha256 = "04afwxgydrn23bv93zqf9bd2cp02i9dcfqbi809arkmh8723qf6k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a69c20f8dcf73c878f2172dcc9f1796fdc0408/recipes/firefox-controller"; sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6"; - name = "firefox-controller"; + name = "recipe"; }; packageRequires = [ cl-lib moz popwin ]; meta = { @@ -23551,20 +30679,24 @@ license = lib.licenses.free; }; }) {}; - fireplace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fireplace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fireplace"; + ename = "fireplace"; version = "20160811.519"; src = fetchFromGitHub { owner = "johanvts"; repo = "emacs-fireplace"; - rev = "23a444f749bcb2b804593e3b2cb9c73cc59231fb"; - sha256 = "1ijsa9k0cqy8w0ix2axw2j5996xab77x5s5vd5850jx0my6m7wyi"; + rev = "2b966ed65b714c613f79e9144d004dfa3b28f1ed"; + sha256 = "1f5053bbvjdmm64zv6r2qkswkpwvx0s3qz4bwm9zya583a6g0nv8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c1ac52c1cfe7ccf46092c2d299ebbffdc1b7609/recipes/fireplace"; sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw"; - name = "fireplace"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23572,9 +30704,13 @@ license = lib.licenses.free; }; }) {}; - firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + firestarter = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "firestarter"; + ename = "firestarter"; version = "20161219.523"; src = fetchFromGitHub { owner = "wasamasa"; @@ -23582,10 +30718,10 @@ rev = "4d6b106f325ac1802eabce3c8a7cd0a4c7a32864"; sha256 = "13daz15v0sshl7lxcg1xcbpl64gklgh50pzk0qxmn5ygw7nlifn0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b046eb3b63220b937e1b70f633cb5424dc782a1/recipes/firestarter"; sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp"; - name = "firestarter"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23593,9 +30729,14 @@ license = lib.licenses.free; }; }) {}; - firrtl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + firrtl-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "firrtl-mode"; + ename = "firrtl-mode"; version = "20180221.1555"; src = fetchFromGitHub { owner = "ibm"; @@ -23603,10 +30744,10 @@ rev = "1ac00d526018945389bcb2292dbdd8395381774a"; sha256 = "02xznsiij39lhjr261vl7yz4k4i76vshh5kwa7ax95zpj2zbs0v6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbf9ab9db03410c35b8b73a23bf8062b10f0815/recipes/firrtl-mode"; sha256 = "11n3wjr9sinqafjs88bznb5rppnignwkn4m4ppixi6xr31v3i4ws"; - name = "firrtl-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -23614,20 +30755,24 @@ license = lib.licenses.free; }; }) {}; - fish-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fish-completion = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fish-completion"; - version = "20180329.2137"; - src = fetchFromGitHub { + ename = "fish-completion"; + version = "20180616.1223"; + src = fetchFromGitLab { owner = "Ambrevar"; repo = "emacs-fish-completion"; - rev = "3e3ed1f19fa778b7c35ad88e033dce5a6b1fc153"; - sha256 = "1zi5cgzwy1wkvc8352s3l24p4i4fh87f9pyir6jji3hy424pm6w4"; + rev = "bac15fda1392a891070574dfe5d2d50b10831e8b"; + sha256 = "029s1ha8pc4df0xng5c0xwv2rlcl423mgh1ffgnbh0fx7ybr5n4v"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/832bae268cd08d7ebfd4b7a8d0570af8549cdbd6/recipes/fish-completion"; - sha256 = "1lq613b0zb4shlzx5s3br4d16295czx3bfymqcnriyspsfjvakar"; - name = "fish-completion"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6d17ca0213ba5ef9dce92002e281e6f08c3492be/recipes/fish-completion"; + sha256 = "1y7vwh7w0shnrnp8x1m1sa0p7kdyz5mg1mfs263gm38in2biym9i"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23635,9 +30780,14 @@ license = lib.licenses.free; }; }) {}; - fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fish-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fish-mode"; + ename = "fish-mode"; version = "20180306.818"; src = fetchFromGitHub { owner = "wwwjfy"; @@ -23645,10 +30795,10 @@ rev = "bac709ac1235751952d6022dddc6307d9135d096"; sha256 = "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14"; - name = "fish-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -23656,20 +30806,25 @@ license = lib.licenses.free; }; }) {}; - fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fix-input = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fix-input"; + ename = "fix-input"; version = "20171231.2220"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; - rev = "37bc0734a2e71d66245ee3960879577e5ef906bb"; - sha256 = "04k4wqsdbwxbq5a4dxvr3mqqsa5y3c0238llh2wig1r763ligm3j"; + rev = "e053fcc641f1f835f2fdb71143e095c1889b8233"; + sha256 = "1w8vv2ijmsch02xsc1r97r6s3jz0dkd8kwz5wgiizq5ghx7x6x6j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p"; - name = "fix-input"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -23677,20 +30832,24 @@ license = lib.licenses.free; }; }) {}; - fix-muscle-memory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fix-muscle-memory = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fix-muscle-memory"; + ename = "fix-muscle-memory"; version = "20160822.2139"; src = fetchFromGitHub { owner = "jonnay"; repo = "fix-muscle-memory"; - rev = "a123e04f8a1d2982cbf930efb909cad9522ac884"; - sha256 = "0mm6dl7017x5l43jf89w4nn5hcyi4fm160d2rcqx5w6dwb6f0v27"; + rev = "df687aea23c6eac4b751f993893c2fd56e5a8a3b"; + sha256 = "02nl4vz6fnbjc7w1lk1y9z0qw5bsxr407ww0b2wqw6h8spmcpcrc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b0501714a6d82657b88d11e3f79d75eea17d8e/recipes/fix-muscle-memory"; sha256 = "0qhasnjw0bj5hzw27r8vj6shhwc3zxcp3wmxijh1rpdw4773f7n8"; - name = "fix-muscle-memory"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23698,20 +30857,26 @@ license = lib.licenses.free; }; }) {}; - fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fix-word = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fix-word"; + ename = "fix-word"; version = "20171231.2215"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "8e66b6a7b599c6c5098490e83ef4e69acf307603"; - sha256 = "1p8hz66fyzivvwwya0br3v7dx0fqna9jw9291zgshvhxbin867fp"; + rev = "3e3339f5d44dd8be100cec1c88bcaefd328a2bde"; + sha256 = "0hd5bhq57qgabs881xfrz1v1n8sp1nv2hrfs386dx7g5b3ancr0i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc"; - name = "fix-word"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -23719,9 +30884,19 @@ license = lib.licenses.free; }; }) {}; - fixmee = callPackage ({ back-button, button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash, smartrep, string-utils, tabulated-list ? null }: - melpaBuild { + fixmee = callPackage ({ back-button + , button-lock + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nav-flash + , smartrep + , string-utils + , tabulated-list ? null }: + melpaBuild { pname = "fixmee"; + ename = "fixmee"; version = "20150223.555"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -23729,10 +30904,10 @@ rev = "1b8b3460f1e3c3c1784b2a63fb9f4fb3bb4dc084"; sha256 = "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f5d06db82e237e6c6babd92a1fd2b58c29662e4f/recipes/fixmee"; sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp"; - name = "fixmee"; + name = "recipe"; }; packageRequires = [ back-button @@ -23747,9 +30922,14 @@ license = lib.licenses.free; }; }) {}; - flame = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flame = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flame"; + ename = "flame"; version = "20180303.1216"; src = fetchFromGitHub { owner = "mschuldt"; @@ -23757,10 +30937,10 @@ rev = "2cfb860a483197e92a4c20d7b9b055d586e76fe0"; sha256 = "1h6mm2zjv03y2d6dv4gq7iaz6r2glgcljzgmi6m4jp6flvyqh09g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7a14c14368de722855286c088020a5657f7cf8b/recipes/flame"; sha256 = "1br9c48anscq9vbssr0gq8f5kbq755hjaglbljwwh9nd5riycv5v"; - name = "flame"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -23768,20 +30948,24 @@ license = lib.licenses.free; }; }) {}; - flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flappymacs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flappymacs"; + ename = "flappymacs"; version = "20171023.304"; src = fetchFromGitHub { owner = "taksatou"; repo = "flappymacs"; - rev = "27f3e21acb22f786606481e3f4e5dc1edbaaaed4"; - sha256 = "0zcwsbz93p1l2jb1fs6m4s5y9klcr5qg5nw10qg30j9l2bc1hda8"; + rev = "fac0011983251d5c44f4ed1eacac03f5de3caac4"; + sha256 = "191sdqaljxryslvwjgr38fhgxi0gg7v74m1rqxx3m740wr4qnx7s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/flappymacs"; sha256 = "1rp4r5ldhm8nrj26y1vm5d5fj3kl7v45cj1naxczrqbcgkd0r404"; - name = "flappymacs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23789,9 +30973,13 @@ license = lib.licenses.free; }; }) {}; - flash-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flash-region = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flash-region"; + ename = "flash-region"; version = "20130923.1117"; src = fetchFromGitHub { owner = "Fuco1"; @@ -23799,10 +30987,10 @@ rev = "261b3597b23cdd40e5c14262a5687bcc6c1d0901"; sha256 = "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf26329a30ec6e39b052e5815d3f113c05e72f84/recipes/flash-region"; sha256 = "1rgg7j34ka0nj1yjl688asim07bbz4aavh67kly6dzzwndr0nw8c"; - name = "flash-region"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23810,9 +30998,14 @@ license = lib.licenses.free; }; }) {}; - flatland-black-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flatland-black-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flatland-black-theme"; + ename = "flatland-black-theme"; version = "20170808.612"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -23820,10 +31013,10 @@ rev = "348c5d5fe615e6ea13cadc17f046e506e789ce07"; sha256 = "1g5jqxdk35ahx8qk4vi7whhcpi1qp7rbbjgiih974fs59cg5iki0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/flatland-black-theme"; sha256 = "0cl2qbry56nb4prbsczffx8h35x91pgicw5pld0ndw3pxid9h2da"; - name = "flatland-black-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -23831,9 +31024,13 @@ license = lib.licenses.free; }; }) {}; - flatland-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flatland-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flatland-theme"; + ename = "flatland-theme"; version = "20171113.721"; src = fetchFromGitHub { owner = "gchp"; @@ -23841,10 +31038,10 @@ rev = "a98a6f19ad4dff0fa3fad1ea487b7d0ef634a19a"; sha256 = "02gbzxd1v003aaj5rn3vr00n4390bhdx2jhpa7nb430fg3s1ppdy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a081fd0c5598fdf5bc0ab92f4d009f32132a29e/recipes/flatland-theme"; sha256 = "14drqwcp9nv269aqm34d426a7gx1a7kr9ygnqa2c8ia1fsizybl3"; - name = "flatland-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23852,9 +31049,14 @@ license = lib.licenses.free; }; }) {}; - flatui-dark-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flatui-dark-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flatui-dark-theme"; + ename = "flatui-dark-theme"; version = "20170513.722"; src = fetchFromGitHub { owner = "theasp"; @@ -23862,10 +31064,10 @@ rev = "5b959a9f743f891e4660b1b432086417947872ea"; sha256 = "0nz4ql7qf49cwsgjb7dg0jhipr5d472r4fddy6fhr1h17s1cd9qy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f9dc5abeb37422c63cac74f9a006d54c4a7c5a5/recipes/flatui-dark-theme"; sha256 = "1mswmkhi43fm0cmdgf0ywpy9lmapy0syl65kqh68sa3jqbznhm6y"; - name = "flatui-dark-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -23873,9 +31075,13 @@ license = lib.licenses.free; }; }) {}; - flatui-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flatui-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flatui-theme"; + ename = "flatui-theme"; version = "20160618.1827"; src = fetchFromGitHub { owner = "john2x"; @@ -23883,10 +31089,10 @@ rev = "9c15db5526c15c8dba55023f5698372b19c2a780"; sha256 = "0ybgpnbq3b0ml3lzgkispn667acpjww7z6cr7hgwg3j1zrqpwi75"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96dc9a8b1f6e5cdd46fc94fc2979f2a1787f4d21/recipes/flatui-theme"; sha256 = "0s88xihw44ks4b07wcb9swr52f3l1ls0jn629mxvfkv4a6hn7rmz"; - name = "flatui-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23894,20 +31100,24 @@ license = lib.licenses.free; }; }) {}; - flex-autopair = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flex-autopair = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flex-autopair"; + ename = "flex-autopair"; version = "20120809.518"; src = fetchFromGitHub { owner = "uk-ar"; repo = "flex-autopair"; - rev = "4bb757f2556a4a51828e2fed8fb81e31e83052cb"; - sha256 = "187ah7yhmr3ckw23bf4fivx8v79yj0zmilrkjj7k6l198w8wmvql"; + rev = "55d128749cc070551a1624a4508d1c4f6d76f7cf"; + sha256 = "0g9chcqjn2930vrn8af4hwibs4giprgsig9dqprz4c6hya03hlf0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flex-autopair"; sha256 = "0w3l236psqxl7wqdi2aisz8wcv279kw6gdja72viiscrbcm78xh0"; - name = "flex-autopair"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23915,20 +31125,27 @@ license = lib.licenses.free; }; }) {}; - flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flex-compile = callPackage ({ buffer-manage + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flex-compile"; - version = "20171213.1019"; + ename = "flex-compile"; + version = "20180528.853"; src = fetchFromGitHub { owner = "plandes"; repo = "flex-compile"; - rev = "1952f6deee9d95196906f46fea2b24882cc614b6"; - sha256 = "0wx0857f25k2rr5y6mikhi0czgvf6r1667fy8hjgl6gk0fyi960f"; + rev = "0b6259944e78f0bc6ee4407d97e3d09db8fd400e"; + sha256 = "1qzzrxq80fl14slirmgidmpazj1gmh9b12jkz72flsbdiy7whpal"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile"; sha256 = "1hlh4k7qgln87xajnjjhf1yyg6bgdwd0iczhlfw8gdwfj5xpjd38"; - name = "flex-compile"; + name = "recipe"; }; packageRequires = [ buffer-manage dash emacs ]; meta = { @@ -23936,19 +31153,23 @@ license = lib.licenses.free; }; }) {}; - flex-isearch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + flex-isearch = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flex-isearch"; + ename = "flex-isearch"; version = "20170308.1210"; src = fetchhg { url = "https://bitbucket.com/jpkotta/flex-isearch"; rev = "8b934ea6f1e4"; sha256 = "0xbwrzkfv4i91qxs80p0pfjlvj5pyigvidby8m5lammm8idwx9dh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/flex-isearch"; sha256 = "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3"; - name = "flex-isearch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23956,9 +31177,14 @@ license = lib.licenses.free; }; }) {}; - flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flim = callPackage ({ apel + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flim"; + ename = "flim"; version = "20180328.1624"; src = fetchFromGitHub { owner = "wanderlust"; @@ -23966,10 +31192,10 @@ rev = "faaa2b1f2bb8fcf835ddfb8981654e4d3b2bdbc6"; sha256 = "0hr4qi5vhq3ravgky95k2n7hin97jln7fmkgbx45fcyiz8jbpz2z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim"; sha256 = "1gkaq549svflx8qyqrk0ccb52b7wp17wmd5jgzkw1109bpc4k6jc"; - name = "flim"; + name = "recipe"; }; packageRequires = [ apel ]; meta = { @@ -23977,9 +31203,15 @@ license = lib.licenses.free; }; }) {}; - flimenu = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flimenu = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flimenu"; + ename = "flimenu"; version = "20170417.1847"; src = fetchFromGitHub { owner = "IvanMalison"; @@ -23987,10 +31219,10 @@ rev = "9351201d89b05cbdaec312a6ebd7fd10c38d6112"; sha256 = "1qb08j66a9mvybqhc2vyywwn16w3kkjb06k50rfqf6sbcmndz8va"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ffc67a266de3d58553b27325b7fc6937df425be/recipes/flimenu"; sha256 = "1xr28kprkq9xwy2f7b3wnjr25a8avm2lfcyi8853jygkm2vmnsx1"; - name = "flimenu"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -23998,9 +31230,13 @@ license = lib.licenses.free; }; }) {}; - fliptext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fliptext = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fliptext"; + ename = "fliptext"; version = "20171124.1256"; src = fetchFromGitHub { owner = "andre-r"; @@ -24008,10 +31244,10 @@ rev = "fd821f645ffebae6ae3894afa7ba7fc06f91afc6"; sha256 = "1jf63kp1myxihv6r13cddxgr8cchxcnnmylj5dx50y42595ia4yh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e36776cbed8eab151f69d0edd5217a7bba7c2451/recipes/fliptext"; sha256 = "1wbrvqrvrpk2lx7b6y30rrshr7a25b2191bnx4v8lm3cv16gv8p7"; - name = "fliptext"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24019,9 +31255,15 @@ license = lib.licenses.free; }; }) {}; - floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: - melpaBuild { + floobits = callPackage ({ fetchFromGitHub + , fetchurl + , highlight + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "floobits"; + ename = "floobits"; version = "20170802.1500"; src = fetchFromGitHub { owner = "Floobits"; @@ -24029,10 +31271,10 @@ rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f"; sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf"; - name = "floobits"; + name = "recipe"; }; packageRequires = [ highlight json ]; meta = { @@ -24040,9 +31282,14 @@ license = lib.licenses.free; }; }) {}; - flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flow-minor-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flow-minor-mode"; + ename = "flow-minor-mode"; version = "20180315.1124"; src = fetchFromGitHub { owner = "an-sh"; @@ -24050,10 +31297,10 @@ rev = "6c782a3fe3f810484009d87813b88804beafafac"; sha256 = "1awf44fyjwzlxjavk31lha8iknm8nxr2r6z07sxhzyy23ff127mh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s"; - name = "flow-minor-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -24061,20 +31308,26 @@ license = lib.licenses.free; }; }) {}; - flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flower = callPackage ({ clomacs + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flower"; - version = "20180316.1052"; + ename = "flower"; + version = "20180618.1222"; src = fetchFromGitHub { owner = "PositiveTechnologies"; repo = "flower"; - rev = "98c53b03da698833058b9ad6b6eb8be46cfd00f6"; - sha256 = "08wq66gvqy14mcpm8x14xz3hvw4h7rcd5ivynma91d4358qrmqap"; + rev = "4d05448dc0118078ec320f564d87acaa740ae47c"; + sha256 = "02p74f5hfhrhv5l7b9cwfbczsgkpqajlmr66qmkdljgc8ksr86n2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower"; sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd"; - name = "flower"; + name = "recipe"; }; packageRequires = [ clomacs emacs ]; meta = { @@ -24082,9 +31335,15 @@ license = lib.licenses.free; }; }) {}; - fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }: - melpaBuild { + fluxus-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , osc }: + melpaBuild { pname = "fluxus-mode"; + ename = "fluxus-mode"; version = "20170210.1141"; src = fetchFromGitHub { owner = "defaultxr"; @@ -24092,10 +31351,10 @@ rev = "3661d4dfdaf249138e7f215f15f291c9391ede8d"; sha256 = "1dp974qs80agx9qcq5k5awdsr8p8smv8cdwkjz2d8xfd5wq2vhh9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3396e0da67153ad051b8551bf34630d32f974f4/recipes/fluxus-mode"; sha256 = "1xn2aw9gxwkmr1miam63lrdx6n0qxsgph3rlaqy9cbs0vkb254an"; - name = "fluxus-mode"; + name = "recipe"; }; packageRequires = [ emacs osc ]; meta = { @@ -24103,20 +31362,25 @@ license = lib.licenses.free; }; }) {}; - flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flx = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flx"; + ename = "flx"; version = "20151030.1112"; src = fetchFromGitHub { owner = "lewang"; repo = "flx"; - rev = "46040d0b096a0340d91235561f27a959a61d0fef"; - sha256 = "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy"; + rev = "7fce6a4cdb65ac1b52e2b409ba548767581ce34c"; + sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx"; sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9"; - name = "flx"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -24124,20 +31388,26 @@ license = lib.licenses.free; }; }) {}; - flx-ido = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: - melpaBuild { + flx-ido = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , flx + , lib + , melpaBuild }: + melpaBuild { pname = "flx-ido"; + ename = "flx-ido"; version = "20180117.719"; src = fetchFromGitHub { owner = "lewang"; repo = "flx"; - rev = "46040d0b096a0340d91235561f27a959a61d0fef"; - sha256 = "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy"; + rev = "9c5cb5de0202b4eaac9359c84ca7ce9cbd7ee835"; + sha256 = "0i7pj4l0ilihvkgal8d71idy5jr9zwanzxch350pg4myr6j1hnad"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx-ido"; sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc"; - name = "flx-ido"; + name = "recipe"; }; packageRequires = [ cl-lib flx ]; meta = { @@ -24145,9 +31415,16 @@ license = lib.licenses.free; }; }) {}; - flx-isearch = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: - melpaBuild { + flx-isearch = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , flx + , lib + , melpaBuild }: + melpaBuild { pname = "flx-isearch"; + ename = "flx-isearch"; version = "20180102.2114"; src = fetchFromGitHub { owner = "PythonNut"; @@ -24155,10 +31432,10 @@ rev = "f132fd6367e369885ab3a865fbfe20eee989bc0b"; sha256 = "1dcvfl4fyhgw0rhfhixzlzjfr99fisa83f7lmlwzz2zs96myhhkz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd1438cc0821b8ae1d01e2a3bc8f07ca8a79134/recipes/flx-isearch"; sha256 = "14cshv5xb57ch5g3m3hfhawnnabdnbacp4kx40d0pw6jxw677gqd"; - name = "flx-isearch"; + name = "recipe"; }; packageRequires = [ cl-lib emacs flx ]; meta = { @@ -24166,20 +31443,29 @@ license = lib.licenses.free; }; }) {}; - flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: - melpaBuild { + flycheck = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , pkg-info + , seq }: + melpaBuild { pname = "flycheck"; - version = "20180326.836"; + ename = "flycheck"; + version = "20180720.247"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "0a588ed2aaf8ea7088ba8abdc91af47d4d41a85a"; - sha256 = "0rvhk4mi4nh66r7rch69rvi0rbmrnxwqnk2rv8d1his0i7z53rq6"; + rev = "740d6670384e76f86d675d8ab00ff21eb7e09fcb"; + sha256 = "0hskxg1q100j55wszlzscy90vhcaylz40b2wqkrad4bflx4dv2x5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr"; - name = "flycheck"; + name = "recipe"; }; packageRequires = [ dash emacs let-alist pkg-info seq ]; meta = { @@ -24187,9 +31473,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-apertium = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-apertium = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-apertium"; + ename = "flycheck-apertium"; version = "20160406.618"; src = fetchFromGitHub { owner = "unhammer"; @@ -24197,10 +31488,10 @@ rev = "71cf49d5aaee962b995583384bfa045a1d4c3db7"; sha256 = "14idjjz6fhmq806mmncmqnr9bvcjks6spin8z6jb0gqcg1dbhm06"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f6cec0d312f0e86e17829e6fd8f87acabc0174f/recipes/flycheck-apertium"; sha256 = "1cc15sljqs6gvb3wiw7n1wkd714qkvfpw6l1kg4lfx9r4jalcvw7"; - name = "flycheck-apertium"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -24208,9 +31499,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-ats2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-ats2 = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-ats2"; + ename = "flycheck-ats2"; version = "20170225.836"; src = fetchFromGitHub { owner = "drvink"; @@ -24218,10 +31515,10 @@ rev = "9f77add8408462af35bdddf87e37a661880255e3"; sha256 = "1fv3r49i8dgszaq5rs8dwnwcj6rgx922ww01ikrq3b4c9y17srpz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3605bdc402e6b13f53910eafb7f1428a5f749f/recipes/flycheck-ats2"; sha256 = "0xm7zzz6hs5qnqkmv7hwxpvp3jjca57agx71sj0m12v0h53gbzhr"; - name = "flycheck-ats2"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24229,20 +31526,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-bashate = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-bashate = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-bashate"; + ename = "flycheck-bashate"; version = "20160629.2140"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-bashate"; - rev = "77fa03dbc578c34fe71ca44926bac2aff8f2b021"; - sha256 = "1jcay4gncpr0fap6qlm6k4r5b94s18zj8j56w462hvxydaxxiql6"; + rev = "d9780b73ee698d6bc001e617b187845cafa3292a"; + sha256 = "1qhvrkhpjs214mc5f6gygwf5hx5gb2jcs46a4b34mqq29rn0j9kc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54fd062e4ad012d846260c96801d3415756ce981/recipes/flycheck-bashate"; sha256 = "1c8hf4893zb74g61afr02wqhmdaswxr3nwsnzzwmb8nrrygvfa8j"; - name = "flycheck-bashate"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24250,9 +31553,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-cask = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-cask = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-cask"; + ename = "flycheck-cask"; version = "20160928.226"; src = fetchFromGitHub { owner = "flycheck"; @@ -24260,10 +31570,10 @@ rev = "c3a51147eddeb7347de81f6a498fc96538bac499"; sha256 = "1jw8n6df2hpnjrsqzdd70j0ya3yjzkcy5gm6zx9acqfx88zlgb9m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-cask"; sha256 = "0d2m7mg91k1nazysayryxagql1vi975n7iv0snknhbw4wisqp82f"; - name = "flycheck-cask"; + name = "recipe"; }; packageRequires = [ dash emacs flycheck ]; meta = { @@ -24271,20 +31581,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-checkbashisms = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-checkbashisms"; + ename = "flycheck-checkbashisms"; version = "20160224.906"; src = fetchFromGitHub { owner = "Gnouc"; repo = "flycheck-checkbashisms"; - rev = "0794ad763d7cd81286283f6400bc89a81e8e07d4"; - sha256 = "06jkvi17960wghphar9c1nixanb0197v8q5nm96mgz0gxn923400"; + rev = "39362240b8e38e6ddc1da2e2c2229e3fecdf6057"; + sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f5678ea5aef4dc8a517d6d9381a64f182645d344/recipes/flycheck-checkbashisms"; sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz"; - name = "flycheck-checkbashisms"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24292,9 +31608,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-checkpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-checkpatch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-checkpatch"; + ename = "flycheck-checkpatch"; version = "20170217.225"; src = fetchFromGitHub { owner = "zpp0"; @@ -24302,10 +31624,10 @@ rev = "6461fc7b0d493eb9863814055f8bce5fa35739de"; sha256 = "1651xmw01n5h7x81y3cvsamdmb67jcf385ax52dkp8miyq1a090r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/193aaae5640434559cd479df1463ee44eab14d86/recipes/flycheck-checkpatch"; sha256 = "1apjn26n663rjddv5iagfs65fdf22049ykmzggybbnprvnmasf55"; - name = "flycheck-checkpatch"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24313,9 +31635,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-clang-analyzer = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-clang-analyzer = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-clang-analyzer"; + ename = "flycheck-clang-analyzer"; version = "20180225.2039"; src = fetchFromGitHub { owner = "alexmurray"; @@ -24323,10 +31651,10 @@ rev = "adc9e7663bafcc9b740c09b691898413627e74ab"; sha256 = "10c45myq9vgsssp5v3vnip4klj9dxk8dh42zap44f9lw99ascx2r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer"; sha256 = "0wby4vilvcmmncr6l6abh3v4wznx9m0zbk30vllj8bq98awfcy3a"; - name = "flycheck-clang-analyzer"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24334,9 +31662,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-clang-tidy = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-clang-tidy"; + ename = "flycheck-clang-tidy"; version = "20171024.108"; src = fetchFromGitHub { owner = "ch1bo"; @@ -24344,10 +31677,10 @@ rev = "b8ebd49693f67e08e420ba847cc88f6721ef9e3e"; sha256 = "0fnn1baw64f7x1zjb95adryr3mfynbblwppcd6ywh7pk0sq18b80"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a289ac549a7735a12eec85521c32f915b9194b85/recipes/flycheck-clang-tidy"; sha256 = "0lhf5byydmd380y7qx5x34r0sq7gzrj286pcaxhl388p6j58cb4p"; - name = "flycheck-clang-tidy"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -24355,9 +31688,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-clangcheck = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }: - melpaBuild { + flycheck-clangcheck = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "flycheck-clangcheck"; + ename = "flycheck-clangcheck"; version = "20150712.10"; src = fetchFromGitHub { owner = "kumar8600"; @@ -24365,10 +31705,10 @@ rev = "24a9424c484420073a24443a829fd5779752362b"; sha256 = "1ckzs32wzqpnw89rrw3l7i4gbyn25wagbadsc4mcrixml5nf0mck"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b42dd133e4fd5579dd1c6cdcbf733571bc890899/recipes/flycheck-clangcheck"; sha256 = "1316cj3ynl80j39ha0371ss7cqw5hcr3m8944pdacdzbmp2sak2m"; - name = "flycheck-clangcheck"; + name = "recipe"; }; packageRequires = [ cl-lib flycheck seq ]; meta = { @@ -24376,20 +31716,28 @@ license = lib.licenses.free; }; }) {}; - flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: - melpaBuild { + flycheck-clojure = callPackage ({ cider + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-clojure"; - version = "20170221.1354"; + ename = "flycheck-clojure"; + version = "20180721.712"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "squiggly-clojure"; - rev = "0fe57ab9c0d6262a3c0dbc9c28a9ca98390a6016"; - sha256 = "1495d09vr8dlf9q6127fa46ghhgyw5bmzx22wdzzrfvc70m041a1"; + rev = "7c856615f91868171af270f4fed08d52988f9596"; + sha256 = "0r2v4gica86z0va5i5xcs5aisi47ywzg2sg6rp7z6yg7aprcnfll"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure"; sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28"; - name = "flycheck-clojure"; + name = "recipe"; }; packageRequires = [ cider emacs flycheck let-alist ]; meta = { @@ -24397,9 +31745,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-color-mode-line = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-color-mode-line"; + ename = "flycheck-color-mode-line"; version = "20171121.2307"; src = fetchFromGitHub { owner = "flycheck"; @@ -24407,10 +31762,10 @@ rev = "cc474804d4e8088a627485faaf4217a5781aec7d"; sha256 = "0lk8p0wb7g9lvxjv9rl59hd9f0m0ksw9rgspis8qshpz8pj5785f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line"; sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq"; - name = "flycheck-color-mode-line"; + name = "recipe"; }; packageRequires = [ dash emacs flycheck ]; meta = { @@ -24418,9 +31773,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-coverity = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-coverity = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-coverity"; + ename = "flycheck-coverity"; version = "20170703.1759"; src = fetchFromGitHub { owner = "alexmurray"; @@ -24428,10 +31790,10 @@ rev = "cb211e3dd50413a5042eb20175be518214591c9d"; sha256 = "17c5lppa5axw6wga3k8zqmn5f2syadlqbavrqgsi8k8nlcckxy1x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55e8df91adbcf8b059096e02aba2781424250381/recipes/flycheck-coverity"; sha256 = "1knd1sqgjkgb5zs8hgsi6lyvkqmrcrdjgx81f26nhg40qv5m2p5l"; - name = "flycheck-coverity"; + name = "recipe"; }; packageRequires = [ dash emacs flycheck ]; meta = { @@ -24439,9 +31801,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-credo = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-credo = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-credo"; + ename = "flycheck-credo"; version = "20170526.845"; src = fetchFromGitHub { owner = "aaronjensen"; @@ -24449,10 +31816,10 @@ rev = "e88f11ead53805c361ec7706e44c3dfee1daa19f"; sha256 = "04i7fbqpkjpsfa8vjpkdhg1sj5isczxwncdp4vr9x3vll3svblm7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88dfffe034135cc46d661f8173e8b14e0fb7f240/recipes/flycheck-credo"; sha256 = "0xmnbib7lx6v10pd3pkr69c4jb4sn3nmjk16qzvscwjgf2dypyax"; - name = "flycheck-credo"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -24460,20 +31827,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-crystal = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-crystal"; - version = "20180306.1821"; + ename = "flycheck-crystal"; + version = "20180626.1942"; src = fetchFromGitHub { owner = "crystal-lang-tools"; repo = "emacs-crystal-mode"; - rev = "490f213c17e67ac28e7de19a0cfa62652d44b5de"; - sha256 = "0isz91ikwc5175y9a984j8j9nmli0qf2j0shljk576ywlybiy00a"; + rev = "ae87526d13be07e6817809ac9795657db0092c9d"; + sha256 = "1skgas1bh05vbncwwcahlr06g05nyn3cjwvfziq501r9b450s7qk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal"; sha256 = "04avxav2rayprm09xkphs1ni10j1kk10j7m77afcac0gnma5rwyn"; - name = "flycheck-crystal"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -24481,9 +31853,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-css-colorguard = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-css-colorguard"; + ename = "flycheck-css-colorguard"; version = "20161031.422"; src = fetchFromGitHub { owner = "Simplify"; @@ -24491,10 +31869,10 @@ rev = "ae94fa0396acd99f9ec36d9572459df793f37fe8"; sha256 = "1vy5yjf98b7dk9lniz3rgk33agg8f1x8488lvm28ljdq3jfdgcfw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-css-colorguard"; sha256 = "16qgn12jdps61mlbvhji5l8qrqigv382wyiv79rj2bwvdzbl653f"; - name = "flycheck-css-colorguard"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24502,20 +31880,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-cstyle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-cstyle = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-cstyle"; + ename = "flycheck-cstyle"; version = "20160905.1641"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-cstyle"; - rev = "207285140a353d08cf1fc450cacab158bc98ba82"; - sha256 = "19wwv4r3nh79bdfcqp55qmknl0gwicy7dcaz28hm3sswbjpfv3rw"; + rev = "002699f83253ea8e1a509a9ab6d0fce1a1650f73"; + sha256 = "1qwimdnvwbg365hnwgrrq9h5h1spikma3va5z47rhxbdb21hvyvs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5970f4f0967dc3a10dc9554a8f5f06b703872878/recipes/flycheck-cstyle"; sha256 = "0p3lzpcgwk4nkq1w0iq40njz8ll2h3vi9z5fbvv1ar4r80fqd909"; - name = "flycheck-cstyle"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24523,9 +31907,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-cython = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-cython = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-cython"; + ename = "flycheck-cython"; version = "20170724.258"; src = fetchFromGitHub { owner = "lbolla"; @@ -24533,10 +31922,10 @@ rev = "ecc4454d35ab5317ab66a04406f36f0c1dbc0b76"; sha256 = "1v17skw0wn7a7nkc1vrs0bbzihnjw0dwvyyd0lydsihzxl5z2r5g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d963eb1b8f8f863b37a96803b00d395e9d85e94/recipes/flycheck-cython"; sha256 = "1mbrwhpbs8in11mp79cnl4bd3m33qdgrvnbvi1mqvrsvz1ay28g4"; - name = "flycheck-cython"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -24544,9 +31933,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-d-unittest = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-d-unittest = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-d-unittest"; + ename = "flycheck-d-unittest"; version = "20160521.2117"; src = fetchFromGitHub { owner = "flycheck"; @@ -24554,10 +31949,10 @@ rev = "3e614f23cb4a5566fd7988dbcaaf254af81c7718"; sha256 = "0lrxyrvdkj88qh78jmamrnji770vjsr6h01agl7hvd4n2xvlxcym"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/flycheck-d-unittest"; sha256 = "0n4m4f0zqcx966582af1nqff5sla7jcr0wrmgzzxnn97yjrlnzk2"; - name = "flycheck-d-unittest"; + name = "recipe"; }; packageRequires = [ dash flycheck ]; meta = { @@ -24565,9 +31960,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-dedukti = callPackage ({ dedukti-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-dedukti = callPackage ({ dedukti-mode + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-dedukti"; + ename = "flycheck-dedukti"; version = "20171103.512"; src = fetchFromGitHub { owner = "rafoo"; @@ -24575,10 +31976,10 @@ rev = "3dbff5646355f39d57a3ec514f560a6b0082a1cd"; sha256 = "1ffpxnwl3wx244n44mbw81g00nhnykd0lnid29f4aw1av7w6nw8l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/732832e88a65a8866fa3872ff5f29eb8a26438f2/recipes/flycheck-dedukti"; sha256 = "00nc18w4nsi6vicpbqqpr4xcdh48g95vnay3kirb2xp5hc2rw3x8"; - name = "flycheck-dedukti"; + name = "recipe"; }; packageRequires = [ dedukti-mode flycheck ]; meta = { @@ -24586,20 +31987,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-demjsonlint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-demjsonlint = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-demjsonlint"; + ename = "flycheck-demjsonlint"; version = "20161114.2318"; src = fetchFromGitHub { owner = "z4139jq"; repo = "flycheck-demjsonlint"; - rev = "a3dfe1df8ecdea76c076c0849901427567356228"; - sha256 = "0zra3rl0kn70kn30wx1lqh9218k06mq3j8jadax61nnynw7bzsa5"; + rev = "1c433150fdf628dda4c9fad938bf7c79610b4460"; + sha256 = "0kmvwmaxw64xjgchq8szk9mhbi6xp2jhv7qpgqndf4svia4pqws6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b66df1afde83607408fb1b30e1260f22015bf448/recipes/flycheck-demjsonlint"; sha256 = "0prwgi6v48ng89vvizb901iq4ysmrlh0g2b3797p1a6z2mps0k57"; - name = "flycheck-demjsonlint"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -24607,9 +32013,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-dialyxir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-dialyxir = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-dialyxir"; + ename = "flycheck-dialyxir"; version = "20170515.825"; src = fetchFromGitHub { owner = "aaronjensen"; @@ -24617,10 +32028,10 @@ rev = "adfb73374cb2bee75724822972f405f2ec371199"; sha256 = "1kzvq99f052mdj4ml1m6nvxhv0kqqblmpdgnwcm89krf0qfl4gjg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa49551b8f726c235e03ea377bb09a8be37b9f32/recipes/flycheck-dialyxir"; sha256 = "0pacxidpgwp7wij17c5r0fm5w3nga3lp4mcim365k3y5r4ralc0c"; - name = "flycheck-dialyxir"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -24628,9 +32039,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-dialyzer = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-dialyzer = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-dialyzer"; + ename = "flycheck-dialyzer"; version = "20160326.730"; src = fetchFromGitHub { owner = "lbolla"; @@ -24638,10 +32054,10 @@ rev = "a5df0db95ac69f397b5f85d325a6d88cf8974f64"; sha256 = "1i5wm2r6rck6864a60mm6kv31vgvqnq49hi9apvhyywfn6sycwkf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc84fb9fabfac4c008fe0eecb0b59933bfbf95c6/recipes/flycheck-dialyzer"; sha256 = "0bn81yzijmnfg5xcnvcvxvqxz995iaafhgbfckgcal974s229kd2"; - name = "flycheck-dialyzer"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -24649,20 +32065,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-dmd-dub = callPackage ({ f + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-dmd-dub"; - version = "20180321.1546"; + ename = "flycheck-dmd-dub"; + version = "20180625.935"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "995132ced9c0e4464a36c4435ae8248c23fc0511"; - sha256 = "0k0dlbpz3vys373cng2gqlpbzlzbls9dl613rxvnba8d8ndz7ri4"; + rev = "148ea4ba3e4c46c8edc616f947f796e98bcad0de"; + sha256 = "0r33rp34ss7mx32x28p67n5sgnmyr6cmpwpprmlq2s72xpmyx4md"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm"; - name = "flycheck-dmd-dub"; + name = "recipe"; }; packageRequires = [ f flycheck ]; meta = { @@ -24670,20 +32092,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-dogma = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-dogma = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-dogma"; + ename = "flycheck-dogma"; version = "20170124.2321"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "flycheck-dogma"; - rev = "eea1844a81e87e2488b05e703a93272d0fc3bc74"; - sha256 = "0wmp4q1jzb6giwrv8ajgqriy155mcc7jnj5sycpfk3hw6q74js66"; + rev = "7e14207a7da67dc5524a8949cb37a3d11de1db6e"; + sha256 = "1f3wn48am7920s6pm7ds1npfbj1w2pb8k790rl79rvc398g1pyyr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd7601c55206fd0b9b59f98e861c52b9d640278/recipes/flycheck-dogma"; sha256 = "0mpmmz0ssdd3a4fnqzy5kf9r3ddcs9kcl0chhilkw5k8480j3dcy"; - name = "flycheck-dogma"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -24691,20 +32118,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-dtrace = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-dtrace = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-dtrace"; + ename = "flycheck-dtrace"; version = "20180126.1135"; src = fetchFromGitHub { owner = "juergenhoetzel"; repo = "flycheck-dtrace"; - rev = "a328c38aea855c0fd02f901c141c100c24b27d7f"; - sha256 = "1cl50ckvjjgx9m7p7fpijk61mw737qigbh9glm5b3slmgkyfq2mq"; + rev = "c418a96cf1dc3bafc17b9bcd23d5097dcf334c92"; + sha256 = "00f7p895nfy9qr1hbcz7h8h8514rcv6ikrxl1pm4nvd045jicfyb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdcdd10fbcd58a5c67e4d07632212e7dedf42dbe/recipes/flycheck-dtrace"; sha256 = "14sg7zkq9f5zbcfn8app8m9mdc8cnwcxh7h4glsz32yaqc1dj7h8"; - name = "flycheck-dtrace"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24712,9 +32145,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-elixir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-elixir = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-elixir"; + ename = "flycheck-elixir"; version = "20171122.507"; src = fetchFromGitHub { owner = "lbolla"; @@ -24722,10 +32160,10 @@ rev = "1f19a739cdb93851c6b01b1e188e215d035cd4a1"; sha256 = "01820hm6231z3zaq97jmmvdrpnyp38cb0m6xms5ihq2r1fqx8z2c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da2ab73ab1426f71ea2b2bea2b418941856b3454/recipes/flycheck-elixir"; sha256 = "0f78fai6q15smh9rvsliv8r0hh3kpwn1lz37yvqkkbx9vl7rlwld"; - name = "flycheck-elixir"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -24733,9 +32171,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-elm = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-elm = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-elm"; + ename = "flycheck-elm"; version = "20160717.257"; src = fetchFromGitHub { owner = "bsermons"; @@ -24743,10 +32187,10 @@ rev = "b401873ebd2176190a0a6fb4d61c2cca97d3b9fb"; sha256 = "18apypk32dyg8zwvrcsza2j10z4zbpff04cz3xzhjskmkzw6210i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78bdcdaa660beda29acecb51761b95d8664d28ac/recipes/flycheck-elm"; sha256 = "06dpv19wgbw48gbf701c77vw1dkpddx8056wpim3zbvwwfwk8ra4"; - name = "flycheck-elm"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24754,9 +32198,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-flawfinder = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-flawfinder = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-flawfinder"; + ename = "flycheck-flawfinder"; version = "20170115.1927"; src = fetchFromGitHub { owner = "alexmurray"; @@ -24764,10 +32214,10 @@ rev = "7d964d38023b088adf3ffc2fddeead81f4491a45"; sha256 = "0y023brz8adwa6gdaaixk6dnrq4kj2i5h56rj54cxrjkagyklfxl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e67a84d1a8c890ea56bd842549d70d9841d1e7a7/recipes/flycheck-flawfinder"; sha256 = "1nabj00f5p1klzh6509ywnazxx2m017isdjdzzixg94g5mp0kv5i"; - name = "flycheck-flawfinder"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24775,9 +32225,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }: - melpaBuild { + flycheck-flow = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-flow"; + ename = "flycheck-flow"; version = "20180216.1156"; src = fetchFromGitHub { owner = "lbolla"; @@ -24785,10 +32241,10 @@ rev = "8173accf0e389f7ba0936d399da84839a7f887af"; sha256 = "14g3mi8i4iy5f3fd3f7yx8ha18zi0kxqgn3sxkvdnk9rp1cdfnk1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; sha256 = "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3"; - name = "flycheck-flow"; + name = "recipe"; }; packageRequires = [ flycheck json ]; meta = { @@ -24796,9 +32252,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-ghcmod = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-ghcmod = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-ghcmod"; + ename = "flycheck-ghcmod"; version = "20150113.2232"; src = fetchFromGitHub { owner = "scturtle"; @@ -24806,10 +32268,10 @@ rev = "6bb7b7d879f05bbae54e99eb04806c877adf3ccc"; sha256 = "0q1m1f3vhw1wy0pa3njy55z28psznbw2xwmwk2v1p5c86n74ns8d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ed620e038f361c41115430a1fc119a04cf4f20/recipes/flycheck-ghcmod"; sha256 = "0mqxg622lqnkb52a0wff7h8b0k6mm1k7fhkfi95fi5sahclja0rp"; - name = "flycheck-ghcmod"; + name = "recipe"; }; packageRequires = [ dash flycheck ]; meta = { @@ -24817,20 +32279,53 @@ license = lib.licenses.free; }; }) {}; - flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-golangci-lint = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { + pname = "flycheck-golangci-lint"; + ename = "flycheck-golangci-lint"; + version = "20180711.117"; + src = fetchFromGitHub { + owner = "weijiangan"; + repo = "flycheck-golangci-lint"; + rev = "b4b51aa6fe5335c0f46f2f83c7dc32e4141ff9f1"; + sha256 = "0kxzziq4d4x1li1cimjckxk5n1429017k39jbfxm4p1bzq1xd6q3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fffbecd6cb43866fc9f37ba2d2c998ef6186c6d5/recipes/flycheck-golangci-lint"; + sha256 = "1vg80q4axbzb147fglli2w19n70bc934hb3hfl1r4shhpbfjlcgj"; + name = "recipe"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-golangci-lint"; + license = lib.licenses.free; + }; + }) {}; + flycheck-gometalinter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-gometalinter"; - version = "20170321.732"; + ename = "flycheck-gometalinter"; + version = "20180424.241"; src = fetchFromGitHub { owner = "favadi"; repo = "flycheck-gometalinter"; - rev = "c90ea1aba80ddfdf603c9ba731be302400fd6ba2"; - sha256 = "0xw2wbch3y5nm90j9c53n3710xm161w724cknv8dwq27ickgp49b"; + rev = "422f6e4b77b27fd7370f0c88437ac5072c9d3413"; + sha256 = "16117njpia9046snp1y2yapqmnzgbsan5dvaw3ih5pqmnqjjqdkd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter"; sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2"; - name = "flycheck-gometalinter"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24838,20 +32333,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-gradle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-gradle = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-gradle"; - version = "20180322.2332"; + ename = "flycheck-gradle"; + version = "20180403.33"; src = fetchFromGitHub { owner = "jojojames"; repo = "flycheck-gradle"; - rev = "28f6d78330334ba58f209af79cc5d699e6557f42"; - sha256 = "1lhcizpkn2sih4m01mlgp3aln8jmx7r7jk5iv636268qmvq9ff8d"; + rev = "a14b45183e50993e8b28a4c57ad5db82b789faef"; + sha256 = "1n3i0fh0rvy29gykqamxayfbbv5jy3h6l375pw4ckydcqlp0dgxk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/382d9afd2bbb0c137719c308a67d185b86d84331/recipes/flycheck-gradle"; sha256 = "0zd92lx0mqjqwzclvvhfwwahq80qspyv9k7qcxjc0bl3avjk6a47"; - name = "flycheck-gradle"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24859,20 +32360,30 @@ license = lib.licenses.free; }; }) {}; - flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: - melpaBuild { + flycheck-haskell = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , haskell-mode + , let-alist + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "flycheck-haskell"; - version = "20180321.1340"; + ename = "flycheck-haskell"; + version = "20180611.1442"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "ef91cfd2766724adf6dd48f7d1dfaeed46dde570"; - sha256 = "0qv2kzplqpnhgalqibb7ligsbxanv07wjjb5cshlsn2l0dimq4w7"; + rev = "32877c2912d435c30c0202680611d127862a372c"; + sha256 = "1glqpgk27fabhs8g6h6g0mlaxbvg2vb2z99rr27nk938f0mv65za"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7"; - name = "flycheck-haskell"; + name = "recipe"; }; packageRequires = [ dash emacs flycheck haskell-mode let-alist seq ]; meta = { @@ -24880,20 +32391,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-hdevtools = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-hdevtools = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-hdevtools"; + ename = "flycheck-hdevtools"; version = "20160926.2"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-hdevtools"; - rev = "eab1fc184854341a56154623a131cab6ff0ce18c"; - sha256 = "0prmrix9a95zr39ybajp7fha03wknxyhrf1kfxsms1brxsc8bqim"; + rev = "53829f0c57800615718cfce27ffa16d8ba286cee"; + sha256 = "1isx9v5xx35pglmhyhpmpg7axw0krmnl0n2qiikf499z7dd35wyn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e210eb2405cc85dd1d03e9119d2249178950398/recipes/flycheck-hdevtools"; sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93"; - name = "flycheck-hdevtools"; + name = "recipe"; }; packageRequires = [ dash flycheck ]; meta = { @@ -24901,41 +32418,54 @@ license = lib.licenses.free; }; }) {}; - flycheck-inline = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, inline-docs, lib, melpaBuild }: - melpaBuild { + flycheck-inline = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-inline"; - version = "20170728.2328"; + ename = "flycheck-inline"; + version = "20180529.614"; src = fetchFromGitHub { - owner = "stardiviner"; + owner = "flycheck"; repo = "flycheck-inline"; - rev = "624957ec04164f03656bf2d0a5ccd6d2b013f545"; - sha256 = "1qrwci7d5g3c3s2z888hydsa22hhiwlarq3im8w2crlzx5lhnbz8"; + rev = "816d37bd7f7034502a7569515df1898a3bcd155c"; + sha256 = "12lsf5f6866jgj5s40gcsg377gzvwni8bla6bx4l5jjn36lf1nvi"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6ad3925576719f34682f65867fd5bbbc97818870/recipes/flycheck-inline"; - sha256 = "1yas4csz0xv0h61nzlywrp9z665gcmwr8vjrkm2psh04rfqhx3wg"; - name = "flycheck-inline"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a9ecc3a4696d2b3b0f0b8b1ca6e5285380ac046a/recipes/flycheck-inline"; + sha256 = "14ph2f5aj2mpyxbbq4v0rk5zdz7773lf2m83m30h3r1cbh5jmddj"; + name = "recipe"; }; - packageRequires = [ cl-lib emacs flycheck inline-docs ]; + packageRequires = [ emacs flycheck ]; meta = { homepage = "https://melpa.org/#/flycheck-inline"; license = lib.licenses.free; }; }) {}; - flycheck-irony = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, irony, lib, melpaBuild }: - melpaBuild { + flycheck-irony = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , irony + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-irony"; - version = "20160317.1536"; + ename = "flycheck-irony"; + version = "20180604.1452"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "flycheck-irony"; - rev = "34940ae5ab8f4c721d9c1118ebfc3496d7e67a84"; - sha256 = "0qa5a8wzvzxwqql92ibc9s43k8sj3vwn7skz9hfr8av0skkhx996"; + rev = "42dbecd4a865cabeb301193bb4d660e26ae3befe"; + sha256 = "00ggn7v1nj2zb7rvwmjrhybd1vcp07n74krdy28z9xwh7w59wyq7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e367afce9a792c168ef1e7e20cc5903f7b570d8/recipes/flycheck-irony"; sha256 = "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z"; - name = "flycheck-irony"; + name = "recipe"; }; packageRequires = [ emacs flycheck irony ]; meta = { @@ -24943,20 +32473,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-jest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-jest = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-jest"; - version = "20180307.1"; + ename = "flycheck-jest"; + version = "20180410.2028"; src = fetchFromGitHub { owner = "jojojames"; repo = "flycheck-jest"; - rev = "2f524e275338e46edb9c1c9ab543020f9031b030"; + rev = "08f27c5ed97c83c445f99fab58f0b6c826f14449"; sha256 = "1ipr1yyk5vf2i8q7923r18a216sgf759x5f6j5776jcjkhp98c98"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31e2ac9de5f28ee9d847097cdeb60afa99476a51/recipes/flycheck-jest"; sha256 = "19dg8v0xzni7x6zn472n4ach1c1jv4syzarfi8ba8r6n26vz9ss4"; - name = "flycheck-jest"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -24964,20 +32500,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-joker = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-joker"; - version = "20171003.2222"; + ename = "flycheck-joker"; + version = "20180712.2102"; src = fetchFromGitHub { owner = "candid82"; repo = "flycheck-joker"; - rev = "c34c3922a2e8bc918f250602e0ddf655cdcad456"; - sha256 = "0fp7h0pmxk02x1kisqvnb9wkjjn9bl91capmnllrb7qmb24w6pd5"; + rev = "0d8d5683a273093ca12841bf93d10dae97ccbc5d"; + sha256 = "0r9w0ky1522yz1jdi8fd36lpdjm30vxq41x77vswikqxvscri3dq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker"; sha256 = "0war80zdljpjhfihqrind8471ic7l4z7j74zmrysybxvnd5nr7l3"; - name = "flycheck-joker"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -24985,9 +32526,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-julia = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-julia"; + ename = "flycheck-julia"; version = "20170729.1441"; src = fetchFromGitHub { owner = "gdkrmr"; @@ -24995,10 +32542,10 @@ rev = "213b60a5a9a1cb7887260e1d159b5bb27167cbb6"; sha256 = "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia"; sha256 = "0340bv0lifs8pajk7gh7rngdjg62vaggn5biyysng642dlg5fwqs"; - name = "flycheck-julia"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -25006,20 +32553,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-kotlin = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-kotlin = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-kotlin"; + ename = "flycheck-kotlin"; version = "20170122.337"; src = fetchFromGitHub { owner = "whirm"; repo = "flycheck-kotlin"; - rev = "cbb9fbf70dbe8efcc3971b3606ee95c97469b1fe"; - sha256 = "0bxjx7xcpscv6vv4yxll8hh43aabv2dnrvkymb47jm3yvjr9cs1c"; + rev = "44dfae49a7355232492e17c150b7f80a84835c45"; + sha256 = "1495yxk308d1j3hw8gfdrsg8xs1imzgwfnwadrz9hx36rjd2dhj5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f158727cc8892aadba0a613dd08e65e2fc791b48/recipes/flycheck-kotlin"; sha256 = "0vh4f3ap1ciddf2fvfnjz668d6spyx49xs2wfp1hrzxn5yqpnra5"; - name = "flycheck-kotlin"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -25027,9 +32579,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-ledger = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-ledger = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-ledger"; + ename = "flycheck-ledger"; version = "20180125.31"; src = fetchFromGitHub { owner = "purcell"; @@ -25037,10 +32594,10 @@ rev = "044f28d126d1bce55c4b78ba6d5bc92e1f6cfd69"; sha256 = "1k14jwz79mjsm0cfig5lc0byfrhvm495wrkybdl36b56q4qhxf58"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger"; sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl"; - name = "flycheck-ledger"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -25048,20 +32605,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-lilypond = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-lilypond = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-lilypond"; + ename = "flycheck-lilypond"; version = "20171203.532"; src = fetchFromGitHub { owner = "hinrik"; repo = "flycheck-lilypond"; - rev = "cc1b7677a932c42e5dab1661ad7b923d4aae744c"; - sha256 = "1yfsg52z4nhbh33fbsig24c9s0mc4xm72ll36h6ibld9fvqsgv6k"; + rev = "d6b2c03e94e0b9b6294d7ad0b2fe4a76907a8aed"; + sha256 = "0vafllj20k8b3z7ybnnpny0dj4xmnr5s69p3krwchs77pi04727h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da99de90193c9ad362afdbbae28dfba52ef3676e/recipes/flycheck-lilypond"; sha256 = "0yx0jbilr8z58df13wcssp3p95skcvl8mnhhr6lijak44sd7klbf"; - name = "flycheck-lilypond"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -25069,9 +32632,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-liquidhs = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-liquidhs = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-liquidhs"; + ename = "flycheck-liquidhs"; version = "20170412.1626"; src = fetchFromGitHub { owner = "ucsd-progsys"; @@ -25079,10 +32647,10 @@ rev = "c27252ac24d77f4b6eec76a4ba9cd61761a3fba9"; sha256 = "1v5s252w2ai0rrci0rkq6wsx110pw8hp60n67990jg6l6lpvir2s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5921fde4068ff1bb288f6f9e2fe03f4a7fdbbda/recipes/flycheck-liquidhs"; sha256 = "07dn2ifj49z2jj9zw0f0ydp5rxx9wfmah4fh4vx8slnpjby367yh"; - name = "flycheck-liquidhs"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -25090,9 +32658,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-mercury = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: - melpaBuild { + flycheck-mercury = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , s }: + melpaBuild { pname = "flycheck-mercury"; + ename = "flycheck-mercury"; version = "20151122.2334"; src = fetchFromGitHub { owner = "flycheck"; @@ -25100,10 +32675,10 @@ rev = "fa9e433a0a912f0fae9e4dec9ea616ef99fcf861"; sha256 = "0isqa6ybdd4166h3rdcg0b8pcxn00v8dav58xwfcj92nhzvs0qca"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a775d12d9b9b6f27a44aeffbbb18de46a9e1b532/recipes/flycheck-mercury"; sha256 = "1z2y6933f05yv9y2aapmn876jnsydh642zqid3j88bb9kqi67x0h"; - name = "flycheck-mercury"; + name = "recipe"; }; packageRequires = [ dash flycheck s ]; meta = { @@ -25111,9 +32686,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-mix = callPackage ({ elixir-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-mix = callPackage ({ elixir-mode + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-mix"; + ename = "flycheck-mix"; version = "20170118.630"; src = fetchFromGitHub { owner = "tomekowal"; @@ -25121,10 +32702,10 @@ rev = "76684d4b5987925b98b254aab656f8bf8198ab88"; sha256 = "130ddx83h88krd64kss4z59lfrmdi3433r95939kqsqfmhzvgx0k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd2a4d71b7f4c0082b687a23fd367d55186625a9/recipes/flycheck-mix"; sha256 = "1wp8lp45lc519w3xsws2c91jlbfmc0pc8764kxsifk74akwcizfl"; - name = "flycheck-mix"; + name = "recipe"; }; packageRequires = [ elixir-mode flycheck ]; meta = { @@ -25132,9 +32713,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-mmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-mmark = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-mmark"; + ename = "flycheck-mmark"; version = "20180203.932"; src = fetchFromGitHub { owner = "mmark-md"; @@ -25142,10 +32729,10 @@ rev = "7fdcc48ff6ffa5e7db126a76f4948ab08b9eb8d4"; sha256 = "0g6a8nm5mxgca7psyi127ky68mal0lj7n486fgrwsg3bxglbsk5m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2fd10423ab80e32245bb494005c8f87a8987fffb/recipes/flycheck-mmark"; sha256 = "0lnw7pz40hijcpi9b92vjxvvyh9v50ww2f2r8z9pyhl9mjy2245x"; - name = "flycheck-mmark"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -25153,20 +32740,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-mypy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-mypy = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-mypy"; - version = "20160220.1432"; + ename = "flycheck-mypy"; + version = "20180518.4"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-mypy"; - rev = "2675dc0e31f8c08eb69f77b8d99e3f7d985c62ee"; - sha256 = "01r2ycbayhsxh3dq4d3qky5s0gcv3fjlp8j08y8dgyl406pkzhdz"; + rev = "043e8bba13a6d5e760cde8374c8f77d90946a1f5"; + sha256 = "0rcw8nxs5n9l8gdgs1yy240qnbad60j1m15xdy35s99nq7x1ksvn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1f5ad8263ee33b8950ff68e39dca5b1f1748c1b/recipes/flycheck-mypy"; sha256 = "1w418jm6x3vcg2x31nzc8a3b8asx6gznl6m76ip8w98riz7vy02f"; - name = "flycheck-mypy"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -25174,9 +32766,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-nim = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-nim = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-nim"; + ename = "flycheck-nim"; version = "20160714.2128"; src = fetchFromGitHub { owner = "ALSchwalm"; @@ -25184,10 +32782,10 @@ rev = "6d27349b66e44578851e6148299709d64d2bde41"; sha256 = "08rjrh7rjx71fsxf931hhfcga7m6a8sd6bvvr4qbsmhldnzd1aa7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68747db46761f28aa2fdf13494d7cecc334cb604/recipes/flycheck-nim"; sha256 = "0w6f6998rqx8a3i4xhga7mrmvhxrm690wkqwfzspidid2z7v71az"; - name = "flycheck-nim"; + name = "recipe"; }; packageRequires = [ dash flycheck ]; meta = { @@ -25195,9 +32793,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-nimsuggest = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-nimsuggest"; + ename = "flycheck-nimsuggest"; version = "20171027.1508"; src = fetchFromGitHub { owner = "yuutayamada"; @@ -25205,10 +32809,10 @@ rev = "dc9a5de1cb3ee05db5794d824610959a1f603bc9"; sha256 = "1bf65hrz0s6f180kn2ir8l5qn7in789w8pyy96b9gqn21z50vb9d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest"; sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv"; - name = "flycheck-nimsuggest"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -25216,20 +32820,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-objc-clang = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-objc-clang"; - version = "20171231.453"; + ename = "flycheck-objc-clang"; + version = "20180410.422"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "07f17d1dbe878fdcabac791a8916ddf643571a68"; - sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9"; + rev = "f4a76ac199b67ff383ab5e70434c9b98b48c92d5"; + sha256 = "0ryanx4vmy9jwqjnwvma6dm136y4fh227cyhz206km6595bbn3nc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; sha256 = "07mzwd04a69d7xpkjmhfmf95j69h6accnf9bb9br7jb1hi9vdalp"; - name = "flycheck-objc-clang"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -25237,9 +32847,17 @@ license = lib.licenses.free; }; }) {}; - flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }: - melpaBuild { + flycheck-ocaml = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild + , merlin }: + melpaBuild { pname = "flycheck-ocaml"; + ename = "flycheck-ocaml"; version = "20170730.1453"; src = fetchFromGitHub { owner = "flycheck"; @@ -25247,10 +32865,10 @@ rev = "8707a7bf545a8639a6a5c600a98d9a2ea1487dc9"; sha256 = "13vzxkjq6v1f1i9zgxgjbwpiba04k9frkcl2wx6a9h3vgd7jyay0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ce9283eb1285953a2578eb7c4d280b4d98c801f/recipes/flycheck-ocaml"; sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7"; - name = "flycheck-ocaml"; + name = "recipe"; }; packageRequires = [ emacs flycheck let-alist merlin ]; meta = { @@ -25258,20 +32876,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }: - melpaBuild { + flycheck-package = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , package-lint }: + melpaBuild { pname = "flycheck-package"; + ename = "flycheck-package"; version = "20161111.1451"; src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-package"; - rev = "6d99248b45eea1e5236062f38e524230efdb1a84"; - sha256 = "00wyi2adiv9cb3x8bid2fhg3cjqlkc7z70i18vldbpmrpppjg4x5"; + rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38"; + sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package"; sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d"; - name = "flycheck-package"; + name = "recipe"; }; packageRequires = [ flycheck package-lint ]; meta = { @@ -25279,20 +32903,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-perl6 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-perl6 = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-perl6"; - version = "20171231.445"; + ename = "flycheck-perl6"; + version = "20180509.1501"; src = fetchFromGitHub { owner = "hinrik"; repo = "flycheck-perl6"; - rev = "7a69ddbb54dc0748734ace95f598c69e9882aa94"; - sha256 = "1bsbw5pjin7m556pnphq8plgfjvbp1pl738lf5qc85jcvinv998m"; + rev = "b804702305d7a6e26f762ff98cfdeec2e9dd4cb7"; + sha256 = "0gys38rlx9lx35bia6nj7kfhz1v5xfrirgf8adwk7b2hfjazrsib"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f6ecdb2ce6bc74a27dca01ab4942778e986ac8f/recipes/flycheck-perl6"; sha256 = "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4"; - name = "flycheck-perl6"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -25300,20 +32930,55 @@ license = lib.licenses.free; }; }) {}; - flycheck-pkg-config = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: - melpaBuild { + flycheck-phpstan = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , phpstan }: + melpaBuild { + pname = "flycheck-phpstan"; + ename = "flycheck-phpstan"; + version = "20180430.358"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "phpstan.el"; + rev = "3653f2a316f4199cbd3238e984eea2325e2618d5"; + sha256 = "1dyba8hpr16nsdv1i45pl3w97728w7p8vl9gf5gvd18xcll4848d"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/flycheck-phpstan"; + sha256 = "1dr0h6cnwxdjmhlackv4gpsljwzs27gk41p8q99r0m44dada9gaf"; + name = "recipe"; + }; + packageRequires = [ emacs flycheck phpstan ]; + meta = { + homepage = "https://melpa.org/#/flycheck-phpstan"; + license = lib.licenses.free; + }; + }) {}; + flycheck-pkg-config = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , s }: + melpaBuild { pname = "flycheck-pkg-config"; - version = "20170214.1114"; + ename = "flycheck-pkg-config"; + version = "20180430.1543"; src = fetchFromGitHub { owner = "Wilfred"; repo = "flycheck-pkg-config"; - rev = "fda3f828082bd957c838126577a6b7e4d747dd54"; - sha256 = "0pvbw9qgpa8x3cs0xbql2spbaza2hxsnamk92pdqppm4g797k3k8"; + rev = "e72e4c1b8153611ed82695673af84096f4d52795"; + sha256 = "07zyrbib9qzy4kj3p7kljcfi53qhb28nf0sjhhkqzdj09iv2k9wf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b2e88f2f126c9ff8b4261d6adb4c0d8d3049f33/recipes/flycheck-pkg-config"; sha256 = "0w7h4fa4mv8377sdbkilqcw4b9qda98c1k01nxic7a8i3iyq02d6"; - name = "flycheck-pkg-config"; + name = "recipe"; }; packageRequires = [ dash flycheck s ]; meta = { @@ -25321,9 +32986,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-plantuml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, plantuml-mode }: - melpaBuild { + flycheck-plantuml = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , plantuml-mode }: + melpaBuild { pname = "flycheck-plantuml"; + ename = "flycheck-plantuml"; version = "20171017.1811"; src = fetchFromGitHub { owner = "alexmurray"; @@ -25331,10 +33003,10 @@ rev = "183be89e1dbba0b38237dd198dff600e0790309d"; sha256 = "1fbdbpwrlkvbgv693ndr3zamkf3gp28v94jg911fsav8bk08f6pq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/65f050860a0efda8cf472c2945b79a0a57651556/recipes/flycheck-plantuml"; sha256 = "01l22isiym635471628b951n025ls3lm6gfhfp6f8n8w7v1sb986"; - name = "flycheck-plantuml"; + name = "recipe"; }; packageRequires = [ emacs flycheck plantuml-mode ]; meta = { @@ -25342,20 +33014,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-pony = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-pony = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-pony"; + ename = "flycheck-pony"; version = "20160501.1417"; src = fetchFromGitHub { owner = "SeanTAllen"; repo = "flycheck-pony"; - rev = "ef27475a14090396a01924d131bfee9e163cf6e9"; - sha256 = "06wij2g3prj5qzd8csc6v0phww7prdsf8hqmli6kil954lyxxaxl"; + rev = "3d3387133a44f5b3f0fb178ef4addf6e1ce1df2f"; + sha256 = "1da10q378k5kbcj0rrpzhm7r3ym4rfwc7v1ialcndbmflsn09m5s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2bcb82f4ddb92243058c9ab1a67d4f7ef87b155/recipes/flycheck-pony"; sha256 = "18w1d7y3jsmsc4wg0909p72cnvbxzsmnirmrahhwgsb963fij5qk"; - name = "flycheck-pony"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -25363,9 +33040,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: - melpaBuild { + flycheck-popup-tip = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "flycheck-popup-tip"; + ename = "flycheck-popup-tip"; version = "20170812.1651"; src = fetchFromGitHub { owner = "flycheck"; @@ -25373,10 +33057,10 @@ rev = "ef86aad907f27ca076859d8d9416f4f7727619c6"; sha256 = "1bi6f9nm4bylsbjv4qnkar35s6xzdf2cc2cxi3g691p9527apdz6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip"; sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx"; - name = "flycheck-popup-tip"; + name = "recipe"; }; packageRequires = [ emacs flycheck popup ]; meta = { @@ -25384,20 +33068,27 @@ license = lib.licenses.free; }; }) {}; - flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: - melpaBuild { + flycheck-pos-tip = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , pos-tip }: + melpaBuild { pname = "flycheck-pos-tip"; - version = "20170504.1504"; + ename = "flycheck-pos-tip"; + version = "20180610.915"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-pos-tip"; - rev = "7b94c0c1e3185a4350dc39885add3927037ebad8"; - sha256 = "0m56rflfdzddfsr1xlgzfl7i259786hxsnwa0m729140c6v8f5wh"; + rev = "909113977d37739387c7f099d74a724cfe6efcec"; + sha256 = "0rfbhvl8n656a9d58bjyzki9r3si3ypylbyjn67rnla4jzzi22v8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip"; sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9"; - name = "flycheck-pos-tip"; + name = "recipe"; }; packageRequires = [ emacs flycheck pos-tip ]; meta = { @@ -25405,9 +33096,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, posframe }: - melpaBuild { + flycheck-posframe = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , posframe }: + melpaBuild { pname = "flycheck-posframe"; + ename = "flycheck-posframe"; version = "20180321.2307"; src = fetchFromGitHub { owner = "alexmurray"; @@ -25415,10 +33113,10 @@ rev = "61bdfd4b04e1651163fdcaa7dc631ad073b3e513"; sha256 = "1r5cwmrszp5cvzlcc4dyhajxd0zrgxjpc0arhr2jkw1fc3d611x9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/124f2a7833e3386a0bf57c8111d782ae7a7ee02e/recipes/flycheck-posframe"; sha256 = "02ym2isn761w2nsfxiqjh0jk4md9wy3hk9na2aw7pyycm5cgmfwp"; - name = "flycheck-posframe"; + name = "recipe"; }; packageRequires = [ emacs flycheck posframe ]; meta = { @@ -25426,20 +33124,55 @@ license = lib.licenses.free; }; }) {}; - flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: - melpaBuild { + flycheck-prospector = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { + pname = "flycheck-prospector"; + ename = "flycheck-prospector"; + version = "20180523.2150"; + src = fetchFromGitHub { + owner = "chocoelho"; + repo = "flycheck-prospector"; + rev = "d5b81adb5c8261b935baf0a614dd4b776280392e"; + sha256 = "1g66gm538dwkvyl5rb199rnp5y8knrr3697m2qi0x0f18l072cg6"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/45475a408ff287f4f9d2a8bc729b995635579c84/recipes/flycheck-prospector"; + sha256 = "1z028qi40pk7jh0m8w332kr5qi6k6sw1kbymqdxxfakh1976fww9"; + name = "recipe"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-prospector"; + license = lib.licenses.free; + }; + }) {}; + flycheck-purescript = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "flycheck-purescript"; + ename = "flycheck-purescript"; version = "20161121.907"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "flycheck-purescript"; - rev = "30f0435d5e2715053c8c6170b2bce2ae462ac819"; - sha256 = "10is8l88827g7gs8qnmyif124agxj9smfav6l53hjv3i0q3m3h6f"; + rev = "60087203dfc9a1338a77c5d621480eac6f0426e1"; + sha256 = "00iyy7gfhxyz4zna423c6y4wyx0rcd6kd1z50s22bi31bya9w8k1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a315aad238fa223058a495e1ca8c71da6447024c/recipes/flycheck-purescript"; sha256 = "05j1iscyg9khw0zq63676zrisragklxp48hmbc7vrbmbiy964lwd"; - name = "flycheck-purescript"; + name = "recipe"; }; packageRequires = [ dash emacs flycheck let-alist seq ]; meta = { @@ -25447,20 +33180,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-pycheckers = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-pycheckers"; - version = "20180328.1126"; + ename = "flycheck-pycheckers"; + version = "20180717.2300"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "6996cfa743ae0f2d76a24eaa1d0e1201fb04e72b"; - sha256 = "16phmjs6h3iygz3h6wdmp6cmd4ckki685206l3wanmppsp91s4jy"; + rev = "f85eb69318729689d09f69e955d800ddc6124d6a"; + sha256 = "0dw342g27mhnfpv83ni7gjx47issmk94hinrakjaf91vm3bjwaag"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; sha256 = "18ski3bp8x33589pc273i5ia3hffvlb4czrd97wkfgr4k59ww6yq"; - name = "flycheck-pycheckers"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -25468,9 +33206,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-pyflakes = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-pyflakes"; + ename = "flycheck-pyflakes"; version = "20170330.1611"; src = fetchFromGitHub { owner = "Wilfred"; @@ -25478,10 +33221,10 @@ rev = "61b045939e3743b2162b7e4e73249c66fc2b8f65"; sha256 = "03p0666vpprp6ijkvx9ypaw58bdq42gh533270plv2k5l8r22cl1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05e6f3041151006e44f91e5bcbaa7be3750fb403/recipes/flycheck-pyflakes"; sha256 = "186h5ky48i1xmjbvvhn1i0rzhsy8bgdv1d8f7rlr2z4brb52f9c1"; - name = "flycheck-pyflakes"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -25489,9 +33232,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-rebar3 = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-rebar3"; + ename = "flycheck-rebar3"; version = "20161030.615"; src = fetchFromGitHub { owner = "joedevivo"; @@ -25499,10 +33247,10 @@ rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6"; sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3"; sha256 = "1ml9k61n5vy4c2q6c10q9j10ky0iqkinx21bl7hip1r6b5b1kmmc"; - name = "flycheck-rebar3"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -25510,20 +33258,27 @@ license = lib.licenses.free; }; }) {}; - flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }: - melpaBuild { + flycheck-rtags = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , rtags }: + melpaBuild { pname = "flycheck-rtags"; - version = "20170522.2154"; + ename = "flycheck-rtags"; + version = "20180619.124"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "a595d13f60c13d67a28467b3941d5ed558102e91"; - sha256 = "0yp6h6nsbji7dmc9pnf9qi7zsqxrxa1bln90bn0y71xf6z11kbp4"; + rev = "5dbb594a7202c4a2e84329cf821bd28bfbea5ae3"; + sha256 = "0x210bqv7618g85nzjy4x9gy31qcbjgppmk8zbpmqk59f2bp7bac"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4"; - name = "flycheck-rtags"; + name = "recipe"; }; packageRequires = [ emacs flycheck rtags ]; meta = { @@ -25531,9 +33286,18 @@ license = lib.licenses.free; }; }) {}; - flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: - melpaBuild { + flycheck-rust = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "flycheck-rust"; + ename = "flycheck-rust"; version = "20180327.945"; src = fetchFromGitHub { owner = "flycheck"; @@ -25541,10 +33305,10 @@ rev = "a722204cff5bffe26b8f127c7003cfc9ed00e34b"; sha256 = "1z0zkf4dxkma6qz83ysyhbfvr0sg2cwxvsapc9j9l1x9nskybv2g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w"; - name = "flycheck-rust"; + name = "recipe"; }; packageRequires = [ dash emacs flycheck let-alist seq ]; meta = { @@ -25552,9 +33316,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-stack = callPackage ({ fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: - melpaBuild { + flycheck-stack = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-stack"; + ename = "flycheck-stack"; version = "20160520.244"; src = fetchFromGitHub { owner = "chrisdone"; @@ -25562,10 +33332,10 @@ rev = "f04235e00998000ee2c305f5a3ee72bb5dbbc926"; sha256 = "139q43ldvymfxns8zv7gxasn3sg0rn4i9yz08wgk50psg5zq5mjr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b77f55989d11d1efacbad0fd3876dd27006f2679/recipes/flycheck-stack"; sha256 = "1r9zppqmp1i5i06jhkrgvwy1p3yc8kmcvgibricydqsij26lhpmf"; - name = "flycheck-stack"; + name = "recipe"; }; packageRequires = [ flycheck haskell-mode ]; meta = { @@ -25573,9 +33343,17 @@ license = lib.licenses.free; }; }) {}; - flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: - melpaBuild { + flycheck-status-emoji = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-status-emoji"; + ename = "flycheck-status-emoji"; version = "20180330.1625"; src = fetchFromGitHub { owner = "liblit"; @@ -25583,10 +33361,10 @@ rev = "61e93ac41847d27b8eea3a334ced2d1783687b77"; sha256 = "104zz9fihvd5klzdcaxsdmmfp0q5qisq5bbff48rfwdxnlp8dskr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p"; - name = "flycheck-status-emoji"; + name = "recipe"; }; packageRequires = [ cl-lib emacs flycheck let-alist ]; meta = { @@ -25594,20 +33372,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-swift = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-swift = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-swift"; + ename = "flycheck-swift"; version = "20170128.2149"; src = fetchFromGitHub { owner = "swift-emacs"; repo = "flycheck-swift"; - rev = "4c5ad401252400a78da395fd56a71e67ff8c2761"; - sha256 = "094vpmpjq0skhkq634p3zgj3nmsiq1dl8k0z7hzafnaw2y157z1s"; + rev = "c6c416a1b7a7d346e5c040e4e4065abc68d3a844"; + sha256 = "0wa60i99jh0dsks30jssg7l17bcmr6jzkwmkjg8brl756p593zp5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd99bea06079c4231363c37e3361bd9e5b1ba490/recipes/flycheck-swift"; sha256 = "1s6rn4wyz9la6bw228jfxx8dxjyk5hf8r3vbmq0k808p772zki0z"; - name = "flycheck-swift"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -25615,20 +33399,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-swift3 = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-swift3"; - version = "20171231.452"; + ename = "flycheck-swift3"; + version = "20180411.652"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d"; - sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q"; + rev = "06a6f98d7e498860b345bbd03e96bfe59608f508"; + sha256 = "0h1n4x0fvqfb6jcapbab1ck6bj4d7irbn9zz2hxv2rlrkqxfsmh3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; sha256 = "05yfrn42svcvdkr8mx16ii8llhzn33lxdawksjqiqg671s6fgdpa"; - name = "flycheck-swift3"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -25636,9 +33426,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-swiftlint = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-swiftlint = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-swiftlint"; + ename = "flycheck-swiftlint"; version = "20180312.1656"; src = fetchFromGitHub { owner = "jojojames"; @@ -25646,10 +33442,10 @@ rev = "8496fd4499ef5c0e0cfeb65f4d76c6f9dd8991f3"; sha256 = "0d2s9brccv7lgw2vnglhhaq29mxb3pxiclhx4w28gb76x8r2rsf7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e2a979726507e974a0a19dfc2ca6884157025be/recipes/flycheck-swiftlint"; sha256 = "1nwxv4l3ml9hlc8qf8a8x1bnnvdj80sb8nfbkcfiqwak315wihr4"; - name = "flycheck-swiftlint"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -25657,20 +33453,54 @@ license = lib.licenses.free; }; }) {}; - flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: - melpaBuild { + flycheck-tcl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { + pname = "flycheck-tcl"; + ename = "flycheck-tcl"; + version = "20180327.559"; + src = fetchFromGitHub { + owner = "nwidger"; + repo = "flycheck-tcl"; + rev = "7ca23f4673e178b9f5dcc8a82b86cf05b15d7236"; + sha256 = "17mmj0yx7d7cwyq35ll1lw4j0yyha172375apvanrkpgpzjpnvrq"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fafc86df6c15348711f16302bb86c0ee08c08454/recipes/flycheck-tcl"; + sha256 = "0rmc7rk0n4mgk11jgza1dn1nkjyi7rqs79d3p0cj1081znyj56f3"; + name = "recipe"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-tcl"; + license = lib.licenses.free; + }; + }) {}; + flycheck-tip = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "flycheck-tip"; + ename = "flycheck-tip"; version = "20171020.348"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "flycheck-tip"; - rev = "9b0072d92e6b4a52834bf5a34120a0f5e1c8c2fd"; - sha256 = "1adcxz2chy0qcv5z79hhj05gdzk4l0jijy5iy9nd3sg8sclxf6nq"; + rev = "a8ea6c905e8ad2d0684a17f7e78ba11e8598e85d"; + sha256 = "12igqdgy93s02mv9zik5x98x3dzk654w6j6n2mkbzipfgfwq6nms"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip"; sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656"; - name = "flycheck-tip"; + name = "recipe"; }; packageRequires = [ emacs flycheck popup ]; meta = { @@ -25678,9 +33508,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-title = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-title = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-title"; + ename = "flycheck-title"; version = "20170216.1546"; src = fetchFromGitHub { owner = "Wilfred"; @@ -25688,10 +33524,10 @@ rev = "6faea67be8661faf8152217869d16e993cc2bc49"; sha256 = "08b2cq5bzmq9aa8b8glx5js2nhfpgdsd0r2sgvi0ij937yz8lf37"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2996b70645cd6fd093e3b31b9586ce5acb036cf6/recipes/flycheck-title"; sha256 = "1cxid9qmzy8pl8qkvr6kgvfqm05pjw8cxpz66x619hbkw2vr7sza"; - name = "flycheck-title"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -25699,9 +33535,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-vale = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: - melpaBuild { + flycheck-vale = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-vale"; + ename = "flycheck-vale"; version = "20180308.2243"; src = fetchFromGitHub { owner = "abingham"; @@ -25709,10 +33552,10 @@ rev = "7777e0d4cf961b6ee6ae4ef917636121d18b3ee8"; sha256 = "1k0bhyy2r9c79lld7mbhw8n4c1hlzwr5qp5wmcxzya0fnp3s6g9j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7693eeb536e601589b49f96d0e2734cd08fad4f2/recipes/flycheck-vale"; sha256 = "1ny30q81hq62s178rj3jjwsf9f3988dd6pl82r0vq53z3asnsxyd"; - name = "flycheck-vale"; + name = "recipe"; }; packageRequires = [ emacs flycheck let-alist ]; meta = { @@ -25720,9 +33563,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-xcode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-xcode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-xcode"; + ename = "flycheck-xcode"; version = "20180121.2251"; src = fetchFromGitHub { owner = "jojojames"; @@ -25730,10 +33579,10 @@ rev = "6147ab777e2c08e4f5ffdbd85d3013ca700fa835"; sha256 = "1jwd7xhg7gfjppimf1kxwxwsgzkqc8w86wgp7kqphp79ydd4jgp8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc66203fdd1721bf1a6f8dcec51694c57d2e690/recipes/flycheck-xcode"; sha256 = "0n86hn6rf0mrx1385pwxgkx28xrbnksarlzb07h9d63s0yb5shaa"; - name = "flycheck-xcode"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -25741,20 +33590,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-yamllint = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-yamllint"; + ename = "flycheck-yamllint"; version = "20170325.1035"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "flycheck-yamllint"; - rev = "c2b273d84f15bd03464d6722391e595d7c179a5c"; - sha256 = "0snj6kkshk8bivwsnhp7kiyhzcn7x6952vw098wgzwqw2hgdkq97"; + rev = "110d310fae409e1869b82c34e60936bd3783dc69"; + sha256 = "0xfmnwmc26wzfw1r4q70yxzm9qqvcpxx953pvssavrxfyg3bdgf4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/932ee0a1f13a52d53102b90911da79145208cbb5/recipes/flycheck-yamllint"; sha256 = "1q2sy0hsbnwdlwq99wk8n5gi9fd8bs4jvi859np8bylbhhb3kj8m"; - name = "flycheck-yamllint"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -25762,9 +33616,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-yang = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yang-mode }: - melpaBuild { + flycheck-yang = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , yang-mode }: + melpaBuild { pname = "flycheck-yang"; + ename = "flycheck-yang"; version = "20180312.1131"; src = fetchFromGitHub { owner = "andaru"; @@ -25772,10 +33632,10 @@ rev = "47881fc42ef0163c47064b72b5d6dbef4f83d778"; sha256 = "0bkbl1pas44bl6s3xjdb5zjbd6bmfjk39md5ds1ix4wchnkjm3iy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e58b4f4294d11424918b399898c0044f5b76ab14/recipes/flycheck-yang"; sha256 = "0agfmirjwlz13aq1jh94agav0y1rxkyhj7mngdgys7mwjxy0ac9h"; - name = "flycheck-yang"; + name = "recipe"; }; packageRequires = [ flycheck yang-mode ]; meta = { @@ -25783,20 +33643,29 @@ license = lib.licenses.free; }; }) {}; - flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: - melpaBuild { + flycheck-ycmd = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild + , ycmd }: + melpaBuild { pname = "flycheck-ycmd"; + ename = "flycheck-ycmd"; version = "20180207.843"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2"; - sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl"; + rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; + sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; sha256 = "114k5y3jy470g5zzhxy03036gcayc08n6g61cidlr2zlyq80glyr"; - name = "flycheck-ycmd"; + name = "recipe"; }; packageRequires = [ dash emacs flycheck let-alist ycmd ]; meta = { @@ -25804,9 +33673,14 @@ license = lib.licenses.free; }; }) {}; - flymake-coffee = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-coffee = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-coffee"; + ename = "flymake-coffee"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; @@ -25814,10 +33688,10 @@ rev = "dee295acf30820ed15fe0de17137d50bc27fc80c"; sha256 = "0706jbi3jcmffxmcpvh8w3007q8sh48kgrcjip5c9hhfqpagayld"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-coffee"; sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d"; - name = "flymake-coffee"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -25825,9 +33699,14 @@ license = lib.licenses.free; }; }) {}; - flymake-cppcheck = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-cppcheck = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-cppcheck"; + ename = "flymake-cppcheck"; version = "20140415.557"; src = fetchFromGitHub { owner = "senda-akiha"; @@ -25835,10 +33714,10 @@ rev = "9554f504d425a04fa6a875f7e3179bc7cf07dd03"; sha256 = "1dlxn8hhz3gfrhvkwhlxjmby6zc0g8yy9n9j9dn8c4cbi2fhyx5m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a83d56c6e150de5d4fdbd89f271f18e5304afd8/recipes/flymake-cppcheck"; sha256 = "11brzgq2zl32a8a2dgj2imsldjqaqvxwk2jypf4bmfwa3mkcqh3d"; - name = "flymake-cppcheck"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -25846,9 +33725,14 @@ license = lib.licenses.free; }; }) {}; - flymake-css = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-css = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-css"; + ename = "flymake-css"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; @@ -25856,10 +33740,10 @@ rev = "de090163ba289910ceeb61b13368ce42d0f2dfd8"; sha256 = "18rqzah8p7mqwkddaav1d4r146amvn8jppazvsvc5vs01syj83m9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-css"; sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5"; - name = "flymake-css"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -25867,20 +33751,25 @@ license = lib.licenses.free; }; }) {}; - flymake-cursor = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }: - melpaBuild { + flymake-cursor = callPackage ({ fetchFromGitHub + , fetchurl + , flymake ? null + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-cursor"; + ename = "flymake-cursor"; version = "20120322.1057"; src = fetchFromGitHub { owner = "flymake"; repo = "emacs-flymake-cursor"; - rev = "ecc539082c3fc9e91bba33d72c26989217411593"; - sha256 = "0cdf5m3rfwsim505qjyyml0r5zzqx7jrlc8ayfvix70f3bmxnibs"; + rev = "5cac5045398b1436ceb143d48961b50d38ae1396"; + sha256 = "0xaq8zfd90kqqwg8ik081jblrdyj6p3fh2xpf6a4sdj8826ry93v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a02597edee67c84bef259d7fc5c5b61bd39a5b86/recipes/flymake-cursor"; sha256 = "0v5abg3h9kmybr0cyr7hqy4rn88h84snzxbsmqcbjw24s10v9p0s"; - name = "flymake-cursor"; + name = "recipe"; }; packageRequires = [ flymake ]; meta = { @@ -25888,20 +33777,24 @@ license = lib.licenses.free; }; }) {}; - flymake-easy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flymake-easy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-easy"; + ename = "flymake-easy"; version = "20140818.55"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-easy"; - rev = "de41ea49503f71f997e5c359a2ad08df696c0147"; - sha256 = "1mylcsklnv3q27q1gvf7wrila39rmxab1ypmvjh5p56d91y6pszc"; + rev = "09deafbcb5f094de8465c2bbfe270ba0f517f515"; + sha256 = "1ld0g3hrbplmw3xgg6jg032hncnlxyc3hid4vn38lkcj3y7ls61b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flymake-easy"; sha256 = "0y7nm2p5x1f0nqfj73zr6xzbpf4wrzx8sn8154yx0qm0qh3id39v"; - name = "flymake-easy"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25909,9 +33802,13 @@ license = lib.licenses.free; }; }) {}; - flymake-elixir = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flymake-elixir = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-elixir"; + ename = "flymake-elixir"; version = "20130810.717"; src = fetchFromGitHub { owner = "syl20bnr"; @@ -25919,10 +33816,10 @@ rev = "3810566cffe35d04cc3f01e27fe397d68d52f802"; sha256 = "04w6g4wixrpfidxbk2bwazhvf0cx3c2v2mxnycqqlqkg0m0sb0fn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05dae578f0dd6b5185f666431b3f36aad3aeffa1/recipes/flymake-elixir"; sha256 = "15r3m58hnc75l3j02xdr8yg25fbn2sbz1295ac44widzis82m792"; - name = "flymake-elixir"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25930,20 +33827,24 @@ license = lib.licenses.free; }; }) {}; - flymake-gjshint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flymake-gjshint = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-gjshint"; + ename = "flymake-gjshint"; version = "20130327.532"; src = fetchFromGitHub { owner = "yasuyk"; repo = "flymake-gjshint-el"; - rev = "dc957c14cb060819585de8aedb330e24efa4b784"; - sha256 = "14kbqyw4v1c51dx7pfgqbn8x4j8j3rgyyq2fa9klqzxpldcskl24"; + rev = "71495ee5303de18293decd57ab9f9abdbaabfa05"; + sha256 = "002s01cymgx4z4l3j2pqirg7899pljdx2hmbz8k6cksdxlymzmkd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4673825b15519e9eb2204ade5cc045751771c52/recipes/flymake-gjshint"; sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44"; - name = "flymake-gjshint"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25951,9 +33852,13 @@ license = lib.licenses.free; }; }) {}; - flymake-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flymake-go = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-go"; + ename = "flymake-go"; version = "20150714.33"; src = fetchFromGitHub { owner = "robert-zaremba"; @@ -25961,10 +33866,10 @@ rev = "ae83761aa908c1a50ff34af04f00dcc46bca2ce9"; sha256 = "03gh0y988pksghmmvb5av2vnlbcsncafvn4nwihsis0bhys8k28q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b42b8b34388803439c249f16fdf14257ef182ed6/recipes/flymake-go"; sha256 = "030m67d8g60ljm7ny3jh4vwj3cshypsklgbjpcvh32y109ga1hy1"; - name = "flymake-go"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25972,20 +33877,25 @@ license = lib.licenses.free; }; }) {}; - flymake-google-cpplint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-google-cpplint = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-google-cpplint"; + ename = "flymake-google-cpplint"; version = "20140205.525"; src = fetchFromGitHub { owner = "senda-akiha"; repo = "flymake-google-cpplint"; - rev = "905d32e84a27f18a78bec455ca930ab1ff9ae31e"; - sha256 = "0zldhlvxmk0xcjmj4ns48pp4h3bvijrzs1md69ya7m3dmsbayfrc"; + rev = "5d36ff947d4cdcc3ac5e7f48e543fe0be949ba72"; + sha256 = "18a7l1wmgxqqzr9mzg5rb9626rwyifmiw34chg9jchfkm8wbz0fv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01f8e5c2b63e80f0411860fde38bf694df3bfc8f/recipes/flymake-google-cpplint"; sha256 = "0q7v70xbprh03f1yabq216q4q82a58s2c1ykr6ig49cg1jdgzkf3"; - name = "flymake-google-cpplint"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -25993,9 +33903,14 @@ license = lib.licenses.free; }; }) {}; - flymake-haml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-haml = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-haml"; + ename = "flymake-haml"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; @@ -26003,10 +33918,10 @@ rev = "22a81e8484734552d461e7ae7305664dc244447e"; sha256 = "0pgp2gl3wdwrzcik5b5csn4qp8iv6pc51brx8p7jrwn7bz4lkb82"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-haml"; sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1"; - name = "flymake-haml"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26014,9 +33929,14 @@ license = lib.licenses.free; }; }) {}; - flymake-haskell-multi = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-haskell-multi = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-haskell-multi"; + ename = "flymake-haskell-multi"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; @@ -26024,10 +33944,10 @@ rev = "b564a94312259885b1380272eb867bf52a164020"; sha256 = "1h21hy5fjwa5qxl31rq3jjp3wwkipdwaliq0ci184rw48kw51xjh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e879eca5eb11b2ae77ee2cb8d8150d85e9e93ebd/recipes/flymake-haskell-multi"; sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij"; - name = "flymake-haskell-multi"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26035,9 +33955,14 @@ license = lib.licenses.free; }; }) {}; - flymake-hlint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-hlint = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-hlint"; + ename = "flymake-hlint"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; @@ -26045,10 +33970,10 @@ rev = "f910736b26784efc9a2fa29503f45c1f1dd0aa38"; sha256 = "157f2l6hllwl12h8f502rq2kl33s202k9bcyfy2cmnn6vhky1b8s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17820f32d46e845cc44b237d0bfd5c2d898721de/recipes/flymake-hlint"; sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x"; - name = "flymake-hlint"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26056,9 +33981,14 @@ license = lib.licenses.free; }; }) {}; - flymake-jshint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-jshint = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-jshint"; + ename = "flymake-jshint"; version = "20140319.1500"; src = fetchFromGitHub { owner = "Wilfred"; @@ -26066,10 +33996,10 @@ rev = "79dd554c227883c487db38ac111306c8d5382c95"; sha256 = "0ywm9fpb7d7ry2fly8719fa41q97yj9za3phqhv6j1chzaxvcv3a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/144511ce3378b468751b1ee627b77a2d22fe8dfc/recipes/flymake-jshint"; sha256 = "0j4djylz6mrq14qmbm35k3gvvsw6i9qc4gd9ma4fykiqzkdjsg7j"; - name = "flymake-jshint"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26077,9 +34007,14 @@ license = lib.licenses.free; }; }) {}; - flymake-jslint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-jslint = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-jslint"; + ename = "flymake-jslint"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; @@ -26087,10 +34022,10 @@ rev = "8edb82be605542b0ef62d38d818adcdde335eecb"; sha256 = "0i6bqpbibsbqhpqfy9zl0awiqkmddi3q8xlrslcjd429f0g5f1ad"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-jslint"; sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm"; - name = "flymake-jslint"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26098,20 +34033,25 @@ license = lib.licenses.free; }; }) {}; - flymake-json = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-json = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-json"; - version = "20170722.1846"; + ename = "flymake-json"; + version = "20180511.211"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-json"; - rev = "d43e62fab69c4c39f54f1057c9801a3e645de619"; - sha256 = "1zlhxl7x754p4bxipklvz0gjqlwg9c8fiyv7rxdkfaxdzpf9a6zm"; + rev = "ae58795f948402e987cda4c15f10354f8ec2d0fd"; + sha256 = "1hr35xxj6w34h7xs13n6sxs69j3z3i0r1qim3hgyiym797xjsa0p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acb0a4d29159aa6d74f754911f63152dac3425bd/recipes/flymake-json"; sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d"; - name = "flymake-json"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26119,9 +34059,15 @@ license = lib.licenses.free; }; }) {}; - flymake-less = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, less-css-mode, lib, melpaBuild }: - melpaBuild { + flymake-less = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , less-css-mode + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-less"; + ename = "flymake-less"; version = "20151110.2338"; src = fetchFromGitHub { owner = "purcell"; @@ -26129,10 +34075,10 @@ rev = "32d3c28a9a5c52b82d1741ff9d715013b6498421"; sha256 = "0ggi8a4j4glpsar0sqg8q06rscajjaziis5ann31wphx88rc5wd7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d4eae8b7b7d81ebf4d85f38fc3a17b4bc918318/recipes/flymake-less"; sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0"; - name = "flymake-less"; + name = "recipe"; }; packageRequires = [ flymake-easy less-css-mode ]; meta = { @@ -26140,20 +34086,24 @@ license = lib.licenses.free; }; }) {}; - flymake-lua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flymake-lua = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-lua"; + ename = "flymake-lua"; version = "20170128.1754"; src = fetchFromGitHub { owner = "sroccaserra"; repo = "flymake-lua"; - rev = "84589f20066921a5b79cf3a1f914a223a2552d2a"; - sha256 = "1f4nigl65g1g5w15ddf33ypk2b07xph964pkdq1bw81451vmvzhn"; + rev = "dcc32b62a285215898ae774ba63dbda0656f6f53"; + sha256 = "07my1w3cdj9iq2f9jfh04m5zivig7b97kha3ajjlx9avss976baq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63889df90a8cd4a39871cc43ccc559eff7b8dd5f/recipes/flymake-lua"; sha256 = "05q6bifr1ywirk6sdn0pr812nlrzsi79bpbgn6ay4jyzmhhfi9z0"; - name = "flymake-lua"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26161,20 +34111,25 @@ license = lib.licenses.free; }; }) {}; - flymake-perlcritic = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }: - melpaBuild { + flymake-perlcritic = callPackage ({ fetchFromGitHub + , fetchurl + , flymake ? null + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-perlcritic"; + ename = "flymake-perlcritic"; version = "20120328.114"; src = fetchFromGitHub { owner = "illusori"; repo = "emacs-flymake-perlcritic"; - rev = "edfaa86500ddfa8a6a6f51f5581a81a821277df6"; - sha256 = "1f4l2r4gp03s18255jawc7s5abpjjrw54937wzygmvzvqvmaiikj"; + rev = "0692d6ad5495f6e5438bde0a10345829b8e1def8"; + sha256 = "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/flymake-perlcritic"; sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8"; - name = "flymake-perlcritic"; + name = "recipe"; }; packageRequires = [ flymake ]; meta = { @@ -26182,9 +34137,14 @@ license = lib.licenses.free; }; }) {}; - flymake-php = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-php = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-php"; + ename = "flymake-php"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; @@ -26192,10 +34152,10 @@ rev = "c045d01e002ba5e09b05f40e25bf5068d02126bc"; sha256 = "03fk8kzlwbs9k91ra91r7djxlpv5mhbha33dnyz50sqwa52cg8ck"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-php"; sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk"; - name = "flymake-php"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26203,9 +34163,14 @@ license = lib.licenses.free; }; }) {}; - flymake-phpcs = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-phpcs = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-phpcs"; + ename = "flymake-phpcs"; version = "20140712.2331"; src = fetchFromGitHub { owner = "senda-akiha"; @@ -26213,10 +34178,10 @@ rev = "a4d383474e055e554aaf1cd617055d5d7181aa50"; sha256 = "140rlp6m0aqibwa0bhv8w6l3giziybqdw7x271nq8f3r60ch13bi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e4d444198f593cfb03c7ca84f3e90db13ef5a01/recipes/flymake-phpcs"; sha256 = "0zzxi3c203fiw6jp1ar9bb9f28x2lg23bczgy8n5cicrq59jfsn9"; - name = "flymake-phpcs"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26224,20 +34189,25 @@ license = lib.licenses.free; }; }) {}; - flymake-puppet = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-puppet = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-puppet"; + ename = "flymake-puppet"; version = "20170731.2254"; src = fetchFromGitHub { owner = "benprew"; repo = "flymake-puppet"; - rev = "8a772395f4ccc59d883712ab53a92a17c1d9a429"; - sha256 = "00w87qa7r8rigmpv58vpjwpn9x13sv7db5m6z4cqh76qkgkghgqi"; + rev = "9579e5c736cb890195464fabf51df113313de88d"; + sha256 = "1bk16l8rbvrwmcd0zd2yg8xmfn7b036716niy21wfizmar0pk7p7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/302dbe34e7949da9c65e9c7bf2ab924db91b968f/recipes/flymake-puppet"; sha256 = "1izq6s33p74dy4wzfnjii8wjs723bm5ggl0w6hkvzgbmyjc01hxv"; - name = "flymake-puppet"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26245,9 +34215,14 @@ license = lib.licenses.free; }; }) {}; - flymake-python-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-python-pyflakes = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-python-pyflakes"; + ename = "flymake-python-pyflakes"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; @@ -26255,10 +34230,10 @@ rev = "1d65c26bf65a5dcbd29fcd967e2feb90e1e7a33d"; sha256 = "0hsvw6rxg3k1ymrav0bf5q3siqr9v2jp4c4h1f98szrj2lp200fm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49091c0eca4158b80269b6ff5f7f3fc8e981420b/recipes/flymake-python-pyflakes"; sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497"; - name = "flymake-python-pyflakes"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26266,9 +34241,14 @@ license = lib.licenses.free; }; }) {}; - flymake-ruby = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-ruby = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-ruby"; + ename = "flymake-ruby"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; @@ -26276,10 +34256,10 @@ rev = "6c320c6fb686c5223bf975cc35178ad6b195e073"; sha256 = "0hzyxhg6y1rknvgj2ycivwrlrw7fznw9jrin5n9z627mzpjpfcnk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-ruby"; sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr"; - name = "flymake-ruby"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26287,9 +34267,14 @@ license = lib.licenses.free; }; }) {}; - flymake-rust = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-rust = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-rust"; + ename = "flymake-rust"; version = "20170729.1439"; src = fetchFromGitHub { owner = "jxs"; @@ -26297,10 +34282,10 @@ rev = "2f42d1f2dad73ec9de460eda6176e3ab25c446f0"; sha256 = "02fgkv9hxwrv8n5h6izb5jyjcpazlf86pjjj4zkv1ycpa6gyzzwn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/flymake-rust"; sha256 = "0fgpkz1d4y2ywizwwrhqdqncdmhdnbgf3mcv3hjpa82x44yb7j32"; - name = "flymake-rust"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26308,9 +34293,14 @@ license = lib.licenses.free; }; }) {}; - flymake-sass = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-sass = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-sass"; + ename = "flymake-sass"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; @@ -26318,10 +34308,10 @@ rev = "2de28148e92deb93bff3d55fe14e7c67ac476056"; sha256 = "05v83l05knqv2inharmhjvzmjskjlany7dnwp5dz44bvy0jhnm39"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-sass"; sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d"; - name = "flymake-sass"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26329,9 +34319,14 @@ license = lib.licenses.free; }; }) {}; - flymake-shell = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-shell = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-shell"; + ename = "flymake-shell"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; @@ -26339,10 +34334,10 @@ rev = "a16cf453056b9849cc7c912bb127fb0b08fc6dab"; sha256 = "1ki0zk5ijfkf4blavl62b55jnjzxw2b7blaxg51arpvvbflqmmlh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-shell"; sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i"; - name = "flymake-shell"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26350,9 +34345,14 @@ license = lib.licenses.free; }; }) {}; - flymake-solidity = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-solidity = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-solidity"; + ename = "flymake-solidity"; version = "20170804.2344"; src = fetchFromGitHub { owner = "kootenpv"; @@ -26360,10 +34360,10 @@ rev = "48bfe9525f764d8a68cc0270905dbf45bfd00bb8"; sha256 = "0v8sf5m0mygqahjyadxgffdf7p59wb0qnghyxajhc69sbg58hnnd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b13f57b77f6648336a049a8dda37757d4dafd90/recipes/flymake-solidity"; sha256 = "10d1g14y3l670lqgfdsnyxanzcjs2jpgnliih56n1xhcpyz551l3"; - name = "flymake-solidity"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26371,9 +34371,14 @@ license = lib.licenses.free; }; }) {}; - flymake-vala = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-vala = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-vala"; + ename = "flymake-vala"; version = "20150325.2231"; src = fetchFromGitHub { owner = "daniellawrence"; @@ -26381,10 +34386,10 @@ rev = "c3674f461fc84fb0300cd3a562fb903a59782745"; sha256 = "0qpr0frcn3w0f6yz8vgavwbxvn6wb0qkfk653v4cfy57dvslr4wf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flymake-vala"; sha256 = "1fs4alyf3dckdf1pm6vgh4wjpl22wrlhfx9nv072l0dg48zgyw16"; - name = "flymake-vala"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26392,20 +34397,25 @@ license = lib.licenses.free; }; }) {}; - flymake-yaml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-yaml = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-yaml"; + ename = "flymake-yaml"; version = "20130423.848"; src = fetchFromGitHub { owner = "yasuyk"; repo = "flymake-yaml"; - rev = "24cb5b744a1796e554e6dbfc6eeb237d06a00b10"; - sha256 = "0mdam39a85csi9b90wak9j3zkd25lj6x54affwkg3fym8yphmplm"; + rev = "0dd11eed29fe4054ff5b4e06e2c39b4d925d6aae"; + sha256 = "1z6x4hkawjpch73lz2g4wcab1pbhg43wp8pmfcnnljy6jp3bmy2b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/888bcbcb24866abd990abd5b467461a1e1fc13fa/recipes/flymake-yaml"; sha256 = "17wghm797np4hlidf3wwb47w4klwc6qyk6ry1z05psl3nykws1g7"; - name = "flymake-yaml"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -26413,9 +34423,14 @@ license = lib.licenses.free; }; }) {}; - flymd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flymd = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flymd"; + ename = "flymd"; version = "20160617.514"; src = fetchFromGitHub { owner = "mola-T"; @@ -26423,10 +34438,10 @@ rev = "84d5a68bcfed4a295952c33ffcd11e880978d9d7"; sha256 = "0j2mmr9f0d3zkhb92zc820iw4vkz958rm3ca7l9k3gx37cc4sn2l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/07e4121f4cfaf4c33828f84b6b06f9cf2b64a0a2/recipes/flymd"; sha256 = "16wq34xv7hswbxw5w9wnnsw2mhc9qzhmaa6aydhh32blcszhp4rk"; - name = "flymd"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -26434,9 +34449,13 @@ license = lib.licenses.free; }; }) {}; - flyparens = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flyparens = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flyparens"; + ename = "flyparens"; version = "20140723.1146"; src = fetchFromGitHub { owner = "jiyoo"; @@ -26444,10 +34463,10 @@ rev = "af9b8cfd647d0e5f97684d613dc2eea7cfc19398"; sha256 = "07hy1kyw4cbxydmhp4scsy3dcbk2s50rmdp8rch1vbcjk5lj4mvb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c4565ae5b84eb8733cb7fd28cf6a087fd1fedab/recipes/flyparens"; sha256 = "1mvbfq062qj8vmgzk6rymg3idlfc1makfp1scmjvpw98h30j2a0a"; - name = "flyparens"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26455,20 +34474,24 @@ license = lib.licenses.free; }; }) {}; - flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flyspell-correct = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flyspell-correct"; - version = "20171205.940"; + ename = "flyspell-correct"; + version = "20180427.1135"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; - sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; + rev = "e47b83e5efb524dfab5a6f92304b319fa6376ae0"; + sha256 = "1w1idyryxq496i1plx8xjyfidakyncx3sa9j3ik7x148ywaf8kwm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; sha256 = "0d2205h234na9s942s83yvkq89l9w9jnl5yfrxkkdiq8pw0dvymd"; - name = "flyspell-correct"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26476,20 +34499,26 @@ license = lib.licenses.free; }; }) {}; - flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }: - melpaBuild { + flyspell-correct-helm = callPackage ({ fetchFromGitHub + , fetchurl + , flyspell-correct + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "flyspell-correct-helm"; - version = "20161031.1134"; + ename = "flyspell-correct-helm"; + version = "20180427.1135"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; - sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; + rev = "e47b83e5efb524dfab5a6f92304b319fa6376ae0"; + sha256 = "1w1idyryxq496i1plx8xjyfidakyncx3sa9j3ik7x148ywaf8kwm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; sha256 = "18s2bzszy6x31avqg7j2lsll2cf4asb8njwhmx4mm215agack976"; - name = "flyspell-correct-helm"; + name = "recipe"; }; packageRequires = [ flyspell-correct helm ]; meta = { @@ -26497,20 +34526,26 @@ license = lib.licenses.free; }; }) {}; - flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }: - melpaBuild { + flyspell-correct-ivy = callPackage ({ fetchFromGitHub + , fetchurl + , flyspell-correct + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "flyspell-correct-ivy"; - version = "20161031.1134"; + ename = "flyspell-correct-ivy"; + version = "20180427.1135"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; - sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; + rev = "e47b83e5efb524dfab5a6f92304b319fa6376ae0"; + sha256 = "1w1idyryxq496i1plx8xjyfidakyncx3sa9j3ik7x148ywaf8kwm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; sha256 = "1n5iyab6bj761w6vxncyqvqzwh9k60pzq5f2n00ifrz74pqs537i"; - name = "flyspell-correct-ivy"; + name = "recipe"; }; packageRequires = [ flyspell-correct ivy ]; meta = { @@ -26518,20 +34553,26 @@ license = lib.licenses.free; }; }) {}; - flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }: - melpaBuild { + flyspell-correct-popup = callPackage ({ fetchFromGitHub + , fetchurl + , flyspell-correct + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "flyspell-correct-popup"; - version = "20161031.1134"; + ename = "flyspell-correct-popup"; + version = "20180427.1135"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; - sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; + rev = "e47b83e5efb524dfab5a6f92304b319fa6376ae0"; + sha256 = "1w1idyryxq496i1plx8xjyfidakyncx3sa9j3ik7x148ywaf8kwm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; sha256 = "1fr8ajwldcl58i8xm31dz1mjwbi9f4q8s58x5jrqhqha0x4p4h9l"; - name = "flyspell-correct-popup"; + name = "recipe"; }; packageRequires = [ flyspell-correct popup ]; meta = { @@ -26539,9 +34580,13 @@ license = lib.licenses.free; }; }) {}; - flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flyspell-lazy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flyspell-lazy"; + ename = "flyspell-lazy"; version = "20180224.1306"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -26549,10 +34594,10 @@ rev = "3ebf68cc9eb10c972a2de8d7861cbabbbce69570"; sha256 = "1n67y90vm041mz172gjqypw3b5za5f18sic54h7wz4a9naynwyb6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/flyspell-lazy"; sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y"; - name = "flyspell-lazy"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26560,9 +34605,14 @@ license = lib.licenses.free; }; }) {}; - flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + flyspell-popup = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "flyspell-popup"; + ename = "flyspell-popup"; version = "20170529.115"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -26570,10 +34620,10 @@ rev = "29311849bfd253b9b689bf331860b4c4d3bd4dde"; sha256 = "0x7jilwb0fgzsr7ma59sgd0d4122cl0hwzr28vi3z5s8wdab7nc4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/186d00724137c055b521a5f5c54acf71c4b16c32/recipes/flyspell-popup"; sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql"; - name = "flyspell-popup"; + name = "recipe"; }; packageRequires = [ popup ]; meta = { @@ -26581,30 +34631,15 @@ license = lib.licenses.free; }; }) {}; - fm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fm"; - version = "20130126.1618"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fm"; - rev = "555bcebdf47ea3b1d9d1e152af7237b9daa62d59"; - sha256 = "1fk4zsb4jliwz10sqz5bpqgj1p479mc506dmvy4zq3vqnpbypqvs"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e4a74b87c05b408433545a2236000ac081af36bf/recipes/fm"; - sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f"; - name = "fm"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fm"; - license = lib.licenses.free; - }; - }) {}; - fm-bookmarks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fm-bookmarks = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fm-bookmarks"; + ename = "fm-bookmarks"; version = "20170104.916"; src = fetchFromGitHub { owner = "kuanyui"; @@ -26612,10 +34647,10 @@ rev = "11dacfd16a926bfecba96a94c6b13e162c7717f7"; sha256 = "0is4617ivga8qrw19y7fy883fgczzdxvrl15ja1dydzj2cbn5d97"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ca020aff7f19cc150cd6968ae7c441372e240c2/recipes/fm-bookmarks"; sha256 = "12ami0k6rfwhrr6xgj0dls4mkk6dp0r9smwzhr4897dv0lw89bdj"; - name = "fm-bookmarks"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -26623,20 +34658,28 @@ license = lib.licenses.free; }; }) {}; - fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fn = callPackage ({ cl-lib ? null + , dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fn"; + ename = "fn"; version = "20170209.1804"; src = fetchFromGitHub { owner = "troyp"; repo = "fn.el"; - rev = "f685fd0c08ec3b1d1b9974b37e62edd78a000cb8"; - sha256 = "1k8pwlpcvlwr4pavg85ja8hdc7rrbafqs1mhhqr5gbq8cp822sja"; + rev = "fe65dc654d319e6fa9cef4d7eca0f8dd847b6a32"; + sha256 = "1j2rrwizafwramlzrjcsfv8xbz72qmiaa120cb1ri8wp6nyvhys0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn"; sha256 = "0cb98rxdb6sd0kws6bc4pa536kiyw3yk0hlfqcm3ps81hcgqjhhn"; - name = "fn"; + name = "recipe"; }; packageRequires = [ cl-lib dash dash-functional emacs ]; meta = { @@ -26644,9 +34687,15 @@ license = lib.licenses.free; }; }) {}; - focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + focus = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "focus"; + ename = "focus"; version = "20171203.2103"; src = fetchFromGitHub { owner = "larstvei"; @@ -26654,10 +34703,10 @@ rev = "045ee6175e9340f873db03445c74ff9eefa35a27"; sha256 = "1hrx8bj4gf0dqbfxgvis62zxnkiyms6v730s55vd8711zxdl0pw4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8"; - name = "focus"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -26665,9 +34714,14 @@ license = lib.licenses.free; }; }) {}; - focus-autosave-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + focus-autosave-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "focus-autosave-mode"; + ename = "focus-autosave-mode"; version = "20160519.1416"; src = fetchFromGitHub { owner = "Vifon"; @@ -26675,10 +34729,10 @@ rev = "e89ed22aa4dfc76e1b844b202aedd468ad58814a"; sha256 = "1c1mh96kghp5d22assm9kzxlp0cy7bws9yrqwwgaw3d72cba40k3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/focus-autosave-mode"; sha256 = "10cd1x5b1w7apgxd2kq45lv0jlj7az4zmn2iz4iymf2r2hancrcd"; - name = "focus-autosave-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26686,9 +34740,14 @@ license = lib.licenses.free; }; }) {}; - foggy-night-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + foggy-night-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "foggy-night-theme"; + ename = "foggy-night-theme"; version = "20160209.708"; src = fetchFromGitHub { owner = "mswift42"; @@ -26696,10 +34755,10 @@ rev = "60a12abdac29c2d913e1cf24485d0cc083e26093"; sha256 = "1mnak9k0hz99jq2p7gydxajzvx2vcql8yzwcm0v80a6xji2whl70"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/65b3f5959241e601fdf9469e407d153cebcbe24c/recipes/foggy-night-theme"; sha256 = "03x3dhkk81d2zh9nflq6wd7v3khpy9046v8qhq4i9dw6davvy9j4"; - name = "foggy-night-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26707,20 +34766,24 @@ license = lib.licenses.free; }; }) {}; - fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fold-dwim = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fold-dwim"; + ename = "fold-dwim"; version = "20140208.837"; src = fetchFromGitHub { - owner = "emacsmirror"; + owner = "emacsattic"; repo = "fold-dwim"; rev = "c46f4bb2ce91b4e307136320e72c28dd50b6cd8b"; sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim"; - sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d"; - name = "fold-dwim"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/62064e272a658d998b1ccf13dc3c2e3e454acade/recipes/fold-dwim"; + sha256 = "1k5186s69qahwbzvwq70af3bkcglls9a82c5jw5mdw3ic8k631sh"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26728,9 +34791,14 @@ license = lib.licenses.free; }; }) {}; - fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }: - melpaBuild { + fold-dwim-org = callPackage ({ fetchFromGitHub + , fetchurl + , fold-dwim + , lib + , melpaBuild }: + melpaBuild { pname = "fold-dwim-org"; + ename = "fold-dwim-org"; version = "20131203.551"; src = fetchFromGitHub { owner = "mattfidler"; @@ -26738,10 +34806,10 @@ rev = "c09bb2b46d65afbd1d0febc6fded7495be7a3037"; sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97d22d9feaf521ce576b80d2933ecbc166c1dbe7/recipes/fold-dwim-org"; sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn"; - name = "fold-dwim-org"; + name = "recipe"; }; packageRequires = [ fold-dwim ]; meta = { @@ -26749,9 +34817,13 @@ license = lib.licenses.free; }; }) {}; - fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fold-this = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fold-this"; + ename = "fold-this"; version = "20180224.40"; src = fetchFromGitHub { owner = "magnars"; @@ -26759,10 +34831,10 @@ rev = "4fb509a4176e950d083a5321ad62742f2e9bcb7b"; sha256 = "1csazxx6wnnriklbrdqxmf7nc67gqb7c5zppr797bk4j4calskgf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c/recipes/fold-this"; sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d"; - name = "fold-this"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26770,9 +34842,13 @@ license = lib.licenses.free; }; }) {}; - folding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + folding = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "folding"; + ename = "folding"; version = "20170925.838"; src = fetchFromGitHub { owner = "jaalto"; @@ -26780,10 +34856,10 @@ rev = "3bf134fd1ecfa8767ab7020c25281ea5ce9968a2"; sha256 = "0kcm4k71syz778cbwqf68a63k4vmhygaib3ylwxbm5dq1dmr7iry"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1912296b7879019bea5ba8353d511496e3a9ca2d/recipes/folding"; sha256 = "0rb4f4llc4z502znmmc0hfi7n07lp01msx4y1iyqijvqzlq2i93y"; - name = "folding"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26791,9 +34867,14 @@ license = lib.licenses.free; }; }) {}; - font-lock-profiler = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + font-lock-profiler = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "font-lock-profiler"; + ename = "font-lock-profiler"; version = "20170208.1208"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -26801,10 +34882,10 @@ rev = "6e096458416888a4f63cca0d6bc5965a052753c8"; sha256 = "186fvyfbakz54fr8j1l7cijvaklw96m1hfbjyw7nha08zc2m1hw5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b372892a29376bc3f0101ea5865efead41e1df26/recipes/font-lock-profiler"; sha256 = "089r74jgi5gwjk9w1bc600vkj0p5ac84rgcl7aqcpqfbh9ylwcp9"; - name = "font-lock-profiler"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26812,9 +34893,14 @@ license = lib.licenses.free; }; }) {}; - font-lock-studio = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + font-lock-studio = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "font-lock-studio"; + ename = "font-lock-studio"; version = "20170127.1251"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -26822,10 +34908,10 @@ rev = "12c35967b31233e06946c70627aa3152dacfe261"; sha256 = "0q0s6f5vi3sfifj7vq2nnsmgyyivp1sd3idk32858md5ri71qif0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8046fef1ac09cac1113dd5d0a6e1bf8e0c77bb1/recipes/font-lock-studio"; sha256 = "0swwbfaypc78cg4ak24cc92kgxmr1x9vcpaw3jz4zgpm2wzbgmrq"; - name = "font-lock-studio"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26833,9 +34919,15 @@ license = lib.licenses.free; }; }) {}; - font-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }: - melpaBuild { + font-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , persistent-soft }: + melpaBuild { pname = "font-utils"; + ename = "font-utils"; version = "20150806.1051"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -26843,10 +34935,10 @@ rev = "9192d3f8ee6a4e75f34c3fed10378674cc2b11d3"; sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2af0a1644116e89c5a705ffe0885ffe3ee874eaf/recipes/font-utils"; sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5"; - name = "font-utils"; + name = "recipe"; }; packageRequires = [ pcache persistent-soft ]; meta = { @@ -26854,9 +34946,14 @@ license = lib.licenses.free; }; }) {}; - fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fontawesome = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fontawesome"; + ename = "fontawesome"; version = "20170305.556"; src = fetchFromGitHub { owner = "syohex"; @@ -26864,10 +34961,10 @@ rev = "a743f80bfd53767ca9ee32da34c5ca032172a480"; sha256 = "1mkyd2bbyd9avw2qaidkzkpv8i7lfiv9189bj49dxklg92823sip"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome"; sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3"; - name = "fontawesome"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26875,20 +34972,51 @@ license = lib.licenses.free; }; }) {}; - forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fontify-face = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "fontify-face"; + ename = "fontify-face"; + version = "20180420.924"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "fontify-face"; + rev = "fc3325c98427523d86f0b411e0515cec51ac3d8a"; + sha256 = "1zfld9a17xhisfwhmfxvx1x63ksl6jg5g99kbivj4nq70sf26dpw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/72bd6750dd5a7d9ed6e408e690f76c260ffd7d9e/recipes/fontify-face"; + sha256 = "1w7xlkladqkbh7gpnkbi53a7k9p5wzma4y9jgwbc58hng9ggm1k0"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/fontify-face"; + license = lib.licenses.free; + }; + }) {}; + forecast = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "forecast"; - version = "20180106.920"; + ename = "forecast"; + version = "20180429.1515"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "8118551aaf0472900cdfdc13449b55b33ab56289"; - sha256 = "153cch134c6rvqfcpikidlpxcbxk8nys2ig1xxpbn9ncn4fqkaf3"; + rev = "ffe03506694c94de0444995f973a925deccc400a"; + sha256 = "02wcvka96zdlq3myfar7dqywfil2b77bc6ydmgcphwn3as3kl08r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; sha256 = "0zng8xdficpfccq484pghzg8yylihcy8aq0vpxd1w6l40m2qf6zn"; - name = "forecast"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26896,9 +35024,13 @@ license = lib.licenses.free; }; }) {}; - foreign-regexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + foreign-regexp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "foreign-regexp"; + ename = "foreign-regexp"; version = "20180224.321"; src = fetchFromGitHub { owner = "k-talo"; @@ -26906,10 +35038,10 @@ rev = "2ec5c44f27c2396ee487aa0ed77ae47d143fa5aa"; sha256 = "0zww0q8x99sfwzf05pk7blsi3v8xiw4xgmlwnv1qlf2qxjkz1xhb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05514013948a520cf0dcaf1dc2ef2300dd55e98/recipes/foreign-regexp"; sha256 = "189cq8n759f28nx10fn3w4qbq7q49bb788kp9l70pj38jgnjn7n7"; - name = "foreign-regexp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26917,9 +35049,18 @@ license = lib.licenses.free; }; }) {}; - foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + foreman-mode = callPackage ({ dash + , dash-functional + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "foreman-mode"; + ename = "foreman-mode"; version = "20170725.722"; src = fetchFromGitHub { owner = "zweifisch"; @@ -26927,10 +35068,10 @@ rev = "22b3bb13134b617870ed1e888af739f4818be929"; sha256 = "01qanhif24czcmhpdfkcjs019ss4r79f7y2wfbzmj6w4z7g3rikk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edeeb2b52ac70f8bdad38d3af62a7e434853c504/recipes/foreman-mode"; sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv"; - name = "foreman-mode"; + name = "recipe"; }; packageRequires = [ dash dash-functional emacs f s ]; meta = { @@ -26938,9 +35079,14 @@ license = lib.licenses.free; }; }) {}; - forest-blue-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + forest-blue-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "forest-blue-theme"; + ename = "forest-blue-theme"; version = "20160627.142"; src = fetchFromGitHub { owner = "olkinn"; @@ -26948,10 +35094,10 @@ rev = "58096ce1a25615d2bae806c3775bae3e2775019d"; sha256 = "1qm74cfnc13wgv0c3657nd3xbgn492r24m5m2i0ipnpq49cddccf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49b8686c31f863dde58d56cddf0baa7757a0c453/recipes/forest-blue-theme"; sha256 = "1pcpwil883k4n5na7jpq7h8a8gw6mily1cj5n5rf25lqqnsz6fxa"; - name = "forest-blue-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26959,9 +35105,13 @@ license = lib.licenses.free; }; }) {}; - form-feed = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + form-feed = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "form-feed"; + ename = "form-feed"; version = "20160102.1453"; src = fetchFromGitHub { owner = "wasamasa"; @@ -26969,10 +35119,10 @@ rev = "799ca3e72b20a59a755a094b8cead57f654f3170"; sha256 = "0nj056x87gcpdqkgx3li5syp6wbj58a1mw2aqa48zflbqwyvs03i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/468503d8103766e8196e977325e3bcb696219f6b/recipes/form-feed"; sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh"; - name = "form-feed"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26980,9 +35130,39 @@ license = lib.licenses.free; }; }) {}; - format-sql = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + format-all = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "format-all"; + ename = "format-all"; + version = "20180722.159"; + src = fetchFromGitHub { + owner = "lassik"; + repo = "emacs-format-all-the-code"; + rev = "6b0bd2fadb8f672e93bc58f2de94be97f5a1b6d6"; + sha256 = "1y2y2ank4bll0h4bsd0d60aqq5hlylna9zvg18q3n68isqagn7zh"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f53143ebd42ef5be793b86d50b23f0a57617d6cc/recipes/format-all"; + sha256 = "1kmnv8ypxvgm3p79cc1wk8032fh7bl1pripys180vw89r2748qs9"; + name = "recipe"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/format-all"; + license = lib.licenses.free; + }; + }) {}; + format-sql = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "format-sql"; + ename = "format-sql"; version = "20150422.633"; src = fetchFromGitHub { owner = "paetzke"; @@ -26990,10 +35170,10 @@ rev = "97f475c245cd6c81a72a265678e2087cee66ac7b"; sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/085c03104aa5a809a112525547eec51100b6fb09/recipes/format-sql"; sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj"; - name = "format-sql"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27001,9 +35181,13 @@ license = lib.licenses.free; }; }) {}; - forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + forth-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "forth-mode"; + ename = "forth-mode"; version = "20170527.1230"; src = fetchFromGitHub { owner = "larsbrinkhoff"; @@ -27011,10 +35195,10 @@ rev = "522256d98d1a909983bcfd3ae20c65226d5929b6"; sha256 = "110ycl8zkimy2818rhp3hk3mn2y25m695shdsy6dwxnrv90agss6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode"; sha256 = "0j60abi5qyy94f4as90zhmkb12jdirysdbq4ajs5h91vi6gb1g3i"; - name = "forth-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27022,9 +35206,17 @@ license = lib.licenses.free; }; }) {}; - fortpy = callPackage ({ auto-complete, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, python-environment }: - melpaBuild { + fortpy = callPackage ({ auto-complete + , epc + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pos-tip + , python-environment }: + melpaBuild { pname = "fortpy"; + ename = "fortpy"; version = "20150715.1332"; src = fetchFromGitHub { owner = "rosenbrockc"; @@ -27032,10 +35224,10 @@ rev = "c614517e9396ef7a78be3b8786fbf303879cf43b"; sha256 = "1nqx2igxmwswjcrnzdjpx5qcjr60zjy3q9cadq5disms17wdcr6y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b277e19f5f9f6605f3e9b7afac95152dac0599/recipes/fortpy"; sha256 = "1nn5vx1rspfsijwhilnjhiy0mjw154ds3lwxvkpwxpchygirlyxj"; - name = "fortpy"; + name = "recipe"; }; packageRequires = [ auto-complete epc pos-tip python-environment ]; meta = { @@ -27043,9 +35235,13 @@ license = lib.licenses.free; }; }) {}; - fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fortune-cookie = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fortune-cookie"; + ename = "fortune-cookie"; version = "20170407.1517"; src = fetchFromGitHub { owner = "andschwa"; @@ -27053,10 +35249,10 @@ rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6"; sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie"; sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78"; - name = "fortune-cookie"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27064,20 +35260,25 @@ license = lib.licenses.free; }; }) {}; - fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fountain-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fountain-mode"; - version = "20180316.914"; + ename = "fountain-mode"; + version = "20180715.145"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "8269066a9035fcf50eb835de3745a62c1cb96660"; - sha256 = "1s1wyhjdyp12iz3zk333z5wlbxl5x3hki9q16164fk9ifhkrppxd"; + rev = "3f253598f2eb6c5eec71af967978a3ecf890240d"; + sha256 = "1m3fq5mg87v48y0v9a5mlxjs49yqxkb718r6ympbihzknjh2a0qq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840"; - name = "fountain-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -27085,9 +35286,14 @@ license = lib.licenses.free; }; }) {}; - fraktur-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fraktur-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fraktur-mode"; + ename = "fraktur-mode"; version = "20160814.1927"; src = fetchFromGitHub { owner = "grettke"; @@ -27095,10 +35301,10 @@ rev = "514baf5546aed12a0d9fa0fe66e87cdcc7843b08"; sha256 = "169d9j7jk3li96fkn2sr257835flkcpml24l4bmzp8j3q57a7wxw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fraktur-mode"; sha256 = "0hy2cncbgpp7ysp7qwfpj0r075rxrc77bmc70bw7hf8m1xiw124k"; - name = "fraktur-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -27106,20 +35312,52 @@ license = lib.licenses.free; }; }) {}; - frame-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + frame-local = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "frame-local"; + ename = "frame-local"; + version = "20180330.240"; + src = fetchFromGitHub { + owner = "sebastiencs"; + repo = "frame-local"; + rev = "51c0889602626e2dcc6f1c1a812b058bc96df03c"; + sha256 = "1ccq4iw1d4hy3irimci42knh66ix0vfzd3nm2wh63ygiaf1rjakw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/556179857e2b46f5a48b45e1b71cd460ffd9f7d7/recipes/frame-local"; + sha256 = "1lz4xmz67l99xbyg9gvgzl06yqh61xhr29vfhv68kq5pg5m881vs"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/frame-local"; + license = lib.licenses.free; + }; + }) {}; + frame-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "frame-mode"; + ename = "frame-mode"; version = "20170419.1427"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "frame-mode"; - rev = "fcdbafbda45758cd60ab3acb492fbbd692987a58"; - sha256 = "1sdxbjxx1lk2j220794af2qz9z068bmx55drm8h0b8kih0037ydn"; + rev = "c0feebf8eab91ac0646a4d30be946e551bb5267f"; + sha256 = "19a7vxr1qhxr1yh9mvlhrbnpmqk9qmbmb4gwxrwdsqrac3fs3lr7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e83da89eeee834cc14c0b128d55ef3634f76fd0/recipes/frame-mode"; sha256 = "0ch58x07fnsx3v3r9cvcmqrqws121m8achjilhqk988hkg7y47c8"; - name = "frame-mode"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -27127,9 +35365,42 @@ license = lib.licenses.free; }; }) {}; - frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + frame-purpose = callPackage ({ dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "frame-purpose"; + ename = "frame-purpose"; + version = "20180623.1757"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "frame-purpose.el"; + rev = "6cff3bff74f9cf1dc31bbc5e1f9a513a5f55def6"; + sha256 = "08pmmzjdbvp09rxn3d332101qmg6c4xx2y6dwzczii70ac7m5v9f"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/033bd36a2419f4521944ccbfe8ce1eb56af20472/recipes/frame-purpose"; + sha256 = "0mvzryfakz5g8smsg4ciaa0bs0jp692rnjbahp9vl62ml5dp62fz"; + name = "recipe"; + }; + packageRequires = [ dash dash-functional emacs ]; + meta = { + homepage = "https://melpa.org/#/frame-purpose"; + license = lib.licenses.free; + }; + }) {}; + frame-tag = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "frame-tag"; + ename = "frame-tag"; version = "20170110.1606"; src = fetchFromGitHub { owner = "liangzan"; @@ -27137,10 +35408,10 @@ rev = "73d6163568c7d32952175e663318b872f995a4e5"; sha256 = "1ks8qw1vq30mjp7bpgrk3f11jhm9viibiap6zjk8r5rykjzl1ifv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e69899b53c158903b9b147754021acf1a6136eda/recipes/frame-tag"; sha256 = "1n13xcc3ny9j9h1h4vslpjl6k9mqksr73kgmqrmkq301p8zps94q"; - name = "frame-tag"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -27148,20 +35419,27 @@ license = lib.licenses.free; }; }) {}; - frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + frames-only-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "frames-only-mode"; + ename = "frames-only-mode"; version = "20180114.1048"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "4dbc6871d8220cb95d287dd35475725a1b7662ab"; - sha256 = "19y23jdfp9i950vl8ahywfh6gkf8cmy0nd3fk931xkx0x5kp64h9"; + rev = "9ebd895574bb0b3e4ef111d522b8039e274e8afc"; + sha256 = "03fis931cb5k7a0jjjgkzmq30g43543kinr8hw6z8xkaivh2yixy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h"; - name = "frames-only-mode"; + name = "recipe"; }; packageRequires = [ dash emacs s ]; meta = { @@ -27169,20 +35447,25 @@ license = lib.licenses.free; }; }) {}; - frameshot = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + frameshot = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "frameshot"; + ename = "frameshot"; version = "20180228.408"; src = fetchFromGitHub { owner = "tarsius"; repo = "frameshot"; - rev = "4e7b252e9fd9227de8b25f384af2c855ec45279a"; - sha256 = "020irzkqr7gs99xsvdd0haja0jvw46dk40xi7ab0m3cq7957srjh"; + rev = "65994602fdf3d8881f0cabffebbce6c0e493e3c8"; + sha256 = "0crvvacpajlhdida54gvv4y11xx78qscr6nznx0bhdb12sj3n45q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot"; sha256 = "1z5f988m9s25miyxbhaxk6m4af9afvblb2p5mdidva04szjklr70"; - name = "frameshot"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -27190,9 +35473,14 @@ license = lib.licenses.free; }; }) {}; - framesize = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: - melpaBuild { + framesize = callPackage ({ fetchFromGitHub + , fetchurl + , key-chord + , lib + , melpaBuild }: + melpaBuild { pname = "framesize"; + ename = "framesize"; version = "20131017.1432"; src = fetchFromGitHub { owner = "nicferrier"; @@ -27200,10 +35488,10 @@ rev = "f2dbf5d2513b2bc45f2085370a55c1754b6025da"; sha256 = "11h9xw6jnw7dacyv1jch2a77xp7hfb93690m7hhazy6l87xmm4dk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c53062af16b26b6f64bd63fa62d7e9db264768f3/recipes/framesize"; sha256 = "1rwiwx3n7gkpfihbf6ndl1lxza4zi2rlj5av6lfp5qypbw9wddkf"; - name = "framesize"; + name = "recipe"; }; packageRequires = [ key-chord ]; meta = { @@ -27211,9 +35499,16 @@ license = lib.licenses.free; }; }) {}; - frecency = callPackage ({ a, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + frecency = callPackage ({ a + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "frecency"; + ename = "frecency"; version = "20170908.2331"; src = fetchFromGitHub { owner = "alphapapa"; @@ -27221,10 +35516,10 @@ rev = "132130088ef5695cffed6fcacfa219cb0c389026"; sha256 = "17s34gaq6jvwr6f4l500xyhv33ykwxiwzsq2rrasgs7l301wqsw0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6e855d01e0b1c9a23c006af67c487719c50bd/recipes/frecency"; sha256 = "033zhzwvh23igfqxbiy68cq6i1wflna19pbg81r0hh9kcfg2afpa"; - name = "frecency"; + name = "recipe"; }; packageRequires = [ a dash emacs ]; meta = { @@ -27232,9 +35527,14 @@ license = lib.licenses.free; }; }) {}; - free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + free-keys = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "free-keys"; + ename = "free-keys"; version = "20160726.1350"; src = fetchFromGitHub { owner = "Fuco1"; @@ -27242,10 +35542,10 @@ rev = "edfd69dc369b2647447b7c28c7c1163b1ddf45b4"; sha256 = "0xgifa7s9n882f9ymyyz9gc11xfbj3vfpnxiq1fqfm5hmwx9pwbc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55067e899ba618d4394ad9657322c92a667a0774/recipes/free-keys"; sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj"; - name = "free-keys"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -27253,9 +35553,13 @@ license = lib.licenses.free; }; }) {}; - fringe-current-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fringe-current-line = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fringe-current-line"; + ename = "fringe-current-line"; version = "20140110.2011"; src = fetchFromGitHub { owner = "kyanagi"; @@ -27263,10 +35567,10 @@ rev = "0ef000bac76abae30601222e6f06c7d133ab4942"; sha256 = "0zwlnzbi91hkfz1jgj9s9pxwi21s21cwp6psdm687wj2a3wy4231"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaaa6f7f2f753a7c8489415ae406c4169eda9fa8/recipes/fringe-current-line"; sha256 = "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8"; - name = "fringe-current-line"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27274,20 +35578,24 @@ license = lib.licenses.free; }; }) {}; - fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fringe-helper = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fringe-helper"; + ename = "fringe-helper"; version = "20140620.1409"; src = fetchFromGitHub { owner = "nschum"; repo = "fringe-helper.el"; - rev = "ef4a9c023bae18ec1ddd7265f1f2d6d2e775efdd"; - sha256 = "0ra9rc53l1gvkqank8apasl3r7wz2yfjrcvmfk3wpxhh24ppxv9d"; + rev = "9bc3d3e82c9cc3937aa090248dc4dd2e289fc55c"; + sha256 = "0vqpgvjxh9dqc6is2ai1nrnwhv3fwx5b2nyhq5w3qr056hi995av"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fringe-helper"; sha256 = "1i5wra4j0rvrsl9vbg7fzga8cadw43ka2rwdj1m11wq8m3cs8g7m"; - name = "fringe-helper"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27295,9 +35603,13 @@ license = lib.licenses.free; }; }) {}; - fsbot-data-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fsbot-data-browser = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fsbot-data-browser"; + ename = "fsbot-data-browser"; version = "20160921.833"; src = fetchFromGitHub { owner = "benaiah"; @@ -27305,10 +35617,10 @@ rev = "6bca4f7de63e31839d2542f6c678b79931dec344"; sha256 = "0lvpgfp89sz6f6rn576g1g88s0q3ibj5ghydjwfcg9w6h7vx5b5s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37a0901b98e1c66be6906234e6d6520a6e940e97/recipes/fsbot-data-browser"; sha256 = "0jijvl07jk200fs01ln4dmw5nx9jg3f9b7gjaknyd18vyvbwr3s5"; - name = "fsbot-data-browser"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27316,20 +35628,31 @@ license = lib.licenses.free; }; }) {}; - fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: - melpaBuild { + fsharp-mode = callPackage ({ company + , company-quickhelp + , dash + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , popup + , pos-tip + , s }: + melpaBuild { pname = "fsharp-mode"; - version = "20171021.431"; + ename = "fsharp-mode"; + version = "20180518.1120"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "5504550605354146842c8f5c34482ece778b7b31"; - sha256 = "0hjqgyjch8fdz54akcpw5kmx2z1yvck6k8qyc0mzzmb54iiayf5a"; + rev = "68d2121a7317d90fe3794c9295d117f4aebd1438"; + sha256 = "0mymvik20slbgsasjpn6nkqcb4z6z4mvd1sf1xalv0qjk24vrlmk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z"; - name = "fsharp-mode"; + name = "recipe"; }; packageRequires = [ company @@ -27345,20 +35668,31 @@ license = lib.licenses.free; }; }) {}; - fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: - melpaBuild { + fstar-mode = callPackage ({ company + , company-quickhelp + , dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , quick-peek + , yasnippet }: + melpaBuild { pname = "fstar-mode"; - version = "20180319.2121"; + ename = "fstar-mode"; + version = "20180713.1329"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "2b8c41cb18d2433bd2379522e1441c51eae0b5e0"; - sha256 = "1im2arr9885zx6j4njlj7ngmhmi1varnllxbw3xj37bl0abgcngi"; + rev = "a42763cdd81d6520651dfaad7a7e8c7388bad54c"; + sha256 = "10nbzm22p9pgsh6zgc9fjy3v1i5vw8877g8f4x3fi8lvpv1ynwps"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; sha256 = "1kwa6gqh91265vpp4gcady2brkizfkfjj0gnya9lar6x7rn4gj7s"; - name = "fstar-mode"; + name = "recipe"; }; packageRequires = [ company @@ -27374,20 +35708,26 @@ license = lib.licenses.free; }; }) {}; - fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fuel = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fuel"; + ename = "fuel"; version = "20180224.1411"; src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "9b2eac2942d777572e330ba5231e1ee3c0a4eea8"; - sha256 = "1sz3n3dfrga2zgwmn7fy21vhgfw51ma8pbgr459hfq9ay96yvd94"; + rev = "780bbd49cf82c9746ca5a3f42f4a4a27266ccee9"; + sha256 = "1fs6200rsbnk2lagz8qj17iynaf4c1fvb6sm03i53shsbarak2c3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; sha256 = "08hzzg5dhqkl5c5lfhwcwmx8m8z3k1nxshn2wlpqf5gch8f2nj6z"; - name = "fuel"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -27395,9 +35735,14 @@ license = lib.licenses.free; }; }) {}; - fuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + fuff = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "fuff"; + ename = "fuff"; version = "20170202.703"; src = fetchFromGitHub { owner = "joelmo"; @@ -27405,10 +35750,10 @@ rev = "278e849913df87bd8756c59382282d87474802c3"; sha256 = "12s25c0abvghkhfbxcf77d2dc20y3xn9df7mfk8mkfwnlwdss2ga"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d0fc6d19559a9ea1bb7fce0c26a2dd65fc71603/recipes/fuff"; sha256 = "080a2lz6mv629c68z44qrrww080gy2iggfzajdq54rr8i23y14vf"; - name = "fuff"; + name = "recipe"; }; packageRequires = [ seq ]; meta = { @@ -27416,20 +35761,24 @@ license = lib.licenses.free; }; }) {}; - full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + full-ack = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "full-ack"; + ename = "full-ack"; version = "20140223.932"; src = fetchFromGitHub { owner = "nschum"; repo = "full-ack"; - rev = "761d846e105b150f8e6d13d7a8983f0248313a45"; - sha256 = "0bjny4ryrs788myhiaf3ir99vadf2v4swa5gkz9i36a7j6wzpgk5"; + rev = "8345753e9569dabf6426a837f29387557e32f2af"; + sha256 = "0x0c6cvsgzcc6336k9bz7pcjpg6s6w6cjlqbsafdqv8yx5ll59jd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/full-ack"; sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309"; - name = "full-ack"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27437,9 +35786,14 @@ license = lib.licenses.free; }; }) {}; - fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fullframe = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fullframe"; + ename = "fullframe"; version = "20170816.303"; src = fetchFromGitHub { owner = "tomterl"; @@ -27447,10 +35801,10 @@ rev = "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd"; sha256 = "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13d1dc5c39543b65c6bb4150c3690211872c00dc/recipes/fullframe"; sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a"; - name = "fullframe"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -27458,9 +35812,14 @@ license = lib.licenses.free; }; }) {}; - function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + function-args = callPackage ({ fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "function-args"; + ename = "function-args"; version = "20171031.1004"; src = fetchFromGitHub { owner = "abo-abo"; @@ -27468,10 +35827,10 @@ rev = "609b25305670fff08d5e357298e7128e4f4e3497"; sha256 = "1xymwk42n2l7c7iaigz23i4l580qpjgq8nqhgr4mnw6invdsgg2c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args"; sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak"; - name = "function-args"; + name = "recipe"; }; packageRequires = [ ivy ]; meta = { @@ -27479,9 +35838,14 @@ license = lib.licenses.free; }; }) {}; - fuo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fuo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fuo"; + ename = "fuo"; version = "20180314.948"; src = fetchFromGitHub { owner = "cosven"; @@ -27489,10 +35853,10 @@ rev = "5318bef9d935b53031e6312652554920def69af2"; sha256 = "02f4kl1y277pry13hz1jscdh2nrbn3xp7zm1dmqyn8yfhn1s1yx2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25fb625becf7f582d2a8d53726d6f01d9ea89ecc/recipes/fuo"; sha256 = "02mvgz2cxrdn5kp5dw0c57rl5nfavqli5yqbxczmbsih164ljdxf"; - name = "fuo"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -27500,9 +35864,13 @@ license = lib.licenses.free; }; }) {}; - furl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + furl = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "furl"; + ename = "furl"; version = "20150508.2016"; src = fetchFromGitHub { owner = "nex3"; @@ -27510,10 +35878,10 @@ rev = "014438271e0ef27333dfcd599cb247f12a20d870"; sha256 = "0wrmbvx0risdjkaxqmh4li6iwvg4635cdpjvw32k2wkdsyn2dlsb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/furl"; sha256 = "1z3yqx95qmvpi6vkkgcwvkmw96s24h8ssd5gc06988picw6vj76f"; - name = "furl"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27521,20 +35889,25 @@ license = lib.licenses.free; }; }) {}; - futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + futhark-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "futhark-mode"; - version = "20171026.722"; + ename = "futhark-mode"; + version = "20180619.949"; src = fetchFromGitHub { - owner = "HIPERFIT"; - repo = "futhark"; - rev = "59fb36049fc1de0db5557db2ceaace367c2f9da1"; - sha256 = "0pix26f019ny5yjnk838awk007z3rb56zviqk66c3bfwb8abj5md"; + owner = "diku-dk"; + repo = "futhark-mode"; + rev = "f834d03aeef2230315e541646e375e6c38a6a10c"; + sha256 = "0ma8v56lv8bbb5159wg2nv286s5nn3jnjfy8kmrx751sw7jmzr2l"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; - sha256 = "1k22xkg6vd60hk58zkxhmsw2gs6ikzmidvxcdglnr46m6x7r7pnq"; - name = "futhark-mode"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/97210774b450b7611d2bfdf36e04a425835d86b9/recipes/futhark-mode"; + sha256 = "1sck984a8m0i9n07jnhpnin6k060756g73ix34ghzd65j5f0pvlw"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -27542,9 +35915,13 @@ license = lib.licenses.free; }; }) {}; - fuzzy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fuzzy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fuzzy"; + ename = "fuzzy"; version = "20150729.2037"; src = fetchFromGitHub { owner = "auto-complete"; @@ -27552,10 +35929,10 @@ rev = "534d723ad2e06322ff8d9bd0ba4863d243f698e7"; sha256 = "0rzp8c2164w775ggm2fs4j5dz33vqcah84ysp81majirwfql1niv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0197df173fbd7ec1e7e35c47476fcf2aaa483f/recipes/fuzzy"; sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h"; - name = "fuzzy"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27563,9 +35940,13 @@ license = lib.licenses.free; }; }) {}; - fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fvwm-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fvwm-mode"; + ename = "fvwm-mode"; version = "20160411.438"; src = fetchFromGitHub { owner = "theBlackDragon"; @@ -27573,10 +35954,10 @@ rev = "6832a1c1f68bf6249c3fd6672ea8e27dc7a5c79e"; sha256 = "03zmk4v259pqx7gkwqq95lccn78rwmh7iq5j0d5jj4jf9h39rr20"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac39130f8a031d6fe7df4411a5f94f2cdf652449/recipes/fvwm-mode"; sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb"; - name = "fvwm-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27584,9 +35965,13 @@ license = lib.licenses.free; }; }) {}; - fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fwb-cmds = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fwb-cmds"; + ename = "fwb-cmds"; version = "20180318.1519"; src = fetchFromGitHub { owner = "tarsius"; @@ -27594,10 +35979,10 @@ rev = "90258a5c7dbbaa2ac227e0fb4ff6c7d5aec3628f"; sha256 = "1xwvv8wjgdaz96v1x1xc5w697bfvcanlcixd0n5qbx6ryakqrb72"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds"; sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx"; - name = "fwb-cmds"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27605,20 +35990,25 @@ license = lib.licenses.free; }; }) {}; - fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + fxrd-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "fxrd-mode"; + ename = "fxrd-mode"; version = "20170728.1101"; src = fetchFromGitHub { owner = "msherry"; repo = "fxrd-mode"; - rev = "18a603474abb5a786a8d9f20c283d5f7beed3540"; - sha256 = "1yprlpxxh7bbxg8filgb00lqqlavbz03h7hqf4280aiypkwi0y86"; + rev = "795b969346982b75e24b5c8619b46197982fbb4d"; + sha256 = "0aha13vqj6ygyr7bflrxll837g4z6wrmrhh5rhcd0vphqg70frgn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode"; sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r"; - name = "fxrd-mode"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -27626,9 +36016,13 @@ license = lib.licenses.free; }; }) {}; - fyure = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fyure = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fyure"; + ename = "fyure"; version = "20130216.514"; src = fetchFromGitHub { owner = "mooz"; @@ -27636,10 +36030,10 @@ rev = "b6977f1eb148e8b63259f7233b55bb050e44d9b8"; sha256 = "08x5li0mshrlamr7vswy7xh358bqhh3pngjr4ckswfi0l2r5fjbd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27f4188f460060277ad2f5422bc2bde8e6fd3ff3/recipes/fyure"; sha256 = "0k5z2xqlrzp5lyvp2lr462x38kqdmqld845bvyvkfjd2k4yri71x"; - name = "fyure"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27647,20 +36041,25 @@ license = lib.licenses.free; }; }) {}; - fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fzf = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fzf"; - version = "20180102.1712"; + ename = "fzf"; + version = "20180618.1845"; src = fetchFromGitHub { owner = "bling"; repo = "fzf.el"; - rev = "b750cccae7c37a9ee4d40d928bb508cc3234bfbf"; - sha256 = "0a1g7bv4qakzzrvvsh5m5ic3yhha57fj3d09gmr7rb5b3p2kl5cz"; + rev = "521d18933cb586337c4e34281bdc71ac07202c98"; + sha256 = "0fpzjslbhhwvs4nh5dxj9cyxyiw6n8qmg76mvq73k5mc8pk7d4ir"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0"; - name = "fzf"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -27668,30 +36067,67 @@ license = lib.licenses.free; }; }) {}; - gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gams-ac = callPackage ({ auto-complete + , emacs + , fetchFromGitHub + , fetchurl + , gams-mode + , lib + , melpaBuild }: + melpaBuild { + pname = "gams-ac"; + ename = "gams-ac"; + version = "20180423.226"; + src = fetchFromGitHub { + owner = "ShiroTakeda"; + repo = "gams-ac"; + rev = "66d04ff36033f54205c19bc1d893e926d4dbf02e"; + sha256 = "1hjbzwgzwqwpyfm8db1r1q14bbk42hrl5469gqfzjq0423wy7szw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca2681b39ac5a985c2f70b4b84ee3c10af1a7ca4/recipes/gams-ac"; + sha256 = "03w9ffscwaaspwxmrqhrfws0qjk3xxzz63k5wkrhx37899w75qha"; + name = "recipe"; + }; + packageRequires = [ auto-complete emacs gams-mode ]; + meta = { + homepage = "https://melpa.org/#/gams-ac"; + license = lib.licenses.free; + }; + }) {}; + gams-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gams-mode"; - version = "20180326.2325"; + ename = "gams-mode"; + version = "20180416.206"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "2d6b5c29d84a42421ddc2f7f1e9c3a141d81c31c"; - sha256 = "0cri329g0b7ywqarg4jlmry574z7v15gdd9j7jnikq1s2jjgnb85"; + rev = "0a7f3f5d44ea59c34677049882f0a34ff9935bc9"; + sha256 = "0wl2dfcfvjy23gcwk6qfxbxjlykw438fi9h1y2855adcc9zrhwzx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci"; - name = "gams-mode"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/gams-mode"; license = lib.licenses.free; }; }) {}; - gandalf-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gandalf-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gandalf-theme"; + ename = "gandalf-theme"; version = "20130809.247"; src = fetchFromGitHub { owner = "ptrv"; @@ -27699,10 +36135,10 @@ rev = "4e472fc851431458537d458d09c1f5895e338536"; sha256 = "0sn3y1ilbg532mg941qmzipvzq86q31x86ypaf0h0m4015r7l59v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4354bbc1ec16783dd286d69fd6e4682ae63e28f9/recipes/gandalf-theme"; sha256 = "0wkmsg3pdw98gyp3q508wsqkzw821qsqi796ynm53zd7a4jfap4p"; - name = "gandalf-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27710,18 +36146,23 @@ license = lib.licenses.free; }; }) {}; - gap-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + gap-mode = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gap-mode"; + ename = "gap-mode"; version = "20160204.736"; src = fetchhg { url = "https://bitbucket.com/gvol/gap-mode"; rev = "617eff4ff846"; sha256 = "08dx8ijivhsfmqkxn33121qcjd6nckpn0jdlh0lhx4z4zg8x37bl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83ec19a4ebac6b2d0fd84939b393848f82620978/recipes/gap-mode"; sha256 = "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2"; - name = "gap-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27729,20 +36170,24 @@ license = lib.licenses.free; }; }) {}; - gather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gather = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gather"; + ename = "gather"; version = "20141230.538"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-gather"; - rev = "50809fbc22d70a1c724c2dd99ac5a1f818ffeb6b"; - sha256 = "0j0dg7nl9kmanayvw0712x5c5x9h48qmqdsyi0pijvgmv8l5slg5"; + rev = "8909c886d72a682710bb79ccfcfe4df54a399b7e"; + sha256 = "0nj5fbn22ihfsdlb5bhj0ph71gkhrgfbb3540sx1x35gqfhb6p4g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/595e40c7102294684badf86deb72d86bbc3c1426/recipes/gather"; sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk"; - name = "gather"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27750,9 +36195,14 @@ license = lib.licenses.free; }; }) {}; - gdscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gdscript-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gdscript-mode"; + ename = "gdscript-mode"; version = "20180117.2056"; src = fetchFromGitHub { owner = "AdamBark"; @@ -27760,10 +36210,10 @@ rev = "31af5283eaec207bc864022a28e2824132471eaf"; sha256 = "0f24zsklkhhvj6qdyid2j1qcyhjnncxjma93zhr0klvn5j1z3aar"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52f99eafb2e80a7fa13a98add98b03a147f35e8b/recipes/gdscript-mode"; sha256 = "0v4ab5xxpq1kya2is5qq61fmfgxgvbigyz7wp907z3mc00kg2818"; - name = "gdscript-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -27771,9 +36221,15 @@ license = lib.licenses.free; }; }) {}; - geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + geben = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "geben"; + ename = "geben"; version = "20170801.551"; src = fetchFromGitHub { owner = "ahungry"; @@ -27781,10 +36237,10 @@ rev = "ec3f5e9376cf1ea5615990bd8c212543d57f033b"; sha256 = "0860nnarbm76jp40v7p5d2wdnq12p03paiw17g3h5p27wnaj611d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; sha256 = "1ai1qcx76m8xh80c8zixq9cqbhnqmj3jk3r7lj3ngbiwx4pnlnwf"; - name = "geben"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -27792,20 +36248,27 @@ license = lib.licenses.free; }; }) {}; - geben-helm-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, geben, helm-projectile, lib, melpaBuild }: - melpaBuild { + geben-helm-projectile = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , geben + , helm-projectile + , lib + , melpaBuild }: + melpaBuild { pname = "geben-helm-projectile"; + ename = "geben-helm-projectile"; version = "20160610.1759"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben-helm-projectile"; - rev = "31ce0faca5dcc71924884f03fd5a7a25d00ccd9b"; - sha256 = "0a1srhwfbgkvndjfi9irg5s6snlxyqrw1vwyqg1sn8aqnbpgib04"; + rev = "14db489efcb20c5aa9102288c94cec3c5a87c35d"; + sha256 = "1nd1jhy393vkn2g65zhygxkpgna0l8gkndxr8jb6qjkkapk58k8l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7d28c45304a69e6ca78b3d00df2563171c027ee/recipes/geben-helm-projectile"; sha256 = "11zhapys6wx2cadflvjimsmilwvjpfd4ihwzzmap8shxpyllsq9r"; - name = "geben-helm-projectile"; + name = "recipe"; }; packageRequires = [ emacs geben helm-projectile ]; meta = { @@ -27813,9 +36276,14 @@ license = lib.licenses.free; }; }) {}; - geeknote = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + geeknote = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "geeknote"; + ename = "geeknote"; version = "20160717.549"; src = fetchFromGitHub { owner = "avendael"; @@ -27823,10 +36291,10 @@ rev = "8ed607c76864afcc9c338972ab093caf4501cbf8"; sha256 = "1dadsyvkzf0rg6immjdjkb0k7iaqh3hm1w9qhap94j54j7v75w2q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/geeknote"; sha256 = "03q0ca8m110qw8wczyyx94gwqymwnmamahw30j7fqkq6ry19yqsm"; - name = "geeknote"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -27834,20 +36302,24 @@ license = lib.licenses.free; }; }) {}; - geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + geiser = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "geiser"; - version = "20180329.548"; - src = fetchFromGitHub { + ename = "geiser"; + version = "20180626.440"; + src = fetchFromGitLab { owner = "jaor"; repo = "geiser"; - rev = "23bc15197dfed3773283b2cacbda47678635f22a"; - sha256 = "0cjb4lj9xbmw3g1mnghd2ig00d5gjksz1an8j12hkmydzj1psmdv"; + rev = "1bdd966a4fbe0c8bd5bcb04dad5213e47a1534e6"; + sha256 = "165vssixx16lvig7hjgh75pi15r53s3n8fn8wyfzdbnkihkwmqbk"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; - sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596"; - name = "geiser"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/67dc8d6e33f3522043f96761b23ea68c9c27084e/recipes/geiser"; + sha256 = "1g7z6c3lfa7slwrxk7q8awqs39qibcv2kc4c2fwlwvgbcfhkw085"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27855,20 +36327,26 @@ license = lib.licenses.free; }; }) {}; - general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + general = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "general"; - version = "20180327.1753"; + ename = "general"; + version = "20180628.1112"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "ce3bc12bd6b928310f7a13f855e5c86183d1e0c2"; - sha256 = "08jbmln6mpqc6xmf0d606baai25y26l67a68i2cfns09gk8k8pqi"; + rev = "e690ef9e706f7eea071357520709ef5407a42159"; + sha256 = "1kgd0v9lgwsxa1p7n3cgsd2f62wi86hcjslb0vf96b9l1n1wjwdl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; sha256 = "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc"; - name = "general"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -27876,9 +36354,17 @@ license = lib.licenses.free; }; }) {}; - genrnc = callPackage ({ concurrent, deferred, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + genrnc = callPackage ({ concurrent + , deferred + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "genrnc"; + ename = "genrnc"; version = "20140612.537"; src = fetchFromGitHub { owner = "aki2o"; @@ -27886,10 +36372,10 @@ rev = "da75b1966a73ad215ec2ced4522c25f4d0bf1f9a"; sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd2d908ba5fa96d90643091573939e54d9165aaa/recipes/genrnc"; sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm"; - name = "genrnc"; + name = "recipe"; }; packageRequires = [ concurrent deferred log4e yaxception ]; meta = { @@ -27897,9 +36383,13 @@ license = lib.licenses.free; }; }) {}; - german-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + german-holidays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "german-holidays"; + ename = "german-holidays"; version = "20161011.13"; src = fetchFromGitHub { owner = "rudolfochrist"; @@ -27907,10 +36397,10 @@ rev = "d7d540c229c1a8be68ee09fbda08fe3ea31b7d29"; sha256 = "1rfka83jwd68k93vn3f7llxd6z0ma5k98gws0081y8i9fc21fnsd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5b3807ff989b13f95e8d6fad2f26a42ff0643c/recipes/german-holidays"; sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn"; - name = "german-holidays"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27918,9 +36408,15 @@ license = lib.licenses.free; }; }) {}; - gerrit-download = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + gerrit-download = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "gerrit-download"; + ename = "gerrit-download"; version = "20150714.708"; src = fetchFromGitHub { owner = "chmouel"; @@ -27928,10 +36424,10 @@ rev = "d568acc7c5935188c9bc19ba72719a6092d9f6fd"; sha256 = "1ch8yp0mgk57x0pny9bvkknsqj27fd1rcmpm9s7qpryrwqkp1ix4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18725e799efd1694ff2397b6c877f926ac5f4ce8/recipes/gerrit-download"; sha256 = "1rlz0iqgvr8yxnv5qmk29xs1jwf0g0ckzanlyldcxvs7n6mhkjjp"; - name = "gerrit-download"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -27939,20 +36435,51 @@ license = lib.licenses.free; }; }) {}; - ggo-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gf = callPackage ({ fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "gf"; + ename = "gf"; + version = "20180606.1455"; + src = fetchFromGitHub { + owner = "grammaticalframework"; + repo = "gf-emacs-mode"; + rev = "41070ecd1cd64fa52cf299dc09a5ea19aca4cf05"; + sha256 = "090jy6p94syvf20b61l2jnm7m5pv6d2qxfjhr1wm0bg1wkvyw50c"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2cc74eb19c54219cd5c5c11d886074859f0948/recipes/gf"; + sha256 = "170q5a7lwa9pbpn0ghcfzny0jfn42wgns1lcv8fngr0k1njfj6v8"; + name = "recipe"; + }; + packageRequires = [ ht s ]; + meta = { + homepage = "https://melpa.org/#/gf"; + license = lib.licenses.free; + }; + }) {}; + ggo-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ggo-mode"; + ename = "ggo-mode"; version = "20130524.443"; src = fetchFromGitHub { owner = "mkjunker"; repo = "ggo-mode"; - rev = "e326899d9ed8217c7a4ea6cfdc4dd7aea61d6c1b"; - sha256 = "0bwjiq4a4f5pg0ngvc3lmkk7aki8n9zqfa1dym0lk4vy6yfhcbhp"; + rev = "ea5097f87072309c7b77204888d459d084bf630f"; + sha256 = "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e055994c3c3042eab11f11ec916ad5b56689809f/recipes/ggo-mode"; sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p"; - name = "ggo-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27960,20 +36487,26 @@ license = lib.licenses.free; }; }) {}; - ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ggtags = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ggtags"; - version = "20171203.1553"; + ename = "ggtags"; + version = "20180418.657"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; - rev = "eec392d2d639030c5a51bce8431f2815ad8e7bc5"; - sha256 = "0mlva84zbi93jrvvd3bgyndc68iib27zsjsd2f52df89198brjqs"; + rev = "bf263afd377992f7c5d9e8f727bd381e74feb327"; + sha256 = "182wqrkvk4asa483sb2zcym5np3z4h7l7ncpcrfgcs80jqbcaywx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw"; - name = "ggtags"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -27981,20 +36514,28 @@ license = lib.licenses.free; }; }) {}; - gh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache }: - melpaBuild { + gh = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , logito + , marshal + , melpaBuild + , pcache }: + melpaBuild { pname = "gh"; + ename = "gh"; version = "20180308.1338"; src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "f029fc11f345ef04ab62ee91c38657e29c462fea"; - sha256 = "1rgdpi8ld5hi2rp30p8sxbrl6z95nvq80jfp3zsr7cmsniwz0vv3"; + rev = "92418cd1b67ff6e8fb0a64478444975a4b8581a3"; + sha256 = "1vl6wy904jw1mqdic54ssvvbs4xqxhmgacldnfkdkx586vwf0hqi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0"; - name = "gh"; + name = "recipe"; }; packageRequires = [ emacs logito marshal pcache ]; meta = { @@ -28002,9 +36543,14 @@ license = lib.licenses.free; }; }) {}; - gh-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gh-md = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gh-md"; + ename = "gh-md"; version = "20151207.940"; src = fetchFromGitHub { owner = "emacs-pe"; @@ -28012,10 +36558,10 @@ rev = "693cb0dcadff70e813e1a9d303d227aff7898557"; sha256 = "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2794e59d5fea812ce5b376d3d9609f50f6bca40e/recipes/gh-md"; sha256 = "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm"; - name = "gh-md"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28023,9 +36569,14 @@ license = lib.licenses.free; }; }) {}; - ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: - melpaBuild { + ghc = callPackage ({ fetchFromGitHub + , fetchurl + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "ghc"; + ename = "ghc"; version = "20180121.418"; src = fetchFromGitHub { owner = "DanielG"; @@ -28033,10 +36584,10 @@ rev = "39b96c475090f91e4f717197c96e083fdb2ccaf7"; sha256 = "0f9qzk3czamqjb42xg2bmx70hafza8cn84zylx60bw8yx4i0q7nx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; sha256 = "02nc7a9khqpd4ca2snam8dq72m53q8x7v5awx56bjq31z6vcmav5"; - name = "ghc"; + name = "recipe"; }; packageRequires = [ haskell-mode ]; meta = { @@ -28044,9 +36595,14 @@ license = lib.licenses.free; }; }) {}; - ghc-imported-from = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ghc-imported-from = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ghc-imported-from"; + ename = "ghc-imported-from"; version = "20141124.1132"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -28054,10 +36610,10 @@ rev = "fcff08628a19f5d26151564659218cc677779b79"; sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghc-imported-from"; sha256 = "063kbymk4r1yrg5ks660d2byrnia6gs6nimjzrvqfi2ib1psc7jc"; - name = "ghc-imported-from"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28065,9 +36621,15 @@ license = lib.licenses.free; }; }) {}; - ghci-completion = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ghci-completion = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ghci-completion"; + ename = "ghci-completion"; version = "20151125.457"; src = fetchFromGitHub { owner = "manzyuk"; @@ -28075,10 +36637,10 @@ rev = "c47e23d585d2a3c7b13aac163693fdc4f2bb90e5"; sha256 = "17fl3k2sqiavbv3bp6rnp3p89j6pnpkkp7wi26pzzk4675r5k45q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/804aa2f9088dfc1b48b59aaa72a61f82fb5be971/recipes/ghci-completion"; sha256 = "1a6k47z5kmacj1s5479393jyj27bjx0911yaqfmmwg2hr0yz7vll"; - name = "ghci-completion"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -28086,9 +36648,13 @@ license = lib.licenses.free; }; }) {}; - gherkin-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gherkin-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gherkin-mode"; + ename = "gherkin-mode"; version = "20171224.553"; src = fetchFromGitHub { owner = "candera"; @@ -28096,10 +36662,10 @@ rev = "0313492e7da152f0aa73ddf96c0287ded8f51253"; sha256 = "15m9a2dcxgmbj0ni2qcxg3vpxvs50pyjvlacm3xd2xhm9wd484hr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d80becedead8db441eed6f7856ca64d78815e2/recipes/gherkin-mode"; sha256 = "0dhrsz24hn0sdf22wpmzbkn66g4540vdkl03pc27kv21gwa9ixxv"; - name = "gherkin-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28107,9 +36673,14 @@ license = lib.licenses.free; }; }) {}; - ghost-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { + ghost-blog = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "ghost-blog"; + ename = "ghost-blog"; version = "20171023.42"; src = fetchFromGitHub { owner = "javaguirre"; @@ -28117,10 +36688,10 @@ rev = "71b358643cc9a2db1bf752281ff94aba9b59e4cc"; sha256 = "1fkh7zslkdi7a4x2xrk73acmigbi7yx9k6iaj75zbjfd49gyqj13"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a906d461bcb2aa07050b72669feb5787414d809/recipes/ghost-blog"; sha256 = "0c591cx5kkfmhhqh8jall470iicxdv01mm3m13irq5xhmp3i5kjy"; - name = "ghost-blog"; + name = "recipe"; }; packageRequires = [ markdown-mode ]; meta = { @@ -28128,9 +36699,13 @@ license = lib.licenses.free; }; }) {}; - ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ghq = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ghq"; + ename = "ghq"; version = "20160803.857"; src = fetchFromGitHub { owner = "rcoedo"; @@ -28138,10 +36713,10 @@ rev = "aae4b8cb22fd6c24d2c9e3962c7e8e9dac6d9825"; sha256 = "0rh2k93c3a0vl073a3s3a3h6gkw454v1lyd7y8l3pd24vw9hc628"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9daa3b0039f6b296b8176523cffbbe27506bb02/recipes/ghq"; sha256 = "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh"; - name = "ghq"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28149,20 +36724,26 @@ license = lib.licenses.free; }; }) {}; - ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: - melpaBuild { + ghub = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "ghub"; - version = "20180328.830"; + ename = "ghub"; + version = "20180715.1159"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "d5408b61322a8207a8362e0ebb421306ec582379"; - sha256 = "1pj9xfqd05i6y0fz4g7ba6jk7s86xj6j5ph6wfynwyz4w63zgw0d"; + rev = "4202c1f389a5ad0b7841be0ac8ab3cc3b6b77cb6"; + sha256 = "1adi6wsfkhx46x28fajjf45jw60hkqqgg9y7wdzzq0a2vkp3hwya"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub"; sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps"; - name = "ghub"; + name = "recipe"; }; packageRequires = [ emacs let-alist ]; meta = { @@ -28170,20 +36751,27 @@ license = lib.licenses.free; }; }) {}; - ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: - melpaBuild { + ghub-plus = callPackage ({ apiwrap + , emacs + , fetchFromGitHub + , fetchurl + , ghub + , lib + , melpaBuild }: + melpaBuild { pname = "ghub-plus"; - version = "20180330.1738"; + ename = "ghub+"; + version = "20180602.1545"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "3f609f5d8277e4282bf2b93366c9f911e0f721a8"; - sha256 = "01a6sgzmyc3m4adik1sgvp19z12rap51xj72hjywgh116l9cqn52"; + rev = "b4a9662f5a6562f8d1dfdda2f009ec78a107c9a2"; + sha256 = "0xi7xhdla64xbcfqi8x8yzqc6v6rrqxd4q8lcrv7sw08ap5ykfas"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; sha256 = "0xx7nwmjx3f7z6z164x1lb9arbb3m3d16mpn92v66w572rhbr34n"; - name = "ghub-plus"; + name = "recipe"; }; packageRequires = [ apiwrap emacs ghub ]; meta = { @@ -28191,20 +36779,25 @@ license = lib.licenses.free; }; }) {}; - gif-screencast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gif-screencast = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gif-screencast"; - version = "20180309.242"; - src = fetchFromGitHub { + ename = "gif-screencast"; + version = "20180616.1230"; + src = fetchFromGitLab { owner = "Ambrevar"; repo = "emacs-gif-screencast"; - rev = "825e606950ec842304bf75cf85baef707b853b03"; - sha256 = "0xdzfw19zll8v9kpvay2rm8piq92ksz574m2gb6b63nm3z7sia1j"; + rev = "12b25442b97b84abae74ecb5190a9d14ff7cfe5a"; + sha256 = "0p7gfccvrv2267abldsyjdqbj4rg25wdy6vmcygiggl3lk0wrnwz"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b149509fb245975b450d15470c7d915e3c7b474d/recipes/gif-screencast"; - sha256 = "12kjr76b1180g3grfycghmgr3xf4vmhlhks8x3ri1gigdf0j8vaa"; - name = "gif-screencast"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6d17ca0213ba5ef9dce92002e281e6f08c3492be/recipes/gif-screencast"; + sha256 = "05l46bsnjdnvcgwx5rc5y7ry9p0hvmkf09rlpalgnrp8qpy8xw0q"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28212,20 +36805,24 @@ license = lib.licenses.free; }; }) {}; - gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gift-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gift-mode"; - version = "20180204.1358"; + ename = "gift-mode"; + version = "20180530.535"; src = fetchFromGitHub { owner = "csrhodes"; repo = "gift-mode"; - rev = "b8dcb86c7f83df0fbdc0da4f80c187423c936e50"; - sha256 = "01x87aam43xmhx7np9rvrdhln3pwn4zfn4d8s38rdpi77n9prw5k"; + rev = "b0441ae6e02f343be3b611a2d4b40495ecd932f0"; + sha256 = "0dwpmvjsczcdzwhjvpfxrkfha513538z8wq3gr3l1zc1kdggx2bk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode"; sha256 = "0sybrjmcg90cjaax7lzzqvacirn5l23hqy9d843c660fsv98scg1"; - name = "gift-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28233,20 +36830,26 @@ license = lib.licenses.free; }; }) {}; - gildas-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }: - melpaBuild { + gildas-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , polymode }: + melpaBuild { pname = "gildas-mode"; + ename = "gildas-mode"; version = "20150919.1501"; src = fetchFromGitHub { owner = "smaret"; repo = "gildas-mode"; - rev = "23e8a2e6066ff74af592de6d5d0d858442e2bf8a"; - sha256 = "1na8pp1g940zi22jgqi6drsm12db0hyw99v493i5j1p2y67c4hxw"; + rev = "1ac31c83ac363550d8ceb0041924d984cd62683f"; + sha256 = "0a8wwczh9g8b0gpc4hlgg9n6y9n4x18b4pchm4arjsccmh3l5bs3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f43d3aec955d31023056baba971805f0ebbb6702/recipes/gildas-mode"; sha256 = "0bc3d8bnvg1w2chrr4rp9daq1x8p41qgklrniq0bbkr2h93cmkgv"; - name = "gildas-mode"; + name = "recipe"; }; packageRequires = [ emacs polymode ]; meta = { @@ -28254,20 +36857,26 @@ license = lib.licenses.free; }; }) {}; - gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: - melpaBuild { + gist = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , gh + , lib + , melpaBuild }: + melpaBuild { pname = "gist"; + ename = "gist"; version = "20171127.2006"; src = fetchFromGitHub { owner = "defunkt"; repo = "gist.el"; - rev = "314fe6ab80fae35b95f0734eceb82f72813b6f41"; - sha256 = "0vbyzww9qmsvdpdc6d6wq6drlq1r9y92807fjhs0frgzmq6dg0rh"; + rev = "b2712a61d04af98a05cc2556d85479803b6626be"; + sha256 = "0zpdh7j0nm9qgzgp55kim04r9hi8cyi3f6kflxrs8srzxwb4gs6k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist"; sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3"; - name = "gist"; + name = "recipe"; }; packageRequires = [ emacs gh ]; meta = { @@ -28275,20 +36884,27 @@ license = lib.licenses.free; }; }) {}; - git = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + git = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "git"; + ename = "git"; version = "20140128.241"; src = fetchFromGitHub { owner = "rejeep"; repo = "git.el"; - rev = "a3396a7027a7d986598c6a2d6d5599bac918f3da"; - sha256 = "10siqf21ay6vl1r1v2c93rajzyjc67m4wq9q88pbij0z18vkq2f0"; + rev = "8b7f1477ef367b5b7de452589dd9a8ab30150d0a"; + sha256 = "06ws3x5qa92drmn6rcp502jk2yil6q9gkzdmb2gww9gb2g695wl5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce19d2716416295966716db47241a0e37b412ab5/recipes/git"; sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5"; - name = "git"; + name = "recipe"; }; packageRequires = [ dash f s ]; meta = { @@ -28296,20 +36912,24 @@ license = lib.licenses.free; }; }) {}; - git-annex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-annex = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-annex"; - version = "20170417.1653"; + ename = "git-annex"; + version = "20180427.856"; src = fetchFromGitHub { owner = "jwiegley"; repo = "git-annex-el"; - rev = "22b7161adcd144f88681b9b904972cea42b27fca"; - sha256 = "038h1dnvncdjy7q1ix3xrx4yqfqfp4ll69ksipj5kawsrch75nh6"; + rev = "ebdb44aef1883f1b2b8058e05d30fb9315b03707"; + sha256 = "1mzv40gj7k10h7h5s43my8msgzjpj680qprqa9pp8nbyhl49v3wh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c91e16bb9e92db9dc9be6a7af3944c3290d2f14/recipes/git-annex"; sha256 = "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l"; - name = "git-annex"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28317,9 +36937,14 @@ license = lib.licenses.free; }; }) {}; - git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-attr = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-attr"; + ename = "git-attr"; version = "20180204.15"; src = fetchFromGitHub { owner = "arnested"; @@ -28327,10 +36952,10 @@ rev = "c03078637a00ea301cbcc7ae301ae928b10af889"; sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr"; sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi"; - name = "git-attr"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28338,9 +36963,13 @@ license = lib.licenses.free; }; }) {}; - git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-auto-commit-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-auto-commit-mode"; + ename = "git-auto-commit-mode"; version = "20161229.817"; src = fetchFromGitHub { owner = "ryuslash"; @@ -28348,10 +36977,10 @@ rev = "2c8197e5d7813734d6a49f9b9c0b227b7ae022a8"; sha256 = "0h8kma09r5fw4b2fbbia5z42x8gg72w6zk39pxnsw876kwa8798f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5660fb76ce93e5fe56227698d079c6994ef3305f/recipes/git-auto-commit-mode"; sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl"; - name = "git-auto-commit-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28359,9 +36988,13 @@ license = lib.licenses.free; }; }) {}; - git-blamed = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-blamed = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-blamed"; + ename = "git-blamed"; version = "20161028.1226"; src = fetchFromGitHub { owner = "tsgates"; @@ -28369,10 +37002,10 @@ rev = "cef196abf398e2dd11f775d1e6cd8690567408aa"; sha256 = "1n6x69z1s3hk6m6w8gpmqyrb2cxfzhi9w7q94d46c3z6r75v18vz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87bc01218964a01cfd471ee068ed75976793a568/recipes/git-blamed"; sha256 = "08az5mwg8kv8xsivs63y4sym54l1n34zc9z6k0iwpfixv9f8bk9p"; - name = "git-blamed"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28380,20 +37013,26 @@ license = lib.licenses.free; }; }) {}; - git-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, term-run, with-editor }: - melpaBuild { + git-command = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , term-run + , with-editor }: + melpaBuild { pname = "git-command"; + ename = "git-command"; version = "20160111.503"; src = fetchFromGitHub { owner = "10sr"; repo = "git-command-el"; - rev = "dce465ca1cd80e16df0f8dce8e427a76e9edc3b7"; - sha256 = "0nnh5y0px7aa9yai9f149v7pjcjp7i3f35cfihs9n3r6bnrmgp4h"; + rev = "a2c192aa779f81a99a10f0eb6dd018f13b2ff949"; + sha256 = "1irqmypgc4l1jlzj4g65ihpic3ffnnkcg1hlysj7qpip5nbflqgl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55d697bc95a7026c7788c13e4765e1b71075e3/recipes/git-command"; sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg"; - name = "git-command"; + name = "recipe"; }; packageRequires = [ term-run with-editor ]; meta = { @@ -28401,20 +37040,27 @@ license = lib.licenses.free; }; }) {}; - git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: - melpaBuild { + git-commit = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , with-editor }: + melpaBuild { pname = "git-commit"; - version = "20180401.314"; + ename = "git-commit"; + version = "20180713.1444"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "570c2a777ec222918492255463742d44a78befee"; - sha256 = "0741c3zd48ybfs67331hxj026lp7frzrzml0kzspbx2121d56yzh"; + rev = "d7412da3277d6ec5810e7ac20d64eb6c5cc0c30b"; + sha256 = "02xfxp6bsp9g0sz9kaykibygqxndgqa59w0a6flma4mkkgwsid9c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2"; - name = "git-commit"; + name = "recipe"; }; packageRequires = [ dash emacs with-editor ]; meta = { @@ -28422,9 +37068,18 @@ license = lib.licenses.free; }; }) {}; - git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, lib, melpaBuild, projectile, s }: - melpaBuild { + git-commit-insert-issue = callPackage ({ bitbucket + , fetchFromGitLab + , fetchurl + , github-issues + , gitlab + , lib + , melpaBuild + , projectile + , s }: + melpaBuild { pname = "git-commit-insert-issue"; + ename = "git-commit-insert-issue"; version = "20171102.1141"; src = fetchFromGitLab { owner = "emacs-stuff"; @@ -28432,10 +37087,10 @@ rev = "f986923b04b587206ce7ee8e0c456768600e8be7"; sha256 = "1gffjf6byasisa9jdcv9n4n5zqalvzfsxv7z75zl0g3ph7wc7bbm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue"; sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax"; - name = "git-commit-insert-issue"; + name = "recipe"; }; packageRequires = [ bitbucket github-issues gitlab projectile s ]; meta = { @@ -28443,9 +37098,13 @@ license = lib.licenses.free; }; }) {}; - git-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-dwim = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-dwim"; + ename = "git-dwim"; version = "20170126.414"; src = fetchFromGitHub { owner = "rubikitch"; @@ -28453,10 +37112,10 @@ rev = "485c732130686c2f28a026e385366006435394b9"; sha256 = "0rcrsjx4ifa9y3rd5l4498kvqkh58zx21gl7mqp053jdsqqq1yrx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/git-dwim"; sha256 = "0xcigah06ak5wdma4ddcix58q2v5hszncb65f272m4lc2racgsfl"; - name = "git-dwim"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28464,9 +37123,14 @@ license = lib.licenses.free; }; }) {}; - git-gutter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-gutter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-gutter"; + ename = "git-gutter"; version = "20161105.656"; src = fetchFromGitHub { owner = "syohex"; @@ -28474,10 +37138,10 @@ rev = "00c05264af046b5ce248e5b0bc42f117d9c27a09"; sha256 = "1c7byzv27sqcal0z7113s1897prxhynk6y89mq1fjlxmr0g20vzb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter"; sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg"; - name = "git-gutter"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28485,9 +37149,17 @@ license = lib.licenses.free; }; }) {}; - git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }: - melpaBuild { + git-gutter-fringe = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , fringe-helper + , git-gutter + , lib + , melpaBuild }: + melpaBuild { pname = "git-gutter-fringe"; + ename = "git-gutter-fringe"; version = "20170112.2133"; src = fetchFromGitHub { owner = "syohex"; @@ -28495,10 +37167,10 @@ rev = "16226caab44174301f1659f7bf8cc67a76153445"; sha256 = "1y77gjl0yznamdj0f55d418zb75k22izisjg7ikvrfsl2yfqf3pm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter-fringe"; sha256 = "10k07dzmkxsxzwc70vpv05rxjyps9494y6k7yhlv8d46x7xjyp0z"; - name = "git-gutter-fringe"; + name = "recipe"; }; packageRequires = [ cl-lib emacs fringe-helper git-gutter ]; meta = { @@ -28506,20 +37178,26 @@ license = lib.licenses.free; }; }) {}; - git-gutter-fringe-plus = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, git-gutter-plus, lib, melpaBuild }: - melpaBuild { + git-gutter-fringe-plus = callPackage ({ fetchFromGitHub + , fetchurl + , fringe-helper + , git-gutter-plus + , lib + , melpaBuild }: + melpaBuild { pname = "git-gutter-fringe-plus"; + ename = "git-gutter-fringe+"; version = "20140729.403"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "git-gutter-fringe-plus"; - rev = "7a2f49d2455a3a872e90e5f7dd4e6b27f1d96cfc"; - sha256 = "1rsj193zpblndki4khjjlwl2njxb329d42l75ki55msxifqrn4fi"; + rev = "3857d486e5b3eca9281fba1c76756cb39a9f9866"; + sha256 = "19sz3gaffirr95n4a8jag9wsqa86fpdn13k685lxrv5317h8iqfh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad46c349d13f7d40db706b487319ede40b96b09c/recipes/git-gutter-fringe+"; sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc"; - name = "git-gutter-fringe-plus"; + name = "recipe"; }; packageRequires = [ fringe-helper git-gutter-plus ]; meta = { @@ -28527,9 +37205,15 @@ license = lib.licenses.free; }; }) {}; - git-gutter-plus = callPackage ({ dash, fetchFromGitHub, fetchurl, git-commit, lib, melpaBuild }: - melpaBuild { + git-gutter-plus = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , git-commit + , lib + , melpaBuild }: + melpaBuild { pname = "git-gutter-plus"; + ename = "git-gutter+"; version = "20151204.923"; src = fetchFromGitHub { owner = "nonsequitur"; @@ -28537,10 +37221,10 @@ rev = "b7726997806d9a2da9fe84ff00ecf21d62b6f975"; sha256 = "0bhrrgdzzj8gwxjx7b2kibp1b6s0vgvykfg0n47iq49m6rqkgi5q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2db25d23c2a1a4f38867aac25d687a150e95c2b/recipes/git-gutter+"; sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0"; - name = "git-gutter-plus"; + name = "recipe"; }; packageRequires = [ dash git-commit ]; meta = { @@ -28548,9 +37232,14 @@ license = lib.licenses.free; }; }) {}; - git-io = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-io = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-io"; + ename = "git-io"; version = "20180317.1052"; src = fetchFromGitHub { owner = "tejasbubane"; @@ -28558,10 +37247,10 @@ rev = "48753acba73b48b997bb678fb5e2a938ae63b5d6"; sha256 = "1zw24j6l0ap761q1knxjaxzdfz11kmfq29aag5av4n87m86rxzr8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a713197f227e3c43de3609dd505cf7cd226d94b9/recipes/git-io"; sha256 = "1acwc9iqchvlvx98fxh4xf3xphv0xzrnxpv8kkl8qaly41izfj0v"; - name = "git-io"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28569,20 +37258,25 @@ license = lib.licenses.free; }; }) {}; - git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-lens = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-lens"; + ename = "git-lens"; version = "20180328.717"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "pidu"; repo = "git-lens"; rev = "ea49e2e005af977a08331f8caa8f64d102b3b932"; sha256 = "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens"; - sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb"; - name = "git-lens"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/git-lens"; + sha256 = "02a393b5y4vpmf9ixgyi3a4gbzk4146zql827ljlav3j0434ssw2"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28590,41 +37284,52 @@ license = lib.licenses.free; }; }) {}; - git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-link = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-link"; - version = "20170603.1026"; + ename = "git-link"; + version = "20180708.943"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "472af75eca7aba42a1934f408c4bda55e34c9dcf"; - sha256 = "0xgvwg2zxb9akk3kxxcz5cvgw4zkbqx5p4b5in01z5aj4lqmjw6s"; + rev = "efd14ab5f17f5942d25e165210447f3983f3250e"; + sha256 = "0rd2g4s73xk8m595aa11vr59gnn5mx7lbcf0040w1xqvlrryzyc9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7"; - name = "git-link"; + name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/git-link"; license = lib.licenses.free; }; }) {}; - git-messenger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + git-messenger = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "git-messenger"; + ename = "git-messenger"; version = "20170101.2040"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-messenger"; - rev = "83815915eb8c1cb47443ff34bca3fecf7d2edf3a"; - sha256 = "1jkfzcn8gl3s5y2hwqkac7lm88q80hgcp66zvy7vnylka1scb6lz"; + rev = "bb838c62662dbc3bed2a8aae5f622fbd8f45dd08"; + sha256 = "0w866cjzaqllf5xjs77mfsj1lw3ll4j5z770cndbkyfbmcwpama0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger"; sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn"; - name = "git-messenger"; + name = "recipe"; }; packageRequires = [ emacs popup ]; meta = { @@ -28632,20 +37337,27 @@ license = lib.licenses.free; }; }) {}; - git-msg-prefix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + git-msg-prefix = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "git-msg-prefix"; + ename = "git-msg-prefix"; version = "20180118.646"; src = fetchFromGitHub { owner = "kidd"; repo = "git-msg-prefix.el"; - rev = "848f2c7475f5e4937b09f55e85ea89a3be5f8588"; - sha256 = "0ab6qjq5nky15vj88j5s8sh7gp9lbwgxrfqsc08bg6gdf2rx2dvx"; + rev = "c6acf10b014607f1541a398206208e568a4714e4"; + sha256 = "1jpak1ji63xxpivyjxi0wicw66zbyxdc725nbg8dbf5n3h9v80bk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd37811d17beaa54e08eb4968791da960d37b391/recipes/git-msg-prefix"; sha256 = "0vicaj91yhbzda76wrwmbfby2ikaja52bcm923jx8brjh1wd99wr"; - name = "git-msg-prefix"; + name = "recipe"; }; packageRequires = [ dash emacs s ]; meta = { @@ -28653,20 +37365,24 @@ license = lib.licenses.free; }; }) {}; - git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-ps1-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-ps1-mode"; - version = "20170102.1944"; + ename = "git-ps1-mode"; + version = "20180413.247"; src = fetchFromGitHub { owner = "10sr"; repo = "git-ps1-mode-el"; - rev = "e41c630f5d04cb1a4d38a4b500d7a154a96a4655"; - sha256 = "11bg953nk5x501vkr0jrz710pz3qxla27bgrd4gp503fbygnixkz"; + rev = "6a06bf57cbe614ab26032b153d3dcf4fb4bfa7ee"; + sha256 = "1lgvzla1bg7gmkj41hmzhiqcbdmdw9ycpzfvpl6xl0sm0fk3j3rj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea177b5ea168828881bd8dcd29ef6b4cb81317f0/recipes/git-ps1-mode"; sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6"; - name = "git-ps1-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28674,20 +37390,25 @@ license = lib.licenses.free; }; }) {}; - git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-timemachine = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-timemachine"; - version = "20180307.414"; - src = fetchFromGitHub { + ename = "git-timemachine"; + version = "20180607.120"; + src = fetchFromGitLab { owner = "pidu"; repo = "git-timemachine"; - rev = "dbcb92ffaa5f8350d47f4fbd74512f4000b8c043"; - sha256 = "1ml06jfjyrcqmbpr5hqvbpi3yy6l2aa836jq8qjla1h74g9qka7z"; + rev = "90a980578249c102da3e904fccdc9a2a5a0e7bcc"; + sha256 = "027zpl603kad2x59wzygiblpc84cn945fnqpm7m1yi3lw4smxsbr"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; - sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq"; - name = "git-timemachine"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/git-timemachine"; + sha256 = "06xdzic7j3d3pqgwxp1q6fs8sf3mi02a9phjvhk90kyvbr8h94ck"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28695,20 +37416,25 @@ license = lib.licenses.free; }; }) {}; - git-wip-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + git-wip-timemachine = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "git-wip-timemachine"; + ename = "git-wip-timemachine"; version = "20150408.306"; src = fetchFromGitHub { owner = "itsjeyd"; repo = "git-wip-timemachine"; - rev = "ed4c7931a5f5233bf3e358b1e81647d063526460"; - sha256 = "1ivnf4vsqk6c7iw1cid7q1hxp7047ajd1mpg0fl002d7m7ginhyl"; + rev = "1ce257e6c25117b01f1b899aca21e07eae084d40"; + sha256 = "116zn8hs1igfdlhga4pav9kq6znl1bk7shbmkck7jvhb2prmqjqb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81b5dd5765f52efdb88fdc14f48af641a18b3dcb/recipes/git-wip-timemachine"; sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw"; - name = "git-wip-timemachine"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -28716,20 +37442,24 @@ license = lib.licenses.free; }; }) {}; - gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gitattributes-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gitattributes-mode"; + ename = "gitattributes-mode"; version = "20180318.1256"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; - sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; + rev = "95ad581ae2aeba87b418ae9554eb326cdba9837d"; + sha256 = "15irwyc0fmp0k5dag1n07xa8ka7n84drbrg2savslvb9m71011dg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x"; - name = "gitattributes-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28737,20 +37467,24 @@ license = lib.licenses.free; }; }) {}; - gitconfig = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gitconfig = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gitconfig"; + ename = "gitconfig"; version = "20130718.235"; src = fetchFromGitHub { owner = "tonini"; repo = "gitconfig.el"; - rev = "7612a37ca14009cac8fb8d6b6f54adad739a5741"; - sha256 = "184q3vsxa9rvhc1n57ms47r73f3zap25wswzi66rm6rmfi2k7678"; + rev = "6c313a39e20702ddcebc12d146f69db1ce668901"; + sha256 = "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gitconfig"; sha256 = "0lqm04nfhhhsdagrjnnagkpg7vpswd8lkd3l52lmpdh0fy16kgrf"; - name = "gitconfig"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28758,20 +37492,24 @@ license = lib.licenses.free; }; }) {}; - gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gitconfig-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gitconfig-mode"; + ename = "gitconfig-mode"; version = "20180318.1256"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; - sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; + rev = "ae6e897c06d3ff609a65a3ac2500d21ccc888822"; + sha256 = "111pm9wwq8p3wiqgap7gyi20say3daadlaxgq2v3mwxyax8fyx34"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1"; - name = "gitconfig-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28779,20 +37517,25 @@ license = lib.licenses.free; }; }) {}; - github-browse-file = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + github-browse-file = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "github-browse-file"; + ename = "github-browse-file"; version = "20160205.627"; src = fetchFromGitHub { owner = "osener"; repo = "github-browse-file"; - rev = "9742a5183af853788c6ecb83fb7ee0b00d1675ac"; - sha256 = "0i3dkm0j4gh21b7r5vxr6dddql5rj7lg8xlaairvild0ccf3bhdl"; + rev = "177667b8dac640f3dabacc4395e09451c5e88c53"; + sha256 = "01vw0nvbhnk9mni3wsm3jf9lqca9x4kn1xfpviqfkciwln7hblqk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8bca60348fc5e2ad55663e69b8690093cf861ca/recipes/github-browse-file"; sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr"; - name = "github-browse-file"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -28800,9 +37543,16 @@ license = lib.licenses.free; }; }) {}; - github-clone = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: - melpaBuild { + github-clone = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , gh + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "github-clone"; + ename = "github-clone"; version = "20160622.2010"; src = fetchFromGitHub { owner = "dgtized"; @@ -28810,10 +37560,10 @@ rev = "467b40ca60a6c26257466ebc43c74414df7f19cc"; sha256 = "1gdx9sl509vn4bagqg8vi1wvj1h3ryfvd5ggs2mv9rry6x9dg823"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba11d6a5cc2fbc76037687c842f90dc815a6468e/recipes/github-clone"; sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9"; - name = "github-clone"; + name = "recipe"; }; packageRequires = [ emacs gh magit ]; meta = { @@ -28821,20 +37571,27 @@ license = lib.licenses.free; }; }) {}; - github-elpa = callPackage ({ commander, fetchFromGitHub, fetchurl, git, lib, melpaBuild, package-build }: - melpaBuild { + github-elpa = callPackage ({ commander + , fetchFromGitHub + , fetchurl + , git + , lib + , melpaBuild + , package-build }: + melpaBuild { pname = "github-elpa"; - version = "20160922.907"; + ename = "github-elpa"; + version = "20180704.2247"; src = fetchFromGitHub { owner = "10sr"; repo = "github-elpa"; - rev = "7619a564edb1985b0487786a3b4ec6d12f897b5b"; - sha256 = "176x0dclclpa6am091f866ybqhhdnlq7jgsik5b5m74dl26bcxcg"; + rev = "abe92cc25c9d75dab4f8bcf0eccafdd8a26774d6"; + sha256 = "0rx61fsvl99r2p3f3y7rgwf7m084lqi0xsdz0w8cml67sd5qm54g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81ec06e370f51b750ba3313b661d7386710cffb0/recipes/github-elpa"; sha256 = "1981dnz49l5r4qsn49i4dhy6x4ln0haff6gl2zx0p5p0zfkzbi7x"; - name = "github-elpa"; + name = "recipe"; }; packageRequires = [ commander git package-build ]; meta = { @@ -28842,9 +37599,14 @@ license = lib.licenses.free; }; }) {}; - github-issues = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + github-issues = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "github-issues"; + ename = "github-issues"; version = "20160616.1141"; src = fetchFromGitHub { owner = "inkel"; @@ -28852,10 +37614,10 @@ rev = "816f7712b0eb05bffec0add3507302862d2629c4"; sha256 = "1x6jbnx9lwgy64nl9lpp01xcj9cbx5fq435iwhiarjdsm4kvixb5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f761e76236e9372d5fae6b5c5dcb1992c5d64d37/recipes/github-issues"; sha256 = "12c6yb3v7xwkzc51binfgl4jb3sm3al5nlrklbsxhn44alazsvb0"; - name = "github-issues"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28863,9 +37625,13 @@ license = lib.licenses.free; }; }) {}; - github-modern-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + github-modern-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "github-modern-theme"; + ename = "github-modern-theme"; version = "20171109.451"; src = fetchFromGitHub { owner = "philiparvidsson"; @@ -28873,10 +37639,10 @@ rev = "a7e7b8e5e9c122138e79e837caf9b7299e748d44"; sha256 = "0agfy3wiznb2ksfa00g7066mb0vps4g74mj6nl9wkvx847dzg34h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5506d93bd8cf59cd281091b377c1bb9a4243666/recipes/github-modern-theme"; sha256 = "1falal6cffiih3q8q9xdyv7bkzw43p56d8ln13g9ad1jz319b3fi"; - name = "github-modern-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28884,20 +37650,25 @@ license = lib.licenses.free; }; }) {}; - github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + github-notifier = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "github-notifier"; - version = "20170604.2119"; + ename = "github-notifier"; + version = "20180420.2016"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "github-notifier.el"; - rev = "f8d011ebef9f626a94a27b5576c8ed06e6ff8987"; - sha256 = "0glkn36fs93y2n1583k8v958qfhl212hbdk3cpkq432hj08wzjnr"; + rev = "274f3812926ea371346f639fcee98066f6e8c96f"; + sha256 = "1qv66sdi8zm8nv1xc32lsmm2bgkxf03hb8sfz59mbvzhy6r7dxin"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier"; sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw"; - name = "github-notifier"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28905,20 +37676,28 @@ license = lib.licenses.free; }; }) {}; - github-pullrequest = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, request }: - melpaBuild { + github-pullrequest = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild + , request }: + melpaBuild { pname = "github-pullrequest"; + ename = "github-pullrequest"; version = "20170115.2216"; src = fetchFromGitHub { owner = "jakoblind"; repo = "github-pullrequest"; - rev = "6ae5c38b0fc15b638b5ba4490112d9822ce5e267"; - sha256 = "1yr7v2wdrvwb1slks83bbh857qq1n207rdk48y8qwlcxbk4ygdr6"; + rev = "471816e09d1e140a0975911fe020c6c659f71209"; + sha256 = "0y7i2zgln3mjj8sm8r4fi67izzyqdxfzj71m2q43dzr8rkrby0qc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/github-pullrequest"; sha256 = "1p5mwpl59iwd1aqczf1b5shcpzhlqwrcy2vp46c276mhqx15r8fr"; - name = "github-pullrequest"; + name = "recipe"; }; packageRequires = [ dash emacs magit request ]; meta = { @@ -28926,9 +37705,15 @@ license = lib.licenses.free; }; }) {}; - github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: - melpaBuild { + github-search = callPackage ({ fetchFromGitHub + , fetchurl + , gh + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "github-search"; + ename = "github-search"; version = "20170823.2023"; src = fetchFromGitHub { owner = "IvanMalison"; @@ -28936,10 +37721,10 @@ rev = "c5fa1d9f8f9bcf201fa31478a6f5e02ed5ac086b"; sha256 = "1v9kswj65sdb90lr4a2xqai55kyp3jp46nksikxx9m243nxdsh9q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/733a808400858513137e0e3d7d38b5b25e8ddc5a/recipes/github-search"; sha256 = "1pwrzbbwnq0il5494561fyvkr0vmm5jqlvpffgkk28c54vs7ms0b"; - name = "github-search"; + name = "recipe"; }; packageRequires = [ gh magit ]; meta = { @@ -28947,9 +37732,40 @@ license = lib.licenses.free; }; }) {}; - github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + github-stars = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ghub + , lib + , melpaBuild }: + melpaBuild { + pname = "github-stars"; + ename = "github-stars"; + version = "20180328.433"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "github-stars.el"; + rev = "283dbe4d10f2b11d15d6871e86c28b8f42759b63"; + sha256 = "1bdhvf2mjg818mfl8w9c2b8prqbd0v59xnjjkaq8qwgb7n7925bq"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/58df7d536f9711e10ecaa6e0a37b9ad255e8fca5/recipes/github-stars"; + sha256 = "1vljmrjid5xxmq5yfmsaq09js7zd75nmm4gd0kwm3lf71pb3lp6f"; + name = "recipe"; + }; + packageRequires = [ emacs ghub ]; + meta = { + homepage = "https://melpa.org/#/github-stars"; + license = lib.licenses.free; + }; + }) {}; + github-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "github-theme"; + ename = "github-theme"; version = "20170630.1501"; src = fetchFromGitHub { owner = "philiparvidsson"; @@ -28957,10 +37773,10 @@ rev = "29f00a51d949a248a5f6355a97131e216747c797"; sha256 = "16ldfz1k0hxc1b785gzrf70hg0q88ijjxp39hb62iax1k1aw9vlw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme"; sha256 = "1c22p17a1d0s30cj40zrszyznch6nji2risq3b47jhh9i6m32jif"; - name = "github-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28968,20 +37784,24 @@ license = lib.licenses.free; }; }) {}; - gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gitignore-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gitignore-mode"; + ename = "gitignore-mode"; version = "20180318.1256"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; - sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; + rev = "ae6e897c06d3ff609a65a3ac2500d21ccc888822"; + sha256 = "111pm9wwq8p3wiqgap7gyi20say3daadlaxgq2v3mwxyax8fyx34"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn"; - name = "gitignore-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28989,9 +37809,43 @@ license = lib.licenses.free; }; }) {}; - gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: - melpaBuild { + gitignore-templates = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "gitignore-templates"; + ename = "gitignore-templates"; + version = "20180327.626"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "gitignore-templates.el"; + rev = "2b729c6b76ec940e15c1599a0105149c2e1f4b17"; + sha256 = "14zsqp128x48d304racw25f1vdi20fadagfqswa5l3rklb0ilbsb"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4c9aa71eac2e68eb1925ed00a2c659c4375bd39c/recipes/gitignore-templates"; + sha256 = "17zx52pmpd4yqlnj39v7ym728i710mdl0by3lc8zk6ljfz77933w"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gitignore-templates"; + license = lib.licenses.free; + }; + }) {}; + gitlab = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , request + , s }: + melpaBuild { pname = "gitlab"; + ename = "gitlab"; version = "20180312.947"; src = fetchFromGitHub { owner = "nlamirault"; @@ -28999,10 +37853,10 @@ rev = "68318aca3206d50701039c9aae39734ca29a49f9"; sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab"; sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq"; - name = "gitlab"; + name = "recipe"; }; packageRequires = [ dash pkg-info request s ]; meta = { @@ -29010,20 +37864,26 @@ license = lib.licenses.free; }; }) {}; - gitlab-ci-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, yaml-mode }: - melpaBuild { + gitlab-ci-mode = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , yaml-mode }: + melpaBuild { pname = "gitlab-ci-mode"; - version = "20180401.252"; + ename = "gitlab-ci-mode"; + version = "20180604.1503"; src = fetchFromGitLab { owner = "joewreschnig"; repo = "gitlab-ci-mode"; - rev = "19a377aa42cd8a8bea74ae900fedc2ac74a323a5"; - sha256 = "0wjz87nhcwzp201jxv3qlj88hn7p8nvq20924y06gra2d656znar"; + rev = "b9fd692d27351e959c4d272a2149def63ef1c00c"; + sha256 = "132b0m3sp6vwknr665aw1mwx1q69ksrmr6xih7qi6nfgny6938qc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode"; sha256 = "1jg6ihrgccrcwg30ysyqw9k7rmvfmsrp70skr2057hfamvccwn4f"; - name = "gitlab-ci-mode"; + name = "recipe"; }; packageRequires = [ emacs yaml-mode ]; meta = { @@ -29031,20 +37891,27 @@ license = lib.licenses.free; }; }) {}; - gitlab-ci-mode-flycheck = callPackage ({ emacs, fetchFromGitLab, fetchurl, flycheck, gitlab-ci-mode, lib, melpaBuild }: - melpaBuild { + gitlab-ci-mode-flycheck = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , flycheck + , gitlab-ci-mode + , lib + , melpaBuild }: + melpaBuild { pname = "gitlab-ci-mode-flycheck"; - version = "20180401.255"; + ename = "gitlab-ci-mode-flycheck"; + version = "20180604.1504"; src = fetchFromGitLab { owner = "joewreschnig"; repo = "gitlab-ci-mode-flycheck"; - rev = "adc5658fe3c90ff944b6ca481773b316a6016e86"; - sha256 = "111clb37329c7v0lv1lwypb8bv7qb9f495f2cy45j2n711vymdna"; + rev = "30ea0eab74b24818f187242b079845785035e967"; + sha256 = "0awv24znkxs0h8pkj4b5jwjajxkf1agam09m5glr8zn5g3xbj798"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck"; sha256 = "19ixd60yynsvmaj7mkppp6k73793x794vrnhx3hh6n7dap1rsjdh"; - name = "gitlab-ci-mode-flycheck"; + name = "recipe"; }; packageRequires = [ emacs flycheck gitlab-ci-mode ]; meta = { @@ -29052,9 +37919,17 @@ license = lib.licenses.free; }; }) {}; - gitolite-clone = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: - melpaBuild { + gitolite-clone = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , s }: + melpaBuild { pname = "gitolite-clone"; + ename = "gitolite-clone"; version = "20160609.1655"; src = fetchFromGitHub { owner = "IvanMalison"; @@ -29062,10 +37937,10 @@ rev = "d8a4c2875c984e51137c980b5773f42703602721"; sha256 = "11i9hxj76869w1z9xn7wq370v56hx5hm4d7msn4zgp64glpa66j9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gitolite-clone"; sha256 = "0mv2bdfqqq47wgikkm5kwpr8gajylf1yzk2j6cxljz09amgq6c8q"; - name = "gitolite-clone"; + name = "recipe"; }; packageRequires = [ dash emacs pcache s ]; meta = { @@ -29073,9 +37948,14 @@ license = lib.licenses.free; }; }) {}; - gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gitpatch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gitpatch"; + ename = "gitpatch"; version = "20170721.2110"; src = fetchFromGitHub { owner = "tumashu"; @@ -29083,10 +37963,10 @@ rev = "577d5adf65c8133caa325c10e89e1e2fc323c907"; sha256 = "1jj12pjwza6cq8a3kr8nqnmm3vxs0wam8h983irry4xr4ifywsn4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch"; sha256 = "0qaswkk06z24v40nkjkv7f6gfv0dlsjd6wchkn0ppqw95883vhv1"; - name = "gitpatch"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29094,9 +37974,15 @@ license = lib.licenses.free; }; }) {}; - gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: - melpaBuild { + gitter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "gitter"; + ename = "gitter"; version = "20180122.56"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -29104,10 +37990,10 @@ rev = "11cb9b4b45f67bdc24f055a9bfac21d2bd19ea1a"; sha256 = "14ri86kxqz9qfhcr0bkgfyggy4bgg9imk9akhw6dfzqkl90gn2gy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter"; sha256 = "1ad5abqgfh6x2fcqbbdvgbg8xin69j0h93z7bav1hs3jla7mgwnv"; - name = "gitter"; + name = "recipe"; }; packageRequires = [ emacs let-alist ]; meta = { @@ -29115,9 +38001,14 @@ license = lib.licenses.free; }; }) {}; - gl-conf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gl-conf-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gl-conf-mode"; + ename = "gl-conf-mode"; version = "20170714.610"; src = fetchFromGitHub { owner = "llloret"; @@ -29125,10 +38016,10 @@ rev = "9136a9b737e0a5b6471a91571d104c487c43f35b"; sha256 = "0wls3sfplrf7wkg7g7fxx4s87cvm3p7myxw6k91np6pbfh8p0s9q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3117e62d429e44506f7d82fc64252d41bc1a4b6/recipes/gl-conf-mode"; sha256 = "0lf8xmq309aqyf16ymqlr8gj2qawlsqagbdndj0kgj72dnnw4cfm"; - name = "gl-conf-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29136,20 +38027,26 @@ license = lib.licenses.free; }; }) {}; - glab = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: - melpaBuild { + glab = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ghub + , lib + , melpaBuild }: + melpaBuild { pname = "glab"; - version = "20180319.828"; + ename = "glab"; + version = "20180419.308"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "d5408b61322a8207a8362e0ebb421306ec582379"; - sha256 = "1pj9xfqd05i6y0fz4g7ba6jk7s86xj6j5ph6wfynwyz4w63zgw0d"; + rev = "4831933da059ee084a16016558b9ccd8c581a8ff"; + sha256 = "1b5jrpj3z989r3mf4jfch8rnaaa5hyb2395xz3v37f0vsphd7s0y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab"; sha256 = "0ym8bgym11mdv5bw22lgkcxyqy7qgxxm0yjmrq8qx7i55gqayyb8"; - name = "glab"; + name = "recipe"; }; packageRequires = [ emacs ghub ]; meta = { @@ -29157,9 +38054,13 @@ license = lib.licenses.free; }; }) {}; - glsl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + glsl-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "glsl-mode"; + ename = "glsl-mode"; version = "20170927.736"; src = fetchFromGitHub { owner = "jimhourihan"; @@ -29167,10 +38068,10 @@ rev = "384968506cf25c5c2df61b32fdfdbd041e3bf651"; sha256 = "0729s4w010vw4ajvh1zpni7szxv9rpm6jk2y9hp7qyi67zbgjjgc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c416822d54df436f29dcf9a5f26398685fdc17a2/recipes/glsl-mode"; sha256 = "0d05qb60k5f7wwpsp3amzghayfbwcha6rh8nrslhnklpjbg87aw5"; - name = "glsl-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29178,9 +38079,14 @@ license = lib.licenses.free; }; }) {}; - gmail-message-mode = callPackage ({ fetchFromGitHub, fetchurl, ham-mode, lib, melpaBuild }: - melpaBuild { + gmail-message-mode = callPackage ({ fetchFromGitHub + , fetchurl + , ham-mode + , lib + , melpaBuild }: + melpaBuild { pname = "gmail-message-mode"; + ename = "gmail-message-mode"; version = "20160627.1147"; src = fetchFromGitHub { owner = "Malabarba"; @@ -29188,10 +38094,10 @@ rev = "ec36672a9dc93c09ebe2f77597b498d11883d008"; sha256 = "0xcdd3abcrqr7nabdmmh0kgfar64hhgnrhsiwg3q201cymhnv49p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/gmail-message-mode"; sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk"; - name = "gmail-message-mode"; + name = "recipe"; }; packageRequires = [ ham-mode ]; meta = { @@ -29199,9 +38105,13 @@ license = lib.licenses.free; }; }) {}; - gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gmail2bbdb = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gmail2bbdb"; + ename = "gmail2bbdb"; version = "20170423.444"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -29209,10 +38119,10 @@ rev = "a84fa385cfaec7fc5f1518c368e52722da139f99"; sha256 = "1qbf3r8a66xlrbni3hv5q5b5v3izis5aid06228rfpc2hwa97hr7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb"; sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j"; - name = "gmail2bbdb"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29220,9 +38130,14 @@ license = lib.licenses.free; }; }) {}; - gmpl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gmpl-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gmpl-mode"; + ename = "gmpl-mode"; version = "20171031.1354"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -29230,10 +38145,10 @@ rev = "c5d362169819ee8b8e8954145daee7e260c54921"; sha256 = "00p2z6kbyc0bas21d1zygx7z49w6mf22y9kf1rcm9gqsnnadb4j9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c89a523f87db358c477e5840b0e043e9f253e640/recipes/gmpl-mode"; sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz"; - name = "gmpl-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29241,20 +38156,24 @@ license = lib.licenses.free; }; }) {}; - gnome-calendar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gnome-calendar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gnome-calendar"; + ename = "gnome-calendar"; version = "20161110.456"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "gnome-calendar.el"; - rev = "489f9f15f7bb35696b1cc19db75b554ae8328df2"; - sha256 = "1aca65g4rfpsm4yk5k2bj6kbb2wrf6s14m8jgv1p94mqmzkj7rlq"; + rev = "668591bec95c23934c5e1ef100cec4824e7cb25d"; + sha256 = "01dgv24snakxr7smkza6334wr74q74g0mrkzd93xwdxrm5k68ahg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e497668d65f0eabd15e39b7492adb395a5a8e75/recipes/gnome-calendar"; sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6"; - name = "gnome-calendar"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29262,9 +38181,16 @@ license = lib.licenses.free; }; }) {}; - gnomenm = callPackage ({ dash, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, s }: - melpaBuild { + gnomenm = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , kv + , lib + , melpaBuild + , s }: + melpaBuild { pname = "gnomenm"; + ename = "gnomenm"; version = "20150316.1218"; src = fetchFromGitHub { owner = "nicferrier"; @@ -29272,10 +38198,10 @@ rev = "9065cda44ffc9e06239b8189a0154d31314c3b4d"; sha256 = "1svnvm9fqqx4mrk9jjn11pzqwk71w8kyyd9wwxam8gz22ykw5jb2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd98221d3498528efb0f2d943102d32ebd7b34b3/recipes/gnomenm"; sha256 = "01vmr64j6hcvdbzg945c5a2g4fiidl18dsk4px7mdf85cv45kzqm"; - name = "gnomenm"; + name = "recipe"; }; packageRequires = [ dash kv s ]; meta = { @@ -29283,9 +38209,13 @@ license = lib.licenses.free; }; }) {}; - gntp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gntp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gntp"; + ename = "gntp"; version = "20141024.1950"; src = fetchFromGitHub { owner = "tekai"; @@ -29293,10 +38223,10 @@ rev = "767571135e2c0985944017dc59b0be79af222ef5"; sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c69a148d3b72d1be6ea10100a8e0cbbd918baa9c/recipes/gntp"; sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f"; - name = "gntp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29304,9 +38234,14 @@ license = lib.licenses.free; }; }) {}; - gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gnu-apl-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gnu-apl-mode"; + ename = "gnu-apl-mode"; version = "20180129.2300"; src = fetchFromGitHub { owner = "lokedhs"; @@ -29314,10 +38249,10 @@ rev = "fa569827c916ed46e410e9f28e4b4d28f8567654"; sha256 = "0x1i1xcd3d34c9c87isd39d9ra69ywd01ag0hgkkgdzrk44znshj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; sha256 = "0971pzc14gw8f0b4lzvicxww1k3wc58gbr3fd0qvdra2jifk2is6"; - name = "gnu-apl-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29325,9 +38260,13 @@ license = lib.licenses.free; }; }) {}; - gnuplot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gnuplot = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gnuplot"; + ename = "gnuplot"; version = "20141231.1337"; src = fetchFromGitHub { owner = "bruceravel"; @@ -29335,10 +38274,10 @@ rev = "21f9046e3f5caad41b750b5c9cee02fa4fd20fb9"; sha256 = "1gm116479gdwc4hr3nyv1id692dcd1sx7w2a80pvmgr35ybccn7c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78be03893e4b0502ce999375e5630d32bda56ac1/recipes/gnuplot"; sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds"; - name = "gnuplot"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29346,9 +38285,13 @@ license = lib.licenses.free; }; }) {}; - gnuplot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gnuplot-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gnuplot-mode"; + ename = "gnuplot-mode"; version = "20171013.916"; src = fetchFromGitHub { owner = "mkmcc"; @@ -29356,10 +38299,10 @@ rev = "601f6392986f0cba332c87678d31ae0d0a496ce7"; sha256 = "14f0yh1rjqc3337j4sbqzfb7pjim2c8a7wk1a73xkrdkmjn82vgb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba/recipes/gnuplot-mode"; sha256 = "1avpik06cmi4h6v6039c64b4zw1r1nsg3nrryl254gl881pysfxg"; - name = "gnuplot-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29367,9 +38310,13 @@ license = lib.licenses.free; }; }) {}; - gnus-alias = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gnus-alias = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gnus-alias"; + ename = "gnus-alias"; version = "20150315.1742"; src = fetchFromGitHub { owner = "hexmode"; @@ -29377,10 +38324,10 @@ rev = "9447d3ccb4c0e75d0468899cccff7aa249657bac"; sha256 = "1i278npayv3kfxxd1ypi9n83q5l402sbc1zkm11pf8g006ifqsp4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6176257e00ca09e79fdff03c6dd450af8eb83666/recipes/gnus-alias"; sha256 = "0mbq9v8fiqqyldpb66v9bc777mzxywaq2dabivabxjg6554s8chf"; - name = "gnus-alias"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29388,20 +38335,25 @@ license = lib.licenses.free; }; }) {}; - gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: - melpaBuild { + gnus-desktop-notify = callPackage ({ fetchFromGitLab + , fetchurl + , gnus ? null + , lib + , melpaBuild }: + melpaBuild { pname = "gnus-desktop-notify"; - version = "20171007.1235"; - src = fetchFromGitHub { + ename = "gnus-desktop-notify"; + version = "20180623.838"; + src = fetchFromGitLab { owner = "wavexx"; repo = "gnus-desktop-notify.el"; - rev = "52e5de0961ce0f6890d5e7f26bc05152b99d9979"; - sha256 = "0r28hrlkji8z62nra71p0q6gvh21w90pyvmgskzjldmj78yjqbdj"; + rev = "44ebe0241a19f4052cd427dff408206542aa3c8f"; + sha256 = "1fqkclbddwfqywvkrb7l2cpibapxrk82ikdpbxapj09iwyn3ijlz"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify"; - sha256 = "08k32vhdp6i8c03rp1k6b5jmvj5ijplj26mdblrgasklcqbdnlfs"; - name = "gnus-desktop-notify"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/gnus-desktop-notify"; + sha256 = "1cfcmmq0ywgp41g0rf8s5fabh3yqbv9iacxi7v74kqh59bqdnz3x"; + name = "recipe"; }; packageRequires = [ gnus ]; meta = { @@ -29409,9 +38361,13 @@ license = lib.licenses.free; }; }) {}; - gnus-select-account = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gnus-select-account = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gnus-select-account"; + ename = "gnus-select-account"; version = "20170721.2211"; src = fetchFromGitHub { owner = "tumashu"; @@ -29419,10 +38375,10 @@ rev = "ddc8c135eeaf90f5b6692a033af2badae36e68ce"; sha256 = "0csq8cqv028g3mrvk88l0nlj3dk5fh67c10hdjwvxbf7winv0391"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gnus-select-account"; sha256 = "1yini6kif7vp5msmhnnpfkab5m5px8y4wgvc0f0k79kdd17gvpsx"; - name = "gnus-select-account"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29430,9 +38386,13 @@ license = lib.licenses.free; }; }) {}; - gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gnus-summary-ext = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gnus-summary-ext"; + ename = "gnus-summary-ext"; version = "20180113.516"; src = fetchFromGitHub { owner = "vapniks"; @@ -29440,10 +38400,10 @@ rev = "025fd853fe9280ae696a89ec2c2cac9befd010aa"; sha256 = "07ww2nc03daz70f2ajw7b2gin22xa306001zclhrxkm1cpjif2fi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca4a905b5f81991074c7d3e41d4422c7e6713d5/recipes/gnus-summary-ext"; sha256 = "0svyz8fy4k9ba6gpdymf4cf8zjjpgm71y48vlybxbv507xjm17qf"; - name = "gnus-summary-ext"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29451,20 +38411,26 @@ license = lib.licenses.free; }; }) {}; - gnus-x-gm-raw = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + gnus-x-gm-raw = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "gnus-x-gm-raw"; + ename = "gnus-x-gm-raw"; version = "20140610.31"; src = fetchFromGitHub { owner = "aki2o"; repo = "gnus-x-gm-raw"; - rev = "978bdfcecc8844465b71641c2e909fcdc66b22be"; - sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril"; + rev = "c2c8c5e94ac94f4c40e023452119c088ac59eac9"; + sha256 = "0gf418ri69yzi9cbxdyna9kxjsniyw72xix2r94m439k1axpwa3f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/263b87e40e32421ae56a99971a7e1baca0484778/recipes/gnus-x-gm-raw"; sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg"; - name = "gnus-x-gm-raw"; + name = "recipe"; }; packageRequires = [ log4e yaxception ]; meta = { @@ -29472,9 +38438,14 @@ license = lib.licenses.free; }; }) {}; - go = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go"; + ename = "go"; version = "20161110.1849"; src = fetchFromGitHub { owner = "eschulte"; @@ -29482,10 +38453,10 @@ rev = "ff45fb44d9cb6579d8511d8b6156ed0b34d5ac97"; sha256 = "14av8zcxp9r4ka0h9x73i6gzwbf231wqkin65va3agrzwaf8swz1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50e8d089f4e163eb459fc602cb90440b110b489f/recipes/go"; sha256 = "1mk1j504xwi3xswc0lfr3czs9j6wcsbrw2halr46mraiy8lnbz6h"; - name = "go"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29493,9 +38464,15 @@ license = lib.licenses.free; }; }) {}; - go-add-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + go-add-tags = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "go-add-tags"; + ename = "go-add-tags"; version = "20161123.427"; src = fetchFromGitHub { owner = "syohex"; @@ -29503,10 +38480,10 @@ rev = "54879945e46a0884c5f93d7fd6c866a9cdf401ac"; sha256 = "1gr65skrd41pk46ilfsbxfdng4br6h9c6blf1q1wx6i9ylhs0ak5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags"; sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim"; - name = "go-add-tags"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -29514,20 +38491,25 @@ license = lib.licenses.free; }; }) {}; - go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-autocomplete = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-autocomplete"; + ename = "go-autocomplete"; version = "20170626.323"; src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "d7aee89652f1bd8ca319c64d6dee1bc1dfd9b6ef"; - sha256 = "1mbz80y0qa6vyvjs33hxsrq5vc2mza5rjhi6rvbxzy2a3lrx4cig"; + rev = "beae6bdcc6fc300059038961b7a3e977e0fb7c61"; + sha256 = "0fhs17v2x24nhs0kd2yjzr56jni2767yrjxims6phsaxs9m5aih2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a"; - name = "go-autocomplete"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -29535,9 +38517,15 @@ license = lib.licenses.free; }; }) {}; - go-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-complete = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-complete"; + ename = "go-complete"; version = "20151015.228"; src = fetchFromGitHub { owner = "vibhavp"; @@ -29545,10 +38533,10 @@ rev = "e39efc356f6e19f17db3f3d2c81f28d38b31a55e"; sha256 = "0phy24cra8cza89xrqsx9xrwg98v9qwqx0fzgm1gwlf333zb3hha"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4df81abbf3b16f06fa327c1626bef1245ea77758/recipes/go-complete"; sha256 = "0dl0ibw145f84kd709r5i2kaw07z1sjzn3dmsiqn8dncspcf2vb4"; - name = "go-complete"; + name = "recipe"; }; packageRequires = [ cl-lib go-mode ]; meta = { @@ -29556,20 +38544,26 @@ license = lib.licenses.free; }; }) {}; - go-direx = callPackage ({ cl-lib ? null, direx, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-direx = callPackage ({ cl-lib ? null + , direx + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-direx"; + ename = "go-direx"; version = "20150315.1843"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-direx"; - rev = "8f2206469328ee932c7f1892f5e1fb02dec98432"; - sha256 = "09rxz40bkr0l75v3lmf8lcwqsgjiv5c8zjmwzy2d4syj4qv69c5y"; + rev = "aecb9fef4d56d04d230d37c75c260c8392b5ad9f"; + sha256 = "05yc0nylg3457an5j7yp3x23157j0hbi21qhcpgsa01144mwnwln"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/032c0c3cd04f36f1bc66bb7d9d789d354c620a09/recipes/go-direx"; sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7"; - name = "go-direx"; + name = "recipe"; }; packageRequires = [ cl-lib direx ]; meta = { @@ -29577,9 +38571,14 @@ license = lib.licenses.free; }; }) {}; - go-dlv = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-dlv = callPackage ({ fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-dlv"; + ename = "go-dlv"; version = "20160517.1346"; src = fetchFromGitHub { owner = "benma"; @@ -29587,10 +38586,10 @@ rev = "45a9e8a047c9995eb7c802268d96b3e527569f41"; sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv"; sha256 = "0lb5v9pmd6m8nvk4c9gcda5dmshrf5812gg1arq5p2g0nzg32mm8"; - name = "go-dlv"; + name = "recipe"; }; packageRequires = [ go-mode ]; meta = { @@ -29598,9 +38597,15 @@ license = lib.licenses.free; }; }) {}; - go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-eldoc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-eldoc"; + ename = "go-eldoc"; version = "20170305.627"; src = fetchFromGitHub { owner = "syohex"; @@ -29608,10 +38613,10 @@ rev = "cbbd2ea1e94a36004432a9ac61414cb5a95a39bd"; sha256 = "1029qg6ida3cw4ynxll6ykpnqkpbrbrx12nnzcplhc25vqpz7hik"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc"; sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk"; - name = "go-eldoc"; + name = "recipe"; }; packageRequires = [ emacs go-mode ]; meta = { @@ -29619,9 +38624,13 @@ license = lib.licenses.free; }; }) {}; - go-errcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-errcheck = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-errcheck"; + ename = "go-errcheck"; version = "20160722.1743"; src = fetchFromGitHub { owner = "dominikh"; @@ -29629,10 +38638,10 @@ rev = "9db21eccecedc2490793f176246094167164af31"; sha256 = "1ngzgkmcbk6qa3p97hch75k446h15515arsdfv7mqb4m5va6429h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c874f608a55cafcc6e57ca2c80bdae6b1c2e47e9/recipes/go-errcheck"; sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs"; - name = "go-errcheck"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29640,9 +38649,14 @@ license = lib.licenses.free; }; }) {}; - go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-fill-struct = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-fill-struct"; + ename = "go-fill-struct"; version = "20171224.1931"; src = fetchFromGitHub { owner = "s-kostyaev"; @@ -29650,10 +38664,10 @@ rev = "a613d0b378473eef39e8fd5724abe790aea84321"; sha256 = "16bgfykvqc61hlx1hj55z15y83zgpavhb853sblds75m8w7mndqg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct"; sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7"; - name = "go-fill-struct"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29661,9 +38675,15 @@ license = lib.licenses.free; }; }) {}; - go-gen-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + go-gen-test = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "go-gen-test"; + ename = "go-gen-test"; version = "20171022.2058"; src = fetchFromGitHub { owner = "s-kostyaev"; @@ -29671,10 +38691,10 @@ rev = "44c202ac97e728e93a35cee028a0ea8dd6e4292c"; sha256 = "1vi5xsf0xbcbvapi20hsjangwyp38cbgi8kiccpmingnq2kp8ghs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0861c126161a2674f0e115eac6f948490b142b44/recipes/go-gen-test"; sha256 = "1pj8n8xj9ccq9ips4wy4v6hdxxgwv11pwi671l6jjrig38v13dzr"; - name = "go-gen-test"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -29682,9 +38702,14 @@ license = lib.licenses.free; }; }) {}; - go-gopath = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-gopath = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-gopath"; + ename = "go-gopath"; version = "20160705.334"; src = fetchFromGitHub { owner = "iced"; @@ -29692,10 +38717,10 @@ rev = "5172fc53f21edbf9347d5ee7d1d745da1ec88a15"; sha256 = "0gqb3k33y42gchc89rw3k1pvb7ai9ka50ljfd4avk31fdpr4dln5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ca8d10b10b015c5bdafe1dbc8e53eb4c0d26d9c/recipes/go-gopath"; sha256 = "0jfy2r3axqpn2cnibp8f9vw36kmx0icixhj6zy43d9xa4znvdqal"; - name = "go-gopath"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -29703,20 +38728,26 @@ license = lib.licenses.free; }; }) {}; - go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-guru = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-guru"; - version = "20170718.1046"; + ename = "go-guru"; + version = "20180628.310"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "ff87a1e80945d958d9c348ce4d2e65a797b38a4b"; - sha256 = "182z309aysvi5xg5ymxmdxhkwdllj9v3pi1pajxsgwiq314bycdr"; + rev = "7f87c32464d2eb22ac7a413cac741a89fbfdc740"; + sha256 = "06znpm5zfi41rcdrjgf79w9zifn2my56sfys5fyafqc53rjya4pv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; sha256 = "01f0gz65z8d0iv8k49xl2sp6q4qnsvwhd4g8fb2irp7iclb0xmvk"; - name = "go-guru"; + name = "recipe"; }; packageRequires = [ cl-lib go-mode ]; meta = { @@ -29724,9 +38755,15 @@ license = lib.licenses.free; }; }) {}; - go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-impl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-impl"; + ename = "go-impl"; version = "20170125.752"; src = fetchFromGitHub { owner = "syohex"; @@ -29734,10 +38771,10 @@ rev = "69f0d0ef05771487e15abec500cd06befd171abf"; sha256 = "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl"; sha256 = "09frwpwc080rfpwkb63yv47dyj741lrpyrp65sq2bn4sf03xw0cx"; - name = "go-impl"; + name = "recipe"; }; packageRequires = [ emacs go-mode ]; meta = { @@ -29745,20 +38782,24 @@ license = lib.licenses.free; }; }) {}; - go-imports = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-imports = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-imports"; - version = "20180325.1918"; + ename = "go-imports"; + version = "20180709.2228"; src = fetchFromGitHub { owner = "yasushi-saito"; repo = "go-imports"; - rev = "7955b820668af7380e65b418e66e445729ea8ef3"; - sha256 = "0yykpnnrxjp4zf66l6pcx9xx4v26b6468gyqyf77kr5890ry9sl1"; + rev = "d9950309c868aa46c45f8671413e53f97dc7fe0b"; + sha256 = "1nq0s6zkk87jggj91iza9ap255i8r1c8ahb1118s25pvb5gcfnfv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4118ebf0db84cc047fab311c789bfbffd6eb2d92/recipes/go-imports"; sha256 = "0xxlh4rmyvfxiynsdqng6wd3js7h3azhb8ii0ch7n0hhqkcnda4x"; - name = "go-imports"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29766,20 +38807,24 @@ license = lib.licenses.free; }; }) {}; - go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-mode"; + ename = "go-mode"; version = "20180327.830"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "ff87a1e80945d958d9c348ce4d2e65a797b38a4b"; - sha256 = "182z309aysvi5xg5ymxmdxhkwdllj9v3pi1pajxsgwiq314bycdr"; + rev = "7c50c800bc06f7e3b2f2d3fc0410e2cea78a5cb3"; + sha256 = "1ain754h3kglk1qiqjkc3mwcyl2wmqywv4qkqfp7wkyyj34gncb6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; sha256 = "0ghqm4lbkfla79plqiyb1lzf5kbz0380h9vf8px15zal00xrv0bl"; - name = "go-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29787,9 +38832,16 @@ license = lib.licenses.free; }; }) {}; - go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: - melpaBuild { + go-playground = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , go-mode + , gotest + , lib + , melpaBuild }: + melpaBuild { pname = "go-playground"; + ename = "go-playground"; version = "20170226.43"; src = fetchFromGitHub { owner = "grafov"; @@ -29797,10 +38849,10 @@ rev = "559d53bbc507394aaca3683325d17286637bf4f0"; sha256 = "04hxgi27cyhs07mb0wz21q11b1nxmfsx56gynxjc2gqj2wb5i086"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6"; - name = "go-playground"; + name = "recipe"; }; packageRequires = [ emacs go-mode gotest ]; meta = { @@ -29808,9 +38860,21 @@ license = lib.licenses.free; }; }) {}; - go-playground-cli = callPackage ({ cl-lib ? null, deferred, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, names, request, s }: - melpaBuild { + go-playground-cli = callPackage ({ cl-lib ? null + , deferred + , emacs + , f + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , names + , request + , s }: + melpaBuild { pname = "go-playground-cli"; + ename = "go-playground-cli"; version = "20160503.214"; src = fetchFromGitHub { owner = "kosh04"; @@ -29818,10 +38882,10 @@ rev = "60beebd98e3930641d41cee0189c579626f223bc"; sha256 = "1fcm65r1sy2fmcp2i7mwc7mxqiaf4aaxda4i2qrm8s25cxsffir7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3af0a72ee1222c133ccfd76f004a346fd6110eee/recipes/go-playground-cli"; sha256 = "00h89rh8d7lq1di77nv609xbzxmjmffq6mz3cmagylxncflg81jc"; - name = "go-playground-cli"; + name = "recipe"; }; packageRequires = [ cl-lib deferred emacs f let-alist names request s ]; meta = { @@ -29829,9 +38893,18 @@ license = lib.licenses.free; }; }) {}; - go-projectile = callPackage ({ fetchFromGitHub, fetchurl, go-eldoc, go-guru, go-mode, go-rename, lib, melpaBuild, projectile }: - melpaBuild { + go-projectile = callPackage ({ fetchFromGitHub + , fetchurl + , go-eldoc + , go-guru + , go-mode + , go-rename + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "go-projectile"; + ename = "go-projectile"; version = "20170302.1705"; src = fetchFromGitHub { owner = "dougm"; @@ -29839,10 +38912,10 @@ rev = "4c449eae696d4e3a15078c336c98ea779da227ab"; sha256 = "1cyvd2va0vgbh7im5rhapyd66ql469cl2hswg946qj961kdxc7s9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3559a179be2a5cda71ee0a5a18bead4b3a1a8138/recipes/go-projectile"; sha256 = "07diik27gr82n11a8k62v1jxq8rhi16f02ybk548f6cn7iqgp2ml"; - name = "go-projectile"; + name = "recipe"; }; packageRequires = [ go-eldoc go-guru go-mode go-rename projectile ]; meta = { @@ -29850,20 +38923,25 @@ license = lib.licenses.free; }; }) {}; - go-rename = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-rename = callPackage ({ fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-rename"; - version = "20161117.331"; + ename = "go-rename"; + version = "20180626.2348"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "ff87a1e80945d958d9c348ce4d2e65a797b38a4b"; - sha256 = "182z309aysvi5xg5ymxmdxhkwdllj9v3pi1pajxsgwiq314bycdr"; + rev = "da55ef1ad3a4802f7d056d3065f6962db3d6fd14"; + sha256 = "1mphf9msxc24q2i0ghcgd0ah6r0x6svxak6kn9is7x0kbfiy9226"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; sha256 = "1cd2nfgwnqzylbry11ahahdip8w66w5hnrndrs65ip10s08w2xki"; - name = "go-rename"; + name = "recipe"; }; packageRequires = [ go-mode ]; meta = { @@ -29871,9 +38949,15 @@ license = lib.licenses.free; }; }) {}; - go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-scratch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-scratch"; + ename = "go-scratch"; version = "20150809.2140"; src = fetchFromGitHub { owner = "shosti"; @@ -29881,10 +38965,10 @@ rev = "3f68cbcce04f59eb8e83af109164731ec0454be0"; sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1713e6f02f8908b828ac2722a3185ea7cceb0609/recipes/go-scratch"; sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5"; - name = "go-scratch"; + name = "recipe"; }; packageRequires = [ emacs go-mode ]; meta = { @@ -29892,9 +38976,14 @@ license = lib.licenses.free; }; }) {}; - go-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + go-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "go-snippets"; + ename = "go-snippets"; version = "20180112.2211"; src = fetchFromGitHub { owner = "toumorokoshi"; @@ -29902,10 +38991,10 @@ rev = "d437df148879566ffe7f2e503a3cf2602aa9fb28"; sha256 = "0rs2yj9bh0snf13hfj9bvyawl16j8416naz6h52l21q72ymd4b0k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca9f3022e7f4d5391be394cd56f6db75c9cff3b6/recipes/go-snippets"; sha256 = "1wcbnfzxailv18spxyv4a0nwlqh9l7yf5vxg0qcjcp5ajd2w12kn"; - name = "go-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -29913,9 +39002,13 @@ license = lib.licenses.free; }; }) {}; - go-stacktracer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-stacktracer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-stacktracer"; + ename = "go-stacktracer"; version = "20150430.1442"; src = fetchFromGitHub { owner = "samertm"; @@ -29923,10 +39016,10 @@ rev = "a2ac6d801b389f80ca4e2fcc1ab44513a9e55976"; sha256 = "0n5nsyfwx2pdlwx6bl35wrfyady5dwraimv92f58mhc344ajd70y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/401996c585d2ccf97add1bc420250d96188b651a/recipes/go-stacktracer"; sha256 = "1laz2ggqydnyr7b36ggb7sphlib79dhp7nszw42wssmv212v94cy"; - name = "go-stacktracer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29934,20 +39027,26 @@ license = lib.licenses.free; }; }) {}; - go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-tag = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-tag"; + ename = "go-tag"; version = "20180226.2011"; src = fetchFromGitHub { owner = "brantou"; repo = "emacs-go-tag"; - rev = "59b243f2fa079d9de9d56f6e2d94397e9560310a"; - sha256 = "0r72qk79q8yyidpxgq4r0295fm73id946p1r4s65bwyzii76rjyi"; + rev = "8dbcb7d42dccac046c7beb31bdf79bb09a0fef40"; + sha256 = "1l20az4lhgbrh96sk6bpvp3w4bh29653fms4bimmiaqmhn2n14y2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag"; sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f"; - name = "go-tag"; + name = "recipe"; }; packageRequires = [ emacs go-mode ]; meta = { @@ -29955,9 +39054,14 @@ license = lib.licenses.free; }; }) {}; - gobgen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gobgen = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gobgen"; + ename = "gobgen"; version = "20161020.823"; src = fetchFromGitHub { owner = "gergelypolonkai"; @@ -29965,10 +39069,10 @@ rev = "ed2c2b0d217deae293096f3cf14aa492791ddd4f"; sha256 = "1isda941gzrl9r2xxaxbsqjxq146cmnhl04m634m8m0q2d751pwk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c9fed22bb8dbfb359e4fdb0d802ed4b5781f50d/recipes/gobgen"; sha256 = "0fb0q9x7wj8gs1iyr87q1vpxmfa2d43zy6cgxpzmv2wc26x96vi7"; - name = "gobgen"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29976,9 +39080,13 @@ license = lib.licenses.free; }; }) {}; - god-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + god-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "god-mode"; + ename = "god-mode"; version = "20180117.334"; src = fetchFromGitHub { owner = "chrisdone"; @@ -29986,10 +39094,10 @@ rev = "344167ed9b4c212273dd056e7481cf1373b461d0"; sha256 = "0y7phh7amrdphv9dkf0304z2knyas745ir59ybngh1a55dfc2mf4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2dff8dc08583048f9b7b4cb6d8f05a18dd4e8b42/recipes/god-mode"; sha256 = "01xx2byjh6vlckaxamm2x2qzicd9qc8h6amyjg0bxz3932a4llaa"; - name = "god-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29997,20 +39105,24 @@ license = lib.licenses.free; }; }) {}; - godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + godoctor = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "godoctor"; - version = "20161205.143"; + ename = "godoctor"; + version = "20180710.1452"; src = fetchFromGitHub { owner = "microamp"; repo = "godoctor.el"; - rev = "f892a4dbabe61186540d6035c5185fd929a6a543"; - sha256 = "1cg09mihvqchgvdxwlrg9vcdj1kvmmy8zmlkscxi6smaxbi0yvjm"; + rev = "4b45ff3d0572f0e84056e4c3ba91fcc178199859"; + sha256 = "12gga1ghc54r6f2adyaq30hm2yxspvgg54zd4k82c3d6cj51qwci"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor"; sha256 = "0k734hry9npsr6zhsplcvmcjqw6jdf79pv4k9dw0xvd598hkpazz"; - name = "godoctor"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30018,9 +39130,14 @@ license = lib.licenses.free; }; }) {}; - gold-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }: - melpaBuild { + gold-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sws-mode }: + melpaBuild { pname = "gold-mode"; + ename = "gold-mode"; version = "20140606.1906"; src = fetchFromGitHub { owner = "yuutayamada"; @@ -30028,10 +39145,10 @@ rev = "6d3aa59602b1b835495271c8c9741ac344c2eab1"; sha256 = "1k4i9z9h4m0h0y92mncr96jir63q5h1bix5bpnlfxhxl5w8pvk1q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1991b63067c581c7576df4b69b509ab5a44d5a/recipes/gold-mode"; sha256 = "1b67hd1fp6xcj65xxp5jcpdjspxsbzxy26v6lqg5kiy8knls57kf"; - name = "gold-mode"; + name = "recipe"; }; packageRequires = [ sws-mode ]; meta = { @@ -30039,9 +39156,13 @@ license = lib.licenses.free; }; }) {}; - golden-ratio = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + golden-ratio = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "golden-ratio"; + ename = "golden-ratio"; version = "20150819.420"; src = fetchFromGitHub { owner = "roman"; @@ -30049,10 +39170,10 @@ rev = "72b028808b41d23fa3f7e8c0d23d2c475e7b46ae"; sha256 = "0wdw89n7ngxpcdigv8c01h4i84hsdh0y7xq6jdj1i6mnajl8gk92"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e87b2af052d0406431957d75aa3717899bdbc8ae/recipes/golden-ratio"; sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81"; - name = "golden-ratio"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30060,20 +39181,24 @@ license = lib.licenses.free; }; }) {}; - golden-ratio-scroll-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + golden-ratio-scroll-screen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "golden-ratio-scroll-screen"; + ename = "golden-ratio-scroll-screen"; version = "20170223.1829"; src = fetchFromGitHub { owner = "jixiuf"; repo = "golden-ratio-scroll-screen"; - rev = "44e947194d3e5cbe0fd2f3c4886a4e6e1a0c0791"; - sha256 = "1wd19jskpp9w0lrg0ky3hvnliq9l09kmxy59hdp06hsdmvr31jwv"; + rev = "0428fbe020ddb90811f2932e661796f667bf4ac5"; + sha256 = "1v4rz5ddd0x7szk9pz5hrxp25xqdf6gngrm8y2cf8xgyvrlscyba"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af044c4a28149362347c2477f0d8d0f8d1dc8c0d/recipes/golden-ratio-scroll-screen"; sha256 = "1ygh104vr65s7frlkzyhrfi6shrbvp2b2j3ynj5dip253v85xki5"; - name = "golden-ratio-scroll-screen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30081,9 +39206,15 @@ license = lib.licenses.free; }; }) {}; - goldendict = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + goldendict = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "goldendict"; + ename = "goldendict"; version = "20180121.120"; src = fetchFromGitHub { owner = "stardiviner"; @@ -30091,10 +39222,10 @@ rev = "1aac19daaec811deb9afe45eea4929309c09ac8b"; sha256 = "1il432f6ayj2whl4s804n5wykgs51jhbx4xkcbfgqra58cbjrjhi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af87026905478d9134a4a036e792f6afd9c10768/recipes/goldendict"; sha256 = "0zvrlz169pg9bj1bmks4lh5zn8cygqzwiyzg49na2a7wf2sk9m1f"; - name = "goldendict"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -30102,20 +39233,24 @@ license = lib.licenses.free; }; }) {}; - golint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + golint = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "golint"; + ename = "golint"; version = "20180221.1215"; src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "85993ffd0a6cd043291f3f63d45d656d97b165bd"; - sha256 = "0kag4ki3dx9xnm41gj4q77wcl77785id4qqb8kb7k5rhfrs29psz"; + rev = "0562613f16a6ec439a4a68e817e69e0f7c405c87"; + sha256 = "1lhzas39dkf38965ibrxdfdh7gxsjiyzqas7h51zr5fdx6cyjwnf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; sha256 = "1q4y6mgll8wyp0c7zx810nzsm0k4wvz0wkly1fbja9z63sjzzxwb"; - name = "golint"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30123,9 +39258,13 @@ license = lib.licenses.free; }; }) {}; - gom-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gom-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gom-mode"; + ename = "gom-mode"; version = "20131007.1953"; src = fetchFromGitHub { owner = "syohex"; @@ -30133,10 +39272,10 @@ rev = "972e33df1d38ff323bc97de87477305826013701"; sha256 = "1anjzlg53kjdqfjcdahbxy8zk9hdha075c1f9nzrnnbbqvmirbbb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1e5f505e048b36c12de36b23b779beeaefc45f/recipes/gom-mode"; sha256 = "07zr38gzqb3ds9mpf94c1vhl1rqd0cjh4g4j2bz86q16c0rnmp7m"; - name = "gom-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30144,9 +39283,13 @@ license = lib.licenses.free; }; }) {}; - google = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + google = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "google"; + ename = "google"; version = "20140416.1048"; src = fetchFromGitHub { owner = "hober"; @@ -30154,10 +39297,10 @@ rev = "3b3189a8b201c8d36fed6e61496274e530dd40bd"; sha256 = "06p1dpnmg7lhdff1g7c04qq8f9srgkmnm42jlqy85k87j3p5ys2i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45237d37da807559498bb958184e05109f880070/recipes/google"; sha256 = "11a521cq5bj7afl7bqiilg0c81dy00lnhak7h3d9c9kwg7kfljiq"; - name = "google"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30165,20 +39308,24 @@ license = lib.licenses.free; }; }) {}; - google-c-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + google-c-style = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "google-c-style"; + ename = "google-c-style"; version = "20180130.936"; src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "5508c2f7dfaba43b30d413c943560476c2e5a46c"; - sha256 = "12f6zw4byx7m6v81q2szabpy0ky8cpyn1drcjyi6yvra11z6747a"; + rev = "505ba68c74eb97e6966f60907ce893001bedc706"; + sha256 = "0277vsj0shrlgb96zgy8lln55l2klzkk6h28g4srbpgkwz5xxsx7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; sha256 = "10gsbg880jbvxs4291vi2ww30ird2f313lbgcb11lswivmhrmd1r"; - name = "google-c-style"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30186,9 +39333,15 @@ license = lib.licenses.free; }; }) {}; - google-contacts = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }: - melpaBuild { + google-contacts = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , oauth2 }: + melpaBuild { pname = "google-contacts"; + ename = "google-contacts"; version = "20171027.1033"; src = fetchFromGitHub { owner = "jd"; @@ -30196,10 +39349,10 @@ rev = "a40389bae006ae094aeb1a39fae9891ca687c0fa"; sha256 = "06mfdmr3dlmk4gyq8fxqv78c5jyis8vxx4ih2azcr5c831pkayzi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-contacts"; sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn"; - name = "google-contacts"; + name = "recipe"; }; packageRequires = [ cl-lib oauth2 ]; meta = { @@ -30207,9 +39360,14 @@ license = lib.licenses.free; }; }) {}; - google-maps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + google-maps = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "google-maps"; + ename = "google-maps"; version = "20171002.734"; src = fetchFromGitHub { owner = "jd"; @@ -30217,10 +39375,10 @@ rev = "c0e5dccfdc9f7f77ff8f29177547be47833d7156"; sha256 = "1agsfmbd2zbn1xs05kxlb32hhkmrri3hdmcrvf0w1fcsgc5a9085"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps"; sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx"; - name = "google-maps"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -30228,9 +39386,14 @@ license = lib.licenses.free; }; }) {}; - google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + google-this = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "google-this"; + ename = "google-this"; version = "20170810.515"; src = fetchFromGitHub { owner = "Malabarba"; @@ -30238,10 +39401,10 @@ rev = "8a2e3ca5da6a8c89bfe99a21486c6c7db125dc84"; sha256 = "1dbra309w8awmi0g0pp7r2dm9nwrj2j9lpl7md8wa89rnzazwahl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this"; sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c"; - name = "google-this"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -30249,20 +39412,24 @@ license = lib.licenses.free; }; }) {}; - google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + google-translate = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "google-translate"; + ename = "google-translate"; version = "20170713.119"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "d8b84a8359fcc697114d1298840e9a45b111c974"; - sha256 = "1qs4hcg1i2m487z50nnwgs0sa2xj4lpgizbrvi2yda0mf3m75fgc"; + rev = "486c63bbfa0338589589f628703c38112035a5b2"; + sha256 = "08b4lxnwy9iqxacbjjljybvvdkl9g2dy6vga6hw7h7h32qra8w2j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47"; - name = "google-translate"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30270,9 +39437,14 @@ license = lib.licenses.free; }; }) {}; - goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + goose-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "goose-theme"; + ename = "goose-theme"; version = "20160828.545"; src = fetchFromGitHub { owner = "tokenrove"; @@ -30280,10 +39452,10 @@ rev = "acd017b50ab25a75fd1331eb3de66467e2042e9c"; sha256 = "1mmdvjsgnwgs6akhyj96fgj30mz53djdq85dl5q4cmiznlbma7hy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23a52e068ec0e6d457402254727673ea02bd407/recipes/goose-theme"; sha256 = "1nw948js678xc5vgrpdkykpcbn1b1id4k1clf87vfv7y5zssvd0x"; - name = "goose-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -30291,9 +39463,14 @@ license = lib.licenses.free; }; }) {}; - gore-mode = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + gore-mode = callPackage ({ fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "gore-mode"; + ename = "gore-mode"; version = "20151123.1127"; src = fetchFromGitHub { owner = "sergey-pashaev"; @@ -30301,10 +39478,10 @@ rev = "94d7f3e99104e06167967c98fdc201049c433c2d"; sha256 = "0l022aqpnb38q6kgdqpbxrc1r7fljwl7xq14yi5jb7qgzw2v43cz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de09fcf14f778efe4247a93fb887b77050258f39/recipes/gore-mode"; sha256 = "0nljybh2pw8pbbajfsz57r11rs4bvzfxmwpbm5qrdn6dzzv65nq3"; - name = "gore-mode"; + name = "recipe"; }; packageRequires = [ go-mode ]; meta = { @@ -30312,9 +39489,17 @@ license = lib.licenses.free; }; }) {}; - gorepl-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s }: - melpaBuild { + gorepl-mode = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild + , s }: + melpaBuild { pname = "gorepl-mode"; + ename = "gorepl-mode"; version = "20170905.245"; src = fetchFromGitHub { owner = "manute"; @@ -30322,10 +39507,10 @@ rev = "bbd27f6a0a77f484e2a3f082d70dc69da63ae52a"; sha256 = "01lqirxgw7svxy1fdv49mvcbhpslf64in6c4dk36b8xhngyqbilf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gorepl-mode"; sha256 = "0xcjjh9hf3pv5jgv089c6bb00s215fc9qwn72fav1xbm5f49nkaq"; - name = "gorepl-mode"; + name = "recipe"; }; packageRequires = [ emacs f hydra s ]; meta = { @@ -30333,20 +39518,28 @@ license = lib.licenses.free; }; }) {}; - gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: - melpaBuild { + gotest = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild + , s }: + melpaBuild { pname = "gotest"; - version = "20180319.137"; + ename = "gotest"; + version = "20180617.633"; src = fetchFromGitHub { owner = "nlamirault"; repo = "gotest.el"; - rev = "ad0d617887eed837eed72f7d3daba40d1bb7cba8"; - sha256 = "1lsc6bri8rqkqrmhdslqpph2rdad4b3x8zabg55d9msc4fh25jlv"; + rev = "4b21b86c07a1597e5e3ca795603787906695ee1b"; + sha256 = "1s1m7r74h2qa10z11xcrsv9ivfn9xc6bbzcxy41whdjp46m65qjm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest"; sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9"; - name = "gotest"; + name = "recipe"; }; packageRequires = [ emacs f go-mode s ]; meta = { @@ -30354,9 +39547,13 @@ license = lib.licenses.free; }; }) {}; - gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gotham-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gotham-theme"; + ename = "gotham-theme"; version = "20171013.1216"; src = fetchFromGitHub { owner = "wasamasa"; @@ -30364,10 +39561,10 @@ rev = "5e97554d1f9639698faedb0660e63694be33bd84"; sha256 = "18x0b2qmyzf9sddsv9ps1059pi4ndzq44rm4yl87slq03y75nxi9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme"; sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl"; - name = "gotham-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30375,9 +39572,13 @@ license = lib.licenses.free; }; }) {}; - goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + goto-chg = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "goto-chg"; + ename = "goto-chg"; version = "20180105.1033"; src = fetchFromGitHub { owner = "emacs-evil"; @@ -30385,10 +39586,10 @@ rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4"; sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy"; - name = "goto-chg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30396,20 +39597,25 @@ license = lib.licenses.free; }; }) {}; - goto-gem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + goto-gem = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "goto-gem"; + ename = "goto-gem"; version = "20140729.1145"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "pidu"; repo = "goto-gem"; rev = "e3206f11f48bb7e798514a4ca2c2f60649613e5e"; sha256 = "0j2hdxqfsifm0d8ilwcw7np6mvn4xm58xglzh42gigj2fxv87g99"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5f576f6fab4ee466c54ce2c50569a447b6d617cc/recipes/goto-gem"; - sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a"; - name = "goto-gem"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/goto-gem"; + sha256 = "0i79z1isdbnqmz5rlqjjys68l27nl90m1gzks4f9d6dsgfryhgwx"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -30417,9 +39623,13 @@ license = lib.licenses.free; }; }) {}; - goto-last-change = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + goto-last-change = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "goto-last-change"; + ename = "goto-last-change"; version = "20150109.1023"; src = fetchFromGitHub { owner = "camdez"; @@ -30427,10 +39637,10 @@ rev = "58b0928bc255b47aad318cd183a5dce8f62199cc"; sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d68945f5845e5e44fb6c11726a56acd4dc56e101/recipes/goto-last-change"; sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx"; - name = "goto-last-change"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30438,20 +39648,29 @@ license = lib.licenses.free; }; }) {}; - govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: - melpaBuild { + govc = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , json-mode + , lib + , magit-popup + , melpaBuild + , s }: + melpaBuild { pname = "govc"; - version = "20180129.905"; + ename = "govc"; + version = "20180524.1323"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "1f0870fcda76974a214b4dd7df54df00d0ba0713"; - sha256 = "17zphy7kkwqiqc9zsrkfv4x63jqbz6vnxrx1snar987dk3iwpfph"; + rev = "e3a01f9611c32b2362366434bcd671516e78955d"; + sha256 = "0cicd4m8ll7y1n0c97drmvmqwsqaspwpzc6nfp73f887m8ff1xis"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; sha256 = "1ivgaziv25wlzg6y4zh8x7mv97pnyhi7p8jpvgh5fg5lnqpzhl4v"; - name = "govc"; + name = "recipe"; }; packageRequires = [ dash emacs json-mode magit-popup s ]; meta = { @@ -30459,20 +39678,24 @@ license = lib.licenses.free; }; }) {}; - govet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + govet = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "govet"; + ename = "govet"; version = "20170808.1024"; src = fetchFromGitHub { owner = "meshelton"; repo = "govet"; - rev = "1c05817cf8b96589076c7ac4e52ee58a860a0cbf"; - sha256 = "1n223i87xmk8p8h8dswnhhvazy0z53dzl36gmk9y7ck8bd9vz706"; + rev = "1b8c044aa856f4b62a682bc57494af19d22a6053"; + sha256 = "1d0gd4awkkfsppqv7367bn5h8k8dlyvrg9cbvsn6mqn5j93mr3fx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e4a5f5031c76056d8f1b64b27a39a512c7c59cd/recipes/govet"; sha256 = "1rpgngixf1xnnqf0l2vvh6y9q3395qyj9ln1rh0xz5lm7d4pq4hy"; - name = "govet"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30480,9 +39703,40 @@ license = lib.licenses.free; }; }) {}; - grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gpastel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "gpastel"; + ename = "gpastel"; + version = "20180419.2350"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "gpastel"; + rev = "21b7d79530134d6a47eeb252b684f884c769d291"; + sha256 = "1s1gnkpz6byf6by8r1bl9vq3slmsdavjb2ybp2zgic48favz1qm2"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9b70e05ff0a074f9e2f1373e8495dc8df462deea/recipes/gpastel"; + sha256 = "0mjy4n26s89b481dby018l80glgfwfaacihmd7vhh2c75ns671a6"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gpastel"; + license = lib.licenses.free; + }; + }) {}; + grab-mac-link = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grab-mac-link"; + ename = "grab-mac-link"; version = "20180328.745"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -30490,10 +39744,10 @@ rev = "35edb57d136c2a9726fd14e6a59cce4fc0248771"; sha256 = "1c3g6ygi71qm3lqvhjjzxkpdhwkpx4qwm8mhinwffcib5hagrafn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link"; sha256 = "1a4wyvx1mlgnd45nn99lwy3vaiwhi1nrphfln86pb6z939dxakj3"; - name = "grab-mac-link"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -30501,9 +39755,15 @@ license = lib.licenses.free; }; }) {}; - grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grab-x-link = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grab-x-link"; + ename = "grab-x-link"; version = "20180205.346"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -30511,10 +39771,10 @@ rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c"; sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link"; sha256 = "1kni49n1v716w4hjfm49mk25jshfc6idpby0k58qvngbfqk3kzy5"; - name = "grab-x-link"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -30522,20 +39782,25 @@ license = lib.licenses.free; }; }) {}; - gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + gradle-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "gradle-mode"; + ename = "gradle-mode"; version = "20150313.1205"; src = fetchFromGitHub { owner = "jacobono"; repo = "emacs-gradle-mode"; - rev = "e4d665d5784ecda7ddfba015f07c69be3cfc45f2"; - sha256 = "0xs2278gamzg0710bm1fkhjh1p75m2l1jcl98ldhyjhvaf9d0ysc"; + rev = "579de06674551919cddac9cfe42129f4fb0155c9"; + sha256 = "0k86lrb55d701nj6pvlw3kjp1dcd3lzfya0hv6q56c529y69d782"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/771cc597daebf9b4aa308f8b350af91a515b44c9/recipes/gradle-mode"; sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g"; - name = "gradle-mode"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -30543,9 +39808,14 @@ license = lib.licenses.free; }; }) {}; - grails = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grails = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grails"; + ename = "grails"; version = "20160416.2336"; src = fetchFromGitHub { owner = "lifeisfoo"; @@ -30553,10 +39823,10 @@ rev = "fa638abe5c37f3f8af4fcd32f212453185ce50b1"; sha256 = "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be0196207245ea9d23fda09121d624db9ea6d83d/recipes/grails"; sha256 = "177y6xv35d2dhc3pdx5qhpywlmlqgfnjpzfm9yxc8l6q2rgs8irw"; - name = "grails"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -30564,20 +39834,24 @@ license = lib.licenses.free; }; }) {}; - grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grails-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grails-mode"; + ename = "grails-mode"; version = "20160504.211"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "88e851a7685a4f6f65786f088423163ba33be84b"; - sha256 = "1ac4dbk890nq9w0slc17106b8rsavhh63rq0n9wplixl8i2ccr4g"; + rev = "50801257d376fd7383ddf9c19ff567183c24ad0b"; + sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; sha256 = "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4"; - name = "grails-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30585,9 +39859,16 @@ license = lib.licenses.free; }; }) {}; - grails-projectile-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + grails-projectile-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "grails-projectile-mode"; + ename = "grails-projectile-mode"; version = "20160327.624"; src = fetchFromGitHub { owner = "yveszoundi"; @@ -30595,10 +39876,10 @@ rev = "8efca50ce92b556fe9d467b157d7aec635bcc017"; sha256 = "0xnj0wp0na53l0y8fiaah50ij4r80j8a29hbjbcicska21p5w1s1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35d49029c1f665ad40e543040d98d5a770bfea96/recipes/grails-projectile-mode"; sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn"; - name = "grails-projectile-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs projectile ]; meta = { @@ -30606,20 +39887,23 @@ license = lib.licenses.free; }; }) {}; - grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grandshell-theme = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grandshell-theme"; - version = "20180131.1439"; - src = fetchFromGitHub { - owner = "steckerhalter"; - repo = "grandshell-theme"; - rev = "823232a83a51e8a3f7b4db09e23658fc1a1c93ca"; - sha256 = "0a1svfbxw7g31rnf3lcjsy2x21s14c2gpbrzjpl06qa0p3cnn4db"; + ename = "grandshell-theme"; + version = "20180605.2217"; + src = fetchgit { + url = "https://framagit.org/steckerhalter/grandshell-theme.git"; + rev = "0ed8e4273607dd4fcaa742b4097259233b09eda6"; + sha256 = "04vx5p1ffln5b9rxgfi15q735plxcjvskby3c5k4slgwf4p91bpq"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; - sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa"; - name = "grandshell-theme"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/grandshell-theme"; + sha256 = "1r0r0r0g116f4jp3rip8mjqqgdam4h5dr5qvdglr9xpirfcw6wq3"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30627,20 +39911,35 @@ license = lib.licenses.free; }; }) {}; - graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }: - melpaBuild { + graphene = callPackage ({ company + , dash + , exec-path-from-shell + , fetchFromGitHub + , fetchurl + , flycheck + , graphene-meta-theme + , ido-completing-read-plus + , lib + , melpaBuild + , ppd-sr-speedbar + , smartparens + , smex + , sr-speedbar + , web-mode }: + melpaBuild { pname = "graphene"; - version = "20171125.854"; + ename = "graphene"; + version = "20180529.412"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene"; - rev = "9dbd50e532ca45076e03db0f96a57d21528fc460"; - sha256 = "0sqxnjmfbr0plahdmp87j8xpl3qkyimf9vkqall4ccljx8irdl6s"; + rev = "cc8477fcfb7771ea4e5bbaf3c01f9e679234c1c1"; + sha256 = "0j0igcmfl61c4pakqmyxpwr4kjar9i81vkl84rw19phc7k9497nb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene"; sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k"; - name = "graphene"; + name = "recipe"; }; packageRequires = [ company @@ -30660,9 +39959,13 @@ license = lib.licenses.free; }; }) {}; - graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + graphene-meta-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "graphene-meta-theme"; + ename = "graphene-meta-theme"; version = "20161204.807"; src = fetchFromGitHub { owner = "rdallasgray"; @@ -30670,10 +39973,10 @@ rev = "62cc73fee31f1bd9474027b83a249feee050271e"; sha256 = "1ydl6dlg5z4infq8j09izwgs6n97yza6nbq5rs1xfv00zd9gr63c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme"; sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q"; - name = "graphene-meta-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30681,9 +39984,14 @@ license = lib.licenses.free; }; }) {}; - graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + graphql-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "graphql-mode"; + ename = "graphql-mode"; version = "20180303.1558"; src = fetchFromGitHub { owner = "davazp"; @@ -30691,10 +39999,10 @@ rev = "36b1a4ed9fe78ccd1f386111644e69a5424a1a7b"; sha256 = "1azq0igx07aff9r7fbl0l4vbr44c4ylfq41g5rahbc70spd85bk6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode"; sha256 = "074dc8fgbrikb5inv837n9bpmz1ami7aaxsqcci1f94x3iw8i74i"; - name = "graphql-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -30702,9 +40010,13 @@ license = lib.licenses.free; }; }) {}; - graphviz-dot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + graphviz-dot-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "graphviz-dot-mode"; + ename = "graphviz-dot-mode"; version = "20171103.127"; src = fetchFromGitHub { owner = "ppareit"; @@ -30712,10 +40024,10 @@ rev = "c456a2b65c734089e6c44e87209a5a432a741b1a"; sha256 = "0j1r2rspaakw37b0mx7pwpvdsvixq9sw3xjbww5piihzpdxz58z1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e2f1e66b33fd95142be4622c996911e38d56281/recipes/graphviz-dot-mode"; sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2"; - name = "graphviz-dot-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30723,20 +40035,24 @@ license = lib.licenses.free; }; }) {}; - grapnel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grapnel = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grapnel"; + ename = "grapnel"; version = "20131001.834"; src = fetchFromGitHub { owner = "leathekd"; repo = "grapnel"; - rev = "fbd0f9a51139973d35e4014855964fa435e8ecaf"; - sha256 = "0nvl8mh7jxailisq31h5bi64s9b74ah1465wiwh18x502swr2s3c"; + rev = "7387234eb3f0285a490fddb1e06a4bf029719fb7"; + sha256 = "0xcj1kqzgxifhrhpl9j2nfpnkd6213ix5z7f97269v3inpzaiyf5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd482e4b2c45921b81c5fb3dfce53acfec3c3093/recipes/grapnel"; sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r"; - name = "grapnel"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30744,19 +40060,25 @@ license = lib.licenses.free; }; }) {}; - grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + grass-mode = callPackage ({ cl-lib ? null + , dash + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grass-mode"; + ename = "grass-mode"; version = "20170503.800"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; rev = "1ae8eae88117"; sha256 = "1sl3d5759fjm98pb50ykz2c05czb2298ipccwj2qz2hdzq63hfv8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v"; - name = "grass-mode"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -30764,20 +40086,24 @@ license = lib.licenses.free; }; }) {}; - grayscale-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grayscale-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grayscale-theme"; + ename = "grayscale-theme"; version = "20171005.102"; src = fetchFromGitHub { owner = "belak"; repo = "emacs-grayscale-theme"; - rev = "53ad50e10e68f2f076ebfc96e10ecef7a932d38d"; - sha256 = "034pa35cjl07bhqdyw3xrcl97xcdg7jg0jvgn034fs3hssmsyxgv"; + rev = "917d63c0effc8459502a41e0cad5822d2b200499"; + sha256 = "0vkv34aslcw2fl9yx8j6094s8j5mgpqrwvyf07a1d16rixncffpm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2993881c7285cfbfc590b4118db46bfd435817bc/recipes/grayscale-theme"; sha256 = "0jbzb1zxv5mg3pivii31d4kz75igm339nw4cmx9kgzia9zal5f1r"; - name = "grayscale-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30785,9 +40111,13 @@ license = lib.licenses.free; }; }) {}; - green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + green-is-the-new-black-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "green-is-the-new-black-theme"; + ename = "green-is-the-new-black-theme"; version = "20180322.1903"; src = fetchFromGitHub { owner = "fredcamps"; @@ -30795,10 +40125,10 @@ rev = "8a03687a2b8b55c5dc7f099086019278d505d8d8"; sha256 = "07j5sv8dskqxpbzr5f58n75cziyqm9v01c3f7wmwfs8jl7h5nc4m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; sha256 = "03q0vj409icmawffy2kd9yl04r453q80cy1p9y4i3xk368z0362g"; - name = "green-is-the-new-black-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30806,20 +40136,24 @@ license = lib.licenses.free; }; }) {}; - green-phosphor-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + green-phosphor-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "green-phosphor-theme"; + ename = "green-phosphor-theme"; version = "20150515.747"; src = fetchFromGitHub { owner = "aalpern"; repo = "emacs-color-theme-green-phosphor"; - rev = "fa42f598626adfdc5450e5c380fa2d5df6110f28"; - sha256 = "0rgv96caigcjffg1983274p4ff1icx1xh5bj7rcd53hai5ag16mp"; + rev = "5549781559ff5daa85c1d6c635c94524c1c5f644"; + sha256 = "0rzbq3vxx8ymgb73smlbjlsffrrrmwp266q93wv6k08h5laj9vwr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6770f5d800232c152833d32efb814005e65ffc6/recipes/green-phosphor-theme"; sha256 = "1p4l75lahmbjcx74ca5jcyc04828vlcahk7gzv5lr7z9mhvq6fbh"; - name = "green-phosphor-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30827,9 +40161,13 @@ license = lib.licenses.free; }; }) {}; - green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + green-screen-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "green-screen-theme"; + ename = "green-screen-theme"; version = "20171130.234"; src = fetchFromGitHub { owner = "rbanffy"; @@ -30837,10 +40175,10 @@ rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0"; sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme"; sha256 = "0a45xcl74kp3v39bl169sq46mqxiwvvis6jzwcy6yrl2vqqi4mab"; - name = "green-screen-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30848,20 +40186,24 @@ license = lib.licenses.free; }; }) {}; - gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gregorio-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gregorio-mode"; + ename = "gregorio-mode"; version = "20170705.751"; src = fetchFromGitHub { owner = "jsrjenkins"; repo = "gregorio-mode"; - rev = "736fd3d05fb67f707cca1a7ce24e3ee7ca5e9567"; - sha256 = "1w13a3irak6i74kl7va8d2simd2kjvw5253s8jvapi1mg4ifw379"; + rev = "2b45f91246286abc449cb71f28583403181051c2"; + sha256 = "1g9x21nmzbm4sqybx5k4pgbjd9x0g27ngwczagplvjzsq9qzv7y6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34cdc536cd0509c5a151c16f44f4db2c5b44365f/recipes/gregorio-mode"; sha256 = "1x3z4gc88h13miz72a597lz9hcn2lxps9jvldl2j62s6nvr88pff"; - name = "gregorio-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30869,9 +40211,13 @@ license = lib.licenses.free; }; }) {}; - grep-a-lot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grep-a-lot = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grep-a-lot"; + ename = "grep-a-lot"; version = "20131006.647"; src = fetchFromGitHub { owner = "ZungBang"; @@ -30879,10 +40225,10 @@ rev = "9f9f645b9e308a0d887b66864ff97d0fca1ba4ad"; sha256 = "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/grep-a-lot"; sha256 = "1cbl4gl91dx73q3i2glsivfxd8jkanrcrzy35zf6rb7raj7rc1bw"; - name = "grep-a-lot"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30890,20 +40236,27 @@ license = lib.licenses.free; }; }) {}; - grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grep-context = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grep-context"; - version = "20180317.742"; + ename = "grep-context"; + version = "20180415.435"; src = fetchFromGitHub { owner = "mkcms"; repo = "grep-context"; - rev = "a17c57e66687a54e195e08afe776bdd60cb6c0a7"; - sha256 = "1nqfa6kjzjshww4hnwg1c0vcr90bdjihy3kmixq3c3jkvxg99b62"; + rev = "4c63d0f2654dee1e249c2054d118d674a757bd45"; + sha256 = "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context"; sha256 = "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g"; - name = "grep-context"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -30911,9 +40264,14 @@ license = lib.licenses.free; }; }) {}; - greymatters-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + greymatters-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "greymatters-theme"; + ename = "greymatters-theme"; version = "20150621.423"; src = fetchFromGitHub { owner = "mswift42"; @@ -30921,10 +40279,10 @@ rev = "a7220a8c6cf18ccae2b76946b6f01188a7c9d5d1"; sha256 = "14c09m9p6556rrf0qfad4zsv7qxa5flamzg6fa83cxh0qfg7wjbp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d13621f3033b180d06852d90bd3ebe03276031f5/recipes/greymatters-theme"; sha256 = "10cxajyws5rwk62i4vk26c1ih0dq490kcfx7gijw38q3b5r1l8nr"; - name = "greymatters-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -30932,18 +40290,23 @@ license = lib.licenses.free; }; }) {}; - grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + grin = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grin"; + ename = "grin"; version = "20110805.2358"; src = fetchhg { url = "https://bitbucket.com/dariusp686/emacs-grin"; rev = "f541aa22da52"; sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/grin"; sha256 = "0rak710fp9c7wx39qn4dc9d0xfjr5w7hwklxh99v1x1ihkla9378"; - name = "grin"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30951,9 +40314,15 @@ license = lib.licenses.free; }; }) {}; - grizzl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grizzl = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grizzl"; + ename = "grizzl"; version = "20160818.37"; src = fetchFromGitHub { owner = "grizzl"; @@ -30961,10 +40330,10 @@ rev = "d554d93afa8519ee3a41340ec8aa6b4555065446"; sha256 = "0ks47pb71ywfxv3jsx8kwb7mgl1xj4fxny3764hfdsgwv1aw0r4c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/grizzl"; sha256 = "0354xskqzxc38l14zxqs31hadwh27v9lyx67y3hnd94d8abr0qcb"; - name = "grizzl"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -30972,9 +40341,16 @@ license = lib.licenses.free; }; }) {}; - groovy-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: - melpaBuild { + groovy-imports = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , s }: + melpaBuild { pname = "groovy-imports"; + ename = "groovy-imports"; version = "20161003.151"; src = fetchFromGitHub { owner = "mbezjak"; @@ -30982,10 +40358,10 @@ rev = "e56d7dda617555ec6205644d32ffddf2e1fa43d9"; sha256 = "060zxl2y4p50g5fwgplgx07h5akfplp49rkv5cx09rqlcyzqhqwa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b18a6842805856062e9452dc32bf0fd458f7d51a/recipes/groovy-imports"; sha256 = "09yjkwsm192lgala1pvxw47id4j7362sl3j1hn9ald2m8m3ddyfs"; - name = "groovy-imports"; + name = "recipe"; }; packageRequires = [ emacs pcache s ]; meta = { @@ -30993,20 +40369,27 @@ license = lib.licenses.free; }; }) {}; - groovy-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + groovy-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "groovy-mode"; - version = "20180326.303"; + ename = "groovy-mode"; + version = "20180601.738"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "88e851a7685a4f6f65786f088423163ba33be84b"; - sha256 = "1ac4dbk890nq9w0slc17106b8rsavhh63rq0n9wplixl8i2ccr4g"; + rev = "a5afa3ac0a23c1bdebea014d06e5c30dde56ee8b"; + sha256 = "04jciwr7614cw3dl9hfiypmqc28njbrin6j3g5r27xn1f91sd5ni"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal"; - name = "groovy-mode"; + name = "recipe"; }; packageRequires = [ dash emacs s ]; meta = { @@ -31014,20 +40397,24 @@ license = lib.licenses.free; }; }) {}; - gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gruber-darker-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gruber-darker-theme"; - version = "20170719.2229"; + ename = "gruber-darker-theme"; + version = "20180529.12"; src = fetchFromGitHub { owner = "rexim"; repo = "gruber-darker-theme"; - rev = "8e6bb26ce0abe20e6129ae8c8ad5c41e0832334e"; - sha256 = "1dxlpyc4w6ys08ir2bivv9lhjpwfjlh3wczmr0r03pc1fqx0w2ap"; + rev = "c7687ec0511941db1371dcd70b31061d74aa5668"; + sha256 = "1dn4vb07wrnc6w94563isx8jfv6vbpp04kh0jfqjmc7nbmyzpaf2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme"; sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi"; - name = "gruber-darker-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31035,9 +40422,16 @@ license = lib.licenses.free; }; }) {}; - grunt = callPackage ({ ansi-color ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grunt = callPackage ({ ansi-color ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grunt"; + ename = "grunt"; version = "20160316.828"; src = fetchFromGitHub { owner = "gempesaw"; @@ -31045,10 +40439,10 @@ rev = "4c269e2738658643ec2ed9ef61a2a3d71b08d304"; sha256 = "1xd6gv9bkqnj7j5mcnwvl1mxjmzvxqhp135hxj0ijc0ybdybacf7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/grunt"; sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz"; - name = "grunt"; + name = "recipe"; }; packageRequires = [ ansi-color dash emacs ]; meta = { @@ -31056,20 +40450,25 @@ license = lib.licenses.free; }; }) {}; - gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gruvbox-theme = callPackage ({ autothemer + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gruvbox-theme"; - version = "20180313.1451"; + ename = "gruvbox-theme"; + version = "20180623.2009"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "dd5e5ad109cf0b5db6c5d9ba279337a799e12b89"; - sha256 = "17ga9qrjmvyjj7i77k6k0riy1jc3lvjvc3v631yvza4qi28492fv"; + rev = "796999e5db2a0e43ad64c062c1bec3c966d095bc"; + sha256 = "0qj5k0c1592ikrb7gcibqwf8hhj6lq4cw7zrb3kmpk4zakzy7a2w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32"; - name = "gruvbox-theme"; + name = "recipe"; }; packageRequires = [ autothemer ]; meta = { @@ -31077,9 +40476,13 @@ license = lib.licenses.free; }; }) {}; - gs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gs-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gs-mode"; + ename = "gs-mode"; version = "20151202.206"; src = fetchFromGitHub { owner = "yyr"; @@ -31087,10 +40490,10 @@ rev = "1a13051db21b999c7682a015b33a03096ff9d891"; sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc1aa5335810e3d6572ebe9cd8949932b74d0f46/recipes/gs-mode"; sha256 = "02ldd92fv1k28nygl34i8gv0b0i1v5qd7nl1l17cf5f3akdwc6iq"; - name = "gs-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31098,9 +40501,13 @@ license = lib.licenses.free; }; }) {}; - gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gscholar-bibtex = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gscholar-bibtex"; + ename = "gscholar-bibtex"; version = "20170913.1457"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -31108,10 +40515,10 @@ rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c"; sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az"; - name = "gscholar-bibtex"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31119,9 +40526,13 @@ license = lib.licenses.free; }; }) {}; - gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gtk-pomodoro-indicator"; + ename = "gtk-pomodoro-indicator"; version = "20171230.840"; src = fetchFromGitHub { owner = "abo-abo"; @@ -31129,10 +40540,10 @@ rev = "eb59b229de0dde307b20654075a9bbac69899a66"; sha256 = "0dmaazcscg9mdsmij26873af5jl2np4q9xf2klw1jmcl61wzggb0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a58f1acaafc459e055d751acdb68427e4b11275e/recipes/gtk-pomodoro-indicator"; sha256 = "1lkz1bk3zl51jdgp7pg6sr57drdwz8mlvl9ryky3iv73kr5i0q6c"; - name = "gtk-pomodoro-indicator"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31140,9 +40551,15 @@ license = lib.licenses.free; }; }) {}; - guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + guess-language = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "guess-language"; + ename = "guess-language"; version = "20170620.308"; src = fetchFromGitHub { owner = "tmalsburg"; @@ -31150,10 +40567,10 @@ rev = "1f1602f74d7159e7fb8c90f92ec5a3d1df5429da"; sha256 = "1764v96sdn3zvpd35ppn31ib4p8cvdrj0bfmbplxg2xhp7xkgmca"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language"; sha256 = "1p8j18hskvsv4pn3cal5s91l19hgshq8hpclmp84z9hlnj9g9fpm"; - name = "guess-language"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -31161,9 +40578,16 @@ license = lib.licenses.free; }; }) {}; - guide-key = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin, s }: - melpaBuild { + guide-key = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popwin + , s }: + melpaBuild { pname = "guide-key"; + ename = "guide-key"; version = "20150107.2235"; src = fetchFromGitHub { owner = "kai2nenobu"; @@ -31171,10 +40595,10 @@ rev = "9236d287a7272e307fb941237390a96037c8c0a2"; sha256 = "14sx5m6fpkm2q8ljkicl1yy1sw003k4rzz9hi7lm1nfqr2l4n6q0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/490b81308ae8132d8c3fd8c3951be88159719172/recipes/guide-key"; sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf"; - name = "guide-key"; + name = "recipe"; }; packageRequires = [ dash popwin s ]; meta = { @@ -31182,9 +40606,15 @@ license = lib.licenses.free; }; }) {}; - guide-key-tip = callPackage ({ fetchFromGitHub, fetchurl, guide-key, lib, melpaBuild, pos-tip }: - melpaBuild { + guide-key-tip = callPackage ({ fetchFromGitHub + , fetchurl + , guide-key + , lib + , melpaBuild + , pos-tip }: + melpaBuild { pname = "guide-key-tip"; + ename = "guide-key-tip"; version = "20161011.123"; src = fetchFromGitHub { owner = "aki2o"; @@ -31192,10 +40622,10 @@ rev = "02c5d4b0b65f3e91be5a47f0ff1ae5e86e00c64e"; sha256 = "1xkrfjmhprnj8i39a85wfcs5whm93fw8l57c606wdhiwqj719ciz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f23db7563654ab58632d56e3b01d2f78276fc3e/recipes/guide-key-tip"; sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06"; - name = "guide-key-tip"; + name = "recipe"; }; packageRequires = [ guide-key pos-tip ]; meta = { @@ -31203,20 +40633,30 @@ license = lib.licenses.free; }; }) {}; - guix = callPackage ({ bui, dash, edit-indirect, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: - melpaBuild { + guix = callPackage ({ bui + , dash + , edit-indirect + , emacs + , fetchFromGitHub + , fetchurl + , geiser + , lib + , magit-popup + , melpaBuild }: + melpaBuild { pname = "guix"; - version = "20180329.1312"; + ename = "guix"; + version = "20180705.315"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "62a50ea1bae7e90a622e9722269ebe449e01145a"; - sha256 = "09fhl2qzai6jc23nq4mnnf6dwhll1g7llxycb25cx4n79qr0db1q"; + rev = "f220e82b2dd94fb349ae37665912a42196d53975"; + sha256 = "12k2qib7qbxxkidsnw2a44jakw0lgbz8kksgxfbqmaryzi35wh5v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; sha256 = "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9"; - name = "guix"; + name = "recipe"; }; packageRequires = [ bui dash edit-indirect emacs geiser magit-popup ]; meta = { @@ -31224,9 +40664,13 @@ license = lib.licenses.free; }; }) {}; - gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gulp-task-runner = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gulp-task-runner"; + ename = "gulp-task-runner"; version = "20170718.1341"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -31234,10 +40678,10 @@ rev = "877990e956b1d71e2d9c7c3e5a129ad199b9debb"; sha256 = "13qy4x4ap43qm5w2vrsy6w01z2s2kymfr9qvlj2yri4xk3r4vrps"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner"; sha256 = "0211mws99bc9ipg7r3qqm1n7gszvwil31psinf0250wliyppjij7"; - name = "gulp-task-runner"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31245,9 +40689,13 @@ license = lib.licenses.free; }; }) {}; - guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + guru-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "guru-mode"; + ename = "guru-mode"; version = "20170730.31"; src = fetchFromGitHub { owner = "bbatsov"; @@ -31255,10 +40703,10 @@ rev = "c180e05ebc1484764aad245c85b69de779826e4e"; sha256 = "0qb6yr6vbic0rh8ayrpbz5byq7jxmwm1fc9l4alpz7dhyb11z07v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e60af6ccb902d8ef00cfecbb13cafebbe3b00d89/recipes/guru-mode"; sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs"; - name = "guru-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31266,20 +40714,24 @@ license = lib.licenses.free; }; }) {}; - gvpr-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gvpr-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gvpr-mode"; + ename = "gvpr-mode"; version = "20131208.918"; src = fetchFromGitHub { owner = "rodw"; repo = "gvpr-lib"; - rev = "3d6cc6f4416faf2a1913821d12ba6eb624362af0"; - sha256 = "0060qw4gr9fv6db20xf3spgl2fwg2iid5ckfjm3vj3ydyv62q13s"; + rev = "1fb539b8227200f75d7eeb9706a236f805159a63"; + sha256 = "18902m92yyw4mqr5x3gzpqw13lykwv7llbqvck0kipyp3fpjjn7y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab25afcf4232082dc0e48706734f141a308912a7/recipes/gvpr-mode"; sha256 = "19p6f06qdjvh2vmgbabajvkfxpn13j899jrivw9mqyssz0cyvzgw"; - name = "gvpr-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31287,9 +40739,14 @@ license = lib.licenses.free; }; }) {}; - gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gxref = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gxref"; + ename = "gxref"; version = "20170411.1053"; src = fetchFromGitHub { owner = "dedi"; @@ -31297,10 +40754,10 @@ rev = "380b02c3c3c2586c828456716eef6a6392bb043b"; sha256 = "1c5j28rwqx53qdsqglif8yblhm2bwm4qzpl2dg0l0g3pr8pk8zjk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; sha256 = "06qlfjclfx00m8pr7lk6baim3vjk5i0m75i1p4aihp2vflvgjaby"; - name = "gxref"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -31308,9 +40765,41 @@ license = lib.licenses.free; }; }) {}; - habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + habamax-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "habamax-theme"; + ename = "habamax-theme"; + version = "20180702.958"; + src = fetchFromGitHub { + owner = "habamax"; + repo = "habamax-theme"; + rev = "b40e3e7c637e67c8f9164b0db9e75c0ec4eb6a0f"; + sha256 = "0fgvnfqgg6gqrwlb8yibs4nybvskd6awxqdpj4yy9jfqibggppld"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/77386484ad0b31c2818fae52cd312821c4632cb8/recipes/habamax-theme"; + sha256 = "1rmir9gc1niwkshxg1826nkh8xxmpim5pbhp61wx1m273lfn2h69"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/habamax-theme"; + license = lib.licenses.free; + }; + }) {}; + habitica = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "habitica"; + ename = "habitica"; version = "20171022.1922"; src = fetchFromGitHub { owner = "abrochard"; @@ -31318,10 +40807,10 @@ rev = "e51ff7436fe1da10404e2c0872b15d6a7a926717"; sha256 = "1hiiqf82nagnpq2qdcdv6y2blfiqs6f8ia8k66a4zn5xgwpd13f4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; sha256 = "0g7rb8ip5d6xvlsfk8cvf81hgzlq5p4kw9pkisjq9ri8mvkfmxf3"; - name = "habitica"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -31329,9 +40818,14 @@ license = lib.licenses.free; }; }) {}; - hack-time-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + hack-time-mode = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hack-time-mode"; + ename = "hack-time-mode"; version = "20170527.910"; src = fetchFromGitLab { owner = "marcowahl"; @@ -31339,10 +40833,10 @@ rev = "73d6fcf8b39283526e5d4e3919193611e25a0898"; sha256 = "1w0idf28fhyn0qmjk1zgh80gzcrkgx5bc8mb0xamc20i53wpr4xl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode"; sha256 = "0vz72ykl679a69sb0r2h9ymcr3xms7bij1w6vxndlfw5v9hg3hk5"; - name = "hack-time-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -31350,9 +40844,14 @@ license = lib.licenses.free; }; }) {}; - hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hacker-typer = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hacker-typer"; + ename = "hacker-typer"; version = "20170206.720"; src = fetchFromGitHub { owner = "therockmandolinist"; @@ -31360,10 +40859,10 @@ rev = "d5a23714a4ccc5071580622f278597d5973f40bd"; sha256 = "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e04a3a1606ea23865c04d93e3dc77cb55b9931f/recipes/hacker-typer"; sha256 = "128y562cxi8rblnqjdzhqc6b58bxi67f6hz569gqw4jywz0xcd0g"; - name = "hacker-typer"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -31371,20 +40870,25 @@ license = lib.licenses.free; }; }) {}; - hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + hackernews = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "hackernews"; + ename = "hackernews"; version = "20180220.419"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "309c60c974eb5af4554e0675d4285baa77d89e54"; - sha256 = "0gz5f17654bbjwydznpcy6aqzxbv2infbb4wd8zawf9dmb0wxc3q"; + rev = "89077fdb98ab1e77459c7839decdf21b87f4341b"; + sha256 = "11id6gp6mz97sm2izz6y47n3sphlibdb6nzvbkcxl7l7av53wxg7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a"; - name = "hackernews"; + name = "recipe"; }; packageRequires = [ json ]; meta = { @@ -31392,9 +40896,13 @@ license = lib.licenses.free; }; }) {}; - hal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hal-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hal-mode"; + ename = "hal-mode"; version = "20160704.1046"; src = fetchFromGitHub { owner = "strahlex"; @@ -31402,10 +40910,10 @@ rev = "cd2f66f219ee520198d4586fb6b169cef7ad3f21"; sha256 = "0xibwmngijq0wv9hkahs5nh02qj3ma0bkczl07hx8wnl6j27f0nj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/955a4d94110bb2048d899a3d7671937e69d5ac79/recipes/hal-mode"; sha256 = "1b1hvlm80awbyjjs5d51v46hw8a2jfz8dv9r61h7vvwh9a8wpgk2"; - name = "hal-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31413,9 +40921,15 @@ license = lib.licenses.free; }; }) {}; - ham-mode = callPackage ({ fetchFromGitHub, fetchurl, html-to-markdown, lib, markdown-mode, melpaBuild }: - melpaBuild { + ham-mode = callPackage ({ fetchFromGitHub + , fetchurl + , html-to-markdown + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "ham-mode"; + ename = "ham-mode"; version = "20150811.606"; src = fetchFromGitHub { owner = "Malabarba"; @@ -31423,10 +40937,10 @@ rev = "3a141986a21c2aa6eefb428983352abb8b7907d2"; sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/ham-mode"; sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz"; - name = "ham-mode"; + name = "recipe"; }; packageRequires = [ html-to-markdown markdown-mode ]; meta = { @@ -31434,20 +40948,25 @@ license = lib.licenses.free; }; }) {}; - hamburg-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hamburg-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hamburg-theme"; + ename = "hamburg-theme"; version = "20160122.2340"; src = fetchFromGitHub { owner = "mswift42"; repo = "hamburg-theme"; - rev = "aacefdf1501d97a5afc0e63c8ead4b2463323028"; - sha256 = "1rnkzl51h263nck1bd0jyb7q58b54d764gcsh7wqxfgzs1jfr4am"; + rev = "a05bf090e0c57c34cc59e301f95d9961280db244"; + sha256 = "1k0z2x95lb4in325nsyl1r75m4px61wp077ak2asmp0i2p8g34g7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/465ac6063c4f91652e59a8bbb493897109791728/recipes/hamburg-theme"; sha256 = "149ln7670kjyhdfj5j9akxch47dlff2hd58amla7j3297z1nhg4k"; - name = "hamburg-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -31455,20 +40974,25 @@ license = lib.licenses.free; }; }) {}; - hamburger-menu = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + hamburger-menu = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hamburger-menu"; + ename = "hamburger-menu"; version = "20160825.1331"; src = fetchFromGitLab { owner = "iain"; repo = "hamburger-menu-mode"; - rev = "3568159c693c30bed7f61580e4f3b6241253ad4e"; - sha256 = "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f"; + rev = "cfeff6e0dd80bf89ed671af9de3dac2e7f90b619"; + sha256 = "05skvms2lz3fsgzg873nk887flr6ga5h8bkhrf6qawaj26naj6i9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8017730403cc0e613e3939017f85074753c3778/recipes/hamburger-menu"; sha256 = "0ws9729i51arjqwpiywcpb7y3c5sm3c9wrq8q0k0m9hpq8h11wdb"; - name = "hamburger-menu"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -31476,9 +41000,15 @@ license = lib.licenses.free; }; }) {}; - haml-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + haml-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "haml-mode"; + ename = "haml-mode"; version = "20170923.2153"; src = fetchFromGitHub { owner = "nex3"; @@ -31486,10 +41016,10 @@ rev = "1cbb2de8f0fc25f35448c5cad04642f28078f3bb"; sha256 = "1045bf7bq914d3577kg9xakm4yciwwsvlh5qwfk4wnsraf7rld0r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode"; sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f"; - name = "haml-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -31497,9 +41027,16 @@ license = lib.licenses.free; }; }) {}; - hamlet-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + hamlet-mode = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "hamlet-mode"; + ename = "hamlet-mode"; version = "20131207.2324"; src = fetchFromGitHub { owner = "lightquake"; @@ -31507,10 +41044,10 @@ rev = "7362b955e556a3d007fa06945a27e5b99349527d"; sha256 = "1njrpb1s2v9skyfbgb28clrxyvyp8i4b8kwa68ynvq3vjb4fnws6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hamlet-mode"; sha256 = "16cyfzv2yrf249jklxdahfmsy8rg6hargjpafy4fz4a532fcbw81"; - name = "hamlet-mode"; + name = "recipe"; }; packageRequires = [ cl-lib dash s ]; meta = { @@ -31518,9 +41055,13 @@ license = lib.licenses.free; }; }) {}; - handlebars-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + handlebars-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "handlebars-mode"; + ename = "handlebars-mode"; version = "20150211.949"; src = fetchFromGitHub { owner = "danielevans"; @@ -31528,10 +41069,10 @@ rev = "81f6b73fea8f397807781a1b51568397af21a6ef"; sha256 = "0w443knp6kvjm2m79cni5d17plyhbsl0a4kip7yrpv5nmg370q3p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/handlebars-mode"; sha256 = "0wizasjihnabnqzn1226vh4gb571rs7s86bffhvkfvbk95zkiafq"; - name = "handlebars-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31539,20 +41080,24 @@ license = lib.licenses.free; }; }) {}; - handlebars-sgml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + handlebars-sgml-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "handlebars-sgml-mode"; + ename = "handlebars-sgml-mode"; version = "20130623.1633"; src = fetchFromGitHub { owner = "jacott"; repo = "handlebars-sgml-mode"; - rev = "c76df93a9a8c1b1b3efdcc4add32bf93304192a4"; - sha256 = "1z37di9vk1l35my8kl8jnyqlkr1rnp0iz13hpc0r065mib67v58k"; + rev = "005282c33dfb6dbd2cfd46a4147d261504e8323c"; + sha256 = "1vx9lxwhj7n928ddzj9vzy8mw0fj7vgzx477x8ay79rhpvs8v122"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87aec68ed80545a61ad46b71e7bd9dbfc7634108/recipes/handlebars-sgml-mode"; sha256 = "10sxm7v94yxa92mqbwj3shqjs6f3zbxjvwgbvg9m2fh3b7xj617w"; - name = "handlebars-sgml-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31560,9 +41105,13 @@ license = lib.licenses.free; }; }) {}; - handoff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + handoff = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "handoff"; + ename = "handoff"; version = "20150916.2300"; src = fetchFromGitHub { owner = "rejeep"; @@ -31570,10 +41119,10 @@ rev = "75dc7a7e352f38679f65d0ca80ad158798e168bd"; sha256 = "0whn8rc98dhncgizzrb22nx6b6cm655q1cf2fpn6g3knq1c2471r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bbdb89413b3f5de680e3f9fa625039c73a377e97/recipes/handoff"; sha256 = "0iqqvygx50wi2vcbs6bfgqzhcz9a89zrwb7sg0ang9qrkiz5k36w"; - name = "handoff"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31581,9 +41130,13 @@ license = lib.licenses.free; }; }) {}; - hardcore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hardcore-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hardcore-mode"; + ename = "hardcore-mode"; version = "20151113.2301"; src = fetchFromGitHub { owner = "magnars"; @@ -31591,10 +41144,10 @@ rev = "b1dda19692b4a7a58a689e81784a9b35be39e70d"; sha256 = "124k803pgxc7fz325yy6jcyam69f5fk9kdwfgmnwwca9ablq4cfb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b929b3343cd5925944665e4e09b4524bca873c95/recipes/hardcore-mode"; sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd"; - name = "hardcore-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31602,9 +41155,14 @@ license = lib.licenses.free; }; }) {}; - hardhat = callPackage ({ fetchFromGitHub, fetchurl, ignoramus, lib, melpaBuild }: - melpaBuild { + hardhat = callPackage ({ fetchFromGitHub + , fetchurl + , ignoramus + , lib + , melpaBuild }: + melpaBuild { pname = "hardhat"; + ename = "hardhat"; version = "20160414.713"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -31612,10 +41170,10 @@ rev = "9038a49ab55cd4c502cf7f07ed0d1b9b6bc3626e"; sha256 = "0j9z46j777y3ljpai5czdlwl07f0irp4fsk4677n11ndyqm1amb5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/081aa3e1d50c2c9e5a9b9ce0716258a93279f605/recipes/hardhat"; sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z"; - name = "hardhat"; + name = "recipe"; }; packageRequires = [ ignoramus ]; meta = { @@ -31623,9 +41181,16 @@ license = lib.licenses.free; }; }) {}; - harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }: - melpaBuild { + harvest = callPackage ({ fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild + , s + , swiper }: + melpaBuild { pname = "harvest"; + ename = "harvest"; version = "20170822.1046"; src = fetchFromGitHub { owner = "kostajh"; @@ -31633,10 +41198,10 @@ rev = "7acbc0564b250521b67131ee2a0a92720239454f"; sha256 = "0wzv67kkfyaw19ddw0ra45p6rja6bk6d1xi3ak5lkyzvgqvylr3b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/harvest"; sha256 = "1r6brld6iq03wsr1b3jhdkxwrcxa6g6fwa1jiy1kgjsr9dq1m51c"; - name = "harvest"; + name = "recipe"; }; packageRequires = [ hydra s swiper ]; meta = { @@ -31644,9 +41209,13 @@ license = lib.licenses.free; }; }) {}; - haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + haskell-emacs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "haskell-emacs"; + ename = "haskell-emacs"; version = "20160904.1326"; src = fetchFromGitHub { owner = "knupfer"; @@ -31654,10 +41223,10 @@ rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9"; sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs"; sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6"; - name = "haskell-emacs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31665,20 +41234,25 @@ license = lib.licenses.free; }; }) {}; - haskell-emacs-base = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }: - melpaBuild { + haskell-emacs-base = callPackage ({ fetchFromGitHub + , fetchurl + , haskell-emacs + , lib + , melpaBuild }: + melpaBuild { pname = "haskell-emacs-base"; + ename = "haskell-emacs-base"; version = "20150714.859"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9"; - sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam"; + rev = "7f91f65254902b8ff04fdb679bc569b2f6a51637"; + sha256 = "17i9l6wgrvmp31ca4xrax31f7bjnn0vn2figycxhfaq9f6vxgkkn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-base"; sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb"; - name = "haskell-emacs-base"; + name = "recipe"; }; packageRequires = [ haskell-emacs ]; meta = { @@ -31686,20 +41260,25 @@ license = lib.licenses.free; }; }) {}; - haskell-emacs-text = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }: - melpaBuild { + haskell-emacs-text = callPackage ({ fetchFromGitHub + , fetchurl + , haskell-emacs + , lib + , melpaBuild }: + melpaBuild { pname = "haskell-emacs-text"; + ename = "haskell-emacs-text"; version = "20150713.716"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9"; - sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam"; + rev = "cc240612740fc3fd6e3c3d8cdfe486a89954f5d1"; + sha256 = "09g6b1ad7qi9k58ymgmssgapwapxcwf30qhmfl2w8sl045ngzlkk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-text"; sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy"; - name = "haskell-emacs-text"; + name = "recipe"; }; packageRequires = [ haskell-emacs ]; meta = { @@ -31707,20 +41286,25 @@ license = lib.licenses.free; }; }) {}; - haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + haskell-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "haskell-mode"; - version = "20171022.26"; + ename = "haskell-mode"; + version = "20180601.143"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "9018ad5cac0b1b1b5e0a51586027fb0ca4076b1a"; - sha256 = "0aj6mjv1i8m18klj9mp690fkmwc81wxh2q69cxjf78fdpgbrhcwl"; + rev = "dd0ea640fa449d021399a17db65e4d50d3f0f2a9"; + sha256 = "0cc8mhjn4qhn3zs3x7azkjnvalg156b6h0n13b8wzlvyp9ka28yj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp"; - name = "haskell-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -31728,9 +41312,15 @@ license = lib.licenses.free; }; }) {}; - haskell-snippets = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + haskell-snippets = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "haskell-snippets"; + ename = "haskell-snippets"; version = "20160918.1722"; src = fetchFromGitHub { owner = "haskell"; @@ -31738,10 +41328,10 @@ rev = "07b0f460b946fd1be26c29652cb0468b47782f3a"; sha256 = "0a7y3awi9hcyahggf0ghsdwvsmrhr9yq634wy9lkqjzrm2hqj0ci"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5534e58ea66fd90ba4a69262f0b303c7fb85af4/recipes/haskell-snippets"; sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2"; - name = "haskell-snippets"; + name = "recipe"; }; packageRequires = [ cl-lib yasnippet ]; meta = { @@ -31749,19 +41339,23 @@ license = lib.licenses.free; }; }) {}; - haskell-tab-indent = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + haskell-tab-indent = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "haskell-tab-indent"; + ename = "haskell-tab-indent"; version = "20170701.258"; src = fetchgit { url = "https://git.spwhitton.name/haskell-tab-indent"; rev = "b4cb851aef96c42ec7b3cc37b6fdd867fe5a0853"; sha256 = "1ah1xagfzsbsgggva621p95qgd0bnsn733gb0ap4p4kgi5hwdqll"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/371f9f45e441cdf4e95557d1e9692619fab3024a/recipes/haskell-tab-indent"; sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7"; - name = "haskell-tab-indent"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31769,20 +41363,26 @@ license = lib.licenses.free; }; }) {}; - hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hasky-extensions = callPackage ({ avy-menu + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hasky-extensions"; + ename = "hasky-extensions"; version = "20180107.2112"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "6909022bccb7e5c26d1c4e5fa20cbc6b65c62d69"; - sha256 = "0s5y84ih5hy6m5krmbgbr027xzhw0vybha0pdi0njjyggagirgxd"; + rev = "d75dc57f4eaeb92785bde6c26c1031710be1cf00"; + sha256 = "135rn33ldrhz3z6fg1rcdaxs1dnahliw782qc4ffxkays186id63"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; sha256 = "0ymigba1d0qkrk3ccd3cx754safzmx1v5d13976571rszgmkvr15"; - name = "hasky-extensions"; + name = "recipe"; }; packageRequires = [ avy-menu emacs ]; meta = { @@ -31790,9 +41390,16 @@ license = lib.licenses.free; }; }) {}; - hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: - melpaBuild { + hasky-stack = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , magit-popup + , melpaBuild }: + melpaBuild { pname = "hasky-stack"; + ename = "hasky-stack"; version = "20180331.208"; src = fetchFromGitHub { owner = "hasky-mode"; @@ -31800,10 +41407,10 @@ rev = "3e17ce07dd6b0207474e4ff14ad7b8c467382947"; sha256 = "0cdsdlgapf9xxj928hlb7ch9x8rznayrvj7n8j2vzfa0kfmg7qwf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; sha256 = "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8"; - name = "hasky-stack"; + name = "recipe"; }; packageRequires = [ emacs f magit-popup ]; meta = { @@ -31811,20 +41418,25 @@ license = lib.licenses.free; }; }) {}; - haste = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + haste = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "haste"; + ename = "haste"; version = "20141030.1334"; src = fetchFromGitHub { owner = "rlister"; repo = "emacs-haste-client"; - rev = "22d05aacc3296ab50a7361222ab139fb4d447c25"; - sha256 = "1gmh455ahd9if11f8mrqbfky24c784bb4fgdl3pj8i0n5sl51i88"; + rev = "f1099c6296fc9575675e281402b89854739114bb"; + sha256 = "1a6almgsh93jzi5h59mmrlwcz805j3fnr8vrcfxnirxpr39159sq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haste"; sha256 = "175kprxqbpmssjxavcm7lyzg1cwsxkrfg9pc72vgqyfmcmjyk34c"; - name = "haste"; + name = "recipe"; }; packageRequires = [ json ]; meta = { @@ -31832,20 +41444,27 @@ license = lib.licenses.free; }; }) {}; - haxe-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: - melpaBuild { + haxe-imports = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , s }: + melpaBuild { pname = "haxe-imports"; + ename = "haxe-imports"; version = "20170330.1604"; src = fetchFromGitHub { owner = "accidentalrebel"; repo = "emacs-haxe-imports"; - rev = "f104a641f3dfe698359d9aca1f28d9383cf43e04"; - sha256 = "09crkm4ibi4m23qw4saqm0nm2i4cv40md3p768j2vniamby2q78f"; + rev = "a4ab31759bd237e78c055dda73e808a4ee1b5fde"; + sha256 = "1x721jwdngahdmj0799ayg91kqxf6jv627b766bbq2hmagsf9si4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db7d2b08e914aab7719c6d3a951b142ec7252f34/recipes/haxe-imports"; sha256 = "10xh57ir49f18pzw9ihpwffchm1mba0ck1zdqsfllh3p5gry1msg"; - name = "haxe-imports"; + name = "recipe"; }; packageRequires = [ emacs pcache s ]; meta = { @@ -31853,19 +41472,23 @@ license = lib.licenses.free; }; }) {}; - haxe-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + haxe-mode = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "haxe-mode"; + ename = "haxe-mode"; version = "20131004.142"; src = fetchhg { url = "https://bitbucket.com/jpsecher/haxe-mode"; rev = "850f29d9f70e"; sha256 = "106a7kpjj4laxl7x8aqpv75ih54569b3bs2a1b8z4rghmikqc4aw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haxe-mode"; sha256 = "07krrpi636dadgyxxhh5037kq527wpnszbl22lk6i5fcxqidcnw9"; - name = "haxe-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31873,9 +41496,14 @@ license = lib.licenses.free; }; }) {}; - haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + haxor-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "haxor-mode"; + ename = "haxor-mode"; version = "20160618.429"; src = fetchFromGitHub { owner = "krzysztof-magosa"; @@ -31883,10 +41511,10 @@ rev = "6fa25a8e6b6a59481bc0354c2fe1e0ed53cbdc91"; sha256 = "0pdfvqbz4wmjl15wi3k4h7myij8v63vmyiq8g9fai18f7ad2klp1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haxor-mode"; sha256 = "0ss0kkwjyc7z7vcb89qr02p70c6m2jarr34mxmdv6ipwil58jj1s"; - name = "haxor-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -31894,9 +41522,15 @@ license = lib.licenses.free; }; }) {}; - hayoo = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + hayoo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "hayoo"; + ename = "hayoo"; version = "20140831.521"; src = fetchFromGitHub { owner = "benma"; @@ -31904,10 +41538,10 @@ rev = "3ca2fb0c4d5f337d0410c21b2702dd147014e984"; sha256 = "0pjxyhh8a02i54a9jsqr8p1mcqfl6k9b8gv9lnzb242gy4518y3l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01c1b96a4d076323264b2762d2c5a61680e21cff/recipes/hayoo"; sha256 = "1rqvnv5nxlsyvsa5my1wpfm82sw21s7kfbg80vrjmxh0mwlyv4p9"; - name = "hayoo"; + name = "recipe"; }; packageRequires = [ emacs json ]; meta = { @@ -31915,9 +41549,13 @@ license = lib.licenses.free; }; }) {}; - hc-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hc-zenburn-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hc-zenburn-theme"; + ename = "hc-zenburn-theme"; version = "20150928.933"; src = fetchFromGitHub { owner = "edran"; @@ -31925,10 +41563,10 @@ rev = "fd0024a5191cdce204d91c8f1db99ba31640f6e9"; sha256 = "0rgcj47h7a67qkw6696pcm1a4g4ryx8nrz55s69fw86958fp08hk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01ccd40bd5fc2699a4756ebf503ac50f562cf600/recipes/hc-zenburn-theme"; sha256 = "0jcddk9ppgcizyyciabj3sgk1pmingl97knf9nmr0mi89h7n2g5y"; - name = "hc-zenburn-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31936,20 +41574,25 @@ license = lib.licenses.free; }; }) {}; - hcl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hcl-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hcl-mode"; + ename = "hcl-mode"; version = "20170107.27"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-hcl-mode"; - rev = "0f2c5ec7e7bcf77c8548e8cac8721ea935ca1b5e"; - sha256 = "0qggby20h8sir4cs5af9y6b2cibix3r067sadygsrvx9ml17indw"; + rev = "f940f425bcdb4111d69f5fbf79f0b1c98848c5b6"; + sha256 = "06mdz9fnqkaxf4036ad1f6pr3km2vaz52rbpkjwk8bsqvzbya98i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode"; sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin"; - name = "hcl-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -31957,9 +41600,13 @@ license = lib.licenses.free; }; }) {}; - headlong = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + headlong = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "headlong"; + ename = "headlong"; version = "20150417.826"; src = fetchFromGitHub { owner = "abo-abo"; @@ -31967,10 +41614,10 @@ rev = "f6830f87f236eee88263cb6976125f72422abe72"; sha256 = "06hq6p6a4fzprbj4r885vsvzddlvx0wxqk5kik06v5bm7hjmnyrq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/826e9a8221d9378dd3b9fcc16ce5f50fd6ed2dce/recipes/headlong"; sha256 = "042ybplkqjb30qf5cpbw5d91j1rdc71b789v277h036bri7hgxz6"; - name = "headlong"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31978,20 +41625,54 @@ license = lib.licenses.free; }; }) {}; - helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: - melpaBuild { + heaven-and-hell = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "heaven-and-hell"; + ename = "heaven-and-hell"; + version = "20180421.221"; + src = fetchFromGitHub { + owner = "valignatev"; + repo = "heaven-and-hell"; + rev = "c2af013e0def7d3234e0eb2fb66a0a2374d5a7f2"; + sha256 = "08n7sr0l4di1c4zgfa17i3x43451sd60z70pjka8rmznys766lsg"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/685edd63bf65520be304cbd564db7f5974fc5ae1/recipes/heaven-and-hell"; + sha256 = "19r0p78r9c78ly8awkgc33xa5b75zkkrb5kwvxbagirxdgkjv74r"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/heaven-and-hell"; + license = lib.licenses.free; + }; + }) {}; + helm = callPackage ({ async + , emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "helm"; - version = "20180331.2328"; + ename = "helm"; + version = "20180719.1206"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "412e85cad7ed4073152b6e339d8e7c9247ddeba4"; - sha256 = "075v6ml40z0j1sblj5q7a7cqrlbvvh7rbwllmz8a7ghcan17n1x6"; + rev = "345842e1a36b8dfa23eb516e8a8cb64783505f6b"; + sha256 = "0k8i2ay8mmqfxsfyg12mp2rg27h9xqbvvsfmd38xgc2ni4c1sd1f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; sha256 = "03la01d0syikjgsjq0krlp3p894djwfxqfmd2srddwks7ish6xjf"; - name = "helm"; + name = "recipe"; }; packageRequires = [ async emacs helm-core popup ]; meta = { @@ -31999,9 +41680,15 @@ license = lib.licenses.free; }; }) {}; - helm-R = callPackage ({ ess, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-R = callPackage ({ ess + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-R"; + ename = "helm-R"; version = "20120819.1714"; src = fetchFromGitHub { owner = "myuhe"; @@ -32009,10 +41696,10 @@ rev = "b0eb9d5f6a483a9dbe6eb6cf1f2024d4f5938bc2"; sha256 = "0nip0zrmn944wy0x2dc5ryr0m7a948rn2a8cbaajghs7a7zai4cr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce6eb840368f8cbee66dc061478d5096b9dacb68/recipes/helm-R"; sha256 = "0zq9f2xhgap3ihnrlsrsaxaz0nx014k0820bfsq7lckwcnm0mng1"; - name = "helm-R"; + name = "recipe"; }; packageRequires = [ ess helm ]; meta = { @@ -32020,20 +41707,26 @@ license = lib.licenses.free; }; }) {}; - helm-ack = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ack = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ack"; + ename = "helm-ack"; version = "20141030.526"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ack"; - rev = "889bc225318d14c6e3be80e73b1d9d6fb30e48c3"; - sha256 = "04rvbafa77blps7x7cmlsciys8fgmvhfhq4v51pk8z5q3j1lrgc5"; + rev = "5982f3cb6ec9f460ebbe06ec0ce7b3590bca3118"; + sha256 = "0ps86zpyywibjwcm9drmamla979ad61fyqr8d6bv71fr56k9ak21"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/258d447778525c26c65a5819ba1edc00e2bb65e5/recipes/helm-ack"; sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni"; - name = "helm-ack"; + name = "recipe"; }; packageRequires = [ cl-lib helm ]; meta = { @@ -32041,9 +41734,15 @@ license = lib.licenses.free; }; }) {}; - helm-ad = callPackage ({ dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ad = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ad"; + ename = "helm-ad"; version = "20151209.215"; src = fetchFromGitHub { owner = "tnoda"; @@ -32051,10 +41750,10 @@ rev = "8ac044705d8620ee354a9cfa8cc1b865e83c0d55"; sha256 = "0hxfgdn56c7qr64r59g9hvxxwa4mw0ad9c9m0z5cj85bsdd7rlx4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b44ec4e059ab830a3708697fa95fada5f6a30a91/recipes/helm-ad"; sha256 = "0h2zjfj9hy7bkpmmjjs0a4a06asbw0yww8mw9rk2xi1gc2aqq4hi"; - name = "helm-ad"; + name = "recipe"; }; packageRequires = [ dash helm ]; meta = { @@ -32062,9 +41761,17 @@ license = lib.licenses.free; }; }) {}; - helm-addressbook = callPackage ({ addressbook-bookmark, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-addressbook = callPackage ({ addressbook-bookmark + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-addressbook"; + ename = "helm-addressbook"; version = "20170903.28"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -32072,10 +41779,10 @@ rev = "62497f72d46afd3a9f9f94b27d062a82fb232de4"; sha256 = "1lmq7j19qv3pabs5arapx3lv2xhf0sgn4b2hl0l0kzph52fvics7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb805b0f2d2055aa4e88bd41239d75ec34f5785/recipes/helm-addressbook"; sha256 = "1d8byi6sr5gz1rx3kglnkp47sn9dqdd83s12d84wyay06ix3cqqi"; - name = "helm-addressbook"; + name = "recipe"; }; packageRequires = [ addressbook-bookmark cl-lib emacs helm ]; meta = { @@ -32083,20 +41790,26 @@ license = lib.licenses.free; }; }) {}; - helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ag = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ag"; + ename = "helm-ag"; version = "20170209.745"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "2fc02c4ead29bf0db06fd70740cc7c364cb650ac"; - sha256 = "1gnn0byywbld6afcq1vp92cjvy4wlag9d1wgymnqn86c3b1bcf21"; + rev = "39ed137823665fca2fa5b215f7c3e8701173f7b7"; + sha256 = "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; sha256 = "050qh5xqh8lwkgmz3jxm8gql5nd7bq8sp9q6mzm2z7367qy4qqyf"; - name = "helm-ag"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -32104,9 +41817,14 @@ license = lib.licenses.free; }; }) {}; - helm-ag-r = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ag-r = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ag-r"; + ename = "helm-ag-r"; version = "20131123.731"; src = fetchFromGitHub { owner = "yuutayamada"; @@ -32114,10 +41832,10 @@ rev = "67de4ebafe9b088db950eefa5ef590a6d78b4ac8"; sha256 = "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa1cf029db913dafb561e4c8ccc1ca9099524de/recipes/helm-ag-r"; sha256 = "0ivh7f021lbmbaj6gs4y8m99s63js57w04q7cwx7v4i32cpas7r9"; - name = "helm-ag-r"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -32125,20 +41843,27 @@ license = lib.licenses.free; }; }) {}; - helm-aws = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + helm-aws = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-aws"; - version = "20171227.132"; + ename = "helm-aws"; + version = "20180514.332"; src = fetchFromGitHub { owner = "istib"; repo = "helm-aws"; - rev = "d69a0241601d170c034e3b69e8df0b1fec72bff7"; - sha256 = "0975a0nwxlnpln7vrq4hqq4xamrhp1zc4bkwnzpw06dk95s23cb9"; + rev = "b36c744b3f00f458635a91d1f5158fccbb5baef6"; + sha256 = "11683s12dabgi9j6cyx0i147pgz4jdd240xviry7w3cxgarqki8y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/421182006b8af17dae8b5ad453cc11e2d990a053/recipes/helm-aws"; sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5"; - name = "helm-aws"; + name = "recipe"; }; packageRequires = [ cl-lib helm s ]; meta = { @@ -32146,9 +41871,16 @@ license = lib.licenses.free; }; }) {}; - helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + helm-backup = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-backup"; + ename = "helm-backup"; version = "20171204.2357"; src = fetchFromGitHub { owner = "antham"; @@ -32156,10 +41888,10 @@ rev = "a2c0fa16113e628500d6822c6605280b94e24038"; sha256 = "0j4dkz9za2zng43dx8ph688gl5973isxr89v5bw160c65n4lbc6w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3"; - name = "helm-backup"; + name = "recipe"; }; packageRequires = [ cl-lib helm s ]; meta = { @@ -32167,20 +41899,26 @@ license = lib.licenses.free; }; }) {}; - helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-bbdb = callPackage ({ bbdb + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-bbdb"; - version = "20180319.639"; + ename = "helm-bbdb"; + version = "20180505.808"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-bbdb"; - rev = "7582e93871d6ab9aeebd87f5f63c43d3207b71fe"; - sha256 = "11nv31rlf6f9aha39pgzapah3drb547gfymha3ihpdsk2xy68ij5"; + rev = "db286b0ee0ea18142f7d005e465832bb755bb0cb"; + sha256 = "193xkwdhl3k0ka7qs9pd92mx0ild7dv11lmgydkpx8w1rcd20yyx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb"; sha256 = "1wlacbfs23shvyaq616r1p84h8321zz1k5nzir5qg8nr6lssi8vp"; - name = "helm-bbdb"; + name = "recipe"; }; packageRequires = [ bbdb helm ]; meta = { @@ -32188,20 +41926,31 @@ license = lib.licenses.free; }; }) {}; - helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: - melpaBuild { + helm-bibtex = callPackage ({ biblio + , cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , parsebib + , s }: + melpaBuild { pname = "helm-bibtex"; - version = "20180328.1147"; + ename = "helm-bibtex"; + version = "20180612.619"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "5be84d36758ed7d5838cc5c8796a6ff427ba7043"; - sha256 = "1pqg49mj22izilx8x9rshflpyiw1q9zrp881nasp5lvbihwydvrg"; + rev = "21f802aaf5b78dec18b72601dd8276c5244e39f5"; + sha256 = "13jg728v8k227p68ngiwknlygzqdvasg6n9ax1a2xgjbx3di12vv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; sha256 = "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z"; - name = "helm-bibtex"; + name = "recipe"; }; packageRequires = [ biblio cl-lib dash f helm parsebib s ]; meta = { @@ -32209,9 +41958,14 @@ license = lib.licenses.free; }; }) {}; - helm-bibtexkey = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-bibtexkey = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-bibtexkey"; + ename = "helm-bibtexkey"; version = "20140214.704"; src = fetchFromGitHub { owner = "kenbeese"; @@ -32219,10 +41973,10 @@ rev = "aa1637ea5c8c5f1817e480fc2a3750cafab3d99f"; sha256 = "10k7hjfz9jmfpbmsv20jy9vr6fqxx1yp8v115hprqvw057iifsl9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d35a2e5cb5232d16d5c98168706d8b6426fcfb44/recipes/helm-bibtexkey"; sha256 = "00i7ni4r73mmxavhfcm0fd7jhx6gxvxx7prax1yxmhs46fpz8jwj"; - name = "helm-bibtexkey"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -32230,9 +41984,15 @@ license = lib.licenses.free; }; }) {}; - helm-bind-key = callPackage ({ bind-key, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-bind-key = callPackage ({ bind-key + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-bind-key"; + ename = "helm-bind-key"; version = "20141108.2115"; src = fetchFromGitHub { owner = "myuhe"; @@ -32240,10 +42000,10 @@ rev = "9da6ad8b7530e72fb4ac67be8c6a482898dddc25"; sha256 = "1wmcy7q4ys2sf8ya5l4n7a6bq5m9d6m19amjfwkmkh4ajkwl041y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ae8bfd320cdef6c65da2a00439f8108d7ffa7ce/recipes/helm-bind-key"; sha256 = "1yfj6mmxc165in1i85ccanssch6bg19ib1fcm7sa4i4hv0mgwaid"; - name = "helm-bind-key"; + name = "recipe"; }; packageRequires = [ bind-key helm ]; meta = { @@ -32251,9 +42011,17 @@ license = lib.licenses.free; }; }) {}; - helm-bm = callPackage ({ bm, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + helm-bm = callPackage ({ bm + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-bm"; + ename = "helm-bm"; version = "20160321.631"; src = fetchFromGitHub { owner = "yasuyk"; @@ -32261,10 +42029,10 @@ rev = "d66341f5646c23178d4d8bffb6cfebe3fb73f1d7"; sha256 = "011k37p4vnzm1x8vyairllanvjfknskl20bdfv0glf64xgbdpfil"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/115033d7b02d3ca42902195de933f62c5f927ae4/recipes/helm-bm"; sha256 = "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh"; - name = "helm-bm"; + name = "recipe"; }; packageRequires = [ bm cl-lib helm s ]; meta = { @@ -32272,20 +42040,25 @@ license = lib.licenses.free; }; }) {}; - helm-books = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-books = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-books"; + ename = "helm-books"; version = "20170324.2331"; src = fetchFromGitHub { owner = "grugrut"; repo = "helm-books"; - rev = "625aadec1541a5ca36951e4ce1301f4b6fe2bf3f"; - sha256 = "1d3nps765gxmadhbd1yqn4qvs23bczglwhxkciprky7ixm5lx53k"; + rev = "6735e1787f99b5ef77b276fa5c43e565b4d3e792"; + sha256 = "0gsa0qf88x4rgkzhgp4dr19l772fla3gd6854z4gwpn0s52rl7h7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acba3db40f37e74e1bf9e30f2abed431c259ff50/recipes/helm-books"; sha256 = "0xh53vji7nsnpi0b38cjh97x26ryxk61mj7bd6m63qwh8dyhs3yx"; - name = "helm-books"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -32293,20 +42066,25 @@ license = lib.licenses.free; }; }) {}; - helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-bundle-show = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-bundle-show"; + ename = "helm-bundle-show"; version = "20151221.430"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-bundle-show"; - rev = "850fecb36f609f1dfd5d20ca0170c9a6b7f90ab9"; - sha256 = "06xi91dy88qnqwqsknhf695324vsiz1vn2fmwl6llywa03k0xnl1"; + rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a"; + sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f10f7387cca102696c38af1d8dc0fe5da5e366f/recipes/helm-bundle-show"; sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7"; - name = "helm-bundle-show"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -32314,9 +42092,15 @@ license = lib.licenses.free; }; }) {}; - helm-c-moccur = callPackage ({ color-moccur, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-c-moccur = callPackage ({ color-moccur + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-c-moccur"; + ename = "helm-c-moccur"; version = "20151230.124"; src = fetchFromGitHub { owner = "myuhe"; @@ -32324,10 +42108,10 @@ rev = "b0a906f85fa352db091f88b91a9c510de607dfe9"; sha256 = "0w4svbg32y63v049plvk7djc1m2amjzrr1v979d9s6jbnnpzlb5c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/462a43341a5811822928bcac331d617a38b52e8a/recipes/helm-c-moccur"; sha256 = "1i6a4jqjy9amlhdbj5d26wzagndfgszha09vs5qf4760vjl7kn4b"; - name = "helm-c-moccur"; + name = "recipe"; }; packageRequires = [ color-moccur helm ]; meta = { @@ -32335,9 +42119,16 @@ license = lib.licenses.free; }; }) {}; - helm-c-yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, yasnippet }: - melpaBuild { + helm-c-yasnippet = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "helm-c-yasnippet"; + ename = "helm-c-yasnippet"; version = "20170128.742"; src = fetchFromGitHub { owner = "emacs-jp"; @@ -32345,10 +42136,10 @@ rev = "65ca732b510bfc31636708aebcfe4d2d845b59b0"; sha256 = "1cbafjqlzxbg19xfdqsinsh7afq58gkf44rsg1qxfgm8g6zhr7f8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2fc20598a2cd22efb212ba43159c6728f0249e5e/recipes/helm-c-yasnippet"; sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90"; - name = "helm-c-yasnippet"; + name = "recipe"; }; packageRequires = [ cl-lib helm yasnippet ]; meta = { @@ -32356,9 +42147,16 @@ license = lib.licenses.free; }; }) {}; - helm-charinfo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-charinfo = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-charinfo"; + ename = "helm-charinfo"; version = "20170810.531"; src = fetchFromGitHub { owner = "mandoku"; @@ -32366,10 +42164,10 @@ rev = "91798a49dc115342a7e01e48b264e9a0bf5ea414"; sha256 = "1ifj6zz5k7qjalg06fvfc7rdmlha0n9hll2hiq7mrcj7lfac6jga"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/helm-charinfo"; sha256 = "04k6crcwhv2k69f5w75g0dg0f5qsbhyxl93qzxxdb5bnr56ad7f6"; - name = "helm-charinfo"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -32377,9 +42175,16 @@ license = lib.licenses.free; }; }) {}; - helm-chrome = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-chrome = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-chrome"; + ename = "helm-chrome"; version = "20160718.2220"; src = fetchFromGitHub { owner = "kawabata"; @@ -32387,10 +42192,10 @@ rev = "fd630ace4b4b4f33355a973743bbfe0c90ce4830"; sha256 = "0r8s85fs5lnwdn377z5zgi3d090k2n1mgiyxwgy49i8yirssgz51"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f6ca33fe8ec8a0af8fb166451050f5502838deb/recipes/helm-chrome"; sha256 = "0p3n2pna83mp4ym8x69lk4r3q4apbj5v2blg2mwcsd9zij153nxz"; - name = "helm-chrome"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -32398,9 +42203,15 @@ license = lib.licenses.free; }; }) {}; - helm-chronos = callPackage ({ chronos, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-chronos = callPackage ({ chronos + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-chronos"; + ename = "helm-chronos"; version = "20150528.1336"; src = fetchFromGitHub { owner = "dxknight"; @@ -32408,10 +42219,10 @@ rev = "a14fc3d65dd96ce6616234b3f7b8b08b4c1817ef"; sha256 = "1dmj4f8pris1i7wvfplp4dbnyfm403l6rplxfrfi0cd9afg7m68i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6f5eef6ac62ed8d035f4dd272695655d00a4180/recipes/helm-chronos"; sha256 = "1a65b680741cx4cyyizyl2c3bss36x3j2m9sh9hjc87xrzarg0s3"; - name = "helm-chronos"; + name = "recipe"; }; packageRequires = [ chronos helm ]; meta = { @@ -32419,9 +42230,16 @@ license = lib.licenses.free; }; }) {}; - helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + helm-cider = callPackage ({ cider + , emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-cider"; + ename = "helm-cider"; version = "20180306.2058"; src = fetchFromGitHub { owner = "clojure-emacs"; @@ -32429,10 +42247,10 @@ rev = "9363cc537f06233345aa3af5cd46aa5681ad607b"; sha256 = "0vfn4smqba1vsshz48ggkj8gs94la0sxb1sq4shrb41qj2x3dci7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x"; - name = "helm-cider"; + name = "recipe"; }; packageRequires = [ cider emacs helm-core ]; meta = { @@ -32440,9 +42258,15 @@ license = lib.licenses.free; }; }) {}; - helm-cider-history = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-cider-history = callPackage ({ cider + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-cider-history"; + ename = "helm-cider-history"; version = "20150719.1420"; src = fetchFromGitHub { owner = "Kungi"; @@ -32450,10 +42274,10 @@ rev = "c391fcb2e162a02001605a0b9449783575a831fd"; sha256 = "18j4ikb3q8ygdq74zqzm83wgb39x7w209n3186mm051n8lfmkaif"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31a9c900d57f2eeed4f0101af73f8a59c20e9a99/recipes/helm-cider-history"; sha256 = "12l8jyl743zqk8m2xzcz75y1ybdkbkvcbvfkn1k88k09s31kdq4h"; - name = "helm-cider-history"; + name = "recipe"; }; packageRequires = [ cider helm ]; meta = { @@ -32461,9 +42285,17 @@ license = lib.licenses.free; }; }) {}; - helm-circe = callPackage ({ circe, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-circe = callPackage ({ circe + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-circe"; + ename = "helm-circe"; version = "20160206.2252"; src = fetchFromGitHub { owner = "lesharris"; @@ -32471,10 +42303,10 @@ rev = "9091651d9fdd8d49d8ff6f9dcf3a2ae416c9f15a"; sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-circe"; sha256 = "07559rg55b0glxiw787xmvxrhms14jz21bvprc5n24b4j827g9xw"; - name = "helm-circe"; + name = "recipe"; }; packageRequires = [ circe cl-lib emacs helm ]; meta = { @@ -32482,9 +42314,15 @@ license = lib.licenses.free; }; }) {}; - helm-clojuredocs = callPackage ({ edn, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-clojuredocs = callPackage ({ edn + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-clojuredocs"; + ename = "helm-clojuredocs"; version = "20160405.23"; src = fetchFromGitHub { owner = "mbuczko"; @@ -32492,10 +42330,10 @@ rev = "5a7f0f2cb401be0b09e73262a1c18265ab9a3cea"; sha256 = "015b8zxh91ljhqvn6z43gy08di54xcw9skw0i7frj3d7gk984qhl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/adb117e04c158b1c77a8c1174329477d7eaca838/recipes/helm-clojuredocs"; sha256 = "0yz0wlyay9286by8i30gs3ispswq8ayqlcnna1s7bgspjvb7scmk"; - name = "helm-clojuredocs"; + name = "recipe"; }; packageRequires = [ edn helm ]; meta = { @@ -32503,9 +42341,13 @@ license = lib.licenses.free; }; }) {}; - helm-cmd-t = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + helm-cmd-t = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "helm-cmd-t"; + ename = "helm-cmd-t"; version = "20170125.659"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -32513,10 +42355,10 @@ rev = "7fa3d4a9f7271512e54c5de999079b27c9eec6bf"; sha256 = "06jdvkgnmwrgsdh9y2bwzdng7hy4331v3lh11jvdy4704w4khmak"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/helm-cmd-t"; sha256 = "1w870ldq029wgicgv4cqm31zw2i8vkap3m9hsr9d0i3gv2virnc6"; - name = "helm-cmd-t"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32524,9 +42366,17 @@ license = lib.licenses.free; }; }) {}; - helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + helm-codesearch = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-codesearch"; + ename = "helm-codesearch"; version = "20180203.2033"; src = fetchFromGitHub { owner = "youngker"; @@ -32534,10 +42384,10 @@ rev = "87a68168b7c1490769305db0df60035e47799a75"; sha256 = "0wiyz0kh2m2mpjhnl2mvsx2gvhkmmk0xaw432mxr48zz9jjnlha9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q"; - name = "helm-codesearch"; + name = "recipe"; }; packageRequires = [ cl-lib dash helm s ]; meta = { @@ -32545,9 +42395,17 @@ license = lib.licenses.free; }; }) {}; - helm-commandlinefu = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, json ? null, let-alist, lib, melpaBuild }: - melpaBuild { + helm-commandlinefu = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , json ? null + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "helm-commandlinefu"; + ename = "helm-commandlinefu"; version = "20150610.2245"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -32555,10 +42413,10 @@ rev = "9ee7e018c5db23ae9c8d1c8fa969876f15b7280d"; sha256 = "0fxrmvb64lav4aqs61z3a4d2mcp9s2nw7fvysyjn0r1291pkzk9j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7eaf1e41ef2fa90b6bb6a80891ef1bf52ef1029b/recipes/helm-commandlinefu"; sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd"; - name = "helm-commandlinefu"; + name = "recipe"; }; packageRequires = [ emacs helm json let-alist ]; meta = { @@ -32566,9 +42424,15 @@ license = lib.licenses.free; }; }) {}; - helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-company = callPackage ({ company + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-company"; + ename = "helm-company"; version = "20180213.1405"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; @@ -32576,10 +42440,10 @@ rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d"; sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; sha256 = "1wl1mzm1h9ig351y77yascdv4z0cka1gayi8cnnlayk763is7q34"; - name = "helm-company"; + name = "recipe"; }; packageRequires = [ company helm ]; meta = { @@ -32587,20 +42451,26 @@ license = lib.licenses.free; }; }) {}; - helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + helm-core = callPackage ({ async + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "helm-core"; - version = "20180331.1241"; + ename = "helm-core"; + version = "20180712.137"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "412e85cad7ed4073152b6e339d8e7c9247ddeba4"; - sha256 = "075v6ml40z0j1sblj5q7a7cqrlbvvh7rbwllmz8a7ghcan17n1x6"; + rev = "8de42d08f45a7052ed858132de43a76f933f58f7"; + sha256 = "1g36knyppz8lfbcn84hx6ivf8b34s26wx5dh4xw85sq6pwi5yn7s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda"; - name = "helm-core"; + name = "recipe"; }; packageRequires = [ async emacs ]; meta = { @@ -32608,9 +42478,17 @@ license = lib.licenses.free; }; }) {}; - helm-cscope = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xcscope }: - melpaBuild { + helm-cscope = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , xcscope }: + melpaBuild { pname = "helm-cscope"; + ename = "helm-cscope"; version = "20170326.22"; src = fetchFromGitHub { owner = "alpha22jp"; @@ -32618,10 +42496,10 @@ rev = "3cc7259ab4989f9f7ca039e703cdac14b907530a"; sha256 = "0gh4csq6v6lqqpi966iwl2238wgkmr3vxb4kxffajpk8r0cq1c9x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2e3460df1ec750053bc8402ad6eb822c10c697/recipes/helm-cscope"; sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4"; - name = "helm-cscope"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm xcscope ]; meta = { @@ -32629,20 +42507,26 @@ license = lib.licenses.free; }; }) {}; - helm-css-scss = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-css-scss = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-css-scss"; + ename = "helm-css-scss"; version = "20140626.1725"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "helm-css-scss"; - rev = "ab8348aa98e0daa2f1b771e35bdb06bfacbe5016"; - sha256 = "01a3pahpsxb7d15dkfgxypl7gzqb4dy4f36lmid1w77b9rhs6nph"; + rev = "363d5ebe9ecf8fab8422b83a414d054c3eff79fa"; + sha256 = "1wwkcjw7q660a7v7f6qr6hr5blharyylr5ddfz013xa3lnzy72cv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b985973ff12135f893e6d2742223725c2143720/recipes/helm-css-scss"; sha256 = "0iflwl0rijbkx1b7i1s7984dw7sz1wa1cb74fqij0kcn76kal7ak"; - name = "helm-css-scss"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -32650,9 +42534,16 @@ license = lib.licenses.free; }; }) {}; - helm-ctest = callPackage ({ dash, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, s }: - melpaBuild { + helm-ctest = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-ctest"; + ename = "helm-ctest"; version = "20180125.2058"; src = fetchFromGitHub { owner = "danlamanna"; @@ -32660,10 +42551,10 @@ rev = "034927a922f40d9f5978786feed9bc9fe1f7655f"; sha256 = "0mbsxlc0isfzqlwvwqxyjkcdvpn9a6qsa29r7mqqihy0jkqi4473"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1cc85ff5554df10fc2066eec4d90de3b25536923/recipes/helm-ctest"; sha256 = "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm"; - name = "helm-ctest"; + name = "recipe"; }; packageRequires = [ dash helm-core s ]; meta = { @@ -32671,20 +42562,26 @@ license = lib.licenses.free; }; }) {}; - helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-dash = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-dash"; - version = "20171120.446"; + ename = "helm-dash"; + version = "20180503.218"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "13dcc176556a7dd0970790e96dbbf9105dc395de"; - sha256 = "1cxfmlf2ddx9rm5f70r1sh9vwmn5s1a6m5in41skspvpm0avc8vi"; + rev = "0ac2db529577fa63f2ed32310062873c585b91de"; + sha256 = "0jsa4vvhbcndv47gssjnk3fwbld73jhf0f5l7hjkq82ckimw0bvi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; sha256 = "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb"; - name = "helm-dash"; + name = "recipe"; }; packageRequires = [ cl-lib helm ]; meta = { @@ -32692,20 +42589,25 @@ license = lib.licenses.free; }; }) {}; - helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-descbinds = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-descbinds"; - version = "20160916.713"; + ename = "helm-descbinds"; + version = "20180429.756"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-descbinds"; - rev = "6d5ddc11e6cef86548bd6b3e0d840112d602659c"; - sha256 = "03b79wdcp4im0fwadzhyc8jxl2wqvg8gmpflnznrwz3l71bi4sqq"; + rev = "033be73f21778633813264ce1634a6e1ad873d8e"; + sha256 = "1n89p56qwa243w1c85i5awnaf7piwjsvfi7nmnsrwm33hix5dknk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds"; sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7"; - name = "helm-descbinds"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -32713,20 +42615,27 @@ license = lib.licenses.free; }; }) {}; - helm-describe-modes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-describe-modes = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-describe-modes"; + ename = "helm-describe-modes"; version = "20160211.2118"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-describe-modes"; - rev = "11fb36af119b784539d31c6160002de1957408aa"; - sha256 = "1d5b85m33hsdb4wswh9wpid0ghsr2zrj3f6ky587lc32s4bs0w0z"; + rev = "d2253c7c2bf4f28b9ff8a2d281bd7527c0106527"; + sha256 = "0li9bi1lm5ldwfpvzahxp7hyfd94jr1kl43rprx0myxb016yk2p5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23f0b2025073850c477ba4646c3821b3c7de6c42/recipes/helm-describe-modes"; sha256 = "0ajy9kwspm8rzafl0df57fad5867s86yjqj29shznqb12r91lpqb"; - name = "helm-describe-modes"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -32734,9 +42643,14 @@ license = lib.licenses.free; }; }) {}; - helm-dictionary = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-dictionary = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-dictionary"; + ename = "helm-dictionary"; version = "20160817.1333"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -32744,10 +42658,10 @@ rev = "805ce850d4cbe811227d9c9b16cc51f652198f3f"; sha256 = "0ambb6i8ipz5y0mnc8jd07j3iiwb7ah87pw8x8pi3phv1r80l0k1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8cc457b06ce271f7c19729cde7728286bb85528/recipes/helm-dictionary"; sha256 = "1pak8qn0qvbzyclhzvr5ka3pl370i4kiykypfkwbfgvqqwczhl3n"; - name = "helm-dictionary"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -32755,20 +42669,26 @@ license = lib.licenses.free; }; }) {}; - helm-directory = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-directory = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-directory"; + ename = "helm-directory"; version = "20170705.2102"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-directory"; - rev = "29f05c87046f9a04329f817e9d7489a290a2592a"; - sha256 = "0dp9s5yicjn91mmrzb15hidf05c8lffpgk2sq23d9x6b9ddnlcl1"; + rev = "caa013b820b5263bf1c6446debfea0766dae8ab8"; + sha256 = "15ljhz7cik7qzbh69l28c9mcvls5zgk42lp5bm9kl9fg6m6aasvq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory"; sha256 = "01c5a08v6rd867kdyrfwdvj05z4srzj9g6xy4scirlbwbff0q76n"; - name = "helm-directory"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -32776,9 +42696,15 @@ license = lib.licenses.free; }; }) {}; - helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-dired-history = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-dired-history"; + ename = "helm-dired-history"; version = "20170524.346"; src = fetchFromGitHub { owner = "jixiuf"; @@ -32786,10 +42712,10 @@ rev = "281523f9fc46cf00fafd670ba5cd16552a607212"; sha256 = "1bqavj5ljr350dckyf39i9plkb0rbhyd17ka94n2g6daapgpq0x6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dired-history"; sha256 = "0qciafa42rbw0dxgkp5mbbwbrcziswmwdj2lszm0px1bip4x7yb8"; - name = "helm-dired-history"; + name = "recipe"; }; packageRequires = [ cl-lib helm ]; meta = { @@ -32797,9 +42723,14 @@ license = lib.licenses.free; }; }) {}; - helm-dired-recent-dirs = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-dired-recent-dirs = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-dired-recent-dirs"; + ename = "helm-dired-recent-dirs"; version = "20131228.614"; src = fetchFromGitHub { owner = "akisute3"; @@ -32807,10 +42738,10 @@ rev = "3bcd125b44f5a707588ae3868777d91192351523"; sha256 = "14sifdrfg8ydvi9mj8qm2bfphbffglxrkb5ky4q5b3j96bn8v110"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e24a676ec0c5804b80c1497606b32c4f2cbe9d/recipes/helm-dired-recent-dirs"; sha256 = "0kh0n5674ksswjzi9gji2qmx8v8g0axx8xbi0m3zby9nwcpv4qzs"; - name = "helm-dired-recent-dirs"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -32818,9 +42749,17 @@ license = lib.licenses.free; }; }) {}; - helm-dirset = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + helm-dirset = callPackage ({ cl-lib ? null + , f + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-dirset"; + ename = "helm-dirset"; version = "20151208.1612"; src = fetchFromGitHub { owner = "k1LoW"; @@ -32828,10 +42767,10 @@ rev = "eb30810cd26e1ee73d84a863e6b2667700e9aead"; sha256 = "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dirset"; sha256 = "1bwgv1pm047xafidq23mdqj3sdc5bvqlw74s80dj88ybp3vrpvlk"; - name = "helm-dirset"; + name = "recipe"; }; packageRequires = [ cl-lib f helm s ]; meta = { @@ -32839,9 +42778,17 @@ license = lib.licenses.free; }; }) {}; - helm-elscreen = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-elscreen = callPackage ({ cl-lib ? null + , elscreen + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-elscreen"; + ename = "helm-elscreen"; version = "20170709.214"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -32849,10 +42796,10 @@ rev = "b8212866939dc4a1e1dc23ad572407b688e130e3"; sha256 = "0gy6lbdngiwfl9vfw32clagbmv70f93slc9zkm3dz3mca37435kz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe42a7fe2dc051c6c49aa75bce89bfe1b5fdbbb/recipes/helm-elscreen"; sha256 = "186k66kf2ak2ihha39989cz1aarqrvbgp213y1fwh9qsn1kxclnd"; - name = "helm-elscreen"; + name = "recipe"; }; packageRequires = [ cl-lib elscreen emacs helm ]; meta = { @@ -32860,9 +42807,15 @@ license = lib.licenses.free; }; }) {}; - helm-emmet = callPackage ({ emmet-mode, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-emmet = callPackage ({ emmet-mode + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-emmet"; + ename = "helm-emmet"; version = "20160713.531"; src = fetchFromGitHub { owner = "yasuyk"; @@ -32870,10 +42823,10 @@ rev = "f0364e736b10cf44232053a78de04133a88185ae"; sha256 = "1zl6vhzbf29864q97q5v7c318x36y1a4cjm0i7kgj3hc6qla5j88"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acbc5e9fab159ad2d63b10c0fa6ac18636bb2379/recipes/helm-emmet"; sha256 = "1dkn9qa3dv2im11lm19wfh5jwwwp42sv7jc0p6qg35rhzwdpfg03"; - name = "helm-emmet"; + name = "recipe"; }; packageRequires = [ emmet-mode helm ]; meta = { @@ -32881,20 +42834,28 @@ license = lib.licenses.free; }; }) {}; - helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-emms = callPackage ({ cl-lib ? null + , emacs + , emms + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-emms"; - version = "20180328.2125"; + ename = "helm-emms"; + version = "20180405.2228"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-emms"; - rev = "b564ed61f596db98b9e9cc68c97f0c058208b9c0"; - sha256 = "090iq5phlq5lgf7asqprra0pz1lhgdxqmyzd7kqlbjssd3wzaig8"; + rev = "d3f9bdef8ff0d093eaf6e26af50ea905ab53fdec"; + sha256 = "0bdb8xp0yp3gijpa9i2rc17gfzjhzlm92vdzw93i10qpd1xhj4aa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms"; sha256 = "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5"; - name = "helm-emms"; + name = "recipe"; }; packageRequires = [ cl-lib emacs emms helm ]; meta = { @@ -32902,20 +42863,25 @@ license = lib.licenses.free; }; }) {}; - helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-etags-plus = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-etags-plus"; + ename = "helm-etags-plus"; version = "20170113.614"; src = fetchFromGitHub { owner = "jixiuf"; repo = "helm-etags-plus"; - rev = "704f0991ee4a2298b01c33aafc224eef322e15e3"; - sha256 = "03n7c9jlpqkz5z1gygx2s3yf46caav2l11d9xnmqhyhbvyimjqf9"; + rev = "dd13aa768e7edc5809c8b5c52daa108eceb7d3f1"; + sha256 = "08yzs82bqj4j7k4hp4hh53ip5p8bh6325j4lg73hh6zsy0jpb9sh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/helm-etags-plus"; sha256 = "0lw21yp1q6iggzlb1dks3p6qdfppnqf50f3rijjs18lisp4izp99"; - name = "helm-etags-plus"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -32923,20 +42889,54 @@ license = lib.licenses.free; }; }) {}; - helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-eww = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , seq }: + melpaBuild { + pname = "helm-eww"; + ename = "helm-eww"; + version = "20180511.618"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-eww"; + rev = "1a09f11b2376dec8237df40140f056be8a256ef0"; + sha256 = "1kqdjhz2xiqw3bxjhfl9namhqrkbc2x70gcv6ljljya5hbkm62sm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/455a32c1d4642dc6752408c4f5055f5f4d1288eb/recipes/helm-eww"; + sha256 = "0pl8s7jmk1kak13bal43kp2awjji9lgr3npq9m09zms121rh709w"; + name = "recipe"; + }; + packageRequires = [ emacs helm seq ]; + meta = { + homepage = "https://melpa.org/#/helm-eww"; + license = lib.licenses.free; + }; + }) {}; + helm-ext = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ext"; - version = "20171218.1543"; + ename = "helm-ext"; + version = "20180525.2050"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "helm-ext"; - rev = "bdc0d86d43d965dda5ac94ec9c3fdcaa1e71aab1"; - sha256 = "1qfawx9k74rhm9rxcdrx9gpxqrvpgpiv3dz8qgl06mdr0hxrcrrb"; + rev = "90b788aced21ec467a234b6b77b5a6ebae6de75f"; + sha256 = "11a27556slh95snzqyvy0rlf6p7f51nx8rxglnv0d34529h72508"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext"; sha256 = "0la2i0b7nialib4wq26cxcak8nq1jzavsw8f0mvbavsb7hfwkpgw"; - name = "helm-ext"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -32944,20 +42944,27 @@ license = lib.licenses.free; }; }) {}; - helm-exwm = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-exwm = callPackage ({ emacs + , exwm + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-exwm"; - version = "20180301.958"; + ename = "helm-exwm"; + version = "20180703.919"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-exwm"; - rev = "9eec927d7fa092762b467d400d996b66c1f6d9c2"; - sha256 = "131xb40y8n3laivzbx4pjynbv0c5v09ihvq4r9c3m1d7qmq6x3kh"; + rev = "56266f261ba3b3d2753b374b50da20eb768c06f5"; + sha256 = "064ziinqa5sdv7rfjn0y278l12kld176fr88k4h78pgf2f2n7cd8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdf9e00cf19fabbeade12a66d66cd010561366/recipes/helm-exwm"; sha256 = "0g15c4bg794vqigafl9g2w85jbs1lbw9qplaf8ffx0az4qwhnvqz"; - name = "helm-exwm"; + name = "recipe"; }; packageRequires = [ emacs exwm helm ]; meta = { @@ -32965,9 +42972,15 @@ license = lib.licenses.free; }; }) {}; - helm-filesets = callPackage ({ fetchFromGitHub, fetchurl, filesets-plus, helm, lib, melpaBuild }: - melpaBuild { + helm-filesets = callPackage ({ fetchFromGitHub + , fetchurl + , filesets-plus + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-filesets"; + ename = "helm-filesets"; version = "20140929.1135"; src = fetchFromGitHub { owner = "gcla"; @@ -32975,10 +42988,10 @@ rev = "b352910af4c3099267a8aa0169c7f743b35bb1fa"; sha256 = "00yhmpv5xjlw1gwbcrznz83gkaby8zlqv74d3p7plca2cwjll1g9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71c0d98ede6119e838e3db146dea5c16d8ba8ed8/recipes/helm-filesets"; sha256 = "1yhhchksi0r4r5c5q1mggz2hykkvk93baq91b5hkaflqi30d1v8f"; - name = "helm-filesets"; + name = "recipe"; }; packageRequires = [ filesets-plus helm ]; meta = { @@ -32986,20 +42999,27 @@ license = lib.licenses.free; }; }) {}; - helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-firefox = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-firefox"; + ename = "helm-firefox"; version = "20161202.517"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-firefox"; - rev = "0ad34b7b5abc485a86cae6920c14de861cbeb085"; - sha256 = "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs"; + rev = "294850c4ce16ae25f2214f863cee0118add60974"; + sha256 = "1kaa58xlnr82qsvdzn8sxk5kkd2lxqnvfciyw7kfi2fdrl6nr4pf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox"; sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs"; - name = "helm-firefox"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -33007,9 +43027,16 @@ license = lib.licenses.free; }; }) {}; - helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }: - melpaBuild { + helm-flx = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flx + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-flx"; + ename = "helm-flx"; version = "20180102.2116"; src = fetchFromGitHub { owner = "PythonNut"; @@ -33017,10 +43044,10 @@ rev = "6640fac5cb16bee73c95b8ed1248a4e5e113690e"; sha256 = "1fh1dy6xpc476hs87mn9fwxhxi97h7clfnnm7dxb7hg43xmgsjjs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx"; sha256 = "03vxr5f5m4s6k6rm0976w8h3s4c3b5mrdqgmkd281hmyh9q3cslq"; - name = "helm-flx"; + name = "recipe"; }; packageRequires = [ emacs flx helm ]; meta = { @@ -33028,20 +43055,27 @@ license = lib.licenses.free; }; }) {}; - helm-flycheck = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, helm-core, lib, melpaBuild }: - melpaBuild { + helm-flycheck = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , flycheck + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-flycheck"; + ename = "helm-flycheck"; version = "20160710.129"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-flycheck"; - rev = "3cf7d3bb194acacc6395f88360588013d92675d6"; - sha256 = "1a2yfxhz04klwhcandqvfzysxp6b7bxyxx1xk1x3kds5hif5fkl4"; + rev = "a15e62a6432c165c4f2c17388686873383400d7d"; + sha256 = "0q9yksx66ry4x3vkcyyj437il225s2ad5h6vkxpyz04p62g3ysnx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cce1662d4ca7b7d868685084294d22ebf6c39e9/recipes/helm-flycheck"; sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b"; - name = "helm-flycheck"; + name = "recipe"; }; packageRequires = [ dash flycheck helm-core ]; meta = { @@ -33049,9 +43083,14 @@ license = lib.licenses.free; }; }) {}; - helm-flymake = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-flymake = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-flymake"; + ename = "helm-flymake"; version = "20160609.1702"; src = fetchFromGitHub { owner = "tam17aki"; @@ -33059,10 +43098,10 @@ rev = "72cf18a1a1f843db9bb5d58301739ea9ccb1655b"; sha256 = "05wpclg4ibp0ida692m3s8nknx4aizfcdgxgfzlwczgdgw0922kn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8547036dceaa466957f4c5a07eb0461f313b924/recipes/helm-flymake"; sha256 = "0h87yd56nhxpahrcpk6hin142hzv3sdr5bvz0injbv8a2lwnny3b"; - name = "helm-flymake"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33070,9 +43109,14 @@ license = lib.licenses.free; }; }) {}; - helm-flyspell = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-flyspell = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-flyspell"; + ename = "helm-flyspell"; version = "20170210.1101"; src = fetchFromGitHub { owner = "pronobis"; @@ -33080,10 +43124,10 @@ rev = "8d4d947c687cb650cb149aa2271ad5201ea92594"; sha256 = "0q0xcgg8w9rrlsrrnk0l7qd8q7jc6x1agm2i769j21wpyfv1nbns"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c5b91762d47a4d3024f1ed7f19666c6f2d5ce5/recipes/helm-flyspell"; sha256 = "1g6xry2y6396pg7rg8hc0l84z5r3j2df7dpd1jgffxa8xa3i661f"; - name = "helm-flyspell"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33091,9 +43135,14 @@ license = lib.licenses.free; }; }) {}; - helm-frame = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + helm-frame = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "helm-frame"; + ename = "helm-frame"; version = "20170515.1250"; src = fetchFromGitLab { owner = "chee"; @@ -33101,10 +43150,10 @@ rev = "389e6461a423d649b7062ba99a2234bef7770059"; sha256 = "1z7iwgl1v8nkwyz3h610l97amgq9slrfxxiicsnigc9vgsqlh987"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/febb2599e50518dadb30088bc9576aea2af092a7/recipes/helm-frame"; sha256 = "18wbwm4r3ra9214whhdbxnjrxzra4pn12wqgq5lxli1khylihm3i"; - name = "helm-frame"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -33112,9 +43161,15 @@ license = lib.licenses.free; }; }) {}; - helm-fuzzier = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-fuzzier = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-fuzzier"; + ename = "helm-fuzzier"; version = "20160605.1445"; src = fetchFromGitHub { owner = "EphramPerdition"; @@ -33122,10 +43177,10 @@ rev = "8798dcf3583b863df5b9dea7fe3b0179ba1c35bc"; sha256 = "1250mh0ydap0sifcyrgs32dnr6c8d723v4c55yvwm23dzvzwycp8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51dc6f01e0e5ee0593bea6616894bc0163878cd0/recipes/helm-fuzzier"; sha256 = "0qdgf0phs3iz29zj3qjhdgb3i4xvf5r2vi0709pwxx2s6r13pvcc"; - name = "helm-fuzzier"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -33133,9 +43188,15 @@ license = lib.licenses.free; }; }) {}; - helm-fuzzy-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-fuzzy-find = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-fuzzy-find"; + ename = "helm-fuzzy-find"; version = "20171105.2000"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -33143,10 +43204,10 @@ rev = "de2abbf7ca13609587325bacd4a1ed4376b5c927"; sha256 = "1dacvnkqqiax02c627z9qi61iyqgr0j3qqmjp29h0v494czvrdbs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f76bb377ed31aa42663858c407cc5476e6fe1f/recipes/helm-fuzzy-find"; sha256 = "0lczlrpd5jy2vhy9jl3rjcdyiwr136spqm8k2rj8m9s8wpn0v75i"; - name = "helm-fuzzy-find"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -33154,20 +43215,28 @@ license = lib.licenses.free; }; }) {}; - helm-ghc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ghc, helm, lib, melpaBuild }: - melpaBuild { + helm-ghc = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , ghc + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ghc"; + ename = "helm-ghc"; version = "20141105.659"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "helm-ghc"; - rev = "e5ee7b8d3b745d162553aecfbd41381c4de85f35"; - sha256 = "16p1gisbza48qircsvrwx020n96ss1c6s68d7cgqqfc0bf2467is"; + rev = "3947bfd6b5a05074e776f0b51f414f1a5a724888"; + sha256 = "0j8mbn33rv4jky9zh1hgw8da8wgs2760057mx8rv5x6i1qcm3bqd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-ghc"; sha256 = "0bv0sfpya1jyay9p80lv0w6h9kdp96r8lnp6nj15w660p1b51c0d"; - name = "helm-ghc"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ghc helm ]; meta = { @@ -33175,20 +43244,25 @@ license = lib.licenses.free; }; }) {}; - helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ghq = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ghq"; + ename = "helm-ghq"; version = "20161015.117"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-ghq"; - rev = "49481685adbb25b3f766aabfdb7472becc673a94"; - sha256 = "1gxb4cqfzkdag8v6id7bvlv0bvqbfl8mdxphll4pkf1nqj9fk69j"; + rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56"; + sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq"; sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6"; - name = "helm-ghq"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33196,20 +43270,26 @@ license = lib.licenses.free; }; }) {}; - helm-ghs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ghs = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ghs"; + ename = "helm-ghs"; version = "20170714.2241"; src = fetchFromGitHub { owner = "iory"; repo = "emacs-helm-ghs"; - rev = "17a70bf16255d90d67c8350e88200ec8bfd47563"; - sha256 = "1jc51anmkr44db4kbcwza17x3ln78ihpslrf2v9xs0sq0ggw1rva"; + rev = "f9d4ab80e8a33b21cd635285289ec5779bbe629f"; + sha256 = "0f7wsln7z2dhqn334pjk6hrj36gvx39vg19g8ds9sj9dq9djlf27"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8d37030806905344a2ca56bfc469f5a238cd69/recipes/helm-ghs"; sha256 = "0bzy2vr2h9c886cm4gd161n7laym952bzy5fhcibafhzm4abl4sh"; - name = "helm-ghs"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -33217,20 +43297,24 @@ license = lib.licenses.free; }; }) {}; - helm-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + helm-git = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "helm-git"; + ename = "helm-git"; version = "20120630.1403"; src = fetchFromGitHub { owner = "maio"; repo = "helm-git"; - rev = "cb96a52b5aecadd3c27aba7749d14e43ab128d55"; - sha256 = "1yfy4a52hx44r32i0b75bka8gfcn5lp61jl86lzrsi2cr9wg10pn"; + rev = "5b4a6eb7a97b2583236a1f919b75249957918e29"; + sha256 = "1z5q47sly41amjiq5wcvdxf8slhl8wd24crgzpbn6m3lw2jk420r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/707696fbec477027e675ff01c502e0b81096025c/recipes/helm-git"; sha256 = "1ib73p7cmkw96csxxpkqwn6m60k1xrd46z6vyp29gj85cs4fpsb8"; - name = "helm-git"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33238,9 +43322,14 @@ license = lib.licenses.free; }; }) {}; - helm-git-files = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-git-files = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-git-files"; + ename = "helm-git-files"; version = "20141212.517"; src = fetchFromGitHub { owner = "kenbeese"; @@ -33248,10 +43337,10 @@ rev = "43193960774069369ac6964bbf7c026900206fa8"; sha256 = "157b525h0kiaknn12fsw67fg26lzb20apx8sssmvlcicqcd51iaw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23bfa0b94f242f9da06366b4aefdf6ece72561e7/recipes/helm-git-files"; sha256 = "02109r956nc1dmqh4v082vkr9wdixh03xhl7icwkzl7ipr5453s6"; - name = "helm-git-files"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33259,9 +43348,14 @@ license = lib.licenses.free; }; }) {}; - helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + helm-git-grep = callPackage ({ fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-git-grep"; + ename = "helm-git-grep"; version = "20170614.711"; src = fetchFromGitHub { owner = "yasuyk"; @@ -33269,10 +43363,10 @@ rev = "744cea07dba6e6a5effbdba83f1b786c78fd86d3"; sha256 = "172m7wbgx9qnv9n1slbzpd9j24p6blddik49z6bq3zdg1vlnf3dv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi"; - name = "helm-git-grep"; + name = "recipe"; }; packageRequires = [ helm-core ]; meta = { @@ -33280,20 +43374,26 @@ license = lib.licenses.free; }; }) {}; - helm-github-stars = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-github-stars = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-github-stars"; - version = "20150625.1523"; + ename = "helm-github-stars"; + version = "20180717.1811"; src = fetchFromGitHub { owner = "Sliim"; repo = "helm-github-stars"; - rev = "9211be3fbb65ca8819e0d1a54524ed8abbfaa4fa"; - sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn"; + rev = "809cf88e2984b121348b1046e1d3890f1fd580b4"; + sha256 = "09ywdsymh479syq9ps15bgyqf5gr94z8wn4jvlcxqz5aq5fil9vq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e77f4a75504ca3e1091cdc757e91fb1ae361fa7/recipes/helm-github-stars"; sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy"; - name = "helm-github-stars"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -33301,9 +43401,17 @@ license = lib.licenses.free; }; }) {}; - helm-gitignore = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gitignore-mode, helm, lib, melpaBuild, request }: - melpaBuild { + helm-gitignore = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , gitignore-mode + , helm + , lib + , melpaBuild + , request }: + melpaBuild { pname = "helm-gitignore"; + ename = "helm-gitignore"; version = "20170210.1608"; src = fetchFromGitHub { owner = "jupl"; @@ -33311,10 +43419,10 @@ rev = "2a2e7da7855a6db0ab3bb6a6a087863d7abd4391"; sha256 = "07770qhy56cf5l69mk6aq882sryjbfjd05kdk78v65mgmlwv806a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3146b9309e8cbe464330dcd1f5b8a9fd8788ad6f/recipes/helm-gitignore"; sha256 = "01l7mx8g1m5qnwz973hzrgds4gywm56jgl4hcdxqvpi1n56md3x6"; - name = "helm-gitignore"; + name = "recipe"; }; packageRequires = [ cl-lib gitignore-mode helm request ]; meta = { @@ -33322,9 +43430,17 @@ license = lib.licenses.free; }; }) {}; - helm-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, helm, lib, melpaBuild, s }: - melpaBuild { + helm-gitlab = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , gitlab + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-gitlab"; + ename = "helm-gitlab"; version = "20180312.947"; src = fetchFromGitHub { owner = "nlamirault"; @@ -33332,10 +43448,10 @@ rev = "68318aca3206d50701039c9aae39734ca29a49f9"; sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab"; sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd"; - name = "helm-gitlab"; + name = "recipe"; }; packageRequires = [ dash gitlab helm s ]; meta = { @@ -33343,20 +43459,28 @@ license = lib.licenses.free; }; }) {}; - helm-go-package = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, go-mode, helm-core, lib, melpaBuild }: - melpaBuild { + helm-go-package = callPackage ({ deferred + , emacs + , fetchFromGitHub + , fetchurl + , go-mode + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-go-package"; + ename = "helm-go-package"; version = "20161102.1853"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-go-package"; - rev = "e42c563936c205ceedb930a687c11b4bb56447bc"; - sha256 = "1169q25paz7x3hia5px4vmn06zzss179q9179x95vx8vfr43ny08"; + rev = "bf741f4a455fcb129c1a9dcec710a52621f9719d"; + sha256 = "0g7i8lnjav9730zsz12181v9xi9rcvdyhs9vzch01dksixq10hvi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/449d272b94c189176305ca17652d76adac087ce5/recipes/helm-go-package"; sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6"; - name = "helm-go-package"; + name = "recipe"; }; packageRequires = [ deferred emacs go-mode helm-core ]; meta = { @@ -33364,20 +43488,24 @@ license = lib.licenses.free; }; }) {}; - helm-google = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-google = callPackage ({ fetchgit + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-google"; - version = "20180212.240"; - src = fetchFromGitHub { - owner = "steckerhalter"; - repo = "helm-google"; - rev = "f9b5f0dfd51e16278eba70d8fc94a599563dab61"; - sha256 = "1s2y4fyax4487bz7p16jhgwsjjnzqrjz7pq22p8h23jzcvgh6wzx"; + ename = "helm-google"; + version = "20180605.2220"; + src = fetchgit { + url = "https://framagit.org/steckerhalter/helm-google.git"; + rev = "48e91a73d5f48c39d7a219022a24440cff548e1a"; + sha256 = "05xj6bkr330glh56n8c63297zqh1cmlhxlyxpr04srjraifyzba1"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google"; - sha256 = "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32"; - name = "helm-google"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/helm-google"; + sha256 = "0hv7wfrahjn8j4914dp2p4fl2cj85pmxnyxf5cnmv6p97yis0ham"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33385,9 +43513,15 @@ license = lib.licenses.free; }; }) {}; - helm-grepint = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-grepint = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-grepint"; + ename = "helm-grepint"; version = "20161001.713"; src = fetchFromGitHub { owner = "kopoli"; @@ -33395,10 +43529,10 @@ rev = "a62ca27515ff6a366b89b420500eb16d380cc653"; sha256 = "1v87v6a34zv998z1dwwcqx49476pvy9g5zml7w5vzfkms0l8l28w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/26446d6a2215bfa622d86837b30f2754dd25eb4c/recipes/helm-grepint"; sha256 = "00wr3wk41sbpamxbjkqlby49g8y5z9n79p51sg7ginban4qy91gf"; - name = "helm-grepint"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -33406,9 +43540,14 @@ license = lib.licenses.free; }; }) {}; - helm-growthforecast = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-growthforecast = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-growthforecast"; + ename = "helm-growthforecast"; version = "20140119.1944"; src = fetchFromGitHub { owner = "daichirata"; @@ -33416,10 +43555,10 @@ rev = "0f94ac090d6c354058ad89a86e5c18385c136d9b"; sha256 = "0p0mk44y2z875ra8mzcb6vlf4rbkiq9yank5hdxvg2x2sxsaambk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d92e66cad586d4dc6b1de12d1b41b818b5232c2/recipes/helm-growthforecast"; sha256 = "1qlyp263rl0892hr53kgc16jlx3jylw2pplbzlx05a60k5348jjv"; - name = "helm-growthforecast"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33427,9 +43566,15 @@ license = lib.licenses.free; }; }) {}; - helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-gtags = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-gtags"; + ename = "helm-gtags"; version = "20170115.2129"; src = fetchFromGitHub { owner = "syohex"; @@ -33437,10 +43582,10 @@ rev = "108e93d0d099ebb7b98847388f368311cf177033"; sha256 = "0hfshcnzrrvf08yw4xz5c93g9pw6bvjp2bmv0s6acrsjqgwhx158"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags"; sha256 = "1kbpfqhhbxmp3f70h91x2fws9mhx87zx4nzjjl29lpl93vf8xckl"; - name = "helm-gtags"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -33448,20 +43593,25 @@ license = lib.licenses.free; }; }) {}; - helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-hatena-bookmark = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-hatena-bookmark"; + ename = "helm-hatena-bookmark"; version = "20170821.646"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-hatena-bookmark"; - rev = "ee0d2554f573779210b0e2595e539b3e28461f1d"; - sha256 = "12qb9jnqa2nl3asfa178ijjrrxkrwddlxf6y6m0d79j2fnqrgbr6"; + rev = "d64833a5bbb4ae112ed176f6473232e526138572"; + sha256 = "01b6nlbidk93arnnd2irm088qlws4i4p1sagsh9v153x6sk0r38k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark"; sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id"; - name = "helm-hatena-bookmark"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33469,9 +43619,16 @@ license = lib.licenses.free; }; }) {}; - helm-hayoo = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, helm, json ? null, lib, melpaBuild }: - melpaBuild { + helm-hayoo = callPackage ({ fetchFromGitHub + , fetchurl + , haskell-mode + , helm + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "helm-hayoo"; + ename = "helm-hayoo"; version = "20151013.2351"; src = fetchFromGitHub { owner = "markus1189"; @@ -33479,10 +43636,10 @@ rev = "dd4c0c8c87521026edf1b808c4de01fa19b7c693"; sha256 = "08pfzs030d8g5s7vkpgicz4srp5cr3xpd84lhrr24ncrhbszxar9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-hayoo"; sha256 = "06nbilb6vfa8959ss5d06zbcwqxlbyi3cb5jnbdag0jnpxvv1hqb"; - name = "helm-hayoo"; + name = "recipe"; }; packageRequires = [ haskell-mode helm json ]; meta = { @@ -33490,20 +43647,25 @@ license = lib.licenses.free; }; }) {}; - helm-helm-commands = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-helm-commands = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-helm-commands"; + ename = "helm-helm-commands"; version = "20130902.1048"; src = fetchFromGitHub { owner = "vapniks"; repo = "helm-helm-commands"; - rev = "3a05aa19c976501343ad9ae630a36810921a85f6"; - sha256 = "05ksfx54ar2j4mypzwh0gfir8r26s4f1i4xw319q5pa1y2100cpn"; + rev = "1c37bb0d4cda6877162603cd1ddc9f596a7a5cb9"; + sha256 = "0c31qr8lk58w86n5iisx0vpd19y44vmqg7xnpjh6mnz102xif7rn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8bd33d5d5c8653df5373984d01c3ec87b30c51b/recipes/helm-helm-commands"; sha256 = "0dq9p37i5rrp2nb1vhqzzqfmdg11va2xr3yz8hdxpwykm1ldqdcf"; - name = "helm-helm-commands"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33511,9 +43673,15 @@ license = lib.licenses.free; }; }) {}; - helm-hoogle = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-hoogle = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-hoogle"; + ename = "helm-hoogle"; version = "20161026.2234"; src = fetchFromGitHub { owner = "jwiegley"; @@ -33521,10 +43689,10 @@ rev = "73969a9d46d2121a849a01a9f7ed3636d01f7bbc"; sha256 = "043bddm6lldl6wkifr1plqip7laai771z1a1l0x2h35l3g8c64h0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ccc21c2acc76a6794aee94902b1bc4c14119901/recipes/helm-hoogle"; sha256 = "0vhk4vwqfirdm5d0pppplfpqyc2sfj6jybhzp9n1w8xgrh2d1c0x"; - name = "helm-hoogle"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -33532,9 +43700,15 @@ license = lib.licenses.free; }; }) {}; - helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-hunks = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-hunks"; + ename = "helm-hunks"; version = "20171217.1133"; src = fetchFromGitHub { owner = "torgeir"; @@ -33542,10 +43716,10 @@ rev = "6392bf716f618eac23ce81140aceb0dfacb9c6d0"; sha256 = "1ih2pgyhshv8nl7hhchd4h0pbjgj45irp5dy1fq2gy05v4rn7wi4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks"; sha256 = "1fhb9sf7fpz3f3ylc906w5xa4zzfr0gix6m7zc4c8qmz33zbhbp5"; - name = "helm-hunks"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -33553,9 +43727,15 @@ license = lib.licenses.free; }; }) {}; - helm-idris = callPackage ({ fetchFromGitHub, fetchurl, helm, idris-mode, lib, melpaBuild }: - melpaBuild { + helm-idris = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , idris-mode + , lib + , melpaBuild }: + melpaBuild { pname = "helm-idris"; + ename = "helm-idris"; version = "20141202.957"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -33563,10 +43743,10 @@ rev = "a2f45d6817974f318b55ad9b7fd19d5df132d47e"; sha256 = "0128nrhwyzslzl0l7wcjxn3dlx3h1sjmwnbbnp2fj4bjk7chc59q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-idris"; sha256 = "04f1963ksbjdza1syajb5vkwwsc9gzk0az6c1m1zgvsianrq4rd9"; - name = "helm-idris"; + name = "recipe"; }; packageRequires = [ helm idris-mode ]; meta = { @@ -33574,9 +43754,15 @@ license = lib.licenses.free; }; }) {}; - helm-img = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-img = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-img"; + ename = "helm-img"; version = "20151224.1521"; src = fetchFromGitHub { owner = "l3msh0"; @@ -33584,10 +43770,10 @@ rev = "aa3f8a5dce8d0413bf07584f07153a39015c2bfc"; sha256 = "0py4xs27z2jvg99i6qaf2ccz0mvk6bb9cvdyz8v8ngmnj3rw2vla"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0ea97a55f8f4183d375424c94705f372189d6ed/recipes/helm-img"; sha256 = "0sq9l1wgm97ppfc45w3bdcv0qq5m85ygnanv1bdcp8bxbdl4vg0q"; - name = "helm-img"; + name = "recipe"; }; packageRequires = [ cl-lib helm ]; meta = { @@ -33595,9 +43781,14 @@ license = lib.licenses.free; }; }) {}; - helm-img-tiqav = callPackage ({ fetchFromGitHub, fetchurl, helm-img, lib, melpaBuild }: - melpaBuild { + helm-img-tiqav = callPackage ({ fetchFromGitHub + , fetchurl + , helm-img + , lib + , melpaBuild }: + melpaBuild { pname = "helm-img-tiqav"; + ename = "helm-img-tiqav"; version = "20151224.1522"; src = fetchFromGitHub { owner = "l3msh0"; @@ -33605,10 +43796,10 @@ rev = "33a7e9508bc8f37d53320b56c92b53d321a57bb0"; sha256 = "04vdin0n3514c8bycdjrwk3l6pkarrwanlklnm75315b91nkkbcp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6a948f91dc58ce565e54967ab75fe572f37f616/recipes/helm-img-tiqav"; sha256 = "1m083hiih2rpyy8i439745mj4ldqy85fpnvms8qnv3042b8x35y0"; - name = "helm-img-tiqav"; + name = "recipe"; }; packageRequires = [ helm-img ]; meta = { @@ -33616,9 +43807,14 @@ license = lib.licenses.free; }; }) {}; - helm-ispell = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + helm-ispell = callPackage ({ fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ispell"; + ename = "helm-ispell"; version = "20151231.53"; src = fetchFromGitHub { owner = "syohex"; @@ -33626,10 +43822,10 @@ rev = "cb735695ab3a0e66c123c2f3f3e8911fb1c2d5fc"; sha256 = "04ddjdia09y14gq4h6m8g6aiwkqvdxp66yjx3j5dh2xrkyxhlxpz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edc42b26027dcd7daf0d6f2bd19ca4736fc12d6d/recipes/helm-ispell"; sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0"; - name = "helm-ispell"; + name = "recipe"; }; packageRequires = [ helm-core ]; meta = { @@ -33637,9 +43833,14 @@ license = lib.licenses.free; }; }) {}; - helm-itunes = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-itunes = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-itunes"; + ename = "helm-itunes"; version = "20151012.2348"; src = fetchFromGitHub { owner = "anschwa"; @@ -33647,10 +43848,10 @@ rev = "966de755a5aadbe02311a6cef77bd4790e84c263"; sha256 = "1czgf5br89x192g3lh3x2n998f79hi1n2f309ll264qnl35kv14w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/helm-itunes"; sha256 = "0zi4wyraqkjwp954pkng8b23giv1q9618apd9v3dczsvlmaar9hf"; - name = "helm-itunes"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33658,9 +43859,14 @@ license = lib.licenses.free; }; }) {}; - helm-j-cheatsheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-j-cheatsheet = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-j-cheatsheet"; + ename = "helm-j-cheatsheet"; version = "20170217.29"; src = fetchFromGitHub { owner = "abo-abo"; @@ -33668,10 +43874,10 @@ rev = "6c47e7162b9ba2de4b41221d01180146973d860b"; sha256 = "0ayv6aqmwjy95gc9cpyx0s71486rvlmn04iwgfn43mr192c38y9p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/681b43eb224942155b97181bbb78bcd295347d04/recipes/helm-j-cheatsheet"; sha256 = "0lppzk60vl3ps9fqnrh020awiy5w46gwlb6d91pr889x24ryphmm"; - name = "helm-j-cheatsheet"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33679,9 +43885,16 @@ license = lib.licenses.free; }; }) {}; - helm-js-codemod = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, js-codemod, lib, melpaBuild }: - melpaBuild { + helm-js-codemod = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm-core + , js-codemod + , lib + , melpaBuild }: + melpaBuild { pname = "helm-js-codemod"; + ename = "helm-js-codemod"; version = "20171106.244"; src = fetchFromGitHub { owner = "torgeir"; @@ -33689,10 +43902,10 @@ rev = "18503d94e64418e8ea5c5854f197ae9f3009cdbf"; sha256 = "0d5fsvfa017gda0jryjdvva1q04nry6grc1433gvgrqqp6vxayxc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd005bfb170df2f0c992043130a5e9588dcf4d77/recipes/helm-js-codemod"; sha256 = "1m07xh97fjyah8di363yalg9f5g5rfr3k5mbjql3n67lfwgxrz94"; - name = "helm-js-codemod"; + name = "recipe"; }; packageRequires = [ emacs helm-core js-codemod ]; meta = { @@ -33700,20 +43913,27 @@ license = lib.licenses.free; }; }) {}; - helm-jstack = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-jstack = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-jstack"; + ename = "helm-jstack"; version = "20150602.2122"; src = fetchFromGitHub { owner = "raghavgautam"; repo = "helm-jstack"; - rev = "2064f7215dcf4ccbd6a7b8784223251507746da4"; - sha256 = "0vhqpcv8xi6a6q7n6xxahdzijr1x5s40fvk9nc44q55psbyv627g"; + rev = "aab0fd9f14794ae3a6e7cfbe7f6a81842ce4c23b"; + sha256 = "133fgmhh5phxssagriw1jsi48va4kyphwbcrha7pfnkmrmr1dgqb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a92ffbc4de86248729773dd8729e6487bf56fbb0/recipes/helm-jstack"; sha256 = "0giix1rv2jrmdxyg990w90ivl8bvgbbvah6nkpj7gb6vbnm15ldz"; - name = "helm-jstack"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -33721,9 +43941,16 @@ license = lib.licenses.free; }; }) {}; - helm-kythe = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-kythe = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-kythe"; + ename = "helm-kythe"; version = "20170709.26"; src = fetchFromGitHub { owner = "MaskRay"; @@ -33731,10 +43958,10 @@ rev = "eabbef4948f8ec7c7b2fac498e9145dfdb10ca82"; sha256 = "1ws7vl0pvznmxb7yj77kfv4l52xkzblhsl68lfkf9cdxcj9g6177"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd1a6d0b08ad750a0e44ebdf76109d29ab226bd3/recipes/helm-kythe"; sha256 = "1yybpic3jzp3yy8xlfdn2jj12h087vn0lj3mqx6xxj2nxd9q4949"; - name = "helm-kythe"; + name = "recipe"; }; packageRequires = [ dash emacs helm ]; meta = { @@ -33742,20 +43969,27 @@ license = lib.licenses.free; }; }) {}; - helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-lastpass = callPackage ({ csv + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-lastpass"; - version = "20180114.937"; + ename = "helm-lastpass"; + version = "20180722.106"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-lastpass"; - rev = "65ac0a80b5908b43ecd6a89c17f22f5c9c6734b0"; - sha256 = "18ncb6lnw06amwr1avh53gqifwg0wpwf2849z2k781dls3n5j4hr"; + rev = "82e1ffb6ae77d9d9e29c398eb013cd20ce963f77"; + sha256 = "0pri9zsjg0zii7dpsr56dy5204q0mld5wi22iay3kqpiyxghhssv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass"; sha256 = "0zgq3szds5l3ah39wiacqcc1j0dlbhwm0cjx64j28jx93300kx57"; - name = "helm-lastpass"; + name = "recipe"; }; packageRequires = [ csv emacs helm ]; meta = { @@ -33763,20 +43997,28 @@ license = lib.licenses.free; }; }) {}; - helm-lean = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lean-mode, lib, melpaBuild }: - melpaBuild { + helm-lean = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lean-mode + , lib + , melpaBuild }: + melpaBuild { pname = "helm-lean"; + ename = "helm-lean"; version = "20171102.754"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "ae90bd280588c96d540892d0f42247db5a126f51"; - sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa"; + rev = "c0af876c967fc969d67c467bc6767210d19c5d87"; + sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean"; sha256 = "0j5ax14lhlyd9mpqk1jwh7nfp090kj71r045v2qjfaw2fa23b7si"; - name = "helm-lean"; + name = "recipe"; }; packageRequires = [ dash emacs helm lean-mode ]; meta = { @@ -33784,20 +44026,27 @@ license = lib.licenses.free; }; }) {}; - helm-lib-babel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-lib-babel = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-lib-babel"; - version = "20180225.1322"; + ename = "helm-lib-babel"; + version = "20180510.624"; src = fetchFromGitHub { owner = "dfeich"; repo = "helm-lib-babel"; - rev = "69bce58c1ef109dd33cc7f7696ad02a536f1b215"; - sha256 = "0x39ds3hziabizaa3hrqfbz2a9by4s25dndp8ymxbl8jjvqgdi3a"; + rev = "41bc0cdea8a604c6c8dc83ed5066644d33688fad"; + sha256 = "1jrpaip5v9kzk0rf8wivsq8irdfd39svxd7p3v80cwgrrl7546xj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6718da5d8849a8c3ec17188b89a1273cf963047/recipes/helm-lib-babel"; sha256 = "0ddj6xrhz4n0npplkjmblqb43jnd6fmr4i4vv1cigrgb7zj6bjx4"; - name = "helm-lib-babel"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -33805,20 +44054,53 @@ license = lib.licenses.free; }; }) {}; - helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-lines = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { + pname = "helm-lines"; + ename = "helm-lines"; + version = "20180601.1333"; + src = fetchFromGitHub { + owner = "torgeir"; + repo = "helm-lines.el"; + rev = "3bfe15a60c6405682085ab289de3eb364624c4e9"; + sha256 = "1fi0khqx35v48s14jr59jp06bpnhx9dy2rdasj2wn1a34jwgd49i"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b0aee0be5f388a6d778cb22ce5ad930d21c6f521/recipes/helm-lines"; + sha256 = "110y0vdmab4zr3ab6cpf93b6iidxhanq4rh1cfrzqjf7a7xik78h"; + name = "recipe"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-lines"; + license = lib.licenses.free; + }; + }) {}; + helm-lobsters = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-lobsters"; + ename = "helm-lobsters"; version = "20150213.746"; src = fetchFromGitHub { owner = "julienXX"; repo = "helm-lobste.rs"; - rev = "53c5b42baf72776dcba891fc3d7cd7d47721e9b0"; - sha256 = "1ic0pcr7cfrfalb7760viixz5gfdg5hfazzwfhhw08vx44xx0jk4"; + rev = "4121b232aeded2f82ad2c8a85c7dda17ef9d97bb"; + sha256 = "0nkmc17ggyfi7iz959mvzh6q7116j44zqwi7ydm9i8z49xfpzafy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6247e3786131e5b2a7824804e49927ed65d266d5/recipes/helm-lobsters"; sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp"; - name = "helm-lobsters"; + name = "recipe"; }; packageRequires = [ cl-lib helm ]; meta = { @@ -33826,20 +44108,25 @@ license = lib.licenses.free; }; }) {}; - helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ls-git = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ls-git"; - version = "20170727.1238"; + ename = "helm-ls-git"; + version = "20180711.223"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "d116bb96b6ea946f633ed7735fbf38a63e611a3a"; - sha256 = "0z09qvb6yyz2vnxkcg6xhaawja1ynxfwzx5j2aqyiicwqbyf3kvg"; + rev = "e38cee59c42fbf16b6de239a537d27af58473394"; + sha256 = "0c53x1dzb80xs6qsmd6py7b9g7d0zva0dhvvxmipjy48dlzr3k5z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj"; - name = "helm-ls-git"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33847,9 +44134,14 @@ license = lib.licenses.free; }; }) {}; - helm-ls-hg = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ls-hg = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ls-hg"; + ename = "helm-ls-hg"; version = "20150908.2243"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -33857,10 +44149,10 @@ rev = "61b91a22fcfb62d0fc56e361ec01ce96973c7165"; sha256 = "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a22c9ec281330c4603aec6feb04cf580dee340/recipes/helm-ls-hg"; sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh"; - name = "helm-ls-hg"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33868,9 +44160,16 @@ license = lib.licenses.free; }; }) {}; - helm-ls-svn = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ls-svn = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ls-svn"; + ename = "helm-ls-svn"; version = "20150717.39"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -33878,10 +44177,10 @@ rev = "4d4dc1a272f27fba5fdd7cc47e5d309b53c63ae3"; sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/helm-ls-svn"; sha256 = "0rqsy6gk114khqr28bp2fi0ixaa8wbqd952yxph517p1pbfwxy66"; - name = "helm-ls-svn"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -33889,20 +44188,26 @@ license = lib.licenses.free; }; }) {}; - helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: - melpaBuild { + helm-make = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "helm-make"; - version = "20180322.1251"; + ename = "helm-make"; + version = "20180602.653"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "51dfe9871ae2851d8d82530346c8e0a846cdfd94"; - sha256 = "0zipg6zv62839n0px8sil86jdv9qlqy877kj1m8x3dln3c7pf0x3"; + rev = "014e81c638fae3ad891a0b9317ae368d9eee7c5f"; + sha256 = "1p7pdrq4vh9adk9m19dyapadaz6karlcksmah3g4l1c8zr0awf4h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc"; - name = "helm-make"; + name = "recipe"; }; packageRequires = [ helm projectile ]; meta = { @@ -33910,9 +44215,17 @@ license = lib.licenses.free; }; }) {}; - helm-migemo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, migemo }: - melpaBuild { + helm-migemo = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild + , migemo }: + melpaBuild { pname = "helm-migemo"; + ename = "helm-migemo"; version = "20151009.2056"; src = fetchFromGitHub { owner = "emacs-jp"; @@ -33920,10 +44233,10 @@ rev = "66c6a19d07c6a385daefd2090d0709d26b608b4e"; sha256 = "0gzlprf5js4y3vzkf7si2xc7ai5j97b5cqrs002hyjj5ij4f2vix"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce6eb840368f8cbee66dc061478d5096b9dacb68/recipes/helm-migemo"; sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x"; - name = "helm-migemo"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm-core migemo ]; meta = { @@ -33931,9 +44244,14 @@ license = lib.licenses.free; }; }) {}; - helm-mode-manager = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-mode-manager = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-mode-manager"; + ename = "helm-mode-manager"; version = "20151124.138"; src = fetchFromGitHub { owner = "istib"; @@ -33941,10 +44259,10 @@ rev = "5d9c3ca4f8205d07ff4e03c4c3e88f596751c1fc"; sha256 = "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-mode-manager"; sha256 = "04yhqbb9cliv1922b0abpc1wrladvhyfmwn8ifqfkzaks4067rhl"; - name = "helm-mode-manager"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33952,9 +44270,17 @@ license = lib.licenses.free; }; }) {}; - helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }: - melpaBuild { + helm-mt = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , multi-term }: + melpaBuild { pname = "helm-mt"; + ename = "helm-mt"; version = "20160917.2152"; src = fetchFromGitHub { owner = "dfdeshom"; @@ -33962,10 +44288,10 @@ rev = "d2bff4100118483bc398c56d0ff095294209265b"; sha256 = "1wci63y0vjvrvrylkhhrz8p9q0ml6la5cpj4rx5cwin9rkmislm6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e726bf0b9b3f371b21f1f0d75175e0dda62f6fb0/recipes/helm-mt"; sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a"; - name = "helm-mt"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm multi-term ]; meta = { @@ -33973,20 +44299,25 @@ license = lib.licenses.free; }; }) {}; - helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-mu = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-mu"; - version = "20171027.933"; + ename = "helm-mu"; + version = "20180513.221"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-mu"; - rev = "cda769ef48e1e11e3b21cdafa85adb8e36384d78"; - sha256 = "0s7v2hdrsd3xmdw0iwd3zqpdj3zp3z0akcyyw3cicpmic7wrcc75"; + rev = "77e6fea24e01481418738421dbcfe28ef1bd63cf"; + sha256 = "1lh0ahxdc5b2z18m9p30gwg8sbg33sjwkjr38p7h5xsm5fm7i0fz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu"; sha256 = "0pydp6scj5icaqfp3dp5h0q1y2i7z9mfyw1ll6iphsz9qh3x2bj2"; - name = "helm-mu"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -33994,20 +44325,28 @@ license = lib.licenses.free; }; }) {}; - helm-navi = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, navi-mode, s }: - melpaBuild { + helm-navi = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , navi-mode + , s }: + melpaBuild { pname = "helm-navi"; + ename = "helm-navi"; version = "20170402.752"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-navi"; - rev = "2256591174ff79f889450fdc10822316819d6476"; - sha256 = "0bbb52v1c81a6ap10qi7mqigi237vwrlmf8mg3ckglm1i710636j"; + rev = "eb5d53f2abc640bea90e3c221562913c4d144638"; + sha256 = "0d2nm35hnp26xlpp4s60ddg8mn89bpaa5b6qsap9ff6kqxfnhww1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5ffbc25c0eb30b9c96594d50f47cd0383aa8ebc/recipes/helm-navi"; sha256 = "0v3amm15pwja2y7zg92hsfhp3scmswwl0q0slg33g11rvj26iiks"; - name = "helm-navi"; + name = "recipe"; }; packageRequires = [ emacs helm navi-mode s ]; meta = { @@ -34015,20 +44354,26 @@ license = lib.licenses.free; }; }) {}; - helm-nixos-options = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, nixos-options }: - melpaBuild { + helm-nixos-options = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , nixos-options }: + melpaBuild { pname = "helm-nixos-options"; + ename = "helm-nixos-options"; version = "20151013.1609"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "7007363e773a419203a69798fb0e0731b2eb0f73"; - sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb"; + rev = "f7709bb007ebafb4d6b32778c7764e2c44e0420d"; + sha256 = "1q7z9rdd00c562qbr51xy3qrqfj7wm4ycysx5fiasjisqa9vphkv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options"; sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933"; - name = "helm-nixos-options"; + name = "recipe"; }; packageRequires = [ helm nixos-options ]; meta = { @@ -34036,20 +44381,26 @@ license = lib.licenses.free; }; }) {}; - helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }: - melpaBuild { + helm-notmuch = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , notmuch }: + melpaBuild { pname = "helm-notmuch"; - version = "20170903.2159"; + ename = "helm-notmuch"; + version = "20180521.407"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-notmuch"; - rev = "782c221bf293eee55990de5b54171f08d881dcee"; - sha256 = "04mlsjqhh2nw2javxz8m1hbnsq0s70dw5pnwdbx8s9dk1p8ikxvw"; + rev = "3176305a700c571e3bd6cdb37598708ad283ea73"; + sha256 = "097h2v5dxlcyb5myk9ijbjnf1qfi52ivaqq56hf5yll3k7i9m65d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch"; sha256 = "1ixdc1ba4ygxl0lpg6ijk06dgj2hfv5p5k6ivq60ss0axyisnnv0"; - name = "helm-notmuch"; + name = "recipe"; }; packageRequires = [ helm notmuch ]; meta = { @@ -34057,9 +44408,16 @@ license = lib.licenses.free; }; }) {}; - helm-open-github = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }: - melpaBuild { + helm-open-github = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , gh + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-open-github"; + ename = "helm-open-github"; version = "20170219.1759"; src = fetchFromGitHub { owner = "syohex"; @@ -34067,10 +44425,10 @@ rev = "2f03d97552a1233db7694116d5f80ecde7612756"; sha256 = "1nzi2m23mqvxkpa7wsd2j0rwvlv5pj0mcaz2ypgfd023k2vh9is1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-open-github"; sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx"; - name = "helm-open-github"; + name = "recipe"; }; packageRequires = [ emacs gh helm-core ]; meta = { @@ -34078,20 +44436,29 @@ license = lib.licenses.free; }; }) {}; - helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + helm-org-rifle = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-org-rifle"; - version = "20180207.1539"; + ename = "helm-org-rifle"; + version = "20180712.1545"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "f4936509b4a5658ea325fc9f941f2e2e9e3018cf"; - sha256 = "020jg7mwyibd6c3lrzdsrc5jbn7vh6y6iyxfc6r28k8bwv4fggv3"; + rev = "b712ced914da3ae733ee7c355261071d4eed4876"; + sha256 = "0s8dq2x73p6dfrkyiq7zajl24wrsdmh6wgwrjjf9d6hdla64pfy8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; sha256 = "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3"; - name = "helm-org-rifle"; + name = "recipe"; }; packageRequires = [ dash emacs f helm s ]; meta = { @@ -34099,9 +44466,14 @@ license = lib.licenses.free; }; }) {}; - helm-orgcard = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + helm-orgcard = callPackage ({ fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-orgcard"; + ename = "helm-orgcard"; version = "20151001.824"; src = fetchFromGitHub { owner = "emacs-jp"; @@ -34109,10 +44481,10 @@ rev = "9655ac340d1ccc5f3d1c0f7c49be8dd3556d4d0d"; sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce6eb840368f8cbee66dc061478d5096b9dacb68/recipes/helm-orgcard"; sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p"; - name = "helm-orgcard"; + name = "recipe"; }; packageRequires = [ helm-core ]; meta = { @@ -34120,9 +44492,16 @@ license = lib.licenses.free; }; }) {}; - helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-pages = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-pages"; + ename = "helm-pages"; version = "20161120.1826"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -34130,10 +44509,10 @@ rev = "51dcb9374d1df9feaae85e60cfb39b970554ecba"; sha256 = "0znmj13nshzspysnzrn2x6k9fym21n9ywkpjibljy0s05m36nbs5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a33cb19b6e71240896bbe5da07ab25f2ee11f0b/recipes/helm-pages"; sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj"; - name = "helm-pages"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -34141,30 +44520,45 @@ license = lib.licenses.free; }; }) {}; - helm-pass = callPackage ({ auth-source-pass, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: - melpaBuild { + helm-pass = callPackage ({ auth-source-pass + , emacs + , fetchFromGitLab + , fetchurl + , helm + , lib + , melpaBuild + , password-store }: + melpaBuild { pname = "helm-pass"; - version = "20180325.1453"; - src = fetchFromGitHub { + ename = "helm-pass"; + version = "20180607.1648"; + src = fetchFromGitLab { owner = "jabranham"; repo = "helm-pass"; - rev = "c451b9739ef742df06af9d098f6b0fb48e807f66"; - sha256 = "1ndhyb796svisq5wdshxlz4nzjsphmwiwf9kp5f077bi6lx25xkn"; + rev = "fdff8f8f2e2b8a61caed7b6c171624700dbe1346"; + sha256 = "1rq4gsz924m06l01x0058cgxxmqwvh4jga8fb7lwviispxi21nbn"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass"; - sha256 = "11yknsch0avdl8jmj54xk45nba3qh8bhsdrc2rds084i7d5gmqia"; - name = "helm-pass"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/helm-pass"; + sha256 = "0a2yqd99j295ingljrvrni4z8qvlk9l827xi3rmkpafhhysch66h"; + name = "recipe"; }; - packageRequires = [ auth-source-pass helm password-store ]; + packageRequires = [ auth-source-pass emacs helm password-store ]; meta = { homepage = "https://melpa.org/#/helm-pass"; license = lib.licenses.free; }; }) {}; - helm-perldoc = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + helm-perldoc = callPackage ({ deferred + , emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-perldoc"; + ename = "helm-perldoc"; version = "20160917.2256"; src = fetchFromGitHub { owner = "syohex"; @@ -34172,10 +44566,10 @@ rev = "1979f9f67814c11ec9498502237c89a5e1153100"; sha256 = "0fvjw8sqnwnjx978y7fghvgp5dznx31hx0pjp4iih01xa1hcwbnc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-perldoc"; sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb"; - name = "helm-perldoc"; + name = "recipe"; }; packageRequires = [ deferred emacs helm-core ]; meta = { @@ -34183,9 +44577,15 @@ license = lib.licenses.free; }; }) {}; - helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, perspeen }: - melpaBuild { + helm-perspeen = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , perspeen }: + melpaBuild { pname = "helm-perspeen"; + ename = "helm-perspeen"; version = "20170228.545"; src = fetchFromGitHub { owner = "jimo1001"; @@ -34193,10 +44593,10 @@ rev = "7fe2922d85608bfa9e18269fc44181428b8849ff"; sha256 = "1m89c95vzmhsvrg5g7ixz5a5ckw2n983x58cwh8rkmaklavacgsy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen"; sha256 = "07cnsfhph807fqyai3by2c5ml9a40gxkq280f27disf8sc45rg1y"; - name = "helm-perspeen"; + name = "recipe"; }; packageRequires = [ helm perspeen ]; meta = { @@ -34204,9 +44604,15 @@ license = lib.licenses.free; }; }) {}; - helm-phpunit = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, phpunit }: - melpaBuild { + helm-phpunit = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , phpunit }: + melpaBuild { pname = "helm-phpunit"; + ename = "helm-phpunit"; version = "20160513.153"; src = fetchFromGitHub { owner = "eric-hansen"; @@ -34214,10 +44620,10 @@ rev = "739f26204ad2ba76c25f45e8eab1e5216f7c3518"; sha256 = "0wirqnzprfxbppdawfx6ah5rdawgyvl8b4zn2r3zm9mnj9jci4dw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96470d7190199bfb13dd54e7e8f5ea50cf0a5039/recipes/helm-phpunit"; sha256 = "0anbrzlpmashcklifyvnnf2rwv5fk4x0kbls2dp2db1bliw3rdh6"; - name = "helm-phpunit"; + name = "recipe"; }; packageRequires = [ helm phpunit ]; meta = { @@ -34225,9 +44631,42 @@ license = lib.licenses.free; }; }) {}; - helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-posframe = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , posframe }: + melpaBuild { + pname = "helm-posframe"; + ename = "helm-posframe"; + version = "20180610.1048"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "helm-posframe"; + rev = "d28f96ea92ee9393658901bb552723db10f40dc3"; + sha256 = "1ycf5m06n32axqpm2vkvszff6gxdps1y8gm46682nf8mk2i3xa6f"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a99c37bc50c371aae8ccc27de8120d4773981cf7/recipes/helm-posframe"; + sha256 = "16mhi17kl3cgwk7ymzg8crakwrwrzsg5p9ijgrdawa7px2z9ym78"; + name = "recipe"; + }; + packageRequires = [ emacs helm posframe ]; + meta = { + homepage = "https://melpa.org/#/helm-posframe"; + license = lib.licenses.free; + }; + }) {}; + helm-proc = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-proc"; + ename = "helm-proc"; version = "20161005.2005"; src = fetchFromGitHub { owner = "markus1189"; @@ -34235,10 +44674,10 @@ rev = "576d31c2d74ba3897d56e2acd2b0993f52c2547c"; sha256 = "11xahzybwh02ds19y6h5hbpqdj278kcb4239vyykdl3wx8p048a7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-proc"; sha256 = "11mh8ny8mhdmp16s21vy9yyql56zxcgmj2aapqs5jy4yad5q62rz"; - name = "helm-proc"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -34246,9 +44685,15 @@ license = lib.licenses.free; }; }) {}; - helm-project-persist = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, project-persist }: - melpaBuild { + helm-project-persist = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , project-persist }: + melpaBuild { pname = "helm-project-persist"; + ename = "helm-project-persist"; version = "20151210.743"; src = fetchFromGitHub { owner = "Sliim"; @@ -34256,10 +44701,10 @@ rev = "357950fbac18090985a750e40d5d8b10ee9dcd53"; sha256 = "0j54c1kzsjgr05qx25rg3ylawvyw6n6liypiwaas47vpyfswbxhv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98780edaf8b1d97aec9e25d07d93289c90fd5069/recipes/helm-project-persist"; sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld"; - name = "helm-project-persist"; + name = "recipe"; }; packageRequires = [ helm project-persist ]; meta = { @@ -34267,20 +44712,27 @@ license = lib.licenses.free; }; }) {}; - helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: - melpaBuild { + helm-projectile = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "helm-projectile"; - version = "20180324.1632"; + ename = "helm-projectile"; + version = "20180722.1426"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "9a4128ffdc96f36ba21f61cabeee1c4640a3d8ce"; - sha256 = "1parnynpdmxvz1plx852h7vja688lqc32yhi87g5fq4vyvms2877"; + rev = "74349fc9132502af2b2e6ca9a51185ae4c9391b4"; + sha256 = "0b24gypvbr1k7pks4fvniwa6smi4vflr5lgd3b82y2ah0b8x758m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; sha256 = "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a"; - name = "helm-projectile"; + name = "recipe"; }; packageRequires = [ cl-lib helm projectile ]; meta = { @@ -34288,20 +44740,26 @@ license = lib.licenses.free; }; }) {}; - helm-prosjekt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, prosjekt }: - melpaBuild { + helm-prosjekt = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , prosjekt }: + melpaBuild { pname = "helm-prosjekt"; + ename = "helm-prosjekt"; version = "20140128.2317"; src = fetchFromGitHub { owner = "abingham"; repo = "prosjekt"; - rev = "a864a8be5842223043702395f311e3350c28e9db"; - sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3"; + rev = "f94f970c2d375e0973b66ba99b29c7aa42fd550f"; + sha256 = "1kfifsqxybvrff6mwifjp0igbad11winsks05l8k661blsh7m5ir"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d359ec827573dd8c871c4f23df5d1737f1830e7/recipes/helm-prosjekt"; sha256 = "019rya3bf13cnval8iz680wby3sqlmqg4nbn0a13l1pkhlnv9fvm"; - name = "helm-prosjekt"; + name = "recipe"; }; packageRequires = [ helm prosjekt ]; meta = { @@ -34309,9 +44767,14 @@ license = lib.licenses.free; }; }) {}; - helm-pt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-pt = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-pt"; + ename = "helm-pt"; version = "20160214.1542"; src = fetchFromGitHub { owner = "ralesi"; @@ -34319,10 +44782,10 @@ rev = "8acc52911dad1ed0c3975f134a468762afe0b76b"; sha256 = "03ys40rr0pvgp35j5scw9c28j184f1c9m58a3x0c8f0lgyfpssjk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550eb9f42c90fd9e80714579c12ee6bfcacb5bb7/recipes/helm-pt"; sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi"; - name = "helm-pt"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -34330,9 +44793,16 @@ license = lib.licenses.free; }; }) {}; - helm-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, window-purpose }: - melpaBuild { + helm-purpose = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , window-purpose }: + melpaBuild { pname = "helm-purpose"; + ename = "helm-purpose"; version = "20170114.836"; src = fetchFromGitHub { owner = "bmag"; @@ -34340,10 +44810,10 @@ rev = "9ff4c21c1e9ebc7afb851b738f815df7343bb287"; sha256 = "1xh6v5xlf1prgk6mrvkc6qa0r0bz74s5f4z3dl7d00chsi7i2m5v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-purpose"; sha256 = "16c9if636v7l8z5df011vdj4a3ci5kf3rdfk4g9hdbbl639yca79"; - name = "helm-purpose"; + name = "recipe"; }; packageRequires = [ emacs helm window-purpose ]; meta = { @@ -34351,9 +44821,15 @@ license = lib.licenses.free; }; }) {}; - helm-pydoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + helm-pydoc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-pydoc"; + ename = "helm-pydoc"; version = "20160917.2242"; src = fetchFromGitHub { owner = "syohex"; @@ -34361,10 +44837,10 @@ rev = "85480a29b56dacde425655bc8f5a597c785afdf5"; sha256 = "1wrs2d84xzjnsmw255bmnd1wcpwd36m0vyni48aa7661d4dh10x3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-pydoc"; sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7"; - name = "helm-pydoc"; + name = "recipe"; }; packageRequires = [ emacs helm-core ]; meta = { @@ -34372,9 +44848,14 @@ license = lib.licenses.free; }; }) {}; - helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-qiita = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-qiita"; + ename = "helm-qiita"; version = "20180301.635"; src = fetchFromGitHub { owner = "masutaka"; @@ -34382,10 +44863,10 @@ rev = "3ccb85640bf54491ed3c3c8110d454ae181650dc"; sha256 = "03km0hm3jy6qcs8szqsmzpdmhfmyh121i5f68cf60am8y616f0kp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita"; sha256 = "1iz2w1901zz3zk9zazikmnkzng5klnvqn4ph1id7liksrcdpdmpm"; - name = "helm-qiita"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -34393,9 +44874,17 @@ license = lib.licenses.free; }; }) {}; - helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + helm-rage = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-rage"; + ename = "helm-rage"; version = "20180118.732"; src = fetchFromGitHub { owner = "bomgar"; @@ -34403,10 +44892,10 @@ rev = "5d0aefb53d859186181d4bdcfeff7d315339c7b8"; sha256 = "0msj3rrv9bwhhwz7r1ayr6qvnxjsq7374j0xfhqbrx49pix4qf3q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage"; sha256 = "02pdmkzwnqhf1r0v7b498z5b2il3ng75ykdwgmwd60k6hiygj70x"; - name = "helm-rage"; + name = "recipe"; }; packageRequires = [ dash emacs helm s ]; meta = { @@ -34414,20 +44903,26 @@ license = lib.licenses.free; }; }) {}; - helm-rails = callPackage ({ fetchFromGitHub, fetchurl, helm, inflections, lib, melpaBuild }: - melpaBuild { + helm-rails = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , inflections + , lib + , melpaBuild }: + melpaBuild { pname = "helm-rails"; + ename = "helm-rails"; version = "20130424.819"; src = fetchFromGitHub { owner = "asok"; repo = "helm-rails"; - rev = "506d9948d45dfbc575c9c4c0d102c1ad2f511e82"; - sha256 = "0i5ps5yds21bsrx86piy9bdgca95l1farsrbjpqz88ad8pq6xa9c"; + rev = "723c2a27f3843570ec1039e3c526953e48b4ed40"; + sha256 = "1gpy6jc932p4yiyglnwylriw3jk2f4bs7rrxbwc0z9xzjzzn4qnz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3af52fd266364a81ff42eb6d08389fa549bd6c2c/recipes/helm-rails"; sha256 = "1iihfsmnkpfp08pldghf3w5k8v5dlmy5ns0l4niwdwp5w8lyjcd6"; - name = "helm-rails"; + name = "recipe"; }; packageRequires = [ helm inflections ]; meta = { @@ -34435,9 +44930,15 @@ license = lib.licenses.free; }; }) {}; - helm-rb = callPackage ({ fetchFromGitHub, fetchurl, helm, helm-ag-r, lib, melpaBuild }: - melpaBuild { + helm-rb = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , helm-ag-r + , lib + , melpaBuild }: + melpaBuild { pname = "helm-rb"; + ename = "helm-rb"; version = "20131123.839"; src = fetchFromGitHub { owner = "yuutayamada"; @@ -34445,10 +44946,10 @@ rev = "4949d646420a9849af234dacdd8eb34a77c662fd"; sha256 = "1b74jsr28ldz80mrqz3d1bmykpcprdbhf3fzhc0awd5i5xdnfaid"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ba8e94755f5a96881bbf4c4ffbff67bec9b804a/recipes/helm-rb"; sha256 = "14pkrj1rpi2ihpb7c1hx6xwzvc1x7l41lwr9znp5vn7z93i034fr"; - name = "helm-rb"; + name = "recipe"; }; packageRequires = [ helm helm-ag-r ]; meta = { @@ -34456,9 +44957,15 @@ license = lib.licenses.free; }; }) {}; - helm-rdefs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-rdefs = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-rdefs"; + ename = "helm-rdefs"; version = "20161129.2136"; src = fetchFromGitHub { owner = "saidie"; @@ -34466,10 +44973,10 @@ rev = "cd3a6b3af3015ee58ef30cb7c81c79ebe5fc867b"; sha256 = "0ji7ak9pkmw0wxzmw5a1amvn3pkj90v9jv1yi12w388njxn7qsvj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1c7a20847513dc1153d54a3a700bc120f71dc6b/recipes/helm-rdefs"; sha256 = "0z3nrqrz63j9nxkbxdsjj3z8zhsqlik28iry3j1plgsxq1mhrn0y"; - name = "helm-rdefs"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -34477,9 +44984,14 @@ license = lib.licenses.free; }; }) {}; - helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-recoll = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-recoll"; + ename = "helm-recoll"; version = "20160731.221"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -34487,10 +44999,10 @@ rev = "cc4c4fa9c8f4f99383647baa8512b60523dc8b36"; sha256 = "1ic2k8ls084yn9h96pk8815wlvxkwwdq75zhm1ls197pkbw7gh7y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a0d168f96470753c22b92ad863be98d8c421ccd/recipes/helm-recoll"; sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b"; - name = "helm-recoll"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -34498,30 +45010,44 @@ license = lib.licenses.free; }; }) {}; - helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, pcre2el }: - melpaBuild { + helm-rg = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-rg"; - version = "20180220.731"; + ename = "helm-rg"; + version = "20180629.220"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "helm-rg"; - rev = "cbce7b4f1afefa1e9a505b45c1b58c688a42f3b9"; - sha256 = "1z8ijiqih902mzfc7kbnfbdhjwfqh5yzg4w3v4mxac0ys5j4z6sg"; + rev = "008b4b06036d95921f176f222e6055255516116d"; + sha256 = "1zkcqcvr2svfa7i4d0vghr80nnksgmvdhfigb3r6prv9v84ghwkm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg"; sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v"; - name = "helm-rg"; + name = "recipe"; }; - packageRequires = [ cl-lib dash emacs helm pcre2el ]; + packageRequires = [ cl-lib dash emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-rg"; license = lib.licenses.free; }; }) {}; - helm-rhythmbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-rhythmbox = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-rhythmbox"; + ename = "helm-rhythmbox"; version = "20160524.458"; src = fetchFromGitHub { owner = "mrBliss"; @@ -34529,10 +45055,10 @@ rev = "c92e1ded34ddd4e62e7e9a558259c232e05193fa"; sha256 = "1ng73dmligj38xbfdfr8sb69czppks7wfvh5q5xcm2pha828kcwm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a81c43958308ad8035a9d0b2422fd094adc72f0/recipes/helm-rhythmbox"; sha256 = "0pnm7yvas0q3b38ch5idm7v4ih2fjyfai8217j74xhkpcc2w4g4a"; - name = "helm-rhythmbox"; + name = "recipe"; }; packageRequires = [ cl-lib helm ]; meta = { @@ -34540,20 +45066,25 @@ license = lib.licenses.free; }; }) {}; - helm-robe = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-robe = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-robe"; + ename = "helm-robe"; version = "20151208.1955"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-robe"; - rev = "6e69543b4ee76c5f8f3f2510c76e6d9aed17a370"; - sha256 = "1qcx036pgrg4xc1y74amd8jkjylnc0g1c4841cc3fbknnn1ap54g"; + rev = "7348d0bc0251b51979554ea678b970fd01c0efe9"; + sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7018f57f6f0e4bd71e172ae23c050b44276581b/recipes/helm-robe"; sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw"; - name = "helm-robe"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -34561,9 +45092,16 @@ license = lib.licenses.free; }; }) {}; - helm-ros = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xterm-color }: - melpaBuild { + helm-ros = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , xterm-color }: + melpaBuild { pname = "helm-ros"; + ename = "helm-ros"; version = "20160812.1052"; src = fetchFromGitHub { owner = "davidlandry93"; @@ -34571,10 +45109,10 @@ rev = "92b0b215f6a017f0f57f1af15466cc0b2a5a0135"; sha256 = "1fgph8wsm2nakn53zj19r59mirzn25r601rljmdv2xpw5h3axywg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9ddf53b4060c33550a445f877aef37dffaeb7e/recipes/helm-ros"; sha256 = "1q9qqjchkj6anikaamhw998f5aaampc1z7085v9pigg3x11vv9fm"; - name = "helm-ros"; + name = "recipe"; }; packageRequires = [ cl-lib helm xterm-color ]; meta = { @@ -34582,20 +45120,26 @@ license = lib.licenses.free; }; }) {}; - helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }: - melpaBuild { + helm-rtags = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , rtags }: + melpaBuild { pname = "helm-rtags"; + ename = "helm-rtags"; version = "20170812.2111"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "a595d13f60c13d67a28467b3941d5ed558102e91"; - sha256 = "0yp6h6nsbji7dmc9pnf9qi7zsqxrxa1bln90bn0y71xf6z11kbp4"; + rev = "ccba23e842a43e8079e22c2fc93d022ac40dedaf"; + sha256 = "091gh5mmgz357mz0jpmbzzrsy04bjczac02i94jxf49p6yw9v4ga"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; sha256 = "1vv6wnniplyls344qzgcf1ivv25c8qilax6sbhvsf46lvrwnr48n"; - name = "helm-rtags"; + name = "recipe"; }; packageRequires = [ helm rtags ]; meta = { @@ -34603,9 +45147,14 @@ license = lib.licenses.free; }; }) {}; - helm-rubygems-local = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-rubygems-local = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-rubygems-local"; + ename = "helm-rubygems-local"; version = "20130711.1811"; src = fetchFromGitHub { owner = "hadashiA"; @@ -34613,10 +45162,10 @@ rev = "289cb33d41c703af9791d6da46b55f070013c2e3"; sha256 = "0s4hb1fvwr9za5gkz8s5w1kh9qjyygz6g59w7vmrg2d8ds2an03d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/helm-rubygems-local"; sha256 = "134qyqnh9l05lfj0vizlx35631q8ih6cdblrvka3p8i571300ikh"; - name = "helm-rubygems-local"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -34624,9 +45173,16 @@ license = lib.licenses.free; }; }) {}; - helm-rubygems-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-rubygems-org = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-rubygems-org"; + ename = "helm-rubygems-org"; version = "20140826.456"; src = fetchFromGitHub { owner = "neomantic"; @@ -34634,10 +45190,10 @@ rev = "6aaed984f698cbdf9f9aceb0221404563e28764d"; sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/655be547d57d358eff968f42c13dcf4371529a72/recipes/helm-rubygems-org"; sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs"; - name = "helm-rubygems-org"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -34645,9 +45201,15 @@ license = lib.licenses.free; }; }) {}; - helm-safari = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-safari = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-safari"; + ename = "helm-safari"; version = "20160403.2024"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -34655,10 +45217,10 @@ rev = "664c7f4488829228eed7e90cd53002e14bec555b"; sha256 = "1ws5zxanaiaaxpgkcb2914qa8wxp6ml019hfnfcp7amjnajq9pyz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-safari"; sha256 = "0lvwghcl5w67g0lc97r7hfvca7ss0mysy2mxj9axxbpyiq6fmh0y"; - name = "helm-safari"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -34666,9 +45228,16 @@ license = lib.licenses.free; }; }) {}; - helm-sage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, sage-shell-mode }: - melpaBuild { + helm-sage = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , sage-shell-mode }: + melpaBuild { pname = "helm-sage"; + ename = "helm-sage"; version = "20160514.45"; src = fetchFromGitHub { owner = "stakemori"; @@ -34676,10 +45245,10 @@ rev = "f14e9281d8f2162df7d8f9c2ad9ad1248a24803b"; sha256 = "0padb6mncgc52wib3dgvdc9r4dp591gf8nblbfnsnxx4zjrcwawb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09760a7f7b3cff6551c394fc7b2298567ca88eb0/recipes/helm-sage"; sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj"; - name = "helm-sage"; + name = "recipe"; }; packageRequires = [ cl-lib helm sage-shell-mode ]; meta = { @@ -34687,20 +45256,27 @@ license = lib.licenses.free; }; }) {}; - helm-selected = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, selected }: - melpaBuild { + helm-selected = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , selected }: + melpaBuild { pname = "helm-selected"; + ename = "helm-selected"; version = "20171222.1810"; src = fetchFromGitHub { owner = "takaxp"; repo = "helm-selected"; - rev = "6743ede584571319e4c29204197e9ff6b7ee97cf"; - sha256 = "199a1ycv6pi4kljv7ln0i59l85yr6ngvd3acjakq3416nnjlvhzh"; + rev = "d2609cdfce14052ab2d9c23761d4fe56966a8ed1"; + sha256 = "0nbfs5s6lshxib6kp20dzh1qbmq079hwcqwi1n61ank22qa9qw5x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc087661e614d9f30c23fe4a65c020bd3656a29/recipes/helm-selected"; sha256 = "0ksyh0r59y4abwls6v6v519yxmcjnaryfnxlam48fqqfrsxv1j0h"; - name = "helm-selected"; + name = "recipe"; }; packageRequires = [ emacs helm selected ]; meta = { @@ -34708,9 +45284,14 @@ license = lib.licenses.free; }; }) {}; - helm-sheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-sheet = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-sheet"; + ename = "helm-sheet"; version = "20130630.539"; src = fetchFromGitHub { owner = "yasuyk"; @@ -34718,10 +45299,10 @@ rev = "d360b68d0ddb09aa1854e7b2f3cb39caeee26463"; sha256 = "00wnqcgpf4hqdnqj5zrizr4s0pffb93xwya8k5c3rp4plncrcdzx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/010c5c5e6ad6e7b05e63936079229739963bf970/recipes/helm-sheet"; sha256 = "0lx70l5gq43hckgdfna8s6wx287sw5ms9l1z3n6vg2x8nr9m61kc"; - name = "helm-sheet"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -34729,9 +45310,16 @@ license = lib.licenses.free; }; }) {}; - helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }: - melpaBuild { + helm-smex = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , smex }: + melpaBuild { pname = "helm-smex"; + ename = "helm-smex"; version = "20171004.1308"; src = fetchFromGitHub { owner = "ptrv"; @@ -34739,10 +45327,10 @@ rev = "2269375dfa452b88b5170d1a5d5849ebb2c1e413"; sha256 = "0n2ki7g0hygsq4bi5zkhp3v772ld7niiajfznxmv11dgn949a52s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex"; sha256 = "02jvq2hyq4wwc9v8gaxr9vkjldc60khdbjf71p8w2iny5w3k0jbj"; - name = "helm-smex"; + name = "recipe"; }; packageRequires = [ emacs helm smex ]; meta = { @@ -34750,9 +45338,15 @@ license = lib.licenses.free; }; }) {}; - helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, spaces }: - melpaBuild { + helm-spaces = callPackage ({ fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild + , spaces }: + melpaBuild { pname = "helm-spaces"; + ename = "helm-spaces"; version = "20161001.709"; src = fetchFromGitHub { owner = "yasuyk"; @@ -34760,10 +45354,10 @@ rev = "877e2b5178926308d6a7c2a37477bb12c33a96d4"; sha256 = "1cz8aw6zprzfalagma7jmbycwll2chk2l4n5hkgqyhakdfm2ryzm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ffb50643223b68a62fab348cd5aba24ce92e6/recipes/helm-spaces"; sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791"; - name = "helm-spaces"; + name = "recipe"; }; packageRequires = [ helm-core spaces ]; meta = { @@ -34771,9 +45365,15 @@ license = lib.licenses.free; }; }) {}; - helm-spotify = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }: - melpaBuild { + helm-spotify = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , multi }: + melpaBuild { pname = "helm-spotify"; + ename = "helm-spotify"; version = "20160905.1447"; src = fetchFromGitHub { owner = "krisajenkins"; @@ -34781,10 +45381,10 @@ rev = "f7a62d1ff88e3127de9be7cd3e818b0a92268ab3"; sha256 = "0q3h84zj63b1rnlvmsznrpmvvf0qbic5yb9xkdjcz4jz4h8p3h1w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1bf9eda57cba4742656f37a621b6d394483ff638/recipes/helm-spotify"; sha256 = "1rzvxnaqh8bm78qp0rhpqs971pc855qrq589r3s8z3gpqzmwlnmf"; - name = "helm-spotify"; + name = "recipe"; }; packageRequires = [ helm multi ]; meta = { @@ -34792,20 +45392,27 @@ license = lib.licenses.free; }; }) {}; - helm-spotify-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }: - melpaBuild { + helm-spotify-plus = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , multi }: + melpaBuild { pname = "helm-spotify-plus"; + ename = "helm-spotify-plus"; version = "20180107.338"; src = fetchFromGitHub { owner = "wandersoncferreira"; repo = "helm-spotify-plus"; - rev = "895f241f1259891d5c89cd42023f119f9fa121d6"; - sha256 = "1sjw0bapik01f3lfnsirpayn7b0169lbjhppb2mqzr3xjxm58wbs"; + rev = "c0903491da0adf215ad44bd31e11604da95062d6"; + sha256 = "0wqj28i5l43xf8l24g4qn6vra489f0lp7nb5rj7yywy6siikmvx6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/306aa9fd29f1495eef71476dfcba3b494223b0a9/recipes/helm-spotify-plus"; sha256 = "1f39g2kgx4jr7ahhhswkrj0m5rbsykvkgh00d7jy8czpp8r4dl20"; - name = "helm-spotify-plus"; + name = "recipe"; }; packageRequires = [ emacs helm multi ]; meta = { @@ -34813,9 +45420,14 @@ license = lib.licenses.free; }; }) {}; - helm-sql-connect = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-sql-connect = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-sql-connect"; + ename = "helm-sql-connect"; version = "20170319.551"; src = fetchFromGitHub { owner = "eric-hansen"; @@ -34823,10 +45435,10 @@ rev = "5aead55b6f8636140945714d8c332b287ab9ef10"; sha256 = "037gri2r9y135av8gbgi9d8k90qs8jlax0bimzcbwdkyhibhzrcp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58347c583dcf4a915c1af1262a5348755f28fe03/recipes/helm-sql-connect"; sha256 = "1av42580c68iq694yr532hhcq0jn7m58x3cib4ix5c8b4ljvnnvd"; - name = "helm-sql-connect"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -34834,9 +45446,15 @@ license = lib.licenses.free; }; }) {}; - helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-swoop = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-swoop"; + ename = "helm-swoop"; version = "20180215.354"; src = fetchFromGitHub { owner = "ShingoFukuyama"; @@ -34844,10 +45462,10 @@ rev = "c66336b8245ddc51c4206f19c119f1081920985c"; sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop"; sha256 = "1b3nyh4h5kcvwam539va4gzxa3rl4a0rdcriif21yq340yifjbdx"; - name = "helm-swoop"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -34855,20 +45473,27 @@ license = lib.licenses.free; }; }) {}; - helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: - melpaBuild { + helm-system-packages = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "helm-system-packages"; - version = "20180321.755"; + ename = "helm-system-packages"; + version = "20180628.1131"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "e6ce15c5c83148279549c4d9aa16848c1b96cbb4"; - sha256 = "10fcg02cjcw83myv6vy2dpc2llp049q9wzxzb67g83jlry1zlz76"; + rev = "d510562f4ea21245496199dffb731d00152f8a2b"; + sha256 = "0qzv395gm1i56f7rahx44b0v816mjk7fx52nwkwspdmixyzckzn2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; sha256 = "01mndx2zzh7r7gmpn6gd1vy1w3l6dnhvgn7n2p39viji1r8b39s4"; - name = "helm-system-packages"; + name = "recipe"; }; packageRequires = [ emacs helm seq ]; meta = { @@ -34876,9 +45501,16 @@ license = lib.licenses.free; }; }) {}; - helm-systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, with-editor }: - melpaBuild { + helm-systemd = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , with-editor }: + melpaBuild { pname = "helm-systemd"; + ename = "helm-systemd"; version = "20180130.2034"; src = fetchFromGitHub { owner = "lompik"; @@ -34886,10 +45518,10 @@ rev = "96f5cd3ee3412539c2f8d145201f47c4f8e53b4f"; sha256 = "0wyabh76q2lighd7qxpkzp35fkblxlz8g7p4lpgfwvjid0ixmnvq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-systemd"; sha256 = "0k2yqmvwswihcn75wzn5923z5y4njarmvdlx3j7w3hwsxh6k1mcw"; - name = "helm-systemd"; + name = "recipe"; }; packageRequires = [ emacs helm with-editor ]; meta = { @@ -34897,9 +45529,42 @@ license = lib.licenses.free; }; }) {}; - helm-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + helm-tail = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { + pname = "helm-tail"; + ename = "helm-tail"; + version = "20180624.203"; + src = fetchFromGitHub { + owner = "akirak"; + repo = "helm-tail"; + rev = "ff3895e2fbc6d3cc6503bc295a49bba70654aaef"; + sha256 = "0ixdr93axjqdqv2m4yvpnf2v4g7c1d1hkqhid2lfg8vaqb9dvqpw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/74b235c2ecf8c8f8206670bca3b915deb4b77c2b/recipes/helm-tail"; + sha256 = "0sw97fzpnrk335l3vjaj3nw87cajhzwsjsxx16r0x6npbiv51wd4"; + name = "recipe"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-tail"; + license = lib.licenses.free; + }; + }) {}; + helm-themes = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-themes"; + ename = "helm-themes"; version = "20160917.2245"; src = fetchFromGitHub { owner = "syohex"; @@ -34907,10 +45572,10 @@ rev = "1160af42590b0d845a55e65e1e782d9e4027fd6e"; sha256 = "0856h8rnbgrxp3v3jpfmwq7kcdm1ymd4gcfvh0h27mk05113vz53"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-themes"; sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j"; - name = "helm-themes"; + name = "recipe"; }; packageRequires = [ emacs helm-core ]; meta = { @@ -34918,20 +45583,26 @@ license = lib.licenses.free; }; }) {}; - helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-tramp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-tramp"; - version = "20180311.2157"; + ename = "helm-tramp"; + version = "20180610.717"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "34cc68bededd3ff6cbec8140f33c530fd3206a64"; - sha256 = "1lway52ssh6zn6jw8157fp8d4brrkdln03vgll2r53bd69i2ipmn"; + rev = "07d2f02166038c14052009f6fb9c2a163118e2cc"; + sha256 = "1yi4wq484nrjb1yphp6dbaqjgfq7hr78gh9v9cys7dqg910ngy4f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; sha256 = "0wqnabaywkhj1fnc3wpx7czrqbja1hsqwcpixmvv0fyrflmza517"; - name = "helm-tramp"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -34939,20 +45610,26 @@ license = lib.licenses.free; }; }) {}; - helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-unicode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-unicode"; - version = "20160715.533"; + ename = "helm-unicode"; + version = "20180608.707"; src = fetchFromGitHub { owner = "bomgar"; repo = "helm-unicode"; - rev = "1ad1fcca7a83c163ae74eb72a443cfc102128e33"; - sha256 = "16s0k6l2k32nxmgqc159kr5vzgn8gydj3bkrkvhhydm3lnh8ki0n"; + rev = "b7092ed6a7191805651efae40947e4781c453211"; + sha256 = "15qn5xynah23dfz3mdw5jabv9qfs2hjdjgn3ifmqn3r6sgd8hcjn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f720b9f9b667bf9ff3080938beab36aa0036dc92/recipes/helm-unicode"; sha256 = "1j95qy2zwdb46dl30ankfx7013l0akc61m14s473j93w320j5224"; - name = "helm-unicode"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -34960,9 +45637,16 @@ license = lib.licenses.free; }; }) {}; - helm-w32-launcher = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-w32-launcher = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-w32-launcher"; + ename = "helm-w32-launcher"; version = "20141223.1214"; src = fetchFromGitHub { owner = "Fanael"; @@ -34970,10 +45654,10 @@ rev = "3e59ad62b89dd21d334af0203d445a83eb25dc5b"; sha256 = "0xlz9rxx7y9pkrzvxmv42vgys5iwx75zv9g50k8ihwc08z80dhcq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa678329a5081e1affa460c00239dabfd1b9dd82/recipes/helm-w32-launcher"; sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri"; - name = "helm-w32-launcher"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -34981,9 +45665,17 @@ license = lib.licenses.free; }; }) {}; - helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }: - melpaBuild { + helm-w3m = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , w3m }: + melpaBuild { pname = "helm-w3m"; + ename = "helm-w3m"; version = "20171102.216"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -34991,10 +45683,10 @@ rev = "8345b7e60702911f54eb6571e429c0d31878957d"; sha256 = "05izdvs8hwkkmz6hvlm2b5p5jmha39nsnnzzhnli70jrbqj013cq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m"; sha256 = "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz"; - name = "helm-w3m"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm w3m ]; meta = { @@ -35002,9 +45694,16 @@ license = lib.licenses.free; }; }) {}; - helm-wordnet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-wordnet = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-wordnet"; + ename = "helm-wordnet"; version = "20160128.707"; src = fetchFromGitHub { owner = "raghavgautam"; @@ -35012,10 +45711,10 @@ rev = "a36dbc6fcb570b812870bc1e190f203e0a0042fc"; sha256 = "03a5hzgqak8wg6i2h2p3fr9ij55lqarcsblml8qrnrj27ghcvzzh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11626120951afc589beac4cf5a0f49bffa752349/recipes/helm-wordnet"; sha256 = "0di8gxsa9r8mzja4akhz0wpgrhlidqyn1s1ix5szplwxklwf2r2f"; - name = "helm-wordnet"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -35023,9 +45722,15 @@ license = lib.licenses.free; }; }) {}; - helm-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-xcdoc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-xcdoc"; + ename = "helm-xcdoc"; version = "20160116.218"; src = fetchFromGitHub { owner = "fujimisakari"; @@ -35033,10 +45738,10 @@ rev = "a85612149a6d8e18ab309b3db2d222ce39c42049"; sha256 = "1yqr5z5sw7schvaq9pmwg79anp806gikm28s6xvrayzyn4idz2n6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3352ce89039fb48827b74f22fcf543722a27738/recipes/helm-xcdoc"; sha256 = "1ikphlnj053i4g1l8r2pqaljvdqglj1yk0xx4vygnw98qyzdsx4v"; - name = "helm-xcdoc"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -35044,20 +45749,26 @@ license = lib.licenses.free; }; }) {}; - helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-xref = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-xref"; - version = "20171209.346"; + ename = "helm-xref"; + version = "20180528.816"; src = fetchFromGitHub { owner = "brotzeit"; repo = "helm-xref"; - rev = "ad98c3f6e5404e44e7e87210b5827bef75e16a25"; - sha256 = "1z1343lp9n0kn3y4z08bwnxlfvg5pchznnfqy2xhjjbm9ndlhc16"; + rev = "6f7e8eeec5cc4db64a76ba242c0f2f61e7ee1e46"; + sha256 = "13f47b3pv37181bbvpaws2z4jcfbim8b2b7zh988gbm579qi4fq6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/helm-xref"; sha256 = "1wyh25gxqgsc151bv4j5l050z1cz0n3yq174m62ihi1fy1pkra4l"; - name = "helm-xref"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -35065,20 +45776,27 @@ license = lib.licenses.free; }; }) {}; - helm-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: - melpaBuild { + helm-youtube = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , request }: + melpaBuild { pname = "helm-youtube"; + ename = "helm-youtube"; version = "20161113.1848"; src = fetchFromGitHub { owner = "maximus12793"; repo = "helm-youtube"; - rev = "202c27fc3b54927611e9d9c764465e1b42ef7e41"; - sha256 = "1wqxcz03fq2z31a1n90dg9ap3451vx1376ijbpfy9sg66pgj8yxv"; + rev = "7a944bc25f0f9e915011e9325caf46b46fcaa1b8"; + sha256 = "0948rq6i4ibwhmi6m2k23f83yvf56vwgri1sg2060d901zd86cxy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7537f732091b96b6c1b96c0174895278eba6776a/recipes/helm-youtube"; sha256 = "1qal5q83p06ghn482rflcfklr17mir582r0mvchxabb5ql60dy0b"; - name = "helm-youtube"; + name = "recipe"; }; packageRequires = [ cl-lib helm request ]; meta = { @@ -35086,9 +45804,14 @@ license = lib.licenses.free; }; }) {}; - helm-z = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-z = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-z"; + ename = "helm-z"; version = "20171203.1925"; src = fetchFromGitHub { owner = "yynozk"; @@ -35096,10 +45819,10 @@ rev = "37212220bebea8b9c238cb1bbacd8332b7f26c03"; sha256 = "1vz958yiva01yl1qj2pz84savcx8jgkvbywhcp4c3a8x3fikf0yl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48c9b83fff8fc428d9d1ecf0005d47f2adb8cb00/recipes/helm-z"; sha256 = "1m268zsr4z7a9l5wj0i8qpimv0kyl8glgm0yb3f08959538nlmd1"; - name = "helm-z"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -35107,9 +45830,16 @@ license = lib.licenses.free; }; }) {}; - helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-zhihu-daily = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-zhihu-daily"; + ename = "helm-zhihu-daily"; version = "20160625.445"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -35117,10 +45847,10 @@ rev = "be27dcc6be1eb97663b65581a9a5c0fc81cfaba7"; sha256 = "1s8q97pra27bacvm5knj0sjgj7iqljlhxqiniaw8ij8w4fhcdh93"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27246ec2bad3c85f8bb76aa26ebcd800edfe0d70/recipes/helm-zhihu-daily"; sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r"; - name = "helm-zhihu-daily"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -35128,20 +45858,31 @@ license = lib.licenses.free; }; }) {}; - helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: - melpaBuild { + helpful = callPackage ({ dash + , dash-functional + , elisp-refs + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , shut-up }: + melpaBuild { pname = "helpful"; - version = "20180331.1143"; + ename = "helpful"; + version = "20180722.1557"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "f2d6751c48d8318f93124e380f0beba5a1c802cb"; - sha256 = "180ws8d4ifyv3ycj5mci3lhipzybxp4r7g5siacqbkw3ns0cwksp"; + rev = "89668dd787248c7f0d35d4ab26f4a61f2efefdcb"; + sha256 = "0fwgvpp6bchvr0fr1s1rb56dywbgw8345v8i3c9sp2xa3ahqmvri"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; - name = "helpful"; + name = "recipe"; }; packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ]; meta = { @@ -35149,9 +45890,14 @@ license = lib.licenses.free; }; }) {}; - hemera-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hemera-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hemera-theme"; + ename = "hemera-theme"; version = "20170910.603"; src = fetchFromGitHub { owner = "GuidoSchmidt"; @@ -35159,10 +45905,10 @@ rev = "354ae3b788c11ac08e6e2fe7c86adc621e2b16fd"; sha256 = "00cfi9gsn9fvjpgxkz931p02gs8dcgwwsaqz3anss9qadxxmi9xv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/hemera-theme"; sha256 = "0lxm06gv5f75s86320m8wh3dirdcspb6zd5n1a6l0pnn585xqkrn"; - name = "hemera-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35170,20 +45916,24 @@ license = lib.licenses.free; }; }) {}; - hemisu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hemisu-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hemisu-theme"; + ename = "hemisu-theme"; version = "20130508.1144"; src = fetchFromGitHub { owner = "andrzejsliwa"; repo = "hemisu-theme"; - rev = "5c206561aa2c844ecdf3e3b672c3235e559ddd7f"; - sha256 = "178dvigiw162m01x7dm8pf61w2n3bq51lvk5q7jzpb9s35pz1697"; + rev = "ae593ac58e6bffef97467259c1d1472840385e84"; + sha256 = "0vjc6aalwplz9sm9nqca7d07ypijjp366vdzg7gqyfzsvdhr1s0v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb4dd85ccbd2c8936e59ca5c5e6234290b8bdf1b/recipes/hemisu-theme"; sha256 = "0byzrz74yvk12m8dl47kkmkziwrrql193q72qx974zbqdj8h2sph"; - name = "hemisu-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35191,9 +45941,13 @@ license = lib.licenses.free; }; }) {}; - heroku = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + heroku = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "heroku"; + ename = "heroku"; version = "20120629.1113"; src = fetchFromGitHub { owner = "technomancy"; @@ -35201,10 +45955,10 @@ rev = "92af1c073b593c4def99c8777c869992aa4d0b3a"; sha256 = "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/heroku"; sha256 = "1wavsymviybfcmwdfrffbkdwbiydggx55jqg6ql79wf9bx7agacp"; - name = "heroku"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35212,20 +45966,24 @@ license = lib.licenses.free; }; }) {}; - heroku-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + heroku-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "heroku-theme"; + ename = "heroku-theme"; version = "20150522.1919"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "heroku-theme"; - rev = "8083643fe92ec3a1c3eb82f1b8dc2236c9c9691d"; - sha256 = "15hk0v6ck076mahsz4spq75jcnv587fx4d3w50c7bdh423fl0xvx"; + rev = "7c1e80f8b5087c37008fec687070344638cd4752"; + sha256 = "05h4q7gykh18v9pn9zjhgrzjwbn21z58a2mrifmis3bpwa5zypvd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/348f0e7aec86c3efd87ab06849a5f1ce90ba23e2/recipes/heroku-theme"; sha256 = "0mchh9y3pqwamry6105qrv1bp1qg1g0jmz7rzc5svz9giynypwf9"; - name = "heroku-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35233,9 +45991,14 @@ license = lib.licenses.free; }; }) {}; - hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hexo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hexo"; + ename = "hexo"; version = "20180223.1944"; src = fetchFromGitHub { owner = "kuanyui"; @@ -35243,10 +46006,10 @@ rev = "ff21ab2d95e13666f36a243989ffea2027842191"; sha256 = "1g7i4vlpac7npx8c7f7i9w3f30is7q7zsxp0sqwp7x7rsa5783nn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; sha256 = "0fgrxf6gdw0kzs6x6y8qr511cazaaiyk7licgkgznngj4w6g7jyn"; - name = "hexo"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35254,9 +46017,13 @@ license = lib.licenses.free; }; }) {}; - hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hfst-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hfst-mode"; + ename = "hfst-mode"; version = "20160708.502"; src = fetchFromGitHub { owner = "unhammer"; @@ -35264,10 +46031,10 @@ rev = "ac1bb9dd92545d3e7fdc05c83996c227cc15c6b8"; sha256 = "0zsz8542kh51clzy8j7g29bwm8zcnfxm9sjzh3xjpqk2ziqf4ii6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e324bb114997f9cc57d76d8a66fec4ff4d1d71fe/recipes/hfst-mode"; sha256 = "1w342n5k9ak1m5znysvrplpr9dhmi7hxbkr4d1dx51dn0azbpjh7"; - name = "hfst-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35275,9 +46042,13 @@ license = lib.licenses.free; }; }) {}; - hgignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hgignore-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hgignore-mode"; + ename = "hgignore-mode"; version = "20160430.1707"; src = fetchFromGitHub { owner = "omajid"; @@ -35285,10 +46056,10 @@ rev = "7aa9f3b8a9c610dbd80b952061b40194e1d9c5bd"; sha256 = "0l22sqi9lmy25idh231p0hgq22b3dxwb9wq60yxk8dck9zlkv7rr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3e325c84d0a30789fab7e897b4fe5040c5093ba/recipes/hgignore-mode"; sha256 = "0ja71l3cghhn1c6w2pff80km8h8xgzf0j9gcldfyc72ar6ifhjkj"; - name = "hgignore-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35296,9 +46067,13 @@ license = lib.licenses.free; }; }) {}; - hgrc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hgrc-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hgrc-mode"; + ename = "hgrc-mode"; version = "20150409.1343"; src = fetchFromGitHub { owner = "omajid"; @@ -35306,10 +46081,10 @@ rev = "314e8320b82cc1ce74b1bd372f296252e7a23090"; sha256 = "1ky5s7hzqbxgasdz285q3rnvzh3irwsq61rlivjrcxyfdxdjbbvp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31a24d95efce2f04f0b555ed16b8d3d5a3aa255a/recipes/hgrc-mode"; sha256 = "18400dhdackdpndkz6shjmd4klfh6b4vlccnnqlzf3a93alw6vqf"; - name = "hgrc-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35317,9 +46092,13 @@ license = lib.licenses.free; }; }) {}; - hi2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hi2 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hi2"; + ename = "hi2"; version = "20141005.1231"; src = fetchFromGitHub { owner = "nilcons"; @@ -35327,10 +46106,10 @@ rev = "c9d199727b5cdcb9e36a972b38131ce4611fd6c8"; sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba880f0130707098e5b648f74d14e151b0110e4e/recipes/hi2"; sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2"; - name = "hi2"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35338,9 +46117,13 @@ license = lib.licenses.free; }; }) {}; - hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hide-lines = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hide-lines"; + ename = "hide-lines"; version = "20151127.1040"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -35348,10 +46131,10 @@ rev = "331122bf19361130351cfe55968c2a7820329eb3"; sha256 = "183l0sx8zn3jv1fqa3xj7a6fd792sp50jyhm50j3hy7c54m4capf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/hide-lines"; sha256 = "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d"; - name = "hide-lines"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35359,9 +46142,14 @@ license = lib.licenses.free; }; }) {}; - hide-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hide-mode-line = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hide-mode-line"; + ename = "hide-mode-line"; version = "20180302.1110"; src = fetchFromGitHub { owner = "hlissner"; @@ -35369,10 +46157,10 @@ rev = "86b9057391edad75467261c2e579603567e608f9"; sha256 = "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2af28365f9fbc6ae71043a67966490c5d18a6095/recipes/hide-mode-line"; sha256 = "0yl6aicpib5h1ckqi3gyilh2nwvp8gf1017n1w1755j01gw1p9hl"; - name = "hide-mode-line"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35380,9 +46168,13 @@ license = lib.licenses.free; }; }) {}; - hideshow-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hideshow-org = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hideshow-org"; + ename = "hideshow-org"; version = "20120223.1450"; src = fetchFromGitHub { owner = "shanecelis"; @@ -35390,10 +46182,10 @@ rev = "16419e52e6cdd2f46f755144c0ab11ce00d1a626"; sha256 = "1dr06b9njzih8z97k62l9w3x0a801x4bp043zvk7av9qkz8izl2r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3de48eee24a5cca9c8b7dba2d6d01dfbc679d8d6/recipes/hideshow-org"; sha256 = "1bzx5ii06r64nra92zv1dvw5zv3im7la2dd3md801hxyfrpb74gc"; - name = "hideshow-org"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35401,9 +46193,14 @@ license = lib.licenses.free; }; }) {}; - hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hierarchy = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hierarchy"; + ename = "hierarchy"; version = "20171221.351"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -35411,10 +46208,10 @@ rev = "06f21d3fc16c44c1fa45dc9c91d10100b4db9355"; sha256 = "1sp59nc82qb40n8p08hr0j4ig7ypc2icvgz74057vs1q042asqqw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; sha256 = "0fh1a590pdq21b4mwh9wrfsmm2lw2faw18r35cdzy8fgyf89yimp"; - name = "hierarchy"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35422,20 +46219,23 @@ license = lib.licenses.free; }; }) {}; - highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight"; - version = "20180131.1216"; - src = fetchFromGitHub { - owner = "steckerhalter"; - repo = "highlight.el"; - rev = "bb8694b8e642a45f07ce8897de0785c5a776441c"; - sha256 = "0s4fkxnd4x3j864mgaiv95iwdjmps4xj2mlaljljc8y04k9q5l9k"; + ename = "highlight"; + version = "20180604.2335"; + src = fetchgit { + url = "https://framagit.org/steckerhalter/highlight.el.git"; + rev = "6f92253690dde26d9bfd21546fdf68ef2fdd486b"; + sha256 = "01c911p0bqq391hv7lfvz51fyismrvbkk5yyzwipmx0wrr9qjgfv"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/89c619b90665385c8f5408935105c52b4d0290ab/recipes/highlight"; - sha256 = "0hc515042gpwqj2wqa3lmbgmccb3im5d313nk5lma9sphqi2yx9q"; - name = "highlight"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/highlight"; + sha256 = "11icn6f46synw6xvs2a266g43fvpnz8i7d7dyr0iywzjpbpyhsd2"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35443,9 +46243,14 @@ license = lib.licenses.free; }; }) {}; - highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-blocks = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-blocks"; + ename = "highlight-blocks"; version = "20151201.815"; src = fetchFromGitHub { owner = "Fanael"; @@ -35453,10 +46258,10 @@ rev = "9c4240a5d16008db430d1a81c76dad474d3deb0c"; sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaf524488c408483ea8f2c3a71174b1b5fc3f5da/recipes/highlight-blocks"; sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1"; - name = "highlight-blocks"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35464,20 +46269,24 @@ license = lib.licenses.free; }; }) {}; - highlight-context-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-context-line = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-context-line"; + ename = "highlight-context-line"; version = "20170319.1442"; src = fetchFromGitHub { owner = "ska2342"; repo = "highlight-context-line"; - rev = "716e10a0c7b703b5f1d9c6ca1481524a4d06b7b8"; - sha256 = "1ipj5l6d3d0mck3k8qsr685phk3zc7k4366vzvjyxvhgp5g2385l"; + rev = "f91e99c178831830801299b9c3a512c4d70871a0"; + sha256 = "0q8z7i0jijj0yjz9smsqhx2hgrps0vyspadpc1ssb8vn5mn7vngb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00df721571ff67fe158251fa843c8f515ded3469/recipes/highlight-context-line"; sha256 = "0zmqcfsr2j0m2l76c8h6lmdqwrd1b38gi6yp5sdib0m4vj9d0pnd"; - name = "highlight-context-line"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35485,9 +46294,14 @@ license = lib.licenses.free; }; }) {}; - highlight-defined = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-defined = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-defined"; + ename = "highlight-defined"; version = "20141225.730"; src = fetchFromGitHub { owner = "Fanael"; @@ -35495,10 +46309,10 @@ rev = "243478cc204ab42d29805ed610961cbb260c1dfd"; sha256 = "1l10xnjyvcbv1v8xlldaca7z3fk5qav7nsbhfnjxxd0bgh5v9by2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/highlight-defined"; sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms"; - name = "highlight-defined"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35506,9 +46320,13 @@ license = lib.licenses.free; }; }) {}; - highlight-escape-sequences = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-escape-sequences = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-escape-sequences"; + ename = "highlight-escape-sequences"; version = "20171117.437"; src = fetchFromGitHub { owner = "dgutov"; @@ -35516,10 +46334,10 @@ rev = "08d846a7aa748209d65fecead2b6a766c3e5cb41"; sha256 = "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd087f2c5a9524986b0f2c7fd7efd1f296363101/recipes/highlight-escape-sequences"; sha256 = "0938b29cqapid9v9q4w2jwh8kdb0p70qwzy9xm2nxaairm7436d6"; - name = "highlight-escape-sequences"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35527,9 +46345,14 @@ license = lib.licenses.free; }; }) {}; - highlight-function-calls = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-function-calls = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-function-calls"; + ename = "highlight-function-calls"; version = "20170907.2200"; src = fetchFromGitHub { owner = "alphapapa"; @@ -35537,10 +46360,10 @@ rev = "f7a1eaf95fc64cc0db4d0567f9ff79ec4ae04787"; sha256 = "1gbj1awjp69352a5p49ldimvij5mj8cngjp2sh45qw1cm5dpq653"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d1eed3f9af218d21ea8db37ee91888e23e59bd5/recipes/highlight-function-calls"; sha256 = "0wmxijkhx74da3ygnvzsdvbh2iii4f7424wmm01b5skbr7qva690"; - name = "highlight-function-calls"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35548,20 +46371,25 @@ license = lib.licenses.free; }; }) {}; - highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-indent-guides = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-indent-guides"; - version = "20170516.1355"; + ename = "highlight-indent-guides"; + version = "20180529.1039"; src = fetchFromGitHub { owner = "DarthFennec"; repo = "highlight-indent-guides"; - rev = "b51744bde1287979f2d948f46501bd6ed0897f69"; - sha256 = "17xbd1kiww762dibws48gwn682g1bxy5rb7np5alqhiiw1l13wdw"; + rev = "88b9bc22efc2006cc7a650c81b95c210a96828ba"; + sha256 = "0qv9010q1ylgh3l0yxlg7js6pxc8bkdxw20r6vrihglb5qf49m08"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides"; sha256 = "00ghp677qgb5clxhdjarfl8ab3mbp6v7yfsldm9bn0s14lyaq5pm"; - name = "highlight-indent-guides"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35569,9 +46397,13 @@ license = lib.licenses.free; }; }) {}; - highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-indentation = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-indentation"; + ename = "highlight-indentation"; version = "20171218.137"; src = fetchFromGitHub { owner = "antonj"; @@ -35579,10 +46411,10 @@ rev = "35e2c1d4f8f368685893128f77f90454cb9c2708"; sha256 = "1rmqi8k8p0f3aawh2l119hsfnnd060bv9hhjx13pabid8xhhvs73"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c443de5088410c0fe1b1c18f664b33ad259277/recipes/highlight-indentation"; sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6"; - name = "highlight-indentation"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35590,9 +46422,14 @@ license = lib.licenses.free; }; }) {}; - highlight-leading-spaces = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-leading-spaces = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-leading-spaces"; + ename = "highlight-leading-spaces"; version = "20151216.422"; src = fetchFromGitHub { owner = "mrBliss"; @@ -35600,10 +46437,10 @@ rev = "840db19d863dd97993fd9f893f5be501627b6354"; sha256 = "1vy6j63jp83ljdqkrqglpys74yfh7p61sd0lqiwczgr5nqyc60rl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74a4af76be764896cef169e24994630498cf19c1/recipes/highlight-leading-spaces"; sha256 = "0h2ww2vqmarghf4zg0wbwn0wgndmkcjy696mc885rwavck2dav4p"; - name = "highlight-leading-spaces"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35611,9 +46448,15 @@ license = lib.licenses.free; }; }) {}; - highlight-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }: - melpaBuild { + highlight-numbers = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parent-mode }: + melpaBuild { pname = "highlight-numbers"; + ename = "highlight-numbers"; version = "20170905.342"; src = fetchFromGitHub { owner = "Fanael"; @@ -35621,10 +46464,10 @@ rev = "f952ecb7448c125d4ef82ee6ad136b25e640d74a"; sha256 = "0fgb63iwdaakzm9cddivmr2j0mmay3512wmd14dh804a62j5l2pv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/882e3a4877ddd22cc52f56f0ce3d55b6e4831c7a/recipes/highlight-numbers"; sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv"; - name = "highlight-numbers"; + name = "recipe"; }; packageRequires = [ emacs parent-mode ]; meta = { @@ -35632,19 +46475,23 @@ license = lib.licenses.free; }; }) {}; - highlight-operators = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-operators = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-operators"; + ename = "highlight-operators"; version = "20170213.1420"; src = fetchhg { url = "https://bitbucket.com/jpkotta/highlight-operators"; rev = "3938e88e78c5"; sha256 = "1h5whrc1iphzq0g8x9mmkhjkbmbdg9i9bvr1y8zrwrs8za8k127y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bd74b7a3484e437c6db4f18613744ebae030f5/recipes/highlight-operators"; sha256 = "00agrwp2i3mkacnp4qhqcnpwn5qlbj9qv97zrw7a7ldqga0vwvhn"; - name = "highlight-operators"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35652,20 +46499,24 @@ license = lib.licenses.free; }; }) {}; - highlight-parentheses = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-parentheses = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-parentheses"; - version = "20170809.1151"; + ename = "highlight-parentheses"; + version = "20180704.402"; src = fetchFromGitHub { owner = "tsdh"; repo = "highlight-parentheses.el"; - rev = "c38885bba4f174c0a2cad3a60fe12b7cf8699aa1"; - sha256 = "0j3rv7cpvckbsdl7lppgdyxbbznqzds5hvjl1qfwip1plbc8vcb2"; + rev = "f0bd58c8dadd2db703b7bfd09e911b5fda05b3df"; + sha256 = "14jzh0vr2sig2ql1iq2x7svvk8ayvy9ahz04y407f53h70ifbmdl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/highlight-parentheses"; sha256 = "1d38wxk5bwblddr74crzwjwpgyr8zgcl5h5ilywg35jpv7n66lp5"; - name = "highlight-parentheses"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35673,20 +46524,25 @@ license = lib.licenses.free; }; }) {}; - highlight-quoted = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-quoted = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-quoted"; + ename = "highlight-quoted"; version = "20140916.1122"; src = fetchFromGitHub { owner = "Fanael"; repo = "highlight-quoted"; - rev = "24103478158cd19fbcfb4339a3f1fa1f054f1469"; - sha256 = "1gq8inxfni9zgz2brqm4nlswgr8b0spq15wr532xfrgr456g10ks"; + rev = "ec9108486cf7f21f9a0b13f81369849b3b525f1f"; + sha256 = "0vqkadhzszlxiqb4ysr7p86hhmi4z1j95llxa680xn6md8x2sj8a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93b5ba18e4bc31ca60aee9cb4674586cd8523bcf/recipes/highlight-quoted"; sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl"; - name = "highlight-quoted"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35694,9 +46550,13 @@ license = lib.licenses.free; }; }) {}; - highlight-refontification = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-refontification = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-refontification"; + ename = "highlight-refontification"; version = "20170211.1224"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -35704,10 +46564,10 @@ rev = "32632897d88c4611fadb08517ca00ef5cbc989b6"; sha256 = "1k6af947h70ivkj31mk3nv2vkxlfpqvpwq8za53n2l7adsjdlf73"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c59f2b5cf1594248e8365b6ce3324f493c5647/recipes/highlight-refontification"; sha256 = "0cm9p4d7yhkz5a88m0y4646a6b9lb2ha7q12fcrdikyckpmbkqss"; - name = "highlight-refontification"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35715,20 +46575,24 @@ license = lib.licenses.free; }; }) {}; - highlight-stages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-stages = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-stages"; + ename = "highlight-stages"; version = "20161212.657"; src = fetchFromGitHub { owner = "zk-phi"; repo = "highlight-stages"; - rev = "29cbc5b78261916da042ddb107420083da49b271"; - sha256 = "0r6nbcrr0dqpgm8dir8ahzjy7rw4nrac48byamzrq96r7ajlxlv0"; + rev = "87c476f8ca0474912af41680a8de243c0c8d5b46"; + sha256 = "1s7hxv4vpbrpk4makdjn3589flddgfy35scyd3kac629fbqiiz79"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46884aa6588f55d6f688477a5e9f528f57673131/recipes/highlight-stages"; sha256 = "0r4kmjmrpi38q3y0q9h5xkxh7x728ha2nbnc152lzw6zfsxnm4x4"; - name = "highlight-stages"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35736,9 +46600,13 @@ license = lib.licenses.free; }; }) {}; - highlight-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-symbol = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-symbol"; + ename = "highlight-symbol"; version = "20160102.1209"; src = fetchFromGitHub { owner = "nschum"; @@ -35746,10 +46614,10 @@ rev = "7a789c779648c55b16e43278e51be5898c121b3a"; sha256 = "19cgyk0sh8nsmf3jbi92i8qsdx4l4yilfq5jj9zfdbj9p5gvwx96"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/highlight-symbol"; sha256 = "01zw7xrkpgc89m55d60dx3s3kjajh5c164f64s2fzrgl9xj92h0r"; - name = "highlight-symbol"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35757,20 +46625,24 @@ license = lib.licenses.free; }; }) {}; - highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-thing = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-thing"; + ename = "highlight-thing"; version = "20170919.704"; src = fetchFromGitHub { owner = "fgeller"; repo = "highlight-thing.el"; - rev = "4eadd178175772fb04ae50e1199d797a6375ad4d"; - sha256 = "1h2ka1fi0pdh0mx3z8sh4fvwyiyc18d56nl9wd4c96h3n93f7py0"; + rev = "efa9abbef9b23d24179fad2518ac03e31d2dd9a9"; + sha256 = "1a39nvlcih26qsjb5s0051j9c9vqv5l66m7wl3ja4pnxx9k4754g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84b6cb403ff9a588771d051e472596f4e3cc974d/recipes/highlight-thing"; sha256 = "0rvdb1lx9xn9drqw0sw9ih759n10g7k0af39w6n8g0wfr67p96w1"; - name = "highlight-thing"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35778,20 +46650,25 @@ license = lib.licenses.free; }; }) {}; - highlight-unique-symbol = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-unique-symbol = callPackage ({ deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-unique-symbol"; + ename = "highlight-unique-symbol"; version = "20130611.2242"; src = fetchFromGitHub { owner = "hitode909"; repo = "emacs-highlight-unique-symbol"; - rev = "4141bf86a94e30d94d9af9c29d40b16886226e1c"; - sha256 = "0hhc2l4pz6q8injpplv6b5l08l8q2lnjdpwabp7gwmhraq54rhjx"; + rev = "d760015b4a5ce31d6da5a30890b599a8e1312be5"; + sha256 = "1sib511n4plbipl4mgjq6vshf03q4h50kga7lyj1qrwf32yxxf10"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78b7caccef56cd2f1a9d8001417af52cc06d6573/recipes/highlight-unique-symbol"; sha256 = "0lwl8pkmq0q4dvyflarggnn8vzpvk5hhcnk508r6xml2if1sg9zx"; - name = "highlight-unique-symbol"; + name = "recipe"; }; packageRequires = [ deferred ]; meta = { @@ -35799,9 +46676,14 @@ license = lib.licenses.free; }; }) {}; - highlight2clipboard = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: - melpaBuild { + highlight2clipboard = callPackage ({ fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild }: + melpaBuild { pname = "highlight2clipboard"; + ename = "highlight2clipboard"; version = "20151020.1140"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -35809,10 +46691,10 @@ rev = "6ce58a060d9c5843ccb8c79ec2bba7858c68ac15"; sha256 = "06nnqry36ncqacfzd8yvc4q59bwk3vgf9a14rkpph2hk2rfvq2m6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87afa08061dc406528e7666cd4ee16995839b2d9/recipes/highlight2clipboard"; sha256 = "19r7abbpm31b0azf2v3xn0rjagg9h01i8g72qapp8dhqb4d9n9r0"; - name = "highlight2clipboard"; + name = "recipe"; }; packageRequires = [ htmlize ]; meta = { @@ -35820,9 +46702,15 @@ license = lib.licenses.free; }; }) {}; - himp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: - melpaBuild { + himp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , vimish-fold }: + melpaBuild { pname = "himp"; + ename = "himp"; version = "20170814.1215"; src = fetchFromGitHub { owner = "mkcms"; @@ -35830,10 +46718,10 @@ rev = "140234b7f7cde03cf858c5011a2ab63e3bc802ec"; sha256 = "1g3ivash185anw8i67di1mxdfxa9py51prdy5ixl95vpqk5nmwbw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51b31fb1fa7052d16d659313d249eef01ca3ee88/recipes/himp"; sha256 = "1igzlvm4g4rcnlvnwi5kn1jfvyrw2vnmp1kpvfnv7w9n6d8kflla"; - name = "himp"; + name = "recipe"; }; packageRequires = [ emacs vimish-fold ]; meta = { @@ -35841,20 +46729,25 @@ license = lib.licenses.free; }; }) {}; - hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hindent = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hindent"; - version = "20171215.848"; + ename = "hindent"; + version = "20180518.202"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "6f6db40cca1b759f78d7e4b971111e40833c3aa0"; - sha256 = "05xlk8pq19vh61cvpbp6156pd5ynnp8zqnj09j0hp8k6kd3wq62z"; + rev = "dc47d8b98ebd6ee7fdd7de5f75e65e5b5eedf72f"; + sha256 = "0xp3mpiyrc6886bi9rih4vbmsar56h8i5sapigd3gn2pv2v688bc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz"; - name = "hindent"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -35862,9 +46755,13 @@ license = lib.licenses.free; }; }) {}; - hippie-exp-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hippie-exp-ext = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hippie-exp-ext"; + ename = "hippie-exp-ext"; version = "20160502.1626"; src = fetchFromGitHub { owner = "rubikitch"; @@ -35872,10 +46769,10 @@ rev = "4eda13f90da51ab217d024701f4c30f91ffcb90e"; sha256 = "141ikpyns1gd6kjply8m9jy9gifx5xdw5bn4p29hrxgiw994a78d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/hippie-exp-ext"; sha256 = "142s7cmgjnqdmac21yps3b071sv18lw068kmxchyxb0zsa067g9l"; - name = "hippie-exp-ext"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35883,9 +46780,13 @@ license = lib.licenses.free; }; }) {}; - hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hippie-expand-slime = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hippie-expand-slime"; + ename = "hippie-expand-slime"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; @@ -35893,10 +46794,10 @@ rev = "39bbae94896a62854d31754debdfae71d35fec62"; sha256 = "1l2j5k4jk8jpm1vdf0z5zwa287859afsgd3gda778sdsiy38l6r7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime"; sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m"; - name = "hippie-expand-slime"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35904,20 +46805,24 @@ license = lib.licenses.free; }; }) {}; - hippie-namespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hippie-namespace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hippie-namespace"; + ename = "hippie-namespace"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "hippie-namespace"; - rev = "d0d0f15c67ab8bef5e9d1e29a89ecd3613a60b49"; - sha256 = "0b5wrid428s11afc48d6mdifmd31gmzyrj9zcpd3jwk63ydiihdc"; + rev = "107d927634032062483e83c6de9b7698b64809d1"; + sha256 = "0lyw9llblicc9fs1y6n5l5wsh7va5dzm684q0n48aaqy3d1kvdpw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/hippie-namespace"; sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0"; - name = "hippie-namespace"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35925,20 +46830,25 @@ license = lib.licenses.free; }; }) {}; - historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + historian = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "historian"; - version = "20180210.2119"; + ename = "historian"; + version = "20180619.1223"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "ec3dfa8786473e52ffc5ca9be95dbc59a9a87ff7"; - sha256 = "1bxigdg3pmgc0s4il1spdw0p8y98k4hwwd89m4i3y97l43asy6p1"; + rev = "6be869f585b854eb849303c452ab4f91dab04fa9"; + sha256 = "07iw04aibmiz5fn97dafyk5k67yl525w6i1gwzazil4wb81q4b21"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian"; sha256 = "00cghcyb3liz2prgygjwsw82d9h70zjddnbf7dvglmj7ph9wn9ab"; - name = "historian"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35946,9 +46856,14 @@ license = lib.licenses.free; }; }) {}; - history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + history = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "history"; + ename = "history"; version = "20160821.902"; src = fetchFromGitHub { owner = "boyw165"; @@ -35956,10 +46871,10 @@ rev = "5317663fb45bbd5e96d258cb0807dcc266ce67ff"; sha256 = "1ghbpfmmp5p0wvivd79165dx5kia8qkmac3a6asg2d6l1h9y58n1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f51d4cc6521546c99197adeb35459fcd53bd67d4/recipes/history"; sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g"; - name = "history"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35967,20 +46882,24 @@ license = lib.licenses.free; }; }) {}; - historyf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + historyf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "historyf"; + ename = "historyf"; version = "20151123.1759"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-historyf"; - rev = "196c058ceb092fdd56b0e4ce85b7e714d6f72224"; - sha256 = "0fgm1m9mq1zn5gnrynf332hamif05qhh8haqci7gii7crzy47c0g"; + rev = "64ab6c9d2cd6dec6982622bf675326e011373cd2"; + sha256 = "1mxicha6m61qxz1mv9z76x4g9fpqk4ch9i6jf7nnpxd6x4xz3f7z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a67279875c19475433fa13625c95ee5855962a59/recipes/historyf"; sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s"; - name = "historyf"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35988,20 +46907,25 @@ license = lib.licenses.free; }; }) {}; - hive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sql ? null }: - melpaBuild { + hive = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sql ? null }: + melpaBuild { pname = "hive"; + ename = "hive"; version = "20131217.712"; src = fetchFromGitHub { owner = "r0man"; repo = "hive-el"; - rev = "11b5172e081ad8079fc78758bef6f306f82ae32b"; - sha256 = "097lrj9lgfa7szww324hlqywwkbi31n1pxfqyg0zbfj45djkp9bx"; + rev = "131f2816a0cf4d1fee44198ca305e6e2d1cab750"; + sha256 = "1hz1j1jv86k80g8safyy7h40j94xhczxmq6kz70cb1czn5df0zlh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b167265dff60950823a5e98a299462b2b535b9a9/recipes/hive"; sha256 = "1marz8gmk824hb0nkhaw48d4qw1xjk1aad27gviya7f5ilypxrya"; - name = "hive"; + name = "recipe"; }; packageRequires = [ sql ]; meta = { @@ -36009,9 +46933,13 @@ license = lib.licenses.free; }; }) {}; - hiwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hiwin = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hiwin"; + ename = "hiwin"; version = "20150825.127"; src = fetchFromGitHub { owner = "yoshida-mediba"; @@ -36019,10 +46947,10 @@ rev = "6ee8ed051405653bd9b7332d7e9fbb591d954051"; sha256 = "177blksgncxpxd1zi9kmbcfjnpd3ll1szjxiyc4am8a6hs1dyyqk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f050fd2b1038dce05a1302d3670933546f86525/recipes/hiwin"; sha256 = "0klhxwxsz7xan2vsknw79r1dj4qhhjbfpddr67mk9qzccp8q0w8g"; - name = "hiwin"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36030,20 +46958,25 @@ license = lib.licenses.free; }; }) {}; - hl-anything = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hl-anything = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hl-anything"; + ename = "hl-anything"; version = "20160422.1008"; src = fetchFromGitHub { owner = "hl-anything"; repo = "hl-anything-emacs"; - rev = "8696bc55a8cba408f0fc83a907a9ec529d79e558"; - sha256 = "10ps1rb5fqwaw4lz3nz2rbsry4y81asmi5557g229h8xjhp6gpnm"; + rev = "c2e50f91a05d6c43e8a1c169f709cd1f23e47b0a"; + sha256 = "1i93zh2ivm1xd6f13wp9fidn94rjnlx89xcgkz95lpiv90icqm3b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f38d26ede4e2e1d495a02c68e3b5041702b032e8/recipes/hl-anything"; sha256 = "0czpc82j5hbzprc66aall72lqnk38dxgpzx4rs8sbx95cag12dxa"; - name = "hl-anything"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -36051,9 +46984,15 @@ license = lib.licenses.free; }; }) {}; - hl-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hl-indent = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hl-indent"; + ename = "hl-indent"; version = "20170429.1404"; src = fetchFromGitHub { owner = "ikirill"; @@ -36061,10 +47000,10 @@ rev = "bdb2e0177a7c8b29af26998e688b856adc6ded93"; sha256 = "0fwb64ja5ij97308pnd7g6l5mascavcp7jcar8igxv9yyqnw6pfi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aa6ce8f3d1349e28dd9dea8396c38257e3cea2f/recipes/hl-indent"; sha256 = "1z42kcwcyinjay65mv042ijh4xfaaiyri368g0sjw0fflsg0ikcr"; - name = "hl-indent"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -36072,9 +47011,13 @@ license = lib.licenses.free; }; }) {}; - hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hl-sentence = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hl-sentence"; + ename = "hl-sentence"; version = "20171018.819"; src = fetchFromGitHub { owner = "milkypostman"; @@ -36082,10 +47025,10 @@ rev = "86ae38d3103bd20da5485cbdd59dfbd396c45ee4"; sha256 = "1rzc74ckj06qs8kq2bd1cgqvgjd2qc3zxmk7bvgg6dy2m9nj52cm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence"; sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs"; - name = "hl-sentence"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36093,41 +47036,24 @@ license = lib.licenses.free; }; }) {}; - hl-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "hl-sexp"; - version = "20101130.443"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "hl-sexp"; - rev = "0606100422321c18db51ceda80f25cd7717c2e01"; - sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp"; - sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm"; - name = "hl-sexp"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-sexp"; - license = lib.licenses.free; - }; - }) {}; - hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hl-todo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hl-todo"; - version = "20180327.1716"; + ename = "hl-todo"; + version = "20180709.2155"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "54d6562ba33182b16a7225c5fe6bb17a68025302"; - sha256 = "1jkxvik625rqbazbm8r83pcdmd288g26a4vvchsp4717k82sklkj"; + rev = "3401f322d954e635372995bf5cc77dae171a78ba"; + sha256 = "1dk4sb2z07cnndzs4dclqgnp3bldl2k3acr21cfdvp87flvpph0y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4"; - name = "hl-todo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36135,9 +47061,17 @@ license = lib.licenses.free; }; }) {}; - hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: - melpaBuild { + hledger-mode = callPackage ({ async + , emacs + , fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "hledger-mode"; + ename = "hledger-mode"; version = "20171201.1156"; src = fetchFromGitHub { owner = "narendraj9"; @@ -36145,10 +47079,10 @@ rev = "594ce27f898ba027cb7f326179ff7875072b03e0"; sha256 = "1jla31az52qygabd99m8ibq60f4almkbjlg1z63kz7zl98hfxnw7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; sha256 = "15s8rqc94z70jzv13961nvcm9a9qadq04pf0m6xrzf8qqk71zn52"; - name = "hledger-mode"; + name = "recipe"; }; packageRequires = [ async emacs htmlize popup ]; meta = { @@ -36156,9 +47090,13 @@ license = lib.licenses.free; }; }) {}; - hlint-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hlint-refactor = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hlint-refactor"; + ename = "hlint-refactor"; version = "20170817.2148"; src = fetchFromGitHub { owner = "mpickering"; @@ -36166,10 +47104,10 @@ rev = "92c69aa01c65968e86c15db087bb1ea785e4736c"; sha256 = "0khnn8qk0948hlq513i7nhf7vg09iwznmj3bgw1b5k5r8j6lhs0g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/hlint-refactor"; sha256 = "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq"; - name = "hlint-refactor"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36177,20 +47115,25 @@ license = lib.licenses.free; }; }) {}; - hlinum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hlinum = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hlinum"; - version = "20170507.2227"; + ename = "hlinum"; + version = "20180421.2112"; src = fetchFromGitHub { owner = "tom-tan"; repo = "hlinum-mode"; - rev = "2b4a08db4ff361ac8eeee1ed94eca7e26c614595"; - sha256 = "0j2ras605i2zsna02lp8k4mkyhln65cggmgkhgr9imcxfzwpjzqk"; + rev = "f17360fe93de6df99a05b4b64b0a1ca4ee45abb6"; + sha256 = "01sfba4sd3mjc7bs1y4qdzryfawg1xzg3hbwy9afwfaz0w5czni8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41bca7b89a7ce52d4c9381b9a4046b7103996c4f/recipes/hlinum"; sha256 = "04b6m0njr7yrbcbpkhqz4hmqpfacmyca3lw75dyw3vpjpsj2g0iv"; - name = "hlinum"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -36198,19 +47141,50 @@ license = lib.licenses.free; }; }) {}; - hoa-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + hmac = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "hmac"; + ename = "hmac"; + version = "20180429.1310"; + src = fetchFromGitHub { + owner = "grimnebulin"; + repo = "emacs-hmac"; + rev = "30132cd3fee7d3d91a9f04709d49ca0dcb96d565"; + sha256 = "0l4msj1i8amcn10dk1shcyh6hn49iphma1q03kp2h84ga79xdpi3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7cabf363dbdfc87f29ab3dcf63bfe39b9e0920f7/recipes/hmac"; + sha256 = "0am8pbjwf43nvhqa2mppdgiyd7kil7jxnaq7hhi5214bsrqgxk31"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/hmac"; + license = lib.licenses.free; + }; + }) {}; + hoa-mode = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hoa-mode"; + ename = "hoa-mode"; version = "20151203.850"; src = fetchgit { url = "https://gitlab.lrde.epita.fr/spot/emacs-modes.git"; rev = "3c608e15b655d2375c5f81323ac561c7848dc029"; sha256 = "19360wx1i7lkr8igddm7zl9yh5hlm3r013rkd512cs18iz1y753x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8b91f35d06f9e7e17c9aaf2fb9ee43a77257113/recipes/hoa-mode"; sha256 = "06rfqn7sqvmgpvwhfmk17qqs4q0frfzhm597z3p1q7kys2035kiv"; - name = "hoa-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36218,20 +47192,26 @@ license = lib.licenses.free; }; }) {}; - hoa-pp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { + hoa-pp-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names }: + melpaBuild { pname = "hoa-pp-mode"; + ename = "hoa-pp-mode"; version = "20151027.36"; src = fetchFromGitHub { owner = "hoaproject"; repo = "Contributions-Emacs-Pp"; - rev = "925b79930a3f4377b0fb2a36b3c6d5566d4b9a8e"; - sha256 = "0g2r4d0ivbadqw1k8jsv0jwv8krpfahsg0qmzyi909p2yfddqk1l"; + rev = "a72104a191214fba502653643a0d166a8f5341d9"; + sha256 = "1wg6vc9swwspi6s6jpig3my83i2pq8vkq2cy1q3an87rczacmfzp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c0d707dad9dc86bb3d6a829a60e21e92a5f3160/recipes/hoa-pp-mode"; sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla"; - name = "hoa-pp-mode"; + name = "recipe"; }; packageRequires = [ emacs names ]; meta = { @@ -36239,9 +47219,13 @@ license = lib.licenses.free; }; }) {}; - holiday-pascha-etc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + holiday-pascha-etc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "holiday-pascha-etc"; + ename = "holiday-pascha-etc"; version = "20160821.1758"; src = fetchFromGitHub { owner = "hexmode"; @@ -36249,10 +47233,10 @@ rev = "eb198656f63cb8679fb0e3a8248782df071a0f3c"; sha256 = "1dd0k7r5kx15sph12vzakhq27zh7vy9r541qdp8w5051k6apw3pw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4108926b1fee78e54c9fa68445c7a2b1b20404ea/recipes/holiday-pascha-etc"; sha256 = "0v2mhga1db6qy1160i730pzzrzisvhl3fjkazj4cjbkpjlshfc5j"; - name = "holiday-pascha-etc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36260,9 +47244,16 @@ license = lib.licenses.free; }; }) {}; - homebrew-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: - melpaBuild { + homebrew-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild }: + melpaBuild { pname = "homebrew-mode"; + ename = "homebrew-mode"; version = "20160615.620"; src = fetchFromGitHub { owner = "dunn"; @@ -36270,10 +47261,10 @@ rev = "d422307aee2f897d1a92e3b959c3214bc54cbe38"; sha256 = "1z4d0niz8q24f2z8rnfnc2rlmkffkf7qc57qn4695jbkzb7galfz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4007f6d15574098722fb427b6a9903f77afb21/recipes/homebrew-mode"; sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj"; - name = "homebrew-mode"; + name = "recipe"; }; packageRequires = [ dash emacs inf-ruby ]; meta = { @@ -36281,20 +47272,26 @@ license = lib.licenses.free; }; }) {}; - honcho = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sudo-edit }: - melpaBuild { + honcho = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sudo-edit }: + melpaBuild { pname = "honcho"; - version = "20180319.1441"; + ename = "honcho"; + version = "20180706.1724"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "honcho.el"; - rev = "fd3306f5cb870b557fc7d700fcb0a560feb3fbc7"; - sha256 = "0pdpnn206nfkc8pl36lxc2jfrmii8ai1gvf21ycx0r37g9q64qhq"; + rev = "f6a89a27e255b3ecb1f0b13058933558b1f0c6fb"; + sha256 = "06q0rw1vc3h1jd7q544csqn6mkfzcqmdlcr7pcrs7y2jsgb01k4s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76487b6776d148325c0200d2f788815f115feac9/recipes/honcho"; sha256 = "1ywx67dmvackfx19p4fvrb8mm27a7pri3m3bwr2acwd29lrrid2x"; - name = "honcho"; + name = "recipe"; }; packageRequires = [ emacs sudo-edit ]; meta = { @@ -36302,20 +47299,26 @@ license = lib.licenses.free; }; }) {}; - hookify = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + hookify = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "hookify"; + ename = "hookify"; version = "20141216.1409"; src = fetchFromGitHub { owner = "Silex"; repo = "hookify"; - rev = "21baae7393b07257de5796402fde0ca72fb00d77"; - sha256 = "0sg4h0m1ds3f6kpzd3vk30g6x2xl74r5j9bidw658f3mmai7m1l8"; + rev = "e76127230716f7fab6662410c03c3872d17a172b"; + sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa04ccd0ac05beed5de8d51ed96ccbf0071fdea1/recipes/hookify"; sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy"; - name = "hookify"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -36323,9 +47326,41 @@ license = lib.licenses.free; }; }) {}; - hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + horoscope = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "horoscope"; + ename = "horoscope"; + version = "20180408.2341"; + src = fetchFromGitHub { + owner = "mschuldt"; + repo = "horoscope.el"; + rev = "f4c683e991adce0a8f9023f15050f306f9b9a9ed"; + sha256 = "17k4j4q19l4ahxlzzic1jlbbh7l378j9vgnrcrvpm0lxa9ipclk0"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/180248c19160940a208b32fa7a9660a838f68de5/recipes/horoscope"; + sha256 = "1y2nzhdl7ghi5l3iyzb04xics7gr5981jmb5z5y8y1z04xhqpfs6"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/horoscope"; + license = lib.licenses.free; + }; + }) {}; + hound = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "hound"; + ename = "hound"; version = "20170627.1259"; src = fetchFromGitHub { owner = "ryoung786"; @@ -36333,10 +47368,10 @@ rev = "0c5a250ef82870dca737a429b6e9b9db93874ed3"; sha256 = "0kf2nhp5k3gk82ad1k9qi4aysqhw36x4mcdhg6kjckmcakfjw3g6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90cfc34eb4e8be7bf887533b85feba91131a435b/recipes/hound"; sha256 = "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v"; - name = "hound"; + name = "recipe"; }; packageRequires = [ cl-lib request ]; meta = { @@ -36344,9 +47379,13 @@ license = lib.licenses.free; }; }) {}; - how-many-lines-in-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + how-many-lines-in-project = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "how-many-lines-in-project"; + ename = "how-many-lines-in-project"; version = "20140806.2142"; src = fetchFromGitHub { owner = "hiddenlotus"; @@ -36354,10 +47393,10 @@ rev = "8a37ef885d004fe2ce231bfe05ed4867c6192d9b"; sha256 = "0vygbdjy2dv7n50vrkcnqyswq48sgas0zzjfsac8x5g9vhxjkawj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/how-many-lines-in-project"; sha256 = "1dfh1ydpjbrawqpsj6kydvy8sz3rlwn4ma5cizfw5spd2gcmj1zb"; - name = "how-many-lines-in-project"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36365,9 +47404,13 @@ license = lib.licenses.free; }; }) {}; - howdoi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + howdoi = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "howdoi"; + ename = "howdoi"; version = "20150203.1643"; src = fetchFromGitHub { owner = "atykhonov"; @@ -36375,10 +47418,10 @@ rev = "5fbf7069ee160c597a328e5ce5fb32920e1ca88f"; sha256 = "01sj9c8mxqaif8wh6zz9v2czjaq7vcdi66drldyjmifkln6rg2v8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d08f4d6c8bdf16f47d2474f92273fd214179cb18/recipes/howdoi"; sha256 = "12vgbypawxhhrnjp8dgh0wrcp7pvjccfaxw4yhq7msai7ik3h83b"; - name = "howdoi"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36386,19 +47429,24 @@ license = lib.licenses.free; }; }) {}; - howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + howm = callPackage ({ cl-lib ? null + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "howm"; + ename = "howm"; version = "20180225.205"; src = fetchgit { url = "https://scm.osdn.net/gitroot/howm/howm.git"; rev = "b932fa603f074049637907d35594f73c3fba45d0"; sha256 = "189j3061g2s1286434x3zyh6xyjycfrd2sqxx655biicy1xxyk52"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm"; sha256 = "07wx3wmc51vm42s81km5sdbm600ax2pv83xg0116xsyn05za3bfn"; - name = "howm"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -36406,9 +47454,14 @@ license = lib.licenses.free; }; }) {}; - ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ht = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ht"; + ename = "ht"; version = "20180129.1434"; src = fetchFromGitHub { owner = "Wilfred"; @@ -36416,10 +47469,10 @@ rev = "5a665d00dc8fda77bad2a43277d8809c23e46ab8"; sha256 = "0w0zi393ixgi154c6dq2i1kf3kraqyfw8alfxcn6fhhxy1g9p02y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd"; - name = "ht"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -36427,9 +47480,14 @@ license = lib.licenses.free; }; }) {}; - html-check-frag = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + html-check-frag = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "html-check-frag"; + ename = "html-check-frag"; version = "20160130.2135"; src = fetchFromGitHub { owner = "TobiasZawada"; @@ -36437,10 +47495,10 @@ rev = "feb89765eafd69dfcf07afeebded8985dc456e7c"; sha256 = "10lbxf56gvy26grzrhhx2p710fzs0h866jd2zmmgkisvyb0vaiay"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a53c9877f6f4c4e72c565fb8bd7cbe81ddbc565c/recipes/html-check-frag"; sha256 = "0drancb9ryifiln44b40l6cal0c7nyp597a6q26288s3v909yk2a"; - name = "html-check-frag"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -36448,20 +47506,24 @@ license = lib.licenses.free; }; }) {}; - html-script-src = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + html-script-src = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "html-script-src"; + ename = "html-script-src"; version = "20120403.1115"; src = fetchFromGitHub { owner = "rejeep"; repo = "html-script-src.el"; - rev = "66460f8ab1b24656e6f3ce5bd50cff6a81be8422"; - sha256 = "0k9ga0qi6h33akip2vrpclfp4zljnbw5ax40lxyxc1813hwkdrmh"; + rev = "0efeed7ab948e48128e6f1a7ddff17ef2951e1c2"; + sha256 = "11zffiy5s0zqwi8hxwa87j2k8n2lm54v8knnbwa5zafhqpb53znm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/html-script-src"; sha256 = "0pdyc2a9wxxc9rivjm2kgh4ysdxmdp73wg37nfy2nzka1m7qni7j"; - name = "html-script-src"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36469,9 +47531,16 @@ license = lib.licenses.free; }; }) {}; - html-to-hiccup = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + html-to-hiccup = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "html-to-hiccup"; + ename = "html-to-hiccup"; version = "20161028.701"; src = fetchFromGitHub { owner = "plexus"; @@ -36479,10 +47548,10 @@ rev = "99217a5058626d253ed8ada51a7642071fe54ba5"; sha256 = "1cvlh1iqjdmgwbw254g0rfdshsj7dhqjjp56gwqhn2fqkga44a7i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/html-to-hiccup"; sha256 = "0gyghgdil14i4p0yv5mb6la1ajzf8xcgdm1si5i5w7cn72vfapmz"; - name = "html-to-hiccup"; + name = "recipe"; }; packageRequires = [ dash emacs s ]; meta = { @@ -36490,9 +47559,14 @@ license = lib.licenses.free; }; }) {}; - html-to-markdown = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + html-to-markdown = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "html-to-markdown"; + ename = "html-to-markdown"; version = "20151105.40"; src = fetchFromGitHub { owner = "Malabarba"; @@ -36500,10 +47574,10 @@ rev = "60c5498c801be186478cf7c05be05b4430c4a144"; sha256 = "09n3zm9ivln8ng80fv5vwwzh9mj355ni685axda3m85xfxgai8gi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/html-to-markdown"; sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv"; - name = "html-to-markdown"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -36511,9 +47585,14 @@ license = lib.licenses.free; }; }) {}; - html2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + html2org = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "html2org"; + ename = "html2org"; version = "20170417.2201"; src = fetchFromGitHub { owner = "lujun9972"; @@ -36521,10 +47600,10 @@ rev = "6904aed40259ad8afccff079ebd8a07bff319ebc"; sha256 = "0dryk622fz0yj939pbs0fbb9i4m8qjnmkcxjsssws8f90plk06af"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/771e6604edc90182697bbd4827c8c46c34b48289/recipes/html2org"; sha256 = "1lj4dwmjkc43dfmsc7z4nvydmmf6wrk5v9ms23zf0llnk9h3hvnk"; - name = "html2org"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -36532,20 +47611,24 @@ license = lib.licenses.free; }; }) {}; - htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + htmlize = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "htmlize"; - version = "20180328.2341"; + ename = "htmlize"; + version = "20180412.1244"; src = fetchFromGitHub { owner = "hniksic"; repo = "emacs-htmlize"; - rev = "726c77b909f825b27e734a5460e3e2b63cfc60b0"; - sha256 = "02v14p01qkj1i38r181d6azcdj00331bkdlgcidg6brljl6jzz41"; + rev = "315a8f23cfd3e87642ff9e30ae3300c7a84244d5"; + sha256 = "0pjiid5a16xx9n5bvfff612mpli00y9nbzjapn9f1y79yl99yvxy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; sha256 = "16nvvsi4nxi0zzk5a6mwmp43p0ls20zdx9r18mxz6bsaw6jangh2"; - name = "htmlize"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36553,9 +47636,16 @@ license = lib.licenses.free; }; }) {}; - http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + http = callPackage ({ edit-indirect + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "http"; + ename = "http"; version = "20170906.1111"; src = fetchFromGitHub { owner = "emacs-pe"; @@ -36563,10 +47653,10 @@ rev = "193a7bf843dd6b6805c7b18dab31f50c8325d710"; sha256 = "1v6adfy1774axplsjfsdkm0azfwb5g7iq26zcss4mj966q1633xv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http"; sha256 = "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm"; - name = "http"; + name = "recipe"; }; packageRequires = [ edit-indirect emacs request ]; meta = { @@ -36574,9 +47664,13 @@ license = lib.licenses.free; }; }) {}; - http-post-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + http-post-simple = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "http-post-simple"; + ename = "http-post-simple"; version = "20170715.240"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -36584,10 +47678,10 @@ rev = "f53697fca278c741051aeb668b00466b5e0fd3fe"; sha256 = "0krdbvvvzn323vx554yw7947nddl3icfjk4wf5kfx7fim5v3mdn6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/http-post-simple"; sha256 = "0z3zphaqywbm7vn2g1f7fkrdamgsc26i8zydm9y53v9z9fmzch5s"; - name = "http-post-simple"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36595,20 +47689,24 @@ license = lib.licenses.free; }; }) {}; - http-twiddle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + http-twiddle = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "http-twiddle"; + ename = "http-twiddle"; version = "20160801.1211"; src = fetchFromGitHub { owner = "hassy"; repo = "http-twiddle"; - rev = "4d0c73b7dcbde8b483d4f3a75c49c74d2fe3ca45"; - sha256 = "0fxmk5b4ggi92n5gi2nim08a2gx1yg7jlp4hj4m0qazxqdcy38i1"; + rev = "46da2dbc40209925aa88ab19014ca982bcf9ac70"; + sha256 = "03fdpl64lgwlz8yc29ia9scbh0s5xh7g7jbyfvvp6hcy2f0yiyx7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/http-twiddle"; sha256 = "1d8xnwhb8lp4p4xnnkryx5c6isd8ckalp0smx66lbi1pa4g6iqsh"; - name = "http-twiddle"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36616,9 +47714,13 @@ license = lib.licenses.free; }; }) {}; - httpcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + httpcode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "httpcode"; + ename = "httpcode"; version = "20121001.2045"; src = fetchFromGitHub { owner = "rspivak"; @@ -36626,10 +47728,10 @@ rev = "a45e735082b09477cd704a99294d336cdbeb12ba"; sha256 = "02jz8qwxl69zhwvpmlqc15znr8x4f30paqszmm7xrrrz5x1c1rn4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906da23e26d44f8c71ba57ab59bb089caea673a9/recipes/httpcode"; sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh"; - name = "httpcode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36637,9 +47739,16 @@ license = lib.licenses.free; }; }) {}; - httprepl = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + httprepl = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "httprepl"; + ename = "httprepl"; version = "20141101.1034"; src = fetchFromGitHub { owner = "gregsexton"; @@ -36647,10 +47756,10 @@ rev = "cfa3693267a8ed1c96a86a126823f37dbfe077d8"; sha256 = "0wd4wmy99mx677x4sdbp57bxxll1fsnnf8hk97r85xdmmjsmrkld"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c49824f6e2dc2f3482e607c2d3a1e2d7685bf688/recipes/httprepl"; sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh"; - name = "httprepl"; + name = "recipe"; }; packageRequires = [ dash emacs s ]; meta = { @@ -36658,20 +47767,27 @@ license = lib.licenses.free; }; }) {}; - hugsql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + hugsql-ghosts = callPackage ({ cider + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "hugsql-ghosts"; - version = "20170612.1223"; + ename = "hugsql-ghosts"; + version = "20180425.429"; src = fetchFromGitHub { owner = "rkaercher"; repo = "hugsql-ghosts"; - rev = "2f3f98b644b4da35f4fb80b7c3b63f986417b415"; - sha256 = "0ng01pzxipzb3vkdn8yy5128kmnqnc4rhkszqji8lf8489jxfn8n"; + rev = "f3ebc60c66204ad39058cb84eb4bd5facce091df"; + sha256 = "0pcr39x8yxl5aa0sz20gw20ixz5imw5m19bzhzbzyn7slr65hlqn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/969fd5e51bf93b5eff6919956c43c041a3b24d1e/recipes/hugsql-ghosts"; sha256 = "1v1iypis5iyimdr9796qpqw0qmhzijap0nbr0mhhyp4001kakkwz"; - name = "hugsql-ghosts"; + name = "recipe"; }; packageRequires = [ cider dash s ]; meta = { @@ -36679,9 +47795,13 @@ license = lib.licenses.free; }; }) {}; - hungarian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hungarian-holidays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hungarian-holidays"; + ename = "hungarian-holidays"; version = "20161020.438"; src = fetchFromGitHub { owner = "gergelypolonkai"; @@ -36689,10 +47809,10 @@ rev = "653108769279499d84a79267c90e640d98823872"; sha256 = "0jjparw5axydjf2lj8asccmksbbj9zgdiv2kc211h122q5712gvm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c2dc20ce4b878a32c540744016a40f6cc2a657a/recipes/hungarian-holidays"; sha256 = "1bdl0ynlni1i19hq4h48k8j9b2davv2kfgrpd2mrl2xqmjvhm1m2"; - name = "hungarian-holidays"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36700,9 +47820,13 @@ license = lib.licenses.free; }; }) {}; - hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hungry-delete = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hungry-delete"; + ename = "hungry-delete"; version = "20170411.1802"; src = fetchFromGitHub { owner = "nflath"; @@ -36710,10 +47834,10 @@ rev = "0434458d3f6b2b585f332271feaa054bf4ec96d7"; sha256 = "04g8gdfqpzdhxf5rnl2k49f2klmzxwys79aib7xs30i0n8c8qb7d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete"; sha256 = "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz"; - name = "hungry-delete"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36721,20 +47845,28 @@ license = lib.licenses.free; }; }) {}; - hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + hy-mode = callPackage ({ dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "hy-mode"; - version = "20180308.2201"; + ename = "hy-mode"; + version = "20180702.1240"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "ca874a29eace152027f982b9720e3962c57a06b1"; - sha256 = "0s1z53v95dnygjp48gmny6a9wq4740rmsaa7p99hlvgqnksx0mzq"; + rev = "71a12a9208c4b87859bcbb6978e7915dd518e8dd"; + sha256 = "1px4kws91y581bg2zaav2nx972v73r4r0j135p5cbnynvkrknhnz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m"; - name = "hy-mode"; + name = "recipe"; }; packageRequires = [ dash dash-functional emacs s ]; meta = { @@ -36742,20 +47874,26 @@ license = lib.licenses.free; }; }) {}; - hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hyai = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hyai"; + ename = "hyai"; version = "20170301.647"; src = fetchFromGitHub { owner = "iquiw"; repo = "hyai"; - rev = "286cece5ca187ebb9d5fba5ac86e452cc638b8d3"; - sha256 = "1gycq2jp6540kiggv3fhmgqsyqvc36jwbyydx1i6w1brpcwvc6dx"; + rev = "e9a7e945fed12d8e664e898cf8b434b0376d5d80"; + sha256 = "1sbn4h74crawdy8yjdjklxh1q6js5y9ip5qxf6dfi85h82qizpa8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd9bd1cfd2f3b760b664a4677b0e4e617cbdfa6/recipes/hyai"; sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s"; - name = "hyai"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -36763,20 +47901,24 @@ license = lib.licenses.free; }; }) {}; - hydandata-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hydandata-light-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hydandata-light-theme"; + ename = "hydandata-light-theme"; version = "20160815.2118"; src = fetchFromGitHub { owner = "hydandata"; repo = "hydandata-light-theme"; - rev = "0fbc91678ef65e1f65d7ec6792ff0b2f104d16a9"; - sha256 = "0bkj5cw173l829fkgigghs07mc2i84ngvs2y9g6kamrpg6zhq7g8"; + rev = "169c0d9ab1272b0f4a1f29eb5f1cd5ffb2365e1e"; + sha256 = "19q63kg1higqxf26bhwnqwvqxpayjq2j24yi54b1wkvwbv5f28nr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/413c617f15947782891159a240e0c9014f1f7d11/recipes/hydandata-light-theme"; sha256 = "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60"; - name = "hydandata-light-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36784,9 +47926,13 @@ license = lib.licenses.free; }; }) {}; - hyde = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hyde = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hyde"; + ename = "hyde"; version = "20160507.2008"; src = fetchFromGitHub { owner = "nibrahim"; @@ -36794,10 +47940,10 @@ rev = "a8cd6ed00ecd8d7de0ded2f4867015b412b15b76"; sha256 = "14sk9gai7sscvwgbl7y3dzz8fdhrqynilscmdimlncpm15w56m6i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151f5c1097e5020dbc13e41f2657aae781c5942b/recipes/hyde"; sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3"; - name = "hyde"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36805,20 +47951,25 @@ license = lib.licenses.free; }; }) {}; - hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hydra = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hydra"; - version = "20180226.1116"; + ename = "hydra"; + version = "20180703.802"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "62e0f374623df15c1eabebe78f4100850d708227"; - sha256 = "1ydipk4fkc7dlfjr7isadgap9mfnmi1lj6n7ckrnzia22vyi9i7r"; + rev = "87cc74b2644daa2e9e660bc8a447c84a0ddeeab6"; + sha256 = "1pizlg7qbzjy6jrs1ivhxx5kfnlbkkfwf5q3jl4695gh7z0spfkb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw"; - name = "hydra"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -36826,9 +47977,13 @@ license = lib.licenses.free; }; }) {}; - i2b2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + i2b2-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "i2b2-mode"; + ename = "i2b2-mode"; version = "20140709.1804"; src = fetchFromGitHub { owner = "danlamanna"; @@ -36836,10 +47991,10 @@ rev = "db10efcfc8bed369a516bbf7526ede41f98cb95a"; sha256 = "17k41rah17l9kf7bvlm83x71nzz4aizgn7254cl5sb59mdhcm8pm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/i2b2-mode"; sha256 = "1jnlisdnp9sz54p444vlq00y3080i4ljcvclri9fy382g1s5ags5"; - name = "i2b2-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36847,18 +48002,23 @@ license = lib.licenses.free; }; }) {}; - i3wm = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + i3wm = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "i3wm"; + ename = "i3wm"; version = "20170822.738"; src = fetchgit { url = "https://git.flintfam.org/swf-projects/emacs-i3.git"; rev = "71391dc61063fee77ad174f3b2ca25c60b41009e"; sha256 = "16rwqfg517ask3y6mqxw689w8xx4i51nq8js5wnzbz9a55aj776n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/i3wm"; sha256 = "11246d71g82iv9zrd44013zwkmnf32m1x8zbrbb656dnzx7ps4rl"; - name = "i3wm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36866,20 +48026,25 @@ license = lib.licenses.free; }; }) {}; - ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ialign = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ialign"; - version = "20180322.848"; + ename = "ialign"; + version = "20180705.453"; src = fetchFromGitHub { owner = "mkcms"; repo = "interactive-align"; - rev = "0f3b412dc7688d99ea8c8810dd5e57a70d580b59"; - sha256 = "1hqblgk14qrjd339p9hm640q11mixkhk5jd72sjja74xhbaxciab"; + rev = "e92664e673647826161a19e9cfc327fa8c69ba6e"; + sha256 = "0x3naly4qh3q2ngm91y1pkm5s59kqgbgydax46hp6jnasdk4klk5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j"; - name = "ialign"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -36887,9 +48052,13 @@ license = lib.licenses.free; }; }) {}; - iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iasm-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iasm-mode"; + ename = "iasm-mode"; version = "20171023.722"; src = fetchFromGitHub { owner = "RAttab"; @@ -36897,10 +48066,10 @@ rev = "abbec7f308f9ce97beeb57e459fff35f559b4c18"; sha256 = "0hvpcckhlxab5f7w4s6iw5lhdbjrqn0l8gayg1w42rn6gssr3rap"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c230ec10eb62d1b3f6df10c05c5dbc2e25d4507/recipes/iasm-mode"; sha256 = "09xh41ayaha07fi5crk3c6pn17gwm3samsf6h71ldkywvz74kipv"; - name = "iasm-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36908,9 +48077,13 @@ license = lib.licenses.free; }; }) {}; - ibuffer-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ibuffer-git = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ibuffer-git"; + ename = "ibuffer-git"; version = "20110508.31"; src = fetchFromGitHub { owner = "jrockway"; @@ -36918,10 +48091,10 @@ rev = "d326319c05ddb8280885b31f9094040c1b365876"; sha256 = "1s5qvlf310b0z7q9k1xhcf4qmyfqd37jpqd67ciahaxk7cp224rd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d341da1b9bac782c75ab931fd53a9525a85c702e/recipes/ibuffer-git"; sha256 = "048888y07bzmi9x5i43fg6bgqbzdqi3nfjfnn6zr29jvlx366r5z"; - name = "ibuffer-git"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36929,9 +48102,14 @@ license = lib.licenses.free; }; }) {}; - ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + ibuffer-projectile = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "ibuffer-projectile"; + ename = "ibuffer-projectile"; version = "20180324.2025"; src = fetchFromGitHub { owner = "purcell"; @@ -36939,10 +48117,10 @@ rev = "1e89bfa7cae0629d29f24af3d81774b88b3cede0"; sha256 = "0y0pvjic5n5wmkrjzjjnhz2xaknib6w5p01vgv2jf5ylwq84wray"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile"; sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk"; - name = "ibuffer-projectile"; + name = "recipe"; }; packageRequires = [ projectile ]; meta = { @@ -36950,9 +48128,14 @@ license = lib.licenses.free; }; }) {}; - ibuffer-rcirc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ibuffer-rcirc = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ibuffer-rcirc"; + ename = "ibuffer-rcirc"; version = "20150215.1318"; src = fetchFromGitHub { owner = "fgallina"; @@ -36960,10 +48143,10 @@ rev = "8a4409b1c679d65c819dee4085faf929840e79f8"; sha256 = "15lapyj7qkkw1i1g1aizappm7gxkfnxhvd4fq66lghkzb76clz2m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8bcf68d54fce13fcb0fb0ae0b6aa975e8127a1f/recipes/ibuffer-rcirc"; sha256 = "1y6pyc6g8j42hs103yynjsdkkxvcq0q4xsz4r93rqwsr3za3wcmc"; - name = "ibuffer-rcirc"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -36971,20 +48154,25 @@ license = lib.licenses.free; }; }) {}; - ibuffer-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ibuffer-sidebar = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ibuffer-sidebar"; + ename = "ibuffer-sidebar"; version = "20180218.1731"; src = fetchFromGitHub { owner = "jojojames"; repo = "ibuffer-sidebar"; - rev = "7ddf1b5a158b33e9a7d3fe5dad7ea626a464d2bc"; - sha256 = "18rl379bfilzvyi4f4kmy74l4vq2q8hhy5i8kflcgvn0ibipwqjz"; + rev = "b18a8ca0fac9cbfb6e99bcccc2cea488d5876add"; + sha256 = "1vvzmx4wi0bscig0aqrs9rmxw6mnyyqcxg3mi8mr52j43p1kdmr3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19c7c36af8e30b9a9ccc4afda2a7b7e39e8d32ff/recipes/ibuffer-sidebar"; sha256 = "0rzdybkqaf8r6v19isgw4wv0mwdqxvf55gq1ig4shscjc7ys22wp"; - name = "ibuffer-sidebar"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -36992,20 +48180,24 @@ license = lib.licenses.free; }; }) {}; - ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ibuffer-tramp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ibuffer-tramp"; + ename = "ibuffer-tramp"; version = "20151118.939"; src = fetchFromGitHub { owner = "svend"; repo = "ibuffer-tramp"; - rev = "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3"; - sha256 = "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f"; + rev = "41fab2ad174f53a4cf5ef7d2ebef518dede82ab4"; + sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a7449b15cb2a89cf06ea3de2cfdc6bc387db3b/recipes/ibuffer-tramp"; sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32"; - name = "ibuffer-tramp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37013,9 +48205,14 @@ license = lib.licenses.free; }; }) {}; - ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ibuffer-vc = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ibuffer-vc"; + ename = "ibuffer-vc"; version = "20171106.2341"; src = fetchFromGitHub { owner = "purcell"; @@ -37023,10 +48220,10 @@ rev = "83d60aefd21e2aa20c7217d224f38a40bb75e63b"; sha256 = "06jk5ccsfivh6bf6ppkli6cni39rvmm9asack1056f9q6jq6l8p1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ibuffer-vc"; sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla"; - name = "ibuffer-vc"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -37034,9 +48231,13 @@ license = lib.licenses.free; }; }) {}; - id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + id-manager = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "id-manager"; + ename = "id-manager"; version = "20170320.546"; src = fetchFromGitHub { owner = "kiwanami"; @@ -37044,10 +48245,10 @@ rev = "14ebc35db298aac4dedc8aa188bc46bacab81f3b"; sha256 = "0k9b12gzvjw06y5ycjkigkj8vcmj4rz57d4hyzip27g1v93vvimc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64a61b3801a0cafec87b1875eaec5950746f716d/recipes/id-manager"; sha256 = "13g5fi06hvx0x2wn1d1d8rkfq5n6wbk9g5bhx2b5sar2yw0akmwm"; - name = "id-manager"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37055,9 +48256,14 @@ license = lib.licenses.free; }; }) {}; - idea-darkula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + idea-darkula-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "idea-darkula-theme"; + ename = "idea-darkula-theme"; version = "20160416.1603"; src = fetchFromGitHub { owner = "fourier"; @@ -37065,10 +48271,10 @@ rev = "52602d9b91883e1f297d000951aeed48bf60176e"; sha256 = "1hknhbm3b5rsba2s84iwspylhzjsm91zdckz22j9gyrq37wjgyrr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abf27cce70443010f996b5577d71fe78f7eab6fb/recipes/idea-darkula-theme"; sha256 = "0lanhwlhd7pbzjc047vd5sgsmi2bx66gr3inr8y57swgrfw3l8sk"; - name = "idea-darkula-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37076,9 +48282,13 @@ license = lib.licenses.free; }; }) {}; - identica-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + identica-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "identica-mode"; + ename = "identica-mode"; version = "20130204.1453"; src = fetchFromGitHub { owner = "gabrielsaldana"; @@ -37086,10 +48296,10 @@ rev = "cf9183ee11ac922e85c7c908f04e2d00b03111b3"; sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/812b7c1fbc435f0530b7f66a1e65f62f5f00da01/recipes/identica-mode"; sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q"; - name = "identica-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37097,9 +48307,13 @@ license = lib.licenses.free; }; }) {}; - idle-highlight-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + idle-highlight-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "idle-highlight-mode"; + ename = "idle-highlight-mode"; version = "20120920.948"; src = fetchFromGitHub { owner = "nonsequitur"; @@ -37107,10 +48321,10 @@ rev = "c466f2a9e291f9da1167dc879577b2e1a7880482"; sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/idle-highlight-mode"; sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc"; - name = "idle-highlight-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37118,9 +48332,13 @@ license = lib.licenses.free; }; }) {}; - idle-require = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + idle-require = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "idle-require"; + ename = "idle-require"; version = "20090715.1503"; src = fetchFromGitHub { owner = "nschum"; @@ -37128,10 +48346,10 @@ rev = "33592bb098223b4432d7a35a1d65ab83f47c1ec1"; sha256 = "0f8rxvc3dk2hi4x524l18fx73xrxy0qqwbybdma4ca67ck9n6xam"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/idle-require"; sha256 = "03z8d06ifzaf81h8b3h16ab69cp3ssky3my07spy81rbhbjl5nn3"; - name = "idle-require"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37139,20 +48357,25 @@ license = lib.licenses.free; }; }) {}; - ido-at-point = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-at-point = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-at-point"; + ename = "ido-at-point"; version = "20151021.57"; src = fetchFromGitHub { owner = "katspaugh"; repo = "ido-at-point"; - rev = "e5907bbe8a3d148d07698b76bd994dc3076e16ee"; - sha256 = "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp"; + rev = "6b267f202dc3d3d924c904fbd894e9a209f231de"; + sha256 = "1bj8k5fq6x3s5qmr02bnkcls7sndmg4wjjjrsd3fr6yl8c4jcy3k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ffbfa66c4284a134265efc606fdc7652b0a7f75/recipes/ido-at-point"; sha256 = "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0"; - name = "ido-at-point"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37160,9 +48383,15 @@ license = lib.licenses.free; }; }) {}; - ido-clever-match = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-clever-match = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-clever-match"; + ename = "ido-clever-match"; version = "20151011.1026"; src = fetchFromGitHub { owner = "Bogdanp"; @@ -37170,10 +48399,10 @@ rev = "f173473e99c8b0756f12e4cc8f67e68fa59eadd3"; sha256 = "14nmldahr0pj2x4vkzpnpx0bsxafmiihgjylk5j5linqvy8q6wk6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/add68b4815cdfe83402b217595a4a46068f83a2a/recipes/ido-clever-match"; sha256 = "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m"; - name = "ido-clever-match"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -37181,9 +48410,13 @@ license = lib.licenses.free; }; }) {}; - ido-complete-space-or-hyphen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-complete-space-or-hyphen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-complete-space-or-hyphen"; + ename = "ido-complete-space-or-hyphen"; version = "20130228.208"; src = fetchFromGitHub { owner = "doitian"; @@ -37191,10 +48424,10 @@ rev = "3fe1fe1e1a743f8deb8f4025977647afecd58f14"; sha256 = "1aih8n10lcrw0bdgvlrkxzhkpxpmphw07cvbp6zd27ia25037fzw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59e11094068d3a0c0e4edc1f82158c43d3b15e0e/recipes/ido-complete-space-or-hyphen"; sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc"; - name = "ido-complete-space-or-hyphen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37202,20 +48435,28 @@ license = lib.licenses.free; }; }) {}; - ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: - melpaBuild { + ido-completing-read-plus = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , memoize + , s }: + melpaBuild { pname = "ido-completing-read-plus"; - version = "20180222.1504"; + ename = "ido-completing-read+"; + version = "20180627.1944"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "2f4050ebd9591a3c2c73cbae1014c908226c43ec"; - sha256 = "1jg3k8ivfjfqh5gw0zzwknvpa8hq21n9p2k913wvxyazv0b1gvqx"; + rev = "03bdf989a9af88d4eeed4003ae74c98baf58ff72"; + sha256 = "08d77ysbzd25rm8rjslckhqlsyim047c9zwq2ybbzqpjy3q52qfy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z"; - name = "ido-completing-read-plus"; + name = "recipe"; }; packageRequires = [ cl-lib emacs memoize s ]; meta = { @@ -37223,9 +48464,14 @@ license = lib.licenses.free; }; }) {}; - ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-describe-bindings = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-describe-bindings"; + ename = "ido-describe-bindings"; version = "20161023.402"; src = fetchFromGitHub { owner = "danil"; @@ -37233,10 +48479,10 @@ rev = "a142ff1c33df23ed9665497d0dcae2943b3c706a"; sha256 = "0967709jyp9s04i6gi90axgqzhz03cdf1j1w39yrkds6q1b6v7jw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31b8e255630f1348a5b5730f7b624ad550d219ad/recipes/ido-describe-bindings"; sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2"; - name = "ido-describe-bindings"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -37244,9 +48490,14 @@ license = lib.licenses.free; }; }) {}; - ido-exit-target = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-exit-target = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-exit-target"; + ename = "ido-exit-target"; version = "20170717.1151"; src = fetchFromGitHub { owner = "waymondo"; @@ -37254,10 +48505,10 @@ rev = "e56fc6928649c87ccf39d56d84ab53ebaced1f73"; sha256 = "1a1bcvmihf22kr8rpv6kyp4b7x79hla5qdys48d6kl06m53gyckp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b815e7492eb0bd39c5d1be5a95784f9fe5612b62/recipes/ido-exit-target"; sha256 = "17vmg47xwk6yjlbcsswirl8s2q565k291ajzjglnz7qg2fwx6spi"; - name = "ido-exit-target"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37265,20 +48516,27 @@ license = lib.licenses.free; }; }) {}; - ido-flex-with-migemo = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, migemo }: - melpaBuild { + ido-flex-with-migemo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flx-ido + , lib + , melpaBuild + , migemo }: + melpaBuild { pname = "ido-flex-with-migemo"; + ename = "ido-flex-with-migemo"; version = "20180323.456"; src = fetchFromGitHub { owner = "ROCKTAKEY"; repo = "ido-flex-with-migemo"; - rev = "9684ffc47d838e82d611d0955b390d8387cf5741"; - sha256 = "06wi05bqwr1va589vzcyakjvh2z3vnn17ccbx0cgb7b3l8md73qs"; + rev = "02fa776e44cb5756205aa574ebfd5c3f86f4cf3c"; + sha256 = "0cyszakyj3kb2bdy6wb5y3m3w6y1fniakjlx92g8mvb6ycwkj2p3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1647d1ae7400ddbc8367c355ade16b5c360b42fc/recipes/ido-flex-with-migemo"; sha256 = "1w8f1r17l4r7w5bacckv9zfl9qynv2ivsw639rzr5acg2ndxagv7"; - name = "ido-flex-with-migemo"; + name = "recipe"; }; packageRequires = [ emacs flx-ido migemo ]; meta = { @@ -37286,9 +48544,14 @@ license = lib.licenses.free; }; }) {}; - ido-gnus = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: - melpaBuild { + ido-gnus = callPackage ({ fetchFromGitHub + , fetchurl + , gnus ? null + , lib + , melpaBuild }: + melpaBuild { pname = "ido-gnus"; + ename = "ido-gnus"; version = "20140216.846"; src = fetchFromGitHub { owner = "vapniks"; @@ -37296,10 +48559,10 @@ rev = "f5fe3f6aa8086f675ba216abace9e3d5f2e3a089"; sha256 = "0ifdwd5vnjv2iyb5bnz8pij35lc0ymmyx8j8zhpkbgjigz8f05ip"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c5cd46d72a3f99ef1344b5f1156f5bf7a5b9adc/recipes/ido-gnus"; sha256 = "14ijb8q4s846984h102h72ij713v5bj3k2vfdvr94gw1f0iya2yg"; - name = "ido-gnus"; + name = "recipe"; }; packageRequires = [ gnus ]; meta = { @@ -37307,9 +48570,14 @@ license = lib.licenses.free; }; }) {}; - ido-grid-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-grid-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-grid-mode"; + ename = "ido-grid-mode"; version = "20160122.339"; src = fetchFromGitHub { owner = "larkery"; @@ -37317,10 +48585,10 @@ rev = "7cfca3988a6dc3ad18e28abe114218095ff2366f"; sha256 = "1ip8g0r0aimhc4a1f06m711zmbs0krxn8hmayk99gk5kkz12igkb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ido-grid-mode"; sha256 = "0sq1d2fwvv247rr9lqg9x87d5h910k5ifqr9cjyskc74mvhrcsr3"; - name = "ido-grid-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37328,9 +48596,13 @@ license = lib.licenses.free; }; }) {}; - ido-hacks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-hacks = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-hacks"; + ename = "ido-hacks"; version = "20150331.1209"; src = fetchFromGitHub { owner = "scottjad"; @@ -37338,10 +48610,10 @@ rev = "b7e7514a0e011e4d767d1f5755c5eae9d85f83dc"; sha256 = "01p4az128k1jvd9i1gshgg87z6048cw9cnm57l8qdlw01c3h6dkx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac3074d28e76133835366273219e180c6e75b18/recipes/ido-hacks"; sha256 = "05f9pdkqppnp7wafka2d2yj84gqchjd7vnrl5rcywy1l47gbxiw0"; - name = "ido-hacks"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37349,20 +48621,26 @@ license = lib.licenses.free; }; }) {}; - ido-load-library = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }: - melpaBuild { + ido-load-library = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , persistent-soft }: + melpaBuild { pname = "ido-load-library"; + ename = "ido-load-library"; version = "20140611.900"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "ido-load-library"; - rev = "e03b55957c93aa1a7dd190e173e16ec59dbb2ba7"; - sha256 = "0l69sr3g1n2x61j6sv6hnbiyk8a2qra6y2kh413qp0sfpx4fzchv"; + rev = "f439559721c5fecb2572dcaf3e357c5d94a20f4a"; + sha256 = "1cmq6kpsh5ngiib67a0vsvhlyl0qy29zxcq03bpcbpm76sv7nc0a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/baa49e7d2d5c07ebf77e7941c240b88fcfd0fc8b/recipes/ido-load-library"; sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj"; - name = "ido-load-library"; + name = "recipe"; }; packageRequires = [ pcache persistent-soft ]; meta = { @@ -37370,20 +48648,25 @@ license = lib.licenses.free; }; }) {}; - ido-migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: - melpaBuild { + ido-migemo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , migemo }: + melpaBuild { pname = "ido-migemo"; + ename = "ido-migemo"; version = "20150921.1544"; src = fetchFromGitHub { owner = "myuhe"; repo = "ido-migemo.el"; - rev = "e71114a92dd69cb46abf3fb71a09ce27506fcf77"; - sha256 = "15iajhrgy989pn91ijcd1mq2015bkaacaplm79rmb0ggxhh8vq38"; + rev = "eec329e315c4782ab966f162a6c91fd3a01ef358"; + sha256 = "1d7jrfs9vihsi88a0aa139xsad00w5rmzh54s3qp8ismljn8dlql"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8550601b8989f9838dfa7848977b2509b8e16175/recipes/ido-migemo"; sha256 = "02hbwchwx2bcwdxz7gz555699l7n9wisfikax1j6idn167n4wdpi"; - name = "ido-migemo"; + name = "recipe"; }; packageRequires = [ migemo ]; meta = { @@ -37391,9 +48674,14 @@ license = lib.licenses.free; }; }) {}; - ido-occasional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-occasional = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-occasional"; + ename = "ido-occasional"; version = "20150214.448"; src = fetchFromGitHub { owner = "abo-abo"; @@ -37401,10 +48689,10 @@ rev = "d405f1795e1e0c63be411ee2825184738d29c33a"; sha256 = "0zlkq29wxd3a4vg0w6ds2jad5h1pja7ccd3l6ppl0kz1b1517qlr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed49d07aa36dfc742ca3fbfa83a6d624bf2fa525/recipes/ido-occasional"; sha256 = "1vdh5i9qznzd9r148a6jw9v47swf7ykwyciqfzc3ismv5q909bl2"; - name = "ido-occasional"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37412,20 +48700,25 @@ license = lib.licenses.free; }; }) {}; - ido-occur = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-occur = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-occur"; + ename = "ido-occur"; version = "20160820.740"; src = fetchFromGitHub { owner = "danil"; repo = "ido-occur"; - rev = "522af5d55b3d4cd6885f3b4100913566c202cec4"; - sha256 = "0yh8px5ffx4pjmy97v1z9nwxb3qgzc5pdaj9nn6lsdxv9z7w5p3v"; + rev = "b0e67fe4835c162cbcf8a982bdf377955b9ac5ae"; + sha256 = "13f21vx3q1qbnl13n3lx1rnr8dhq3zwch22pvy53h8q6sdf7r73a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a576d8569bf82be01e7d50defcc99a90aab1436/recipes/ido-occur"; sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji"; - name = "ido-occur"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -37433,20 +48726,25 @@ license = lib.licenses.free; }; }) {}; - ido-select-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-select-window = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-select-window"; + ename = "ido-select-window"; version = "20131220.1247"; src = fetchFromGitHub { owner = "pjones"; repo = "ido-select-window"; - rev = "a64707d8d154664d50d12e26417d586e4c3dd78b"; - sha256 = "1iifpgdpa98si0g2ykr0xbxcbqrvzqfl6r1dv9zihmxhdr7hs9c8"; + rev = "946db3db7a3fec582cc1a0097877f1250303b53a"; + sha256 = "0qvf3h2ljlbf3z36dhywzza62mfi6mqbrfc0sqfsbyia9bn1df4f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/775c8361322c2ba9026130dd60083e0255170b8f/recipes/ido-select-window"; sha256 = "03xqfpnagy2sk67yq7n7s6ma3im37d558zzx8sdzd9pbfxy9ij23"; - name = "ido-select-window"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37454,9 +48752,15 @@ license = lib.licenses.free; }; }) {}; - ido-skk = callPackage ({ ddskk, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-skk = callPackage ({ ddskk + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-skk"; + ename = "ido-skk"; version = "20151111.150"; src = fetchFromGitHub { owner = "tsukimizake"; @@ -37464,10 +48768,10 @@ rev = "89a2e62799bff2841ff634517c86084c4ce69246"; sha256 = "149cznbybwj0gkjyvpnh4kn258kxw449m7cn95n9jbh1r45vljvy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6da9bd69a646a8edfaf9dc7f2e31e5f057f44b6b/recipes/ido-skk"; sha256 = "1fyzjkw9xp126bzfv1254bvyakh323iw3wdzrkd9gb4ir39k5jzw"; - name = "ido-skk"; + name = "recipe"; }; packageRequires = [ ddskk emacs ]; meta = { @@ -37475,9 +48779,13 @@ license = lib.licenses.free; }; }) {}; - ido-sort-mtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-sort-mtime = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-sort-mtime"; + ename = "ido-sort-mtime"; version = "20171121.59"; src = fetchFromGitHub { owner = "pkkm"; @@ -37485,10 +48793,10 @@ rev = "f638ff0c922af862f5211779f2311a27fde428eb"; sha256 = "0isy3rmw69664fsypg58rs42ql43drf27l90yvplnbcqd7nnnb21"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36d2f7f1bb0d0694a25c1e83340781e08bee814b/recipes/ido-sort-mtime"; sha256 = "1dkny9y3x49dv1vjwz78x2qhb6kdq3fa8qh1xkm30jyapvgiwdg2"; - name = "ido-sort-mtime"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37496,9 +48804,13 @@ license = lib.licenses.free; }; }) {}; - ido-springboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-springboard = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-springboard"; + ename = "ido-springboard"; version = "20170105.2355"; src = fetchFromGitHub { owner = "jwiegley"; @@ -37506,10 +48818,10 @@ rev = "263a8cd4582c81bfc29d7db37d5267e2488b148c"; sha256 = "14mbmkqnw2kkzcb8f9z1g3c8f8f9lca3zb6f3q8jk9dsyp9vh81z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/409d847fb464a320e626fae56521a81a8e862a3e/recipes/ido-springboard"; sha256 = "04jqnag8jiyfbwvc3vd9ikrsmf6cajld7dz2gz9y0zkj1k4gs7zv"; - name = "ido-springboard"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37517,41 +48829,24 @@ license = lib.licenses.free; }; }) {}; - ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: - melpaBuild { - pname = "ido-ubiquitous"; - version = "20180216.949"; - src = fetchFromGitHub { - owner = "DarwinAwardWinner"; - repo = "ido-completing-read-plus"; - rev = "2f4050ebd9591a3c2c73cbae1014c908226c43ec"; - sha256 = "1jg3k8ivfjfqh5gw0zzwknvpa8hq21n9p2k913wvxyazv0b1gvqx"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; - sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; - name = "ido-ubiquitous"; - }; - packageRequires = [ cl-lib ido-completing-read-plus ]; - meta = { - homepage = "https://melpa.org/#/ido-ubiquitous"; - license = lib.licenses.free; - }; - }) {}; - ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-vertical-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-vertical-mode"; - version = "20160429.1037"; + ename = "ido-vertical-mode"; + version = "20180618.1401"; src = fetchFromGitHub { owner = "creichert"; repo = "ido-vertical-mode.el"; - rev = "b42e4227ed5d37b5d840a9d9d1cdaabf50e189b1"; - sha256 = "1h0kwsrg0xaqmk37hij2ssi9vcvxq49bdc4s3amwc45x1i369q7q"; + rev = "16c4c1a112796ee0bcf401ea39d3e2643a89feaf"; + sha256 = "10cfm765qwba0bnablwy8c4mjxvb1lwm89d16svwhp1pn20an6a8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4bbd212ea4606b9871cf583d06b5cee2f6ce0a9/recipes/ido-vertical-mode"; sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm"; - name = "ido-vertical-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37559,20 +48854,25 @@ license = lib.licenses.free; }; }) {}; - ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: - melpaBuild { + ido-yes-or-no = callPackage ({ fetchFromGitHub + , fetchurl + , ido-completing-read-plus + , lib + , melpaBuild }: + melpaBuild { pname = "ido-yes-or-no"; + ename = "ido-yes-or-no"; version = "20161108.1551"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-yes-or-no"; - rev = "c55383b1fce5879e87e7ca6809fc60534508e182"; - sha256 = "1p50ycsn1mcq5nqa16w10hm8v2pixibvandc91mj5l7s8zspanik"; + rev = "8953eadaaa7811ebc66d8a9eb7ac43f38913ab59"; + sha256 = "0pi5kak267v571j5y0khz1s0nlxyp9jrsbh09dk3j6a44d2iyypl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e575f46b8597a34523df6b6a75da5a640f4c5a2e/recipes/ido-yes-or-no"; sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana"; - name = "ido-yes-or-no"; + name = "recipe"; }; packageRequires = [ ido-completing-read-plus ]; meta = { @@ -37580,9 +48880,13 @@ license = lib.licenses.free; }; }) {}; - idomenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + idomenu = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "idomenu"; + ename = "idomenu"; version = "20141123.1320"; src = fetchFromGitHub { owner = "birkenfeld"; @@ -37590,10 +48894,10 @@ rev = "4b0152d606360c70204fb4c27f68de79ca885386"; sha256 = "1vx2g1xgxpcabr49mkl6ggzrpa3k2zhm479j6262vb64swzx33jw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f856045bc5ab2aee4dd4ad9806917e27e56ec64c/recipes/idomenu"; sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h"; - name = "idomenu"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37601,20 +48905,27 @@ license = lib.licenses.free; }; }) {}; - idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: - melpaBuild { + idris-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , prop-menu }: + melpaBuild { pname = "idris-mode"; - version = "20180210.400"; + ename = "idris-mode"; + version = "20180416.2245"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "cc35d124332aba84dc3e4da94433127a12459351"; - sha256 = "056yfgfqxzcfmlk2kj34r1dpjxi0xllcllkhrc9v8d9cib7hjqqf"; + rev = "2cd2ace9327248e141c35127b8ef9114a1301a1d"; + sha256 = "1bszb2bccjvamxbyyhbmw7hqhs71yyx4x0bxzszs9036f6p1znph"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s"; - name = "idris-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs prop-menu ]; meta = { @@ -37622,9 +48933,14 @@ license = lib.licenses.free; }; }) {}; - ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ids-edit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ids-edit"; + ename = "ids-edit"; version = "20170818.802"; src = fetchFromGitHub { owner = "kawabata"; @@ -37632,10 +48948,10 @@ rev = "8562a6cbfb3f2d44bc6f62ab15081a80f8fee502"; sha256 = "10h64c5n9piq9ly7ipqq33ji8x8vwh9j1h7r05yab8a2sn0h8587"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ids-edit"; sha256 = "1n4gpcl3qj65cmaq9cdljsmrf84570z4chfvga6slsqjz5him8d1"; - name = "ids-edit"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37643,9 +48959,13 @@ license = lib.licenses.free; }; }) {}; - iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iedit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iedit"; + ename = "iedit"; version = "20180207.219"; src = fetchFromGitHub { owner = "victorhge"; @@ -37653,10 +48973,10 @@ rev = "412490db4387ad9d040bfb5854f25de4c40c2146"; sha256 = "1995j0yvvls5i7zfxw8zwfk05in8b0n82k05qdrap29v6nq2v4bx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit"; sha256 = "0bh8ir6kspxjsvjww5y3b5hl3flbm2cc77jh8vnnva3z086f18mh"; - name = "iedit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37664,9 +48984,13 @@ license = lib.licenses.free; }; }) {}; - ietf-docs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ietf-docs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ietf-docs"; + ename = "ietf-docs"; version = "20150928.257"; src = fetchFromGitHub { owner = "choppsv1"; @@ -37674,10 +48998,10 @@ rev = "ede30d6d26044069e1731fd20c0ab2324552c0b4"; sha256 = "0b86x675g95yrlc0alffx0z9fmficlwv3gpy5cy86z1xvvyh3nzw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cedfdfe2c282d0484ea8239726f46a4861ef07ea/recipes/ietf-docs"; sha256 = "0wnk36z9g7lksmynd04hb2m6rx45wpxnxj1lhrlpjnzsrknhf4k3"; - name = "ietf-docs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37685,9 +49009,13 @@ license = lib.licenses.free; }; }) {}; - iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iflipb = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iflipb"; + ename = "iflipb"; version = "20171113.1244"; src = fetchFromGitHub { owner = "jrosdahl"; @@ -37695,10 +49023,10 @@ rev = "a5ad1fbd1173cff5228dab265515c92c0778f86a"; sha256 = "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb"; sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d"; - name = "iflipb"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37706,9 +49034,13 @@ license = lib.licenses.free; }; }) {}; - ignoramus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ignoramus = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ignoramus"; + ename = "ignoramus"; version = "20160414.709"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -37716,10 +49048,10 @@ rev = "b37dc7c07edd9d152436f9019c14df158b599be3"; sha256 = "1b4r4h8yrs8zkyr1hnnx2wjrmm39wbqxfhyxpjb5pxi4zk3fh4rj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac5439afe2f9a902e615f0cf919ef7138559c0f0/recipes/ignoramus"; sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9"; - name = "ignoramus"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37727,18 +49059,23 @@ license = lib.licenses.free; }; }) {}; - igv = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + igv = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "igv"; + ename = "igv"; version = "20141210.427"; src = fetchgit { url = "https://bitbucket.org/sbarbit/eigv"; rev = "47ac6ceede252f451348a2c696398c0cb5279555"; sha256 = "11pss3hfxkfkyi273zfajdj43shdl6pn739zfv9jbm75v7m9bz6f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/igv"; sha256 = "0vjqdyj9j26y0hhzmip6lpwc8g1c9vnmgya1p7v77bkgdicgl659"; - name = "igv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37746,20 +49083,26 @@ license = lib.licenses.free; }; }) {}; - image-archive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + image-archive = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "image-archive"; + ename = "image-archive"; version = "20150620.1832"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-image-archive"; - rev = "8d29535bd832329ffeeac780aae7aa8919af1175"; - sha256 = "068z3ygq9p139ikm04xqhhqhc994an5isba5c7kpqs009y09xw3w"; + rev = "4cf0edabfd6a4da2ffb920ff1e5009a002fc1e53"; + sha256 = "0k5iv2s33d6yj7bb9m7xskd52cfs0bkrq3g1qkby17drd29iwdhv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17464f31b07f64da0e9db187cd6f5facee3ad7ce/recipes/image-archive"; sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp"; - name = "image-archive"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -37767,9 +49110,14 @@ license = lib.licenses.free; }; }) {}; - image-dired-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + image-dired-plus = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "image-dired-plus"; + ename = "image-dired+"; version = "20150429.2244"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -37777,10 +49125,10 @@ rev = "b68094625d963056ad64e0e44af0e2266b2eadc7"; sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98f83f450804f1dc496a7bda17818cdae3f52151/recipes/image-dired+"; sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy"; - name = "image-dired-plus"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -37788,9 +49136,14 @@ license = lib.licenses.free; }; }) {}; - image-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + image-plus = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "image-plus"; + ename = "image+"; version = "20150707.916"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -37798,10 +49151,10 @@ rev = "6834d0c09bb4df9ecc0d7a559bd7827fed48fffc"; sha256 = "0v66wk9nh0raih4jhrzmmyi5lbysjnmbv791vm2230ffi2hmwxnd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02d7400477a993b7a3cae327501dbf8db97dfa28/recipes/image+"; sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg"; - name = "image-plus"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -37809,9 +49162,13 @@ license = lib.licenses.free; }; }) {}; - imakado = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + imakado = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "imakado"; + ename = "imakado"; version = "20141024.223"; src = fetchFromGitHub { owner = "imakado"; @@ -37819,10 +49176,10 @@ rev = "00a1e7eea2cb9e9066343a23927d6c747707902f"; sha256 = "0f3xdqhq9nprvl8bnmgrx20h08ddkfak0is29bsqwckkfgn7pmqp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca131089c823065852f58347a88bd49217a22072/recipes/imakado"; sha256 = "18mj0vpv3dybfpa8hl9jwlagsivbhgqgz8lwb8cswsq9hwv3jgd3"; - name = "imakado"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37830,9 +49187,14 @@ license = lib.licenses.free; }; }) {}; - imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + imake = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "imake"; + ename = "imake"; version = "20180318.1559"; src = fetchFromGitHub { owner = "tarsius"; @@ -37840,10 +49202,10 @@ rev = "7df5fb9684a0288313ef5f64594078d477105959"; sha256 = "0xc19ir5ak1bfq0ag48ql5rj58zd565csgxhpa30s9lvvkc8kvr5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake"; sha256 = "0j732fi6999n9990w4l28raw140fvqfbynyh4x65yilhw95r7c34"; - name = "imake"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37851,20 +49213,24 @@ license = lib.licenses.free; }; }) {}; - imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + imapfilter = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "imapfilter"; + ename = "imapfilter"; version = "20180318.1327"; src = fetchFromGitHub { owner = "tarsius"; repo = "imapfilter"; - rev = "79bbbe918319bc1e8f42a0bef53dc7c77fe868ea"; - sha256 = "0lqhwh8kav7f526a40rjdy2hzarzph1i3ig2dmbf02gp32sl7rg9"; + rev = "5e842a8c60ba98f344edf1b1e65f5a480ed938ed"; + sha256 = "16k7cxzdjbblzckp5qppw1ga0rzdh3ww2ni7ry1h43p9cfna0kcx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter"; sha256 = "0i893kqj6yzadhza800r6ri7fihl01r57z8yrzzh3d09qaias5vz"; - name = "imapfilter"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37872,9 +49238,14 @@ license = lib.licenses.free; }; }) {}; - imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + imenu-anywhere = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "imenu-anywhere"; + ename = "imenu-anywhere"; version = "20170805.1155"; src = fetchFromGitHub { owner = "vspinu"; @@ -37882,10 +49253,10 @@ rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3"; sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; sha256 = "1ylqzdnd3nzcpyyd6rh6i5q9mvf8c99rvpk51fzfm3yq2kyw4dbq"; - name = "imenu-anywhere"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -37893,20 +49264,25 @@ license = lib.licenses.free; }; }) {}; - imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + imenu-list = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "imenu-list"; - version = "20171120.1255"; + ename = "imenu-list"; + version = "20180601.702"; src = fetchFromGitHub { owner = "bmag"; repo = "imenu-list"; - rev = "0d3d445ce60a77a6c7bcbdbf1ae62cc20d2b5575"; - sha256 = "0q7124qaa3kmag3p3a1wq4axj59dvcsd7ydsh6cl9np2p18illvx"; + rev = "04f0632f7b8c81be8747617768c57b66e5d60994"; + sha256 = "0lmcnbps7fbqcsimynil5xq9d7n4jmcclw1qprbj8yjk42lxz0d1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list"; sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s"; - name = "imenu-list"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -37914,20 +49290,25 @@ license = lib.licenses.free; }; }) {}; - imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + imenus = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "imenus"; - version = "20170217.47"; + ename = "imenus"; + version = "20180505.1017"; src = fetchFromGitHub { owner = "alezost"; repo = "imenus.el"; - rev = "7eea33f0aeca0737b3d7d87aeb67073ef4b5d978"; - sha256 = "1xcw3gsw5alhdnvh7c98cwhxdjhfxrrx1nrl5zn3ibdk8cj3z0p6"; + rev = "149cfa579ee231014d3341a0e05add69759757a5"; + sha256 = "00licvs457wzqq06a8cx7vw22kyqky20i7yq7a2nzf3cfl7vaya7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc571105a8d7e2ea85391812f1fa639787fa7563/recipes/imenus"; sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r"; - name = "imenus"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -37935,19 +49316,50 @@ license = lib.licenses.free; }; }) {}; - immortal-scratch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + imgbb = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { + pname = "imgbb"; + ename = "imgbb"; + version = "20180609.949"; + src = fetchFromGitHub { + owner = "ecraven"; + repo = "imgbb.el"; + rev = "a524a46263835aa474f908827ebab4e8fa586001"; + sha256 = "1fhhpz29x9vkhzms2qkxblic96kqzg0rqsxj71vgz6fpwdb4f9gy"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/89d363862890aa7f25db1a5fc5e209bccbadf0bf/recipes/imgbb"; + sha256 = "0p29pasq0f0b5x7yig4g4n1k0y82aiapxazz359pm7n4kjy2s6qp"; + name = "recipe"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/imgbb"; + license = lib.licenses.free; + }; + }) {}; + immortal-scratch = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "immortal-scratch"; + ename = "immortal-scratch"; version = "20160517.1418"; src = fetchhg { url = "https://bitbucket.com/jpkotta/immortal-scratch"; rev = "b354aba33d91"; sha256 = "1mx9f8pwnbrm6q9ngdyv64aqkw1izj83m0mf7zqlpww7yfhv1q9b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f9f4a59d88106ddfee740653abd28e305f6dfe0/recipes/immortal-scratch"; sha256 = "0rxhaqivvjij59hhv3mh4wwrc0bl0xv144j1i237xhlvhxk6nnn6"; - name = "immortal-scratch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37955,9 +49367,13 @@ license = lib.licenses.free; }; }) {}; - immutant-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + immutant-server = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "immutant-server"; + ename = "immutant-server"; version = "20140311.1508"; src = fetchFromGitHub { owner = "leathekd"; @@ -37965,10 +49381,10 @@ rev = "2a21e65588acb6a976f2998e30b21fdabdba4dbb"; sha256 = "0rbamm9qvipgswxng8g1d7rbdbcj7sgwrccg7imcfapwwq7xhj4h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6e906492f9982e2cebd1e4838d7b7c81a295efa/recipes/immutant-server"; sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i"; - name = "immutant-server"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37976,20 +49392,27 @@ license = lib.licenses.free; }; }) {}; - impatient-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, simple-httpd }: - melpaBuild { + impatient-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild + , simple-httpd }: + melpaBuild { pname = "impatient-mode"; - version = "20180124.1828"; + ename = "impatient-mode"; + version = "20180528.916"; src = fetchFromGitHub { owner = "skeeto"; repo = "impatient-mode"; - rev = "4099906914cee4991907fc501799fb80cafa3f7d"; - sha256 = "1j9s5zpdi03qvvga59izxx3389k0g1vk2hiiivc8bph6zyr52fw0"; + rev = "96c068d5add95595dc5be42115d100cf99f908ba"; + sha256 = "18fawpnqcm1yv7f83sz05pjihwydmafmccfmizyg0hlgayhj0izf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaa64c4d43139075d77f4518de94bcbe475d21fc/recipes/impatient-mode"; sha256 = "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j"; - name = "impatient-mode"; + name = "recipe"; }; packageRequires = [ cl-lib htmlize simple-httpd ]; meta = { @@ -37997,20 +49420,26 @@ license = lib.licenses.free; }; }) {}; - import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: - melpaBuild { + import-js = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , grizzl + , lib + , melpaBuild }: + melpaBuild { pname = "import-js"; - version = "20171026.1628"; + ename = "import-js"; + version = "20180709.1133"; src = fetchFromGitHub { owner = "Galooshi"; repo = "emacs-import-js"; - rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250"; - sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3"; + rev = "fb1f167e33c388b09a2afd32fbda90a67bfb2e40"; + sha256 = "0if117lia2ykd6ai0cf5z4ddhsm9icijigwbrn079v7m9s8yl43p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js"; sha256 = "00b2qv1y8879cf8ayplmwqd36w7sppx57myi2wjhy9i2rnvdbmgn"; - name = "import-js"; + name = "recipe"; }; packageRequires = [ emacs grizzl ]; meta = { @@ -38018,9 +49447,15 @@ license = lib.licenses.free; }; }) {}; - import-popwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: - melpaBuild { + import-popwin = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popwin }: + melpaBuild { pname = "import-popwin"; + ename = "import-popwin"; version = "20170218.607"; src = fetchFromGitHub { owner = "syohex"; @@ -38028,10 +49463,10 @@ rev = "bb05a9e226f8c63fe7b18a3e92010357049ab5ba"; sha256 = "0jjm214zfq2kk8vzf67vala46lbbkjyms7qm27qv3yhcbc7ricvn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6f0629515f36e2e98839a6894ca8c0f58862dc2/recipes/import-popwin"; sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy"; - name = "import-popwin"; + name = "recipe"; }; packageRequires = [ emacs popwin ]; meta = { @@ -38039,20 +49474,27 @@ license = lib.licenses.free; }; }) {}; - importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + importmagic = callPackage ({ emacs + , epc + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "importmagic"; - version = "20170702.1844"; + ename = "importmagic"; + version = "20180519.2003"; src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5"; - sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5"; + rev = "e32ee9f6a5eef937b76eba82fdae8bae85d18088"; + sha256 = "09jq913vhqndqkck1wyp37r15pnz747rgaxivlrjgp9xd3zzpz1s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; sha256 = "1kpmgpll0zz3zlr3q863v1fq6wmwdwx7mn676x0r7g4iy1bdslmv"; - name = "importmagic"; + name = "recipe"; }; packageRequires = [ emacs epc f ]; meta = { @@ -38060,20 +49502,24 @@ license = lib.licenses.free; }; }) {}; - indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + indent-guide = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "indent-guide"; + ename = "indent-guide"; version = "20170221.327"; src = fetchFromGitHub { owner = "zk-phi"; repo = "indent-guide"; - rev = "d64f43011c72068e008621e620009ec592b35913"; - sha256 = "1zjxfwbbmg95llpkvgbwdgk6cx7g9x48y3i4v75r8d4iy2xndgq8"; + rev = "b6eb32b1ea150e54e491f1eed3b598990c4bd631"; + sha256 = "096x6fyl8cy62kbsglbhkyx45qr7a9wsmnihi8nj80d43qyzcjc2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide"; sha256 = "029fj9rr9vfmkysi6lzpwra92j6ppw675qpj3sinfq7fqqlicvp7"; - name = "indent-guide"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38081,20 +49527,24 @@ license = lib.licenses.free; }; }) {}; - indent-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + indent-info = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "indent-info"; - version = "20171216.1509"; + ename = "indent-info"; + version = "20180423.1212"; src = fetchFromGitHub { owner = "terlar"; repo = "indent-info.el"; - rev = "e63a918b16d6d1986dd9123670a762e49102ce2b"; - sha256 = "0smh7x49cl8zhhjfvcgbcnr1a4n5rck7cpg797xwi3vr00b4bzv8"; + rev = "d218b4cb3726476caee91db6f6c920856ab992bc"; + sha256 = "0z427rvvhw5raql5391sajm4rk1n2y8khsy2wqr7r66fdv5hg2mg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1274c0d871c51e358b3de577372dae8e3a04ead0/recipes/indent-info"; sha256 = "0fa6p5fvyxib1iz025kqak7navb11jlfxw5x2jr47180vv9a1373"; - name = "indent-info"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38102,9 +49552,16 @@ license = lib.licenses.free; }; }) {}; - indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: - melpaBuild { + indent-tools = callPackage ({ fetchFromGitLab + , fetchurl + , hydra + , lib + , melpaBuild + , s + , yafolding }: + melpaBuild { pname = "indent-tools"; + ename = "indent-tools"; version = "20180124.408"; src = fetchFromGitLab { owner = "emacs-stuff"; @@ -38112,10 +49569,10 @@ rev = "b650b2ca82ccd9ccb4f3142afa0da4737ddd364f"; sha256 = "01xkkrdfn3c8ivs2wc3ck2278m75gq73wv59fchb6gw1a9d6xj7d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools"; sha256 = "12rawl9qaihgyascy53yxpkknp95wh8fiqygb5cgl7d761qizvp6"; - name = "indent-tools"; + name = "recipe"; }; packageRequires = [ hydra s yafolding ]; meta = { @@ -38123,9 +49580,15 @@ license = lib.licenses.free; }; }) {}; - indicators = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + indicators = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "indicators"; + ename = "indicators"; version = "20161211.326"; src = fetchFromGitHub { owner = "Fuco1"; @@ -38133,10 +49596,10 @@ rev = "f62a1201f21453e3aca93f48483e65ae8251432e"; sha256 = "0n933jigp0awba2hxg3kwscmfmmqn3jwbrxcw3vw9aj0a5rg5bq6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72c96bad0d0b5a4f738fd1b2afe5d302eded440d/recipes/indicators"; sha256 = "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss"; - name = "indicators"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -38144,20 +49607,29 @@ license = lib.licenses.free; }; }) {}; - indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: - melpaBuild { + indium = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild + , seq + , websocket }: + melpaBuild { pname = "indium"; - version = "20180307.1359"; + ename = "indium"; + version = "20180521.1355"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "e9db390fa273b02d4e637ab94244358792caead9"; - sha256 = "1cddcnmgdjdm9aqn5nr6g2p93rd4rb0xllyf7rimgf64xnqa96hm"; + rev = "bc9ab60ded9af501fb4424359737cbff29cecfb1"; + sha256 = "1f6asv98vsxkizb1nf37q6wacqdbqnqzk035j6sdsmj7p3plb3iy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl"; - name = "indium"; + name = "recipe"; }; packageRequires = [ company emacs js2-mode seq websocket ]; meta = { @@ -38165,20 +49637,24 @@ license = lib.licenses.free; }; }) {}; - indy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + indy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "indy"; + ename = "indy"; version = "20150610.1006"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "indy"; - rev = "4604867d8111f0e186a5351e68e054a77cb14abf"; - sha256 = "17xvi39v358nff4h1f6l3l3xwjlcr9hzln5v8qmk0kq9b8gkzgxa"; + rev = "faff56fda87bafed6a1e79dc3426800f256ed1a1"; + sha256 = "1p694bcg4g7qzngak6nshcrrnf7mxb8j2cf9yskcznwri1s064dd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/indy"; sha256 = "118n3n07h1vx576fdv6v5a94aa004q0gmy9hlsnrswpxa30ahnw7"; - name = "indy"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38186,20 +49662,26 @@ license = lib.licenses.free; }; }) {}; - inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inf-clojure = callPackage ({ clojure-mode + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inf-clojure"; - version = "20180316.1140"; + ename = "inf-clojure"; + version = "20180402.1403"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "69137983d368af0dc76cfa2e9e33338b796df5f4"; - sha256 = "02admpcd7gc1zpxha2xcdydbwcr1gbc2z09dnh3yss7ddjzmgbr6"; + rev = "59868ff0433f7631c362ce25879bd4271d350ebc"; + sha256 = "1xh901krzwmvkj0rdq0hjbf41vsf92mr0w9vjb9ki660wnnjw8wc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl"; - name = "inf-clojure"; + name = "recipe"; }; packageRequires = [ clojure-mode emacs ]; meta = { @@ -38207,20 +49689,26 @@ license = lib.licenses.free; }; }) {}; - inf-crystal = callPackage ({ crystal-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inf-crystal = callPackage ({ crystal-mode + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inf-crystal"; + ename = "inf-crystal"; version = "20180118.1811"; src = fetchFromGitHub { owner = "brantou"; repo = "inf-crystal.el"; - rev = "02007b2a2a3bea44902d7c83c4acba1e39d278e3"; - sha256 = "18627gvpgw2ay7zcbglw6gwpslgh69hbvynwcyqln4c17fk9h0kw"; + rev = "dd5c85e621976ea09b602182a15396e3b510ec63"; + sha256 = "0yw2p13iah9alqq684cy410xph2a83lqs5401j0fah0qkgnjv6mh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff84c742eebb84577f362b2739f4bcf1434d58ac/recipes/inf-crystal"; sha256 = "09ssq7i5c2fxxbrsp3nn1f1ah1yv2nb19n5s1iqyykkk316k2q26"; - name = "inf-crystal"; + name = "recipe"; }; packageRequires = [ crystal-mode emacs ]; meta = { @@ -38228,20 +49716,24 @@ license = lib.licenses.free; }; }) {}; - inf-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inf-mongo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inf-mongo"; - version = "20160815.216"; + ename = "inf-mongo"; + version = "20180408.638"; src = fetchFromGitHub { owner = "tobiassvn"; repo = "inf-mongo"; - rev = "649dc6ea8e468f1d8109568548eb222c71486dbf"; - sha256 = "19n0ddzgbqhbz3qjpvvw4nasrn2qvkczrdd8kk9h28v8xix5grzp"; + rev = "2e498d1c88bd1904eeec18ed06b1a0cf8bdc2a92"; + sha256 = "1m6skisj6r3fbxadpwwgf3a3934b2qvwb7zj975qksxq56ij0wkq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b27d5354d4b30cc9dd3be730d79e5a5bc1f74/recipes/inf-mongo"; sha256 = "09hf3jmacsk4hl0rxk35cza8vjl0xfmv19dagb8h8fli97fb65hh"; - name = "inf-mongo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38249,20 +49741,24 @@ license = lib.licenses.free; }; }) {}; - inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inf-ruby = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inf-ruby"; - version = "20180309.433"; + ename = "inf-ruby"; + version = "20180521.648"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "57710da5c8c146fef805deb7dc6a2cd8ccbc11d4"; - sha256 = "0kwxa8mpn3drvn1rnfh4g1hvin8l2sa1gns01dshf1qqaa829jkb"; + rev = "49d59a7897f594e3be74ecbddae83719f9a6c0f0"; + sha256 = "1bkv825n1316sisajzrqza3mz0pjc03r6bl40dhgqf8qyjkkcq3c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp"; - name = "inf-ruby"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38270,20 +49766,24 @@ license = lib.licenses.free; }; }) {}; - inferior-spim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inferior-spim = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inferior-spim"; + ename = "inferior-spim"; version = "20160826.646"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "inferior-spim"; - rev = "fb9aa091f6058bf320793f1a608c1ed7322c1f47"; - sha256 = "0855w29rsgy04bc6m6bjggpzmlkv5z9zxx1p0qlhqr3msj1dqgfn"; + rev = "93f67ee49f1c6899a7efd52ea4e80e9f9da3371c"; + sha256 = "1ffa29clfsr3wb00irzqlazk9d0qmjxn9wy8zfca61lh0ax5khbg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2ce70b5dc05096a6de46069e8d26323d3df78b6/recipes/inferior-spim"; sha256 = "1bl29ww55vabgly84wdg18qq1md4vxzvsb6kvxymf6bpw55k313s"; - name = "inferior-spim"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38291,9 +49791,15 @@ license = lib.licenses.free; }; }) {}; - inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inflections = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inflections"; + ename = "inflections"; version = "20170913.216"; src = fetchFromGitHub { owner = "eschulte"; @@ -38301,10 +49807,10 @@ rev = "e4f1372cf22e811faca52fc86bdd5d817498a4d8"; sha256 = "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections"; sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70"; - name = "inflections"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -38312,9 +49818,39 @@ license = lib.licenses.free; }; }) {}; - info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + info-beamer = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "info-beamer"; + ename = "info-beamer"; + version = "20180604.1422"; + src = fetchFromGitHub { + owner = "dakra"; + repo = "info-beamer.el"; + rev = "af443795af20481af91ac54a489b20f6a9d90b0a"; + sha256 = "0r938pp10szrqiv37ryzfir4h5pg68farm56cpnh9hh8cnix6nrh"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e9da9aac33df6e53a8cbabcffd8e3a363298b9f3/recipes/info-beamer"; + sha256 = "0jlwvn96diwnngjbabq6wzp5q6rvmwa6p36d80nv8r7x7ch0740q"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/info-beamer"; + license = lib.licenses.free; + }; + }) {}; + info-buffer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "info-buffer"; + ename = "info-buffer"; version = "20170112.622"; src = fetchFromGitHub { owner = "llvilanova"; @@ -38322,10 +49858,10 @@ rev = "d35dad6e766c6e2ddb8dc6acb4ce5b6e10fbcaa7"; sha256 = "0czkp7cf7qmdm1jdn67gxyxz8b4qj2kby8if50d450xqwbx0da7x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer"; sha256 = "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4"; - name = "info-buffer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38333,9 +49869,15 @@ license = lib.licenses.free; }; }) {}; - info-colors = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + info-colors = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "info-colors"; + ename = "info-colors"; version = "20180205.350"; src = fetchFromGitHub { owner = "ubolonton"; @@ -38343,10 +49885,10 @@ rev = "a8ebb7b8efa314c08ea8110d8b1876afb562bb45"; sha256 = "0wvyf2w5s184kwacs6lbpjryx6hziayvdrl3crxir8gmg2kcv07m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors"; sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x"; - name = "info-colors"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -38354,9 +49896,14 @@ license = lib.licenses.free; }; }) {}; - inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inherit-local = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inherit-local"; + ename = "inherit-local"; version = "20170409.949"; src = fetchFromGitHub { owner = "shlevy"; @@ -38364,10 +49911,10 @@ rev = "b1f4ff9c41f9d64e4adaf5adcc280b82f084cdc7"; sha256 = "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87"; - name = "inherit-local"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -38375,9 +49922,13 @@ license = lib.licenses.free; }; }) {}; - ini-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ini-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ini-mode"; + ename = "ini-mode"; version = "20170424.209"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -38385,10 +49936,10 @@ rev = "2194cfa2fd13196a37350ec20b3f00dcf6162b7c"; sha256 = "0s3dcqywrbggrcn9j5nibhcl4xbnhdndz5sibcp26qswd18jyrdk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/000cca577d000bafe7bf5711d0bfe7593fb6975a/recipes/ini-mode"; sha256 = "0f6fbmg4wmlzghcibfbcx3z124b2017rhsasi5smgx9i2vkydzrm"; - name = "ini-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38396,20 +49947,24 @@ license = lib.licenses.free; }; }) {}; - init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + init-loader = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "init-loader"; + ename = "init-loader"; version = "20160528.615"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "init-loader"; - rev = "5d3cea1004c11ff96b33020e337b03b925c67c42"; - sha256 = "17bg4s8yz7yz28m04fp2ff6ld0y01yl99wkn2k5rkg4j441xg3n2"; + rev = "287da99eadfa3dd85492506db43d68324069b593"; + sha256 = "03a655qzcwizv9hvfcp47466axsrq0h049fdd79xk6zmans5s6fj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e46e6ec79ff4c76fc85e13321e6dabd5797c5f45/recipes/init-loader"; sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r"; - name = "init-loader"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38417,20 +49972,25 @@ license = lib.licenses.free; }; }) {}; - init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + init-open-recentf = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "init-open-recentf"; + ename = "init-open-recentf"; version = "20161206.645"; src = fetchFromGitHub { owner = "zonuexe"; repo = "init-open-recentf.el"; - rev = "7d8fb124806291f7f6ef2ec3a664ea25899b6d68"; - sha256 = "0vswa7304s7m6cirbaky9rmrxjb2aylvif2vg2p6l274k37c4jyh"; + rev = "5b0e1053bb4b3fa755d3b2e4f3edf0c16b8eacfe"; + sha256 = "1y6avl71lmbj5f0wprkkw5f252jhcf3nihbr460wlp3nlvhsxgan"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db8b6eced50726c788d7343137f6b4558575abf/recipes/init-open-recentf"; sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r"; - name = "init-open-recentf"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -38438,9 +49998,13 @@ license = lib.licenses.free; }; }) {}; - initsplit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + initsplit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "initsplit"; + ename = "initsplit"; version = "20160919.1118"; src = fetchFromGitHub { owner = "dabrahams"; @@ -38448,10 +50012,10 @@ rev = "c941d436eb2b10b01c76a582c5a2b23fb30751aa"; sha256 = "0vz0pfm2m3v0zk65b4ikk6yfpk282nzbm99fbzj8w76yfg240dfn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a908c8fad08cd4d7dbb586570d0f0b384bf9071/recipes/initsplit"; sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq"; - name = "initsplit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38459,9 +50023,14 @@ license = lib.licenses.free; }; }) {}; - ink-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ink-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ink-mode"; + ename = "ink-mode"; version = "20160814.416"; src = fetchFromGitHub { owner = "Kungsgeten"; @@ -38469,10 +50038,10 @@ rev = "e35f26abbaf8ea23c5aa0a0c7ef15334cdfb7b48"; sha256 = "0ixqgk101gnm2q6f2bjk2pnqlrj41krqz56lss6fmf81xhxavmpp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ink-mode"; sha256 = "02q95xay6z56i4l0j24dszxnfpjbxijlj4150nsadbv55m7nnjcf"; - name = "ink-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -38480,9 +50049,13 @@ license = lib.licenses.free; }; }) {}; - inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inkpot-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inkpot-theme"; + ename = "inkpot-theme"; version = "20171217.144"; src = fetchFromGitHub { owner = "ideasman42"; @@ -38490,10 +50063,10 @@ rev = "8d59548ff5171bf6be6acc58d111674579646124"; sha256 = "0r63rb99nm7fpw8yn3gkbfka12jqwzkdhv97hm89nvdrxdnbggfs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme"; sha256 = "1m3iygb8vbqcnsxsnwr7g2mq1n2a9r7qxp3pgm1fpwz1lngvaagf"; - name = "inkpot-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38501,20 +50074,24 @@ license = lib.licenses.free; }; }) {}; - inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inline-crypt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inline-crypt"; + ename = "inline-crypt"; version = "20170824.200"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; repo = "inline-crypt-el"; - rev = "281385b383f850fd2e895926b1cef804dd052633"; - sha256 = "0hjmq8j7y4wnjgk6z92w4ci0ag9fm6rn63z9mi3krvdv154vz2n0"; + rev = "af4981c613bfd355d5ef34da1995a8384f167fd9"; + sha256 = "119ns1a0v222wyysrf07cx94adrm26fhci530gnfc6xy5vaf24k7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b04fffe5e52f26e92930a112a64531228f94e340/recipes/inline-crypt"; sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n"; - name = "inline-crypt"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38522,9 +50099,14 @@ license = lib.licenses.free; }; }) {}; - inline-docs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inline-docs = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inline-docs"; + ename = "inline-docs"; version = "20170522.2150"; src = fetchFromGitHub { owner = "stardiviner"; @@ -38532,10 +50114,10 @@ rev = "b57f1681be6147f999cdc12abff414a0442e8897"; sha256 = "0ji8qgscs4fxp2i29l3v8z9y6i2glga6bysbcsn855pqsn00xkcv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/inline-docs"; sha256 = "1imjcx4qgrs5llindgmnvkb73fagnlxfg04s72kckgcy47c4352p"; - name = "inline-docs"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -38543,9 +50125,13 @@ license = lib.licenses.free; }; }) {}; - inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inlineR = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inlineR"; + ename = "inlineR"; version = "20120520.732"; src = fetchFromGitHub { owner = "myuhe"; @@ -38553,10 +50139,10 @@ rev = "29357186beca825e3d0451b700ec09b9ed65e37b"; sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a7228e5f23a4e66f4510b2f6fc41c36aa791991/recipes/inlineR"; sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw"; - name = "inlineR"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38564,20 +50150,24 @@ license = lib.licenses.free; }; }) {}; - insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + insert-shebang = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "insert-shebang"; - version = "20170825.438"; + ename = "insert-shebang"; + version = "20180403.514"; src = fetchFromGitHub { owner = "psachin"; repo = "insert-shebang"; - rev = "adfa473f07443b231914d277c20a3419b30399b6"; - sha256 = "10zy3vg5fr30hhv0q3jldffhjacg1yrv5d9gfkdz55ry277l3xz1"; + rev = "7bfea92ba1dae9d13d442e2f84f9fb6c05a0a9bd"; + sha256 = "01f2p58qsny7p9l6vrra0i2m2g1k05p39m0bzi906zm5awx7l0rr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang"; sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v"; - name = "insert-shebang"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38585,9 +50175,13 @@ license = lib.licenses.free; }; }) {}; - insfactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + insfactor = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "insfactor"; + ename = "insfactor"; version = "20141116.1602"; src = fetchFromGitHub { owner = "duelinmarkers"; @@ -38595,10 +50189,10 @@ rev = "7ef5446cebb08a17d4106d2e6f3c053e49e1e829"; sha256 = "112s3c0ii8zjc6vlj2im2qd2pl3hb95pq4zibm86gjpw428wd8iy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9a76a6498c2a0b0d471d3df7ae3d510d027f08c/recipes/insfactor"; sha256 = "0c6q1d864qc78sqk9iadjpd01xc7myipgnf89pqa2z75yprndvyn"; - name = "insfactor"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38606,19 +50200,23 @@ license = lib.licenses.free; }; }) {}; - instapaper = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + instapaper = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "instapaper"; + ename = "instapaper"; version = "20130104.621"; src = fetchhg { url = "https://bitbucket.com/jfm/emacs-instapaper"; rev = "8daa0058ede7"; sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/instapaper"; sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn"; - name = "instapaper"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38626,9 +50224,38 @@ license = lib.licenses.free; }; }) {}; - intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + intel-hex-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "intel-hex-mode"; + ename = "intel-hex-mode"; + version = "20180422.1731"; + src = fetchFromGitHub { + owner = "mschuldt"; + repo = "intel-hex-mode"; + rev = "e83c94e1c31a8435a88b3ae395f2bc842ef83217"; + sha256 = "0jpc6wh3agdh38wdjr1x880iiaj6698nr8dkgx114fsfj1la6f7v"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f1bf82134671b1383f5f4d4a3c180081bea66814/recipes/intel-hex-mode"; + sha256 = "02ffbrkr3zajqhrxc3grmqm632ji4fmgnfabn42islpcfq12q3i4"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/intel-hex-mode"; + license = lib.licenses.free; + }; + }) {}; + intellij-theme = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "intellij-theme"; + ename = "intellij-theme"; version = "20171017.715"; src = fetchFromGitLab { owner = "fommil"; @@ -38636,10 +50263,10 @@ rev = "1bbfff8e6742d18e9b77ed796f44da3b7bd10606"; sha256 = "0ml1gi2cn6h3xm5c78vxwv327r0rgimia1vqqi9jb09yb6lckbgj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme"; sha256 = "1g8cninmq840sl8fmhq2hcsmz7nccbjmprzcl8w1zdavfp86b97g"; - name = "intellij-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38647,20 +50274,25 @@ license = lib.licenses.free; }; }) {}; - interaction-log = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + interaction-log = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "interaction-log"; + ename = "interaction-log"; version = "20160305.501"; src = fetchFromGitHub { owner = "michael-heerdegen"; repo = "interaction-log.el"; - rev = "a49a06746d4df6bcfceec3c48dece065d635f9f9"; - sha256 = "1vmaj14k5idx1ykkp1yl0b9qr4fimwagz7p6c00xi9klvjsx566y"; + rev = "0f2d773269d1f7b93c9281226719113f5410cbd0"; + sha256 = "0mvhydb4lfm2kazmb7fab8zh7sd8l9casghn8wl42mqji3v7lfwh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b72951c339c601350a7f10aee05a7fb94bac37ea/recipes/interaction-log"; sha256 = "1r9qbvgssc2zdwgwmmwv5kapvmg1y3px7268gkiakkfanw3kqk6j"; - name = "interaction-log"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -38668,9 +50300,13 @@ license = lib.licenses.free; }; }) {}; - interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + interleave = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "interleave"; + ename = "interleave"; version = "20171003.2324"; src = fetchFromGitHub { owner = "rudolfochrist"; @@ -38678,10 +50314,10 @@ rev = "87549df30cbc681baf86b238bd14c7cf7ec11fc4"; sha256 = "07430hsyq9q90rjzxq7ifq4mlfc8k8b7l6b31s7xk1xm2snbky6b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy"; - name = "interleave"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38689,20 +50325,28 @@ license = lib.licenses.free; }; }) {}; - intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: - melpaBuild { + intero = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "intero"; - version = "20180331.1851"; + ename = "intero"; + version = "20180703.18"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "b1d3715e2009cb59c6b35c8cfa3357831fe28d39"; - sha256 = "1yi1101709k3j3zmiw6hllmcfya6k04g03hk15v6h5ghc7sy4mq1"; + rev = "60e2e3f76f647b20d9de8418f9576ea157e21864"; + sha256 = "0srim6q3p749xpqp28c6zfxf0aj0d87jdc1smn62wc37fxkf1wgq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; sha256 = "15n7ipsq8ylmq4blsycpszkx034j9sb92vqvaz30j5v307fmvs99"; - name = "intero"; + name = "recipe"; }; packageRequires = [ company emacs flycheck haskell-mode ]; meta = { @@ -38710,9 +50354,16 @@ license = lib.licenses.free; }; }) {}; - interval-list = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + interval-list = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "interval-list"; + ename = "interval-list"; version = "20150327.1018"; src = fetchFromGitHub { owner = "Fuco1"; @@ -38720,10 +50371,10 @@ rev = "38af7ecf0a493ad8f487074938a2a115f3531177"; sha256 = "1zv6m24ryls9hvla3hf8wzp6r7fzbxa1lzr1mb0wz0s292l38wjz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/afee0fed80f4fa444116b12653c034d760f5f1fb/recipes/interval-list"; sha256 = "0926z3lxkmpxalpq7hj355cjzbgpdiw7z4s8xdrpa1pi818d35zf"; - name = "interval-list"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -38731,9 +50382,14 @@ license = lib.licenses.free; }; }) {}; - interval-tree = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + interval-tree = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "interval-tree"; + ename = "interval-tree"; version = "20130325.707"; src = fetchFromGitHub { owner = "Fuco1"; @@ -38741,10 +50397,10 @@ rev = "301302f480617091cf3ab6989caac385d52543dc"; sha256 = "0fqnn9xhrc9hkaiziafjgg288l6m05416z9kz8l5845fnqsb7pb3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca0f4b62aee7ff7c4457da29fd25860a5c768319/recipes/interval-tree"; sha256 = "13zynac3h50x68f1ja72kqdrapjks2zmgqd4g7qwscq92mmh60i9"; - name = "interval-tree"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -38752,9 +50408,15 @@ license = lib.licenses.free; }; }) {}; - inverse-acme-theme = callPackage ({ autothemer, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inverse-acme-theme = callPackage ({ autothemer + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inverse-acme-theme"; + ename = "inverse-acme-theme"; version = "20170822.1954"; src = fetchFromGitHub { owner = "dcjohnson"; @@ -38762,10 +50424,10 @@ rev = "74d6f3e2f6534371509dd2d77006435156c276d6"; sha256 = "15fk60ky8kbj665yjylmgc4nn4qsk57fvarqzwv3fns64yfshkv3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme"; sha256 = "03g6h8dpn42qnr593ryhj22lj1h2nx4rdr1knhkvxygfv3c4lgh5"; - name = "inverse-acme-theme"; + name = "recipe"; }; packageRequires = [ autothemer cl-lib ]; meta = { @@ -38773,9 +50435,13 @@ license = lib.licenses.free; }; }) {}; - io-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + io-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "io-mode"; + ename = "io-mode"; version = "20161004.56"; src = fetchFromGitHub { owner = "superbobry"; @@ -38783,10 +50449,10 @@ rev = "fd65ae769093defcf554d6d637eba6e6dfc29f56"; sha256 = "1x3j4asbczfr9vrqd7bms57ngqzaik73sm2njcgjshf9c3js3aa9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29ac993c86f992a452784c75c1511d15c4718c91/recipes/io-mode"; sha256 = "1fpiml7lvbl4s2xw4wk2y10iifvfza24kd9j8qvi1bgd85qkx42q"; - name = "io-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38794,9 +50460,13 @@ license = lib.licenses.free; }; }) {}; - io-mode-inf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + io-mode-inf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "io-mode-inf"; + ename = "io-mode-inf"; version = "20140128.1134"; src = fetchFromGitHub { owner = "slackorama"; @@ -38804,10 +50474,10 @@ rev = "6dd2bac3fd87484bb7d97e135b06c29d70b444b6"; sha256 = "1ard88kc13c57y9zdkyr012w8rdrwahz8a3fb5v6hwqymg16m20s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df121fc9f71af1d060c83555ec611c422cbe8d0d/recipes/io-mode-inf"; sha256 = "0hwhvf1qwkmzzlzdda1flw6p1jjh9rzxsfwm2sc4795ac2xm6dhc"; - name = "io-mode-inf"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38815,20 +50485,24 @@ license = lib.licenses.free; }; }) {}; - ioccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ioccur = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ioccur"; + ename = "ioccur"; version = "20130821.2248"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "ioccur"; - rev = "4c0ef992a6fcd2aed62e3866d56650463108ab5a"; - sha256 = "1rz5wf19lg1lnm0h73ynhb0vl3c99k7vpipay2f8jls24pv60bra"; + rev = "2e4f83ba72bc7d0225606176de2ef7a970ca301c"; + sha256 = "111rrn1l2k40bfpcf6d9n06vhlhxhv3718kgd40ksrqz97pzq0dx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/308c27227795560adf8c979ba1d046286549843d/recipes/ioccur"; sha256 = "1a9iy6x4lkm4wgkcb0pv86c2kvpq8ymrc4ssp109r67kwqw7lrr6"; - name = "ioccur"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38836,9 +50510,14 @@ license = lib.licenses.free; }; }) {}; - iodine-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iodine-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iodine-theme"; + ename = "iodine-theme"; version = "20151031.939"; src = fetchFromGitHub { owner = "srdja"; @@ -38846,10 +50525,10 @@ rev = "02fb780e1d8d8a6b9c709bfac399abe1665c6999"; sha256 = "14zfxa8fc7h4rkz1hyplwf4q2lga3l5dd7a2xq5kk0kvf2fs4mk3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6893ce6309f1e3b3457c99e84611044e653b827a/recipes/iodine-theme"; sha256 = "05mnq0bgcla0pxsgywpvcdgd4sk2xr7bjlp87l0dx8j121vqripj"; - name = "iodine-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -38857,9 +50536,14 @@ license = lib.licenses.free; }; }) {}; - ipcalc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ipcalc = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ipcalc"; + ename = "ipcalc"; version = "20170926.105"; src = fetchFromGitHub { owner = "dotemacs"; @@ -38867,10 +50551,10 @@ rev = "2720f7e3e662e04e195f8338b81a499cf321296a"; sha256 = "1kmqbb9ca3sca59462ha21grbgxkl4wynz2lr4yqb4qk7cijgd6g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ipcalc"; sha256 = "0hw5g30pnqwzvbhf6kggyj6wij5iw7d8jgmr88pyw63kxach8vkv"; - name = "ipcalc"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -38878,9 +50562,13 @@ license = lib.licenses.free; }; }) {}; - iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iplayer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iplayer"; + ename = "iplayer"; version = "20161120.1320"; src = fetchFromGitHub { owner = "csrhodes"; @@ -38888,10 +50576,10 @@ rev = "b788fffa4b36bbd558047ffa6be51b1f0f462f23"; sha256 = "0x82mxbc6f5azzg7c4zrxz1q763k8i3y1kfb79xfspb2i64dgg5g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a97667365f1c30f53a6aeeb7b909a78888eb1/recipes/iplayer"; sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r"; - name = "iplayer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38899,20 +50587,23 @@ license = lib.licenses.free; }; }) {}; - ipretty = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ipretty = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ipretty"; - version = "20140406.2220"; - src = fetchFromGitHub { - owner = "steckerhalter"; - repo = "ipretty"; - rev = "6f6da8907abea53d6d246d61e1a0f4ebeb0b9f38"; - sha256 = "0skyd9c7pz68v17aj3h47ralszbmc4gqg552q8jpimcjd1lacc7l"; + ename = "ipretty"; + version = "20180605.2222"; + src = fetchgit { + url = "https://framagit.org/steckerhalter/ipretty.git"; + rev = "042f5cc4e6f81d59115e8335c582bb5c571c2585"; + sha256 = "0vk8k4zfqa0869fg1kzbzzgz65xg7six5m4jm8088pb2nvfn1lrr"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0a28fb8952b3827e857d49b1366ddfbc3a266813/recipes/ipretty"; - sha256 = "1zysip6cb8s4nzsxiwk052gq6higz2xnd376r9wxmgj7w8him2c4"; - name = "ipretty"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/ipretty"; + sha256 = "0nlp7xmgqsipdq8xjld0xpw3q3qlxm31r2k52hxs32rx044y6c71"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38920,9 +50611,14 @@ license = lib.licenses.free; }; }) {}; - ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ipython-shell-send = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ipython-shell-send"; + ename = "ipython-shell-send"; version = "20171212.318"; src = fetchFromGitHub { owner = "jackkamm"; @@ -38930,10 +50626,10 @@ rev = "36523a387c15ee1652a5b0e291d4d4838da5e912"; sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send"; sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8"; - name = "ipython-shell-send"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -38941,9 +50637,14 @@ license = lib.licenses.free; }; }) {}; - iqa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iqa = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iqa"; + ename = "iqa"; version = "20170722.834"; src = fetchFromGitHub { owner = "a13"; @@ -38951,10 +50652,10 @@ rev = "08e3f70d0a3ed95a0c5675ae88e7966474ecc45a"; sha256 = "1n7ghcixk16n6x8p7128mqjfcsalxfyp3asydnijw7qp358l7f9r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9bd2e952d98f7ac2dc823581b07b65e951e9e45/recipes/iqa"; sha256 = "02yrkizk4ssip44s6r62finsrf45hxj9cpil1xrvh8g4jbsmfsw4"; - name = "iqa"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -38962,20 +50663,24 @@ license = lib.licenses.free; }; }) {}; - ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ir-black-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ir-black-theme"; + ename = "ir-black-theme"; version = "20130302.2355"; src = fetchFromGitHub { owner = "jmdeldin"; repo = "ir-black-theme.el"; - rev = "36e930d107604b5763c80294a6f92aaa02e6c272"; - sha256 = "1cy9xwhswj9vahg8zr16r2crm2mm3vczqs73gc580iidasb1q1i2"; + rev = "ee6078bc67cbc15184e64e0f1fc8542d4079d55f"; + sha256 = "0yha2623zfy9q97y48v6fgg20ghig9zdlv80s30iqj9lwaf3v2md"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e725582bc322d03c9dca2b22e8606444fd8753c/recipes/ir-black-theme"; sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v"; - name = "ir-black-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38983,9 +50688,13 @@ license = lib.licenses.free; }; }) {}; - iregister = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iregister = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iregister"; + ename = "iregister"; version = "20150515.1407"; src = fetchFromGitHub { owner = "atykhonov"; @@ -38993,10 +50702,10 @@ rev = "6a48c66187289de5f300492be11c83e98410c018"; sha256 = "1ch610b3d0x3nxglp749305syliivamc108rgv9if4ihb67gp8b5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a12a51873444b84765758e18c9cf24d85a200e44/recipes/iregister"; sha256 = "0iq1nlj5czi4nblrszfv3grkl1fni7blh8bhcfccidms8v9r3mdm"; - name = "iregister"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39004,20 +50713,26 @@ license = lib.licenses.free; }; }) {}; - irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + irony = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "irony"; - version = "20180308.1256"; + ename = "irony"; + version = "20180703.1040"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "847cf4e84f554fdcce49587747f0c18dae12b3ba"; - sha256 = "004b9av02q9165rfr6b3c7qfbry72s9bdkfs3n40f4fp25dcwq0q"; + rev = "91353a291509f0615fabaedcd92663cd6d94d345"; + sha256 = "12951pqrk5r9wr4ir1nr810g8p6ddyldh1m6f48r7999fb5y14rw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a"; - name = "irony"; + name = "recipe"; }; packageRequires = [ cl-lib json ]; meta = { @@ -39025,9 +50740,16 @@ license = lib.licenses.free; }; }) {}; - irony-eldoc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: - melpaBuild { + irony-eldoc = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , irony + , lib + , melpaBuild }: + melpaBuild { pname = "irony-eldoc"; + ename = "irony-eldoc"; version = "20170502.1208"; src = fetchFromGitHub { owner = "ikirill"; @@ -39035,10 +50757,10 @@ rev = "0df5831eaae264a25422b061eb2792aadde8b3f2"; sha256 = "1l5qpr66v1l12fb50yh73grb2rr85xxmbj19mm33b5rdrq2bqmmd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc42459d5c1671bd478d781339f2572b3de2e7d0/recipes/irony-eldoc"; sha256 = "03m0h13jd37vfvn4mavaq3vbzx4x0lklbs0mbc29zaz8pwqlcwz6"; - name = "irony-eldoc"; + name = "recipe"; }; packageRequires = [ cl-lib emacs irony ]; meta = { @@ -39046,9 +50768,14 @@ license = lib.licenses.free; }; }) {}; - isearch-dabbrev = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + isearch-dabbrev = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "isearch-dabbrev"; + ename = "isearch-dabbrev"; version = "20141223.2222"; src = fetchFromGitHub { owner = "Dewdrops"; @@ -39056,10 +50783,10 @@ rev = "1efe7abba4923015cbc2462395deaec5446a9cc8"; sha256 = "17d0816awadvsw1qc7r0p6ira75jmgxaj9hsk9ypayxsaf6ynyrb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9dfc7c1112bac8744910c58f77a98a901fd8065/recipes/isearch-dabbrev"; sha256 = "1hl7zl5vjcsk3z452874g4nfcnmna8m2242dc9cgpl5jddzwqa7x"; - name = "isearch-dabbrev"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -39067,9 +50794,13 @@ license = lib.licenses.free; }; }) {}; - isearch-symbol-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + isearch-symbol-at-point = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "isearch-symbol-at-point"; + ename = "isearch-symbol-at-point"; version = "20130728.1521"; src = fetchFromGitHub { owner = "re5et"; @@ -39077,10 +50808,10 @@ rev = "51a1029bec1ec414885f9edb7e5947603dffdab2"; sha256 = "09z49850c32x0rchxg203cxg504xi2b6cjgnd0i4axcs5fmq7gv9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733de00a1800645674e83c5e21c80f2890c4e7c/recipes/isearch-symbol-at-point"; sha256 = "0j5fr7qdvpd5b096h5a83fz8sh9wybdnsgix6v94gv8lkzdsqkr8"; - name = "isearch-symbol-at-point"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39088,9 +50819,13 @@ license = lib.licenses.free; }; }) {}; - isend-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + isend-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "isend-mode"; + ename = "isend-mode"; version = "20171118.745"; src = fetchFromGitHub { owner = "ffevotte"; @@ -39098,10 +50833,10 @@ rev = "88d4576e70e5874115c305ab2767d181dfda5985"; sha256 = "0pnzy5000m34f20q97my8ahcsgr0fqyhmfzbmds5bc269vsnbr6g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ef6e4dab78a4c333647a85ed07a81da8083ec0c/recipes/isend-mode"; sha256 = "0sk80a08ny9vqw94klqfgii297qm633000wlcldha76ip8viikdv"; - name = "isend-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39109,9 +50844,13 @@ license = lib.licenses.free; }; }) {}; - isgd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + isgd = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "isgd"; + ename = "isgd"; version = "20150414.236"; src = fetchFromGitHub { owner = "chmouel"; @@ -39119,10 +50858,10 @@ rev = "764306dadd5a9213799081a48aba22f7c75cca9a"; sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5ff75b269fd57c5822277b9ed850c69b626f1a5/recipes/isgd"; sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi"; - name = "isgd"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39130,30 +50869,40 @@ license = lib.licenses.free; }; }) {}; - isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + isortify = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pythonic }: + melpaBuild { pname = "isortify"; - version = "20180312.2132"; + ename = "isortify"; + version = "20180612.622"; src = fetchFromGitHub { owner = "proofit404"; repo = "isortify"; - rev = "2e53c9ce3fa1ef80b08a8568cdae19a3669f3056"; - sha256 = "1l2py65xr0m3w9lc6qp2jcc9477kjhkfnjdnkgfimz6aqlg1p9xg"; + rev = "442f12fa91695a43a4b542f7b82d6ac9b004729b"; + sha256 = "02rjyza8a0j3a2jfm9ps8gvsjqx3gxznaxw1d1zjam0a87fp7p1k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify"; sha256 = "0nlpjd6mrhv8iccdny0x5lb41dpyp6l7kiax4xqra0rb2vq0chcs"; - name = "isortify"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs pythonic ]; meta = { homepage = "https://melpa.org/#/isortify"; license = lib.licenses.free; }; }) {}; - iss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iss-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iss-mode"; + ename = "iss-mode"; version = "20141001.1213"; src = fetchFromGitHub { owner = "rasmus-toftdahl-olesen"; @@ -39161,10 +50910,10 @@ rev = "3b517aff31529bab33f8d7b562bd17aff0107fd1"; sha256 = "0992lzgar0kz9i1sk5vz17q9qzfgl8fkyxa1q0hmhgnpjf503cnj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ecc9f618b9f065f593b91c1c1221a550ab752bae/recipes/iss-mode"; sha256 = "1my4vi1x07hg0dva97i685lx6m6fcbfk16j1zy93zriyd7z5plkc"; - name = "iss-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39172,9 +50921,13 @@ license = lib.licenses.free; }; }) {}; - itail = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + itail = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "itail"; + ename = "itail"; version = "20171112.4"; src = fetchFromGitHub { owner = "re5et"; @@ -39182,10 +50935,10 @@ rev = "6e43c20da03be3b9c6ece93b7dc3495975ec1888"; sha256 = "044nzxh1hq41faxw3lix0wy78vfz304pjcaa5a11dqfz7q3gx5cv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b810bf1deeb79064144d8b684fab336686018ef/recipes/itail"; sha256 = "0mcyly88a3c15hl3wll56agpdsyvd26r501h0v64lasfr4k634m7"; - name = "itail"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39193,9 +50946,14 @@ license = lib.licenses.free; }; }) {}; - itasca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + itasca = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "itasca"; + ename = "itasca"; version = "20170601.922"; src = fetchFromGitHub { owner = "jkfurtney"; @@ -39203,10 +50961,10 @@ rev = "3d15dd1b70d6db69b0f4758a3e28b8b506cc84ca"; sha256 = "0mfcl7ka7r5mx52xvf13i3799ddkdi9sq2q4p2rkgb96r37ia221"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/itasca"; sha256 = "0j0lvs9x2j3z5yyhbgmymccswi40vv1gz3sl56bl857m1hlxzshz"; - name = "itasca"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -39214,20 +50972,25 @@ license = lib.licenses.free; }; }) {}; - iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iter2 = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iter2"; - version = "20171128.1211"; + ename = "iter2"; + version = "20180510.633"; src = fetchFromGitHub { owner = "doublep"; repo = "iter2"; - rev = "b0e8ecebe2d6807403a5eb1c75d68a4706259d4e"; - sha256 = "038z7scy572n6cx0z59kiz59v7zqvn70wg2bwka5f3pglr67wzhp"; + rev = "f8fb8dc7230cdcd37c5d0e4e5a432125c13816d2"; + sha256 = "13q8p9cjz9c9j2l4vlwy6nvwh9y3b0aclg1b32zfdqhs6kmypisd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2"; sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65"; - name = "iter2"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -39235,9 +50998,15 @@ license = lib.licenses.free; }; }) {}; - iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iterator = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iterator"; + ename = "iterator"; version = "20170207.38"; src = fetchFromGitHub { owner = "thierryvolpiatto"; @@ -39245,10 +51014,10 @@ rev = "9da54f9aed945b46866782cdf962c9e530419297"; sha256 = "0r50hdyr9s18p7ggiyv36g011jgg47bgszvjgcmpp23rz131mxyw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66aa4c3b43083a0098ee3163005dcc36d7251146/recipes/iterator"; sha256 = "17q10fw6y0icsv6vv9n968bwmbjlihrpkkyw62d1kfxhs9yw659z"; - name = "iterator"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -39256,9 +51025,15 @@ license = lib.licenses.free; }; }) {}; - ivariants = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivs-edit, lib, melpaBuild }: - melpaBuild { + ivariants = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivs-edit + , lib + , melpaBuild }: + melpaBuild { pname = "ivariants"; + ename = "ivariants"; version = "20170822.1924"; src = fetchFromGitHub { owner = "kawabata"; @@ -39266,10 +51041,10 @@ rev = "ca0b74d32b5d2d77a45cc6ad6edc00be0ee85284"; sha256 = "16hygfx9gla6yhc3kaiy4m6g910m1hak3v86fnpf12kzvjjs9zfx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ivariants"; sha256 = "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw"; - name = "ivariants"; + name = "recipe"; }; packageRequires = [ emacs ivs-edit ]; meta = { @@ -39277,9 +51052,16 @@ license = lib.licenses.free; }; }) {}; - ivs-edit = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ivs-edit = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ivs-edit"; + ename = "ivs-edit"; version = "20170818.741"; src = fetchFromGitHub { owner = "kawabata"; @@ -39287,10 +51069,10 @@ rev = "5db39c234aa7393b591168a4fd0a9a4cbbca347d"; sha256 = "1sdl83cf87zbv0ynvb6qlgbpm4d3dqhdn84jhhs5j247r5qzhmz6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ivs-edit"; sha256 = "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2"; - name = "ivs-edit"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -39298,20 +51080,25 @@ license = lib.licenses.free; }; }) {}; - ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ivy = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ivy"; - version = "20180326.1231"; + ename = "ivy"; + version = "20180719.1037"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f8cdaa7f3c733b88865650d10d9138bcb40a9ba8"; - sha256 = "0gfaj5ygjmvrmghyqghp7i6wf5abiayb28av4291plpyl0liz78h"; + rev = "31e18fd15780c5f6eedbe3d6a14f86aade673d01"; + sha256 = "0xv9ddgq218xy68bbf7d8l243g932viwlqmlk04jmalk3qyv4hj9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; sha256 = "0xf5p91r2ljl93wbr5wbgnb4hzhs00wkaf4fmdlf31la8xwwp5ci"; - name = "ivy"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -39319,20 +51106,31 @@ license = lib.licenses.free; }; }) {}; - ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: - melpaBuild { + ivy-bibtex = callPackage ({ biblio + , cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parsebib + , s + , swiper }: + melpaBuild { pname = "ivy-bibtex"; - version = "20180328.1147"; + ename = "ivy-bibtex"; + version = "20180612.619"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "5be84d36758ed7d5838cc5c8796a6ff427ba7043"; - sha256 = "1pqg49mj22izilx8x9rshflpyiw1q9zrp881nasp5lvbihwydvrg"; + rev = "21f802aaf5b78dec18b72601dd8276c5244e39f5"; + sha256 = "13jg728v8k227p68ngiwknlygzqdvasg6n9ax1a2xgjbx3di12vv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; sha256 = "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2"; - name = "ivy-bibtex"; + name = "recipe"; }; packageRequires = [ biblio cl-lib dash f parsebib s swiper ]; meta = { @@ -39340,9 +51138,16 @@ license = lib.licenses.free; }; }) {}; - ivy-dired-history = callPackage ({ cl-lib ? null, counsel, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + ivy-dired-history = callPackage ({ cl-lib ? null + , counsel + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-dired-history"; + ename = "ivy-dired-history"; version = "20170625.2256"; src = fetchFromGitHub { owner = "jixiuf"; @@ -39350,10 +51155,10 @@ rev = "c9c67ea1ee5e68443f0e6006ba162d6c8d868b69"; sha256 = "1lim9zi57w011df5zppb18yjkaxkgfy796pc6i01p4dl32x0rpfv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad37f6b04ff45fbffeadefc94db16baa27bcc2ac/recipes/ivy-dired-history"; sha256 = "1vj073k5m0l8rx9iiisikzl053ad9mlhvbk30f5zmw9sw7b9blyl"; - name = "ivy-dired-history"; + name = "recipe"; }; packageRequires = [ cl-lib counsel ivy ]; meta = { @@ -39361,20 +51166,29 @@ license = lib.licenses.free; }; }) {}; - ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + ivy-erlang-complete = callPackage ({ async + , counsel + , emacs + , erlang + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-erlang-complete"; - version = "20180311.558"; + ename = "ivy-erlang-complete"; + version = "20180715.2144"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "62e2b14ff25b0c143c882cb38d029b216acc3dd6"; - sha256 = "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568"; + rev = "6dad91e4951ed6fd8886bfee587144da18b57049"; + sha256 = "1padq39s8k4p16bgxi0cyy1q0rqa89w38a0nzkc3kvnq3iycixlp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; sha256 = "00fqjgrhvcn3ibpgiy4b0sr4x9p6ym5r1rvi4rdzsw2i3nxmgf3a"; - name = "ivy-erlang-complete"; + name = "recipe"; }; packageRequires = [ async counsel emacs erlang ivy ]; meta = { @@ -39382,30 +51196,42 @@ license = lib.licenses.free; }; }) {}; - ivy-feedwrangler = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + ivy-feedwrangler = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-feedwrangler"; - version = "20171121.1306"; + ename = "ivy-feedwrangler"; + version = "20180618.822"; src = fetchFromGitHub { owner = "asimpson"; repo = "ivy-feedwrangler"; - rev = "ad4f94f8cc4557876ea0b0fb9b519f16ce23e96a"; - sha256 = "1w312qh6ng4xrj3xmpm4pzfswj3kpwzjb3vbad0pig8cp0zrc39c"; + rev = "051eac49cae32b16fab2e06ff0115cd8fb5dc499"; + sha256 = "1irp76kbg8d7wmgvfjbb4c3wmd29bdrl503jkq4w52fl57g94cvj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1c112939545f6d157111eabcb573738b09ef7c/recipes/ivy-feedwrangler"; sha256 = "1mxm37biix8c0s32gfv4pidffvlgdz5i9325zk71fhgfzqwkf5vx"; - name = "ivy-feedwrangler"; + name = "recipe"; }; - packageRequires = [ ivy ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/ivy-feedwrangler"; license = lib.licenses.free; }; }) {}; - ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }: - melpaBuild { + ivy-gitlab = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , gitlab + , ivy + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ivy-gitlab"; + ename = "ivy-gitlab"; version = "20180312.947"; src = fetchFromGitHub { owner = "nlamirault"; @@ -39413,10 +51239,10 @@ rev = "68318aca3206d50701039c9aae39734ca29a49f9"; sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab"; sha256 = "0gbwsmb6my0327f9j96s20mybnjaw9yaiwhs3sy3vav0qww91z1y"; - name = "ivy-gitlab"; + name = "recipe"; }; packageRequires = [ dash gitlab ivy s ]; meta = { @@ -39424,20 +51250,28 @@ license = lib.licenses.free; }; }) {}; - ivy-historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, historian, ivy, lib, melpaBuild }: - melpaBuild { + ivy-historian = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flx + , historian + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-historian"; + ename = "ivy-historian"; version = "20170715.2120"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "ec3dfa8786473e52ffc5ca9be95dbc59a9a87ff7"; - sha256 = "1bxigdg3pmgc0s4il1spdw0p8y98k4hwwd89m4i3y97l43asy6p1"; + rev = "6cc124987e18501a1f6f9a384144a22424be3ad8"; + sha256 = "1r2p8fqbc1ms9wrhkxqqmmi8cyba1xdsy9yk2yq1rrivhqpl9fq7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian"; sha256 = "0yzq3rr51q5d64pfc7x5jszz77x6nwpbjj0g74x5ga3bsw3i67d9"; - name = "ivy-historian"; + name = "recipe"; }; packageRequires = [ emacs flx historian ivy ]; meta = { @@ -39445,20 +51279,27 @@ license = lib.licenses.free; }; }) {}; - ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: - melpaBuild { + ivy-hydra = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , hydra + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-hydra"; - version = "20180208.912"; + ename = "ivy-hydra"; + version = "20180614.1500"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f8cdaa7f3c733b88865650d10d9138bcb40a9ba8"; - sha256 = "0gfaj5ygjmvrmghyqghp7i6wf5abiayb28av4291plpyl0liz78h"; + rev = "8c1a191764446397f31d4c8e47e687f5b521e46f"; + sha256 = "14csqz3mj33rjby8vgzlarcymn97jx8678w4n6mfd9m1h40fb7nv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; sha256 = "1xv8nfi6dzhx868h44ydq4f5jmsa7rbqfa7jk8g0z0ifv477hrvx"; - name = "ivy-hydra"; + name = "recipe"; }; packageRequires = [ emacs hydra ivy ]; meta = { @@ -39466,9 +51307,15 @@ license = lib.licenses.free; }; }) {}; - ivy-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + ivy-lobsters = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-lobsters"; + ename = "ivy-lobsters"; version = "20171202.1241"; src = fetchFromGitHub { owner = "julienXX"; @@ -39476,10 +51323,10 @@ rev = "4364df4b3685fd1b50865ac9360fb948c0288dd1"; sha256 = "1cfcy2ks0kb04crwlfp02052zcwg384cgz7xjyafwqynm77d35l0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9774fbf133ce8db3ce996b1a40c586309a2fec6/recipes/ivy-lobsters"; sha256 = "1g8bwlh4nls21k16r1pmqmb633j19h3jnjbfl2vixyrh2na8ff1w"; - name = "ivy-lobsters"; + name = "recipe"; }; packageRequires = [ cl-lib ivy ]; meta = { @@ -39487,20 +51334,28 @@ license = lib.licenses.free; }; }) {}; - ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }: - melpaBuild { + ivy-mpdel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , libmpdel + , melpaBuild + , mpdel }: + melpaBuild { pname = "ivy-mpdel"; - version = "20180319.757"; + ename = "ivy-mpdel"; + version = "20180502.1148"; src = fetchFromGitHub { owner = "mpdel"; repo = "ivy-mpdel"; - rev = "6948fba6872b4f9b6cca9c73b968bd8cd5aae62f"; - sha256 = "152gmqjc4sq3210ckb974b7xqqc3admshgjnazgz32239v0l5gyk"; + rev = "16c0e67e4411c4da158a708edf427505ebbf8845"; + sha256 = "0ddvp8d5vxab40rmk7zj5r8hwgszrl18p0mj8fal7yp1f8la550d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel"; sha256 = "1v9xiy4bs7r24li6fwi5dfqav8dfr3dy0xhj3wnzvcgwxp5ji56r"; - name = "ivy-mpdel"; + name = "recipe"; }; packageRequires = [ emacs ivy libmpdel mpdel ]; meta = { @@ -39508,20 +51363,26 @@ license = lib.licenses.free; }; }) {}; - ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + ivy-pages = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-pages"; + ename = "ivy-pages"; version = "20160728.1220"; src = fetchFromGitHub { owner = "igorepst"; repo = "ivy-pages"; - rev = "47b03a1f9384502cf22369ff31a2898c863d3aff"; - sha256 = "0jv74s8jn1sdwdhxkx11gnaqcc49369gld1g6a1hl62521j897rc"; + rev = "428a901f94c9625c8407fd2bf76f9d7714d40d87"; + sha256 = "11lcv8dqlmfqvhn7n3wfp9idr5hf30312p213y5pvs4m70lbc9k2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93f1183beb74aa4a96de8cd043a2a8eefdd7ad7e/recipes/ivy-pages"; sha256 = "0zz8nbjma8r6r7xxbg7xfz13202d77k1ybzpib41slmljzh7xgwv"; - name = "ivy-pages"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -39529,9 +51390,16 @@ license = lib.licenses.free; }; }) {}; - ivy-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, password-store }: - melpaBuild { + ivy-pass = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , password-store }: + melpaBuild { pname = "ivy-pass"; + ename = "ivy-pass"; version = "20170812.1255"; src = fetchFromGitHub { owner = "ecraven"; @@ -39539,10 +51407,10 @@ rev = "5b523de1151f2109fdd6a8114d0af12eef83d3c5"; sha256 = "18crb4zh2pjf0cmv3b913m9vfng27girjwfqc3mk7vqd1r5a49yk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bfef855e071442d2b9d1e0ce9b5706937bffc53/recipes/ivy-pass"; sha256 = "1sb29q22fsjqfxqznf73xcqhzy132bjd45w7r27sfmf825vcysci"; - name = "ivy-pass"; + name = "recipe"; }; packageRequires = [ emacs ivy password-store ]; meta = { @@ -39550,9 +51418,16 @@ license = lib.licenses.free; }; }) {}; - ivy-phpunit = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, phpunit }: - melpaBuild { + ivy-phpunit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , phpunit }: + melpaBuild { pname = "ivy-phpunit"; + ename = "ivy-phpunit"; version = "20180219.115"; src = fetchFromGitHub { owner = "12pt"; @@ -39560,10 +51435,10 @@ rev = "ffedb0138d36564e8e36a28fd9bc71ea8944681f"; sha256 = "0kf1k3jqg2r20x985h6brg92sg7y47c5vkfjky8xp11gqyqw47bi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93822c5588f81683e3d43f690785b80c207d331d/recipes/ivy-phpunit"; sha256 = "1spvcf41lvjdmiwp6058wrpp0hfg1cjld6b7zm28m2ys6mn35ycs"; - name = "ivy-phpunit"; + name = "recipe"; }; packageRequires = [ emacs ivy phpunit ]; meta = { @@ -39571,20 +51446,27 @@ license = lib.licenses.free; }; }) {}; - ivy-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, posframe }: - melpaBuild { + ivy-posframe = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , posframe }: + melpaBuild { pname = "ivy-posframe"; - version = "20180309.132"; + ename = "ivy-posframe"; + version = "20180707.2016"; src = fetchFromGitHub { owner = "tumashu"; repo = "ivy-posframe"; - rev = "b9b9a45455692d06b89d4fbf40bba6852b9a109a"; - sha256 = "1sc8mwk5ans3l0p465wl3blvchfmkhyg06x95b0dnkjldzkk2v6a"; + rev = "ff2578a044dbe3ba5711ed727cc778b5aa108676"; + sha256 = "0nphklyn3czr5zvdl5m31fc3sc80mn0izdmmxnq9cj7hz8fc61ch"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e7c6f7ca439683abf11dcaa38672ac139c0da4f/recipes/ivy-posframe"; sha256 = "1sv4xvdvb1g8g5m4f1f159lxbxaz96drsmvhh0k43hp1dh3bhj3b"; - name = "ivy-posframe"; + name = "recipe"; }; packageRequires = [ emacs ivy posframe ]; meta = { @@ -39592,9 +51474,44 @@ license = lib.licenses.free; }; }) {}; - ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }: - melpaBuild { + ivy-prescient = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , prescient }: + melpaBuild { + pname = "ivy-prescient"; + ename = "ivy-prescient"; + version = "20180716.907"; + src = fetchFromGitHub { + owner = "raxod502"; + repo = "prescient.el"; + rev = "a1464272d62f4054c314d1a3196f7b7673325752"; + sha256 = "1w6xbyrk48mdv7iyspqkjv7ppp4r8rf1dispk08p8qig2d9crvl7"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient"; + sha256 = "017ibpbj390q5d051k3wn50774wvcixzbwikvi5ifzqkhgixqk9c"; + name = "recipe"; + }; + packageRequires = [ emacs ivy prescient ]; + meta = { + homepage = "https://melpa.org/#/ivy-prescient"; + license = lib.licenses.free; + }; + }) {}; + ivy-purpose = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , window-purpose }: + melpaBuild { pname = "ivy-purpose"; + ename = "ivy-purpose"; version = "20160724.303"; src = fetchFromGitHub { owner = "bmag"; @@ -39602,10 +51519,10 @@ rev = "0495f2f3aed64d7e0028125e76a9a68f8fc4107e"; sha256 = "1hiw7mnrr0cnnp0a2mh837pzdaknadwv0sk82vya6blx0a7m691g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1fa2a37a1a6492eddf638216acec4b9d54d3498d/recipes/ivy-purpose"; sha256 = "0c5n7x3sa57wslwnldvc0i315xhyi1zndyhr07rzka1rhj8v1c4v"; - name = "ivy-purpose"; + name = "recipe"; }; packageRequires = [ emacs ivy window-purpose ]; meta = { @@ -39613,20 +51530,26 @@ license = lib.licenses.free; }; }) {}; - ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + ivy-rich = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-rich"; - version = "20180314.1909"; + ename = "ivy-rich"; + version = "20180704.1845"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "69314197b6563b87d145eb13ea16efd5b20513a6"; - sha256 = "1a09mf51nbjvz8i91vx09rricvnlpmnh1znwhrxi5iiwa1pd0dlh"; + rev = "6575eb27510e841607b9e8cea87998a50fbc7be7"; + sha256 = "0agnpkkwvhf3g0cpl1c8p5dj4cnlg3890pg73p4rvrv2i27ni2h4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; sha256 = "0knkqc403gch4dp1q114h64cwwisxwnsxjqbl3cnidlwkn7lzk7m"; - name = "ivy-rich"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -39634,20 +51557,26 @@ license = lib.licenses.free; }; }) {}; - ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }: - melpaBuild { + ivy-rtags = callPackage ({ fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , rtags }: + melpaBuild { pname = "ivy-rtags"; + ename = "ivy-rtags"; version = "20170522.2154"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "a595d13f60c13d67a28467b3941d5ed558102e91"; - sha256 = "0yp6h6nsbji7dmc9pnf9qi7zsqxrxa1bln90bn0y71xf6z11kbp4"; + rev = "7e6b6f21935eedbe4678ba91c5531ac162b51a5a"; + sha256 = "12629d1s8rplhjh17n3bmgnkpscq4gljgyl84j8qyhh40dwq1qk0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; sha256 = "18f0jak643dd8lmx701wgk95miajabd8190ls35831slr28lqxsq"; - name = "ivy-rtags"; + name = "recipe"; }; packageRequires = [ ivy rtags ]; meta = { @@ -39655,9 +51584,15 @@ license = lib.licenses.free; }; }) {}; - ivy-todo = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + ivy-todo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-todo"; + ename = "ivy-todo"; version = "20171208.809"; src = fetchFromGitHub { owner = "Kungsgeten"; @@ -39665,10 +51600,10 @@ rev = "964e347cea1a6097854d7113f5b07f6c5ef81df0"; sha256 = "07208qdk1a77dgh9qmpn164x5mgkzvprsdvb7y35ax12r2q541b8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97909da7899d4187e8eb6b3284f6225ebec7fa51/recipes/ivy-todo"; sha256 = "12sfg2rbnk73a34ap94g4g70gx13llcgsrmfdrgrzk83a2274a2r"; - name = "ivy-todo"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -39676,20 +51611,26 @@ license = lib.licenses.free; }; }) {}; - ivy-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + ivy-xcdoc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-xcdoc"; + ename = "ivy-xcdoc"; version = "20160917.355"; src = fetchFromGitHub { owner = "hex2010"; repo = "emacs-ivy-xcdoc"; - rev = "5ea22af36c4c2737fb0bec53432c233482d8b314"; - sha256 = "1m5ljx395yw70fx643pnf7pk709s9v5b77zvvv3j21d0cjnppqz5"; + rev = "fbf264b0746182567b17fd7409fff8eed3658c71"; + sha256 = "1y55p3qaz054lxb7q8vq00h3spyfbc9xnilm26b4vcps5y0limp6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2fd855c098ca65293d84c3b526b0c39f7b07ade/recipes/ivy-xcdoc"; sha256 = "1my45325ys2m2l5y8pmi5jnbplqm16b1n7zll37163vv16zwnd53"; - name = "ivy-xcdoc"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -39697,20 +51638,26 @@ license = lib.licenses.free; }; }) {}; - ivy-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + ivy-xref = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-xref"; - version = "20180201.1919"; + ename = "ivy-xref"; + version = "20180701.2117"; src = fetchFromGitHub { owner = "alexmurray"; repo = "ivy-xref"; - rev = "4d2c437b479733e4159a356c9909ed3e110403a1"; - sha256 = "19gzsphcmkzyihcijb0609ykv98ak24p3z4k0ifil5r40iss1d1n"; + rev = "f8ab1eeab05f025a97ddf2f239862db14e3430e9"; + sha256 = "0k6v3iamdchwnlpr1vbw1wjzc8hr2745qpvmwa74rsqgbj79p9pg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref"; sha256 = "1p5a0x83b0bc7b654j1d207s7vifffgwmp26pya2mz0czd68ywy8"; - name = "ivy-xref"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -39718,20 +51665,56 @@ license = lib.licenses.free; }; }) {}; - ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }: - melpaBuild { + ivy-yasnippet = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , yasnippet }: + melpaBuild { + pname = "ivy-yasnippet"; + ename = "ivy-yasnippet"; + version = "20180620.2336"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "ivy-yasnippet"; + rev = "817c52a0f74dcd156c7f8c6433dfb6b32753428a"; + sha256 = "1qx71alaj3bzis6qd3vs9jg52lkr871830rbpgxy1s7ks6qj79yd"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8c76857d716afab46f5efe46e353935921d5f217/recipes/ivy-yasnippet"; + sha256 = "180q6hrsnkssbf9x9bj74dyy26kym4akbsjlj81x4193nnmc5w67"; + name = "recipe"; + }; + packageRequires = [ dash emacs ivy yasnippet ]; + meta = { + homepage = "https://melpa.org/#/ivy-yasnippet"; + license = lib.licenses.free; + }; + }) {}; + ivy-youtube = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , request }: + melpaBuild { pname = "ivy-youtube"; + ename = "ivy-youtube"; version = "20171112.732"; src = fetchFromGitHub { owner = "squiter"; repo = "ivy-youtube"; - rev = "8168dc1f26521830dfd99466d35ab93159afd004"; - sha256 = "1yds7ffqd9rd87vypvnpzl4i7678f6879hdj4whr9zn47hsbdfzn"; + rev = "23e1089d4c4fc32db20df14ba10078aabf117e87"; + sha256 = "0m70vxjj49kf8bzni2qchgzgx808z1fcfh02cflkhjcb77dkq8d6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube"; sha256 = "1masw9qc33valx55klfhzx0bg1hfazmn5yd9wh12q2gjsz8nxyw4"; - name = "ivy-youtube"; + name = "recipe"; }; packageRequires = [ cl-lib ivy request ]; meta = { @@ -39739,20 +51722,25 @@ license = lib.licenses.free; }; }) {}; - ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }: - melpaBuild { + ix = callPackage ({ fetchFromGitHub + , fetchurl + , grapnel + , lib + , melpaBuild }: + melpaBuild { pname = "ix"; + ename = "ix"; version = "20131027.929"; src = fetchFromGitHub { owner = "theanalyst"; repo = "ix.el"; - rev = "aea4c54a5cc5a6f26637353c16a3a0e70fc76963"; - sha256 = "069alh9vs6is3hvbwxbwr9g8qq9md5c92wg5bfswi99yciqdvc4i"; + rev = "47632caf925fbb3cc8633834d2d619032d039336"; + sha256 = "1j6axmi6fxcl2ja4660ygxchggm2dzjngi0k3g6pimawykvgxs3n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a9d68fcf5bddbf07909b77682474dc592077051/recipes/ix"; sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3"; - name = "ix"; + name = "recipe"; }; packageRequires = [ grapnel ]; meta = { @@ -39760,20 +51748,24 @@ license = lib.licenses.free; }; }) {}; - iy-go-to-char = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iy-go-to-char = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iy-go-to-char"; + ename = "iy-go-to-char"; version = "20141029.846"; src = fetchFromGitHub { owner = "doitian"; repo = "iy-go-to-char"; - rev = "04ab4f5f3a241cbbc9b8c178a22b412a62f632f9"; - sha256 = "0bcm3y3qvsrk7gd23xfzz5bgcnm3h4l63w9hv8cr9n86sm8475m1"; + rev = "11b2a90d10e29151d18f8997f804b745b710b040"; + sha256 = "1jgs41mf3nizjiiq64gzymjvd559mffr1agj9hvq0x42a3dwfc81"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/iy-go-to-char"; sha256 = "10szn9y7gl8947p3f9w6p6vzjf1a9cjif9mbj3qdqx4vbsl9mqpz"; - name = "iy-go-to-char"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39781,9 +51773,13 @@ license = lib.licenses.free; }; }) {}; - j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + j-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "j-mode"; + ename = "j-mode"; version = "20171224.1056"; src = fetchFromGitHub { owner = "zellio"; @@ -39791,10 +51787,10 @@ rev = "e8725ac8af95498faabb2ca3ab3bd809a8f148e6"; sha256 = "0icrwny3cif0iwgyf9i25sj9i5gy056cn9ic2wwwbzqjqb4xg6dd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode"; sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i"; - name = "j-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39802,19 +51798,24 @@ license = lib.licenses.free; }; }) {}; - jabber = callPackage ({ fetchgit, fetchurl, fsm, lib, melpaBuild }: - melpaBuild { + jabber = callPackage ({ fetchgit + , fetchurl + , fsm + , lib + , melpaBuild }: + melpaBuild { pname = "jabber"; - version = "20170106.1603"; + ename = "jabber"; + version = "20170423.513"; src = fetchgit { - url = "https://git.code.sf.net/p/emacs-jabber/git"; - rev = "2ef76cff4a5a932cf17dc6107a0c5adee806081e"; - sha256 = "0jvgp121544vc0yd31cncz06dkgw4za605nkk914vmql321zjzr2"; + url = "https://github.com/legoscia/emacs-jabber.git"; + rev = "3de7fb40ab9c82ada2a4b5f364a2417345953050"; + sha256 = "0miq8y9yfnhihwxayzri81s21qwqm5vyj3h7j95q5kmdml661fb4"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jabber"; - sha256 = "0saajvfpzgcsqa7h7aa6l0bns6swr40c46md6s0d90x9lrvwp7ws"; - name = "jabber"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7dbf3c2ffee5a4d71466ce037c618e0434a346/recipes/jabber"; + sha256 = "04d2jdzs3c790ms70px8xvyip1liqvd3jy2mbs8qqbwyiccb74xx"; + name = "recipe"; }; packageRequires = [ fsm ]; meta = { @@ -39822,9 +51823,15 @@ license = lib.licenses.free; }; }) {}; - jabber-otr = callPackage ({ emacs, fetchFromGitHub, fetchurl, jabber, lib, melpaBuild }: - melpaBuild { + jabber-otr = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , jabber + , lib + , melpaBuild }: + melpaBuild { pname = "jabber-otr"; + ename = "jabber-otr"; version = "20150918.444"; src = fetchFromGitHub { owner = "legoscia"; @@ -39832,10 +51839,10 @@ rev = "2692b1530234e0ba9a0d6c1eaa1cbe8679f193c0"; sha256 = "0yv86nadp6dfzl05vhk8c1kahg2pcrhfmd3mnfjrngp7ksac5lyf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9219f685c18c8e799cae3dc43cc1c740c0f67733/recipes/jabber-otr"; sha256 = "114z5bwhkza03yvfa4nmicaih2jdq83lh6micxjimpddsc8fjgi0"; - name = "jabber-otr"; + name = "recipe"; }; packageRequires = [ emacs jabber ]; meta = { @@ -39843,19 +51850,23 @@ license = lib.licenses.free; }; }) {}; - jack-connect = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + jack-connect = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jack-connect"; + ename = "jack-connect"; version = "20141207.407"; src = fetchgit { url = "https://bitbucket.org/sbarbit/jack-connect"; rev = "b00658dfe3d5d67431c18ffa693d5a3705067ba0"; sha256 = "1a33z07m9rh42pbcjv7sd640gf6jjzs4yn6idx52g8i5vzns0dkh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0f5c5f8051f3046baebb08f41b0ca0bf0d73c85/recipes/jack-connect"; sha256 = "1ssl126wihaf8m2f6ms0l5ai6pz5wn348a09k6l0h3jfww032g1q"; - name = "jack-connect"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39863,9 +51874,13 @@ license = lib.licenses.free; }; }) {}; - jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jade-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jade-mode"; + ename = "jade-mode"; version = "20160525.741"; src = fetchFromGitHub { owner = "brianc"; @@ -39873,10 +51888,10 @@ rev = "4dbde92542fc7ad61df38776980905a4721d642e"; sha256 = "0p6pfxbl98kkwa3lgx82h967w4p0wbd9s96gvs72d74ryan07ij1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/877b5a3e612e1b1d6d51e60c66b0b79f231abdb2/recipes/jade-mode"; sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94"; - name = "jade-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39884,9 +51899,13 @@ license = lib.licenses.free; }; }) {}; - jammer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jammer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jammer"; + ename = "jammer"; version = "20160310.59"; src = fetchFromGitHub { owner = "wasamasa"; @@ -39894,10 +51913,10 @@ rev = "48aa795df6df7ae6484518bcd0398293ca49d7c6"; sha256 = "1gnj8vmpxds2wdkz49swiby5vq2hvbf64q5hhvwymfdvwlk54v55"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cb82a6e936e2d5d1dd5930b600ede52dac3ceb33/recipes/jammer"; sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z"; - name = "jammer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39905,20 +51924,25 @@ license = lib.licenses.free; }; }) {}; - japanese-holidays = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + japanese-holidays = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "japanese-holidays"; + ename = "japanese-holidays"; version = "20160927.2318"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "japanese-holidays"; - rev = "0bccfac342d6ebda1c1a35c3babca0c800ff0c9b"; - sha256 = "1id40wxjb9j20lxhsq16j6qmdr6c7sh65iq7iyjqhrz5c4706x66"; + rev = "4207ee349356837ebfbf0badb6c42f256412c833"; + sha256 = "1n4imcnwqdixd8ybc06hmmh6l28gv0c6mvrpwg7fh9lgsvmgbxb3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80088028a1322e99e5fc50bebe08fcb6d1a2a44d/recipes/japanese-holidays"; sha256 = "0pxpkikkn2ys0kgf3lbrdxv8iym50h5ik2xzza0qk7cw1v93jza9"; - name = "japanese-holidays"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -39926,20 +51950,25 @@ license = lib.licenses.free; }; }) {}; - japanlaw = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + japanlaw = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "japanlaw"; + ename = "japanlaw"; version = "20160129.20"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "japanlaw.el"; - rev = "c160e195cda0e02a709a2d39c62bc2a1ed39a09a"; - sha256 = "1lrsm282lhp7pf0gwr3aad2228lvpqnqs1qdv2xk0zljqnqc0bhx"; + rev = "ad318559d626652d1bc59baa8ab86d5075361e33"; + sha256 = "1wjgjbzk66a4bv60lkf76g1bd9rw892kx36ijvr9vl6z760rrrcm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6192e1db76f017c3b1315453144cffc47cdd495d/recipes/japanlaw"; sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa"; - name = "japanlaw"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -39947,20 +51976,24 @@ license = lib.licenses.free; }; }) {}; - jape-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jape-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jape-mode"; + ename = "jape-mode"; version = "20140903.806"; src = fetchFromGitHub { owner = "tanzoniteblack"; repo = "jape-mode"; - rev = "85b9182850707b5d107391f6caee5bd401507a7d"; - sha256 = "0xmv7gw5xms6nhjcl51cw33yvjgw0c6bpnlyca3195x7g34sg1zj"; + rev = "27dbebc4de93eb887038fda7a11671349efe8dbb"; + sha256 = "0bnh5jvqjwrd5wqh1gvbx2z7sjczf8cvah9y58c2v68ia5drxb3z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b034024bd31c4be96c478a951b0ef63d8f89a1b7/recipes/jape-mode"; sha256 = "1gd685r86h0kr36msw81gfgwv7d35hihz6h0jkc6vd22wf6qc3ly"; - name = "jape-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39968,9 +52001,13 @@ license = lib.licenses.free; }; }) {}; - jar-manifest-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jar-manifest-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jar-manifest-mode"; + ename = "jar-manifest-mode"; version = "20160430.1726"; src = fetchFromGitHub { owner = "omajid"; @@ -39978,10 +52015,10 @@ rev = "270dae14c481300f75ed96dad3a5ae42ca928a1d"; sha256 = "1p7w3hq2cyn1245q0zn8m7hpjs8nbp7kqfmd2gzi2k209czipy21"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed68a9120d4f1e2895606938d1a117fb01abd1bc/recipes/jar-manifest-mode"; sha256 = "0kx358m3p23r8m7z45454i62ijmdlf4mljlbqc20jkihfanr6wqd"; - name = "jar-manifest-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39989,20 +52026,24 @@ license = lib.licenses.free; }; }) {}; - jasminejs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jasminejs-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jasminejs-mode"; + ename = "jasminejs-mode"; version = "20150526.1705"; src = fetchFromGitHub { owner = "stoltene2"; repo = "jasminejs-mode"; - rev = "9f8044bf81ab5b4841a30b0bd099916e1b7ff54a"; - sha256 = "1zcrxijcwqfs6r1cd6w4jq8g3ly0a69nf0cbx93w5v86x2kjpz0l"; + rev = "23637d6718423d376eebbdaa4d6d914c7cab26ed"; + sha256 = "1p31x23cc1xjziydbphfh4pbv43703x2x0i2kz7a8c6hvka07lym"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e58e8c102f6110f9a8bda47a4601197db47e743/recipes/jasminejs-mode"; sha256 = "1a70j3aglrwmaw9g8m99sxad2vs53y4swxh97gqjsgx1rrx03g52"; - name = "jasminejs-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40010,9 +52051,14 @@ license = lib.licenses.free; }; }) {}; - jastadd-ast-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jastadd-ast-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jastadd-ast-mode"; + ename = "jastadd-ast-mode"; version = "20161219.126"; src = fetchFromGitHub { owner = "rudi"; @@ -40020,10 +52066,10 @@ rev = "a29fdb470cbf0a398164950a3b0d2217de48e0c0"; sha256 = "01fv0ixkshy7i6wzcgq6xvijvh3n402vyhmh3qzjwi9p0vxvdyxv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/32d59dd9e796438f1752d36a30d4e062abbb6dd1/recipes/jastadd-ast-mode"; sha256 = "1cwqxzmqx5wxaax12rq0hy0whpaivqncykym43p3an2sl9s6ngva"; - name = "jastadd-ast-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40031,9 +52077,16 @@ license = lib.licenses.free; }; }) {}; - java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: - melpaBuild { + java-imports = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , s }: + melpaBuild { pname = "java-imports"; + ename = "java-imports"; version = "20170913.710"; src = fetchFromGitHub { owner = "dakrone"; @@ -40041,10 +52094,10 @@ rev = "e96ff44ed48b362ab6227b8b802b84d84f78bcaa"; sha256 = "0nryawj8v6gj6hnb81yf6966kjnydcz49zsg2k355gldryqf4v5p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f6f4e4c14c422c2066f2200bb9b8f35e2ecc896/recipes/java-imports"; sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98"; - name = "java-imports"; + name = "recipe"; }; packageRequires = [ emacs pcache s ]; meta = { @@ -40052,9 +52105,14 @@ license = lib.licenses.free; }; }) {}; - java-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + java-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "java-snippets"; + ename = "java-snippets"; version = "20160626.1952"; src = fetchFromGitHub { owner = "nekop"; @@ -40062,10 +52120,10 @@ rev = "738523debb1018439bda0ce70e00248154a600ac"; sha256 = "0k9iq8f5ngx80r965hc9bzmaa7y4vwn4vx10v1v9f46h48kmsg0q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec561bb8ee3d6df0d493c20497dd8c5897bf1e5e/recipes/java-snippets"; sha256 = "0bsmp6sc3khdadkmwqy8khz8kzqijcsv70gimm2cs1kwnbyj6pfp"; - name = "java-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -40073,9 +52131,14 @@ license = lib.licenses.free; }; }) {}; - javadoc-lookup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + javadoc-lookup = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "javadoc-lookup"; + ename = "javadoc-lookup"; version = "20160213.1631"; src = fetchFromGitHub { owner = "skeeto"; @@ -40083,10 +52146,10 @@ rev = "507a2dd443d60b537b8f779c1847e2cd0ccd1382"; sha256 = "16gywcma1s8kslwznlxwlx0xj0gs5g31637kb74vfdplk48f04zj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d5f55c7d90181cc4eff68bb472f772f070a93/recipes/javadoc-lookup"; sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79"; - name = "javadoc-lookup"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -40094,9 +52157,13 @@ license = lib.licenses.free; }; }) {}; - javap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + javap-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "javap-mode"; + ename = "javap-mode"; version = "20120223.1408"; src = fetchFromGitHub { owner = "hiredman"; @@ -40104,10 +52171,10 @@ rev = "864c1130e204b2072e1d19cd027b6fce8ebe6629"; sha256 = "070r4mg4v937n4h2bmzdbn3vsmmq7ijz69nankqs761jxv5gcwlg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/009ce356c410d980613f21fa7c9f1c97ee9af76f/recipes/javap-mode"; sha256 = "19p39l4nwgxm52yimy4j6l43845cpk8g5qdrldlwfxd7dvay09ay"; - name = "javap-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40115,20 +52182,25 @@ license = lib.licenses.free; }; }) {}; - jaword = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }: - melpaBuild { + jaword = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tinysegmenter }: + melpaBuild { pname = "jaword"; + ename = "jaword"; version = "20170425.2327"; src = fetchFromGitHub { owner = "zk-phi"; repo = "jaword"; - rev = "ac062b0e5ab4bd3270497e80aa0f3ac033a0493f"; - sha256 = "05kbscympb59njfrs94w4b2lwkc3057wzib65kq0l93bx4pcw2iy"; + rev = "a084558075f8892d61214aa21ff3663dd466cf4c"; + sha256 = "0vjim6a9hy6bkbiaggdljlkbga2gpyv89zrla8sdgw8s2yh8m8bl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00fe123ddc7fbcb9fd2b97e8a9fc8a8c5fabbf7f/recipes/jaword"; sha256 = "05pzh99zfl8n3p6lxdd9abr52m24hqcb105458i1cy0ra840bf4d"; - name = "jaword"; + name = "recipe"; }; packageRequires = [ tinysegmenter ]; meta = { @@ -40136,9 +52208,13 @@ license = lib.licenses.free; }; }) {}; - jazz-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jazz-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jazz-theme"; + ename = "jazz-theme"; version = "20170411.711"; src = fetchFromGitHub { owner = "donderom"; @@ -40146,10 +52222,10 @@ rev = "b1cb78a97cc4050f19d88a89e455c3e52d98240e"; sha256 = "0q9gfa40qh9wypvzg3xrv4kh6l51az9swb39133961dc8zrrrinm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da25345df9d8d567541ed6b0ec832310cde67115/recipes/jazz-theme"; sha256 = "0ad8kvrmd3gyb8wfghcl4r3kwzplk5gxlw3p23wsbx6c2xq6xr7g"; - name = "jazz-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40157,9 +52233,14 @@ license = lib.licenses.free; }; }) {}; - jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jbeans-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jbeans-theme"; + ename = "jbeans-theme"; version = "20180309.825"; src = fetchFromGitHub { owner = "synic"; @@ -40167,10 +52248,10 @@ rev = "3caa95998d8492a2ca6c17971de499ca15609871"; sha256 = "0k8bd5j09753czl55dcwijs4j1vxir4zwcwlgsxli4b4f8sl2z8r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme"; sha256 = "0y7ccycfnpykgzr88968w7dl45qazf8b9zlf7ydw3ghkl4f6lbwl"; - name = "jbeans-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40178,9 +52259,14 @@ license = lib.licenses.free; }; }) {}; - jdecomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jdecomp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jdecomp"; + ename = "jdecomp"; version = "20170224.1400"; src = fetchFromGitHub { owner = "xiongtx"; @@ -40188,10 +52274,10 @@ rev = "692866abc83deedce62be8d6040cf24dda7fb7a8"; sha256 = "00l6mc643na97jrb0k595kwmfg8wc7m5iqjd9l9vvf3dal6389b8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jdecomp"; sha256 = "1vgjmz7rxvgy9lprzr5b018lzqy3h0zg8913la1bzgwlm3mr68y5"; - name = "jdecomp"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40199,20 +52285,29 @@ license = lib.licenses.free; }; }) {}; - jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }: - melpaBuild { + jdee = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , memoize + , s }: + melpaBuild { pname = "jdee"; - version = "20180218.919"; + ename = "jdee"; + version = "20180711.1336"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "07afc434bb502d85fc8b882f62fc4d237d23f34e"; - sha256 = "0pnf80l5v0sn24p64pb36lrajs9b7p4y9m984hm52k2ah8kjg2n5"; + rev = "9192578df89dc92c88a7faf71d8aaf4f60bcb84c"; + sha256 = "0ahpygiw7ik82y75khhhr8d81883cpnld10xdcarzj0mblhi3vqf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; sha256 = "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4"; - name = "jdee"; + name = "recipe"; }; packageRequires = [ dash emacs flycheck memoize s ]; meta = { @@ -40220,20 +52315,27 @@ license = lib.licenses.free; }; }) {}; - jedi = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }: - melpaBuild { + jedi = callPackage ({ auto-complete + , emacs + , fetchFromGitHub + , fetchurl + , jedi-core + , lib + , melpaBuild }: + melpaBuild { pname = "jedi"; + ename = "jedi"; version = "20160425.2156"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-jedi"; - rev = "b0764f425766786dfb1bff910ed1d1670f11eb9c"; - sha256 = "19q1bii0dg3q566bwm63rw3fnnmwvas9i2ibjrlnni8laavc9r5p"; + rev = "1521c525483263b7241c4881b15299b38700070c"; + sha256 = "1xj6rswsnicwcgcqid4qji1x4yhdhrgvvjdd3jhb4z8mfahpnpp6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi"; sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4"; - name = "jedi"; + name = "recipe"; }; packageRequires = [ auto-complete emacs jedi-core ]; meta = { @@ -40241,20 +52343,28 @@ license = lib.licenses.free; }; }) {}; - jedi-core = callPackage ({ cl-lib ? null, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, python-environment }: - melpaBuild { + jedi-core = callPackage ({ cl-lib ? null + , emacs + , epc + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , python-environment }: + melpaBuild { pname = "jedi-core"; + ename = "jedi-core"; version = "20170121.610"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-jedi"; - rev = "b0764f425766786dfb1bff910ed1d1670f11eb9c"; - sha256 = "19q1bii0dg3q566bwm63rw3fnnmwvas9i2ibjrlnni8laavc9r5p"; + rev = "de1f5597b600c0cb7661b5f451da2af4cb722571"; + sha256 = "120l9zfh432ffj5n6q4x16msvnqwcazkaxib2n19k4pdyvpd1gbp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi-core"; sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f"; - name = "jedi-core"; + name = "recipe"; }; packageRequires = [ cl-lib emacs epc python-environment ]; meta = { @@ -40262,9 +52372,15 @@ license = lib.licenses.free; }; }) {}; - jedi-direx = callPackage ({ direx, fetchFromGitHub, fetchurl, jedi, lib, melpaBuild }: - melpaBuild { + jedi-direx = callPackage ({ direx + , fetchFromGitHub + , fetchurl + , jedi + , lib + , melpaBuild }: + melpaBuild { pname = "jedi-direx"; + ename = "jedi-direx"; version = "20140310.236"; src = fetchFromGitHub { owner = "tkf"; @@ -40272,10 +52388,10 @@ rev = "7a2e677400717ed12b959cb5988e7b3fb1c12117"; sha256 = "1pgi5vnwz5agrpvy7nwg3gv2nfbbmimhk8dxkg81k6yf1iiqxcap"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a058c3007e63b2b651689fd17c789f7d69348f83/recipes/jedi-direx"; sha256 = "1y4n4c2imnm3f1q129bvbi4gzk0iazd8qq959gvq9j9fl1aziiz1"; - name = "jedi-direx"; + name = "recipe"; }; packageRequires = [ direx jedi ]; meta = { @@ -40283,9 +52399,14 @@ license = lib.licenses.free; }; }) {}; - jekyll-modes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }: - melpaBuild { + jekyll-modes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , polymode }: + melpaBuild { pname = "jekyll-modes"; + ename = "jekyll-modes"; version = "20141117.514"; src = fetchFromGitHub { owner = "fred-o"; @@ -40293,10 +52414,10 @@ rev = "7cb10b50fd2883e3f7b10fdfd98f19f2f0b2381c"; sha256 = "0rx72rid7922mhw21j85kxmx0fhpkmkv9jvxmj9izy01xnjbk00c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6667529d56dc35c5c56e4b4a4d1f06b6172df677/recipes/jekyll-modes"; sha256 = "1305f1yg1mamyw3bkzrk5q3q58ihs8f5k9vjknsww5xvrzz3r1si"; - name = "jekyll-modes"; + name = "recipe"; }; packageRequires = [ polymode ]; meta = { @@ -40304,9 +52425,14 @@ license = lib.licenses.free; }; }) {}; - jemdoc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jemdoc-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jemdoc-mode"; + ename = "jemdoc-mode"; version = "20170704.1327"; src = fetchFromGitHub { owner = "drdv"; @@ -40314,10 +52440,10 @@ rev = "529b4d4681e1198b9892f340fdd6c3f1592a047a"; sha256 = "1f8nn8mv18q3x3k32i6kjis9f3g1ybdjcfaw8hywqwy6k8dr734m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49a8c0f885df0b91d758b4d7c92bd67368da8a56/recipes/jemdoc-mode"; sha256 = "1bl8a9fcilrqjzh92q7nvd16pxjiwmbnj157q2bx36y7bxm60acv"; - name = "jemdoc-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40325,9 +52451,16 @@ license = lib.licenses.free; }; }) {}; - jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + jenkins = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "jenkins"; + ename = "jenkins"; version = "20170721.236"; src = fetchFromGitHub { owner = "rmuslimov"; @@ -40335,10 +52468,10 @@ rev = "1ec967973db685c9d84133ec6a5e06489ce06b62"; sha256 = "1ai5adv46van2g029x9idj394ycczfacyhyv291sasf8mv9i7j4b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed2da33db5eaea1a37f86057da174a45cd37ea5/recipes/jenkins"; sha256 = "0ji42r7p3f3hh643839xf74gb231vr7anycr2xhkga8qy2vwa53s"; - name = "jenkins"; + name = "recipe"; }; packageRequires = [ dash emacs json ]; meta = { @@ -40346,9 +52479,13 @@ license = lib.licenses.free; }; }) {}; - jenkins-watch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jenkins-watch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jenkins-watch"; + ename = "jenkins-watch"; version = "20121004.1626"; src = fetchFromGitHub { owner = "ataylor284"; @@ -40356,10 +52493,10 @@ rev = "37b84dfbd98240a57ff798e1ff8bc7dba2913577"; sha256 = "0jayhv8j7b527dimhvcs0d7ax25x7v50dk0k6apisqc23psvkq66"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jenkins-watch"; sha256 = "1mdmh62rq3b8p23xgaf4i0kzpgq3ldljdxsnk07wa8bp3p7jxvgs"; - name = "jenkins-watch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40367,9 +52504,16 @@ license = lib.licenses.free; }; }) {}; - jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jetbrains = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jetbrains"; + ename = "jetbrains"; version = "20180228.2102"; src = fetchFromGitHub { owner = "emacs-php"; @@ -40377,10 +52521,10 @@ rev = "56f71a17d455581c10d48f6dbb31d9e2126227bf"; sha256 = "0v948k7xjm66px20ad331pskc7svpcrcffh3hbkjsksd4k0pggds"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains"; sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7"; - name = "jetbrains"; + name = "recipe"; }; packageRequires = [ cl-lib emacs f ]; meta = { @@ -40388,9 +52532,15 @@ license = lib.licenses.free; }; }) {}; - jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + jg-quicknav = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "jg-quicknav"; + ename = "jg-quicknav"; version = "20170808.1830"; src = fetchFromGitHub { owner = "jeffgran"; @@ -40398,10 +52548,10 @@ rev = "c8d53e774d63e68a944092c08a026b57da741038"; sha256 = "0rdrryfppgj5smrds5gyyhc4z8x36aq3gxdpckq80rbl4s729chy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/jg-quicknav"; sha256 = "1pxyv1nbnqb0s177kczy6b6q4l8d2r52xqhx2rdb0wxdmp6m5x9c"; - name = "jg-quicknav"; + name = "recipe"; }; packageRequires = [ cl-lib s ]; meta = { @@ -40409,9 +52559,13 @@ license = lib.licenses.free; }; }) {}; - jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jinja2-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jinja2-mode"; + ename = "jinja2-mode"; version = "20141128.207"; src = fetchFromGitHub { owner = "paradoxxxzero"; @@ -40419,10 +52573,10 @@ rev = "cfaa7bbe7bb290cc500440124ce89686f3e26f86"; sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b79196cf0dc0b436ff75eabea369a62f92825d9f/recipes/jinja2-mode"; sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx"; - name = "jinja2-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40430,20 +52584,24 @@ license = lib.licenses.free; }; }) {}; - jira-markup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jira-markup-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jira-markup-mode"; + ename = "jira-markup-mode"; version = "20150601.1409"; src = fetchFromGitHub { owner = "mnuessler"; repo = "jira-markup-mode"; - rev = "4fc534c47df26a2f402bf835ebe2ed89474a4062"; - sha256 = "1ack7dmapva3wc2gm22prd5wd3cmq19sl4xl9f04a3nk2msr6ksx"; + rev = "53bf083fdbece483f1351f32085b424b38c4c1f2"; + sha256 = "1lqk7x7h8n6xvqzfwjh220gprk5jfi8f87z6afps9rib2scz7kbh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7e0349bff91ed27ad14dfc12178719453a8df55/recipes/jira-markup-mode"; sha256 = "0f3sw41b4wl0aajq0ap66942rb2015d9iks0ss016jgzashw7zsp"; - name = "jira-markup-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40451,20 +52609,30 @@ license = lib.licenses.free; }; }) {}; - jist = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, magit, melpaBuild, request, seq }: - melpaBuild { + jist = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , magit + , melpaBuild + , request + , seq }: + melpaBuild { pname = "jist"; + ename = "jist"; version = "20161229.921"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "jist.el"; - rev = "da0692452e312a99bb27d8708504b521798aca48"; - sha256 = "13dic7bmj7a8vvjz47s1fnz8p5m22d2m2h2vlkmlq7322qwxxw6p"; + rev = "ec4b27eb4051f0084cb3b1e4f19fab9e2db77665"; + sha256 = "163zip2fhyn41wmwhyrx8przcq2qmlq841b6hpm9lw8mm3wfnqbq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/898bfa0b315240ef9335fde24ff0386a4c6c6595/recipes/jist"; sha256 = "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar"; - name = "jist"; + name = "recipe"; }; packageRequires = [ dash emacs let-alist magit request seq ]; meta = { @@ -40472,9 +52640,13 @@ license = lib.licenses.free; }; }) {}; - jknav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jknav = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jknav"; + ename = "jknav"; version = "20121006.1325"; src = fetchFromGitHub { owner = "aculich"; @@ -40482,10 +52654,10 @@ rev = "861245715c728503dad6573278fdd75c271dbf8b"; sha256 = "1idby2rjkslw85593qd4zy6an9zz71yzwqc6rck57r54xyfs8mij"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3673aebf53a7a3d54aee4e979b9dc7e37842f4db/recipes/jknav"; sha256 = "0c0a8plqrlsw8lhmyj9c1lfkj2b48cjkbw9pna8qcizvwgym9089"; - name = "jknav"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40493,9 +52665,16 @@ license = lib.licenses.free; }; }) {}; - jonprl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + jonprl-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "jonprl-mode"; + ename = "jonprl-mode"; version = "20160818.1759"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -40503,10 +52682,10 @@ rev = "6059bb64891fae45827174e044d6a87ac07172d8"; sha256 = "0v4xiq3xf7c52rmyymw8a4ws85ij0xy7pr7625gf15359cs5chs9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d26b6aea2b0567b971c4f013b58b598e9eb76af6/recipes/jonprl-mode"; sha256 = "0763ad65dmpl2l5lw91mlppfdvrjg6ym45brhi8sdwwri1xnyv9z"; - name = "jonprl-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs yasnippet ]; meta = { @@ -40514,9 +52693,16 @@ license = lib.licenses.free; }; }) {}; - jpop = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jpop = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jpop"; + ename = "jpop"; version = "20170410.550"; src = fetchFromGitHub { owner = "domtronn"; @@ -40524,10 +52710,10 @@ rev = "7628b03260be96576b34459d45959ee77d8b2110"; sha256 = "1x7qha7xyn2j225h7axhskngc8icjhgm3f451iq3qysj22q8g4d6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a52a3cf909d12201196b92685435f9fa338b7ba/recipes/jpop"; sha256 = "00chh1aqnkkkhdp44sapdjx37cbn92g42wapdq7kcl8v1v0xmnjr"; - name = "jpop"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -40535,20 +52721,25 @@ license = lib.licenses.free; }; }) {}; - jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jq-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jq-mode"; - version = "20180213.755"; + ename = "jq-mode"; + version = "20180407.1048"; src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "d1fca4613ec90c2c0b8241f4603eba733dd1ac73"; - sha256 = "0sgpl03dqm4lv081l3ff3xp38c39q5i2miyvpsqdjmgnixg3nm8c"; + rev = "72ea5e35e0a66c7275cf4fe4af25a619761653d7"; + sha256 = "0xgkmadbbs3zid11pn6silb25kyng424ikgx0wib48yzcra0kdw4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin"; - name = "jq-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40556,9 +52747,13 @@ license = lib.licenses.free; }; }) {}; - jquery-doc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jquery-doc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jquery-doc"; + ename = "jquery-doc"; version = "20150812.58"; src = fetchFromGitHub { owner = "ananthakumaran"; @@ -40566,10 +52761,10 @@ rev = "24032284919b942ec27707d929bdd8bf48420062"; sha256 = "0gh2bgmsbi9lby89ssvl49kpz07jqrfnyg47g6b9xmf5rw42s1z9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/504d8cfac08f3fcd856610bc2caeb4d4178aeedf/recipes/jquery-doc"; sha256 = "0pyg90izdrb9mvpbz9nx21mp8m3svqjnz1jr8i7wqgfjxsxdklxj"; - name = "jquery-doc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40577,20 +52772,26 @@ license = lib.licenses.free; }; }) {}; - js-auto-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-beautify, web-mode }: - melpaBuild { + js-auto-beautify = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-beautify + , web-mode }: + melpaBuild { pname = "js-auto-beautify"; + ename = "js-auto-beautify"; version = "20161030.2209"; src = fetchFromGitHub { owner = "Qquanwei"; repo = "auto-beautify.el"; - rev = "180d15af7b5dfaab4ee1954cca2fdc797932f9de"; - sha256 = "0xwkjq41v32dqc5gq8hcmcvdjg2y38xq6hkw5pja0kyvyk92c82d"; + rev = "6bc9fef474197ca1722cb1e9051b270f80cdd7cc"; + sha256 = "1jj4zbdw76ir7zigdhad4qdw1cabbql71847bzkqh6zzjwpg9h3p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/js-auto-beautify"; sha256 = "0hpp6im24xy4g5l1n9kvpmpj26rnxxnf4snf7xgh5gxx6wsiicy1"; - name = "js-auto-beautify"; + name = "recipe"; }; packageRequires = [ web-beautify web-mode ]; meta = { @@ -40598,20 +52799,25 @@ license = lib.licenses.free; }; }) {}; - js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + js-auto-format-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "js-auto-format-mode"; + ename = "js-auto-format-mode"; version = "20180123.830"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "6bd44162ac422304803f606278bb0c08ab940a5d"; - sha256 = "1hy4wyw7yi93ngagg9qmkljjqaypfnzks3vny1pn6d5nw2acb1vx"; + rev = "1558fb539e0beb7f98901280d695968a2351384d"; + sha256 = "16l2mjklazmfpdin3vz3ddf083phhyrhi18n0rfhv5rwh9m23wr9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs"; - name = "js-auto-format-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40619,9 +52825,14 @@ license = lib.licenses.free; }; }) {}; - js-codemod = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + js-codemod = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "js-codemod"; + ename = "js-codemod"; version = "20171104.454"; src = fetchFromGitHub { owner = "torgeir"; @@ -40629,10 +52840,10 @@ rev = "014e56c846487d1eeaf8a91dd503b9d96eb1510a"; sha256 = "0s07ypjlqsx2pgq89wmr69w9p7ybc62abqp53kzf5gmdl6fdzgxq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81670a2467fa846a3f0e6c81e870e8ae140dd54e/recipes/js-codemod"; sha256 = "1m5wbyx12sc5qwbrh948ikskck10p6j05ahrrvmmflvfb3q4vpcj"; - name = "js-codemod"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40640,9 +52851,14 @@ license = lib.licenses.free; }; }) {}; - js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + js-comint = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "js-comint"; + ename = "js-comint"; version = "20171129.2056"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -40650,10 +52866,10 @@ rev = "83e932e4a83d1a69098ee87e0ab911d299368e60"; sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1"; - name = "js-comint"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40661,9 +52877,13 @@ license = lib.licenses.free; }; }) {}; - js-doc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + js-doc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "js-doc"; + ename = "js-doc"; version = "20160714.2134"; src = fetchFromGitHub { owner = "mooz"; @@ -40671,10 +52891,10 @@ rev = "f0606e89d5aa89146f96edb38cf69af0068a9d1e"; sha256 = "1ffayl6hca9zanbznh6rkql7fbr53id1lyrj2vllx8zakfac4dyv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5621f60b3f580db652c347719d004d7168944caa/recipes/js-doc"; sha256 = "0nafqgb4kf8jgrb7ijfcvigq8kf043ki89h61izda4hccm3c42pk"; - name = "js-doc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40682,9 +52902,15 @@ license = lib.licenses.free; }; }) {}; - js-format = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: - melpaBuild { + js-format = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild }: + melpaBuild { pname = "js-format"; + ename = "js-format"; version = "20170118.1702"; src = fetchFromGitHub { owner = "futurist"; @@ -40692,10 +52918,10 @@ rev = "544bda9be72b74ec2d442543ba60cff727d96669"; sha256 = "18wr2z2w2fqgy51f5m5izrnywarxn6w4qs04lsgbwlsc6ahpwwpf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6deaa93f7deaba9f5f36f1963522b6dc5c673a/recipes/js-format"; sha256 = "112zqb3q1gjlaa9zkmhx7vamh0g97dwp9j55215i1sx66lmp18iq"; - name = "js-format"; + name = "recipe"; }; packageRequires = [ emacs js2-mode ]; meta = { @@ -40703,9 +52929,17 @@ license = lib.licenses.free; }; }) {}; - js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + js-import = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "js-import"; + ename = "js-import"; version = "20170115.853"; src = fetchFromGitHub { owner = "jakoblind"; @@ -40713,10 +52947,10 @@ rev = "7b1b7c963e3df9c76ed6cfb66c908c80775c6cfb"; sha256 = "03a13bcipk32hdvh5bm2z8kxs4b2xp3r1phwxmvb49lxx6417bs9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/js-import"; sha256 = "0r653ls1a4kr7i7249afgfj7vz365gadfm8bc1vmqfabxn8mysd4"; - name = "js-import"; + name = "recipe"; }; packageRequires = [ dash emacs f projectile ]; meta = { @@ -40724,20 +52958,25 @@ license = lib.licenses.free; }; }) {}; - js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: - melpaBuild { + js2-closure = callPackage ({ fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild }: + melpaBuild { pname = "js2-closure"; + ename = "js2-closure"; version = "20170816.1218"; src = fetchFromGitHub { owner = "jart"; repo = "js2-closure"; - rev = "f59db386d7d0693935d0bf52babcd2c203c06d04"; - sha256 = "09zfmxi9m883lzsafnws06ifpq92b2i9q05pxk085vgkdpq35nss"; + rev = "74a75f001a8bc2b9c02b9e8b4557f7ee3c5f84fb"; + sha256 = "1gapx656s4ngy8s8y1p56xxnclwf4qqg83l3jizknxky7yhayyl9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bf3e70ae38a78184f0b373ff6f0db234f51cb2/recipes/js2-closure"; sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7"; - name = "js2-closure"; + name = "recipe"; }; packageRequires = [ js2-mode ]; meta = { @@ -40745,9 +52984,15 @@ license = lib.licenses.free; }; }) {}; - js2-highlight-vars = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: - melpaBuild { + js2-highlight-vars = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild }: + melpaBuild { pname = "js2-highlight-vars"; + ename = "js2-highlight-vars"; version = "20170418.1129"; src = fetchFromGitHub { owner = "unhammer"; @@ -40755,10 +53000,10 @@ rev = "e3bb177e50f76b272e8073a94d4f46be6512a163"; sha256 = "0yy8sqkn6c7r377qr2id4z550vw1x70xjd4i7yg0g1rj7q1kg98l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f4a7c90be2e032277ae87b8de36d2e3f6146f09/recipes/js2-highlight-vars"; sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475"; - name = "js2-highlight-vars"; + name = "recipe"; }; packageRequires = [ emacs js2-mode ]; meta = { @@ -40766,20 +53011,26 @@ license = lib.licenses.free; }; }) {}; - js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + js2-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "js2-mode"; - version = "20180331.2247"; + ename = "js2-mode"; + version = "20180627.744"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "d76b4df4427e7bf4dfb2ba7b5dfff3c2aea52459"; - sha256 = "0m6pv3a6ji5dxjc8wp4z40rms63y4wz5k0bbl0ayi0k6miliik0d"; + rev = "3bea9ab39b6c0b6dd442d69fe53183c1f7652284"; + sha256 = "039ffsqc40ydg4ma4ycvw76rxa6s8g54dbvcm8fyypkb8ibn7yn6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv"; - name = "js2-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -40787,20 +53038,29 @@ license = lib.licenses.free; }; }) {}; - js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: - melpaBuild { + js2-refactor = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild + , multiple-cursors + , s + , yasnippet }: + melpaBuild { pname = "js2-refactor"; - version = "20180322.338"; + ename = "js2-refactor"; + version = "20180502.342"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "7701772b2335d811361481bbb188da17afb9d0b8"; - sha256 = "10hl01rn8s2q2j2m66mzg3sdaqdl6ivqr9sr1rpv1fn41dy0dlqj"; + rev = "186e1abf8c818623e1eef8bb07509d2ea11367b8"; + sha256 = "1g877cxvmv29089m0phh551clpz995ja9585nvwiycdzc7w2mqga"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r"; - name = "js2-refactor"; + name = "recipe"; }; packageRequires = [ dash js2-mode multiple-cursors s yasnippet ]; meta = { @@ -40808,20 +53068,24 @@ license = lib.licenses.free; }; }) {}; - js3-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + js3-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "js3-mode"; + ename = "js3-mode"; version = "20160515.850"; src = fetchFromGitHub { owner = "thomblake"; repo = "js3-mode"; - rev = "229aeb374f1b1f3ee5c59b8ba3eebb6385c232cb"; - sha256 = "0yd2lck1kq01pxk86jpxff5ih6fxx1a1wvl7v8b5ys7gi33fjqz2"; + rev = "7fceb21ec56aac7af4b189bb0c0d0cf620327f5a"; + sha256 = "18c0s3i21b77pi5y86zi7jg9pwxc0h5dzznjiyrig0jab0cksln5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/805a7c7fee2bafd8785813963bf91ac1ca417fd1/recipes/js3-mode"; sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r"; - name = "js3-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40829,9 +53093,15 @@ license = lib.licenses.free; }; }) {}; - jscs = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jscs = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jscs"; + ename = "jscs"; version = "20151015.1049"; src = fetchFromGitHub { owner = "papaeye"; @@ -40839,10 +53109,10 @@ rev = "9d39d0f2355e69a020bf76242504f3a33e013ccf"; sha256 = "1bqsv2drhcs8ia7nxss33f80p2mhcl4mr1nalphzw6s1f4mq2sgy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f59d039a199ff93d7280669511a752f12a74f0bd/recipes/jscs"; sha256 = "1yw251f6vpj2bikjw79arywprk8qnmmfcki99mvwnqhsqlv1a8iv"; - name = "jscs"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -40850,9 +53120,13 @@ license = lib.licenses.free; }; }) {}; - jsfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jsfmt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jsfmt"; + ename = "jsfmt"; version = "20150727.1525"; src = fetchFromGitHub { owner = "brettlangdon"; @@ -40860,10 +53134,10 @@ rev = "68109120f553fbc651fafb6fc35ed83c3e79f8a6"; sha256 = "0h9gx5cl3lashk0n8pv9yzb0mm8dyziddfbwfqfm70638p93ylhc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ddc99843dec18a295dfc36e7b429f0e1ab7fb71/recipes/jsfmt"; sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd"; - name = "jsfmt"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40871,20 +53145,26 @@ license = lib.licenses.free; }; }) {}; - json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }: - melpaBuild { + json-mode = callPackage ({ fetchFromGitHub + , fetchurl + , json-reformat + , json-snatcher + , lib + , melpaBuild }: + melpaBuild { pname = "json-mode"; - version = "20170719.2205"; + ename = "json-mode"; + version = "20180718.109"; src = fetchFromGitHub { owner = "joshwnj"; repo = "json-mode"; - rev = "32d5a9b3319e6797c4d52e7d61a65e5638102ef4"; - sha256 = "04n68ppxdga5r7mbahiqjkykf3i5simpx91aa8x9h197y5wwi4ww"; + rev = "ffc92b1eefc54963703b43be140f4c8c8ad348f7"; + sha256 = "186m03fhbv8v8kz5nmhrsakhl2mh0hn365yrx36i28i8mbnwzah7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode"; sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70"; - name = "json-mode"; + name = "recipe"; }; packageRequires = [ json-reformat json-snatcher ]; meta = { @@ -40892,9 +53172,15 @@ license = lib.licenses.free; }; }) {}; - json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }: - melpaBuild { + json-navigator = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , hierarchy + , lib + , melpaBuild }: + melpaBuild { pname = "json-navigator"; + ename = "json-navigator"; version = "20171220.19"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -40902,10 +53188,10 @@ rev = "7a1fec93500c46ccba4086d10115d8188607d0d0"; sha256 = "03gjvzlyf90sh2q735qfbbjyqx4z9c3yc8jjp2sjpmp5fjvdm9yf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator"; sha256 = "0yfl31cg0mkgsbpgx00m9h2cxnhsavcf7zlspb0qr4g2zq6ya1wx"; - name = "json-navigator"; + name = "recipe"; }; packageRequires = [ emacs hierarchy ]; meta = { @@ -40913,20 +53199,24 @@ license = lib.licenses.free; }; }) {}; - json-reformat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + json-reformat = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "json-reformat"; + ename = "json-reformat"; version = "20160212.53"; src = fetchFromGitHub { owner = "gongo"; repo = "json-reformat"; - rev = "8eb6668ed447988aea06467ba8f42e1f2178246f"; - sha256 = "11y11yybhb8wfj8qcj4gw8rhhly7kjs7ylyxwsh7qnfgq6f771qh"; + rev = "24c2bf3c41897b5cf1398dcaedfec88526308bf4"; + sha256 = "05bjyw0hkpiyfadsx3giawykbj4qinfr1ilzd0xvx8akzq2ipq0y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c7976237f327fdfa58eea26ac8679f40ef3163/recipes/json-reformat"; sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na"; - name = "json-reformat"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40934,9 +53224,15 @@ license = lib.licenses.free; }; }) {}; - json-rpc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + json-rpc = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "json-rpc"; + ename = "json-rpc"; version = "20180104.728"; src = fetchFromGitHub { owner = "skeeto"; @@ -40944,10 +53240,10 @@ rev = "0992ae71964055230aa5d4d934a1b93b5dfd7eb4"; sha256 = "0nfccwxss3dz1ig6i3dig703xpsy90m7i96bm3pysrw2jfp4by9s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82c6b97cdfe2970f028a00146b01e5734710291b/recipes/json-rpc"; sha256 = "1v1pfmm9g18p6kgn27q1m1bjgwbzvwfm0jbsxp8gdsssaygky71k"; - name = "json-rpc"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -40955,9 +53251,14 @@ license = lib.licenses.free; }; }) {}; - json-snatcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + json-snatcher = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "json-snatcher"; + ename = "json-snatcher"; version = "20150511.2047"; src = fetchFromGitHub { owner = "Sterlingg"; @@ -40965,10 +53266,10 @@ rev = "c4cecc0a5051bd364373aa499c47a1bb7a5ac51c"; sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/990de179e20c169aa02ffec42c89f18ce02239c8/recipes/json-snatcher"; sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4"; - name = "json-snatcher"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40976,9 +53277,14 @@ license = lib.licenses.free; }; }) {}; - jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jsonnet-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jsonnet-mode"; + ename = "jsonnet-mode"; version = "20180310.2256"; src = fetchFromGitHub { owner = "mgyucht"; @@ -40986,10 +53292,10 @@ rev = "4eb52cff8ce6020f5a6309a1c0465b5cdd6c698e"; sha256 = "0l9q6g00yxz5j1hchd2vim33n39zshv7qmmga1zf8qcn20yxz7mm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode"; sha256 = "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia"; - name = "jsonnet-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40997,9 +53303,16 @@ license = lib.licenses.free; }; }) {}; - jss = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, websocket }: - melpaBuild { + jss = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild + , websocket }: + melpaBuild { pname = "jss"; + ename = "jss"; version = "20130508.723"; src = fetchFromGitHub { owner = "segv"; @@ -41007,10 +53320,10 @@ rev = "41749257aecf13c7bd6ed489b5ab3304d06e40bc"; sha256 = "07yd7sxb5f2mbm2nva7b2nwyxxkmsi2rdd5qig0bq1b2mf3g5l83"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3dc3607f512df378ba141327802820da4991a97/recipes/jss"; sha256 = "050hskqcjz5kc8nni255vj3hc9m936w1rybvg5kqyz4p4lpzj00k"; - name = "jss"; + name = "recipe"; }; packageRequires = [ emacs js2-mode websocket ]; meta = { @@ -41018,20 +53331,29 @@ license = lib.licenses.free; }; }) {}; - jst = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: - melpaBuild { + jst = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , s }: + melpaBuild { pname = "jst"; + ename = "jst"; version = "20150604.438"; src = fetchFromGitHub { owner = "cheunghy"; repo = "jst-mode"; - rev = "2a3fd16c992f7790dc67134ef06a814c3d20579c"; - sha256 = "16jgmabcqrjb3v9c6q711jqn9dna88bmzm4880mdry69ixwcydxy"; + rev = "865ff97449a4cbbcb40d38b4908cf4d7b22a5108"; + sha256 = "066ql5czrzikznlx7vww6m8h0pfkixfm8qnydfwpfndcqq6ypd90"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85d7aec81b7b8ff3721fd577cbdc10ed2288f76d/recipes/jst"; sha256 = "0hp1f7p6m1gfv1a3plavzkzn87dllb5g2xrgg3mch4qsgdbqx65i"; - name = "jst"; + name = "recipe"; }; packageRequires = [ dash emacs f pcache s ]; meta = { @@ -41039,20 +53361,24 @@ license = lib.licenses.free; }; }) {}; - jsx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jsx-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jsx-mode"; + ename = "jsx-mode"; version = "20130908.1024"; src = fetchFromGitHub { owner = "jsx"; repo = "jsx-mode.el"; - rev = "47213429c09259126cddb5742482cfc444c70d50"; - sha256 = "1g648r0wrd8m5ggl5jrplmj7jmr68bh2ykyii5wv30zfba97r1sh"; + rev = "3a0d688f0f93cbb4596e562e596f7736a0926160"; + sha256 = "1kldk8i3galix9nbrcn92a8j942nx6nwzihl8w17lh8v95d51rhn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dea24e922f18c1f7e1b97da07ba2e4f33170557/recipes/jsx-mode"; sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b"; - name = "jsx-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41060,18 +53386,23 @@ license = lib.licenses.free; }; }) {}; - jtags = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + jtags = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jtags"; + ename = "jtags"; version = "20160211.1229"; src = fetchgit { url = "https://git.code.sf.net/p/jtags/code"; - rev = "b50daa48510f71e74ce0ec2eb85030896a79cf96"; - sha256 = "03w5y9c1109kpsn6xnxdaz3maiwbvxywqshc1l5wngfc85jwiv8y"; + rev = "f7d29e1635ef7ee4ee2cdb8f1f6ab83e1015c84a"; + sha256 = "029arf0m39rrb3x81hpd3ljwd4ki37hwa4n38hynn8lfmwrrdy2x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jtags"; sha256 = "1f3dw9fr31lcqmida14d9rsvy1r1b5d6ihqwdj9hbx5kv7d8jyj7"; - name = "jtags"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41079,9 +53410,13 @@ license = lib.licenses.free; }; }) {}; - julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + julia-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "julia-mode"; + ename = "julia-mode"; version = "20171116.642"; src = fetchFromGitHub { owner = "JuliaLang"; @@ -41089,10 +53424,10 @@ rev = "2ef6992125a85674532a1e37dacd5c60bee4feeb"; sha256 = "0vjsaws0rqrkv1mqxwf9lp8qmaq92piippybsf4ncizxwbnh8x6d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; sha256 = "0m49v67fs5yq0q3lwkcfmrzsjdzi1qrkfjyvjcdwnfmp29w14kq6"; - name = "julia-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41100,9 +53435,14 @@ license = lib.licenses.free; }; }) {}; - julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + julia-repl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "julia-repl"; + ename = "julia-repl"; version = "20171116.46"; src = fetchFromGitHub { owner = "tpapp"; @@ -41110,10 +53450,10 @@ rev = "f808a12e7ebe403f82036899c2dace640be73154"; sha256 = "1lh4pbxrnld205ga58036jwnxkmgabdd8hyr6g7fahw94llq2cpa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; sha256 = "1k8a54s7g64zasmmnywygr0ra3s3din5mkqb7b5van2l0d4hcmzn"; - name = "julia-repl"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -41121,9 +53461,14 @@ license = lib.licenses.free; }; }) {}; - julia-shell = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: - melpaBuild { + julia-shell = callPackage ({ fetchFromGitHub + , fetchurl + , julia-mode + , lib + , melpaBuild }: + melpaBuild { pname = "julia-shell"; + ename = "julia-shell"; version = "20161125.1110"; src = fetchFromGitHub { owner = "dennisog"; @@ -41131,10 +53476,10 @@ rev = "583a0b2ca20461ab4356929fd0f2212c22341b69"; sha256 = "182r7x7w3xnx7c54izz3rlz0khcwh7v21m89qpq99f9dvcs6273k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812c6a8498949d8bd9828a95433c539da87c1c8/recipes/julia-shell"; sha256 = "0182irlvk6nn71zk4j8xjgcqp4bxi7a2dbj44frrssy6018cd410"; - name = "julia-shell"; + name = "recipe"; }; packageRequires = [ julia-mode ]; meta = { @@ -41142,9 +53487,15 @@ license = lib.licenses.free; }; }) {}; - jumblr = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + jumblr = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "jumblr"; + ename = "jumblr"; version = "20170727.1343"; src = fetchFromGitHub { owner = "mkmcc"; @@ -41152,10 +53503,10 @@ rev = "34533dfb9db8538c005f4eaffafeff7ed193729f"; sha256 = "0nn2m27c70nykin4iakrna0c61qd1hr09czrfmfpk06k70iifjky"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b47000c35a181c03263e85e8955eb4b4c9e69e4d/recipes/jumblr"; sha256 = "1wnawz1m6x95iyzac453p55h7hlr5q0ry5437aqqx0bw7gdwg3dp"; - name = "jumblr"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -41163,20 +53514,27 @@ license = lib.licenses.free; }; }) {}; - jump = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }: - melpaBuild { + jump = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , findr + , inflections + , lib + , melpaBuild }: + melpaBuild { pname = "jump"; + ename = "jump"; version = "20161126.1728"; src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; - rev = "e4f1372cf22e811faca52fc86bdd5d817498a4d8"; - sha256 = "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9"; + rev = "9519c675e8a650f6afade7d870e925d0fb50f112"; + sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump"; sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364"; - name = "jump"; + name = "recipe"; }; packageRequires = [ cl-lib findr inflections ]; meta = { @@ -41184,20 +53542,24 @@ license = lib.licenses.free; }; }) {}; - jump-char = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jump-char = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jump-char"; - version = "20160505.851"; + ename = "jump-char"; + version = "20180601.648"; src = fetchFromGitHub { owner = "lewang"; repo = "jump-char"; - rev = "9c1c3618662e7b43d5937342816fd63b5a31e861"; - sha256 = "1dgghswf6s7h6h04mhfnsh2m0ld8qqk70l0dq3cxhdjzqx16vnms"; + rev = "1e31a3c687f2b3c71bbfab881c6d75915534bb9e"; + sha256 = "1nzln2l6sy67qz30107sgyhhfacy85im9vdlbv1hp4fzdmxxkx84"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jump-char"; sha256 = "1r6d1vhm87zafi7rr7z8jwyz3yy7i7s4774n84jsql24j1rzzwd4"; - name = "jump-char"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41205,9 +53567,13 @@ license = lib.licenses.free; }; }) {}; - jump-to-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jump-to-line = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jump-to-line"; + ename = "jump-to-line"; version = "20130122.853"; src = fetchFromGitHub { owner = "ongaeshi"; @@ -41215,10 +53581,10 @@ rev = "01ef8c3529d85e6c59cc20840acbc4a8e8325bc8"; sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b6c700a28b65cbbad36a9bbaf88cc36c8191eb0/recipes/jump-to-line"; sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr"; - name = "jump-to-line"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41226,9 +53592,13 @@ license = lib.licenses.free; }; }) {}; - jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jump-tree = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jump-tree"; + ename = "jump-tree"; version = "20171014.851"; src = fetchFromGitHub { owner = "yangwen0228"; @@ -41236,10 +53606,10 @@ rev = "282267dc6305889e31d46b405b7ad4dfe5923b66"; sha256 = "0r6cwpks4aylndvq5lcny3799fag05zm36gd11043wca7sgr90fz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree"; sha256 = "1gknpwd1vjpd1jqpi2axhyi6sg4clarr32rfrfz6hi6kmzr848mj"; - name = "jump-tree"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41247,9 +53617,14 @@ license = lib.licenses.free; }; }) {}; - jumplist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jumplist = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jumplist"; + ename = "jumplist"; version = "20151119.1945"; src = fetchFromGitHub { owner = "ganmacs"; @@ -41257,10 +53632,10 @@ rev = "c482d137d95bc5e1bcd790cdbde25b7f729b2502"; sha256 = "0ykzvy8034mchq6ffyi7vqnwyrj6gnqqgn39ki81pv97qh8hh8yl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2b7c688b881615c5f0b00f3879b9469d380a4e6/recipes/jumplist"; sha256 = "06xjg1q8b2fwfhfmdkb76bw2id8pgqc61fmwlgri5746jgdmd7nf"; - name = "jumplist"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -41268,9 +53643,15 @@ license = lib.licenses.free; }; }) {}; - jvm-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jvm-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jvm-mode"; + ename = "jvm-mode"; version = "20150422.8"; src = fetchFromGitHub { owner = "martintrojer"; @@ -41278,10 +53659,10 @@ rev = "3355dbaf5b0185aadfbad24160399abb32c5bea0"; sha256 = "0k91cdjlpil8npc4d3zsgx2gk41crl7qgm9r85khcgxs59kmkniw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdb7d7d7b955405eb6357277b5d049df8aa85ce/recipes/jvm-mode"; sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w"; - name = "jvm-mode"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -41289,9 +53670,14 @@ license = lib.licenses.free; }; }) {}; - kaesar = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kaesar = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kaesar"; + ename = "kaesar"; version = "20160128.208"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -41299,10 +53685,10 @@ rev = "d087075cb1a46c2c85cd075220e09b2eaef9b86e"; sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fac8639e59dc923ea31da1f84a99f83d51b47/recipes/kaesar"; sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l"; - name = "kaesar"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -41310,9 +53696,14 @@ license = lib.licenses.free; }; }) {}; - kaesar-file = callPackage ({ fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }: - melpaBuild { + kaesar-file = callPackage ({ fetchFromGitHub + , fetchurl + , kaesar + , lib + , melpaBuild }: + melpaBuild { pname = "kaesar-file"; + ename = "kaesar-file"; version = "20160128.208"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -41320,10 +53711,10 @@ rev = "d087075cb1a46c2c85cd075220e09b2eaef9b86e"; sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fac8639e59dc923ea31da1f84a99f83d51b47/recipes/kaesar-file"; sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc"; - name = "kaesar-file"; + name = "recipe"; }; packageRequires = [ kaesar ]; meta = { @@ -41331,9 +53722,15 @@ license = lib.licenses.free; }; }) {}; - kaesar-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }: - melpaBuild { + kaesar-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , kaesar + , lib + , melpaBuild }: + melpaBuild { pname = "kaesar-mode"; + ename = "kaesar-mode"; version = "20160128.208"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -41341,10 +53738,10 @@ rev = "d087075cb1a46c2c85cd075220e09b2eaef9b86e"; sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fac8639e59dc923ea31da1f84a99f83d51b47/recipes/kaesar-mode"; sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry"; - name = "kaesar-mode"; + name = "recipe"; }; packageRequires = [ cl-lib kaesar ]; meta = { @@ -41352,9 +53749,14 @@ license = lib.licenses.free; }; }) {}; - kakapo-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kakapo-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kakapo-mode"; + ename = "kakapo-mode"; version = "20171003.2151"; src = fetchFromGitHub { owner = "listx"; @@ -41362,10 +53764,10 @@ rev = "67d516138172fd60782df94454b3d0bd247e84f3"; sha256 = "0r2n410arr48skcwm39c6mjhzsia117lb8xd7pc4854y0rbrvrvs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode"; sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss"; - name = "kakapo-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -41373,20 +53775,25 @@ license = lib.licenses.free; }; }) {}; - kaleidoscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + kaleidoscope = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "kaleidoscope"; + ename = "kaleidoscope"; version = "20170808.117"; src = fetchFromGitHub { owner = "algernon"; repo = "kaleidoscope.el"; - rev = "e932103e043bd1503bf5d98dd117ff6737b852bc"; - sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1"; + rev = "b89a243f6024099192f1bc38d8a54e3e7a654090"; + sha256 = "154myfd3nag9nhpc3lrhq13191q7a9bzi0ml8a3k0fwy1810yi29"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope"; sha256 = "0nfz207rzpnni7jyzvdvz5lr0zcpzy278a86821cmw8d5l81a3yp"; - name = "kaleidoscope"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -41394,20 +53801,27 @@ license = lib.licenses.free; }; }) {}; - kaleidoscope-evil-state-flash = callPackage ({ evil, fetchFromGitHub, fetchurl, kaleidoscope, lib, melpaBuild, s }: - melpaBuild { + kaleidoscope-evil-state-flash = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , kaleidoscope + , lib + , melpaBuild + , s }: + melpaBuild { pname = "kaleidoscope-evil-state-flash"; + ename = "kaleidoscope-evil-state-flash"; version = "20170728.320"; src = fetchFromGitHub { owner = "algernon"; repo = "kaleidoscope.el"; - rev = "e932103e043bd1503bf5d98dd117ff6737b852bc"; - sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1"; + rev = "5b88327350c3d6375ef1d43fb31342eaabd88fdc"; + sha256 = "1rbifir3rpp6i7il13b9yawkwllr2ima1d9rsff46n6h2920d5x1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope-evil-state-flash"; sha256 = "17a4nmdi6h0z4va3kiw4ivaywiisblz6cicypk9d3g9sl92drcvq"; - name = "kaleidoscope-evil-state-flash"; + name = "recipe"; }; packageRequires = [ evil kaleidoscope s ]; meta = { @@ -41415,18 +53829,23 @@ license = lib.licenses.free; }; }) {}; - kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + kanban = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kanban"; + ename = "kanban"; version = "20170418.110"; src = fetchhg { url = "https://bitbucket.com/ArneBab/kanban.el"; rev = "dd11d722b20a"; sha256 = "07g0spi9jf48vap76f9rgl61sg3jqy03qdxnmchzwlia8wvcsscb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kanban"; sha256 = "1j4qv3xcg0gk07yx3b4kayiy1n3w8yq1r78h07613iljx2ny91fz"; - name = "kanban"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41434,20 +53853,24 @@ license = lib.licenses.free; }; }) {}; - kanji-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kanji-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kanji-mode"; + ename = "kanji-mode"; version = "20160826.439"; src = fetchFromGitHub { owner = "wsgac"; repo = "kanji-mode"; - rev = "eda4f8666486689d36317db7dbda54fb73d3e3d2"; - sha256 = "1m0s1kdgz1psiidpxcrzm8qmvmrmk5g2k8lz1lq357z482l4i7ll"; + rev = "5e9d5b72468ece11cfb81b729be6babf63ede425"; + sha256 = "1zh7klqaza840q5f44zzh1wrnd6sqa2k93z3dgx3yhhsxfd1dxvy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f1fb16f2f7f677d0817fd63633dd071ba2cf12/recipes/kanji-mode"; sha256 = "0nnkv7lp7ks9qhkbhz15ixm53grc2q0xfspzykxi9c4b59kypcq5"; - name = "kanji-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41455,20 +53878,27 @@ license = lib.licenses.free; }; }) {}; - kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kaolin-themes = callPackage ({ autothemer + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kaolin-themes"; - version = "20180323.1118"; + ename = "kaolin-themes"; + version = "20180722.1037"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "245a02265d06a499b600ef591fcfb9a7bf2c1b39"; - sha256 = "05b6q9cxwj8hdmkqbisd0p49z5n9dacxw3rcs9a8nww27frnxzx3"; + rev = "8d0d8513541c293646aaff886d1fb81621d3cf45"; + sha256 = "00bn5wr4wvdn4nn1minlqnbj57rdb8biv4w9bmkgipsmkr27zaxz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw"; - name = "kaolin-themes"; + name = "recipe"; }; packageRequires = [ autothemer cl-lib emacs ]; meta = { @@ -41476,9 +53906,15 @@ license = lib.licenses.free; }; }) {}; - kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + kaomoji = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "kaomoji"; + ename = "kaomoji"; version = "20171226.2040"; src = fetchFromGitHub { owner = "kuanyui"; @@ -41486,10 +53922,10 @@ rev = "90a1490743b2a30762f5454c9d9309018eff83dd"; sha256 = "1jc796nyrck3k50x6jb1wsaawk396y4gk87gkwb8yd5qks7ci35q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/140c65cb3cdf6c197b085ccf8ba079e1efd15f38/recipes/kaomoji"; sha256 = "1p61pbqf2lnwr6ryxxc4jkd5bmlgknrc27lg89h3b4pw7k39cqy1"; - name = "kaomoji"; + name = "recipe"; }; packageRequires = [ emacs helm-core ]; meta = { @@ -41497,9 +53933,15 @@ license = lib.licenses.free; }; }) {}; - karma = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + karma = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "karma"; + ename = "karma"; version = "20160220.445"; src = fetchFromGitHub { owner = "tonini"; @@ -41507,10 +53949,10 @@ rev = "31d3e7708246183d7ed0686be92bf23140af348c"; sha256 = "12v242kfcx849j8w95v2g7djh9xqbx8n033iaxyavfxnz0pp7zdl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/681e12556c3ab3e2a8376d5c7c33ee5a213de650/recipes/karma"; sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc"; - name = "karma"; + name = "recipe"; }; packageRequires = [ emacs pkg-info ]; meta = { @@ -41518,9 +53960,13 @@ license = lib.licenses.free; }; }) {}; - kdeconnect = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kdeconnect = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kdeconnect"; + ename = "kdeconnect"; version = "20180126.1540"; src = fetchFromGitHub { owner = "carldotac"; @@ -41528,10 +53974,10 @@ rev = "ca0cbf9a628ba7b519b43fa85e0d988ca26bf853"; sha256 = "07aqzfg2nn35bkikrmk1lszqkc6h8vn2551m22mwc19lmdx94p2i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c363866d30fb86ae636d30def8c3847711ada762/recipes/kdeconnect"; sha256 = "1bcwpnwmm1l2jzc5znw8z6f5knysinidsbm12v4r1j8v6v80ydw6"; - name = "kdeconnect"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41539,9 +53985,13 @@ license = lib.licenses.free; }; }) {}; - kerl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kerl = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kerl"; + ename = "kerl"; version = "20150424.1305"; src = fetchFromGitHub { owner = "correl"; @@ -41549,10 +53999,10 @@ rev = "1732ee26213f021bf040919c45ad276aafcaae14"; sha256 = "1kkzs7nrcr74qn1m456vaj52a9j3ah4biakimz06hls415l56yk9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/166afdc776689b0da93576dbeaa71ff6dfb627db/recipes/kerl"; sha256 = "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss"; - name = "kerl"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41560,9 +54010,13 @@ license = lib.licenses.free; }; }) {}; - key-chord = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + key-chord = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "key-chord"; + ename = "key-chord"; version = "20160227.438"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -41570,10 +54024,10 @@ rev = "72443e9ff3c4f1c3ccaced3130236801efde3d83"; sha256 = "15jfpysyydcvqlvdannxg2s4bh4i9z6i950fad1qlq43jfmq7k55"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/key-chord"; sha256 = "1g0jqmnn575h5n4figxbc5xs76zl8b1cdqa6wbi3d1p2rn3g8scr"; - name = "key-chord"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41581,20 +54035,24 @@ license = lib.licenses.free; }; }) {}; - key-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + key-combo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "key-combo"; + ename = "key-combo"; version = "20150324.739"; src = fetchFromGitHub { owner = "uk-ar"; repo = "key-combo"; - rev = "2fb5c65bc82d5bd2964e2b163822429ab45d90a1"; - sha256 = "1d445784mar1jrmrlswwxh3w52l3aym8kx3k4lgqwqa1p0i0pjqz"; + rev = "09a917bdfd3b309b4b3cbe3b11212e1ae6fab38d"; + sha256 = "0af0yzw95624s0wwh1rw9q7djwwhw6mrk9zhzj66cir555lsshlz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/99b422ef5f7b9dda894207e3133791fb9963a092/recipes/key-combo"; sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf"; - name = "key-combo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41602,9 +54060,13 @@ license = lib.licenses.free; }; }) {}; - key-intercept = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + key-intercept = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "key-intercept"; + ename = "key-intercept"; version = "20140210.2349"; src = fetchFromGitHub { owner = "tarao"; @@ -41612,10 +54074,10 @@ rev = "d9a60edb4ce893f2d3d94f242164fdcc62d43cf2"; sha256 = "143nfs8pgi5yy3mjq7nirffplk4vb8kik4q7zypynh2pddip30a4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad758d865bde8c97d27c0d57cabe1606f8b36974/recipes/key-intercept"; sha256 = "1z776jbpjks5bir6bd0748mlrmz05nf0jy9l4hlmwgyn72dcbx16"; - name = "key-intercept"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41623,9 +54085,14 @@ license = lib.licenses.free; }; }) {}; - key-leap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + key-leap = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "key-leap"; + ename = "key-leap"; version = "20160831.747"; src = fetchFromGitHub { owner = "MartinRykfors"; @@ -41633,10 +54100,10 @@ rev = "b3f6ef15c8a13870475d5af159fa24b30f97dea0"; sha256 = "1f2k7jpxfvjirxzjc5c4s4lpg1hdgw8k7lfchx362jqijny1ipfp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b56e18063e6292bb2aca2acc7077b32f3d62262/recipes/key-leap"; sha256 = "0z1fhpf8g0c4rh3bf8dfmdgyhj5w686kavjr214czaga0x7mwlwj"; - name = "key-leap"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -41644,9 +54111,14 @@ license = lib.licenses.free; }; }) {}; - key-seq = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: - melpaBuild { + key-seq = callPackage ({ fetchFromGitHub + , fetchurl + , key-chord + , lib + , melpaBuild }: + melpaBuild { pname = "key-seq"; + ename = "key-seq"; version = "20150907.56"; src = fetchFromGitHub { owner = "vlevit"; @@ -41654,10 +54126,10 @@ rev = "e29b083a6427d061638749194fc249ef69ad2cc0"; sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d54ab1b6973a44362e50559dd91344d0b17f513/recipes/key-seq"; sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74"; - name = "key-seq"; + name = "recipe"; }; packageRequires = [ key-chord ]; meta = { @@ -41665,20 +54137,25 @@ license = lib.licenses.free; }; }) {}; - keycast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keycast = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keycast"; + ename = "keycast"; version = "20180318.1321"; src = fetchFromGitHub { owner = "tarsius"; repo = "keycast"; - rev = "46370b8a72922902921d3ed2fa194564568053dc"; - sha256 = "0wgicba3v5l7a0wmmr3awf026vhf4grrn8c4i2hipi9ij3wckqzc"; + rev = "0d28c26b07a062ab58c01c6cbedc3e68bd4ec8a1"; + sha256 = "0wfy5wbr150y57mlzsxhb6bq9ycqj2jk5i6nhwl4q8b6xd3mh6p6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast"; sha256 = "19qq5y1zjp3029kfq0c59xl9xnxqmdn2pd04sblznchcr9jdy5id"; - name = "keycast"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -41686,9 +54163,13 @@ license = lib.licenses.free; }; }) {}; - keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keychain-environment = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keychain-environment"; + ename = "keychain-environment"; version = "20180318.1523"; src = fetchFromGitHub { owner = "tarsius"; @@ -41696,10 +54177,10 @@ rev = "d3643196de6dc79ea77f9f4805028350fd76100b"; sha256 = "0wzs77nwal6apinc39d4arj3lralv2cb9aw9gkikk46fgk404hwj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4382c9e7e8dee2cafea9ee49965d0952ca359dd5/recipes/keychain-environment"; sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v"; - name = "keychain-environment"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41707,9 +54188,13 @@ license = lib.licenses.free; }; }) {}; - keydef = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keydef = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keydef"; + ename = "keydef"; version = "20090428.1231"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -41717,10 +54202,10 @@ rev = "dff2be9f58d12d8c6a490ad0c1b2b10b55528dc0"; sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/keydef"; sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992"; - name = "keydef"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41728,9 +54213,14 @@ license = lib.licenses.free; }; }) {}; - keyfreq = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keyfreq = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keyfreq"; + ename = "keyfreq"; version = "20160516.716"; src = fetchFromGitHub { owner = "dacap"; @@ -41738,10 +54228,10 @@ rev = "9c665c8c219d18866403897936427bb408e3d6b9"; sha256 = "1dhdk4f6q340n0r9n8jld2n2fykp7m40x23n7sw4wpm8g151gxin"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd7157bad0f3039321b5b279a88e7e4fce895543/recipes/keyfreq"; sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7"; - name = "keyfreq"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -41749,9 +54239,14 @@ license = lib.licenses.free; }; }) {}; - keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keymap-utils = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keymap-utils"; + ename = "keymap-utils"; version = "20180318.1537"; src = fetchFromGitHub { owner = "tarsius"; @@ -41759,10 +54254,10 @@ rev = "1ad766dbc111ec78b1a292da97b9bd4856cd2ff7"; sha256 = "0imx8zp21bm066bzdynvasylrlhw0gr8mpk2bwkz8j1y5lsp54v8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9"; - name = "keymap-utils"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -41770,20 +54265,26 @@ license = lib.licenses.free; }; }) {}; - keyset = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keyset = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keyset"; + ename = "keyset"; version = "20150219.2130"; src = fetchFromGitHub { owner = "HKey"; repo = "keyset"; - rev = "41bbfc4dbed5de6ecf3ec1dba634c7c26241ca84"; - sha256 = "0cm6naqlwk65xy9lwnn5r7m6nc1l7ims2ckydmyzny5ak8y5jbws"; + rev = "c6b375fbe8035fde593d1d96895eb6e3f111d379"; + sha256 = "1vdlx8p0s0zh7sxawd7hfcb66aqap9wdcl1z5ilidnbba4if212g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bad8a1f1b94fbfbde5d8035f7e22431e64a9eec/recipes/keyset"; sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg"; - name = "keyset"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -41791,9 +54292,14 @@ license = lib.licenses.free; }; }) {}; - keyswap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keyswap = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keyswap"; + ename = "keyswap"; version = "20160813.257"; src = fetchFromGitHub { owner = "hardenedapple"; @@ -41801,10 +54307,10 @@ rev = "cd682a7c4a8d64d6bae6a005db5045232e5e7b95"; sha256 = "191i2b2xx6180sly0dd6b1z6npsrzjqhxrbak9wm6yblx7alsgn2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed8303f5009604ae3d83769063d38749e37fc5d8/recipes/keyswap"; sha256 = "0ck9w2jr4vdk3yjlcdzblsbgw5w5x1cxbx7h1am5vkr6fhxh2hdi"; - name = "keyswap"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -41812,20 +54318,24 @@ license = lib.licenses.free; }; }) {}; - keyword-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keyword-search = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keyword-search"; - version = "20170309.2247"; + ename = "keyword-search"; + version = "20180424.402"; src = fetchFromGitHub { owner = "keyword-search"; repo = "keyword-search"; - rev = "33682e93429027805ee7c51c5f6f608872b6f5dc"; - sha256 = "03qz2sdyrlww1xc9bkarc07pf3rk42h7jjnl0dw76ffrci1z1mj1"; + rev = "f8475ecaddb8804a9be6bee47678207c86ac8dee"; + sha256 = "1ymqnpm9his2bkchq23vwazprwyw0d2sdgza7zjxvs3q0f4nj0vx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdc51938f2300bf005e2d1b1819e0fa59e0bd7/recipes/keyword-search"; sha256 = "0wvci1v8pblfbdslfzpi46c149y8pi49kza9jf33jzhj357lp5qa"; - name = "keyword-search"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41833,8 +54343,12 @@ license = lib.licenses.free; }; }) {}; - kfg = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kfg = callPackage ({ f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kfg"; version = "20140908.2238"; src = fetchFromGitHub { @@ -41843,7 +54357,7 @@ rev = "d2c9dd26618fb2f7bf1e7b6eae193b1cceba3c97"; sha256 = "0xq835xzywks4b4kaz5i0pp759i23kibs5gkvvxasw0dncqh7j5c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b212de583b43dd05d2acd15bb2245e735d0b14c/recipes/kfg"; sha256 = "0vvvxl6a4ac27igwmsgzpf0whf9h2pjl9d89fd9fizad6gi8x1fs"; name = "kfg"; @@ -41854,20 +54368,26 @@ license = lib.licenses.free; }; }) {}; - kibit-helper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + kibit-helper = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "kibit-helper"; + ename = "kibit-helper"; version = "20150508.833"; src = fetchFromGitHub { owner = "brunchboy"; repo = "kibit-helper"; - rev = "16bdfff785ee05d8e74a5780f6808506d990cef7"; - sha256 = "0s2hb2lvfmcvm3n1fg4biaafc1p7j7w990d7w15gicaw6rr2j4nr"; + rev = "ec5f154db3bb0c838e86f527353f08644cede926"; + sha256 = "0ky167xh1hrmqsldybzjhyqjizgjzs1grn5mf8sm2j9qwcvjw2zv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f7fee551ca9ed226f1285dffe87027e1e1047f65/recipes/kibit-helper"; sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s"; - name = "kibit-helper"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -41875,20 +54395,26 @@ license = lib.licenses.free; }; }) {}; - kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kill-or-bury-alive = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kill-or-bury-alive"; + ename = "kill-or-bury-alive"; version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "0ba8f44efe60058ef66b10a059fd30489b42546f"; - sha256 = "09y6905ig6qphfwjk1xn79sv4qxx75gnrmnwd9i80ig3lfp8ps2r"; + rev = "d21aa7a12f1a76d47249db36eb9825242df9d512"; + sha256 = "1m790afdrns8afh7f690slq2gcya5bp7630fxwi8fqp5vil7lswg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8"; - name = "kill-or-bury-alive"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -41896,9 +54422,13 @@ license = lib.licenses.free; }; }) {}; - kill-ring-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kill-ring-search = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kill-ring-search"; + ename = "kill-ring-search"; version = "20140422.855"; src = fetchFromGitHub { owner = "nschum"; @@ -41906,10 +54436,10 @@ rev = "23535b4a01a1cb1574604e36c49614e84e85c883"; sha256 = "0yrc09k64rv5is4wvss938mkj2pkvbr98lr3ahsi7p0aqn7s444v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kill-ring-search"; sha256 = "1jggi6r5j2dr9y17v4cyskc0wydfdpqgp1pib5dr2kg6n6w0s5xl"; - name = "kill-ring-search"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41917,9 +54447,13 @@ license = lib.licenses.free; }; }) {}; - killer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + killer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "killer"; + ename = "killer"; version = "20120808.422"; src = fetchFromGitHub { owner = "tarsius"; @@ -41927,10 +54461,10 @@ rev = "7bbb223f875402a7b2abee4baa5a54f10bd97212"; sha256 = "05rbh5hkj3jsn9pw0qa4d5a5pi6367vdqkijcn9k14fdfbmyd30x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd8c3ec8fa272273128134dea96c0c999a524549/recipes/killer"; sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma"; - name = "killer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -41938,9 +54472,15 @@ license = lib.licenses.free; }; }) {}; - kite = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, websocket }: - melpaBuild { + kite = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild + , websocket }: + melpaBuild { pname = "kite"; + ename = "kite"; version = "20130201.1138"; src = fetchFromGitHub { owner = "jscheid"; @@ -41948,10 +54488,10 @@ rev = "7ed74d1147a6ddd152d3da65dc30df3517d53144"; sha256 = "1cr4i66lws6yhyxmyx5jw6d5x7i75435mafkkych4nfa0mv4vicd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kite"; sha256 = "17bpk9ycx2xkwm3j1dxi5216lbzf5lgnscs8i4y0pkpicdn0wyr6"; - name = "kite"; + name = "recipe"; }; packageRequires = [ json websocket ]; meta = { @@ -41959,20 +54499,26 @@ license = lib.licenses.free; }; }) {}; - kite-mini = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, websocket }: - melpaBuild { + kite-mini = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , websocket }: + melpaBuild { pname = "kite-mini"; + ename = "kite-mini"; version = "20160508.406"; src = fetchFromGitHub { owner = "tungd"; repo = "kite-mini.el"; - rev = "a68619dbc109c7989f3448426d8c1ee9e797c11f"; - sha256 = "1qmg5mdf3zhmpa4kdvkh62y6if6mj4ag885dg7y6461dg2y6ymlh"; + rev = "48734092e735033ad7664a9933acd4556e095f79"; + sha256 = "0ralsdjzj09g6nsa04jvyyzr6cgsi0d7gi1ji77f52m31dl0b8cw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b76d0ee09efc6652d0541cf72c9623760dda66/recipes/kite-mini"; sha256 = "1g644406zm3db0fjyv704aa8dbd20v1apmysb3mmh2vldbch4iyh"; - name = "kite-mini"; + name = "recipe"; }; packageRequires = [ dash websocket ]; meta = { @@ -41980,20 +54526,24 @@ license = lib.licenses.free; }; }) {}; - kivy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kivy-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kivy-mode"; - version = "20160902.1041"; + ename = "kivy-mode"; + version = "20180702.1329"; src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "86b6e19d8a02788fe8850b690bcecdff848f3c4e"; - sha256 = "1bgjfi6gddx2dwpisnvsig1j4zz9hdf83dy700jxy4gbsrn8d30m"; + rev = "3e57ac0b07385384619a8042dafcab89cc10da57"; + sha256 = "1pm0660x688rpgns9jpzg1y08pavp65dazm1aznkvpnvdhy2zs93"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1"; - name = "kivy-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42001,9 +54551,15 @@ license = lib.licenses.free; }; }) {}; - kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kiwix = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kiwix"; + ename = "kiwix"; version = "20170927.120"; src = fetchFromGitHub { owner = "stardiviner"; @@ -42011,10 +54567,10 @@ rev = "86dbead6c0017beefd92a0b64a0bb5f5d12c5b16"; sha256 = "142mm1wy8zvlkzairnc1rjdi1lsq1asfk4zdbs1aria1nxz1sx6x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix"; sha256 = "0x5ld557kxzx5s8ziy5axgvm1fxlq81l9gvinfgs8f257vjlki07"; - name = "kiwix"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -42022,9 +54578,14 @@ license = lib.licenses.free; }; }) {}; - kixtart-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kixtart-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kixtart-mode"; + ename = "kixtart-mode"; version = "20150611.904"; src = fetchFromGitHub { owner = "ryrun"; @@ -42032,10 +54593,10 @@ rev = "1c2356797e7b766bbaaa2b341176a8b10499cd79"; sha256 = "1ld3ccg8q7hmjrj60rxvmmfy4dpm2lvlshjqdf9ifgjzp221g4vb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/672cfc166209b6c2ffcb0e549fd2416be7212a5a/recipes/kixtart-mode"; sha256 = "079bw4lgxbmk65rrfyy8givs8j5wsyhpcjjw915ifkg577gj87qp"; - name = "kixtart-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -42043,20 +54604,50 @@ license = lib.licenses.free; }; }) {}; - know-your-http-well = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + klere-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "klere-theme"; + ename = "klere-theme"; + version = "20180415.1123"; + src = fetchFromGitHub { + owner = "WammKD"; + repo = "emacs-klere-theme"; + rev = "8e389530dd783dcaab2365e0970181c72d782efb"; + sha256 = "1217yr4qpax4snzyi64wzcr13qjnmd0dcqw7ch3vniqn48vnla92"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/07a3e348d69738ae59fce3570a61b0cdc565fdb8/recipes/klere-theme"; + sha256 = "1lgvk6q2853rpk15i91zf917r8wmrb7bnagp4x02fws49x83hqrs"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/klere-theme"; + license = lib.licenses.free; + }; + }) {}; + know-your-http-well = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "know-your-http-well"; + ename = "know-your-http-well"; version = "20160208.1504"; src = fetchFromGitHub { owner = "for-GET"; repo = "know-your-http-well"; - rev = "3cc5ab6d2764ab7aacb1b6e026abaccbeb6c37f2"; - sha256 = "0hni9xvv0759nqwhngijiqkvpiz7alyd4ydf0mvi2vkmbxkci8n1"; + rev = "ab8cf84ad8031ff85b983c528ebb7117dc784aad"; + sha256 = "19qky551arnb7gl7w0yp54kkdls03m9wn9bxnr7hm5nv1bml2y64"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ab50ae6278022281b2b7297c086089e5e669c7a/recipes/know-your-http-well"; sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q"; - name = "know-your-http-well"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42064,20 +54655,28 @@ license = lib.licenses.free; }; }) {}; - kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: - melpaBuild { + kodi-remote = callPackage ({ elnode + , fetchFromGitHub + , fetchurl + , json ? null + , let-alist + , lib + , melpaBuild + , request }: + melpaBuild { pname = "kodi-remote"; - version = "20180223.1905"; + ename = "kodi-remote"; + version = "20180609.1654"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "aa8c8bb8e64f1f61fadeb4e93973b14dfe19e4a9"; - sha256 = "1gsaw4yfv68ilf0z130rf13300lnz1fdgi2x8rm8hc0q0dlsp1a6"; + rev = "bca7250bb69e09c1a9829e15ef4aed1f486777eb"; + sha256 = "1d67gvhkvcdii2nj0ngh5lnvv1y3iw1ccl70lmi39srz5p2hjw59"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; sha256 = "0f3n7b3plsw28xpz07lf5pv71b6s2xjhq2h23gpyg0r69v99chh5"; - name = "kodi-remote"; + name = "recipe"; }; packageRequires = [ elnode json let-alist request ]; meta = { @@ -42085,9 +54684,13 @@ license = lib.licenses.free; }; }) {}; - kolon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kolon-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kolon-mode"; + ename = "kolon-mode"; version = "20140122.334"; src = fetchFromGitHub { owner = "samvtran"; @@ -42095,10 +54698,10 @@ rev = "5af0955e280ae991862189ebecd3937c5fc8fb9f"; sha256 = "0yr4yxwxgxp5pm9f8gaqlikxp26inv01inq0ya42dzam5yphkafw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b18f38d291303ff362e11ca711bb00bf411e2180/recipes/kolon-mode"; sha256 = "0wcg8ph3mk4zcmzqpvl2w6rfgvrfvhmgwb14y8agh9b7v5d9xwj3"; - name = "kolon-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42106,9 +54709,14 @@ license = lib.licenses.free; }; }) {}; - kooten-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kooten-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kooten-theme"; + ename = "kooten-theme"; version = "20161023.205"; src = fetchFromGitHub { owner = "kootenpv"; @@ -42116,10 +54724,10 @@ rev = "d10197b4dd7af02cd14aeab2573c273a294798c3"; sha256 = "1vc97d3i7jh4fbpan7lfnmsm32c4gwgrg11j2vq7z3rwm42wkkyr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kooten-theme"; sha256 = "1zhrjli65pn5nshz8pqn5vbsndzk2h8mhbcldq9k0mc7ki2rrdlv"; - name = "kooten-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -42127,20 +54735,24 @@ license = lib.licenses.free; }; }) {}; - korean-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + korean-holidays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "korean-holidays"; + ename = "korean-holidays"; version = "20170228.2045"; src = fetchFromGitHub { owner = "tttuuu888"; repo = "korean-holidays"; - rev = "6e94c2e071069aee9ed12ebbfd9b0ad863b8c78e"; - sha256 = "1xs81yafp783sz1clb65yc9w2xlf2kmshbsjynnafqd6pfd0skps"; + rev = "aed79c24e3f91d8f9508367758b18e5fa3a9eaf4"; + sha256 = "1kqbxnjmp7hxjcv8zhy9v8v6220l9vd7rgqicjln4yrjz82z4579"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/korean-holidays"; sha256 = "1yf0z9vpiwhlsnyb0fy9wf5rz6f2fzzign96zgj0zd5hwmznbmyr"; - name = "korean-holidays"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42148,9 +54760,14 @@ license = lib.licenses.free; }; }) {}; - kosmos-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kosmos-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kosmos-theme"; + ename = "kosmos-theme"; version = "20170502.1150"; src = fetchFromGitHub { owner = "habamax"; @@ -42158,10 +54775,10 @@ rev = "616456d2376a75dc31190ad65137d179fbad4336"; sha256 = "193zwgwfnj0lyk0msa16y0dfg7asp953p3jm56d9wdacggbcraj9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kosmos-theme"; sha256 = "0vj1z69hz0j7kxnzj13c4vck1qj5j1glr9lymk5ns2v8l56gakwb"; - name = "kosmos-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -42169,9 +54786,14 @@ license = lib.licenses.free; }; }) {}; - kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kotlin-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kotlin-mode"; + ename = "kotlin-mode"; version = "20180219.853"; src = fetchFromGitHub { owner = "Emacs-Kotlin-Mode-Maintainers"; @@ -42179,10 +54801,10 @@ rev = "a2c2628d55c4e8b018ffe9f55ca38d89302a1bbc"; sha256 = "12zng3rq134f0d49fr2rsf0jgmxl3qc7kkhziy7r27hx6ny9h8z2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode"; sha256 = "08jn8r4nhhlck0f7n5agibwh049rigdiy12lpmijbwk1zmcvsqws"; - name = "kotlin-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -42190,9 +54812,13 @@ license = lib.licenses.free; }; }) {}; - kpm-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kpm-list = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kpm-list"; + ename = "kpm-list"; version = "20170924.652"; src = fetchFromGitHub { owner = "KMahoney"; @@ -42200,10 +54826,10 @@ rev = "e0f5112e5ce8ec1b603f4428fa51681c68bb28f5"; sha256 = "1achcr3v0d85narnxqpbfxy9qfk537kl83wiq5lyfy3lwqqf7dmp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b7065d016e2da49277b165edf565bef5819d483/recipes/kpm-list"; sha256 = "0022bhy1mzngjmjydyqnmlgnhww05v4dxsfav034r8nyyc7677z0"; - name = "kpm-list"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42211,20 +54837,24 @@ license = lib.licenses.free; }; }) {}; - kroman = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kroman = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kroman"; + ename = "kroman"; version = "20150827.1640"; src = fetchFromGitHub { owner = "cheunghy"; repo = "kroman-el"; - rev = "90402b6ae40383e75d8ba97d66eee93eebf40f70"; - sha256 = "11axxmhdpwgrcyjz200pf5bqzjw9wz4085r8p1n2vr5gx98374fr"; + rev = "431144a3cd629a2812a668a29ad85182368dc9b0"; + sha256 = "0miywc3vfqi3hjb7lk8baz1y2nbp9phjjxclqriyqra4gw4n0vhc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/07ff16db526dce9d720a858aa14010f297bf31a6/recipes/kroman"; sha256 = "0y9ji3c8kndrz605n7b4w5xq0qp093d61hxwhblm3qrh3370mws7"; - name = "kroman"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42232,20 +54862,25 @@ license = lib.licenses.free; }; }) {}; - ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ksp-cfg-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ksp-cfg-mode"; - version = "20170724.1127"; + ename = "ksp-cfg-mode"; + version = "20180608.2247"; src = fetchFromGitHub { owner = "lashtear"; repo = "ksp-cfg-mode"; - rev = "713a22ee28688e581ec3ad60228c853b516a14b6"; - sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3"; + rev = "fda64705f605fb8fccee53a5040fe4865ca17d44"; + sha256 = "19brscxk85cky2kzwyyljz6xqrfvyyyg7dqmadlnlrf8kw9wnb2x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode"; sha256 = "0azcn4qvziacbw1qy33fwdaldw7xpzr672vzjsqhr0b2vg9m2ipi"; - name = "ksp-cfg-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -42253,20 +54888,27 @@ license = lib.licenses.free; }; }) {}; - kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + kubernetes = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "kubernetes"; - version = "20171122.1819"; + ename = "kubernetes"; + version = "20180706.520"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "kubernetes-el"; - rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c"; - sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi"; + rev = "2b5ce22b12bd8a569cb0a8019a395173e3a13523"; + sha256 = "19abr8q9mz3g5i0jb5j6p3jll93jrpvzgj14q2l81c4dng0yamdc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes"; sha256 = "06357a8y3rpvid03r9vhmjgq97hmiah5g8gff32dij9424vidil9"; - name = "kubernetes"; + name = "recipe"; }; packageRequires = [ dash emacs magit ]; meta = { @@ -42274,9 +54916,15 @@ license = lib.licenses.free; }; }) {}; - kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }: - melpaBuild { + kubernetes-evil = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , kubernetes + , lib + , melpaBuild }: + melpaBuild { pname = "kubernetes-evil"; + ename = "kubernetes-evil"; version = "20171122.1819"; src = fetchFromGitHub { owner = "chrisbarrett"; @@ -42284,10 +54932,10 @@ rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c"; sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil"; sha256 = "12ygfs6g9aivf2ws3lxwjm5xnd2kidhli889icpygd5v7gnk9pg8"; - name = "kubernetes-evil"; + name = "recipe"; }; packageRequires = [ evil kubernetes ]; meta = { @@ -42295,9 +54943,15 @@ license = lib.licenses.free; }; }) {}; - kubernetes-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kubernetes-tramp = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kubernetes-tramp"; + ename = "kubernetes-tramp"; version = "20171026.922"; src = fetchFromGitHub { owner = "gruggiero"; @@ -42305,10 +54959,10 @@ rev = "9fa84df71f6e88bc23a756cdf2df393a35aec945"; sha256 = "1l1ibc97ahp3zwwypqfg3201qdxad4sdpdaq7nsfb87gh46vsbz8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ea4b15e64a9dc33b9977650488693cacadd1ab1/recipes/kubernetes-tramp"; sha256 = "15nlx3w2v0gky0zgbx7n0w1mdr6yaj4dh028ay2k19wg8wbsckjq"; - name = "kubernetes-tramp"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -42316,9 +54970,15 @@ license = lib.licenses.free; }; }) {}; - kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + kurecolor = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "kurecolor"; + ename = "kurecolor"; version = "20180401.521"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -42326,10 +54986,10 @@ rev = "a27153f6a01f38226920772dc4917b73166da5e6"; sha256 = "04av67q5841jli6rp39hav3a5gr2vcf3db4qsv553i23ffplb955"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor"; sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f"; - name = "kurecolor"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -42337,9 +54997,13 @@ license = lib.licenses.free; }; }) {}; - kv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kv"; + ename = "kv"; version = "20140108.734"; src = fetchFromGitHub { owner = "nicferrier"; @@ -42347,10 +55011,10 @@ rev = "721148475bce38a70e0b678ba8aa923652e8900e"; sha256 = "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kv"; sha256 = "0c10r7mhg517p62lc87ccqypsjrm28xh3bgv4f01fnx569jqgzgp"; - name = "kv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42358,9 +55022,13 @@ license = lib.licenses.free; }; }) {}; - kwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kwin = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kwin"; + ename = "kwin"; version = "20150308.1112"; src = fetchFromGitHub { owner = "reactormonk"; @@ -42368,10 +55036,10 @@ rev = "d4f8f3593598b71ee596e0a87b2c1d6a912a9566"; sha256 = "0irbfgip493hyh45msnb7climgfwr8f05nvc97bzaqggnay88scy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04e6d622a1f1cb765c33297a99f06ed513985498/recipes/kwin"; sha256 = "1pxnyj81py3ygadmyfrqndb0jkk6xlbf0rg3857hsy3ccblzm7ki"; - name = "kwin"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42379,9 +55047,13 @@ license = lib.licenses.free; }; }) {}; - labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + labburn-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "labburn-theme"; + ename = "labburn-theme"; version = "20170502.207"; src = fetchFromGitHub { owner = "ksjogo"; @@ -42389,10 +55061,10 @@ rev = "e95334acd8a73fbe8e156f70e047014a87e92e66"; sha256 = "0ai8gr4an4d44lgin7kdzydn2d0a98jb8mv0n9b93bq160lbmkwj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; sha256 = "09qqb62hfga88zka0pc27rc8i43cxi84cv1x8wj0vvzx6mvic1lm"; - name = "labburn-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42400,9 +55072,13 @@ license = lib.licenses.free; }; }) {}; - lang-refactor-perl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lang-refactor-perl = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lang-refactor-perl"; + ename = "lang-refactor-perl"; version = "20131122.1327"; src = fetchFromGitHub { owner = "jplindstrom"; @@ -42410,10 +55086,10 @@ rev = "691bd69639de6b7af357e3b7143563ececd9c497"; sha256 = "135k7inkvdz51j7al3nndaamrkyn989vlv1mxcp8lwx8cgq0rqfj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6bbbf89b71364720dd39e2cf902271108151b5ca/recipes/lang-refactor-perl"; sha256 = "02fv25d76rvxqzxs48j4lkrifdhqayyb1in05ryyz2pk9x5hbax9"; - name = "lang-refactor-perl"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42421,9 +55097,14 @@ license = lib.licenses.free; }; }) {}; - langdoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + langdoc = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "langdoc"; + ename = "langdoc"; version = "20150217.2245"; src = fetchFromGitHub { owner = "tom-tan"; @@ -42431,10 +55112,10 @@ rev = "2c7223bacb116992d700ecb19a60df5c09c63424"; sha256 = "0svci7xs4iysv8ysf93g382arip0xpgi0fllw8xx2vrd70sz7lff"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/defe78f12dbd7137bed7b1a309caa579e220f7dc/recipes/langdoc"; sha256 = "19i6ys58wswl5ckf33swl6lsfzg4znx850br4icik15yrry65yj7"; - name = "langdoc"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -42442,20 +55123,25 @@ license = lib.licenses.free; }; }) {}; - langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + langtool = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "langtool"; - version = "20170917.2154"; + ename = "langtool"; + version = "20180409.316"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "bae4bdd240583b2253b4ff03af5295146e285103"; - sha256 = "0zwaddpmvkq7v5nnyzacmx0ql5zjlisvkqwa2knw3pihngr160cd"; + rev = "d93286722cff3fecf8641a4a6c3b0691f30362fe"; + sha256 = "17xa055705n4jb7nafqvqgl0a6fdaxp3b3q8q0gsv5vzycsc74ga"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw"; - name = "langtool"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -42463,20 +55149,26 @@ license = lib.licenses.free; }; }) {}; - language-detection = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + language-detection = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "language-detection"; + ename = "language-detection"; version = "20161123.1013"; src = fetchFromGitHub { owner = "andreasjansson"; repo = "language-detection.el"; - rev = "54a6ecf55304fba7d215ef38a4ec96daff2f35a4"; - sha256 = "0p8kim8idh7hg9398kpgjawkxq9hb6fraxpamdkflg8gjk0h5ppa"; + rev = "38f5d294870678efc6ccf94ce6e8175a58f93025"; + sha256 = "0jm3ybi353kjffvgy489b5x1yd8vi2vxdmn32z4c42zrnmg5a6lv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed2b68d0a11e5db0e7f2f5cbb2eb93c298bcb765/recipes/language-detection"; sha256 = "1c613dj6j05idqyjd6ix7llw04d0327aicac04cicrb006km3r51"; - name = "language-detection"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -42484,9 +55176,16 @@ license = lib.licenses.free; }; }) {}; - lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + lastpass = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "lastpass"; + ename = "lastpass"; version = "20171208.216"; src = fetchFromGitHub { owner = "storvik"; @@ -42494,10 +55193,10 @@ rev = "a4529ce70b8187ed9ac4972997df152af58ef2eb"; sha256 = "1h4h7swww2is7qblqi5r1vh26a9lfl52c0yq7rgwd1pqclffgc8m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass"; sha256 = "0x4c9c110nqv3v6kzcxdg9a9zcg7yn1hj6ffgrbsd8c3wbrdxrlj"; - name = "lastpass"; + name = "recipe"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -42505,9 +55204,15 @@ license = lib.licenses.free; }; }) {}; - latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + latex-extra = callPackage ({ auctex + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "latex-extra"; + ename = "latex-extra"; version = "20170816.1847"; src = fetchFromGitHub { owner = "Malabarba"; @@ -42515,10 +55220,10 @@ rev = "82d99b8b0c2db20e5270749582e03bcc2443ffb5"; sha256 = "15m7zvdhg5z7d8alrw66p703wdp5r57lxrgq3zz7xc4hscwghlb1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra"; sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj"; - name = "latex-extra"; + name = "recipe"; }; packageRequires = [ auctex cl-lib ]; meta = { @@ -42526,9 +55231,13 @@ license = lib.licenses.free; }; }) {}; - latex-math-preview = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + latex-math-preview = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "latex-math-preview"; + ename = "latex-math-preview"; version = "20170522.1455"; src = fetchFromGitLab { owner = "latex-math-preview"; @@ -42536,10 +55245,10 @@ rev = "775887a89447dd19541b121161cc02e9799d0d3a"; sha256 = "1mp6bpl8992pi40vs6b86q922h4z8879mrjalldv5dyz57ym5fsq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e413b7684e9199510b00035825aa861d670e072/recipes/latex-math-preview"; sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr"; - name = "latex-math-preview"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42547,19 +55256,23 @@ license = lib.licenses.free; }; }) {}; - latex-pretty-symbols = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + latex-pretty-symbols = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "latex-pretty-symbols"; + ename = "latex-pretty-symbols"; version = "20151112.244"; src = fetchhg { url = "https://bitbucket.com/mortiferus/latex-pretty-symbols.el"; rev = "ef4ea64c09ea"; sha256 = "0h9hncf2ghfkd3i3342ajj1niykhfr0aais3j6sjg1vkm16xbr3b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/latex-pretty-symbols"; sha256 = "1f2s2f64bmsx89a3crm4skhdi4pq9w18z9skxw3i3ydaj15s8jgl"; - name = "latex-pretty-symbols"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42567,9 +55280,13 @@ license = lib.licenses.free; }; }) {}; - latex-preview-pane = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + latex-preview-pane = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "latex-preview-pane"; + ename = "latex-preview-pane"; version = "20180222.951"; src = fetchFromGitHub { owner = "jsinglet"; @@ -42577,10 +55294,10 @@ rev = "e7dbe0df3ca938128ab394cdf04f3e40eb5b139e"; sha256 = "1i8mc2qdyyg04rm946vqmmw021c4v8aq7yvxsgl53mfbx9snm3dv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3227f2e35d701915a8d3479d20581dcbe3a778/recipes/latex-preview-pane"; sha256 = "1id1l473azmc9hm5vq5wba8gad9np7sv38x94qd2zkf8b78pzkbw"; - name = "latex-preview-pane"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42588,9 +55305,13 @@ license = lib.licenses.free; }; }) {}; - latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + latex-unicode-math-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "latex-unicode-math-mode"; + ename = "latex-unicode-math-mode"; version = "20170123.1016"; src = fetchFromGitHub { owner = "Christoph-D"; @@ -42598,10 +55319,10 @@ rev = "e8931e68214ca94e6a04080ebc629693d5881884"; sha256 = "049lpqnyjz0x2dp7rzk9gwbf5s28s33vxxk5lfhax6kaizlxkaq8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode"; sha256 = "1p9gpp28vylibv1s95bzfgscznw146ybgk6f3qdbbnafrcrmifcr"; - name = "latex-unicode-math-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42609,20 +55330,25 @@ license = lib.licenses.free; }; }) {}; - latexdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + latexdiff = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "latexdiff"; - version = "20171225.1623"; + ename = "latexdiff"; + version = "20180521.1532"; src = fetchFromGitHub { owner = "galaunay"; repo = "latexdiff.el"; - rev = "665aa65707d0e8c5778de70f38a42be4ba1def5d"; - sha256 = "1ppxmcbkscsdsnm5vf7lmhzq1y0vkkg8dpp4gh0hmsvqvh7d67bp"; + rev = "024ee7a4fd235695dacd9f53594fef3d79bee88b"; + sha256 = "17xpkbrwfck0m6zp5d1b9b4slkgyvm8d92nzilb4s1rf9nqf9mvw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d164cf118a2c928c04e4d5cbfd47ac732e626fe0/recipes/latexdiff"; sha256 = "002frvk31q3plrqa6lldadchck51bch4n126y5l33fyfs0ipspfa"; - name = "latexdiff"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -42630,9 +55356,13 @@ license = lib.licenses.free; }; }) {}; - launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + launch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "launch"; + ename = "launch"; version = "20130619.1504"; src = fetchFromGitHub { owner = "sfllaw"; @@ -42640,10 +55370,10 @@ rev = "e7c3b573fc05fe4d3d322389079909311542e799"; sha256 = "0ciycsqzyj6ld60c7sfqjq59ln3jvk3w9vy606kqzpcvj01ihmv1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e46ed1761fa2e69f0dc2f58e422ea1de8a8cb49/recipes/launch"; sha256 = "043gwz583pa1wv84fl634p1v86lcsldsw7qkjbm6y678q5mms0m6"; - name = "launch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42651,9 +55381,14 @@ license = lib.licenses.free; }; }) {}; - launch-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + launch-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "launch-mode"; + ename = "launch-mode"; version = "20170105.2112"; src = fetchFromGitHub { owner = "iory"; @@ -42661,10 +55396,10 @@ rev = "25ebd4ba77afcbe729901eb74923dbe9ae81c313"; sha256 = "1pjb4gwzkk6djzyfqqxf6y5xvrsh4bi5ijg60zrdlnhivggnfbvn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/876755fff14914b10a26d15f0c7ff32be7c51aa3/recipes/launch-mode"; sha256 = "1za0h16z84ls7da17qzqady0simzy5pk1mlw3mb0nhlg2cfmn060"; - name = "launch-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -42672,20 +55407,25 @@ license = lib.licenses.free; }; }) {}; - launchctl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + launchctl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "launchctl"; + ename = "launchctl"; version = "20150518.609"; src = fetchFromGitHub { owner = "pekingduck"; repo = "launchctl-el"; - rev = "73f8f52a5aa9a0be9bdcf68c29ad0fa2b4a115a4"; - sha256 = "154z7bhb7qagvl3dlgrlsxdg4chz2863ijglg47xs3yhjp5ypanj"; + rev = "79842d30134a2f8838ffb909e87f6200ea148428"; + sha256 = "18fmgvfhv3kz1bpf9icipsmq9ifahhplv9q1b3rw8bbjcl5jrnb5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66d0d8c6f7cb66e56328a9cfe9cdef6dffc3c1be/recipes/launchctl"; sha256 = "07fq445cjpv4ndi7hnjmsrmskm2rlp6ghq0k3bcbjxl21smd9vs9"; - name = "launchctl"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -42693,9 +55433,14 @@ license = lib.licenses.free; }; }) {}; - lavender-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lavender-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lavender-theme"; + ename = "lavender-theme"; version = "20170808.613"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -42703,10 +55448,10 @@ rev = "ef5e959b95d7fb8152137bc186c4c24e986c1e3c"; sha256 = "0pbpns387fmalkakbdl2q7d2y720m7ai7mnydsinjwlkdrshvj4g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/lavender-theme"; sha256 = "1x7mk3dpk44fkzll6xmh2dw270cgb3a9qs3h8bmiq2dw0wrcwcd1"; - name = "lavender-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -42714,20 +55459,25 @@ license = lib.licenses.free; }; }) {}; - lcb-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lcb-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lcb-mode"; + ename = "lcb-mode"; version = "20160815.2240"; src = fetchFromGitHub { owner = "peter-b"; repo = "lcb-mode"; - rev = "be0768e9aa6f9b8e76f2230f4f7f4d152a766b9a"; - sha256 = "0mgcqqhjadm8ckp6x37f9j4xcs61g73m9v8qr4zbw115yci2d0xk"; + rev = "e5b0b6ca6c5feeb2502d66a760ddf5bb590d04c4"; + sha256 = "0i58qz4l5rzwp9kx4r9f818ly21ys71zh1zjxppp220p3yydljfq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd1380a9ba363f62f297e3ab2995341258b51fd1/recipes/lcb-mode"; sha256 = "184vd5ll0ms2lspzv8zz2zbairsr8i9p3gs28hrnnwm6mrpx4n18"; - name = "lcb-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -42735,20 +55485,26 @@ license = lib.licenses.free; }; }) {}; - lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lcr = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lcr"; - version = "20180224.1243"; + ename = "lcr"; + version = "20180414.1256"; src = fetchFromGitHub { owner = "jyp"; repo = "lcr"; - rev = "6caa2bac7056dcf42c4cb88a1d5fbe1c9d71a9b4"; - sha256 = "0xvl0dqxwim6nmm6f9ddyp0r6j1n719zlgm2a3f49dskhnkn798z"; + rev = "49a59d80a4b55cc421cb55430ff8258887382c3d"; + sha256 = "1fds0s0if9m155v5hk5l0ihc6wr331qif5bc013w04hrlkn4v5jh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr"; sha256 = "07syirjlrw8g95zk273953mnmg9x4bv8jpyvvzghhin4saiiiw3k"; - name = "lcr"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -42756,41 +55512,30 @@ license = lib.licenses.free; }; }) {}; - ldap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ldap-mode"; - version = "20091203.1015"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "ldap-mode"; - rev = "8761a835e90b990fb5fe70173ecdcd6f4b776cb0"; - sha256 = "03mv2r6k9syr7bk4vmdafmpa8kz19hv5h68ahj2bmdcmwlvwhkf3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/169243eedf4ee97fe01811a686f0798f2573fa0a/recipes/ldap-mode"; - sha256 = "0lkfpbzsry9jigrx5zp14bkrvqnavnk4y3s0whnbigc4fgpf94rq"; - name = "ldap-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ldap-mode"; - license = lib.licenses.free; - }; - }) {}; - lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: - melpaBuild { + lean-mode = callPackage ({ dash + , dash-functional + , emacs + , f + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , s }: + melpaBuild { pname = "lean-mode"; - version = "20180123.413"; + ename = "lean-mode"; + version = "20180712.57"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "ae90bd280588c96d540892d0f42247db5a126f51"; - sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa"; + rev = "529b8fa535cfa090a6b62566794161556ffade80"; + sha256 = "0gqwc65m42kkal390a7qx1r5b9ixsbg6avn8s35n5r1qf2w0qx5p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode"; sha256 = "0rdraxsirkrzbinjwg4qam15iy3qiixqgwsckngzw8d9a4s9l6sj"; - name = "lean-mode"; + name = "recipe"; }; packageRequires = [ dash dash-functional emacs f flycheck s ]; meta = { @@ -42798,9 +55543,20 @@ license = lib.licenses.free; }; }) {}; - leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: - melpaBuild { + leanote = callPackage ({ async + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , pcache + , request + , s }: + melpaBuild { pname = "leanote"; + ename = "leanote"; version = "20161222.1739"; src = fetchFromGitHub { owner = "aborn"; @@ -42808,10 +55564,10 @@ rev = "d499e7b59bb1f1a2fabc0e4c26fb101ed62ebc7b"; sha256 = "1lg4zml26q97bx9jrmjikhnm3d74b12q2li5h8gpxx9m35wc360c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote"; sha256 = "1xnfv7bpkw3ir402962zbp856d56nas098nkf7bamnsnax6kkqw7"; - name = "leanote"; + name = "recipe"; }; packageRequires = [ async cl-lib emacs let-alist pcache request s ]; meta = { @@ -42819,20 +55575,25 @@ license = lib.licenses.free; }; }) {}; - ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ledger-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ledger-mode"; - version = "20180317.2003"; + ename = "ledger-mode"; + version = "20180705.138"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "74b242f9cfd9e3a0735c4041b3941ddb65642fc9"; - sha256 = "1fyyhrr4600q706v05pnc25j4apmz8m52jdb1s7jnwph89zwm18c"; + rev = "ac93ac5c36dd66fc97417697d92688c5e2570024"; + sha256 = "0yhr1d40wk2h514p6rjpnhvdxwjdbmr3bkh1wnc6pafpcryhydi1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; sha256 = "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf"; - name = "ledger-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -42840,9 +55601,13 @@ license = lib.licenses.free; }; }) {}; - leerzeichen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + leerzeichen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "leerzeichen"; + ename = "leerzeichen"; version = "20170422.613"; src = fetchFromGitHub { owner = "fgeller"; @@ -42850,10 +55615,10 @@ rev = "5acf9855ecb2b2cd5da4402bb48df149e7525cc5"; sha256 = "1bx4pv51a9x8f51pjrms8jkfrpa3glwkh308svz05gnyi2g0r8hw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5de7033e75bc28de6e50b2146511cdaac4542ad6/recipes/leerzeichen"; sha256 = "0h7zpskcgkswr110vckfdbxggz5b3g9grk1j1cbd98pmrpgfqrvp"; - name = "leerzeichen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42861,9 +55626,13 @@ license = lib.licenses.free; }; }) {}; - legalese = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + legalese = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "legalese"; + ename = "legalese"; version = "20150820.1024"; src = fetchFromGitHub { owner = "jorgenschaefer"; @@ -42871,10 +55640,10 @@ rev = "ec23e69d18329456beed9546a1d6c72f96db91cf"; sha256 = "05zpc8b2pyjz76fvmgr7zkl56g6nf6hi4nmxdg6gkw8fx6p8i19f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/legalese"; sha256 = "18rkvfknaqwkmhsjpgrf2hknrb2zj61aw8rb4907gsbs9rciqpdd"; - name = "legalese"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42882,9 +55651,13 @@ license = lib.licenses.free; }; }) {}; - lemon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lemon-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lemon-mode"; + ename = "lemon-mode"; version = "20130216.504"; src = fetchFromGitHub { owner = "mooz"; @@ -42892,10 +55665,10 @@ rev = "155bfced6c9afc8072a0133d3d1baa54c6d67430"; sha256 = "0n6jrm5ilm5wzfrh7yjxn3sr5m10hwdm55b179ild32lh4795zj7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6163d4cf36031349480039b82de8cdc75c2db169/recipes/lemon-mode"; sha256 = "0jdf3556kmv55jh85ljqh2gdx0jl2b8zgvpz9a4kf53xifk3lqz5"; - name = "lemon-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42903,20 +55676,25 @@ license = lib.licenses.free; }; }) {}; - lenlen-theme = callPackage ({ color-theme-solarized, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lenlen-theme = callPackage ({ color-theme-solarized + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lenlen-theme"; + ename = "lenlen-theme"; version = "20170328.1945"; src = fetchFromGitHub { owner = "zk-phi"; repo = "lenlen-theme"; - rev = "b8a6412c81633b10fb98ba0930f55b25071c084a"; - sha256 = "177fqqhd498v2h6wki6pgg982rp4jxhn4wrzajcqppjz4nidb1b7"; + rev = "3af764f0b381bdbf04b1a9064695abbe7916bbc3"; + sha256 = "1zlgb3s7gdh0ypsjw4ck7ai6hqf54cakd1walj8qqhia23g76mxq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/lenlen-theme"; sha256 = "1bddkcl9kzj3v071qpzmxzjwywqfj5j6cldz240qgp5mx685r0a9"; - name = "lenlen-theme"; + name = "recipe"; }; packageRequires = [ color-theme-solarized ]; meta = { @@ -42924,20 +55702,29 @@ license = lib.licenses.free; }; }) {}; - lentic = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild, s }: - melpaBuild { + lentic = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , m-buffer + , melpaBuild + , s }: + melpaBuild { pname = "lentic"; + ename = "lentic"; version = "20161202.1352"; src = fetchFromGitHub { owner = "phillord"; repo = "lentic"; - rev = "678db9327209a1e6200c9272f4080595dc68f8a5"; - sha256 = "1wziqwclrkrz6bs66mj2rqcgavyf11l7iaz8vksv7vw6fh18bpbs"; + rev = "c744f3d3be20ce2a9f25890db2b4500438dfa547"; + sha256 = "1rvjmn70ncrsv6rzxhjiplibf0ypkg0qlg21ra53bhvy6vlizdsi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cbb6f9cc3c1040b80fbf3f2df2ac2c3c8d18b6b1/recipes/lentic"; sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m"; - name = "lentic"; + name = "recipe"; }; packageRequires = [ dash emacs f m-buffer s ]; meta = { @@ -42945,9 +55732,15 @@ license = lib.licenses.free; }; }) {}; - lentic-server = callPackage ({ fetchFromGitHub, fetchurl, lentic, lib, melpaBuild, web-server }: - melpaBuild { + lentic-server = callPackage ({ fetchFromGitHub + , fetchurl + , lentic + , lib + , melpaBuild + , web-server }: + melpaBuild { pname = "lentic-server"; + ename = "lentic-server"; version = "20160717.1352"; src = fetchFromGitHub { owner = "phillord"; @@ -42955,10 +55748,10 @@ rev = "8e809fafbb27a98f815b544d9d9ee15843eb6a36"; sha256 = "1wc1c6hqhbb5x4fi7lp30bsrfww9g12c41lphswy92qzlij4zbww"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10b8cc0b4612d7d02be3a74c21b762cbf7613bd6/recipes/lentic-server"; sha256 = "1y9idhf9qcsw3dbdj7rwa7bdrn1q0m3bg3r2jzwdnvkq8aas1w56"; - name = "lentic-server"; + name = "recipe"; }; packageRequires = [ lentic web-server ]; meta = { @@ -42966,20 +55759,24 @@ license = lib.licenses.free; }; }) {}; - less-css-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + less-css-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "less-css-mode"; + ename = "less-css-mode"; version = "20160930.2153"; src = fetchFromGitHub { owner = "purcell"; repo = "less-css-mode"; - rev = "2c3f69640c3c98457255f601db98f520dee2e7b6"; - sha256 = "01cxa7p299k3kgcv2x4lcri154fij7p02v1kl3fx4vnc88nr9jwd"; + rev = "59bf174c4e9f053ec2a7ef8c8a8198490390f6fb"; + sha256 = "1rkjamdy2a80w439vb2hhr7vqjj47wi2azlr7yq2xdz9851xsx9f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/less-css-mode"; sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8"; - name = "less-css-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -42987,9 +55784,13 @@ license = lib.licenses.free; }; }) {}; - letcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + letcheck = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "letcheck"; + ename = "letcheck"; version = "20160202.1148"; src = fetchFromGitHub { owner = "Fuco1"; @@ -42997,10 +55798,10 @@ rev = "edf188ca2f85349e971b83f164c6484264e79426"; sha256 = "06hggcbz98qhfbvp0fxn89j98d0mmki4wc4k8kfzp5fhg071chbi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a0937f704e33bbb9ea8f101cd87c44e8050afb/recipes/letcheck"; sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2"; - name = "letcheck"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43008,9 +55809,14 @@ license = lib.licenses.free; }; }) {}; - letterbox-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + letterbox-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "letterbox-mode"; + ename = "letterbox-mode"; version = "20170701.1825"; src = fetchFromGitHub { owner = "pacha64"; @@ -43018,10 +55824,10 @@ rev = "88c67a51d67216d569a28e8423200883fde096dd"; sha256 = "1xzzfr525pn2mj7x6xnvccxhls79bfpi5mqhl9ivisnlgj1bvdjw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1512e20962ea354e4311c0a2696a22576a099ba9/recipes/letterbox-mode"; sha256 = "117dj5xzf6givwjyqsciz6axhlcj7xbx0zj91ximm81kb5fswgda"; - name = "letterbox-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -43029,9 +55835,13 @@ license = lib.licenses.free; }; }) {}; - leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + leuven-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "leuven-theme"; + ename = "leuven-theme"; version = "20170919.252"; src = fetchFromGitHub { owner = "fniessen"; @@ -43039,10 +55849,10 @@ rev = "9d31a9d4ed763d6309e9d44985cd8b4a5a2fb500"; sha256 = "0vr535a32cgkna0h1z8ac9cb4al3jb01bybn956rz51qdbzm2d1h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; sha256 = "0pm5majr9cmj6g4zr7vb55ypk9fmfbvxx78mgmgignknbasq9g9a"; - name = "leuven-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43050,9 +55860,13 @@ license = lib.licenses.free; }; }) {}; - levenshtein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + levenshtein = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "levenshtein"; + ename = "levenshtein"; version = "20090830.340"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -43060,10 +55874,10 @@ rev = "070925197ebf6b704e6e00c4f2d2ec783f3df38c"; sha256 = "1w6rhp723kn1ns7r0gcblp5q8bvncicnjjsgdangbib1a4l2xw79"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/levenshtein"; sha256 = "1vdbgzs7gfy89a1dzf6z5l3f5jmly1i8lb2fqi2d08qyl5rhb8bl"; - name = "levenshtein"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43071,9 +55885,13 @@ license = lib.licenses.free; }; }) {}; - lexbind-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lexbind-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lexbind-mode"; + ename = "lexbind-mode"; version = "20141027.729"; src = fetchFromGitHub { owner = "spacebat"; @@ -43081,10 +55899,10 @@ rev = "fa0a6848c1cfd3fbf45db43dc2deef16377d887d"; sha256 = "167ayfl1k8dnajw173hh67nbwbk4frmjc4fzc515q67m9d7m5932"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a493e642cc90bbe1c70a2d918793f0734464c9/recipes/lexbind-mode"; sha256 = "1hs9wg45mwp3fwi827rc4g0gjx4fk87zlibq3id9fcqic8q7nrnl"; - name = "lexbind-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43092,20 +55910,24 @@ license = lib.licenses.free; }; }) {}; - lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lfe-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lfe-mode"; + ename = "lfe-mode"; version = "20170121.454"; src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "5faa7106419263689bfc0bc08a7451ccb1fba718"; - sha256 = "010l1xz9wa6wm7fnajxcdxjl1nmbkwxxwszd4h14xmhj830560ph"; + rev = "70579b69e44147f1b74f619dd9dbaed572d8f9d6"; + sha256 = "1p9a3d1jqm0kqn074f3fh1v4xp1f1jzwihv395bk6yxlhagk9anb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; sha256 = "0smncyby53ipm8yqslz88sqjafk0x6r8d0qwk4wzk0pbgfyklhgs"; - name = "lfe-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43113,9 +55935,66 @@ license = lib.licenses.free; }; }) {}; - libmpdee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + libelcouch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { + pname = "libelcouch"; + ename = "libelcouch"; + version = "20180604.53"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "libelcouch"; + rev = "1396144ebbb9790d4c744db0d4aacc0211b8e8e6"; + sha256 = "1r0wrqiqar3jw5xbp1qv7kj7m1fdzciyy9690hwiq99dcm8nlri3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/209d5c507cfe42b152c21a4534c3ba549186420f/recipes/libelcouch"; + sha256 = "1zfjyfyjd59z0ns32v2b0r5g9ypjxrlmkx3djmxsmzd4an8ciq3p"; + name = "recipe"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/libelcouch"; + license = lib.licenses.free; + }; + }) {}; + libgit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "libgit"; + ename = "libgit"; + version = "20180624.2359"; + src = fetchFromGitHub { + owner = "magit"; + repo = "libegit2"; + rev = "5e8dedb8275d394ce423a73ce39934302fa84f50"; + sha256 = "1nr9h8qkkjv1r5jzyydxqmq02kxays1yqxlqd7s9968gqacyqkyv"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/993a5abe3a9e8b160f0d68283eeca6af033abc79/recipes/libgit"; + sha256 = "05yys8cjli2zhmhdh9w5qz287ibzplqabx5vyyjv9rpk6wgzkzik"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/libgit"; + license = lib.licenses.free; + }; + }) {}; + libmpdee = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "libmpdee"; + ename = "libmpdee"; version = "20160117.1501"; src = fetchFromGitHub { owner = "andyetitmoves"; @@ -43123,10 +56002,10 @@ rev = "a6ca3b7d6687f3ba60996b9b5044ad1d3b228290"; sha256 = "039awlam3nrgkxrarcapfyc2myvc77aw7whrkcsjjybzylpzv0pr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc91db6f80463a1baea9759f9863b551ae21e180/recipes/libmpdee"; sha256 = "0z4d8y8jlsjw20b31akkaikh5xl0c05lj77d2i1xbgzam4iixma0"; - name = "libmpdee"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43134,20 +56013,25 @@ license = lib.licenses.free; }; }) {}; - libmpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + libmpdel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "libmpdel"; - version = "20180328.2353"; + ename = "libmpdel"; + version = "20180606.453"; src = fetchFromGitHub { owner = "mpdel"; repo = "libmpdel"; - rev = "abb748b6cb35de4652df80ce8539bfc63189619d"; - sha256 = "0ccqcn85131pywzga4644f0azxrsl5ay69m6jz27zzvshs7gzzjv"; + rev = "fcc719c2f23df4b5838eab76a40fef11055203de"; + sha256 = "0qw6rrb16bbhwg1gci4ymn2nshzf21lcf2nyphxbn4vcv400cw4k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel"; sha256 = "0qi9g3czwzi9hhp7gjczpzjx9vgzz52xi91332l0sxcxmwbawjp1"; - name = "libmpdel"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -43155,9 +56039,13 @@ license = lib.licenses.free; }; }) {}; - lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lice = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lice"; + ename = "lice"; version = "20170220.143"; src = fetchFromGitHub { owner = "buzztaiki"; @@ -43165,10 +56053,10 @@ rev = "4339929927c62bd636f89bb39ea999d18d269250"; sha256 = "0879z761b7gajkhq176ps745xpdrivch349crransv8fnsc759yb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2508699ebfc846742940c5e4356b095b540e2405/recipes/lice"; sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x"; - name = "lice"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43176,9 +56064,14 @@ license = lib.licenses.free; }; }) {}; - light-soap-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + light-soap-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "light-soap-theme"; + ename = "light-soap-theme"; version = "20150607.745"; src = fetchFromGitHub { owner = "mswift42"; @@ -43186,10 +56079,10 @@ rev = "76a787bd40c6b567ae68ced7f5d9f9f10725e00d"; sha256 = "04dik8z2mg6qr4d3fkd26kg29b4c5crvbnc1lfsrzyrik7ipvsi8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/053be1123bb934d80b4d6db0e7e39b59771be035/recipes/light-soap-theme"; sha256 = "09p4w51d5szhi81a6a3l0r4zd4ixkrkzxldr938bcmj0qmj62iyk"; - name = "light-soap-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -43197,20 +56090,51 @@ license = lib.licenses.free; }; }) {}; - line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + line-reminder = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "line-reminder"; + ename = "line-reminder"; + version = "20180602.2252"; + src = fetchFromGitHub { + owner = "jcs090218"; + repo = "line-reminder"; + rev = "0db41599b7663c4c8257aaf733323e84e95ef042"; + sha256 = "09pzynms4m4m54fk2ci1wizkgrqkgh4mqyrj9wzpwpkdik7zvr7b"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/456f760f7f7d4151e18f08b2f1154c5880423b21/recipes/line-reminder"; + sha256 = "0kvqilg5fnr3qb7nwjf4j5ydm1lp4m06ss81i0bq2c6bv74zfcf1"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/line-reminder"; + license = lib.licenses.free; + }; + }) {}; + line-up-words = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "line-up-words"; + ename = "line-up-words"; version = "20180219.224"; src = fetchFromGitHub { owner = "janestreet"; repo = "line-up-words"; - rev = "bbefa954510801725070be50a7e13de6dc38f49a"; - sha256 = "165sg8j69lxqjfx9avbcclsw6n57x4qrkhd74zbmzs35xnji9w5q"; + rev = "2c236f5772e18d0e50d7ca2eee7eebbe356d9b60"; + sha256 = "0sazx4a6hn0z7318mdc80z87n5ix4hhyyh4p4f37pv5p9q6y8sd2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words"; sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79"; - name = "line-up-words"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43218,9 +56142,39 @@ license = lib.licenses.free; }; }) {}; - lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lines-at-once = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "lines-at-once"; + ename = "lines-at-once"; + version = "20180421.1947"; + src = fetchFromGitHub { + owner = "jiahaowork"; + repo = "lines-at-once.el"; + rev = "a018ba90549384d52ec58c2685fd14a0f65252be"; + sha256 = "0bwc4d2gnfhaqzn455nzrvd9lys7z7ay2v1hxgwp99ndqq93ws6i"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/513d0f0c6976f685fc0df6b6bb0da3162f58f537/recipes/lines-at-once"; + sha256 = "1hiij6i47i9px82ll87dvx5pgp5jzz8qis7hdm8n6hd3c9rnabma"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lines-at-once"; + license = lib.licenses.free; + }; + }) {}; + lingr = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lingr"; + ename = "lingr"; version = "20100807.1031"; src = fetchFromGitHub { owner = "lugecy"; @@ -43228,10 +56182,10 @@ rev = "4215a8704492d3c860097cbe2649936c22c196df"; sha256 = "0rkx0hk3y79rwhjqs3wvgxhg1rj83mxbqkhhm3jfawp8c1av4f40"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5d29710ab17b1a98f9b559344e4dd40a2b9c08/recipes/lingr"; sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff"; - name = "lingr"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43239,20 +56193,24 @@ license = lib.licenses.free; }; }) {}; - link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + link = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "link"; + ename = "link"; version = "20140717.2029"; src = fetchFromGitHub { owner = "myrkr"; repo = "dictionary-el"; - rev = "a23b8f4a422d0de69a006ed010eff5795319db98"; - sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm"; + rev = "a5619fb275520d699eaae214e41ebcfde23c17f3"; + sha256 = "176w46j3m343vlkjn9jyaaz3ikzdzxffrvhalgc76ydw9wyivbf8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/link"; sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8"; - name = "link"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43260,20 +56218,27 @@ license = lib.licenses.free; }; }) {}; - link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + link-hint = callPackage ({ avy + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "link-hint"; - version = "20170923.855"; + ename = "link-hint"; + version = "20180519.1430"; src = fetchFromGitHub { owner = "noctuid"; repo = "link-hint.el"; - rev = "0294df85aee10b47fcf6c2c9bfe7e1038660fa21"; - sha256 = "0ixfrp6pfljgy5ja79cka0fa6a9ganwhh5myz6czqj4ykjzlyi2c"; + rev = "23df5fa36ab182452be6b772475eab67b846dd92"; + sha256 = "0b7i2jasc5bsphix9fhvmi3ddj42f5n5liczrrfv4p9k14px3b10"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint"; sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89"; - name = "link-hint"; + name = "recipe"; }; packageRequires = [ avy cl-lib emacs ]; meta = { @@ -43281,9 +56246,13 @@ license = lib.licenses.free; }; }) {}; - linphone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + linphone = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "linphone"; + ename = "linphone"; version = "20130524.409"; src = fetchFromGitHub { owner = "zabbal"; @@ -43291,10 +56260,10 @@ rev = "99af3db941b7f4e5272bb48bff96c1ce4ceac302"; sha256 = "01yv6239z90hvncwmm9g5nh4xvyxv2ig3h4hsmxdn4kacfxvc84n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0ea68b186c813faceb6fc663633cb81df666f0e/recipes/linphone"; sha256 = "0q7mw1npxq24szhwswc93qz5h6magcxw63ymba7hwhif6my65zx7"; - name = "linphone"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43302,20 +56271,24 @@ license = lib.licenses.free; }; }) {}; - linum-off = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + linum-off = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "linum-off"; + ename = "linum-off"; version = "20160217.1337"; src = fetchFromGitHub { owner = "mattfidler"; repo = "linum-off"; - rev = "116e66ac259b183e0763b85616888316ab196822"; - sha256 = "1pvgp76n2qnm01l5f9mkb9yqwfxag9x23wwqbsna66rmvsag69w0"; + rev = "3e37baaad27d27e405f8dfe01d4ab9cd5b591353"; + sha256 = "1hyy6d9ybdv9r6bibiylw66a8w4dmlvsj5gfkp37vsp5xj66f2iz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3774ed0cf6fb8c6d08553dc709c7e76a745b2e0/recipes/linum-off"; sha256 = "1yilsdsyxlzmh64dpzirzga9c7lhp1phps9cdgp2898zpnzaclay"; - name = "linum-off"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43323,9 +56296,13 @@ license = lib.licenses.free; }; }) {}; - linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + linum-relative = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "linum-relative"; + ename = "linum-relative"; version = "20180124.247"; src = fetchFromGitHub { owner = "coldnew"; @@ -43333,10 +56310,10 @@ rev = "c74a6981b688a5e1e6b8e0809363963ff558ce4d"; sha256 = "0svxi1l3s4rg1k1apfw25gzi127rsks56b5yfg79a48b5rf1xmkh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative"; sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj"; - name = "linum-relative"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43344,9 +56321,20 @@ license = lib.licenses.free; }; }) {}; - liquid-types = callPackage ({ button-lock, dash, emacs, fetchFromGitHub, fetchurl, flycheck, flycheck-liquidhs, lib, melpaBuild, popup, pos-tip }: - melpaBuild { + liquid-types = callPackage ({ button-lock + , dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , flycheck-liquidhs + , lib + , melpaBuild + , popup + , pos-tip }: + melpaBuild { pname = "liquid-types"; + ename = "liquid-types"; version = "20151201.2335"; src = fetchFromGitHub { owner = "ucsd-progsys"; @@ -43354,10 +56342,10 @@ rev = "cc4bacbbf204ef9cf0756f78dfebee2c6ae14d7b"; sha256 = "06rnma2xj2vnbvy1bnls59cagk6qsf862bj1zp6xbmpr1a5l9m4z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5921fde4068ff1bb288f6f9e2fe03f4a7fdbbda/recipes/liquid-types"; sha256 = "1g7zyak69l4lcsq952j2jy692xxnill9nqb1xfa17yzp547cgvf2"; - name = "liquid-types"; + name = "recipe"; }; packageRequires = [ button-lock @@ -43373,9 +56361,13 @@ license = lib.licenses.free; }; }) {}; - liso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + liso-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "liso-theme"; + ename = "liso-theme"; version = "20160410.1329"; src = fetchFromGitHub { owner = "caisah"; @@ -43383,10 +56375,10 @@ rev = "844688245eb860d23043455e165ee24503454c81"; sha256 = "01ycjy3amzbplp3zf0x5fahsja92gyg2252xhzcyiazmhaz7gkrd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27b849f3a41a5ae3d497cef02a95c92fd479b93b/recipes/liso-theme"; sha256 = "014a71dnhnr0dr36sl2h8ffp6il9nasij31ahqz0bjgn4r16s5gy"; - name = "liso-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43394,9 +56386,13 @@ license = lib.licenses.free; }; }) {}; - lisp-extra-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lisp-extra-font-lock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lisp-extra-font-lock"; + ename = "lisp-extra-font-lock"; version = "20160930.1227"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -43404,10 +56400,10 @@ rev = "092f5a6e75ddfc8051b252f10e182723a17980e4"; sha256 = "0cdjgnh2hzwpim4vl2siykfsfni1z5h45vn5dcm52yx8p10s7mzd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e01d4faf9ecb4dde8b6eb4acdb0e48e3e5b6ea/recipes/lisp-extra-font-lock"; sha256 = "1xchqwhav9x7b02787ghka567fihdc14aamx92jg549c6d14qpwk"; - name = "lisp-extra-font-lock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43415,9 +56411,13 @@ license = lib.licenses.free; }; }) {}; - lispxmp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lispxmp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lispxmp"; + ename = "lispxmp"; version = "20170925.1723"; src = fetchFromGitHub { owner = "rubikitch"; @@ -43425,10 +56425,10 @@ rev = "7ad077b4ee91ce8a42f84eeddb9fc7ea4eac7814"; sha256 = "1156jynii783v9sjj3a7s20ysa26mqaq22zk5nbia949hwbibx16"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/lispxmp"; sha256 = "1a641v5cx4wy2v8a2swxzn1y9cz4g2bp4mn9q290n3ifpn5356dl"; - name = "lispxmp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43436,20 +56436,30 @@ license = lib.licenses.free; }; }) {}; - lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: - melpaBuild { + lispy = callPackage ({ ace-window + , emacs + , fetchFromGitHub + , fetchurl + , hydra + , iedit + , lib + , melpaBuild + , swiper + , zoutline }: + melpaBuild { pname = "lispy"; - version = "20180329.524"; + ename = "lispy"; + version = "20180716.839"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "1ef2ad809922aff9ff4c50ea61c39dfd1c5dd7e0"; - sha256 = "055ckkikzgl7dwsp28h6qxbhxi0gxwg6r82g3w9y9xffjnsv2d3y"; + rev = "a8b0e0afb73b7687cae370fc84384db65bd73fca"; + sha256 = "0y9k91gabgab7fwml4grhna2vzfwbxl9l1n58f5nl9xhia6zfqzi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g"; - name = "lispy"; + name = "recipe"; }; packageRequires = [ ace-window emacs hydra iedit swiper zoutline ]; meta = { @@ -43457,9 +56467,13 @@ license = lib.licenses.free; }; }) {}; - lispyscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lispyscript-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lispyscript-mode"; + ename = "lispyscript-mode"; version = "20170720.1217"; src = fetchFromGitHub { owner = "krisajenkins"; @@ -43467,10 +56481,10 @@ rev = "def632e3335b0c481fbcf5a17f18b0a8c58dd12f"; sha256 = "042nndsrv7kyq20v3lahrpr0x89xyayvhx59i0hx6pvkc9wgk5b6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf912fa20edc9cff12645381b303e37f2de14976/recipes/lispyscript-mode"; sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr"; - name = "lispyscript-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43478,20 +56492,28 @@ license = lib.licenses.free; }; }) {}; - lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: - melpaBuild { + lispyville = callPackage ({ cl-lib ? null + , emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , lispy + , melpaBuild }: + melpaBuild { pname = "lispyville"; - version = "20180327.1343"; + ename = "lispyville"; + version = "20180704.458"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "647de2c3fa3e4cabc791f6d40edcd243b23c4d53"; - sha256 = "0gqph6hbywkzikqxqfvb1fj12srns54jddhkvkrspi71s7g7cff4"; + rev = "aea9df65cc0916789e20c0eb7575624a19388bee"; + sha256 = "05maf5aacjfiap7fyl7mnx1chbs6k30cl1k5af6ar45lhvg7srva"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; sha256 = "1pj41pd51x399gmy0j3qn9hr3ayw31pcg0h9pzbviqpnwmv2in6b"; - name = "lispyville"; + name = "recipe"; }; packageRequires = [ cl-lib emacs evil lispy ]; meta = { @@ -43499,9 +56521,13 @@ license = lib.licenses.free; }; }) {}; - list-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + list-environment = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "list-environment"; + ename = "list-environment"; version = "20151226.1856"; src = fetchFromGitHub { owner = "dgtized"; @@ -43509,10 +56535,10 @@ rev = "b7ca30b05905047be2e55199a6475f8d98ce318b"; sha256 = "1szbs16jlxfj71986dbg0d3j5raaxcwz0xq5ar352731r5mdcqw4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/696cd1647731eb1a22afb95f558c96a1b4aa5121/recipes/list-environment"; sha256 = "1zdhrlp8vk8knjwh56pws6dyn003r6avjzvhghlkgnw9nfrdk57h"; - name = "list-environment"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43520,9 +56546,16 @@ license = lib.licenses.free; }; }) {}; - list-packages-ext = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, persistent-soft, s }: - melpaBuild { + list-packages-ext = callPackage ({ fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , persistent-soft + , s }: + melpaBuild { pname = "list-packages-ext"; + ename = "list-packages-ext"; version = "20151115.916"; src = fetchFromGitHub { owner = "laynor"; @@ -43530,10 +56563,10 @@ rev = "b4dd644e4369c9aa66f5bb8895ea49ebbfd0a27a"; sha256 = "02l7q5376ydz6a8i9x74bsx5bbxz8xkasmv1lzvf79d3jbg28l1s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71c217d98c6967d979f57f89ca26200304b0fc37/recipes/list-packages-ext"; sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk"; - name = "list-packages-ext"; + name = "recipe"; }; packageRequires = [ ht persistent-soft s ]; meta = { @@ -43541,41 +56574,25 @@ license = lib.licenses.free; }; }) {}; - list-register = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "list-register"; - version = "20091203.1015"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "list-register"; - rev = "f8bec5dc3765174de1089549947d9ca9a1cdbe5f"; - sha256 = "1pr7vmjmyildg44n7psg0zmj8a3kfsw5xmgh600fhs95wqxn3sag"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/list-register"; - sha256 = "0kza9xfhmxc8qia5yixx5z2y9j4wb1530rcvgxn545b903fs55kv"; - name = "list-register"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/list-register"; - license = lib.licenses.free; - }; - }) {}; - list-unicode-display = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + list-unicode-display = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "list-unicode-display"; + ename = "list-unicode-display"; version = "20150219.101"; src = fetchFromGitHub { owner = "purcell"; repo = "list-unicode-display"; - rev = "222c21c68ccc930b2843ea919c960de9be3b55c2"; - sha256 = "15gz7iw8k4xlj1ik216qw4q1j7nxihlnqgr983ic4k1n2r29fys7"; + rev = "59770cf3572bd36c3e9ba044846dc420c0dca09b"; + sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8e2a974a56665b97d7622b0428994edadc88a0/recipes/list-unicode-display"; sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha"; - name = "list-unicode-display"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -43583,9 +56600,13 @@ license = lib.licenses.free; }; }) {}; - list-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + list-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "list-utils"; + ename = "list-utils"; version = "20160414.702"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -43593,10 +56614,10 @@ rev = "acf18aca1131a90f8d673974673e3c5d8fdc6a86"; sha256 = "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9fcd716cbb9f5a4de82a49e57bcb20c483d05f6/recipes/list-utils"; sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3"; - name = "list-utils"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43604,20 +56625,24 @@ license = lib.licenses.free; }; }) {}; - lit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lit-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lit-mode"; + ename = "lit-mode"; version = "20141123.936"; src = fetchFromGitHub { owner = "HectorAE"; repo = "lit-mode"; - rev = "c61c403afc8333a5649c5421ab1a6341dc1c7d92"; - sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd"; + rev = "bfecbe898223393f34340ca379977be753ee497a"; + sha256 = "1sjyb5v3s9z128ifjqx7a1dsgds2iz185y82581qxakl7ylmn15k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a6a1c79c9bba7b17c150ea0663bc61936f15d83/recipes/lit-mode"; sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59"; - name = "lit-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43625,20 +56650,25 @@ license = lib.licenses.free; }; }) {}; - litable = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + litable = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "litable"; + ename = "litable"; version = "20160922.859"; src = fetchFromGitHub { owner = "Fuco1"; repo = "litable"; - rev = "90a2dca14a6da9b24fe332a65cff899ab4a90810"; - sha256 = "1xaixgjfpnqnsdkhfia107fq5xaq2l0gdb0zp730z97958136mm3"; + rev = "4a57d7aeddca76448e4df2a46b42d49253e5e625"; + sha256 = "1zryrc0d2avb27w6a6yzqcc73rsr2rp795vi10qhb04ixda4a8w4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74f2190b653907985e49a96ded986ab11b4946d7/recipes/litable"; sha256 = "073yw3ivkl093xxppn5vqyh69jhfc97al505mnyn34fwdj5v8fji"; - name = "litable"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -43646,9 +56676,14 @@ license = lib.licenses.free; }; }) {}; - litecoin-ticker = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + litecoin-ticker = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "litecoin-ticker"; + ename = "litecoin-ticker"; version = "20160611.1711"; src = fetchFromGitHub { owner = "llcc"; @@ -43656,10 +56691,10 @@ rev = "3d8047c736e4ee0b8638953f8cc63eaefad34106"; sha256 = "03iggfi3r5xjh9yhhpr1pgyayriycyybf8qnrhqkqcamh77kq21f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/litecoin-ticker"; sha256 = "14pjizgdckqhm31ihbz35j8g95jdpmf1rd4l5zz38fyx12zbcpx5"; - name = "litecoin-ticker"; + name = "recipe"; }; packageRequires = [ json ]; meta = { @@ -43667,9 +56702,15 @@ license = lib.licenses.free; }; }) {}; - literal-string = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { + literal-string = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "literal-string"; + ename = "literal-string"; version = "20170301.730"; src = fetchFromGitHub { owner = "joodie"; @@ -43677,10 +56718,10 @@ rev = "2ca4fc08b8e19e6183b1f1db747bb0a4aa4f98eb"; sha256 = "0wcz0lid05gnlmxpxm4ckw07cnxwjkyw6960nq7pylbjpg76g5ng"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6519bb53f409eeb0d557809b338849e473c193c4/recipes/literal-string"; sha256 = "0ylv9dpw17w272f92vn5cldklyz1d8daihi1fsh5ylvxqpinyrkn"; - name = "literal-string"; + name = "recipe"; }; packageRequires = [ emacs markdown-mode ]; meta = { @@ -43688,20 +56729,25 @@ license = lib.licenses.free; }; }) {}; - literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + literate-coffee-mode = callPackage ({ coffee-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "literate-coffee-mode"; + ename = "literate-coffee-mode"; version = "20170211.715"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-literate-coffee-mode"; - rev = "55ce0305495f4a38c8063c4bd63deb1e1252373d"; - sha256 = "1gm89azjgsdg0c7z9yprpjbph211c5jnqv11pkf1i1r1wzx0wanj"; + rev = "ef34c3a5b813ef078d44c29887761950ab6821c7"; + sha256 = "1bkpwl4fpyrxs941pp68pfk30ffi9v09h5dsamaqmlm43vchcspi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/literate-coffee-mode"; sha256 = "18fdgay7xfgza75z3xma666f414m9dn7d50w94wzzmv7ja74sp64"; - name = "literate-coffee-mode"; + name = "recipe"; }; packageRequires = [ coffee-mode ]; meta = { @@ -43709,9 +56755,14 @@ license = lib.licenses.free; }; }) {}; - literate-starter-kit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + literate-starter-kit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "literate-starter-kit"; + ename = "literate-starter-kit"; version = "20150730.1154"; src = fetchFromGitHub { owner = "eschulte"; @@ -43719,10 +56770,10 @@ rev = "6dce1d01781966c14558aa553cfc85008c06e115"; sha256 = "1v37bii372w2g3pl09n5dcrk6y7glhpg8qiv17zsk9jy3ps2xm1b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/812860589cd92759fd2ae02d27f287de88f26863/recipes/literate-starter-kit"; sha256 = "1n2njf007fmrmsb8zrgxbz1cpxmr5nsp8w41yxa934iqc7qygkjy"; - name = "literate-starter-kit"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -43730,9 +56781,16 @@ license = lib.licenses.free; }; }) {}; - live-code-talks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, narrowed-page-navigation }: - melpaBuild { + live-code-talks = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , narrowed-page-navigation }: + melpaBuild { pname = "live-code-talks"; + ename = "live-code-talks"; version = "20150115.1423"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -43740,10 +56798,10 @@ rev = "fece58108939a53104f88d348298c9e122f25b75"; sha256 = "1j0qa96vlsqybhp0082a466qb1hd2b0621306brl9pfl5srf5jsj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/live-code-talks"; sha256 = "1ji4lww71dqxnn5c9inix8xqcmgc76wbps0ylxhhgs44ki4hlyrm"; - name = "live-code-talks"; + name = "recipe"; }; packageRequires = [ cl-lib emacs narrowed-page-navigation ]; meta = { @@ -43751,9 +56809,14 @@ license = lib.licenses.free; }; }) {}; - live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + live-py-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "live-py-mode"; + ename = "live-py-mode"; version = "20180330.1758"; src = fetchFromGitHub { owner = "donkirkby"; @@ -43761,10 +56824,10 @@ rev = "ab2f9bea32dbad11a6464a4880e5487645a0f65a"; sha256 = "0w3kpszsrh0gj0a62iqhnhm3flmmgq0pl0d6w5r61mvlq9wck5dv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq"; - name = "live-py-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -43772,9 +56835,13 @@ license = lib.licenses.free; }; }) {}; - lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lively = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lively"; + ename = "lively"; version = "20171005.54"; src = fetchFromGitHub { owner = "purcell"; @@ -43782,10 +56849,10 @@ rev = "348675828c6a81bfa1ac311ca465aad813542c1b"; sha256 = "1j8w63hhk1wcxcfqz0wimqijp7p1m8a2n947gwqv8nk1wm40aqg3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively"; sha256 = "1q8cbl3sr3dpvzk57985giy4xmz4lvg94jcw7shbhz1v9q05dr5g"; - name = "lively"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43793,9 +56860,15 @@ license = lib.licenses.free; }; }) {}; - livereload = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, websocket }: - melpaBuild { + livereload = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , websocket }: + melpaBuild { pname = "livereload"; + ename = "livereload"; version = "20170628.2350"; src = fetchFromGitHub { owner = "joaotavora"; @@ -43803,10 +56876,10 @@ rev = "1e501d7e46dbd476c2c7cc9d20b5ac9d41fb1955"; sha256 = "1z1v2panxrqpam5ysnilx83y6b4dwxmxqhmbgjwfyd1bdmr4iya4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/330731804c442226fa2faaa3da408e9253a1c051/recipes/livereload"; sha256 = "1z0dbg82l6znz1b03v19a8fnq6b1smikpvaplpxlgny82xrs9als"; - name = "livereload"; + name = "recipe"; }; packageRequires = [ emacs websocket ]; meta = { @@ -43814,9 +56887,13 @@ license = lib.licenses.free; }; }) {}; - livescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + livescript-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "livescript-mode"; + ename = "livescript-mode"; version = "20140612.2121"; src = fetchFromGitHub { owner = "yhisamatsu"; @@ -43824,10 +56901,10 @@ rev = "90a918d9686e256e6d4d439cc20f24dad8d3b804"; sha256 = "0kqjz0i0zapyhh8z57cvc8ifiizngix3ca01mjnvyq3zxg1bqrsg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1727cd154c841219b1dff1c8714cb09692e2730f/recipes/livescript-mode"; sha256 = "1fdfhp39zr2mhy5rd6mwqv5fwd8xaypdqig7v3ksv77m5zq7cmmj"; - name = "livescript-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43835,9 +56912,15 @@ license = lib.licenses.free; }; }) {}; - livid-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s, skewer-mode }: - melpaBuild { + livid-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , skewer-mode }: + melpaBuild { pname = "livid-mode"; + ename = "livid-mode"; version = "20131116.544"; src = fetchFromGitHub { owner = "pandeiro"; @@ -43845,10 +56928,10 @@ rev = "dfe5212fa64738bc4138bfebf349fbc8bc237c26"; sha256 = "178ldzpk8a9m9abn8xlplxn5jgcca71dpkp82bs5g7bsccp3rx6p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b14068485afbd888bf0d124aea089fe5fbd5038c/recipes/livid-mode"; sha256 = "0jy16m6injqznx4gmxzvhys480pclw9g07z4qll2dna37177ww9d"; - name = "livid-mode"; + name = "recipe"; }; packageRequires = [ s skewer-mode ]; meta = { @@ -43856,19 +56939,24 @@ license = lib.licenses.free; }; }) {}; - lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + lms = callPackage ({ emacs + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lms"; + ename = "lms"; version = "20170804.922"; src = fetchhg { url = "https://bitbucket.com/inigoserna/lms.el"; rev = "f07ac3678e27"; sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms"; sha256 = "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1"; - name = "lms"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -43876,9 +56964,39 @@ license = lib.licenses.free; }; }) {}; - load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + load-env-vars = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "load-env-vars"; + ename = "load-env-vars"; + version = "20180511.1510"; + src = fetchFromGitHub { + owner = "diasjorge"; + repo = "emacs-load-env-vars"; + rev = "5da97fabb4d36a00a29c40375fce9c16d8005ab3"; + sha256 = "16xvcb0pq0a6c331grcdak7h8xmns752cz1dbvssm44xfv2cqjqi"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/93835267005c49095a02fc1688b2b449f5acfb86/recipes/load-env-vars"; + sha256 = "0yc05qqhbva2zn2rrl4spp38jxblk4gh64q9fd7mgl7i50f2kk00"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/load-env-vars"; + license = lib.licenses.free; + }; + }) {}; + load-relative = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "load-relative"; + ename = "load-relative"; version = "20170526.310"; src = fetchFromGitHub { owner = "rocky"; @@ -43886,10 +57004,10 @@ rev = "738896e3da491b35399178ed2c6bc92cc728d119"; sha256 = "1rpy5mfncncl6gqgg53d3g25g1700g4b9bivd4c0cfcv5dbxhp73"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative"; sha256 = "0j8ybbjzhzgjx47pqqdbsqi8n6pzqcf6zqc38x7cf1kkklgc87ay"; - name = "load-relative"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43897,20 +57015,24 @@ license = lib.licenses.free; }; }) {}; - load-theme-buffer-local = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + load-theme-buffer-local = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "load-theme-buffer-local"; + ename = "load-theme-buffer-local"; version = "20120702.1336"; src = fetchFromGitHub { owner = "vic"; repo = "color-theme-buffer-local"; - rev = "e606dec66f16a06140b9aad625a4fd52bca4f936"; - sha256 = "0c04fy3hc8wc0aabilqx9mcipmd41rmshqjxc3z8m1w0bm4288g1"; + rev = "bc221a88aefec5bdc137b5d5e449e1f1e55ce901"; + sha256 = "0yhydmzllwygv6l9vyv23jr5rf2mx1fm7y1jv92dn43ys53bv3sb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/load-theme-buffer-local"; sha256 = "13829yrh36qac7gpxanizlk4n7av99ngvv06y6mmi5rq06a4hjx4"; - name = "load-theme-buffer-local"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43918,9 +57040,13 @@ license = lib.licenses.free; }; }) {}; - loc-changes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + loc-changes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "loc-changes"; + ename = "loc-changes"; version = "20160801.1008"; src = fetchFromGitHub { owner = "rocky"; @@ -43928,10 +57054,10 @@ rev = "4d1dcdf7631c23b1259ad4f72bf9686cf95fb46c"; sha256 = "0a81933l3rrsbi9vkvfb1g94vkhl5n3fkffpy4icis97q7qh08mc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ce68d573d19f26ecfd190f8e6cd1f384ca3e8a/recipes/loc-changes"; sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh"; - name = "loc-changes"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43939,9 +57065,14 @@ license = lib.licenses.free; }; }) {}; - loccur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + loccur = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "loccur"; + ename = "loccur"; version = "20161227.251"; src = fetchFromGitHub { owner = "fourier"; @@ -43949,10 +57080,10 @@ rev = "650d91dda0d313c8f445a0803c07809d857dee0f"; sha256 = "09xc2207dhlbw0x9pks2gay09adzijzcabdwg55iszrs7pxjjfa0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72550b043794331e85bc4b124f6d8ab70d969eff/recipes/loccur"; sha256 = "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h"; - name = "loccur"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -43960,20 +57091,24 @@ license = lib.licenses.free; }; }) {}; - lockfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lockfile-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lockfile-mode"; + ename = "lockfile-mode"; version = "20170624.2207"; src = fetchFromGitHub { owner = "preetpalS"; repo = "emacs-lockfile-mode"; - rev = "fcfef88460cb3cd67c4d83a1801d0326d282feac"; - sha256 = "1dh41a8dj8h3lrhjajaz886vsimflshk6bc08w71rwvjyy2k8xil"; + rev = "496b6035716df0582f879f9488f296947cabead2"; + sha256 = "0sm73w2in65kdb68m9w3jrr5pa392x75bv063r8cdhy868031l49"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12a383eb6c29acb007dae9dc777ace3ba84edac9/recipes/lockfile-mode"; sha256 = "13nr983xldja8m02a1rdnyqxc8g045hxjh6649wmqmqk4mk0m310"; - name = "lockfile-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -43981,9 +57116,13 @@ license = lib.licenses.free; }; }) {}; - lodgeit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lodgeit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lodgeit"; + ename = "lodgeit"; version = "20150312.649"; src = fetchFromGitHub { owner = "ionrock"; @@ -43991,10 +57130,10 @@ rev = "ec9b8e5cbb17bcf8ac4bdddd1d361cb60e59384c"; sha256 = "1cdnm270kzixa0kpis0xw2ybkw8lqh7kykc7blxkxjrr9yjvbawl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c82e72535aefade20e23e38931ca573e3459401e/recipes/lodgeit"; sha256 = "1ax2w5yxscycjz90g4jdbhd64g9sipzxpfjs7gq3na77s5dcjzsq"; - name = "lodgeit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -44002,9 +57141,13 @@ license = lib.licenses.free; }; }) {}; - log4e = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + log4e = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "log4e"; + ename = "log4e"; version = "20170401.604"; src = fetchFromGitHub { owner = "aki2o"; @@ -44012,10 +57155,10 @@ rev = "34309972ad02abcebbcff6b1682731978aef030c"; sha256 = "12zk40gqrh86m50y777kprkwz75vbcm0q1a9narzcs2lnpwc8g4z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d0e451c5a8eb25db95990b058964a9acea4b89/recipes/log4e"; sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34"; - name = "log4e"; + name = "recipe"; }; packageRequires = []; meta = { @@ -44023,19 +57166,23 @@ license = lib.licenses.free; }; }) {}; - log4j-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + log4j-mode = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "log4j-mode"; + ename = "log4j-mode"; version = "20160108.1118"; src = fetchgit { url = "https://git.code.sf.net/p/log4j-mode/code"; - rev = "26171b1e723502055e085393b0ecdcb6db406010"; - sha256 = "15x6368pk4bbvhbd6cqnazcxfdz0b3f70029x0884a5797janln5"; + rev = "a278948ea07ef8f4fdb6d389345a68b50de14fae"; + sha256 = "0fa2k0c0pp55crz358aw6b26q3mgw6lik498vy8p95vmcy6lb9v3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/log4j-mode"; sha256 = "0311jb47fjji8dqy98anr487f7vnvi85p4mn5ymqvxs5c6972gms"; - name = "log4j-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -44043,9 +57190,16 @@ license = lib.licenses.free; }; }) {}; - logalimacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup, popwin, stem }: - melpaBuild { + logalimacs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup + , popwin + , stem }: + melpaBuild { pname = "logalimacs"; + ename = "logalimacs"; version = "20131021.1129"; src = fetchFromGitHub { owner = "logaling"; @@ -44053,10 +57207,10 @@ rev = "8286e39502250fc6c3c6656a7f46a8eee8e9a713"; sha256 = "0lj3i9i3mg17xws13gzx8myc6d7djgsj47yx4kaq5hycgkni1p7q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef9833a5ca4d455f1d33b9367860e2051d60662f/recipes/logalimacs"; sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6"; - name = "logalimacs"; + name = "recipe"; }; packageRequires = [ popup popwin stem ]; meta = { @@ -44064,9 +57218,14 @@ license = lib.licenses.free; }; }) {}; - logito = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + logito = callPackage ({ eieio ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "logito"; + ename = "logito"; version = "20120225.1255"; src = fetchFromGitHub { owner = "sigma"; @@ -44074,10 +57233,10 @@ rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052"; sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logito"; sha256 = "0xi7zbxpialsn4pknj8aqmkbiwwsbapwynrrjb8avhli2hd4s3fl"; - name = "logito"; + name = "recipe"; }; packageRequires = [ eieio ]; meta = { @@ -44085,19 +57244,24 @@ license = lib.licenses.free; }; }) {}; - lognav-mode = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + lognav-mode = callPackage ({ emacs + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lognav-mode"; - version = "20171230.1052"; + ename = "lognav-mode"; + version = "20180708.322"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/lognav-mode"; - rev = "a9b53f2da040"; - sha256 = "0ka92x63zfgraby5ycypn3ri2s3s2b1m2j7fpb4r37bk9xkf90v4"; + rev = "73aba5c1b9c6"; + sha256 = "0bshlkxzb1wbvm5fpsmqd51z4y1nfqkh802ddd8pfs5k22lv21sk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad86b93f4982a0c6291c771e12c8f42ace3b88f9/recipes/lognav-mode"; sha256 = "1941scifg3nn7gmnki3sa9zvwsbb84w5lw2xjmdx0sh8rbxaw8gb"; - name = "lognav-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -44105,9 +57269,37 @@ license = lib.licenses.free; }; }) {}; - logstash-conf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + logpad = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "logpad"; + ename = "logpad"; + version = "20180607.1215"; + src = fetchhg { + url = "https://bitbucket.com/tux_/logpad.el"; + rev = "506ace0e996f"; + sha256 = "0z9dq37hsrzjkd3pynqmm8gbiv1sbqnjxlqkyq6lpps5fd9n5vsz"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5148207367bf236223e952a1e4fd600f90571b5e/recipes/logpad"; + sha256 = "1r688z3y98wnr15fg6zzcs4c4yw0l6ygah07gjhblj8b7q7i2qgg"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/logpad"; + license = lib.licenses.free; + }; + }) {}; + logstash-conf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "logstash-conf"; + ename = "logstash-conf"; version = "20170524.1229"; src = fetchFromGitHub { owner = "Wilfred"; @@ -44115,10 +57307,10 @@ rev = "4e127f9aec190786613445aa88efa307ff7c6748"; sha256 = "119yb1wk1n5ycfzgpffcwy7yx8ar8k1gza0gvbq3r61ha5a9qijs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logstash-conf"; sha256 = "0djf2kl6jypxlfss4x8ij670v733vid1vbyg6yd96pc9781v3zrm"; - name = "logstash-conf"; + name = "recipe"; }; packageRequires = []; meta = { @@ -44126,20 +57318,26 @@ license = lib.licenses.free; }; }) {}; - logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + logview = callPackage ({ datetime + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "logview"; - version = "20180216.1445"; + ename = "logview"; + version = "20180522.1054"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "9ec279d933923dab2d8d1f140adc43073dab6433"; - sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02"; + rev = "902c881f5e1ca802761b856b3945bd418847dd79"; + sha256 = "1df41wabldg1ahcbqi5szwml5hqdjm6p3hj5b8ajkkagykrnh8xg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh"; - name = "logview"; + name = "recipe"; }; packageRequires = [ datetime emacs ]; meta = { @@ -44147,20 +57345,24 @@ license = lib.licenses.free; }; }) {}; - lolcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lolcode-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lolcode-mode"; + ename = "lolcode-mode"; version = "20111002.147"; src = fetchFromGitHub { owner = "bodil"; repo = "lolcode-mode"; - rev = "1914f1ba87587ecf5f175eeb2144c28e9f039317"; - sha256 = "0pyfgywmmnlz1arvdxwyw96gr6xcg2sp3bqjli8xfcl8i0nww4kb"; + rev = "280a47e0bf02ee3abc7c5b6b14345056f41981f9"; + sha256 = "1j51h2j0n6mkglalrp1mirpc1v7mgrfxfd1k43rhzg800rb4ahhr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/572d31a0bd8627d8b5f6bab021c953a1fee31d2c/recipes/lolcode-mode"; sha256 = "0dxdqr3z5bw0vcfxhhhc1499vrfk1xqwxshr0kvlhdalpf59rqiw"; - name = "lolcode-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -44168,9 +57370,14 @@ license = lib.licenses.free; }; }) {}; - look-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, look-mode, melpaBuild }: - melpaBuild { + look-dired = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , look-mode + , melpaBuild }: + melpaBuild { pname = "look-dired"; + ename = "look-dired"; version = "20160729.1623"; src = fetchFromGitHub { owner = "vapniks"; @@ -44178,10 +57385,10 @@ rev = "9bfa4e5e6f3810705b6426c88493ea0bf6b15640"; sha256 = "1yagp35ylznrh3a5ahpzrrxi6ma69ppwqsab3cwss54bi4f02ihn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef66b97b2e9034cb0c62dd1e37b2577ffef60834/recipes/look-dired"; sha256 = "0dddx5nxr519wqdgrbglh0pqjl3alg4ddmank42g4llzycy61wsd"; - name = "look-dired"; + name = "recipe"; }; packageRequires = [ look-mode ]; meta = { @@ -44189,9 +57396,13 @@ license = lib.licenses.free; }; }) {}; - look-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + look-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "look-mode"; + ename = "look-mode"; version = "20151211.1026"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -44199,10 +57410,10 @@ rev = "d65f75e8ea24eff2ac31c53b4835b45127eedd56"; sha256 = "1adzlviy928wsqx9fvxi71rwv89zyydqmf5g0wrlx66r0ksw3793"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/look-mode"; sha256 = "0nhhz5s423g4kqqh0vy8k0696r0myhjfv84p2vciliky9gv1wkig"; - name = "look-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -44210,20 +57421,24 @@ license = lib.licenses.free; }; }) {}; - loop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + loop = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "loop"; + ename = "loop"; version = "20160813.707"; src = fetchFromGitHub { owner = "Wilfred"; repo = "loop.el"; - rev = "e22807f83a0890dc8a904c51ee0742c34efccc6c"; - sha256 = "1c89hsi0h783s96d322mvqwlf00ndm2qnrc165wpxrdbns38kbbv"; + rev = "0ce77271d56b0fcdba4b3b38fed526081cd1f674"; + sha256 = "0l0k2plgmfnqcy1ilk20755n5xk480p15mzqc247ipr0ldr9ajxr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba481ca96469b3bd518e4fd8f24947338c8af014/recipes/loop"; sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar"; - name = "loop"; + name = "recipe"; }; packageRequires = []; meta = { @@ -44231,20 +57446,24 @@ license = lib.licenses.free; }; }) {}; - lorem-ipsum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lorem-ipsum = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lorem-ipsum"; + ename = "lorem-ipsum"; version = "20140911.1408"; src = fetchFromGitHub { owner = "jschaf"; repo = "emacs-lorem-ipsum"; - rev = "4b39f6fed455d67f635b3837cf5668bf74d0f6cd"; - sha256 = "0a3b18p3vdjci89prsgdzjnfxsl8p67vjhf8ai4qdng7zvh50lir"; + rev = "893a27505734a1497b79bc26e0736a78221b35d9"; + sha256 = "0grzl4kqpc1x6569yfh9xdzzbgmhcskxwk6f7scjpl32acr88cmx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c09f9b82430992d119d9148314c758f067832cd/recipes/lorem-ipsum"; sha256 = "0p62yifbrknjn8z0613wy2aaknj44liyrgbknhpa0qn0d4fcrp4h"; - name = "lorem-ipsum"; + name = "recipe"; }; packageRequires = []; meta = { @@ -44252,9 +57471,14 @@ license = lib.licenses.free; }; }) {}; - love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }: - melpaBuild { + love-minor-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , lua-mode + , melpaBuild }: + melpaBuild { pname = "love-minor-mode"; + ename = "love-minor-mode"; version = "20170726.2236"; src = fetchFromGitHub { owner = "ejmr"; @@ -44262,10 +57486,10 @@ rev = "3ca8f3405338f2d6f4fbcdd5e89342a46378543a"; sha256 = "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f224c4c7519b3668b1270c957227e486896b7b6/recipes/love-minor-mode"; sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m"; - name = "love-minor-mode"; + name = "recipe"; }; packageRequires = [ lua-mode ]; meta = { @@ -44273,20 +57497,25 @@ license = lib.licenses.free; }; }) {}; - lsp-go = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: - melpaBuild { + lsp-go = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { pname = "lsp-go"; - version = "20180330.255"; + ename = "lsp-go"; + version = "20180630.1101"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-go"; - rev = "00cbaac9419efc641fbe9e27ad0315d2c9a3ecb5"; - sha256 = "1n08vr2rkasz1w1bc43fi6zqg11vg7fa2a4sgp2cdrsn5hcp8nnh"; + rev = "0d354e1682fe1db074a924d7812f6ea62048d73d"; + sha256 = "0rk1brvy9hmjwykzf3pgli7h5gp3m6ra4yspv0rknbd2drzw4r94"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go"; sha256 = "1yg21qqlf8ma734vaz6xrfym2058gvx7llsqy94fbbg1fg61c32c"; - name = "lsp-go"; + name = "recipe"; }; packageRequires = [ lsp-mode ]; meta = { @@ -44294,20 +57523,25 @@ license = lib.licenses.free; }; }) {}; - lsp-hack = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: - melpaBuild { + lsp-hack = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { pname = "lsp-hack"; - version = "20171128.1238"; + ename = "lsp-hack"; + version = "20180703.1837"; src = fetchFromGitHub { owner = "jra3"; repo = "lsp-hack"; - rev = "f299555ad5206f13d7cfe75a3c76607b1f0d6da5"; - sha256 = "1z3cca395v5kv7h1w7vnb7c42sq2aczv7sznx9nc2gjjabmrd8vy"; + rev = "a3b6725dc7b16246d71a7d4ddbddd0fec1a009eb"; + sha256 = "1amkdlc0dpxv953f8v7l5i3a54gm6nxrdmrizkgc28plbvcpqdqy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a70d8442c653554d28dc87425913424ab42ab5c8/recipes/lsp-hack"; sha256 = "1xfvk4hqs748b9dm8dirb2mdpnhq9mybgsbcj258yydr57d9zijs"; - name = "lsp-hack"; + name = "recipe"; }; packageRequires = [ lsp-mode ]; meta = { @@ -44315,20 +57549,26 @@ license = lib.licenses.free; }; }) {}; - lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }: - melpaBuild { + lsp-haskell = callPackage ({ fetchFromGitHub + , fetchurl + , haskell-mode + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { pname = "lsp-haskell"; + ename = "lsp-haskell"; version = "20180131.459"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "aa421f9702056a89cd4e63c0dcf5543acb62840f"; - sha256 = "1m0diap909jn9w54j9462zg972xhwxivcda59jmb6isgjpyi1yyb"; + rev = "bd7d0a4c3b54dbaa4c89b80f4f0268d717b4dd6f"; + sha256 = "13dp655kdi6z6s9is0q1qf6yvmfxzv7bjjlhp2f7bjiv2jh5yzyv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; sha256 = "0pdcxnfp8ng24bfk695wpx5wcdqnjrjsfpks0xicih3mcdm1x9l8"; - name = "lsp-haskell"; + name = "recipe"; }; packageRequires = [ haskell-mode lsp-mode ]; meta = { @@ -44336,20 +57576,79 @@ license = lib.licenses.free; }; }) {}; - lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: - melpaBuild { + lsp-html = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { + pname = "lsp-html"; + ename = "lsp-html"; + version = "20180629.25"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-html"; + rev = "478927767c3c2bd06b052807126e5d48be53755a"; + sha256 = "0833mrmbhfzm2xhf91wl7bp4h54h2qaxy4lidy05ngm407wbjypd"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/204acff0d1a8c6dc79ef34cc464435a1504d7c15/recipes/lsp-html"; + sha256 = "0fd53k8spfm2s618gvchr0jsbc0a0varklc05cdjvjxyxk04ssmc"; + name = "recipe"; + }; + packageRequires = [ lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-html"; + license = lib.licenses.free; + }; + }) {}; + lsp-intellij = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { + pname = "lsp-intellij"; + ename = "lsp-intellij"; + version = "20180621.1131"; + src = fetchFromGitHub { + owner = "Ruin0x11"; + repo = "lsp-intellij"; + rev = "0911f703ac50164a702b6ee213173e763eda3094"; + sha256 = "1nc4bi6annxd4i94wznh28di3pvq73yvz3g4nhs1l95jczl13rpj"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d72cbb85fe4e0c6bea9a704dc1545f88efa56d2/recipes/lsp-intellij"; + sha256 = "0l2ffxqsdzvddypdl3w9rd7qxy2kzw2iwfkr2w7czglyfbnyyg2b"; + name = "recipe"; + }; + packageRequires = [ emacs lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-intellij"; + license = lib.licenses.free; + }; + }) {}; + lsp-java = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { pname = "lsp-java"; - version = "20180330.30"; + ename = "lsp-java"; + version = "20180701.111"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "35ad849fdd445be127f8df59ef1bb68effd0b7ff"; - sha256 = "0id9rjjzwybcyfa9ns3fm1py3zsm0z1l88dwlfh8pgkfjy7zkc34"; + rev = "b3d671ccc264b32492e30f48b4d5a52f6b88145d"; + sha256 = "17dqz2fmsczl46vq6id9918hxy5b332lncgwzrzjbbpqi3ysa1s3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java"; sha256 = "1y5wxggkr7v4a2a3h2n01911gd1xv047dikbvyy1gappf05fdngj"; - name = "lsp-java"; + name = "recipe"; }; packageRequires = [ emacs lsp-mode ]; meta = { @@ -44357,20 +57656,27 @@ license = lib.licenses.free; }; }) {}; - lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: - melpaBuild { + lsp-javacomp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild + , s }: + melpaBuild { pname = "lsp-javacomp"; + ename = "lsp-javacomp"; version = "20180218.2334"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "lsp-javacomp"; - rev = "cb080824e1fc08e2724d6ecde7034f1acfd565f0"; - sha256 = "0ihb4bld8pzw2mxfwygxldsv2hclvmzkr7cp8nimzjam1nlgjhic"; + rev = "4423fc41974e25ddf4a46fb13bd64680d52b420a"; + sha256 = "1k66h5l52al3glsz261j2lcfl8pddxh55m8slr9p1kaxzr67fl6a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; sha256 = "1gp8dlcpik2lmpicccq2kya498pmw9m8vz9m1fbd725p7wk58fhi"; - name = "lsp-javacomp"; + name = "recipe"; }; packageRequires = [ emacs lsp-mode s ]; meta = { @@ -44378,41 +57684,80 @@ license = lib.licenses.free; }; }) {}; - lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: - melpaBuild { + lsp-javascript-flow = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { + pname = "lsp-javascript-flow"; + ename = "lsp-javascript-flow"; + version = "20180612.2208"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-javascript"; + rev = "b9873765270ac5c76013efe6fae0beb60f55f85c"; + sha256 = "1cpwivz6cy9rs5s3723j0y3wf6bhr4avazdyl1f2gv3xiwr0gbns"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9a28de5ce89080ba224e07734b3ba0b0992acd6/recipes/lsp-javascript-flow"; + sha256 = "1bydgcmgzbx2pqna19h1avrlrlfv6gvsii1n839q4bhiwn3452f7"; + name = "recipe"; + }; + packageRequires = [ emacs lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-javascript-flow"; + license = lib.licenses.free; + }; + }) {}; + lsp-javascript-typescript = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild + , typescript-mode }: + melpaBuild { pname = "lsp-javascript-typescript"; - version = "20180203.52"; + ename = "lsp-javascript-typescript"; + version = "20180614.1311"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "8df90bc27852da2cf05951870d94ce7920d8c09f"; - sha256 = "0pqk8p0z30p0j7lc5i2mvy7vmg8k5hphgwp4djhgm1ickm9pcx20"; + rev = "7e7c5f66b02321f402712841064347cb872c41e4"; + sha256 = "1ilhnbdvfjanv0cjwk289dq1whpf69qzw0hh9ak37gbi4pqvsbdv"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; - sha256 = "0pml7f7874c5xx94qpq7w5sz5hcail8s5nm5sy5vgax1j742r5y1"; - name = "lsp-javascript-typescript"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/97b6ddeb34297aacfefdd4c227ad520b70a12bc6/recipes/lsp-javascript-typescript"; + sha256 = "01i6dimwz5s143cbcfi2rflfgkj569avx103wnlbcfd87apj7813"; + name = "recipe"; }; - packageRequires = [ lsp-mode ]; + packageRequires = [ emacs lsp-mode typescript-mode ]; meta = { homepage = "https://melpa.org/#/lsp-javascript-typescript"; license = lib.licenses.free; }; }) {}; - lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lsp-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lsp-mode"; - version = "20180330.2309"; + ename = "lsp-mode"; + version = "20180708.1914"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "7dd173015d2c355e1dd2cc7a62ad75825e89e235"; - sha256 = "155n00m2bk4ayimn8nwn1ikzq53d2mda550k6z7cfw9il1bk9qkz"; + rev = "5ea5c6398a923e24c4fedf6d782004b4dc4cb254"; + sha256 = "1pn9lnd8r4zl35hqwi00qcsb6v6aj533hbm7faj1d3nndlf2qmbh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9"; - name = "lsp-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -44420,20 +57765,26 @@ license = lib.licenses.free; }; }) {}; - lsp-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: - melpaBuild { + lsp-ocaml = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { pname = "lsp-ocaml"; - version = "20171111.1352"; + ename = "lsp-ocaml"; + version = "20180610.1154"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ocaml"; - rev = "1aef50ceb2794a2f2234fb0f13410b7f1e3b5c16"; - sha256 = "0naxdkc0y45wjqbvb61vgiyrajyf5clg1wypf7g3ljny7791xz3l"; + rev = "5a8c776b6d75b502703243b3d628fccd813481b0"; + sha256 = "1431f8r8c4h8jbghggk1s2bwqr1qlxys3d52xsvf35bbk1gki5an"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7be2d7a7af3d744c531e5e018d791bf2566df428/recipes/lsp-ocaml"; sha256 = "17334qcgqrz4jd5npizyq20fmxy07z2p3pq98s5np2kc4h9ara33"; - name = "lsp-ocaml"; + name = "recipe"; }; packageRequires = [ emacs lsp-mode ]; meta = { @@ -44441,20 +57792,26 @@ license = lib.licenses.free; }; }) {}; - lsp-php = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: - melpaBuild { + lsp-php = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { pname = "lsp-php"; - version = "20180214.624"; + ename = "lsp-php"; + version = "20180331.944"; src = fetchFromGitHub { - owner = "tszg"; + owner = "emacs-lsp"; repo = "lsp-php"; - rev = "ff5f5ba417342aa05869a1a9c6a0fc2d42c8acc3"; - sha256 = "05rq7sqb6chymzfqvk5xk9bgi7nsdf1ldimams8df9ml6242zjsg"; + rev = "3189a13c605e1615b7ce2cd12f09c1ed92a88178"; + sha256 = "1kv708yrx57j0cvz9vcam4rwfincgbbr7rdbxdmnfmwnx4ylgckg"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/be00893ec6db70624acf1b4527cca05486d6b090/recipes/lsp-php"; - sha256 = "1fpmg8mbp0r8krlbp4j0bk6kslmm88lrpki0w961s4gqrqxw287c"; - name = "lsp-php"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9fda03716433077e440c0fb8357207f7a348552c/recipes/lsp-php"; + sha256 = "0ds3hivkb7zxkz6crn6h9apvavvm899vwq4mkav4cbijsl4q33l0"; + name = "recipe"; }; packageRequires = [ emacs lsp-mode ]; meta = { @@ -44462,20 +57819,25 @@ license = lib.licenses.free; }; }) {}; - lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: - melpaBuild { + lsp-python = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { pname = "lsp-python"; - version = "20171021.254"; + ename = "lsp-python"; + version = "20180609.16"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-python"; - rev = "035fed681ef18a774dcb82e361bd6b5b8778623f"; - sha256 = "0mhs7v1mc23h0rlcyinl3pf1qavjl4s6j5vrf9vc65sggsnw0x1d"; + rev = "28a3ad4e98af5ede860ef4c2fe47048ce676559b"; + sha256 = "0y8cglfmjn4j1apyjr66vpqln3rzqdkada3ggxlap4iirgb5iqgf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python"; sha256 = "0x8cyvkwp4znliiwf3qfrhnk80h8n1jfyyq0n5yfccsgk7gpm8qx"; - name = "lsp-python"; + name = "recipe"; }; packageRequires = [ lsp-mode ]; meta = { @@ -44483,9 +57845,18 @@ license = lib.licenses.free; }; }) {}; - lsp-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, markdown-mode, melpaBuild, rust-mode }: - melpaBuild { + lsp-rust = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , markdown-mode + , melpaBuild + , rust-mode }: + melpaBuild { pname = "lsp-rust"; + ename = "lsp-rust"; version = "20180305.508"; src = fetchFromGitHub { owner = "emacs-lsp"; @@ -44493,10 +57864,10 @@ rev = "ecc889cc8735b280e0e6e84d2f4526b0048148b3"; sha256 = "0wmci5lij5721xpfsj3mnvr3z1j8b9s0w76dhzd0lnyaknvyv1rs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28"; - name = "lsp-rust"; + name = "recipe"; }; packageRequires = [ dash emacs lsp-mode markdown-mode rust-mode ]; meta = { @@ -44504,20 +57875,58 @@ license = lib.licenses.free; }; }) {}; - lsp-ui = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: - melpaBuild { + lsp-typescript = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild + , typescript-mode }: + melpaBuild { + pname = "lsp-typescript"; + ename = "lsp-typescript"; + version = "20180614.1311"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-javascript"; + rev = "7e7c5f66b02321f402712841064347cb872c41e4"; + sha256 = "1ilhnbdvfjanv0cjwk289dq1whpf69qzw0hh9ak37gbi4pqvsbdv"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e7903d6b51132c0d8ad209f13ffe915c1bc5a76d/recipes/lsp-typescript"; + sha256 = "1d1yrcgg1bdsikcb2j8cayhlh9hdnna3rc1pphq0kn81gk0rgbrq"; + name = "recipe"; + }; + packageRequires = [ emacs lsp-mode typescript-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-typescript"; + license = lib.licenses.free; + }; + }) {}; + lsp-ui = callPackage ({ dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , lsp-mode + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "lsp-ui"; - version = "20180330.1806"; + ename = "lsp-ui"; + version = "20180618.1951"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "d4724353e87d5d79634d0d000aee15119899971a"; - sha256 = "1zbywpv3dypp0r4qksaj538nfv1ml25v0q2bi2m23yh29kfs2yi4"; + rev = "bd5970edae874338bd01d0bc50c4671ea4cae390"; + sha256 = "0s5an922wfias2n0h5jqa2n4mxvrfg6sav470him4dbwqqrgx5ck"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j"; - name = "lsp-ui"; + name = "recipe"; }; packageRequires = [ dash @@ -44532,20 +57941,26 @@ license = lib.licenses.free; }; }) {}; - lsp-vue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: - melpaBuild { + lsp-vue = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { pname = "lsp-vue"; - version = "20180129.1805"; + ename = "lsp-vue"; + version = "20180628.15"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-vue"; - rev = "faf976ee9b333919653b4b98e2886b488707e866"; - sha256 = "1d6sw5jsjhwd5bbl2p8k6hdwpg1pmnsmvbq8g33h80qlg05fwj60"; + rev = "3c3f364f70d300101a37a239a6bf8c382176f238"; + sha256 = "0m5bi99y02jvjv25jpm5sj50x4k75md9p6qqq5bzsdj3b07d2gxx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9eb7699630fd7e11f38b4ba278a497633c9733/recipes/lsp-vue"; sha256 = "1df3dva31livffy9bzassgqpps3bf9nbqmhngzh8bnhjvvrbj5ic"; - name = "lsp-vue"; + name = "recipe"; }; packageRequires = [ emacs lsp-mode ]; meta = { @@ -44553,9 +57968,13 @@ license = lib.licenses.free; }; }) {}; - lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lua-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lua-mode"; + ename = "lua-mode"; version = "20180323.321"; src = fetchFromGitHub { owner = "immerrr"; @@ -44563,10 +57982,10 @@ rev = "99312b8d6c500ba3067da6d81efcfbbea05a1cbd"; sha256 = "04m9njcpdmar3njjz4x2qq26xk0k6qprcfzx8whlmvapqf8w19iz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94"; - name = "lua-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -44574,9 +57993,15 @@ license = lib.licenses.free; }; }) {}; - luarocks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + luarocks = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "luarocks"; + ename = "luarocks"; version = "20170430.1605"; src = fetchFromGitHub { owner = "emacs-pe"; @@ -44584,10 +58009,10 @@ rev = "cee27ba0716edf338077387969883226dd2b7484"; sha256 = "0rdsjmmi95agb859997qdhbk0dns2jyx2mlg8rync58wna70nmbn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5abd2b52a071ab206d40057dc85c891183204ea/recipes/luarocks"; sha256 = "05srrk9gmv1vhq7m5bjhh2hl2siis04j15b31x0sgknxh3ybr33x"; - name = "luarocks"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -44595,20 +58020,25 @@ license = lib.licenses.free; }; }) {}; - lush-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lush-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lush-theme"; + ename = "lush-theme"; version = "20141107.806"; src = fetchFromGitHub { owner = "andre-richter"; repo = "emacs-lush-theme"; - rev = "3b80004f33cdce9f4db69e9ccf2041561e98985d"; - sha256 = "0mv73s89n59m44szc37086wq55py5sx0lc0jxncfybawhsqyd0ar"; + rev = "fd69cf6e254b329d7997acd37fe04c17139f3435"; + sha256 = "0gcyxvkpfi1vsa7gyx13rb29x86j2i2nnqldli1sna4v87jw288g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b29b2f36852e711ce3520d71e83921a1dcb9ccf/recipes/lush-theme"; sha256 = "03kqws8dzm0ay5k86f4v7g2g2ygwk4fzmz2vyzhzhbsj8hrniq9p"; - name = "lush-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -44616,20 +58046,24 @@ license = lib.licenses.free; }; }) {}; - lusty-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lusty-explorer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lusty-explorer"; - version = "20180127.1443"; + ename = "lusty-explorer"; + version = "20180628.646"; src = fetchFromGitHub { owner = "sjbach"; repo = "lusty-emacs"; - rev = "3df794ed4829e353ee3c1e3c6686440f9e868ef6"; - sha256 = "1z2nzjlmmcnin3h0713kqaaikyc0h4iiazv50lsvrp0agjbmhcqp"; + rev = "fc4b2f0f8a07db107234490fdfbf72f8b76a6643"; + sha256 = "014fivh9shi7p3x31bl22x48agrgygp0pf2lgzzflrxcynmprbnp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efedaa3b1de5f6406c7dcd842eee42eefaf8ab50/recipes/lusty-explorer"; sha256 = "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps"; - name = "lusty-explorer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -44637,9 +58071,38 @@ license = lib.licenses.free; }; }) {}; - lxc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "lv"; + ename = "lv"; + version = "20160912.756"; + src = fetchFromGitHub { + owner = "abo-abo"; + repo = "hydra"; + rev = "a07b92a8755dfb064701210b634e2dc4839552ac"; + sha256 = "11k0ifmr90vdinibhyqqyqrmpxbn9c5pjpzhr4p66wv6249s540w"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5114349617617673d5055fe28cb8f8c86cf41f83/recipes/lv"; + sha256 = "1lkm40rwpj9hmckng9bz5g4jbx9g9i3wlqgl6rq0m6i14syr69v4"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/lv"; + license = lib.licenses.free; + }; + }) {}; + lxc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lxc"; + ename = "lxc"; version = "20140410.1322"; src = fetchFromGitHub { owner = "nicferrier"; @@ -44647,10 +58110,10 @@ rev = "88bed56c954d1edd9ff5ce0ced2c02dcf9f71835"; sha256 = "090gk0il4yyypzjbh2qrjdaldwf90fi30impmh4zcfl73bic5q9q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c16c08c388e3280f617d0768bc1cd75c5897768/recipes/lxc"; sha256 = "1rv1ybmbjx7n3cavx21nzmvckw63q3jmjsfdr2pcgavrr2ck6lka"; - name = "lxc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -44658,9 +58121,42 @@ license = lib.licenses.free; }; }) {}; - lyrics = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + lxc-tramp = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "lxc-tramp"; + ename = "lxc-tramp"; + version = "20180523.1324"; + src = fetchFromGitHub { + owner = "montag451"; + repo = "lxc-tramp"; + rev = "1aab85fef50df2067902bff13e1bac5e6366908b"; + sha256 = "066qwyk38r42xriifg1ik2f0am0m57wlfrk5278sycr8vbag6fc9"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2464020a5b3d89bddcd122cad81fed84ded9b117/recipes/lxc-tramp"; + sha256 = "0rksh7k30kh3i23c98qinffz2zj6h1bshaw994hwy8qwgm38vx61"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/lxc-tramp"; + license = lib.licenses.free; + }; + }) {}; + lyrics = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "lyrics"; + ename = "lyrics"; version = "20180123.2004"; src = fetchFromGitHub { owner = "emacs-pe"; @@ -44668,10 +58164,10 @@ rev = "fb35b387796f64f48b4daa5a163f4a576210f200"; sha256 = "17al49f633h3fsa6aq9v5c1r8dp2gj97f46z1fhmgxbijmpfzs0w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b04c8f3dfa9fc07cc0ff3df5c4069f864b6db92e/recipes/lyrics"; sha256 = "0kj8v8cg4yqnz0v1nhq41jxjgd4ivqd6lsr1v5cqhg4m0r7f2nzc"; - name = "lyrics"; + name = "recipe"; }; packageRequires = [ emacs seq ]; meta = { @@ -44679,20 +58175,25 @@ license = lib.licenses.free; }; }) {}; - m-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + m-buffer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "m-buffer"; + ename = "m-buffer"; version = "20170407.1441"; src = fetchFromGitHub { owner = "phillord"; repo = "m-buffer-el"; - rev = "8681342aaffa187e5c54945ab91b812965a96d19"; - sha256 = "040g7l0r4bxz4ynp4zxy80jsa6x2f48z8rylc41fqxiblasmh0af"; + rev = "6eb1d2535a82707a83733173bc400a0d8e520c80"; + sha256 = "1sx76i59razwccvn6x7rx5a124bfyjw9fcbxf4gj7nsg33qiq809"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer"; sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94"; - name = "m-buffer"; + name = "recipe"; }; packageRequires = [ seq ]; meta = { @@ -44700,9 +58201,14 @@ license = lib.licenses.free; }; }) {}; - mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mac-pseudo-daemon = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mac-pseudo-daemon"; + ename = "mac-pseudo-daemon"; version = "20170728.1240"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; @@ -44710,10 +58216,10 @@ rev = "d235680a72677f11925b912428ad1a57b664e3e8"; sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon"; sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0"; - name = "mac-pseudo-daemon"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -44721,20 +58227,27 @@ license = lib.licenses.free; }; }) {}; - maces-game = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + maces-game = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "maces-game"; + ename = "maces-game"; version = "20170903.851"; src = fetchFromGitHub { owner = "pawelbx"; repo = "maces-game"; - rev = "c0fb795f5642467ea528d2f04d904547e8a77ecd"; - sha256 = "1sf1h5660fd3mfcca3h1fqk3xssgigkil26wz1kp1kvxfx9lm31m"; + rev = "6a067422d305ac51612842930ed6686dc615ffec"; + sha256 = "07pl2y4qlpcn9ap2vp1gpvdqh4l05gb7pp11c1krlaxybhwdcqjb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9f33b926ecec48a43ba4f0484c687a7349ce50/recipes/maces-game"; sha256 = "0wz91dsa0w4xlkl5lbdr8k4pgkgalsqcy27sd0i8xswq3wwiy0ip"; - name = "maces-game"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -44742,9 +58255,13 @@ license = lib.licenses.free; }; }) {}; - macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + macro-math = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "macro-math"; + ename = "macro-math"; version = "20130328.904"; src = fetchFromGitHub { owner = "nschum"; @@ -44752,10 +58269,10 @@ rev = "216e59371e9ee39c34117ba79b9acd78bb415750"; sha256 = "119c77s3qp1vqc5m2yf7m4s81aphkhsvsnwqmpq6xl08r3592zxz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macro-math"; sha256 = "072ycszl4cjc9nvv4axsgyfzz9djpgh4y1xqfr1nxi41nsdfc9kn"; - name = "macro-math"; + name = "recipe"; }; packageRequires = []; meta = { @@ -44763,9 +58280,14 @@ license = lib.licenses.free; }; }) {}; - macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + macrostep = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "macrostep"; + ename = "macrostep"; version = "20161120.1306"; src = fetchFromGitHub { owner = "joddie"; @@ -44773,10 +58295,10 @@ rev = "424e3734a1ee526a1bd7b5c3cd1d3ef19d184267"; sha256 = "1fm40mxdn289cyzgw992223dgrjmwxn4q8svyyxfaxjrpb38jhjz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macrostep"; sha256 = "1h1gag21x05a14j0wbg0lg502fq2hbqfhjlg05kysw9f870whfq2"; - name = "macrostep"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -44784,9 +58306,14 @@ license = lib.licenses.free; }; }) {}; - madhat2r-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + madhat2r-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "madhat2r-theme"; + ename = "madhat2r-theme"; version = "20170202.1630"; src = fetchFromGitHub { owner = "madhat2r"; @@ -44794,10 +58321,10 @@ rev = "6b387f09de055cfcc15d74981cd4f32f8f9a7323"; sha256 = "1nnjdqqbarzv62ic3ddc2z9wmh93zjia4nvfjmji8213dngrrf88"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a382a388821908306c0b8350fba91218515e1b/recipes/madhat2r-theme"; sha256 = "0y588skd6c2ykyp54d38ibwrqglnaanr15d45d51cvcvp9k7x508"; - name = "madhat2r-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -44805,9 +58332,14 @@ license = lib.licenses.free; }; }) {}; - mag-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, splitter }: - melpaBuild { + mag-menu = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , splitter }: + melpaBuild { pname = "mag-menu"; + ename = "mag-menu"; version = "20150505.1150"; src = fetchFromGitHub { owner = "chumpage"; @@ -44815,10 +58347,10 @@ rev = "9b9277021cd09fb1dba64b1d2a00705d20914bd6"; sha256 = "1flamyk7z3r723cczqra0f4yabc6kmgwjaw2bvs3kisppqmmz72g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00043412ffa4e434de9679204b9b3d2602e76ae0/recipes/mag-menu"; sha256 = "1r1yisjnqxl9llpf91rwqp4q47jc4qp32xnkl8wzsgr0r2qf5yk2"; - name = "mag-menu"; + name = "recipe"; }; packageRequires = [ splitter ]; meta = { @@ -44826,9 +58358,15 @@ license = lib.licenses.free; }; }) {}; - magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + magic-filetype = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "magic-filetype"; + ename = "magic-filetype"; version = "20180219.752"; src = fetchFromGitHub { owner = "emacs-php"; @@ -44836,10 +58374,10 @@ rev = "019494add5ff02dd36cb3f500142fc51125522cc"; sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype"; sha256 = "0f0j8fgh2gpkarz9308pns0d89wc2dchyim6hbixkdpqzg9gskc3"; - name = "magic-filetype"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -44847,20 +58385,26 @@ license = lib.licenses.free; }; }) {}; - magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + magic-latex-buffer = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "magic-latex-buffer"; + ename = "magic-latex-buffer"; version = "20170530.1705"; src = fetchFromGitHub { owner = "zk-phi"; repo = "magic-latex-buffer"; - rev = "c03277d5619d9adcd871f3e6480a1a27985810cb"; - sha256 = "065xfj6asw7px4xmh5isbfs0y6m6818lrds1ca45rhkyfw98d2sb"; + rev = "f1172ea243ff74b2013215b906eb8c0066497384"; + sha256 = "0rsq79sbf24cvdib283ddc2vg37sjyh3h0d1siki86psyg1mgaz1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/07e240ebe71d389d314c4a27bbcfe1f88b215c3b/recipes/magic-latex-buffer"; sha256 = "0xm4vk4aggyfw96cgya5cp97jzx5ha0xwpf2yfh7c3m8d9cca4y8"; - name = "magic-latex-buffer"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -44868,20 +58412,31 @@ license = lib.licenses.free; }; }) {}; - magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: - melpaBuild { + magit = callPackage ({ async + , dash + , emacs + , fetchFromGitHub + , fetchurl + , ghub + , git-commit + , lib + , magit-popup + , melpaBuild + , with-editor }: + melpaBuild { pname = "magit"; - version = "20180401.314"; + ename = "magit"; + version = "20180720.1712"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "570c2a777ec222918492255463742d44a78befee"; - sha256 = "0741c3zd48ybfs67331hxj026lp7frzrzml0kzspbx2121d56yzh"; + rev = "c5269547ae178f4893a8ec662f71b0e032d4c0fa"; + sha256 = "1qyyi1pyb1hr66b43ka0sshafizddxgzlbqlnlfncb2rm8fyab0h"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; - sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga"; - name = "magit"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ac8feccfa0f4eb5bda2ef561a6be66ba145c00e0/recipes/magit"; + sha256 = "03iv74rgng5fcy3qfr76hiy0hj6x2z0pis1yj8wm1naq5rc55hjn"; + name = "recipe"; }; packageRequires = [ async @@ -44889,7 +58444,6 @@ emacs ghub git-commit - let-alist magit-popup with-editor ]; @@ -44898,20 +58452,26 @@ license = lib.licenses.free; }; }) {}; - magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-annex = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-annex"; - version = "20180120.1534"; + ename = "magit-annex"; + version = "20180715.1812"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "44eaef7d55647d5d4bd466742b738d7a9563d07f"; - sha256 = "1wka4aj9jv4i8a8aj1wffg8aba23qgg02636fx7ky919jr97f3za"; + rev = "e36674fa052431342942ce42c3e396318a5bb5b0"; + sha256 = "085qwg8f68j6lcdfm0ri6a8fjvb2z7qwkvaflcff7rr7hjbmnb29"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys"; - name = "magit-annex"; + name = "recipe"; }; packageRequires = [ cl-lib magit ]; meta = { @@ -44919,9 +58479,15 @@ license = lib.licenses.free; }; }) {}; - magit-filenotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-filenotify = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-filenotify"; + ename = "magit-filenotify"; version = "20151116.1540"; src = fetchFromGitHub { owner = "ruediger"; @@ -44929,10 +58495,10 @@ rev = "c0865b3c41af20b6cd89de23d3b0beb54c8401a4"; sha256 = "0nkxxhxkhy314jv1l3hza84vigl8q7fc8hjjvrx58gfgsfgifx6r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca5541d2ce3553e9ade2c1ec1c0d78103dfd0c4d/recipes/magit-filenotify"; sha256 = "1ihk5yi6psqkccpi2bq2h70kn7k874zl7wcinjaq21lirk4z7bvn"; - name = "magit-filenotify"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -44940,20 +58506,26 @@ license = lib.licenses.free; }; }) {}; - magit-find-file = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-find-file = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-find-file"; + ename = "magit-find-file"; version = "20150702.130"; src = fetchFromGitHub { owner = "bradwright"; repo = "magit-find-file.el"; - rev = "c3ea91bab37d10a814a829728ec972811f728d60"; - sha256 = "1j3jsrp0qpaa2xd98d1g9z0zc4b93knwajrlnlsc7l6g0vlfsddb"; + rev = "035da838b1a19e7a5ee135b4ca8475f4e235b61e"; + sha256 = "1jlww053s580d7rlvmr1dl79wxasa0hhh2jnwb1ra353d6h3a73w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/magit-find-file"; sha256 = "1y66nsq1hbv1sb4n71gdxv7p1rz37vd9lkf7zl7avy0dchs499ik"; - name = "magit-find-file"; + name = "recipe"; }; packageRequires = [ dash magit ]; meta = { @@ -44961,9 +58533,14 @@ license = lib.licenses.free; }; }) {}; - magit-gerrit = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-gerrit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-gerrit"; + ename = "magit-gerrit"; version = "20160226.130"; src = fetchFromGitHub { owner = "terranpro"; @@ -44971,10 +58548,10 @@ rev = "ece6f369694aca17f3ac166ed2801b432acfe20d"; sha256 = "0mms0gxv9a3ns8lk5k2wjibm3088y1cmpr3axjdh6ppv7r5wdvii"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f7cc000debed666ad6800e31c114eedb7384317c/recipes/magit-gerrit"; sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4"; - name = "magit-gerrit"; + name = "recipe"; }; packageRequires = [ magit ]; meta = { @@ -44982,20 +58559,29 @@ license = lib.licenses.free; }; }) {}; - magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }: - melpaBuild { + magit-gh-pulls = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , gh + , lib + , magit + , melpaBuild + , pcache + , s }: + melpaBuild { pname = "magit-gh-pulls"; - version = "20171117.226"; + ename = "magit-gh-pulls"; + version = "20180716.936"; src = fetchFromGitHub { owner = "sigma"; repo = "magit-gh-pulls"; - rev = "d526f4c9ee1709c79f8a4630699ce1f25ae054e7"; - sha256 = "11fd3c7wnqy08khj6za8spbsm3k1rqqih21lbax2iwvxl8jv4dv0"; + rev = "6949e973f3e951cb0bfe75d889e0fcccc33ba733"; + sha256 = "0djr5lkv2wjs2c4dvb41xjkpjk9w6q888r4dlgw9w35z7h30b5vi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls"; sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d"; - name = "magit-gh-pulls"; + name = "recipe"; }; packageRequires = [ emacs gh magit pcache s ]; meta = { @@ -45003,9 +58589,15 @@ license = lib.licenses.free; }; }) {}; - magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }: - melpaBuild { + magit-gitflow = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , magit + , magit-popup + , melpaBuild }: + melpaBuild { pname = "magit-gitflow"; + ename = "magit-gitflow"; version = "20170929.124"; src = fetchFromGitHub { owner = "jtatarik"; @@ -45013,10 +58605,10 @@ rev = "cc41b561ec6eea947fe9a176349fb4f771ed865b"; sha256 = "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow"; sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf"; - name = "magit-gitflow"; + name = "recipe"; }; packageRequires = [ magit magit-popup ]; meta = { @@ -45024,20 +58616,26 @@ license = lib.licenses.free; }; }) {}; - magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-imerge = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-imerge"; - version = "20180329.1950"; + ename = "magit-imerge"; + version = "20180609.858"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "f337f178a1b4d2e4c1199fa02338febe216ab902"; - sha256 = "1x0714qxryj3fg9qwnsxrksdja1q98vvjpdwn8h9anifxa0wknh6"; + rev = "6f64cd84f1cfed9ee976a9059494128c9b52bdf4"; + sha256 = "0adgkqp4s70qph73xrgxr56c2vrfmmqn0c4llzvxp0yp7linnr8d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4"; - name = "magit-imerge"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -45045,20 +58643,27 @@ license = lib.licenses.free; }; }) {}; - magit-lfs = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-lfs = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-lfs"; + ename = "magit-lfs"; version = "20170312.1524"; src = fetchFromGitHub { owner = "ailrun"; repo = "magit-lfs"; - rev = "799282fce73b668d2cf6e4fa87f889fec8e25333"; - sha256 = "11wv3j8b377sbfj1qhcr6rn05ns728ifrigjk7r60rd34lwyc8c4"; + rev = "9897c59109ce34755cbd35eff689680351c45fba"; + sha256 = "05cy0pw5lcyzcqxycvwbw39l88405lc92x0w1lvhlbwwylpbhw2s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a92f0963d8df3e299a999948828173dac38a612/recipes/magit-lfs"; sha256 = "1im9skj74jdi7jh0fnyyk8a4g4sk48clgn107ggf69lnfpxh8xxa"; - name = "magit-lfs"; + name = "recipe"; }; packageRequires = [ dash emacs magit ]; meta = { @@ -45066,20 +58671,26 @@ license = lib.licenses.free; }; }) {}; - magit-org-todos = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-org-todos = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-org-todos"; - version = "20180319.859"; + ename = "magit-org-todos"; + version = "20180709.1250"; src = fetchFromGitHub { owner = "danielma"; repo = "magit-org-todos.el"; - rev = "df206287737b9671f2e36ae7b1474ebbe9940d2a"; - sha256 = "0kdp7k7jnnrkhsg0xh1c3h7iz0vgi120gf5xwl1hxy61avivnxrn"; + rev = "9ffa3efb098434d837cab4bacd1601fdfc6fe999"; + sha256 = "0kxz5q8q5np4zm1ls4hx1h53vlnhj0mnmbq12p5nzk5zcxycbcpz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84480cad490cab2f087a484ed7b9d3d3064bbd29/recipes/magit-org-todos"; sha256 = "0yywgzm2jzvsccm9h0a0s1q8fag9dfajnznwk6iqz5pywq5mxijr"; - name = "magit-org-todos"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -45087,20 +58698,28 @@ license = lib.licenses.free; }; }) {}; - magit-p4 = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild, p4 }: - melpaBuild { + magit-p4 = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , magit + , magit-popup + , melpaBuild + , p4 }: + melpaBuild { pname = "magit-p4"; + ename = "magit-p4"; version = "20170414.546"; src = fetchFromGitHub { owner = "qoocku"; repo = "magit-p4"; - rev = "c87de6d3f10fd35415a0c56e63747eb14ed5a113"; - sha256 = "03gn9xl9mqxb7ways9n9rcl0hc3h41j2nq42q10b0jw5zrzmr9ra"; + rev = "ef23e89dc504970e78ac9b158731a3eda7d6d7ee"; + sha256 = "1gld0x4y4jshyfr0q8k5icjpgmfrbcfir13sysgzqjz9ssyn2bi5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440d47ca465845eaa601ca8a6e4b15fc197e522b/recipes/magit-p4"; sha256 = "19p7h3a21jjr2h52ika14lyczdv6z36gl7hk1v17bffffac8q069"; - name = "magit-p4"; + name = "recipe"; }; packageRequires = [ cl-lib magit magit-popup p4 ]; meta = { @@ -45108,20 +58727,27 @@ license = lib.licenses.free; }; }) {}; - magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + magit-popup = callPackage ({ async + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "magit-popup"; - version = "20180329.1302"; + ename = "magit-popup"; + version = "20180618.1602"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "32e6da899abd6657c098534c5775fc7177047f49"; - sha256 = "0nrvs7gwd9kn4n808akrydn7zggvy9zyk38yrcmm561kw0h0h903"; + rev = "e2060ccb3105555f55992a995587221820341b24"; + sha256 = "1z1xi6mkz1h0vxbhwp1ypn5jpa0a859b296k4ds2j1i18h1lvgad"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; sha256 = "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv"; - name = "magit-popup"; + name = "recipe"; }; packageRequires = [ async dash emacs ]; meta = { @@ -45129,20 +58755,26 @@ license = lib.licenses.free; }; }) {}; - magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-stgit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-stgit"; - version = "20171115.754"; + ename = "magit-stgit"; + version = "20180522.542"; src = fetchFromGitHub { owner = "magit"; repo = "magit-stgit"; - rev = "0e44df69d7c0c793808a5278bed35b2c6ec39f7f"; - sha256 = "1zr3ir9426yg5vrsi3k56vzdhajddn5c0p2ygw587gscnr7fgv5b"; + rev = "186e60489f5449d87d94aca24b9d65e2f26a3bc5"; + sha256 = "134555zdc7abrfl9hlyy3l3raljzn3kk4zfcmr70xkx2qjjdl9a2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit"; sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv"; - name = "magit-stgit"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -45150,9 +58782,15 @@ license = lib.licenses.free; }; }) {}; - magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-svn = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-svn"; + ename = "magit-svn"; version = "20170213.433"; src = fetchFromGitHub { owner = "magit"; @@ -45160,10 +58798,10 @@ rev = "c833903732a14478f5c4cfc561bae7c50671b36c"; sha256 = "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn"; sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0"; - name = "magit-svn"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -45171,20 +58809,26 @@ license = lib.licenses.free; }; }) {}; - magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-tbdiff = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-tbdiff"; - version = "20180120.1553"; + ename = "magit-tbdiff"; + version = "20180527.652"; src = fetchFromGitHub { owner = "magit"; repo = "magit-tbdiff"; - rev = "aaa040037c38f13c0e6bbce83e38959ef30c1925"; - sha256 = "1hc2mkmd4cni0sgkypp32xlsn749c6i2lz8l3crmgk48q6qx2i18"; + rev = "15af196860defda2554aa16ddc172a55ccf03a0d"; + sha256 = "0d24y9sj2qzcm5an37yd7s0gxbq5q8p9xlgxyzz60ln30hwnx107"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff"; sha256 = "1wydmw4f1072k8frk8mi8aaky7dndinq8n7kn10q583bjlxgw80r"; - name = "magit-tbdiff"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -45192,20 +58836,72 @@ license = lib.licenses.free; }; }) {}; - magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-todos = callPackage ({ a + , anaphora + , async + , dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , hl-todo + , lib + , magit + , melpaBuild + , pcre2el + , s }: + melpaBuild { + pname = "magit-todos"; + ename = "magit-todos"; + version = "20180716.2339"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "magit-todos"; + rev = "d12e2e3ccad4b87d5df5285ade0c56ec5f46ad63"; + sha256 = "006yy13hjzalwz7pz0br32zifxlxrrf8cvnz0j3km55sxpdvqmil"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos"; + sha256 = "0vqmbw0qj8a5wf4ig9hgc0v3l1agdkvgprzjv178hs00297br2s8"; + name = "recipe"; + }; + packageRequires = [ + a + anaphora + async + dash + emacs + f + hl-todo + magit + pcre2el + s + ]; + meta = { + homepage = "https://melpa.org/#/magit-todos"; + license = lib.licenses.free; + }; + }) {}; + magit-topgit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-topgit"; + ename = "magit-topgit"; version = "20160313.1254"; src = fetchFromGitHub { owner = "magit"; repo = "magit-topgit"; - rev = "11489ea798bc88d0ea5244bbf725285eedfefbef"; - sha256 = "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q"; + rev = "243fdfa7ce62dce4efd01b6b818a2791868db2f0"; + sha256 = "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-topgit"; sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i"; - name = "magit-topgit"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -45213,20 +58909,30 @@ license = lib.licenses.free; }; }) {}; - magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: - melpaBuild { + magithub = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ghub-plus + , git-commit + , lib + , magit + , markdown-mode + , melpaBuild + , s }: + melpaBuild { pname = "magithub"; - version = "20180330.1737"; + ename = "magithub"; + version = "20180625.2104"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "aeb554d9851dca009b7850843fbd0227fa33ab21"; - sha256 = "1yzfifdaaqpzngkdwf12951925vqx0rb1wih5s8r0lxdivw9w483"; + rev = "bc318ec9953b919195fbaa980b6873b6af7bed81"; + sha256 = "1c8sfrahxk8q7jarvxmrwsgdy8xcjhky14vc268jbrrz197yp006"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab"; - name = "magithub"; + name = "recipe"; }; packageRequires = [ emacs ghub-plus git-commit magit markdown-mode s ]; meta = { @@ -45234,20 +58940,27 @@ license = lib.licenses.free; }; }) {}; - magma-mode = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + magma-mode = callPackage ({ cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "magma-mode"; - version = "20160304.408"; + ename = "magma-mode"; + version = "20180413.727"; src = fetchFromGitHub { owner = "ThibautVerron"; repo = "magma-mode"; - rev = "528c96a269980dcc6b65e2e973510ff07e6b9fc4"; - sha256 = "1pq6ckxp3dcb2f6xfsd4jwd43r9d0920m30ammp39glgc39p9lsq"; + rev = "db5bff33611027418ba387c7e223d5de82dd9e94"; + sha256 = "0k973dwk2frcdjdpxv26v584ldyhprny001l48wwwiyc2mf08bzk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59764a0aab7c3f32b5a872a3d10a7e144f273a7e/recipes/magma-mode"; sha256 = "1gq6yi51h1h7ivrm1xr6nfrpabx8ylbk0waaw04gnw3bb54dmmvc"; - name = "magma-mode"; + name = "recipe"; }; packageRequires = [ cl-lib dash f ]; meta = { @@ -45255,9 +58968,15 @@ license = lib.licenses.free; }; }) {}; - magnatune = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + magnatune = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "magnatune"; + ename = "magnatune"; version = "20151030.1235"; src = fetchFromGitHub { owner = "eikek"; @@ -45265,10 +58984,10 @@ rev = "605b01505ba30589c77ebb4c96834b5072ccbdd4"; sha256 = "1hqz26zm4bdz5wavna4j9yia3ns4z19dnszl7k0lcpgbgmb0wh8y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6dfd5ae62718a32f8c5af4048af06cb53961d7df/recipes/magnatune"; sha256 = "0fmxlrq5ls6fpbk5fv67aan8gg1c61i1chfw5lhf496pwqzq901d"; - name = "magnatune"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -45276,9 +58995,13 @@ license = lib.licenses.free; }; }) {}; - majapahit-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + majapahit-theme = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "majapahit-theme"; + ename = "majapahit-theme"; version = "20160817.1148"; src = fetchFromGitLab { owner = "franksn"; @@ -45286,10 +59009,10 @@ rev = "77c96df7619666b2102d90d452eeadf04adc89a6"; sha256 = "0wnhfdk2zwxqfh8d74xmszqgibcgxiq825pq8381zg4nkz5cckfb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9b793878de4107bb646652d09d8799aef8b97e8/recipes/majapahit-theme"; sha256 = "04k2smrya27rrjlzvnl3a6llg8vj8x4mm9qyk4kwrmckhd6jd68s"; - name = "majapahit-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -45297,9 +59020,16 @@ license = lib.licenses.free; }; }) {}; - major-mode-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: - melpaBuild { + major-mode-icons = callPackage ({ all-the-icons + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , powerline }: + melpaBuild { pname = "major-mode-icons"; + ename = "major-mode-icons"; version = "20170228.2314"; src = fetchFromGitHub { owner = "stardiviner"; @@ -45307,10 +59037,10 @@ rev = "e6117a236b2ad52e948576550b183053321dfc91"; sha256 = "0gpp9x23qz7ll8d7hlbvynv891hw907k38i7v0b08s8zh1ilvnwa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f551bec8bdc5dee4b31edea0c2f92b3c77ec56/recipes/major-mode-icons"; sha256 = "02p5h9q2j7z3wcmvkbqbbzzk3lyfdq43psppy9x9ypic9fij8j95"; - name = "major-mode-icons"; + name = "recipe"; }; packageRequires = [ all-the-icons emacs powerline ]; meta = { @@ -45318,20 +59048,24 @@ license = lib.licenses.free; }; }) {}; - make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + make-color = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "make-color"; + ename = "make-color"; version = "20140625.450"; src = fetchFromGitHub { owner = "alezost"; repo = "make-color.el"; - rev = "5ca1383ca9228bca82120b238bdc119f302b75c0"; - sha256 = "1wmpy1d966zzxwar2ng825zlch5fwsslsi1706ss9v7zl7i9wggd"; + rev = "a1b34e95ccd3ebee4fba1489ab613d0b3078026d"; + sha256 = "1ky3scyjb69wi76xg6a8qx4ja6lr6mk530bv5gmhj7fxbq8b3x5c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb765469c65589ae9d7dbc420a8edcf44c3be5d1/recipes/make-color"; sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k"; - name = "make-color"; + name = "recipe"; }; packageRequires = []; meta = { @@ -45339,9 +59073,15 @@ license = lib.licenses.free; }; }) {}; - make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: - melpaBuild { + make-it-so = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , swiper }: + melpaBuild { pname = "make-it-so"; + ename = "make-it-so"; version = "20180128.1307"; src = fetchFromGitHub { owner = "abo-abo"; @@ -45349,10 +59089,10 @@ rev = "bc3b01d6b9ed6ff66ebbd524234f9d6df60dd4be"; sha256 = "0833bzlscpnkvjnrg3g54yr246afbjwri8n5wxk8drnsq6acvd8z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so"; sha256 = "0a8abz54mb60mfr0bl9ry8yawq99vx9hjl4fm2sivns58qjgfy73"; - name = "make-it-so"; + name = "recipe"; }; packageRequires = [ emacs swiper ]; meta = { @@ -45360,20 +59100,28 @@ license = lib.licenses.free; }; }) {}; - makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + makefile-executor = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "makefile-executor"; - version = "20180315.632"; + ename = "makefile-executor"; + version = "20180720.132"; src = fetchFromGitHub { owner = "thiderman"; repo = "makefile-executor.el"; - rev = "06b2efa4539c319ab36806b0bd8ea87e214aaa74"; - sha256 = "08rjj3bdnvmaxiwnys4cjd19wkkk06wv0l58hpn3c7vi077ps3cc"; + rev = "9a7d78f814a4b372d8f8179819cb1b37b83b1973"; + sha256 = "1sw8zqxzrcxs4v211bmlxz5xfrpckrawnbhf1fiji0971cv3hx0r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor"; sha256 = "0889rq2a7ks2ynyq91xsa2kpzgd72kzbjxx0b34w8faknpj3b6hi"; - name = "makefile-executor"; + name = "recipe"; }; packageRequires = [ dash emacs f s ]; meta = { @@ -45381,9 +59129,14 @@ license = lib.licenses.free; }; }) {}; - makey = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + makey = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "makey"; + ename = "makey"; version = "20131231.630"; src = fetchFromGitHub { owner = "mickeynp"; @@ -45391,10 +59144,10 @@ rev = "a61781e69d3b451551e269446e1c5f624ab81137"; sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e32e98758aa6fd31218e98608bd54a76c3e83/recipes/makey"; sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4"; - name = "makey"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -45402,20 +59155,30 @@ license = lib.licenses.free; }; }) {}; - malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }: - melpaBuild { + malinka = callPackage ({ cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , rtags + , s }: + melpaBuild { pname = "malinka"; + ename = "malinka"; version = "20171202.221"; src = fetchFromGitHub { owner = "LefterisJP"; repo = "malinka"; - rev = "d4aa517c7a9022eae16c758c7efdb3a0403542d7"; - sha256 = "1rnzvx1nc01sw9fklm36lyllqm6dizj64gnlqbs4nammx7z0spi1"; + rev = "e3dc5b0703a5954057110b82cb397a990ace23e6"; + sha256 = "0ljv6p1ln4mji4xh2q8w9rah6das4wvvp0pmaj2a2156lx2q3q54"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka"; sha256 = "1zmnlgy9k1s1s2wgkhlwfsnknmhggy0rx3l495a5x1kqsx6i0c9y"; - name = "malinka"; + name = "recipe"; }; packageRequires = [ cl-lib dash f projectile rtags s ]; meta = { @@ -45423,20 +59186,24 @@ license = lib.licenses.free; }; }) {}; - mallard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mallard-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mallard-mode"; + ename = "mallard-mode"; version = "20131203.2025"; src = fetchFromGitHub { owner = "jhradilek"; repo = "emacs-mallard-mode"; - rev = "c48170c1ace4959abcc5fb1df0d4cb149cff44c1"; - sha256 = "18x3cssfn81k8hg4frj7dhzphg784321z51wbbvn3bjhq7s6j3a2"; + rev = "0a4cfede57bc31134495804ce513cc106de8de3c"; + sha256 = "1dxhn9m2d5zjcpsqn004z9g7sw5pzgh18aik53y6hqsnvc2ph8r8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19c5543664ca685a70e53baa1357842e83cbf8f7/recipes/mallard-mode"; sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd"; - name = "mallard-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -45444,20 +59211,26 @@ license = lib.licenses.free; }; }) {}; - mallard-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, mallard-mode, melpaBuild, yasnippet }: - melpaBuild { + mallard-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , mallard-mode + , melpaBuild + , yasnippet }: + melpaBuild { pname = "mallard-snippets"; + ename = "mallard-snippets"; version = "20131023.1151"; src = fetchFromGitHub { owner = "jhradilek"; repo = "emacs-mallard-snippets"; - rev = "70c5293f10722f2ace73bdf74d9a18f95b040edc"; - sha256 = "0qk7i47nmyp4llwp6x0i1i5dk82ck26iyz1sjvvlihaw8a5akny2"; + rev = "35b7d0558da14fcffd51863f623806216a0093ce"; + sha256 = "0b4g1h2kw00arpm816j7aa3cx10k9rwf5pxy57icjybj4b30irqa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a31a6ac93a864cb5212c925fdfb0961d36b24a/recipes/mallard-snippets"; sha256 = "0437qd7q9i32pmhxaz3vi2dnfpj4nddmzgnqpwsgl28slhjw2hv8"; - name = "mallard-snippets"; + name = "recipe"; }; packageRequires = [ mallard-mode yasnippet ]; meta = { @@ -45465,9 +59238,14 @@ license = lib.licenses.free; }; }) {}; - malyon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + malyon = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "malyon"; + ename = "malyon"; version = "20161208.1325"; src = fetchFromGitHub { owner = "speedenator"; @@ -45475,10 +59253,10 @@ rev = "0d9882650720b4a791556f5e2d917388965d6fc0"; sha256 = "0an1yvp0p624rxd8n5phiwvznw35ripqhlwzwyv2bw7lc1rscllr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54b3785cfcdb3b54307f60ee634a101e8bcd9989/recipes/malyon"; sha256 = "050kj4c1vp9f3fiskf8hld7w46092n4jipdga226x97igx575g3r"; - name = "malyon"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -45486,9 +59264,14 @@ license = lib.licenses.free; }; }) {}; - man-commands = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + man-commands = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "man-commands"; + ename = "man-commands"; version = "20151221.1421"; src = fetchFromGitHub { owner = "nflath"; @@ -45496,10 +59279,10 @@ rev = "f4ba0c3790855d7544dff92d470d212f24de1d9d"; sha256 = "1lfq4hsq2n33l58ja5kzy6bwk9jxbcdsg6y8gqlk71lcslzqldrk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cefd80c8f65e1577ba36ea665b36c3a3d4032b4b/recipes/man-commands"; sha256 = "1yl7y0k24gydldfs406v1n523q46m9x6in6pgljgjnjravc67wnq"; - name = "man-commands"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -45507,20 +59290,25 @@ license = lib.licenses.free; }; }) {}; - manage-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + manage-minor-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "manage-minor-mode"; + ename = "manage-minor-mode"; version = "20140310.900"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "manage-minor-mode"; - rev = "1bed33b0752380b548b822fe72e6858c5fe70c8e"; - sha256 = "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07"; + rev = "a62d044455a022a12749a33e70dff7b2ec8e3561"; + sha256 = "0iq573daxcfpgw6mjhb7ayn95g5p8ayyqs9r1rljdzff35jyfkpw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/manage-minor-mode"; sha256 = "0ljdca9b08dw0kx679jmq0wc484xcpbmzwx8zkncw642pnbj9q0j"; - name = "manage-minor-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -45528,9 +59316,13 @@ license = lib.licenses.free; }; }) {}; - mandm-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mandm-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mandm-theme"; + ename = "mandm-theme"; version = "20170925.321"; src = fetchFromGitHub { owner = "choppsv1"; @@ -45538,10 +59330,10 @@ rev = "078d6d6f11bd48193c5de590cfb0e3d0d687ffc9"; sha256 = "070280438388q57lpzvd5wdk16abmxixiq01n68hdskfcipdkn2d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mandm-theme"; sha256 = "0mvzn29ljd3az6axyqq88vkkf1vpcvslc1svlnbyrpdfinphd0mx"; - name = "mandm-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -45549,20 +59341,28 @@ license = lib.licenses.free; }; }) {}; - mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: - melpaBuild { + mandoku = callPackage ({ fetchFromGitHub + , fetchurl + , git + , github-clone + , lib + , magit + , melpaBuild + , org }: + melpaBuild { pname = "mandoku"; - version = "20180223.2121"; + ename = "mandoku"; + version = "20180403.406"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "d44fd7e27c28f4cde7a739994744f3eecaab3b6f"; - sha256 = "16rlnzcwav4f66iib9ys7zb6lmxs4hn0cr035i9xp6a8rgxjgw21"; + rev = "e3b7678762e9824861b1ce775a94b05b096164f5"; + sha256 = "119q1f3xv024q9inw20c3xb194mgn11igs3x7pqdfapyinrzz6p0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; sha256 = "1pg7ir3y6yk92kfs5agbxapcxf7gy60m353rjv8g3kfkx5zyh3mv"; - name = "mandoku"; + name = "recipe"; }; packageRequires = [ git github-clone magit org ]; meta = { @@ -45570,9 +59370,20 @@ license = lib.licenses.free; }; }) {}; - mandoku-tls = callPackage ({ emacs, fetchFromGitHub, fetchurl, github-clone, helm, helm-charinfo, hydra, lib, mandoku, melpaBuild, org }: - melpaBuild { + mandoku-tls = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , github-clone + , helm + , helm-charinfo + , hydra + , lib + , mandoku + , melpaBuild + , org }: + melpaBuild { pname = "mandoku-tls"; + ename = "mandoku-tls"; version = "20171117.1840"; src = fetchFromGitHub { owner = "mandoku"; @@ -45580,10 +59391,10 @@ rev = "ffeebf5bd451ac1806ddfe1744fbbd036a56f902"; sha256 = "16399qifjj4hnfw4a62jwxfwnc7k8lmiy3bz8iwzlc91jjic7zdc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/mandoku-tls"; sha256 = "0zny1l548rvjsbbzj47wysz6gk1sqxvpj215r3w84vw5dyrn78bz"; - name = "mandoku-tls"; + name = "recipe"; }; packageRequires = [ emacs @@ -45599,9 +59410,13 @@ license = lib.licenses.free; }; }) {}; - map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + map-progress = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "map-progress"; + ename = "map-progress"; version = "20140310.1432"; src = fetchFromGitHub { owner = "tarsius"; @@ -45609,10 +59424,10 @@ rev = "3167eb218510953fb97e7d50948a625eaa3f0005"; sha256 = "0pd6bh7wrrh59blp86a2jl2vi4qkzx49z0hy7dkc71ccg0wjsgz1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ed3335eaf0be7368059bcdb52c46f5e47c0c1a5/recipes/map-progress"; sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7"; - name = "map-progress"; + name = "recipe"; }; packageRequires = []; meta = { @@ -45620,9 +59435,14 @@ license = lib.licenses.free; }; }) {}; - map-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + map-regexp = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "map-regexp"; + ename = "map-regexp"; version = "20130522.1403"; src = fetchFromGitHub { owner = "tarsius"; @@ -45630,10 +59450,10 @@ rev = "b8e06284ec1c593d7d2bda5f35597a63de46333f"; sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/927314443ecc00d94e7125de669e82832c5a125c/recipes/map-regexp"; sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj"; - name = "map-regexp"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -45641,20 +59461,28 @@ license = lib.licenses.free; }; }) {}; - marcopolo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: - melpaBuild { + marcopolo = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , request + , s }: + melpaBuild { pname = "marcopolo"; + ename = "marcopolo"; version = "20160421.304"; src = fetchFromGitHub { owner = "nlamirault"; repo = "marcopolo"; - rev = "9193aabdf12223087b5ed58f1507d5d8a24a4381"; - sha256 = "1yc0sgzh1qprhdrzjqc88d6g4xvw80fblcvjl6yn6kihv1ymz091"; + rev = "85db828f2bb4346a811b3326349b1c6d0aae4601"; + sha256 = "1qf724y1zq3z6fzm23qhwjl2knhs49nbz0vizwf8g9s51bk6bny2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/936a1cff601594575c5b550c5eb16e7dafc8a5ab/recipes/marcopolo"; sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0"; - name = "marcopolo"; + name = "recipe"; }; packageRequires = [ dash pkg-info request s ]; meta = { @@ -45662,9 +59490,13 @@ license = lib.licenses.free; }; }) {}; - mark-multiple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mark-multiple = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mark-multiple"; + ename = "mark-multiple"; version = "20121118.754"; src = fetchFromGitHub { owner = "magnars"; @@ -45672,10 +59504,10 @@ rev = "f6a53c7c5283d640ae718f4548b0fda78877a375"; sha256 = "1x3anvy3hlmydxyfzr1rhaiy502yi1yz3v54sg8wc1w7jrvwaj29"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7efe1814aa552d44c3db2cd7304569f2aae66287/recipes/mark-multiple"; sha256 = "179wd9g0smm76k92n7j2vgg8gz5wn9lczrns5ggq2yhbc77j0gn4"; - name = "mark-multiple"; + name = "recipe"; }; packageRequires = []; meta = { @@ -45683,9 +59515,13 @@ license = lib.licenses.free; }; }) {}; - mark-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mark-tools = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mark-tools"; + ename = "mark-tools"; version = "20130614.325"; src = fetchFromGitHub { owner = "stsquad"; @@ -45693,10 +59529,10 @@ rev = "a11b61effa90bd0abc876d12573674d36fc17f0c"; sha256 = "0k4zvbs09mkr8vdffv18s55rn9cyxldzav9vw04lm7v296k94ivz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ca36020392807aca9658d13481868d8b6c23d51/recipes/mark-tools"; sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq"; - name = "mark-tools"; + name = "recipe"; }; packageRequires = []; meta = { @@ -45704,20 +59540,26 @@ license = lib.licenses.free; }; }) {}; - markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + markdown-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "markdown-mode"; - version = "20180124.138"; + ename = "markdown-mode"; + version = "20180707.555"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "668de4a965980d618637a3b5754e721b54c51e83"; - sha256 = "00biiz0s5mwq092qxdh9943f6qf6k6n7dhrrj7nvj2b8iciid9as"; + rev = "b92f00d10e2582028d4306d3be8730add58e9fa1"; + sha256 = "0cwfc4l7rqwa9hgxz73lzm6czjqnif39dkcmacxb2gi9gpxwlxjn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14"; - name = "markdown-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -45725,9 +59567,14 @@ license = lib.licenses.free; }; }) {}; - markdown-mode-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { + markdown-mode-plus = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "markdown-mode-plus"; + ename = "markdown-mode+"; version = "20170320.1404"; src = fetchFromGitHub { owner = "milkypostman"; @@ -45735,10 +59582,10 @@ rev = "411d079f4430a33c34ec0bbcb1535fe1145a2509"; sha256 = "0427cxvykmz8kz1gnn27yc9c4z8djyy6m9qz6wbd4np1cgqlmly2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/markdown-mode+"; sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00"; - name = "markdown-mode-plus"; + name = "recipe"; }; packageRequires = [ markdown-mode ]; meta = { @@ -45746,9 +59593,14 @@ license = lib.licenses.free; }; }) {}; - markdown-preview-eww = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + markdown-preview-eww = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "markdown-preview-eww"; + ename = "markdown-preview-eww"; version = "20160111.702"; src = fetchFromGitHub { owner = "niku"; @@ -45756,10 +59608,10 @@ rev = "5853f836425c877c8a956501f0adda137ef1d3b7"; sha256 = "1i5gr3j9dq41p2zl4bfyvzv6i5z7hgrxzrycmbdc3s7nja36k9z4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9b3ad97a193c41068ca184b4835fa7a7a0ebc9c/recipes/markdown-preview-eww"; sha256 = "0j6924f84is41dspib68y5lnz1f8nm7pqyhv47alxra50cjrpxnx"; - name = "markdown-preview-eww"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -45767,9 +59619,19 @@ license = lib.licenses.free; }; }) {}; - markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }: - melpaBuild { + markdown-preview-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild + , uuidgen + , web-server + , websocket }: + melpaBuild { pname = "markdown-preview-mode"; + ename = "markdown-preview-mode"; version = "20171121.2323"; src = fetchFromGitHub { owner = "ancane"; @@ -45777,10 +59639,10 @@ rev = "4ec15183fc9fadb9368902c9b77a2d0e1196d1c6"; sha256 = "1zvpcnn0lafd6pvp5d42rid20dqi7zrpyai1q0kagpv3grbbyzc8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode"; sha256 = "1cam5wfxca91q3i1kl0qbdvnfy62hr5ksargi4430kgaz34bcbyn"; - name = "markdown-preview-mode"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -45795,9 +59657,16 @@ license = lib.licenses.free; }; }) {}; - markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }: - melpaBuild { + markdown-toc = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild + , s }: + melpaBuild { pname = "markdown-toc"; + ename = "markdown-toc"; version = "20170711.1249"; src = fetchFromGitHub { owner = "ardumont"; @@ -45805,10 +59674,10 @@ rev = "7038f4f6d5c2bc7e4aea89699a607ac2b7dd16a8"; sha256 = "1kvf30ib1kxp29k1xwixkq6l4jjr3q3g1wpvh9yfzk5ld97zmry1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc"; sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv"; - name = "markdown-toc"; + name = "recipe"; }; packageRequires = [ dash markdown-mode s ]; meta = { @@ -45816,20 +59685,25 @@ license = lib.licenses.free; }; }) {}; - markdownfmt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + markdownfmt = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "markdownfmt"; + ename = "markdownfmt"; version = "20160609.541"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-markdownfmt"; - rev = "187a74eb4fd9e8520ce08da42d1d292b9af7f2b7"; - sha256 = "01rxl997rb7f71mbvygavsxaq2vr17f2nnpbg7i551lg82xrsbb4"; + rev = "af83cd00fafcaa837ffdb50d1fa2b0ac952f16c0"; + sha256 = "1alkjvs21wlai742qgcm0bgf3z3c0f10xgalz48gi4vmwn6in7r7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16cee5fe003e3afc7daf6858ed83843b52e44901/recipes/markdownfmt"; sha256 = "1wzsw90z988bm94cw4jw5gzjcicgiz4qgn1nsdm8nim9rp43bj17"; - name = "markdownfmt"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -45837,9 +59711,14 @@ license = lib.licenses.free; }; }) {}; - markup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + markup = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "markup"; + ename = "markup"; version = "20170420.429"; src = fetchFromGitHub { owner = "leoc"; @@ -45847,10 +59726,10 @@ rev = "876da2d3f23473475bb0fd0a1480ae11d2671291"; sha256 = "0rggadka5aqgrik3qky6s75s5yb5bfj6fcpxjz1iyrwi0fka0akd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a75c955ad6b2f68b8933329e545625d948f6f8f4/recipes/markup"; sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf"; - name = "markup"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -45858,9 +59737,13 @@ license = lib.licenses.free; }; }) {}; - markup-faces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + markup-faces = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "markup-faces"; + ename = "markup-faces"; version = "20141110.17"; src = fetchFromGitHub { owner = "sensorflo"; @@ -45868,10 +59751,10 @@ rev = "98a807ed82473eb41c6a201ed7ef816d6bcd67b0"; sha256 = "1w6i1m7xdr9cijnmdj35cl99r12vl83qws0qlfhrgvisilshnr27"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/markup-faces"; sha256 = "06fawlv4ih2lsmk7x6h9p5rppl8vw2w3nvlss95kb8fj5fwf7mw9"; - name = "markup-faces"; + name = "recipe"; }; packageRequires = []; meta = { @@ -45879,9 +59762,16 @@ license = lib.licenses.free; }; }) {}; - marmalade-client = callPackage ({ fetchFromGitHub, fetchurl, gh, kv, lib, melpaBuild, web }: - melpaBuild { + marmalade-client = callPackage ({ fetchFromGitHub + , fetchurl + , gh + , kv + , lib + , melpaBuild + , web }: + melpaBuild { pname = "marmalade-client"; + ename = "marmalade-client"; version = "20141231.1207"; src = fetchFromGitHub { owner = "nicferrier"; @@ -45889,10 +59779,10 @@ rev = "f315dea57e4fbebd9ee0668c0bafd4c45c7b754a"; sha256 = "017k109nfif5mzkj547py8pdnzlr4sxb74yqqsl944znflq67blr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/834d6d8444169e1e9b66c963a4c2e03ff658e154/recipes/marmalade-client"; sha256 = "0llwqwwxrf7qdkpdb03ij0iinll0vc9qr557zyr3bn5zb4fad1sq"; - name = "marmalade-client"; + name = "recipe"; }; packageRequires = [ gh kv web ]; meta = { @@ -45900,9 +59790,16 @@ license = lib.licenses.free; }; }) {}; - marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: - melpaBuild { + marshal = callPackage ({ eieio ? null + , fetchFromGitHub + , fetchurl + , ht + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "marshal"; + ename = "marshal"; version = "20180124.439"; src = fetchFromGitHub { owner = "sigma"; @@ -45910,10 +59807,10 @@ rev = "f038689cbd5b3680b80b44edd0c7a63ca3038e26"; sha256 = "1n79im1r7h1ilvppn9alqwl96zhyxbm5hk7kbmqh022dggw0cx15"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl"; - name = "marshal"; + name = "recipe"; }; packageRequires = [ eieio ht json ]; meta = { @@ -45921,9 +59818,14 @@ license = lib.licenses.free; }; }) {}; - maruo-macro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + maruo-macro-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "maruo-macro-mode"; + ename = "maruo-macro-mode"; version = "20160616.649"; src = fetchFromGitHub { owner = "zonuexe"; @@ -45931,10 +59833,10 @@ rev = "8fc9a38ad051eafa8eb94038711acc52c5d1d8d5"; sha256 = "0r005yap50jf6b5jc7314ds17g1nn2irn1agidi74fbrwfbndxgm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c17243b6c62e179aefc25d5f2ca43e5f6c66c1/recipes/maruo-macro-mode"; sha256 = "1h7pclpqkkgi8z9yp5n79ffna809yf336bz6082l541xc06pmvcv"; - name = "maruo-macro-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -45942,9 +59844,14 @@ license = lib.licenses.free; }; }) {}; - mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mastodon = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mastodon"; + ename = "mastodon"; version = "20180305.1909"; src = fetchFromGitHub { owner = "jdenen"; @@ -45952,10 +59859,10 @@ rev = "ae8dabda04e377a6ac22cb854e4844f68073f533"; sha256 = "1avf2wkzd14dj27i9skm3mn3ipkr1zp93yrwxrk2q5kphj1qji2j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; sha256 = "1bsyf4j6zs9gin0k7p22yv5gaqd6m3vdc2fiagfbs7gxsmhb6p4i"; - name = "mastodon"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -45963,20 +59870,25 @@ license = lib.licenses.free; }; }) {}; - material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + material-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "material-theme"; + ename = "material-theme"; version = "20171123.1040"; src = fetchFromGitHub { owner = "cpaulik"; repo = "emacs-material-theme"; - rev = "b66838d220ad380a16da1d8878936974b26f815d"; - sha256 = "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2"; + rev = "c59b4874914b5b28068be25292690325f19739dd"; + sha256 = "1sp2h2n0ihp0r6q7c1861awg7rqh6bcxz4hgnny1gj5vjz9h7rch"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme"; sha256 = "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq"; - name = "material-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -45984,9 +59896,13 @@ license = lib.licenses.free; }; }) {}; - math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + math-symbol-lists = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "math-symbol-lists"; + ename = "math-symbol-lists"; version = "20170221.553"; src = fetchFromGitHub { owner = "vspinu"; @@ -45994,10 +59910,10 @@ rev = "1af8fdcab7941a62287c2d04b8876e1538f39c60"; sha256 = "1kj9r2mvmvnj6m2bwhbj8fspqiq8fdrhkaj0ir43f7qmd4imblsj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/math-symbol-lists"; sha256 = "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27"; - name = "math-symbol-lists"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46005,9 +59921,14 @@ license = lib.licenses.free; }; }) {}; - math-symbols = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + math-symbols = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "math-symbols"; + ename = "math-symbols"; version = "20170818.759"; src = fetchFromGitHub { owner = "kawabata"; @@ -46015,10 +59936,10 @@ rev = "3f8b466f002e1b28ddbe9a6f236c9a1352adb17d"; sha256 = "0r63acgicb43p05gsiz98m7077sj72c1miz18fi8qbzi02p9qjr7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7b0799bddbbbecd12bc1589b56a6250acf76407/recipes/math-symbols"; sha256 = "0sx9cgyk56npjd6z78y9cldbvjl5ipl7k1nc1sylg1iggkbwxnqx"; - name = "math-symbols"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -46026,19 +59947,23 @@ license = lib.licenses.free; }; }) {}; - matlab-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + matlab-mode = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "matlab-mode"; + ename = "matlab-mode"; version = "20180125.1010"; src = fetchgit { url = "https://git.code.sf.net/p/matlab-emacs/src"; rev = "50266ff812607e55bddacd71a46d1b96e36fb0bd"; sha256 = "1spyfnkw6j0v947m6yj6mv6ni1za0a9m9iycpjycpcb42q7d9rlg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f78cff288077e04f8c9e4c2e5be9f3c33d8ff49/recipes/matlab-mode"; sha256 = "1q3sdmahf915ix4lrv65cxsfh6hrs91c8pmyixbqmbhifqi33d0q"; - name = "matlab-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46046,9 +59971,13 @@ license = lib.licenses.free; }; }) {}; - maude-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + maude-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "maude-mode"; + ename = "maude-mode"; version = "20160222.807"; src = fetchFromGitHub { owner = "rudi"; @@ -46056,10 +59985,10 @@ rev = "c9543bb8a172fa77af592388e7f520a4a6d38987"; sha256 = "1sn9bdaq3mf2vss5gzmxhnp9fz43cakxh36qjdgqrvx302nlnv52"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c33b8bd62391767a63f57786750e38cbc262bda/recipes/maude-mode"; sha256 = "1w5v3r905xkwchkm2gzvzpswba5p2m7hqpyg9fzq2ldlr8kk7ah3"; - name = "maude-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46067,9 +59996,15 @@ license = lib.licenses.free; }; }) {}; - maven-test-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + maven-test-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "maven-test-mode"; + ename = "maven-test-mode"; version = "20141219.2157"; src = fetchFromGitHub { owner = "rranelli"; @@ -46077,10 +60012,10 @@ rev = "a19151861df2ad8ae4880a2e7c86ddf848cb569a"; sha256 = "1xn2yyr8mr90cynbxgv0h5v180pzf0ydnjr9spg34mrdicqlki6c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc7f677c53431542cb8d7c95666d021dead2b98/recipes/maven-test-mode"; sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm"; - name = "maven-test-mode"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -46088,9 +60023,13 @@ license = lib.licenses.free; }; }) {}; - maxframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + maxframe = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "maxframe"; + ename = "maxframe"; version = "20170120.905"; src = fetchFromGitHub { owner = "rmm5t"; @@ -46098,10 +60037,10 @@ rev = "13bda6dd9f1d96aa4b9dd9957a26cefd399a7772"; sha256 = "0kh8yk1py9zg62zfl289hszhq3kl3mqmjk6z5vqkw3mcik4lm69g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/maxframe"; sha256 = "1lxj60qcvv8vakdq79k1brzv3ki74kajrx8620dzx76bnfkryxk8"; - name = "maxframe"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46109,9 +60048,14 @@ license = lib.licenses.free; }; }) {}; - mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mb-url = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mb-url"; + ename = "mb-url"; version = "20161224.1806"; src = fetchFromGitHub { owner = "dochang"; @@ -46119,10 +60063,10 @@ rev = "129a0bb6a684be76fb9f09010e710065d0e5baaa"; sha256 = "1apy7abjhdbgh8001rzv41q40bfl444rcz62lvgdwj3lg45zb8xc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url"; sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h"; - name = "mb-url"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -46130,9 +60074,15 @@ license = lib.licenses.free; }; }) {}; - mbe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mbe = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mbe"; + ename = "mbe"; version = "20151126.334"; src = fetchFromGitHub { owner = "ijp"; @@ -46140,10 +60090,10 @@ rev = "bb10aa8f26bb7e9b1d5746934c94edb00402940c"; sha256 = "1zywygdgnp2zr8fxqhl0cbrgbl43931k936b9imhqi96p6622pb6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a8a16e485d608dbd59151d77e252048a49f9d25/recipes/mbe"; sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3"; - name = "mbe"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -46151,9 +60101,14 @@ license = lib.licenses.free; }; }) {}; - mbo70s-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mbo70s-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mbo70s-theme"; + ename = "mbo70s-theme"; version = "20170808.615"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -46161,10 +60116,10 @@ rev = "bed3db8965708ed4e9482b224a9b084765c052f2"; sha256 = "19hha9xwfqvdgsws69x0mcm93yfllp44hdl1xw9zlhj8f4ihizh5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8d0c1050b3319e136fe75903ae3612a52790189/recipes/mbo70s-theme"; sha256 = "1abx2rw09xxp122ff7i9sry5djd4l6vn4lfzxs92rknjzkyc40pb"; - name = "mbo70s-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -46172,20 +60127,24 @@ license = lib.licenses.free; }; }) {}; - mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mbsync = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mbsync"; - version = "20171130.335"; + ename = "mbsync"; + version = "20180530.33"; src = fetchFromGitHub { owner = "dimitri"; repo = "mbsync-el"; - rev = "911d9ac255e8f7fb4bd21c0e816e44abfeb59128"; - sha256 = "05qqb7399bmjdkfr5gdkf7fpg6xziyd9345x00vz5cbq859p128p"; + rev = "bca442138f24f20479b89bd5d77b012ab06f4232"; + sha256 = "1wb3wasfcqcwdlvhgr6y334mgjdkis1s6lf1bbypw9dzi1xmkj21"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync"; sha256 = "1q5g76mspi24zwbs7h4m8bmkhab4drskha4d9b516w1f1cyg6hb6"; - name = "mbsync"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46193,20 +60152,25 @@ license = lib.licenses.free; }; }) {}; - mc-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: - melpaBuild { + mc-extras = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multiple-cursors }: + melpaBuild { pname = "mc-extras"; - version = "20170824.2239"; + ename = "mc-extras"; + version = "20180519.2139"; src = fetchFromGitHub { owner = "knu"; repo = "mc-extras.el"; - rev = "f0ba639e9b18cc56e80ae45bbb2b694dbad9171a"; - sha256 = "0d6ncj6zd0lfsdpffbh3l25ycjw5hn0rwi5znp5hpl06b1ycyk4s"; + rev = "fac7e42d03078b4ca0fa72f191995c727143a0d1"; + sha256 = "097rzzd3r43f406axpvf4xfc5fxpb3v2dcrlxk5axpvr0m31b0d1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12747bb8603ebc09ce0873f3317a99e34d818313/recipes/mc-extras"; sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym"; - name = "mc-extras"; + name = "recipe"; }; packageRequires = [ multiple-cursors ]; meta = { @@ -46214,9 +60178,13 @@ license = lib.licenses.free; }; }) {}; - md-readme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + md-readme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "md-readme"; + ename = "md-readme"; version = "20160811.946"; src = fetchFromGitHub { owner = "thomas11"; @@ -46224,10 +60192,10 @@ rev = "bf818dd847c8b06b3b5100c5d3cf24cf96662528"; sha256 = "0gyjadkv572v3zilxivbiz28pvqh0jmi5bh5la1hyim0qnxymli8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5408d7c12c189d2b5ab9fbb02276de334851e3c8/recipes/md-readme"; sha256 = "1krq0f79jjrlihr2aqq87pxdqixv2zdjw4hm732sz79g996yxyw3"; - name = "md-readme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46235,20 +60203,31 @@ license = lib.licenses.free; }; }) {}; - md4rd = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild, request, s, tree-mode }: - melpaBuild { + md4rd = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , hierarchy + , lib + , melpaBuild + , request + , s + , tree-mode }: + melpaBuild { pname = "md4rd"; - version = "20180123.1244"; + ename = "md4rd"; + version = "20180625.2236"; src = fetchFromGitHub { owner = "ahungry"; repo = "md4rd"; - rev = "be0fc4951b2d1f5194ffa1fcaac706dbac560500"; - sha256 = "1i93shx5x192gd7cl2r6gvcvhhwyi1k08abi5w3izv1hn3pmksgq"; + rev = "3a6c5055330f1cad455cbeb6ad6f9eb4751a8309"; + sha256 = "1c0g6f6myllqz6mymqxbpi392fg1hvzas0ah2wmyw5ycmaafpz3d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48d4a3b3337e16e68631409d1de0ce67ae22b837/recipes/md4rd"; sha256 = "0ayr5qw0cz7bd46djfhm8slr2kfgssi5bsnzqcasr8n4lyg9jvfc"; - name = "md4rd"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs hierarchy request s tree-mode ]; meta = { @@ -46256,9 +60235,13 @@ license = lib.licenses.free; }; }) {}; - mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mediawiki = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mediawiki"; + ename = "mediawiki"; version = "20170812.2255"; src = fetchFromGitHub { owner = "hexmode"; @@ -46266,10 +60249,10 @@ rev = "8473e12d1839f5287a4227586bf117dad820f867"; sha256 = "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki"; sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6"; - name = "mediawiki"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46277,20 +60260,28 @@ license = lib.licenses.free; }; }) {}; - meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: - melpaBuild { + meghanada = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "meghanada"; - version = "20180218.538"; + ename = "meghanada"; + version = "20180717.1810"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0"; - sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8"; + rev = "1fe888ad929f0ebed9a8cde7bb0a605881e1386c"; + sha256 = "1b7cri71fikvyxcc6q9rci1zc4q45a1bvz00ks7gvx6w2sd7h5gd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4"; - name = "meghanada"; + name = "recipe"; }; packageRequires = [ company emacs flycheck yasnippet ]; meta = { @@ -46298,9 +60289,13 @@ license = lib.licenses.free; }; }) {}; - melancholy-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + melancholy-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "melancholy-theme"; + ename = "melancholy-theme"; version = "20170220.1248"; src = fetchFromGitHub { owner = "techquila"; @@ -46308,10 +60303,10 @@ rev = "a9e13ca7051731b3a2c2aece9f3e3033b9a5e41d"; sha256 = "13wgh3w9wh1y1ynsbz4zi2vj14h8z1kj5vhq4w6szs0y0zzjb9zj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8f708d1300d401697c099709718fcb70d5db1f/recipes/melancholy-theme"; sha256 = "1wihbv44234lwsgp5w4hmmi3pgxbcfjvs1nclv0yg600z9s8sn8w"; - name = "melancholy-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46319,9 +60314,14 @@ license = lib.licenses.free; }; }) {}; - mellow-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mellow-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mellow-theme"; + ename = "mellow-theme"; version = "20170808.617"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -46329,10 +60329,10 @@ rev = "2bdf18f05f5212b6f269d9a94afe2cf201766891"; sha256 = "0cj9lkqgiaq1s2k9ky93jgv5pfbmjznsd54r3iqkiy1zshpkir68"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mellow-theme"; sha256 = "0kl1psykx7akxwabszk4amszh3zil8ia4bfbjjvr6h9phgx66pb0"; - name = "mellow-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -46340,9 +60340,14 @@ license = lib.licenses.free; }; }) {}; - melpa-upstream-visit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + melpa-upstream-visit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "melpa-upstream-visit"; + ename = "melpa-upstream-visit"; version = "20130720.333"; src = fetchFromGitHub { owner = "laynor"; @@ -46350,10 +60355,10 @@ rev = "7310c74fdead3c0f86ad6eff76cf989e63f70f66"; sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c110538a1ae2419505ea8f144ef7de2d67cad568/recipes/melpa-upstream-visit"; sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf"; - name = "melpa-upstream-visit"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -46361,20 +60366,24 @@ license = lib.licenses.free; }; }) {}; - memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + memoize = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "memoize"; - version = "20170720.1802"; + ename = "memoize"; + version = "20180614.1230"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-memoize"; - rev = "636defefa9168f90bce6fc27431352ac7d01a890"; - sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk"; + rev = "9a561268ffb550b257a08710489a95cd087998b6"; + sha256 = "1hsw7pjdy3mksg343v400068b6x7s45gzg0l74h5i4nq8bacv8km"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize"; sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6"; - name = "memoize"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46382,9 +60391,15 @@ license = lib.licenses.free; }; }) {}; - memolist = callPackage ({ ag, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { + memolist = callPackage ({ ag + , fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "memolist"; + ename = "memolist"; version = "20150804.1021"; src = fetchFromGitHub { owner = "mikanfactory"; @@ -46392,10 +60407,10 @@ rev = "60c296e202a71e9dcf1c3936d47b5c4b95c5839f"; sha256 = "1jd4rjv812iv7kp4wyxdz8sk7j0442m8x2ypk6hiqis0braxnspm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/memolist"; sha256 = "0nvp38qbzcl6dcayjndw32d3r9h8vf2n29i678s1yr280ll8xw6w"; - name = "memolist"; + name = "recipe"; }; packageRequires = [ ag markdown-mode ]; meta = { @@ -46403,9 +60418,16 @@ license = lib.licenses.free; }; }) {}; - mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }: - melpaBuild { + mentor = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq + , xml-rpc }: + melpaBuild { pname = "mentor"; + ename = "mentor"; version = "20170105.221"; src = fetchFromGitHub { owner = "skangas"; @@ -46413,10 +60435,10 @@ rev = "9a160d718b02a95b1bb24072cca87b4348e1e261"; sha256 = "16n5dd00ajr2qqwm51v1whf2kmyr27mx30n3xlydf9np3f34hlax"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor"; sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s"; - name = "mentor"; + name = "recipe"; }; packageRequires = [ cl-lib seq xml-rpc ]; meta = { @@ -46424,20 +60446,24 @@ license = lib.licenses.free; }; }) {}; - merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + merlin = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "merlin"; - version = "20170917.430"; + ename = "merlin"; + version = "20180214.242"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "a5dbf8e321ff162476555e62264468dd6f55c279"; - sha256 = "0mq4ddr3g64dd4bhq812hb5xvlkswfmib1nw34f3m8sghmaxcd5z"; + rev = "0a14a7df44cd8f5cea7928f3097b5bb5257cb61d"; + sha256 = "145r8bhvkar0fwajsg4msyg40na8ii0xbrwbi9b81cx1g17k5c7k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; sha256 = "177cy9xcrjckxv8gvi1zhg2ndfr8cmsr37inyvpi5dxqy6d6alhp"; - name = "merlin"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46445,9 +60471,41 @@ license = lib.licenses.free; }; }) {}; - meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + merlin-eldoc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , merlin }: + melpaBuild { + pname = "merlin-eldoc"; + ename = "merlin-eldoc"; + version = "20180630.1026"; + src = fetchFromGitHub { + owner = "khady"; + repo = "merlin-eldoc"; + rev = "6e1626d755a8bee0a03f89a951bdf69eaf4db5f9"; + sha256 = "1xa8dfdi7w8ip7m6n0cqz28p9zvqsshd76zg27g4pmhgv1n3fnkc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a7130ec893175323775e887babbcec7a1e324c01/recipes/merlin-eldoc"; + sha256 = "0r4997813yz81zvmdgvr0xcp9c321h55z39lajpj1plmrs3c7bry"; + name = "recipe"; + }; + packageRequires = [ emacs merlin ]; + meta = { + homepage = "https://melpa.org/#/merlin-eldoc"; + license = lib.licenses.free; + }; + }) {}; + meson-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "meson-mode"; + ename = "meson-mode"; version = "20170901.1135"; src = fetchFromGitHub { owner = "wentasah"; @@ -46455,10 +60513,10 @@ rev = "212d9f38a08074f1cb6e914e12b60bc52dcb8bee"; sha256 = "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode"; sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80"; - name = "meson-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -46466,20 +60524,24 @@ license = lib.licenses.free; }; }) {}; - messages-are-flowing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + messages-are-flowing = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "messages-are-flowing"; + ename = "messages-are-flowing"; version = "20170218.1720"; src = fetchFromGitHub { owner = "legoscia"; repo = "messages-are-flowing"; - rev = "ef879726957c850c3a5afd7f1118604991e37e32"; - sha256 = "1mryk48z92r4j8f3qg0j0q5iygv7vnk1k0wgza5pq6bhrl5w13hq"; + rev = "649061753b67b24c54a2eaadc8b3218cafae7376"; + sha256 = "01y9cx5d5sqgvg97dzrnyi7m3yp0q3hm2yqcgknkp111afcgiwm7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/messages-are-flowing"; sha256 = "0v74b7cjj87kncndxfpfs6dcc4jcl18wpbirffl7dw6mac2anw6m"; - name = "messages-are-flowing"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46487,20 +60549,24 @@ license = lib.licenses.free; }; }) {}; - meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + meta-presenter = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "meta-presenter"; + ename = "meta-presenter"; version = "20170425.1934"; src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; - rev = "4e7aae56e5abf6deaadbda84fd5ec4e3e19c22be"; - sha256 = "0nb64i9ikkcbb6s21rzc2d5i84dpy0zvqk7f3zynlprzaqy11b7n"; + rev = "7ba8d30e36ce6de6e563c7f3a41a24d288787c48"; + sha256 = "0m23qsbai8j0bx0px7v3ipw92i4y8maxibna6zqrw3msv1j3s7cw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; sha256 = "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d"; - name = "meta-presenter"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46508,9 +60574,14 @@ license = lib.licenses.free; }; }) {}; - metalheart-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + metalheart-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "metalheart-theme"; + ename = "metalheart-theme"; version = "20160709.2341"; src = fetchFromGitHub { owner = "mswift42"; @@ -46518,10 +60589,10 @@ rev = "ec98ea2c11dc1213dae8cbe1fe0cee73ca138bb2"; sha256 = "0pc86qh74i6vr0ap2j2sn4nl2c0vv15m4m1myyjmggfxx2f27nnc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/204dd67b24bf4f2305a14efb925c8fe004026694/recipes/metalheart-theme"; sha256 = "1xqql1mcwp52plm1gp6q4m9zij2w360y15lnjsz9xgjqvslr7gy5"; - name = "metalheart-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -46529,9 +60600,14 @@ license = lib.licenses.free; }; }) {}; - metascript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + metascript-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "metascript-mode"; + ename = "metascript-mode"; version = "20150708.1757"; src = fetchFromGitHub { owner = "metascript"; @@ -46539,10 +60615,10 @@ rev = "edb361c7b0e5de231e5334a17b90652fb1df78f9"; sha256 = "1rascpmv17dksyn9y0llmjb8r4484x5ax54w6r83k1x7ha1iacx5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90c03167b5fb4f4edc8a76240b3668203261bc58/recipes/metascript-mode"; sha256 = "1kgs4ki0s6bxx2ri6zxmsy2b2w56gnr9hjkr6302wcmp3qy7clwn"; - name = "metascript-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -46550,9 +60626,14 @@ license = lib.licenses.free; }; }) {}; - metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: - melpaBuild { + metaweblog = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xml-rpc }: + melpaBuild { pname = "metaweblog"; + ename = "metaweblog"; version = "20171216.1840"; src = fetchFromGitHub { owner = "punchagan"; @@ -46560,10 +60641,10 @@ rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a"; sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog"; sha256 = "10kwqnfafby4ap0572mfkkdssr13y9p2gl9z3nmxqjjy04fkfi8b"; - name = "metaweblog"; + name = "recipe"; }; packageRequires = [ xml-rpc ]; meta = { @@ -46571,20 +60652,24 @@ license = lib.licenses.free; }; }) {}; - mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mew = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mew"; - version = "20180329.2022"; + ename = "mew"; + version = "20180709.1817"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "abe7f589adc5eef0d53e1eeaba9ab28d01c91231"; - sha256 = "1bn78w2mslsh02m6rzrqdm70cfgx1kgw10ifnrcslc1vn6lwvd0z"; + rev = "d4eac40c09ef349e09f0169bc2725d050dc8c7ad"; + sha256 = "03k2nw8v9xzani2sk37x4abbmljm5h2ixxpczhv8njpqfmy8rm8x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk"; - name = "mew"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46592,9 +60677,13 @@ license = lib.licenses.free; }; }) {}; - mexican-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mexican-holidays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mexican-holidays"; + ename = "mexican-holidays"; version = "20160109.1342"; src = fetchFromGitHub { owner = "shopClerk"; @@ -46602,10 +60691,10 @@ rev = "43ced1f9e40a04be6927d1a1be64060f9be4f5c5"; sha256 = "0bhllmyk1r9y63jw5gx10v09791w33lc54qs31gcxbnss094l6py"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17cf468b17eead32f38e0386e8ec60ecfe11b767/recipes/mexican-holidays"; sha256 = "0awf4vv6mbp1xr92nsgdn513g4adqhp21k12q4fbm85b2l3jlspb"; - name = "mexican-holidays"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46613,20 +60702,25 @@ license = lib.licenses.free; }; }) {}; - mgmtconfig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mgmtconfig-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mgmtconfig-mode"; + ename = "mgmtconfig-mode"; version = "20180222.1257"; src = fetchFromGitHub { owner = "purpleidea"; repo = "mgmt"; - rev = "3c8d424a431abc0a19b456a8aa4fcdb739151f3d"; - sha256 = "0kp82xy6a8vkq5l0fcjw5f5yzg33ig28kc9zv1qs7a2czswnmydx"; + rev = "f01eea33e9b396f1e7501944216271d0d9b8df6f"; + sha256 = "19grypbx6kxgdlqnj1h7rz2clvrwk98z5sk9dar0077ncp2k1f80"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode"; sha256 = "0bdjaqfk68av4lfc4cpacrl2mxvimplfkbadi9l6wb65vlqz6sil"; - name = "mgmtconfig-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -46634,20 +60728,25 @@ license = lib.licenses.free; }; }) {}; - mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mhc = callPackage ({ calfw + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mhc"; - version = "20180314.3"; + ename = "mhc"; + version = "20180717.2009"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "f7bce7f5504093737071e2fc79ae6bc95dd37af5"; - sha256 = "0sash77j2k1gpi35miyaf96g0zfx3d5hjqag8vcwc692lx1sf06c"; + rev = "e29e69ab2f282131039a63f56f48e39d56c175d9"; + sha256 = "0lxn4vg3qxzdxad1fv0ssnw4rjhzvrys4k3lqx87sbg28l9ykk77"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql"; - name = "mhc"; + name = "recipe"; }; packageRequires = [ calfw ]; meta = { @@ -46655,9 +60754,13 @@ license = lib.licenses.free; }; }) {}; - mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mic-paren = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mic-paren"; + ename = "mic-paren"; version = "20170731.1207"; src = fetchFromGitHub { owner = "emacsattic"; @@ -46665,10 +60768,10 @@ rev = "d0410c7d805c9aaf51a1bcefaaef092bed5824c4"; sha256 = "0f24ibzgra94bwal8b0dpjxa11n42gkmanqswfnjhlvx052v9dxr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0e54eac31fbbce9a778fb654f07e11aaaa46ca/recipes/mic-paren"; sha256 = "17j0b8jyr0zx6zds2dz5fzvarm2wh8l5hxds2s90kh5z0kk23r07"; - name = "mic-paren"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46676,20 +60779,26 @@ license = lib.licenses.free; }; }) {}; - micgoline = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: - melpaBuild { + micgoline = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , powerline }: + melpaBuild { pname = "micgoline"; + ename = "micgoline"; version = "20160414.2026"; src = fetchFromGitHub { owner = "yzprofile"; repo = "micgoline"; - rev = "837504263bb1711203b0f7efecd6b7b5f272fae0"; - sha256 = "0r6l6iqn5z9wp4w58flnls7kk6300qlxyy04fw0np00nvwsy4qvp"; + rev = "e3e2effe4846175a3b52b4092c0c134ced5978d8"; + sha256 = "1cmpvg4x812hsl764zaq96y8jvjp99nljp552bbx52lbbnb1w5nr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2219768cf62b52bcbe73cec291eb74c3fedcc862/recipes/micgoline"; sha256 = "0xixcy006my2s0wn0isiag0b4rm38kswa5m0xnhg5n30qjjfzf4i"; - name = "micgoline"; + name = "recipe"; }; packageRequires = [ emacs powerline ]; meta = { @@ -46697,9 +60806,15 @@ license = lib.licenses.free; }; }) {}; - midje-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + midje-mode = callPackage ({ cider + , clojure-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "midje-mode"; + ename = "midje-mode"; version = "20170808.2103"; src = fetchFromGitHub { owner = "dnaumov"; @@ -46707,10 +60822,10 @@ rev = "10ad5b6084cd03d5cd268b486a7c3c246d85535f"; sha256 = "0nag9ks7qbg40h9z954v42x8zi65wbgfhviwvxvb2bmbzv4m4pbs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/midje-mode"; sha256 = "16g57mwkm3ypnyqniy1lj9nfn5wj7cyndb5fhl3fym773ywn6hip"; - name = "midje-mode"; + name = "recipe"; }; packageRequires = [ cider clojure-mode ]; meta = { @@ -46718,9 +60833,14 @@ license = lib.licenses.free; }; }) {}; - migemo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + migemo = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "migemo"; + ename = "migemo"; version = "20160924.741"; src = fetchFromGitHub { owner = "emacs-jp"; @@ -46728,10 +60848,10 @@ rev = "e4744efae1b2fdea2bbd2ceaff0f6ea0bb739f5a"; sha256 = "12p50kg2h78qi8892jj4g3wa4fjm7gjiqf6qw52zyx3kvgwxgxwa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2424b0328a0198a03359455abdb3024a8067c857/recipes/migemo"; sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr"; - name = "migemo"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -46739,9 +60859,13 @@ license = lib.licenses.free; }; }) {}; - milkode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + milkode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "milkode"; + ename = "milkode"; version = "20140926.2229"; src = fetchFromGitHub { owner = "ongaeshi"; @@ -46749,10 +60873,10 @@ rev = "ba97e2aeefa1d9d0b3835bf08edd0de248b0c513"; sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29fffbec2d3067c046c456602779af8c04bf898f/recipes/milkode"; sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh"; - name = "milkode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46760,19 +60884,23 @@ license = lib.licenses.free; }; }) {}; - minesweeper = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + minesweeper = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minesweeper"; + ename = "minesweeper"; version = "20150413.2222"; src = fetchhg { url = "https://bitbucket.com/zck/minesweeper.el"; rev = "d29af12fc611"; sha256 = "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/minesweeper"; sha256 = "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag"; - name = "minesweeper"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46780,20 +60908,25 @@ license = lib.licenses.free; }; }) {}; - mingus = callPackage ({ fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild }: - melpaBuild { + mingus = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , libmpdee + , melpaBuild }: + melpaBuild { pname = "mingus"; - version = "20171124.238"; + ename = "mingus"; + version = "20180712.2336"; src = fetchFromGitHub { owner = "pft"; repo = "mingus"; - rev = "93827f564145a598838d3c3232202a60d681bd49"; - sha256 = "09aj6h2zfww95h9ym5pw2p6p7hz57l7zlx4v492ga2vkcsjis7gy"; + rev = "686d383f48b196c916c5fcb6ddc3bcff8a0c4b14"; + sha256 = "0vv6aqalbpshr0fadh248lirqa6a0dcixccby2kbvdsf79s7xzx8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6699927f1ded5c97f2ce1861f8e54a5453264cca/recipes/mingus"; sha256 = "0vw09qk56l792706vvp465f40shf678mcmdh7iw8wsjix4401bzi"; - name = "mingus"; + name = "recipe"; }; packageRequires = [ libmpdee ]; meta = { @@ -46801,9 +60934,14 @@ license = lib.licenses.free; }; }) {}; - mini-header-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mini-header-line = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mini-header-line"; + ename = "mini-header-line"; version = "20170621.521"; src = fetchFromGitHub { owner = "ksjogo"; @@ -46811,10 +60949,10 @@ rev = "73b6724e0a26c4528d93768191c8aa59e6bce2e5"; sha256 = "187xynmpgkx498an246ywrqdhyyp2ag1l7yxnm0x0rbfgw67q5j1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/122db5436ff9061713c0d3d8f44c47494067843e/recipes/mini-header-line"; sha256 = "1yg8i7gsmiv8zwl1wqvgrh2xl2hm5nn3q11rz4hpyxw26355i817"; - name = "mini-header-line"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -46822,9 +60960,13 @@ license = lib.licenses.free; }; }) {}; - minibuf-isearch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minibuf-isearch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minibuf-isearch"; + ename = "minibuf-isearch"; version = "20151226.1143"; src = fetchFromGitHub { owner = "knagano"; @@ -46832,10 +60974,10 @@ rev = "2846c6ac369ee623dad4cd3c8a7a6d9078965516"; sha256 = "1n4b039448826w2jcsv4r2iw3v2vlrsxw8dbci8wcfigmkbfc879"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebfd2f3f6a2dbd251c321738a4efaacc2200164b/recipes/minibuf-isearch"; sha256 = "0n36d152lc53zj9jy38b0c7hlww0z6hx94y3x2njy6cmh3p5g8nh"; - name = "minibuf-isearch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46843,9 +60985,13 @@ license = lib.licenses.free; }; }) {}; - minibuffer-complete-cycle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minibuffer-complete-cycle = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minibuffer-complete-cycle"; + ename = "minibuffer-complete-cycle"; version = "20130813.945"; src = fetchFromGitHub { owner = "knu"; @@ -46853,10 +60999,10 @@ rev = "3df80135887d0169e02294a948711f6dfeca4a6f"; sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/afac2cf41fe57efa8d313fdbab0b0b795ec144e4/recipes/minibuffer-complete-cycle"; sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2"; - name = "minibuffer-complete-cycle"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46864,9 +61010,13 @@ license = lib.licenses.free; }; }) {}; - minibuffer-cua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minibuffer-cua = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minibuffer-cua"; + ename = "minibuffer-cua"; version = "20130906.434"; src = fetchFromGitHub { owner = "knu"; @@ -46874,10 +61024,10 @@ rev = "adc4979a64f8b36e05960e9afa0746dfa9e2e4c7"; sha256 = "011kg76zr4hfhi2gngnc7jlmp0l0nvhmlgyc0y9bir2jbjf4yyvz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3b0f1f260b02c14da4d584b6af08b2fa3adf39c/recipes/minibuffer-cua"; sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw"; - name = "minibuffer-cua"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46885,9 +61035,13 @@ license = lib.licenses.free; }; }) {}; - miniedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + miniedit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "miniedit"; + ename = "miniedit"; version = "20100419.1045"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -46895,10 +61049,10 @@ rev = "e12bf659c3eb92dd8a4cb77642dc0865c54667a3"; sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/miniedit"; sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87"; - name = "miniedit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46906,20 +61060,24 @@ license = lib.licenses.free; }; }) {}; - minimal-session-saver = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minimal-session-saver = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minimal-session-saver"; + ename = "minimal-session-saver"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "minimal-session-saver"; - rev = "cf654ac549850746dc21091746e4bcc1aef7668e"; - sha256 = "1sj5sq932w079y3vy55q5b6wybwrzz30y092iq1mpfg5xvl42sbm"; + rev = "ac42b6835f777a8a7e04599d8f20ec650997ba96"; + sha256 = "0n2drkqnd02d7n5f4qlxlzlh4gkdi33w4hprndpw15gyny2i8x29"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/minimal-session-saver"; sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i"; - name = "minimal-session-saver"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46927,9 +61085,13 @@ license = lib.licenses.free; }; }) {}; - minimal-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minimal-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minimal-theme"; + ename = "minimal-theme"; version = "20160608.322"; src = fetchFromGitHub { owner = "anler"; @@ -46937,10 +61099,10 @@ rev = "430e0d3fc2044c16aa9f10961841febbd60df285"; sha256 = "1rmcvdydgwppma1v2yajz6yzhns8bh3gdb09338jlk0nkp1akpfj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/minimal-theme"; sha256 = "01dar95l7wjjqhbsknvsfbpvv41ka7iqd1fssckz18lgfqpb54bs"; - name = "minimal-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -46948,20 +61110,26 @@ license = lib.licenses.free; }; }) {}; - minions = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minions = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minions"; - version = "20180321.749"; + ename = "minions"; + version = "20180709.1012"; src = fetchFromGitHub { owner = "tarsius"; repo = "minions"; - rev = "acac7fb0b04ffdf243775231690956d163474177"; - sha256 = "1065asbg1h2chd34cbja2pir93r5y8gp3wv3jv6sf5csa6yqk6c7"; + rev = "2f5e73e15d0021e7ba26cf09f1cd2734b018fb69"; + sha256 = "12acfjmk6n40k5mb2hy1izbk483y83bc3d54r76l750sbm3kpdar"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/769a2167d7f6dfdbbfda058ddea036f80b97d230/recipes/minions"; sha256 = "0ximlj93yp6646bh99r2vnayk15ky26sibrmrqqysfw1pzs4a940"; - name = "minions"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -46969,20 +61137,25 @@ license = lib.licenses.free; }; }) {}; - minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minitest = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minitest"; + ename = "minitest"; version = "20160628.1120"; src = fetchFromGitHub { owner = "arthurnn"; repo = "minitest-emacs"; - rev = "1aadb7865c1dc69c201cecee275751ecec33a182"; - sha256 = "1l18zqpdzbnqj2qawq8hj7z7pl8hr8z9d8ihy8jaiqma915hmhj1"; + rev = "2997ba81456f2a0f3e25b6555b491586865ebb61"; + sha256 = "10f1caszcas39g8kz0hfx1gq1jbpcnb5wwd1c262l9lwvla85nyl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41b2e55c0fe48267dc4f55924c782c6f934d8ca4/recipes/minitest"; sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw"; - name = "minitest"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -46990,9 +61163,14 @@ license = lib.licenses.free; }; }) {}; - minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minizinc-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minizinc-mode"; + ename = "minizinc-mode"; version = "20180201.650"; src = fetchFromGitHub { owner = "m00nlight"; @@ -47000,10 +61178,10 @@ rev = "2512521ba7f8e263a06db88df663fc6b3cca7e16"; sha256 = "1yrawvvn3ndzzrllh408v4a5n0y0n5p1jczdm9r8pbxqgyknbk1n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode"; sha256 = "1blb6mbyqvmdvwp477p1ggs3n6rzi9sdfvi0v1wfzmd7k749b10c"; - name = "minizinc-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -47011,20 +61189,24 @@ license = lib.licenses.free; }; }) {}; - minor-mode-hack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minor-mode-hack = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minor-mode-hack"; + ename = "minor-mode-hack"; version = "20170925.1734"; src = fetchFromGitHub { owner = "rubikitch"; repo = "minor-mode-hack"; - rev = "9688994e23ccb2de568225ef125b41c46e5667c3"; - sha256 = "0f6kafr7zqgdlw914bxh2390a1bjz5zy3h30yrfpavz283ycvrrw"; + rev = "c3aa957602c924c01fe07d48d191b8616fb3696a"; + sha256 = "0lmcf7mv2sk33ajngxasc7kmf5qf17fccijllm3yr0lqdnxbx0pa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/minor-mode-hack"; sha256 = "07ga48xvbi641i053bykv9v4wxhka6jhhg76b1ll24rys02az526"; - name = "minor-mode-hack"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47032,20 +61214,24 @@ license = lib.licenses.free; }; }) {}; - mip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mip-mode = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mip-mode"; + ename = "mip-mode"; version = "20151126.2217"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "gaudecker"; repo = "mip-mode"; rev = "7c88c383b4c7ed0a4c1dc397735f365c1fcb461c"; sha256 = "12k9ii4090dn03xvgqisl4zl4qi33054zxyfkqzzpa9wv72h4knc"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/815ce14f7788edd3cf0504946bf3a25a7c7b3074/recipes/mip-mode"; - sha256 = "1wx5zg4kimd29vqipbzm4vjphn0mldri12g6b18kc290nhgj22ar"; - name = "mip-mode"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cbfefacda071c0f5ee698a4c345a2d6fea6a0d24/recipes/mip-mode"; + sha256 = "0jr8lzs1qzp2ki7xmm5vrdc6vmzagy8zsil0217vyl89pdfmxnyr"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47053,20 +61239,24 @@ license = lib.licenses.free; }; }) {}; - mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mips-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mips-mode"; - version = "20180321.211"; + ename = "mips-mode"; + version = "20180502.757"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-mips-mode"; - rev = "e6c25201a3325b555e64388908d584f3f81d9e32"; - sha256 = "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf"; + rev = "75152fc78baa762af4f83602f6cb3c8b9bcebca3"; + sha256 = "1bk1jfqwwrq3jr6zasyjaz16rjjqbihrn7kakgfk3szv6grvsd7p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; sha256 = "0gg18v80lbndi2yyr5nl37mz0zpamwv9ha4clajkf0bc0vplxkj7"; - name = "mips-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47074,20 +61264,25 @@ license = lib.licenses.free; }; }) {}; - mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mixed-pitch = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mixed-pitch"; - version = "20180314.1441"; - src = fetchFromGitHub { + ename = "mixed-pitch"; + version = "20180410.917"; + src = fetchFromGitLab { owner = "jabranham"; repo = "mixed-pitch"; - rev = "b76567bd0c55f72942e686b7de97a222d333b333"; - sha256 = "186s9ligb1b3hh54pdhfkvpzva5dkj87ydslyi3jjf7yrhvxgw9k"; + rev = "b6b1601c7a3eb9ab23e33192bc479bccc4dd5e7b"; + sha256 = "0g3mcbsjgcwg196ygj21i454ifyf0898r0xlkar1fqdl8lckb8zj"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch"; - sha256 = "1910x5mssxmzzdmllmbqd3ihx0x8s50qf5dx86wal7aja9rris1z"; - name = "mixed-pitch"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/mixed-pitch"; + sha256 = "1gda4jl946qlbf8rqm0mk493kwy8yqldr21cr583l6b6gl1nb4qf"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -47095,9 +61290,14 @@ license = lib.licenses.free; }; }) {}; - mkdown = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { + mkdown = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "mkdown"; + ename = "mkdown"; version = "20140517.718"; src = fetchFromGitHub { owner = "ajtulloch"; @@ -47105,10 +61305,10 @@ rev = "8e23de82719af6c5b53b52b3308a02b3a1fb872e"; sha256 = "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mkdown"; sha256 = "034bwwgh0w1dwawdx2nwn4d6wj65i58aqlvi60kflijfn8l3inr3"; - name = "mkdown"; + name = "recipe"; }; packageRequires = [ markdown-mode ]; meta = { @@ -47116,9 +61316,14 @@ license = lib.licenses.free; }; }) {}; - mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: - melpaBuild { + mmm-jinja2 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mmm-mode }: + melpaBuild { pname = "mmm-jinja2"; + ename = "mmm-jinja2"; version = "20170313.720"; src = fetchFromGitHub { owner = "glynnforrest"; @@ -47126,10 +61331,10 @@ rev = "c8cb763174fa2fb61b9a0e5e0ff8cb0210f8492f"; sha256 = "0big2i3bg4cm14f68ncaiz2h6dk6zqiisrz4l0bv10q9kaa9q2sj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2"; sha256 = "0zg4psrgikb8644x3vmsns0id71ni9fcpm591zn16b4j64llvgsi"; - name = "mmm-jinja2"; + name = "recipe"; }; packageRequires = [ mmm-mode ]; meta = { @@ -47137,19 +61342,24 @@ license = lib.licenses.free; }; }) {}; - mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }: - melpaBuild { + mmm-mako = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild + , mmm-mode }: + melpaBuild { pname = "mmm-mako"; + ename = "mmm-mako"; version = "20121019.2351"; src = fetchhg { url = "https://bitbucket.com/pjenvey/mmm-mako"; rev = "5c9ff92137b5"; sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/mmm-mako"; sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn"; - name = "mmm-mako"; + name = "recipe"; }; packageRequires = [ mmm-mode ]; meta = { @@ -47157,20 +61367,26 @@ license = lib.licenses.free; }; }) {}; - mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mmt = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mmt"; + ename = "mmt"; version = "20171231.2219"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "e860009ce531ee05d2902309db5f804326596b45"; - sha256 = "1l0jh657ndypi9n7dxac8hqc61fxp9c10li3w23c1r9pad4zisy5"; + rev = "b8cc8d29e185c15a1e43ecc2a78e36a6d2f86b8f"; + sha256 = "17v26116g05py2yd24a5rjlr2lbdacahglxar10k5291v9i4msdw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq"; - name = "mmt"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -47178,9 +61394,13 @@ license = lib.licenses.free; }; }) {}; - mo-git-blame = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + mo-git-blame = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mo-git-blame"; + ename = "mo-git-blame"; version = "20160129.959"; src = fetchFromGitLab { owner = "mbunkus"; @@ -47188,10 +61408,10 @@ rev = "254a675eb794cdbbdef9fa2b4b7bb510b70089c0"; sha256 = "1dh92hzpicfvrlg6swrw4igwb771xbsmsf7hxp1a4iry4w8dk398"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a784f931849ca836557390999b179ef9f6e775f3/recipes/mo-git-blame"; sha256 = "14ngwwgzrnnysq1k1k681b5i06ad8r3phhgpvn5alp2fj3il03l3"; - name = "mo-git-blame"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47199,20 +61419,24 @@ license = lib.licenses.free; }; }) {}; - mo-vi-ment-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mo-vi-ment-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mo-vi-ment-mode"; + ename = "mo-vi-ment-mode"; version = "20131028.2333"; src = fetchFromGitHub { owner = "AjayMT"; repo = "mo-vi-ment"; - rev = "f45b014261f8fab19254920bd1d92f3a83263411"; - sha256 = "0k0scl9z35d8x4ikxm2db1frpbx151p2m181fa1armxbd9lbfvnn"; + rev = "6386db71640ed9415bbfa5f42296335f5da7d454"; + sha256 = "0rkjkr5ak75s2h8293ifgvq063xb1lsf0z0679bmvymq6li8gz6h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85487df36bab0a4d2ea034dbe01c8f095a7efddc/recipes/mo-vi-ment-mode"; sha256 = "1pg889mgpv0waccm135mlvag7q13gzfkzchv2532jngwrn6amqc7"; - name = "mo-vi-ment-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47220,9 +61444,15 @@ license = lib.licenses.free; }; }) {}; - mobdebug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }: - melpaBuild { + mobdebug-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lua-mode + , melpaBuild }: + melpaBuild { pname = "mobdebug-mode"; + ename = "mobdebug-mode"; version = "20140109.1946"; src = fetchFromGitHub { owner = "deftsp"; @@ -47230,10 +61460,10 @@ rev = "e1d483bc4e341c762bc5c0a8c52306a8d01ea0da"; sha256 = "04hbd7mv29v3fv4ld0b3skrir0wp9dix2n5nbqp63fj6n5i4cyyz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25a48680d9f0d2b86ee64cc2415626a5283136a8/recipes/mobdebug-mode"; sha256 = "19k0c7igqsqvib6hx0nssig4l5f959dlr4wijd1hp5h1hmcb5vv8"; - name = "mobdebug-mode"; + name = "recipe"; }; packageRequires = [ emacs lua-mode ]; meta = { @@ -47241,9 +61471,15 @@ license = lib.licenses.free; }; }) {}; - mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: - melpaBuild { + mocha = callPackage ({ f + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild }: + melpaBuild { pname = "mocha"; + ename = "mocha"; version = "20180321.1622"; src = fetchFromGitHub { owner = "scottaj"; @@ -47251,10 +61487,10 @@ rev = "33e1b521a8a8d0225df353b51f1e8a4588ee32d0"; sha256 = "1ln6wz452sfxy7ii211ha9p0n3pygxyzyk0raczfla3ln8dh989q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx"; - name = "mocha"; + name = "recipe"; }; packageRequires = [ f js2-mode ]; meta = { @@ -47262,9 +61498,14 @@ license = lib.licenses.free; }; }) {}; - mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + mocha-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "mocha-snippets"; + ename = "mocha-snippets"; version = "20170103.2127"; src = fetchFromGitHub { owner = "cowboyd"; @@ -47272,10 +61513,10 @@ rev = "e054137bd78f0d236e983874da1f345d30a71816"; sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets"; sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds"; - name = "mocha-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -47283,20 +61524,26 @@ license = lib.licenses.free; }; }) {}; - mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mocker = callPackage ({ eieio ? null + , el-x + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mocker"; + ename = "mocker"; version = "20150916.1854"; src = fetchFromGitHub { owner = "sigma"; repo = "mocker.el"; - rev = "6a1d7c9189bd721debd1a60707526e43a733f537"; - sha256 = "0i96fn5ji1z78in4nr316sgfp2mc8lmxijslw3k9q1v50j91bcya"; + rev = "55b078b53ea49e48bd1821d96f0fb86f794fdc6c"; + sha256 = "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a4fe34a6f354d396c24ff13e15157510202259/recipes/mocker"; sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3"; - name = "mocker"; + name = "recipe"; }; packageRequires = [ eieio el-x ]; meta = { @@ -47304,20 +61551,25 @@ license = lib.licenses.free; }; }) {}; - modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + modalka = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "modalka"; + ename = "modalka"; version = "20171231.2213"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "297d5e66628bbd788f8673656ab5f2da29f7c40b"; - sha256 = "1agb500fc3cmhfq423bii7mz83hwnfas5xs6c1qjv3d89v7wxp69"; + rev = "e69ec8fa01e86cb789f7f2b27b6d5a47e1ca3069"; + sha256 = "10yn56vamcfblilsnfqfagssr4060gr7qbpnqa2fjqv1l8fg6jrf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c"; - name = "modalka"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -47325,20 +61577,26 @@ license = lib.licenses.free; }; }) {}; - mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mode-icons = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mode-icons"; + ename = "mode-icons"; version = "20170216.620"; src = fetchFromGitHub { owner = "ryuslash"; repo = "mode-icons"; - rev = "2d47c03ee33c53d069fd64409f7212a2e1ed3f18"; - sha256 = "1cdjrd9jap56wna89v48lc45vycd225ly1wpii31s8sbikxfna2v"; + rev = "dd0a161272823294f2b9afb8b919fd11323ef6b4"; + sha256 = "1d1rhqi0adac8jgz977jrnbnf9kan8cwr1fghlxb2q7p33kp1d29"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons"; sha256 = "1dqcry27rz7afyvjg7345wysp6wmh8fpj32ysk5iw5i7v5scf6kf"; - name = "mode-icons"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -47346,20 +61604,24 @@ license = lib.licenses.free; }; }) {}; - mode-line-bell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mode-line-bell = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mode-line-bell"; + ename = "mode-line-bell"; version = "20171231.1939"; src = fetchFromGitHub { owner = "purcell"; repo = "mode-line-bell"; - rev = "dcfad0929a606af0e836d93e78be989a8ac16f87"; - sha256 = "0vpi3x60izvwwcck6scdm4386bc67693nqwwll0mbzf8n9args4v"; + rev = "dd5c6d85079a25015704cc1132be3dc5388bf48b"; + sha256 = "152qaibhkiw9cij1k4m27mlsvnsvpdk113nsrf6d37czynfly6b3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/26f19808655b0242a1e9e5e5d41f7f794542e243/recipes/mode-line-bell"; sha256 = "1ri771hb91b7hd203f8zp83h5hcndh8ccc1y8shhqmak6a6l04wk"; - name = "mode-line-bell"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47367,9 +61629,13 @@ license = lib.licenses.free; }; }) {}; - mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mode-line-debug = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mode-line-debug"; + ename = "mode-line-debug"; version = "20180318.1525"; src = fetchFromGitHub { owner = "tarsius"; @@ -47377,10 +61643,10 @@ rev = "a0fcc394b07d2414bd6f722da10f1c7567333f6b"; sha256 = "04vsb0lniy90bhnqb590dap9y4wac64xz0lc2rlfczic0nrqd1aa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0080ab9ef1eca5dd19b3fd9af536d8aa17773a2/recipes/mode-line-debug"; sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd"; - name = "mode-line-debug"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47388,9 +61654,13 @@ license = lib.licenses.free; }; }) {}; - modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + modern-cpp-font-lock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "modern-cpp-font-lock"; + ename = "modern-cpp-font-lock"; version = "20180110.1231"; src = fetchFromGitHub { owner = "ludwigpacifici"; @@ -47398,10 +61668,10 @@ rev = "9b10e1831bac34685be89e32e83ed969c4bac683"; sha256 = "0csaky9k24hd3qjhb3kyraycvlsdkjhmw6bbd36z0q0ac56sd2sg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock"; sha256 = "0h43icb5rqbkc5699kdy2mrjs5448phl18jch45ylp2wy2r8c2qj"; - name = "modern-cpp-font-lock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47409,9 +61679,13 @@ license = lib.licenses.free; }; }) {}; - modtime-skip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + modtime-skip-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "modtime-skip-mode"; + ename = "modtime-skip-mode"; version = "20140128.1401"; src = fetchFromGitHub { owner = "jordonbiondo"; @@ -47419,10 +61693,10 @@ rev = "c0e49523aa26b2263a8693691ac775988015f592"; sha256 = "0ri841cwx2mx8ri50lhvifmxnysdc022421mlmklql0252kn775l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486a675ca4898f99133bc18202e123fb58af54c0/recipes/modtime-skip-mode"; sha256 = "1drafwf4kqp83jp47j2ddl2n4a92zf1589fnp6c72hmjqcxv3l28"; - name = "modtime-skip-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47430,20 +61704,24 @@ license = lib.licenses.free; }; }) {}; - moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + moe-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "moe-theme"; - version = "20180314.2108"; + ename = "moe-theme"; + version = "20180616.1900"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "c3ec67b02d55b5072ef4d32ff412019e5940d988"; - sha256 = "1kjyv8mypcpqhhrmbnzjfrf4i40zws9sysaar8f7i08cr79idjj1"; + rev = "ee6d7a1c84ac7a11fcc82dfc3b174eee1c8461fa"; + sha256 = "1g0hzivvqxijbmnnw8ivdlr1z90brnfp555hg6h7hhsh0b6v0arl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; sha256 = "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6"; - name = "moe-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47451,19 +61729,24 @@ license = lib.licenses.free; }; }) {}; - molecule = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + molecule = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "molecule"; - version = "20180120.1514"; + ename = "molecule"; + version = "20180527.43"; src = fetchgit { url = "https://git.daemons.it/drymer/molecule.el/"; - rev = "758dad6f5701c3a2e1146ba5895c08ef734a93d2"; - sha256 = "0syirvzjgbf1yvcvp00a19m4gi49yh1g95ba896mh741wrkilhb4"; + rev = "2ef72b81d9aa24ea782b71a061a3abdad6cae162"; + sha256 = "0fn16jlpdfy35mz0n27bzdiwgvv8l9nfxf8j4pypgpqarnxzpsgc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7421b67dc51abf13bb028e467bb4c83f857a342e/recipes/molecule"; sha256 = "0kdwmn4gb382igy979y7x2fdqcnfxlb4dvqvm6w7ghs564grzgj4"; - name = "molecule"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -47471,9 +61754,13 @@ license = lib.licenses.free; }; }) {}; - molokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + molokai-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "molokai-theme"; + ename = "molokai-theme"; version = "20151016.845"; src = fetchFromGitHub { owner = "alloy-d"; @@ -47481,10 +61768,10 @@ rev = "04a44f21184b6a26caae4f2c92db9019d883309c"; sha256 = "1hqa59pdrnwfykyl58lr8pfbh2f13sygvmrh707hbwc2aii0jjv2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1fdc89f0c52231f238096a1d42c2c330cb50d2c/recipes/molokai-theme"; sha256 = "0srdh3yx7j6xs7rgpzmsyzz6ds00kq887rs2sfa0nvk0j0ga6baf"; - name = "molokai-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47492,9 +61779,13 @@ license = lib.licenses.free; }; }) {}; - mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mongo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mongo"; + ename = "mongo"; version = "20150315.519"; src = fetchFromGitHub { owner = "m2ym"; @@ -47502,10 +61793,10 @@ rev = "595529ddd70ecb9fab8b11daad2c3929941099d6"; sha256 = "0z8mcfhj425hb91fkj1pyg3apw1kf4mgy8lx6n1sc8zmib38py0x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mongo"; sha256 = "0jb5m611m7w26wgfwijgy0dn65s7p1y6fdcfpfgpxa7j5vrcxasc"; - name = "mongo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47513,9 +61804,14 @@ license = lib.licenses.free; }; }) {}; - monitor = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + monitor = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "monitor"; + ename = "monitor"; version = "20161018.444"; src = fetchFromGitHub { owner = "GuiltyDolphin"; @@ -47523,10 +61819,10 @@ rev = "63f4643a0ee81616dbb692b8b03bae21df2283e2"; sha256 = "1hl7nzxvjwv9kknyjikkbxw1gbi5kx4hkkq7sw6jnj06192n93yg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9df614e8e7b9dfdbd7eec552a2b13e0f5acfc22/recipes/monitor"; sha256 = "11n4nv6vkjw434yrwqjw20229m2sxqxxdp7sg99gzrd5gjyab643"; - name = "monitor"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -47534,20 +61830,24 @@ license = lib.licenses.free; }; }) {}; - monky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + monky = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "monky"; - version = "20170224.921"; + ename = "monky"; + version = "20180716.720"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "monky"; - rev = "62fc907cb541aef1c253d6bcd60447156e6f064c"; - sha256 = "1qxykx8ccm4k95ncnzy8pspqgmz29pvqha5dg8al4zq20bms98s5"; + rev = "f1aaea2b8334d5870c8179f2c70b4088882caff8"; + sha256 = "1ibfigbkir4y87wl7nhz6z5fb13gqmhiby1315yqw8p7d604am56"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky"; sha256 = "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz"; - name = "monky"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47555,20 +61855,24 @@ license = lib.licenses.free; }; }) {}; - monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + monochrome-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "monochrome-theme"; + ename = "monochrome-theme"; version = "20140326.350"; src = fetchFromGitHub { owner = "fxn"; repo = "monochrome-theme.el"; - rev = "bfca67fe7365310bc47ae9ca96c417caada54896"; - sha256 = "0jvsss38rgry37dnshxbqxcj7qh1q6iyza58kix47h5wbnrpvszn"; + rev = "9cf993670c9e8d198f41d840216e13280585b3e1"; + sha256 = "0x6k0lxhp6y32ws54fgb71j3vfkn864iswhxs0ygg7n1nrkz1ipq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/monochrome-theme"; sha256 = "0cq2clliwcwnn1spz1w6y5qw1lgqznw212rcc4q6f1kslq0jyk5x"; - name = "monochrome-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47576,9 +61880,14 @@ license = lib.licenses.free; }; }) {}; - monokai-alt-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + monokai-alt-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "monokai-alt-theme"; + ename = "monokai-alt-theme"; version = "20170630.1348"; src = fetchFromGitHub { owner = "dawidof"; @@ -47586,10 +61895,10 @@ rev = "f342b6afc31f929be0626eca2d696ee9fab78011"; sha256 = "1lgsqrwf21b0rh4x8nmj08a46ld7dkq4jhwxi1fi7a9xhmi2yd4i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ff05515c2f3bd80cb8d7de9afc8fd983e62ad91/recipes/monokai-alt-theme"; sha256 = "135bli9vhgl898526q6znjvck356bja1ylsfi95d9445jd136c4v"; - name = "monokai-alt-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -47597,20 +61906,24 @@ license = lib.licenses.free; }; }) {}; - monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + monokai-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "monokai-theme"; - version = "20180314.501"; + ename = "monokai-theme"; + version = "20180402.221"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "da23ef64d4848636e47a026259526575381bd164"; - sha256 = "08py8dmwlqhc16fjcjf24dmpfbv2xpq8b0l43cx8f44f6791r2qf"; + rev = "1143c072f5153ae1a69807e5e8af163069b947d2"; + sha256 = "0dy8c3349j7fmp8052hbgvk0b7ldlv5jqpg0paq1i0hlypivd30i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a"; - name = "monokai-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47618,9 +61931,14 @@ license = lib.licenses.free; }; }) {}; - monotropic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + monotropic-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "monotropic-theme"; + ename = "monotropic-theme"; version = "20180218.357"; src = fetchFromGitHub { owner = "caffo"; @@ -47628,10 +61946,10 @@ rev = "b46e94a712e01cebe69a6f7d950e91d7c7dd1b66"; sha256 = "0lmyfqi6c5f2cr9ha1l2qnc4ayigb1zj9gz8xi5xxadhad3zymwh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38222d109ece0030b0bfafb242aa100694b2bfcf/recipes/monotropic-theme"; sha256 = "129yqjh4gaab1kjijzkzbw50alzdiwmpv9cl3lsy04m8zk02shl8"; - name = "monotropic-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -47639,20 +61957,24 @@ license = lib.licenses.free; }; }) {}; - monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + monroe = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "monroe"; - version = "20180116.817"; + ename = "monroe"; + version = "20180703.1046"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "609dfd82897c14324a99206ebf450377e5c6257e"; - sha256 = "07qyxc7mjly0j2x7aqbpnn7nd5fp2pck02ks25m62gn4a1sq4v3z"; + rev = "36fd5b250de51f8bfa62bbe6ce35e8690e0ad120"; + sha256 = "1aw823a5llv196rzqhqvh7bk2npwzy1fgaj24xv0x2g5fk9n85hv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig"; - name = "monroe"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47660,20 +61982,25 @@ license = lib.licenses.free; }; }) {}; - moody = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + moody = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "moody"; - version = "20180321.750"; + ename = "moody"; + version = "20180403.549"; src = fetchFromGitHub { owner = "tarsius"; repo = "moody"; - rev = "db27ba168503bd6e6c98c313e73699dc403a10aa"; - sha256 = "1y0zg0flcv3sawyqvwilh1ysvbn1bsnkn0b2n89lj00zyb5dj5z8"; + rev = "adf652f35cba1bb3d0f254e1905e2deeeb0fbdba"; + sha256 = "1zspq29n60r0kd9fy7d50zdypljigwcjb0qa5gkwiipnhpcnf9bp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody"; sha256 = "095241sjw330fb5lk48aa4zx8xbzk8s4ml22n6a8bzr99nkhn5jy"; - name = "moody"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -47681,9 +62008,41 @@ license = lib.licenses.free; }; }) {}; - moonscript = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + moom = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "moom"; + ename = "moom"; + version = "20180618.1245"; + src = fetchFromGitHub { + owner = "takaxp"; + repo = "moom"; + rev = "54b50eac555c9195ad39060e31fd4aac5662b5fd"; + sha256 = "1xxxwy67fcgll6m0wiypv3r85vg45g8f6fkhx5m52cs3w8iav7il"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c55081230ee02346ed02e0ab19ee2302e7b9ffa7/recipes/moom"; + sha256 = "11l4yc8fhxsrsjfksqj4cxr13jln0khhd2dn09i94n71dx7lybh1"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/moom"; + license = lib.licenses.free; + }; + }) {}; + moonscript = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "moonscript"; + ename = "moonscript"; version = "20170831.1526"; src = fetchFromGitHub { owner = "k2052"; @@ -47691,10 +62050,10 @@ rev = "56f90471e2ced2b0a177aed4d8c2f854797e9cc7"; sha256 = "1v2phdpfngrb01x4qygpfgxdzpgvbprki2kbmpc83vlqxlmkvvjk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3046afee95277024830d7d372f2f1c84a0adcb00/recipes/moonscript"; sha256 = "1fi4hg5gk5zpfkrk0hqghghkzbbi33v48piq2i085i4nc6m3imp0"; - name = "moonscript"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -47702,20 +62061,25 @@ license = lib.licenses.free; }; }) {}; - morganey-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + morganey-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "morganey-mode"; + ename = "morganey-mode"; version = "20170118.134"; src = fetchFromGitHub { owner = "morganey-lang"; repo = "morganey-mode"; - rev = "5cf3870432a2aeb69d373abe63b3be1f325f6d21"; - sha256 = "04xv4v2n03axjlpm9pg3j4zjapqjb7is3anx6laa90zbw3z2iv9z"; + rev = "7e33f1be486f58dfcf02adcbf82ccac47f69bd9b"; + sha256 = "1ic3m71ilclrvshc6lasbb1s7ifhjp10iwy0zbjbhfy27n05g3z1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/morganey-mode"; sha256 = "18cbmx8lnypgxkisxa3lrh88v8l9k0q8fnai5ps8ngvfgz42rlqp"; - name = "morganey-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -47723,20 +62087,24 @@ license = lib.licenses.free; }; }) {}; - morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + morlock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "morlock"; + ename = "morlock"; version = "20180318.1323"; src = fetchFromGitHub { owner = "tarsius"; repo = "morlock"; - rev = "b883d48024ddfffebe2d0dd69f5ed54c617f8834"; - sha256 = "0xns4f39x012n7piiv6kgb45n932wxs5fp4yyq44p1mnr0m8v4y8"; + rev = "5fd655ba3050981ab8059bcddf5b19c21f9ceea1"; + sha256 = "0bgrqydh9bb059j6b6y86xn6qdq85y0radsi1zq20p5xmrsgivbn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ef53bbc80edda12a90a8a9705fe14415972833/recipes/morlock"; sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna"; - name = "morlock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47744,20 +62112,25 @@ license = lib.licenses.free; }; }) {}; - mosey = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mosey = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mosey"; - version = "20161015.319"; + ename = "mosey"; + version = "20180614.949"; src = fetchFromGitHub { owner = "alphapapa"; repo = "mosey.el"; - rev = "eb0ae6ec10f1d9828a2665476f6d6811df9b0bfa"; - sha256 = "1cpa38ay4y7cffi9h34s8lw308qggpf342hzqzgbsqy7rl9wr10k"; + rev = "2e3ac9d334fa2937ed5267193dfd25d8e1f14dc2"; + sha256 = "1yxy6m5igvsy37vn93ijs0b479v50vsnsyp8zi548iy2ribr0qr5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76a9a43eea68db9f82c07677235c481a6f243aa2/recipes/mosey"; sha256 = "0zprzr5aqv77kmg1ki9w6fw1nc2ap6yqjl4ak05a1i9cq8g6nf3m"; - name = "mosey"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -47765,9 +62138,14 @@ license = lib.licenses.free; }; }) {}; - mote-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: - melpaBuild { + mote-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , ruby-mode ? null }: + melpaBuild { pname = "mote-mode"; + ename = "mote-mode"; version = "20160122.1629"; src = fetchFromGitHub { owner = "inkel"; @@ -47775,10 +62153,10 @@ rev = "666c6641addbd3b337a7aa01fd2742ded2f41b83"; sha256 = "10mf96r75558scn71pri71aa8nhp6hmnb5rwjxlh5dlf80r5dfd7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mote-mode"; sha256 = "0ccsyl0wvf0nbsw57sxad7w0c0i5al5s5mjrjjq8bnfh4dyj2x0y"; - name = "mote-mode"; + name = "recipe"; }; packageRequires = [ ruby-mode ]; meta = { @@ -47786,9 +62164,15 @@ license = lib.licenses.free; }; }) {}; - motion-mode = callPackage ({ fetchFromGitHub, fetchurl, flymake-cursor, flymake-easy, lib, melpaBuild }: - melpaBuild { + motion-mode = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-cursor + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "motion-mode"; + ename = "motion-mode"; version = "20140919.1856"; src = fetchFromGitHub { owner = "ainame"; @@ -47796,10 +62180,10 @@ rev = "4c94180e3ecea611a61240a0c0cd48f1032c4a55"; sha256 = "17570labnwdnwca2cg4ga0mrrm00n0h3wlxry823k5yn3k93rnj1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e3a2091a73c7d725c929313290566f5ca19404/recipes/motion-mode"; sha256 = "1lfsc8ayiz2v3dfn8c0mmfch8vpzqyddxw8kscan2lzl2lcj50h0"; - name = "motion-mode"; + name = "recipe"; }; packageRequires = [ flymake-cursor flymake-easy ]; meta = { @@ -47807,9 +62191,15 @@ license = lib.licenses.free; }; }) {}; - mouse-slider-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mouse-slider-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mouse-slider-mode"; + ename = "mouse-slider-mode"; version = "20161021.1214"; src = fetchFromGitHub { owner = "skeeto"; @@ -47817,10 +62207,10 @@ rev = "b3c19cd231edecce76787c5a9bbe5e4046d91f88"; sha256 = "1qkbrwicp3gaknnmfrajf1qdyhj5s0c09cx62869rp2721p8rqaw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8fa747999bb928c3836400a43d8ab63939381673/recipes/mouse-slider-mode"; sha256 = "0aqxjm78k7i8c59w6mw9wsfw3rail1pg40ac1dbcjkm62fjbh5hy"; - name = "mouse-slider-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -47828,20 +62218,24 @@ license = lib.licenses.free; }; }) {}; - move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + move-dup = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "move-dup"; - version = "20170513.1911"; + ename = "move-dup"; + version = "20180531.537"; src = fetchFromGitHub { owner = "wyuenho"; repo = "move-dup"; - rev = "dae61de7aa5e2bf56a7bab1fa36fa3a39520a3c0"; - sha256 = "1mrrxx2slxi1qgf483nnxv3y8scfsc844sfnzn4b7hjpfpali0r8"; + rev = "24e5b6d7222cbe2437c602f1af37d5807569961a"; + sha256 = "0i78cv3xdchzak8xxm7xm1fw4z6ww3v402cl2rwyg4363fx00f7y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup"; sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f"; - name = "move-dup"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47849,20 +62243,24 @@ license = lib.licenses.free; }; }) {}; - move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + move-text = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "move-text"; + ename = "move-text"; version = "20170908.2030"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "move-text"; - rev = "7cbc941a9150468609010a93c429117da2523903"; - sha256 = "1irrcbqi1m6pcsjkbd3nqri158qhl0bcynciwwxdfqb45i67a1m9"; + rev = "daaa5c3e01d1b88f4eea8e1421acd2453c2df350"; + sha256 = "1hm2j28vf7zh5h552wszawxsp2c4jwpc33017ld1vc9qcccp3895"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text"; sha256 = "04bfrkanafmbrdyw06ciw9kiyn7h3kpikxk3clx2gc04jl67hzgy"; - name = "move-text"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47870,20 +62268,24 @@ license = lib.licenses.free; }; }) {}; - mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mowedline = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mowedline"; + ename = "mowedline"; version = "20161121.1835"; src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "6121b7d4aacd18f7b24da226e61dbae054e50a7c"; - sha256 = "16j3y4hffnv2rg97p49hqz3x1icp7qkpcjxhalny5l4gysx9mfqg"; + rev = "bde4de0a4e1404127b0a48897d8cd1d1cb8a263d"; + sha256 = "0wwl9f01b9sgs8n19a4i7h08xaf6zdljf2plbdpyy4gzi2iiqcc4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb"; - name = "mowedline"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47891,20 +62293,24 @@ license = lib.licenses.free; }; }) {}; - moz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + moz = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "moz"; + ename = "moz"; version = "20150805.1006"; src = fetchFromGitHub { owner = "bard"; repo = "mozrepl"; - rev = "ab3e79914445039ceb62f7f2dc342358fec3492e"; - sha256 = "1c7dsip5wmlf7x2hziwil5n3igvpnh17d7yg8lsg001y5sjl3mjv"; + rev = "2209e126b509b9a4d0800b1c7f9623e8d2b4345b"; + sha256 = "18b214667b4hr76dd09kbjb3acsnr9n5aik49ji1v50k78aaswvv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6839c5e52364fb32f6d8a351e5c2f21fbd6669a1/recipes/moz"; sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi"; - name = "moz"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47912,9 +62318,14 @@ license = lib.licenses.free; }; }) {}; - moz-controller = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, moz }: - melpaBuild { + moz-controller = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , moz }: + melpaBuild { pname = "moz-controller"; + ename = "moz-controller"; version = "20151208.1806"; src = fetchFromGitHub { owner = "RenWenshan"; @@ -47922,10 +62333,10 @@ rev = "46f665c03574fa922de767fc29795e0db4a7c5c6"; sha256 = "0fssn33ld6xhjlwg1dbrjg8sa0pjmglq0dw792yrmvm4fj0zjph8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcc20337594a76a547f696adece121ae592c6917/recipes/moz-controller"; sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd"; - name = "moz-controller"; + name = "recipe"; }; packageRequires = [ moz ]; meta = { @@ -47933,20 +62344,24 @@ license = lib.licenses.free; }; }) {}; - mozc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mozc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mozc"; + ename = "mozc"; version = "20180101.0"; src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "afb03ddfe72dde4cf2409863a3bfea160f7a66d8"; - sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"; + rev = "f5ddd0e06f5d94ecc626b38797c982e8598d18e0"; + sha256 = "03ccc2v80033av5a5gq7w90rpk851idfg28979hjq8qfzsizx7x6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; sha256 = "0nslh4xyqpvzdxcgrd1bzaqcdz77bghizh6n2w6wk46cflir8xba"; - name = "mozc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -47954,9 +62369,14 @@ license = lib.licenses.free; }; }) {}; - mozc-im = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }: - melpaBuild { + mozc-im = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mozc }: + melpaBuild { pname = "mozc-im"; + ename = "mozc-im"; version = "20160411.1722"; src = fetchFromGitHub { owner = "d5884"; @@ -47964,10 +62384,10 @@ rev = "df614a1076c28a11551fb3e822868bae47e855a5"; sha256 = "0cpcldizgyr125j7lzkl8l6jw1hc3fb12cwgkpjrl6pjpr80vb15"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b651b7f1c15b44577b3c2b7493264ed802cf073/recipes/mozc-im"; sha256 = "1gqzmm712npj36qfi506zgl0ycd6k7l5m46c7zz2z2lb6jpssw10"; - name = "mozc-im"; + name = "recipe"; }; packageRequires = [ mozc ]; meta = { @@ -47975,9 +62395,15 @@ license = lib.licenses.free; }; }) {}; - mozc-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mozc, popup }: - melpaBuild { + mozc-popup = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mozc + , popup }: + melpaBuild { pname = "mozc-popup"; + ename = "mozc-popup"; version = "20150223.1634"; src = fetchFromGitHub { owner = "d5884"; @@ -47985,10 +62411,10 @@ rev = "f0684b875a7427ec08f8df13939a486e5d5cf420"; sha256 = "1mbpkjc6sk7qqmgsmr5a5l2ycwnqp8bkwgikdavgs6hnal10bkmn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49bdcf035b9f885a689b9dc21817aecdcd09768b/recipes/mozc-popup"; sha256 = "1n43lwflxzzyskxgzg19rg3hiqqkf5l7vfgaydryf4sk8480x687"; - name = "mozc-popup"; + name = "recipe"; }; packageRequires = [ mozc popup ]; meta = { @@ -47996,20 +62422,27 @@ license = lib.licenses.free; }; }) {}; - mozc-temp = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }: - melpaBuild { + mozc-temp = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mozc }: + melpaBuild { pname = "mozc-temp"; + ename = "mozc-temp"; version = "20160228.40"; src = fetchFromGitHub { owner = "HKey"; repo = "mozc-temp"; - rev = "9d6b645eff901ea79dbc43a55d5a97ead3f4bad7"; - sha256 = "1vwciy6hcbcyid41bykibx6ii1y9ln7kdxn7cjwfjrgd3kl9wg19"; + rev = "7f5dd5fc8ceeca9b1822f7e056a4be67e2e74959"; + sha256 = "1gdi2pz8450h11aknz3hbgjlx09w6c4l8d8sz0zv3pb1z8cqkgqv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0c77275d759bf73df11fa151b4e737d7cb15adf/recipes/mozc-temp"; sha256 = "0x1bsa1py0kn73hzbsb4ijl0bqng8nib191vgn6xq8f5cx55044d"; - name = "mozc-temp"; + name = "recipe"; }; packageRequires = [ dash emacs mozc ]; meta = { @@ -48017,9 +62450,13 @@ license = lib.licenses.free; }; }) {}; - mpages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mpages = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mpages"; + ename = "mpages"; version = "20150710.704"; src = fetchFromGitHub { owner = "slevin"; @@ -48027,10 +62464,10 @@ rev = "39a72a0931ab1cdbfdf0ab9f412dc12d43a3829f"; sha256 = "11c8pr3s77aq34ic32lnsialwh8bw3m78kj838xl2aab2pgrlny2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b535c2862c4fad568324466883f23ba9f39e787f/recipes/mpages"; sha256 = "11scjjwwrpgaz6i4jq9y7m864nfak46vnbfb0w15625znz926jcs"; - name = "mpages"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48038,20 +62475,26 @@ license = lib.licenses.free; }; }) {}; - mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, libmpdel, melpaBuild }: - melpaBuild { + mpdel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , libmpdel + , melpaBuild }: + melpaBuild { pname = "mpdel"; - version = "20180328.2359"; + ename = "mpdel"; + version = "20180606.512"; src = fetchFromGitHub { owner = "mpdel"; repo = "mpdel"; - rev = "3786dd31a9f0a3355c967889323742cfe61f4141"; - sha256 = "0fqdhjmywyw9yd97glrw12j962kmq062djgz2ymv6kspy2g1xv9y"; + rev = "a1e05828e3bc03679530b4cfff1306706171cb78"; + sha256 = "1avfhkklhkkazy1b0ymcmc0walrs29ak36vbvaxs480r5s16dkjd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel"; sha256 = "1py6zk16yl7pyql2qxzd770clzszw7c769hw70n963kns1qmpif8"; - name = "mpdel"; + name = "recipe"; }; packageRequires = [ emacs libmpdel ]; meta = { @@ -48059,9 +62502,15 @@ license = lib.licenses.free; }; }) {}; - mpmc-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }: - melpaBuild { + mpmc-queue = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , queue }: + melpaBuild { pname = "mpmc-queue"; + ename = "mpmc-queue"; version = "20180303.1229"; src = fetchFromGitHub { owner = "smizoe"; @@ -48069,10 +62518,10 @@ rev = "df07d6bef7468edb1d73ef73b8331b94d0e5d0ca"; sha256 = "17817l3afghg9z8jxkj61yg85plmr74ki3wf4hz685llx8fr69w0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30511f1e5eaf45b5f43fbacdd6c7254cb39b1d2c/recipes/mpmc-queue"; sha256 = "08jcmhfl87nsg6zgv582yfs152bqihbcssh085gxxqn2x99li354"; - name = "mpmc-queue"; + name = "recipe"; }; packageRequires = [ emacs queue ]; meta = { @@ -48080,30 +62529,99 @@ license = lib.licenses.free; }; }) {}; - mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }: - melpaBuild { + mpv = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild + , org }: + melpaBuild { pname = "mpv"; - version = "20150218.118"; + ename = "mpv"; + version = "20180602.314"; src = fetchFromGitHub { owner = "kljohann"; repo = "mpv.el"; - rev = "3021c55fa5723a806dde5fb2a630b115e2c53d06"; - sha256 = "193j90sgn1zgl00mji86wll4djj57vk5arhwbmhhf5b1qx3wpbhm"; + rev = "9dedf3b7c1bfd778284df7f394207ce0447ea7aa"; + sha256 = "15z62wi47pwvkbh4qgvz06yk4cyy570pjz1276sd9frdwgd4kc19"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2392c1d1042ac6a42bbf9aa7e394c03e178829d0/recipes/mpv"; sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l"; - name = "mpv"; + name = "recipe"; }; - packageRequires = [ cl-lib emacs json names org ]; + packageRequires = [ cl-lib emacs json org ]; meta = { homepage = "https://melpa.org/#/mpv"; license = lib.licenses.free; }; }) {}; - msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mqr = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mqr"; + ename = "mqr"; + version = "20180527.504"; + src = fetchFromGitHub { + owner = "calancha"; + repo = "multi-replace"; + rev = "4ade19d4620b8b61340290bf63fa56d5e493859f"; + sha256 = "0pkxmv0rla9f2ly9fq3i3mrsa2q8rsrs4pk6w7wpi3v5fbj1jmd6"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0023747e8173fab8e88143ee95a31540a079c6bf/recipes/mqr"; + sha256 = "1nw713sha29q1zgsxxfrkggkrk6q8vvk9sdi1s539r8h35bc3jx0"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mqr"; + license = lib.licenses.free; + }; + }) {}; + mqtt-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mqtt-mode"; + ename = "mqtt-mode"; + version = "20180605.1031"; + src = fetchFromGitHub { + owner = "andrmuel"; + repo = "mqtt-mode"; + rev = "36d1d4296d79e17b8f35e8e14f2708980eb502db"; + sha256 = "1116xvwpavg7icm263s0clgxhw3qqm4aqiw4ky94w9a8ydazx51l"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b85c84ff9523026620e5b3cf864bbc7b9f81d57a/recipes/mqtt-mode"; + sha256 = "1zbnhd65c9wz9yr29j37c8z7vz3axpfwkzx0z8xjplp40mafpz1z"; + name = "recipe"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/mqtt-mode"; + license = lib.licenses.free; + }; + }) {}; + msvc = callPackage ({ ac-clang + , cedet ? null + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "msvc"; + ename = "msvc"; version = "20171225.738"; src = fetchFromGitHub { owner = "yaruopooner"; @@ -48111,10 +62629,10 @@ rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3"; sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3"; - name = "msvc"; + name = "recipe"; }; packageRequires = [ ac-clang cedet cl-lib emacs ]; meta = { @@ -48122,20 +62640,25 @@ license = lib.licenses.free; }; }) {}; - mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mtg-deck-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mtg-deck-mode"; - version = "20180129.1637"; + ename = "mtg-deck-mode"; + version = "20180613.1310"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "4eeb1a5115d60d064dcd79b9e0dd48619cd2ee4c"; - sha256 = "16qmqqq7297idr2x4fr22ihhx6z91484x0hpmskbh6fn05bvls2y"; + rev = "8265b8ed17fcd4406760c19aa6ee9c76068b1ab0"; + sha256 = "04qdcqpkic2nhqy6nf15j3zp5hmrfzs2kndvmg5v4vjac2vfmzfb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; sha256 = "07hszf33nawhp218f90qr4s713yyjdd7zzkq0s8q0fb6aai5iiih"; - name = "mtg-deck-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -48143,9 +62666,14 @@ license = lib.licenses.free; }; }) {}; - mu-cite = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }: - melpaBuild { + mu-cite = callPackage ({ fetchFromGitHub + , fetchurl + , flim + , lib + , melpaBuild }: + melpaBuild { pname = "mu-cite"; + ename = "mu-cite"; version = "20160130.300"; src = fetchFromGitHub { owner = "ksato9700"; @@ -48153,10 +62681,10 @@ rev = "aea3c2d01eb3284d5e0124059d368e8c6b6ffddc"; sha256 = "1gxspy50gh7j4sysvr17fvvp8p417ww39ii5dy0fxncfwczdsa19"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a80bc6e626f4bc6edfe6560833d12d31ecfd7a51/recipes/mu-cite"; sha256 = "0ap21sw4r2x774q2np6rhrxh2m2rf3f6ak3k71iar159chx32y6q"; - name = "mu-cite"; + name = "recipe"; }; packageRequires = [ flim ]; meta = { @@ -48164,9 +62692,17 @@ license = lib.licenses.free; }; }) {}; - mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: - melpaBuild { + mu4e-alert = callPackage ({ alert + , emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , s }: + melpaBuild { pname = "mu4e-alert"; + ename = "mu4e-alert"; version = "20180304.2246"; src = fetchFromGitHub { owner = "iqbalansari"; @@ -48174,10 +62710,10 @@ rev = "96a293b28646f4620e257f24748becc4a06843cd"; sha256 = "01rgsd958shph01ialk0lp3snxqydvjkiik170jshfls1jric1di"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert"; sha256 = "0b74ky51nx75vcrrbabr5cj2cx4yax5kgaq479hjp5yc5mq2q46r"; - name = "mu4e-alert"; + name = "recipe"; }; packageRequires = [ alert emacs ht s ]; meta = { @@ -48185,20 +62721,52 @@ license = lib.licenses.free; }; }) {}; - mu4e-jump-to-list = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mu4e-conversation = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mu4e-conversation"; + ename = "mu4e-conversation"; + version = "20180722.159"; + src = fetchFromGitLab { + owner = "ambrevar"; + repo = "mu4e-conversation"; + rev = "223cc66e99c7665326e3d991d6d383cb0d7512bb"; + sha256 = "1ncawxcgsnk6ila5h30ka66x350xnkpxadlpnszbf3lc3w2scxjp"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7638aecc7a2cd4b1646c6e32fe83e18ef212bbaa/recipes/mu4e-conversation"; + sha256 = "16vhjaxjhshw7ch9ihk35r99549xlbmvybwjx0p9mzyqi30dn3s6"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mu4e-conversation"; + license = lib.licenses.free; + }; + }) {}; + mu4e-jump-to-list = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mu4e-jump-to-list"; - version = "20171104.1248"; - src = fetchFromGitHub { + ename = "mu4e-jump-to-list"; + version = "20180425.1132"; + src = fetchFromGitLab { owner = "wavexx"; repo = "mu4e-jump-to-list.el"; - rev = "2aa995ddedc7634292b459a3ea2718eea39695cf"; - sha256 = "0l4fnnmdb5xf99klviabyqkh3ywkwvphhf8darj42ygrhbs086pd"; + rev = "e336ffe84b55edaaf4e48040d4d9156a9f4c881e"; + sha256 = "0ff7a64vk0kd1sl52ncwj2xf3sh0kb0yln1cmdxdz0hyfsnc8d1h"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ca51179f5584c0eac626da7cda896b247d33fcae/recipes/mu4e-jump-to-list"; - sha256 = "1k4ic476f6xzh6f1a9jaqy0248zz2q4xjygdvrsyrp1sxjbrwxvm"; - name = "mu4e-jump-to-list"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/mu4e-jump-to-list"; + sha256 = "0yl1vi62pjgklwa7ifvr35fciiqqc5zkrc0m4yxjiv0c0dn50b7n"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -48206,20 +62774,25 @@ license = lib.licenses.free; }; }) {}; - mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mu4e-maildirs-extension = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mu4e-maildirs-extension"; - version = "20171119.1125"; + ename = "mu4e-maildirs-extension"; + version = "20180606.112"; src = fetchFromGitHub { owner = "agpchil"; repo = "mu4e-maildirs-extension"; - rev = "c3ebeedd5c12e190949aed53c3040d51d21de58f"; - sha256 = "19a95f0sp5psq00mgnbw3azn9c3db3gafax3svih1qk1ff4yf3hp"; + rev = "3ef4c48516be66e73d24fe764aadbcfc126b7964"; + sha256 = "04nf947sxkir3gni67jc5djhywkmay1l8cqkicayimrh3vd5cy05"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-maildirs-extension"; sha256 = "0bisxm0rph5q1p3zjr7vyyr0jqr3ihs6ihiwyfr8d3dvba1zhffc"; - name = "mu4e-maildirs-extension"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -48227,20 +62800,25 @@ license = lib.licenses.free; }; }) {}; - mu4e-query-fragments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mu4e-query-fragments = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mu4e-query-fragments"; + ename = "mu4e-query-fragments"; version = "20170923.622"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "wavexx"; repo = "mu4e-query-fragments.el"; - rev = "34ddad4e6785f575333efcc66153d892daa1c884"; - sha256 = "0l5i3a88j9il2y0jq2sfzwi9q3czc1wi8n9nvgdysj5db5m4xsw6"; + rev = "5f2b195dad2d74f38ff35b93edea5dd133112012"; + sha256 = "0frq485lghpzpzcrpw7f4vmc39nx1ph1dp0i0l8hb6h8rl1n4r7n"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/21277a79a211b4d101809314bdb9963130a3d533/recipes/mu4e-query-fragments"; - sha256 = "0h8rapfz9snvr722vr65gqa0xhgig81b2gvswjlzljwd2m98yzzn"; - name = "mu4e-query-fragments"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/mu4e-query-fragments"; + sha256 = "1gckwfgw7jvr6dbikcmy07i07wjhlvq66swhac2laaj6w567vc7w"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -48248,20 +62826,51 @@ license = lib.licenses.free; }; }) {}; - multi = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + muban = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "muban"; + ename = "muban"; + version = "20180415.519"; + src = fetchFromGitHub { + owner = "jiahaowork"; + repo = "muban.el"; + rev = "c134c46e60be1fb3e9a08dba3d07346855e0fcc2"; + sha256 = "1xlkzvfbzhhpmzz008ad4l9sxdvda2cxhq6grn84pcfh5g2ccn2c"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3576c6b7d79ce6d4df40ce83400fa2468f8fbcdf/recipes/muban"; + sha256 = "1njphxx6sgw952p7v2qkbjwa8sb2mwrxrzv35bzp0d4c84ny2sa0"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/muban"; + license = lib.licenses.free; + }; + }) {}; + multi = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multi"; + ename = "multi"; version = "20131013.844"; src = fetchFromGitHub { owner = "kurisuwhyte"; repo = "emacs-multi"; - rev = "0987ab71692717ed457cb3984de184db9185806d"; - sha256 = "0f5hc6mgq0hg1wwnvqd4fp7ck58lcavvgqjggz9zlhrjgkmynjxx"; + rev = "884203b11fdac8374ec644cca975469aab263404"; + sha256 = "11zabs7qpdhri6n90ck7pgwcbz46d813nyl73h5m1i8jvz1wzx7v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9fea5cf529bcdf412af2926e55b8d77edc07eca/recipes/multi"; sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig"; - name = "multi"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -48269,9 +62878,15 @@ license = lib.licenses.free; }; }) {}; - multi-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + multi-compile = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multi-compile"; + ename = "multi-compile"; version = "20160306.1423"; src = fetchFromGitHub { owner = "ReanGD"; @@ -48279,10 +62894,10 @@ rev = "bd0331854774e7a269ce8a7dd49580cd397c0ec2"; sha256 = "1aswpv1m02n26620hgkcfd38f06bzmmijlr9rs5krv6snq5gdb8g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b312434c6c8e23ded2b74bf8f144ad0b3170adae/recipes/multi-compile"; sha256 = "16fv0hpwcjw1771zlbgznph0fix9fbm6yqj2rcz1f9l26iih6apz"; - name = "multi-compile"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -48290,9 +62905,18 @@ license = lib.licenses.free; }; }) {}; - multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: - melpaBuild { + multi-line = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , shut-up }: + melpaBuild { pname = "multi-line"; + ename = "multi-line"; version = "20170821.1926"; src = fetchFromGitHub { owner = "IvanMalison"; @@ -48300,10 +62924,10 @@ rev = "d3ce76b6aec62f96ef2c0409d8262fd39e67dccc"; sha256 = "0kysz7l18z3fkzygpdnqf2ancixrwyzh6n49jgk0c50lhhqj324x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line"; sha256 = "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp"; - name = "multi-line"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs s shut-up ]; meta = { @@ -48311,19 +62935,24 @@ license = lib.licenses.free; }; }) {}; - multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + multi-project = callPackage ({ emacs + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multi-project"; + ename = "multi-project"; version = "20171217.1211"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; rev = "a6e7c1542c0b"; sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x"; - name = "multi-project"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -48331,9 +62960,15 @@ license = lib.licenses.free; }; }) {}; - multi-run = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }: - melpaBuild { + multi-run = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , window-layout }: + melpaBuild { pname = "multi-run"; + ename = "multi-run"; version = "20180122.709"; src = fetchFromGitHub { owner = "sagarjha"; @@ -48341,10 +62976,10 @@ rev = "87d9eed414999fd94685148d39e5308c099e65ca"; sha256 = "0m4wk6sf01b7bq5agmyfcm9kpmwmd90wbvh7fkhs61mrs86s2zw8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run"; sha256 = "1iv4a49czdjl0slp8590f1ya0vm8g2ycnkwrdpqi3b55haaqp91h"; - name = "multi-run"; + name = "recipe"; }; packageRequires = [ emacs window-layout ]; meta = { @@ -48352,9 +62987,13 @@ license = lib.licenses.free; }; }) {}; - multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + multi-term = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multi-term"; + ename = "multi-term"; version = "20160619.233"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -48362,10 +63001,10 @@ rev = "f954e4e18b0a035151d34852387e724d87a3316f"; sha256 = "00cz3q654vpmijbqxp8c6nkxqj9zx1hjr3552l0adk3fbg6qpmcq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/multi-term"; sha256 = "16idk4nd7qpyrvyspbrdl8gdfaclng6ny0xigk6fqdv352djalal"; - name = "multi-term"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48373,9 +63012,13 @@ license = lib.licenses.free; }; }) {}; - multi-web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + multi-web-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multi-web-mode"; + ename = "multi-web-mode"; version = "20130823.2054"; src = fetchFromGitHub { owner = "fgallina"; @@ -48383,10 +63026,10 @@ rev = "ad1c8d1c870334052d244c7ae3636cb7b9357b7c"; sha256 = "0mc4kkgwnwfk27wwc21nw5ly7qcsl7y5bd8wf2y8r6pxhvwran4n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/multi-web-mode"; sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5"; - name = "multi-web-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48394,9 +63037,13 @@ license = lib.licenses.free; }; }) {}; - multicolumn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + multicolumn = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multicolumn"; + ename = "multicolumn"; version = "20150202.1451"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -48404,10 +63051,10 @@ rev = "c7a3afecd470859b2e60aa7c554d6e4d436df7fa"; sha256 = "1ispa0wxpkydm0cyj4scyyacfrbilrip5v8bsrcqfc6qs597z8rf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f37a999b0583a0ebc842c2f9fad8d08cb6c9dabf/recipes/multicolumn"; sha256 = "1ylnc3s4ixvnqn7g2p6nzz8x29ggqc703waci430f1rp1lsd3q09"; - name = "multicolumn"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48415,9 +63062,13 @@ license = lib.licenses.free; }; }) {}; - multifiles = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + multifiles = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multifiles"; + ename = "multifiles"; version = "20130615.1433"; src = fetchFromGitHub { owner = "magnars"; @@ -48425,10 +63076,10 @@ rev = "dddfe64b8e1c1cd1f9ccc1f03405477fc0d53897"; sha256 = "065l04ylplng1vgykkbn2vnkcs3sn1k2cikx1ha2q8wmgx6bkvai"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/multifiles"; sha256 = "0m0pi2qjis9p6z9cd8hlxm1r88ynwmd2ks8wg65sffffwsdbg4kz"; - name = "multifiles"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48436,20 +63087,25 @@ license = lib.licenses.free; }; }) {}; - multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + multiple-cursors = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multiple-cursors"; - version = "20180320.747"; + ename = "multiple-cursors"; + version = "20180615.518"; src = fetchFromGitHub { owner = "magnars"; repo = "multiple-cursors.el"; - rev = "0e49fecc18fc57e45398be886c91850b12abf112"; - sha256 = "007qpgd6z20wa581r2zycfjzgw5dq0fawrffk4h3spf1pmjvn8m3"; + rev = "9c49874fa444a4e7255ec05f62c01daed31c7b09"; + sha256 = "176jyz5sfxn9sp94ymd8ksimmribhdrw2fr7wpwyf4wi17ksvxq4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors"; sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x"; - name = "multiple-cursors"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -48457,9 +63113,15 @@ license = lib.licenses.free; }; }) {}; - multitran = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + multitran = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multitran"; + ename = "multitran"; version = "20180320.956"; src = fetchFromGitHub { owner = "zevlg"; @@ -48467,10 +63129,10 @@ rev = "d826eff6ada28799a9ff6c8a4c2884b2ef1e36fb"; sha256 = "0rk8fidq8fp9k4m21wvkld3w8g13nbfpxnj10g35c16n5wa0ydkb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d665759fa6491b77103920a75c18a561f6800c1c/recipes/multitran"; sha256 = "0nxrzzlinl5310zfrb4z5j0553cmg11m9y2gaf990j61afaw8f32"; - name = "multitran"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -48478,9 +63140,16 @@ license = lib.licenses.free; }; }) {}; - mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: - melpaBuild { + mustache = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , s }: + melpaBuild { pname = "mustache"; + ename = "mustache"; version = "20170923.533"; src = fetchFromGitHub { owner = "Wilfred"; @@ -48488,10 +63157,10 @@ rev = "5e39654b933a18131146a0f3b3e3dc55c5058124"; sha256 = "0ilsdrvqy9zn0yb1c8zh1zidag32rfb9xhm43qpfcg6n5w6c7r82"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1bcf9599ca6d2c29333071a80f96808d4ab52e2/recipes/mustache"; sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g"; - name = "mustache"; + name = "recipe"; }; packageRequires = [ dash ht s ]; meta = { @@ -48499,9 +63168,13 @@ license = lib.licenses.free; }; }) {}; - mustache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mustache-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mustache-mode"; + ename = "mustache-mode"; version = "20141024.732"; src = fetchFromGitHub { owner = "mustache"; @@ -48509,10 +63182,10 @@ rev = "bf9897eb287ca47ced65d7d4e07ea61ea0aec39f"; sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mustache-mode"; sha256 = "1xmqh663r5i42a586xn0wzw6h1jkvhbnw5iwvjv96w452slhkr36"; - name = "mustache-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48520,9 +63193,13 @@ license = lib.licenses.free; }; }) {}; - mustang-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mustang-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mustang-theme"; + ename = "mustang-theme"; version = "20170719.246"; src = fetchFromGitHub { owner = "mswift42"; @@ -48530,10 +63207,10 @@ rev = "dda6d04803f1c9b196b620ef564e7768fee15de2"; sha256 = "0pg3iay0iinf361v4ay8kizdxs5rm23ir556cwwgz3m3gbs0mgsh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed3691edd1cba6abc0c30d2aab732e2ba51bf00/recipes/mustang-theme"; sha256 = "0771l3x6109ki914nwpfz3fj7pbvpcg9vf485mrccq2wlxymr5dr"; - name = "mustang-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48541,9 +63218,14 @@ license = lib.licenses.free; }; }) {}; - mustard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mustard-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mustard-theme"; + ename = "mustard-theme"; version = "20170808.619"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -48551,10 +63233,10 @@ rev = "3b15d992c79590d7ea2503004e2a863b57e274b5"; sha256 = "01ak4ayk46jqawlbb9cqliiqhnn68cq27kryamibdpds8sq0ch83"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mustard-theme"; sha256 = "0izxhivhmv49dja4wy9n0ipd41xdzdza2ql7pfa7ny35ji5hskik"; - name = "mustard-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -48562,20 +63244,26 @@ license = lib.licenses.free; }; }) {}; - mutant = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mutant = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mutant"; + ename = "mutant"; version = "20160124.553"; src = fetchFromGitHub { owner = "p-lambert"; repo = "mutant.el"; - rev = "de9cdefe48c880128a8f62c6699d7416e9c8ced1"; - sha256 = "0w9blrm3596hmip8jg2hlz9sl31ci89b90jglmg4ipldgrgj3ly6"; + rev = "aff50603a70a110f4ecd7142963ef719e8c11c06"; + sha256 = "1faqbkff0v6pigsnnq2dxnzdra8q62cvlxigscwalwxd27bbz548"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc72d1f18eba7501a040d450a85d8dee4e3070f/recipes/mutant"; sha256 = "0m5l5r37zb0ig96757ldyl9hbb01lknzqf08ap6dsmdwr1zayvp1"; - name = "mutant"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -48583,9 +63271,13 @@ license = lib.licenses.free; }; }) {}; - mvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mvn = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mvn"; + ename = "mvn"; version = "20160211.743"; src = fetchFromGitHub { owner = "apg"; @@ -48593,10 +63285,10 @@ rev = "8a65b4eb88c9801aa3bff1921b600c72dfb8791a"; sha256 = "1jg3xrk44lspxli0zr02jcsl8phj0ns7ly3dkd7rx2wgsk69ari3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/mvn"; sha256 = "0bpg9zpyfdyn9xvrbmq4gb10hd701mc49np8arlmnilphb3fdgzs"; - name = "mvn"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48604,9 +63296,39 @@ license = lib.licenses.free; }; }) {}; - mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mw-thesaurus = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mw-thesaurus"; + ename = "mw-thesaurus"; + version = "20180628.2225"; + src = fetchFromGitHub { + owner = "agzam"; + repo = "mw-thesaurus.el"; + rev = "b3f8c3aae2b68a4e6cc054c6c99d3b3135e781d1"; + sha256 = "01ljvhx2g4i5vgzwibdgp5jl37s01m0j4sfaw7bbsm8nag0h4aw5"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/53e4a552b8a7527433b11c377e1257fabceb8049/recipes/mw-thesaurus"; + sha256 = "10v3a09sz31ndj0ldpz0c3s45s62gyvdw0iq0c0dkg4da2rvicww"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mw-thesaurus"; + license = lib.licenses.free; + }; + }) {}; + mwim = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mwim"; + ename = "mwim"; version = "20180227.852"; src = fetchFromGitHub { owner = "alezost"; @@ -48614,10 +63336,10 @@ rev = "462207227b98a6a4356d51419f5ad5ba9356e5cf"; sha256 = "06lw6064i82daasgm87gm58d142pypqc1q3cnx1cm35hyj4skd32"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim"; sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k"; - name = "mwim"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48625,9 +63347,39 @@ license = lib.licenses.free; }; }) {}; - myanmar-input-methods = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mxf-view = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mxf-view"; + ename = "mxf-view"; + version = "20180501.40"; + src = fetchFromGitHub { + owner = "t-suwa"; + repo = "mxf-view"; + rev = "c4825f35fad81c4624a2fcaea95cc605addf5cbc"; + sha256 = "0ci1kdc7qs04yny6sxhbncb3d4gzcsdhk2w51phpb8m2rilm0xgl"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08911f0409c238d009c22051ede04a8d4cdcafa9/recipes/mxf-view"; + sha256 = "08xyfi74pja2cyfmhigq83yxwfhf9k1797wfz7hrxx9zw6kqa840"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mxf-view"; + license = lib.licenses.free; + }; + }) {}; + myanmar-input-methods = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "myanmar-input-methods"; + ename = "myanmar-input-methods"; version = "20160106.737"; src = fetchFromGitHub { owner = "yelinkyaw"; @@ -48635,10 +63387,10 @@ rev = "9d4e0d6358c61bde7a2274e430ef71683faea32e"; sha256 = "0cf0c9g9k2lk1ifi2dlw7c601sh1ycxf3fgl2hy5wliyd6l9rf86"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76093af2bba82159784994ec9e17a69cd22bf868/recipes/myanmar-input-methods"; sha256 = "1yg8zy2z18pbyr507ms2b162c0819rna1ilwyp6hb3iv2zjw45sd"; - name = "myanmar-input-methods"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48646,20 +63398,26 @@ license = lib.licenses.free; }; }) {}; - mykie = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mykie = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mykie"; + ename = "mykie"; version = "20150808.1505"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "mykie-el"; - rev = "7676f0e883af1d1054e404e97691f3c13aba196f"; - sha256 = "0a9a6hmv8vjmp6h9mnzin9vc0sncg79v5z72pasvbrplfxijzan0"; + rev = "91f222b4f2b2b4285b0bc306905eb960826a67ed"; + sha256 = "0x8pvcai8gvxwp2r2x4szh2xzk1mxjsh3698pc4l1cm7d8yrvwk0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e10504a19e052c080be2ccc9b1b8fd2e73a852e0/recipes/mykie"; sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj"; - name = "mykie"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -48667,9 +63425,14 @@ license = lib.licenses.free; }; }) {}; - mynt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, virtualenvwrapper }: - melpaBuild { + mynt-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , virtualenvwrapper }: + melpaBuild { pname = "mynt-mode"; + ename = "mynt-mode"; version = "20150512.1349"; src = fetchFromGitHub { owner = "crshd"; @@ -48677,10 +63440,10 @@ rev = "23d4489167bfa899634548cb41ed32fdeb3600c9"; sha256 = "18ml0qz3iipm9w36zvwz77cbbrg885jgvzk6z4a33xcfp524xhma"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22eaeb5041155d56483d2ac6b32098456411442b/recipes/mynt-mode"; sha256 = "17s0wdwgh2dcpww6h3qszc9dcs7ki00xkyisvsfn4xqajrmmp75b"; - name = "mynt-mode"; + name = "recipe"; }; packageRequires = [ virtualenvwrapper ]; meta = { @@ -48688,9 +63451,15 @@ license = lib.licenses.free; }; }) {}; - mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + mysql-to-org = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "mysql-to-org"; + ename = "mysql-to-org"; version = "20180123.714"; src = fetchFromGitHub { owner = "mallt"; @@ -48698,10 +63467,10 @@ rev = "2526205ad484ad3fa38d41e7d537ace38c27645c"; sha256 = "1yinix08mzr7v2jm3yx1j3h15cw7i202wi100nmnmvqrylpd9zr2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mysql-to-org"; sha256 = "0jjdv6ywdn1618l36bw3xa3mdgg3rc8r0rdv9xdqx8mmg648a7gj"; - name = "mysql-to-org"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -48709,9 +63478,13 @@ license = lib.licenses.free; }; }) {}; - mysql2sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mysql2sqlite = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mysql2sqlite"; + ename = "mysql2sqlite"; version = "20170725.1516"; src = fetchFromGitHub { owner = "echosa"; @@ -48719,10 +63492,10 @@ rev = "8e6e74451c942e2e92f90dc13222b95a7dbb285e"; sha256 = "18jriaj391n4wr0qiva68jf482yx9v9l4xagbzl9vw125lszkngb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9841d3cfd1ee954eb0ab9b2ca3a3f605eb0fd22a/recipes/mysql2sqlite"; sha256 = "1jblrbw4rq2jwpb8d1dyna0fiv52b9va3sj881cb17rqx200y3nd"; - name = "mysql2sqlite"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48730,20 +63503,26 @@ license = lib.licenses.free; }; }) {}; - myterminal-controls = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + myterminal-controls = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "myterminal-controls"; + ename = "myterminal-controls"; version = "20170425.1936"; src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; - rev = "aae4f50f9f22d374eaaac2ce95e522f13dcc8fc0"; - sha256 = "08xgzrpp5l5d43j1b8ai3d41jzk9i70r2pqdcj53h79ml56bicgp"; + rev = "59ff3a02e34969a2ac608906937cb65cb514f9f1"; + sha256 = "11b0m09n1qqhjbdmcilb1g1408k17700qn37m3wavjrcjvdhnd5n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2"; - name = "myterminal-controls"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -48751,9 +63530,15 @@ license = lib.licenses.free; }; }) {}; - n4js = callPackage ({ cypher-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + n4js = callPackage ({ cypher-mode + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "n4js"; + ename = "n4js"; version = "20150713.1931"; src = fetchFromGitHub { owner = "tmtxt"; @@ -48761,10 +63546,10 @@ rev = "3991ed8975151d5e8d568e952362df810f7ffab7"; sha256 = "1pd6c0jc1zxx3i3nk4qdx7gdf1qn8sc9jgqd72pkkpzvdwv998cp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82157dfd975635c49ef75eae83e2bdf5fe4ae5c2/recipes/n4js"; sha256 = "0x7smxs91ffriyxx2df61fh1abpl39gqy4m62k77h7xb6fg7af6m"; - name = "n4js"; + name = "recipe"; }; packageRequires = [ cypher-mode emacs ]; meta = { @@ -48772,9 +63557,16 @@ license = lib.licenses.free; }; }) {}; - name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + name-this-color = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "name-this-color"; + ename = "name-this-color"; version = "20151014.1330"; src = fetchFromGitHub { owner = "knl"; @@ -48782,10 +63574,10 @@ rev = "e37cd1291d5d68d4c8d6386eab9cb9d94fd3bcfa"; sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/name-this-color"; sha256 = "15x3dp135p45gv4qn4ll3pd6zqi4glcpv6fzvjxnx0dcval9z4d8"; - name = "name-this-color"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -48793,9 +63585,13 @@ license = lib.licenses.free; }; }) {}; - nameframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nameframe = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nameframe"; + ename = "nameframe"; version = "20171106.1656"; src = fetchFromGitHub { owner = "john2x"; @@ -48803,10 +63599,10 @@ rev = "aafb8c5c5fbe0510e2f5d5b6b6b5dd0b73abe5d8"; sha256 = "1ivklkz3j722wg038bh3hmycp9j64zjrig49vl42mkj6d3ggwilg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd314150b3f8ce529a2ae39a71e03bebedfdc6b9/recipes/nameframe"; sha256 = "0iq8cfii39ha8sxn9w7kyfvys8kwyax8g4l0pkl05q0a0s95padp"; - name = "nameframe"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48814,20 +63610,26 @@ license = lib.licenses.free; }; }) {}; - nameframe-perspective = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, perspective }: - melpaBuild { + nameframe-perspective = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nameframe + , perspective }: + melpaBuild { pname = "nameframe-perspective"; + ename = "nameframe-perspective"; version = "20170405.1819"; src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "aafb8c5c5fbe0510e2f5d5b6b6b5dd0b73abe5d8"; - sha256 = "1ivklkz3j722wg038bh3hmycp9j64zjrig49vl42mkj6d3ggwilg"; + rev = "d14186e99fa800d293e8e3072ba26f383c6624c6"; + sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2543af5579d37a3eb52e6fea41da315f5590331e/recipes/nameframe-perspective"; sha256 = "0wgr90m2pazc514slgdl1lin4mr3xxizasc82k7qinvdvdja515x"; - name = "nameframe-perspective"; + name = "recipe"; }; packageRequires = [ nameframe perspective ]; meta = { @@ -48835,20 +63637,26 @@ license = lib.licenses.free; }; }) {}; - nameframe-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, projectile }: - melpaBuild { + nameframe-projectile = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nameframe + , projectile }: + melpaBuild { pname = "nameframe-projectile"; + ename = "nameframe-projectile"; version = "20160927.2103"; src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "aafb8c5c5fbe0510e2f5d5b6b6b5dd0b73abe5d8"; - sha256 = "1ivklkz3j722wg038bh3hmycp9j64zjrig49vl42mkj6d3ggwilg"; + rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; + sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc17af8ff1694120d12a0cdbfccec78834810acd/recipes/nameframe-projectile"; sha256 = "11z64wy8mnnrjmgfs2sjbv3mh136aki8r5f89myx861nfx18hc3k"; - name = "nameframe-projectile"; + name = "recipe"; }; packageRequires = [ nameframe projectile ]; meta = { @@ -48856,9 +63664,14 @@ license = lib.licenses.free; }; }) {}; - nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nameless = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nameless"; + ename = "nameless"; version = "20180215.1421"; src = fetchFromGitHub { owner = "Malabarba"; @@ -48866,10 +63679,10 @@ rev = "79d7ba8e9b8f3093e93172bdb4c5a4d31b0fa3e0"; sha256 = "11xghz03csj5w3qfbjyr48liaxr08gl6gy73hmmrq2bl57six5n0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless"; sha256 = "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq"; - name = "nameless"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -48877,9 +63690,15 @@ license = lib.licenses.free; }; }) {}; - names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + names = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "names"; + ename = "names"; version = "20180321.455"; src = fetchFromGitHub { owner = "Malabarba"; @@ -48887,10 +63706,10 @@ rev = "d8baba5360e5253938a25d3e005455b6d2d86971"; sha256 = "11wyha2q8y7bzqq3jrzix8n97ywvsibvddrahqcps1a1yqk4hzfz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names"; sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg"; - name = "names"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -48898,9 +63717,13 @@ license = lib.licenses.free; }; }) {}; - namespaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + namespaces = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "namespaces"; + ename = "namespaces"; version = "20130326.1550"; src = fetchFromGitHub { owner = "chrisbarrett"; @@ -48908,10 +63731,10 @@ rev = "3d02525d9b9a5ae6e7be3adefd880121436e6270"; sha256 = "157hhb253m6a9l5wy6x8w5ar3x0qz1326l7a0npxif6pma0dd140"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de404e9ad3d1e27af24e868e84218d872d5fc795/recipes/namespaces"; sha256 = "02pb7762khxpah4q6xg8r7dmlv1kwyzinffi7pcaps6ycj29q2fr"; - name = "namespaces"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48919,20 +63742,25 @@ license = lib.licenses.free; }; }) {}; - nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nand2tetris = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nand2tetris"; + ename = "nand2tetris"; version = "20171201.1013"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "33acee34d24b1c6a87db833b7d23449cf858f64f"; - sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw"; + rev = "fe37ee41367ceff6f7d7a472a5f80cf1285e1e01"; + sha256 = "0g1gwayas7claa9cn3mv8dnlz46n78014qxb2ix25428dnsrridy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris"; sha256 = "1zg9xx7mj8334m2v2zqqfkr5vkj4dzqbj8y13qk6xhzb7qkppyqd"; - name = "nand2tetris"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -48940,20 +63768,25 @@ license = lib.licenses.free; }; }) {}; - nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }: - melpaBuild { + nand2tetris-assembler = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nand2tetris }: + melpaBuild { pname = "nand2tetris-assembler"; + ename = "nand2tetris-assembler"; version = "20171201.1013"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "33acee34d24b1c6a87db833b7d23449cf858f64f"; - sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw"; + rev = "fe37ee41367ceff6f7d7a472a5f80cf1285e1e01"; + sha256 = "0g1gwayas7claa9cn3mv8dnlz46n78014qxb2ix25428dnsrridy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler"; sha256 = "1761kgrflipxba8894cnx90ks7f3ba4nj6ci515zzxcx9s45mfyy"; - name = "nand2tetris-assembler"; + name = "recipe"; }; packageRequires = [ nand2tetris ]; meta = { @@ -48961,19 +63794,23 @@ license = lib.licenses.free; }; }) {}; - nanowrimo = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + nanowrimo = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nanowrimo"; + ename = "nanowrimo"; version = "20151104.1828"; src = fetchhg { url = "https://bitbucket.com/gvol/nanowrimo.el"; rev = "25e2ca20ed34"; sha256 = "1nzkamy53kl1g4y1jm7j5zgpkdsyg5ykp8zp1f0bg5mhy8mmf75w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/nanowrimo"; sha256 = "1nhyj38qyn1x6a5rbrwhcxwfwzyqqjm3dvksdnmam6vfwn3s2r31"; - name = "nanowrimo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -48981,9 +63818,13 @@ license = lib.licenses.free; }; }) {}; - naquadah-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + naquadah-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "naquadah-theme"; + ename = "naquadah-theme"; version = "20180212.440"; src = fetchFromGitHub { owner = "jd"; @@ -48991,10 +63832,10 @@ rev = "999056526db5095ce600c83672fc80cb744bd93e"; sha256 = "1f10598m4vcpr4md6hpdvv46zi6159rajxyzrrlkiz0g94v8y6rl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/naquadah-theme"; sha256 = "1aml1f2lgn530i86218nrc1pk3zw5n3qd2gw4gylwi7g75i0cqn1"; - name = "naquadah-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49002,9 +63843,14 @@ license = lib.licenses.free; }; }) {}; - narrow-reindent = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + narrow-reindent = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "narrow-reindent"; + ename = "narrow-reindent"; version = "20150722.1206"; src = fetchFromGitHub { owner = "emallson"; @@ -49012,10 +63858,10 @@ rev = "87466aac4dbeb79597124dd077bf5c704872fd3d"; sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73c7f01a009dc7ac1b9da8ce41859695a97b7878/recipes/narrow-reindent"; sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0"; - name = "narrow-reindent"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -49023,9 +63869,15 @@ license = lib.licenses.free; }; }) {}; - narrowed-page-navigation = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + narrowed-page-navigation = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "narrowed-page-navigation"; + ename = "narrowed-page-navigation"; version = "20150108.2119"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -49033,10 +63885,10 @@ rev = "b215adbac4873f56fbab65772062f0f5be8058a1"; sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37e993fec280428f094b6c8ec418fe5ba8c6d49/recipes/narrowed-page-navigation"; sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7"; - name = "narrowed-page-navigation"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -49044,20 +63896,24 @@ license = lib.licenses.free; }; }) {}; - nash-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nash-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nash-mode"; + ename = "nash-mode"; version = "20160830.512"; src = fetchFromGitHub { owner = "tiago4orion"; repo = "nash-mode.el"; - rev = "2cd96535eb7d669a94306183e95ee37333872c1a"; - sha256 = "0wdkl56pgm6qlgqjs4kqjglnxzjsfjd0y4fiffhxc893gm0psrpg"; + rev = "bb7ae728a16812a0ef506483b877f6221c92ca9c"; + sha256 = "1n4dxbd388ibghismc5d1nkvxwxdi4r415prsaa3qad8l9s4ivwh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8bd080c81b163a6ddcfffc710316b9711935b4a/recipes/nash-mode"; sha256 = "1d6nfxn7fc2qv78bf5277sdwfqflag2gihgic8vxrbjlpnizxn1p"; - name = "nash-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49065,20 +63921,25 @@ license = lib.licenses.free; }; }) {}; - nasm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nasm-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nasm-mode"; - version = "20161216.736"; + ename = "nasm-mode"; + version = "20180711.1209"; src = fetchFromGitHub { owner = "skeeto"; repo = "nasm-mode"; - rev = "d990ed94d902b74a5c834fb567e03307607cee45"; - sha256 = "1dyc50a1zskx9fqxl2iy2x74f3bkb2ccz908v0aj13rqfqqnns9j"; + rev = "1d4871ef184fc5da792bccbae1ea189f876706fc"; + sha256 = "1pyawg7axx6rzcal3v0cya2jpdnsndd4af8vy60kjpwxa1sq7h2m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a832b3bd7c2f2d3cee8bcfb5421d22acf5523e/recipes/nasm-mode"; sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17"; - name = "nasm-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -49086,9 +63947,13 @@ license = lib.licenses.free; }; }) {}; - nav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nav = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nav"; + ename = "nav"; version = "20120507.7"; src = fetchFromGitHub { owner = "ijt"; @@ -49096,10 +63961,10 @@ rev = "c5eb234c063f435dbdcd1f8bdc46cfc68c973ebe"; sha256 = "0kfqpji6z3ra8sc951vmm1bzyhkws7vb5q6djvl45wlf1wrgkc4p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/nav"; sha256 = "0ly1fk4ak1p8gkz3qmmxyslcjgicnfm8bpqqgndvwcznp8pvpjml"; - name = "nav"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49107,20 +63972,24 @@ license = lib.licenses.free; }; }) {}; - nav-flash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nav-flash = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nav-flash"; + ename = "nav-flash"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "nav-flash"; - rev = "53f5bc59e3f32c1192d15637d3979732dacb2c35"; - sha256 = "07wjicbvzg7cz983hv0p2qw1qlln07djigkmbqfpwvg3fk50fdyg"; + rev = "26b8c0d23e2d460f3ce06cb5df8a5e219c20da8b"; + sha256 = "0xnvl851h1g1d4h0qa218a4a23bpadbiwx6lgx94gvwcylnbl722"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/nav-flash"; sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3"; - name = "nav-flash"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49128,20 +63997,26 @@ license = lib.licenses.free; }; }) {}; - navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, outorg, outshine }: - melpaBuild { + navi-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , outorg + , outshine }: + melpaBuild { pname = "navi-mode"; - version = "20170414.1228"; + ename = "navi-mode"; + version = "20180515.1948"; src = fetchFromGitHub { owner = "alphapapa"; repo = "navi"; - rev = "c1d38e8237f4e14af020a0b7d4f118ea198ab674"; - sha256 = "0jj5spk14hgb7zb1cd2n8whcw4k1kd5zb6llwj96v178yaws7l8k"; + rev = "7c3fd1a9b520300abfdb1b7c3de21403e81a95bf"; + sha256 = "1k5g3ij6rq20jllb7w21sp068lvcc2cjrxm2yq76bjaajbfsa501"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode"; sha256 = "0pc52iq8lng2g0vpnrhdfxmibc1dx9ksmrjg0303as1yv41fnc69"; - name = "navi-mode"; + name = "recipe"; }; packageRequires = [ outorg outshine ]; meta = { @@ -49149,20 +64024,24 @@ license = lib.licenses.free; }; }) {}; - navi2ch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + navi2ch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "navi2ch"; + ename = "navi2ch"; version = "20150329.1916"; src = fetchFromGitHub { owner = "naota"; repo = "navi2ch"; - rev = "f39d93c32acd5b9c3a7fb1a9fe14c5e1c4b5288e"; - sha256 = "0i0icyaa2zzzl0cr9n1zv44pg2lric8gic58dkjxjv8yyk6y01cn"; + rev = "faebfd15184de9df6903eae436dafb52c38ee86e"; + sha256 = "15l2zmm8bp4ip8m1hfxkvswfwa29pg72kisfya2n5v900r184a4m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36bea1eca58de15d6106cbd293d941d12ee3d21c/recipes/navi2ch"; sha256 = "13xwvyy27dz1abjkkazm3s1p6cw32l2klr1bnln02w0azkbdy7x3"; - name = "navi2ch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49170,9 +64049,16 @@ license = lib.licenses.free; }; }) {}; - navorski = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, multi-term, s }: - melpaBuild { + navorski = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multi-term + , s }: + melpaBuild { pname = "navorski"; + ename = "navorski"; version = "20141203.1024"; src = fetchFromGitHub { owner = "roman"; @@ -49180,10 +64066,10 @@ rev = "698c1c62da70164aebe9a7a5d034778fbc30ea5b"; sha256 = "0g7rmvfm0ldv0d2x7f8k761mgmi47siyspfi1ns40ijhkpc15x8l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9246cef94029d2da2211345c076ed55deb91e8fa/recipes/navorski"; sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7"; - name = "navorski"; + name = "recipe"; }; packageRequires = [ dash multi-term s ]; meta = { @@ -49191,9 +64077,14 @@ license = lib.licenses.free; }; }) {}; - ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ncl-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ncl-mode"; + ename = "ncl-mode"; version = "20180128.2303"; src = fetchFromGitHub { owner = "yyr"; @@ -49201,10 +64092,10 @@ rev = "602292712a9e6b7e7c25155978999e77d06b7338"; sha256 = "0sv44hn2ylick7ywpcbij8h2vxdj06zridjdmcfgpv5d090dbl9n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode"; sha256 = "1niy0w24q6q6j7s0l9fcaqai7zz2gg1qlk2s9sxb8j79jc41y47k"; - name = "ncl-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -49212,9 +64103,13 @@ license = lib.licenses.free; }; }) {}; - nclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nclip = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nclip"; + ename = "nclip"; version = "20130617.1315"; src = fetchFromGitHub { owner = "maio"; @@ -49222,10 +64117,10 @@ rev = "af88e38b1f04be02bf2e57affc662dbd0f828e67"; sha256 = "178gjv7kq97p9i4naxql7xabvmchw5x8idkpyjqqky3b24v5wkis"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f03f254afbe561e0a6dd6c287dcc137da05376cd/recipes/nclip"; sha256 = "016jp1rqrf1baxlxbi3476m88a0l3r405dh6pmly519wm2k8pipw"; - name = "nclip"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49233,9 +64128,14 @@ license = lib.licenses.free; }; }) {}; - neato-graph-bar = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + neato-graph-bar = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "neato-graph-bar"; + ename = "neato-graph-bar"; version = "20171230.1753"; src = fetchFromGitLab { owner = "RobertCochran"; @@ -49243,10 +64143,10 @@ rev = "c59f15ed9a40aecc174aa22c4bbfa7978e182705"; sha256 = "0bdgsxdlwpkd3hjnw1jmj30slakzmj2pinj3pyr5qqba9apxnvri"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49c5bd4e1506a28ada9856e5f70e520890123d16/recipes/neato-graph-bar"; sha256 = "1p4jmla75ny443cv7djk3nvl3ikchllnsivxx9yds14ynk4jxhgb"; - name = "neato-graph-bar"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -49254,20 +64154,24 @@ license = lib.licenses.free; }; }) {}; - nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nemerle = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nemerle"; + ename = "nemerle"; version = "20161029.1323"; src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "59b28607968a9bee060b42eac55c69c37d1c0e69"; - sha256 = "1anbzlm7ccgd9ss6fqfq1gyvnpnjsxi9y9q3fk6c6cwd11dyq16g"; + rev = "8818c5af5598e16ea59189e1e3245f0a3d7c78f0"; + sha256 = "1ky63jyxdz1m6fcz3phi87mwc0ha6bn2fpg4lcdzp0w8cp8rc8ad"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle"; sha256 = "1rbalq3s2inwz9cf6bfmnxgqd9ylba3crflfjs6b4mnp33z4swny"; - name = "nemerle"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49275,20 +64179,24 @@ license = lib.licenses.free; }; }) {}; - neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + neon-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "neon-mode"; - version = "20170711.501"; + ename = "neon-mode"; + version = "20180406.456"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "9c23289c0c8ed17d1596cfb95a5ade57df7db5f7"; - sha256 = "0q5niz0di1r0wl0lsq8hcsz854xdwpzw798sl42qc1r5mdpz3ghz"; + rev = "99d15e46beaf1e7d71e39a00cce810df1f33229d"; + sha256 = "07vsi07m5q070fvkqhz32qa2y7dgnyi1kggairimbiwbn98bh642"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; sha256 = "0kgyc0rkxvvks5ykizfv82f2cx7ck17sk63plj7bld6khlcgv0y6"; - name = "neon-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49296,20 +64204,25 @@ license = lib.licenses.free; }; }) {}; - neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + neotree = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "neotree"; - version = "20170522.758"; + ename = "neotree"; + version = "20180616.903"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "bc98dfb44c106375efa4f26848f3790ee264da97"; - sha256 = "1m30ldbprz3f62szyi1alzjy337ryczljxy1z5lf6smb03ymns2s"; + rev = "4f8d80fd51c712df7b11ae8491be3527db46f612"; + sha256 = "04w784pln671nmji7hwyka1vaj20114gfxyh513glhn78by2y5s1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06"; - name = "neotree"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -49317,9 +64230,66 @@ license = lib.licenses.free; }; }) {}; - netherlands-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nerdtab = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "nerdtab"; + ename = "nerdtab"; + version = "20180527.408"; + src = fetchFromGitHub { + owner = "casouri"; + repo = "nerdtab"; + rev = "7af72c3d798ec3a44e6bc8cec18200198192ad9a"; + sha256 = "0n8av79pdq7as45pfd81pffrpg1wrd3ppdk7zd0i85rmyknnix7r"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/59bc273db1d34997ea5d51cc6adc33ec785bc7f3/recipes/nerdtab"; + sha256 = "0q7dyqxq058195pgb1pjy27gcrr96096xcvvrapkarym7jsa2wy3"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nerdtab"; + license = lib.licenses.free; + }; + }) {}; + netease-music = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names }: + melpaBuild { + pname = "netease-music"; + ename = "netease-music"; + version = "20180429.1822"; + src = fetchFromGitHub { + owner = "nicehiro"; + repo = "netease-music"; + rev = "aecf451fd69f9faa9f86232550ebf8ced5a48254"; + sha256 = "0cb5adrnprlhrpcw06wi84fiva3mwac92rxfi5pgcw9ga213qhy8"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca3d4a8f8d9080e26a8fe2c38c0001d5cfc3c88c/recipes/netease-music"; + sha256 = "1vb81f1l45v6rny91rcqvnhzqh5ybdr0r39yrcaih8zhvamk685z"; + name = "recipe"; + }; + packageRequires = [ emacs names ]; + meta = { + homepage = "https://melpa.org/#/netease-music"; + license = lib.licenses.free; + }; + }) {}; + netherlands-holidays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "netherlands-holidays"; + ename = "netherlands-holidays"; version = "20150202.817"; src = fetchFromGitHub { owner = "abo-abo"; @@ -49327,10 +64297,10 @@ rev = "26236178cdd650df9958bf5a086e184096559f00"; sha256 = "1kkflj2qnrn6kzh1l6bjl5n5507qilb22pqj3h0f2m6hfyn0sw5z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abdbce47cb5c623696b5d6fcb3bef2d995d90195/recipes/netherlands-holidays"; sha256 = "181linsbg5wrx1z7zbj3in2d3d4zd2v7drspkj0b6l0c5yfxwayf"; - name = "netherlands-holidays"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49338,9 +64308,16 @@ license = lib.licenses.free; }; }) {}; - netrunner = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }: - melpaBuild { + netrunner = callPackage ({ company + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "netrunner"; + ename = "netrunner"; version = "20160910.1632"; src = fetchFromGitHub { owner = "Kungsgeten"; @@ -49348,10 +64325,10 @@ rev = "c64672992175c8c1073c0f56c2e471839db71a0f"; sha256 = "1jj8qsq4xa93h3srskhw1l6igzf9jhwl8hfa73zvqr8dhqhp149k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a8b1d8c31383b6ec3788ad6c9adf0117190484c9/recipes/netrunner"; sha256 = "1lk5acbv1fw7q9jwpk0l5hqb9wnscg2kj3qn6b4pwn9ggf8axkpv"; - name = "netrunner"; + name = "recipe"; }; packageRequires = [ company helm popup ]; meta = { @@ -49359,20 +64336,25 @@ license = lib.licenses.free; }; }) {}; - network-watch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + network-watch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "network-watch"; + ename = "network-watch"; version = "20171123.346"; src = fetchFromGitHub { owner = "jamiguet"; repo = "network-watch"; - rev = "958dd0d419e4f9402648a86b754091ba346e01b8"; - sha256 = "1xqp7aghc8xd1733azl27mjf57qvm0036qbkqmaks2ip8s8c6arj"; + rev = "d80b38dbec79f813c3949a8df8fb5f58d48b60ee"; + sha256 = "1c8qbigdj61dqzkf03y6fzywykqgim6zpfmva8631q5ygnhsrnp2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e129679b3e2074af3e3de1b2ccce53a2fa5e9f65/recipes/network-watch"; sha256 = "0y3vjrh9vlfg44c01ylkszisliwfy5zb8c5z3qrmf3yj4q096f42"; - name = "network-watch"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -49380,20 +64362,24 @@ license = lib.licenses.free; }; }) {}; - never-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + never-comment = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "never-comment"; + ename = "never-comment"; version = "20140104.1407"; src = fetchFromGitHub { owner = "To1ne"; repo = "never-comment"; - rev = "74ded8f1e7f23240f5f6032d0451fb0a51733bc4"; - sha256 = "0p00mmid04pfsna4ify3cy0b9lx431q1r5h772hihsg4f1rs2ppy"; + rev = "1996d003cad6bccf1475f7845d79efacbc7cd673"; + sha256 = "16q90lbgdh9iz3njakgip20mhc8dmd0zjsvk02zsc5q5n9c7rs8i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef3f8e712c10d63fea009951d7916fe376267cbe/recipes/never-comment"; sha256 = "0sn8y57895bfpgiynnj4m9b3x3dbb9v5fwkcwmf9jr39dbf98v6s"; - name = "never-comment"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49401,9 +64387,13 @@ license = lib.licenses.free; }; }) {}; - newlisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + newlisp-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "newlisp-mode"; + ename = "newlisp-mode"; version = "20160226.745"; src = fetchFromGitHub { owner = "kosh04"; @@ -49411,10 +64401,10 @@ rev = "ac23be40c81a360988ab803d365f1510733f6db4"; sha256 = "1zzsfyqwj1k4zh30gl491ipavr9pp9djwjq3zz2q3xh7jys68w8r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5c79c56bddfeb498d28f2575184434fbb93465d/recipes/newlisp-mode"; sha256 = "0i2d2gyzzvpr5qm2cqzbn9my21lfb66315hg9fj86ac5pkc25zrd"; - name = "newlisp-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49422,9 +64412,13 @@ license = lib.licenses.free; }; }) {}; - nexus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nexus = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nexus"; + ename = "nexus"; version = "20140114.505"; src = fetchFromGitHub { owner = "juergenhoetzel"; @@ -49432,10 +64426,10 @@ rev = "c46f499951b90839aa8683779fe43d8f01672a60"; sha256 = "1xnx6v49i6abzbhq4fl4bp9d0pp9gby40splpcj211xsb8yiry27"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80d3665e9a31aa3098df456dbeb07043054e42f5/recipes/nexus"; sha256 = "1mdphgsqg6n4hryr53rk42z58vfv0g5wkar5ipanr4h4iclkf5vd"; - name = "nexus"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49443,20 +64437,25 @@ license = lib.licenses.free; }; }) {}; - ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }: - melpaBuild { + ng2-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , typescript-mode }: + melpaBuild { pname = "ng2-mode"; - version = "20180216.743"; + ename = "ng2-mode"; + version = "20180520.1731"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ng2-mode"; - rev = "d41ed14f276f1f08fb7eaacc863f471654e2c2fa"; - sha256 = "0rys2gnbw9d32i1gqqf46mbf36x2s9lz7v144yw901b2i8p6c5ja"; + rev = "177248bca3787fabab70f3026ccf390395171f0d"; + sha256 = "1s6nvjby3vxh0sfmxg4c43vj9fkr8358v8plqvczpnjk3jxk4xvm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; sha256 = "0sr4yh5nkgqb1qciq9mzzhr64350bi2wjm6z9d616nkjw72saz1r"; - name = "ng2-mode"; + name = "recipe"; }; packageRequires = [ typescript-mode ]; meta = { @@ -49464,9 +64463,13 @@ license = lib.licenses.free; }; }) {}; - nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nginx-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nginx-mode"; + ename = "nginx-mode"; version = "20170611.2137"; src = fetchFromGitHub { owner = "ajc"; @@ -49474,10 +64477,10 @@ rev = "a2bab83c2eb233d57d76b236e7c141c2ccc97005"; sha256 = "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode"; sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c"; - name = "nginx-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49485,20 +64488,24 @@ license = lib.licenses.free; }; }) {}; - niceify-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + niceify-info = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "niceify-info"; + ename = "niceify-info"; version = "20160416.544"; src = fetchFromGitHub { owner = "aaron-em"; repo = "niceify-info.el"; - rev = "38df5062bc3b99d1074cab3e788b5ed66732111c"; - sha256 = "0hgrf628ris94pmvmgibkq6zmwrqkv9q70c5a2gsbdpqmfikj8m1"; + rev = "66b45916f1994e16ee023d29fa7cf8fec48078f1"; + sha256 = "0dzcaa88l7yjc7fhyhkvbzs7bmhi6bb6rx41wsnnidlnpzbgdrk7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2a923da7363d904eb848eb335736974e05dba1/recipes/niceify-info"; sha256 = "1s9c8yxbab9zl5jx38alwa2hpp4zj5cb9a5gfm3x09jf3iw768bl"; - name = "niceify-info"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49506,9 +64513,16 @@ license = lib.licenses.free; }; }) {}; - niconama = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + niconama = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "niconama"; + ename = "niconama"; version = "20170910.801"; src = fetchFromGitHub { owner = "NOBUTOKA"; @@ -49516,10 +64530,10 @@ rev = "96e7553e50e6bf7b58aac50f52c9b0b8edb41c56"; sha256 = "1gihjzwl6309vgav5z7jzi8jb7is8vx8lr23kb6h373gwws4bi10"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad8e7189e9c4c5d86cef268f45be0dda2d702805/recipes/niconama"; sha256 = "1v4cvcxrl254jhfl1q5ld0gn4598fcvv0pfhilh2jy76w5acqx81"; - name = "niconama"; + name = "recipe"; }; packageRequires = [ cl-lib emacs request ]; meta = { @@ -49527,19 +64541,51 @@ license = lib.licenses.free; }; }) {}; - nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + night-owl-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "night-owl-theme"; + ename = "night-owl-theme"; + version = "20180630.1431"; + src = fetchFromGitHub { + owner = "aaronjensen"; + repo = "night-owl-emacs"; + rev = "deecfd6f47f0802ed760e0b5843fb3cc6f723fd1"; + sha256 = "1mr0dr5yba6nkaki914yiaxa7b1yqw1p0dm9a75mvkzwra6fcljh"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/77fe194a0e58bdb9789c85f3c50895eb886b4016/recipes/night-owl-theme"; + sha256 = "121jc59ry60h1ml1vxx4a6l4a6jcxk7fc4wz32fqv5pr03rzgs7h"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/night-owl-theme"; + license = lib.licenses.free; + }; + }) {}; + nikola = callPackage ({ async + , emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nikola"; + ename = "nikola"; version = "20170703.1321"; src = fetchgit { url = "https://git.daemons.it/drymer/nikola.el/"; rev = "964715ac30943c9d6976999cad208dc60d09def0"; sha256 = "0b0bpw9r2xi1avzq76pl58bbk1shb57d3bmzd9d53d07gj5c9399"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ef4f7c2f1c48edd7b4a6fdcda51908d216c631c/recipes/nikola"; sha256 = "1d0a80y910klayb9jf0ahn5lj9l6xdhwcp2in3ridmqislavrcnv"; - name = "nikola"; + name = "recipe"; }; packageRequires = [ async emacs ]; meta = { @@ -49547,20 +64593,29 @@ license = lib.licenses.free; }; }) {}; - nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck-nimsuggest, let-alist, lib, melpaBuild }: - melpaBuild { + nim-mode = callPackage ({ commenter + , emacs + , epc + , fetchFromGitHub + , fetchurl + , flycheck-nimsuggest + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "nim-mode"; - version = "20180212.1040"; + ename = "nim-mode"; + version = "20180516.1309"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "bff7065f6d2419ec517d247f0f3aaf935820064e"; - sha256 = "0iqsm843msw41jxhfi7dbsj6x4qanvd84xhg2j6wl6ncabdmwnjm"; + rev = "35f4b2cb2d4c142f6f7f0e3ffb06c87b81bb8c26"; + sha256 = "1c4gl09sm8hiwa308xifj4vnnhiv3hvqs7zk0cz245k8pba612ih"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6"; - name = "nim-mode"; + name = "recipe"; }; packageRequires = [ commenter emacs epc flycheck-nimsuggest let-alist ]; meta = { @@ -49568,20 +64623,24 @@ license = lib.licenses.free; }; }) {}; - nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nimbus-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nimbus-theme"; - version = "20180401.917"; + ename = "nimbus-theme"; + version = "20180606.1936"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "49f1bed0cedcc901414fbd983c3859e9c6432342"; - sha256 = "090r2ldxql3v286gkkjvd6mrp1a0hkypm86kpsy5zd77bxz0gn3v"; + rev = "d4adcf0e821648aef066f9b97808a3c691615749"; + sha256 = "0hvyvc5pvv0n4dv4y1h09vq84gzbf2xjavpiryfxb100hcjicjss"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; sha256 = "1hy4rc1v5wg7n6nazdq09gadirb0qvn887mmdavwjnnac45xyi18"; - name = "nimbus-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49589,20 +64648,25 @@ license = lib.licenses.free; }; }) {}; - ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ninja-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ninja-mode"; + ename = "ninja-mode"; version = "20141203.2159"; src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "e234a7bdb6c42f4539c0ab09b624f191287c2c10"; - sha256 = "01hsabhvp1yilzdss3mkvrskkvxw41xxch6lkwlcrr6h5f70szi2"; + rev = "d3238428c6ed77eb08dfc57854325634401481e2"; + sha256 = "05scnv74g9m70dfj1y71iw0dw38zbb77h2s7kciicr9pdrvdg8d4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik"; - name = "ninja-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -49610,9 +64674,15 @@ license = lib.licenses.free; }; }) {}; - nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nix-buffer = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nix-buffer"; + ename = "nix-buffer"; version = "20180212.718"; src = fetchFromGitHub { owner = "shlevy"; @@ -49620,10 +64690,10 @@ rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099"; sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd"; - name = "nix-buffer"; + name = "recipe"; }; packageRequires = [ emacs f ]; meta = { @@ -49631,20 +64701,25 @@ license = lib.licenses.free; }; }) {}; - nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nix-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nix-mode"; - version = "20180215.1331"; + ename = "nix-mode"; + version = "20180629.1501"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "0ac0271f6c8acdbfddfdbb1211a1972ae562ec17"; - sha256 = "157vy4xkvaqd76km47sh41wykbjmfrzvg40jxgppnalq9pjxfinp"; + rev = "57ac40d53b4f4fe0d61fcabb41f8f3992384048e"; + sha256 = "0l5m5p3rsrjf7ghik3z1bglf255cwliglgr3hiv6qpp121k4p0ga"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5"; - name = "nix-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -49652,9 +64727,15 @@ license = lib.licenses.free; }; }) {}; - nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + nix-sandbox = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "nix-sandbox"; + ename = "nix-sandbox"; version = "20171004.1006"; src = fetchFromGitHub { owner = "travisbhartwell"; @@ -49662,10 +64743,10 @@ rev = "7007363e773a419203a69798fb0e0731b2eb0f73"; sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66be755a6566e8c0cfb5aafa50de29b434023c7a/recipes/nix-sandbox"; sha256 = "13zr0jbc6if2wvyiplay2gkd5548imfm38x1qy1dw6m2vhbzwp0k"; - name = "nix-sandbox"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -49673,20 +64754,51 @@ license = lib.licenses.free; }; }) {}; - nixos-options = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nix-update = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "nix-update"; + ename = "nix-update"; + version = "20180424.1748"; + src = fetchFromGitHub { + owner = "jwiegley"; + repo = "nix-update-el"; + rev = "d92b2c190dbaeb16751be724fe381f8a796c424c"; + sha256 = "0lqhc7nnw96pz9alq75w6zmjb6carmaak1g2cf4csslqbihnbriz"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c59e828d4cad3d75344b34b9666349250e53b6ea/recipes/nix-update"; + sha256 = "0if83pvjvr0347301j553bsxrrxniyykq20457cdkzlvva52c0b3"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nix-update"; + license = lib.licenses.free; + }; + }) {}; + nixos-options = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nixos-options"; + ename = "nixos-options"; version = "20160209.1041"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "7007363e773a419203a69798fb0e0731b2eb0f73"; - sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb"; + rev = "045825c2e1cf0a4fb0a472e72c1dae8f55202cef"; + sha256 = "12zwaiyr1n37zwrmyr3m8kn2302abyagj5dzmbr1wvbf3ihkxmxd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options"; sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm"; - name = "nixos-options"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -49694,20 +64806,27 @@ license = lib.licenses.free; }; }) {}; - nlinum-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }: - melpaBuild { + nlinum-hl = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nlinum }: + melpaBuild { pname = "nlinum-hl"; + ename = "nlinum-hl"; version = "20170613.1748"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-nlinum-hl"; - rev = "d5ca1490e0cde0605e34a6a17de8cc236c9810da"; - sha256 = "0rj2ay2x7mqnj2vpnndfzr47sldx7i6zxj4nn81yamrdxgv19ajd"; + rev = "46e26d1e3d5bfe9a3f79a5cce21f3c442ac10da8"; + sha256 = "1yi3rg6j8r0c7a70dghj838vfslwdvjcy6w7735pfbdb073mpzfs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b13a886535a5c33fe389a6b616988b7377249625/recipes/nlinum-hl"; sha256 = "17lcp1ira7yhch9npg9sf3npwg06yh9zyhg0lnb22xg09lbndj0x"; - name = "nlinum-hl"; + name = "recipe"; }; packageRequires = [ cl-lib emacs nlinum ]; meta = { @@ -49715,9 +64834,15 @@ license = lib.licenses.free; }; }) {}; - nlinum-relative = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }: - melpaBuild { + nlinum-relative = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nlinum }: + melpaBuild { pname = "nlinum-relative"; + ename = "nlinum-relative"; version = "20160526.8"; src = fetchFromGitHub { owner = "CodeFalling"; @@ -49725,10 +64850,10 @@ rev = "5b9950c97ba79a6f0683e38b13da23f39e01031c"; sha256 = "0h00ghr5sipayfxz7ykzy7bg1p1vkbwxl5xch3x0h8j2cp1dqc3d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb418a464b112f9bb1bbd050e9602b60c0fcce1c/recipes/nlinum-relative"; sha256 = "15ifh5bfsarkifx6m7d5rhx6hqlnm231plkf623885kar7i85ia4"; - name = "nlinum-relative"; + name = "recipe"; }; packageRequires = [ emacs nlinum ]; meta = { @@ -49736,9 +64861,17 @@ license = lib.licenses.free; }; }) {}; - nm = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, notmuch, peg }: - melpaBuild { + nm = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , notmuch + , peg }: + melpaBuild { pname = "nm"; + ename = "nm"; version = "20151110.1110"; src = fetchFromGitHub { owner = "tjim"; @@ -49746,10 +64879,10 @@ rev = "5a3f29174b3a4b2b2e7a700a862f3b16a942687e"; sha256 = "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdad6565e83dd79db538d3b6a45e932864246da2/recipes/nm"; sha256 = "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw"; - name = "nm"; + name = "recipe"; }; packageRequires = [ company emacs notmuch peg ]; meta = { @@ -49757,20 +64890,24 @@ license = lib.licenses.free; }; }) {}; - nnir-est = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nnir-est = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nnir-est"; - version = "20170818.746"; + ename = "nnir-est"; + version = "20180710.1403"; src = fetchFromGitHub { owner = "kawabata"; repo = "nnir-est"; - rev = "dc1fee4757725b8171b755313d7bafbf1364f49a"; - sha256 = "054mzb1h7smvvpzkg59pb4fd5rnig9j937wwvdr9s9222akyvkma"; + rev = "6d0d5c8e33f4e4ccbc22350324c0990d2676fb5a"; + sha256 = "1xmv2mddhvcvnyndpyv42gl8zn5dx7lvd03pl43bjp38srn4aj6g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/nnir-est"; sha256 = "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv"; - name = "nnir-est"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49778,20 +64915,25 @@ license = lib.licenses.free; }; }) {}; - no-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + no-emoji = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "no-emoji"; - version = "20171214.2310"; + ename = "no-emoji"; + version = "20180515.1137"; src = fetchFromGitHub { owner = "ecraven"; repo = "no-emoji"; - rev = "329b4093bf38f3f4b0e4760c70270d3b45ee554e"; - sha256 = "1799wh6qy2yaadkdvnvp37320wxkhal8vlnj47d32a1bv8l8s91q"; + rev = "ebceeab50dbfe4d60235180a57633745dbc18c77"; + sha256 = "19wni50073dwspppx0xlryagg2fgg0jiz5kqf1b1wmaq8xn5b8r9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af6b04c1f95468254f2cf361964df9fd25d23586/recipes/no-emoji"; sha256 = "1lr6bzjxwn3yzw0mq36h2k2h8bqb1ngin42swhv022yx6a022zn2"; - name = "no-emoji"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -49799,20 +64941,25 @@ license = lib.licenses.free; }; }) {}; - no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + no-littering = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "no-littering"; - version = "20180331.155"; + ename = "no-littering"; + version = "20180620.600"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "b67f52072096f7e9efe98d2cc106ba39652c7545"; - sha256 = "108zjw83rh7yfrf999lx4dd7vh5281qigrnli50q75j4qhnmsfm7"; + rev = "f1ac5274ba49e3533c356c4cd6d5f8ebed0ec517"; + sha256 = "07w2x6s29332m3q1cy1igbjqpsyfq3l9x9gk0chn4n0c93wa0174"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh"; - name = "no-littering"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -49820,20 +64967,27 @@ license = lib.licenses.free; }; }) {}; - noaa = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + noaa = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "noaa"; - version = "20170719.1136"; + ename = "noaa"; + version = "20180419.1133"; src = fetchFromGitHub { owner = "thomp"; repo = "noaa"; - rev = "a4ec583275450d718334238d2813579420229f65"; - sha256 = "0ah6b31x9f4lc6q984nilj4g0aqzam5rhb3s61jgx9k4x7jmdks1"; + rev = "e99f7702512de49f93138dce6e0a7cfe2bc5eed3"; + sha256 = "1fhq6bly76qj67dbkbdlhl0icqpl4h1k3lip9ig64d8fqykpi8al"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1272203f85375e50d951451bd5fd3baffd57bbfa/recipes/noaa"; sha256 = "11hzpmgapmf6dc5imvj5jvzcy7hfddyz74lqmrq8128i72q1sj0v"; - name = "noaa"; + name = "recipe"; }; packageRequires = [ cl-lib emacs request ]; meta = { @@ -49841,20 +64995,24 @@ license = lib.licenses.free; }; }) {}; - noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + noccur = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "noccur"; + ename = "noccur"; version = "20150514.1420"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "noccur.el"; - rev = "6cc02ce07178a61ae38a849f80472c01969272bc"; - sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7"; + rev = "ff2a76883c43b283a08680733ec3ad403a1b1827"; + sha256 = "0y18hpwgzvm1i9yb3b6fxpbh3fmzkmyldq4as65i5s8n66i7mr6j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41f15b8298390310e95cbe137ea1516c0be10b94/recipes/noccur"; sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g"; - name = "noccur"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49862,9 +65020,13 @@ license = lib.licenses.free; }; }) {}; - nocomments-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nocomments-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nocomments-mode"; + ename = "nocomments-mode"; version = "20170213.1237"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -49872,10 +65034,10 @@ rev = "5a41a20cc44dfe4a9ea584354ed6dbc15dd92f46"; sha256 = "0jwwnypa0lx812p3dqqn9c05g27qavnvr23pzphydx9i15nz80g0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d88074771b581d21f48b707f93949f7224a28633/recipes/nocomments-mode"; sha256 = "1qhalhs29fb3kv5ckk8ny9fbqn2c4r4lwnc566j3bb1caqf2j7g0"; - name = "nocomments-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49883,9 +65045,14 @@ license = lib.licenses.free; }; }) {}; - noctilux-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + noctilux-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "noctilux-theme"; + ename = "noctilux-theme"; version = "20161113.642"; src = fetchFromGitHub { owner = "sjrmanning"; @@ -49893,10 +65060,10 @@ rev = "a3265a1be7f4d73f44acce6d968ca6f7add1f2ca"; sha256 = "12xx0v8d97kjvlkj0ii78vxxvzgmcfc4hzv4yvxymg50rsy0zzqi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0a18df34c105da8c5710643cd8027402bb07c95/recipes/noctilux-theme"; sha256 = "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp"; - name = "noctilux-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -49904,9 +65071,14 @@ license = lib.licenses.free; }; }) {}; - node-resolver = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + node-resolver = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "node-resolver"; + ename = "node-resolver"; version = "20140930.1023"; src = fetchFromGitHub { owner = "meandavejustice"; @@ -49914,10 +65086,10 @@ rev = "ef9d0486907a746a80b02ffc6208a09c168a9f7c"; sha256 = "1cgmq00ackabwcl4h0n2bb8y08wz0ir5rzca2q3sk4asly6d02m7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60537705dc922bd50220d378a2992cf36464eb0c/recipes/node-resolver"; sha256 = "1ng4rgm8f745fajqnbjhi2rshvn6icwdpbh5dzpzhim1w9kb3bhh"; - name = "node-resolver"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -49925,9 +65097,13 @@ license = lib.licenses.free; }; }) {}; - nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nodejs-repl = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nodejs-repl"; + ename = "nodejs-repl"; version = "20170722.443"; src = fetchFromGitHub { owner = "abicky"; @@ -49935,10 +65111,10 @@ rev = "4a4104dbf2cd314e90f35d200f28bd93c34708d0"; sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl"; sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907"; - name = "nodejs-repl"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49946,9 +65122,39 @@ license = lib.licenses.free; }; }) {}; - noflet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nodemcu-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "nodemcu-mode"; + ename = "nodemcu-mode"; + version = "20180501.1525"; + src = fetchFromGitHub { + owner = "andrmuel"; + repo = "nodemcu-mode"; + rev = "8effd9f3df40b6b92a2f05e4d54750b624afc4a7"; + sha256 = "1s19sshsm4cdx8kj5prmsq8ryz4843xcqmdayvlfl99jxsp9j4pm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a414f8b30954a50d74e4ae42abcf436cfca8d2b4/recipes/nodemcu-mode"; + sha256 = "0xx5dys8vifgaf3hb4q762xhhn1jybc4xwajqj98iban4nrakb3a"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nodemcu-mode"; + license = lib.licenses.free; + }; + }) {}; + noflet = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "noflet"; + ename = "noflet"; version = "20141102.654"; src = fetchFromGitHub { owner = "nicferrier"; @@ -49956,10 +65162,10 @@ rev = "7ae84dc3257637af7334101456dafe1759c6b68a"; sha256 = "0g70gnmfi8n24jzfci9nrj0n9bn1qig7b8f9f325rin8h7x32ypf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df33a7230e0e4a67ce75e5cce6a436e2a0d205e8/recipes/noflet"; sha256 = "0vzamqb52n330mi6rydrd4ls8nbwh5s42fc2gs5y15zakp6mvhr3"; - name = "noflet"; + name = "recipe"; }; packageRequires = []; meta = { @@ -49967,20 +65173,25 @@ license = lib.licenses.free; }; }) {}; - nofrils-acme-theme = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + nofrils-acme-theme = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nofrils-acme-theme"; - version = "20180227.1353"; + ename = "nofrils-acme-theme"; + version = "20180620.548"; src = fetchFromGitLab { owner = "esessoms"; repo = "nofrils-theme"; - rev = "0bb6f199ace1488613884075fe588f02000bb0ab"; - sha256 = "1aslhxk5mp6khf66ac4c441vywhiqpb4kyajagb8b1p10z8hrqva"; + rev = "98ad7bfaff1d85b33dc162645670285b067c6f92"; + sha256 = "0f8s7mhcs1ym4an8d4dabfvhin30xs2d0c5gv875hsgz8p3asgxs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c59ddaa5e41d3c25c446b1ed1905d7f88b448e0a/recipes/nofrils-acme-theme"; sha256 = "01xqsn8whczv34lfa9vbm5rpvrvsrlpav8pzng10jvax1a9wdp3a"; - name = "nofrils-acme-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -49988,9 +65199,14 @@ license = lib.licenses.free; }; }) {}; - nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nord-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nord-theme"; + ename = "nord-theme"; version = "20180102.1001"; src = fetchFromGitHub { owner = "arcticicestudio"; @@ -49998,10 +65214,10 @@ rev = "b5c1dc762fe3acaa88a0ce9640085d45d0109c43"; sha256 = "0j1cbwlh646gkjp70maqbq7izchgc23wdax50ykgkw3mxhjrlsf2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; sha256 = "0p4fqg4i2ayimd8kxsqnb1xkapzhhxf7szxi1skva4dcym3z67cc"; - name = "nord-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -50009,20 +65225,24 @@ license = lib.licenses.free; }; }) {}; - nordless-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nordless-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nordless-theme"; - version = "20180328.516"; + ename = "nordless-theme"; + version = "20180613.50"; src = fetchFromGitHub { owner = "lthms"; repo = "nordless-theme.el"; - rev = "31cf52bfa81cf312421533ccc4a26f79b03b6976"; - sha256 = "120d5wajjcimfzdmqn1kxav5l6ylpggg9rjhv0n65nmh829f1msm"; + rev = "e4da9d2465a123ea28e33a507cc7ab69692cde86"; + sha256 = "172ww1amlvd17f9qr69a17ksk0i8zpfma0arkygmf8n951zkqv8d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3de9da6cb8c1a75ff1d41a69e156c21be00713b6/recipes/nordless-theme"; sha256 = "1ylvqh5hf7asdx2mn57fsaa7ncfgfzq1ss50k9665k32zvv3zksx"; - name = "nordless-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50030,18 +65250,49 @@ license = lib.licenses.free; }; }) {}; - nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + northcode-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "northcode-theme"; + ename = "northcode-theme"; + version = "20180423.949"; + src = fetchFromGitHub { + owner = "Northcode"; + repo = "northcode-theme.el"; + rev = "4d3750461ba25ec45321318b5f1af4e8fdf16147"; + sha256 = "1yin5i38jdp47k6b7mc0jkv9ihl8nk5rpqin4qmwbhb871zxn7ma"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/25dcd4dd8189ad0fbf6c31874daa618bf1957863/recipes/northcode-theme"; + sha256 = "0x4dryx174kcjzm11z9q5qqlzr1c9zr0p32zwgbvgypgnvjy6i4g"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/northcode-theme"; + license = lib.licenses.free; + }; + }) {}; + nose = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nose"; + ename = "nose"; version = "20140520.948"; src = fetchhg { url = "https://bitbucket.com/durin42/nosemacs"; rev = "194d7789bf79"; sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nose"; sha256 = "1xdqsxq06x2m9rcfn1qh89g0mz1rvzl246d3sfmciwcyl932x682"; - name = "nose"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50049,18 +65300,23 @@ license = lib.licenses.free; }; }) {}; - notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + notmuch = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "notmuch"; - version = "20180324.1609"; + ename = "notmuch"; + version = "20180503.1659"; src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - rev = "c117306f2dfcdf705ef3433962d227d1cb39eb90"; - sha256 = "1xkzy39b50xa6nzgbdkjcx0yivg6sw2pia39lli70bg76c13lc3a"; + rev = "c20a5eb80520a11cb697a45b0d9553c68e2199c8"; + sha256 = "13gpsgx5k26x8r38q56y01mfz2r1haxw76hc52mq8vypfl1gpw3x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; sha256 = "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7"; - name = "notmuch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50068,9 +65324,14 @@ license = lib.licenses.free; }; }) {}; - notmuch-labeler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, notmuch }: - melpaBuild { + notmuch-labeler = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , notmuch }: + melpaBuild { pname = "notmuch-labeler"; + ename = "notmuch-labeler"; version = "20131230.919"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -50078,10 +65339,10 @@ rev = "d65d1129555d368243df4770ecc1e7ccb88efc58"; sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e9940e66bbf70ec868dbdaaeaa1fbd4f076a2e1/recipes/notmuch-labeler"; sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0"; - name = "notmuch-labeler"; + name = "recipe"; }; packageRequires = [ notmuch ]; meta = { @@ -50089,20 +65350,27 @@ license = lib.licenses.free; }; }) {}; - nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nov = callPackage ({ dash + , emacs + , esxml + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nov"; - version = "20180317.345"; + ename = "nov"; + version = "20180617.1444"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "e7bb37334ca85ce0e3f5c980464f652266a11218"; - sha256 = "1lymf4ir9kja0dpifbx230cq3n1li25kcdn3x3bh8fskiil1pqm0"; + rev = "3be6e8cd1a6311b0782ca2aa3d9961bec6183632"; + sha256 = "1i7caa7s0c2qmf8bf9bi6sp7yavpnxlck6gm9fc0lkywrjfq0ixs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; sha256 = "0hlcncpdazi4rn5yxd0zq85v7gpjhw7a6dl2i99zf4ymsan97lhq"; - name = "nov"; + name = "recipe"; }; packageRequires = [ dash emacs esxml ]; meta = { @@ -50110,9 +65378,39 @@ license = lib.licenses.free; }; }) {}; - noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nova-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "nova-theme"; + ename = "nova-theme"; + version = "20180530.801"; + src = fetchFromGitHub { + owner = "muirmanders"; + repo = "emacs-nova-theme"; + rev = "2f41855ac250d822d2e8cec4610c8645718bd7e3"; + sha256 = "0gc4jw9mdv2kmhwwf1avxr0magrdhpqlxakd29dxjq9md8qybrvj"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/16457166c17fb1cc074a34c61e52ebc285c0eacc/recipes/nova-theme"; + sha256 = "1d2271qd5z48x71pxjg4lngsc5ddw5iqh496p04f63sm08cgaky4"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nova-theme"; + license = lib.licenses.free; + }; + }) {}; + noxml-fold = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "noxml-fold"; + ename = "noxml-fold"; version = "20170823.657"; src = fetchFromGitHub { owner = "paddymcall"; @@ -50120,10 +65418,10 @@ rev = "46c7f6a008672213238a9f8d7a416ce80916aa62"; sha256 = "0axr7n4wdrd009lz6sg4y9ggf4f5svgrsclwhs0hyn2ld34rvrax"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13d2af88b292293cb5ab50819c63acfe936630c8/recipes/noxml-fold"; sha256 = "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc"; - name = "noxml-fold"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50131,20 +65429,25 @@ license = lib.licenses.free; }; }) {}; - npm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + npm-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "npm-mode"; - version = "20171103.1135"; + ename = "npm-mode"; + version = "20180720.1001"; src = fetchFromGitHub { owner = "mojochao"; repo = "npm-mode"; - rev = "91b8a5ad9301a368e1ce051e625450d7fe3884a4"; - sha256 = "1zzx9956mfrh91d84dpl4ij9b62iza4mflr9qjlh69b8allajngn"; + rev = "4f4b9fc2c07290ae87f65179df95be5221e76bf2"; + sha256 = "01dnyra7j72v7alalx5gk4mkq6gddvr66facpsq1dpvi2h4d8cky"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22dd6b2f8a94f56a61f4b70bd7e44b1bcf96eb18/recipes/npm-mode"; sha256 = "1aym4jfr6im6hdc5d7995q6myhgig286fk9hpaxdf418h1s17rqr"; - name = "npm-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -50152,9 +65455,16 @@ license = lib.licenses.free; }; }) {}; - nrepl-eval-sexp-fu = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, smartparens, thingatpt ? null }: - melpaBuild { + nrepl-eval-sexp-fu = callPackage ({ fetchFromGitHub + , fetchurl + , highlight + , lib + , melpaBuild + , smartparens + , thingatpt ? null }: + melpaBuild { pname = "nrepl-eval-sexp-fu"; + ename = "nrepl-eval-sexp-fu"; version = "20140311.341"; src = fetchFromGitHub { owner = "samaaron"; @@ -50162,10 +65472,10 @@ rev = "3a24b7d4bca13e87c987a4ddd212da914ff59191"; sha256 = "1nwj1ax2qmmlab4lik0b7japhqd424d0rb995dfv89p99gp8vmvc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nrepl-eval-sexp-fu"; sha256 = "1mz7a6aa4x23khlfqhhn9ycs3yxg44h5cckg4v4rc6lbif1jzzf8"; - name = "nrepl-eval-sexp-fu"; + name = "recipe"; }; packageRequires = [ highlight smartparens thingatpt ]; meta = { @@ -50173,20 +65483,25 @@ license = lib.licenses.free; }; }) {}; - nrepl-sync = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nrepl-sync = callPackage ({ cider + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nrepl-sync"; + ename = "nrepl-sync"; version = "20140807.854"; src = fetchFromGitHub { owner = "phillord"; repo = "lein-sync"; - rev = "bab53a2361526d63a24cda176d07a1247bf5b399"; - sha256 = "1129r3rzmfbl8nxjz71xnlyaszhhldawj467zbl36brdadp014n1"; + rev = "9506238562c2e0c0df744e0d81edff4c74322a7d"; + sha256 = "1si5pfczk3iypdx2ydhirznx2hvp6r7sq2hy64gn3mn4r68svlfi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2059ab6f2a3adc5af4f0876546e344e806e22ee5/recipes/nrepl-sync"; sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd"; - name = "nrepl-sync"; + name = "recipe"; }; packageRequires = [ cider ]; meta = { @@ -50194,20 +65509,24 @@ license = lib.licenses.free; }; }) {}; - nsis-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nsis-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nsis-mode"; - version = "20150914.546"; + ename = "nsis-mode"; + version = "20180718.2008"; src = fetchFromGitHub { owner = "mattfidler"; repo = "nsis-mode"; - rev = "5ea767c326bbe180e42be723605c0b03b16fdb06"; - sha256 = "1w80mbwlvmpd5ff7vy84z61b27klzh9z4wa6m2g7cy674fw4r1xp"; + rev = "a49f5dbc8a5e60d3bbb803582efb5468bbbe7507"; + sha256 = "05c8dhys08xmd53ya0633c1lhki5mraz0hqizwz2s5511anj417d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9b169a80c7afdeb0c6e17cd289114b5d3d97266/recipes/nsis-mode"; sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l"; - name = "nsis-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50215,20 +65534,29 @@ license = lib.licenses.free; }; }) {}; - nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }: - melpaBuild { + nu-mode = callPackage ({ ace-window + , avy + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , transpose-frame + , undo-tree + , which-key }: + melpaBuild { pname = "nu-mode"; - version = "20180220.1315"; + ename = "nu-mode"; + version = "20180619.1428"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "9c9fcb1395a3bd317cb5433c6c4defaa9bb3c7dd"; - sha256 = "0snynh8mk1ivdphrrpznh16szw2jcagxl7w056wv7j2zmb17agcx"; + rev = "22cf474e70c4e72045bfb1630814ef03e3b76096"; + sha256 = "0hfrf92kf3p91d5yn3b4i8x24j20v42rph4dvspmbmkfcyh9qinh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; sha256 = "0nzv3p62k8yyyww6idlxyi94q4d07nis7ydypar8d01jfqlrybkn"; - name = "nu-mode"; + name = "recipe"; }; packageRequires = [ ace-window @@ -50242,20 +65570,24 @@ license = lib.licenses.free; }; }) {}; - nubox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nubox = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nubox"; + ename = "nubox"; version = "20170619.210"; src = fetchFromGitHub { owner = "martijnat"; repo = "nubox"; - rev = "1ccb8035ae42727ba6bdd5c1106fbceddeeed370"; - sha256 = "02yh99rcgxdq6jn4xs8782nl6bjccmal8j78qslvpkrzrrxjajx6"; + rev = "84aa965f0cb4bde293237e4cc586643d1f662f83"; + sha256 = "0i1x0sd61c8k4q9ijgxyz21gvj1gah273990qfjzj9a25r4hzvlj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/725948568b8a067762b63475bc400f089f478a36/recipes/nubox"; sha256 = "0snzfsd765i363ykdhqkn65lqy97c79d20lalszrwcl2snm96n1f"; - name = "nubox"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50263,9 +65595,13 @@ license = lib.licenses.free; }; }) {}; - number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + number = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "number"; + ename = "number"; version = "20170901.612"; src = fetchFromGitHub { owner = "chrisdone"; @@ -50273,10 +65609,10 @@ rev = "bbc278d34dbcca83e70e3be855ec98b23debfb99"; sha256 = "0a1r352zs58mdwkq58561qxrz3m5rwk3xqcaaqhkxc0h9jqs4a9r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49d56b297ab729695249143dd65d3c67543cfcc6/recipes/number"; sha256 = "1nwcdv5ibirxx3sqadh6mnpj40ni3wna7wnjh343mx38dk2dzncf"; - name = "number"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50284,20 +65620,24 @@ license = lib.licenses.free; }; }) {}; - number-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + number-lock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "number-lock"; + ename = "number-lock"; version = "20160829.1900"; src = fetchFromGitHub { owner = "Liu233w"; repo = "number-lock.el"; - rev = "74417b1238953bf485961a0dd7d20f5c36ae25ea"; - sha256 = "0xmd4q2k0psd53cg71vsyc54iiq0wp9bs00ch68561lrnbjg043w"; + rev = "1ac1b1a269128ddac820df7d45a8d0c703e9c05c"; + sha256 = "11pqm2f8bx3m9mnvpjbvq8vd8sym7zpq7n0y4lbkybiyxswjrv5q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c107adabe2e4c5b35ebb6b21db076cdea0e9c24/recipes/number-lock"; sha256 = "13xqn4bcjm01zl0rgbwzad58x35230lm2qiipbyqkh2ma0a9pqn4"; - name = "number-lock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50305,9 +65645,14 @@ license = lib.licenses.free; }; }) {}; - numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + numbers = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "numbers"; + ename = "numbers"; version = "20170802.434"; src = fetchFromGitHub { owner = "davep"; @@ -50315,10 +65660,10 @@ rev = "dd02508b788a13b7d4dbcc4923fa23134b783ab3"; sha256 = "0bgha85j5f9lpk1h3siiw28v5sy6z52n7d7xi3m301r9hdlccc39"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers"; sha256 = "02cx19fi34yvc0icajnwrmb8lr2g8y08kis08v9xxalfxz06kb3h"; - name = "numbers"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -50326,20 +65671,24 @@ license = lib.licenses.free; }; }) {}; - nummm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nummm-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nummm-mode"; + ename = "nummm-mode"; version = "20131117.214"; src = fetchFromGitHub { owner = "agpchil"; repo = "nummm-mode"; - rev = "81951e12032274543c5f7a585b29bd93961e94e4"; - sha256 = "1i0yymsx8kin28bkrgwkk9ngsmjh0gh5j4hb0k03bq4fy799f2xx"; + rev = "73b1aa8643d86197c82cd28acdaefcb48a1e0abe"; + sha256 = "1022dchkh0hbhsqds6zncfayjgq5zg2x2r5gklr0nyx8j2qd8g7j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nummm-mode"; sha256 = "1gdq00f3x0rxxj917x9381v2x7cl9yabj7559zr5vj1clwza8jn4"; - name = "nummm-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50347,20 +65696,25 @@ license = lib.licenses.free; }; }) {}; - nv-delete-back = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nv-delete-back = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nv-delete-back"; + ename = "nv-delete-back"; version = "20170224.449"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "nivaca"; repo = "nv-delete-back"; rev = "44d506105989873dc1725e0cfc675925b35c9c98"; sha256 = "0lgz0sknnrxmc7iy4lniday1nwpz4q841c3w2hm72aiwn5z21h22"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a7bdc83e14be56f5848d3066686f5d24c2ed4a3c/recipes/nv-delete-back"; - sha256 = "0gq119zqcpckm0d6w08mphrssgbvxvschl7xn5y4vdn880vfm7q1"; - name = "nv-delete-back"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7542fa39060b507a6f455225367e45e89d3e2f92/recipes/nv-delete-back"; + sha256 = "13izzym4alda05k7ra67lyjx6dx23fjqz2dqk7mrzhik9x552hsr"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -50368,9 +65722,17 @@ license = lib.licenses.free; }; }) {}; - nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + nvm = callPackage ({ dash + , dash-functional + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "nvm"; + ename = "nvm"; version = "20171217.836"; src = fetchFromGitHub { owner = "rejeep"; @@ -50378,10 +65740,10 @@ rev = "bc0a33257ec16e9f575bb6914b5949199897ada9"; sha256 = "07fb6xxnij3nyhvf1yfv58zglawijfr0apmgx22qgaray53rp3nw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm"; sha256 = "0md1ybc2r2fxykwk21acjhdzy2kw326bdwa1d15c6f48lknzvg4w"; - name = "nvm"; + name = "recipe"; }; packageRequires = [ dash dash-functional f s ]; meta = { @@ -50389,20 +65751,24 @@ license = lib.licenses.free; }; }) {}; - nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nyan-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nyan-mode"; + ename = "nyan-mode"; version = "20170423.40"; src = fetchFromGitHub { owner = "TeMPOraL"; repo = "nyan-mode"; - rev = "3447aa114575230cb230862ac0ac9b065f789ecd"; - sha256 = "1nlsgkll6gagn4bs092ad1glkcihlcac9ai4cbj63l8x9x346yqg"; + rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a"; + sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode"; sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv"; - name = "nyan-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50410,9 +65776,14 @@ license = lib.licenses.free; }; }) {}; - nyx-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nyx-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nyx-theme"; + ename = "nyx-theme"; version = "20170910.607"; src = fetchFromGitHub { owner = "GuidoSchmidt"; @@ -50420,10 +65791,10 @@ rev = "afe2b8c3b5421b4c292d182dcf77079b278e93d8"; sha256 = "1qamw4x3yrygy8qkicy6smxksnsfkkp76hlnivswh7dm3fr23v6m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/nyx-theme"; sha256 = "17ajpsbwbal1rwgd38kckh1kvnd412h6fkvj2x4j5rqvjr9nhgr6"; - name = "nyx-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -50431,9 +65802,13 @@ license = lib.licenses.free; }; }) {}; - o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + o-blog = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "o-blog"; + ename = "o-blog"; version = "20151202.1539"; src = fetchFromGitHub { owner = "renard"; @@ -50441,10 +65816,10 @@ rev = "e466c59478feddc8126c43c1b98550474af484c0"; sha256 = "0xs6787a4v7djgd2zz2v1pk14x27mg2ganz30j9f0gdiai7da6ch"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5f24e70260f46445b119817bc1326f29b367c4b/recipes/o-blog"; sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja"; - name = "o-blog"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50452,9 +65827,13 @@ license = lib.licenses.free; }; }) {}; - oauth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + oauth = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "oauth"; + ename = "oauth"; version = "20130127.1751"; src = fetchFromGitHub { owner = "psanford"; @@ -50462,10 +65841,10 @@ rev = "ee4744ad76a1560281b0c4944575a3bd598c6458"; sha256 = "058dyk1c3iw0ip8n8rfpskvqiriqilpclkzc18x73msp5svrh3lj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/oauth"; sha256 = "0vgxvscb9cr07g3lzpi269kamgzhpac6dir1rlr4qd2wdv0nifl9"; - name = "oauth"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50473,20 +65852,24 @@ license = lib.licenses.free; }; }) {}; - ob-applescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-applescript = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-applescript"; + ename = "ob-applescript"; version = "20160914.1327"; src = fetchFromGitHub { owner = "stig"; repo = "ob-applescript.el"; - rev = "bc708af6cf45707d4e8d8f00ea59a7e413bfaca7"; - sha256 = "08q0kglajvgpjvzij89z9xiz65r15ddxz16bjk2b59p0vzzy51ij"; + rev = "b5c2966b3bab37a3b1f4e9c663d11da8ef9956ec"; + sha256 = "0asab7zppxj9dm20f8i273lr8z19lcrjri7v9gmw1jjn0cshfgjm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23b075774be913539c3f057dcb7f24fbc05c37a4/recipes/ob-applescript"; sha256 = "1gk8cgscj9wbl5k8ahh1a61p271xpk5vk2w64a8y3njnwrwxm9jc"; - name = "ob-applescript"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50494,40 +65877,54 @@ license = lib.licenses.free; }; }) {}; - ob-async = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ob-async = callPackage ({ async + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-async"; - version = "20171114.1936"; + ename = "ob-async"; + version = "20180624.1553"; src = fetchFromGitHub { owner = "astahlman"; repo = "ob-async"; - rev = "99a6f24191cacb343d6090ecc8c1c67f768b2e22"; - sha256 = "1cw62nsdnmllpkn4mqi80vp6s17yf6an418gvr06z8cxqndw07h1"; + rev = "2333106205fd3fa244ccdfbd95fcabf29eb81116"; + sha256 = "0lqazlzqsqhhkag7k82ar2clbhhm17mv4bdw0fh8nh4bkpph7p5a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; sha256 = "0k7kv71nnibp53lav774c61w9pzhq8qvch9rvpyyrwbyd67ninl8"; - name = "ob-async"; + name = "recipe"; }; - packageRequires = [ async emacs org ]; + packageRequires = [ async dash emacs org ]; meta = { homepage = "https://melpa.org/#/ob-async"; license = lib.licenses.free; }; }) {}; - ob-axiom = callPackage ({ axiom-environment, emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-axiom = callPackage ({ axiom-environment + , emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-axiom"; + ename = "ob-axiom"; version = "20171103.1548"; src = fetchgit { url = "https://bitbucket.org/pdo/axiom-environment"; - rev = "6842fb7f85df839acde395093647e2f91cf62fdd"; - sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8"; + rev = "38cea35e98997e0baf25ab6a1d70ac6daa83a73a"; + sha256 = "1g1br2va3qz4r0pxmg4254vyscwal6kl2vh0nzlgjpck7x19id5i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/ob-axiom"; sha256 = "17qh4hsr3aw4d0p81px3qcbax6dv2zjhyn5n9pxqwcp2skm5vff5"; - name = "ob-axiom"; + name = "recipe"; }; packageRequires = [ axiom-environment emacs ]; meta = { @@ -50535,9 +65932,13 @@ license = lib.licenses.free; }; }) {}; - ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-blockdiag = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-blockdiag"; + ename = "ob-blockdiag"; version = "20170727.1801"; src = fetchFromGitHub { owner = "corpix"; @@ -50545,10 +65946,10 @@ rev = "634fcf64a4ae735afe7001d865b03f5d71e23046"; sha256 = "0xr3bv4wxz13b1grfyl2qnrszzab3n9735za837nf4lxh527ksaj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag"; sha256 = "1lmawbgrlp6qd7p664jcl98y1xd2yqw9np6j52bh9i6s3cz6628g"; - name = "ob-blockdiag"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50556,9 +65957,14 @@ license = lib.licenses.free; }; }) {}; - ob-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ob-browser = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-browser"; + ename = "ob-browser"; version = "20170720.1218"; src = fetchFromGitHub { owner = "krisajenkins"; @@ -50566,10 +65972,10 @@ rev = "a347d9df1c87b7eb660be8723982c7ad2563631a"; sha256 = "0q2amf2kh2gkn65132q9nvn87pws5mmnr3wm1ajk23c01kcjf29c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c51529213c15d42a7a7b76771f07dd73c036a51f/recipes/ob-browser"; sha256 = "1yqbzmmazamgf8fi8ipq14ffm8h1pp5d2lkflbxjsagdq61hirxm"; - name = "ob-browser"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -50577,20 +65983,24 @@ license = lib.licenses.free; }; }) {}; - ob-cfengine3 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-cfengine3 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-cfengine3"; + ename = "ob-cfengine3"; version = "20180102.1012"; src = fetchFromGitHub { owner = "nickanderson"; repo = "ob-cfengine3"; - rev = "93ebcfceec3734f4bd187ae123686187d66fd401"; - sha256 = "0cyjdg8vzaf31gqsgmz5znw7v2p36jiz3sj1jvw7vhr8s4iar81i"; + rev = "2d15491e91ba84f5242610fdffafe31d4d68dc4a"; + sha256 = "1fp9ll4kp3qjyj0ai1fygrwzja7yblq7si8h7hsgwfmcr261d15v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3"; sha256 = "1pp3mykc5k629qlqixpl2900m1j604xpp6agrngwagsvf7qkhnvl"; - name = "ob-cfengine3"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50598,20 +66008,26 @@ license = lib.licenses.free; }; }) {}; - ob-clojurescript = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ob-clojurescript = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-clojurescript"; - version = "20180318.1519"; + ename = "ob-clojurescript"; + version = "20180406.1128"; src = fetchFromGitLab { owner = "statonjr"; repo = "ob-clojurescript"; - rev = "f6771b692af7d7aa78990161d4ef843009b9ace4"; - sha256 = "0nca5hizg3p8f92dc330algf2ad6lf5m27n151095zd71fj3q187"; + rev = "17ee1558aa94c7b0246fd03f684884122806cfe7"; + sha256 = "1an4m7mpr345xw4fanyf2vznxm1dxbv35987caq1wq9039mzfaxr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9ccc0d2d034944cb9688d5e184fa5df95f6b31/recipes/ob-clojurescript"; sha256 = "0h4qjz65k8m1ms7adrm5ypmjcjxx1nws1jmda88c4jjwjyz40jjf"; - name = "ob-clojurescript"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -50619,9 +66035,14 @@ license = lib.licenses.free; }; }) {}; - ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ob-coffee = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-coffee"; + ename = "ob-coffee"; version = "20170725.724"; src = fetchFromGitHub { owner = "zweifisch"; @@ -50629,10 +66050,10 @@ rev = "7f0b330273e8af7777de87a75fe52a89798e4548"; sha256 = "1w3fw3ka46d7vcsdq03l0wlviwsk52asfjiy9zfk4qabhpqwj9mz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23d7f1d021b07053acb57e2668ece0eaed0f817/recipes/ob-coffee"; sha256 = "16k8r9rqz4mayxl85pjdfsrz43k2hwcf8k7aff8wnic0ldzp6ivf"; - name = "ob-coffee"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -50640,9 +66061,14 @@ license = lib.licenses.free; }; }) {}; - ob-coffeescript = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-coffeescript = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-coffeescript"; + ename = "ob-coffeescript"; version = "20180125.2319"; src = fetchFromGitHub { owner = "brantou"; @@ -50650,10 +66076,10 @@ rev = "5a5bb04aea9c2a6eab5b05f90f5c7cb6de7b4261"; sha256 = "0yy20w1127xmz0mx2swbr294vg0jh8g0ibj5bpdf55xwdnv6im2l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript"; sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p"; - name = "ob-coffeescript"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -50661,20 +66087,25 @@ license = lib.licenses.free; }; }) {}; - ob-crystal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-crystal = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-crystal"; + ename = "ob-crystal"; version = "20180125.2318"; src = fetchFromGitHub { owner = "brantou"; repo = "ob-crystal"; - rev = "d84c1adee4b269cdba06a97caedb8071561a09af"; - sha256 = "1fny4fj4407lcp4k3379gbixk3wd171snw49p1kny2mvxrliz22h"; + rev = "b3bb27a21a4cefef3f5aeef52718b694bd51245b"; + sha256 = "0clrvk2vz1ag93rlmsc0dd0pgxb4x22935v51jqjkp2gw3n50kxx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal"; sha256 = "11mk2spwlddbrvcimhzw43b6d3gxzmi8br58bily1x4qkvl6zy4n"; - name = "ob-crystal"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -50682,9 +66113,17 @@ license = lib.licenses.free; }; }) {}; - ob-cypher = callPackage ({ cypher-mode, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ob-cypher = callPackage ({ cypher-mode + , dash + , dash-functional + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ob-cypher"; + ename = "ob-cypher"; version = "20170725.720"; src = fetchFromGitHub { owner = "zweifisch"; @@ -50692,10 +66131,10 @@ rev = "114bdf6db20ee0ade060bb5df379ddee48ff4f26"; sha256 = "142d91jvf7nr7q2sj61njy5hv6ljhsq2qkvkdbkfqj07rgpwfgn3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc05c833f64e7974cf5a2ad60a053a04267251cb/recipes/ob-cypher"; sha256 = "1ygmx0rjvxjl8hifkkwrkk9gpsmdsk6ndb6pg7y78p8hfp5jpyq3"; - name = "ob-cypher"; + name = "recipe"; }; packageRequires = [ cypher-mode dash dash-functional s ]; meta = { @@ -50703,20 +66142,25 @@ license = lib.licenses.free; }; }) {}; - ob-dao = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ob-dao = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-dao"; + ename = "ob-dao"; version = "20170816.858"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "ob-dao"; - rev = "fa92f62a63c684d689f57e790e5dd614c5bba270"; - sha256 = "18i2qwxcn5p1hj32svl54n0dv2j551n3nmgb4h8gbvs39rl49qkq"; + rev = "8c62bd800b1f572860e30be4b72c71fa415a2e31"; + sha256 = "12pxn04qn24grinbybaj03qimg6vc1n2cbs9bh94s9zcyg2wv982"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6284c73f1d0797fa2ed4d9a11d3198076cc5fff9/recipes/ob-dao"; sha256 = "0nj1qyac0lj5ljrqfqi9g2z0d7z5yihajkvjhlx5kg9zs3lgs5rs"; - name = "ob-dao"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -50724,20 +66168,24 @@ license = lib.licenses.free; }; }) {}; - ob-dart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-dart = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-dart"; + ename = "ob-dart"; version = "20170106.824"; src = fetchFromGitHub { owner = "mzimmerm"; repo = "ob-dart"; - rev = "04d63b922a5469506560ca0c00678e57131e0269"; - sha256 = "1r0r0dqsr44kcbj2w96rbx8alvkkfzc98ac35zb4ncy1bf71jhfb"; + rev = "2e463d83a3fe1c9c86f2040e0d22c06dfa49ecbf"; + sha256 = "0qkyyrrgs0yyqzq6ks1xcb8iwm1qfxwan1n8ichmrsbhwsc05jd3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3219b9623587365f56e9eeb4bd97f3dc449a11/recipes/ob-dart"; sha256 = "1lqi4pazkjcxvmm2bdpd9vcakmdclkamb69xwxdl44p68wsq2gn8"; - name = "ob-dart"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50745,20 +66193,24 @@ license = lib.licenses.free; }; }) {}; - ob-diagrams = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-diagrams = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-diagrams"; + ename = "ob-diagrams"; version = "20160407.537"; src = fetchFromGitHub { owner = "bergey"; repo = "org-babel-diagrams"; - rev = "ed6649616325ca5b2d2109f74aded8bcb8aa5186"; + rev = "be45815f5596d181592fae709096b7b5f4a71992"; sha256 = "0kx95lvkvg6h6lhs9knlp8rwi05y8y0i8w8vs7mwm378syls0qk0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fbb31def39fef108ecf7be105a901abfa6845f76/recipes/ob-diagrams"; sha256 = "1r1p9l61az1jb5m4k2dwnkp9j8xlcb588gq4mcg796vnbdscfcy2"; - name = "ob-diagrams"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50766,9 +66218,14 @@ license = lib.licenses.free; }; }) {}; - ob-elixir = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ob-elixir = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-elixir"; + ename = "ob-elixir"; version = "20170725.719"; src = fetchFromGitHub { owner = "zweifisch"; @@ -50776,10 +66233,10 @@ rev = "8990a8178b2f7bd93504a9ab136622aab6e82e32"; sha256 = "19awvfbjsnd5la14ad8cfd20pdwwlf3d2wxmz7kz6x6rf48x38za"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/287e4758f6f1df0152d68577abd91478c4a3f4ab/recipes/ob-elixir"; sha256 = "1l5b9hww2vmqnjlsd6lbjpz9walck82ngang1amfnk4xn6d0gdhi"; - name = "ob-elixir"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -50787,20 +66244,51 @@ license = lib.licenses.free; }; }) {}; - ob-fsharp = callPackage ({ emacs, fetchFromGitHub, fetchurl, fsharp-mode, lib, melpaBuild }: - melpaBuild { + ob-elvish = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ob-elvish"; + ename = "ob-elvish"; + version = "20180427.1200"; + src = fetchFromGitHub { + owner = "zzamboni"; + repo = "ob-elvish"; + rev = "369181ceae1190bf971c71aebf9fc6133bd98c39"; + sha256 = "170bw9qryhzjzmyi84qc1jkzy1y7i8sjz6vmvyfc264ia4j51m9w"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/90e979025f56061bc960f630945b09320a3dd28e/recipes/ob-elvish"; + sha256 = "1rpn3dabwgray1w55jib4ixr3l1afz9j7nyn0ha2r602hs02x1ya"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-elvish"; + license = lib.licenses.free; + }; + }) {}; + ob-fsharp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , fsharp-mode + , lib + , melpaBuild }: + melpaBuild { pname = "ob-fsharp"; + ename = "ob-fsharp"; version = "20170618.729"; src = fetchFromGitHub { owner = "juergenhoetzel"; repo = "ob-fsharp"; - rev = "0b2fdd9bb4f38af8b5cf4914627af52f5b43d9f7"; - sha256 = "1z1m2dqnvyyv9ff289p8x1hajnz9n0mmfkrkyl1zvipaqd9mgljw"; + rev = "65ec2b626ac55313d8a04e746940370f615fed1e"; + sha256 = "12k6z3zsh8av3avhl2a62v475bpxpcdy56v8i248bv1wgd3ma2mi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89bc8c5fe6db0573109e82b3d1350d33d6d8aff5/recipes/ob-fsharp"; sha256 = "1b9052lvr03vyizkjz3qsa8cw3pjml4kb3yy13jwh09jz5q87qbf"; - name = "ob-fsharp"; + name = "recipe"; }; packageRequires = [ emacs fsharp-mode ]; meta = { @@ -50808,9 +66296,13 @@ license = lib.licenses.free; }; }) {}; - ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-go = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-go"; + ename = "ob-go"; version = "20170731.1057"; src = fetchFromGitHub { owner = "pope"; @@ -50818,10 +66310,10 @@ rev = "28a0250cd969974936e44dfdccb0265632d25f84"; sha256 = "1g595miqn7wdmphvgi06ijqzjy801nal226kbghk9p002s3xzzn0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go"; sha256 = "09d8jrzijf8gr08615rdmf366zgip43dxvyihy0yzhk7j0p3iahj"; - name = "ob-go"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50829,20 +66321,26 @@ license = lib.licenses.free; }; }) {}; - ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ob-http = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ob-http"; - version = "20170920.2251"; + ename = "ob-http"; + version = "20180707.748"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "c4da6d47b3f96c31c00f9eaaf712b59afe00daef"; - sha256 = "0rhxp7gw4d5yp6yvjcp80in22wckj4zl9siykalj0jm97hkwqmzz"; + rev = "b1428ea2a63bcb510e7382a1bf5fe82b19c104a7"; + sha256 = "11fx9c94xxhl09nj9z5b5v6sm0xwkqawgjnnm7bg56vvj495n6h7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss"; - name = "ob-http"; + name = "recipe"; }; packageRequires = [ cl-lib s ]; meta = { @@ -50850,20 +66348,25 @@ license = lib.licenses.free; }; }) {}; - ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-hy = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-hy"; - version = "20180125.2316"; + ename = "ob-hy"; + version = "20180701.2240"; src = fetchFromGitHub { owner = "brantou"; repo = "ob-hy"; - rev = "44b1afb42c8a72febdbe68b6816134bc5957e5ba"; - sha256 = "0j34fsyqz28qjpggibbaqfwja10f06d9gh3pndlj6ghfx8i0plrh"; + rev = "a42ecaf440adc03e279afe43ee5ef6093ddd542a"; + sha256 = "0kv92r6j0dcqcg1s0g4iq1xvanscg6crwniysbrq6ifvmc4lvfdj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy"; sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7"; - name = "ob-hy"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -50871,9 +66374,18 @@ license = lib.licenses.free; }; }) {}; - ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ob-ipython = callPackage ({ dash + , dash-functional + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ob-ipython"; + ename = "ob-ipython"; version = "20180224.153"; src = fetchFromGitHub { owner = "gregsexton"; @@ -50881,10 +66393,10 @@ rev = "7147455230841744fb5b95dcbe03320313a77124"; sha256 = "1a10fc2jk37ni5sjjvf87s5nyaz2a6h2mlj5dxh4dhv5sd3bb85p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; sha256 = "06llf365k8m81ljmlajqvxlh84qg6h0flp3m6gb0zx71xilvw186"; - name = "ob-ipython"; + name = "recipe"; }; packageRequires = [ dash dash-functional emacs f s ]; meta = { @@ -50892,9 +66404,14 @@ license = lib.licenses.free; }; }) {}; - ob-kotlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ob-kotlin = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-kotlin"; + ename = "ob-kotlin"; version = "20170725.718"; src = fetchFromGitHub { owner = "zweifisch"; @@ -50902,10 +66419,10 @@ rev = "3b2f57e9944cfc36f2714dc550db42159904929a"; sha256 = "1fgfl4j0jgz56a1w8h2mvnzisz123c1xz7ga380bg1hmy44dbv5j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aa74d349eb55aafddfc4327b6160ae2da80d689/recipes/ob-kotlin"; sha256 = "19g4s9dnipg9aa360mp0affmnslm6h7byg595rnaz6rz25a3qdpx"; - name = "ob-kotlin"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -50913,9 +66430,14 @@ license = lib.licenses.free; }; }) {}; - ob-lfe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ob-lfe = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-lfe"; + ename = "ob-lfe"; version = "20170725.720"; src = fetchFromGitHub { owner = "zweifisch"; @@ -50923,10 +66445,10 @@ rev = "f7780f58e650b4d29dfd834c662b1d354b620a8e"; sha256 = "1ricvb2wxsmsd4jr0301pk30mswx41msy07fjgwhsq8dimxzmngp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d595d3b93e6b25ece1cdffc9d1502e8a868eb538/recipes/ob-lfe"; sha256 = "11cpaxk9wb27b9zhyns75dqpds4gh3cbjcvia4p2bnvmbm8lz4y8"; - name = "ob-lfe"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -50934,9 +66456,38 @@ license = lib.licenses.free; }; }) {}; - ob-ml-marklogic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-mermaid = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ob-mermaid"; + ename = "ob-mermaid"; + version = "20180522.959"; + src = fetchFromGitHub { + owner = "arnm"; + repo = "ob-mermaid"; + rev = "7f7fb533babc0b783c20e82527ddc7f0ebfbb629"; + sha256 = "0cllrjbbcqgr8qm9n8w7bmvgh2xvrrl3gqjmws3rsn0k7biq3kz5"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4df483806a4caaeb99fdac42f83bfe648d2e4165/recipes/ob-mermaid"; + sha256 = "0fp57m80ksnb6zs1gndwsqhrphkv9lfysq0h7h8g3parizh2idzs"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-mermaid"; + license = lib.licenses.free; + }; + }) {}; + ob-ml-marklogic = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-ml-marklogic"; + ename = "ob-ml-marklogic"; version = "20170622.1133"; src = fetchFromGitHub { owner = "ndw"; @@ -50944,10 +66495,10 @@ rev = "f678af0f440b3030e311ed6fbc444200be04da91"; sha256 = "1fszg6bn927bi1dx4zgiq0wr7zxrjv8sjrwgn9mansbljszbmccm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edce412552d4798450493e0a3dbe768f38f77cc7/recipes/ob-ml-marklogic"; sha256 = "1y5cgba7gzlmhdrs0k7clgrxixdl4najj5271x1m023jch7bz7xl"; - name = "ob-ml-marklogic"; + name = "recipe"; }; packageRequires = []; meta = { @@ -50955,9 +66506,14 @@ license = lib.licenses.free; }; }) {}; - ob-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ob-mongo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-mongo"; + ename = "ob-mongo"; version = "20170720.1219"; src = fetchFromGitHub { owner = "krisajenkins"; @@ -50965,10 +66521,10 @@ rev = "371bf19c7c10eab2f86424f8db8ab685997eb5aa"; sha256 = "02k4gvh1nqhn0h36h77vvms7xwwak8rdddibbidsrwwspbr4qr1s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e020ea3ef89a3787d498c2f698c82c5073c9ee32/recipes/ob-mongo"; sha256 = "1cgmqsl5dzi8xy3sh5xsfkczl555fpd4q6kgsh9xkn74sz227907"; - name = "ob-mongo"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -50976,20 +66532,25 @@ license = lib.licenses.free; }; }) {}; - ob-nim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-nim = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-nim"; + ename = "ob-nim"; version = "20170809.1130"; src = fetchFromGitHub { owner = "lompik"; repo = "ob-nim"; - rev = "bf1642cb93f0a898804dc13fd9408d2964403bd2"; - sha256 = "1xgi863wn1pvlsajmldd706k1dk7d7pa6b9nbgsh34kzchvhd75s"; + rev = "742b6b1fccdb245807b540f41f7f422b27f36230"; + sha256 = "0qnx9b40y1vxb7wsznnn29chl80fwlh42g2gm9l1p8jvli3jm2wp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7263ebadeabe36359c14ffb36deda2bc75f2ca61/recipes/ob-nim"; sha256 = "07i9n9z9xswbisq4rvgg7vbqj28c6j1xk96kpdbk8ffdvgybcpfz"; - name = "ob-nim"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -50997,20 +66558,24 @@ license = lib.licenses.free; }; }) {}; - ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-prolog = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-prolog"; - version = "20180328.1034"; + ename = "ob-prolog"; + version = "20180720.344"; src = fetchFromGitHub { owner = "ljos"; repo = "ob-prolog"; - rev = "8e34b273730423f267138e9f9a0abe7718f3a5fa"; - sha256 = "0kn4dph1wfigh9l8r8ghxgnixjxawfh335kh4ypab1hb528pdq2n"; + rev = "85ada8fc1f523167f137746c82d823a194160141"; + sha256 = "1fa3hn9l9av7z6g4az8cfr2157g5cdryzp8nrmjr8w9386p13m4l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog"; sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s"; - name = "ob-prolog"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51018,20 +66583,25 @@ license = lib.licenses.free; }; }) {}; - ob-restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }: - melpaBuild { + ob-restclient = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , restclient }: + melpaBuild { pname = "ob-restclient"; - version = "20160323.2305"; + ename = "ob-restclient"; + version = "20180703.902"; src = fetchFromGitHub { owner = "alf"; repo = "ob-restclient.el"; - rev = "08b82b9ea668631968ae4fb531fd74494630f840"; - sha256 = "09zxf158sspwv7j0kjjxzlymxi9ax7xpk5d5fry2jljskgn17csv"; + rev = "3af542c0895d7b4fabe84275ac5c7a214340c8ec"; + sha256 = "0khrvpn92kxpfndzybk9h2and5a7rzazvj598lpwllfs1y8fbsas"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28c1d3af3f8b2f598b80b03b64de5d15cbb3f13d/recipes/ob-restclient"; sha256 = "0nv2wsqmpschym6ch8fr4a79hlnpz31jc8y2flsygaqj0annjkfk"; - name = "ob-restclient"; + name = "recipe"; }; packageRequires = [ restclient ]; meta = { @@ -51039,20 +66609,24 @@ license = lib.licenses.free; }; }) {}; - ob-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-rust = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-rust"; - version = "20170730.759"; + ename = "ob-rust"; + version = "20180606.1646"; src = fetchFromGitHub { owner = "micanzhang"; repo = "ob-rust"; - rev = "f23d93725c21ab95a44cb4d2c0c4ab0489bd55d9"; - sha256 = "0indljqh6idfwza286gi9dkqwrndbnny4a5f7csz8gssmn0x3i30"; + rev = "a0e3c62ac3d4d44ae73746b5a45c04322c908bd3"; + sha256 = "1hjn27k9jnykipb9lbk2py83abaawvsm503pkzmggd4zzpf6f9qq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/843affc2fd481647c5377bf9a96b636b39718034/recipes/ob-rust"; sha256 = "1syzwh399wcwqhg1f3fvl12978dr574wji7cknqvll3hyh0zwd65"; - name = "ob-rust"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51060,20 +66634,27 @@ license = lib.licenses.free; }; }) {}; - ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: - melpaBuild { + ob-sagemath = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , sage-shell-mode }: + melpaBuild { pname = "ob-sagemath"; + ename = "ob-sagemath"; version = "20170130.1833"; src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; - rev = "68d3e516c712bc7aa5042f305f3eb5bbb6d656c2"; - sha256 = "1yr7d3ayrdnycapnhc08zyf6b9gp7xw0pngz90h75s6j33pisx30"; + rev = "1d99614509624d7bfd457325ca52f3bf1059f4d5"; + sha256 = "11qsh0lfb1kqiz0cfx7acfpyw0a90bh7r86a4h31d4xl1xfq94sx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; sha256 = "02ispac1y4g7p7iyscf5p8lvp92ncrn6281jm9igyiny1w6hivy7"; - name = "ob-sagemath"; + name = "recipe"; }; packageRequires = [ emacs s sage-shell-mode ]; meta = { @@ -51081,9 +66662,14 @@ license = lib.licenses.free; }; }) {}; - ob-sml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sml-mode }: - melpaBuild { + ob-sml = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sml-mode }: + melpaBuild { pname = "ob-sml"; + ename = "ob-sml"; version = "20130829.1143"; src = fetchFromGitHub { owner = "swannodette"; @@ -51091,10 +66677,10 @@ rev = "958165c92b6cff6cada5c85c8ae5887806b8451b"; sha256 = "0gymna48igcixrapjmg842pnlsshhw8zplxwyyn0x2yrma9fjyyg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1b0fbe1198fa624771c2f61249db502de57942a/recipes/ob-sml"; sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn"; - name = "ob-sml"; + name = "recipe"; }; packageRequires = [ sml-mode ]; meta = { @@ -51102,20 +66688,25 @@ license = lib.licenses.free; }; }) {}; - ob-sql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-sql-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-sql-mode"; - version = "20170213.1056"; + ename = "ob-sql-mode"; + version = "20180426.1211"; src = fetchFromGitHub { owner = "nikclayton"; repo = "ob-sql-mode"; - rev = "778232af7c87b6a32ecb3668a9e5a2763d6a4830"; - sha256 = "04npsn7awdp1n7fgwidaza58mjbmm3jsv2d992h2vzslfcyx2hnl"; + rev = "8d36d312bec4a742bec8890373948a888cac18de"; + sha256 = "1q69acl5lrnac14r8mddvdphvfl4wphqilfgm8l2f5nzhi9cmn02"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-sql-mode"; sha256 = "143agagkmwqwdqc0mbdsqp6v02y12q437v4x6dlh81yihif56rdk"; - name = "ob-sql-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -51123,9 +66714,14 @@ license = lib.licenses.free; }; }) {}; - ob-swift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ob-swift = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-swift"; + ename = "ob-swift"; version = "20170921.625"; src = fetchFromGitHub { owner = "zweifisch"; @@ -51133,10 +66729,10 @@ rev = "ed478ddbbe41ce5373efde06b4dd0c3663c9055f"; sha256 = "1vwg10d33mwb32bpdbpghfihy3ryiqbc4yydpb5hfv3v5k83vs0x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b401383966398d3223032c59baa920ce594e5fef/recipes/ob-swift"; sha256 = "19mcjfmijbajldm3jz8ij1x2p7d164mbq2ln6yb6iihxmdqnn2q4"; - name = "ob-swift"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -51144,9 +66740,15 @@ license = lib.licenses.free; }; }) {}; - ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }: - melpaBuild { + ob-translate = callPackage ({ fetchFromGitHub + , fetchurl + , google-translate + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-translate"; + ename = "ob-translate"; version = "20170720.1219"; src = fetchFromGitHub { owner = "krisajenkins"; @@ -51154,10 +66756,10 @@ rev = "9d9054a51bafd5a29a8135964069b4fa3a80b169"; sha256 = "143dq3wp3h1zzk8ihj8yjw9ydqnf48q7y8yxxa0ly7f2v1li84bc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d89e4006afc51bd44e23f87a1d1ef1140489ab3/recipes/ob-translate"; sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz"; - name = "ob-translate"; + name = "recipe"; }; packageRequires = [ google-translate org ]; meta = { @@ -51165,9 +66767,15 @@ license = lib.licenses.free; }; }) {}; - ob-typescript = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ob-typescript = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-typescript"; + ename = "ob-typescript"; version = "20150804.530"; src = fetchFromGitHub { owner = "lurdan"; @@ -51175,10 +66783,10 @@ rev = "9dcbd226cbfb75e790dd9de91d9401dde85a889a"; sha256 = "1ycqdjqn5361pcnc95hxhjqd3y96cjjnaylrnzwhmacl38jm3vai"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11733cd33add89b541dcc1f90a732833861b10d9/recipes/ob-typescript"; sha256 = "1wpy928ndvc076jzi14f6k5fsw8had0pz7f1yjdqql4icszhqa0p"; - name = "ob-typescript"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -51186,9 +66794,13 @@ license = lib.licenses.free; }; }) {}; - ob-uart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-uart = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-uart"; + ename = "ob-uart"; version = "20170521.158"; src = fetchFromGitHub { owner = "andrmuel"; @@ -51196,10 +66808,10 @@ rev = "90daeac90a9e75c20cdcf71234c67b812110c50e"; sha256 = "1syxxq411izmyfrhlywasax7n5c3yjy487mvfdjzjg8csmmk0m9v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5334f1a48b8ea6b7a660db27910769093c76113d/recipes/ob-uart"; sha256 = "1dkbyk8da0zw784dgwi8njnz304s54341dyfzvlb0lhcn41dmkz7"; - name = "ob-uart"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51207,9 +66819,13 @@ license = lib.licenses.free; }; }) {}; - oberon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + oberon = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "oberon"; + ename = "oberon"; version = "20120715.209"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -51217,10 +66833,10 @@ rev = "fb57d18ce13835a8a69b6bafecdd9193ca9a59a3"; sha256 = "16462cgq91jg7i97h440zss5vw2qkxgdy7gm148ns4djr2fchnf6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/oberon"; sha256 = "1wna7ld670r6ljdg5yx0ga0grbq1ma8q92gkari0d5czr7s9lggv"; - name = "oberon"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51228,9 +66844,14 @@ license = lib.licenses.free; }; }) {}; - obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + obfusurl = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "obfusurl"; + ename = "obfusurl"; version = "20170809.824"; src = fetchFromGitHub { owner = "davep"; @@ -51238,10 +66859,10 @@ rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5"; sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl"; sha256 = "0xx2zsjbkd17iy7xzqc66f9xgc97f9js3nz656yhmmxakjk2krra"; - name = "obfusurl"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -51249,9 +66870,13 @@ license = lib.licenses.free; }; }) {}; - objc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + objc-font-lock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "objc-font-lock"; + ename = "objc-font-lock"; version = "20141021.1122"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -51259,10 +66884,10 @@ rev = "34b457d577f97ca94b8792d025f9a909c7610612"; sha256 = "138c1nm579vr37dqprqsakfkhs2awm3klzyyd6bv9rhkrysrpbqk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6f93d328e137d2ca069328932b60c3bf60b0a4e/recipes/objc-font-lock"; sha256 = "0njslpgdcph3p3gamrbd6pc04szks07yv4ij3p1l7p5dc2p06rs6"; - name = "objc-font-lock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51270,9 +66895,13 @@ license = lib.licenses.free; }; }) {}; - obsidian-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + obsidian-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "obsidian-theme"; + ename = "obsidian-theme"; version = "20170719.248"; src = fetchFromGitHub { owner = "mswift42"; @@ -51280,10 +66909,10 @@ rev = "f45efb2ebe9942466c1db6abbe2d0e6847b785ea"; sha256 = "1d36mdq8b1q1x84a2nb93bwnzlpdldiafh7q7qfjjm9dsgbij73b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90227252eb69d3eac81f5a6bd5e3a582d33f335/recipes/obsidian-theme"; sha256 = "17ckshimdma6fqiis4kxczxkbrsfpm2a0b41m5f3qz3qlhcw2xgr"; - name = "obsidian-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51291,9 +66920,13 @@ license = lib.licenses.free; }; }) {}; - occidental-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + occidental-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "occidental-theme"; + ename = "occidental-theme"; version = "20130312.1258"; src = fetchFromGitHub { owner = "olcai"; @@ -51301,10 +66934,10 @@ rev = "fd2db7256d4f78c43d99c3cddb1c39106d479816"; sha256 = "0pnliw02crqw8hbg088klz54z6s1ih8q2lcn9mq5f12xi752hxm8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736fd0b7865cc800800fa6467019a365ddf1c412/recipes/occidental-theme"; sha256 = "1ra5p8k96wvb04v69xm87jl4jlgi57v4jw2xxzkwbwxbydncnv0b"; - name = "occidental-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51312,9 +66945,13 @@ license = lib.licenses.free; }; }) {}; - occur-context-resize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + occur-context-resize = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "occur-context-resize"; + ename = "occur-context-resize"; version = "20170904.1609"; src = fetchFromGitHub { owner = "dgtized"; @@ -51322,10 +66959,10 @@ rev = "cdee5a631ceed9337579d4090e0acf8140747f80"; sha256 = "0h7ypw45h5rcbwx4c4mn2ps9hp84dpjp3iay2nc9zaavv05n7ysa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2425d82b365784b17ab56af5f77c6095664c784/recipes/occur-context-resize"; sha256 = "0sp5v4rwqgqdj26gdkrmjvkmbp4g6jq4lrn2c3zm8s2gq0s3l6ri"; - name = "occur-context-resize"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51333,9 +66970,13 @@ license = lib.licenses.free; }; }) {}; - occur-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + occur-x = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "occur-x"; + ename = "occur-x"; version = "20130610.643"; src = fetchFromGitHub { owner = "juan-leon"; @@ -51343,10 +66984,10 @@ rev = "352f5fab207d8a1d3dd048073ff127a83e97c82b"; sha256 = "1zj0xhvl5qx42injv0av4lyzd3jsjls1m368dqd2qnswhfw8wfn6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/occur-x"; sha256 = "04nydxp4syd0chfnfrz8v1vkx2qasfh86b98qv8719cily1jw76p"; - name = "occur-x"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51354,20 +66995,24 @@ license = lib.licenses.free; }; }) {}; - oceanic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + oceanic-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "oceanic-theme"; + ename = "oceanic-theme"; version = "20161015.119"; src = fetchFromGitHub { owner = "terry3"; repo = "oceanic-theme"; - rev = "a92ee9b470843c923e6cdcafdd65106ff994d04d"; - sha256 = "1bj4l88546gmlfmwyg1zsqfz9g2l87hsa9jlrf8s4c907di736ir"; + rev = "00288f6a5245eb001dc123e36af1820eb3cbe985"; + sha256 = "00qij2h9kha557b3d69a8z3a3jsl8h4iwygxmr4h3i1w63nvy165"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d85588df4e2057ef1c822ff177572054ed979b/recipes/oceanic-theme"; sha256 = "1i69dy9hfqwfyiykvnqzkqim0lv1p5z5fjsdk84068si4b029gzv"; - name = "oceanic-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51375,20 +67020,25 @@ license = lib.licenses.free; }; }) {}; - ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }: - melpaBuild { + ocodo-svg-modelines = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , svg-mode-line-themes }: + melpaBuild { pname = "ocodo-svg-modelines"; + ename = "ocodo-svg-modelines"; version = "20150516.719"; src = fetchFromGitHub { owner = "ocodo"; repo = "ocodo-svg-modelines"; - rev = "c7b0789a177219f117c4de5659ecfa8622958c40"; - sha256 = "155gmls6cz3zf4lcj89kzb96y7k0glx0f659jg5z0skgxq79hf48"; + rev = "a6c5b9a7536c7a8fa3bd9d9dafdebc8d99903018"; + sha256 = "05ay599nc6jdw2fjss4izz1ynv2wc4svff932n8j9hvrhygipb2w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b9651865f4f8009c9b31fa1e5561de97a5ad8de/recipes/ocodo-svg-modelines"; sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay"; - name = "ocodo-svg-modelines"; + name = "recipe"; }; packageRequires = [ svg-mode-line-themes ]; meta = { @@ -51396,20 +67046,24 @@ license = lib.licenses.free; }; }) {}; - ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ocp-indent = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ocp-indent"; - version = "20170803.222"; + ename = "ocp-indent"; + version = "20180417.849"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "9bbd079199ef7308d4fa3cf0fafd2d7d8b4bf2d4"; - sha256 = "117xwqxnmg2f2np1zqyc8hhnxmrrd2gcixqclb5lkwk68kisjmi5"; + rev = "b15fd7585b42f89d745fad69ed1f2b70ecb8757d"; + sha256 = "0aszx9kxfbrlg0amsl3j3kdwn6n0a5fl33kvl8rgyv543p2jcx8f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw"; - name = "ocp-indent"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51417,20 +67071,25 @@ license = lib.licenses.free; }; }) {}; - octicons = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + octicons = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "octicons"; + ename = "octicons"; version = "20151031.2040"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-octicons"; - rev = "a61e561966ffd8faa3b48ce5b3a4eec10c59708b"; - sha256 = "0w98ii2ny57al94a4h927xx1hn99df5if543v2gh36zqdlwc7xci"; + rev = "229286a6166dba8ddabc8c4d338798c6cd3cf67d"; + sha256 = "0dp7dhmgrq078rjhpm1cr993qjqz7qgy2z4sn73qw6j55va7d9kw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c62867eae1a254eb5fe820d4387dd4e8a0ff9be2/recipes/octicons"; sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk"; - name = "octicons"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -51438,20 +67097,25 @@ license = lib.licenses.free; }; }) {}; - octo-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + octo-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "octo-mode"; + ename = "octo-mode"; version = "20161008.529"; src = fetchFromGitHub { owner = "cryon"; repo = "octo-mode"; - rev = "bd4db7e5e3275b24c74e6a23c11d04f54e9feca5"; - sha256 = "1blr664h8bq8bs1wr82nhhb9y7ggrlxp6x203i5bv542zm4a5rba"; + rev = "4b2ed4a61674f73a6ccd390b5ae123474bd0c977"; + sha256 = "1jkmf3j7wmv3b3ngi9fky1d94h4501lz5jcbn6xa3cb477j5nzj8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/899ec190515d33f706e5279c8e3628514f733a12/recipes/octo-mode"; sha256 = "1xvpykdrkmxlk302kbqycasrq89f72xvhqlm14qrcd2lqnwhbi07"; - name = "octo-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -51459,9 +67123,13 @@ license = lib.licenses.free; }; }) {}; - octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + octopress = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "octopress"; + ename = "octopress"; version = "20170813.615"; src = fetchFromGitHub { owner = "aaronbieber"; @@ -51469,10 +67137,10 @@ rev = "b4c25df9e3ccf49ac27c0a152daa4e27d1247d56"; sha256 = "0zidh929sc1wi695ibzglbybfvxz2rj1365mij97088wwdk5dyz8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7205d3d43797755077f19f57f531b4b39e77bae3/recipes/octopress"; sha256 = "0zsir6chjvn5i1irmf5aj6mmb401c553r5wykq796sz7jnjhrjg0"; - name = "octopress"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51480,9 +67148,13 @@ license = lib.licenses.free; }; }) {}; - offlineimap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + offlineimap = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "offlineimap"; + ename = "offlineimap"; version = "20150916.458"; src = fetchFromGitHub { owner = "jd"; @@ -51490,10 +67162,10 @@ rev = "cc3e067e6237a1eb7b21c575a41683b1febb47f1"; sha256 = "1bjrgj8klg7ly63vx90jpaih9virn02bhqi16p6z0mw36q1q7ysq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/offlineimap"; sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b"; - name = "offlineimap"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51501,9 +67173,14 @@ license = lib.licenses.free; }; }) {}; - old-norse-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + old-norse-input = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "old-norse-input"; + ename = "old-norse-input"; version = "20170816.1142"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -51511,10 +67188,10 @@ rev = "c2e21ee72c3768e9152aff6baf12a19cde1d0c53"; sha256 = "0zybr1v91884p4ncrpr962pr02qsns6hf7kc4c5gyad8sg4pbvxh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84780a6ebd1b2294b86ae8c6df5bd6521cf4e85a/recipes/old-norse-input"; sha256 = "1g00h6ykf61ckr6f3r17j72w3h04p5q65aa3rhr5llk3jk1wv331"; - name = "old-norse-input"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -51522,20 +67199,25 @@ license = lib.licenses.free; }; }) {}; - oldlace-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + oldlace-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "oldlace-theme"; + ename = "oldlace-theme"; version = "20150705.600"; src = fetchFromGitHub { owner = "mswift42"; repo = "oldlace-theme"; - rev = "5c6f437203b0783b36a7aff4a578de4a0c8c4ee6"; - sha256 = "0y9fxrsxp1158fyjp4f69r7g2s7b6nbxlsmsb8clwqc8pmmg2z82"; + rev = "9ecbef999b63021c967846a3c80b3fbfc81f1290"; + sha256 = "1kn25kamsb0s0cdg8mggi8rc7qgz4x6m3w6s42jvqybv41zhv50x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6b11187b012744771380dfabab607cf7e073c45/recipes/oldlace-theme"; sha256 = "1pxiqqh5x4wsayqgwplzvsbalbj44zvby7x0pijdvwcnsh74znj8"; - name = "oldlace-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -51543,20 +67225,25 @@ license = lib.licenses.free; }; }) {}; - olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + olivetti = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "olivetti"; - version = "20180308.638"; + ename = "olivetti"; + version = "20180531.37"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "b1759abbb2be27107c0c09beae10ca5e4c556b56"; - sha256 = "0zdxvd3xh5p9j8si2kfmavzdjwpz9352nr6i0c550m10lrnixnv4"; + rev = "02272654f1d920ea2da5a4b553acd5e5cc096ab1"; + sha256 = "0f7i2f42mlr27d9wa9h2zvz0k0xyqvwndzgz81x8gsm0w1iv15k9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd"; - name = "olivetti"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -51564,20 +67251,24 @@ license = lib.licenses.free; }; }) {}; - om-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + om-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "om-mode"; + ename = "om-mode"; version = "20140915.1410"; src = fetchFromGitHub { owner = "danielsz"; repo = "om-mode"; - rev = "cdc0c2912321f8438b0f3449ba8aca50ec150bba"; - sha256 = "03szb2i2xk3nq578cz1drsddsbld03ryvykdfzmfvwcmlpaknvzb"; + rev = "5a6b380f8d1293a865d8a37aa4816d7412c512ce"; + sha256 = "1wbnmg2lfv5xqgwj3axgwkccxmx0i202nf2nnfglg10hffy67rcm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/om-mode"; sha256 = "0bnlnxmzch9j39l8sf85npi89xlnkcnkmy4fihmwhrm86mnmayrb"; - name = "om-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51585,9 +67276,13 @@ license = lib.licenses.free; }; }) {}; - omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + omni-kill = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "omni-kill"; + ename = "omni-kill"; version = "20171016.1440"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; @@ -51595,10 +67290,10 @@ rev = "904549c8fd6ac3cf22b5d7111ca8944e179cffea"; sha256 = "1mlnh5pdqdv1qb8jvi0wvkgbpy74zq807gmp04bp6cpxdns9j63f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill"; sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k"; - name = "omni-kill"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51606,20 +67301,28 @@ license = lib.licenses.free; }; }) {}; - omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: - melpaBuild { + omni-log = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , s }: + melpaBuild { pname = "omni-log"; + ename = "omni-log"; version = "20170930.535"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-log.el"; - rev = "11e959473c1bd9415d0cda785940c36ba6ad44ab"; - sha256 = "081vq3wzl8w9yz1356np6h27d7yi5j8i3va9sc2flfwylmw1y9gr"; + rev = "e32bee893359476da9771871e342b70d6a03c671"; + sha256 = "1dzg3sb2zb7cwjl6lyxmh3j4s64dld987p9vw86hfisp2ccxxk2v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log"; sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r"; - name = "omni-log"; + name = "recipe"; }; packageRequires = [ dash emacs ht s ]; meta = { @@ -51627,9 +67330,18 @@ license = lib.licenses.free; }; }) {}; - omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }: - melpaBuild { + omni-quotes = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , omni-log + , s }: + melpaBuild { pname = "omni-quotes"; + ename = "omni-quotes"; version = "20170425.1132"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; @@ -51637,10 +67349,10 @@ rev = "454116c1dd6581baaeefd6b9310b1b6b7a5c36d0"; sha256 = "1h8lrpi5wizi5vncdz83cxlx7c71xw3sw89sfg462zfbz2sq8afl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes"; sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs"; - name = "omni-quotes"; + name = "recipe"; }; packageRequires = [ dash f ht omni-log s ]; meta = { @@ -51648,20 +67360,24 @@ license = lib.licenses.free; }; }) {}; - omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + omni-scratch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "omni-scratch"; + ename = "omni-scratch"; version = "20171009.1451"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; - rev = "9eee3161e5cb6df58618548a2173f4da7d194814"; - sha256 = "1cppy9p5k8737jjgjlmfqqfdx048kpjn5cx7iw0dxal180y3i39g"; + rev = "636374c59c7d33c2f72c97ad8ba9fb4854f2324d"; + sha256 = "0w62bk2m0gs4b605s691z4iap9baz1z6c8z4v9vb05917qlsx5xb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9"; - name = "omni-scratch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51669,9 +67385,15 @@ license = lib.licenses.free; }; }) {}; - omni-tags = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }: - melpaBuild { + omni-tags = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcre2el }: + melpaBuild { pname = "omni-tags"; + ename = "omni-tags"; version = "20170426.1409"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; @@ -51679,10 +67401,10 @@ rev = "8f0f6c302fab900b7681e5c039f90850cbbabd33"; sha256 = "0cqj4h4bdhmb0r6f2xx9g6cs3599m4j3snkrvsgddaq8c6mg47w0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c77e57f41484c08cae9f47c4379d1752ccf43ce2/recipes/omni-tags"; sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl"; - name = "omni-tags"; + name = "recipe"; }; packageRequires = [ cl-lib pcre2el ]; meta = { @@ -51690,20 +67412,62 @@ license = lib.licenses.free; }; }) {}; - omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: - melpaBuild { + omnibox = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , frame-local + , lib + , melpaBuild }: + melpaBuild { + pname = "omnibox"; + ename = "omnibox"; + version = "20180422.1749"; + src = fetchFromGitHub { + owner = "sebastiencs"; + repo = "omnibox"; + rev = "8ee75c71c20c438ebc43ba24ef6f543633d118f3"; + sha256 = "19d7djf942dagxsz0c0lnfra4fk09qm6grkc0nihpsw4afjbj01a"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bf274ff47f167edd214e667249356de281522802/recipes/omnibox"; + sha256 = "05jc9hhr3gnjfyjpdx79ij9b5qwfrsmdf8h2s5ldxbw82q8a0z02"; + name = "recipe"; + }; + packageRequires = [ dash emacs frame-local ]; + meta = { + homepage = "https://melpa.org/#/omnibox"; + license = lib.licenses.free; + }; + }) {}; + omnisharp = callPackage ({ auto-complete + , cl-lib ? null + , csharp-mode + , dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , popup + , s + , shut-up }: + melpaBuild { pname = "omnisharp"; - version = "20180121.702"; + ename = "omnisharp"; + version = "20180606.318"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "c00a3a9157432c578fffb79169232e4a81d4ad31"; - sha256 = "0ghwqf1wbiywzdx0qlgs4y94z4ivlgac8rpg1bimlb8xfx62sia0"; + rev = "ef369f79f5e65077b640b0d7525a1c9a3739713f"; + sha256 = "19awri250vya7c4pjmkwwxxnsimw0rjy75gary0g1hzr492zibdb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; sha256 = "0gh0wwdpdx2cjf95pcagj52inf7mrmiq7x8p0x5c7lvl4pfzhh87"; - name = "omnisharp"; + name = "recipe"; }; packageRequires = [ auto-complete @@ -51722,9 +67486,13 @@ license = lib.licenses.free; }; }) {}; - omtose-phellack-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + omtose-phellack-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "omtose-phellack-theme"; + ename = "omtose-phellack-theme"; version = "20161111.1320"; src = fetchFromGitHub { owner = "franksn"; @@ -51732,10 +67500,10 @@ rev = "66f99633e199e65bd28641626435e8e59246529a"; sha256 = "0imf2pcf93srm473nvaksw5pw5i4caqxb6aqfbq6xww8gdbqfazy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b1e07ed9010408c12598640ec8d154f9eb18d/recipes/omtose-phellack-theme"; sha256 = "0aj0sw611w13xryn762ws63dfalczxixa5rv3skglmfy9axg3v3b"; - name = "omtose-phellack-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51743,9 +67511,17 @@ license = lib.licenses.free; }; }) {}; - on-parens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: - melpaBuild { + on-parens = callPackage ({ dash + , emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , smartparens }: + melpaBuild { pname = "on-parens"; + ename = "on-parens"; version = "20180202.1441"; src = fetchFromGitHub { owner = "willghatch"; @@ -51753,10 +67529,10 @@ rev = "7a41bc02bcffd265f8a69ed4b4e0df3c3009aaa4"; sha256 = "0pkc05plbjqfxrw54amlm6pzg9gcsz0nvqzprplr6rhh7ss419zn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ea1eb5eb5a40e95ba06b0a4ac89ad8843c9cc2c/recipes/on-parens"; sha256 = "19kyzpkgfl0ipbcgnl8fbfbapnfdxr8w9i7prfkm6rjp6amxyqab"; - name = "on-parens"; + name = "recipe"; }; packageRequires = [ dash emacs evil smartparens ]; meta = { @@ -51764,9 +67540,14 @@ license = lib.licenses.free; }; }) {}; - on-screen = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + on-screen = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "on-screen"; + ename = "on-screen"; version = "20160302.150"; src = fetchFromGitHub { owner = "michael-heerdegen"; @@ -51774,10 +67555,10 @@ rev = "206468aa4de299ad26c2db12b757f5ad7290912f"; sha256 = "1rrby3mbh24qd43nsb3ymcrjxh1cz6iasf1gv0a8fmivmb4f7dyz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/628f43fdfdb41174800fb8171e71134c27730f6f/recipes/on-screen"; sha256 = "104jisc2bckzrajxlvj1cfx1drnjj7jhqjblvm89ry32xdnjxmqb"; - name = "on-screen"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -51785,9 +67566,39 @@ license = lib.licenses.free; }; }) {}; - one-time-pad-encrypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + one-themes = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "one-themes"; + ename = "one-themes"; + version = "20180507.1008"; + src = fetchFromGitHub { + owner = "balajisivaraman"; + repo = "emacs-one-themes"; + rev = "fb633009a173dee56cf581198d9c26871189edf8"; + sha256 = "0920g4mvqf97v6akw4fc1aq8aq2mnm8ah2xlkcgsc4a78bhk7aq1"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/504fb2fa2fe17eb008f7e9b8f7fb394f4a3ebd28/recipes/one-themes"; + sha256 = "11c6py5vani2cv4qjvizlzz9xvr5v57qxy1chcxy2lq3jlz1q5w0"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/one-themes"; + license = lib.licenses.free; + }; + }) {}; + one-time-pad-encrypt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "one-time-pad-encrypt"; + ename = "one-time-pad-encrypt"; version = "20160329.813"; src = fetchFromGitHub { owner = "garvinguan"; @@ -51795,10 +67606,10 @@ rev = "87cc1f124024ce3d277299ca0ac703f182937d9f"; sha256 = "0g2hvpnmgyy1k393prv97nqwlqc58nqf71hkrmaijw0cyy9q03nz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/one-time-pad-encrypt"; sha256 = "0xl74vxq9dzl84b6wsw8flykxcsxggpd4s47a2ph3irr64mbbgq5"; - name = "one-time-pad-encrypt"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51806,9 +67617,14 @@ license = lib.licenses.free; }; }) {}; - opam = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + opam = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "opam"; + ename = "opam"; version = "20150719.520"; src = fetchFromGitHub { owner = "lunaryorn"; @@ -51816,10 +67632,10 @@ rev = "4d589de5765728f56af7078fae328b6792de8600"; sha256 = "1yqrp9icci5snp1485wb6y8mr2hjp9006ahch58lvmnq98bn7j45"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4e2076ebaefe7e241607ff6920fe243d10ccd0/recipes/opam"; sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa"; - name = "opam"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -51827,9 +67643,13 @@ license = lib.licenses.free; }; }) {}; - open-in-msvs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + open-in-msvs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "open-in-msvs"; + ename = "open-in-msvs"; version = "20170123.1428"; src = fetchFromGitHub { owner = "evgeny-panasyuk"; @@ -51837,10 +67657,10 @@ rev = "e0d071c83188ad5db8f3297d6ce784b4ed554a04"; sha256 = "0aiccdcll5zjy11fandd9bvld8p8srmhrh3waqc33yp4x8pjkjpd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09a462fac31a7ceda4ee84a8550ff1db6d11140f/recipes/open-in-msvs"; sha256 = "0cng0brxjdriyhwsbn85pfrgqg56chzk24lvkx91rzgz15fbpnv5"; - name = "open-in-msvs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51848,9 +67668,13 @@ license = lib.licenses.free; }; }) {}; - open-junk-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + open-junk-file = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "open-junk-file"; + ename = "open-junk-file"; version = "20161210.314"; src = fetchFromGitHub { owner = "rubikitch"; @@ -51858,10 +67682,10 @@ rev = "558bec7372b0fed4c4cb6074ab906535fae615bd"; sha256 = "0kcgkxn5v9bsbkcvpjxjqhj1w3c29bfb33bmiw32gzbfphmrvhh1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/open-junk-file"; sha256 = "0r1v9m8a5blv70fzq5miv5i57jx0bm1p0jxh0lwklam0m99znmcj"; - name = "open-junk-file"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51869,20 +67693,25 @@ license = lib.licenses.free; }; }) {}; - opencc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + opencc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "opencc"; + ename = "opencc"; version = "20170722.116"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "emacs-opencc"; - rev = "8c539f72669ba9a99d8b5198db5ea930897ad1b9"; - sha256 = "140s88z0rsiylm8g1mzgc50ai38x79j004advin6lil5zcggxq3i"; + rev = "959d9ffbae095752182026e3bd9b8fd61178c39f"; + sha256 = "0qym9xxjsn4ally7qlfffin7rybdz3w5z4gw1cw2j6ragwcm6w8a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc5476b3670a9f5c3d3682c2e7852fc6c5fe60/recipes/opencc"; sha256 = "1dd62x0h3imil4g3psndxykp45jf83fm4afxcvvyayj45z099f4r"; - name = "opencc"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -51890,9 +67719,13 @@ license = lib.licenses.free; }; }) {}; - opencl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + opencl-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "opencl-mode"; + ename = "opencl-mode"; version = "20170816.549"; src = fetchFromGitHub { owner = "salmanebah"; @@ -51900,10 +67733,10 @@ rev = "6e69434d0fa6e11a542acad370611bba18d3bc5c"; sha256 = "00vhmbfh51mncx5xnzv96kbb5r6r27xw6xwvi7gf454zbvcibrws"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d97575fdae88d55b55686aa6814f858813cad171/recipes/opencl-mode"; sha256 = "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79"; - name = "opencl-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51911,20 +67744,27 @@ license = lib.licenses.free; }; }) {}; - opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + opener = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "opener"; + ename = "opener"; version = "20161207.1010"; src = fetchFromGitHub { owner = "0robustus1"; repo = "opener.el"; - rev = "c384f67278046fdcd220275fdd212ab85672cbeb"; - sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h"; + rev = "ab75048b1073fb1b1452dabae94ab55e0cfb57c4"; + sha256 = "00kh8m23jzwb0wipwjdm2wad08xqrlcg00vzc4vzijgrapz0da3h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener"; sha256 = "0fhny4m7x19wnlnr19s4rkl04dkx95yppd51jzrkr96xiznw97s7"; - name = "opener"; + name = "recipe"; }; packageRequires = [ cl-lib emacs request ]; meta = { @@ -51932,20 +67772,28 @@ license = lib.licenses.free; }; }) {}; - opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: - melpaBuild { + opensource = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , request + , s }: + melpaBuild { pname = "opensource"; + ename = "opensource"; version = "20160926.916"; src = fetchFromGitHub { owner = "OpenSourceOrg"; repo = "el-opensourceorg"; - rev = "13499b7ae602c735e40c1c494bda6252a2f1c98f"; - sha256 = "14vb47y5cq3j80aah8fjjf5aw343p9p7bhlxnpz5fr8r9a883dka"; + rev = "42742d5f1b9590acff7f05ee0094e3a80f4f7171"; + sha256 = "0z92l9d3q12qlf18v7w8qjiw0ciha9l1nvxr0zmik5ck87qk4vmn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec4255a403e912a14a7013ea96f554d3588dfc30/recipes/opensource"; sha256 = "17gi20s2vi7m75qqaff907x1g8ja5ny90klldpqmj258m2j6a6my"; - name = "opensource"; + name = "recipe"; }; packageRequires = [ dash pkg-info request s ]; meta = { @@ -51953,9 +67801,13 @@ license = lib.licenses.free; }; }) {}; - openstack-cgit-browse-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + openstack-cgit-browse-file = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "openstack-cgit-browse-file"; + ename = "openstack-cgit-browse-file"; version = "20130819.227"; src = fetchFromGitHub { owner = "chmouel"; @@ -51963,10 +67815,10 @@ rev = "244219288b9aef41155044697bb114b7af83ab8f"; sha256 = "0086pfk4pq6xmknk7a42fihcjgzkcplqqc1rk9fhwmn9j7djbq70"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd7035e1ea63d7d8378f8bfda6a5402a5b6bb9e4/recipes/openstack-cgit-browse-file"; sha256 = "05dl28a4npnnzzipypfcqb21sdww715lwji2xnsabx3fb1h1w5jl"; - name = "openstack-cgit-browse-file"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51974,18 +67826,23 @@ license = lib.licenses.free; }; }) {}; - openwith = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + openwith = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "openwith"; + ename = "openwith"; version = "20120531.1436"; src = fetchhg { url = "https://bitbucket.com/jpkotta/openwith"; rev = "aeb78782ec87"; sha256 = "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/openwith"; sha256 = "0l3grbnn349cv26ap2phlmp2h94s68gqznh5zdqwc2cp7lf699sx"; - name = "openwith"; + name = "recipe"; }; packageRequires = []; meta = { @@ -51993,9 +67850,13 @@ license = lib.licenses.free; }; }) {}; - operate-on-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + operate-on-number = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "operate-on-number"; + ename = "operate-on-number"; version = "20150706.2323"; src = fetchFromGitHub { owner = "knu"; @@ -52003,10 +67864,10 @@ rev = "ceb3be565a29326c1098244fac0c50606723a56e"; sha256 = "0iw3c8sn702ziki59mvd5gxm484i7f0bwsy8fz95y08s9gknjjf9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aec74eff8ca3d5e381d7a6d61c73f1a0716f1c60/recipes/operate-on-number"; sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk"; - name = "operate-on-number"; + name = "recipe"; }; packageRequires = []; meta = { @@ -52014,9 +67875,14 @@ license = lib.licenses.free; }; }) {}; - orca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + orca = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "orca"; + ename = "orca"; version = "20171030.1216"; src = fetchFromGitHub { owner = "abo-abo"; @@ -52024,10 +67890,10 @@ rev = "5e1744afb793dda744ddc6fe342144b5e90bea08"; sha256 = "0gqgs3rmdzm5vqk8azgzwannxjifvrf5fj40n543d0066c2dfsfi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4d9cf89c58a9b36b7c2a42de2aecb3b60001908/recipes/orca"; sha256 = "012ndbrgm58r09snhvi476rw0lq4m913y0slc0cxb688p9wgz5w3"; - name = "orca"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -52035,9 +67901,16 @@ license = lib.licenses.free; }; }) {}; - org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + org-ac = callPackage ({ auto-complete-pcmp + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "org-ac"; + ename = "org-ac"; version = "20170401.607"; src = fetchFromGitHub { owner = "aki2o"; @@ -52045,10 +67918,10 @@ rev = "41e3ef8e4039619d0370c23c66730b3b2e9e32ed"; sha256 = "1l3fn8vjdqq7rrn1b7l2i238bhjni13mg9v25dydin0sfb697abk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/adf598f8dae69ff286ae78d353a2a5d4363b4480/recipes/org-ac"; sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr"; - name = "org-ac"; + name = "recipe"; }; packageRequires = [ auto-complete-pcmp log4e yaxception ]; meta = { @@ -52056,20 +67929,25 @@ license = lib.licenses.free; }; }) {}; - org-agenda-property = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-agenda-property = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-agenda-property"; + ename = "org-agenda-property"; version = "20140626.1416"; src = fetchFromGitHub { owner = "Malabarba"; repo = "org-agenda-property"; - rev = "3b469f3e93de0036547f3631cd0366d53f7584c8"; - sha256 = "15xgkm5p30qfghyhkjivh5n4770794qf4pza462vb0xl5v6kffbm"; + rev = "01afb36072eb27846eb09310dfca7991dbae831e"; + sha256 = "1f98adm1vgc43q2k63ggddsbz4329h4m5zpnzkv9lqszbjwdaq5c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/org-agenda-property"; sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk"; - name = "org-agenda-property"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -52077,20 +67955,27 @@ license = lib.licenses.free; }; }) {}; - org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + org-alert = callPackage ({ alert + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "org-alert"; - version = "20170724.2116"; + ename = "org-alert"; + version = "20180523.1833"; src = fetchFromGitHub { owner = "groksteve"; repo = "org-alert"; - rev = "3b7417ac12f2710e88f8dff538670621064ef8bc"; - sha256 = "1hyl4b2r7wzdfr2m7x8pgpylia3z15fihn679xdiyc32rzy7k5vk"; + rev = "f87bff4acbd839acb4d2245b56b2c3d21f950911"; + sha256 = "05xhp1ggpcgd48vcrxf9l43aasxfjw1ypgzpq3gp7031x83m9rr6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert"; sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152"; - name = "org-alert"; + name = "recipe"; }; packageRequires = [ alert dash s ]; meta = { @@ -52098,20 +67983,24 @@ license = lib.licenses.free; }; }) {}; - org-attach-screenshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-attach-screenshot = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-attach-screenshot"; - version = "20180330.1139"; + ename = "org-attach-screenshot"; + version = "20180419.2225"; src = fetchFromGitHub { owner = "dfeich"; repo = "org-screenshot"; - rev = "5eeb2eef690a02b95dfe171d38ec66c954719d65"; - sha256 = "10mzlqk7in6gjh6x9q0gc5slx536hc2dz2kndm77f8qaf9z7hw79"; + rev = "6b1edbd2384191122a30788ac72f2233c2df0294"; + sha256 = "0vyxpc28b9b0cn02a9p48q6iy61qw7gj7gzk37ijdmzg8dzy6hxv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f545cd8d1da39e7fbd61020e178de30053ba774b/recipes/org-attach-screenshot"; sha256 = "0108kahyd499q87wzvirv5d6p7jrb7ckz8r96pwqzgflj3njbnmn"; - name = "org-attach-screenshot"; + name = "recipe"; }; packageRequires = []; meta = { @@ -52119,9 +68008,13 @@ license = lib.licenses.free; }; }) {}; - org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-autolist = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-autolist"; + ename = "org-autolist"; version = "20170924.1201"; src = fetchFromGitHub { owner = "calvinwyoung"; @@ -52129,10 +68022,10 @@ rev = "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1"; sha256 = "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca8e2cdb282674b20881bf6b4fc49af42a5d09a7/recipes/org-autolist"; sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj"; - name = "org-autolist"; + name = "recipe"; }; packageRequires = []; meta = { @@ -52140,9 +68033,17 @@ license = lib.licenses.free; }; }) {}; - org-babel-eval-in-repl = callPackage ({ emacs, ess, eval-in-repl, fetchFromGitHub, fetchurl, lib, matlab-mode, melpaBuild }: - melpaBuild { + org-babel-eval-in-repl = callPackage ({ emacs + , ess + , eval-in-repl + , fetchFromGitHub + , fetchurl + , lib + , matlab-mode + , melpaBuild }: + melpaBuild { pname = "org-babel-eval-in-repl"; + ename = "org-babel-eval-in-repl"; version = "20170511.514"; src = fetchFromGitHub { owner = "diadochos"; @@ -52150,10 +68051,10 @@ rev = "bfa72c582ac1531ad42aba23e2b1267ab68e31f6"; sha256 = "1jm56zxa99s163jv02vhfrshmykvld7girq7gmj1x60g3wjzhn5k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl"; sha256 = "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx"; - name = "org-babel-eval-in-repl"; + name = "recipe"; }; packageRequires = [ emacs ess eval-in-repl matlab-mode ]; meta = { @@ -52161,9 +68062,13 @@ license = lib.licenses.free; }; }) {}; - org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-beautify-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-beautify-theme"; + ename = "org-beautify-theme"; version = "20170908.1518"; src = fetchFromGitHub { owner = "jonnay"; @@ -52171,10 +68076,10 @@ rev = "df6a1114fda313e1689363e196c8284fbe2a2738"; sha256 = "1lkz7736swimad12khwbbqc4gxjydgr1k45p4mx03s25pv1w920y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme"; sha256 = "0rrlyn61xh3szw8aihxpbmg809xx5ac66xqzj895dn1raz129h2w"; - name = "org-beautify-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -52182,20 +68087,24 @@ license = lib.licenses.free; }; }) {}; - org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-board = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-board"; - version = "20180226.1136"; + ename = "org-board"; + version = "20180530.1120"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "eef4cd47ea221dcdc352b5af578007bcde5f3e6a"; - sha256 = "1sj5n2gynwc14kl6cjmdg8mvs0nc187nfj4czd3rbz4yqq818l3b"; + rev = "8899d8f8c1977df2397793a54868317463120553"; + sha256 = "190rf8hi1233rjmr78cqy03m1vspcsdbzcf64xs8n4vckyb18vl4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; sha256 = "00jsrxc8f85cvrh7364n7337frdj12yknlfp28fhdgk2ph6d7bp4"; - name = "org-board"; + name = "recipe"; }; packageRequires = []; meta = { @@ -52203,20 +68112,25 @@ license = lib.licenses.free; }; }) {}; - org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-bookmark-heading = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-bookmark-heading"; + ename = "org-bookmark-heading"; version = "20170510.1008"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-bookmark-heading"; - rev = "c535fd9b430d2cc50b54a1ab550d64e20ebd5bd6"; - sha256 = "0v2321lzivxd35174xgsnc95g49dlcgj8lzb6nlid1ri38fhqwyl"; + rev = "8e184f1ab1ef68417db9f12c7dce4d221fe6d496"; + sha256 = "1bhkfn2x02vpd0rxdgwz6lyycdnak2hxplna0hizim1k804gkxwn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaadbd149399c6e3c48ac5cbeedeb29a3f5791f1/recipes/org-bookmark-heading"; sha256 = "1q92rg9d945ypcpb7kig2r0cr7nb7avsylaa7nxjib25advx80n9"; - name = "org-bookmark-heading"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -52224,20 +68138,26 @@ license = lib.licenses.free; }; }) {}; - org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-brain = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-brain"; - version = "20180319.353"; + ename = "org-brain"; + version = "20180712.1410"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "3749aa100569e9d32609aa8368f12ced4dc1f757"; - sha256 = "0mld8lalq9lkihfv0vr9qsihdav6anvamihlcg2d69kcg088yqgj"; + rev = "d8dc1c4914c6200eaf44e36bf51a3cf02ef88fb9"; + sha256 = "1lygmnxyqgp0pm7gjy38vlkycyipqwhmyhmwqs3xr2hxgb9rlfd3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; sha256 = "0c05c6lbr740nnjp9p34padrbrc3q1x2pgylkyhsxadm4mfsvj0c"; - name = "org-brain"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -52245,9 +68165,13 @@ license = lib.licenses.free; }; }) {}; - org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-bullets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-bullets"; + ename = "org-bullets"; version = "20171127.526"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -52255,10 +68179,10 @@ rev = "5b096148bc37306f73b27da838dca751d5b1936f"; sha256 = "1yxikvbsbrqv9kjh1dc55w3xm44x4s7gamxq4f6jm045p8abfqrr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe60fc3c60d87b5fd7aa24e858c79753d5f7d2f6/recipes/org-bullets"; sha256 = "0yrfgd6r71rng3qipp3y9i5mpm6510k4xsfgyidcn25v27fysk3v"; - name = "org-bullets"; + name = "recipe"; }; packageRequires = []; meta = { @@ -52266,20 +68190,25 @@ license = lib.licenses.free; }; }) {}; - org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-caldav = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-caldav"; - version = "20170615.724"; + ename = "org-caldav"; + version = "20180403.1336"; src = fetchFromGitHub { owner = "dengste"; repo = "org-caldav"; - rev = "07e6ccda6756754a115d567f2ad3a760514b731d"; - sha256 = "0gaqkbdqkb7v6k2bg21c8c7c38g9rkgk8gy79s4gi6hzd4j717mp"; + rev = "8d3492c27a09f437d2d94f2736c56d7652e87aa0"; + sha256 = "19q83xgbdabkidx26xvff1x7kixk2wllplnwfsy7kggdj9wqpm9l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav"; sha256 = "1wzb5garpxg8p7zaqp6z5q0l2x8n9m7fjg5xy3vg9878njnqr9kc"; - name = "org-caldav"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -52287,9 +68216,14 @@ license = lib.licenses.free; }; }) {}; - org-capture-pop-frame = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-capture-pop-frame = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-capture-pop-frame"; + ename = "org-capture-pop-frame"; version = "20160518.308"; src = fetchFromGitHub { owner = "tumashu"; @@ -52297,10 +68231,10 @@ rev = "b16fd712de62cf0d1f9befd03be6ab5983cb3301"; sha256 = "01ffkk79wz2qkh9h9cjl59j34wvbiqzzxbbc9a06lh2rc946wgis"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b20edd229469b33ea87c40cfd06aa0bf95d149de/recipes/org-capture-pop-frame"; sha256 = "0g0b3vifwg39rb0fmad7y955dcqccnm01c6m27cv2x4xfib8ik3w"; - name = "org-capture-pop-frame"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -52308,20 +68242,26 @@ license = lib.licenses.free; }; }) {}; - org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-category-capture = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-category-capture"; - version = "20170819.1047"; + ename = "org-category-capture"; + version = "20180531.1942"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "53c193a209d663b33de71fe7d35eb40c0d0e15b6"; - sha256 = "0kcbcj1nz2asi1v1nbqa2lp1qjg90nbdz2913m8c6dnwhff8rr0j"; + rev = "e57023c0e33e4a0f848fcfec1902e13e6a92f711"; + sha256 = "03svxxx6jh0c5517yvp7g5lfvjn3n4r169j589iii0fcjp4qri3n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; sha256 = "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav"; - name = "org-category-capture"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -52329,20 +68269,26 @@ license = lib.licenses.free; }; }) {}; - org-chef = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-chef = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-chef"; - version = "20180325.628"; + ename = "org-chef"; + version = "20180706.1835"; src = fetchFromGitHub { owner = "Chobbes"; repo = "org-chef"; - rev = "36fc59b4181456d7bd4c8227c34edbad600b08f3"; - sha256 = "0yvrxl24a0q4wbhmx2azsylwapih0xf6a5rhch3ppzhy4vyrdjcf"; + rev = "6b004af05d05c981b9cf9d24a525242e36129b46"; + sha256 = "1jb2s3q02z8rjzcdxmnk91p4f75illdfjmmz93yv0izp5irhm9s7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23b9e64887a290fca7c7ab2718f627f8d728575f/recipes/org-chef"; sha256 = "1xzbdrv5z31lxnzzgbp50l10lzlvx6j7kc7ssg76fma49wfpnra5"; - name = "org-chef"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -52350,20 +68296,25 @@ license = lib.licenses.free; }; }) {}; - org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-cliplink = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-cliplink"; - version = "20170724.413"; + ename = "org-cliplink"; + version = "20180717.408"; src = fetchFromGitHub { owner = "rexim"; repo = "org-cliplink"; - rev = "16c2cad9c3bafb71fea70f70c1e584307a6dee01"; - sha256 = "1k3vcr4fr290pg00gvb9q9wpvq1fk6pzgw95x12fdrig5lp48hih"; + rev = "7d35b09ebdb160a2aee3145766454a11d27b3fb7"; + sha256 = "0kskxy07i2yhb36ncsqxm50m2cry40qc7gg4x4z7rhbmski653ab"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink"; sha256 = "19l3k9w9csgvdr7n824bzg7jja0f28dmz6caldxh43vankpmlg3p"; - name = "org-cliplink"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -52371,20 +68322,27 @@ license = lib.licenses.free; }; }) {}; - org-clock-convenience = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-clock-convenience = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-clock-convenience"; + ename = "org-clock-convenience"; version = "20160830.1156"; src = fetchFromGitHub { owner = "dfeich"; repo = "org-clock-convenience"; - rev = "2d3fab0991ef7fa8d94c46a63a66abd289c79d9e"; - sha256 = "0dm8mzjy2hldn9lqblrfcq5w4d2byrgggg6wcs9rhdnpx96cvz74"; + rev = "d4f98e95d75d78822ddfab6b67bc971516f9773c"; + sha256 = "0s69jqadrgsmlv74386i900gr6xr3kgr5x1n75gqf4rsdmhx4s5d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a80ed929181cdd28886ca598a0c387a31d239b2e/recipes/org-clock-convenience"; sha256 = "1zis0fp7q253qfxypm7a69zb3w8jb4cbrbj2rk34d1jisvnn4irw"; - name = "org-clock-convenience"; + name = "recipe"; }; packageRequires = [ cl-lib emacs org ]; meta = { @@ -52392,9 +68350,15 @@ license = lib.licenses.free; }; }) {}; - org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: - melpaBuild { + org-clock-csv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , s }: + melpaBuild { pname = "org-clock-csv"; + ename = "org-clock-csv"; version = "20180313.1957"; src = fetchFromGitHub { owner = "atheriel"; @@ -52402,10 +68366,10 @@ rev = "4a6e9e4895799afa0b994f4a908c1e3c2043451f"; sha256 = "1f7xvarimv82xwiw5cavnak7av0yi4afn94nhhp60pyfh8azls50"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; sha256 = "02spjrzdf1kmvyvqkzg7nnmq9kqv75zwxn5ifqmg0f7a1gw28f0l"; - name = "org-clock-csv"; + name = "recipe"; }; packageRequires = [ org s ]; meta = { @@ -52413,9 +68377,14 @@ license = lib.licenses.free; }; }) {}; - org-clock-today = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-clock-today = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-clock-today"; + ename = "org-clock-today"; version = "20161014.220"; src = fetchFromGitHub { owner = "mallt"; @@ -52423,10 +68392,10 @@ rev = "02b8fd541a01040405a9a1400c46dcb68b7c2a3a"; sha256 = "1gbkrgbpsrwkjd199giffim8jvx1n4dqrsyk53sz1swj9dlhxgp9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-clock-today"; sha256 = "1x9hplz9w2kpa239rz6y02hsl4fgzxlkwr9hhwjy12x1f88x0k73"; - name = "org-clock-today"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -52434,9 +68403,16 @@ license = lib.licenses.free; }; }) {}; - org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-commentary = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-commentary"; + ename = "org-commentary"; version = "20160801.2337"; src = fetchFromGitHub { owner = "smaximov"; @@ -52444,10 +68420,10 @@ rev = "821ccb994811359c42f4e3d459e0e88849d42b75"; sha256 = "0ixhyn8s7l2caq0qpv9zlq9fzm3z8b81755c3yffnk5camnij6py"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e0a40d9ea5849b9c22378a84ac8122e4eb2737d/recipes/org-commentary"; sha256 = "0ym1rq2zhyhc6hkk40wsa9jni2h1z5dkaisldqzg8ggl7iv3v4fx"; - name = "org-commentary"; + name = "recipe"; }; packageRequires = [ dash emacs org ]; meta = { @@ -52455,9 +68431,13 @@ license = lib.licenses.free; }; }) {}; - org-context = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-context = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-context"; + ename = "org-context"; version = "20170107.537"; src = fetchFromGitHub { owner = "thisirs"; @@ -52465,10 +68445,10 @@ rev = "a3b4a4ce6d15e3c2d45eb5dcb78bea81913f3e21"; sha256 = "18swz38q8z1nga6l8f1l27b7ba3y5y3ikk0baplmich3hxav58xj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f33b6157eb172719a56c3e86233708b1e545e451/recipes/org-context"; sha256 = "19y8aln7wix9p506ajvfkl641147c5mdmjm98jnq68cx2r4wp6zz"; - name = "org-context"; + name = "recipe"; }; packageRequires = []; meta = { @@ -52476,9 +68456,13 @@ license = lib.licenses.free; }; }) {}; - org-cua-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-cua-dwim = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-cua-dwim"; + ename = "org-cua-dwim"; version = "20120202.2134"; src = fetchFromGitHub { owner = "mattfidler"; @@ -52486,10 +68470,10 @@ rev = "a55d6c7009fc0b22f1110c07de629acc955c85e4"; sha256 = "0nrfvmqb70phnq0k4wbdj6z666wq6xvabg4pgv8qn62rbrw4yyhm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-cua-dwim"; sha256 = "0ib3m41b4lh0p0xxhsmfv42qs00xm2cfwwl2cgfdjjp1s57p19xy"; - name = "org-cua-dwim"; + name = "recipe"; }; packageRequires = []; meta = { @@ -52497,9 +68481,14 @@ license = lib.licenses.free; }; }) {}; - org-dashboard = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-dashboard = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-dashboard"; + ename = "org-dashboard"; version = "20171223.1124"; src = fetchFromGitHub { owner = "bard"; @@ -52507,10 +68496,10 @@ rev = "02c0699771d199075a286e4502340ca6e7c9e831"; sha256 = "0zi23xgv5fq827dljhzp6m2v7ggr3pdw3fpgq8515gs9q4f12v1r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11ce0ba772672d9cbae5713ebaf3798eec5fdb3c/recipes/org-dashboard"; sha256 = "1hvhhbmyx12wsf2n1hd0hg5cy05zyspd82xxcdh04g4s9r3ikqj5"; - name = "org-dashboard"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -52518,20 +68507,24 @@ license = lib.licenses.free; }; }) {}; - org-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-doing = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-doing"; + ename = "org-doing"; version = "20161017.920"; src = fetchFromGitHub { owner = "omouse"; repo = "org-doing"; - rev = "07ddbfc238cba31e4990c9b52e9a2757b39111da"; - sha256 = "1d9gf6wf3jp07bn2h6bbc75iy0wwdvzdlj9n4nwbc46nf3k154pa"; + rev = "4819e75c827c2115bd28f3b3148d846aa64ccd9b"; + sha256 = "0pb7ljysh8ap572f9y813js6lvvac4kjky2a5r39hv28px33hmx5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c497b87e14ab614c963f4b2f041bc0111b6e936/recipes/org-doing"; sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j"; - name = "org-doing"; + name = "recipe"; }; packageRequires = []; meta = { @@ -52539,9 +68532,15 @@ license = lib.licenses.free; }; }) {}; - org-dotemacs = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-dotemacs = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-dotemacs"; + ename = "org-dotemacs"; version = "20151119.1022"; src = fetchFromGitHub { owner = "vapniks"; @@ -52549,10 +68548,10 @@ rev = "99a066508fedf8c80a3bfef08e015e612499d417"; sha256 = "15zrnd168n4pwa1bj5fz79hcrgw61braf0b095rsfhjh5w2sasy7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c1847184312c8c95e7e81e5b3b73e5621cc2509/recipes/org-dotemacs"; sha256 = "1vc391fdkdqd4g0piq66zhrlgqx5s2ijv7qd1rc3a235sjb9i2n4"; - name = "org-dotemacs"; + name = "recipe"; }; packageRequires = [ cl-lib org ]; meta = { @@ -52560,20 +68559,25 @@ license = lib.licenses.free; }; }) {}; - org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-download = callPackage ({ async + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-download"; - version = "20180327.1429"; + ename = "org-download"; + version = "20180625.842"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "a57beffd0f09b218a9487d1750960878c1d5b12c"; - sha256 = "1disqqfwjl366kv6xgc28w7zbc4xl9a0jmdj7w27mb00sxzfk3vb"; + rev = "434447251343164e3aacd9db17e67dd2a10b6e65"; + sha256 = "1ckkwdyvxiwhlxl00fd96v01vb71bdnzb3xyl04pxwjsydcbsai0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; sha256 = "19yjx0qqpmrdwagp3d6lwwv7dcb745m9ccq3m29sin74f5p4svsi"; - name = "org-download"; + name = "recipe"; }; packageRequires = [ async ]; meta = { @@ -52581,9 +68585,14 @@ license = lib.licenses.free; }; }) {}; - org-dp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-dp = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-dp"; + ename = "org-dp"; version = "20180311.123"; src = fetchFromGitHub { owner = "tj64"; @@ -52591,10 +68600,10 @@ rev = "334fefd06eb925c86b1642787b2a088aa0932bab"; sha256 = "0cjx9428ypadvrlbfnfj6zwnfhdcay82q2f9x8v5gaffa6wrr7j3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f337375082da316ed07b8ce9c775b484b8cdbf6/recipes/org-dp"; sha256 = "0fnrzpgw8l0g862j20yy4mw1wfcm2i04r6dxi4yd7yay8bw2i4yq"; - name = "org-dp"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -52602,20 +68611,29 @@ license = lib.licenses.free; }; }) {}; - org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: - melpaBuild { + org-drill-table = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , s }: + melpaBuild { pname = "org-drill-table"; + ename = "org-drill-table"; version = "20180115.209"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "org-drill-table"; - rev = "096387d929bcf3eb479e0a9d5da9cf32c756a759"; - sha256 = "1a8ygrcag8i9hdpy2vsn0sh8lwhl9b56rv91j3rddy1jv5qx1ipb"; + rev = "e4c4c1b0a17f51cb8de67eafe06a6bffc754f525"; + sha256 = "1nzn890z30l062flbnww9f3nq7wm5x5146rh76az8h7jm6vigvca"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3347da186765877826b224e1f5d1b585ebd3692c/recipes/org-drill-table"; sha256 = "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69"; - name = "org-drill-table"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs org s ]; meta = { @@ -52623,20 +68641,27 @@ license = lib.licenses.free; }; }) {}; - org-dropbox = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { + org-dropbox = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names }: + melpaBuild { pname = "org-dropbox"; + ename = "org-dropbox"; version = "20150113.2109"; src = fetchFromGitHub { owner = "heikkil"; repo = "org-dropbox"; - rev = "75dab6d6f0438a7a8a18ccf3a5d55f50bf531f6e"; - sha256 = "0jjdsng7fm4wbhvd9naqzdfsmkvj1sf1d9rikprg1pd58azv6idx"; + rev = "2dc677a770c9e82f928ad8e97a7707eb368e58ed"; + sha256 = "1ldyxxlgfm2zskjr06b5kppq560cy75ic2dh9si09hrsw3qj0m4s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd613fbe42c41b125a25dfa0206666446dc5fa40/recipes/org-dropbox"; sha256 = "0qfvdz13ncqn7qaz03lwabzsnk62z6wqzlxlvdqv5xyllcy9m6ln"; - name = "org-dropbox"; + name = "recipe"; }; packageRequires = [ dash emacs names ]; meta = { @@ -52644,20 +68669,25 @@ license = lib.licenses.free; }; }) {}; - org-easy-img-insert = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-easy-img-insert = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-easy-img-insert"; + ename = "org-easy-img-insert"; version = "20160915.1308"; src = fetchFromGitHub { owner = "tashrifsanil"; repo = "org-easy-img-insert"; - rev = "9f8aaa7f68ff1f0d8d7b1e9b618abb15002f971e"; - sha256 = "1p0hzfzlcdmd8d01a4xqg27n7qcnv7a03n8wiicv0dnicx179952"; + rev = "3efb4d70e5a39bfbf7ee4c4033cc61afa89430dd"; + sha256 = "1nijybb8dc251n187ljwffw3hxppb7nhb0lhc7jx4fyymg3r27l3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/512db70609fc451972405acb4b186a9b3c6944fa/recipes/org-easy-img-insert"; sha256 = "0gpb9f66gn8dbhwrlw7z2a5rpphbh1fv845wz8yy4v7nv2j3sf54"; - name = "org-easy-img-insert"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -52665,20 +68695,26 @@ license = lib.licenses.free; }; }) {}; - org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-edit-latex = callPackage ({ auctex + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-edit-latex"; + ename = "org-edit-latex"; version = "20170908.822"; src = fetchFromGitHub { owner = "et2010"; repo = "org-edit-latex"; - rev = "1f228310ef2f3f2959a527f6d99e42ce977384c8"; - sha256 = "1zfimgnmn7nqaq8aglyly55k5dr548467masr2g4x3m0z1by1z6b"; + rev = "ecd91601cb6f3aa79d055bde99bfec6d2b335952"; + sha256 = "0m2smwn18zvq5sg5p6j15vf6s1y9lzzrl088ziv9725wil5jwkly"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex"; sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry"; - name = "org-edit-latex"; + name = "recipe"; }; packageRequires = [ auctex emacs ]; meta = { @@ -52686,9 +68722,15 @@ license = lib.licenses.free; }; }) {}; - org-ehtml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }: - melpaBuild { + org-ehtml = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-server }: + melpaBuild { pname = "org-ehtml"; + ename = "org-ehtml"; version = "20150506.1658"; src = fetchFromGitHub { owner = "eschulte"; @@ -52696,10 +68738,10 @@ rev = "9df85de1a0fe1e7b2d6c000777c1a0c0217f92d0"; sha256 = "0kqvwqmwnwg2h7r38fpjg6qlkcj9v8011df8nmsgs1w1mfdvnjsq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f68028b3f4d2455da6d657e90abcab6181db284/recipes/org-ehtml"; sha256 = "0n82fbd7aircqg2c9m138qfv8csrv0amhya3xlwswdkqn51vn3gw"; - name = "org-ehtml"; + name = "recipe"; }; packageRequires = [ emacs web-server ]; meta = { @@ -52707,9 +68749,15 @@ license = lib.licenses.free; }; }) {}; - org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-elisp-help = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-elisp-help"; + ename = "org-elisp-help"; version = "20161121.1655"; src = fetchFromGitHub { owner = "tarsius"; @@ -52717,10 +68765,10 @@ rev = "3e33ab1a2933dd7f2782ef91d667a37f12d633ab"; sha256 = "088pbafz1x4z7qi70cjbrvfrcdrjp4zy0yl115klbidshqhxycmj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help"; sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h"; - name = "org-elisp-help"; + name = "recipe"; }; packageRequires = [ cl-lib org ]; meta = { @@ -52728,20 +68776,28 @@ license = lib.licenses.free; }; }) {}; - org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }: - melpaBuild { + org-evil = callPackage ({ dash + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , monitor + , org }: + melpaBuild { pname = "org-evil"; - version = "20171102.556"; + ename = "org-evil"; + version = "20180620.817"; src = fetchFromGitHub { owner = "GuiltyDolphin"; repo = "org-evil"; - rev = "90a82ec72fb688ef98d1343c02dc3c6da9e4bbee"; - sha256 = "0fl9m1bgcmvxpdmb05lbna9snfrd8gbrn16c2w72b3asxx7acq94"; + rev = "3b4620edc606412ef75c0b5aa637af22486eb126"; + sha256 = "0aqya9l9s55h5wd728iz15f53p5xajrfk8pn9gjxnw0i8m4d09sd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; sha256 = "0wvd201k9b9ghg39rwbah6rw8b7hyyd27vvqjynjwbk3v8rp5zyn"; - name = "org-evil"; + name = "recipe"; }; packageRequires = [ dash evil monitor org ]; meta = { @@ -52749,20 +68805,24 @@ license = lib.licenses.free; }; }) {}; - org-fancy-priorities = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-fancy-priorities = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-fancy-priorities"; + ename = "org-fancy-priorities"; version = "20180328.1631"; src = fetchFromGitHub { owner = "harrybournis"; repo = "org-fancy-priorities"; - rev = "819bb993b71e7253cefef7047306ab4e0f9d0a86"; - sha256 = "13cyzlx0415i953prq6ch7r5iy23c1pz116bdxi5yqags4igh4wv"; + rev = "fc09edc9b139e82395982d08db2825702045cb85"; + sha256 = "0pzqbszjm24c8gfcczcmn242ipprsqi7pmys65bqgz63iypfxpcw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/712902ae1cf967ceb2052266ed3244e92998f8a7/recipes/org-fancy-priorities"; sha256 = "13rljgi5fbzlc16cxqj49yg47a5qpyxzj0lswhdyhgzncp1fyq7p"; - name = "org-fancy-priorities"; + name = "recipe"; }; packageRequires = []; meta = { @@ -52770,20 +68830,29 @@ license = lib.licenses.free; }; }) {}; - org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }: - melpaBuild { + org-gcal = callPackage ({ alert + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , request-deferred }: + melpaBuild { pname = "org-gcal"; + ename = "org-gcal"; version = "20170420.1401"; src = fetchFromGitHub { owner = "myuhe"; repo = "org-gcal.el"; - rev = "bdc704842da000a1cffb8f155ef3887c5e1d0446"; - sha256 = "0nbwxmc2arssy1ll416i6chb0rx239jh2fm1lcylhdg3af25rsbj"; + rev = "270ae5d94a5d2e22cdd1fc4063534483a0dfef87"; + sha256 = "0j6i05qczv14k1rw5bry6ys66ykh46dx9837lyswfl0mwrgl3i04"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal"; sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q"; - name = "org-gcal"; + name = "recipe"; }; packageRequires = [ alert cl-lib emacs org request-deferred ]; meta = { @@ -52791,20 +68860,27 @@ license = lib.licenses.free; }; }) {}; - org-gnome = callPackage ({ alert, fetchFromGitHub, fetchurl, gnome-calendar, lib, melpaBuild, telepathy }: - melpaBuild { + org-gnome = callPackage ({ alert + , fetchFromGitHub + , fetchurl + , gnome-calendar + , lib + , melpaBuild + , telepathy }: + melpaBuild { pname = "org-gnome"; + ename = "org-gnome"; version = "20150614.757"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "org-gnome.el"; - rev = "122e14cf6f8104150a65246a9a7c10e1d7939862"; - sha256 = "0jd5zwykc6fkkaj8qhg7wgmrjn47054x242b5s03w8ylyczqbcg3"; + rev = "1012d47886cfd30eed25b73d9f18e475e0155f88"; + sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4f7ebd2d2312954d098fe4afd07c3d02b4df475d/recipes/org-gnome"; sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v"; - name = "org-gnome"; + name = "recipe"; }; packageRequires = [ alert gnome-calendar telepathy ]; meta = { @@ -52812,9 +68888,14 @@ license = lib.licenses.free; }; }) {}; - org-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-grep = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-grep"; + ename = "org-grep"; version = "20151202.429"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -52822,10 +68903,10 @@ rev = "5bdd04c0f53b8a3d656f36ea17bba3df7f0cb684"; sha256 = "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ed0682fb9130a62e628d4e64747bb9c70456681/recipes/org-grep"; sha256 = "0kpgizy0zxnlmyh0prwdll62ri2c1l4sb0yrkl7yw17cr4gxmkkz"; - name = "org-grep"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -52833,9 +68914,13 @@ license = lib.licenses.free; }; }) {}; - org-if = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + org-if = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-if"; + ename = "org-if"; version = "20150920.813"; src = fetchFromGitLab { owner = "elzair"; @@ -52843,10 +68928,10 @@ rev = "fab602cc1bbee7a4e99c0083e129219d3f9ed2e8"; sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09df84b60c46678ad40d8dabc08fcfe518f5ad79/recipes/org-if"; sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96"; - name = "org-if"; + name = "recipe"; }; packageRequires = []; meta = { @@ -52854,9 +68939,42 @@ license = lib.licenses.free; }; }) {}; - org-iv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, impatient-mode, lib, melpaBuild, org }: - melpaBuild { + org-index = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "org-index"; + ename = "org-index"; + version = "20180720.127"; + src = fetchFromGitHub { + owner = "marcihm"; + repo = "org-index"; + rev = "54b1485eea187575840e4eac79b950273d243455"; + sha256 = "1fmq30768cqhz52frkvrcr52wzbpaqbgwvgl28gac2dxzypg9zgb"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index"; + sha256 = "1dp52xqrhby2xyi6p2d0ggp5irqsqwicp62ndg5wszyd33clxab5"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-index"; + license = lib.licenses.free; + }; + }) {}; + org-iv = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , impatient-mode + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-iv"; + ename = "org-iv"; version = "20171001.322"; src = fetchFromGitHub { owner = "kuangdash"; @@ -52864,10 +68982,10 @@ rev = "7f2bb1b32647655fd9d6684f6f09dcc66b61b0cd"; sha256 = "0s3fi8sk7jm5vr0fz20fbygm4alhpirv0j20jfi1pab14yhhf34h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7db0c34f0f6fb9c3b9e581a74304cc9a26ed342/recipes/org-iv"; sha256 = "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx"; - name = "org-iv"; + name = "recipe"; }; packageRequires = [ cl-lib impatient-mode org ]; meta = { @@ -52875,20 +68993,28 @@ license = lib.licenses.free; }; }) {}; - org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: - melpaBuild { + org-jira = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , s }: + melpaBuild { pname = "org-jira"; - version = "20180103.1813"; + ename = "org-jira"; + version = "20180625.2111"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "51a1b2248ec421aecdd38aaf5c2876a036b08bb7"; - sha256 = "0zyh5nn9hgiz0ic67ypahaah5f3vjmall7z0ffn4gl0fy22sar6h"; + rev = "03d6ebcf177db7b208c6a99386695e839f314314"; + sha256 = "07hy37by9ics7rc1sgkpg8qk2xzp67ny4i4rkd7q7j4abqdr131v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib"; - name = "org-jira"; + name = "recipe"; }; packageRequires = [ cl-lib emacs request s ]; meta = { @@ -52896,51 +69022,68 @@ license = lib.licenses.free; }; }) {}; - org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-journal = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-journal"; - version = "20180327.819"; + ename = "org-journal"; + version = "20180603.102"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "d225d093e2e87574b67d79206764b6cf5cf7a00e"; - sha256 = "0c8bms5pypwk08cv8a6pchrxf5nx97sygpa4pmaxlvccsa45n8a2"; + rev = "2395db4deb255c05d0d3a75c95f53263b74939c9"; + sha256 = "018wjn7v8a1z4z1sycz7b01rdck73ap13cr3lvfqvp9mms94qq71"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b"; - name = "org-journal"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/org-journal"; license = lib.licenses.free; }; }) {}; - org-kanban = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-kanban = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-kanban"; - version = "20180313.1339"; + ename = "org-kanban"; + version = "20180722.1158"; src = fetchFromGitHub { owner = "gizmomogwai"; repo = "org-kanban"; - rev = "c240a1894b7ae4ed292657b4d3cf03db8274f451"; - sha256 = "12l9yb5dzhv9fgcl8nba5dh403bafx1klq2sw0n1v7zv82dic57i"; + rev = "4f499e97c4583e99b042f579110a8be197337bda"; + sha256 = "0z7k240j1jqw8dqxwqr06ljnlmx3q0grrbangfr5py9z48dc63vl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban"; sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41"; - name = "org-kanban"; + name = "recipe"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ dash emacs org ]; meta = { homepage = "https://melpa.org/#/org-kanban"; license = lib.licenses.free; }; }) {}; - org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-link-minor-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-link-minor-mode"; + ename = "org-link-minor-mode"; version = "20170805.1152"; src = fetchFromGitHub { owner = "seanohalpin"; @@ -52948,10 +69091,10 @@ rev = "7b92df60f3fee7f609d649d80ef243b45771ebea"; sha256 = "1lz7qj57s391ssawmccvhgxv1w99fj1m9rg3g4pymdl3sgdcz4g4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1d2add7baf96c9a18671766d61c8aa028756796/recipes/org-link-minor-mode"; sha256 = "1akb670mzzhmldw2202x3k6b7vwfcn0rs55znpxsrc4iqihdgka3"; - name = "org-link-minor-mode"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -52959,9 +69102,14 @@ license = lib.licenses.free; }; }) {}; - org-link-travis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-link-travis = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-link-travis"; + ename = "org-link-travis"; version = "20140405.1627"; src = fetchFromGitHub { owner = "aki2o"; @@ -52969,10 +69117,10 @@ rev = "596615ad8373d9090bd4138da683524f0ad0bda5"; sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c7f9539630e5ac7748fe36fd27c3486649ab74/recipes/org-link-travis"; sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs"; - name = "org-link-travis"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -52980,9 +69128,15 @@ license = lib.licenses.free; }; }) {}; - org-linkany = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + org-linkany = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "org-linkany"; + ename = "org-linkany"; version = "20160206.2011"; src = fetchFromGitHub { owner = "aki2o"; @@ -52990,10 +69144,10 @@ rev = "8cfe2f1a46e6654a79f56505349d1396263cecb3"; sha256 = "0lqxzmjxs80z3z90f66f3zfrdajiamdcwpvfv5j2w40js9xz4x37"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df82cf95e34775b22da0a8bb29750f603c58f259/recipes/org-linkany"; sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c"; - name = "org-linkany"; + name = "recipe"; }; packageRequires = [ log4e yaxception ]; meta = { @@ -53001,20 +69155,83 @@ license = lib.licenses.free; }; }) {}; - org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-listcruncher = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { + pname = "org-listcruncher"; + ename = "org-listcruncher"; + version = "20180630.1326"; + src = fetchFromGitHub { + owner = "dfeich"; + repo = "org-listcruncher"; + rev = "6fb86f740f8b9fb283049132e108863d1918a893"; + sha256 = "04nykrcmsx5pqhyk305n0xh828fmdng2pqhhnylisnwds1v13cbp"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5bed5078a3e56a825be61d158ca8321763b92f7c/recipes/org-listcruncher"; + sha256 = "05vi7a03gj1waaqcjnkgpij4r45r2087xg7kgfs6ki8zhsyws23q"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs seq ]; + meta = { + homepage = "https://melpa.org/#/org-listcruncher"; + license = lib.licenses.free; + }; + }) {}; + org-make-toc = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , s }: + melpaBuild { + pname = "org-make-toc"; + ename = "org-make-toc"; + version = "20180614.1959"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "org-make-toc"; + rev = "c27e3600473100daa3007fb134cd3fe13e821d90"; + sha256 = "0078qpimkx6ps1cnyb1kaxiz4k93ppm7axsbrm18qic6mvp6i2nc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/df87749128bcfd27ca93a65084a2e88cd9ed5c3f/recipes/org-make-toc"; + sha256 = "0xaw3d1axvln4pr7p0jnqf0j6fd1g6cra1gykvf6y12zx02xkchh"; + name = "recipe"; + }; + packageRequires = [ dash emacs org s ]; + meta = { + homepage = "https://melpa.org/#/org-make-toc"; + license = lib.licenses.free; + }; + }) {}; + org-mime = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-mime"; - version = "20180313.524"; + ename = "org-mime"; + version = "20180607.2350"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "10098b001c3926f0fb128c85fc64d9016a195868"; - sha256 = "0xb37lg7rlgfwkhvwwsb9wv7k5yig8n8bnxq97hxrbx56dh70mhr"; + rev = "895a7c31bb6aa0913b902ece414d0ad29dc8cf1f"; + sha256 = "1s0z2zljbk2nsd8rrpknrydi3b7rzfrc21bq396pxhfz11irz3pb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6"; - name = "org-mime"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -53022,20 +69239,27 @@ license = lib.licenses.free; }; }) {}; - org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-mind-map = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-mind-map"; - version = "20171206.645"; + ename = "org-mind-map"; + version = "20180614.1352"; src = fetchFromGitHub { owner = "theodorewiles"; repo = "org-mind-map"; - rev = "d7854dbd30d565d3087d2810d6a77cc882988eae"; - sha256 = "0jkm6ar07m399hqanjpw6y7bxdr59j72skmi9ncgjyb81ch70g36"; + rev = "c0578ee519ad54451e758e401acae2914f52c47a"; + sha256 = "1z43c3vwmd8h8nnncp6fya0l73rfqmb6ij01mp027pxpazq3skhc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map"; sha256 = "07wffzf4dzfj8bplwhr9yscm6l9wbz8y01j0jc8cw943z5b8pdgs"; - name = "org-mind-map"; + name = "recipe"; }; packageRequires = [ dash emacs org ]; meta = { @@ -53043,20 +69267,25 @@ license = lib.licenses.free; }; }) {}; - org-mobile-sync = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-mobile-sync = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-mobile-sync"; - version = "20160629.1307"; - src = fetchFromGitHub { - owner = "steckerhalter"; - repo = "org-mobile-sync"; - rev = "442bcfe93f4f2cab02e2dd2c3634fbffcda9a17d"; - sha256 = "0vzafaqkrwjg22yf4lcqrg02xv4nqwgpphbrdmh90c4d3rlhrck1"; + ename = "org-mobile-sync"; + version = "20180605.2224"; + src = fetchgit { + url = "https://framagit.org/steckerhalter/org-mobile-sync.git"; + rev = "06764b943a528827df1e2acc6bc7806cc2c1351f"; + sha256 = "0qdgs965ppihsz2ihyykdinr4n7nbb89d384z7kn985b17263lvn"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/24335fa800ba6c18ca6690464fbb0232bb697c7a/recipes/org-mobile-sync"; - sha256 = "1cj0pxcjngiipmyl0w1p0g4wrxgm2y98a8862x1lcbali9lqbrwj"; - name = "org-mobile-sync"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/org-mobile-sync"; + sha256 = "152mswykbz3m9w1grpsvb6wi9rg1vf3clnrl8qy6v911c0hy1s9c"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -53064,20 +69293,25 @@ license = lib.licenses.free; }; }) {}; - org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-mru-clock = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-mru-clock"; - version = "20180219.359"; + ename = "org-mru-clock"; + version = "20180419.606"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "18301b6ffe1149e373dc07d5047b67b9e1faec64"; - sha256 = "13x25fk2wnddzgx11rmkrhpvaava0knaqhlhk36c6pyldbhbhbxy"; + rev = "0e2dcb7799fb82bbe55c8aa9930192871e8b6109"; + sha256 = "08z6jc7qhj7zmzf1sag1n4nqh77k1dis2ijc6s2pzqlaxm3rhxyw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; sha256 = "1arww5x6vdyyn1bwxry91w88phbr9l6nk8xxrw40iqmmbhggahgm"; - name = "org-mru-clock"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -53085,9 +69319,16 @@ license = lib.licenses.free; }; }) {}; - org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-multiple-keymap = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-multiple-keymap"; + ename = "org-multiple-keymap"; version = "20150328.1806"; src = fetchFromGitHub { owner = "myuhe"; @@ -53095,10 +69336,10 @@ rev = "8ebc532df7f0dd6e6c3aa7c380a51d4166c668e8"; sha256 = "0zbpzm9lni6z180s7n52x8s5by5zkq2nlhx82l2h9i7in9y4r6c3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a22beed723d149282e70e3411b79e8ce9f5ab2b/recipes/org-multiple-keymap"; sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f"; - name = "org-multiple-keymap"; + name = "recipe"; }; packageRequires = [ cl-lib emacs org ]; meta = { @@ -53106,20 +69347,27 @@ license = lib.licenses.free; }; }) {}; - org-notebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-notebook = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-notebook"; + ename = "org-notebook"; version = "20170321.2152"; src = fetchFromGitHub { owner = "Rahi374"; repo = "org-notebook"; - rev = "86042d866bf441e2c9bb51f995e5994141b78517"; - sha256 = "0znxn6zzc9645m3wmkryf4xwjskf7gwylrg6z2kmr1wpjlpfwb01"; + rev = "d90c4aeca2442161e6dd89de175561af85aace03"; + sha256 = "15hf0x0v4fz6gxj8qx9pfm6xic7qni33nn4ga6cxbdgpwgyr61wz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04149b1f158e857ea824fe120372ac52a000adcf/recipes/org-notebook"; sha256 = "045xqmrik1s83chl7l7fnlav2p76xrfj21kacpjj215saz1f8nld"; - name = "org-notebook"; + name = "recipe"; }; packageRequires = [ cl-lib emacs org ]; meta = { @@ -53127,20 +69375,27 @@ license = lib.licenses.free; }; }) {}; - org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-noter = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-noter"; - version = "20180331.1231"; + ename = "org-noter"; + version = "20180722.853"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "32cdf41079ca67c5906a10215eb7fbaefebab994"; - sha256 = "11hhw8fk1qn63hwdx49h9h58p2hmxhmni6qdazd0ipk68finmy8f"; + rev = "447c890e173884e9ca459b73ac3a771fc59e8512"; + sha256 = "01akk7zdyijclb3igmm56xyz2h9ffc0j0skawb1xwwrni7aphnbm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; sha256 = "0vsc2b1yz9lw0zv1vnm722pl35kxpwhcdi7h6mijhnw8vv7rhixf"; - name = "org-noter"; + name = "recipe"; }; packageRequires = [ cl-lib emacs org ]; meta = { @@ -53148,9 +69403,16 @@ license = lib.licenses.free; }; }) {}; - org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }: - melpaBuild { + org-octopress = callPackage ({ ctable + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , orglue }: + melpaBuild { pname = "org-octopress"; + ename = "org-octopress"; version = "20170820.2115"; src = fetchFromGitHub { owner = "yoshinari-nomura"; @@ -53158,10 +69420,10 @@ rev = "38598ef98d04076a8eb78d549907ddfde8d3a652"; sha256 = "0bmj5wkwidj1v3b8ipligr0nkfdaxm82717nz8fqidz967q4xbk6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fba6c3c645ba903f636814b5a2bb1baca0b5283b/recipes/org-octopress"; sha256 = "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw"; - name = "org-octopress"; + name = "recipe"; }; packageRequires = [ ctable org orglue ]; meta = { @@ -53169,9 +69431,16 @@ license = lib.licenses.free; }; }) {}; - org-onenote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, org, request }: - melpaBuild { + org-onenote = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , oauth2 + , org + , request }: + melpaBuild { pname = "org-onenote"; + ename = "org-onenote"; version = "20171007.2200"; src = fetchFromGitHub { owner = "ifree"; @@ -53179,10 +69448,10 @@ rev = "5ce5cf4edb143180e0b185ac26826d39ae5bc929"; sha256 = "1jlnnb04ichcl155lklvjw91l8j1dvg77bv1815chak226aq4xqj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7705ee9a8733733664b6214bf4eec15d640c6895/recipes/org-onenote"; sha256 = "0qgmizzryb6747yd80d3nic3546f4h8vjd6c30jr99vv2ildjsfk"; - name = "org-onenote"; + name = "recipe"; }; packageRequires = [ oauth2 org request ]; meta = { @@ -53190,9 +69459,42 @@ license = lib.licenses.free; }; }) {}; - org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-outline-numbering = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , org + , ov }: + melpaBuild { + pname = "org-outline-numbering"; + ename = "org-outline-numbering"; + version = "20180705.801"; + src = fetchFromGitLab { + owner = "andersjohansson"; + repo = "org-outline-numbering"; + rev = "b95b6a7ed9289637cb512232470633b330ca9713"; + sha256 = "03x3n2ywgk2x7slpzy26bw3l9l000pd964z0yifvf9fqhpbk5d0r"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6dbd71c2176c1160e8418631d69f4bcba75845fd/recipes/org-outline-numbering"; + sha256 = "131cpvfsiv92bbicq5n7dlr6k643sk7xw31xs0lwmw4pxq44m8sg"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs org ov ]; + meta = { + homepage = "https://melpa.org/#/org-outline-numbering"; + license = lib.licenses.free; + }; + }) {}; + org-outlook = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-outlook"; + ename = "org-outlook"; version = "20160705.638"; src = fetchFromGitHub { owner = "mattfidler"; @@ -53200,10 +69502,10 @@ rev = "ec32d8d9d8ffd17e6de4de0b52fc3f5ad9b4cc0d"; sha256 = "1la7g9qzn8wbfzc2zd6gddi1zl145b35311l66sjyffidmhgfw8d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/804a4b6802d2cf53e5415d956f0b4772853f4c69/recipes/org-outlook"; sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9"; - name = "org-outlook"; + name = "recipe"; }; packageRequires = []; meta = { @@ -53211,9 +69513,21 @@ license = lib.licenses.free; }; }) {}; - org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: - melpaBuild { + org-page = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , git + , ht + , htmlize + , lib + , melpaBuild + , mustache + , org + , simple-httpd }: + melpaBuild { pname = "org-page"; + ename = "org-page"; version = "20170806.1924"; src = fetchFromGitHub { owner = "kelvinh"; @@ -53221,10 +69535,10 @@ rev = "50430ababf73a2d090881a952e9770badaf7478b"; sha256 = "1xph0pdcbzlxfnbhhad2jgkznrl2vs76yl3jd29ny4xsl0n3gglw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page"; sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v"; - name = "org-page"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -53241,19 +69555,26 @@ license = lib.licenses.free; }; }) {}; - org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, ht, lib, melpaBuild }: - melpaBuild { + org-parser = callPackage ({ dash + , emacs + , fetchhg + , fetchurl + , ht + , lib + , melpaBuild }: + melpaBuild { pname = "org-parser"; + ename = "org-parser"; version = "20171002.2136"; src = fetchhg { url = "https://bitbucket.com/zck/org-parser.el"; rev = "105050acee08"; sha256 = "1y1ikk950awxhvx4d930ymqa8ds6a0wlywzx09jvrnkvbisd4l63"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; sha256 = "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h"; - name = "org-parser"; + name = "recipe"; }; packageRequires = [ dash emacs ht ]; meta = { @@ -53261,19 +69582,26 @@ license = lib.licenses.free; }; }) {}; - org-password-manager = callPackage ({ dash, fetchgit, fetchurl, lib, melpaBuild, org, s }: - melpaBuild { + org-password-manager = callPackage ({ dash + , fetchgit + , fetchurl + , lib + , melpaBuild + , org + , s }: + melpaBuild { pname = "org-password-manager"; + ename = "org-password-manager"; version = "20180227.1010"; src = fetchgit { - url = "https://git.leafac.com/org-password-manager"; + url = "https://github.com/leafac/org-password-manager"; rev = "4b30a36e71182553a02e4dd415369290d98ec03a"; sha256 = "1a6i3g032c5xzsnaf7rprn22kk68y1ay3w21p3q52p3lvlzhnfis"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; - sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm"; - name = "org-password-manager"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fba84d698f7d16ffc0dc16618efcd1cdc0b39d79/recipes/org-password-manager"; + sha256 = "0wxvl6ypgn6ky1z3dh33ya3rh73znkh5f8qhqwfmwp7hy2mbl4la"; + name = "recipe"; }; packageRequires = [ dash org s ]; meta = { @@ -53281,9 +69609,15 @@ license = lib.licenses.free; }; }) {}; - org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: - melpaBuild { + org-pdfview = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , pdf-tools }: + melpaBuild { pname = "org-pdfview"; + ename = "org-pdfview"; version = "20180225.206"; src = fetchFromGitHub { owner = "markus1189"; @@ -53291,10 +69625,10 @@ rev = "09ef4bf8ff8319c1ac78046c7e6b89f6a0beb82c"; sha256 = "15zxdq6f6w3l8pzg3b58cj37z61dx106jwslpqni71m8wczdqkz1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview"; sha256 = "1qhlmzf2ffcrjnx4yghv7n6rsry8bcwnkw489spgraq9vxvqklah"; - name = "org-pdfview"; + name = "recipe"; }; packageRequires = [ org pdf-tools ]; meta = { @@ -53302,9 +69636,15 @@ license = lib.licenses.free; }; }) {}; - org-pomodoro = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-pomodoro = callPackage ({ alert + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-pomodoro"; + ename = "org-pomodoro"; version = "20171108.1314"; src = fetchFromGitHub { owner = "lolownia"; @@ -53312,10 +69652,10 @@ rev = "3deed1c26dcbda4d5231b9085ddf68e302b0f9dc"; sha256 = "0mpcqqrz8mrqn1gbvffyw5d0qgpg3cpljxqk028s9snj4vy6xpz5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e54e77c5619b56e9b488b3fe8761188b6b3b4198/recipes/org-pomodoro"; sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27"; - name = "org-pomodoro"; + name = "recipe"; }; packageRequires = [ alert cl-lib ]; meta = { @@ -53323,9 +69663,14 @@ license = lib.licenses.free; }; }) {}; - org-present = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-present = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-present"; + ename = "org-present"; version = "20180303.1530"; src = fetchFromGitHub { owner = "rlister"; @@ -53333,10 +69678,10 @@ rev = "d13acd70eff6a1608bc991920232146a0de76b21"; sha256 = "0jz8xiny3rv9ql0p623byz32pip1b82j2c2nyfz2wd114kiabb6q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aba18f15fbaab115456e6afc9433074558a379f5/recipes/org-present"; sha256 = "09h0cjqjwhqychyrdv1hmiyak677vgf1b94392sdsq3ns70zyjk7"; - name = "org-present"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -53344,20 +69689,26 @@ license = lib.licenses.free; }; }) {}; - org-preview-html = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-preview-html = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-preview-html"; - version = "20160913.526"; + ename = "org-preview-html"; + version = "20180624.2319"; src = fetchFromGitHub { owner = "lujun9972"; repo = "org-preview-html"; - rev = "2b6afbaf1fcf781bcd53074ee62895f15f5282e5"; - sha256 = "1cr68gn093q7vvkald2gwcxns2ypqxhc5vavjj1j81ijrh1y1h2w"; + rev = "8ba7ecd7ac624f33b3e2395f477bbff4f1ec4efe"; + sha256 = "1h46v0ckhfzv3fixcfxk7pkmh56c5lana8kpwiknm447q1wmlbx4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-preview-html"; sha256 = "1dnr046mk5ngmic2yqcmrnn7pzrrx3sg22rk2pc3vgdxs8bhvhf9"; - name = "org-preview-html"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -53365,20 +69716,29 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }: - melpaBuild { + org-projectile = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org-category-capture + , projectile + , s }: + melpaBuild { pname = "org-projectile"; - version = "20171022.950"; + ename = "org-projectile"; + version = "20180531.1942"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "53c193a209d663b33de71fe7d35eb40c0d0e15b6"; - sha256 = "0kcbcj1nz2asi1v1nbqa2lp1qjg90nbdz2913m8c6dnwhff8rr0j"; + rev = "e57023c0e33e4a0f848fcfec1902e13e6a92f711"; + sha256 = "03svxxx6jh0c5517yvp7g5lfvjn3n4r169j589iii0fcjp4qri3n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; sha256 = "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw"; - name = "org-projectile"; + name = "recipe"; }; packageRequires = [ dash emacs org-category-capture projectile s ]; meta = { @@ -53386,20 +69746,27 @@ license = lib.licenses.free; }; }) {}; - org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }: - melpaBuild { + org-projectile-helm = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , org-projectile }: + melpaBuild { pname = "org-projectile-helm"; - version = "20170819.826"; + ename = "org-projectile-helm"; + version = "20180601.1122"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "53c193a209d663b33de71fe7d35eb40c0d0e15b6"; - sha256 = "0kcbcj1nz2asi1v1nbqa2lp1qjg90nbdz2913m8c6dnwhff8rr0j"; + rev = "674e3cdda4a3ea4bdcc369dae032d49dfb5c5765"; + sha256 = "02ia5i8aal9gck248v6kqzffsp09mmf4cispdbhqkp83mz96bxdn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; sha256 = "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4"; - name = "org-projectile-helm"; + name = "recipe"; }; packageRequires = [ emacs helm org-projectile ]; meta = { @@ -53407,9 +69774,14 @@ license = lib.licenses.free; }; }) {}; - org-protocol-jekyll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-protocol-jekyll = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-protocol-jekyll"; + ename = "org-protocol-jekyll"; version = "20170328.939"; src = fetchFromGitHub { owner = "vonavi"; @@ -53417,10 +69789,10 @@ rev = "dec064a42d6dfe81dfde7ba59ece5ca103ac6334"; sha256 = "1pgc0lfbz6q2x8b5qkk766i5qylql4p0ng732rcqr7rzg6j31gm7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1ee7c75da91fcf303ea89d148a05ac1e58e23e/recipes/org-protocol-jekyll"; sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs"; - name = "org-protocol-jekyll"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -53428,20 +69800,26 @@ license = lib.licenses.free; }; }) {}; - org-radiobutton = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-radiobutton = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-radiobutton"; - version = "20180321.1535"; + ename = "org-radiobutton"; + version = "20180612.328"; src = fetchFromGitHub { owner = "Fuco1"; repo = "org-radiobutton"; - rev = "15777e9b389cd93eab6c3c2f967e64a5b7f247b0"; - sha256 = "1mysrs3m9bmw66r4hrh2bssfhgp56rbhnkcc4rm4d5slsbak10fz"; + rev = "4182aafbe5ae1bdfb0b07efa435bdba8bbd7199d"; + sha256 = "0jm5ijs4pjzvlzpqk3k9qqcvaza2lmz2c0fcxf1g357v643bmaj4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/105043d8cfcb62ed89ddf9870f615519e6f415e7/recipes/org-radiobutton"; sha256 = "16ly42iyfh7d34yz4bvdpj3zrlwkw3kmh82gwr25a05mlsdc1d93"; - name = "org-radiobutton"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -53449,9 +69827,15 @@ license = lib.licenses.free; }; }) {}; - org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-random-todo = callPackage ({ alert + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-random-todo"; + ename = "org-random-todo"; version = "20180312.104"; src = fetchFromGitHub { owner = "unhammer"; @@ -53459,10 +69843,10 @@ rev = "8357350a66bbc4e0e5cb590acc104d39870cf736"; sha256 = "1cl1abgflbnnmvakb1z69rpr2gsm3hyg20iggwl6pn2fl0pf5wf5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; sha256 = "0yflppdbkfn2phd21zkjdlidzasfm846mzniay83v3akz0qx31lr"; - name = "org-random-todo"; + name = "recipe"; }; packageRequires = [ alert emacs ]; meta = { @@ -53470,20 +69854,26 @@ license = lib.licenses.free; }; }) {}; - org-randomnote = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-randomnote = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-randomnote"; + ename = "org-randomnote"; version = "20171210.557"; src = fetchFromGitHub { owner = "mwfogleman"; repo = "org-randomnote"; - rev = "c89eb4cf625ea7e7624b6a2d3d5676ce25ab03d7"; - sha256 = "05ap1kbq5cwak70jlm3m0pvbax75kg3281qxs5flz3qbkfsbg3h2"; + rev = "c544202d6cba1c1618ed39b2a45fa0ffc5f83e60"; + sha256 = "1ny7qq3av43kbzd9q2rsqi04sg7n9snaqss3nazr80mpswx906dx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d92cb392b23701948176ba12516df5ae6608e950/recipes/org-randomnote"; sha256 = "06i42ig7icap1i1mqzv5cqwhnmsrzpjmjbjjn49nv26ljr3mjw0b"; - name = "org-randomnote"; + name = "recipe"; }; packageRequires = [ dash f ]; meta = { @@ -53491,9 +69881,18 @@ license = lib.licenses.free; }; }) {}; - org-readme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, header2, http-post-simple, lib, lib-requires, melpaBuild, yaoddmuse }: - melpaBuild { + org-readme = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , header2 + , http-post-simple + , lib + , lib-requires + , melpaBuild + , yaoddmuse }: + melpaBuild { pname = "org-readme"; + ename = "org-readme"; version = "20151204.417"; src = fetchFromGitHub { owner = "mattfidler"; @@ -53501,10 +69900,10 @@ rev = "4cb9f768d282a2835b4510b6504ff9ede487007d"; sha256 = "1q3s12s0ll7jhrnd3adkaxv7ff69ppprv0pyl5f6gy8y51y63k8d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/317318e6071b174e0ec6302ea4f526976d837db4/recipes/org-readme"; sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh"; - name = "org-readme"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -53518,9 +69917,17 @@ license = lib.licenses.free; }; }) {}; - org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, frecency, lib, melpaBuild, org }: - melpaBuild { + org-recent-headings = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , frecency + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-recent-headings"; + ename = "org-recent-headings"; version = "20170907.2129"; src = fetchFromGitHub { owner = "alphapapa"; @@ -53528,10 +69935,10 @@ rev = "a09c2670c400c7a4fbbf0ac05d2d9226aa10e8f4"; sha256 = "1m0v94zaz30c5p4k1s213dpg0kjs6nd92bph2zlbm37wq8znizmn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; sha256 = "0b51pyxdk8fdbksx7h1c88sw1liwng8wkjfb1q7w7lglw6f8sjsa"; - name = "org-recent-headings"; + name = "recipe"; }; packageRequires = [ dash emacs frecency org ]; meta = { @@ -53539,20 +69946,24 @@ license = lib.licenses.free; }; }) {}; - org-redmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-redmine = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-redmine"; + ename = "org-redmine"; version = "20160711.414"; src = fetchFromGitHub { owner = "gongo"; repo = "org-redmine"; - rev = "e77d013bc3784947c46a5c53f03cd7d3c68552fc"; - sha256 = "06miv3mf2a39vkf6mmm5ssc47inqh7dq82khsyc03anz4d4lj822"; + rev = "a526c3ac802634486bf10de9c2283ccb1a30ec8d"; + sha256 = "04lfnyq6d86wa3acvjd4w2wvh538z9crsgsg4rgpyahklc5vm01f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/017a9dd8029d083ca0c1307f2b83be187c7615e5/recipes/org-redmine"; sha256 = "0y2pm18nnyzm9wjc0j15v46nf3xi7a0wvspfzi360qv08i54skqv"; - name = "org-redmine"; + name = "recipe"; }; packageRequires = []; meta = { @@ -53560,20 +69971,35 @@ license = lib.licenses.free; }; }) {}; - org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, htmlize, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: - melpaBuild { + org-ref = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , helm + , helm-bibtex + , htmlize + , hydra + , ivy + , key-chord + , lib + , melpaBuild + , pdf-tools + , s }: + melpaBuild { pname = "org-ref"; - version = "20180330.1356"; + ename = "org-ref"; + version = "20180706.614"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "85b8e0ac858ca2c37844e606a81bff428848adb4"; - sha256 = "1bbggn2kg7jw3bxmyyvr6bnlmiq0ylz76kyywfr8frbwic6g3rzc"; + rev = "0f951f8b59adc1ad4e82f514eaf1e3487b9a036e"; + sha256 = "1d4f89ssy6wgsyl4w1linns73k22lkmcvhq5rc8sg9vdsb8inw6k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; sha256 = "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08"; - name = "org-ref"; + name = "recipe"; }; packageRequires = [ dash @@ -53593,9 +70019,13 @@ license = lib.licenses.free; }; }) {}; - org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-repo-todo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-repo-todo"; + ename = "org-repo-todo"; version = "20171227.1719"; src = fetchFromGitHub { owner = "waymondo"; @@ -53603,10 +70033,10 @@ rev = "f73ebd91399c5760ad52c6ad9033de1066042003"; sha256 = "0c74zwmac8x1y8jimdx473v0falpky2kfig8pnaxavz415gb315q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo"; sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1"; - name = "org-repo-todo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -53614,20 +70044,24 @@ license = lib.licenses.free; }; }) {}; - org-review = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-review = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-review"; + ename = "org-review"; version = "20160906.2237"; src = fetchFromGitHub { owner = "brabalan"; repo = "org-review"; - rev = "058e75b7f28d2ad2390290fe17a63d98ef5ab763"; - sha256 = "1j917zblg5ncls9lbvpzhqal55mx27d3kpvhzvjw2h7x47ji6iym"; + rev = "44773bbd9868bb3ddca27cd35d2fc54139a70ab5"; + sha256 = "1iqcxdni680pgl9azi7khx2ns3mh8sgpbq1mcc4ivxkbwrb93crb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-review"; sha256 = "1v7p7pmrjjyj0my9xw55gsn9vvr9aq5x53x13nmspvqg47z6bd98"; - name = "org-review"; + name = "recipe"; }; packageRequires = []; meta = { @@ -53635,20 +70069,25 @@ license = lib.licenses.free; }; }) {}; - org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-rich-yank = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-rich-yank"; - version = "20180325.1218"; + ename = "org-rich-yank"; + version = "20180430.644"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-rich-yank"; - rev = "ba7eb7ba8d25dbf053b1f746061a4442375da437"; - sha256 = "0c6prl8wk9cf9rnr9ymwj50zv0gahbrwqjdqn0a46sflsaycb07i"; + rev = "b29bd06f295424fc15b3b8c1b3f78f501d67db47"; + sha256 = "0c4ywznxwf7hdc4x434d90hp440rplc4nsih4aswjkb7lx38lp9a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank"; sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y"; - name = "org-rich-yank"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -53656,9 +70095,14 @@ license = lib.licenses.free; }; }) {}; - org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }: - melpaBuild { + org-rtm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , rtm }: + melpaBuild { pname = "org-rtm"; + ename = "org-rtm"; version = "20160214.436"; src = fetchFromGitHub { owner = "pmiddend"; @@ -53666,10 +70110,10 @@ rev = "adc42ad1fbe92ab447ccc9553780f4456f2508d2"; sha256 = "1hn8y9933x5x6lxpijcqx97p3hln69ahabqdsl2bmzda3mxm4bn2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-rtm"; sha256 = "1hdcwmiv2qivdr2g78xz9fl38wn45vj0bn55dbsdj3qx7k7wgfx6"; - name = "org-rtm"; + name = "recipe"; }; packageRequires = [ rtm ]; meta = { @@ -53677,9 +70121,15 @@ license = lib.licenses.free; }; }) {}; - org-seek = callPackage ({ ag, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-seek = callPackage ({ ag + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-seek"; + ename = "org-seek"; version = "20161216.2102"; src = fetchFromGitHub { owner = "stardiviner"; @@ -53687,10 +70137,10 @@ rev = "1f51e6634e3b9a6a29d335d0d14370a6ffef2265"; sha256 = "0aq3af6fd16lm9iirzya6hmc8g48kfp8pc4dx51mgb5d6jjiizkv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-seek"; sha256 = "04ay4abm03kn15cn45ldrzh2rw6gr6ia3qrj7hn5crd75ppwvln7"; - name = "org-seek"; + name = "recipe"; }; packageRequires = [ ag emacs ]; meta = { @@ -53698,9 +70148,16 @@ license = lib.licenses.free; }; }) {}; - org-send-ebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + org-send-ebook = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "org-send-ebook"; + ename = "org-send-ebook"; version = "20180401.1015"; src = fetchFromGitHub { owner = "stardiviner"; @@ -53708,10 +70165,10 @@ rev = "efa80f3c1a26347097a16eca4dda2610627fcdf0"; sha256 = "097cpr9v0c03117z76cy0b9faq3zjvi45anvgrw4bkbgs5mh9x2l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/646106cf43649544056285aef8c4035b6e5bbbdb/recipes/org-send-ebook"; sha256 = "0gvnrl4rfqn3zd0wmj4bhd63zkjk68lwwcgmsqrfw7af22wlfv3d"; - name = "org-send-ebook"; + name = "recipe"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -53719,20 +70176,25 @@ license = lib.licenses.free; }; }) {}; - org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-static-blog = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-static-blog"; - version = "20180323.128"; + ename = "org-static-blog"; + version = "20180527.2348"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-static-blog"; - rev = "8ea4456b0ca5642fff5868e54fe23f3b5109a579"; - sha256 = "0zh1vb6q8xwaawizv9rq86ahpvxsmrjrzhgh6k4xv6rx8k7k1i7g"; + rev = "f69d2fd6671fb250fbd87df5efa898a7bf5b9bda"; + sha256 = "1h9c96rbxxk1jypib5f9pfi5zkimkvhxi61j0sps6r39435dd3w7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; sha256 = "07vh2k7cj0cs1yzfmrrz9p03x5mbfh0bigbl93s72h1wf7i05rkw"; - name = "org-static-blog"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -53740,20 +70202,26 @@ license = lib.licenses.free; }; }) {}; - org-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-sticky-header = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-sticky-header"; + ename = "org-sticky-header"; version = "20170422.2135"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-sticky-header"; - rev = "aae8dbc7f3b33c4dd35dc38d83791d7c23757060"; - sha256 = "1vdaqi0054hgf70i1g4lxxr3ry6k855ndjysq9c8ip4x2dfzyrv4"; + rev = "a435bffa3d155bdc2ad536f4da869f884e38773e"; + sha256 = "1gq0xcb1824kgjcfy868sf0a6xv4qmnzl4pmv8zlp8jb5d1ghlic"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9a600bd156eb766ba5ce37e16f3e8253f37ee8/recipes/org-sticky-header"; sha256 = "0ign3vjckmxp7n3625wb53qlch07c3s4l67jsvk38dhhcsg1rhnj"; - name = "org-sticky-header"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -53761,20 +70229,29 @@ license = lib.licenses.free; }; }) {}; - org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org, s }: - melpaBuild { + org-super-agenda = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , org + , s }: + melpaBuild { pname = "org-super-agenda"; - version = "20170904.1516"; + ename = "org-super-agenda"; + version = "20180714.1348"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-super-agenda"; - rev = "d06bfb021bee575ce750b36ee9bfc2d8fc8fd635"; - sha256 = "1lh4ggpc948cs7i4h3hxj4qq4msr9wqi97h6skflvgvs5ihlgq41"; + rev = "3b5e8faeec1333aca3cafbbaa350dacc95412086"; + sha256 = "1l19c1pbxgyrc19jv8zp8mv60xhwf50g8fc7jmc24p73ckvff7w4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda"; sha256 = "1h3kqvpjq2w0n8qiqwb8wcpdy2g4ac7j6kin0943g7p5gm5yf0ra"; - name = "org-super-agenda"; + name = "recipe"; }; packageRequires = [ dash emacs ht org s ]; meta = { @@ -53782,20 +70259,27 @@ license = lib.licenses.free; }; }) {}; - org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-sync = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-sync"; + ename = "org-sync"; version = "20180221.1127"; src = fetchFromGitHub { owner = "arbox"; repo = "org-sync"; - rev = "095335063b306871970f981898a220f62ad0ae4e"; - sha256 = "0p4xmlhv9xsa111yrgmfl5laznmj9ijpsifqcxmplrf5ckzqbdkn"; + rev = "fedddd20384de9919ba8e0b08344ff9356508805"; + sha256 = "0hkr5m795srmx8vzqaa4rhrnnm7qyxnadj5wlkdgsa8c3vcjl5gc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync"; sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad"; - name = "org-sync"; + name = "recipe"; }; packageRequires = [ cl-lib emacs org ]; meta = { @@ -53803,9 +70287,16 @@ license = lib.licenses.free; }; }) {}; - org-sync-snippets = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-sync-snippets = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-sync-snippets"; + ename = "org-sync-snippets"; version = "20170824.1128"; src = fetchFromGitHub { owner = "abrochard"; @@ -53813,10 +70304,10 @@ rev = "0f264a032d371d7dbb4a7cbaf0ea2f91b5a629ca"; sha256 = "0j680cla1zlxkwnslxwnxd5h6v1vvwr9byi1aawm9gxvz11x7vsj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96aff3f39adfa0c68aca8ff8d3b11fbfd889327e/recipes/org-sync-snippets"; sha256 = "0kv15zqva2cgx7jscp02x9gx20b5ckf525h546hyca86vfaakfbp"; - name = "org-sync-snippets"; + name = "recipe"; }; packageRequires = [ emacs f org ]; meta = { @@ -53824,9 +70315,13 @@ license = lib.licenses.free; }; }) {}; - org-table-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-table-comment = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-table-comment"; + ename = "org-table-comment"; version = "20120209.1051"; src = fetchFromGitHub { owner = "mattfidler"; @@ -53834,10 +70329,10 @@ rev = "33b9966c33ecbc3e27cca67c2f2cdea04364d74e"; sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c1f08c41969bc8a7104fb914564b4f6cab667e2/recipes/org-table-comment"; sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz"; - name = "org-table-comment"; + name = "recipe"; }; packageRequires = []; meta = { @@ -53845,9 +70340,15 @@ license = lib.licenses.free; }; }) {}; - org-table-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-table-sticky-header = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-table-sticky-header"; + ename = "org-table-sticky-header"; version = "20170408.1814"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -53855,10 +70356,10 @@ rev = "93dc69efc00ac9fd3cc2ece5100f51df33ec7d8b"; sha256 = "0d9d9sxak6kvqbb91h65ahw272d7dfxpgjw6zbs472xb6di1r6pm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header"; sha256 = "1rk41279rcsdma39zpr1ka5p47gh1d0969wahd0jbm5xlmx5gz2m"; - name = "org-table-sticky-header"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -53866,9 +70367,16 @@ license = lib.licenses.free; }; }) {}; - org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-tfl = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-tfl"; + ename = "org-tfl"; version = "20170923.518"; src = fetchFromGitHub { owner = "storax"; @@ -53876,10 +70384,10 @@ rev = "f0d7d39106a1de5457f5160cddd98ab892b61066"; sha256 = "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl"; sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf"; - name = "org-tfl"; + name = "recipe"; }; packageRequires = [ cl-lib emacs org ]; meta = { @@ -53887,9 +70395,14 @@ license = lib.licenses.free; }; }) {}; - org-themis = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-themis = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-themis"; + ename = "org-themis"; version = "20160121.2004"; src = fetchFromGitHub { owner = "zellio"; @@ -53897,10 +70410,10 @@ rev = "78aadbbe22b1993be5c4accd0d3f91a4e85c9a3c"; sha256 = "1apd5yyr12skagma7xpzrh22rhplmhhv0pma4zf5b0i6nkxy06j2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60e0efe4f201ed96e90c437e3e7205e0344d4676/recipes/org-themis"; sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln"; - name = "org-themis"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -53908,20 +70421,26 @@ license = lib.licenses.free; }; }) {}; - org-time-budgets = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-time-budgets = callPackage ({ alert + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-time-budgets"; + ename = "org-time-budgets"; version = "20151111.1"; src = fetchFromGitHub { owner = "leoc"; repo = "org-time-budgets"; - rev = "baa1ce6333157fed3b3799a80e6cf8c73c9e2c18"; - sha256 = "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb"; + rev = "530dd4ce72f94a86db28b3e19c164e64df2a29ab"; + sha256 = "09iw2jffb2qrx5r07zd1j8sk5wafamjkc2khqyfwc5kx6xyp1f46"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/776b58b433ab7dde5870300d288c3e6734fc32c0/recipes/org-time-budgets"; sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah"; - name = "org-time-budgets"; + name = "recipe"; }; packageRequires = [ alert cl-lib ]; meta = { @@ -53929,20 +70448,27 @@ license = lib.licenses.free; }; }) {}; - org-toodledo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: - melpaBuild { + org-toodledo = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request-deferred }: + melpaBuild { pname = "org-toodledo"; + ename = "org-toodledo"; version = "20150301.313"; src = fetchFromGitHub { owner = "myuhe"; repo = "org-toodledo"; - rev = "2c91a92bd07ae4a546771b018a6faa0e06399968"; - sha256 = "014337wimvzy0rxh2p2c647ly215zcyhgym2hcljkdriv15cafna"; + rev = "01b53b637f304b89cd3bf2d29009b5ed6ad9466d"; + sha256 = "1c6kc79f6qkg7dl40mzmhcjph29i8frcfvfcvz4b155ilxwzr0z4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4956fb6c5f1076a02f07d0f953e846fee39bfaa6/recipes/org-toodledo"; sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3"; - name = "org-toodledo"; + name = "recipe"; }; packageRequires = [ cl-lib emacs request-deferred ]; meta = { @@ -53950,9 +70476,15 @@ license = lib.licenses.free; }; }) {}; - org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-tracktable = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-tracktable"; + ename = "org-tracktable"; version = "20161118.529"; src = fetchFromGitHub { owner = "tty-tourist"; @@ -53960,10 +70492,10 @@ rev = "8e0e60a582a034bd66d5efb72d513140b7d4d90a"; sha256 = "1aq7qv5jyc2x2a4iphnzmmsvak6dbi7nwdcf3m8nly8w75vrl5lj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57263d996e321f842d0741898370390146606c63/recipes/org-tracktable"; sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00"; - name = "org-tracktable"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -53971,9 +70503,15 @@ license = lib.licenses.free; }; }) {}; - org-transform-tree-table = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + org-transform-tree-table = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "org-transform-tree-table"; + ename = "org-transform-tree-table"; version = "20150110.633"; src = fetchFromGitHub { owner = "jplindstrom"; @@ -53981,10 +70519,10 @@ rev = "0a9bf07f01bc5fc3b349aff64e83999a8de83b52"; sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/afca0e652a993848610606866609edbf2f5f76ae/recipes/org-transform-tree-table"; sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r"; - name = "org-transform-tree-table"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -53992,20 +70530,24 @@ license = lib.licenses.free; }; }) {}; - org-tree-slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-tree-slide = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-tree-slide"; - version = "20171129.2238"; + ename = "org-tree-slide"; + version = "20180424.1636"; src = fetchFromGitHub { owner = "takaxp"; repo = "org-tree-slide"; - rev = "9f1b898223f3dafd15a384e0d06da8f09bd55cb0"; - sha256 = "097p6wyx8fabwmsg8nvv8zlmk6fr8wgbckn5pz8vdzjwp0kbi3s5"; + rev = "6608f8d43bf40acbddeb4434715283e5884c8a02"; + sha256 = "0cp1pbpvb8dyg5milrhlarsygdfyzpy44yhf7xhrbfmk96v8073w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6160c259bc4bbcf3b98c220222430f798ee6463f/recipes/org-tree-slide"; sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn"; - name = "org-tree-slide"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54013,9 +70555,18 @@ license = lib.licenses.free; }; }) {}; - org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }: - melpaBuild { + org-trello = callPackage ({ dash + , dash-functional + , deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request-deferred + , s }: + melpaBuild { pname = "org-trello"; + ename = "org-trello"; version = "20180330.2331"; src = fetchFromGitHub { owner = "org-trello"; @@ -54023,10 +70574,10 @@ rev = "e2e8a3d45057645e4caae7d46a79d2d9be2894bd"; sha256 = "12yw54hg1lhfxw6mvxjsvbiv7cg1zwm3ccsl7g127vbf0yp2dhrl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello"; sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i"; - name = "org-trello"; + name = "recipe"; }; packageRequires = [ dash dash-functional deferred request-deferred s ]; meta = { @@ -54034,9 +70585,39 @@ license = lib.licenses.free; }; }) {}; - org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-variable-pitch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "org-variable-pitch"; + ename = "org-variable-pitch"; + version = "20180429.1515"; + src = fetchFromGitHub { + owner = "cadadr"; + repo = "elisp"; + rev = "ffe03506694c94de0444995f973a925deccc400a"; + sha256 = "02wcvka96zdlq3myfar7dqywfil2b77bc6ydmgcphwn3as3kl08r"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9632b7e98772b584d6420f8d0f9652d67118e05e/recipes/org-variable-pitch"; + sha256 = "1xci5zq1bpwnm3adlcsxzpskxywzalb1n3n14lvf787f77ib602c"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-variable-pitch"; + license = lib.licenses.free; + }; + }) {}; + org-vcard = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-vcard"; + ename = "org-vcard"; version = "20170929.410"; src = fetchFromGitHub { owner = "flexibeast"; @@ -54044,10 +70625,10 @@ rev = "dbe266b79df4fb31f1766010322bf4e383ce1c03"; sha256 = "1rcqcgxvjshbz3n1p376h618xapj03n6m7b3cxgv9gnryviyr6ax"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard"; sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl"; - name = "org-vcard"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54055,20 +70636,24 @@ license = lib.licenses.free; }; }) {}; - org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-wc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-wc"; - version = "20180124.229"; + ename = "org-wc"; + version = "20180609.1953"; src = fetchFromGitHub { owner = "tesujimath"; repo = "org-wc"; - rev = "6ff202a4612fe65b4e96bd551893fe8df67b0f51"; - sha256 = "1yqiqscj7cmnqd4s1lgbf7jbhcqlf3bwr52sabz7mqfs4iwdryhl"; + rev = "0716c1e8276f6953e139e357e97566e792c8be19"; + sha256 = "0wx4z6y3wn6948bz2pgrpffd4jzwgplvjkh0rnra4gihrapg1bv8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc"; sha256 = "1yk2py4bzm2yr8vw6rbgl2hfpd21hf4fga0d5q6y779631klp6wl"; - name = "org-wc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54076,20 +70661,29 @@ license = lib.licenses.free; }; }) {}; - org-web-tools = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: - melpaBuild { + org-web-tools = callPackage ({ dash + , emacs + , esxml + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , s }: + melpaBuild { pname = "org-web-tools"; - version = "20180117.1915"; + ename = "org-web-tools"; + version = "20180531.1808"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-web-tools"; - rev = "8d2e7556947f6647f55e41ed3ad3710878631fb3"; - sha256 = "1wx85ah89x2fg69kn2ilk950dnz5asmq205kar95c3rrxymf4yia"; + rev = "58c37ab50e99775cf4ed3d6884aa9c3f45d855de"; + sha256 = "18kwlwv85qdaahp71r43h2hv1pn078jkfqfpmb7vvsks23i4vvh2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools"; sha256 = "19zpspap85fjqg5a20ps34rcigb0ws986pj6dzd7xik8s6ia29s7"; - name = "org-web-tools"; + name = "recipe"; }; packageRequires = [ dash emacs esxml org s ]; meta = { @@ -54097,9 +70691,16 @@ license = lib.licenses.free; }; }) {}; - org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-wild-notifier = callPackage ({ alert + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-wild-notifier"; + ename = "org-wild-notifier"; version = "20180221.2025"; src = fetchFromGitHub { owner = "akhramov"; @@ -54107,10 +70708,10 @@ rev = "d0df145d9bbb72b2c315b7d8007cb6a59fea2095"; sha256 = "1xcnb5x539776b6ljd9qyl9jadp2r4qg805m4m8yfz9sk00dv7yl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; - name = "org-wild-notifier"; + name = "recipe"; }; packageRequires = [ alert dash emacs ]; meta = { @@ -54118,20 +70719,30 @@ license = lib.licenses.free; }; }) {}; - org-wunderlist = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred, s }: - melpaBuild { + org-wunderlist = callPackage ({ alert + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , request-deferred + , s }: + melpaBuild { pname = "org-wunderlist"; + ename = "org-wunderlist"; version = "20150817.1913"; src = fetchFromGitHub { owner = "myuhe"; repo = "org-wunderlist.el"; - rev = "f7f1ca73661356b9fa072efd73431592ff1182e1"; - sha256 = "169wzfjc9bbk2ydgq1zghrwkfp2fjwsrnwsw86npslj4c4bz41mm"; + rev = "18565a018364db123dd0785c3c459a33ac458a2c"; + sha256 = "1yyhh9ys67cg3y64vwi5nsl4vz793lkl4gpbv6jar8j5ryfg0z5w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44019e5d9e3d0f3e2cf76fa5828e1f953fd5e60b/recipes/org-wunderlist"; sha256 = "08zg3wgr80rp89c53ffqzz22ws9bp62a1m74xvxa74x6nq9i4xl0"; - name = "org-wunderlist"; + name = "recipe"; }; packageRequires = [ alert cl-lib emacs org request-deferred s ]; meta = { @@ -54139,20 +70750,28 @@ license = lib.licenses.free; }; }) {}; - org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }: - melpaBuild { + org2blog = callPackage ({ fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild + , metaweblog + , org + , xml-rpc }: + melpaBuild { pname = "org2blog"; + ename = "org2blog"; version = "20171218.1911"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "aa7a5730f4a58a53c41370dcde7bec43d5c1a2cd"; - sha256 = "1ivf156186myr84rqbd8rn6wa8qjrip7la6sgc8k6ggg6lzvkqac"; + rev = "04ea7e80497ab7f7bc0d097f1807d3a085074812"; + sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40"; - name = "org2blog"; + name = "recipe"; }; packageRequires = [ htmlize metaweblog org xml-rpc ]; meta = { @@ -54160,9 +70779,14 @@ license = lib.licenses.free; }; }) {}; - org2ctex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org2ctex = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org2ctex"; + ename = "org2ctex"; version = "20171016.2343"; src = fetchFromGitHub { owner = "tumashu"; @@ -54170,10 +70794,10 @@ rev = "1b74aa9cf45de224ffd6aa9b93f0debddc2b48bc"; sha256 = "17qkz3ja87hhq41hvlxvdzqipmi1gn38khd00dshsxhk5hg7i99a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f77fe537ca8ee2ddb6e3efe71f3b3c560c52c7d/recipes/org2ctex"; sha256 = "0049zf3ls7vbbcz1hdwai57ih9gppk2j0gzwijzwkb23ccwaf64a"; - name = "org2ctex"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -54181,9 +70805,14 @@ license = lib.licenses.free; }; }) {}; - org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org2elcomment = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org2elcomment"; + ename = "org2elcomment"; version = "20170324.245"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -54191,10 +70820,10 @@ rev = "c88a75d9587c484ead18f7adf08592b09c1cceb0"; sha256 = "19r7rxnd2cl0vc8bbf86mh5b779pl5z917657ymlc74bqq140m3x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8af13650de8b4a814832638d4182bf8ce576244c/recipes/org2elcomment"; sha256 = "0jv8sskw55rzxw578l6nm4arsycrw1si80ds7gr8i0x352fdydyp"; - name = "org2elcomment"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -54202,9 +70831,18 @@ license = lib.licenses.free; }; }) {}; - org2issue = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild, org, ox-gfm, s }: - melpaBuild { + org2issue = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , gh + , lib + , melpaBuild + , org + , ox-gfm + , s }: + melpaBuild { pname = "org2issue"; + ename = "org2issue"; version = "20160426.1818"; src = fetchFromGitHub { owner = "lujun9972"; @@ -54212,10 +70850,10 @@ rev = "0f7f13463e389f2d8d7d830a928042d0cf1c71eb"; sha256 = "1lvwkvzqgy9nlz7zmqfl9j8cairjfv3vknpzcqp6rzp6hkq04zk5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad1759854c3bd302aa353dea92cf462e981aff2f/recipes/org2issue"; sha256 = "1qd5l9ga26smgp1gkc8r9ja2n974kq1jf2z876s5v0489ipa59bz"; - name = "org2issue"; + name = "recipe"; }; packageRequires = [ emacs gh org ox-gfm s ]; meta = { @@ -54223,9 +70861,17 @@ license = lib.licenses.free; }; }) {}; - org2jekyll = callPackage ({ dash-functional, deferred, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, s }: - melpaBuild { + org2jekyll = callPackage ({ dash-functional + , deferred + , fetchFromGitHub + , fetchurl + , kv + , lib + , melpaBuild + , s }: + melpaBuild { pname = "org2jekyll"; + ename = "org2jekyll"; version = "20170225.115"; src = fetchFromGitHub { owner = "ardumont"; @@ -54233,10 +70879,10 @@ rev = "52a19a5d372116262b9d613f4ec8490a3b49e329"; sha256 = "14ld8ip487282if2sil96lfg5wx7632kg71sxhafygphbdl9vxd4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48a1e5bd5e338bd3593f004f95b6fbb12595bfb7/recipes/org2jekyll"; sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv"; - name = "org2jekyll"; + name = "recipe"; }; packageRequires = [ dash-functional deferred kv s ]; meta = { @@ -54244,9 +70890,21 @@ license = lib.licenses.free; }; }) {}; - org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: - melpaBuild { + org2web = callPackage ({ cl-lib ? null + , dash + , el2org + , fetchFromGitHub + , fetchurl + , ht + , htmlize + , lib + , melpaBuild + , mustache + , org + , simple-httpd }: + melpaBuild { pname = "org2web"; + ename = "org2web"; version = "20171005.1617"; src = fetchFromGitHub { owner = "tumashu"; @@ -54254,10 +70912,10 @@ rev = "5243b399927a4c474bb3b8d1c8a00799df1f27d7"; sha256 = "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web"; sha256 = "0lcqf0pgkd7jilasw1485fy45k269jxvyl7hl7qrcs94s6fy2vaf"; - name = "org2web"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -54274,20 +70932,24 @@ license = lib.licenses.free; }; }) {}; - organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + organic-green-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "organic-green-theme"; - version = "20170720.1111"; + ename = "organic-green-theme"; + version = "20180522.920"; src = fetchFromGitHub { owner = "kostafey"; repo = "organic-green-theme"; - rev = "eea6b77b7ee26310fd6741b9affc3f2c43be2820"; - sha256 = "1zaxvc1j6lfdg8wi80pfjywr6nfr7qc27j4ahzz59giba3bb7azp"; + rev = "200ac4a636eeb6faf1793d1937e62a343debc437"; + sha256 = "18a04grh4k9npf566xki9fiivy5qvpvv5v8mpj66wfx919fwa44c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme"; sha256 = "1fdj3dpcdqx0db5q8dlxag6pr2qn4yiz1hmg3c7dkmh51n85ssw2"; - name = "organic-green-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54295,20 +70957,55 @@ license = lib.licenses.free; }; }) {}; - orgbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + organize-imports-java = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "organize-imports-java"; + ename = "organize-imports-java"; + version = "20180623.1209"; + src = fetchFromGitHub { + owner = "jcs090218"; + repo = "organize-imports-java"; + rev = "cd21c23f903384ffe0eca5e6511bdf893457ab19"; + sha256 = "196rwbj8ayccrm7qz72fxk5lngpi00vg9hn4v05krwfhg496yp0k"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad0242f941ff44b4897c94d336bc0af498582dd7/recipes/organize-imports-java"; + sha256 = "1k8s7pm268w42fm0lqlqg77mib8mbccw11ppf99r574510a1bni3"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs f s ]; + meta = { + homepage = "https://melpa.org/#/organize-imports-java"; + license = lib.licenses.free; + }; + }) {}; + orgbox = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "orgbox"; + ename = "orgbox"; version = "20140528.1826"; src = fetchFromGitHub { owner = "yasuhito"; repo = "orgbox"; - rev = "72373b09768cc2200d143af38e25a0c082e8375d"; - sha256 = "0hwmr67nky9xp5xlrkp54nw6b72d29lmna28dnbgqs2i5rccbk55"; + rev = "612dd2250dbae01c85342923223f9063aae535c5"; + sha256 = "02mxp17p7bj4xamg0m6zk832hmpqcgzc7bjbjcnvbvrawhc255hy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1948eca5a18f35b61b9a0baf532753fd105ba3a/recipes/orgbox"; sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8"; - name = "orgbox"; + name = "recipe"; }; packageRequires = [ cl-lib org ]; meta = { @@ -54316,9 +71013,17 @@ license = lib.licenses.free; }; }) {}; - orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: - melpaBuild { + orgit = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild + , org }: + melpaBuild { pname = "orgit"; + ename = "orgit"; version = "20180318.1301"; src = fetchFromGitHub { owner = "magit"; @@ -54326,10 +71031,10 @@ rev = "d909f92d3b1b42184143fd5e6d4c6a2762477ab7"; sha256 = "1jdc874bxkpbfpllak3vmfsn82p930s565bzff341vzv7aw2528c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w"; - name = "orgit"; + name = "recipe"; }; packageRequires = [ dash emacs magit org ]; meta = { @@ -54337,20 +71042,27 @@ license = lib.licenses.free; }; }) {}; - orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + orglink = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "orglink"; + ename = "orglink"; version = "20180318.1323"; src = fetchFromGitHub { owner = "tarsius"; repo = "orglink"; - rev = "e9e90e16ddaceaf99c9b251a215d6338b9762b4d"; - sha256 = "0vqyidi54rbpqwqi6iv1xaqkr9gfr0pfhr1msxckh8jy6avgy319"; + rev = "82ea67b7f1bf10627759044acb74828f66a85a83"; + sha256 = "0zqbz1idj73wz3kljkkzl7mvalk73j7xpl3di6mb16ylscg9sraw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink"; sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b"; - name = "orglink"; + name = "recipe"; }; packageRequires = [ dash emacs org ]; meta = { @@ -54358,9 +71070,15 @@ license = lib.licenses.free; }; }) {}; - orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + orglue = callPackage ({ epic + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "orglue"; + ename = "orglue"; version = "20171220.426"; src = fetchFromGitHub { owner = "yoshinari-nomura"; @@ -54368,10 +71086,10 @@ rev = "ae2a45c19b52e45db7891093a3ff17ba2e51c507"; sha256 = "0h3b37wz4hlk022c0sq7c9p5z3v4n6cljhy8g1qjhnxac8y7mkr0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/orglue"; sha256 = "1kj62y3cf3as2d5s207s6kg5alm09jmw0aag1z6lblrjlzbi1p2j"; - name = "orglue"; + name = "recipe"; }; packageRequires = [ epic org ]; meta = { @@ -54379,9 +71097,17 @@ license = lib.licenses.free; }; }) {}; - orgnav = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + orgnav = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "orgnav"; + ename = "orgnav"; version = "20170608.1013"; src = fetchFromGitHub { owner = "facetframer"; @@ -54389,10 +71115,10 @@ rev = "9e2cac9c1a67af5f0080e60022e821bf7b70312d"; sha256 = "0764dg3dcsdy4i6syv9aqqmr47civn9dl3638g4lsqdikghw7lvv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a41436df126d7ef2c0a8b56d90afb942fe47dc59/recipes/orgnav"; sha256 = "0z04n5rzv5c0lvn658nrfj6rg3a31n369h5rjgi5bap06qm427ix"; - name = "orgnav"; + name = "recipe"; }; packageRequires = [ dash emacs helm s ]; meta = { @@ -54400,20 +71126,24 @@ license = lib.licenses.free; }; }) {}; - orgtbl-aggregate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + orgtbl-aggregate = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "orgtbl-aggregate"; - version = "20160421.726"; + ename = "orgtbl-aggregate"; + version = "20180620.1043"; src = fetchFromGitHub { owner = "tbanel"; repo = "orgaggregate"; - rev = "a33a02ba70639cadaef5f6ea028c2fe73f76cf14"; - sha256 = "0zh8n8jb479ilmz88kj0q5wx8a9zqkfqds0rr8jbk2rqmj6j72v3"; + rev = "10996132229aff46a46d37b4983d8afb54446b07"; + sha256 = "19f4gwixhr9v669ggbriyd4rnq43bz8qzqllxzfdbygm39vm2ira"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf64b53c9d49718a8ffc39b14c90539b36840280/recipes/orgtbl-aggregate"; sha256 = "0gnyjwn6jshs8bzdssm2xppg2s9p2x3rrhp523q39aydskc6ggc9"; - name = "orgtbl-aggregate"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54421,9 +71151,13 @@ license = lib.licenses.free; }; }) {}; - orgtbl-ascii-plot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + orgtbl-ascii-plot = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "orgtbl-ascii-plot"; + ename = "orgtbl-ascii-plot"; version = "20151215.1351"; src = fetchFromGitHub { owner = "tbanel"; @@ -54431,10 +71165,10 @@ rev = "cd91f6ae26a7402e192a1f4fd6248f5797edf19e"; sha256 = "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21b02596ac4b48e592ebe966475b164866bb9d6e/recipes/orgtbl-ascii-plot"; sha256 = "1ssjbdprbn34nsfx1xjc382l2195rbh8mybpn31d4kcjx6fqf78h"; - name = "orgtbl-ascii-plot"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54442,20 +71176,25 @@ license = lib.licenses.free; }; }) {}; - orgtbl-join = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + orgtbl-join = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "orgtbl-join"; + ename = "orgtbl-join"; version = "20150121.1446"; src = fetchFromGitHub { owner = "tbanel"; repo = "orgtbljoin"; - rev = "ccf5e0d96e053dc289da39a048715fcf36835ff2"; - sha256 = "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg"; + rev = "863f0bde0aa226ecc6d000d9bcb1424be407dfb0"; + sha256 = "0issbnl13lkfg3w0ia42mrjyvl8sl2blnmv2kazyd0lzkcfy1kap"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e43ae8aaa54113f53b51aea3fb2656d608d1032c/recipes/orgtbl-join"; sha256 = "1kq2h0lb521z8q2xb9bsi37xzzdsa0hw4mm3qkzidi5j9fi3apf1"; - name = "orgtbl-join"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -54463,20 +71202,24 @@ license = lib.licenses.free; }; }) {}; - orgtbl-show-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + orgtbl-show-header = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "orgtbl-show-header"; + ename = "orgtbl-show-header"; version = "20141023.137"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "orgtbl-show-header"; - rev = "112d54a44682f065318ed0c9c89a8f5b8907342a"; - sha256 = "1s2bgsm4s33w5275qghw1axdpmz6bbyhki53jr2giyk4f90822gi"; + rev = "2f13391f56cf94f8fe1dc79d6eccb662198f9b69"; + sha256 = "0s3pf18n7vh67am1pjaa22gh645088dbz2rgxixr9avpfyalaycj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c5ea906b1d642405ca532d89dbb32cf79f53582/recipes/orgtbl-show-header"; sha256 = "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k"; - name = "orgtbl-show-header"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54484,9 +71227,17 @@ license = lib.licenses.free; }; }) {}; - origami = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + origami = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "origami"; + ename = "origami"; version = "20180101.753"; src = fetchFromGitHub { owner = "gregsexton"; @@ -54494,10 +71245,10 @@ rev = "1f38085c8f9af7842765ed63f7d6dfe4dab59366"; sha256 = "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b816be227dfc7330292a50346c4bb37394d3e998/recipes/origami"; sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr"; - name = "origami"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs s ]; meta = { @@ -54505,20 +71256,26 @@ license = lib.licenses.free; }; }) {}; - osx-browse = callPackage ({ browse-url-dwim, fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }: - melpaBuild { + osx-browse = callPackage ({ browse-url-dwim + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , string-utils }: + melpaBuild { pname = "osx-browse"; + ename = "osx-browse"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "osx-browse"; - rev = "44ded7cc3a7ee426c1c3257fae534c121f7e752e"; - sha256 = "1iybrhp607a5rb3ynlaf8w2x9wdgdbril702z44dgcg3wxih2zy1"; + rev = "838b81625853e04919fbb56fd21f387762b2e3f5"; + sha256 = "0c1jh9396bwgs3n7yh9lvyj464x66r4b40c8zm9sv73c6g80m77q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/081aa3e1d50c2c9e5a9b9ce0716258a93279f605/recipes/osx-browse"; sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm"; - name = "osx-browse"; + name = "recipe"; }; packageRequires = [ browse-url-dwim string-utils ]; meta = { @@ -54526,9 +71283,13 @@ license = lib.licenses.free; }; }) {}; - osx-clipboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + osx-clipboard = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "osx-clipboard"; + ename = "osx-clipboard"; version = "20141012.17"; src = fetchFromGitHub { owner = "joddie"; @@ -54536,10 +71297,10 @@ rev = "e46dd31327a3f92f77b013b4c9b1e5fdd0e5c73d"; sha256 = "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71b85cd2b2122a2742f919d10bfcb054b681e61e/recipes/osx-clipboard"; sha256 = "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f"; - name = "osx-clipboard"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54547,9 +71308,14 @@ license = lib.licenses.free; }; }) {}; - osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + osx-dictionary = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "osx-dictionary"; + ename = "osx-dictionary"; version = "20171026.34"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -54557,10 +71323,10 @@ rev = "b16630ecf69f87ac873486d8b9c8c03e6c9ea7fa"; sha256 = "06qsg8hlw1b725pzpsg5f194pxqcg1pjncsi8j0815yrlzfcg6sp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary"; sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82"; - name = "osx-dictionary"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -54568,9 +71334,14 @@ license = lib.licenses.free; }; }) {}; - osx-lib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + osx-lib = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "osx-lib"; + ename = "osx-lib"; version = "20160919.1700"; src = fetchFromGitHub { owner = "raghavgautam"; @@ -54578,10 +71349,10 @@ rev = "fdbbb41e07ba64d6a09b54bd142a7c7b83bfd09f"; sha256 = "0n03yca62znrri1pg0cl4xzm4lkmdqyf1p9sm1vfjwlwxk552z5x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b42ae666e3511752f5138927e7bf7965bd9f7ee5/recipes/osx-lib"; sha256 = "12wvki8jhzqsanxv5yqzjmfx6ifwz9ab9zh6r8nss86bk8864ix4"; - name = "osx-lib"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -54589,20 +71360,24 @@ license = lib.licenses.free; }; }) {}; - osx-location = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + osx-location = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "osx-location"; + ename = "osx-location"; version = "20150613.217"; src = fetchFromGitHub { owner = "purcell"; repo = "osx-location"; - rev = "8bb3a94cc9f04b922d2d730fe08596cc6ee12bf2"; - sha256 = "09hjcpmh0fxhsx63vcaz05w94xcc8q35vgffggjqaybs7hyzlx69"; + rev = "110aee945b53ea550e4debe69bf3c077d940ec8c"; + sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8673dafb02a8d70c278bfd2c063f40992defe3a3/recipes/osx-location"; sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c"; - name = "osx-location"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54610,9 +71385,13 @@ license = lib.licenses.free; }; }) {}; - osx-org-clock-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + osx-org-clock-menubar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "osx-org-clock-menubar"; + ename = "osx-org-clock-menubar"; version = "20150205.1311"; src = fetchFromGitHub { owner = "jordonbiondo"; @@ -54620,10 +71399,10 @@ rev = "9964d2a97cc2fb6570dc4116da44f73bd8eb7cb3"; sha256 = "1rgykby1ysbapq53lnk9yy04r9q4qirnzs2abgvz7g2qjq5fyzag"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cade09308a6b8c998800f2ad2592ad6ea79f65ca/recipes/osx-org-clock-menubar"; sha256 = "1y5qxslxl0d93f387nyj8zngz5nh1p4rzdfx0lnbvya6shfaxaf6"; - name = "osx-org-clock-menubar"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54631,41 +71410,24 @@ license = lib.licenses.free; }; }) {}; - osx-plist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "osx-plist"; - version = "20101130.448"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "osx-plist"; - rev = "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0"; - sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f3686dc818bd12be247bad915c01736a95690041/recipes/osx-plist"; - sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8"; - name = "osx-plist"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/osx-plist"; - license = lib.licenses.free; - }; - }) {}; - osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + osx-pseudo-daemon = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "osx-pseudo-daemon"; + ename = "osx-pseudo-daemon"; version = "20170721.2307"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "mac-pseudo-daemon"; - rev = "d235680a72677f11925b912428ad1a57b664e3e8"; - sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40"; + rev = "0358b3acd932082082971c489012bf139f5860dc"; + sha256 = "1scdqy8g8dx3qzii70p3m2gddqqy7dkv63p8nfkp7vw1y5m19426"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon"; sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z"; - name = "osx-pseudo-daemon"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54673,9 +71435,14 @@ license = lib.licenses.free; }; }) {}; - osx-trash = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + osx-trash = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "osx-trash"; + ename = "osx-trash"; version = "20160520.600"; src = fetchFromGitHub { owner = "lunaryorn"; @@ -54683,10 +71450,10 @@ rev = "0f1dc052d0a750b8c75f14530a4897f5d4324b4e"; sha256 = "0f4md49175iyrgzv4pijf7qbxyddcm2yscrrlh91pg410la7fysk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f4c86e5b86df6c5c2c484f041fa3e434bbfbbb1/recipes/osx-trash"; sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj"; - name = "osx-trash"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -54694,20 +71461,24 @@ license = lib.licenses.free; }; }) {}; - otama = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + otama = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "otama"; + ename = "otama"; version = "20160404.332"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "otama"; - rev = "c114fd8006762f891bc120a7c0ea213872e7ab31"; - sha256 = "1jzyfvc25ls0l4kpxg6857ccynl1pzgxfif7bppz2nfmf99z4534"; + rev = "b69e0740846ace7885b0c0717f7abe8d0419eefd"; + sha256 = "0javkbzsc4bbx121awbn35fb6lyvhskkkh9jb0byd51gpvg74g1r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53b1eaef5c8b408eb8fff838af1e0249c4fe9444/recipes/otama"; sha256 = "04ffyscldb2sn2n26ixrnc07ybvl7iclv2hi1kmhr5hdgxwpyjq9"; - name = "otama"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54715,20 +71486,51 @@ license = lib.licenses.free; }; }) {}; - outline-magic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + other-emacs-eval = callPackage ({ async + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "other-emacs-eval"; + ename = "other-emacs-eval"; + version = "20180408.648"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "other-emacs-eval"; + rev = "8ace5acafef65daabf0c6619eff60733d7f5d792"; + sha256 = "1pry1xw2p01b18ks5n0xs895qqqci7v2nrwjiil2vr3m1ys92ymc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/75b6391726b0d5069e036930c2c5fa177c4e3422/recipes/other-emacs-eval"; + sha256 = "07sr5bb6x9w450cvfg32darg6jlwg11n7c1qhhk0ijcrnlsm09n7"; + name = "recipe"; + }; + packageRequires = [ async emacs ]; + meta = { + homepage = "https://melpa.org/#/other-emacs-eval"; + license = lib.licenses.free; + }; + }) {}; + outline-magic = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "outline-magic"; - version = "20150209.1426"; + ename = "outline-magic"; + version = "20180619.1119"; src = fetchFromGitHub { owner = "tj64"; repo = "outline-magic"; - rev = "5689436cd67edc86066e51be77fa4e1fe21de507"; - sha256 = "116cwlhn7s47rhivz6113lh8lvaz3bjb3ynjlbx9hyf7gq3nfnxn"; + rev = "2a5f07417b696cf7541d435c43bafcc64817636b"; + sha256 = "1iyslhk2zvhn4ip27apkjzkqw56lfakp2jzwz106jm45f3kllpc8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a98ad2ef680eef541ee82e8a65ed73e524df98a1/recipes/outline-magic"; sha256 = "085yayzph3y7fh6pd5sdjdkhdcvwfzcyqd6y3xlbz7wni5ac6b5f"; - name = "outline-magic"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54736,9 +71538,13 @@ license = lib.licenses.free; }; }) {}; - outline-toc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + outline-toc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "outline-toc"; + ename = "outline-toc"; version = "20170730.430"; src = fetchFromGitHub { owner = "abingham"; @@ -54746,10 +71552,10 @@ rev = "31f04bea19cfcfb01a94d1fd2b72391cb02b7463"; sha256 = "1pqz2ynw51n3f7d9hknz80d42017lccsggkg13zqmn51wkjpc48j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64b07ee55e87c4a1125ce18a8ae0a44661380ffe/recipes/outline-toc"; sha256 = "13hy9ahla68qcbfbm7b5d0yy774qfc3byb6pn9c66k2wg4xh6pxb"; - name = "outline-toc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54757,9 +71563,13 @@ license = lib.licenses.free; }; }) {}; - outlined-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + outlined-elisp-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "outlined-elisp-mode"; + ename = "outlined-elisp-mode"; version = "20131108.327"; src = fetchFromGitHub { owner = "zk-phi"; @@ -54767,10 +71577,10 @@ rev = "c16cb02b540448919ad148f2be6a41523ee5489c"; sha256 = "0d9hfr4kb6rkhwacdn70bkfchgam26gj92zfyaqw77a2sgwcmwwv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae918c301e1c0ae39574ae76d70059718724293b/recipes/outlined-elisp-mode"; sha256 = "165sivmv5h4nvh08ampq95x6b0bkzxgrdjbxjxlq6rv00vaidn7v"; - name = "outlined-elisp-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -54778,20 +71588,25 @@ license = lib.licenses.free; }; }) {}; - outlook = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + outlook = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "outlook"; - version = "20180330.458"; + ename = "outlook"; + version = "20180428.730"; src = fetchFromGitHub { owner = "asavonic"; repo = "outlook.el"; - rev = "77f5199f573a67700cb8d4f736cea5b6bda8ab0c"; - sha256 = "0rhivgwqnfdvcl5vh9lmg6yaz36bhkvfmj590qxcq18zj1529mfh"; + rev = "b6a7a06b996d84647e8024412876e9e76ca884e4"; + sha256 = "0qyrpki1m4j0m32iadg58rjfy589lpig0547bhxzh51x4smkazhx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5ce3e6800213b117578a1022f25407f2ec1604f/recipes/outlook"; sha256 = "0yq9zl7dr8kkm4rps5np4dwvjfhzsxq9wd1af7zwcmms4l3qry6k"; - name = "outlook"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -54799,9 +71614,14 @@ license = lib.licenses.free; }; }) {}; - outorg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + outorg = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "outorg"; + ename = "outorg"; version = "20170414.1215"; src = fetchFromGitHub { owner = "alphapapa"; @@ -54809,10 +71629,10 @@ rev = "78b0695121fb974bc4e971eb4ef7f8afd6d89d64"; sha256 = "03aclh4m3f7rb821gr9pwvnqkkl91px3qxdcarpf3ypa1x4fxvlj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg"; sha256 = "10jh64d1nalfig69nnsib46915jinv37lvmxa0aj91zymq2szdm9"; - name = "outorg"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -54820,20 +71640,25 @@ license = lib.licenses.free; }; }) {}; - outrespace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + outrespace = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "outrespace"; - version = "20180126.857"; + ename = "outrespace"; + version = "20180711.732"; src = fetchFromGitHub { owner = "articuluxe"; repo = "outrespace"; - rev = "5c3e036e0d72889b5084c67eeac317e88b1bf2f6"; - sha256 = "025lgvy8m70m72zxzdsdxgsayi3hr0hfp076mf0b97zfcw6h87c3"; + rev = "7dafed7e1cabf4a0bb55e5c6465e83796e3fdabe"; + sha256 = "0xdaaxvamjjghidxir1hpagrglxws646avl4d196g4z9y479wdyg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace"; sha256 = "13xasp9vjb3n0smdhrh9pq1yhhrg3p6z14fmlvf6xqip52rx89hl"; - name = "outrespace"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -54841,20 +71666,26 @@ license = lib.licenses.free; }; }) {}; - outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }: - melpaBuild { + outshine = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , outorg }: + melpaBuild { pname = "outshine"; - version = "20171108.441"; + ename = "outshine"; + version = "20180625.1259"; src = fetchFromGitHub { owner = "alphapapa"; repo = "outshine"; - rev = "5f1a6b70231d2811c522e4e5e8c89ff461b311d6"; - sha256 = "1l9v1dfhgg7il11ifbhvcvrg3acfjk9sdxlc3lja1k54d7dp60jv"; + rev = "8712df02b97a148e11de2761f3e707623db6f9c2"; + sha256 = "18xpc0wa2xwb9f3lkmrvfd6wh42ca2msx5rwcwy9sra0x7qqiacf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine"; sha256 = "1qqmvs17hq5s047nqplg4sa09xg5ck6zwqyg91xmbh71bx80v28v"; - name = "outshine"; + name = "recipe"; }; packageRequires = [ cl-lib outorg ]; meta = { @@ -54862,20 +71693,25 @@ license = lib.licenses.free; }; }) {}; - ov = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ov = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ov"; + ename = "ov"; version = "20150311.2228"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "ov.el"; - rev = "fae7215b3dedba2a9ced145284332e4609bfdc38"; - sha256 = "1rk5pzm5wmdq68d99hhhbq8pq37bnph0dip5j2jnfj6zsw70whr2"; + rev = "4e1c254d74bc1773c92f1613c3865cdcb4bc7095"; + sha256 = "0qxk2rf84j86syxi8xknsq252irwg7sz396v3bb4wqz4prpj0kzc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18d8a10ba3018cb61924af3a1682b82f543f2d98/recipes/ov"; sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb"; - name = "ov"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -54883,20 +71719,25 @@ license = lib.licenses.free; }; }) {}; - overcast-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + overcast-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "overcast-theme"; + ename = "overcast-theme"; version = "20180315.1243"; src = fetchFromGitHub { owner = "myTerminal"; repo = "overcast-theme"; - rev = "009257956522dedf07d9e136ee41ac0b1b0b3518"; - sha256 = "1g3s44n839s7fw3spkph31m0a5walilj151v0jyp302mjfn396nh"; + rev = "faafe7c19106cb4db29ba716d117fbb6ebdda3f4"; + sha256 = "1kjvx2wjb9ksdr7w0c4xnvqa4sbplj6rwlh85lbmcg8lwkb1s2sy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86691c61fc880954a05502a6474cc2fa0d0a43b/recipes/overcast-theme"; sha256 = "1v8hdnvc4pfmadkvdm6b8z0cy20pminvhjdlr13q5m9immr88a4r"; - name = "overcast-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -54904,9 +71745,17 @@ license = lib.licenses.free; }; }) {}; - overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + overseer = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "overseer"; + ename = "overseer"; version = "20180225.2219"; src = fetchFromGitHub { owner = "tonini"; @@ -54914,10 +71763,10 @@ rev = "02d49f582e80e36b4334c9187801c5ecfb027789"; sha256 = "0q4ai7ividy8xv09s342y49s97ismhfdfsjk70zif60fp0ajfzfn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer"; sha256 = "0zbh0j21h6wsqnqvnzai6y6rpccdciksb7g64qw7fx0cpg5x2ms8"; - name = "overseer"; + name = "recipe"; }; packageRequires = [ dash emacs f pkg-info ]; meta = { @@ -54925,9 +71774,16 @@ license = lib.licenses.free; }; }) {}; - owdriver = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, smartrep, yaxception }: - melpaBuild { + owdriver = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , smartrep + , yaxception }: + melpaBuild { pname = "owdriver"; + ename = "owdriver"; version = "20170401.612"; src = fetchFromGitHub { owner = "aki2o"; @@ -54935,10 +71791,10 @@ rev = "d934f182bafe29aa16c173440eff3fef08b0ec10"; sha256 = "0yy5sah7vcjxcik3sp2cxp9gvcryyzw799h8zf4wbvjxv74kd17c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3f9c1bb19345c6027a945e7f265632da1a391cb/recipes/owdriver"; sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd"; - name = "owdriver"; + name = "recipe"; }; packageRequires = [ log4e smartrep yaxception ]; meta = { @@ -54946,9 +71802,14 @@ license = lib.licenses.free; }; }) {}; - ox-asciidoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-asciidoc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-asciidoc"; + ename = "ox-asciidoc"; version = "20171111.354"; src = fetchFromGitHub { owner = "yashi"; @@ -54956,10 +71817,10 @@ rev = "e75d9565dd07dc59d11fa92d392ab47cecb3c902"; sha256 = "1irv8k8l99kk5qqgapj1bfg9ppnd4fkkagm96mgxf0bxax0pblhn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b268064f09ae5c3d15064b7d197c7af767fb278/recipes/ox-asciidoc"; sha256 = "07b549dqyh1gk226d7zbls1mw6q4mas7kbfwkansmyykax0r2zyr"; - name = "ox-asciidoc"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -54967,9 +71828,14 @@ license = lib.licenses.free; }; }) {}; - ox-bibtex-chinese = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ox-bibtex-chinese = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ox-bibtex-chinese"; + ename = "ox-bibtex-chinese"; version = "20170722.2009"; src = fetchFromGitHub { owner = "tumashu"; @@ -54977,10 +71843,10 @@ rev = "2ad2364399229144110db7ef6365ad0461d6a38c"; sha256 = "06lp56na1fv87296hhaxgb6gfnzln39p4v245gfxhk0k27589vxj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c09c708c4372451502923cd3cb756f4f98ba97b/recipes/ox-bibtex-chinese"; sha256 = "0f3xigrkhc86vv23f76fdd4rjsspsd2ck5c65biq2ds247f4gm61"; - name = "ox-bibtex-chinese"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -54988,9 +71854,15 @@ license = lib.licenses.free; }; }) {}; - ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }: - melpaBuild { + ox-clip = callPackage ({ fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-clip"; + ename = "ox-clip"; version = "20180305.1940"; src = fetchFromGitHub { owner = "jkitchin"; @@ -54998,10 +71870,10 @@ rev = "594c90953a91948505bb394350adf110e041f19a"; sha256 = "1alm6hh7qg8sv50cm5p03icx47za2g7b2nvbwzx6kxkrgmgqfq6c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip"; sha256 = "1sm0ivd8rypnl0z901anjsnbfjwhxqcaagqav82ybdb1z6x1qicv"; - name = "ox-clip"; + name = "recipe"; }; packageRequires = [ htmlize org ]; meta = { @@ -55009,20 +71881,26 @@ license = lib.licenses.free; }; }) {}; - ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-epub = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-epub"; + ename = "ox-epub"; version = "20171202.1713"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d"; - sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7"; + rev = "7991155e4b80bafee616108014be5281c22bae83"; + sha256 = "09di3qq0nc9m3dnqik392vbdps829wlkxdsjlcpdm0dfms9wq10v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; sha256 = "15q6vsmgv76c0qfdxa3prqvgmr6n7k4rd4bpi05574ibi23y0ynh"; - name = "ox-epub"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -55030,9 +71908,13 @@ license = lib.licenses.free; }; }) {}; - ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ox-gfm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ox-gfm"; + ename = "ox-gfm"; version = "20170628.1402"; src = fetchFromGitHub { owner = "larstvei"; @@ -55040,10 +71922,10 @@ rev = "99f93011b069e02b37c9660b8fcb45dab086a07f"; sha256 = "0drdypmgxk3238hmkqw9s3cw9wv94cyfqar5ar0bv0k69s92pxj8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q"; - name = "ox-gfm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -55051,9 +71933,14 @@ license = lib.licenses.free; }; }) {}; - ox-html5slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-html5slide = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-html5slide"; + ename = "ox-html5slide"; version = "20131227.2206"; src = fetchFromGitHub { owner = "coldnew"; @@ -55061,10 +71948,10 @@ rev = "4703dfbd9d79161509def673d2c1e118d722a58f"; sha256 = "19h3w3fcas60jv02v7hxjmh05804sb7bif70jssq3qwisj0j09xm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7a7fd72c9bbb5d90e0e096b791971f2b64b8463/recipes/ox-html5slide"; sha256 = "0nqk6chg0ky98ap2higa74786prj7dbwx2a3l67m0llmdajw76qn"; - name = "ox-html5slide"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -55072,20 +71959,26 @@ license = lib.licenses.free; }; }) {}; - ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-hugo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-hugo"; - version = "20180328.2041"; + ename = "ox-hugo"; + version = "20180720.1121"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "ab0ccf2e8e0298d919d8dd497e2631376e1f1ca9"; - sha256 = "1wz34ip94kn4b6igbr9nph0nysqmfr2dg6ysxkk3xn9bpzms6gq4"; + rev = "b7e04248bfdc3188e7f1dbd3d55b8d3b9c40906c"; + sha256 = "0nfkrw4qvmhap19q6a1i8yml80jkrlrvzni9dfvxm8qjhihd74kc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; sha256 = "1niarxj2y4a14lrv2nqcc36msw7k61h8fbjpcdrfbaw3n0kchd40"; - name = "ox-hugo"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -55093,9 +71986,14 @@ license = lib.licenses.free; }; }) {}; - ox-impress-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-impress-js = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-impress-js"; + ename = "ox-impress-js"; version = "20150412.1016"; src = fetchFromGitHub { owner = "kinjo"; @@ -55103,10 +72001,10 @@ rev = "91c6d2af6af308ade352a03355c4fb551b238c6b"; sha256 = "1kf2si2lyy0xc971bx5zd2j9mnz1smc9s8l0dwc6iksh2v9q8cy9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5e79b4b897daca80f26440107abaddf0a480db9/recipes/ox-impress-js"; sha256 = "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l"; - name = "ox-impress-js"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -55114,9 +72012,18 @@ license = lib.licenses.free; }; }) {}; - ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, makey, melpaBuild, org }: - melpaBuild { + ox-ioslide = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , makey + , melpaBuild + , org }: + melpaBuild { pname = "ox-ioslide"; + ename = "ox-ioslide"; version = "20161015.638"; src = fetchFromGitHub { owner = "coldnew"; @@ -55124,10 +72031,10 @@ rev = "6555680be5364c8ddd2bf446865cb1a82adb6b9e"; sha256 = "05d1bykgj454g0vq2k2sd36pd9hmcwr9a8033dagkqc625h7wj4h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b960abca4d642c47e640300876eefee1851e6b86/recipes/ox-ioslide"; sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc"; - name = "ox-ioslide"; + name = "recipe"; }; packageRequires = [ cl-lib emacs f makey org ]; meta = { @@ -55135,20 +72042,25 @@ license = lib.licenses.free; }; }) {}; - ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-jira = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-jira"; + ename = "ox-jira"; version = "20171001.216"; src = fetchFromGitHub { owner = "stig"; repo = "ox-jira.el"; - rev = "db2ec528f46c9e611624ba28611c440a99bff255"; - sha256 = "04zz6359xkn4w7jmmadxyvjd8pw21gw12mqwch1l9yxc4m9q474l"; + rev = "23565783ca66e2aafc2aa03796e09dde4ae11c1a"; + sha256 = "169v87xmdr41f0wyjpq4wzmr1kfb8gf6x67c24v9dbb7bldynl2g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira"; sha256 = "088ks14d7slgs2qsqp1kkxvqzzhdkwphdvpg27ix686dz1krxxib"; - name = "ox-jira"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -55156,9 +72068,15 @@ license = lib.licenses.free; }; }) {}; - ox-mediawiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ox-mediawiki = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ox-mediawiki"; + ename = "ox-mediawiki"; version = "20180105.1354"; src = fetchFromGitHub { owner = "tomalexander"; @@ -55166,10 +72084,10 @@ rev = "a9327150293e370e500ba55bddfe5fc435c6bf9b"; sha256 = "0dsq86hli24imdkgsf45asx23kriw9di3d0cf5z8axfpkcbkn770"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24244d146306ce965df382c8958c7574c74313f2/recipes/ox-mediawiki"; sha256 = "0lijj2n4saw0xd3jaghbvx9v6a4ldl5gd8wy7s7hfcm30wb75cdb"; - name = "ox-mediawiki"; + name = "recipe"; }; packageRequires = [ cl-lib s ]; meta = { @@ -55177,9 +72095,14 @@ license = lib.licenses.free; }; }) {}; - ox-minutes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ox-minutes = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ox-minutes"; + ename = "ox-minutes"; version = "20180202.934"; src = fetchFromGitHub { owner = "kaushalmodi"; @@ -55187,10 +72110,10 @@ rev = "27c29f3fdb9181322ae56f8bace8d95e621230e5"; sha256 = "10rw12gmg3d6fvkqijmjnk5bdpigvm8fy34435mwg7raw0gmlq75"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/162d0dacbb7252508147edb52fe33b1927a6bd69/recipes/ox-minutes"; sha256 = "13rwcp0k9h7l5g8xw2s2r1xhsmkibhfqyq6hlicvddv232g724sj"; - name = "ox-minutes"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -55198,9 +72121,16 @@ license = lib.licenses.free; }; }) {}; - ox-nikola = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, ox-rst }: - melpaBuild { + ox-nikola = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , ox-rst }: + melpaBuild { pname = "ox-nikola"; + ename = "ox-nikola"; version = "20151114.316"; src = fetchFromGitHub { owner = "msnoigrs"; @@ -55208,10 +72138,10 @@ rev = "5bcbc1a38f6619f62294194f13ca0cd4ca14dd48"; sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e3fa1b0728ad3058376800ec5e2e9e3847c1d2f/recipes/ox-nikola"; sha256 = "13k5wggz8bhnfgpsc09jnisk7xdb226d6imp7v6vmd1ax9m2xb0w"; - name = "ox-nikola"; + name = "recipe"; }; packageRequires = [ emacs org ox-rst ]; meta = { @@ -55219,20 +72149,29 @@ license = lib.licenses.free; }; }) {}; - ox-pandoc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: - melpaBuild { + ox-pandoc = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-pandoc"; - version = "20171107.341"; + ename = "ox-pandoc"; + version = "20180510.638"; src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "cd3c59f6c0ea49e0cac31d8392a5bbac02886d8f"; - sha256 = "04wppfxjm43bc5c8i5l5kbpln7rhifgqrmbjbxdbqd3vl4lpcnzh"; + rev = "aa37dc7e94213d4ebedb85c384c1ba35007da18e"; + sha256 = "0iibxplgdp34bpq1yll2gmqjd8d8lnqn4mqjvx6cdf0y438yr4jz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc"; sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc"; - name = "ox-pandoc"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ht org ]; meta = { @@ -55240,20 +72179,25 @@ license = lib.licenses.free; }; }) {}; - ox-pukiwiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-pukiwiki = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-pukiwiki"; + ename = "ox-pukiwiki"; version = "20150124.916"; src = fetchFromGitHub { owner = "yashi"; repo = "org-pukiwiki"; - rev = "bdbde2c294f5d3de11f08a3fe19f01175d2e011a"; - sha256 = "0adj6gm39qw4ivb7csfh21qqqipcnw1sgm1xdqvrk86kbs9k1b2g"; + rev = "b53920abf698fa6682623d671108393e92c68bd7"; + sha256 = "031xl8wry4frbc3d5d0nq7bca6y4plij9v8v8p8rg5ms3sh2fhjq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd4043336e54c6ae3976068a1af5cfe58713e408/recipes/ox-pukiwiki"; sha256 = "10sfbri5hv5hyx9jc1bzlk4qmzfmpfgfy8wkjkpv7lv2x0axqd8a"; - name = "ox-pukiwiki"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -55261,9 +72205,14 @@ license = lib.licenses.free; }; }) {}; - ox-qmd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-qmd = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-qmd"; + ename = "ox-qmd"; version = "20170402.957"; src = fetchFromGitHub { owner = "0x60df"; @@ -55271,10 +72220,10 @@ rev = "3a24c7a0b3ec80e494b977e14a3dfb94c9f1d8ec"; sha256 = "030nay81c49ings96akzzy108a6agg91rvpmg0pf05qmjysfysmf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e71826e8a8c30b0eb535cce7a379740011b79534/recipes/ox-qmd"; sha256 = "1i2kdpp6prgphc1l42nz7q6vdfsbcn2vvlf10s7dfhhr8jzcyyy7"; - name = "ox-qmd"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -55282,20 +72231,25 @@ license = lib.licenses.free; }; }) {}; - ox-reveal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-reveal = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-reveal"; + ename = "ox-reveal"; version = "20161027.226"; src = fetchFromGitHub { owner = "yjwen"; repo = "org-reveal"; - rev = "001567cc12d50ba07612edd1718b86a12e8c2547"; - sha256 = "18rma8smjrskbjyna076zhvx79zs5r5vinb537h8mw13pfxd6cm8"; + rev = "d7ffc3fd1b095ed81e0af005ecbb0b42427d13b0"; + sha256 = "0y8cnpm7hw8s3d09j8imdpaddqq914nfy3skjm7i10g9xacrp294"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bb4024eef5dc4cc3674bbbed9d92f074d533f35/recipes/ox-reveal"; sha256 = "092swxkkisvj2y18ynal8dn7wcfi7h4y6n0dlzqq28bfflarbwik"; - name = "ox-reveal"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -55303,9 +72257,15 @@ license = lib.licenses.free; }; }) {}; - ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-rst = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-rst"; + ename = "ox-rst"; version = "20180314.1713"; src = fetchFromGitHub { owner = "msnoigrs"; @@ -55313,10 +72273,10 @@ rev = "a74b60883b0d844c80efb364dac1560b85f2548f"; sha256 = "0smgz2q7bjj2svx1gdr187m58yxq1hs878bciz9h6jcp03a9sb61"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst"; sha256 = "0447q0gvasii57rp391la9prz0w228jnzgi59s785vzswdryww0n"; - name = "ox-rst"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -55324,20 +72284,25 @@ license = lib.licenses.free; }; }) {}; - ox-textile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-textile = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-textile"; - version = "20180110.516"; + ename = "ox-textile"; + version = "20180502.247"; src = fetchFromGitHub { owner = "yashi"; repo = "org-textile"; - rev = "0af57d17c93049bf7533061863f711d13fbed891"; - sha256 = "17jgb5bn3c4q4gasb2xas5bs3mrd1drnizgbqpnc50c8jfmcr4kd"; + rev = "b179abaa6616604c6efe32cb509e62ad46e7374e"; + sha256 = "1hwrnnrhrdp5cjn81wipzi5j8zr82kpwlvr6hna2cj2zr3r7a6m8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a68a7a99ecce8f1afa03e72ff1f636edaf5868/recipes/ox-textile"; sha256 = "01kri7vh16xhy8x5qd6s5z08xr0q964rk6xrligdb3i6x78wfvi4"; - name = "ox-textile"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -55345,20 +72310,26 @@ license = lib.licenses.free; }; }) {}; - ox-tiddly = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-tiddly = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-tiddly"; - version = "20151206.240"; + ename = "ox-tiddly"; + version = "20180626.1352"; src = fetchFromGitHub { owner = "dfeich"; repo = "org8-wikiexporters"; - rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f"; - sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5"; + rev = "21317d7e963f79e7b883962ca097eab049115799"; + sha256 = "1s5s2h3kpsx5cn1lqzsn9h2w7zlcgh51d679lyy45f9szm26hn3y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-tiddly"; sha256 = "1rpbnz152af588r8kafqpg9aq3ngwjfkrsjqk6w90l5rh280yi39"; - name = "ox-tiddly"; + name = "recipe"; }; packageRequires = [ cl-lib org ]; meta = { @@ -55366,20 +72337,25 @@ license = lib.licenses.free; }; }) {}; - ox-trac = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-trac = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-trac"; + ename = "ox-trac"; version = "20171026.1123"; src = fetchFromGitHub { owner = "JalapenoGremlin"; repo = "ox-trac"; - rev = "03cc31efb1aa06991918f1071e250a9d58f96cfb"; - sha256 = "0knrmq0sc8s9c6j0967jmrp2hq8jcwg281qqk89y8j9rpbmhbaj6"; + rev = "5ac6c81bbc18db6c17e267d6399778c3fb5bf1ee"; + sha256 = "1bg8bis4ykyq3iy6x93wksyigwg7jyzphlhfvvvqk093sp15fgd9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b73753ef9229d0fdfbe237acc63126f1786a494/recipes/ox-trac"; sha256 = "0f8b3i83vzxzfa91p4ahlqz6njql18xy5nk265sjxpy9zr898rsa"; - name = "ox-trac"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -55387,20 +72363,26 @@ license = lib.licenses.free; }; }) {}; - ox-tufte = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-tufte = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-tufte"; + ename = "ox-tufte"; version = "20160926.907"; src = fetchFromGitHub { owner = "dakrone"; repo = "ox-tufte"; - rev = "49d7ea78fde063b407ce6fa57739f90c83500682"; - sha256 = "1hb5s8m8r5nbz2kii1g975m3p4lnfkwraxhd71zhfvagf13wfkxd"; + rev = "ca1b16eb91b25bb4f05e58e9b6692e8486c8c619"; + sha256 = "0vyb1ilkywdhjx0j8hq1h993jh6ylwshmqiaa04fq4kbk9yqvspf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e1592b788ef7218cfb4b3da8599b6cd23eef357/recipes/ox-tufte"; sha256 = "15b7aml9nl1kh8gbc086nb155f5mzlh8dmq41zi9frn6gskzjnfk"; - name = "ox-tufte"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -55408,9 +72390,13 @@ license = lib.licenses.free; }; }) {}; - ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ox-twbs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ox-twbs"; + ename = "ox-twbs"; version = "20161103.1316"; src = fetchFromGitHub { owner = "marsmining"; @@ -55418,10 +72404,10 @@ rev = "2414e6b1de7deb6dd2ae79a7be633fdccb9c2f28"; sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-twbs"; sha256 = "050rv270jlkc1v7wp47cv9cwr9pz3n840dd4jxxhfs6s47b9ln73"; - name = "ox-twbs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -55429,9 +72415,15 @@ license = lib.licenses.free; }; }) {}; - ox-twiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-twiki = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-twiki"; + ename = "ox-twiki"; version = "20170803.1339"; src = fetchFromGitHub { owner = "dfeich"; @@ -55439,10 +72431,10 @@ rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f"; sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/084da2cc725cc23b02657e7adb14ec31532ad25a/recipes/ox-twiki"; sha256 = "1p1k0yg5fxcjgwpq2ix9ckh2kn69m7d5rnz76h14hw9p72cb54r0"; - name = "ox-twiki"; + name = "recipe"; }; packageRequires = [ cl-lib org ]; meta = { @@ -55450,9 +72442,13 @@ license = lib.licenses.free; }; }) {}; - p4 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + p4 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "p4"; + ename = "p4"; version = "20150721.1237"; src = fetchFromGitHub { owner = "gareth-rees"; @@ -55460,10 +72456,10 @@ rev = "eff047caa75dbe4965defca9d1212454cdb755d5"; sha256 = "12jsnfppif4l548wymvakx0f2zlm63xs6kfrb49hicmk668cq4ra"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7e2fa7af647e0dbf5ade5c32d1984b133156b6f/recipes/p4"; sha256 = "0215li17gn35wmvd84gnp4hkwa2jd81wz4frb1cba2b5j33rlprc"; - name = "p4"; + name = "recipe"; }; packageRequires = []; meta = { @@ -55471,9 +72467,13 @@ license = lib.licenses.free; }; }) {}; - pabbrev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pabbrev = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pabbrev"; + ename = "pabbrev"; version = "20160320.1401"; src = fetchFromGitHub { owner = "phillord"; @@ -55481,10 +72481,10 @@ rev = "56400d5d256b42ffe45c229ea9827f026b650cf5"; sha256 = "09bn19ydyz1hncmvyyh87gczp3lmlczpm352p0107z1gw6xmpjil"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c032b0d126e0196b4526ee04f5103582610681ea/recipes/pabbrev"; sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3"; - name = "pabbrev"; + name = "recipe"; }; packageRequires = []; meta = { @@ -55492,20 +72492,25 @@ license = lib.licenses.free; }; }) {}; - package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + package-build = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "package-build"; - version = "20180330.2032"; + ename = "package-build"; + version = "20180628.2221"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "50c41597d15fb5f39ec65d8009e10ea8fb11d67a"; - sha256 = "0l84iilg7jmr5q16h1jjmssq68f9xz45kvhgdspvrh6j723js12l"; + rev = "befbd7fcb9d1c7143e3ce432eaae69160112e96d"; + sha256 = "04mfnmcxrcd4kg5wcwkcnqk4ixr2mxhpc4aj3xgm5j1b3slma7zf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; sha256 = "0kr82j9rbvmapsph0jdxy24p0b8mcnj01sg1myywf428nf30cgbh"; - name = "package-build"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -55513,20 +72518,24 @@ license = lib.licenses.free; }; }) {}; - package-filter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + package-filter = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "package-filter"; + ename = "package-filter"; version = "20161121.2319"; src = fetchFromGitHub { owner = "milkypostman"; repo = "package-filter"; - rev = "bc73b41aea1d65ca44ef1593ca13126df9bbb39e"; - sha256 = "0fq31zcz5j0n29p3zmx2k2w0xvay24zs34mbq8nb0y0jr7ycm184"; + rev = "c8e2531227c02c4c5e9d593f2cdb6a4ab4a6849b"; + sha256 = "001h92jchz6x6pm8bj90law0yzc5xd84f703z7fcwan4k0g1iwl7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89312eaf69f3d7ac46647255c847fcb45415e78d/recipes/package-filter"; sha256 = "0am73zch2fy1hfjwzk8kg0j3lgbcz3hzxjrdf0j0a9w0myp0mmjm"; - name = "package-filter"; + name = "recipe"; }; packageRequires = []; meta = { @@ -55534,20 +72543,26 @@ license = lib.licenses.free; }; }) {}; - package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + package-lint = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "package-lint"; - version = "20180323.1852"; + ename = "package-lint"; + version = "20180608.2119"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "5ac4122cf1e24649b387bec8630740cd4ec85b72"; - sha256 = "030jcapghpf1smmsb17q79dmgfmjqh5x3kvzlqcgmcgfdj2jvx7m"; + rev = "318a608ff94229dfd2e953e4fd6f37bab27adfaa"; + sha256 = "1ib41dp1dafnkmjga2imhgpgxmwrn4rsi72ylwhh6y9s7a55i8zp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; sha256 = "0w7nkj4yz5yqmhr3mr7kxa6aqqfs75m3l2578s39940a5sdzirwy"; - name = "package-lint"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -55555,20 +72570,24 @@ license = lib.licenses.free; }; }) {}; - package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + package-plus = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "package-plus"; + ename = "package+"; version = "20170815.1956"; src = fetchFromGitHub { owner = "zenspider"; repo = "package"; - rev = "9213f6134eabc2cff5826779ced437714324c066"; - sha256 = "0b20mxr5xvkydxn9gv246xls52is3jyhm5ckmrhkb2dp9qc4hfa4"; + rev = "09f37a21256223a770d3b6a6174cb7da427720c3"; + sha256 = "149ba7nq380azi4rypvk0xqdv3bin2sqvab9q1kcwg3kidhspx8a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49cfbbc4535aa7e175aa819d67b8aa52a6f94384/recipes/package+"; sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn"; - name = "package-plus"; + name = "recipe"; }; packageRequires = []; meta = { @@ -55576,9 +72595,15 @@ license = lib.licenses.free; }; }) {}; - package-safe-delete = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + package-safe-delete = callPackage ({ emacs + , epl + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "package-safe-delete"; + ename = "package-safe-delete"; version = "20150116.807"; src = fetchFromGitHub { owner = "Fanael"; @@ -55586,10 +72611,10 @@ rev = "138171e4fc03c0ef05a8260cbb5cd2e114c1c194"; sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61b961211276bd95655b6a0967eda5037a3d240b/recipes/package-safe-delete"; sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw"; - name = "package-safe-delete"; + name = "recipe"; }; packageRequires = [ emacs epl ]; meta = { @@ -55597,20 +72622,25 @@ license = lib.licenses.free; }; }) {}; - package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restart-emacs }: - melpaBuild { + package-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , restart-emacs }: + melpaBuild { pname = "package-utils"; - version = "20180317.1134"; + ename = "package-utils"; + version = "20180514.715"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "652531caf1a1df916d2185e7f47085bd0509c940"; - sha256 = "0lmz4szrfs2445q8nyqnh9hgm69bwdf7q78sfqyxiw1fqaj205si"; + rev = "5621b95c56b55499f0463fd8b29501da25d861bd"; + sha256 = "1mhsf0l0253d9b7n3c68mw5kwnsk7wf217y7m2fiybh51bdgjfnd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r"; - name = "package-utils"; + name = "recipe"; }; packageRequires = [ restart-emacs ]; meta = { @@ -55618,20 +72648,25 @@ license = lib.licenses.free; }; }) {}; - packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + packed = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "packed"; + ename = "packed"; version = "20180318.1029"; src = fetchFromGitHub { owner = "emacscollective"; repo = "packed"; - rev = "c41c3dfda86ae33832ffc146923e2a4675cbacfa"; - sha256 = "1272xmb3l8ddfijqzci3x0kxwibqb0sbkci4rbcv9ba9hpxp4d1v"; + rev = "788ea94bff319d6a776954c32cff1de8b400f051"; + sha256 = "1sga68hf6zf5j8sb56zqy35p5gn6x7c12m6h8q1gzazfy7xz57p0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd"; - name = "packed"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -55639,9 +72674,18 @@ license = lib.licenses.free; }; }) {}; - pacmacs = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pacmacs = callPackage ({ cl-lib ? null + , dash + , dash-functional + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pacmacs"; + ename = "pacmacs"; version = "20160131.32"; src = fetchFromGitHub { owner = "codingteam"; @@ -55649,10 +72693,10 @@ rev = "d813e9c62c2540fe619234824fc60e128c786442"; sha256 = "0zx72qbqy2n1r6mjylw67zb6nnchp2b49vsdyl0k5bdaq2xyqv6i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52ce427e046267655dd9f836e57176d59f23e601/recipes/pacmacs"; sha256 = "0w0r6z365jrglpbifb94w6c22wqi9x93qgkss9pn820hrndqbqxy"; - name = "pacmacs"; + name = "recipe"; }; packageRequires = [ cl-lib dash dash-functional emacs f ]; meta = { @@ -55660,20 +72704,25 @@ license = lib.licenses.free; }; }) {}; - paganini-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + paganini-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "paganini-theme"; - version = "20160612.337"; + ename = "paganini-theme"; + version = "20180710.821"; src = fetchFromGitHub { owner = "onurtemizkan"; repo = "paganini"; - rev = "44e3ae4c451f3b380956fea8aef8cca75279746b"; - sha256 = "0p5sml4djwr92s36nx4hd0pjwkfws4px01g0dzip34zabkm3dx4b"; + rev = "c7474dd275dca81e77542987c459b4baba1fe190"; + sha256 = "0pvrsv3a94rp7g2p9is3f3mqkqlnd7kcpspdfn7wry3ighc0gqzq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6fbb609b411df4fe6f66a7afe27eda7d297f140/recipes/paganini-theme"; sha256 = "1kypkf52hjlfj75pcmjf2a60m6iwj0y1dspjwqynzz3l48i6ippm"; - name = "paganini-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -55681,9 +72730,14 @@ license = lib.licenses.free; }; }) {}; - page-break-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + page-break-lines = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "page-break-lines"; + ename = "page-break-lines"; version = "20171210.31"; src = fetchFromGitHub { owner = "purcell"; @@ -55691,10 +72745,10 @@ rev = "fd3b7e38ad8747cd009ead7ef1bb150849ccc693"; sha256 = "0ik5v2kd0l5a6sznld5ncdb4lsyqbbw7axs0qwxc968b540k9zq5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines"; sha256 = "0i5kx191wnq9763jyqxbyh33hvdaqbd98a1rhgqd97zhvg0hslz1"; - name = "page-break-lines"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -55702,9 +72756,13 @@ license = lib.licenses.free; }; }) {}; - pager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pager = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pager"; + ename = "pager"; version = "20151201.1720"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -55712,10 +72770,10 @@ rev = "5c791ed23f1136e04040d6f4bc9b4ca5b6dc919f"; sha256 = "198zlh7zrql1185b9qjim44a09kbbgs9zyahak9nhv1gxqn7mrdf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/pager"; sha256 = "0s5zwimkbsivbwlyd7g8dpnjyzqcfc5plg53ij4sljiipgjh5brl"; - name = "pager"; + name = "recipe"; }; packageRequires = []; meta = { @@ -55723,9 +72781,14 @@ license = lib.licenses.free; }; }) {}; - pager-default-keybindings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pager }: - melpaBuild { + pager-default-keybindings = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pager }: + melpaBuild { pname = "pager-default-keybindings"; + ename = "pager-default-keybindings"; version = "20130719.1357"; src = fetchFromGitHub { owner = "nflath"; @@ -55733,10 +72796,10 @@ rev = "dbbd49c2ac5906d1dabf9e9c832bfebc1ab405b3"; sha256 = "11msqs8v9wn8sj45dw1fl0ldi3sw33v0xclynbxgmawyabfq3bqm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87faee8c9820dd47feccdfbce7fd57dbe2800405/recipes/pager-default-keybindings"; sha256 = "0vqb3s1fxkl1fxxspq89344s55sfcplz26z0pbh347l1681h3pci"; - name = "pager-default-keybindings"; + name = "recipe"; }; packageRequires = [ pager ]; meta = { @@ -55744,20 +72807,24 @@ license = lib.licenses.free; }; }) {}; - palimpsest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + palimpsest = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "palimpsest"; + ename = "palimpsest"; version = "20170119.1232"; src = fetchFromGitHub { owner = "danielsz"; repo = "Palimpsest"; - rev = "e6d5944393c260ceb724462c84046cc62c9ae916"; - sha256 = "0vw3lv02rf8f9vm379zff4l85psjwxsrvba4xcpdkqi1w4rbsnxr"; + rev = "168839453e25f8ff7f1b28170909e5428c8fe5f8"; + sha256 = "0j6cn0bc4vxvviawmkgkzdrmf3j5rbl8f7dkzvv6k1hislzhzpsb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f6d011a0314637a2f4c1b00efa4912e67b7fa4/recipes/palimpsest"; sha256 = "18kklfdlcg982pdrslh0xqa42h28f91bdm7q2zn890d6dcivp6bk"; - name = "palimpsest"; + name = "recipe"; }; packageRequires = []; meta = { @@ -55765,20 +72832,28 @@ license = lib.licenses.free; }; }) {}; - pallet = callPackage ({ cask, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + pallet = callPackage ({ cask + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "pallet"; + ename = "pallet"; version = "20150512.2"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "pallet"; - rev = "b8d0df1883224a371ac0a3bc9b9c1c4dc61e6ac0"; - sha256 = "0j87yq8rycklk8df4rlwx0bp2n94pyhaz4yv8vacbqrzchpa1bb0"; + rev = "0e1ae11e1ebfe644cbf832df62ac2dbf6ecd0501"; + sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf977287e9bd668efbd972c9937906384ee832c6/recipes/pallet"; sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7"; - name = "pallet"; + name = "recipe"; }; packageRequires = [ cask dash f s ]; meta = { @@ -55786,20 +72861,28 @@ license = lib.licenses.free; }; }) {}; - pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: - melpaBuild { + pamparam = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , hydra + , lib + , lispy + , melpaBuild + , worf }: + melpaBuild { pname = "pamparam"; - version = "20180321.1041"; + ename = "pamparam"; + version = "20180415.48"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "bc3df2f1190c773f03fdd43fac5125da37f03de9"; - sha256 = "00jdc99gm8qplhs6jwlr6daa6rkpazbs1wicbdbiag9g7h8y7q5h"; + rev = "8fa25d06fb2ae6d992e738a10d8b2150e109d9bf"; + sha256 = "0p50cfmwgwahb1czqvgx2kvnd3k46zl0pybvxlyf45y4c4kr8wjp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; sha256 = "0xwz1il9ldkfprin3rva407m4wm7c48blwfn4mgaxmqafy4p0g9f"; - name = "pamparam"; + name = "recipe"; }; packageRequires = [ emacs hydra lispy worf ]; meta = { @@ -55807,20 +72890,25 @@ license = lib.licenses.free; }; }) {}; - panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + panda-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "panda-theme"; + ename = "panda-theme"; version = "20180203.2318"; src = fetchFromGitHub { owner = "jamiecollinson"; repo = "emacs-panda-theme"; - rev = "f93ad6ded20d71cab9bf29a0c7040e07e1ba4f05"; - sha256 = "1y9yppkprbnqf59p94kkpxsma2s7z8cp195na05mdgcs0pmbs6l7"; + rev = "548b06f3e37f017fa3996015016fb0e565b84d93"; + sha256 = "1f2kzmk03vkq5jdkad6hg2rqjll1l91g48dh2piwdqrkjjbkwsvy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme"; sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7"; - name = "panda-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -55828,9 +72916,14 @@ license = lib.licenses.free; }; }) {}; - pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pandoc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pandoc"; + ename = "pandoc"; version = "20161128.357"; src = fetchFromGitHub { owner = "zonuexe"; @@ -55838,10 +72931,10 @@ rev = "198d262d09e30448f1672338b0b5a81cf75e1eaa"; sha256 = "0njc6xlwa8hihyqrk0hs12sb6rs7jma2wpjfr8xsj9p8jld4y359"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c21ff09d67fad2658e0de08bc2edb7588c504a/recipes/pandoc"; sha256 = "0x81anxam7agr2v2zqgc331zs5s5zxcw54kzpanndda23n51h5cc"; - name = "pandoc"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -55849,20 +72942,26 @@ license = lib.licenses.free; }; }) {}; - pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: - melpaBuild { + pandoc-mode = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild }: + melpaBuild { pname = "pandoc-mode"; - version = "20180122.108"; + ename = "pandoc-mode"; + version = "20180710.746"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "883e131c53a6351a239c422f05027aa526181ddb"; - sha256 = "1qb50m4zyk57hs8siwiz21q5qymhl585crmhgqnvkspk6dg0063s"; + rev = "f1fa01d3fd079a82c0561e6227b5e984910ec458"; + sha256 = "0yy7h87zykdc8mrvam7rqjfibzbvci2phxzipq0cfq1mcq7ypdlm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781"; - name = "pandoc-mode"; + name = "recipe"; }; packageRequires = [ dash hydra ]; meta = { @@ -55870,9 +72969,13 @@ license = lib.licenses.free; }; }) {}; - pangu-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pangu-spacing = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pangu-spacing"; + ename = "pangu-spacing"; version = "20170317.157"; src = fetchFromGitHub { owner = "coldnew"; @@ -55880,10 +72983,10 @@ rev = "a4463dbb74abdeddb6c1c132a1f8fcf67ed87498"; sha256 = "143ywxgaf5y52ynd4wcqp40c5pgy61ng431y77l46iix10vasslq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0b00eda1d20ff2cbffe3ac606e5fd60d915a5d6/recipes/pangu-spacing"; sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8"; - name = "pangu-spacing"; + name = "recipe"; }; packageRequires = []; meta = { @@ -55891,20 +72994,25 @@ license = lib.licenses.free; }; }) {}; - paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + paper-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "paper-theme"; - version = "20180125.926"; + ename = "paper-theme"; + version = "20180429.1515"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "8118551aaf0472900cdfdc13449b55b33ab56289"; - sha256 = "153cch134c6rvqfcpikidlpxcbxk8nys2ig1xxpbn9ncn4fqkaf3"; + rev = "ffe03506694c94de0444995f973a925deccc400a"; + sha256 = "02wcvka96zdlq3myfar7dqywfil2b77bc6ydmgcphwn3as3kl08r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; sha256 = "1ph6c6g907cnxzl74byc754119qia8rs8y7wvaj8i6q3fz2658zr"; - name = "paper-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -55912,20 +73020,28 @@ license = lib.licenses.free; }; }) {}; - paperless = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + paperless = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "paperless"; + ename = "paperless"; version = "20180224.445"; src = fetchFromGitHub { owner = "atgreen"; repo = "paperless"; - rev = "b3b6c05da393f6b1292a3d5937bc4499baabd0b6"; - sha256 = "1b2gm823qd6bllgp9qg2vgskzg4rpdvh8bgic8708hkq6lwpdv70"; + rev = "04d98b13f591206429a9192c1804b7a2fd6287cb"; + sha256 = "1vk20vdcfjng3p3srf140k85lm8pqp41mfnwnahxm32bi0dx6hl3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/500be17952ffb6b8d1e524b5b3d316878202fabc/recipes/paperless"; sha256 = "182arnx2fz0dww6bvg6m70a1picqd3czmzwv92x0rb4ghwrnq2dq"; - name = "paperless"; + name = "recipe"; }; packageRequires = [ cl-lib emacs f s ]; meta = { @@ -55933,9 +73049,18 @@ license = lib.licenses.free; }; }) {}; - paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: - melpaBuild { + paradox = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , hydra + , let-alist + , lib + , melpaBuild + , seq + , spinner }: + melpaBuild { pname = "paradox"; + ename = "paradox"; version = "20180216.334"; src = fetchFromGitHub { owner = "Malabarba"; @@ -55943,10 +73068,10 @@ rev = "e5dd26f67ba8fa8ab1631a00ddea4117805b3fd0"; sha256 = "09x8glw949hivbzikki5blgjkzyws69hck501ym99663k4irdir1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2"; - name = "paradox"; + name = "recipe"; }; packageRequires = [ emacs hydra let-alist seq spinner ]; meta = { @@ -55954,18 +73079,23 @@ license = lib.licenses.free; }; }) {}; - paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + paredit = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "paredit"; + ename = "paredit"; version = "20171126.1805"; src = fetchgit { url = "https://mumble.net/~campbell/git/paredit.git"; rev = "acbe10fdd85d2e91831adf70b6a828bc7e900da0"; sha256 = "1c7ag0cvd6rl5fsj3dpfcjpyb8xjd26d864z98a74cirn8pc8f7l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit"; sha256 = "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653"; - name = "paredit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -55973,20 +73103,25 @@ license = lib.licenses.free; }; }) {}; - paredit-everywhere = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: - melpaBuild { + paredit-everywhere = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , paredit }: + melpaBuild { pname = "paredit-everywhere"; - version = "20150821.2144"; + ename = "paredit-everywhere"; + version = "20180506.149"; src = fetchFromGitHub { owner = "purcell"; repo = "paredit-everywhere"; - rev = "94c92095c2096713fb3e2f7662ddd994f4b694c6"; - sha256 = "120m6vs6bb9cav88wpv97kd7s8vvmg6pry6pmf7jk6i7l1wj0iaw"; + rev = "653d7a58fb370d5f7df367464d8d05e23a70b29d"; + sha256 = "0q6a3cvanjh3j0kdpqa812yql2axgga45g6nljvxijm8i9ba2hqf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/593890222d074c6a308eb1b809077c6861e1af30/recipes/paredit-everywhere"; sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36"; - name = "paredit-everywhere"; + name = "recipe"; }; packageRequires = [ paredit ]; meta = { @@ -55994,9 +73129,14 @@ license = lib.licenses.free; }; }) {}; - paredit-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: - melpaBuild { + paredit-menu = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , paredit }: + melpaBuild { pname = "paredit-menu"; + ename = "paredit-menu"; version = "20160128.933"; src = fetchFromGitHub { owner = "phillord"; @@ -56004,10 +73144,10 @@ rev = "cc0ae85bd819f9ebfa4f2a419ab3b2d70e39c9c8"; sha256 = "15xkanrwxh3qqay3vkfqvhzs88g7nnfv9bqk509qflyhqnvc9sxr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a6379588b373fca2769b8761de4ba13545c082c/recipes/paredit-menu"; sha256 = "05jp4cc548x5f07k096dgizhivdpaajxq38hin831sm0p9cibm4p"; - name = "paredit-menu"; + name = "recipe"; }; packageRequires = [ paredit ]; meta = { @@ -56015,9 +73155,14 @@ license = lib.licenses.free; }; }) {}; - paren-completer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + paren-completer = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "paren-completer"; + ename = "paren-completer"; version = "20160501.352"; src = fetchFromGitHub { owner = "MatthewBregg"; @@ -56025,10 +73170,10 @@ rev = "74183a8e13fa1266271bdcbcb4bfb29a4f915f0a"; sha256 = "1il0gbyjnlxhk04z3lgxmvlmlhgc94rmxdf8nl5sk3gblqmr8v3b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/paren-completer"; sha256 = "1k71nmsf155b4pvzcsymsc1bn42h9apypapkvc1kxyr6zm29zcr4"; - name = "paren-completer"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -56036,20 +73181,24 @@ license = lib.licenses.free; }; }) {}; - paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + paren-face = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "paren-face"; + ename = "paren-face"; version = "20180318.1325"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "a45d111153a76c481fa0b36d6172ac90e073dfc4"; - sha256 = "1cr0vnm57lxs48z17ddcv7qlfvks7wdsp01zsw0c7i3h5ajl8myp"; + rev = "42b2141b5427bc78d640229821b2b8053e6743d2"; + sha256 = "1f1srk4100rsc7i6257q460g4ykmqx4fwrpgb57dlp83d3342c6h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf"; - name = "paren-face"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56057,9 +73206,13 @@ license = lib.licenses.free; }; }) {}; - parent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + parent-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "parent-mode"; + ename = "parent-mode"; version = "20150824.1600"; src = fetchFromGitHub { owner = "Fanael"; @@ -56067,10 +73220,10 @@ rev = "db692cf08deff2f0e973e6e86e26662b44813d1b"; sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9736d8f6c3065c46b8c4e0056e9d592d3ec973e9/recipes/parent-mode"; sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig"; - name = "parent-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56078,20 +73231,26 @@ license = lib.licenses.free; }; }) {}; - parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + parinfer = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "parinfer"; - version = "20180226.2134"; + ename = "parinfer"; + version = "20180718.16"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "5bfc915c4a91da740f3216798327b5676d227569"; - sha256 = "0zz4l7k2blbxcg1ni3amfys58szw51fvrjk7dbjxp7vsgpp7x3ji"; + rev = "04dd27a3f39d6dbe8e4e717a6f7dac26c9798bd8"; + sha256 = "1n1ggfzyvnw9w3acqahiv4pnzhlmvr5rzv15m3iw35w77yki87x4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; sha256 = "05w4w7j6xyj19dm63073amd4n7fw4zm3qnn4x02fk2011iw8fq7i"; - name = "parinfer"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -56099,9 +73258,13 @@ license = lib.licenses.free; }; }) {}; - parse-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + parse-csv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "parse-csv"; + ename = "parse-csv"; version = "20160512.1023"; src = fetchFromGitHub { owner = "mrc"; @@ -56109,10 +73272,10 @@ rev = "96bef1ffbc89ea12d13311c9fa239c5c3e864890"; sha256 = "06xg6f74697zmn042wg259qlik2l21k4al08a06xz4gv9a83nsx6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/010a182f7424928036231774c2fe17b857e3ca40/recipes/parse-csv"; sha256 = "0khpfxbarw0plx8kka357d8wl1vvdih5797xlld9adc0g3cng0zz"; - name = "parse-csv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56120,9 +73283,14 @@ license = lib.licenses.free; }; }) {}; - parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + parsebib = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "parsebib"; + ename = "parsebib"; version = "20180116.627"; src = fetchFromGitHub { owner = "joostkremers"; @@ -56130,10 +73298,10 @@ rev = "683c970a6fb51591bc88ee80e295fedee876e044"; sha256 = "0mpgyy9qfb5x4fvlmb274hgayjbwf0bgk65dxyx31zikjwpcd56p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd"; - name = "parsebib"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -56141,20 +73309,26 @@ license = lib.licenses.free; }; }) {}; - parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + parsec = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "parsec"; + ename = "parsec"; version = "20171202.2031"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "parsec.el"; - rev = "72c1897a42b3b0b59505b3562e8f46c6354faec1"; - sha256 = "0yg35fs9gr07j6x7xi4f3v11xdanmkhr5sr9lqim0m10aglv7vwf"; + rev = "212f848d95c2614a86f135c1bf3de15ef0e09805"; + sha256 = "11qr9i55530pzmiwilfazaqxcjw8sx1iry19jvzdqsffjqvx2mnl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; sha256 = "1p3364sv5r868xjj1411xqj4acxqmbzcdl900sd03585ql5wbypj"; - name = "parsec"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -56162,20 +73336,26 @@ license = lib.licenses.free; }; }) {}; - parseclj = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + parseclj = callPackage ({ a + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "parseclj"; - version = "20180225.2233"; + ename = "parseclj"; + version = "20180602.1306"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "parseclj"; - rev = "af6102c4a80693cc3b40c4eb5c340358ab4b9696"; - sha256 = "1m1yvskgvm4np6r36c5gjg5whi1dyg6c1xd0nfqgc0cw9awwxp6b"; + rev = "dc0d165b0a8633f5b11ed9175a6e421c52f4d314"; + sha256 = "1ra1z9xp8v4qsw00dzr3w7a9qznj2laarc3s09n1wnr8xbp6nwxk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a977779a7ee49f57b849b14e581210a7f47d61/recipes/parseclj"; sha256 = "077qigx0qyjyvm3437ffnv05rmnpqxvpxf69yyfdgnay1xclv172"; - name = "parseclj"; + name = "recipe"; }; packageRequires = [ a emacs ]; meta = { @@ -56183,20 +73363,25 @@ license = lib.licenses.free; }; }) {}; - pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pasp-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pasp-mode"; - version = "20170803.1301"; + ename = "pasp-mode"; + version = "20180404.1000"; src = fetchFromGitHub { owner = "santifa"; repo = "pasp-mode"; - rev = "6511193677d6113fec1171f476c0db3be242ee15"; - sha256 = "1fk87iiqnyfwblw8fgqhw2mg61w2pl7id1dm8lb75pqrjq8kvjbg"; + rev = "59385eb0e8ebcfc8c11dd811fb145d4b0fa3cc92"; + sha256 = "1ar4vws3izzmir7m870mccci620ns3c5j26dcmwaxavhgw45wcmf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode"; sha256 = "0aix8siyd5yhgxq94k1sl64a9q2xlfrz6cj9y5mcqhb6qjgmrnva"; - name = "pasp-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -56204,9 +73389,17 @@ license = lib.licenses.free; }; }) {}; - pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }: - melpaBuild { + pass = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , password-store + , password-store-otp }: + melpaBuild { pname = "pass"; + ename = "pass"; version = "20180201.451"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -56214,10 +73407,10 @@ rev = "da08fed8dbe1bac980088d47b01f90154dbb8d8b"; sha256 = "1j5fdcqmqw62zvmwd80bjvkrr5vg59l5k6673hvvhjx77c8nvidv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr"; - name = "pass"; + name = "recipe"; }; packageRequires = [ emacs f password-store password-store-otp ]; meta = { @@ -56225,41 +73418,52 @@ license = lib.licenses.free; }; }) {}; - passmm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + passmm = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , password-store }: + melpaBuild { pname = "passmm"; - version = "20170113.837"; + ename = "passmm"; + version = "20180622.1626"; src = fetchFromGitHub { owner = "pjones"; repo = "passmm"; - rev = "076df7221f9450b96855c36684ae4a7481e0bb71"; - sha256 = "0nap42jhjh3nq57a5hpv6wd8gli6i9g6n5rbjza685sifqn27dbf"; + rev = "f6130373b84a2d7180a04f6bd533148aa778d8fc"; + sha256 = "19sszl0vjsy0wk0bysm938c3sj458faj4dhw8fqb2nhm6l5v194r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae2a1e10375f9cd55d19502c9740b2737eba209/recipes/passmm"; sha256 = "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b"; - name = "passmm"; + name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs password-store ]; meta = { homepage = "https://melpa.org/#/passmm"; license = lib.licenses.free; }; }) {}; - passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + passthword = callPackage ({ cl-lib ? null + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "passthword"; + ename = "passthword"; version = "20141201.123"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "pidu"; repo = "passthword"; rev = "30bace842eaaa6b48cb2251fb84868ebca0467d6"; sha256 = "0yckh61v9a798gpyk8x2z9990h3b61lwsw0kish571pygfyqhjkq"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/399bb6d6e36ca4c1e54566e66d7065fe1011f99c/recipes/passthword"; - sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn"; - name = "passthword"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/passthword"; + sha256 = "19zv80kidb6a3985n3zij507hvffcxhcvlfxd01gwx64wvfc0c3c"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -56267,9 +73471,13 @@ license = lib.licenses.free; }; }) {}; - password-generator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + password-generator = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "password-generator"; + ename = "password-generator"; version = "20150222.1240"; src = fetchFromGitHub { owner = "zargener"; @@ -56277,10 +73485,10 @@ rev = "c8193d5e963bda0a2f8e51fd4a94dcf37c76f282"; sha256 = "1pw401ar114wpayibphv3n6m0gz68zjmiwz60r4lbar45bmxvihx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/password-generator"; sha256 = "1ziiz4x4slfadlm7fjpmwvq4a9fi3ird74b6v5na499ylqnzrl59"; - name = "password-generator"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56288,9 +73496,13 @@ license = lib.licenses.free; }; }) {}; - password-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + password-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "password-mode"; + ename = "password-mode"; version = "20170411.2329"; src = fetchFromGitHub { owner = "juergenhoetzel"; @@ -56298,10 +73510,10 @@ rev = "ed764a4ec1011526457c71b7c37fa9a659a866ab"; sha256 = "102zydbkr2zrr7w0j11n7pivnsdmq3c6lykf3qc84jifp7j58pgr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28dafa392a378e7de2c6992fe17b33f6379dc6b8/recipes/password-mode"; sha256 = "1rxh6jg99qxagc6i2xgvswvw93h4ma7j8lhjr4ln44vbgyhzph11"; - name = "password-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56309,20 +73521,28 @@ license = lib.licenses.free; }; }) {}; - password-store = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, with-editor }: - melpaBuild { + password-store = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , with-editor }: + melpaBuild { pname = "password-store"; + ename = "password-store"; version = "20170829.1633"; src = fetchFromGitHub { owner = "zx2c4"; repo = "password-store"; - rev = "fab65bda88ea979dbbc49f3d856a1d14ee4f1296"; - sha256 = "0yicj227h21lqa97kcaa1pw4xyaakjqh9ynr2pynixkafalfkxhl"; + rev = "65cead8c0fdb07ce3821f6b97bdcb32684d0c3f7"; + sha256 = "0rm364l9mg2gl16ng5zd02gkfq8592mhrp81sk1v0wwh8wlyrzrh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; sha256 = "03r8j14l12yc42b51fzvn1jh8j85nyl1rg6c80r0a7ihwkj27jv6"; - name = "password-store"; + name = "recipe"; }; packageRequires = [ emacs f s with-editor ]; meta = { @@ -56330,9 +73550,16 @@ license = lib.licenses.free; }; }) {}; - password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }: - melpaBuild { + password-store-otp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , password-store + , s }: + melpaBuild { pname = "password-store-otp"; + ename = "password-store-otp"; version = "20170928.18"; src = fetchFromGitHub { owner = "volrath"; @@ -56340,10 +73567,10 @@ rev = "a39a64a91de36e87b852339635bd3c5fb0e32441"; sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp"; sha256 = "0m3n4gjf6hmcs2kg80h1whzbl74zsj79ihliyqfcdfc4v31m32sg"; - name = "password-store-otp"; + name = "recipe"; }; packageRequires = [ emacs password-store s ]; meta = { @@ -56351,9 +73578,15 @@ license = lib.licenses.free; }; }) {}; - password-vault = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + password-vault = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "password-vault"; + ename = "password-vault"; version = "20160126.1020"; src = fetchFromGitHub { owner = "PuercoPop"; @@ -56361,10 +73594,10 @@ rev = "dc56e6c2f5da66f1ab63736cecf08fb2c6c2b30f"; sha256 = "0921xwg3d3345hiqz4c1iyqwvfyg8rv0wggcnig7xh9qivspag4c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71ad3fa96afa18b5002faf9272732c7d09826493/recipes/password-vault"; sha256 = "17i556xwq6yaxv9v18l1abcpbaz6hygsa4vf4b68fc98vcy7396a"; - name = "password-vault"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -56372,9 +73605,15 @@ license = lib.licenses.free; }; }) {}; - paste-of-code = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + paste-of-code = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "paste-of-code"; + ename = "paste-of-code"; version = "20170709.1655"; src = fetchFromGitHub { owner = "spebern"; @@ -56382,10 +73621,10 @@ rev = "92d258e8ec98598d847ecab82903f9224c7c2050"; sha256 = "1bf2d0i726psjwnqdp0w4h0qk7fnwcbwf1a66q7p8vczavqygfan"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b29a5101bb6fc01b8b6e1b798ce6f73bc6d34944/recipes/paste-of-code"; sha256 = "0wjcchpp1689arfz6s7gfq4bxn0svz6qj5azvjwwsyzais1bicdi"; - name = "paste-of-code"; + name = "recipe"; }; packageRequires = [ emacs request ]; meta = { @@ -56393,9 +73632,13 @@ license = lib.licenses.free; }; }) {}; - pastebin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pastebin = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pastebin"; + ename = "pastebin"; version = "20101125.1202"; src = fetchFromGitHub { owner = "nicferrier"; @@ -56403,10 +73646,10 @@ rev = "8e9a829298ce0f747ab80758aa26caeb2af6cb30"; sha256 = "1hjzpza8zmzb83sacmqcnh9a52m4x5d8xbwvcqvld1ajglv4y124"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/pastebin"; sha256 = "0ff01vzslgdmsj1jp1m2lvnan6immd4l7vz466g1glb5nkb7qfcr"; - name = "pastebin"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56414,20 +73657,24 @@ license = lib.licenses.free; }; }) {}; - pastehub = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pastehub = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pastehub"; + ename = "pastehub"; version = "20140614.2320"; src = fetchFromGitHub { owner = "kiyoka"; repo = "pastehub"; - rev = "37b045c67659c078f1517d0fbd5282dab58dca23"; - sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n"; + rev = "3cc5dcb87104f3b4320a6d7fa20fa7340e6b7026"; + sha256 = "0wbb5689n9k351gf3s9mqr3bi00lpajk0h1k9gx1b2mdbb7lq7xd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb8645a9880c586ef2ad16f3a4e61ba76176c224/recipes/pastehub"; sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v"; - name = "pastehub"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56435,9 +73682,14 @@ license = lib.licenses.free; }; }) {}; - pastelmac-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pastelmac-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pastelmac-theme"; + ename = "pastelmac-theme"; version = "20151030.1936"; src = fetchFromGitHub { owner = "bmastenbrook"; @@ -56445,10 +73697,10 @@ rev = "bead21741e3f46f6506e8aef4469d4240a819389"; sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7151773de39fe570e3e9b351daad89db9dd267f/recipes/pastelmac-theme"; sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f"; - name = "pastelmac-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -56456,9 +73708,15 @@ license = lib.licenses.free; }; }) {}; - pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + pastery = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "pastery"; + ename = "pastery"; version = "20171113.1949"; src = fetchFromGitHub { owner = "diasbruno"; @@ -56466,10 +73724,10 @@ rev = "4493be98b743b4d062cb4e00760125e394a55022"; sha256 = "0bmm18d84lrkclg4md46k1ma03w7a97s10hrvjcm9yj8xbrjqqsc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery"; sha256 = "006qawjc86spbbs2pxvhg9w94rcsxap577cndqwaiw1k0cc8vkhp"; - name = "pastery"; + name = "recipe"; }; packageRequires = [ emacs request ]; meta = { @@ -56477,9 +73735,13 @@ license = lib.licenses.free; }; }) {}; - path-headerline-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + path-headerline-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "path-headerline-mode"; + ename = "path-headerline-mode"; version = "20140423.632"; src = fetchFromGitHub { owner = "7696122"; @@ -56487,10 +73749,10 @@ rev = "b5b2725c6a8b1cb592fc242b7dbbd54b4dff2e69"; sha256 = "1ffnkw8djs8kvfjd1crnaqram1vl4w3g1zhsqp74ds0mccsd6830"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/path-headerline-mode"; sha256 = "0yw2i3cp20v8nd2wj1rs1qad8abghzzasf2sjyla90q06wlna98w"; - name = "path-headerline-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56498,20 +73760,24 @@ license = lib.licenses.free; }; }) {}; - pathify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pathify = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pathify"; + ename = "pathify"; version = "20160423.146"; src = fetchFromGitHub { owner = "alezost"; repo = "pathify.el"; - rev = "401b184c743694a60b3bc4273fc43de05cd5ac4b"; - sha256 = "0wsq11qffw1lx9x79law7jrz0sxm6km83gh891ic9ak2y6j5shxf"; + rev = "335332a900717ae01bde5ccb8f3dc97a5350f123"; + sha256 = "1brdyrp2sz1pszdfr6f4w94qxk5lrd6kphc1xa5pywfns14c9386"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/459460c977b9cf033e22937899ad380e01efcf11/recipes/pathify"; sha256 = "1z970xnzbhmfikj1rkfx24jvwc7f1xxw6hk7kmahxvphjxrvgc2f"; - name = "pathify"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56519,20 +73785,26 @@ license = lib.licenses.free; }; }) {}; - paxedit = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: - melpaBuild { + paxedit = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , paredit }: + melpaBuild { pname = "paxedit"; + ename = "paxedit"; version = "20160730.1027"; src = fetchFromGitHub { owner = "promethial"; repo = "paxedit"; - rev = "09f3d5aeb108937a801e77ef413e29eaa4ecc4be"; - sha256 = "1yd5wh8fsxh3v2fgpxm2cd7h9xz9zfj2d8g4bh4gzqjwrmn5rlgl"; + rev = "48df0a26285f68cd20ea64368e7bf2a5fbf13135"; + sha256 = "0z32lb2s943vk9fincsifdrjqmk7ks2skpzr6g4s3gd40sz5imfz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/106b272c2f0741d21d31a0ddfa4f521c575559c1/recipes/paxedit"; sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic"; - name = "paxedit"; + name = "recipe"; }; packageRequires = [ cl-lib paredit ]; meta = { @@ -56540,9 +73812,13 @@ license = lib.licenses.free; }; }) {}; - pbcopy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pbcopy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pbcopy"; + ename = "pbcopy"; version = "20150224.2059"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -56550,10 +73826,10 @@ rev = "338f7245746b5de1bb96c5cc2b32bfd9b5d83272"; sha256 = "138w0dlp3msjmr2x09kfcnxwhdldbz9xjfy7l6lig1x9ima0z5w6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bbde7950ad5b3b801ca6a2a27c0f5294c8b7746/recipes/pbcopy"; sha256 = "1989pkhaha6s2rmgyswnzps92x9hhzymjz4ng4a5jda1b9snp60q"; - name = "pbcopy"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56561,9 +73837,13 @@ license = lib.licenses.free; }; }) {}; - pc-bufsw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pc-bufsw = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pc-bufsw"; + ename = "pc-bufsw"; version = "20180107.1040"; src = fetchFromGitHub { owner = "ibukanov"; @@ -56571,10 +73851,10 @@ rev = "b99ba484e18ebf2b88654704146746490bb7625f"; sha256 = "184nnkfh7n6vbbmvykvklr1dn3dcwjj3w800irdg55bbnkxxzkj4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2bbd34d673935846c286e73a1e2efaa00ab01a/recipes/pc-bufsw"; sha256 = "01d7735ininlsjkql7dy57irgwgk4k9br8bl18wq51vgkg90i5k5"; - name = "pc-bufsw"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56582,20 +73862,25 @@ license = lib.licenses.free; }; }) {}; - pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pcache = callPackage ({ eieio ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pcache"; + ename = "pcache"; version = "20170105.1414"; src = fetchFromGitHub { owner = "sigma"; repo = "pcache"; - rev = "1f8086077d770e524492e6fa59b07856e85a6fea"; - sha256 = "09z5295f8051ag13ndq8rhxgg2m0gim45yfpjv4xkbmdcfkfinc2"; + rev = "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740"; + sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcache"; sha256 = "0wwx20x6gzlli3hh4zd9pfv2cmqfm38xbl9p4vsgy08q1rm5agva"; - name = "pcache"; + name = "recipe"; }; packageRequires = [ eieio ]; meta = { @@ -56603,9 +73888,14 @@ license = lib.licenses.free; }; }) {}; - pcap-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pcap-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pcap-mode"; + ename = "pcap-mode"; version = "20161025.748"; src = fetchFromGitHub { owner = "orgcandman"; @@ -56613,10 +73903,10 @@ rev = "52780669af0ade136f84d73f21b4dbb7ab655416"; sha256 = "1v218cjs0qy3ac0rbzm22y1x388nxnf0pslh9jrvlymkn227pjs8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44f4cb526556a4b58b7e67314002e73413a59a76/recipes/pcap-mode"; sha256 = "1p6lnr7yr8i3yp63xc8r1hnx8a4v0mz1s7q89zxx7aprk7i9kpv6"; - name = "pcap-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -56624,9 +73914,13 @@ license = lib.licenses.free; }; }) {}; - pcmpl-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pcmpl-args = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pcmpl-args"; + ename = "pcmpl-args"; version = "20120911.2224"; src = fetchFromGitHub { owner = "JonWaltman"; @@ -56634,10 +73928,10 @@ rev = "2ba03b3125ada8037585e545b88bd85b79da5c37"; sha256 = "0pwx1nbgciy28rivvrgka46zihmag9ljrs40bvscgd9rkragm4zy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcmpl-args"; sha256 = "10mgci1rk6sr7wk46mnp5l37v3qxdc6yy5zfvy9mzwzh3va1pw31"; - name = "pcmpl-args"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56645,9 +73939,13 @@ license = lib.licenses.free; }; }) {}; - pcmpl-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pcmpl-git = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pcmpl-git"; + ename = "pcmpl-git"; version = "20170120.1659"; src = fetchFromGitHub { owner = "leoliu"; @@ -56655,10 +73953,10 @@ rev = "9472ac70baeda025ef7becd1cf141d72aec93f32"; sha256 = "17y3rdp7fgyg4i9hwyzgpv1d19i5c6rqdf1gm5bdm2csk12vfg9n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a51c16bed8d0a2fecad0ae9580d58cd44cc8930/recipes/pcmpl-git"; sha256 = "12y9pg1g4i1ghnjvgfdpa6p84h4bcqrr23y9bazwl9n6aj20cmxk"; - name = "pcmpl-git"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56666,9 +73964,13 @@ license = lib.licenses.free; }; }) {}; - pcmpl-homebrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pcmpl-homebrew = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pcmpl-homebrew"; + ename = "pcmpl-homebrew"; version = "20170110.1609"; src = fetchFromGitHub { owner = "hiddenlotus"; @@ -56676,10 +73978,10 @@ rev = "d001520fec4715c9a4c73f02fd948bac371cc50a"; sha256 = "0mw8w2jd9qgyhxdbnvjays5q6c83i0sb3diizrkq23axprfg6d70"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-homebrew"; sha256 = "11yd18s79iszp8gas97hqpa0b0whgh7dvlyci3nd4z28467p83v8"; - name = "pcmpl-homebrew"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56687,9 +73989,16 @@ license = lib.licenses.free; }; }) {}; - pcmpl-pip = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: - melpaBuild { + pcmpl-pip = callPackage ({ f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , seq }: + melpaBuild { pname = "pcmpl-pip"; + ename = "pcmpl-pip"; version = "20171201.33"; src = fetchFromGitHub { owner = "hiddenlotus"; @@ -56697,10 +74006,10 @@ rev = "8b001b579fc015f80ee0e4f3211058b830bf7c47"; sha256 = "0f8s2gn82dhyrnv0j688697xy0ig2yhn5m94gwhcllxq5a3yhbdg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-pip"; sha256 = "19a3np5swpqvrx133yvziqnr2pvj8zi0b725j8kxhp2bj1g1c6hr"; - name = "pcmpl-pip"; + name = "recipe"; }; packageRequires = [ f s seq ]; meta = { @@ -56708,20 +74017,26 @@ license = lib.licenses.free; }; }) {}; - pcomplete-extension = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pcomplete-extension = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pcomplete-extension"; - version = "20180322.28"; + ename = "pcomplete-extension"; + version = "20180706.2155"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "pcomplete-extension"; - rev = "3d7dac3de9e81604e4ed93c344cf4d44ebae3bf7"; - sha256 = "1qrlp066rbcafn67mmbg48fkxw7ai6ni8b3asmm8w623xhd63v1g"; + rev = "bb941272b54f49f780819f7ce4fd2c802de9a0da"; + sha256 = "0bwbxnnw760i6mi7h9pyx3gaasrcja7dj3bfrlia07gw8jgl81ad"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6cb8a938418f84a5b0ede92e84a516f38e4b1011/recipes/pcomplete-extension"; sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc"; - name = "pcomplete-extension"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -56729,9 +74044,15 @@ license = lib.licenses.free; }; }) {}; - pcre2el = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pcre2el = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pcre2el"; + ename = "pcre2el"; version = "20161120.1303"; src = fetchFromGitHub { owner = "joddie"; @@ -56739,10 +74060,10 @@ rev = "0b5b2a2c173aab3fd14aac6cf5e90ad3bf58fa7d"; sha256 = "14br6ad138qx1z822wqssswqiihxiynz1k69p6mcdisr2q8yyi1z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f04a25e467cc4c7d9a263330a7a1a53d67c6eb9b/recipes/pcre2el"; sha256 = "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3"; - name = "pcre2el"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -56750,9 +74071,13 @@ license = lib.licenses.free; }; }) {}; - pcsv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pcsv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pcsv"; + ename = "pcsv"; version = "20150220.331"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -56760,10 +74085,10 @@ rev = "798e0933f8d0818beb17aebf3b1056bbf74e03d0"; sha256 = "0aaprjczjf3al5vcypw1fsnz5a0xnnlhmvy0lc83i9aqbsa2y8af"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80ffaf99b2a4566a3f9d0309cd7b63f563f3826e/recipes/pcsv"; sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl"; - name = "pcsv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56771,9 +74096,13 @@ license = lib.licenses.free; }; }) {}; - pdb-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pdb-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pdb-mode"; + ename = "pdb-mode"; version = "20150128.951"; src = fetchFromGitHub { owner = "sixpi"; @@ -56781,10 +74110,10 @@ rev = "855fb18ebb73b5df30c8d7677c2bcd0f361b138a"; sha256 = "1xkkyz7y08jr71rzdacb9v7gk95qsxlsshkdsxq8jp70irq51099"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aee132aa24322fe1ac88ae17ee6e77ae1ec8d11/recipes/pdb-mode"; sha256 = "1ihkxd15kx5m5xb9yxwz8wqbmyk9iaskry9szzdz1j4gjlczb6hy"; - name = "pdb-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56792,20 +74121,27 @@ license = lib.licenses.free; }; }) {}; - pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: - melpaBuild { + pdf-tools = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , tablist }: + melpaBuild { pname = "pdf-tools"; - version = "20180109.1234"; + ename = "pdf-tools"; + version = "20180428.827"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "9241a79bbf159ba0b079ebdbfa8ad1b3e69cf8c0"; - sha256 = "00v2rqrh3z93s651j1i1z9i6chr0lxw1kbnkpr56pqrh5rbvy0q5"; + rev = "5209f620c85e6c7c23e96768ebae6b5c6f79f3e1"; + sha256 = "0dv3phzjp6z2f5bbl6m7ll073p81w1fkq543mp44g2cqb9dvq24s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw"; - name = "pdf-tools"; + name = "recipe"; }; packageRequires = [ emacs let-alist tablist ]; meta = { @@ -56813,9 +74149,14 @@ license = lib.licenses.free; }; }) {}; - peacock-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + peacock-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "peacock-theme"; + ename = "peacock-theme"; version = "20170808.620"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -56823,10 +74164,10 @@ rev = "9e46fbfb562b6e26c6e3d6d618b044b3694da4c8"; sha256 = "0w4dzdsv2cdldss5jwmdbjb5a62k5j1szwdim4gv8ldifhj7fy22"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/peacock-theme"; sha256 = "0jpdq090r37d07bm52yx3x9y3gsip6fyxxq1ax1k5k0r0js45kq9"; - name = "peacock-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -56834,9 +74175,14 @@ license = lib.licenses.free; }; }) {}; - peek-mode = callPackage ({ elnode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + peek-mode = callPackage ({ elnode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "peek-mode"; + ename = "peek-mode"; version = "20130620.1246"; src = fetchFromGitHub { owner = "erikriverson"; @@ -56844,10 +74190,10 @@ rev = "55a7dd011375330c7d57322257a5167516702c71"; sha256 = "11nv6pll0zj9dkgzlzgav39a6x3sfi7kvfhwm96fa3iy4v8bixrb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08384964d8c1f5f60c84c044d26a79105973ab21/recipes/peek-mode"; sha256 = "07wcnh3jmp2gi9xhd3d8i2n0pr2g9kav497nnz94i85awhzf8fi4"; - name = "peek-mode"; + name = "recipe"; }; packageRequires = [ elnode ]; meta = { @@ -56855,20 +74201,24 @@ license = lib.licenses.free; }; }) {}; - peep-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + peep-dired = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "peep-dired"; + ename = "peep-dired"; version = "20160321.1537"; src = fetchFromGitHub { owner = "asok"; repo = "peep-dired"; - rev = "c88a9a3050197840edfe145f11e0bb9488de32f4"; - sha256 = "1wy5qpnfri1gha2cnl6q20qar8dbl2mimpb43bnhmm2g3wgjyad6"; + rev = "12d7e52cd5ae29fd828db0bf1fbf648020077145"; + sha256 = "159yc9fcpywqhy92kn7i7aid30j3bzybfdz9kxb643026v30nhxq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8e06a916ac18053e34821673d1cf7936b15c2ac/recipes/peep-dired"; sha256 = "16k5y3h2ip96k071vhx83avg4r4nplnd973b1271vvxbx2bly735"; - name = "peep-dired"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56876,9 +74226,13 @@ license = lib.licenses.free; }; }) {}; - peg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + peg = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "peg"; + ename = "peg"; version = "20150707.2341"; src = fetchFromGitHub { owner = "ellerh"; @@ -56886,10 +74240,10 @@ rev = "081efeca91d790c7fbc90871ac22c40935f4833b"; sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b9b55a02e903ae7e75f8b636fdb1cf907c5db7c/recipes/peg"; sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm"; - name = "peg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56897,19 +74251,24 @@ license = lib.licenses.free; }; }) {}; - pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + pelican-mode = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pelican-mode"; - version = "20180401.148"; + ename = "pelican-mode"; + version = "20180604.1507"; src = fetchgit { url = "https://git.korewanetadesu.com/pelican-mode.git"; - rev = "c48bd6c3b7369787a09923c53b452d9ec460399c"; - sha256 = "0b5sizmbf05kiwrq0n45scg95jg33qar70gi2vsqp4aaqryipccs"; + rev = "209ad24318e1f28675da430aa10ef3467694b9ac"; + sha256 = "1hiyl2iy2pa38bfr0z4axxmq3b79c31djyxqchx5mwzl9427dfsr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi"; - name = "pelican-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -56917,19 +74276,24 @@ license = lib.licenses.free; }; }) {}; - per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + per-buffer-theme = callPackage ({ cl-lib ? null + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "per-buffer-theme"; + ename = "per-buffer-theme"; version = "20160318.1501"; src = fetchhg { url = "https://bitbucket.com/inigoserna/per-buffer-theme.el"; rev = "9e6200da91b3"; sha256 = "0w02l91x624cgzdg33a9spgcwy12m607dsfnr1xbc1fi08np4sd1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/per-buffer-theme"; sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn"; - name = "per-buffer-theme"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -56937,20 +74301,26 @@ license = lib.licenses.free; }; }) {}; - perl6-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + perl6-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "perl6-mode"; - version = "20161228.430"; + ename = "perl6-mode"; + version = "20180619.459"; src = fetchFromGitHub { owner = "perl6"; repo = "perl6-mode"; - rev = "4867c6d268545f5356111d72c4ae77917d34cb21"; - sha256 = "1bpq2wa27rlmyx13vg0ig2nzzivzxzh9hdmhyw285dcn8agashnp"; + rev = "4ad9987e2576ab2f17cc7090ce35d347167449bb"; + sha256 = "0578mgy1pdiz19kam7n6cp98kbq8vmn2q6xc8qsjvzma3rfdsmgv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e912dccdee12f745272d26ea10d5f106a27cabc/recipes/perl6-mode"; sha256 = "0r5q2nggb9kbjcdfv81d7sm41jqz040j9z52fnck4b9mlz2dy6d0"; - name = "perl6-mode"; + name = "recipe"; }; packageRequires = [ emacs pkg-info ]; meta = { @@ -56958,9 +74328,13 @@ license = lib.licenses.free; }; }) {}; - perlbrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + perlbrew = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "perlbrew"; + ename = "perlbrew"; version = "20161108.2309"; src = fetchFromGitHub { owner = "kentaro"; @@ -56968,10 +74342,10 @@ rev = "3a3406c3307c92aa30f9400d430925c434a3b6f0"; sha256 = "0kxz8ljc7w69ywp0bb15010sgrr13i1p05hcvhfr9c35l0n62r6p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24bd9c2cd848f5003a244a7127e8fc5ef46bdca4/recipes/perlbrew"; sha256 = "1qadwkcic2qckqy8hgrnj08ajhxayknhpyxkc6ir15vfqjk5crr8"; - name = "perlbrew"; + name = "recipe"; }; packageRequires = []; meta = { @@ -56979,9 +74353,13 @@ license = lib.licenses.free; }; }) {}; - persistent-overlays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + persistent-overlays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "persistent-overlays"; + ename = "persistent-overlays"; version = "20161127.2300"; src = fetchFromGitHub { owner = "mneilly"; @@ -56989,10 +74367,10 @@ rev = "f563c8b966edc78c9d806661c4eb80e4781c4eab"; sha256 = "0csllpkpjf4csw3zfaw8k05jg078najfmjz6pz1jcl6b4sxjdfqa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3673c87c5ca883b4f713efeae912c3ad991c667/recipes/persistent-overlays"; sha256 = "136acbxqykvsw8a5il1zgpxr7llxmc3347847vf0jnmbzb1b472a"; - name = "persistent-overlays"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57000,20 +74378,25 @@ license = lib.licenses.free; }; }) {}; - persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + persistent-scratch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "persistent-scratch"; - version = "20170110.546"; + ename = "persistent-scratch"; + version = "20180425.1811"; src = fetchFromGitHub { owner = "Fanael"; repo = "persistent-scratch"; - rev = "551c655fa349e6f48e4e29f427fff7594f76ac1d"; - sha256 = "1iqfr8s4cvnnmqw5yxyr6b6nghbsc95mgjlc61qxa8wa1mpv31rz"; + rev = "0bfd717d28ce9e262741b06341c61306602c7711"; + sha256 = "1fq3m3p81rrvv1yp0cxfznphx7gava11sn09x706lmm1js62jnip"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch"; sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1"; - name = "persistent-scratch"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -57021,9 +74404,15 @@ license = lib.licenses.free; }; }) {}; - persistent-soft = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache }: - melpaBuild { + persistent-soft = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , list-utils + , melpaBuild + , pcache }: + melpaBuild { pname = "persistent-soft"; + ename = "persistent-soft"; version = "20150223.1053"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -57031,10 +74420,10 @@ rev = "a1e0ddf2a12a6f18cab565dee250f070384cbe02"; sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/persistent-soft"; sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc"; - name = "persistent-soft"; + name = "recipe"; }; packageRequires = [ list-utils pcache ]; meta = { @@ -57042,9 +74431,16 @@ license = lib.licenses.free; }; }) {}; - persp-fr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: - melpaBuild { + persp-fr = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , persp-mode }: + melpaBuild { pname = "persp-fr"; + ename = "persp-fr"; version = "20180103.642"; src = fetchFromGitHub { owner = "rocher"; @@ -57052,10 +74448,10 @@ rev = "aeb3b5de6135269091bb9aa0396973766c27fc88"; sha256 = "0l6hlgn54iw2f6ry0gw79rsbz1r4svxf2xwffi580vi68wrcnvf2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr"; sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2"; - name = "persp-fr"; + name = "recipe"; }; packageRequires = [ dash emacs persp-mode ]; meta = { @@ -57063,20 +74459,24 @@ license = lib.licenses.free; }; }) {}; - persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + persp-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "persp-mode"; - version = "20180104.843"; + ename = "persp-mode"; + version = "20180604.1018"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "eef754ce06159e220a9f3c99db3809925f41b8f1"; - sha256 = "1x4s1nlnvab3sgzm0glkazfpc7lkh64af5nc4jjz1jzin8v0m055"; + rev = "cc1d16aeb17f45d7141fcdc45f8bbffa03b3127f"; + sha256 = "1qjnzdrx5a5nv742wvcv50jgjis6a44xwl29gj4k9ix5phgc2n9l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w"; - name = "persp-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57084,9 +74484,16 @@ license = lib.licenses.free; }; }) {}; - persp-mode-projectile-bridge = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode, projectile }: - melpaBuild { + persp-mode-projectile-bridge = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , persp-mode + , projectile }: + melpaBuild { pname = "persp-mode-projectile-bridge"; + ename = "persp-mode-projectile-bridge"; version = "20170315.420"; src = fetchFromGitHub { owner = "Bad-ptr"; @@ -57094,10 +74501,10 @@ rev = "f6453cd7b8b4352c06e771706f2c5b7e2cdff1ce"; sha256 = "1gyfn2fhx3bqzr9m1r4b8nyak8pmpcgj7yz2bagnjs21vfngr18c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c049b0067b70577511114dc8abac0a00a9e0588/recipes/persp-mode-projectile-bridge"; sha256 = "169mpikixa33ljmh2n9sm186yibrik3f5p8m1hcisnzdsc3wgxmp"; - name = "persp-mode-projectile-bridge"; + name = "recipe"; }; packageRequires = [ cl-lib persp-mode projectile ]; meta = { @@ -57105,20 +74512,27 @@ license = lib.licenses.free; }; }) {}; - persp-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, perspective, projectile }: - melpaBuild { + persp-projectile = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , perspective + , projectile }: + melpaBuild { pname = "persp-projectile"; - version = "20160709.2317"; + ename = "persp-projectile"; + version = "20180616.1244"; src = fetchFromGitHub { owner = "bbatsov"; repo = "persp-projectile"; - rev = "7686633acf44402fa90429759cca6a155e4df2b9"; - sha256 = "0rqyzsmg32sdr4k9i2lf3jfyr9bskkl7gfb5ndl16iip9py7403z"; + rev = "3a79cb26e290b478e83aa7795146fb1759092d14"; + sha256 = "17i1srw1k771i3a5wlydbyasyd9z39ryf48mxfs0dsbx1zjbj0pg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/persp-projectile"; sha256 = "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm"; - name = "persp-projectile"; + name = "recipe"; }; packageRequires = [ cl-lib perspective projectile ]; meta = { @@ -57126,20 +74540,25 @@ license = lib.licenses.free; }; }) {}; - perspective = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + perspective = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "perspective"; - version = "20160609.1444"; + ename = "perspective"; + version = "20180717.1403"; src = fetchFromGitHub { owner = "nex3"; repo = "perspective-el"; - rev = "89a8ef5e8297b113e4f732bb94336608b76e13fd"; - sha256 = "1bdywz241kyvlxn107l2jg6vyhvvw5j4pywrarzx3pdymh9qk645"; + rev = "8e2f122de408d7866136dd861d513a9575cf32e6"; + sha256 = "0pd5sqrrz6y3md20yh6ffy32jdcgb1gc9b4j14pm6r54bqxik68h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspective"; sha256 = "021ax1c2ys82dcjs5jl7b4nb83n6gax2imnpm030rcbihjl1lzm7"; - name = "perspective"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -57147,9 +74566,15 @@ license = lib.licenses.free; }; }) {}; - perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: - melpaBuild { + perspeen = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , powerline }: + melpaBuild { pname = "perspeen"; + ename = "perspeen"; version = "20171203.221"; src = fetchFromGitHub { owner = "seudut"; @@ -57157,10 +74582,10 @@ rev = "edb70c530bda50ff3d1756e32a703d5fef5e5480"; sha256 = "12h0kj96s4h8z4kqalp7hccnlnqn5lrax3df75gz16pskx2dwxqr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen"; sha256 = "0kwmllas9vnppsfaviy58d0nk4hmlqp566mfr4l53x46sybv1y04"; - name = "perspeen"; + name = "recipe"; }; packageRequires = [ emacs powerline ]; meta = { @@ -57168,20 +74593,25 @@ license = lib.licenses.free; }; }) {}; - pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pfuture = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pfuture"; - version = "20171116.812"; + ename = "pfuture"; + version = "20180715.524"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "pfuture"; - rev = "d55a764b5beee803e489974be2408dbe236fc482"; - sha256 = "1p6prnjh9pnz6q7fmlb5wjm2jzdm2jikkp6qfll8v7m3l19xwrmw"; + rev = "e39d0d2953a5db7d9f567596865239012e506ac4"; + sha256 = "0nd1asv8a0iqjvgaaxy4pyyfxcyk3rlyxndia78rzskkl53dqrc6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; sha256 = "15fr9wkpv8v1p22wz7hsyihq7f807ck105c2crfs8y7capfvs53s"; - name = "pfuture"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -57189,9 +74619,13 @@ license = lib.licenses.free; }; }) {}; - pg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pg = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pg"; + ename = "pg"; version = "20130731.1442"; src = fetchFromGitHub { owner = "cbbrowne"; @@ -57199,10 +74633,10 @@ rev = "4f6516ec3946d95dcef49abb6703cc89ecb5183d"; sha256 = "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4d1bb21948da2b283a3a9d89d9e3aed11afa13/recipes/pg"; sha256 = "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji"; - name = "pg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57210,9 +74644,13 @@ license = lib.licenses.free; }; }) {}; - pgdevenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pgdevenv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pgdevenv"; + ename = "pgdevenv"; version = "20150105.1436"; src = fetchFromGitHub { owner = "dimitri"; @@ -57220,10 +74658,10 @@ rev = "7f1d5bc734750aca98cf67a9491cdbd5615fd132"; sha256 = "0c9d4c24ic67y07y74bv5b7vc56b6l0lbh2fbzm870r1dl5zbzcj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73ae474fc4792b2c322a0d2b5fd5b7cfe8c2fd05/recipes/pgdevenv"; sha256 = "0za35sdwwav81wpk4jjqh56icaswwxxyg3bqqp0qiz24llb5ln1w"; - name = "pgdevenv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57231,20 +74669,25 @@ license = lib.licenses.free; }; }) {}; - ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ph = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ph"; + ename = "ph"; version = "20161029.822"; src = fetchFromGitHub { owner = "gromnitsky"; repo = "ph"; - rev = "ed80dad9211583ed0db633448b3624c99b7fac23"; - sha256 = "1pgz64zv9a0r16i958x53g7wnk0q7ngcd6z1maf7lxhlp57v015d"; + rev = "a66e38637d1898b2ec31ee611033ac3f295fd97f"; + sha256 = "10xznvjszn0smn6wf84rykkkiqyzv7xf7fjjyklhll7zphg714mw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f62ca074ca2df780ab32aac50b2b828ee6a9934c/recipes/ph"; sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l"; - name = "ph"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -57252,9 +74695,18 @@ license = lib.licenses.free; }; }) {}; - phabricator = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }: - melpaBuild { + phabricator = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , s }: + melpaBuild { pname = "phabricator"; + ename = "phabricator"; version = "20160510.725"; src = fetchFromGitHub { owner = "ajtulloch"; @@ -57262,10 +74714,10 @@ rev = "d09d6f059aea92d3b11c68664a5e80c901182ab8"; sha256 = "0cmfb5ns335nq27iw94qxvrldpwjga0hw40da9kpdcfg0in4ya0c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/829010a578f34f0f2dfb36a0de01547c2950bb65/recipes/phabricator"; sha256 = "07988f2xyp76xjs25b3rdblhmijs2piriz4p0q92jw69bdvkl14c"; - name = "phabricator"; + name = "recipe"; }; packageRequires = [ dash emacs f projectile s ]; meta = { @@ -57273,20 +74725,27 @@ license = lib.licenses.free; }; }) {}; - phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + phan = callPackage ({ composer + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "phan"; - version = "20171017.2045"; + ename = "phan"; + version = "20180527.2039"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phan.el"; - rev = "17b44a62580272bcf5ee91fb58098292e9de6f83"; - sha256 = "002qak8jlim6pjj3ckikzzcc6n40mcqd5qvzakazi1q01z1ffsnd"; + rev = "6b077b3421a0b2c0b98a6906b8ab0d14d9d7bf50"; + sha256 = "1af4pam149dgxqzwqkjklxxqq2n8fg3l1b9w6bmaw24lx1pdxcyv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan"; sha256 = "17ar6nxy0plx5li49kgf4f0h99wwmnnp5kwmpf34jg9ygyhaglvb"; - name = "phan"; + name = "recipe"; }; packageRequires = [ composer emacs f ]; meta = { @@ -57294,9 +74753,14 @@ license = lib.licenses.free; }; }) {}; - phi-autopair = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: - melpaBuild { + phi-autopair = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , paredit }: + melpaBuild { pname = "phi-autopair"; + ename = "phi-autopair"; version = "20170216.1953"; src = fetchFromGitHub { owner = "zk-phi"; @@ -57304,10 +74768,10 @@ rev = "3c7556779c3a53b045f5df33ae2a0c67469cbf60"; sha256 = "16gh2r1mhmirbq20kklym4l60rfcfn8dsj0vv3hx3fj8q81h8qc9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f26b586c0126699f3de65bf38dfbf9c4c0149c15/recipes/phi-autopair"; sha256 = "1ya1bvh28qgz1zg9kdh2lzbsf0w0lx4xr42mdrjwaz3bbfa9asg4"; - name = "phi-autopair"; + name = "recipe"; }; packageRequires = [ paredit ]; meta = { @@ -57315,9 +74779,14 @@ license = lib.licenses.free; }; }) {}; - phi-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + phi-grep = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "phi-grep"; + ename = "phi-grep"; version = "20170606.107"; src = fetchFromGitHub { owner = "zk-phi"; @@ -57325,10 +74794,10 @@ rev = "ab9bd8d25e751a9cbfa108b49839293230b6e8b5"; sha256 = "0p1i07dgaic0jnwdsnvsnib2913r9w8j98d1p5rx8db2nabjmzc0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/992655fa4bd209abdf1149572e95f853e595125e/recipes/phi-grep"; sha256 = "1y5lq6lq9qdydbypb1pjnxryh94a295nnqqh2x27whiwdiysirjj"; - name = "phi-grep"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -57336,9 +74805,13 @@ license = lib.licenses.free; }; }) {}; - phi-rectangle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + phi-rectangle = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "phi-rectangle"; + ename = "phi-rectangle"; version = "20151207.2254"; src = fetchFromGitHub { owner = "zk-phi"; @@ -57346,10 +74819,10 @@ rev = "0c12716afc71d803d1f39417469521dc465762d9"; sha256 = "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/phi-rectangle"; sha256 = "111fqqa7h5cajq92sbiqhavm25l5bcapxhfh38y7irq4mv08xifw"; - name = "phi-rectangle"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57357,9 +74830,13 @@ license = lib.licenses.free; }; }) {}; - phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + phi-search = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "phi-search"; + ename = "phi-search"; version = "20180321.1829"; src = fetchFromGitHub { owner = "zk-phi"; @@ -57367,10 +74844,10 @@ rev = "9a089b8271cb1cff9640848850298c9ec855286c"; sha256 = "1gr5plcbrfdc4pglfj905s89hf8x0kc083h30wcnd81bnw9jwz1x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0274300c33f19ca6f868e1d570ffee513dbdf7/recipes/phi-search"; sha256 = "0nj06ixl76dd80zg83q4bi8k224mcwb612mr4gd1xppj5k8xl03g"; - name = "phi-search"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57378,9 +74855,14 @@ license = lib.licenses.free; }; }) {}; - phi-search-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, phi-search }: - melpaBuild { + phi-search-dired = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , phi-search }: + melpaBuild { pname = "phi-search-dired"; + ename = "phi-search-dired"; version = "20150405.14"; src = fetchFromGitHub { owner = "zk-phi"; @@ -57388,10 +74870,10 @@ rev = "162a5e4507c72512affae22744bb606a906d4193"; sha256 = "1b44947hncw4q42fxxrz6fm21habzp4pyp0569xdwysrx2rca2fn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c6dd518648f23927c5e6424210c157ed3cfd95/recipes/phi-search-dired"; sha256 = "1gf3vs3vrp5kbq4ixnj7adazmnqixi63qswgc2512p10gf7inf8p"; - name = "phi-search-dired"; + name = "recipe"; }; packageRequires = [ phi-search ]; meta = { @@ -57399,9 +74881,15 @@ license = lib.licenses.free; }; }) {}; - phi-search-mc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, phi-search }: - melpaBuild { + phi-search-mc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multiple-cursors + , phi-search }: + melpaBuild { pname = "phi-search-mc"; + ename = "phi-search-mc"; version = "20160324.803"; src = fetchFromGitHub { owner = "knu"; @@ -57409,10 +74897,10 @@ rev = "7aa671910f766437089aec26c3aa7814222d1356"; sha256 = "0wr86ad0yl52im6b9z0b9pzmhcn39qg5m9878yfv1nbxliw40lcd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83cf3fa3736eb2583dcf6bca16b9acb89e3408a3/recipes/phi-search-mc"; sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8"; - name = "phi-search-mc"; + name = "recipe"; }; packageRequires = [ multiple-cursors phi-search ]; meta = { @@ -57420,20 +74908,26 @@ license = lib.licenses.free; }; }) {}; - phi-search-migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, migemo, phi-search }: - melpaBuild { + phi-search-migemo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , migemo + , phi-search }: + melpaBuild { pname = "phi-search-migemo"; + ename = "phi-search-migemo"; version = "20170618.221"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-search-migemo"; - rev = "308909ebfc8003d16673f97ca9eb26a667b72969"; - sha256 = "07pi72jnd6k5xj9ypmxa0pbb03r07safpgf8vlp1m0xda5ixl0wf"; + rev = "723b584d386639d59298d872ad7a035d3f8008b0"; + sha256 = "01j3fpn44vgj8fq4smay1qd3wnh321v5pkgm9vkhpryj1v1g7am1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b78e07146a4e954e050349a1798ac46ecba10bab/recipes/phi-search-migemo"; sha256 = "0qk73s09sasm438w29j5z2bmlb60p1mgbv2ch43rgq8c6kjzg6h6"; - name = "phi-search-migemo"; + name = "recipe"; }; packageRequires = [ migemo phi-search ]; meta = { @@ -57441,9 +74935,13 @@ license = lib.licenses.free; }; }) {}; - phoenix-dark-mono-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + phoenix-dark-mono-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "phoenix-dark-mono-theme"; + ename = "phoenix-dark-mono-theme"; version = "20170729.706"; src = fetchFromGitHub { owner = "j0ni"; @@ -57451,10 +74949,10 @@ rev = "a54f515d162148bcb38676980bc2316adb3d7b8b"; sha256 = "1zr334qsjrajd2vrrlc1rfm4b4kdw15jfh5d102vj5bp7z7ajhb4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-mono-theme"; sha256 = "15in299j170n0wxmkg3cx1zzx1n7r1ifraqqzfqhcnk8i8lmc939"; - name = "phoenix-dark-mono-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57462,9 +74960,13 @@ license = lib.licenses.free; }; }) {}; - phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "phoenix-dark-pink-theme"; + ename = "phoenix-dark-pink-theme"; version = "20170729.703"; src = fetchFromGitHub { owner = "j0ni"; @@ -57472,10 +74974,10 @@ rev = "4defbb76b00c1a29f060813898578152d6be623d"; sha256 = "03d7ak4ia3fifp0c8fm4qdydizsfsxvcvbzwfxlsk66s28p5wglc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme"; sha256 = "0bz6iw73d85bi12qqx6fdw3paqknrxvn0asbwjmgdcrlqrfczjlr"; - name = "phoenix-dark-pink-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57483,20 +74985,26 @@ license = lib.licenses.free; }; }) {}; - php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }: - melpaBuild { + php-auto-yasnippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , php-mode + , yasnippet }: + melpaBuild { pname = "php-auto-yasnippets"; + ename = "php-auto-yasnippets"; version = "20170330.1814"; src = fetchFromGitHub { - owner = "ejmr"; + owner = "emacs-php"; repo = "php-auto-yasnippets"; rev = "03e1f0899c081813901ac15c2f7a675a37cca9f5"; sha256 = "0d7y6njsd1s2r5df2k8wvvwgxpwwyaqkhdd2b3p1php8rrbj3mg8"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d47ca8cd5900a80a2ede1b354547addf9b2bbbac/recipes/php-auto-yasnippets"; - sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn"; - name = "php-auto-yasnippets"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28b2d8802f98e339ff01ecf9733b71b6c631123e/recipes/php-auto-yasnippets"; + sha256 = "047i51ks2nn7ydrx2hjx9qvsh3lxnyxp8a6c3h3nb1acy84f5bd1"; + name = "recipe"; }; packageRequires = [ php-mode yasnippet ]; meta = { @@ -57504,20 +75012,24 @@ license = lib.licenses.free; }; }) {}; - php-boris = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + php-boris = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "php-boris"; + ename = "php-boris"; version = "20130527.121"; src = fetchFromGitHub { owner = "tomterl"; repo = "php-boris"; - rev = "f2faebf610c917f7091f7ec0cd97645629c4f819"; - sha256 = "07lcibr55pk3sab9bbq2r4phadl5p28n63wkq5rkhkkjc7s9rayc"; + rev = "4bb7e4d34d9906ddce688205eb24cafe634c6d06"; + sha256 = "1pya68rbn3bs67nn0mprjx2w759byqmixylcvl25v8f645nmxd0r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/php-boris"; sha256 = "0kklwk8b98czsg567vgzzdfnv76yn1id3ah2q2qqdhaky1yzw7ak"; - name = "php-boris"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57525,20 +75037,25 @@ license = lib.licenses.free; }; }) {}; - php-boris-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, php-boris }: - melpaBuild { + php-boris-minor-mode = callPackage ({ fetchgit + , fetchurl + , highlight + , lib + , melpaBuild + , php-boris }: + melpaBuild { pname = "php-boris-minor-mode"; + ename = "php-boris-minor-mode"; version = "20140209.1035"; - src = fetchFromGitHub { - owner = "steckerhalter"; - repo = "php-boris-minor-mode"; - rev = "c70e176dd6545f2d42ca3427e87b469635616d8a"; - sha256 = "1wk7vq80v97psxfg0pwy4mc6kdc61gm6h1vgl9p71ii6g6zvzcqg"; + src = fetchgit { + url = "https://framagit.org/steckerhalter/php-boris-minor-mode.git"; + rev = "8648eba604e4ff82ef6594a2c5ee4cb4825e6235"; + sha256 = "00lmvsmh053zhdv56vkcxc4dpzrlx6jyck87vq8vjbj8q9nmkf23"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38006c8029c8891d660c423e79db0d45bf3d4428/recipes/php-boris-minor-mode"; - sha256 = "1cmpd303chldss7kylpinv8qc3c78srz02a9cp9x79c8arq7apwl"; - name = "php-boris-minor-mode"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/php-boris-minor-mode"; + sha256 = "06nzdvzjp6ywq0jf0v0cmcv77wj1vyas2r10kmxd45rzw12hqjd9"; + name = "recipe"; }; packageRequires = [ highlight php-boris ]; meta = { @@ -57546,20 +75063,25 @@ license = lib.licenses.free; }; }) {}; - php-cs-fixer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + php-cs-fixer = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "php-cs-fixer"; + ename = "php-cs-fixer"; version = "20170506.1133"; src = fetchFromGitHub { owner = "OVYA"; repo = "php-cs-fixer"; - rev = "ca2c075a22ad156c336d2aa093fb6394c9f6c112"; - sha256 = "1axjfsfasg7xyq5ax2bx7rh2mgf8caw5bh858hhp1gk9xvi21qhx"; + rev = "2e28b82d192c6f420ecb8cbef04256f3c9c47c4b"; + sha256 = "1lh37z4z09nz4wfp8ly94dwrmjsqpg6phw5r8y4gjhfnfbgpq4b9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3631c4b81c1784995ae9e74d832e301d79214e2/recipes/php-cs-fixer"; sha256 = "1xvz6v1fwngi2rizrx5sf0wrs4cy8rb13467r26k8hb7z8h1rqmf"; - name = "php-cs-fixer"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -57567,9 +75089,13 @@ license = lib.licenses.free; }; }) {}; - php-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + php-eldoc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "php-eldoc"; + ename = "php-eldoc"; version = "20140202.1141"; src = fetchFromGitHub { owner = "sabof"; @@ -57577,10 +75103,10 @@ rev = "df05064146b884d9081e10657e32dc480f070cfe"; sha256 = "0hm6myvf91f4d2yfc7fs2xky9m8hfnimx1gkfzmn9f5pcc2l2p0i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7af452f42847a947e87edd6aa559f807d08920c1/recipes/php-eldoc"; sha256 = "1q5fkl8crqrgxik2mxbkqv10qnqhqrazd66rgfw797s3jcchv58j"; - name = "php-eldoc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57588,20 +75114,26 @@ license = lib.licenses.free; }; }) {}; - php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + php-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "php-mode"; - version = "20180328.1051"; + ename = "php-mode"; + version = "20180608.250"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "2c83fbe9af2ac07806e973ed6baa34582fb70f4e"; - sha256 = "18a8q4jfdz2hh1dswv069qzqh68d2qzal7mprj64kz17a1p62d3w"; + rev = "cf1907be2ddca079146ef258ba95d525f17787e3"; + sha256 = "1dpyid4qp8lak6pvhjh1p5nwbgz67nq1yhwir54k4wk39r1g6i08"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y"; - name = "php-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -57609,20 +75141,24 @@ license = lib.licenses.free; }; }) {}; - php-refactor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + php-refactor-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "php-refactor-mode"; + ename = "php-refactor-mode"; version = "20171123.2235"; src = fetchFromGitHub { owner = "keelerm84"; repo = "php-refactor-mode.el"; - rev = "7a794b0618df2882b1bd586fdd698dba0bc5130d"; - sha256 = "12kjyzmicay7y37znk0znpn81lszmnydq5fkl5pk57bxblwwiivg"; + rev = "d06dabd9ca743a04067e02282b69d7b7467fb4b7"; + sha256 = "1mdbv079xj0a506hcq99bd8cdpwgq6anhqfkfwm56b3cn7g54qkr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad4a9bb43e131e2eb0d8b09b13245bc268c524a5/recipes/php-refactor-mode"; sha256 = "0gj0nv6ii7pya0hcxs8haz5pahj0sa12c2ls53c3j85in645zb3s"; - name = "php-refactor-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57630,9 +75166,15 @@ license = lib.licenses.free; }; }) {}; - php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + php-runtime = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "php-runtime"; + ename = "php-runtime"; version = "20180110.934"; src = fetchFromGitHub { owner = "emacs-php"; @@ -57640,10 +75182,10 @@ rev = "fa4312863245511462b75cb31df2f8558288f4df"; sha256 = "1glwy0cgnn0z4rnd45pqy0bmyaddhxfjlj778hz7ghy40h9kqbdn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime"; sha256 = "0dvnwajrjsgyqzglzpkx9vwx3f55mrag6dsbdjqc9vvpvxhmgfwb"; - name = "php-runtime"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -57651,9 +75193,16 @@ license = lib.licenses.free; }; }) {}; - php-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, s }: - melpaBuild { + php-scratch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , php-mode + , s }: + melpaBuild { pname = "php-scratch"; + ename = "php-scratch"; version = "20161103.1517"; src = fetchFromGitHub { owner = "mallt"; @@ -57661,10 +75210,10 @@ rev = "3aa66d1d53b84b779374edff7a7e6b5f2cd7575d"; sha256 = "0iyb4y0wrd1yqm56p37riw6nwvrlcgxj1x0nhw8304p8hv76mzdi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/php-scratch"; sha256 = "0sl9cccp4xjsidiyjf3sca8wlch3zd23zyac21xys11xm3rjxh9r"; - name = "php-scratch"; + name = "recipe"; }; packageRequires = [ emacs php-mode s ]; meta = { @@ -57672,20 +75221,53 @@ license = lib.licenses.free; }; }) {}; - phpcbf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + phpactor = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "phpactor"; + ename = "phpactor"; + version = "20180721.1022"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "phpactor.el"; + rev = "a09b2eb76228b39a9a6823dc6782e44bafc4b974"; + sha256 = "10x999z1rlnjdvnpq4c7gf6n19a47nj954y3vbshb15d6wzxd923"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d67b98ecd541c227c011615f67d7a0890f5e1af3/recipes/phpactor"; + sha256 = "0w2iszi74y3s6rcn6p2ic545cg319y4jpy83npbh5m98y8jma84m"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs f ]; + meta = { + homepage = "https://melpa.org/#/phpactor"; + license = lib.licenses.free; + }; + }) {}; + phpcbf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "phpcbf"; - version = "20150302.528"; + ename = "phpcbf"; + version = "20180519.138"; src = fetchFromGitHub { owner = "nishimaki10"; repo = "emacs-phpcbf"; - rev = "b556b548ceb061b002389d6165d2cc63d8bddb5d"; - sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z"; + rev = "a31020fc4c5add7339e009faea66894dc02a77f1"; + sha256 = "04iw5is9h6a0i650mymyxq32z02rzl6k7pvwmv849rka16xhw1aq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77ef54e3fb2715a081786dc54f99ae74def5c77c/recipes/phpcbf"; sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv"; - name = "phpcbf"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -57693,9 +75275,44 @@ license = lib.licenses.free; }; }) {}; - phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: - melpaBuild { + phpstan = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "phpstan"; + ename = "phpstan"; + version = "20180721.1235"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "phpstan.el"; + rev = "09102b062b607affc93f2d8a113a9fc9f9cf3016"; + sha256 = "0n21vyvd5c42v03xcfx94dz252z3s413i0f9pwjrssq2yd3x2bgm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/phpstan"; + sha256 = "0j3xb3h6fqgk0nv5mlfz7lgfkcy0z04an9qy8nq5y473hdj87qzm"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/phpstan"; + license = lib.licenses.free; + }; + }) {}; + phpunit = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , s }: + melpaBuild { pname = "phpunit"; + ename = "phpunit"; version = "20171127.301"; src = fetchFromGitHub { owner = "nlamirault"; @@ -57703,10 +75320,10 @@ rev = "a13706733f98be3639c47311fc820b3b50f4bc33"; sha256 = "0vfvybjinj0knim4ax0xspz7zr3n2y9ap1lvwqx1gwydr06w4jrl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit"; sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8"; - name = "phpunit"; + name = "recipe"; }; packageRequires = [ cl-lib emacs f pkg-info s ]; meta = { @@ -57714,20 +75331,24 @@ license = lib.licenses.free; }; }) {}; - pianobar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pianobar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pianobar"; - version = "20171117.1522"; + ename = "pianobar"; + version = "20180416.1804"; src = fetchFromGitHub { owner = "agrif"; repo = "pianobar.el"; - rev = "68fe0ed839f6775535081b3ae0a946ccaf11234a"; - sha256 = "0ycwahbn7fny3slmh5xkfv7vk4qj95jydygdk6pzzx6drsdhnyza"; + rev = "3154c4cb7401017fd441fcd6a7a0b669a4406882"; + sha256 = "0dy51pi85i8ag47zmnhppllsbmxd0bp704azffddkg36pjh4inxk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5659b4c7be20572aabe75caba866301393db012/recipes/pianobar"; sha256 = "16vsf2cig9qjbh9s58zb5byjmyghxbsxpzpm5hyyrv251jap1jjn"; - name = "pianobar"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57735,20 +75356,26 @@ license = lib.licenses.free; }; }) {}; - pickle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pickle = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pickle"; - version = "20180218.1840"; + ename = "pickle"; + version = "20180627.1937"; src = fetchFromGitHub { owner = "ahungry"; repo = "pickle-mode"; - rev = "d672186129a19581c908bae3063e09baa815869c"; - sha256 = "10jl9xinljzb8nra59r6wyrmsr8sbbl40yahpzn4558nmmdckcnb"; + rev = "568570b7d376026fbcb7c3df1ad8f605bd14c820"; + sha256 = "0dg44js5l1p93h73x7zh4znr0iwgmms7qr4v4594ab6sg7cc54jm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cb71882f074d3fef1f5a7b504dafcb6adff8ed4/recipes/pickle"; sha256 = "0fryzmrs6bn6r590qp08jyzx9g6jakf1pahxhcfglsv9k3jbfp13"; - name = "pickle"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -57756,9 +75383,13 @@ license = lib.licenses.free; }; }) {}; - picolisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + picolisp-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "picolisp-mode"; + ename = "picolisp-mode"; version = "20150516.155"; src = fetchFromGitHub { owner = "flexibeast"; @@ -57766,10 +75397,10 @@ rev = "1a537b14090813f46cbba54636d40365e1a8067e"; sha256 = "0p91ysyjksbravnw3l78mshay6swgb5k1zi5bbppppk8zkmdp115"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe116998dadeef6e61c0791efb396f9b8befa5d6/recipes/picolisp-mode"; sha256 = "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5"; - name = "picolisp-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57777,20 +75408,25 @@ license = lib.licenses.free; }; }) {}; - picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + picpocket = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "picpocket"; - version = "20170905.1133"; + ename = "picpocket"; + version = "20180610.359"; src = fetchFromGitHub { owner = "johanclaesson"; repo = "picpocket"; - rev = "e0ca0f1fc03b4166ce2eab9d7532b9b29989e5bd"; - sha256 = "0ldiwfysfwz6mr54j7rl1jccfx9lq31a4v9r6cm55js75mamhbw1"; + rev = "ce4b6ed088384f2414af82e8e4eae5b92c2874bf"; + sha256 = "15vpbcv83mc4j1pvrk7xic0klh2bl9gzg2xxs7c2lmnix52hy8mv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket"; sha256 = "0p2mrjcd8ig0h7dk0zvyfma4nnfk2ic6gp2dwfqyqq6irb010f45"; - name = "picpocket"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -57798,20 +75434,24 @@ license = lib.licenses.free; }; }) {}; - pig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pig-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pig-mode"; - version = "20140617.1058"; + ename = "pig-mode"; + version = "20180520.700"; src = fetchFromGitHub { owner = "motus"; repo = "pig-mode"; - rev = "af4200c88a50264b63fa162a02860f3f54c8755b"; - sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx"; + rev = "4c6c6e1b1bb719d8adc6c47cc24665f6fe558959"; + sha256 = "1vwnybyrzk8nw2cs27yrsipxb6hmx7cs5d60yf00h0wiv3l6v3rr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0d7c07d28e2f229b281201a781ebaceed6465ed/recipes/pig-mode"; sha256 = "0gmvc4rrqkn0cx8fk1sxk6phfbpf8dcba3k6i24k3idcx8rxsw3x"; - name = "pig-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57819,20 +75459,25 @@ license = lib.licenses.free; }; }) {}; - pig-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + pig-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "pig-snippets"; + ename = "pig-snippets"; version = "20130912.2324"; src = fetchFromGitHub { owner = "motus"; repo = "pig-mode"; - rev = "af4200c88a50264b63fa162a02860f3f54c8755b"; - sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx"; + rev = "69ca24cb756dd516828e284e33274145eba21183"; + sha256 = "1b1wibla851f7mra0jf13xhil1xw4s0m2l53f1s2h36468wb24y1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0d7c07d28e2f229b281201a781ebaceed6465ed/recipes/pig-snippets"; sha256 = "1sqi0a2dsqgmabkrncxiyrhibyryyy25d11b15ybhlngd05wqbx2"; - name = "pig-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -57840,9 +75485,14 @@ license = lib.licenses.free; }; }) {}; - pillar = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: - melpaBuild { + pillar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , makey + , melpaBuild }: + melpaBuild { pname = "pillar"; + ename = "pillar"; version = "20141112.1011"; src = fetchFromGitHub { owner = "pillar-markup"; @@ -57850,10 +75500,10 @@ rev = "13a7f676544cc66005ccd8e6fc1c25e4ccd6f909"; sha256 = "19i8hgzr7kdj4skf0cnv6vlsklq9qcyxcv3p33k9vgq7y4f9mah8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bff55f1182f3bd0bc8a8773921f703168d87de21/recipes/pillar"; sha256 = "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js"; - name = "pillar"; + name = "recipe"; }; packageRequires = [ makey ]; meta = { @@ -57861,9 +75511,13 @@ license = lib.licenses.free; }; }) {}; - pinboard-api = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pinboard-api = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pinboard-api"; + ename = "pinboard-api"; version = "20140324.448"; src = fetchFromGitHub { owner = "danieroux"; @@ -57871,10 +75525,10 @@ rev = "b7b5214d0c35178f8dca08cf22d6ef3c21f0fce4"; sha256 = "0wy9c37g6m5khchlp8qvfnjgkwq4r38659adcm5prvzjgzqhlfja"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a13787abe600b6f6355a475af573efa0064bf6f/recipes/pinboard-api"; sha256 = "0yzvgnpkj2fhl01id36nc5pj8vyb05bllraiz3lwwcc66y98h9n0"; - name = "pinboard-api"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57882,9 +75536,39 @@ license = lib.licenses.free; }; }) {}; - pinot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pinboard-popular = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , loop + , melpaBuild }: + melpaBuild { + pname = "pinboard-popular"; + ename = "pinboard-popular"; + version = "20180511.1026"; + src = fetchFromGitHub { + owner = "asimpson"; + repo = "pinboard-popular"; + rev = "c0bc76cd35f8ecf34723c64a702b82eec2751318"; + sha256 = "1msvb5r6ixd886plpbss62q2nwrrsb6271bi922vlhr817lhsain"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/094f63e451622571aac832b14221a0d5a96de9c5/recipes/pinboard-popular"; + sha256 = "0d9ng4mclnb9yfzh8wzz03fbhfxayns0dg31bdixkwvy2vk00rkf"; + name = "recipe"; + }; + packageRequires = [ loop ]; + meta = { + homepage = "https://melpa.org/#/pinboard-popular"; + license = lib.licenses.free; + }; + }) {}; + pinot = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pinot"; + ename = "pinot"; version = "20140211.1226"; src = fetchFromGitHub { owner = "tkf"; @@ -57892,10 +75576,10 @@ rev = "67fda555a155b22bb2ce44ba618b4bd6fc5f144a"; sha256 = "1wc31r5fpcia4n4vbpg7vv3rzrnjzh18yygi3kp4wvl2wzx2azqh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f75cd89811b4bb668c1e7a93246b93fbcf5d9c47/recipes/pinot"; sha256 = "1kjzq02pddnkia637xz2mnjjyglyh6qzragnf7nnxbw9ayiim58i"; - name = "pinot"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57903,9 +75587,41 @@ license = lib.licenses.free; }; }) {}; - pinyin-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: - melpaBuild { + pinyin = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "pinyin"; + ename = "pinyin"; + version = "20180620.541"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "pinyin.el"; + rev = "80b588cbf97973973fce4d720df3cf41306df2e4"; + sha256 = "1crd90f1b603k5k9qsdbi2zdkyhqcim8xk5mqw5w20mxrf39y36n"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b16f0f7f86021bb0bece6c90878b0dba1657107f/recipes/pinyin"; + sha256 = "1afgz62zpar6d65q4h12s7ijhhl2r2vlrnk79vsjrl560jh7hgfm"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/pinyin"; + license = lib.licenses.free; + }; + }) {}; + pinyin-search = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pinyinlib }: + melpaBuild { pname = "pinyin-search"; + ename = "pinyin-search"; version = "20160514.2058"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -57913,10 +75629,10 @@ rev = "2e877a76851009d41bde66eb33182a03a7f04262"; sha256 = "0bp4raxqv34jyg3yvdcsh9lav28x376gngm9nn8vjgmq9wggzf3i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03da6f02778f7fae77a00cdc420cfbafead6dec4/recipes/pinyin-search"; sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z"; - name = "pinyin-search"; + name = "recipe"; }; packageRequires = [ pinyinlib ]; meta = { @@ -57924,9 +75640,13 @@ license = lib.licenses.free; }; }) {}; - pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pinyinlib = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pinyinlib"; + ename = "pinyinlib"; version = "20170827.1442"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -57934,10 +75654,10 @@ rev = "45f05d3dbb4fe957f7ab332ca6f94675848b6aa3"; sha256 = "0pmgb4y06dbffs4442aa92vn8ydwl45zqwzxzwhk6md1318fppvd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib"; sha256 = "0kv67qa3825fw64qimkph2b65pilrsx5730y4c7f7c1f8giz5vxr"; - name = "pinyinlib"; + name = "recipe"; }; packageRequires = []; meta = { @@ -57945,20 +75665,25 @@ license = lib.licenses.free; }; }) {}; - pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pip-requirements = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pip-requirements"; - version = "20180306.1522"; + ename = "pip-requirements"; + version = "20180602.1034"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pip-requirements.el"; - rev = "88c764ad5d988a3ed0d2b6f0b7dd22308b03a058"; - sha256 = "01gl4nzqpmczprsdg13yvcj8d1p49wdwskmkm8nzssrshir6xdxl"; + rev = "4eff2953317272e145649effb1956081a31645ee"; + sha256 = "1hnkfbcsrf69pz71pka4hp8dv4qvq431x5ahind4iwz9lzsfhhwq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5eaf6987f92070ccc33d3e28c6bb2b96f72ba1aa/recipes/pip-requirements"; sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz"; - name = "pip-requirements"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -57966,20 +75691,27 @@ license = lib.licenses.free; }; }) {}; - pipenv = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + pipenv = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "pipenv"; - version = "20180222.359"; + ename = "pipenv"; + version = "20180718.2247"; src = fetchFromGitHub { owner = "pwalsh"; repo = "pipenv.el"; - rev = "364eaf1c823a28db97fe55e7fe85106107a23234"; - sha256 = "1f3xx606xvsmcc73mqml0w07xbkkm2xjirc4pfkb2883cfsk3fq1"; + rev = "05e98e80be2dd92f14ffb9f6048f98547a9f0253"; + sha256 = "1gdy31nlxac1c500jpcnvgb32lcg0xfqgiiyci4s958cwn1yn704"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv"; sha256 = "110ddg6yjglp49rgn1ck41rl97q92nm6zx86mxjmcqq35cxmc6g1"; - name = "pipenv"; + name = "recipe"; }; packageRequires = [ emacs f s ]; meta = { @@ -57987,20 +75719,27 @@ license = lib.licenses.free; }; }) {}; - pippel = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + pippel = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "pippel"; - version = "20170730.623"; + ename = "pippel"; + version = "20180710.156"; src = fetchFromGitHub { owner = "brotzeit"; repo = "pippel"; - rev = "3737d5934665b5059c1e858feeb4270262b37e53"; - sha256 = "0k94y305c6abhxgq6birfvnrplsx5gadwsqwn8m87sh8ldsjnmgi"; + rev = "21a5200e8e5ccaa1911abb4ebf090b76ca839756"; + sha256 = "1amqjm6kn1xda058kdwq3xgk7raz6y9iw0mzrac78sgf57qaczyb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/pippel"; sha256 = "1li4h0dff1n7njy2lk3d50ndrlw84fphmdg16j0srkbgy7xz90yn"; - name = "pippel"; + name = "recipe"; }; packageRequires = [ dash emacs s ]; meta = { @@ -58008,9 +75747,13 @@ license = lib.licenses.free; }; }) {}; - pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pivotal-tracker = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pivotal-tracker"; + ename = "pivotal-tracker"; version = "20170720.816"; src = fetchFromGitHub { owner = "jxa"; @@ -58018,10 +75761,10 @@ rev = "0311d117037c74512149a4a78b269c2e46d7dfba"; sha256 = "0g3xzh8jr9lbg6h2hk81cdyxkxx3l79qhxrp4g34rc0dml79rzf9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pivotal-tracker"; sha256 = "0yiyz11sd25ybgr2qmg62qqmcz96va1pq3q866cqmpl38xn7znpj"; - name = "pivotal-tracker"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58029,20 +75772,26 @@ license = lib.licenses.free; }; }) {}; - pixie-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, inf-clojure, lib, melpaBuild }: - melpaBuild { + pixie-mode = callPackage ({ clojure-mode + , fetchFromGitHub + , fetchurl + , inf-clojure + , lib + , melpaBuild }: + melpaBuild { pname = "pixie-mode"; - version = "20150121.2124"; + ename = "pixie-mode"; + version = "20180625.2241"; src = fetchFromGitHub { owner = "johnwalker"; repo = "pixie-mode"; - rev = "f32d5d812c7b5b72d7ff7bad52b41035f9ef6e96"; - sha256 = "0nnvf2p593gn8sbyrvczyll030xgnkxn900a2hy7ia7xh0wmvddp"; + rev = "a40c2632cfbe948852a5cdcfd44e6a65db11834d"; + sha256 = "11c5gv88chh7sg2i0rzisbad0mkq1zc7dyi5md8hdi5gqm68704g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a57300bfdae57c9996db0411d56a5fc7b35778c3/recipes/pixie-mode"; sha256 = "16z15yh78837k548xk5widdmy6fv03vym6q54i40knmgf5cllsl8"; - name = "pixie-mode"; + name = "recipe"; }; packageRequires = [ clojure-mode inf-clojure ]; meta = { @@ -58050,9 +75799,13 @@ license = lib.licenses.free; }; }) {}; - pixiv-novel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pixiv-novel-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pixiv-novel-mode"; + ename = "pixiv-novel-mode"; version = "20160220.621"; src = fetchFromGitHub { owner = "zonuexe"; @@ -58060,10 +75813,10 @@ rev = "0d1ca524d92b91f20a7105402a773bc21779b434"; sha256 = "18rvnvm097ca4yc1nfswdv7dfqg36insnif5kfj19aa60m9qxl09"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92092c1c13c37520f98b952d40745aa062f062c1/recipes/pixiv-novel-mode"; sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px"; - name = "pixiv-novel-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58071,20 +75824,25 @@ license = lib.licenses.free; }; }) {}; - pkg-info = callPackage ({ epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pkg-info = callPackage ({ epl + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pkg-info"; + ename = "pkg-info"; version = "20150517.443"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "pkg-info.el"; - rev = "76ba7415480687d05a4353b27fea2ae02b8d9d61"; - sha256 = "150xhsv695cchs5jc2hwk9gjgs0k8wkm966crvxxs6xvj5fg69xq"; + rev = "4dbe328c9eced79e0004e3fdcd7bfb997a928be5"; + sha256 = "1xkdbyhz9mgdz5zmjm4hh050klsl12w5lkckw2l77ihcxv0vjnf2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pkg-info"; sha256 = "1k23hmpcq534060qcxbrv4g6bw9nzcbjg192mbdp20kwidw7p81n"; - name = "pkg-info"; + name = "recipe"; }; packageRequires = [ epl ]; meta = { @@ -58092,41 +75850,51 @@ license = lib.licenses.free; }; }) {}; - pkgbuild-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pkgbuild-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pkgbuild-mode"; - version = "20151010.736"; + ename = "pkgbuild-mode"; + version = "20180609.931"; src = fetchFromGitHub { owner = "juergenhoetzel"; repo = "pkgbuild-mode"; - rev = "7369ab3c6b59cfdf2ecd2b32ad96ce006e766fa0"; - sha256 = "077vp3fxwxj7b98ydw6iyi391w3acp73qwk6615yqdylpp66m750"; + rev = "b19759d8c4fcb27ac3455d277ad8b81886f0ad97"; + sha256 = "038xgic6ngvgsbn3ss3nvhdy3bhq425sas5lgg8z1nql8f4rz2kb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/pkgbuild-mode"; sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x"; - name = "pkgbuild-mode"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/pkgbuild-mode"; license = lib.licenses.free; }; }) {}; - plain-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + plain-theme = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "plain-theme"; + ename = "plain-theme"; version = "20171123.2010"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "yegortimoshenko"; repo = "plain-theme"; rev = "2609a811335d58cfb73a65d6307c156fe09037d3"; sha256 = "0g5vl4xigdm2pn2mnkwgj1kxdjr66w7ynr77bchy3ij6qvzdzkqd"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; - sha256 = "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8"; - name = "plain-theme"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b147fb05a1b4296e1b85d31ba018d132a5bb5ed2/recipes/plain-theme"; + sha256 = "10qq7cy6hqh6c8qi796y9lk4wyyjbhdn1pvkcw3g29cfh857x50m"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -58134,20 +75902,24 @@ license = lib.licenses.free; }; }) {}; - plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + plan9-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "plan9-theme"; - version = "20180102.1852"; + ename = "plan9-theme"; + version = "20180606.2035"; src = fetchFromGitHub { owner = "john2x"; repo = "plan9-theme.el"; - rev = "2a31fb9251922667692337c867612947d2139696"; - sha256 = "0g01a34q3dsn23s7s94xxmrvqalmvzi3hdz2hgh4swn4hrp4bzqf"; + rev = "4c9455033e877b7ce464bc99de32f310cf0bcda9"; + sha256 = "0arbhpms38i75a9dpqn9krv64bx47jaiccanqdgzf4slcb8kvk6z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme"; sha256 = "0bvr877mc79s1shr82b33ipspz09jzc3809c6pkbw0jqpfid44cc"; - name = "plan9-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58155,9 +75927,14 @@ license = lib.licenses.free; }; }) {}; - planet-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + planet-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "planet-theme"; + ename = "planet-theme"; version = "20161030.1917"; src = fetchFromGitHub { owner = "cmack"; @@ -58165,10 +75942,10 @@ rev = "b0a310ff36565fe22224c407cf59569986698a32"; sha256 = "1xdj59skmldq5dnarirhwq4qycipas86nbyqwl8zsv0bh20nl1rs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/planet-theme"; sha256 = "1hr5m08qn51r9804jd0k95ryz3frzkk1dp6wpybil6bf67a2l5lr"; - name = "planet-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -58176,20 +75953,24 @@ license = lib.licenses.free; }; }) {}; - plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + plantuml-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "plantuml-mode"; + ename = "plantuml-mode"; version = "20170819.1033"; src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "cfb408fc840dae80a7d05d5648d27c18f04c00a9"; - sha256 = "1w2f953glxqfg8ilv537qznxj4kv4ddi011wyhkn27sv4wnky82c"; + rev = "5a2e8d0dd2ba9286fc3c82d8689d25050290f68d"; + sha256 = "1gcv5gmps371wd2sjbq4g5p2yj2ip8lpn81lypwb5xavqa7gjhlv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode"; sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h"; - name = "plantuml-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58197,20 +75978,25 @@ license = lib.licenses.free; }; }) {}; - plaster = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + plaster = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "plaster"; + ename = "plaster"; version = "20180127.1250"; src = fetchFromGitHub { owner = "Shirakumo"; repo = "plaster"; - rev = "c6c9c223d634041411d111b4397574f65e140585"; - sha256 = "0pzdw9jb1p1bi5zc59sjvwxzczg8laz5vlsrs73ah1pk9jckqwf5"; + rev = "11eb23920410818fe444887b97ad4c8722d66c85"; + sha256 = "0lqz8m8a2ahvgm0i9cz0j4bisi34czc4s29z70p5p6rdg4g21fk1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e363cffa021e649c052f38cedb7cc01dbe9e24a/recipes/plaster"; sha256 = "0vfixc0f5n4flsmdf1iqlbx03yv28w3nqm1ycz2fx6p5jvhkvfqk"; - name = "plaster"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -58218,9 +76004,14 @@ license = lib.licenses.free; }; }) {}; - platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + platformio-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "platformio-mode"; + ename = "platformio-mode"; version = "20161210.539"; src = fetchFromGitHub { owner = "ZachMassia"; @@ -58228,10 +76019,10 @@ rev = "1466aed132a77f48fcb31938d64abb1a1e58ec42"; sha256 = "1lfkp7df8as9gspynkyhz4dbm95kbngyba1ymg6ql67adyv79v1i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/platformio-mode"; sha256 = "1v1pp3365wj19a5wmsxyyy5n548z3lmcbm2pwl914wip3ca7546f"; - name = "platformio-mode"; + name = "recipe"; }; packageRequires = [ projectile ]; meta = { @@ -58239,20 +76030,27 @@ license = lib.licenses.free; }; }) {}; - play-crystal = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + play-crystal = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "play-crystal"; + ename = "play-crystal"; version = "20180114.224"; src = fetchFromGitHub { owner = "veelenga"; repo = "play-crystal.el"; - rev = "0b4810a9025213bd11dbcbfd38b3ca928829e0a5"; - sha256 = "15gqr11paz5qmx43qb0f95wc87nn2snr7my22b0n6jwbk5djf402"; + rev = "86b54346e7c832c14f8e5654a462f6490a6b11d7"; + sha256 = "0kvkr24f8r21pahm2lsvbr9bg53770wxwpdfmmjljs2zmgxf2c40"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92715977136afa731e85e894542dc88b664b3304/recipes/play-crystal"; sha256 = "1jqf36b1mhyf4j7fs386g6isy09q7k8zwdc4rb34mhjg1a56gcnf"; - name = "play-crystal"; + name = "recipe"; }; packageRequires = [ dash emacs request ]; meta = { @@ -58260,20 +76058,24 @@ license = lib.licenses.free; }; }) {}; - play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + play-routes-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "play-routes-mode"; + ename = "play-routes-mode"; version = "20170426.33"; src = fetchFromGitHub { owner = "brocode"; repo = "play-routes-mode"; - rev = "22d7b87e0eaf0330f2b2283872f8dc08a3258771"; - sha256 = "0j61adh2lsh2zgz1v9i2jzh56ngnrpvsblipvc472k5dxa5qdxin"; + rev = "ef8230932f7bb96643febbd6872c522932f9571a"; + sha256 = "1wv4wnkcdlq5qvxr55wgs6dc64m69r0niz0r5h2ch9d5nclmvbkh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode"; sha256 = "17phqil2zf5rfvhs5v743dh4lix4v2azbf33z9n97ahs7j66y2gz"; - name = "play-routes-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58281,20 +76083,24 @@ license = lib.licenses.free; }; }) {}; - playerctl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + playerctl = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "playerctl"; + ename = "playerctl"; version = "20180301.554"; src = fetchFromGitHub { owner = "thomasluquet"; repo = "playerctl.el"; - rev = "3eee541423c2e5eb9f23a26fa9aa88c9c5a19ad1"; - sha256 = "16qvn1mss5j8vpf1qpq4lwl4hwng64caw3c3shixsncfmgw25z6f"; + rev = "c75358240a9bc234f31fc3e652929b103b1238b9"; + sha256 = "1yf66kw967xminfwzzdfzimh1313m3lm946bmcdl1zb8db0fcrdc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6db0d82c2eef7c5bef5f9f2c15969da4c404b62d/recipes/playerctl"; sha256 = "1pix3hcsg6ymzajiixwcq4v3clvadpkl0rhplkhachv6wmci327x"; - name = "playerctl"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58302,20 +76108,25 @@ license = lib.licenses.free; }; }) {}; - playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + playground = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "playground"; - version = "20180319.243"; + ename = "playground"; + version = "20180623.2026"; src = fetchFromGitHub { owner = "akirak"; repo = "emacs-playground"; - rev = "f1b87ba65d8be28c4a8fc0fd8480d2da00e52406"; - sha256 = "0fqja170pbdrj1lz8dfpi53l07bf4vk18maa1kzcd2nyd569xxvi"; + rev = "85ab8ce4b574254eead623a3553082a9e6e655af"; + sha256 = "0m780v6h3mjib5hmmv3afjnmh562v5c13l6vam4nnhj4qrq33ri8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f062a74fe1746129879ad19c1735621f58509d33/recipes/playground"; sha256 = "1xjmxkl8h4l87fvv1sr478r6mkmy9gkzw2fxmzqn5fcsahzkyg4d"; - name = "playground"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -58323,9 +76134,13 @@ license = lib.licenses.free; }; }) {}; - plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + plenv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "plenv"; + ename = "plenv"; version = "20130706.2316"; src = fetchFromGitHub { owner = "karupanerura"; @@ -58333,10 +76148,10 @@ rev = "ee937d0f3a1a7ba2d035f45be896d3ed8fefaee2"; sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0819979b9567ac5fab9ed6821eba8fe7ee6a299/recipes/plenv"; sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4"; - name = "plenv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58344,20 +76159,24 @@ license = lib.licenses.free; }; }) {}; - plim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + plim-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "plim-mode"; + ename = "plim-mode"; version = "20140812.1713"; src = fetchFromGitHub { owner = "dongweiming"; repo = "plim-mode"; - rev = "92e39190286f172567ceb02c80e1df3b81abfa2d"; - sha256 = "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2"; + rev = "98cd6d11b7ff3ee7b6cb8845f143b5a692a3e6e8"; + sha256 = "1mcd6c3kgq9a5mv9c9di042vqicjp16nm9i6kz0p8ij3hk2ib22i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/plim-mode"; sha256 = "1nrqw5dvb3j5x3wkpsjbpv1d2s367icq9j4h1xv1cahfsn8nn4m9"; - name = "plim-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58365,9 +76184,16 @@ license = lib.licenses.free; }; }) {}; - plsense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + plsense = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "plsense"; + ename = "plsense"; version = "20151104.645"; src = fetchFromGitHub { owner = "aki2o"; @@ -58375,10 +76201,10 @@ rev = "d50f9dccc98f42bdb42f1d1c8142246e03879218"; sha256 = "1r2yxa7gqr0z9fwhx38siwjpg73a93rdmnhr4h6nm6lr32vviyxm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb1025f146514e9c142cd96cac9f2989d6d1a8c5/recipes/plsense"; sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va"; - name = "plsense"; + name = "recipe"; }; packageRequires = [ auto-complete log4e yaxception ]; meta = { @@ -58386,9 +76212,17 @@ license = lib.licenses.free; }; }) {}; - plsense-direx = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, plsense, yaxception }: - melpaBuild { + plsense-direx = callPackage ({ direx + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , plsense + , yaxception }: + melpaBuild { pname = "plsense-direx"; + ename = "plsense-direx"; version = "20140520.1308"; src = fetchFromGitHub { owner = "aki2o"; @@ -58396,10 +76230,10 @@ rev = "8a2f465264c74e04524cc789cdad0190ace43f6c"; sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/65fb1d8b4ed12f097958842d1b00dcdf3660b184/recipes/plsense-direx"; sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j"; - name = "plsense-direx"; + name = "recipe"; }; packageRequires = [ direx log4e plsense yaxception ]; meta = { @@ -58407,9 +76241,14 @@ license = lib.licenses.free; }; }) {}; - plur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + plur = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "plur"; + ename = "plur"; version = "20160504.224"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -58417,10 +76256,10 @@ rev = "5bdd3b9a2f0624414bd596e798644713cd1545f0"; sha256 = "0qlxj19hj96l4lw81xh5r14ppf6kp63clikk060s9yw00q7gnl6a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38f6f53fcd1186efd5e6752166da4e23b712cdb1/recipes/plur"; sha256 = "0nf1dc7xf2zp316rssnz8sv374akcr54hp0rb219qvgyck9bdqiv"; - name = "plur"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -58428,18 +76267,23 @@ license = lib.licenses.free; }; }) {}; - pmdm = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + pmdm = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pmdm"; + ename = "pmdm"; version = "20151109.1036"; src = fetchhg { url = "https://bitbucket.com/inigoserna/pmdm.el"; rev = "f50a54774156"; sha256 = "0x3s9fj41n6a21la762qm1si9ysv3zj5bbp6ykfskr73sxq6s9ff"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/pmdm"; sha256 = "1zmy6cbnqhsbwc5vx30mx45xn88d2186hgrl75ws7vvbl197j03b"; - name = "pmdm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58447,18 +76291,23 @@ license = lib.licenses.free; }; }) {}; - po-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + po-mode = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "po-mode"; - version = "20170419.303"; + ename = "po-mode"; + version = "20180505.415"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "071d155f83e2c9c917db43f5452822a6dc30250a"; - sha256 = "1whbjblizl478gc7yc2yj0spwskzq8d9inpxian441a6jj9biah3"; + rev = "a57ffdb2f17d040a737e84114544fcd748fa87fa"; + sha256 = "19qg3l6w2lapjv73yvjiy5mj6j8kv7ch1gjpx2b86y2y5mqrqii7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w"; - name = "po-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58466,20 +76315,26 @@ license = lib.licenses.free; }; }) {}; - pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + pocket-api = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "pocket-api"; - version = "20170818.533"; + ename = "pocket-api"; + version = "20180402.1809"; src = fetchFromGitHub { owner = "lujun9972"; repo = "pocket-api.el"; - rev = "26e4583311ebc472f7bba59a1189f04938f2c03e"; - sha256 = "04cf97mwkp5rw0dvnspdbrycywjdv4mljl6lbjhbvlijj745d5xm"; + rev = "3eb9430b9db90bc02e736e433eb86389f7655189"; + sha256 = "0k6a9zzdi02g677cc699llk04i06yb7ddnlnmxndap5jszfyqwfi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04e3be76aef4d1b6d5bb3eda533b5deffcc8a5bc/recipes/pocket-api"; sha256 = "1f5j491wbqgbx6zlb0zdajca5il0628vr9a38y0n3x0h69wm0cx5"; - name = "pocket-api"; + name = "recipe"; }; packageRequires = [ emacs request ]; meta = { @@ -58487,20 +76342,29 @@ license = lib.licenses.free; }; }) {}; - pocket-lib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, request, s }: - melpaBuild { + pocket-lib = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , kv + , lib + , melpaBuild + , request + , s }: + melpaBuild { pname = "pocket-lib"; - version = "20171108.421"; + ename = "pocket-lib"; + version = "20180711.1723"; src = fetchFromGitHub { owner = "alphapapa"; repo = "pocket-lib.el"; - rev = "c860dc2f67398d837de2be17e85894a1303e7b49"; - sha256 = "1cpwzpicqad3xn7714z9z2v26i3zyqldm78xnnkac3dwar29zjvb"; + rev = "8dd89153472d2e49bf9a3b3507b93c2acf0b44ac"; + sha256 = "05wyi3mj8mhswdajyng10r0z6ai2y9gh888x8bskdvxdnd772glk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71f17ce28f4fc8c2c100848be8aec15526ef8697/recipes/pocket-lib"; sha256 = "0v619blifmvm36dr773wjf35fjji4dj3pyck9nkz0m8zmpz0fg78"; - name = "pocket-lib"; + name = "recipe"; }; packageRequires = [ dash emacs kv request s ]; meta = { @@ -58508,9 +76372,15 @@ license = lib.licenses.free; }; }) {}; - pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }: - melpaBuild { + pocket-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pocket-api }: + melpaBuild { pname = "pocket-mode"; + ename = "pocket-mode"; version = "20171201.515"; src = fetchFromGitHub { owner = "lujun9972"; @@ -58518,10 +76388,10 @@ rev = "229de7d35b7e5605797591c46aa8200d7efc363c"; sha256 = "0j3axac4lp7p00a7mf7frryqg1y3jwqaw0s475gz606642vg9l45"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa3d04058bfc0bc1da3393d17429d517275e97c/recipes/pocket-mode"; sha256 = "04zxll5yg021m13vr54w2pnrmqb87ykdbpa8nx2wn9myg2rywh0v"; - name = "pocket-mode"; + name = "recipe"; }; packageRequires = [ emacs pocket-api ]; meta = { @@ -58529,20 +76399,33 @@ license = lib.licenses.free; }; }) {}; - pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: - melpaBuild { + pocket-reader = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , ht + , kv + , lib + , melpaBuild + , org-web-tools + , ov + , pocket-lib + , rainbow-identifiers + , s }: + melpaBuild { pname = "pocket-reader"; - version = "20171127.335"; + ename = "pocket-reader"; + version = "20180719.1453"; src = fetchFromGitHub { owner = "alphapapa"; repo = "pocket-reader.el"; - rev = "6a35d531f2425e2e187f5107047f3dc7625f3623"; - sha256 = "0pankd0wvmfaws6xm9yvaddf592nj5hphqfq5dmwvzcp5ywx62n4"; + rev = "baef400c607cb192fac9157d3f6ce5e1573628bd"; + sha256 = "12j1za5d98svll26xi8igxk0zh8vz4i0bbscx8m39gn0grh5kmnb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf"; - name = "pocket-reader"; + name = "recipe"; }; packageRequires = [ dash @@ -58560,9 +76443,14 @@ license = lib.licenses.free; }; }) {}; - podcaster = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + podcaster = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "podcaster"; + ename = "podcaster"; version = "20161020.835"; src = fetchFromGitHub { owner = "lujun9972"; @@ -58570,10 +76458,10 @@ rev = "9854517025deb5d556168a68955fb7b662239f5c"; sha256 = "06ag0idz7cf6i9kg7kqr03js9b6cw6my1jzd1x3wkgazx5slqk4q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2649dc294f40d00f3bf1b1cf09879c2ef0d3e43b/recipes/podcaster"; sha256 = "1kzac0mhg8dk2vfk29ns36jl8vwg6ghbdb3n6kqfzci5ygn96yib"; - name = "podcaster"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -58581,20 +76469,24 @@ license = lib.licenses.free; }; }) {}; - poet-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + poet-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "poet-theme"; - version = "20180324.1909"; + ename = "poet-theme"; + version = "20180603.1523"; src = fetchFromGitHub { owner = "kunalb"; repo = "poet"; - rev = "53e0ec4006d5b5d24f263e1cfd1c1154c47bac9e"; - sha256 = "1qizsg2mh8nx8wx5ibd2fnpdxxiq57b02vrcx71pnbdqi6fv7zr9"; + rev = "fddb662bfc55c535e5b13b3368e430916d8be70c"; + sha256 = "1dicjjh68rs1mzzgy81s1phjbdc5mirwxb3ym8y1yirpb2hj4bal"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/40bbe29dee56f7989d8e87c03f4842e2b191acc3/recipes/poet-theme"; sha256 = "0pllyp4spj30g6ihzc91hzvnrvcg2zb49adj8wcmbzvq3hxnvls1"; - name = "poet-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58602,20 +76494,24 @@ license = lib.licenses.free; }; }) {}; - point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + point-pos = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "point-pos"; + ename = "point-pos"; version = "20170421.932"; src = fetchFromGitHub { owner = "alezost"; repo = "point-pos.el"; - rev = "442bccb40791832cbc2d6f5c8f53be745aea2b73"; - sha256 = "1p56h8ipgrd5433pc641xccdnsni51l58ll0hv2rp9aqjg9nlgcr"; + rev = "f4126b64567a81e7f22058f09d56c63b2ff06632"; + sha256 = "1sbwz9kxvnd5r24q9x6bhcjajjnm2z8q6khgqs4gl4ycs60kn0s6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23a1e835155fba51f595c10c46487a4c269f43ff/recipes/point-pos"; sha256 = "1zv6hx8i8jwq52j4la1ff0ar0bpbs2pb4gcsh9hypghba11gnync"; - name = "point-pos"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58623,9 +76519,13 @@ license = lib.licenses.free; }; }) {}; - point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + point-stack = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "point-stack"; + ename = "point-stack"; version = "20170808.958"; src = fetchFromGitHub { owner = "dgutov"; @@ -58633,10 +76533,10 @@ rev = "76e17311e3a810314c7d31ac46dc55450ff30fa2"; sha256 = "1sp3djnyg3f5ci43m4pi0f6clblrz5lrnzc415r87csbavqqgv2z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3c9e6b3c583f098f75462b4d48cd137a1bcb76/recipes/point-stack"; sha256 = "0201gka1izqgxyivan60jbg9x1mmsw5dscxacasg97ffsciwbfr9"; - name = "point-stack"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58644,9 +76544,13 @@ license = lib.licenses.free; }; }) {}; - pointback = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pointback = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pointback"; + ename = "pointback"; version = "20100210.752"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -58654,10 +76558,10 @@ rev = "e3a02c1784d81b5a1d2477338d049af581ed19f8"; sha256 = "016cjy5pnnqccjqb0njqc9jq6kf6p165nlki83b8c0sj75yxghav"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/pointback"; sha256 = "198q511hixvzc13b3ih89xs9g47rdvbiixn5baqakpmpx3a12hz4"; - name = "pointback"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58665,20 +76569,26 @@ license = lib.licenses.free; }; }) {}; - pollen-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pollen-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pollen-mode"; - version = "20160808.2000"; + ename = "pollen-mode"; + version = "20180404.612"; src = fetchFromGitHub { owner = "lijunsong"; repo = "pollen-mode"; - rev = "de762bd7f9760185dae8ef025ca9a9126ae78de0"; - sha256 = "19bi50nlmwnh4kz3b1hrgc7ks0g84bld9aifws2l3wyc3xsj8cqa"; + rev = "df4eab5b490cb478a092e6bab6b07f9e2f9c6fad"; + sha256 = "0x8bnf0n109ard5zdmma04w0wv5jb1r7qh5smsa1kjvws98gnp57"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/pollen-mode"; sha256 = "1kskvdh6rczlki724h5xym8s4iychqzm0i82qdj87x1cg1kx9i85"; - name = "pollen-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -58686,9 +76596,15 @@ license = lib.licenses.free; }; }) {}; - poly-ruby = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }: - melpaBuild { + poly-ruby = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , polymode }: + melpaBuild { pname = "poly-ruby"; + ename = "poly-ruby"; version = "20170802.648"; src = fetchFromGitHub { owner = "knu"; @@ -58696,10 +76612,10 @@ rev = "e6f50a92d29a5ff567d70cafa6621c4f89056d11"; sha256 = "1pdimvcrjq0k6a9kijcl6zmsmmvssdqsdkgcz14qs4444qly4l9b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68213703359324d09553a2164f1f6ecca7c16854/recipes/poly-ruby"; sha256 = "0d8s6bl5ynx0r5cwvfkd52rksiq5kdyrgbxds56r8ls6cfkwqngg"; - name = "poly-ruby"; + name = "recipe"; }; packageRequires = [ emacs polymode ]; meta = { @@ -58707,9 +76623,14 @@ license = lib.licenses.free; }; }) {}; - polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + polymode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "polymode"; + ename = "polymode"; version = "20170307.322"; src = fetchFromGitHub { owner = "vspinu"; @@ -58717,10 +76638,10 @@ rev = "0340f5e7e55235832e59673f027cc79a23cbdcd6"; sha256 = "057cybkq3cy07n5s332k071sjiky3mziy003lza4rh75mgqkwhmh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode"; sha256 = "0md02l7vhghvzplxa04sphimhphmksvmz079zykxajcvpm2rgwc8"; - name = "polymode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -58728,20 +76649,26 @@ license = lib.licenses.free; }; }) {}; - pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pomidor = callPackage ({ alert + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pomidor"; - version = "20180320.1252"; + ename = "pomidor"; + version = "20180614.128"; src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "30004b21714b53d22041514d905e1876c5cedd4b"; - sha256 = "0nis9dx73y90lqnh24j5ywrdmjf7aa1jrdgwxm53wjl4sfmk85r1"; + rev = "8859aecdb48b76a36c5e251793da0f108b2dfeb4"; + sha256 = "07amyi7i6jb8byv4gmyhadiyyqwpd9d64aayr826x7pnzx5gcg5s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; sha256 = "0pdzipyza98dhnz6am8lrmz8fh3p1c21v2mhs56fb9lwyvcgv8fi"; - name = "pomidor"; + name = "recipe"; }; packageRequires = [ alert emacs ]; meta = { @@ -58749,9 +76676,13 @@ license = lib.licenses.free; }; }) {}; - pomodoro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pomodoro = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pomodoro"; + ename = "pomodoro"; version = "20150716.1046"; src = fetchFromGitHub { owner = "baudtack"; @@ -58759,10 +76690,10 @@ rev = "4a299b8f5e6623010224dcb3e524ff288c6a082c"; sha256 = "1dlk0ypw8316vgvb7z2p7fvaiz1wcy1l8crixypaya1zdsnh9v1z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b5c2c50eb87952d01c1b338b7d3e4b3a4546555/recipes/pomodoro"; sha256 = "075sbypas8xlhsw8wg3mgi3fn5yf7xb3klyjgyy8wfkgdz0269f8"; - name = "pomodoro"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58770,9 +76701,13 @@ license = lib.licenses.free; }; }) {}; - pony-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pony-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pony-mode"; + ename = "pony-mode"; version = "20170807.822"; src = fetchFromGitHub { owner = "davidmiller"; @@ -58780,10 +76715,10 @@ rev = "760684d30b6c234d1b88c9a4673a808f36f7f341"; sha256 = "1y4gxn25i2nszdhqq8jxf9h65mqfgcwbypx5p4wkan5i1v2i3yr1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1fd64317610fb6ef5b14e8bf15e727680d5ff09/recipes/pony-mode"; sha256 = "1hgiryhpxv30bjlgv9pywzqn2ypimwzdhx03znqvn56zrwn1frnl"; - name = "pony-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58791,9 +76726,14 @@ license = lib.licenses.free; }; }) {}; - pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + pony-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "pony-snippets"; + ename = "pony-snippets"; version = "20160204.2011"; src = fetchFromGitHub { owner = "SeanTAllen"; @@ -58801,10 +76741,10 @@ rev = "a6615ab0693f17fc47ec45753202010238157810"; sha256 = "002jhj47b9aqrfjy8b31ccbqhah5sn9wn7dmrhm1wbbgj9rfyw6s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pony-snippets"; sha256 = "12ygvpfkzldq6s4mwbrxs4x9927i7pa7ywn7lf1r3gg4h29ar9gn"; - name = "pony-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -58812,9 +76752,14 @@ license = lib.licenses.free; }; }) {}; - ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ponylang-mode = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ponylang-mode"; + ename = "ponylang-mode"; version = "20171028.1356"; src = fetchFromGitHub { owner = "SeanTAllen"; @@ -58822,10 +76767,10 @@ rev = "5e23459dc395eb77fa4c6cfa3d6c08b1b185a6df"; sha256 = "0iwdnv56200w53ba4f66vih7gha2nb36ajnvbqixc0byibwcsnc9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode"; sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1"; - name = "ponylang-mode"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -58833,9 +76778,15 @@ license = lib.licenses.free; }; }) {}; - pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + pophint = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "pophint"; + ename = "pophint"; version = "20170917.1948"; src = fetchFromGitHub { owner = "aki2o"; @@ -58843,10 +76794,10 @@ rev = "909025c5a871ca4b9ec7aed7f1a27c819a94dba1"; sha256 = "0qbb36qijkzbzxlmqsvvddm7x2gk9rkafnyjbkxsl76rz1ajy6nz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0055c2887acbbd8a2803bf3f81ac2cc444cc805a/recipes/pophint"; sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72"; - name = "pophint"; + name = "recipe"; }; packageRequires = [ log4e yaxception ]; meta = { @@ -58854,9 +76805,13 @@ license = lib.licenses.free; }; }) {}; - poporg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + poporg = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "poporg"; + ename = "poporg"; version = "20170403.51"; src = fetchFromGitHub { owner = "QBobWatson"; @@ -58864,10 +76819,10 @@ rev = "2c58d68c81ecca4140bf179f19ed153ec804b65a"; sha256 = "1ymqhy0sqd54z154s3cm6q1m4xnr9wkx9dl5f93845k11ay3kvln"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63502ec265a66d3f72ef93a2f6e7c2e517ff98a3/recipes/poporg"; sha256 = "08s42689kd78h2fmw230ja5dd3c3b4lx5mzadncwq0lj91y86kd8"; - name = "poporg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -58875,20 +76830,25 @@ license = lib.licenses.free; }; }) {}; - popup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + popup = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "popup"; + ename = "popup"; version = "20160709.729"; src = fetchFromGitHub { owner = "auto-complete"; repo = "popup-el"; - rev = "80829dd46381754639fb764da11c67235fe63282"; - sha256 = "05j7m6mqp6hr6225blsipnp2qcncwl09f52niya5334ibqzbvvlk"; + rev = "e452399db8bb0a8906c627f598eb8f0dcfca5572"; + sha256 = "07jcpdjk33nw82wx872fp2dph025kb0szfnbgc2xs56i11141371"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/popup"; sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2"; - name = "popup"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -58896,20 +76856,25 @@ license = lib.licenses.free; }; }) {}; - popup-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + popup-complete = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "popup-complete"; + ename = "popup-complete"; version = "20141108.1908"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-popup-complete"; - rev = "caa655a6d8472e9a4bfa1311126d90d7d1b07fca"; - sha256 = "1q9zajv6g7mi6k98kzq3498nhmdkp1z9d2b8vgzbk7745d39gm9b"; + rev = "e362d4a005b36646ffbaa6be604e9e31bc406ca9"; + sha256 = "084hb3zn1aiabbyxgaalszb2qjf9z64z960ks5fvz8nh7n6y7ny4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b43b85f90c476a3b88f94927a7db90bdc72cd171/recipes/popup-complete"; sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1"; - name = "popup-complete"; + name = "recipe"; }; packageRequires = [ popup ]; meta = { @@ -58917,9 +76882,14 @@ license = lib.licenses.free; }; }) {}; - popup-edit-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + popup-edit-menu = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "popup-edit-menu"; + ename = "popup-edit-menu"; version = "20170404.725"; src = fetchFromGitHub { owner = "debugfan"; @@ -58927,10 +76897,10 @@ rev = "925600a6e29183841199e866cf55e566a6a1b002"; sha256 = "1dd0ss7cjdjs3c7vkq8p874408iysih80brc8vlfh1f43cnc5v92"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e824ae5bd9214f8de210059f8145f13a4e62e8a1/recipes/popup-edit-menu"; sha256 = "1mqni09l1xfxv4g64hskpsla41r5d2xfbw81ncbszwqzlln6k5bf"; - name = "popup-edit-menu"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -58938,9 +76908,16 @@ license = lib.licenses.free; }; }) {}; - popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }: - melpaBuild { + popup-imenu = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , flx-ido + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "popup-imenu"; + ename = "popup-imenu"; version = "20170326.340"; src = fetchFromGitHub { owner = "ancane"; @@ -58948,10 +76925,10 @@ rev = "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09"; sha256 = "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca5d65d6a9c7ef3fa2684271fe087dc132d3a61/recipes/popup-imenu"; sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn"; - name = "popup-imenu"; + name = "recipe"; }; packageRequires = [ dash flx-ido popup ]; meta = { @@ -58959,20 +76936,26 @@ license = lib.licenses.free; }; }) {}; - popup-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: - melpaBuild { + popup-kill-ring = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup + , pos-tip }: + melpaBuild { pname = "popup-kill-ring"; + ename = "popup-kill-ring"; version = "20131020.1154"; src = fetchFromGitHub { owner = "waymondo"; repo = "popup-kill-ring"; - rev = "5773dfadc104a906c088a3ec62e8cdd3e01e57fa"; - sha256 = "1zdwlmk3vr0mq0dxrnkqjncalnbmvpxc0lma2sv3a4czl8yv0inn"; + rev = "dc50b62ae8b7c2675dde96bb410d9bf0e8643f6a"; + sha256 = "0bpnsc4agy6mcnc79d9a6gi79jiiqrhf3a55pw0p4z16m86vwyqr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b745b067e5d68467b89e0dbade7a9a76de2946c/recipes/popup-kill-ring"; sha256 = "1jfw669xi2983jj3hiw5lyhc0rc0318qrmqx03f7m4ylg70dgxip"; - name = "popup-kill-ring"; + name = "recipe"; }; packageRequires = [ popup pos-tip ]; meta = { @@ -58980,9 +76963,15 @@ license = lib.licenses.free; }; }) {}; - popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + popup-switcher = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "popup-switcher"; + ename = "popup-switcher"; version = "20171205.51"; src = fetchFromGitHub { owner = "kostafey"; @@ -58990,10 +76979,10 @@ rev = "f5788a31918e37bb5c04139048c667bcec9f1b62"; sha256 = "0gfi8dlgynciv3q5a208c7gd66g2r99b3zn0i31ibpppjqy2vcsk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7d1897c4c4a6f4b4527279e6dad976219d7b78/recipes/popup-switcher"; sha256 = "1888xiqhrn7fcpjnr3smchmmqwfayfbbyvdkdb79c6drzjcvidp1"; - name = "popup-switcher"; + name = "recipe"; }; packageRequires = [ cl-lib popup ]; meta = { @@ -59001,9 +76990,13 @@ license = lib.licenses.free; }; }) {}; - popwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + popwin = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "popwin"; + ename = "popwin"; version = "20150315.600"; src = fetchFromGitHub { owner = "m2ym"; @@ -59011,10 +77004,10 @@ rev = "95dea14c60019d6cccf9a3b33e0dec4e1f22c304"; sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3d6a8b734e0820fd904c215a83fe5519496dc3/recipes/popwin"; sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf"; - name = "popwin"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59022,9 +77015,15 @@ license = lib.licenses.free; }; }) {}; - portage-navi = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + portage-navi = callPackage ({ concurrent + , ctable + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "portage-navi"; + ename = "portage-navi"; version = "20141208.555"; src = fetchFromGitHub { owner = "kiwanami"; @@ -59032,10 +77031,10 @@ rev = "8016c3e99fe6cef101d479a3d69185796b22ca2f"; sha256 = "1pm4x74pw67m2izr9dir201dn5g9icgk6h2j8rqvasgx8v8krv3i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a467702b3ac3c8bdc723262e6919f67fd71d524/recipes/portage-navi"; sha256 = "1wjkh8xj5120v9fz1nrpkd6x4f22ni8h2lfkd82df7kjz6bzdfwg"; - name = "portage-navi"; + name = "recipe"; }; packageRequires = [ concurrent ctable ]; meta = { @@ -59043,9 +77042,13 @@ license = lib.licenses.free; }; }) {}; - pos-tip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pos-tip = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pos-tip"; + ename = "pos-tip"; version = "20150318.813"; src = fetchFromGitHub { owner = "pitkali"; @@ -59053,10 +77056,10 @@ rev = "051e08fec5cf30b7574bdf439f79fef7d42d689d"; sha256 = "168hl76rhj6f5ncmrij4rd3z55228h6kb23384h2phsjw0avgf23"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/306e9978d2a071548cc9d8c531a1ce6c6c6b99aa/recipes/pos-tip"; sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh"; - name = "pos-tip"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59064,20 +77067,25 @@ license = lib.licenses.free; }; }) {}; - posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + posframe = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "posframe"; - version = "20180308.1627"; + ename = "posframe"; + version = "20180708.702"; src = fetchFromGitHub { owner = "tumashu"; repo = "posframe"; - rev = "c29228eb2100503a0fda39252d4f11c1eb5acc56"; - sha256 = "1k92gzzy6ys2f86jzggqlz3x6v665hwkafj3frj4mgmxp7yxsiw0"; + rev = "945761dc70c62a04747c4c892bdf5fc38670e50e"; + sha256 = "051gr067ac0bd59nzs4jqjqc27kbb6gl8whs106jwn39z0b0ndri"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe"; sha256 = "02chwkc7gn7fxaaxsz9msmrhrd62bji5hhb71kdm019x8d84z06w"; - name = "posframe"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -59085,9 +77093,14 @@ license = lib.licenses.free; }; }) {}; - postcss-sorting = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + postcss-sorting = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "postcss-sorting"; + ename = "postcss-sorting"; version = "20180211.156"; src = fetchFromGitHub { owner = "P233"; @@ -59095,10 +77108,10 @@ rev = "deb0c935d2904c11a965758a9aee5a0e905f21fc"; sha256 = "03kng7i09px5vizvmmrar7rj3bk27y43bi8hlzxax0ja27k0c66c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fae97430f211786f615f7450936f823e2a04ec4/recipes/postcss-sorting"; sha256 = "0730b2wddal15yi4k6wzhv9xv1k40iwrn3mivg9bkxabh3mgrl10"; - name = "postcss-sorting"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -59106,9 +77119,13 @@ license = lib.licenses.free; }; }) {}; - pov-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pov-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pov-mode"; + ename = "pov-mode"; version = "20161114.2343"; src = fetchFromGitHub { owner = "melmothx"; @@ -59116,10 +77133,10 @@ rev = "9fc1db3aab7c27155674dd1a87ec62606035d074"; sha256 = "1399fxivy15y2k4vp7vqqgsi8l1mzxc8aa2mf2x1hksgiyq60acp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89d6b4a3d7a5f3cc93e9d13d4c174b5d7de7bad1/recipes/pov-mode"; sha256 = "1xzdmlfi5ixdh08v0ca80zkh9n3gfn4ql5pnl3jh745wbj9azxp9"; - name = "pov-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59127,20 +77144,26 @@ license = lib.licenses.free; }; }) {}; - pow = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pow = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pow"; + ename = "pow"; version = "20140420.106"; src = fetchFromGitHub { owner = "yukihr"; repo = "emacs-pow"; - rev = "ea83986b8ca8e27cb996290d6463b111ec0966ce"; - sha256 = "112s6qb80sn44b1cxggqfci89wymxvvwkwl7nknfnr2dzd58lzzy"; + rev = "782532d5d3582fe8fd67014507b20077f3f2d292"; + sha256 = "0d87h67qk7jw4fpq3kzzsh5v1k2nhrz6yfl1hzi7hqm5mdvnbfc9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pow"; sha256 = "13f3pk52f9lkkl3zi6448j9b39kn6ny9vmnlsvhwa6s0vaz8f220"; - name = "pow"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -59148,9 +77171,14 @@ license = lib.licenses.free; }; }) {}; - powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + powerline = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "powerline"; + ename = "powerline"; version = "20180321.1948"; src = fetchFromGitHub { owner = "milkypostman"; @@ -59158,10 +77186,10 @@ rev = "af5ef31a33c3589a9be0b2a55a2741582e605efd"; sha256 = "0zynj4pl9717xbj8g1mac3haiybdndb034bnqk03bb42iyrwy767"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx"; - name = "powerline"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -59169,9 +77197,15 @@ license = lib.licenses.free; }; }) {}; - powerline-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: - melpaBuild { + powerline-evil = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , powerline }: + melpaBuild { pname = "powerline-evil"; + ename = "powerline-evil"; version = "20151112.710"; src = fetchFromGitHub { owner = "raugturi"; @@ -59179,10 +77213,10 @@ rev = "98b3a102b6dba6632aa0755a7257300c9b164309"; sha256 = "1c8y4r7zdr6764kzs5bc64idv2pfjvi78lg2f1d2hp1595ia8y5r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a44108579409ab2aab3e75ccabffb207843ec1ee/recipes/powerline-evil"; sha256 = "0cdnmq9f06lzkj0hs948a7j5sgg6fl5f36bfnyaxgss23akbfjhr"; - name = "powerline-evil"; + name = "recipe"; }; packageRequires = [ evil powerline ]; meta = { @@ -59190,20 +77224,25 @@ license = lib.licenses.free; }; }) {}; - powershell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + powershell = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "powershell"; - version = "20161103.2354"; + ename = "powershell"; + version = "20180616.2328"; src = fetchFromGitHub { owner = "jschaf"; repo = "powershell.el"; - rev = "3c09e1b87064bedc065e45346fd4c3e051eeb0f0"; - sha256 = "19cq6n8dhvr2vw8nx3f4dkybqs9dqa6ss3z2ycql8rdmc5wg6jpn"; + rev = "4e215e4cd683c727315301d1b61bef4f9773abec"; + sha256 = "0dhl3cn2szvrj4084ly1f4fiwgixasvwi6skdchfvzbpx9q05dlv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7002c50f2734675134791916aa9d8b82b4582fcb/recipes/powershell"; sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk"; - name = "powershell"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -59211,9 +77250,43 @@ license = lib.licenses.free; }; }) {}; - ppd-sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist-drawer, sr-speedbar }: - melpaBuild { + powerthesaurus = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , s }: + melpaBuild { + pname = "powerthesaurus"; + ename = "powerthesaurus"; + version = "20180719.208"; + src = fetchFromGitHub { + owner = "SavchenkoValeriy"; + repo = "emacs-powerthesaurus"; + rev = "ab39b050e801934872f3dcaa60b50b0d30ecf367"; + sha256 = "0l4rny6ssa5wmksc0g1qnyfj15qlffavflm2adcqywr660d93pq9"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/04a7e6d2292e933e0318296107774e1248888f3c/recipes/powerthesaurus"; + sha256 = "011kl3n1hfmz844w198gvh5anjyqj0m4pvryahslc0r1zavik7ni"; + name = "recipe"; + }; + packageRequires = [ emacs request s ]; + meta = { + homepage = "https://melpa.org/#/powerthesaurus"; + license = lib.licenses.free; + }; + }) {}; + ppd-sr-speedbar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , project-persist-drawer + , sr-speedbar }: + melpaBuild { pname = "ppd-sr-speedbar"; + ename = "ppd-sr-speedbar"; version = "20151108.424"; src = fetchFromGitHub { owner = "rdallasgray"; @@ -59221,10 +77294,10 @@ rev = "19d3e924407f40a6bb38c8fe427a159af755adce"; sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f930f54048d06f6a97824b66fbb74649eed40b54/recipes/ppd-sr-speedbar"; sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8"; - name = "ppd-sr-speedbar"; + name = "recipe"; }; packageRequires = [ project-persist-drawer sr-speedbar ]; meta = { @@ -59232,20 +77305,25 @@ license = lib.licenses.free; }; }) {}; - prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prassee-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "prassee-theme"; - version = "20180105.1644"; + ename = "prassee-theme"; + version = "20180709.304"; src = fetchFromGitHub { owner = "prassee"; repo = "prassee-emacs-theme"; - rev = "b68d13f929364b9bb087f8f587798144218f7dc6"; - sha256 = "08r22xsrlycl0lyqg5qi5wv5w4zhdawmi8ikdgvn5776qaixb6r7"; + rev = "81126f69cdbaab836c00ae7a49aaf89d4229fde1"; + sha256 = "18yqsl8jsi3zxfcigvm6fjcx84hzb8b3j7ihiyzqmdhmvma3i08y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme"; sha256 = "1j0817hxxri6mq9pplgwf5jp2dagk6hay7g1a1lgz4qgkf5jnshs"; - name = "prassee-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -59253,9 +77331,13 @@ license = lib.licenses.free; }; }) {}; - preproc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + preproc-font-lock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "preproc-font-lock"; + ename = "preproc-font-lock"; version = "20151107.1218"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -59263,10 +77345,10 @@ rev = "565fda9f5fdeb0598986174a07e9fb09f7604397"; sha256 = "0yrfd9qaz16nqcvjyjm9qci526qgkv6k51q5752h3iyqkxnss1pd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/582692267795c91bb7f2ec3bffc2b9c2be9f2a32/recipes/preproc-font-lock"; sha256 = "1ra0lgjv6713zym2h8pblf2ryf0f658l1khbxbwnxl023gkyj9v4"; - name = "preproc-font-lock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59274,9 +77356,39 @@ license = lib.licenses.free; }; }) {}; - preseed-generic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prescient = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "prescient"; + ename = "prescient"; + version = "20180702.1140"; + src = fetchFromGitHub { + owner = "raxod502"; + repo = "prescient.el"; + rev = "18ddbe85e040dcf6fa9aeba8c8ce9d143921423a"; + sha256 = "1jaw3awjs1w65nclas891gramr2ib3svy8sph989wjbmlbg377zh"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec02349e31531c347e4a43fbde56ae4386898cc6/recipes/prescient"; + sha256 = "04js3hblavfrc6kqp942x5yjdl3ndazf3n64p83423ldsmhbip6s"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/prescient"; + license = lib.licenses.free; + }; + }) {}; + preseed-generic-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "preseed-generic-mode"; + ename = "preseed-generic-mode"; version = "20180209.2100"; src = fetchFromGitHub { owner = "suntong"; @@ -59284,10 +77396,10 @@ rev = "3aa8806c4a659064baa01751400c53fbaf847f66"; sha256 = "02yb5xkgwqxpwghhjmxf2gx0faifi04w2jd8cvfsiwzwqmqyhmv7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/preseed-generic-mode"; sha256 = "14vbx6y7h4vqc5kkgj4mbr9zj6gqf6ib3hh2917m203s8y87lsfl"; - name = "preseed-generic-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59295,20 +77407,51 @@ license = lib.licenses.free; }; }) {}; - prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + presentation = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "presentation"; + ename = "presentation"; + version = "20180426.1924"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "emacs-presentation-mode"; + rev = "b1948e6d8b37b6df9290d77d181e1b1d58dd33c0"; + sha256 = "0wm7rg7gvyngps3b7agpyhhbi2r7z0n5x8wxzahl8l1bm820y8jk"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/747afd0339215528bf104f778a13edacbac510b7/recipes/presentation"; + sha256 = "0zdpfvg6kbvi6b4lb7vbdjrkgk0j1q6gzyd0s2b0603fnyy4sqdg"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/presentation"; + license = lib.licenses.free; + }; + }) {}; + prettier-js = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "prettier-js"; + ename = "prettier-js"; version = "20180108.2326"; src = fetchFromGitHub { owner = "prettier"; repo = "prettier-emacs"; - rev = "fac9dd29720f8417bd8cd5dd8ab5138c6dd7d701"; - sha256 = "00bgwzvha2i2sfi05jdzgpxvbjfpjhj5gv2vn3bnalgd1z3cz89r"; + rev = "0e8b95c4e5898a03e85dbc555c37b4f968292aec"; + sha256 = "0l8i0fbwwyhllkpk8xd6w5gcv65z4ja1ygf6slh5sd1g0ixh29md"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; sha256 = "0mf66sdsdbhf76pwkjkfjsnh26g4j3zb4y1qrbxc9jcvymccb3yq"; - name = "prettier-js"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59316,9 +77459,13 @@ license = lib.licenses.free; }; }) {}; - prettify-greek = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + prettify-greek = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "prettify-greek"; + ename = "prettify-greek"; version = "20160603.208"; src = fetchFromGitLab { owner = "fommil"; @@ -59326,10 +77473,10 @@ rev = "698d07a6ffe85f6fb53f3bfec4f49380c25cfd90"; sha256 = "0g2bxa7mwfkc8navbi2w28rd4f4zqphxi13kwmd2p83g3wavd99v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/prettify-greek"; sha256 = "1izl6r6i3zbhd7r7lz2k42yyz6qcng11wfmb7lx4883dj00flsl7"; - name = "prettify-greek"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59337,9 +77484,13 @@ license = lib.licenses.free; }; }) {}; - pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pretty-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pretty-mode"; + ename = "pretty-mode"; version = "20160614.1146"; src = fetchFromGitHub { owner = "akatov"; @@ -59347,10 +77498,10 @@ rev = "500085206e25b98d00b9ec996f91c87ba569c4ce"; sha256 = "0m7ii971zxlz8a9yx2ljf9fmd8k6hc9w1q8mi5xi32v9viccjabs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2fe9feae4c1f007e51272a97917a63dcf6bbe5/recipes/pretty-mode"; sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f"; - name = "pretty-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59358,20 +77509,24 @@ license = lib.licenses.free; }; }) {}; - pretty-sha-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pretty-sha-path = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pretty-sha-path"; + ename = "pretty-sha-path"; version = "20141105.1026"; src = fetchFromGitHub { owner = "alezost"; repo = "pretty-sha-path.el"; - rev = "a2b43dd9de423a38d67cda2e3bd9412f7d363257"; - sha256 = "1n0594msgy53ia58gjfkm3z3cnmq52wrq5992fm28s4jgazbgdfd"; + rev = "beea38bdf34ed27059d6484e1e2a337a27e1f7ce"; + sha256 = "1hfk3j69r0xva1c7v72vc2hhksdjia7vmxfx82j6j0jfpn6163f1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6520d692662aaf92023623273597d966ca3cba9d/recipes/pretty-sha-path"; sha256 = "0qqsg383391dnsk46xm8plq7xmdmnis3iv7h7dmchpzd99bkm9lq"; - name = "pretty-sha-path"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59379,20 +77534,24 @@ license = lib.licenses.free; }; }) {}; - pretty-symbols = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pretty-symbols = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pretty-symbols"; + ename = "pretty-symbols"; version = "20140814.259"; src = fetchFromGitHub { owner = "drothlis"; repo = "pretty-symbols"; - rev = "582cbe51ecfe1cc0a5b185bc06113c8a661e3956"; - sha256 = "1f00l9f6an1mh8yhf629mw0p37m4jcpl8giz47xbdyw1k6bqn830"; + rev = "ab82b3fba129fae14e4031eb7fd648c1a92d0e71"; + sha256 = "12ny0lpqhj7g1hmj3y6012zz7145xx6ivgg381d4lc8791j35djd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed01ef6333e4558877b0e357ff8bf601fb88b757/recipes/pretty-symbols"; sha256 = "0d1ad2x4md0n3fad3s2355wm8hl311qdhih1gkdqwdaj4i1d6gvb"; - name = "pretty-symbols"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59400,20 +77559,25 @@ license = lib.licenses.free; }; }) {}; - private = callPackage ({ aes, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + private = callPackage ({ aes + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "private"; + ename = "private"; version = "20150121.1757"; src = fetchFromGitHub { owner = "cheunghy"; repo = "private"; - rev = "9266d01c095895cc3ee9de95bc20511e88353755"; - sha256 = "0zng64f5vwnpkf9fk59yv1ndc646q608a6awr1y9qk0mhzbfzhqm"; + rev = "f57f1c2f6bfe900bd40b252688df4c6ed6a5f44b"; + sha256 = "0720vrb9nwy4c069fk7adw5f50g9dji1wra9s3jwazr8jn45k0mn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c4195e20f942f7c9499731f51d3eba14eefd650/recipes/private"; sha256 = "1glpcwcyndyn683q9mg99hr0h3l8pz7rrhbnfak01v826d5cnk9g"; - name = "private"; + name = "recipe"; }; packageRequires = [ aes ]; meta = { @@ -59421,20 +77585,25 @@ license = lib.licenses.free; }; }) {}; - private-diary = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + private-diary = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "private-diary"; + ename = "private-diary"; version = "20151216.857"; src = fetchFromGitHub { owner = "cacology"; repo = "private-diary"; - rev = "0c86fb6150ad8ed14f94def3504f5a68f4147283"; - sha256 = "1pxr5a9ik09k0f58lawhxiv179n5j8q24zhrs9vjk93yskl1ydwn"; + rev = "5b1aeb22f22447fd35e1c107b6db44a7b27b8a42"; + sha256 = "14g1hi9m91lb23jf4475pcdnb97fxrm52zblxag628nik3gp7qpb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef39950941c522e64ea991c9eeecfb5f6f18f6a2/recipes/private-diary"; sha256 = "0dgnf375c00nlkp66kbkzsf469063l03b9miiplbhd63zshlv1i1"; - name = "private-diary"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -59442,20 +77611,24 @@ license = lib.licenses.free; }; }) {}; - proc-net = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + proc-net = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "proc-net"; + ename = "proc-net"; version = "20130321.1712"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-proc-net"; - rev = "10861112a1f3994c8e6374d6c5bb5d734cfeaf73"; - sha256 = "0nly5h0d6w8dc08ifb2fiqcn4cqcn9crkh2wn0jzlz4zd2x75qrb"; + rev = "00bfc92a381787ec387974ed17070118ced6d9ad"; + sha256 = "1df4kpr298hkii3rhx341qqnc9g4nq5vna6w687knzibbm0iixga"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a518f37260084fa7e9221e9189aedc09a951f6d/recipes/proc-net"; sha256 = "0562x2s3kk9vlaavak4lya1nlmn4mwlzlc7nw1l3687q023z4hmv"; - name = "proc-net"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59463,9 +77636,13 @@ license = lib.licenses.free; }; }) {}; - processing-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + processing-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "processing-mode"; + ename = "processing-mode"; version = "20171022.1602"; src = fetchFromGitHub { owner = "ptrv"; @@ -59473,10 +77650,10 @@ rev = "448aba82970c98322629eaf2746e73be6c30c98e"; sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-mode"; sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m"; - name = "processing-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59484,20 +77661,25 @@ license = lib.licenses.free; }; }) {}; - processing-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + processing-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "processing-snippets"; + ename = "processing-snippets"; version = "20140426.728"; src = fetchFromGitHub { owner = "ptrv"; repo = "processing2-emacs"; - rev = "448aba82970c98322629eaf2746e73be6c30c98e"; - sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q"; + rev = "6175b8eef76369c4b1b8608b8df9a37f14b1be5c"; + sha256 = "1mjzn8mynagck6fcw499gxzs1xm7gfqamlmgyqiy58wjni2xllr6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-snippets"; sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r"; - name = "processing-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -59505,20 +77687,28 @@ license = lib.licenses.free; }; }) {}; - prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + prodigy = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "prodigy"; - version = "20180329.1357"; + ename = "prodigy"; + version = "20180511.238"; src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; - rev = "a07c611862ae6dad6cdf9186a7813e701dc6e072"; - sha256 = "1addcwmgd2i9jp327ccsw5vgiixw6k1jks2fwg328llln0gv18ll"; + rev = "701dccaa56de9e6a330c05bde33bce4f3b3d6a97"; + sha256 = "1vyvxawlayp2nra0q83146q2nzv8qwn5a4nj0sx1jc90a0a83vgj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy"; sha256 = "0lfxb80jqjnzssjs6l511jcsmhkpzb5rh5czrb16dkqcz0cl5b2p"; - name = "prodigy"; + name = "recipe"; }; packageRequires = [ dash emacs f s ]; meta = { @@ -59526,9 +77716,13 @@ license = lib.licenses.free; }; }) {}; - professional-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + professional-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "professional-theme"; + ename = "professional-theme"; version = "20150315.400"; src = fetchFromGitHub { owner = "juanjux"; @@ -59536,10 +77730,10 @@ rev = "0927d1474049a193f9f366bde5eb1887b9ba20ed"; sha256 = "0hx7rxa3smdippcpj4j63k0r5l4wflllb0vpnwwknc9j93r7042b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb79514b2afada80da82762890242de5ad88d8de/recipes/professional-theme"; sha256 = "1l8nisn2c124cpylyahr76hfpdim2125zrns2897p466l5wcxcx5"; - name = "professional-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59547,20 +77741,26 @@ license = lib.licenses.free; }; }) {}; - prog-fill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prog-fill = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "prog-fill"; - version = "20180128.2019"; + ename = "prog-fill"; + version = "20180606.1832"; src = fetchFromGitHub { owner = "ahungry"; repo = "prog-fill"; - rev = "ad38e2f6a45a8dd7eb08c407506256dd2e045de1"; - sha256 = "13dsihqs0wc2bjxgyiqb5xbav9va432qqkpl84a0rdrwndpc7lpc"; + rev = "3fbf7da6dd826e95c9077d659566ee29814a31d8"; + sha256 = "167is1hbv3nsskz26g9q3zdndqsw9d3rwhbasj0r7a3wabpr8j4r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d680ed481688c9899adb28fbd9a22a17fa8943/recipes/prog-fill"; sha256 = "0wnqzkzhaywcyw93z86pngpycsrd1mi79psmck6qbhms1aia79p3"; - name = "prog-fill"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -59568,9 +77768,13 @@ license = lib.licenses.free; }; }) {}; - prognth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prognth = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "prognth"; + ename = "prognth"; version = "20130920.1059"; src = fetchFromGitHub { owner = "Fuco1"; @@ -59578,10 +77782,10 @@ rev = "2f1ca4d34b1fd581163e1df122c85418137e8e62"; sha256 = "1szxsbk470fg3jp70r20va9hnnf4jj0mb7kxdkn6rd7ky6w34lwm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db6d52b92317aa5ad5024131b62edb5f91f50033/recipes/prognth"; sha256 = "0hr5a3s0ij4hvn424v885z7pcs62yqm9mamw5b096hgjxgjf6ylm"; - name = "prognth"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59589,20 +77793,24 @@ license = lib.licenses.free; }; }) {}; - programmer-dvorak = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + programmer-dvorak = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "programmer-dvorak"; + ename = "programmer-dvorak"; version = "20150426.1837"; src = fetchFromGitHub { owner = "yangchenyun"; repo = "programmer-dvorak"; - rev = "3288a8f058eca4cab390a564babbbcb17cfa0350"; - sha256 = "1yklm43d0ppyf4simhqab6m892z4mmxs2145lzw6kpizixavcv00"; + rev = "c35d5e3b8b53c1e9341957b5d5db40387ba0c8ee"; + sha256 = "1y2n11d1kbpgb4jivvgd1j4gz409jfrg0kxfa04nx1b0nx4f3gd6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89b0f4b5838aa3d4572ca91fe60cf28664368cb6/recipes/programmer-dvorak"; sha256 = "1w8r35hkl6qy9a89l0m74x9q2vcc4h2hvmi3r2hqcy2ypkn5l5bv"; - name = "programmer-dvorak"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59610,9 +77818,43 @@ license = lib.licenses.free; }; }) {}; - project-explorer = callPackage ({ cl-lib ? null, emacs, es-lib, es-windows, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + project-abbrev = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "project-abbrev"; + ename = "project-abbrev"; + version = "20180705.1954"; + src = fetchFromGitHub { + owner = "jcs090218"; + repo = "project-abbrev"; + rev = "ca4bddd72a73d43332c5b262e6a104a341882af5"; + sha256 = "15nbfdc0z4wp8hakrc5m6bqn6klv22xxs3c3z6c49sdrlhqr9jvy"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/11580720cfbbbaeed9d914abb8a48705c195b159/recipes/project-abbrev"; + sha256 = "0771r4a652r3sqb601q5j6348kx1741s7svzxyfr2a4lspfffvqb"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/project-abbrev"; + license = lib.licenses.free; + }; + }) {}; + project-explorer = callPackage ({ cl-lib ? null + , emacs + , es-lib + , es-windows + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "project-explorer"; + ename = "project-explorer"; version = "20150503.1714"; src = fetchFromGitHub { owner = "sabof"; @@ -59620,10 +77862,10 @@ rev = "589a09008706f5f4ef91393dc4306eede0d15ca9"; sha256 = "04l4m3kxbwvyw9xy6cwakrdxxdswrrs7sya8zn6m738aawbr1mcd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2e5d686b8a18c7a17965ff6c5af8f5817b7ab31/recipes/project-explorer"; sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m"; - name = "project-explorer"; + name = "recipe"; }; packageRequires = [ cl-lib emacs es-lib es-windows ]; meta = { @@ -59631,20 +77873,24 @@ license = lib.licenses.free; }; }) {}; - project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + project-persist = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "project-persist"; + ename = "project-persist"; version = "20150519.1324"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "project-persist"; - rev = "8da45c80b23b1d7499eac11a258fd7382312a304"; - sha256 = "1fvjap0bsyw5q92q50wk8c81yv4g8nqb6jdlnarf80glwk50avrs"; + rev = "a4e5de1833edb60656d8a04357c527d34e81d27c"; + sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd81d1f8a30ed951ed94b9a4db13a2f7735ea878/recipes/project-persist"; sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24"; - name = "project-persist"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59652,9 +77898,14 @@ license = lib.licenses.free; }; }) {}; - project-persist-drawer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist }: - melpaBuild { + project-persist-drawer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , project-persist }: + melpaBuild { pname = "project-persist-drawer"; + ename = "project-persist-drawer"; version = "20151108.422"; src = fetchFromGitHub { owner = "rdallasgray"; @@ -59662,10 +77913,10 @@ rev = "35bbe132a4fab6a0fec15ce6c0fd2fe6a4aa9626"; sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23084af52d2243016eee73a5ee0cd3e945eec71d/recipes/project-persist-drawer"; sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb"; - name = "project-persist-drawer"; + name = "recipe"; }; packageRequires = [ project-persist ]; meta = { @@ -59673,19 +77924,23 @@ license = lib.licenses.free; }; }) {}; - project-root = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + project-root = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "project-root"; + ename = "project-root"; version = "20110206.1230"; src = fetchhg { url = "https://bitbucket.com/piranha/project-root"; rev = "843ca1f4ab2b"; sha256 = "0nw02f5lmbqdfnw93d3383sdxx1d31szk23zvjlrmmdwv2124281"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/project-root"; sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb"; - name = "project-root"; + name = "recipe"; }; packageRequires = []; meta = { @@ -59693,9 +77948,15 @@ license = lib.licenses.free; }; }) {}; - project-shells = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + project-shells = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "project-shells"; + ename = "project-shells"; version = "20171107.51"; src = fetchFromGitHub { owner = "hying-caritas"; @@ -59703,10 +77964,10 @@ rev = "d9401de750e444697c2eb9de1ff79f2a2eba4af8"; sha256 = "1x16l0gijirmj667s8l87nizsiww2wzjka9ydl4yxzchl7a486cp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/becf54de5ae9582d7c76382dff16d40b04b1a464/recipes/project-shells"; sha256 = "0mhifxcpgsfwrhbs7axg6ja4klgzzy9pc0nqa7w3qg45xgi9s4m8"; - name = "project-shells"; + name = "recipe"; }; packageRequires = [ emacs seq ]; meta = { @@ -59714,20 +77975,26 @@ license = lib.licenses.free; }; }) {}; - projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + projectile = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "projectile"; - version = "20180324.2226"; + ename = "projectile"; + version = "20180721.352"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "fba757dcee67479e579c164ec0f4f930793de6cd"; - sha256 = "1c3lvq9n501dcvxa8xz9cg4hm7bazbamb5rbfxlqjk9b4gbf8hby"; + rev = "06f7148ad5168476879c11dcacc02e76439a0226"; + sha256 = "167libx4b0xgnrz5xafbpylig4jmmn4dmqwqqcrf9953p37pn8ga"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn"; - name = "projectile"; + name = "recipe"; }; packageRequires = [ emacs pkg-info ]; meta = { @@ -59735,20 +78002,26 @@ license = lib.licenses.free; }; }) {}; - projectile-codesearch = callPackage ({ codesearch, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + projectile-codesearch = callPackage ({ codesearch + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "projectile-codesearch"; - version = "20171129.600"; + ename = "projectile-codesearch"; + version = "20180508.822"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-codesearch"; - rev = "4e6a2382c26d1218a4a007d31de2bab8ef9d2e7c"; - sha256 = "030zbx1glr6m7sxy89c833iw1v3bgjkcg835c38hlazra1vq783p"; + rev = "e40efc62e9333db0593bd81b5c78d08b19bfb193"; + sha256 = "04xivg6f19mlpsv77jwasg4ii9vlv8amblm03siwhx53ib9wlcyc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b1b1d3e356c6b9bffdcf98848918efe2fdfa8c7/recipes/projectile-codesearch"; sha256 = "1457dhmpgrq1qafr3v4ccw26ix10m60c5vlrpyqsfz8vh8lv0bb8"; - name = "projectile-codesearch"; + name = "recipe"; }; packageRequires = [ codesearch projectile ]; meta = { @@ -59756,20 +78029,28 @@ license = lib.licenses.free; }; }) {}; - projectile-direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }: - melpaBuild { + projectile-direnv = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , s }: + melpaBuild { pname = "projectile-direnv"; + ename = "projectile-direnv"; version = "20160305.1738"; src = fetchFromGitHub { owner = "christianromney"; repo = "projectile-direnv"; - rev = "d5d29e5228f840b7a25358a2fd50353ef2dc9b16"; - sha256 = "1bq47a6lckgin93cqy5wj277rlrw2cgfywgmbdpxvmbhygpg5hqr"; + rev = "250a902585acb611e10cf0f0248a84416df01522"; + sha256 = "1yzq7zsm76p6gcgq3hz9bg3pgdj709gxx6jzp24mszkfb87jiw79"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/602485c251bc573e855dfd33e4e94052afbab93f/recipes/projectile-direnv"; sha256 = "1s5dapdcblcbcqyv8df26v8wxl8bhrs9ybl5h5qbzz49gigd8nqh"; - name = "projectile-direnv"; + name = "recipe"; }; packageRequires = [ dash emacs projectile s ]; meta = { @@ -59777,20 +78058,26 @@ license = lib.licenses.free; }; }) {}; - projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + projectile-git-autofetch = callPackage ({ alert + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "projectile-git-autofetch"; - version = "20171129.1447"; + ename = "projectile-git-autofetch"; + version = "20180418.1636"; src = fetchFromGitHub { owner = "andrmuel"; repo = "projectile-git-autofetch"; - rev = "da02069d906e6e7f28ea1dd6a9196529315a5cba"; - sha256 = "106kj49rxsrdh6awvql3zyr3ramdcn0aaq4rmbmd45hz9ij7x1wh"; + rev = "55855886bccb5a22fbeb2b1c86ef2e9ff4de9067"; + sha256 = "11h6ix7j145azg69kha46g2ggrmqff178p1krp12wv07iv3sijj6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch"; sha256 = "0m0raddsw5yvjrw2v6bdaswffmva8y9hxksdgf9axpvrd3rzlk9n"; - name = "projectile-git-autofetch"; + name = "recipe"; }; packageRequires = [ alert projectile ]; meta = { @@ -59798,20 +78085,28 @@ license = lib.licenses.free; }; }) {}; - projectile-hanami = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild, projectile, rake }: - melpaBuild { + projectile-hanami = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild + , projectile + , rake }: + melpaBuild { pname = "projectile-hanami"; + ename = "projectile-hanami"; version = "20160505.611"; src = fetchFromGitHub { owner = "avdgaag"; repo = "projectile-hanami"; - rev = "c4b8e7d4dfec789ef8493a7c5d4ce0cf7937e579"; - sha256 = "1pqmyfz0vil30x739r18zpw9n76297ckisimq2g0xl1irhynsvbk"; + rev = "b1da03d14b96972b6d369ed6dde40f65b4a2ca41"; + sha256 = "1jsp2ca07w1y0v7zrx47yj0apqmkzx5577labp3ndd751x21bvnj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c0123322baee1e96afd055de3f44827574d2b5f/recipes/projectile-hanami"; sha256 = "0qi9i4wdggrmihf1j42fqrf38psmb33rlafg3y6da5r7lpn03j1a"; - name = "projectile-hanami"; + name = "recipe"; }; packageRequires = [ emacs inf-ruby projectile rake ]; meta = { @@ -59819,20 +78114,30 @@ license = lib.licenses.free; }; }) {}; - projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: - melpaBuild { + projectile-rails = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , inf-ruby + , inflections + , lib + , melpaBuild + , projectile + , rake }: + melpaBuild { pname = "projectile-rails"; - version = "20180327.433"; + ename = "projectile-rails"; + version = "20180718.55"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "b5e516ef6a336bde32e4594408be15fd96b07e1b"; - sha256 = "06qwhf04wy67ils5wn9hyc1z2j1pq0kb1mvxkxzqglwdnaca00l7"; + rev = "38fa072fe2d63890a439cc29a19671da39e975bd"; + sha256 = "17fj0qmxnbj48d2mnpz0dw2060whi29b8d2qb9sa9irrwfb63ayw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq"; - name = "projectile-rails"; + name = "recipe"; }; packageRequires = [ emacs f inf-ruby inflections projectile rake ]; meta = { @@ -59840,20 +78145,26 @@ license = lib.licenses.free; }; }) {}; - projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }: - melpaBuild { + projectile-ripgrep = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , ripgrep }: + melpaBuild { pname = "projectile-ripgrep"; + ename = "projectile-ripgrep"; version = "20180301.651"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "a1f8f030bf5daea92dd13b953720a6c13dd3557c"; - sha256 = "0mpysjcbw9qxy1lcwsd2rqf72xahpdpn88xcq0cnk1y2jam8gjkf"; + rev = "1f4338eeeb4bb3084a4b43762fa69a2c93ddff85"; + sha256 = "0im6l8gn3msl5jks3qif0jmi358kj46a50p2lirpjh6rnilmnanq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; sha256 = "1iczizyayql40wcljvpc1mvfvn9r28b1dkrkcmdxif732gd01jjg"; - name = "projectile-ripgrep"; + name = "recipe"; }; packageRequires = [ projectile ripgrep ]; meta = { @@ -59861,20 +78172,26 @@ license = lib.licenses.free; }; }) {}; - projectile-sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sift }: - melpaBuild { + projectile-sift = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , sift }: + melpaBuild { pname = "projectile-sift"; + ename = "projectile-sift"; version = "20160107.215"; src = fetchFromGitHub { owner = "nlamirault"; repo = "sift.el"; - rev = "4ce8878a0fc396ded7521ce38852d93e1d863065"; - sha256 = "1x78i6svi4cwah9xw85imhpncvxsx4xim4fzykpnd328mxkk07h6"; + rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13"; + sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/projectile-sift"; sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i"; - name = "projectile-sift"; + name = "recipe"; }; packageRequires = [ projectile sift ]; meta = { @@ -59882,9 +78199,15 @@ license = lib.licenses.free; }; }) {}; - projectile-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sr-speedbar }: - melpaBuild { + projectile-speedbar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , sr-speedbar }: + melpaBuild { pname = "projectile-speedbar"; + ename = "projectile-speedbar"; version = "20170516.1943"; src = fetchFromGitHub { owner = "anshulverma"; @@ -59892,10 +78215,10 @@ rev = "dcab13db72c2084edbebe808e35f1126fe0b3bcd"; sha256 = "106a4y5r1adjpbnjn734s7d910r6akhjlyjpd6bnczjhp357wyc7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8cb5a175258404c347ffa30fca002504467a0/recipes/projectile-speedbar"; sha256 = "0dli4gzsiycivh8dwa00lfpbimyg42qygfachzrhi8qy5413pwlp"; - name = "projectile-speedbar"; + name = "recipe"; }; packageRequires = [ projectile sr-speedbar ]; meta = { @@ -59903,20 +78226,30 @@ license = lib.licenses.free; }; }) {}; - projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: - melpaBuild { + projectile-trailblazer = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , inf-ruby + , inflections + , lib + , melpaBuild + , projectile + , rake }: + melpaBuild { pname = "projectile-trailblazer"; + ename = "projectile-trailblazer"; version = "20170928.924"; src = fetchFromGitHub { owner = "micdahl"; repo = "projectile-trailblazer"; - rev = "a37a4f7b7f727d98e4c74c0256e059e84263553d"; - sha256 = "1njs2aps4mlbnnfjkfwrb8vy8lg6lyxzxkxpscv91la7yf3wpc3g"; + rev = "79299498d74876f2ac3fe8075716b39a5bdd04cd"; + sha256 = "1lkj9jdr3g7nl80fxvic6g5cn7vbkyxys7m3kcmd6xa9mq7nvci4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer"; sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4"; - name = "projectile-trailblazer"; + name = "recipe"; }; packageRequires = [ emacs f inf-ruby inflections projectile rake ]; meta = { @@ -59924,9 +78257,15 @@ license = lib.licenses.free; }; }) {}; - projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + projectile-variable = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "projectile-variable"; + ename = "projectile-variable"; version = "20170208.918"; src = fetchFromGitHub { owner = "emacs-php"; @@ -59934,10 +78273,10 @@ rev = "8d348ac70bdd6dc320c13a12941b32b38140e264"; sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/projectile-variable"; sha256 = "15qc5n91nxyfvb100iyihfmrdr57qgw6098yv3nfqgw3zx1qchdw"; - name = "projectile-variable"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -59945,20 +78284,27 @@ license = lib.licenses.free; }; }) {}; - projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + projector = callPackage ({ alert + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "projector"; - version = "20171006.1258"; + ename = "projector"; + version = "20180712.1549"; src = fetchFromGitHub { owner = "waymondo"; repo = "projector.el"; - rev = "03751fca880c95cf47e560c78cfc2aaa056cd455"; - sha256 = "1yg9pcs6pbwd7a35q0jqjwnqwjqz4v5jd24msr51xh0v8kbs2v61"; + rev = "aeecd317b3031834569d2cd51171e377eacd0685"; + sha256 = "1nnggqrla6w58ll19fh01fndhssqx7l1blw21r8j9rv1vvjmvf3p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector"; sha256 = "0hrinplk607wcc2ibn05pl8ghikv9f3zvymncp6nz95jw9brdapf"; - name = "projector"; + name = "recipe"; }; packageRequires = [ alert cl-lib projectile ]; meta = { @@ -59966,9 +78312,14 @@ license = lib.licenses.free; }; }) {}; - projekt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + projekt = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "projekt"; + ename = "projekt"; version = "20150324.148"; src = fetchFromGitHub { owner = "tekai"; @@ -59976,10 +78327,10 @@ rev = "a65e554e5d8b0def08c5d06f3fe34fec40bebd83"; sha256 = "0hvvlh24157qjxz82sbg22d4cbrf95xyx202cybp0n1vyxsmjcmw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a854ed4fef114861bcc7814cd064c16d3c074c/recipes/projekt"; sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8"; - name = "projekt"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -59987,9 +78338,15 @@ license = lib.licenses.free; }; }) {}; - projmake-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, indicators, lib, melpaBuild }: - melpaBuild { + projmake-mode = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , indicators + , lib + , melpaBuild }: + melpaBuild { pname = "projmake-mode"; + ename = "projmake-mode"; version = "20161031.1015"; src = fetchFromGitHub { owner = "ericbmerritt"; @@ -59997,10 +78354,10 @@ rev = "a897701f7e8f8cc11459ed44eb0e454db2a460c1"; sha256 = "0las0xl4af6sn5pbllq16abw2hj1kswwpkyi6lf31sbwr5wnq4qb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df23138073d2416fa6522beca86b7a62eb4d42e3/recipes/projmake-mode"; sha256 = "192gvmhcz1anl80hpmcjwwd08dljyrap9sk6qj0y85mcnaafm882"; - name = "projmake-mode"; + name = "recipe"; }; packageRequires = [ dash indicators ]; meta = { @@ -60008,20 +78365,26 @@ license = lib.licenses.free; }; }) {}; - promise = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + promise = callPackage ({ async + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "promise"; - version = "20170215.2204"; + ename = "promise"; + version = "20180409.252"; src = fetchFromGitHub { owner = "chuntaro"; repo = "emacs-promise"; - rev = "d3cad4e1f7825404828cd9f5b887f18d3fd83c56"; - sha256 = "1cn1xcp6yfxp642yibknngf456v29s2qq3y8bsc67ydxjkr5w4gz"; + rev = "f623fa7466983fd1ba7034371f599434c03da723"; + sha256 = "1ffk5scab9whn27xz4wyik5vl235ngvhx30fd05abq97d6l7hndl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise"; sha256 = "1y1v3ikcmh9yp5fdwagcjg755bgkyqk714lb6s1hb2606m3ia03s"; - name = "promise"; + name = "recipe"; }; packageRequires = [ async emacs ]; meta = { @@ -60029,20 +78392,24 @@ license = lib.licenses.free; }; }) {}; - prompt-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prompt-text = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "prompt-text"; + ename = "prompt-text"; version = "20160106.609"; src = fetchFromGitHub { owner = "10sr"; repo = "prompt-text-el"; - rev = "bb9265ebfada42d0e3c67c809665e1e5d980691e"; - sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2"; + rev = "3cc486c070b7a7c806c8d6002f9ba4979f56107d"; + sha256 = "1hv4p1x5sli5lplm8hl6frxmwvbc1vmamgj9m2ryk17ykqmr05r5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17d2bc3e53865fe8c98aabb6ef0ad1d10fcb1061/recipes/prompt-text"; sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc"; - name = "prompt-text"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60050,9 +78417,14 @@ license = lib.licenses.free; }; }) {}; - prompts = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prompts = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "prompts"; + ename = "prompts"; version = "20160916.341"; src = fetchFromGitHub { owner = "GuiltyDolphin"; @@ -60060,10 +78432,10 @@ rev = "1cd5e732ff2a86b47836eb7252e5b59cd4b6ab26"; sha256 = "10y8x54p64zs1jlq4nf1kixpb42078n2gdf9s62b1siyb1vhl581"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2395402e72d9b0f7ce2ca5fcb4497919f90a8fe2/recipes/prompts"; sha256 = "1fz5sbc45jiq64y89lm8nj6lsanq3lzyjzahxzrgqvr7655pphzm"; - name = "prompts"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -60071,9 +78443,15 @@ license = lib.licenses.free; }; }) {}; - prop-menu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prop-menu = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "prop-menu"; + ename = "prop-menu"; version = "20150728.418"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -60081,10 +78459,10 @@ rev = "50b102c1c0935fd3e0c465feed7f27d66b21cdf3"; sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d3a013cc9c489987fe689c8d73bbaa3445bdeb3/recipes/prop-menu"; sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i"; - name = "prop-menu"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -60092,9 +78470,15 @@ license = lib.licenses.free; }; }) {}; - propfont-mixed = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + propfont-mixed = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "propfont-mixed"; + ename = "propfont-mixed"; version = "20150113.1411"; src = fetchFromGitHub { owner = "ikirill"; @@ -60102,10 +78486,10 @@ rev = "0b461ef4754a469610dba71874a34b6da42176bf"; sha256 = "0lch20njy248w7bnvgs7jz0zqasskf5dakmykxwpb48llm6kx95v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ccb401b60cb1128ba50a5afecd97feca6d00d7a/recipes/propfont-mixed"; sha256 = "19k0ydpkiviznsngwcqwn4k30r6j8w34pchgpjlsfwq1bndaai9y"; - name = "propfont-mixed"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -60113,9 +78497,14 @@ license = lib.licenses.free; }; }) {}; - proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + proportional = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "proportional"; + ename = "proportional"; version = "20171025.1637"; src = fetchFromGitHub { owner = "ksjogo"; @@ -60123,10 +78512,10 @@ rev = "f671ffe8fd803e2fc462e2e1844aeeab1a13918e"; sha256 = "02sbrcb9c27djk64xv41vii6pbw83b6iljrd66w4ad9hgz2pkxzk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0a7f061df4cce44e5fe98f6e1c31bec4a7338f/recipes/proportional"; sha256 = "022lhbslzd67wyah8r0gl73vzxgjjwia08l3ssdd08jj3p56m3wx"; - name = "proportional"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -60134,9 +78523,14 @@ license = lib.licenses.free; }; }) {}; - prosjekt = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prosjekt = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "prosjekt"; + ename = "prosjekt"; version = "20151127.616"; src = fetchFromGitHub { owner = "abingham"; @@ -60144,10 +78538,10 @@ rev = "a864a8be5842223043702395f311e3350c28e9db"; sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d359ec827573dd8c871c4f23df5d1737f1830e7/recipes/prosjekt"; sha256 = "1fn7ii1bq7bjkz27hihclpvx0aabgwy3kv47r9qibjl2jin97rck"; - name = "prosjekt"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -60155,20 +78549,24 @@ license = lib.licenses.free; }; }) {}; - protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + protobuf-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "protobuf-mode"; + ename = "protobuf-mode"; version = "20170526.950"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "7bf47a6b5d10382a4b427677cf7ca9288f4e2833"; - sha256 = "1rmq32csqd5zxhw7v9c8hd08ylr84s2dgnci0xss73s5cfyrd0g3"; + rev = "4674cc7c073f1b8d5efd2a42ffcf3ca30a907bfe"; + sha256 = "0sspwvwxyqq9aibf3piv6cp5vb28w2fnfk6x7wkmaiy7a4gcklcv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj"; - name = "protobuf-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60176,9 +78574,14 @@ license = lib.licenses.free; }; }) {}; - protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + protocols = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "protocols"; + ename = "protocols"; version = "20170802.432"; src = fetchFromGitHub { owner = "davep"; @@ -60186,10 +78589,10 @@ rev = "d0f7c4acb05465f1a0d4be54363bbd2802647e77"; sha256 = "1xg3pwsnzn795bz299x273ral2jrz2v3p9r6gjm4dcx5pm3348mj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols"; sha256 = "1wg3qh8a1ms82lkzz4i1bk787147a8agcj8rszj1zfvwg0ckqq1a"; - name = "protocols"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -60197,20 +78600,59 @@ license = lib.licenses.free; }; }) {}; - psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: - melpaBuild { + proxy-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "proxy-mode"; + ename = "proxy-mode"; + version = "20180520.2030"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "proxy-mode"; + rev = "1cf689c2408945081215550589936a7eaab14987"; + sha256 = "0xvc33xwrdh71kmv1g85gb28ba7yx8cz6257dgh6sx7ligz7cmvd"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/25224d3bcdb625314e931d5acc22f60c7192a84b/recipes/proxy-mode"; + sha256 = "0ldjfmxn8k8bzvdrlsfpijsmgn754aza54by5d59k7a1xn6d37mp"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/proxy-mode"; + license = lib.licenses.free; + }; + }) {}; + psc-ide = callPackage ({ cl-lib ? null + , company + , dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild + , s + , seq }: + melpaBuild { pname = "psc-ide"; - version = "20180101.1421"; + ename = "psc-ide"; + version = "20180605.302"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "085e9d5541ccf35e876a6135daaddaa0a58f3bb2"; - sha256 = "0q7xqrjvllngz658w32zm9jbz1njqwpaqgiv3b377nfnay9rsh3p"; + rev = "f71120b0c0d3192f79488ab000b9a689e5145ce4"; + sha256 = "1lg3bqspjmcdmfyjpnx5l9zy0lmicgnszcdbysjmf4q5jxqd3lhd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9"; - name = "psc-ide"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -60228,20 +78670,28 @@ license = lib.licenses.free; }; }) {}; - psci = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }: - melpaBuild { + psci = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , purescript-mode + , s }: + melpaBuild { pname = "psci"; - version = "20171011.50"; + ename = "psci"; + version = "20180418.533"; src = fetchFromGitHub { owner = "purescript-emacs"; repo = "emacs-psci"; - rev = "5360b244c588ed2f2a5bb86180cb5d4deb2216de"; - sha256 = "0m9lpwwm29h0pms1rnwnh67ff1n1dmf25yy429g438zq98l94x9s"; + rev = "3f5ef1141a97c4b5507204d48e8aeccd553e4591"; + sha256 = "1g06hqr23mg8457azkjp7wjsqavj48c0mjck0igi6mc2rh310930"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci"; sha256 = "1iwkr58b910vrwwxyk00psy74vp201vmm3b0cm4k5fh3glr31vp9"; - name = "psci"; + name = "recipe"; }; packageRequires = [ dash f purescript-mode s ]; meta = { @@ -60249,51 +78699,44 @@ license = lib.licenses.free; }; }) {}; - psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + psession = callPackage ({ async + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "psession"; - version = "20180331.1138"; + ename = "psession"; + version = "20180423.2159"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "1360c92372fc2cdb05a3a06dbabf311471cca460"; - sha256 = "02lksnjd6c4b2az09jhkhfcimld96cl8kdv75j39jvf4qdqhmrg8"; + rev = "702d20897c0839568201bc6921d5f0f80b8778c0"; + sha256 = "0ynd69fyjpgs6rs3kkznpx19kmdmd25wb46bj9zq61gj138b6p33"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a"; - name = "psession"; + name = "recipe"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ async cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/psession"; license = lib.licenses.free; }; }) {}; - psvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "psvn"; - version = "20151103.1042"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "psvn"; - rev = "23048d302858fc3a52c118652bd83491a4956410"; - sha256 = "1jz1g0igpnsjn2r144205bffj10iyp8izm8678mzkhnricxkn0d6"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3690f9af15a6470b76d953c349eed82833b79a7c/recipes/psvn"; - sha256 = "1wdww25pjla7c8zf04mvgia1ws8cal9rb7z8g3vn2s3gp68py12n"; - name = "psvn"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/psvn"; - license = lib.licenses.free; - }; - }) {}; - psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + psysh = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "psysh"; + ename = "psysh"; version = "20171022.2229"; src = fetchFromGitHub { owner = "emacs-php"; @@ -60301,10 +78744,10 @@ rev = "926af4ae0c068ed699fc939f4b3e642aaa6f7c9e"; sha256 = "0k6kb4xbfxcvd7dm3kb600mq56xyy086zi7nal04jkv9lc59bwn7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/psysh"; sha256 = "00rzfw8nlbcmfbjnzbfl08136dhgvrrn9g1s9l623xgpbcay63sg"; - name = "psysh"; + name = "recipe"; }; packageRequires = [ emacs f s ]; meta = { @@ -60312,9 +78755,13 @@ license = lib.licenses.free; }; }) {}; - pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pt"; + ename = "pt"; version = "20161226.1159"; src = fetchFromGitHub { owner = "bling"; @@ -60322,10 +78769,10 @@ rev = "6d99b2aaded3ece3db19a20f4b8f1d4abe382622"; sha256 = "1vi97hgwrf7n8vsbkvvhn398m20755jnbbbz4kxgqfmcgpimc8nc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34c51783af154f203489f5f7df7012ca61932caa/recipes/pt"; sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj"; - name = "pt"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60333,20 +78780,26 @@ license = lib.licenses.free; }; }) {}; - pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pug-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pug-mode"; - version = "20171208.2029"; + ename = "pug-mode"; + version = "20180513.1426"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "894a86d0ae4e855ae6044af6d7e106f8996c97c2"; - sha256 = "0phf9y5rcahhavbvnsh6hfm3ig7vr3fs7m503zv1sac9is5zxypi"; + rev = "8739fe5b5ff83a53cfb233263e85346562e58f1d"; + sha256 = "16whqy3plqarlvmifakgc7a8fjp4gv7hchzgspnvgjadqk3h0ik0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85"; - name = "pug-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -60354,20 +78807,24 @@ license = lib.licenses.free; }; }) {}; - pulseaudio-control = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pulseaudio-control = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pulseaudio-control"; - version = "20171024.2339"; + ename = "pulseaudio-control"; + version = "20180627.450"; src = fetchFromGitHub { owner = "flexibeast"; repo = "pulseaudio-control"; - rev = "08c59e1dc45ec96edb62f34036e82cf5f14c0e8b"; - sha256 = "10cgg1r00kz2fsnnryvzay5pf8s1pwb1dzlds1fbjdnyfvdgammv"; + rev = "1da372ec79f5d2fb901d1f9f0679fee8848fd011"; + sha256 = "02xrsms2pjqdk6327midi61i5vg2h9cq5jwaxv43ldm68wl7hi6k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control"; sha256 = "1vdhg85lbdx7sj1xg2vhhfmhrrp5q2x560agnsb0gxi2akp6z9r0"; - name = "pulseaudio-control"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60375,20 +78832,24 @@ license = lib.licenses.free; }; }) {}; - punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + punctuality-logger = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "punctuality-logger"; + ename = "punctuality-logger"; version = "20141120.1231"; src = fetchFromGitLab { owner = "elzair"; repo = "punctuality-logger"; - rev = "e09e5dd37bc92289fa2f7dc44aed51a7b5e04bb0"; - sha256 = "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q"; + rev = "d76c5d5589a4f8a94cc5537686d9a3b46ea7cc59"; + sha256 = "03872n1v5qqqblviq9sf2ml6ibs50mcjrh0i35sb0m7l202nh52b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/punctuality-logger"; sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm"; - name = "punctuality-logger"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60396,20 +78857,26 @@ license = lib.licenses.free; }; }) {}; - pungi = callPackage ({ fetchFromGitHub, fetchurl, jedi, lib, melpaBuild, pyvenv }: - melpaBuild { + pungi = callPackage ({ fetchFromGitHub + , fetchurl + , jedi + , lib + , melpaBuild + , pyvenv }: + melpaBuild { pname = "pungi"; + ename = "pungi"; version = "20150222.446"; src = fetchFromGitHub { owner = "mgrbyte"; repo = "pungi"; - rev = "a2d4d439ea371be0b064a12248288903b8a521a0"; - sha256 = "1viw95y6fha782n1jw7snr7xc00iyf94r4whsm1a2q11vm2d1h21"; + rev = "41c9f8b7795e083bfd63ba0d06c789c250998723"; + sha256 = "012lv7hrwlhvins81vw3yjkhdwbpi6g1dx55i101qyrpzv5ifngm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d504c6028c029268d380c0eac25b1c4886aa6e98/recipes/pungi"; sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1"; - name = "pungi"; + name = "recipe"; }; packageRequires = [ jedi pyvenv ]; meta = { @@ -60417,9 +78884,13 @@ license = lib.licenses.free; }; }) {}; - punpun-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + punpun-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "punpun-theme"; + ename = "punpun-theme"; version = "20161103.147"; src = fetchFromGitHub { owner = "wasamasa"; @@ -60427,10 +78898,10 @@ rev = "cce8b10b2df6f9187a9eaa0c3f21ff0dda175968"; sha256 = "1iz1qc9bphl2y2z7abc33fvyaccj733drkl7nzbr1jlpbknkmk2k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77a9edbb36dc9474adb23d356e6c596789aab2a2/recipes/punpun-theme"; sha256 = "1l7nphh8v7w5w790cwmnp6nw5rciwhgzkvynkrvpiv9chhacx0xg"; - name = "punpun-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60438,9 +78909,15 @@ license = lib.licenses.free; }; }) {}; - puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + puppet-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "puppet-mode"; + ename = "puppet-mode"; version = "20171220.2249"; src = fetchFromGitHub { owner = "voxpupuli"; @@ -60448,10 +78925,10 @@ rev = "b3ed5057166a4f49dfa9be638523a348b55a2fd2"; sha256 = "0sgws5cl4vc8707l66lq0zi1p6pxik0474ihg9jczh2xxnq4clsk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; sha256 = "1qn71j6fkwnrsq1s6fhfcxhic3rbspg5cy9n7jv451ji7ywyhakf"; - name = "puppet-mode"; + name = "recipe"; }; packageRequires = [ emacs pkg-info ]; meta = { @@ -60459,9 +78936,13 @@ license = lib.licenses.free; }; }) {}; - purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + purescript-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "purescript-mode"; + ename = "purescript-mode"; version = "20180120.709"; src = fetchFromGitHub { owner = "dysinger"; @@ -60469,10 +78950,10 @@ rev = "b76c7f37f1a3527e8ace66bbd584851e1f803cc8"; sha256 = "0nnrfs1siz4wwn56razlig6cvi8fqgcgk5wv5b0iyizq8a8wwia7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode"; sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m"; - name = "purescript-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60480,9 +78961,14 @@ license = lib.licenses.free; }; }) {}; - purple-haze-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + purple-haze-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "purple-haze-theme"; + ename = "purple-haze-theme"; version = "20141014.1929"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -60490,10 +78976,10 @@ rev = "3e245cbef7cd09e6b3ee124963e372a04e9a6485"; sha256 = "15myw5rkbnnpgzpiipm5xl4cyzymv8hh66x9al4aalb5nf52dckc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/purple-haze-theme"; sha256 = "1rvfpm3zkhdv3ikc8pqqngf9pi0niwyi52pg8dq8i056nwc5bk9z"; - name = "purple-haze-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -60501,20 +78987,24 @@ license = lib.licenses.free; }; }) {}; - purty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + purty-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "purty-mode"; + ename = "purty-mode"; version = "20131004.1559"; src = fetchFromGitHub { owner = "jcatw"; repo = "purty-mode"; - rev = "8eef77317a3bab07ade212353a50fbd3f20f365a"; - sha256 = "0qm2xv762cz196aqs445crqrmsks8hpwzpaykzn0chlvdk0m5cv1"; + rev = "ad48149bfd0c765796a728b22d679e03fc124328"; + sha256 = "1gx2c94bq34d2zjdr9mbnafq6alzz8vrlj5pskm15p225s85a2q3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/purty-mode"; sha256 = "0gbbwl5kg74jf1i1zsr40zg3gw43qmz1l87k0r578v1xvyqmhm1i"; - name = "purty-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60522,9 +79012,15 @@ license = lib.licenses.free; }; }) {}; - pushbullet = callPackage ({ fetchFromGitHub, fetchurl, grapnel, json ? null, lib, melpaBuild }: - melpaBuild { + pushbullet = callPackage ({ fetchFromGitHub + , fetchurl + , grapnel + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "pushbullet"; + ename = "pushbullet"; version = "20140809.532"; src = fetchFromGitHub { owner = "theanalyst"; @@ -60532,10 +79028,10 @@ rev = "73c59a0f1dc04875b3e5a2c8afbc26c32128e445"; sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2649d60dd1ed3b3171ff1448b89967c5f7759a0/recipes/pushbullet"; sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl"; - name = "pushbullet"; + name = "recipe"; }; packageRequires = [ grapnel json ]; meta = { @@ -60543,19 +79039,24 @@ license = lib.licenses.free; }; }) {}; - pushover = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + pushover = callPackage ({ cl-lib ? null + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pushover"; + ename = "pushover"; version = "20170818.1403"; src = fetchgit { url = "https://git.flintfam.org/swf-projects/emacs-pushover.git"; rev = "bbe3ac8df3c532a72da4552615af960b8a577588"; sha256 = "187bisngi37n66ik2dq7rg4hy4nlxl9pifqgqq08kf9238y8hd11"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9553cd029bc0733c89d2c790cb173d9668a9eba/recipes/pushover"; sha256 = "0im5bf2r69s2jb6scm8xdk63y1xi5zm4kg9ghfixlvyvipfli4kl"; - name = "pushover"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -60563,9 +79064,13 @@ license = lib.licenses.free; }; }) {}; - px = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + px = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "px"; + ename = "px"; version = "20170317.1630"; src = fetchFromGitHub { owner = "aaptel"; @@ -60573,10 +79078,10 @@ rev = "0c52f7933eab3ca1642ab0df151db9950430c9e2"; sha256 = "0f741a2gpc2mdl85ivbiskga620b6ci2x0dwjs7m8c1vk6xrxbpi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/326fc9b057a5016248ac36ca166e9a38f13babf6/recipes/px"; sha256 = "0xjmz18m2dslh6yq5z32r43zq3svfxn8mhrfbmihglyv2mkwxw44"; - name = "px"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60584,9 +79089,13 @@ license = lib.licenses.free; }; }) {}; - py-autopep8 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + py-autopep8 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "py-autopep8"; + ename = "py-autopep8"; version = "20160925.352"; src = fetchFromGitHub { owner = "paetzke"; @@ -60594,10 +79103,10 @@ rev = "68e12d8788c91c7ec53a68acf1d23adb2ffa4788"; sha256 = "16fmym6hvi2lx0mmbrrhld1vzki5iqfqx2m0xa9021gjjzb33lw6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c400e0f3cfe70821e621fe85d239b4f6596d5171/recipes/py-autopep8"; sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp"; - name = "py-autopep8"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60605,9 +79114,13 @@ license = lib.licenses.free; }; }) {}; - py-gnitset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + py-gnitset = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "py-gnitset"; + ename = "py-gnitset"; version = "20170821.1032"; src = fetchFromGitHub { owner = "quodlibetor"; @@ -60615,10 +79128,10 @@ rev = "1e993cc29cbc31e06fe1e335dec198e21972fa55"; sha256 = "1hslq2bdk95cgza9qbskxf942ckhjb4bqi6nrhbmlnm9agmjqm59"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/py-gnitset"; sha256 = "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r"; - name = "py-gnitset"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60626,20 +79139,24 @@ license = lib.licenses.free; }; }) {}; - py-import-check = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + py-import-check = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "py-import-check"; + ename = "py-import-check"; version = "20130802.411"; src = fetchFromGitHub { owner = "psibi"; repo = "emacs-py-import-check"; - rev = "9787f87745a4234cd9bed711860b707902bc8ae4"; - sha256 = "1416hbc64gwn9c8g9lxfx58w60ysi0x8rbps6mfxalavdhbs20sv"; + rev = "38ad91e67047bd37231497d11d409d064d510f98"; + sha256 = "1irdc740za4vb1ixnp2j33m8xwknybdg5szj1pgy28r72w4lipfy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abe81fe96790ceebcf0951595644ea6a82613890/recipes/py-import-check"; sha256 = "1261dki0q44sw9h0g1305i2fj1dg9xgwzry50jbn2idcrqg4xf7k"; - name = "py-import-check"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60647,9 +79164,13 @@ license = lib.licenses.free; }; }) {}; - py-isort = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + py-isort = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "py-isort"; + ename = "py-isort"; version = "20160925.318"; src = fetchFromGitHub { owner = "paetzke"; @@ -60657,10 +79178,10 @@ rev = "e67306f459c47c53a65604e4eea88a3914596560"; sha256 = "08i55gv392wc12x8v3dca0dmz8a8p9ljsqhyajsb6qv1k120wqhx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44377d11da07b49c8dc6887c948cc5ddfc065bd2/recipes/py-isort"; sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb"; - name = "py-isort"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60668,9 +79189,14 @@ license = lib.licenses.free; }; }) {}; - py-smart-operator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + py-smart-operator = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "py-smart-operator"; + ename = "py-smart-operator"; version = "20170531.509"; src = fetchFromGitHub { owner = "rmuslimov"; @@ -60678,10 +79204,10 @@ rev = "0c8a66faca4b35158d0b5885472cb75286039167"; sha256 = "09pmkp24s7nwh6p4pzsjp1z65ksi9n3n2xv7d3igpa86l8qgcm2d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7491a1825b7aaa5f76aafadb8f04721ab1b1cfe/recipes/py-smart-operator"; sha256 = "1n0bdr9z2s1ikhmfz642k94gjzb88anwlb61mh27ay8wqdgm74c4"; - name = "py-smart-operator"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -60689,9 +79215,16 @@ license = lib.licenses.free; }; }) {}; - py-test = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + py-test = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "py-test"; + ename = "py-test"; version = "20151116.2222"; src = fetchFromGitHub { owner = "Bogdanp"; @@ -60699,10 +79232,10 @@ rev = "3b2a0bdaacb54df6f2bee8317423e5c0d159d5cf"; sha256 = "1s39407z3rxz10r5sshv2vj7s23ylkhg59ixasgnpjk82gl4igpf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84690ba6b033027772c20bf20432427b32d3231a/recipes/py-test"; sha256 = "1mbwbzg606winf5af7qkg6a1hg79lc7k2miq4d3mwih496l5sinb"; - name = "py-test"; + name = "recipe"; }; packageRequires = [ dash emacs f ]; meta = { @@ -60710,9 +79243,13 @@ license = lib.licenses.free; }; }) {}; - py-yapf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + py-yapf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "py-yapf"; + ename = "py-yapf"; version = "20160925.422"; src = fetchFromGitHub { owner = "paetzke"; @@ -60720,10 +79257,10 @@ rev = "a878304202ad827a1f3de3dce1badd9ca8731146"; sha256 = "1mmzqdigxx46my0h9497l25cjydy3vykg6slxkch4dzvhhlbap48"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3306c6906d4b21868b9407de27fbebdaed3d00d5/recipes/py-yapf"; sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f"; - name = "py-yapf"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60731,20 +79268,26 @@ license = lib.licenses.free; }; }) {}; - pycarddavel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + pycarddavel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "pycarddavel"; + ename = "pycarddavel"; version = "20150831.516"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "pycarddavel"; - rev = "a6d81ee4eb8309cd82f6082aeca68c5a015702a3"; - sha256 = "09glwrb9q65qdm4yd0mbi5hwdy2434zm8699ywhs6hqpjacadlmi"; + rev = "6ead921066fa0156f20155b7126e5875ce11c328"; + sha256 = "0qg1kjzsv2mcvlsivqy8ys3djbs5yala37r9h2zcxdicl88q0l11"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b3d2cd943f26dcff322efb16d55dd3bd71dea07/recipes/pycarddavel"; sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a"; - name = "pycarddavel"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -60752,20 +79295,25 @@ license = lib.licenses.free; }; }) {}; - pycoverage = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pycoverage = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pycoverage"; + ename = "pycoverage"; version = "20160324.1812"; src = fetchFromGitHub { owner = "mattharrison"; repo = "pycoverage.el"; - rev = "4f5451f4d6e1e2ddd5878fc7d18f5fc4fc92a83d"; - sha256 = "0xhkzskxnj4lmf4152c3n1vp68l1xgwa277f3yg8sslg6ixkd2p0"; + rev = "dbc152a807efcaac4e50bedb64c026674009a279"; + sha256 = "0qap6iz865l43mixga7541c2z9kdx8zkkdcgdlgn6n8pyv8iz7qs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb0310bbe8427abdcba2b30414ec26475b0b7440/recipes/pycoverage"; sha256 = "1jaanmpnawk0r6zfzx18crqml7lv412l2l0iabp345xvfvsh8h1m"; - name = "pycoverage"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -60773,20 +79321,24 @@ license = lib.licenses.free; }; }) {}; - pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pydoc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pydoc"; - version = "20180302.2041"; + ename = "pydoc"; + version = "20180509.1519"; src = fetchFromGitHub { owner = "statmobile"; repo = "pydoc"; - rev = "146a006493f5284fdf23b42ef90454f1be25d0c1"; - sha256 = "1wk9zkwqi7vf0jpsf5y7hz0z198x4k9xp2fpqggkqfbv007ks1qq"; + rev = "253a95571fa80548e2174c89fa965e689030f09c"; + sha256 = "1linfl31i6wpbhyrrjw3xxxxi5d2747ng3bn3fk87ihd9zlbx6wz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc"; sha256 = "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n"; - name = "pydoc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60794,19 +79346,23 @@ license = lib.licenses.free; }; }) {}; - pydoc-info = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + pydoc-info = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pydoc-info"; + ename = "pydoc-info"; version = "20110301.34"; src = fetchhg { url = "https://bitbucket.com/jonwaltman/pydoc-info"; rev = "151d877c8fb8"; sha256 = "1mzyr6yznkyv99x9q8zx2f270ngjh8s94zvnhcbhidi57inpd1nh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/pydoc-info"; sha256 = "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf"; - name = "pydoc-info"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60814,20 +79370,25 @@ license = lib.licenses.free; }; }) {}; - pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }: - melpaBuild { + pyenv-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pythonic }: + melpaBuild { pname = "pyenv-mode"; + ename = "pyenv-mode"; version = "20170801.1648"; src = fetchFromGitHub { owner = "proofit404"; repo = "pyenv-mode"; - rev = "eabb1c66f9e0c0500fef4d089508aad246d81dc0"; - sha256 = "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3"; + rev = "215b7f0ed3847e0c844adbff7d9b19057aa7c820"; + sha256 = "0wb9xgpp9bc045kkw0jg14qnxa1y7ydsv1zw4nmy0mw7acxpcjgn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode"; sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59"; - name = "pyenv-mode"; + name = "recipe"; }; packageRequires = [ pythonic ]; meta = { @@ -60835,20 +79396,27 @@ license = lib.licenses.free; }; }) {}; - pyenv-mode-auto = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pyenv-mode, s }: - melpaBuild { + pyenv-mode-auto = callPackage ({ f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pyenv-mode + , s }: + melpaBuild { pname = "pyenv-mode-auto"; - version = "20180216.2352"; + ename = "pyenv-mode-auto"; + version = "20180620.552"; src = fetchFromGitHub { owner = "ssbb"; repo = "pyenv-mode-auto"; - rev = "08f319efbc31571f391e032379169ab90fa71418"; - sha256 = "089n0s0vhwysgrkpjidy7gsl6skmzz2lg011mgiskfvqwijj2vyx"; + rev = "b6eef88ad89865a7e0ec8bae8c6ce8239cb649c6"; + sha256 = "1gz7145jnjcky1751pqrlhh3pq02ybsmz49ngx4ip2589nry7iyv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3fcb707356bd16fd0b573c176023534cd69d0d7/recipes/pyenv-mode-auto"; sha256 = "1l7h4fas1vshkh4skxzpw7v2a11s1hwnb20n6a81yh701pbikqnd"; - name = "pyenv-mode-auto"; + name = "recipe"; }; packageRequires = [ f pyenv-mode s ]; meta = { @@ -60856,20 +79424,24 @@ license = lib.licenses.free; }; }) {}; - pyfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pyfmt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pyfmt"; + ename = "pyfmt"; version = "20150521.1356"; src = fetchFromGitHub { owner = "aheaume"; repo = "pyfmt.el"; - rev = "cb92be2cf0804cc53142dc5edb36f8e0ef5cec32"; - sha256 = "1rp8zchvclh29rl9a1i82pcqghnhpaqnppaydxc2qx23y9pdgz9i"; + rev = "3022283c1ae7da1b6a983fedc90179670725f8d0"; + sha256 = "0p0hjac9qk809ygmg566avv4fkljfnrn7rk1pxh61dsj7al6kzzp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d477025ae5af50bf8f7b37f2adfa9159502e13/recipes/pyfmt"; sha256 = "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6"; - name = "pyfmt"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60877,20 +79449,27 @@ license = lib.licenses.free; }; }) {}; - pygen = callPackage ({ dash, elpy, fetchFromGitHub, fetchurl, lib, melpaBuild, python-mode }: - melpaBuild { + pygen = callPackage ({ dash + , elpy + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , python-mode }: + melpaBuild { pname = "pygen"; + ename = "pygen"; version = "20161120.2106"; src = fetchFromGitHub { owner = "JackCrawley"; repo = "pygen"; - rev = "9019ff44ba49d7295b1476530feab91fdadb084b"; - sha256 = "01gmggjv36jc8660xfpfy70cydabhymd17q3z16cjqvsxapbj7nf"; + rev = "3a5d1d1a0640865b15be05cd1eeb33bb4793b622"; + sha256 = "0fzpvdwb7hhmfmjxzvap8413bc81lrx8r3ij3yasqaxyqw3a6vy1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e761724e52de6fa4d92950751953645dd439d340/recipes/pygen"; sha256 = "1ivg7a1ghg0bvz3idz7dzy5yb0ln3b2j7dfizg2g0fi4iwvc4czz"; - name = "pygen"; + name = "recipe"; }; packageRequires = [ dash elpy python-mode ]; meta = { @@ -60898,20 +79477,28 @@ license = lib.licenses.free; }; }) {}; - pyim = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: - melpaBuild { + pyim = callPackage ({ async + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup + , pyim-basedict }: + melpaBuild { pname = "pyim"; - version = "20180324.2310"; + ename = "pyim"; + version = "20180712.640"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "78fe2db87d38fc64879621802e2fcf8b54b8acb7"; - sha256 = "1w5qswz1ybfzk1g5w8qlid836n6nsd5zpblfkijmss4nlkwxczgs"; + rev = "b0ad82aa86124d74f9dfbdcad24199e111e5445c"; + sha256 = "03dq9mnz5mdbk3q9id0i4wf41r9ap3p5avihd0f4m77sspjfn9ix"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j"; - name = "pyim"; + name = "recipe"; }; packageRequires = [ async emacs popup pyim-basedict ]; meta = { @@ -60919,9 +79506,13 @@ license = lib.licenses.free; }; }) {}; - pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pyim-basedict = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pyim-basedict"; + ename = "pyim-basedict"; version = "20170726.1959"; src = fetchFromGitHub { owner = "tumashu"; @@ -60929,10 +79520,10 @@ rev = "3196cb210e056702c5a4ea1dac1d8e1e27740fab"; sha256 = "03jbjc5a1h22vpcybg0gmbyibaa85w2ml1pjk646qb28ljywd5aw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-basedict"; sha256 = "1y8cmccli3im5bvws2h582z7k4nj6p8brgypl8h09y3na6yjy2z9"; - name = "pyim-basedict"; + name = "recipe"; }; packageRequires = []; meta = { @@ -60940,9 +79531,14 @@ license = lib.licenses.free; }; }) {}; - pyim-cangjie5dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: - melpaBuild { + pyim-cangjie5dict = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pyim }: + melpaBuild { pname = "pyim-cangjie5dict"; + ename = "pyim-cangjie5dict"; version = "20170729.1946"; src = fetchFromGitHub { owner = "erstern"; @@ -60950,10 +79546,10 @@ rev = "c8618590780b818db1a67a29bc47c5d25903517a"; sha256 = "0p49h2kn8wy3b51zahzyc1cy24h3b44cg5yjpmv4w23dhsr4zlz8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27a58729115b038abe813601bf16bba1524cdb2c/recipes/pyim-cangjie5dict"; sha256 = "0k2nxdlrj3m09javv599ajwd8cd5mjz0hj1j51zpv4y0l1n801bn"; - name = "pyim-cangjie5dict"; + name = "recipe"; }; packageRequires = [ pyim ]; meta = { @@ -60961,9 +79557,14 @@ license = lib.licenses.free; }; }) {}; - pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: - melpaBuild { + pyim-wbdict = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pyim }: + melpaBuild { pname = "pyim-wbdict"; + ename = "pyim-wbdict"; version = "20170724.1527"; src = fetchFromGitHub { owner = "tumashu"; @@ -60971,10 +79572,10 @@ rev = "114489ed97e825ae11a8d09da6e873820cf23106"; sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict"; sha256 = "1s0i9xcnpy8kxqhsv7rqxabv5vnxsciyng398mn32mknib03315i"; - name = "pyim-wbdict"; + name = "recipe"; }; packageRequires = [ pyim ]; meta = { @@ -60982,9 +79583,16 @@ license = lib.licenses.free; }; }) {}; - pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: - melpaBuild { + pyimport = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , shut-up }: + melpaBuild { pname = "pyimport"; + ename = "pyimport"; version = "20180308.952"; src = fetchFromGitHub { owner = "Wilfred"; @@ -60992,10 +79600,10 @@ rev = "a6f63cf7ed93f0c0f7c207e6595813966f8852b9"; sha256 = "1q5gqhvh4zq5dy8vns694warcz48j1hdnxg16sjck4gsi9xivbvs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; sha256 = "1qwigplawknykw1kbm5babyyknzn43ddhbdpahvzh4wy3kycn6n8"; - name = "pyimport"; + name = "recipe"; }; packageRequires = [ dash s shut-up ]; meta = { @@ -61003,9 +79611,14 @@ license = lib.licenses.free; }; }) {}; - pyimpsort = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pyimpsort = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pyimpsort"; + ename = "pyimpsort"; version = "20160129.2053"; src = fetchFromGitHub { owner = "emacs-pe"; @@ -61013,10 +79626,10 @@ rev = "d5c61d70896b642646dfd3c809c06174ae086c1a"; sha256 = "05qx1p19dw3nr264shihfn33k579hd0wf4cxki5cqrxi7xzpjgrc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97eb7c0934298d393910419fd55d7d5f1b0cfc38/recipes/pyimpsort"; sha256 = "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k"; - name = "pyimpsort"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -61024,20 +79637,24 @@ license = lib.licenses.free; }; }) {}; - pylint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pylint = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pylint"; + ename = "pylint"; version = "20170402.555"; src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "955acfec0e51c7705960693ed077c0696dd91581"; - sha256 = "0d220lp9187shwvaqnq2306f6ajg9bdyn3vz9f4z8qz1ya6ris9j"; + rev = "c812c59b31ba0b3f45c4bef6d4d93f561f79949d"; + sha256 = "1234ms5brqvx468hqpslzg4nsj42g9vjza2rp5msn15nj7cdhbxj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; sha256 = "1138a8dn9y4ypbphs1zfvr8gr4vdjcy0adsl4xfbgsls4kcdwpxx"; - name = "pylint"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61045,20 +79662,28 @@ license = lib.licenses.free; }; }) {}; - pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pynt = callPackage ({ deferred + , ein + , emacs + , epc + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pynt"; - version = "20180331.2118"; + ename = "pynt"; + version = "20180710.26"; src = fetchFromGitHub { owner = "ebanner"; repo = "pynt"; - rev = "742ed8313088a29abcbd2d3fe74922823666e554"; - sha256 = "0fpnv6vv4blrfr6v4nrqvgcrq7c6w8jj67n0mskyp4a7p7l44qcy"; + rev = "963c43cfdb5deea7daedc269aafa79192d853154"; + sha256 = "167hw8flq5fgxf4wzsdx07a1jgp8qg11lraj7g09ds2wrlh9awid"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt"; sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3"; - name = "pynt"; + name = "recipe"; }; packageRequires = [ deferred ein emacs epc ]; meta = { @@ -61066,9 +79691,42 @@ license = lib.licenses.free; }; }) {}; - pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + pyramid = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pythonic + , tablist }: + melpaBuild { + pname = "pyramid"; + ename = "pyramid"; + version = "20180718.1420"; + src = fetchFromGitHub { + owner = "dakra"; + repo = "pyramid.el"; + rev = "63b7ce47d3f79c8fdd06ea0cbdb519ae3e481aea"; + sha256 = "0al7sk1kj8czffxsc5dfhnpx7wh1iwxb3a3wx8ghgkgj5iw1y466"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f786a47c2a6243c693163680146606c71502d0be/recipes/pyramid"; + sha256 = "149p9k6wjlgamm3vrkkcdj4fqhdfsskv1jqflp1bccfkgqpi5096"; + name = "recipe"; + }; + packageRequires = [ emacs pythonic tablist ]; + meta = { + homepage = "https://melpa.org/#/pyramid"; + license = lib.licenses.free; + }; + }) {}; + pytest = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "pytest"; + ename = "pytest"; version = "20170614.745"; src = fetchFromGitHub { owner = "ionrock"; @@ -61076,10 +79734,10 @@ rev = "013fccd684fc8f2092d6e1ec4203ec574e12051d"; sha256 = "0yjnq2lyh6jr5xz29n6xxmp4lcy28wrcmw05j0zgcjdshri1pd43"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/33a854a27adbaf57d344340199f90d52747b8450/recipes/pytest"; sha256 = "0ssib65wa20h8r6156f392l481vns5fcax6w70hcawmn84nficdh"; - name = "pytest"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -61087,9 +79745,13 @@ license = lib.licenses.free; }; }) {}; - python-cell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + python-cell = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "python-cell"; + ename = "python-cell"; version = "20131029.1616"; src = fetchFromGitHub { owner = "thisch"; @@ -61097,10 +79759,10 @@ rev = "ccacd91a19be784860d687eb1e8ce88fddaacaf6"; sha256 = "1cnjdgw3x6yb5k06z57xifywlg0kdx9ai4f1ajc0wx9aax8r5gav"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0549866c5e96f673ec9dec298e7ff9d5779d443b/recipes/python-cell"; sha256 = "07i3vyci52jvslq28djwkgx1r157wvxd99rvqlxnmmsl5yj4k1jf"; - name = "python-cell"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61108,9 +79770,13 @@ license = lib.licenses.free; }; }) {}; - python-django = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + python-django = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "python-django"; + ename = "python-django"; version = "20150821.2104"; src = fetchFromGitHub { owner = "fgallina"; @@ -61118,10 +79784,10 @@ rev = "fc54ad74f0309670359b939f64d0f1fff68aeac4"; sha256 = "1qckn5bi1ib54hgqbym5qqwzvbv70ria1w3c2x543xlr0l7zga6h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29b2cd21e7b504222aed92ec062402f3e2a818fc/recipes/python-django"; sha256 = "02whx8g8r02mzng7d7bnbkz5n7gyzp5hcnmvd6a3lq106c0h7w9k"; - name = "python-django"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61129,9 +79795,13 @@ license = lib.licenses.free; }; }) {}; - python-docstring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + python-docstring = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "python-docstring"; + ename = "python-docstring"; version = "20170508.156"; src = fetchFromGitHub { owner = "glyph"; @@ -61139,10 +79809,10 @@ rev = "d35d2e0fbe468743c19a870fec7b28a7e725790d"; sha256 = "11y208svg5nxw8k7cbgd2iydng40gwpr85bdnxkywd910sac5p7b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e159e59ba0b60326cca0e1ea68fac4b85d54cd24/recipes/python-docstring"; sha256 = "1vi30y71vflsbprp5j4phbp7x1j24vxn9d6sifaddari0g0zxpfw"; - name = "python-docstring"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61150,9 +79820,14 @@ license = lib.licenses.free; }; }) {}; - python-environment = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + python-environment = callPackage ({ deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "python-environment"; + ename = "python-environment"; version = "20150310.153"; src = fetchFromGitHub { owner = "tkf"; @@ -61160,10 +79835,10 @@ rev = "401006584e32864a10c69d29f14414828909362e"; sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/283155ad56cd8eda416c83a9b7f8d43d4d1570c2/recipes/python-environment"; sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7"; - name = "python-environment"; + name = "recipe"; }; packageRequires = [ deferred ]; meta = { @@ -61171,9 +79846,13 @@ license = lib.licenses.free; }; }) {}; - python-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + python-info = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "python-info"; + ename = "python-info"; version = "20151228.1052"; src = fetchFromGitHub { owner = "Wilfred"; @@ -61181,10 +79860,10 @@ rev = "306f15441b54b25757cdfd3b327b84024ea21ed7"; sha256 = "0zk6014dzfrb3y3nhs890x082xf044w0a8nmy6rlrj375lvhfn99"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a30746451ec5ffab250e160c1d5bd29b8dc6b54/recipes/python-info"; sha256 = "0kvpz1r2si94rs1iajn1ffmx7a5bgyjnzri36ajdgd5gcgh41dhy"; - name = "python-info"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61192,20 +79871,24 @@ license = lib.licenses.free; }; }) {}; - python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + python-mode = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "python-mode"; - version = "20180319.344"; + ename = "python-mode"; + version = "20180721.1147"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "85b61649b5f66e966d55ffbaf90160c2b60ff410"; - sha256 = "173i3k0nvjri1g1mkgkc2i9c9mpnsvxf1ldmm12yhadl5gl2ah07"; + rev = "acb7714fd24ce06e1800fb955d547d367c64439d"; + sha256 = "1bmd0qc7qbzpxfg0wj4fs4qmdqdjar2zn8ljgr845j7qbxd0hcav"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; sha256 = "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k"; - name = "python-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61213,20 +79896,30 @@ license = lib.licenses.free; }; }) {}; - python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }: - melpaBuild { + python-pytest = callPackage ({ dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , magit-popup + , melpaBuild + , projectile + , s }: + melpaBuild { pname = "python-pytest"; - version = "20180307.844"; + ename = "python-pytest"; + version = "20180614.253"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-python-pytest"; - rev = "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70"; - sha256 = "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk"; + rev = "1ddb1ec183872dbcf383a4cc60b60944aaba7727"; + sha256 = "190ccqvdnxdsslsdn7c2b3a2377jrrpi4gj8rdbbksmjyr20gbf2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest"; sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4"; - name = "python-pytest"; + name = "recipe"; }; packageRequires = [ dash @@ -61241,9 +79934,14 @@ license = lib.licenses.free; }; }) {}; - python-switch-quotes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + python-switch-quotes = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "python-switch-quotes"; + ename = "python-switch-quotes"; version = "20161228.9"; src = fetchFromGitHub { owner = "werehuman"; @@ -61251,10 +79949,10 @@ rev = "93f1e9b40e061a6cea480139e8b1362b6404abd0"; sha256 = "1x04hnf3m8cgqp0i566q4n7kh59cayzfxka3g07kv0h543xbys4n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d99fbd3d0c486bf89c9c0937e2ebf378be39293f/recipes/python-switch-quotes"; sha256 = "1wc27q9ac8p7c5mfk3kznbmdd5ds4ray0csgba79n19g152y5jjc"; - name = "python-switch-quotes"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -61262,9 +79960,14 @@ license = lib.licenses.free; }; }) {}; - python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + python-test = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "python-test"; + ename = "python-test"; version = "20171112.2137"; src = fetchFromGitHub { owner = "emacs-pe"; @@ -61272,10 +79975,10 @@ rev = "f00b9de14647b15b6f36ceee77d7e9e08dd074a4"; sha256 = "1ba3r79afd5za36g09imp546bbvx2v9j58hl1bhjahx992wywrch"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test"; sha256 = "16grx9xzl48dcwflfmv64wigyxlw495a6q01b1ynkqj5sjdl3fkn"; - name = "python-test"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -61283,20 +79986,27 @@ license = lib.licenses.free; }; }) {}; - python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: - melpaBuild { + python-x = callPackage ({ cl-lib ? null + , fetchFromGitLab + , fetchurl + , folding + , lib + , melpaBuild + , python ? null }: + melpaBuild { pname = "python-x"; + ename = "python-x"; version = "20180218.1447"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "wavexx"; repo = "python-x.el"; rev = "35d6719953e809a07c0bb8f770deb5fa712d00e5"; sha256 = "1s24a9ji549nhlanm13gq7ghnz0zj6mwpbbmbqk8igsw3arx2nvr"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x"; - sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn"; - name = "python-x"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/python-x"; + sha256 = "03px1z27yhvc9084h9j2p0khvhkwmfxdskf0ndvz79ywp6nl7mb6"; + name = "recipe"; }; packageRequires = [ cl-lib folding python ]; meta = { @@ -61304,41 +80014,52 @@ license = lib.licenses.free; }; }) {}; - pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + pythonic = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "pythonic"; - version = "20180208.214"; + ename = "pythonic"; + version = "20180624.2212"; src = fetchFromGitHub { owner = "proofit404"; repo = "pythonic"; - rev = "e8102636cdd44a65638e3752fac9834a4ea87504"; - sha256 = "1v8qq9g9hdyia2hjkwwhsaikz528xkcirqpkgv6m9glbd3831h21"; + rev = "838eaf47c23628c5e88a59796bbe4653c57bf5c0"; + sha256 = "11gq0crq9ng6wy15kpv3zgahczyzv8clakwal1mvb6b5jq6ndmb5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic"; sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51"; - name = "pythonic"; + name = "recipe"; }; - packageRequires = [ cl-lib dash emacs f s ]; + packageRequires = [ emacs f s ]; meta = { homepage = "https://melpa.org/#/pythonic"; license = lib.licenses.free; }; }) {}; - pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pyvenv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pyvenv"; - version = "20180331.802"; + ename = "pyvenv"; + version = "20180720.214"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "ea3e28a4d6fe90d56c5d356161b0b2cb59529950"; - sha256 = "0cn8dksg429cb6vmm7pqrmxgckiw0zpxcx68bcm87pdnp7186f58"; + rev = "5824c8986bc3d21b1b0ab6a00d396bedbe1506b2"; + sha256 = "0qdaxfl6bhxg41r6fhpqwzjrxmjnp7pznrk1r3zfyris60ih91cq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v"; - name = "pyvenv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61346,20 +80067,26 @@ license = lib.licenses.free; }; }) {}; - qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, markdown-mode, melpaBuild }: - melpaBuild { + qiita = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "qiita"; + ename = "qiita"; version = "20140118.44"; src = fetchFromGitHub { owner = "gongo"; repo = "qiita-el"; - rev = "93c697b97d540fd1601a13a3d9889fb939b19878"; - sha256 = "0ggivlaj29rbbhkjpf3bf7vr96xjzffas0sf5m54qh6nyz6nnha5"; + rev = "d38988863a17a6fa8af617349b033c53b7634a83"; + sha256 = "0m3sr3csab80y408y5rm2ph379n5g5sv08wr32arfh815x3ql0wk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8065a58e297c50c031de97d2d80bce5857bd803/recipes/qiita"; sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl"; - name = "qiita"; + name = "recipe"; }; packageRequires = [ helm markdown-mode ]; meta = { @@ -61367,9 +80094,39 @@ license = lib.licenses.free; }; }) {}; - qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ql = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ql"; + ename = "ql"; + version = "20180418.1320"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "ql-el"; + rev = "d976414ba6aa576ad524b5ee5bfa620efd072258"; + sha256 = "138h4ndnzpphsmi4b8yw53mxc3rnqrj1c3jp8njx5pkmiqkp1q00"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303/recipes/ql"; + sha256 = "0wxjblqacs5nx2hyh7r6rlv1yngbhn6phn5rni4dw2dms98zj34z"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ql"; + license = lib.licenses.free; + }; + }) {}; + qml-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "qml-mode"; + ename = "qml-mode"; version = "20161015.1731"; src = fetchFromGitHub { owner = "coldnew"; @@ -61377,10 +80134,10 @@ rev = "6c5f33ba88ae010bf201a80ee8095e20a724558c"; sha256 = "1sncsvzjfgmhp4m8w5jd4y51k24n2jfpgvrkd64wlhhzbj3wb947"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3abc88ddbb6b8ecafa45e75ceba9a1294ad88d4/recipes/qml-mode"; sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n"; - name = "qml-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61388,20 +80145,25 @@ license = lib.licenses.free; }; }) {}; - qt-pro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + qt-pro-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "qt-pro-mode"; + ename = "qt-pro-mode"; version = "20170604.1141"; src = fetchFromGitHub { owner = "EricCrosson"; repo = "qt-pro-mode"; - rev = "66601441cc728a609765b149ee0d7dcfb74dc8bf"; - sha256 = "0azx8a7kwgn5byijgwar2rib9xv2p9w7w3yyb5bk19g3id2f8gdw"; + rev = "1e0052fcfb89c15cb47714c1546d4e8ec6e01ae6"; + sha256 = "11bwxq4nwfbnlk4clg0m8jh2xz0ldv4ggyaw645sy7hprvwkp8y4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9af710be77ccde8ffa5f22168d2c8a06b73dd6a/recipes/qt-pro-mode"; sha256 = "1k3ph9bqvvg6i6n623qrwdpsffs8w9rv9nihmlggb4w30dwqc9nf"; - name = "qt-pro-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -61409,41 +80171,24 @@ license = lib.licenses.free; }; }) {}; - quack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "quack"; - version = "20160410.207"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "quack"; - rev = "c1c8e448d295cc1b5752104a63a5759a9c5fdf6d"; - sha256 = "0vhzwr2adkprjibi3x4lnsvjxishysma7fhpwzgg28l21qjqc0nm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cb571caa41ea51ebbfe952526785287d913d2836/recipes/quack"; - sha256 = "1l7jw8sx2llbzp3sg5755qdhhyq8jdaggxzzn7icjxxrmj1ji6ii"; - name = "quack"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/quack"; - license = lib.licenses.free; - }; - }) {}; - quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + quasi-monochrome-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "quasi-monochrome-theme"; - version = "20180307.458"; + ename = "quasi-monochrome-theme"; + version = "20180516.813"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-quasi-monochrome"; - rev = "7c1217521616f568a1c9aba76cc87a7381b833a4"; - sha256 = "1yg3dg6ldlpxgsxxd15qgpda0jivj4g4cyy631hakdrp5skvpmk6"; + rev = "e803bc0c2e38f350feb8297a092812e5204781c7"; + sha256 = "0s1pqyxahkz5rrczk8m7xiqm41rjhxsyfdl2klp2l8ih13zlwf6i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme"; sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0"; - name = "quasi-monochrome-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61451,20 +80196,24 @@ license = lib.licenses.free; }; }) {}; - quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + quelpa = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "quelpa"; - version = "20180325.1338"; - src = fetchFromGitHub { - owner = "quelpa"; - repo = "quelpa"; - rev = "260bad5748dc9b02ad4d98bfef755fa9abd07af2"; - sha256 = "0g48fkc8qf9dfr61qlxw5sf0cw03mpr6zl7sn4fjglf5rlx7kdzh"; + ename = "quelpa"; + version = "20180711.1338"; + src = fetchgit { + url = "https://framagit.org/steckerhalter/quelpa.git"; + rev = "66c760b43eb6158f520df4e514f1d9c8e4ddee71"; + sha256 = "0qz5zfj24cmaw903xszf8zg4hmas6q8k6bx5c10vq45rwqkdcgva"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; - sha256 = "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs"; - name = "quelpa"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a496196d405c152600d44ef4aa28557f489c542c/recipes/quelpa"; + sha256 = "0qm4dxwlvaka6j8ismb4lhar4dzlhpvjsx6524w15ilcbdbyqqjl"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -61472,20 +80221,26 @@ license = lib.licenses.free; }; }) {}; - quelpa-use-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, quelpa, use-package }: - melpaBuild { + quelpa-use-package = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild + , quelpa + , use-package }: + melpaBuild { pname = "quelpa-use-package"; - version = "20161212.1038"; - src = fetchFromGitHub { - owner = "quelpa"; - repo = "quelpa-use-package"; - rev = "cd4820a34819516f26df0fe2e4d416bdea468e89"; - sha256 = "0wbmf0ihxldgrx43c3wiaapssn8qimcyaa3hg2x2j1q05c2qlgcg"; + ename = "quelpa-use-package"; + version = "20180617.2356"; + src = fetchgit { + url = "https://framagit.org/steckerhalter/quelpa-use-package.git"; + rev = "54ebc63607647fe4f26b56519d81e18f0e70a689"; + sha256 = "1f007lkjb42rlfsnwkj61fdqyncw4587x8a9qbhq583bfh2d3p5c"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b581e411ef5ea3954acc2cd997c87b3b86777333/recipes/quelpa-use-package"; - sha256 = "0p09w419kldgl913hgqfzyv2pck27vqq2i1xsx7g29biwgnp9hl9"; - name = "quelpa-use-package"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a496196d405c152600d44ef4aa28557f489c542c/recipes/quelpa-use-package"; + sha256 = "1rdhnv7iz9clcy68j1gqv8cwq70ip4w12179v553lyikk9icrpp8"; + name = "recipe"; }; packageRequires = [ emacs quelpa use-package ]; meta = { @@ -61493,9 +80248,13 @@ license = lib.licenses.free; }; }) {}; - quick-buffer-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + quick-buffer-switch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "quick-buffer-switch"; + ename = "quick-buffer-switch"; version = "20151007.1508"; src = fetchFromGitHub { owner = "renard"; @@ -61503,10 +80262,10 @@ rev = "d5fdd67b4c9f04b7a7122da2215e4ae076a03b1b"; sha256 = "0kh63nzdzwxksn2ar2i1ds7n96jga2dhhc9gg27p1g2ca66fs6h5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30f167afc241f3ec24c092f2f06dbabd4dd11bcc/recipes/quick-buffer-switch"; sha256 = "1fsnha3x3pgq582libb3dmxb93aagv1avnc0rigpfd7hv6bagj40"; - name = "quick-buffer-switch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61514,20 +80273,25 @@ license = lib.licenses.free; }; }) {}; - quick-peek = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + quick-peek = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "quick-peek"; - version = "20170327.27"; + ename = "quick-peek"; + version = "20180525.711"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "quick-peek"; - rev = "6a006fbf1a41b04c0e7522d50c942ec89c3637fc"; - sha256 = "06rww4a6j7wc32hvay83xcjl16aykm8hwlsh764fx9hfxxfa1fka"; + rev = "3cc57cc12f4b5f27a18cc5fb0c32c3a943c16158"; + sha256 = "0wrgdny402z95234kn86k17qn1v3sg8bfdn48y9mg52dk7wnsxvf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68f59a3048ec6196b138b6584a22ce70baa38284/recipes/quick-peek"; sha256 = "0ivg6v9c535bw2bv636wmkd4sy037j55054bfm31wvvxk99bndwq"; - name = "quick-peek"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -61535,9 +80299,13 @@ license = lib.licenses.free; }; }) {}; - quick-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + quick-preview = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "quick-preview"; + ename = "quick-preview"; version = "20150828.2139"; src = fetchFromGitHub { owner = "myuhe"; @@ -61545,10 +80313,10 @@ rev = "29c884c6ab385ef67d9aa656ebb7c94cabeb5c35"; sha256 = "1cp3z05qjy7qvjjv105ws1j9qykx8sl4s13xff0ijwvjza6ga44c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98270840568fa1fca2d92f26108444fb24609e83/recipes/quick-preview"; sha256 = "18janbmhbwb6a46fgc1sxl9ww591v60y3wgh2wqh62vdy4ix3bd9"; - name = "quick-preview"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61556,9 +80324,14 @@ license = lib.licenses.free; }; }) {}; - quick-shell-keybind = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + quick-shell-keybind = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "quick-shell-keybind"; + ename = "quick-shell-keybind"; version = "20171022.2313"; src = fetchFromGitHub { owner = "eyeinsky"; @@ -61566,10 +80339,10 @@ rev = "5f4541a5a5554d108bf16b5fd1713e962161ca1b"; sha256 = "19hqywwf80q6ay886xmcjjpr4pghkw78hzdg0mrpkpkqn2vj06gk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9bf4d78da24d88476545f97b2af0527dde73600/recipes/quick-shell-keybind"; sha256 = "1f66wk2m0yykcbq6qbalgscpq8s53qshyyqdnimlmdi0g0glif1b"; - name = "quick-shell-keybind"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -61577,9 +80350,15 @@ license = lib.licenses.free; }; }) {}; - quickref = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + quickref = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "quickref"; + ename = "quickref"; version = "20170817.532"; src = fetchFromGitHub { owner = "pd"; @@ -61587,10 +80366,10 @@ rev = "f368c8b8219bb90498c5ab84e26f00eedaa234cf"; sha256 = "0nalnfb816qk1dfxjk9j8r5lvzv2k4jf747xdjbj2mcvv07g2jd2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/quickref"; sha256 = "0jahi84ra9g7h0cvz3c02zkbkknrzgv48zq32n72lkxl958swqn1"; - name = "quickref"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -61598,9 +80377,14 @@ license = lib.licenses.free; }; }) {}; - quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + quickrun = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "quickrun"; + ename = "quickrun"; version = "20170222.1715"; src = fetchFromGitHub { owner = "syohex"; @@ -61608,10 +80392,10 @@ rev = "55bbe5d54b80206ea5a60bf2f58eb6368b2c8201"; sha256 = "1skbd5q99d9rwfi954r9p7b7nhwcfijq30z0fpdhbi1iiabf7vqz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy"; - name = "quickrun"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -61619,9 +80403,13 @@ license = lib.licenses.free; }; }) {}; - quiet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + quiet = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "quiet"; + ename = "quiet"; version = "20160508.556"; src = fetchFromGitHub { owner = "zzkt"; @@ -61629,10 +80417,10 @@ rev = "6f20309f99e26fcae2601d1544b342f044e54baf"; sha256 = "14q7x341gqcxn3bq72wmfxipqmj2dh35kxcrwjkyghbsbd43rv8n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/443425d9e4412a1e3e8117f97c255c8420223542/recipes/quiet"; sha256 = "1jq65jpx0rlkc0dzy55gs37ybpjzvcv06ahwiw1lk2n92g4pi96a"; - name = "quiet"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61640,20 +80428,26 @@ license = lib.licenses.free; }; }) {}; - quiz = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + quiz = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "quiz"; + ename = "quiz"; version = "20170818.415"; src = fetchFromGitHub { owner = "davep"; repo = "quiz.el"; - rev = "c43151212ead2330e7ec8e5ac6914c617a12e4f8"; - sha256 = "09r3p6gw17xrsm0pk6yv4lg8i3yf03yx2mlj4mi9i0r765m01c27"; + rev = "b7c8fc14ebad50ca170c40e4ecb07b7f49f054ba"; + sha256 = "1kxivd572ww5c6m7d3183ikiyrgvmvhbs8kkyhpc9y3y8ziaid1x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz"; sha256 = "0pcjfhk109ifi834jw8lndwhpfcv764wym1dhiqhp5qd2vf431kg"; - name = "quiz"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -61661,20 +80455,26 @@ license = lib.licenses.free; }; }) {}; - r-autoyas = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + r-autoyas = callPackage ({ ess + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "r-autoyas"; + ename = "r-autoyas"; version = "20140101.710"; src = fetchFromGitHub { owner = "mattfidler"; repo = "r-autoyas.el"; - rev = "b4020ee7f5f895e0065b8b26da8a49c51432d530"; - sha256 = "0dhljmdlg4p832w9s7rp8vznkpjkwpg8k9hj95cn2h76c0afwz3j"; + rev = "d321a7da0ef2e94668d53e0807277da7b70ea678"; + sha256 = "1m4iwza0dvwzqfapwpsrbphgnxbv5vhw8ar332pj8i16vh3h0fry"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a095d3a687055c6ac43a4338826542d14a25127/recipes/r-autoyas"; sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4"; - name = "r-autoyas"; + name = "recipe"; }; packageRequires = [ ess yasnippet ]; meta = { @@ -61682,20 +80482,30 @@ license = lib.licenses.free; }; }) {}; - racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, rust-mode, s }: - melpaBuild { + racer = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pos-tip + , rust-mode + , s }: + melpaBuild { pname = "racer"; - version = "20171211.1548"; + ename = "racer"; + version = "20180708.2325"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "cb74060bbaff8e505ba36e20e4a3a763ee7dd4c8"; - sha256 = "1azhvwm42sracyg9vj51k72pq3mm2gfimdvrbz50p5ijmirmllja"; + rev = "dd7f179efbab6597eb7eb1d66883f168b3dc5573"; + sha256 = "0drawn72lg6xxzg85909gfgrckh641m70gzqzrabcdqizfcxm5pk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi"; - name = "racer"; + name = "recipe"; }; packageRequires = [ dash emacs f pos-tip rust-mode s ]; meta = { @@ -61703,20 +80513,27 @@ license = lib.licenses.free; }; }) {}; - racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + racket-mode = callPackage ({ emacs + , faceup + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "racket-mode"; - version = "20180313.719"; + ename = "racket-mode"; + version = "20180719.854"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "62c40b5a166f3d15d4ab82f5ccc0bbbd0fe90334"; - sha256 = "0v3myl2sfpk8b4n9xsnpwn37f7bzxyh99lm3ya1qj8p3qvmqszgv"; + rev = "0f75097771a8ad9b9356c915ba877353aff1e7f6"; + sha256 = "0ms31sjxxww93j0f731ww7yj3adl2scpr3m1zx4w5094mi69babg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; sha256 = "04sr55zrgwyi48sj4ssm4rmm327yxs7hvjhxclnkhaaigrmrv7jb"; - name = "racket-mode"; + name = "recipe"; }; packageRequires = [ emacs faceup s ]; meta = { @@ -61724,9 +80541,13 @@ license = lib.licenses.free; }; }) {}; - rails-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rails-log-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rails-log-mode"; + ename = "rails-log-mode"; version = "20140407.2125"; src = fetchFromGitHub { owner = "ananthakumaran"; @@ -61734,10 +80555,10 @@ rev = "ff440003ad7d47cb0ac3300f2a632f4cfd36a446"; sha256 = "1fh8wsb0pa2isr1kgh3v9zmmxq1nlmqwqk4z34dw5wpaiyihmk84"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ebbf4364759c8e38d550e66fd0ce193f4214e15/recipes/rails-log-mode"; sha256 = "0h7gfg0c5pwfh18qzg1mx7an9p958ygdfqb54s85mbkv8x3rh1a0"; - name = "rails-log-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61745,9 +80566,13 @@ license = lib.licenses.free; }; }) {}; - railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + railscasts-reloaded-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "railscasts-reloaded-theme"; + ename = "railscasts-reloaded-theme"; version = "20180131.2246"; src = fetchFromGitHub { owner = "thegeorgeous"; @@ -61755,10 +80580,10 @@ rev = "6312f01470dcc73537dbdaaccabd59c4d18d23a9"; sha256 = "1fqpqgkpn36kj3fb4na0w4cjwln05rvy6w1q5czas8z37rk2bs33"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; sha256 = "1iy30mnm3s7p7qigrm3lvv7xjgwvinwg6yg0hry2aifwn88cnwmz"; - name = "railscasts-reloaded-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61766,9 +80591,13 @@ license = lib.licenses.free; }; }) {}; - railscasts-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + railscasts-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "railscasts-theme"; + ename = "railscasts-theme"; version = "20150219.725"; src = fetchFromGitHub { owner = "mikenichols"; @@ -61776,10 +80605,10 @@ rev = "1340c3f6c2717761cab95617cf8dcbd962b1095b"; sha256 = "021x1l5kzsbm0qj5a3bngxa7ickm4lbwsdz81a2ks9pi1ivmw205"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0366a9844f6c28dfc3d5ba26201865921981574/recipes/railscasts-theme"; sha256 = "1z5m8ccx2k18gbzqvg0051mp2myy2qncf4xvv47k80f83pk2hw6r"; - name = "railscasts-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61787,9 +80616,13 @@ license = lib.licenses.free; }; }) {}; - rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rainbow-blocks = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rainbow-blocks"; + ename = "rainbow-blocks"; version = "20171025.738"; src = fetchFromGitHub { owner = "istib"; @@ -61797,10 +80630,10 @@ rev = "dd435d7bb34ff6f162a5f315df308b90b7e9f842"; sha256 = "06yfb3i7wzvqrhkb61zib9xvpb5i00s4frizkzff66im05k0n795"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks"; sha256 = "1zf1z1hnp8q0s9za7nnpq83isbpmz26l8hxafz0h0b5dz1w2vlvs"; - name = "rainbow-blocks"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61808,9 +80641,13 @@ license = lib.licenses.free; }; }) {}; - rainbow-delimiters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rainbow-delimiters = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rainbow-delimiters"; + ename = "rainbow-delimiters"; version = "20170929.432"; src = fetchFromGitHub { owner = "Fanael"; @@ -61818,10 +80655,10 @@ rev = "19b93892afa0494ba749c2ca9c154e04447ad778"; sha256 = "0c2a8pbhzzy0bxx8gxz320r106k69hvwkn43j06i6sidbgjwh786"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2cf11dbff76f0e3581b865f48bb44a307aa7f23/recipes/rainbow-delimiters"; sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg"; - name = "rainbow-delimiters"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61829,9 +80666,14 @@ license = lib.licenses.free; }; }) {}; - rainbow-identifiers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rainbow-identifiers = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rainbow-identifiers"; + ename = "rainbow-identifiers"; version = "20141102.726"; src = fetchFromGitHub { owner = "Fanael"; @@ -61839,10 +80681,10 @@ rev = "19fbfded1baa98d12335f26f6d7b20e5ae44ce2e"; sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/975aadd9fe1faf9ad617ba6200ca77185b87e7c0/recipes/rainbow-identifiers"; sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp"; - name = "rainbow-identifiers"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -61850,9 +80692,16 @@ license = lib.licenses.free; }; }) {}; - rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rake = callPackage ({ cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rake"; + ename = "rake"; version = "20180212.208"; src = fetchFromGitHub { owner = "asok"; @@ -61860,10 +80709,10 @@ rev = "9c204334b03b4e899fadae6e59c20cf105404128"; sha256 = "09k2fqkmqr6g19rvqr5x2kpj1cn3wkncxg50hz02vmsrbgmzmnja"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake"; sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns"; - name = "rake"; + name = "recipe"; }; packageRequires = [ cl-lib dash f ]; meta = { @@ -61871,9 +80720,14 @@ license = lib.licenses.free; }; }) {}; - rally-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: - melpaBuild { + rally-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popwin }: + melpaBuild { pname = "rally-mode"; + ename = "rally-mode"; version = "20161113.1954"; src = fetchFromGitHub { owner = "seanleblanc"; @@ -61881,10 +80735,10 @@ rev = "0f5e09a6abe2de7613f174b4f54863df93343134"; sha256 = "1vrsv8ph1v853ii0i3q889xlwxnjdqz4bs3ipi502rjx6g7y5gdz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0914825c6d5ad26d2a8035fc33ad98df42df3c53/recipes/rally-mode"; sha256 = "1vzsh5855bzln3p3235yccl2azpndpc4rh95zrx6p1k62h2kv0y1"; - name = "rally-mode"; + name = "recipe"; }; packageRequires = [ popwin ]; meta = { @@ -61892,9 +80746,14 @@ license = lib.licenses.free; }; }) {}; - rand-theme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rand-theme = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rand-theme"; + ename = "rand-theme"; version = "20151219.1535"; src = fetchFromGitHub { owner = "gopar"; @@ -61902,10 +80761,10 @@ rev = "65a00e5c5150f857aa96803b68f50bc8da0215b7"; sha256 = "0fmajgqf9j21qn7h35sky5di8cnma432g0ki9d5m41byxp9y1bdl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rand-theme"; sha256 = "0c2xs99jgrhk6f1s6pls8pigg6qwcr4imnwdlngwzr0jz8jhqvxa"; - name = "rand-theme"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -61913,20 +80772,24 @@ license = lib.licenses.free; }; }) {}; - random-splash-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + random-splash-image = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "random-splash-image"; + ename = "random-splash-image"; version = "20151002.1830"; src = fetchFromGitHub { owner = "kakakaya"; repo = "random-splash-image"; - rev = "53a39ebfd8ac6be066a652a508a717870f94218a"; - sha256 = "1mky9xhghzz34sswqm2v3jhfc25fdrjx4hh4a1hs4h45g1v58lm9"; + rev = "907e2db5ceff781ac7f4dbdd65fe71736c36aa22"; + sha256 = "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bfbfe83143299b86f867c4d7faf6a0d7a070e1e/recipes/random-splash-image"; sha256 = "1j454jy4ia2wrgi3fxzjfdqi3z8x13hq8kh62lnb84whs7a1nhik"; - name = "random-splash-image"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61934,9 +80797,14 @@ license = lib.licenses.free; }; }) {}; - ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ranger = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ranger"; + ename = "ranger"; version = "20170817.857"; src = fetchFromGitHub { owner = "ralesi"; @@ -61944,10 +80812,10 @@ rev = "6bbff5df2e55f56047fca5058d9ca93ba4963aef"; sha256 = "000dqqy5fbic8rwyndchj5pjmzad2yfa7z3xzi84dla6vhv15q6p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger"; sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4"; - name = "ranger"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -61955,9 +80823,13 @@ license = lib.licenses.free; }; }) {}; - rase = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rase = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rase"; + ename = "rase"; version = "20120928.1345"; src = fetchFromGitHub { owner = "m00natic"; @@ -61965,10 +80837,10 @@ rev = "59b5f7e8102570b65040e8d55781c7ea28de7338"; sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/334419debe065c34665bb0207574d1d4dfb9e8ae/recipes/rase"; sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0"; - name = "rase"; + name = "recipe"; }; packageRequires = []; meta = { @@ -61976,9 +80848,16 @@ license = lib.licenses.free; }; }) {}; - rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: - melpaBuild { + rats = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild + , s }: + melpaBuild { pname = "rats"; + ename = "rats"; version = "20170818.313"; src = fetchFromGitHub { owner = "ane"; @@ -61986,10 +80865,10 @@ rev = "a6d55aebcc54f669c6c6ffedf84364c4097903cc"; sha256 = "0cskw05jb7wckhfs2qs9pn5icxa93ay2mw2i1brsmdd0igz34lg3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a62cbae1b2d9af2322bb6a27949de8c8bfddc2b7/recipes/rats"; sha256 = "0jhwiq9yzwpyqhk3c32vqx8nryingzh58psxbzjl3812b7xdqphr"; - name = "rats"; + name = "recipe"; }; packageRequires = [ cl-lib go-mode s ]; meta = { @@ -61997,9 +80876,13 @@ license = lib.licenses.free; }; }) {}; - rbenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rbenv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rbenv"; + ename = "rbenv"; version = "20141119.2349"; src = fetchFromGitHub { owner = "senny"; @@ -62007,10 +80890,10 @@ rev = "2ea1a5bdc1266caef1dd77700f2c8f42429b03f1"; sha256 = "0yd0rs6fnc6lsfi7pivw5sivh698055r8ifj9vrxb82dcx2y6v2h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rbenv"; sha256 = "1skh1v8dgwl1f9m3pmy2s3rnzp8n3cydi3579fgjv4mzi81k3d5q"; - name = "rbenv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62018,9 +80901,15 @@ license = lib.licenses.free; }; }) {}; - rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild, popup }: - melpaBuild { + rbt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild + , popup }: + melpaBuild { pname = "rbt"; + ename = "rbt"; version = "20170202.1502"; src = fetchFromGitHub { owner = "joeheyming"; @@ -62028,10 +80917,10 @@ rev = "32bfba9062a014e375451cf4203c29535b5efc1e"; sha256 = "0jzhyf42m9gqcnsz9gxc9wk8bbb9a7fj78swwyj0wqn9jm8jxbra"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7241985be1e8a26a454b8136a537040b7ae801/recipes/rbt"; sha256 = "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm"; - name = "rbt"; + name = "recipe"; }; packageRequires = [ magit popup ]; meta = { @@ -62039,9 +80928,13 @@ license = lib.licenses.free; }; }) {}; - rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rc-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rc-mode"; + ename = "rc-mode"; version = "20160913.1218"; src = fetchFromGitHub { owner = "mrhmouse"; @@ -62049,10 +80942,10 @@ rev = "fe2e0570bf9c19a292e16b18fd4b0a256df5d93f"; sha256 = "0skjg3l3ss8nlrpnpjjflmf7wjib4jfarkmx4438nc6vm6553fmn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode"; sha256 = "0p77mckw8jyxcwspj1ffm8mz0k01ddm67hh9j8rw812wddwnj7qf"; - name = "rc-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62060,9 +80953,13 @@ license = lib.licenses.free; }; }) {}; - rcirc-alert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rcirc-alert = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rcirc-alert"; + ename = "rcirc-alert"; version = "20141127.247"; src = fetchFromGitHub { owner = "csantosb"; @@ -62070,10 +80967,10 @@ rev = "0adf8ff9c47023fec578f678424be62b0f49057f"; sha256 = "0xdyrp0zs2v2glpfwlajmj97wygwi0y492zbp6rp3caa5bj3j4z2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/735aa2256660efffdaf6ecbd61a3e2818a48327f/recipes/rcirc-alert"; sha256 = "0lyd3gz1sflp93xb7xbvk1gh69w468ync1p144avyh2pybl40q4a"; - name = "rcirc-alert"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62081,9 +80978,14 @@ license = lib.licenses.free; }; }) {}; - rcirc-alertify = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rcirc-alertify = callPackage ({ alert + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rcirc-alertify"; + ename = "rcirc-alertify"; version = "20140406.1819"; src = fetchFromGitHub { owner = "fgallina"; @@ -62091,10 +80993,10 @@ rev = "ea5cafc55893f375eccbe013d12dbaa94bf6e259"; sha256 = "1mpk5rzsil298q3ppv5v9jrn274v71jffyz0jihrksh1wbjzwhlx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1559b0e19e571c83c25ac7104e269ebc42d8f14/recipes/rcirc-alertify"; sha256 = "13448bykmy0jqcajhn2gjiar3m8cingyr8394vxybp2m1zvv0pws"; - name = "rcirc-alertify"; + name = "recipe"; }; packageRequires = [ alert ]; meta = { @@ -62102,9 +81004,13 @@ license = lib.licenses.free; }; }) {}; - rcirc-groups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rcirc-groups = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rcirc-groups"; + ename = "rcirc-groups"; version = "20170731.1401"; src = fetchFromGitHub { owner = "dimitri"; @@ -62112,10 +81018,10 @@ rev = "b68ece9d219b909244d4e3c0d8bf6a746d6fead7"; sha256 = "196x3qg22rhh917diml1q0hszqrqwg0klzp96q1c7c744mlq82fx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35b9c9e877c686df0ac9f96855d733a240063829/recipes/rcirc-groups"; sha256 = "1iws3f8vkwrflcj6ni8nmf1wcw1jrlnssm76kzzhag77ry3iswgx"; - name = "rcirc-groups"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62123,9 +81029,13 @@ license = lib.licenses.free; }; }) {}; - rcirc-notify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rcirc-notify = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rcirc-notify"; + ename = "rcirc-notify"; version = "20150219.1404"; src = fetchFromGitHub { owner = "nicferrier"; @@ -62133,10 +81043,10 @@ rev = "841a7b5a6cdb0c11a812df924d2c6a7d364fd455"; sha256 = "1k4knsrca626pikgaalqbqwy7im4wz1vrmzzhdrdb4lhdz6sq3q3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/009e2db47c9fe730fff1dc807e52c86b3ab26446/recipes/rcirc-notify"; sha256 = "0mwhzkbzhpq4jws05p7qp0kbay8kcblb9xikznm0i8drpdyc617v"; - name = "rcirc-notify"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62144,9 +81054,14 @@ license = lib.licenses.free; }; }) {}; - rcirc-styles = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rcirc-styles = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rcirc-styles"; + ename = "rcirc-styles"; version = "20160206.1850"; src = fetchFromGitHub { owner = "aaron-em"; @@ -62154,10 +81069,10 @@ rev = "f313bf6a7470bed314b27c7a40558cb787d7bc67"; sha256 = "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10771a996c8a9dc1eb211cddff53db7b2b01e00b/recipes/rcirc-styles"; sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r"; - name = "rcirc-styles"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -62165,9 +81080,13 @@ license = lib.licenses.free; }; }) {}; - rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rdf-prefix = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rdf-prefix"; + ename = "rdf-prefix"; version = "20180127.1006"; src = fetchFromGitHub { owner = "simenheg"; @@ -62175,10 +81094,10 @@ rev = "164136d05505275d42d1ca3a390f55fcc89694b8"; sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm"; - name = "rdf-prefix"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62186,9 +81105,13 @@ license = lib.licenses.free; }; }) {}; - rdp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rdp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rdp"; + ename = "rdp"; version = "20120928.1854"; src = fetchFromGitHub { owner = "skeeto"; @@ -62196,10 +81119,10 @@ rev = "b620192afada04aec33b38cc130fef0765f41ca9"; sha256 = "08l96bhghmnckar4i6afj9csqglasmpmby1r7j38ic9bp37z2yqd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2dd8ef80d344c9801f7d0a26b0e3ea33a53bf89/recipes/rdp"; sha256 = "0lj3idwv4fxz8pi8mnxkbhwhzaa1gs6ib4nzly3fc6yiix9ampkz"; - name = "rdp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62207,9 +81130,13 @@ license = lib.licenses.free; }; }) {}; - rdxmk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rdxmk = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rdxmk"; + ename = "rdxmk"; version = "20170629.1834"; src = fetchFromGitHub { owner = "jsalzbergedu"; @@ -62217,10 +81144,10 @@ rev = "e78749fb29738365ffa4d863ffabeb969ebb0bcf"; sha256 = "0gwlqjk84ih89c2ckx0rrw07jgwd32wfwj4mibchdrn0ai891md0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db54339795e0519f154328e54d47a7a0c80afc71/recipes/rdxmk"; sha256 = "14iavsgqp28y2ykgly8x69sny34r32dl4bpb47m921vk5n4y6zky"; - name = "rdxmk"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62228,9 +81155,14 @@ license = lib.licenses.free; }; }) {}; - react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + react-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "react-snippets"; + ename = "react-snippets"; version = "20170803.1550"; src = fetchFromGitHub { owner = "johnmastro"; @@ -62238,10 +81170,10 @@ rev = "bfc4b68b81374a6a080240592641091a7e8a6d61"; sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets"; sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73"; - name = "react-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -62249,20 +81181,25 @@ license = lib.licenses.free; }; }) {}; - read-aloud = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + read-aloud = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "read-aloud"; + ename = "read-aloud"; version = "20160922.2200"; src = fetchFromGitHub { owner = "gromnitsky"; repo = "read-aloud.el"; - rev = "c662366226abfb07204ab442b4f853ed85438d8a"; - sha256 = "0wmfjbk3s45wj8j6xwfdldxwkrxsfcby2a242r2p88y3f8pp30i1"; + rev = "d5f80ab72054a957aed25224639c1779cae5f4d1"; + sha256 = "1hbb6diz96jabajxrnancjfpyd9div8vzbwys1f5bddi9z8l2jyy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20452bf3112276a7e1c880bfab259150fc70b47a/recipes/read-aloud"; sha256 = "01fd87k50x71w8qypbi7llgyc1xnmyxifxh4ni9pgbx2ryn72lzv"; - name = "read-aloud"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -62270,20 +81207,27 @@ license = lib.licenses.free; }; }) {}; - readability = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth, ov }: - melpaBuild { + readability = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , oauth + , ov }: + melpaBuild { pname = "readability"; + ename = "readability"; version = "20140715.1727"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "emacs-readability"; - rev = "6c220ab8e0ca63946574ed892add5c8fd14002ce"; - sha256 = "0kg18ybgwcxhv5fiya5d3wn5w9si4914q946gjannk67d6jcq08g"; + rev = "3329d7c77d010c8fa92215cd2b7cd891eb2f68c7"; + sha256 = "0s226fqhc9y1s49l5y01mlxxz3ah4k3payy4jdgnd8r03rb3gia7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eed9bcb1aa238746c9a9f6ecba9dd61b83d8b612/recipes/readability"; sha256 = "0kg91ma9k3p5ps467jjz2lw13rv1l8ivwc3zpg6c1rl474ds0qqv"; - name = "readability"; + name = "recipe"; }; packageRequires = [ emacs oauth ov ]; meta = { @@ -62291,9 +81235,13 @@ license = lib.licenses.free; }; }) {}; - readline-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + readline-complete = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "readline-complete"; + ename = "readline-complete"; version = "20150708.737"; src = fetchFromGitHub { owner = "monsanto"; @@ -62301,10 +81249,10 @@ rev = "30c020c37b2741160cc37e656e13c85d826a0ebf"; sha256 = "1j5b5xapflwzh8a297gva0l12ralwa9vl5z3bb75c9ksjkhi4nm6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cf3b56dae7669b34df9d2abe2d78164cbf064c9/recipes/readline-complete"; sha256 = "1qymk5ypv6ljk8x49z4jcifz7c2dqcg5181f4hqh67g1byvj2277"; - name = "readline-complete"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62312,9 +81260,13 @@ license = lib.licenses.free; }; }) {}; - real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + real-auto-save = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "real-auto-save"; + ename = "real-auto-save"; version = "20180107.1850"; src = fetchFromGitHub { owner = "chillaranand"; @@ -62322,10 +81274,10 @@ rev = "d813632c1e754539cc92953ac4c3609105f9af58"; sha256 = "0gz0w7zxl865shz9mf5xv8xi5mjq969600jqh4laazvhyk32skmg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save"; sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8"; - name = "real-auto-save"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62333,20 +81285,29 @@ license = lib.licenses.free; }; }) {}; - realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: - melpaBuild { + realgud = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , load-relative + , loc-changes + , melpaBuild + , test-simple }: + melpaBuild { pname = "realgud"; - version = "20180327.1634"; + ename = "realgud"; + version = "20180710.1953"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "096bd8732ea0661f10d7f7c1c91ad1ca4cf51207"; - sha256 = "1mjbhnzq4j7pfapmxqhy6lx3f6py2wbj2xrri16npmn1qqmkmbjp"; + rev = "da2a74b50a770a2c1166656a05ba9d132a2a5c73"; + sha256 = "0w5lbwjaraw11sj36a9hsywa187g97hnvksrd6wbf8prbfwhghlx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15"; - name = "realgud"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -62360,9 +81321,16 @@ license = lib.licenses.free; }; }) {}; - realgud-byebug = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: - melpaBuild { + realgud-byebug = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , realgud }: + melpaBuild { pname = "realgud-byebug"; + ename = "realgud-byebug"; version = "20180308.1923"; src = fetchFromGitHub { owner = "rocky"; @@ -62370,10 +81338,10 @@ rev = "de603d58aa9ef72a2619247a0234fccf6bc2cc9a"; sha256 = "1hk2z7axy1v5yvx4xgkisfk00varq5rf8j88f0l63ywylyw1fwhl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-byebug"; sha256 = "1m4pqnvnnfzq7b9bv5fkz70pifklddwqrwbwnrfyiawx9vdgrpz9"; - name = "realgud-byebug"; + name = "recipe"; }; packageRequires = [ cl-lib emacs realgud ]; meta = { @@ -62381,9 +81349,16 @@ license = lib.licenses.free; }; }) {}; - realgud-old-debuggers = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: - melpaBuild { + realgud-old-debuggers = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , realgud }: + melpaBuild { pname = "realgud-old-debuggers"; + ename = "realgud-old-debuggers"; version = "20170316.31"; src = fetchFromGitHub { owner = "rocky"; @@ -62391,10 +81366,10 @@ rev = "1e1d573a6ba731afbe68c1309a316457ca3fbb94"; sha256 = "1gk8k9lqbvqq4ngw0ffp3sqhkaj23n54m3ndh2ba9gvlmx7mxm7g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/260b4d5a85c380dda0f7bb0370e3ffa8cc3c0275/recipes/realgud-old-debuggers"; sha256 = "0iwi1byfwcpviaizdw9wzdcjlbk35ql4wfzj0ynh331g0hmibhs9"; - name = "realgud-old-debuggers"; + name = "recipe"; }; packageRequires = [ cl-lib emacs realgud ]; meta = { @@ -62402,20 +81377,27 @@ license = lib.licenses.free; }; }) {}; - realgud-pry = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: - melpaBuild { + realgud-pry = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , realgud }: + melpaBuild { pname = "realgud-pry"; + ename = "realgud-pry"; version = "20160805.745"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-pry"; - rev = "9b3834048fcbc16827c55af38f8cfef0cf6533da"; - sha256 = "1kpy2ym29mnr89c7im27hhbpww7dgblw6w731ayrlg8rlvqzh7ln"; + rev = "fca36075a223f6a4a643764199babe3d1dfde2ac"; + sha256 = "08jnav5v5q1mwgk9x100magm3jcprzfhmx8z6x8vcmp7xf79n1pp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-pry"; sha256 = "1p5ijig5rczndcykllq0vy6w4askwl0yd8b5fqg7yl5yx45r8xgs"; - name = "realgud-pry"; + name = "recipe"; }; packageRequires = [ cl-lib emacs realgud ]; meta = { @@ -62423,20 +81405,25 @@ license = lib.licenses.free; }; }) {}; - realgud-rdb2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: - melpaBuild { + realgud-rdb2 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , realgud }: + melpaBuild { pname = "realgud-rdb2"; + ename = "realgud-rdb2"; version = "20160303.43"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-ruby-debugger2"; - rev = "b394bee61e75b7c6a5fa565594aa79b74887f5df"; - sha256 = "17lspprzaxv6lmwxgqr0vazkvh6dm2cpqs5yildczlr843k90vv5"; + rev = "e63eeed131517a9e8225f972c9f6c975c8121e41"; + sha256 = "0skaw5fzvqk56mfk3ciy9n85vznq1sxv6w575v3jd80w2dns4yay"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-rdb2"; sha256 = "0wqvgb3h2b0ys76sq2z462cjv0fajqc41f7wqvf53wfcs2zw4l9y"; - name = "realgud-rdb2"; + name = "recipe"; }; packageRequires = [ realgud ]; meta = { @@ -62444,20 +81431,25 @@ license = lib.licenses.free; }; }) {}; - reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + reason-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "reason-mode"; - version = "20171027.2235"; + ename = "reason-mode"; + version = "20180722.437"; src = fetchFromGitHub { owner = "reasonml-editor"; repo = "reason-mode"; - rev = "a9de59cced37b44db72ee248107021a660561d11"; - sha256 = "04g3598ykczxkmj5gjd4airfl41b821agy6r4h2bnq5fcfdj0jnx"; + rev = "5777cce583039df82a49c6fc8b57c99f127b2565"; + sha256 = "0baxdq02i0lwk2ll3jddfz5w1paq496vd3if2p7vfipgf79y0n8g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode"; sha256 = "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr"; - name = "reason-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -62465,9 +81457,14 @@ license = lib.licenses.free; }; }) {}; - rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rebecca-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rebecca-theme"; + ename = "rebecca-theme"; version = "20180324.121"; src = fetchFromGitHub { owner = "vic"; @@ -62475,10 +81472,10 @@ rev = "1fe3662d1b02caea96e9a780252b2c45f7a49b1d"; sha256 = "0qcfnc9slhm4y2bpld0ckbv3wijr9y7h6555sy23z3dlmz7xs1wm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; sha256 = "1m72jqyqx18i1vpj07v3vkbi0di9dks5sz46wb2h0f23xqyx00md"; - name = "rebecca-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -62486,9 +81483,13 @@ license = lib.licenses.free; }; }) {}; - rebox2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rebox2 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rebox2"; + ename = "rebox2"; version = "20121113.500"; src = fetchFromGitHub { owner = "lewang"; @@ -62496,10 +81497,10 @@ rev = "00634eca420cc48657b81e40e599ff8548083985"; sha256 = "1xh9nxqfg9abcl41ni69rnwjfgyfr0pbl55dzyxsbh6sb36r3h8z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9132290886694bd551681e32af26e9f4ebae57/recipes/rebox2"; sha256 = "06ra50afjqac9ck1s9gaxy0sqxcb612wzd28s4q4imicqpgfxzjw"; - name = "rebox2"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62507,9 +81508,13 @@ license = lib.licenses.free; }; }) {}; - recentf-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + recentf-ext = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "recentf-ext"; + ename = "recentf-ext"; version = "20170925.1735"; src = fetchFromGitHub { owner = "rubikitch"; @@ -62517,10 +81522,10 @@ rev = "450de5f8544ed6414e88d4924d7daa5caa55b7fe"; sha256 = "1jylpqgngbl594a1qvd305m9lda48cib4dsasimdqxp20d4c56iy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/recentf-ext"; sha256 = "122kns45l75cdwxbfjznks3kvm5jc89ik714ij2qx14qyik0xmni"; - name = "recentf-ext"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62528,9 +81533,14 @@ license = lib.licenses.free; }; }) {}; - recentf-remove-sudo-tramp-prefix = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + recentf-remove-sudo-tramp-prefix = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "recentf-remove-sudo-tramp-prefix"; + ename = "recentf-remove-sudo-tramp-prefix"; version = "20180204.2156"; src = fetchFromGitHub { owner = "ncaq"; @@ -62538,10 +81548,10 @@ rev = "6d23ebc3f52b0a66236c171c45cc77a4d3aba541"; sha256 = "0rzs9fmy1iqips6px0v57wnplbxmm3sbnk6xcszwhkwwp563hk32"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0bf1761715ee4917ba0823adbda03859d5b8131a/recipes/recentf-remove-sudo-tramp-prefix"; sha256 = "01kdpx7kqd39a5hjym5plcj5d8szzghigq9mq186mggayg8q44cr"; - name = "recentf-remove-sudo-tramp-prefix"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -62549,9 +81559,15 @@ license = lib.licenses.free; }; }) {}; - recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + recompile-on-save = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "recompile-on-save"; + ename = "recompile-on-save"; version = "20151126.646"; src = fetchFromGitHub { owner = "maio"; @@ -62559,10 +81575,10 @@ rev = "92e11446869d878803d4f3dec5d2101380c12bb2"; sha256 = "0wk28blnfks987iby0p3qpd4nxnz6sqn4fx8g59gyddjhav51lri"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77805a854da76b105bd7589fd0960b1ef8868b8b/recipes/recompile-on-save"; sha256 = "0bg2p7pk4jlpqc7lg48mxd6zkwnx15r0r7lmsxgx9dv1ilfwrmgn"; - name = "recompile-on-save"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -62570,9 +81586,13 @@ license = lib.licenses.free; }; }) {}; - recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + recover-buffers = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "recover-buffers"; + ename = "recover-buffers"; version = "20171008.2137"; src = fetchFromGitHub { owner = "tripleee"; @@ -62580,10 +81600,10 @@ rev = "81a5cb53099955ebc2a411a44cba5a394ee3f2d1"; sha256 = "07dfdvz5rn5l13xdycd7h75zaq0pw2afb9n1yiq01fqk6gvrhc5b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/43b33cfb794c35de78fde6eabb71ffe01049d23d/recipes/recover-buffers"; sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b"; - name = "recover-buffers"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62591,9 +81611,13 @@ license = lib.licenses.free; }; }) {}; - rect-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rect-plus = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rect-plus"; + ename = "rect+"; version = "20150620.1744"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -62601,10 +81625,10 @@ rev = "299b742faa0bc4448e0d5fe9cb98ab1eb93b8dcc"; sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8c1cd81f0e764a7cfc2f3f96574898ff414beb4/recipes/rect+"; sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m"; - name = "rect-plus"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62612,9 +81636,15 @@ license = lib.licenses.free; }; }) {}; - rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rectangle-utils = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rectangle-utils"; + ename = "rectangle-utils"; version = "20160914.2108"; src = fetchFromGitHub { owner = "thierryvolpiatto"; @@ -62622,10 +81652,10 @@ rev = "6fe38fdd48ef5305a908b94a043a966ac3f2053a"; sha256 = "08n3ah40gfgkbriwj2z3y0751vpvgz86qjdn6dxs4mghjrwr2545"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1852b75c82822e97c39b7c7caeb2a32246171be4/recipes/rectangle-utils"; sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7"; - name = "rectangle-utils"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -62633,9 +81663,13 @@ license = lib.licenses.free; }; }) {}; - recursive-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + recursive-narrow = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "recursive-narrow"; + ename = "recursive-narrow"; version = "20140902.1027"; src = fetchFromGitHub { owner = "nflath"; @@ -62643,10 +81677,10 @@ rev = "bc0cab88234ca92640d4b8da0d83e132c1897922"; sha256 = "1mj7lyadzn3bwig3f9zariq5z4fg6liqnjvfd34yx88xc52nwf33"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/recursive-narrow"; sha256 = "15pzwxzyc3dl81v27gk7a4866cxbhzpmmcmfi9n4vrrxmf61h905"; - name = "recursive-narrow"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62654,9 +81688,15 @@ license = lib.licenses.free; }; }) {}; - redis = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + redis = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "redis"; + ename = "redis"; version = "20150531.1248"; src = fetchFromGitHub { owner = "emacs-pe"; @@ -62664,10 +81704,10 @@ rev = "2c33f3397bc14e7a8192867b55920492d4eead8c"; sha256 = "1rjpf23a8rggjmmxvm1997d3xz03kz84xams486b9ky0n2v02d57"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fbb970956ee19d812c17900f3c01c5fee0c3f2/recipes/redis"; sha256 = "1awnilb8bk0izp6yw0187ybh9slf1hc51014xvvmj90darxby79a"; - name = "redis"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -62675,9 +81715,16 @@ license = lib.licenses.free; }; }) {}; - redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + redpen-paragraph = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "redpen-paragraph"; + ename = "redpen-paragraph"; version = "20160625.350"; src = fetchFromGitHub { owner = "karronoli"; @@ -62685,10 +81732,10 @@ rev = "770ffb34b04bfa0ea8484fa1506e96c530168e13"; sha256 = "0cqln3d8yp9fdam984bwnngjl0hjnwi7yhcggdkjwribhr79cxhl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e6b187bfc14f3affbe2d8d1cb854abe69deb15b/recipes/redpen-paragraph"; sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca"; - name = "redpen-paragraph"; + name = "recipe"; }; packageRequires = [ cl-lib emacs json ]; meta = { @@ -62696,20 +81743,25 @@ license = lib.licenses.free; }; }) {}; - redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + redprl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "redprl"; - version = "20180320.1312"; + ename = "redprl"; + version = "20180418.734"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "c28a1d98dcb4f766e19ba7ce78824ca57d022a7b"; - sha256 = "1kr6j75b428xr1pqy1ad0gqahh5dj5zh4pddc6rymr969yai02z0"; + rev = "4abdbdeda4604ff30ce19c0df3f43e34faf60bd7"; + sha256 = "0m6ck4x16b9qnd33dcw5zvygwgcqzwqydrvcw0gfyfypfcw13qwb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; sha256 = "1zinzs3vzf2alsnxf5k71i7lp90fm26wv4y20ci52n0hnh5nz861"; - name = "redprl"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -62717,9 +81769,14 @@ license = lib.licenses.free; }; }) {}; - redshank = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: - melpaBuild { + redshank = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , paredit }: + melpaBuild { pname = "redshank"; + ename = "redshank"; version = "20180128.1348"; src = fetchFromGitHub { owner = "emacsattic"; @@ -62727,10 +81784,10 @@ rev = "f3eef7d4891570e6bcb74eb52c73edb765a639b8"; sha256 = "00mihmjd0amr9wzb3qsz69bp7y5iqx9vvh1hg77i57zlm88x6ma6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2677a5cf74ebace6510517f47eaa43b35f736683/recipes/redshank"; sha256 = "0p18rkn09qb4ssr6jix13kqc3jld407qr2z2k8z78i3xy4bfzr5f"; - name = "redshank"; + name = "recipe"; }; packageRequires = [ paredit ]; meta = { @@ -62738,20 +81795,25 @@ license = lib.licenses.free; }; }) {}; - redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + redtick = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "redtick"; - version = "20170129.1428"; + ename = "redtick"; + version = "20180424.1436"; src = fetchFromGitHub { owner = "ferfebles"; repo = "redtick"; - rev = "e6d2e9b69ec666f460f9158dd31cdf035eeb1080"; - sha256 = "03l36ik7a4a7ibgxh22hk8p43wkj6nb5x8mmlyjhh4phzc9i0kav"; + rev = "0faa6b7b479fae39f5d4632f0cbbef0f2917780e"; + sha256 = "12wsczhz03vjfvck20jg9xi2mgiihq2d4cnkj6r95jkja0ds7brh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3187bd436541e2a5c2b28de67c62f5d5165af737/recipes/redtick"; sha256 = "1a9rviz0hg6vlh2jc04g6vslyf9n89xglcz9cb79vf10hhr6igrb"; - name = "redtick"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -62759,9 +81821,18 @@ license = lib.licenses.free; }; }) {}; - refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: - melpaBuild { + refine = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , list-utils + , loop + , melpaBuild + , s }: + melpaBuild { pname = "refine"; + ename = "refine"; version = "20180315.1528"; src = fetchFromGitHub { owner = "Wilfred"; @@ -62769,10 +81840,10 @@ rev = "0a99439a0b4ed6f79b9a240ea1270140a9e328bc"; sha256 = "1scw449mbmr70kb0r2ymhph9j0s5ym77ijp5fpwph9bri46cad3g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; sha256 = "1sk6rsd92pix7k8snnqm3hsimjzaihzjgac0g5h3a2zm9dabf4py"; - name = "refine"; + name = "recipe"; }; packageRequires = [ dash emacs list-utils loop s ]; meta = { @@ -62780,20 +81851,24 @@ license = lib.licenses.free; }; }) {}; - regex-dsl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + regex-dsl = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "regex-dsl"; + ename = "regex-dsl"; version = "20100124.228"; src = fetchFromGitHub { owner = "alk"; repo = "elisp-regex-dsl"; - rev = "ac89ab8b7691a165ef3007cb84417125cfc0632e"; - sha256 = "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx"; + rev = "c9d9ce30669e3c4ccfa6030eb4a080083451ac71"; + sha256 = "11lrgygmwgc93av33md601alqr7ffh5ga0r60lvkl3rgwgnxz7iw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/regex-dsl"; sha256 = "0c9mxsvmx6mgpq838qnjjr7ra4hafikv7hq4nfab7zw9mxrcr2f9"; - name = "regex-dsl"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62801,9 +81876,13 @@ license = lib.licenses.free; }; }) {}; - regex-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + regex-tool = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "regex-tool"; + ename = "regex-tool"; version = "20170104.1118"; src = fetchFromGitHub { owner = "jwiegley"; @@ -62811,10 +81890,10 @@ rev = "0b4a0111143c88ef94bec56624cb2e00c1a054e6"; sha256 = "03qm8s7nqsj0pjnnb0p84gk7hvad4bywn3rhr3ibzj6hxqvppbqj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/regex-tool"; sha256 = "1s4clmy5r7w6aj2bh2vf2fmbcwnainzidj28mf3kc34x3qhybngq"; - name = "regex-tool"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62822,9 +81901,13 @@ license = lib.licenses.free; }; }) {}; - region-bindings-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + region-bindings-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "region-bindings-mode"; + ename = "region-bindings-mode"; version = "20140407.1514"; src = fetchFromGitHub { owner = "fgallina"; @@ -62832,10 +81915,10 @@ rev = "3fa5dbdbd7c000bebff6d9d14a4be326ec24b6fc"; sha256 = "02kfi3c6ydnr7xw611ck66kfjyl5w86dr9vfjv3wjl6ad9jya4zy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/faba50ed3e8c22991bcb8968880f79fad1748705/recipes/region-bindings-mode"; sha256 = "141q4x6rilidpnsm9s78qks9i1v6ng0ydhbzqi39xcaccfyyjb69"; - name = "region-bindings-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62843,20 +81926,24 @@ license = lib.licenses.free; }; }) {}; - region-convert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + region-convert = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "region-convert"; + ename = "region-convert"; version = "20161118.1859"; src = fetchFromGitHub { owner = "zonuexe"; repo = "right-click-context"; - rev = "2f8195fb81b8d27aeb42bdc4055ebce37c09717b"; - sha256 = "05fr1gg5xfwp4rmyyn181vxn2mhmb3aca1g1rp2nk36v7lfzgpxv"; + rev = "32f572b4f9ff6f9a062a914b4f8ba66f43e7ee8a"; + sha256 = "1lsr7ljzvfs84jnlk2igg8h0ki09gzw2ihgl2p6wdn27d47blcwd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert"; sha256 = "0daghvxc6gxgric1aa1gw036gbpbzilqz72gr1inqy92hz7xrxfm"; - name = "region-convert"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62864,9 +81951,13 @@ license = lib.licenses.free; }; }) {}; - region-state = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + region-state = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "region-state"; + ename = "region-state"; version = "20151128.238"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -62874,10 +81965,10 @@ rev = "07ffb7d9ada2fcd204f3447f078c265d25f36f60"; sha256 = "0gsh0x1rqxvzrszdyna9d8b8w22mqnd9yqcwzay2prc6rpl26g1f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/716e82eb4ca0845f59a743556b37be8a1ecb29af/recipes/region-state"; sha256 = "1iq2x1w8lqjjiwjja7r3qki6drvydnk171k9fj9g6rk7wslknz8x"; - name = "region-state"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62885,9 +81976,13 @@ license = lib.licenses.free; }; }) {}; - register-channel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + register-channel = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "register-channel"; + ename = "register-channel"; version = "20150513.2059"; src = fetchFromGitHub { owner = "YangZhao11"; @@ -62895,10 +81990,10 @@ rev = "f62f9a62ebd2537d4a8c8f2e358562c67d2aefc1"; sha256 = "01k3v4yiilz1k6drv7b2x6zbjx6dlz7cch8rq63mwc7v8kvdnqmi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad44618ac36e96d04f5c44c77637ea6229e61b4c/recipes/register-channel"; sha256 = "037i2fgxxsfb85vd6xk17wyh7ny6fqfixvb0a18lf8m1hib1gyhr"; - name = "register-channel"; + name = "recipe"; }; packageRequires = []; meta = { @@ -62906,19 +82001,24 @@ license = lib.licenses.free; }; }) {}; - related = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + related = callPackage ({ cl-lib ? null + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "related"; + ename = "related"; version = "20161002.2310"; src = fetchgit { url = "https://bitbucket.org/julien-montmartin/related"; rev = "0065a2e16eeaa9bface49f7f0815b9cf9719f441"; sha256 = "0gaj1mqv77dahw6zfqlf8q624b2ba589chgaa22vy4vg3lz6qzks"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6248cbbb6c977c9c9332a34b449eb090dd9322b3/recipes/related"; sha256 = "0nm2dnmz4a5z187mzggsj8xrdy1x84lxx79rmwcrkh1d7jzjhi6f"; - name = "related"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -62926,20 +82026,28 @@ license = lib.licenses.free; }; }) {}; - relative-buffers = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + relative-buffers = callPackage ({ cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "relative-buffers"; + ename = "relative-buffers"; version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "relative-buffers"; - rev = "2547475084244d266b507e563c9b4034705cfeca"; - sha256 = "16m4qyjg0ca1j944ra1qhhg9ks3sk0rv5ax59rqga20l8wf6k0jq"; + rev = "88c24259ed62b85adff6850e34bbbe844caddccf"; + sha256 = "0100maanb1v0hl4pj8ykzlqpr3cvs6ldak5japndm5yngzp6m8ks"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab22cea99fbee937bbd6e8fbc8bd27967aeaa8a5/recipes/relative-buffers"; sha256 = "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i"; - name = "relative-buffers"; + name = "recipe"; }; packageRequires = [ cl-lib dash f s ]; meta = { @@ -62947,9 +82055,14 @@ license = lib.licenses.free; }; }) {}; - relax = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + relax = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "relax"; + ename = "relax"; version = "20131029.1434"; src = fetchFromGitHub { owner = "technomancy"; @@ -62957,10 +82070,10 @@ rev = "6e33892623ab87833082262321dc8e1977209626"; sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67247451b39461db4a5fcff3827a09f53f9fc8ec/recipes/relax"; sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk"; - name = "relax"; + name = "recipe"; }; packageRequires = [ json ]; meta = { @@ -62968,9 +82081,15 @@ license = lib.licenses.free; }; }) {}; - remark-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { + remark-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "remark-mode"; + ename = "remark-mode"; version = "20171217.2356"; src = fetchFromGitHub { owner = "torgeir"; @@ -62978,10 +82097,10 @@ rev = "e8a95f25d865d6165a7fdb1cadf5e6f0bb5ee73b"; sha256 = "01qdaby7mn5d8y95wcbqzwzcbjmf2329g6yjbvmdd1gn6s7qzs0b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/161a45835a153c6ac81b99311482f5dd36507da1/recipes/remark-mode"; sha256 = "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0"; - name = "remark-mode"; + name = "recipe"; }; packageRequires = [ emacs markdown-mode ]; meta = { @@ -62989,20 +82108,25 @@ license = lib.licenses.free; }; }) {}; - remember-last-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + remember-last-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "remember-last-theme"; + ename = "remember-last-theme"; version = "20170619.1433"; src = fetchFromGitHub { owner = "anler"; repo = "remember-last-theme"; - rev = "0973f1aa6b96355fa376fffe8b45733b6e963c51"; - sha256 = "11kcqpw1wrhghbw2dx3pqndmq9a1rbqir3k71ggaj1x2y2arzvm7"; + rev = "57e8e2a475ea89316dbb5c4d2ea047f56a2cbcdf"; + sha256 = "0sb110rb6pnjnvyqn0kji19bhbn8mk4x32yps00aq2g2v9pc1jzr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/26edcdddaf8dc8c9a18d6b007e0d49d04fe4ccca/recipes/remember-last-theme"; sha256 = "0pw36f9mchkl1qhaii39zd0vwrydjlijzanv706ai2bl8r7l0ppy"; - name = "remember-last-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -63010,20 +82134,25 @@ license = lib.licenses.free; }; }) {}; - repeatable-motion = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + repeatable-motion = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "repeatable-motion"; + ename = "repeatable-motion"; version = "20170620.1148"; src = fetchFromGitHub { owner = "willghatch"; repo = "emacs-repeatable-motion"; - rev = "f29effdc4121c2dc7e3fec9b3a62debce29cda9d"; - sha256 = "11s7r5g0djj0yc8ll7jfw5v3m9kyvaiscndnfnvvjw5lwgfyh0v3"; + rev = "77aa35b27c8a76dc8deef87c9f71ef7e6fd289ee"; + sha256 = "0pm9z0w402430j66167s1az37jxw89sck1b7lm9gjnc3gslh0lpm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd56ebaea098715b9c201f07e6196c38977f8e3/recipes/repeatable-motion"; sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw"; - name = "repeatable-motion"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -63031,20 +82160,51 @@ license = lib.licenses.free; }; }) {}; - repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }: - melpaBuild { + repeater = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "repeater"; + ename = "repeater"; + version = "20180418.512"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "repeater"; + rev = "854b874542b186b2408cbc58ad0591fe8eb70b6c"; + sha256 = "0cx6b8l9ssf56fz8xjsmbyhy8mdcj8l0rvsdx37qk86xq4nlz74p"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/10e6c57937b7540f1fbf920765a63292784433ed/recipes/repeater"; + sha256 = "07fq3d6w5ns5ryv4vd23iww2bz34f62syzbg8y643kdd0kp1m772"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/repeater"; + license = lib.licenses.free; + }; + }) {}; + repl-toggle = callPackage ({ fetchFromGitHub + , fetchurl + , fullframe + , lib + , melpaBuild }: + melpaBuild { pname = "repl-toggle"; - version = "20161203.414"; + ename = "repl-toggle"; + version = "20180501.328"; src = fetchFromGitHub { owner = "tomterl"; repo = "repl-toggle"; - rev = "50044030969d68e9f78a6db4e0a9229f5f3eaec3"; - sha256 = "0gi4pdfgyhl2lss5p71p0jxifni6zl0fv7n4cj42hbalgfyxfv79"; + rev = "934f59478a5c5577795f9507e945d564be368510"; + sha256 = "13pgfqijfp0ad9h1rpcf0blppq3jv31wdgvpjndgi213vwrkk79j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/repl-toggle"; sha256 = "16k9fk1nl2llk9qli52kiirlx9rlz8yhjh3cy6v5y2b3k0y1cf0b"; - name = "repl-toggle"; + name = "recipe"; }; packageRequires = [ fullframe ]; meta = { @@ -63052,9 +82212,13 @@ license = lib.licenses.free; }; }) {}; - replace-from-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + replace-from-region = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "replace-from-region"; + ename = "replace-from-region"; version = "20170227.1516"; src = fetchFromGitHub { owner = "rubikitch"; @@ -63062,10 +82226,10 @@ rev = "dc9318b9b2822da7b00ecc34d1dc965c8f96c9bb"; sha256 = "05l0wn1gqw2sbl65s1m7afmg3b1ps2qgqqrjkl9r2i26p95kqlq3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/replace-from-region"; sha256 = "1p77sajghqkjd7k83nma4qpz682la3zg716jdsnpcwcw0qk9ybcb"; - name = "replace-from-region"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63073,20 +82237,25 @@ license = lib.licenses.free; }; }) {}; - replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + replace-pairs = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "replace-pairs"; + ename = "replace-pairs"; version = "20160207.451"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "replace-pairs"; - rev = "1e49071e2ef46a458a28f77681e313a63db5663c"; - sha256 = "1nl1g6fi7mkr0h3p4xa6czqpihnzdwpj9hg7d6qvlvih001hcc16"; + rev = "ef6f2719aab7714f6cb209fd3dd6d2e720681b3c"; + sha256 = "169p85rmgashm0g26apkxynmypqk9ndh76kvh572db5kqb8ix0c6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c578f574bc13edf45330a2836c02dece163688d/recipes/replace-pairs"; sha256 = "0l9674rba25wh6fskvfwkhv99lwlszb177hsfzx39s6b4hshvlsb"; - name = "replace-pairs"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -63094,9 +82263,13 @@ license = lib.licenses.free; }; }) {}; - replace-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + replace-symbol = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "replace-symbol"; + ename = "replace-symbol"; version = "20160517.1712"; src = fetchFromGitHub { owner = "bmastenbrook"; @@ -63104,10 +82277,10 @@ rev = "baf949e528aee1881f455f9c84e67718bedcb3f6"; sha256 = "178y1cmpdb2r72igx8j4l7pyhs1idw56j6hg5h8r9a2p99lkgjjc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/377b6ff2b785f6d87adf1e23a5b0ce02881fc5c9/recipes/replace-symbol"; sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng"; - name = "replace-symbol"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63115,9 +82288,16 @@ license = lib.licenses.free; }; }) {}; - replace-with-inflections = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inflections, lib, melpaBuild, string-inflection }: - melpaBuild { + replace-with-inflections = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , inflections + , lib + , melpaBuild + , string-inflection }: + melpaBuild { pname = "replace-with-inflections"; + ename = "replace-with-inflections"; version = "20170911.245"; src = fetchFromGitHub { owner = "knu"; @@ -63125,10 +82305,10 @@ rev = "e286036a5d1dbac06a72a1e831b2a8d9cad27238"; sha256 = "1szbps1k3na3w9djkqxm3s1anm12505ajr7ay9j7pmd00qf75379"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7892eb506b8f4260bde4be2805bf3b2d594ab640/recipes/replace-with-inflections"; sha256 = "1pqpin5ipm3g74zjh1kh6s1gh0aan6202p0y2q00d4ywbz9kn5s0"; - name = "replace-with-inflections"; + name = "recipe"; }; packageRequires = [ cl-lib inflections string-inflection ]; meta = { @@ -63136,20 +82316,25 @@ license = lib.licenses.free; }; }) {}; - repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + repo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "repo"; + ename = "repo"; version = "20170213.139"; src = fetchFromGitHub { owner = "canatella"; repo = "repo-el"; - rev = "d7b87cd515bad8a67d3a892a46a23f5fe81e08de"; - sha256 = "0rbvcvm7bfr6ncji7cllfxyyr6x7n9fx863byp243phsj3n93adz"; + rev = "9f03c0d90c9036b96e531c17d529f3855364d47a"; + sha256 = "1ggxs40mbk50aqhqqfdcz6izvlvsz53s93dj3ndxvgdxkpkxr6yn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1729d4ea9498549fff3594b971fcde5f81592f84/recipes/repo"; sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb"; - name = "repo"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -63157,20 +82342,28 @@ license = lib.licenses.free; }; }) {}; - req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: - melpaBuild { + req-package = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , ht + , lib + , log4e + , melpaBuild + , use-package }: + melpaBuild { pname = "req-package"; - version = "20180121.2100"; + ename = "req-package"; + version = "20180506.2350"; src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "699d5aa9204c07905db4574406f771c69aa5752c"; - sha256 = "15q8lsld2k8yd8wqrn0hsnj8xvmwj9zgpbrqzjda452jdqsznfcm"; + rev = "f97d7531a3e7526f2d7b008868eb647c80d0de5d"; + sha256 = "1yl1ap5jlrkvhw47c1xyb9q4khqqnz38y5rvbvw4zib1ik9vwhmc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf"; - name = "req-package"; + name = "recipe"; }; packageRequires = [ dash ht log4e use-package ]; meta = { @@ -63178,9 +82371,14 @@ license = lib.licenses.free; }; }) {}; - request = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + request = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "request"; + ename = "request"; version = "20170131.1747"; src = fetchFromGitHub { owner = "tkf"; @@ -63188,10 +82386,10 @@ rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8"; sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request"; sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji"; - name = "request"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -63199,20 +82397,26 @@ license = lib.licenses.free; }; }) {}; - request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + request-deferred = callPackage ({ deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "request-deferred"; + ename = "request-deferred"; version = "20160419.1605"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8"; - sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"; + rev = "aeae9028de5c489b07a5f5df29682eff47f80f6b"; + sha256 = "002blp30bvi8l9b9mzjk8ib6xv3fps3j8cqrvbdj6dw2yvrcfl1g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred"; sha256 = "1dcxqnzmvddk61dzmfx8vjbzd8m44lscr3pjdp3r7211zhwfk40n"; - name = "request-deferred"; + name = "recipe"; }; packageRequires = [ deferred request ]; meta = { @@ -63220,9 +82424,18 @@ license = lib.licenses.free; }; }) {}; - requirejs = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, popup, s, yasnippet }: - melpaBuild { + requirejs = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild + , popup + , s + , yasnippet }: + melpaBuild { pname = "requirejs"; + ename = "requirejs"; version = "20151203.2319"; src = fetchFromGitHub { owner = "joeheyming"; @@ -63230,10 +82443,10 @@ rev = "4ea2a5fcbc76e4cbb6a7461e6f05f019b75865b1"; sha256 = "1bfj2zjn3x41jal6c136wnwkgmag27bmrwbfwdylafc7qqk6dflv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6a710c0d5ab34c52498c4154deebb779052aa01/recipes/requirejs"; sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k"; - name = "requirejs"; + name = "recipe"; }; packageRequires = [ cl-lib js2-mode popup s yasnippet ]; meta = { @@ -63241,20 +82454,24 @@ license = lib.licenses.free; }; }) {}; - requirejs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + requirejs-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "requirejs-mode"; + ename = "requirejs-mode"; version = "20130215.1304"; src = fetchFromGitHub { owner = "moricard"; repo = "requirejs-mode"; - rev = "bbb0c09f8eb2d6a33c17319be8137f68bb16bc92"; - sha256 = "02wva5q8mvc0a5kms2wm1gyaag2x3zd6fkkpl4218nrbb0mbficv"; + rev = "011849043098b6c4f27571625ae19071b53b8824"; + sha256 = "1dhhwz3910lcyabmpm14ky61dhgj4hvdv87k2nnzm73iwxl876ih"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/requirejs-mode"; sha256 = "00bl5dz56f77hl9wy3xvjhq81641mv9jbskcd8mcgcz9ycj9g5k2"; - name = "requirejs-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63262,20 +82479,26 @@ license = lib.licenses.free; }; }) {}; - resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + resize-window = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "resize-window"; + ename = "resize-window"; version = "20170704.2212"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904"; - sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk"; + rev = "e281aca5a1b371aff20d7bfc6abc456de22e19dd"; + sha256 = "1d8jzhwif80bgj5pxa36hbavjrlmjg12yzxypl40d1wrjamq854c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l"; - name = "resize-window"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -63283,20 +82506,24 @@ license = lib.licenses.free; }; }) {}; - restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + restart-emacs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "restart-emacs"; - version = "20170609.905"; + ename = "restart-emacs"; + version = "20180601.331"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "restart-emacs"; - rev = "98aa4efd2caeaf0f42ca385c24fa14a843b271b7"; - sha256 = "00qh17m4q6a1d2ck1309hp4hcw528nzp60zp8vy6x6qx7shsibrm"; + rev = "9aa90d3df9e08bc420e1c9845ee3ff568e911bd9"; + sha256 = "02x1a85k7r95z8091zgjiaj9nf0zvx1jy4xvl3hr12qbnrx1wfav"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs"; sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6"; - name = "restart-emacs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63304,9 +82531,13 @@ license = lib.licenses.free; }; }) {}; - restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + restclient = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "restclient"; + ename = "restclient"; version = "20180316.851"; src = fetchFromGitHub { owner = "pashky"; @@ -63314,10 +82545,10 @@ rev = "859d944796ce298b5779d9d256bd8d271d57e221"; sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; sha256 = "0wzp8i89a4hwm7qyxvdk10frknbqcni0isnp8k63nhq7c30s7md4"; - name = "restclient"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63325,20 +82556,26 @@ license = lib.licenses.free; }; }) {}; - restclient-helm = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, restclient }: - melpaBuild { + restclient-helm = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , restclient }: + melpaBuild { pname = "restclient-helm"; + ename = "restclient-helm"; version = "20170314.854"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "859d944796ce298b5779d9d256bd8d271d57e221"; - sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn"; + rev = "af7420085dd67ed08d199a2402e8ff3e996c3029"; + sha256 = "04c1b0xvhrsxb4r98qvvasn1nbkl4ddinip2rplilacywjy26rsz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; sha256 = "0cpf02ippfr9w6kiw3kng8smabv256ff388322hhn8a8icyjl24j"; - name = "restclient-helm"; + name = "recipe"; }; packageRequires = [ helm restclient ]; meta = { @@ -63346,9 +82583,15 @@ license = lib.licenses.free; }; }) {}; - restclient-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }: - melpaBuild { + restclient-test = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , restclient }: + melpaBuild { pname = "restclient-test"; + ename = "restclient-test"; version = "20180106.1246"; src = fetchFromGitHub { owner = "simenheg"; @@ -63356,10 +82599,10 @@ rev = "4518561bc9661fedacb6fb352e9677207f45c418"; sha256 = "0hbilpn77w0vykga9p4dkwaygipyna7mwn24y2kwfcahcr39pqjb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82e3078fc1f96d276fd288c3d7b91df5df4717a6/recipes/restclient-test"; sha256 = "0g26z5p9fq7fm6bgrwaszya5xmhsgzcn1p7zqr83w74fbw6bcl39"; - name = "restclient-test"; + name = "recipe"; }; packageRequires = [ emacs restclient ]; meta = { @@ -63367,9 +82610,13 @@ license = lib.licenses.free; }; }) {}; - reveal-in-osx-finder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + reveal-in-osx-finder = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "reveal-in-osx-finder"; + ename = "reveal-in-osx-finder"; version = "20150802.957"; src = fetchFromGitHub { owner = "kaz-yos"; @@ -63377,10 +82624,10 @@ rev = "5710e5936e47139a610ec9a06899f72e77ddc7bc"; sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bf40285279b761b0efd6bc8542ae9aad4b329e1/recipes/reveal-in-osx-finder"; sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc"; - name = "reveal-in-osx-finder"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63388,9 +82635,14 @@ license = lib.licenses.free; }; }) {}; - reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + reverse-im = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "reverse-im"; + ename = "reverse-im"; version = "20180213.525"; src = fetchFromGitHub { owner = "a13"; @@ -63398,10 +82650,10 @@ rev = "16931909115a922b1cf3846b1f60509b6590001f"; sha256 = "0ccpnd1n9z18wpf8m9xyx5gps2xh5kxv8s1q2zan2zs9f46sz9pc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; sha256 = "0c0dxxpa2s6gvhi14zfb0rnb4i7jaqw627a7ngm5fzyh0r9himcf"; - name = "reverse-im"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -63409,20 +82661,24 @@ license = lib.licenses.free; }; }) {}; - reverse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + reverse-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "reverse-theme"; + ename = "reverse-theme"; version = "20141204.1745"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-reverse-theme"; - rev = "8319d0d5342890a3530ffa4daafdb7c35feda1ca"; - sha256 = "002ywhjms8ybk7cma2p2i11z3fz6kb0w8mlafysm911rvcq2hg5f"; + rev = "13d0821a4ec5ece7e6a81f50d2a1a7e7ad21394d"; + sha256 = "1sfl0rm4sxjkcjki0hmkkcicr24qr2q7gmficg9bi5q6vlrid1pn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/reverse-theme"; sha256 = "163kk5qnz9bk3l2fam79n264s764jfxbwqbiwgid8kw9cmk0v776"; - name = "reverse-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63430,9 +82686,13 @@ license = lib.licenses.free; }; }) {}; - review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + review-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "review-mode"; + ename = "review-mode"; version = "20180312.535"; src = fetchFromGitHub { owner = "kmuto"; @@ -63440,10 +82700,10 @@ rev = "bf38b0ce8be2eef1cf810ac6f3664d2190bb9ef7"; sha256 = "0vmv19qvpba715xqx18dmlxq9kgkzvkf6jfd03bdcj2lh804y3pb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode"; sha256 = "0wapicggkngpdzi0yxc0b24s526fs819rc2d6miv6ix3gnw11n0n"; - name = "review-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63451,20 +82711,25 @@ license = lib.licenses.free; }; }) {}; - reykjavik-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + reykjavik-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "reykjavik-theme"; + ename = "reykjavik-theme"; version = "20160109.0"; src = fetchFromGitHub { owner = "mswift42"; repo = "reykjavik-theme"; - rev = "d9bb783d6cf3c3b52cf377d9207484fba54657fd"; - sha256 = "0zmby92mjszh77r5wh8sccqv3a5bb9sfhac8g55nasavw8hfplvj"; + rev = "0d04f21a8d4c98accd278a1ba360ea3fa7cac812"; + sha256 = "07gcz2zmz1hhrailad9jfjflkyf1lkm8cdyvnd752064dkdja7y7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10bf153e2b84050304ba2532f5eb41c7a4e7632f/recipes/reykjavik-theme"; sha256 = "1f0q2gfzkmpd374jryrd1lgg8xj6rwdq181jhppj3rfjizgw4l35"; - name = "reykjavik-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -63472,20 +82737,27 @@ license = lib.licenses.free; }; }) {}; - rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + rg = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "rg"; - version = "20180401.1308"; + ename = "rg"; + version = "20180626.1041"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "1d037789386ca626123cef6eab8b5ab467a8ca3b"; - sha256 = "18q55bx6wfmzvzxl97w38b5kk9ihblyk8p9g9q4d1xangsclqqzz"; + rev = "ca5afceb3dd84590ffadd525a9643befbae0959f"; + sha256 = "03f13vcknlwdbq4997q82z6gl718mv83k88rnynh1m4v4hcpwv09"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; - name = "rg"; + name = "recipe"; }; packageRequires = [ cl-lib emacs s ]; meta = { @@ -63493,9 +82765,13 @@ license = lib.licenses.free; }; }) {}; - rhtml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rhtml-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rhtml-mode"; + ename = "rhtml-mode"; version = "20130422.611"; src = fetchFromGitHub { owner = "eschulte"; @@ -63503,10 +82779,10 @@ rev = "a6d71b38a3db867ccf82999c99805db1a3a33c33"; sha256 = "1qlpv5lzj4yfyjgdykhm6q9izg6g0z5pf5nmynj42vsx7v8bhy1x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9e14e9d8df9c2ce13e290a5f3d3bf9b247037f4/recipes/rhtml-mode"; sha256 = "038j5jkcckmhlq3vz4h07s5y2scljh1fdn9r614hiyxwgk48lc35"; - name = "rhtml-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63514,9 +82790,14 @@ license = lib.licenses.free; }; }) {}; - rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rib-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rib-mode"; + ename = "rib-mode"; version = "20170726.748"; src = fetchFromGitHub { owner = "blezek"; @@ -63524,10 +82805,10 @@ rev = "97470158784c3c212e22e2c20b8471ee65ba59af"; sha256 = "0hln0hympmxmsci82ivc2rw289j1bmgdxns96m1ng1bl668bwag7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode"; sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587"; - name = "rib-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -63535,20 +82816,25 @@ license = lib.licenses.free; }; }) {}; - rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rich-minority = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rich-minority"; + ename = "rich-minority"; version = "20170813.622"; src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "a50d9b2fd059f6a0e5b22063a5375851a087f61a"; - sha256 = "126slgxa786rcbxdnazyn7svkwk31hy1c2ab7kzswf8f0k81fqk8"; + rev = "333e4669f76a0fb68b433117d377711e418a525e"; + sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc"; - name = "rich-minority"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -63556,20 +82842,25 @@ license = lib.licenses.free; }; }) {}; - rigid-tabs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rigid-tabs = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rigid-tabs"; + ename = "rigid-tabs"; version = "20170903.859"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "wavexx"; repo = "rigid-tabs.el"; - rev = "eba84ceaba2e57e76ad2dfbb7a7154238a25d956"; - sha256 = "18rba101m9vmjl4mf3x0k7wvbgn6qmay9la745vzpr3lx1f4nn98"; + rev = "d48ba58acbe8934700cd23db2acb574b09306238"; + sha256 = "03dmyn5lnw0mj4ymgyxz6gksl2byw31plxn61qcggkj6gk8g500d"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/689b0060ee5db505fc0ed4603aca204b2d3c63a2/recipes/rigid-tabs"; - sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp"; - name = "rigid-tabs"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/rigid-tabs"; + sha256 = "0623hhhykrxq702871s5p4vddkvx7jpj6hg5q0c9jkbvflz9n9y8"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -63577,20 +82868,25 @@ license = lib.licenses.free; }; }) {}; - rimero-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rimero-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rimero-theme"; - version = "20171001.821"; + ename = "rimero-theme"; + version = "20180630.515"; src = fetchFromGitHub { owner = "yveszoundi"; repo = "emacs-rimero-theme"; - rev = "2c15da5a4d56f1b29db2fc178d387eb86e7abd39"; - sha256 = "0pvykjz0a2jgq2dghhshc4w7852jrlk0vy35ppbn956yp7rq9sx3"; + rev = "dc6917b7404d3f79044046c231a195c40c9d0a88"; + sha256 = "0zjs76lp4mpds7hkxbks2lj77ifbnzgq74xdl6minfcxc3wjkbvi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d07b0c021001195e6e0951c890566a5a784ce1/recipes/rimero-theme"; sha256 = "0jbknrp9hc8s956cy2gqffxnx0fgnhmjqp2i4vyp0ywh45wrls5r"; - name = "rimero-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -63598,20 +82894,28 @@ license = lib.licenses.free; }; }) {}; - rinari = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, jump, lib, melpaBuild, ruby-compilation, ruby-mode ? null }: - melpaBuild { + rinari = callPackage ({ fetchFromGitHub + , fetchurl + , inf-ruby + , jump + , lib + , melpaBuild + , ruby-compilation + , ruby-mode ? null }: + melpaBuild { pname = "rinari"; + ename = "rinari"; version = "20150708.2340"; src = fetchFromGitHub { owner = "eschulte"; repo = "rinari"; - rev = "134438af8fbdfa9c8077267c768d273a9792b484"; - sha256 = "0ndrqj7qsf9rky4v928803ib66p37vyhxgyc42vshx86q73v4cyg"; + rev = "be07b0f42aefa24c5d36c441d1f3f72e64fffaa4"; + sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b243a909faa71e14ee7ca4f307df8e8136e5d7c/recipes/rinari"; sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0"; - name = "rinari"; + name = "recipe"; }; packageRequires = [ inf-ruby jump ruby-compilation ruby-mode ]; meta = { @@ -63619,9 +82923,13 @@ license = lib.licenses.free; }; }) {}; - rings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rings = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rings"; + ename = "rings"; version = "20160531.1327"; src = fetchFromGitHub { owner = "konr"; @@ -63629,10 +82937,10 @@ rev = "3590b222eb80652cbd27866f066bd3571d86edfc"; sha256 = "01mfiyq4cr2qdmvaxid8a094p20w97n2nsiy9vyng77vcmv36sd5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113118947e33ab0c8004dbe9b188eba2ea282356/recipes/rings"; sha256 = "1ncsb4jip07hbrf1l4j9yzn3l0kb63ylhzzsb4bb2yx6as4a66k7"; - name = "rings"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63640,9 +82948,13 @@ license = lib.licenses.free; }; }) {}; - ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ripgrep = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ripgrep"; + ename = "ripgrep"; version = "20180323.920"; src = fetchFromGitHub { owner = "nlamirault"; @@ -63650,10 +82962,10 @@ rev = "a1f8f030bf5daea92dd13b953720a6c13dd3557c"; sha256 = "0mpysjcbw9qxy1lcwsd2rqf72xahpdpn88xcq0cnk1y2jam8gjkf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; sha256 = "1j9c3mhcyhs4xf44z6fnlvmb81pps25bp43gdqvp0954i068mgah"; - name = "ripgrep"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63661,9 +82973,14 @@ license = lib.licenses.free; }; }) {}; - riscv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + riscv-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "riscv-mode"; + ename = "riscv-mode"; version = "20170804.821"; src = fetchFromGitHub { owner = "AdamNiederer"; @@ -63671,10 +82988,10 @@ rev = "99febf97d1fa9441e8dada94fe30c2aa439c9749"; sha256 = "119p926ypz525xdh82m2d1saky1qh5va224fxyqisfbwfrc17arh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0853b4b678be7d1906a2f7946bfa1072590faf72/recipes/riscv-mode"; sha256 = "0496b7xwshmk3gv6s5hggbm9qd60a05racj3xcsxwqzak359lk2b"; - name = "riscv-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -63682,20 +82999,26 @@ license = lib.licenses.free; }; }) {}; - rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: - melpaBuild { + rjsx-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild }: + melpaBuild { pname = "rjsx-mode"; - version = "20180314.845"; + ename = "rjsx-mode"; + version = "20180624.1758"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0"; - sha256 = "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8"; + rev = "8bdb234f2b66a2ce0563b676447ebb8db37d593f"; + sha256 = "047mfmj6rklxiqg43ji4gb5qr86z8q1717imsjffrkbjq3iqlw6j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; sha256 = "0w3ij8k8058pfw443chm1kn30ia0f5rfbg03w9ddw86xb3wa2q0b"; - name = "rjsx-mode"; + name = "recipe"; }; packageRequires = [ emacs js2-mode ]; meta = { @@ -63703,9 +83026,15 @@ license = lib.licenses.free; }; }) {}; - robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: - melpaBuild { + robe = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild }: + melpaBuild { pname = "robe"; + ename = "robe"; version = "20171116.1249"; src = fetchFromGitHub { owner = "dgutov"; @@ -63713,10 +83042,10 @@ rev = "7829f4fdda41eee0add8868646ab86e6b17de4b4"; sha256 = "1h526m21g0yqpry8dh42aj8nv4lp74dc1cmcyfb16sx5rrk0vx27"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe"; sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk"; - name = "robe"; + name = "recipe"; }; packageRequires = [ emacs inf-ruby ]; meta = { @@ -63724,9 +83053,13 @@ license = lib.licenses.free; }; }) {}; - robots-txt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + robots-txt-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "robots-txt-mode"; + ename = "robots-txt-mode"; version = "20170908.642"; src = fetchFromGitHub { owner = "emacs-php"; @@ -63734,10 +83067,10 @@ rev = "4a77674ab2963b829d3b751741c4ce1169e87f6b"; sha256 = "1ynmb9gpryfrml80kkv71k11j7r91mgyzh1q8xx52s0b4mkd33zc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/robots-txt-mode"; sha256 = "00hxz4mygcxg7d8m2i4cm0bl82v3hw8wb4m8vv7g7fqkjp32c9qc"; - name = "robots-txt-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63745,9 +83078,14 @@ license = lib.licenses.free; }; }) {}; - roguel-ike = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + roguel-ike = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "roguel-ike"; + ename = "roguel-ike"; version = "20160119.1902"; src = fetchFromGitHub { owner = "stevenremot"; @@ -63755,10 +83093,10 @@ rev = "706dcb0687e8016d7d776f9d9e5ace9fdbbca43c"; sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2db1979e039e466268ca7c264988792d3046e19a/recipes/roguel-ike"; sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8"; - name = "roguel-ike"; + name = "recipe"; }; packageRequires = [ popup ]; meta = { @@ -63766,9 +83104,13 @@ license = lib.licenses.free; }; }) {}; - rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rope-read-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rope-read-mode"; + ename = "rope-read-mode"; version = "20171003.719"; src = fetchFromGitHub { owner = "marcowahl"; @@ -63776,10 +83118,10 @@ rev = "77b183a6f5450138388509f54a6a2ce442766e50"; sha256 = "0ddm7gwr51ip8mc79jxkvp52sxhlvs0kyy59v7r7pf5mbadbpsbz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw"; - name = "rope-read-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63787,20 +83129,24 @@ license = lib.licenses.free; }; }) {}; - rotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rotate = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rotate"; + ename = "rotate"; version = "20160909.136"; src = fetchFromGitHub { owner = "daichirata"; repo = "emacs-rotate"; - rev = "091b5ac4fc310773253efb317e3dbe8e46959ba6"; - sha256 = "0msjn7ays71mcw6qmdk0mpjp1rvd7fwz917vmvlcd7cpmvkyfbds"; + rev = "eb177ec2aba1a358aa757720a9a4c8d8ce4856e8"; + sha256 = "1v8m08hrj3g1vcyhjmkh6wsiczrvjq0v90nqb5y3hy3l40pkag5x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d92e66cad586d4dc6b1de12d1b41b818b5232c2/recipes/rotate"; sha256 = "11a0svvfq29cb4630jq0hz19xk9jfhfjnssm7vg0dnlzpxqi3vif"; - name = "rotate"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63808,20 +83154,24 @@ license = lib.licenses.free; }; }) {}; - roy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + roy-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "roy-mode"; + ename = "roy-mode"; version = "20121208.358"; src = fetchFromGitHub { owner = "folone"; repo = "roy-mode"; - rev = "0416f561edbc6b4a29fced8be84d2527a9613d65"; - sha256 = "04jbnm9is2cis75h40znqzjvyjq27ncr2vfank6zglzi4fhxsl0r"; + rev = "e1a4fb5ec0f46e82f569865ca47042ba5934e425"; + sha256 = "1m19hjgh9s21qknb1278pf6gw77a747siy04qdznj4519j12wjjg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/roy-mode"; sha256 = "1r49c1v0xjkrpxmq0k2l2nrx95n06b7hbpmr1n7nkil2bxdq275i"; - name = "roy-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63829,9 +83179,13 @@ license = lib.licenses.free; }; }) {}; - rpm-spec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rpm-spec-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rpm-spec-mode"; + ename = "rpm-spec-mode"; version = "20160710.436"; src = fetchFromGitHub { owner = "stigbjorlykke"; @@ -63839,10 +83193,10 @@ rev = "c1c38050c48ea330c7cea632b8785d66daeefb2b"; sha256 = "0427kcvf2ljhzwxskn3jzk0ncrl3f9zcz2sm83d9pmhh5jax2gch"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb7e188fffda3d4e42690511775e5e32a11e1b34/recipes/rpm-spec-mode"; sha256 = "1ygk0pdhq1hvgzd173h79lxb04b9lmvq4hi70qf9244bqbm0m182"; - name = "rpm-spec-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63850,9 +83204,14 @@ license = lib.licenses.free; }; }) {}; - rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + rpn-calc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "rpn-calc"; + ename = "rpn-calc"; version = "20170522.1842"; src = fetchFromGitHub { owner = "zk-phi"; @@ -63860,10 +83219,10 @@ rev = "66fcb64dbfddfc23823356b6213215bd7ab5efc6"; sha256 = "1lgabs97x6h4yrgwln8hsxi47wgl46jzhf162wa1almdbqbp9100"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/rpn-calc"; sha256 = "04dj2r4035k0c3x6iyjydshzmq381d60pmscp2hg5m7sp7bqn5xs"; - name = "rpn-calc"; + name = "recipe"; }; packageRequires = [ popup ]; meta = { @@ -63871,20 +83230,24 @@ license = lib.licenses.free; }; }) {}; - rsense = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rsense = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rsense"; + ename = "rsense"; version = "20100510.2105"; src = fetchFromGitHub { owner = "m2ym"; repo = "rsense"; - rev = "8b5ee58318747ca1dde84ee41d48c4f50175cf35"; - sha256 = "0xkr1qn8fm3kv5c11janq5acp1q02abvxc463zijvm2qk735yl4d"; + rev = "fbcfc00402742b0d8744a9bfd1bcdd869f4fb923"; + sha256 = "178rnmhj3987dscsjkg5qcsw92s3b5rv51s0j7qcavx254h7xdf0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2149ce3baef9ac01d5b2e8b1a933a3e1206015f/recipes/rsense"; sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5"; - name = "rsense"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63892,20 +83255,26 @@ license = lib.licenses.free; }; }) {}; - rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: - melpaBuild { + rspec-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , ruby-mode ? null }: + melpaBuild { pname = "rspec-mode"; - version = "20171025.1606"; + ename = "rspec-mode"; + version = "20180614.448"; src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "94a04f148922852b591957b0b3b22de5c4237448"; - sha256 = "04qcicaklj9fhl0wbb8axi8zvd0az43cnrhf53vhgwsgnf7rjya2"; + rev = "dda1ece81bd2802c4097e5c963fac33a444659cb"; + sha256 = "1d8i2y9r1im346df3ishsx16g5264pfq930whbj9hipfml6s8ddy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx"; - name = "rspec-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ruby-mode ]; meta = { @@ -63913,20 +83282,24 @@ license = lib.licenses.free; }; }) {}; - rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rtags = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rtags"; - version = "20180224.1658"; + ename = "rtags"; + version = "20180619.823"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "a595d13f60c13d67a28467b3941d5ed558102e91"; - sha256 = "0yp6h6nsbji7dmc9pnf9qi7zsqxrxa1bln90bn0y71xf6z11kbp4"; + rev = "015cde3b77d9971e890f25b54cccfdb2582970fa"; + sha256 = "00fs8181nrgnx9bcsc479rhgvxx7hh8byxnzi9g6kl4ak1cmc7jx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; sha256 = "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd"; - name = "rtags"; + name = "recipe"; }; packageRequires = []; meta = { @@ -63934,9 +83307,14 @@ license = lib.licenses.free; }; }) {}; - rtm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rtm = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rtm"; + ename = "rtm"; version = "20180329.808"; src = fetchFromGitHub { owner = "pmiddend"; @@ -63944,10 +83322,10 @@ rev = "3e3d09387cb84801343ecca8fb02e82f213e7bbe"; sha256 = "0cc07lhh27i1ra4alrwb6w322ddi6hw0498nkzf388arhn10h3wv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rtm"; sha256 = "1bwbaps76pawz73fs7nzkvbii9d57zmfdccpm18dwn6phaqxbhyc"; - name = "rtm"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -63955,9 +83333,15 @@ license = lib.licenses.free; }; }) {}; - rubik = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rubik = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rubik"; + ename = "rubik"; version = "20180222.1214"; src = fetchFromGitHub { owner = "Kurvivor19"; @@ -63965,10 +83349,10 @@ rev = "c8dab1726463dbc9042a0b00186e4a8df02eb868"; sha256 = "13razzmk70h5sd69ms0a3ljr285zcad0wnrqkfxbgi5rnppqlkh1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik"; sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267"; - name = "rubik"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -63976,9 +83360,14 @@ license = lib.licenses.free; }; }) {}; - rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rubocop = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rubocop"; + ename = "rubocop"; version = "20170311.2211"; src = fetchFromGitHub { owner = "bbatsov"; @@ -63986,10 +83375,10 @@ rev = "980bedb455e3551d35a212fae515c054888907c1"; sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop"; sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q"; - name = "rubocop"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -63997,20 +83386,52 @@ license = lib.licenses.free; }; }) {}; - ruby-additional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: - melpaBuild { + rubocopfmt = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "rubocopfmt"; + ename = "rubocopfmt"; + version = "20180519.748"; + src = fetchFromGitHub { + owner = "jimeh"; + repo = "rubocopfmt.el"; + rev = "34c69c9c923d0da223f7569a6ecc842095adcf85"; + sha256 = "0aa683r16gvpv07i0gzbil81kgxbgk4pjn510xgalan3fk20nal4"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ac01edffceea771d8fe41326e28dd9881f1661ab/recipes/rubocopfmt"; + sha256 = "06ficv1r3axzi7q659pk1m3gbpf44nd2ir2ikmi8mr8rq44sqps0"; + name = "recipe"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/rubocopfmt"; + license = lib.licenses.free; + }; + }) {}; + ruby-additional = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , ruby-mode ? null }: + melpaBuild { pname = "ruby-additional"; - version = "20171001.2106"; + ename = "ruby-additional"; + version = "20180316.1937"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "ruby-additional"; - rev = "14f380893cb7c1d9ddbb4ed1a2fc280999c82fde"; - sha256 = "07mbjnph72l52f0bgz6qn5pbnfiyjx5p1ranq5g4csbfpx9jcc3s"; + rev = "97998d908e3720c7cb45a80aeda4b55f3b8ea0f0"; + sha256 = "1jmnz1y2q5994x7j6gfqrbpjyd2rsnrjis8xlx14hplmfgm2scd5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/ruby-additional"; sha256 = "1ivxn787k64q5jl0dxmxbj240ykcyvfhfam5fdvrwvc3yysk2dx7"; - name = "ruby-additional"; + name = "recipe"; }; packageRequires = [ emacs ruby-mode ]; meta = { @@ -64018,20 +83439,25 @@ license = lib.licenses.free; }; }) {}; - ruby-compilation = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: - melpaBuild { + ruby-compilation = callPackage ({ fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-compilation"; + ename = "ruby-compilation"; version = "20150708.2340"; src = fetchFromGitHub { owner = "eschulte"; repo = "rinari"; - rev = "134438af8fbdfa9c8077267c768d273a9792b484"; - sha256 = "0ndrqj7qsf9rky4v928803ib66p37vyhxgyc42vshx86q73v4cyg"; + rev = "be07b0f42aefa24c5d36c441d1f3f72e64fffaa4"; + sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/ruby-compilation"; sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc"; - name = "ruby-compilation"; + name = "recipe"; }; packageRequires = [ inf-ruby ]; meta = { @@ -64039,9 +83465,13 @@ license = lib.licenses.free; }; }) {}; - ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ruby-electric = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-electric"; + ename = "ruby-electric"; version = "20170810.430"; src = fetchFromGitHub { owner = "knu"; @@ -64049,10 +83479,10 @@ rev = "3553448a780a1ea5c3b0e9becd820d4762876593"; sha256 = "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric"; sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2"; - name = "ruby-electric"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64060,20 +83490,24 @@ license = lib.licenses.free; }; }) {}; - ruby-end = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ruby-end = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-end"; + ename = "ruby-end"; version = "20141215.423"; src = fetchFromGitHub { owner = "rejeep"; repo = "ruby-end.el"; - rev = "a136f75abb6d5577ce40d61dfeb778c2e9bb09c0"; - sha256 = "1f530gaiy010qln51g83m1llazhyfi8ws0lvsb982fhi4dh1xfk5"; + rev = "648b81af136a581bcef387744d93c011d9cdf54b"; + sha256 = "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ruby-end"; sha256 = "1cnmdlkhm8xsifbjs6ymvi92gdnxiaghb04h10qg41phj6v7m9mg"; - name = "ruby-end"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64081,9 +83515,13 @@ license = lib.licenses.free; }; }) {}; - ruby-extra-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ruby-extra-highlight = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-extra-highlight"; + ename = "ruby-extra-highlight"; version = "20171106.1133"; src = fetchFromGitHub { owner = "Lindydancer"; @@ -64091,10 +83529,10 @@ rev = "83942d18eae361998d24c1c523b308eea821f048"; sha256 = "18mq0ap7f0b22cdp2wdj0y2fqsahm2ngf7fvdy0mkkfs3818awlp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73488b0aea4eb470a1f235fece0753797bfd7e35/recipes/ruby-extra-highlight"; sha256 = "0dybf39yv0yzy8bsz9k5s64033id6hq4v268m11la4bp5fbv5r37"; - name = "ruby-extra-highlight"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64102,9 +83540,14 @@ license = lib.licenses.free; }; }) {}; - ruby-factory = callPackage ({ fetchFromGitHub, fetchurl, inflections, lib, melpaBuild }: - melpaBuild { + ruby-factory = callPackage ({ fetchFromGitHub + , fetchurl + , inflections + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-factory"; + ename = "ruby-factory"; version = "20160101.2321"; src = fetchFromGitHub { owner = "sshaw"; @@ -64112,10 +83555,10 @@ rev = "2bb7ccc2fccb5257376a989aa395bc7b9eb1d55d"; sha256 = "15b2rs6m4d511qqkc2gc8k15mbqzrgv6s3hpypajl8nvqa79xnyd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ce422ccc34eb325ce432284e44af48607251da2/recipes/ruby-factory"; sha256 = "0v8009pad0l41zh9r1wzcx1h6vpzhr5rgpq6rb002prxz2lcbd37"; - name = "ruby-factory"; + name = "recipe"; }; packageRequires = [ inflections ]; meta = { @@ -64123,9 +83566,13 @@ license = lib.licenses.free; }; }) {}; - ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ruby-hash-syntax = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-hash-syntax"; + ename = "ruby-hash-syntax"; version = "20180323.1909"; src = fetchFromGitHub { owner = "purcell"; @@ -64133,10 +83580,10 @@ rev = "89fc364a837d7a78ecce34380f09c073a83e30e0"; sha256 = "1nwf3681fa6lfqr14n9wihckpi220hvamv1ppzmrhn4k49vxljy8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5"; - name = "ruby-hash-syntax"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64144,9 +83591,13 @@ license = lib.licenses.free; }; }) {}; - ruby-interpolation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ruby-interpolation = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-interpolation"; + ename = "ruby-interpolation"; version = "20131112.852"; src = fetchFromGitHub { owner = "leoc"; @@ -64154,10 +83605,10 @@ rev = "1978e337601222cedf00e117bf4b5cac15d1f203"; sha256 = "1r2f5jxi6wnkmr1ssvqgshi97gjvxvf3qqc0njg1s33cy39wpqq5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/ruby-interpolation"; sha256 = "07idndxw8vgfrk5zfmjjhmixza35mqxwjhsrbjrq5yy72i5ivznp"; - name = "ruby-interpolation"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64165,9 +83616,14 @@ license = lib.licenses.free; }; }) {}; - ruby-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: - melpaBuild { + ruby-refactor = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , ruby-mode ? null }: + melpaBuild { pname = "ruby-refactor"; + ename = "ruby-refactor"; version = "20160214.850"; src = fetchFromGitHub { owner = "ajvargo"; @@ -64175,10 +83631,10 @@ rev = "e6b7125878a08518bffec6942df0c606f748e9ee"; sha256 = "13008ih4hwa80bn2dbgj551knbvgpriz5sb241rkf7mifmlfzgsi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d223ef5b9e51265c510f1cf7888b621e47bfdcf/recipes/ruby-refactor"; sha256 = "0nwinnnhy72h1ihjlnjl8k8z3yf4nl2z7hfv085gwiacr6nn2rby"; - name = "ruby-refactor"; + name = "recipe"; }; packageRequires = [ ruby-mode ]; meta = { @@ -64186,9 +83642,15 @@ license = lib.licenses.free; }; }) {}; - ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el, ruby-mode ? null }: - melpaBuild { + ruby-test-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcre2el + , ruby-mode ? null }: + melpaBuild { pname = "ruby-test-mode"; + ename = "ruby-test-mode"; version = "20171016.931"; src = fetchFromGitHub { owner = "r0man"; @@ -64196,10 +83658,10 @@ rev = "87f6d770f8d2326c8d36099aeee5d577f3e2af69"; sha256 = "0qiwc2h5hyh6np16a2gfcchbnyh7v5wnzd8idr64cmd9blg3jh8d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode"; sha256 = "06j1q9m08jkwlnkccppf2qlcs48nr8ic9sjdv90rnixc18bw7bpk"; - name = "ruby-test-mode"; + name = "recipe"; }; packageRequires = [ pcre2el ruby-mode ]; meta = { @@ -64207,9 +83669,13 @@ license = lib.licenses.free; }; }) {}; - ruby-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ruby-tools = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-tools"; + ename = "ruby-tools"; version = "20151209.815"; src = fetchFromGitHub { owner = "rejeep"; @@ -64217,10 +83683,10 @@ rev = "6b97066b58a4f82eb2ecea6434a0a7e981aa4c18"; sha256 = "0jd9acycpbdd90hallrl0k5055rypp502qv4c6i286p7f9is4kvq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ruby-tools"; sha256 = "0zpk55rkrqyangyyljxzf0n1icgqnpdzycwack5rji556h5grvjy"; - name = "ruby-tools"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64228,9 +83694,14 @@ license = lib.licenses.free; }; }) {}; - rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rufo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rufo"; + ename = "rufo"; version = "20170718.716"; src = fetchFromGitHub { owner = "danielma"; @@ -64238,10 +83709,10 @@ rev = "85a6d80fb05fef396a8029b8f944c92a53faf8fe"; sha256 = "11klircrdc9z9jfksd6rjgwbb775mziss67mw74673b8iva8n1y7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo"; sha256 = "0pxsifcxic3q54rqj0jbj20hq7f2s4icl57lligf9g0w23qzj239"; - name = "rufo"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -64249,20 +83720,25 @@ license = lib.licenses.free; }; }) {}; - rum-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rum-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rum-mode"; + ename = "rum-mode"; version = "20180126.1622"; src = fetchFromGitHub { owner = "rumlang"; repo = "rum-mode"; - rev = "893b1a26244ef6ea82833a9afbc13cb82c0cfb53"; - sha256 = "0lgahv25a9b2dfgkcm9ipyziiqnr3sb9l2dvzm35khwf3m8dwxgq"; + rev = "161471e6476d232d479f9767535918920811d7bf"; + sha256 = "12fh1fmfnfpkgsya5asxqywimdb5361cvw1cqfmhrm1z5pyjgbd7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9f8ce2dee376f1f34e89e9642c472a148fca77/recipes/rum-mode"; sha256 = "1838w8rk5pgp1hn7a0m83mfw9jin4qv5mkyl68hl3gj7g9lhn7sd"; - name = "rum-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -64270,9 +83746,14 @@ license = lib.licenses.free; }; }) {}; - run-stuff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + run-stuff = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "run-stuff"; + ename = "run-stuff"; version = "20180208.2348"; src = fetchFromGitHub { owner = "ideasman42"; @@ -64280,10 +83761,10 @@ rev = "ed42a7bc9a197ccf1ca87f9937bf98f0a9ed3f92"; sha256 = "1w49v868n3723q6887y4bc5q8spd7xync5d581vvxdpi75qgvr0z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6e9ce2acd859b887f7e161f4b9969be1a0b8ef/recipes/run-stuff"; sha256 = "0zx96m6cval5g4p0lhy9kpyycp2jygaq3y2njhkpij9gl4nb2ll2"; - name = "run-stuff"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -64291,20 +83772,24 @@ license = lib.licenses.free; }; }) {}; - runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + runner = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "runner"; + ename = "runner"; version = "20160524.43"; src = fetchFromGitHub { owner = "thamer"; repo = "runner"; - rev = "a211d57ddc600410d07a8b534920ba905b093d87"; - sha256 = "1ddf5jydpc43wgvw4a669wifij71b4r8zfazcqfdpyfh1j4m591b"; + rev = "e7394d7c9e886788a656a7085b4cf963d6fc318f"; + sha256 = "0gpfszp6bqr3vdr32vr6l0nq9hnic31vnins68hc5hknli91bpsq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a4e051ab45b8036b91aa0c50bd3f93cd85e9d0/recipes/runner"; sha256 = "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx"; - name = "runner"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64312,9 +83797,13 @@ license = lib.licenses.free; }; }) {}; - runtests = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + runtests = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "runtests"; + ename = "runtests"; version = "20150807.131"; src = fetchFromGitHub { owner = "sunesimonsen"; @@ -64322,10 +83811,10 @@ rev = "ed90249f24cc48290018df48b9b9b7172440be3e"; sha256 = "18w6gkpxp0g7rzvnrk8vvr267y768dfik447ssq8jpz3jlr5jnq6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c49160919d310256501d7c71102f8367aae5aa/recipes/runtests"; sha256 = "0m9rqjb5c0yqr2wv5dsdiba21knr63b5pxsqgbkbybi15zgxcicb"; - name = "runtests"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64333,9 +83822,13 @@ license = lib.licenses.free; }; }) {}; - russian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + russian-holidays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "russian-holidays"; + ename = "russian-holidays"; version = "20170109.1340"; src = fetchFromGitHub { owner = "grafov"; @@ -64343,10 +83836,10 @@ rev = "b285a30f29d85c48e3ea4eb93972d34a090c167b"; sha256 = "1mz842gvrscklg2w2r2q2wbj92qr31h895k700j3axqx6k30ni0h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4830900e371e7036225ea434c52204f4d2481a7/recipes/russian-holidays"; sha256 = "0lawjwz296grbvb4a1mm1j754q7mpcanyfln1gqxr339kqx2aqd8"; - name = "russian-holidays"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64354,20 +83847,25 @@ license = lib.licenses.free; }; }) {}; - rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rust-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rust-mode"; - version = "20180322.127"; + ename = "rust-mode"; + version = "20180626.1512"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "07e16c6364bf0362f76c6aa46604453dec3ac640"; - sha256 = "0xjbv9q3mz7chjaz889hyji4xaff8ql2wmk0wir6bnyg6g2k58d1"; + rev = "106aeab800fb3404baf231845d3e3549ec235afa"; + sha256 = "0bcrklyicxh032rrp585rl5mxd26nb61dp6r5bl935rlcmxzsczh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; sha256 = "1i1mw1v99nyikscg2s1m216b0h8svbzmf5kjvjgk9zjiba4cbqzc"; - name = "rust-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -64375,20 +83873,26 @@ license = lib.licenses.free; }; }) {}; - rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: - melpaBuild { + rust-playground = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , rust-mode }: + melpaBuild { pname = "rust-playground"; - version = "20180317.1434"; + ename = "rust-playground"; + version = "20180507.1032"; src = fetchFromGitHub { owner = "grafov"; repo = "rust-playground"; - rev = "cbb8a32c5f69b5acd5e04519f55465b2b241c0a0"; - sha256 = "0791msvihb99ghknkvmmbjkp1zcvn39463y3qg6xj049h2xl9skk"; + rev = "2f22ec74e4158984e0e70cf0bf728bbd42eb661b"; + sha256 = "1p80zghdk3hsfj36z30sfkllqr3b4yi279zkg0la9kfg6785x2cg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rust-playground"; sha256 = "0ml0zr9vz2vjd9wr0v706w4v4qqfzpa56rdzfak2kb5llx53j89v"; - name = "rust-playground"; + name = "recipe"; }; packageRequires = [ emacs rust-mode ]; meta = { @@ -64396,20 +83900,55 @@ license = lib.licenses.free; }; }) {}; - rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rustic = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , s + , xterm-color }: + melpaBuild { + pname = "rustic"; + ename = "rustic"; + version = "20180722.1209"; + src = fetchFromGitHub { + owner = "brotzeit"; + repo = "rustic"; + rev = "15e4d58ded3436b4da4b1a54e5f527ca3d5de22b"; + sha256 = "1jra1l0bz7bxkgsc0jgi9xmf1vipvzazkg40m58hhlbq1hynxm8z"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/716c14a2ed8f5817c09c1ff530a4980c17b44bb3/recipes/rustic"; + sha256 = "13bwrdqmm6xb34k8r72c0r3b9aym5dwsalp63bkfh9k9kq9hic0n"; + name = "recipe"; + }; + packageRequires = [ dash emacs f projectile s xterm-color ]; + meta = { + homepage = "https://melpa.org/#/rustic"; + license = lib.licenses.free; + }; + }) {}; + rvm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rvm"; + ename = "rvm"; version = "20150402.742"; src = fetchFromGitHub { owner = "senny"; repo = "rvm.el"; - rev = "134497bc460990c71ab8fa75431156e62c17da2d"; - sha256 = "1z5psj8mfp0fw8fx6v1sibf8cxhz30yyiwjw17w80f9c24g0j4ii"; + rev = "8e45a9bad8e317ff195f384dab14d3402497dc79"; + sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/rvm"; sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8"; - name = "rvm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64417,9 +83956,14 @@ license = lib.licenses.free; }; }) {}; - ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ryo-modal = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ryo-modal"; + ename = "ryo-modal"; version = "20180331.118"; src = fetchFromGitHub { owner = "Kungsgeten"; @@ -64427,10 +83971,10 @@ rev = "42f874467dfdce59b511f883496ce2624b133dd7"; sha256 = "0k9nmi014vb9c8rymy3w8xbnj1q85xlslpblacz78iqn1kr6wy1z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal"; sha256 = "06pm6grsdcldi1khbjfjp7lpi6f6x3pa5ikspp0xdwijnmi0xrrf"; - name = "ryo-modal"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -64438,20 +83982,24 @@ license = lib.licenses.free; }; }) {}; - s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + s = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "s"; - version = "20180227.51"; + ename = "s"; + version = "20180406.108"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "5968b951bd646c003f2825f31cdf9da94d6f1cae"; - sha256 = "1ai8r6dmlvaa702yr74dbph97kp5xar3h147ahpk3vj1gh5irvnr"; + rev = "03410e6a7a2b11e47e1fea3b7d9899c7df26435e"; + sha256 = "074ny8y68fhnknkjxvrijrk534xzdiwip8wkifxfbwv3va315x83"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; sha256 = "0dars9212z0yv97mj4615h23vd22vy8b6cw2n433z9jhif3aybqa"; - name = "s"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64459,9 +84007,15 @@ license = lib.licenses.free; }; }) {}; - s-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, noflet, s }: - melpaBuild { + s-buffer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , noflet + , s }: + melpaBuild { pname = "s-buffer"; + ename = "s-buffer"; version = "20130605.1424"; src = fetchFromGitHub { owner = "nicferrier"; @@ -64469,10 +84023,10 @@ rev = "f95d234282377f00a2c3a9846681080cb95bb1df"; sha256 = "06ng960fj2ivnwb0hrn0qic5x8hb0sswjzph01zmwhbfnwykhr85"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1bf91527219e7afc8e113134a958f3adb862a5a/recipes/s-buffer"; sha256 = "07kivgzv24psjq1240gwj9wkndq4bhvjh38x552k90m9v6jz8l6m"; - name = "s-buffer"; + name = "recipe"; }; packageRequires = [ noflet s ]; meta = { @@ -64480,9 +84034,14 @@ license = lib.licenses.free; }; }) {}; - s12cpuv2-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + s12cpuv2-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "s12cpuv2-mode"; + ename = "s12cpuv2-mode"; version = "20171013.1351"; src = fetchFromGitHub { owner = "AdamNiederer"; @@ -64490,10 +84049,10 @@ rev = "b17d4cf848dec1e20e66458e5c7ff77a2c051a8c"; sha256 = "1fc132gv48xwrxiw139kc9f5wkhjgsgqdfm6b7v97xj5025zg6hr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c1b9bbdc4deb17636270c7f2be0b43b647c695a/recipes/s12cpuv2-mode"; sha256 = "0mrcf5s7vmkyrsdka7qd2vfcmdy8hzf6a6g14la88rxrv4chv29s"; - name = "s12cpuv2-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -64501,20 +84060,27 @@ license = lib.licenses.free; }; }) {}; - s3ed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + s3ed = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "s3ed"; + ename = "s3ed"; version = "20180204.549"; src = fetchFromGitHub { owner = "mattusifer"; repo = "s3ed"; - rev = "13503cb057bed29cb00a14dffe4472b5cb7748ad"; - sha256 = "1ak5nmay12s4ipmvm1a36kyny05xhzmj7wp6dry391db9n7g2wy0"; + rev = "55b03717caa672b7aebf528b686455fe1d39888c"; + sha256 = "1qh9hy220pzbzandpcxc2p8knl674gyym0qmqi63scx7s8hn8nmh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/32ba78167bd6908b49f340f6da48643ac38f25f2/recipes/s3ed"; sha256 = "08scv3aqnidz28rad5npz7b4pz9dx05rs72qkp3ybkk2vhqf2qwa"; - name = "s3ed"; + name = "recipe"; }; packageRequires = [ dash emacs seq ]; meta = { @@ -64522,9 +84088,13 @@ license = lib.licenses.free; }; }) {}; - sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sackspace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sackspace"; + ename = "sackspace"; version = "20130719.256"; src = fetchFromGitHub { owner = "cofi"; @@ -64532,10 +84102,10 @@ rev = "fd0480eaaf6d3d11fd30ac5feb2da2f4f7572708"; sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/073e92e05c4bd6197a5ad24f470b21a97f5bb7b8/recipes/sackspace"; sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z"; - name = "sackspace"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64543,9 +84113,17 @@ license = lib.licenses.free; }; }) {}; - sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: - melpaBuild { + sage-shell-mode = callPackage ({ cl-lib ? null + , deferred + , emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "sage-shell-mode"; + ename = "sage-shell-mode"; version = "20180215.35"; src = fetchFromGitHub { owner = "sagemath"; @@ -64553,10 +84131,10 @@ rev = "9f07ff835e8d19afe571dbe414afb690c7b1cb5c"; sha256 = "07al41ir1ab0z2m2acvx63scr33bfp3asshjl05shs4j9d4bkmdp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; sha256 = "0ivqiigmp9cf88j4xapzanjpbx692r70wb4i25mnppqsi3jlwxdv"; - name = "sage-shell-mode"; + name = "recipe"; }; packageRequires = [ cl-lib deferred emacs let-alist ]; meta = { @@ -64564,9 +84142,13 @@ license = lib.licenses.free; }; }) {}; - sailfish-scratchbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sailfish-scratchbox = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sailfish-scratchbox"; + ename = "sailfish-scratchbox"; version = "20171202.532"; src = fetchFromGitHub { owner = "vityafx"; @@ -64574,10 +84156,10 @@ rev = "bb5ed0f0b0cd72f2eb1af065b7587ec81866b089"; sha256 = "1b53mdqgcmjay3i3fnxnycv8crqi20yvyv57ybgs2ikfl3v282h2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e76261e7dffcb607839440843b085709c2c90b26/recipes/sailfish-scratchbox"; sha256 = "1s0glsi4fm6is7fv9vy1h14frq8a4bgahkc8w08vqfnpiin2r567"; - name = "sailfish-scratchbox"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64585,9 +84167,14 @@ license = lib.licenses.free; }; }) {}; - salesforce-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + salesforce-utils = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "salesforce-utils"; + ename = "salesforce-utils"; version = "20160813.1854"; src = fetchFromGitHub { owner = "grimnebulin"; @@ -64595,10 +84182,10 @@ rev = "73328baf0fb94ac0d0de645a8f6d42e5ae27f773"; sha256 = "1zsznz9pn9dj672jii6wcvs47yqyxv3dsm5qy1dax1d6gvvbf4zq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/salesforce-utils"; sha256 = "0b70w92zghid6n0ba28dh5r3pckr8jsd1743qyi8vj04ih1dns5i"; - name = "salesforce-utils"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -64606,9 +84193,17 @@ license = lib.licenses.free; }; }) {}; - salt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: - melpaBuild { + salt-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mmm-jinja2 + , mmm-mode + , yaml-mode }: + melpaBuild { pname = "salt-mode"; + ename = "salt-mode"; version = "20180118.1754"; src = fetchFromGitHub { owner = "glynnforrest"; @@ -64616,10 +84211,10 @@ rev = "e46c28ef77663391519646c79641c9d177f70d35"; sha256 = "13zk20bif05qgpqsx9hf6ri7qkxqq7nicp2lb84dg7id24md22x9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; sha256 = "1n7i9d6qpjsdcgbzmbf63y4c7ggxh5wsim8fd0casnrq9bl7ssym"; - name = "salt-mode"; + name = "recipe"; }; packageRequires = [ emacs mmm-jinja2 mmm-mode yaml-mode ]; meta = { @@ -64627,20 +84222,25 @@ license = lib.licenses.free; }; }) {}; - sane-term = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sane-term = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sane-term"; + ename = "sane-term"; version = "20160620.647"; src = fetchFromGitHub { owner = "adamrt"; repo = "sane-term"; - rev = "ef6fd08078f49f2bb3be60855d2d002bb6a5e0d2"; - sha256 = "0aazzq1yqn5mal75hxa6ifx2hnyv0lh800klqvzn26xd7i8xcfrd"; + rev = "034033141b2eb467e2d0b79c8ce1da1f8ff2f013"; + sha256 = "0nhs916h52hxbp479ma01p6i0zfap26n4fvyx83822pisbcd3krb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sane-term"; sha256 = "08b8zlr8qzxfrpg9lqiyam3sb8a8rzak79ra4r6ljjppyj4zmwi7"; - name = "sane-term"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -64648,9 +84248,15 @@ license = lib.licenses.free; }; }) {}; - sass-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, haml-mode, lib, melpaBuild }: - melpaBuild { + sass-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , haml-mode + , lib + , melpaBuild }: + melpaBuild { pname = "sass-mode"; + ename = "sass-mode"; version = "20161006.2326"; src = fetchFromGitHub { owner = "nex3"; @@ -64658,10 +84264,10 @@ rev = "37105f46f6ea3592039f2ea7d0463ae7f042616e"; sha256 = "0gd0n5mh2f1gr2aq65d94zmvc2d04z2yb1baw24m0c11fai4y710"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/sass-mode"; sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800"; - name = "sass-mode"; + name = "recipe"; }; packageRequires = [ cl-lib haml-mode ]; meta = { @@ -64669,9 +84275,13 @@ license = lib.licenses.free; }; }) {}; - sauron = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sauron = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sauron"; + ename = "sauron"; version = "20171105.247"; src = fetchFromGitHub { owner = "djcb"; @@ -64679,10 +84289,10 @@ rev = "50f09bfc6f5bf79e72a1223e345ee720b507e56a"; sha256 = "1k80vzgky4fcakxs3h0yb7g3zpn4382p8zz730kk1ibfd7i56a68"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d30dcc4715422133e1bb00ad7a8e25b060387e4/recipes/sauron"; sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb"; - name = "sauron"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64690,9 +84300,13 @@ license = lib.licenses.free; }; }) {}; - save-load-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + save-load-path = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "save-load-path"; + ename = "save-load-path"; version = "20140206.414"; src = fetchFromGitHub { owner = "rubikitch"; @@ -64700,10 +84314,10 @@ rev = "6cb763a37e2b8af505bff2bcd11fd49c9ea04d66"; sha256 = "0rxcg60lxaabdx9gjj17sfxnr09694viphlhhk355dcc4v5ngbdm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/save-load-path"; sha256 = "1cl9kkv996m2irm9i5n7f020zqzvrsv9dyscc16ca9jsn16msww2"; - name = "save-load-path"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64711,9 +84325,13 @@ license = lib.licenses.free; }; }) {}; - save-visited-files = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + save-visited-files = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "save-visited-files"; + ename = "save-visited-files"; version = "20170228.2250"; src = fetchFromGitHub { owner = "nflath"; @@ -64721,10 +84339,10 @@ rev = "33e8d223f622001f5792c52d8b36661e46b5834c"; sha256 = "1lf03fhmgjz1pixfahdm3cbqs5vbp6bk4qgm2xkm51vzmp39hfim"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f5979e2c2dbfc4e8e3b4d2881cf860c26f63db5/recipes/save-visited-files"; sha256 = "1pmjz27dlp5yrihgsy8q1bwbhkkj3sn7d79ccvljvzxg5jn1grkd"; - name = "save-visited-files"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64732,9 +84350,13 @@ license = lib.licenses.free; }; }) {}; - savekill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + savekill = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "savekill"; + ename = "savekill"; version = "20140417.1929"; src = fetchFromGitHub { owner = "rubikitch"; @@ -64742,10 +84364,10 @@ rev = "67fc94e3d8fe8ce3ca16f90518f6a46479b63e34"; sha256 = "0h8bl28p5xrs9daapcjkslm066a4hqlb764i5nz1db0lwrvr0csm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/savekill"; sha256 = "14hfqia7d2v1dn1wdwsphrrkq9hc57721irms9s9vinign0pqx7h"; - name = "savekill"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64753,9 +84375,13 @@ license = lib.licenses.free; }; }) {}; - say-what-im-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + say-what-im-doing = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "say-what-im-doing"; + ename = "say-what-im-doing"; version = "20160706.1231"; src = fetchFromGitHub { owner = "benaiah"; @@ -64763,10 +84389,10 @@ rev = "5b2ce6783b02805bcac1107a149bfba3852cd9d5"; sha256 = "0wy4hrc44ajl88krp6qy40szl2kl2wc3xjz3y4n250d1v81k25xi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d22ddcd4ad9514fe0c36f299e7463a4b7e771d7/recipes/say-what-im-doing"; sha256 = "1hgh842f7gs2sxy7s6zq57nsqy4jjlnjcga6hwzcx0kw3albgz7x"; - name = "say-what-im-doing"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64774,20 +84400,25 @@ license = lib.licenses.free; }; }) {}; - sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sayid = callPackage ({ cider + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sayid"; - version = "20170509.1215"; + ename = "sayid"; + version = "20180404.1139"; src = fetchFromGitHub { owner = "bpiel"; repo = "sayid"; - rev = "20a92323c3edc060c521aa93edab9dad47646b4f"; - sha256 = "0h0wn5c1n2y3cyslz3kbhksvwy1rnwvb1995949b6qkkzwf0cb4l"; + rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f"; + sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid"; sha256 = "0chz46wmwmsn4ys59pn7lqs4assqy2hv43rvka7kq61jdl4g6fgs"; - name = "sayid"; + name = "recipe"; }; packageRequires = [ cider ]; meta = { @@ -64795,20 +84426,25 @@ license = lib.licenses.free; }; }) {}; - sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sbt-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sbt-mode"; - version = "20180314.1511"; + ename = "sbt-mode"; + version = "20180511.922"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "aebea880b3d3de606d8d8c8d65bc6a5040f52d1f"; - sha256 = "1iqbigqdv1g12q2bg0f6j7xl0z1ra7vy4k8h1wfqxvlb9fqfqr1y"; + rev = "e658af140547cbef495c33535c7f694a501d318c"; + sha256 = "0lv9ridzk9x6rkf7lj21srnszypyq04vqg05vl10zhpz1yqlnbjd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8"; - name = "sbt-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -64816,20 +84452,24 @@ license = lib.licenses.free; }; }) {}; - scad-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scad-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scad-mode"; + ename = "scad-mode"; version = "20180108.1809"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "e7c0851d4023817b2a11df2583d6f406f3b58883"; - sha256 = "1rmjlgx83ck511ikahmn9xkg1qwakm0x3k7yzc2r5jkl40605833"; + rev = "2de6815c7c2ade42e53e86751b9584ac4a5e1ef9"; + sha256 = "188wbnhdgk0820izing6hb7fca1d42hw9bnn405kms157kvcgqsi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; sha256 = "04b4y9jks8sslgmkx54fds8fba9xv54z0cfab52dy99v1301ms3k"; - name = "scad-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64837,9 +84477,14 @@ license = lib.licenses.free; }; }) {}; - scad-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, scad-mode }: - melpaBuild { + scad-preview = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , scad-mode }: + melpaBuild { pname = "scad-preview"; + ename = "scad-preview"; version = "20160206.536"; src = fetchFromGitHub { owner = "zk-phi"; @@ -64847,10 +84492,10 @@ rev = "fee011589671cc8f1296cb6aa81553e5bb699819"; sha256 = "13x00dls59zshz69260pnqmx6ydrjg8p2jdjn1rzgf5dsmwfy3sc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18a043064223906510adbb837f1be329252dbd50/recipes/scad-preview"; sha256 = "0wcd2r60ibbc2mzpq8fvyfc1fy172rf9kzdj51p4jyl51r76i86z"; - name = "scad-preview"; + name = "recipe"; }; packageRequires = [ scad-mode ]; meta = { @@ -64858,9 +84503,13 @@ license = lib.licenses.free; }; }) {}; - scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scala-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scala-mode"; + ename = "scala-mode"; version = "20170802.432"; src = fetchFromGitHub { owner = "ensime"; @@ -64868,10 +84517,10 @@ rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379"; sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; sha256 = "12x377iw085fbkjb034dmcsbi7hma17zkkmbgrhkvfkz8pbgaic8"; - name = "scala-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64879,9 +84528,13 @@ license = lib.licenses.free; }; }) {}; - scf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scf-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scf-mode"; + ename = "scf-mode"; version = "20151121.1848"; src = fetchFromGitHub { owner = "lewang"; @@ -64889,10 +84542,10 @@ rev = "dbfcdcd89034f208d65e181af58e0d73ad09f8b2"; sha256 = "0m7hanpc2skmsz783m0212xd10y31gkj5n6w8gx9s989l1y4i1b8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/376be7f8903dbea69643600ae14e934ee5e2a11b/recipes/scf-mode"; sha256 = "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0"; - name = "scf-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64900,9 +84553,13 @@ license = lib.licenses.free; }; }) {}; - scheme-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scheme-complete = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scheme-complete"; + ename = "scheme-complete"; version = "20170824.713"; src = fetchFromGitHub { owner = "ashinn"; @@ -64910,10 +84567,10 @@ rev = "4c77038048cbcf34b5907f0439c93058a71a2d2b"; sha256 = "14b1bajgvim48j7y4pss73lyxqfyazjnxn1dgvvmkvngm3k1a4y8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/scheme-complete"; sha256 = "1mp9gssd2fx3ra2bjd7w311hwmflhybr5x574qb12603gjkgrp1h"; - name = "scheme-complete"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64921,20 +84578,24 @@ license = lib.licenses.free; }; }) {}; - scheme-here = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scheme-here = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scheme-here"; + ename = "scheme-here"; version = "20141028.18"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "scheme-here"; - rev = "430ba017cc530865218de23a8f7985095a58343f"; - sha256 = "09cvrphrnbj8avnlqqv6scjz17cn6zm6mzghjn3vxfr4hql66rir"; + rev = "fccf668bb8f1d481be6e70fffa2b52ea681e32a5"; + sha256 = "1m5aqcm4pd0m0rz3r09i52q55nlx3ga7hca9xlzf0gwcyyn8xzyg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/scheme-here"; sha256 = "04lmkf3zc396anlp9s9irdkqavsc0lzlpzprswd4r2kp4xp7kcks"; - name = "scheme-here"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64942,19 +84603,24 @@ license = lib.licenses.free; }; }) {}; - schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + schrute = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "schrute"; + ename = "schrute"; version = "20170521.1140"; src = fetchgit { url = "https://bitbucket.org/shackra/dwight-k.-schrute"; rev = "59faa6c4232ae183cea93237301acad8c0763997"; sha256 = "1w5l1vf4cn4psrxgnq5n6j3zw644s70inpa17vsvng3sk5r8crcb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute"; sha256 = "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy"; - name = "schrute"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -64962,9 +84628,13 @@ license = lib.licenses.free; }; }) {}; - scion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scion = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scion"; + ename = "scion"; version = "20130315.555"; src = fetchFromGitHub { owner = "nominolo"; @@ -64972,10 +84642,10 @@ rev = "99b4589175665687181a932cd836850205625f71"; sha256 = "0ark720g0nrdqri5bjdpss6kn6k3hz3w3zdvy334wws05mkb17y4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/faf180d15c3847fc6f832866338494dd99b6654d/recipes/scion"; sha256 = "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d"; - name = "scion"; + name = "recipe"; }; packageRequires = []; meta = { @@ -64983,9 +84653,17 @@ license = lib.licenses.free; }; }) {}; - sclang-extensions = callPackage ({ auto-complete, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + sclang-extensions = callPackage ({ auto-complete + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "sclang-extensions"; + ename = "sclang-extensions"; version = "20160508.2038"; src = fetchFromGitHub { owner = "chrisbarrett"; @@ -64993,10 +84671,10 @@ rev = "e9cc79732f16fdb582129303110c163dcc0d6da0"; sha256 = "164dn5615bxvya4n58lly9r739va1xzm00wyfg4shcwgnwm3byqb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2095549944ca28d6a2d6a90d5ab3ba9c27997a8/recipes/sclang-extensions"; sha256 = "00nirxawsngvlx7bmf5hqg2wk0l1v5pi09r6phzd0q8gyq3kmbbn"; - name = "sclang-extensions"; + name = "recipe"; }; packageRequires = [ auto-complete dash emacs s ]; meta = { @@ -65004,9 +84682,14 @@ license = lib.licenses.free; }; }) {}; - sclang-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + sclang-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "sclang-snippets"; + ename = "sclang-snippets"; version = "20130513.51"; src = fetchFromGitHub { owner = "ptrv"; @@ -65014,10 +84697,10 @@ rev = "c840a416b96f83bdd70491e3d1fbe2f1ae8b3f58"; sha256 = "0vbcghgapwdf3jgjnjdla17dhf5mkmwapz4a8fmlr7sw1wqvj857"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/680e5757e074c16efd31084a7dc5dcea339597f5/recipes/sclang-snippets"; sha256 = "0q1bh316v737a0hm9afijk1spvg144cgrf45jm0bpd60zhiv7bb2"; - name = "sclang-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -65025,20 +84708,26 @@ license = lib.licenses.free; }; }) {}; - scp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scp = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scp"; + ename = "scp"; version = "20171203.1851"; src = fetchFromGitHub { owner = "tszg"; repo = "emacs-scp"; - rev = "447305db246d9c9240678dd9c734ed920300463a"; - sha256 = "0f8dv17rjknlkw32dd4xmdxbkwby5dn8mychaqwlk8vanhm74n7w"; + rev = "3f437ee9f52df7d9f4c57275a8cfb7f06c3c26ff"; + sha256 = "013i4152irybladx0lyi1kriaxpn6dnpnc9bqdxngmgycmwsrn4r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62f5c9284de51373a4015cf053d66977cf00d175/recipes/scp"; sha256 = "1q7v2cr89syw682zqxhavaggv6aqi69rl94vm8bmn745a868gliw"; - name = "scp"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -65046,9 +84735,14 @@ license = lib.licenses.free; }; }) {}; - scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: - melpaBuild { + scpaste = callPackage ({ fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild }: + melpaBuild { pname = "scpaste"; + ename = "scpaste"; version = "20171101.922"; src = fetchFromGitHub { owner = "technomancy"; @@ -65056,10 +84750,10 @@ rev = "10559d6b0feb34dc60f039a237052adcca77b5d9"; sha256 = "10z8jpi6f3mhq8ymxcv1lc291sqr2kzvgwx8mlmck0bmlys12pqc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9007fb32097bc63731c3615dae9342fcef2558a2/recipes/scpaste"; sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1"; - name = "scpaste"; + name = "recipe"; }; packageRequires = [ htmlize ]; meta = { @@ -65067,9 +84761,13 @@ license = lib.licenses.free; }; }) {}; - scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scratch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scratch"; + ename = "scratch"; version = "20170614.1401"; src = fetchFromGitHub { owner = "ieure"; @@ -65077,10 +84775,10 @@ rev = "2cdf2b841ce7a0987093f65b0cc431947549f897"; sha256 = "0wscsndynjmnliajqaz28r1ww81j8wh84zwaaswx51abhwgl0idf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b46813f928eadfa08a1d4bf94ceeb96dbc2a7c72/recipes/scratch"; sha256 = "1an30pr64fz13s6lghlcb36b7hn3961vv0yipfp9s140ccygdvh7"; - name = "scratch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65088,9 +84786,13 @@ license = lib.licenses.free; }; }) {}; - scratch-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scratch-ext = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scratch-ext"; + ename = "scratch-ext"; version = "20140103.2116"; src = fetchFromGitHub { owner = "kyanagi"; @@ -65098,10 +84800,10 @@ rev = "388c53cddd0466b451264894667ed64a6947ad67"; sha256 = "0ng0by647r49mia7vmjqc97gwlwgs8kmaz0lw2y54jdz8m0bbngp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a142d336a57d075dfd5caf44fa1c1254b83ac728/recipes/scratch-ext"; sha256 = "031wxz10k1q4bi5hywhcw1vzi41d5pv5hc09x8jk9s5nzyssvc0y"; - name = "scratch-ext"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65109,9 +84811,13 @@ license = lib.licenses.free; }; }) {}; - scratch-log = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scratch-log = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scratch-log"; + ename = "scratch-log"; version = "20141114.2343"; src = fetchFromGitHub { owner = "mori-dev"; @@ -65119,10 +84825,10 @@ rev = "1168f7f16d36ca0f4ddf2bb98881f8db62cc5dc0"; sha256 = "030mcq0cmamizvra8jh2x76f71g5apiavwb10c28j62rl0r5bisk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bec9692973db8853f9d329aebc0cc9e81bb34003/recipes/scratch-log"; sha256 = "1yp3p0dzhmqrd0krqii3x79k4zc3p59148cijhk6my4n1xqnhs69"; - name = "scratch-log"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65130,9 +84836,13 @@ license = lib.licenses.free; }; }) {}; - scratch-message = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scratch-message = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scratch-message"; + ename = "scratch-message"; version = "20170107.536"; src = fetchFromGitHub { owner = "thisirs"; @@ -65140,10 +84850,10 @@ rev = "3ecc7f5e3b8a597ebd1492fd426d3720a7f34302"; sha256 = "1kb664r3gbhv2ja8jyyzfw22db99ini8qbgzcy9xsl56lha4x4xi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24c5ff6b643de9fb79334eff57b702281b20bc10/recipes/scratch-message"; sha256 = "1dl9d4gvicwnb662ir9azywjmmm7xv4d0sz42z7mmwy8hl9hi91b"; - name = "scratch-message"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65151,9 +84861,14 @@ license = lib.licenses.free; }; }) {}; - scratch-palette = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: - melpaBuild { + scratch-palette = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popwin }: + melpaBuild { pname = "scratch-palette"; + ename = "scratch-palette"; version = "20150225.42"; src = fetchFromGitHub { owner = "zk-phi"; @@ -65161,10 +84876,10 @@ rev = "f6803b448079f4a81cc699cec7442ef543cd5818"; sha256 = "00b4r8bqlxc29k18vig0164d5c9fp5bp5q26d28lwr4f0s4a71d2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b737bd93008e10ff446b347f405541a6f4127716/recipes/scratch-palette"; sha256 = "0m6hc2amwnnii4y189kkridhapl9jipkmadvrmwvspgy3lxhlafs"; - name = "scratch-palette"; + name = "recipe"; }; packageRequires = [ popwin ]; meta = { @@ -65172,9 +84887,14 @@ license = lib.licenses.free; }; }) {}; - scratch-pop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: - melpaBuild { + scratch-pop = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popwin }: + melpaBuild { pname = "scratch-pop"; + ename = "scratch-pop"; version = "20170510.758"; src = fetchFromGitHub { owner = "zk-phi"; @@ -65182,10 +84902,10 @@ rev = "7f4172c792b10bd38898dd8963cf0ade91921869"; sha256 = "0mwjq7z0cpaqhqygzhfcpfqyx8376jsc1g2874np6ff49389bj4d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420fb3408b64f1a3e42316262016728c483bf0c1/recipes/scratch-pop"; sha256 = "0s7g1fbnc5hgz8gqmp1lynj5g7vvxisj7scxx5wil9qpn2zyggq1"; - name = "scratch-pop"; + name = "recipe"; }; packageRequires = [ popwin ]; meta = { @@ -65193,9 +84913,15 @@ license = lib.licenses.free; }; }) {}; - scratches = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scratches = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scratches"; + ename = "scratches"; version = "20151005.2116"; src = fetchFromGitHub { owner = "cheunghy"; @@ -65203,10 +84929,10 @@ rev = "9441afe6396ca38f08029123fab5d87429cbf315"; sha256 = "10hmy0p4pkrzvvyisk4rjc6hqqyk2sir1rszqgmkhrdywl010vlc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3691aaaed27d0cf67af417f75fbb693ab856bd47/recipes/scratches"; sha256 = "0409v1wi10q48rrh8iib6dw9icmswfrpjx9x7xcma994z080d2fy"; - name = "scratches"; + name = "recipe"; }; packageRequires = [ dash f ]; meta = { @@ -65214,20 +84940,25 @@ license = lib.licenses.free; }; }) {}; - scribble-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scribble-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scribble-mode"; + ename = "scribble-mode"; version = "20160124.1528"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "scribble-mode"; - rev = "34e9e5edb921813b6483e0fefa848efb6ee4b314"; - sha256 = "0598byqpz2q6yi2q4dwd77jj9z3n99z34d3an51s9m2za0nh1qvp"; + rev = "7e83ddf30b7089607c1653eced3edef459d4ad16"; + sha256 = "14bpdn89ry1im84zcx3jq64q2gl0jxfz9x7fy0szdas7ycrhjghz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6469c2b389d757003da69da727905228eb564d50/recipes/scribble-mode"; sha256 = "0idagikxhr86h2k6fb45zdzg73wpmpiszx0gi6d8jx7s1xqd6s50"; - name = "scribble-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -65235,30 +84966,42 @@ license = lib.licenses.free; }; }) {}; - scrooge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, thrift }: - melpaBuild { + scrooge = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , thrift }: + melpaBuild { pname = "scrooge"; - version = "20170728.1106"; + ename = "scrooge"; + version = "20180630.322"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "emacs-scrooge"; - rev = "fb55c64eb2ae4db57b14bc99d2e411d81b2c5c2a"; - sha256 = "1hhbm7jmngv69l81vaj0fhpzkvw4sf7q5mdf9mm27mwd2jk70prl"; + rev = "0a8c58e9e6708abe4ef7e415bc1e0472318bb1b0"; + sha256 = "1my5yz9ppr7d90ad94mkqzkp20c8bym6mdi7jwab2yisbzykmwzc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e3623181fa771dc94a7026eb58ac81fe9d9fc68/recipes/scrooge"; sha256 = "1gisyfzawrgg55jbwrbnri314f6zd38di19iwy0b2dim8in4sjpg"; - name = "scrooge"; + name = "recipe"; }; - packageRequires = [ emacs thrift ]; + packageRequires = [ cl-lib dash emacs thrift ]; meta = { homepage = "https://melpa.org/#/scrooge"; license = lib.licenses.free; }; }) {}; - scss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scss-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scss-mode"; + ename = "scss-mode"; version = "20180123.908"; src = fetchFromGitHub { owner = "antonj"; @@ -65266,10 +85009,10 @@ rev = "cf58dbec5394280503eb5502938f3b5445d1b53d"; sha256 = "0raja19l0igwr0pn0ghr1pj1d8i9k3m3764ma4r8nwzxcj9qw4ja"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/scss-mode"; sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv"; - name = "scss-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65277,20 +85020,29 @@ license = lib.licenses.free; }; }) {}; - sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }: - melpaBuild { + sdcv = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup + , pos-tip + , showtip }: + melpaBuild { pname = "sdcv"; + ename = "sdcv"; version = "20180211.833"; src = fetchFromGitHub { owner = "stardiviner"; repo = "sdcv.el"; - rev = "7cb1f8ec0fa4bb25669534d62bff58df38a992a8"; + rev = "50ac95be1369fe8cf98d6254e05d6ac343dad421"; sha256 = "09i7zsizwq5k79wi5sgcfqdlbx0nazrnw3nd6hkn2vfrcffb7pf1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv"; sha256 = "1bj3b17sjd9fha686g6w191l4p8a1p8sb9br65xf54n6nd9bmv7a"; - name = "sdcv"; + name = "recipe"; }; packageRequires = [ cl-lib emacs popup pos-tip showtip ]; meta = { @@ -65298,9 +85050,14 @@ license = lib.licenses.free; }; }) {}; - sdlang-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sdlang-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sdlang-mode"; + ename = "sdlang-mode"; version = "20161130.2311"; src = fetchFromGitHub { owner = "CyberShadow"; @@ -65308,10 +85065,10 @@ rev = "d42a6eedefeb44919fbacf58d302b6df18f05bbc"; sha256 = "0r6sm7b15scmjcpdcqvm55hdsvyw5d2g7mrfhsx2hs8sqz64gkwc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/691af79137015f15a3d383439e534e255ba4b36d/recipes/sdlang-mode"; sha256 = "1z6n374z55dr2c6xdwgvmpznd5gk9y23k136zmy29b68j2kswj6l"; - name = "sdlang-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -65319,9 +85076,13 @@ license = lib.licenses.free; }; }) {}; - search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + search-web = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "search-web"; + ename = "search-web"; version = "20150312.403"; src = fetchFromGitHub { owner = "tomoya"; @@ -65329,10 +85090,10 @@ rev = "c4ae86ac1acfc572b81f3d78764bd9a54034c331"; sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f1a3697649ccf69c8eb177c31ec4246b98f503b/recipes/search-web"; sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36"; - name = "search-web"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65340,9 +85101,14 @@ license = lib.licenses.free; }; }) {}; - searchq = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + searchq = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "searchq"; + ename = "searchq"; version = "20150829.511"; src = fetchFromGitHub { owner = "boyw165"; @@ -65350,10 +85116,10 @@ rev = "dd510d55ad66a82c6ef022cfe7c4a73ad5365f82"; sha256 = "0zs08vxmjb3y4dnfq6djnrhmkgyhhwd5zylrjisrd4y7f089fyh4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9738c1be0511540bfd8f324334518c72c9c38c94/recipes/searchq"; sha256 = "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr"; - name = "searchq"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -65361,9 +85127,13 @@ license = lib.licenses.free; }; }) {}; - seclusion-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + seclusion-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "seclusion-mode"; + ename = "seclusion-mode"; version = "20121118.1553"; src = fetchFromGitHub { owner = "dleslie"; @@ -65371,10 +85141,10 @@ rev = "9634e76c52bfb7200ff0f9f01404f743429e9ef0"; sha256 = "15cjhwjiwmrfzmr74hbw5s92si2qdb8i97nmkbsgkj3444rxg239"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b087d151b00f5251b15ebb071896995874afb274/recipes/seclusion-mode"; sha256 = "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m"; - name = "seclusion-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65382,19 +85152,27 @@ license = lib.licenses.free; }; }) {}; - secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, s }: - melpaBuild { + secretaria = callPackage ({ alert + , emacs + , f + , fetchgit + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "secretaria"; + ename = "secretaria"; version = "20180104.720"; src = fetchgit { url = "https://bitbucket.org/shackra/secretaria.el"; rev = "e9d59d264ba30f8055a1ee1576fe9296d5b41055"; sha256 = "10ijr9babki05j3wlhwsym85q868kirivsml7jlmi1csnn2y3c6b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria"; sha256 = "1a8jf91wplzazssh0s8ld0g8rp57gdfvxlsyn643w3mbp3ny8ybv"; - name = "secretaria"; + name = "recipe"; }; packageRequires = [ alert emacs f s ]; meta = { @@ -65402,9 +85180,40 @@ license = lib.licenses.free; }; }) {}; - seeing-is-believing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + see-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , language-detection + , lib + , melpaBuild }: + melpaBuild { + pname = "see-mode"; + ename = "see-mode"; + version = "20180510.1741"; + src = fetchFromGitHub { + owner = "marcelino-m"; + repo = "see-mode"; + rev = "db9e4324f9dcc14d5125cb6a79d6c9fad5b14626"; + sha256 = "0w595mpdd999j7m9dsy18fy7pr9nq4dm666lvjvlzzgdgwwf0zvc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6ee64e846c471926194fcecc4824a06effc0aa5b/recipes/see-mode"; + sha256 = "1124x11vxci9mvx3zn56v5h9dhmy7bzd5pilqdgzp3hzjmyydnfi"; + name = "recipe"; + }; + packageRequires = [ emacs language-detection ]; + meta = { + homepage = "https://melpa.org/#/see-mode"; + license = lib.licenses.free; + }; + }) {}; + seeing-is-believing = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "seeing-is-believing"; + ename = "seeing-is-believing"; version = "20170214.520"; src = fetchFromGitHub { owner = "jcinnamond"; @@ -65412,10 +85221,10 @@ rev = "fbbe246c0fda87bb26227bb826eebadb418a220f"; sha256 = "1h1b48s2iirswdlvfz41jbflm4x09ksc2lycrc1awzlwd6r8hdhg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14bb6de5c051a68284ee1a7e25ecb2c7c19ffd3b/recipes/seeing-is-believing"; sha256 = "05aja5xycb3kpmxyi234l50h98f5m1fil6ll4f2xkpxwv31ba5rb"; - name = "seeing-is-believing"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65423,9 +85232,14 @@ license = lib.licenses.free; }; }) {}; - seethru = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, shadchen }: - melpaBuild { + seethru = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , shadchen }: + melpaBuild { pname = "seethru"; + ename = "seethru"; version = "20150218.1029"; src = fetchFromGitHub { owner = "Benaiah"; @@ -65433,10 +85247,10 @@ rev = "d87e231f99313bea75b1e69e48c0f32968c82060"; sha256 = "0qd462qbqdx53xh3ddf76chiljxf6s43r28v2ix85gsig7nm5pgr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7945732d9789143b386603dd7c96ef14ba68ddaf/recipes/seethru"; sha256 = "1lcwslkki9s15xr2dmh2iic4ax8ia0j20hjnjmkv612wv04b806v"; - name = "seethru"; + name = "recipe"; }; packageRequires = [ shadchen ]; meta = { @@ -65444,20 +85258,27 @@ license = lib.licenses.free; }; }) {}; - sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + sekka = callPackage ({ cl-lib ? null + , concurrent + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "sekka"; + ename = "sekka"; version = "20170803.547"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "61840b57d9ae32bf8e297b175942590a1319c7e7"; - sha256 = "05vj12l88s29wnkpvgzlbypv9hkmy1hqgv9hvav6v4kmdykl5w1b"; + rev = "d1fd5d47aacba723631d5d374169a45ff2051c41"; + sha256 = "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp"; - name = "sekka"; + name = "recipe"; }; packageRequires = [ cl-lib concurrent popup ]; meta = { @@ -65465,9 +85286,13 @@ license = lib.licenses.free; }; }) {}; - select-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + select-themes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "select-themes"; + ename = "select-themes"; version = "20160220.1706"; src = fetchFromGitHub { owner = "jasonm23"; @@ -65475,10 +85300,10 @@ rev = "236f54287519a3ea6dd7b3992d053e4f4ff5d0fe"; sha256 = "1c9yv1kjcd0jrzgw99q9p4kzj980f261mjcsggbcw806wb0iw1xn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4e7d01da10a1a1f7fe563031af5d3f9694cea33/recipes/select-themes"; sha256 = "18ydv7240vcqppg1i7n8sy18hy0lhpxz17947kxs7mvj4rl4wd84"; - name = "select-themes"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65486,9 +85311,13 @@ license = lib.licenses.free; }; }) {}; - selected = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + selected = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "selected"; + ename = "selected"; version = "20170222.34"; src = fetchFromGitHub { owner = "Kungsgeten"; @@ -65496,10 +85325,10 @@ rev = "03edaeac90bc6000d263f03be3d889b4685e1bf7"; sha256 = "1d72vw1dcxnyir7vymr3cfxal5dndm1pmm192aa9bcyrcg7aq39g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/selected"; sha256 = "1zk9jvsiw30zqh68xjx2zcc71php68ryiwqmws52ghqiaifj50gf"; - name = "selected"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65507,9 +85336,13 @@ license = lib.licenses.free; }; }) {}; - selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + selectric-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "selectric-mode"; + ename = "selectric-mode"; version = "20170216.311"; src = fetchFromGitHub { owner = "rbanffy"; @@ -65517,10 +85350,10 @@ rev = "a35cb3815caceaf273ad7d16ac3b2dd3c7a3003e"; sha256 = "04bj71080wqybznyx63dawhppq6x3p88x1j56gvl8kvxv2hwzgzf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode"; sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4"; - name = "selectric-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65528,9 +85361,14 @@ license = lib.licenses.free; }; }) {}; - semi = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }: - melpaBuild { + semi = callPackage ({ fetchFromGitHub + , fetchurl + , flim + , lib + , melpaBuild }: + melpaBuild { pname = "semi"; + ename = "semi"; version = "20180204.1448"; src = fetchFromGitHub { owner = "wanderlust"; @@ -65538,10 +85376,10 @@ rev = "44aa82ecf78273d8ff4c84f2121b885fb7149f41"; sha256 = "1wl12gsz9pn4wzgbffv3ymr49kcxjggc2jx19kxqyjmwdnw004yf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78849c2d1df187b7f0ef4c34985a341e640ad3e/recipes/semi"; sha256 = "01wk3lgln5lac65hp6v83d292bdk7544z23xa1v6a756nhybwv25"; - name = "semi"; + name = "recipe"; }; packageRequires = [ flim ]; meta = { @@ -65549,9 +85387,14 @@ license = lib.licenses.free; }; }) {}; - sendto = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sendto = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sendto"; + ename = "sendto"; version = "20160425.550"; src = fetchFromGitHub { owner = "lujun9972"; @@ -65559,10 +85402,10 @@ rev = "076b81d7a53f75b0a59b0ef3448f35570567054c"; sha256 = "13qqprxz87cv3sjlq5hj0jp0qcfm3djfgasga8cc84ykrcc47p9f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31f7c2f97dd186cb77dc8a106baf5e087792c6ab/recipes/sendto"; sha256 = "00ifasqpmggr4bhdyymzr215840y0ayfnfp0mh7wj99mr6f3zfq0"; - name = "sendto"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -65570,9 +85413,15 @@ license = lib.licenses.free; }; }) {}; - sensitive = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sequences }: - melpaBuild { + sensitive = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sequences }: + melpaBuild { pname = "sensitive"; + ename = "sensitive"; version = "20170818.551"; src = fetchFromGitHub { owner = "timvisher"; @@ -65580,10 +85429,10 @@ rev = "69dd6125a41d8b55f4b6ba61daa4d1aa1f716fa8"; sha256 = "0nj71ds4frfi16hsfswmp89rfxkvvdvhdlsqizzi9cbvr49s0l1f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e5468ce136fabe59e1434f8a7f265f41c5e64c1/recipes/sensitive"; sha256 = "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3"; - name = "sensitive"; + name = "recipe"; }; packageRequires = [ emacs sequences ]; meta = { @@ -65591,20 +85440,27 @@ license = lib.licenses.free; }; }) {}; - sentence-navigation = callPackage ({ ample-regexps, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sentence-navigation = callPackage ({ ample-regexps + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sentence-navigation"; - version = "20171215.1007"; + ename = "sentence-navigation"; + version = "20180408.919"; src = fetchFromGitHub { owner = "noctuid"; repo = "emacs-sentence-navigation"; - rev = "b2fc2de3aaf1e2e7fd12d6d75a5b6c4b23614022"; - sha256 = "0s7xqs3r9ygc6vcba8ghsd7rbrgy7dkis3y1d36ik4w5dqh9qlvi"; + rev = "7c5d2edeaed01196aec25031782e89adeaa089f0"; + sha256 = "15za4fg7c8fsih86wz1npyx6gdmw0xhizklfsyfh84416dsmgswp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d097cf9b6c9c1606505d3988a2afdd7b066abc8/recipes/sentence-navigation"; sha256 = "1p3ch1ab06v038h130fsxpbq45d1yadl67i2ih4l4fh3xah5997m"; - name = "sentence-navigation"; + name = "recipe"; }; packageRequires = [ ample-regexps cl-lib emacs ]; meta = { @@ -65612,20 +85468,25 @@ license = lib.licenses.free; }; }) {}; - seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + seoul256-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "seoul256-theme"; - version = "20180331.1939"; + ename = "seoul256-theme"; + version = "20180505.57"; src = fetchFromGitHub { owner = "anandpiyer"; repo = "seoul256-emacs"; - rev = "237cea479c5635fda908c0229beada080ca6c17f"; - sha256 = "1dd8vvvkm6h1ljxv15v4mcsb9nxf0d4v5yk6wnpx185l2936gykc"; + rev = "8e76d0207489964ef780420723d49e409f68f7d1"; + sha256 = "1fcnq2jh330va1xvpfh6nnd9gbjjisv0ham44zwi5lh0j7424jkj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/seoul256-theme"; sha256 = "1nvhnyfvmpqg0a54nq73lhz3h9g94zkbix13bbzv9bp1lg8v6w1x"; - name = "seoul256-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -65633,9 +85494,14 @@ license = lib.licenses.free; }; }) {}; - sequences = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sequences = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sequences"; + ename = "sequences"; version = "20170818.552"; src = fetchFromGitHub { owner = "timvisher"; @@ -65643,10 +85509,10 @@ rev = "564ebbd93b0beea4e75acfbf824350e90b5d5738"; sha256 = "0ym2bl9dpsglz35is0iwxfw5w7zs9398bkln8lgv28nr6kw0ym4s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf716df68fb2d6a41fe75fac0b41e356bddcf30/recipes/sequences"; sha256 = "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh"; - name = "sequences"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -65654,9 +85520,13 @@ license = lib.licenses.free; }; }) {}; - sequential-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sequential-command = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sequential-command"; + ename = "sequential-command"; version = "20170925.1740"; src = fetchFromGitHub { owner = "rubikitch"; @@ -65664,10 +85534,10 @@ rev = "a48cbcbe273b33edd3ae56e68f44b4100fa3a48a"; sha256 = "1f05amz22klvs2yqyw7n5bmivgdn5zc7vkv5x6bgc9b5k977lggj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/sequential-command"; sha256 = "0qhrpwcgn89sqdj8yhgax0qk81ycdanlgwx25cxy8wnxkqqcvh9m"; - name = "sequential-command"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65675,9 +85545,21 @@ license = lib.licenses.free; }; }) {}; - servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }: - melpaBuild { + servant = callPackage ({ ansi + , commander + , dash + , epl + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , shut-up + , web-server }: + melpaBuild { pname = "servant"; + ename = "servant"; version = "20140216.419"; src = fetchFromGitHub { owner = "cask"; @@ -65685,10 +85567,10 @@ rev = "4d2aa8250b54b28e6e7ee4cd5ebd98a33db2c134"; sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/servant"; sha256 = "0h8xsg37cvc5r8vkclf7d3gbf6gh4k5pmbiyhwpkbrxwjyl1sl21"; - name = "servant"; + name = "recipe"; }; packageRequires = [ ansi commander dash epl f s shut-up web-server ]; meta = { @@ -65696,9 +85578,17 @@ license = lib.licenses.free; }; }) {}; - serverspec = callPackage ({ dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + serverspec = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "serverspec"; + ename = "serverspec"; version = "20150623.455"; src = fetchFromGitHub { owner = "k1LoW"; @@ -65706,10 +85596,10 @@ rev = "b6dfe82af9869438de5e5d860ced196641f372c0"; sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a4f4757d8886d178a85d4bc8ac9399a99d8c4d4/recipes/serverspec"; sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id"; - name = "serverspec"; + name = "recipe"; }; packageRequires = [ dash f helm s ]; meta = { @@ -65717,9 +85607,14 @@ license = lib.licenses.free; }; }) {}; - services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + services = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "services"; + ename = "services"; version = "20170802.430"; src = fetchFromGitHub { owner = "davep"; @@ -65727,10 +85622,10 @@ rev = "04c7986041a33dfa0b0ae57c7d6fbd600548c596"; sha256 = "0ycfkskkdlmc0l75z5a8f66wq5mvb24c4kz19a6kqs8rwm2ygz35"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services"; sha256 = "02lgmpbw52ps6z4p9gwzvh9iaxisq5mb0n9aml9ajxac1473vpcd"; - name = "services"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -65738,9 +85633,39 @@ license = lib.licenses.free; }; }) {}; - session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sesman = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "sesman"; + ename = "sesman"; + version = "20180719.213"; + src = fetchFromGitHub { + owner = "vspinu"; + repo = "sesman"; + rev = "43b0c9ef2a9ba7608d27c24fb0daedc1deabf179"; + sha256 = "1w0fy74snc7gy7cmxfmlbvmdgpywi3grj5ph72liinxlpl1cw218"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/31110e9bd82ad9c817e6cb597fa9c26c4cdc93ed/recipes/sesman"; + sha256 = "106jcdsp7rhkr4bbyprcld5fxcnimfcyx0cwcpzhd0b4vh3v3qvg"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/sesman"; + license = lib.licenses.free; + }; + }) {}; + session = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "session"; + ename = "session"; version = "20120510.1700"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -65748,10 +85673,10 @@ rev = "19ea0806873daac3539a4b956e15655e99e3dd6c"; sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/session"; sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx"; - name = "session"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65759,9 +85684,13 @@ license = lib.licenses.free; }; }) {}; - seti-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + seti-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "seti-theme"; + ename = "seti-theme"; version = "20161208.836"; src = fetchFromGitHub { owner = "caisah"; @@ -65769,10 +85698,10 @@ rev = "cbfef2fc15d19ce4c8326e65fafdd61737077132"; sha256 = "191mvz6d6j764q1sj2496i6lq0q42b5qh5zfdvf0yl39pzbwx8jx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/088924b78575359996cf30745497b287cfb11f37/recipes/seti-theme"; sha256 = "1mwkx3hynabwr0a2rm1bh91h7xf38a11h1fb6ys8s3mnr68csd9z"; - name = "seti-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65780,9 +85709,13 @@ license = lib.licenses.free; }; }) {}; - sexp-move = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + sexp-move = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sexp-move"; + ename = "sexp-move"; version = "20150915.1030"; src = fetchFromGitLab { owner = "elzair"; @@ -65790,10 +85723,10 @@ rev = "117f7a91ab7c25e438413753e916570122011ce7"; sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sexp-move"; sha256 = "0sdm3kr4594fy9hk8yljj2iwa40bgs8nqpwwl2a60r060spz54z9"; - name = "sexp-move"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65801,20 +85734,24 @@ license = lib.licenses.free; }; }) {}; - sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sexy-monochrome-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sexy-monochrome-theme"; - version = "20171125.1212"; + ename = "sexy-monochrome-theme"; + version = "20180526.108"; src = fetchFromGitHub { owner = "voloyev"; repo = "sexy-monochrome-theme"; - rev = "529a1c75196391d7f2f1f42cf9d9f4a52c7d9007"; - sha256 = "0myrdmp5r2lr1n54cmrn8p0xi4kjizx8nclxaqxn99bc7g6wlcf1"; + rev = "bf4b6ccd63b9dfbe14035963a80057e1f56ad1e7"; + sha256 = "0m2m4ini1dzk7hzjy7zqn90vih9n6kiz1amgv4gyhzarbwj7zyw6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme"; sha256 = "0rlx4029zxrnzzqspn8zrp3q6w0n46q24qk7za46hvxdsmgdpxbq"; - name = "sexy-monochrome-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65822,9 +85759,14 @@ license = lib.licenses.free; }; }) {}; - shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shackle = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shackle"; + ename = "shackle"; version = "20171209.1401"; src = fetchFromGitHub { owner = "wasamasa"; @@ -65832,10 +85774,10 @@ rev = "4189c1c773aab533969b587f7801ffbcd1d7d613"; sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6"; - name = "shackle"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -65843,9 +85785,13 @@ license = lib.licenses.free; }; }) {}; - shadchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shadchen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shadchen"; + ename = "shadchen"; version = "20141102.1039"; src = fetchFromGitHub { owner = "VincentToups"; @@ -65853,10 +85799,10 @@ rev = "35f2b9c304eec990c16efbd557198289dc7cbb1f"; sha256 = "0phivbhjdw76gzrx35rp0zybqfb0fdy2hjllf72qf1r0r5gxahl8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a2a36fbfcf457eab05c1ff31cb9c2f68686094e/recipes/shadchen"; sha256 = "1r1mfmv4cdlc8kzjiqz81kpqdrwbnyciwdgg6n5x0yi4apwpvnl4"; - name = "shadchen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65864,20 +85810,25 @@ license = lib.licenses.free; }; }) {}; - shader-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shader-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shader-mode"; - version = "20180105.1500"; + ename = "shader-mode"; + version = "20180518.457"; src = fetchFromGitHub { owner = "midnightSuyama"; repo = "shader-mode"; - rev = "c141841feeee48299cff6651ed2e201a052e0570"; - sha256 = "177kn9zrnzsayx9n9ym9k9a1rrbn8sycv1v67knpca05wkxg53zi"; + rev = "d7dc8d0d6fe8914e8b6d5cf2081ad61e6952359c"; + sha256 = "13scj6w3vsdcgmq7zak3pflqpq295wgzsng72rcafgkkr7r12rar"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4396f3c10a38f91d5f98684efbeb02812e479209/recipes/shader-mode"; sha256 = "12y84fa1wc82js53rpadaysmbshhqf6wb97889qkksx19n3xmb9g"; - name = "shader-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -65885,20 +85836,24 @@ license = lib.licenses.free; }; }) {}; - shakespeare-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shakespeare-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shakespeare-mode"; - version = "20160908.1511"; + ename = "shakespeare-mode"; + version = "20180704.1438"; src = fetchFromGitHub { owner = "CodyReichert"; repo = "shakespeare-mode"; - rev = "0406a5ac4c98fcd171f0539c5cd88050aa351ea8"; - sha256 = "04p6132121cv9z20mpp3dw5b4s4k8wcknscq97a7z072cabph3ji"; + rev = "c442eeea9d585e1b1fbb8813e33d47feec348a57"; + sha256 = "1ba9xy5jwn8ni8fi2k144j669jp95k2qf9ip77r16rsiy7divl0y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shakespeare-mode"; sha256 = "1sg8n4ifpi36zmf6b6s0swq7k3r038cmj8kxjm7hpgxq6f9qnk9x"; - name = "shakespeare-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65906,9 +85861,13 @@ license = lib.licenses.free; }; }) {}; - shampoo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shampoo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shampoo"; + ename = "shampoo"; version = "20131230.219"; src = fetchFromGitHub { owner = "dmatveev"; @@ -65916,10 +85875,10 @@ rev = "bc193c39636c30182159c5c91c37a9a4cb50fedf"; sha256 = "15a8gs4lrqxn0jyfw16rc6vm7z1i10pzzlnp30x6nly9a7xra47x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f145113a0698466e706a6a4c55d63cec512706/recipes/shampoo"; sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61"; - name = "shampoo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65927,9 +85886,13 @@ license = lib.licenses.free; }; }) {}; - shell-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shell-command = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shell-command"; + ename = "shell-command"; version = "20090830.340"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -65937,10 +85900,10 @@ rev = "7e22125f746ce9ffbe9b0282d62f4b4bbbe672bd"; sha256 = "1my2i26a03z8xyyacsnl5wdylnbhhvazn23bpy639d3l4x4l7jzw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/shell-command"; sha256 = "01nviashfr64wm78zi3vrqrqdqgsamp76d9kasxv0b7fqmfx7yjk"; - name = "shell-command"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65948,9 +85911,13 @@ license = lib.licenses.free; }; }) {}; - shell-current-directory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shell-current-directory = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shell-current-directory"; + ename = "shell-current-directory"; version = "20140101.1554"; src = fetchFromGitHub { owner = "metaperl"; @@ -65958,10 +85925,10 @@ rev = "bf843771bf9a4aa05e054ade799eb8862f3be89a"; sha256 = "1w42j5cdddr0riz1xjq3wiz5i9f71i9jdzd1l92ir0mlj05wjyic"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edcb78c3491a5999b39a40087b7f991c2b737e30/recipes/shell-current-directory"; sha256 = "0bj2gs96ivm5x8l7gwvfckyalr1amh4cb1v2dbl323zmrqddhgkd"; - name = "shell-current-directory"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65969,9 +85936,13 @@ license = lib.licenses.free; }; }) {}; - shell-here = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shell-here = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shell-here"; + ename = "shell-here"; version = "20150728.1004"; src = fetchFromGitHub { owner = "ieure"; @@ -65979,10 +85950,10 @@ rev = "251309141e18978d2b8014345acc6f5afcd4d509"; sha256 = "0z04z07r7p5p05zhaka37s48y82hg2dbk0ynap4inph3frn4yyfl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88df6e04614547a59aefbeae88c301f3b8394039/recipes/shell-here"; sha256 = "0csi70v89bqdpbsizji6c5z0jmkx4x4vk1zfclkpap4dalmxxcsh"; - name = "shell-here"; + name = "recipe"; }; packageRequires = []; meta = { @@ -65990,9 +85961,13 @@ license = lib.licenses.free; }; }) {}; - shell-history = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shell-history = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shell-history"; + ename = "shell-history"; version = "20100505.139"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -66000,10 +85975,10 @@ rev = "ee371a81f2d2bf5a308344078329ca1e9b5ed38c"; sha256 = "0jyz31j5a07shcf2ym5gnn16xk5r3s84ls8kxk5myvxi3wkpgdd4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/shell-history"; sha256 = "1cmk8rymnj7dscxjq0p23jgwc16yvzw1804ya5wsg95v239gz1hy"; - name = "shell-history"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66011,9 +85986,15 @@ license = lib.licenses.free; }; }) {}; - shell-pop = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shell-pop = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shell-pop"; + ename = "shell-pop"; version = "20170304.616"; src = fetchFromGitHub { owner = "kyagi"; @@ -66021,10 +86002,10 @@ rev = "4a3a9d093ad1add792bba764c601aa28de302b34"; sha256 = "1ybvg048jvijcg9jjfrbllf59pswmp0fd5zwq5x6nwg5wmggplzd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop"; sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8"; - name = "shell-pop"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -66032,9 +86013,13 @@ license = lib.licenses.free; }; }) {}; - shell-split-string = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shell-split-string = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shell-split-string"; + ename = "shell-split-string"; version = "20151224.208"; src = fetchFromGitHub { owner = "10sr"; @@ -66042,10 +86027,10 @@ rev = "19f6f999c33cc66a4c91bacdcc3697c25d97bf5a"; sha256 = "16srngml5xmpaxb0wzhx91jil0r0dmn673bwai3lzxrkmjnl748l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84e20f4d02c69f8caf39cd20a581be3b9fa79931/recipes/shell-split-string"; sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m"; - name = "shell-split-string"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66053,9 +86038,14 @@ license = lib.licenses.free; }; }) {}; - shell-switcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shell-switcher = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shell-switcher"; + ename = "shell-switcher"; version = "20161028.2252"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -66063,10 +86053,10 @@ rev = "28a7f753dd7addd2933510526f52620cb5a22048"; sha256 = "1x7rrf56hjasciim8rj29vfngwis4pr3mhclvxd4sbmhz9y66wm0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a16194f6ddc05350b9875f4e0a3a0383c79e650e/recipes/shell-switcher"; sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx"; - name = "shell-switcher"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -66074,9 +86064,13 @@ license = lib.licenses.free; }; }) {}; - shell-toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shell-toggle = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shell-toggle"; + ename = "shell-toggle"; version = "20150226.611"; src = fetchFromGitHub { owner = "knu"; @@ -66084,10 +86078,10 @@ rev = "0d01bd9a780fdb7fe6609c552523f4498649a3b9"; sha256 = "0ssaccdacabpja9nqzhr8x8ggfwmlian7y4p0fa6gvr7qsvjpgr9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95873d90886d2db5cc1d83d4bcb8dd5c2e65bc3e/recipes/shell-toggle"; sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446"; - name = "shell-toggle"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66095,20 +86089,26 @@ license = lib.licenses.free; }; }) {}; - shelldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + shelldoc = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "shelldoc"; + ename = "shelldoc"; version = "20151114.1925"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-shelldoc"; - rev = "5df2264eb60e45066f3633df4f34834751667346"; - sha256 = "1mc7y79h5p9cxqwsl40b1j5la5bm8b70n6fn4rx9wr4bi7rwph5i"; + rev = "20eb889f3d3d9bd01aafdc699e712a75db42d8f3"; + sha256 = "0i6xp6g3ggs4fkr410blxa4mkb1y05pcygkdbvb7y3gh878q5b5k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/551623175e55629be6cfe44a595f25f09bd889e8/recipes/shelldoc"; sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx"; - name = "shelldoc"; + name = "recipe"; }; packageRequires = [ cl-lib s ]; meta = { @@ -66116,20 +86116,24 @@ license = lib.licenses.free; }; }) {}; - shelltest-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shelltest-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shelltest-mode"; - version = "20141227.248"; + ename = "shelltest-mode"; + version = "20180430.1841"; src = fetchFromGitHub { owner = "rtrn"; repo = "shelltest-mode"; - rev = "b4bdd547bcdac427561aa1452f2aeb65e3a3c9f5"; - sha256 = "0f45q8j9m0ic3l69i7qjhf0l19cprn56fxw61al4xd3wxv4pr9gy"; + rev = "5fea8c9394380e822971a171905b6b5ab9be812d"; + sha256 = "1np65a92n4y9i0nr8wymzn6md9xqmi9qyggya7sz0q4nzsh45wqg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af6dcd4fc0663a255bd85b247bbdf57d425efdb7/recipes/shelltest-mode"; sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh"; - name = "shelltest-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66137,9 +86141,14 @@ license = lib.licenses.free; }; }) {}; - shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shen-elisp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shen-elisp"; + ename = "shen-elisp"; version = "20170427.1502"; src = fetchFromGitHub { owner = "deech"; @@ -66147,10 +86156,10 @@ rev = "ffe17dee05f75539cf5e4c59395e4c7400ececaa"; sha256 = "10dq3qj1q8i6f604zws97xrvjxwrdcjj3ygh6xpna00cvf40llc2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shen-elisp"; sha256 = "045nawzyqaxd3g5f56fxfy680pl18x67w0wi28nrq4l4681w9xyq"; - name = "shen-elisp"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -66158,20 +86167,24 @@ license = lib.licenses.free; }; }) {}; - shift-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shift-number = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shift-number"; + ename = "shift-number"; version = "20170301.659"; src = fetchFromGitHub { owner = "alezost"; repo = "shift-number.el"; - rev = "cd099a5582fc996b800ac7607f6c38a004ce9740"; - sha256 = "131by7z6303m81kjhy8rnfvwyzfbxglc19xb90jdks4vgczqkcah"; + rev = "94c3713cc11283a831f66d5205d112762edc186b"; + sha256 = "17a5aifj37pv3jm6k7ilc3s4vwhiy2dwyjjy9dxy3qqc8w9h4rr1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b06be6b25078ddfabc1ef1145c817552f679c41c/recipes/shift-number"; sha256 = "1sbzkmd336d0dcdpk29pzk2b5bhlahrn083x62l6m150n2xzxn4p"; - name = "shift-number"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66179,9 +86192,15 @@ license = lib.licenses.free; }; }) {}; - shift-text = callPackage ({ cl-lib ? null, es-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shift-text = callPackage ({ cl-lib ? null + , es-lib + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shift-text"; + ename = "shift-text"; version = "20130831.955"; src = fetchFromGitHub { owner = "sabof"; @@ -66189,10 +86208,10 @@ rev = "1be9cbf994000022172ceb746fe1d597f57ea8ba"; sha256 = "13zsws8gq9a8nfk4yzlvfsvqjh9zbnanmw68rcna93yc5nc634nr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ad2ea105b895cb958ce0ab2bf2fad2b40d41b2f/recipes/shift-text"; sha256 = "1v9zk7ycc8k1qk1cfs2y1knygl686msmlilqy5a7mh0w0z9f3a2i"; - name = "shift-text"; + name = "recipe"; }; packageRequires = [ cl-lib es-lib ]; meta = { @@ -66200,20 +86219,24 @@ license = lib.licenses.free; }; }) {}; - shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shimbun = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shimbun"; - version = "20180201.2145"; + ename = "shimbun"; + version = "20180325.2048"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "4b9664bab3794379af42d549d9540735c16b5a25"; - sha256 = "16wics5k7w7b23zayh9j6jbh6dflk6r8wq75p9bnpw1n36gmm8ig"; + rev = "59339a69a069fecf7b15148cbc141a6c1811edd6"; + sha256 = "1al8kjmp2jm2ssla8vhalrvpclragh999mgby5524cppwlzz592b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; sha256 = "1rjykr0y5jfd6r3shm8x23yyra6qjsb55jrfc45rhpb89klyg1nk"; - name = "shimbun"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66221,9 +86244,13 @@ license = lib.licenses.free; }; }) {}; - shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shm"; + ename = "shm"; version = "20180326.1757"; src = fetchFromGitHub { owner = "chrisdone"; @@ -66231,10 +86258,10 @@ rev = "7f9df73f45d107017c18ce4835bbc190dfe6782e"; sha256 = "1jcc30048j369jgsbbmkb63whs4wb37bq21jrm3r6ry22izndsqa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm"; sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c"; - name = "shm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66242,20 +86269,25 @@ license = lib.licenses.free; }; }) {}; - shoulda = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shoulda = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shoulda"; + ename = "shoulda"; version = "20140616.1133"; src = fetchFromGitHub { owner = "marcwebbie"; repo = "shoulda.el"; - rev = "fbe8eb8efc6cfcca1713283a290882cfcdc8725e"; - sha256 = "19p47a4hwl6h2w5ay09hjhl4kf7cydwqp8s2iyrx2i0k58az8i8i"; + rev = "24dc6b6138a06edde9c8d13a6aaa1654d1d7de54"; + sha256 = "18p0z5d8vhdhmw6x5rys2kfk93pb7mzdagls9ml0mjcixsyy7qsc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41497a876c80d81d9562ea4b2cc2a83dba98ae8a/recipes/shoulda"; sha256 = "0lmlhx34nwvn636y2wvw3sprhhh6q3mdg7dzgpjj7ybibvhp1lzk"; - name = "shoulda"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -66263,9 +86295,15 @@ license = lib.licenses.free; }; }) {}; - show-css = callPackage ({ doom, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + show-css = callPackage ({ doom + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "show-css"; + ename = "show-css"; version = "20160210.608"; src = fetchFromGitHub { owner = "8cylinder"; @@ -66273,10 +86311,10 @@ rev = "771daeddd4df7a7c10f66419a837145649bab63b"; sha256 = "11kzjm12hbcdzrshq20r20l29k3555np1sva7afqrhgvd239fdq1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/show-css"; sha256 = "0sq15l58macy2affdgbimnchn491fnrqr3bbgn30k3l3xkvkmc7k"; - name = "show-css"; + name = "recipe"; }; packageRequires = [ doom s ]; meta = { @@ -66284,9 +86322,14 @@ license = lib.licenses.free; }; }) {}; - show-marks = callPackage ({ fetchFromGitHub, fetchurl, fm, lib, melpaBuild }: - melpaBuild { + show-marks = callPackage ({ fetchFromGitHub + , fetchurl + , fm + , lib + , melpaBuild }: + melpaBuild { pname = "show-marks"; + ename = "show-marks"; version = "20130805.749"; src = fetchFromGitHub { owner = "vapniks"; @@ -66294,10 +86337,10 @@ rev = "97609566582e65eed0d0a854efa5c312f209115d"; sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2007ab49d123e324c8d7c09bca9de33468d98ab/recipes/show-marks"; sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb"; - name = "show-marks"; + name = "recipe"; }; packageRequires = [ fm ]; meta = { @@ -66305,9 +86348,13 @@ license = lib.licenses.free; }; }) {}; - showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + showtip = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "showtip"; + ename = "showtip"; version = "20090830.340"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -66315,10 +86362,10 @@ rev = "930da302809a4257e8d69425455b29e1cc91949b"; sha256 = "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/showtip"; sha256 = "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780"; - name = "showtip"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66326,20 +86373,24 @@ license = lib.licenses.free; }; }) {}; - shpec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shpec-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shpec-mode"; + ename = "shpec-mode"; version = "20150530.222"; src = fetchFromGitHub { owner = "shpec"; repo = "shpec-mode"; - rev = "146adc8281d0f115df39a3a3f982ac59ab61b754"; - sha256 = "1mizhbwvnsxxjz6m94qziibvhghhp8v8db3wxrq3z9gsaqqkcndn"; + rev = "76bccd63e3b70233a6c9ca0798dd03550952cc76"; + sha256 = "09454mcjd8n1090pjc5mk1dc6bn3bgh60ddpnv9hkajkzpcjxx4h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd1bfe85b430c3bbb5a7baf11bb9699dad417f60/recipes/shpec-mode"; sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl"; - name = "shpec-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66347,9 +86398,15 @@ license = lib.licenses.free; }; }) {}; - shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }: - melpaBuild { + shr-tag-pre-highlight = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , language-detection + , lib + , melpaBuild }: + melpaBuild { pname = "shr-tag-pre-highlight"; + ename = "shr-tag-pre-highlight"; version = "20171113.114"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -66357,10 +86414,10 @@ rev = "6182f43a36b0f82ba6edcf6e423b5f69a46a814e"; sha256 = "0916bpzi6sw5gyn5xgi9czf35zrvl04w10wz6fvz0lc57giihil1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight"; sha256 = "1v8fqx8bd5504r2mflq6x8xs3k0py3bgsnadz3bjs68yhaxacj3v"; - name = "shr-tag-pre-highlight"; + name = "recipe"; }; packageRequires = [ emacs language-detection ]; meta = { @@ -66368,20 +86425,28 @@ license = lib.licenses.free; }; }) {}; - shrink-path = callPackage ({ dash, emacs, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: - melpaBuild { + shrink-path = callPackage ({ dash + , emacs + , f + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "shrink-path"; + ename = "shrink-path"; version = "20170812.1947"; src = fetchFromGitLab { owner = "bennya"; repo = "shrink-path.el"; - rev = "9d06c453d1537df46a4b703a29213cc7f7857aa0"; - sha256 = "021bpgpzysag1s11m9pyq2bk6a0mf9ayx10yxhf5cw56x3d0jj1b"; + rev = "a94c80743280fe317cf56cd4d4cd6385ce9e3dfb"; + sha256 = "1s5ax71qi8pl8jsc49yaqrhfvxmc4z4hjzmy1fhfr1qjmxl5d08i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path"; sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb"; - name = "shrink-path"; + name = "recipe"; }; packageRequires = [ dash emacs f s ]; meta = { @@ -66389,9 +86454,13 @@ license = lib.licenses.free; }; }) {}; - shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shrink-whitespace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shrink-whitespace"; + ename = "shrink-whitespace"; version = "20150916.1215"; src = fetchFromGitHub { owner = "jcpetkovich"; @@ -66399,10 +86468,10 @@ rev = "8d4263d974fbe66417c0bb9edc155ecc2f48e4b7"; sha256 = "07zzyfibs2c7w4gpvdh9003frznbg7zdnrx0nv8bvn0b68d3yz0m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shrink-whitespace"; sha256 = "0baqv4wr1wi4wd7cfhqf4y24qkpd72lax596z5lj934ihwf3gggw"; - name = "shrink-whitespace"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66410,20 +86479,26 @@ license = lib.licenses.free; }; }) {}; - shut-up = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shut-up = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shut-up"; - version = "20150423.522"; + ename = "shut-up"; + version = "20180628.1130"; src = fetchFromGitHub { owner = "cask"; repo = "shut-up"; - rev = "a4fd18f37e20ae991c0dbba821b2c8e6f1679c39"; - sha256 = "00c11s664hwj1l1hw7qshygy3wb6wbd0hn6qqnyq1xr0r87nnhjs"; + rev = "081d6b01e3ba0e60326558e545c4019219e046ce"; + sha256 = "1bnmrwrhra6cpc3jjgwwzrydj5ps7q2dlkh2ag4j7rkyv4dlk351"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/297d3d88a1dad694d5903072adb679f2194ce444/recipes/shut-up"; sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26"; - name = "shut-up"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -66431,20 +86506,25 @@ license = lib.licenses.free; }; }) {}; - shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shx = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shx"; - version = "20180310.1748"; + ename = "shx"; + version = "20180528.1408"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "b33b23097ad34177e4179e9d3731ec5db30c6391"; - sha256 = "0vlgm1aix074ifi9gvp4c0ygdmzplydj4gdsl46173qbd8lfi2rj"; + rev = "207e6cd292a26fb1162072e2e20df9aa5efd61ef"; + sha256 = "1hnjmnnmg6axgw4z57rmc8h8wpnbi2rwyr4bv2sdrkk12d3i2kp5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; sha256 = "0h5ldglx4y85lm0pfilasnch2k82mlr7rb20qvarzwd41hb1az1k"; - name = "shx"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -66452,20 +86532,24 @@ license = lib.licenses.free; }; }) {}; - sibilant-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sibilant-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sibilant-mode"; + ename = "sibilant-mode"; version = "20151119.1345"; src = fetchFromGitHub { owner = "jbr"; repo = "sibilant-mode"; - rev = "bc1b5d8cd597918bafc9b2880ee49024740e54ab"; - sha256 = "0cjqh6qbbmgxd6zgqnikw6bh8wpjydydkkqs5wcmblpi5awqmnb6"; + rev = "5baf8c3e80ee0736c7298a2a17fb615ba5ac0d2d"; + sha256 = "0lpr3pcmwn51wl732kb9a2cagrkxjsgk384z2b7cq9zs79mdh616"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de12c8a37d6d42103f437e6bd974a94924242e8f/recipes/sibilant-mode"; sha256 = "0jd6dsk93nvwi5yia3623hfc4v6zz4s2n8m1wx9bw8x6kv3h3qbq"; - name = "sibilant-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66473,9 +86557,13 @@ license = lib.licenses.free; }; }) {}; - sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sicp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sicp"; + ename = "sicp"; version = "20171028.1523"; src = fetchFromGitHub { owner = "webframp"; @@ -66483,10 +86571,10 @@ rev = "8e13f7ff4695a05471486d37a6c5f979a5b965fb"; sha256 = "15krfnj2qz4j2ns4a05a4wwaknhx77m4jhazg7zvz9xm4b4j1qm8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1363d7b6e95375ac63f07eed2b3947f4f81bc9ba/recipes/sicp"; sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz"; - name = "sicp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66494,20 +86582,50 @@ license = lib.licenses.free; }; }) {}; - sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + side-notes = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "side-notes"; + ename = "side-notes"; + version = "20180523.2328"; + src = fetchFromGitHub { + owner = "rnkn"; + repo = "side-notes"; + rev = "981ac308b9b5d58e2af20485377e693d2a6e15aa"; + sha256 = "1hjj6pkl83b9fldzf2bixdny85l5mn81a9kf25kyp0cc6apvwsqr"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/24a71c493adfb79bcd5172d65aa0751e9a6ab556/recipes/side-notes"; + sha256 = "07hrrplgvp3fvl10fsmxifnim8wz34w7fhzzzkxpdj1zlwls6h83"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/side-notes"; + license = lib.licenses.free; + }; + }) {}; + sift = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sift"; + ename = "sift"; version = "20160107.215"; src = fetchFromGitHub { owner = "nlamirault"; repo = "sift.el"; - rev = "4ce8878a0fc396ded7521ce38852d93e1d863065"; - sha256 = "1x78i6svi4cwah9xw85imhpncvxsx4xim4fzykpnd328mxkk07h6"; + rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13"; + sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift"; sha256 = "1kr5rxza5li3zrkfvs91y7dxmn213z0zf836rkwkmwg2b9rmqxvj"; - name = "sift"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66515,9 +86633,15 @@ license = lib.licenses.free; }; }) {}; - signal = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + signal = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "signal"; + ename = "signal"; version = "20160816.738"; src = fetchFromGitHub { owner = "Mola-T"; @@ -66525,10 +86649,10 @@ rev = "aa58327e2297df921d72a0370468b48663efd438"; sha256 = "1gzfdk3ks56h8q4xk69aaxkhkg9jhs55iqdicyvq7x9wmjn6b7xw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/signal"; sha256 = "0y4crwpnmwm8bi9jazrph4yj0nnva2i1js8h3bw3sizy20a4yf00"; - name = "signal"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -66536,20 +86660,24 @@ license = lib.licenses.free; }; }) {}; - signature = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + signature = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "signature"; + ename = "signature"; version = "20140730.1249"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "pidu"; repo = "signature"; rev = "c47df2e1189a84505f9224aa78e87b6c65d13d37"; sha256 = "1g4rr7hpy9r3y4vdpv48xpmy8kqvs4j64kvnhnj2rw2wv1grw78j"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2191b1b46868f9f3b7a98f47411498dd42839347/recipes/signature"; - sha256 = "11n3id1iiip99lj8c0iffbrf59s2yvmwlhqbf8xzxkhws7vwdl5q"; - name = "signature"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/signature"; + sha256 = "0y5xspcsjap662n1gp882kjripiz90wwbhsq27c0qwl1zcx5rrkj"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66557,9 +86685,14 @@ license = lib.licenses.free; }; }) {}; - silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + silkworm-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "silkworm-theme"; + ename = "silkworm-theme"; version = "20180301.637"; src = fetchFromGitHub { owner = "mswift42"; @@ -66567,10 +86700,10 @@ rev = "4a297f952401cfe894dcb24174f6eda05e00fada"; sha256 = "00kjibpn3ry7j1s6kqmakybialpcx4919344lxks7wij5l6qqxx0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme"; sha256 = "1zbrjqmhf80qs3i910sixirrv42rxkqdrg2z03gnz1g885gpcn13"; - name = "silkworm-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -66578,20 +86711,24 @@ license = lib.licenses.free; }; }) {}; - simp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + simp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "simp"; - version = "20161206.2151"; + ename = "simp"; + version = "20180606.1954"; src = fetchFromGitHub { owner = "re5et"; repo = "simp"; - rev = "13959cabdc7a10d8878592ef4333b3e6df2f1483"; - sha256 = "1wph7r7r9s867wr6j17fqch8hmj20fksrhl80bw2k4vyscaj0f22"; + rev = "d4d4b8547055347828bedccbeffdb4fd2d5a5d34"; + sha256 = "1a60vk46haibzrm6zgssdw085wpssmmqc66bipvkq6xnp2cvchkc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45ff5b788e12218f8e2df7e53444796ca4b929fc/recipes/simp"; sha256 = "0x4lssjkj3fk9fw603f0sggvcj25iw0zbzsm5c949lhl4a3wvc9c"; - name = "simp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66599,20 +86736,25 @@ license = lib.licenses.free; }; }) {}; - simple-bookmarks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + simple-bookmarks = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "simple-bookmarks"; + ename = "simple-bookmarks"; version = "20160804.701"; src = fetchFromGitHub { owner = "jtkDvlp"; repo = "simple-bookmarks"; - rev = "6c58337f2b7dbe9e58b5e097b1567f046a01d071"; - sha256 = "05071n96d91q3jz9dwp1qkqwq56k0d7cd1pnjj4jvjx4kb852waj"; + rev = "e89e8163a0705e28e9346320a1ee13c1aae249af"; + sha256 = "0bx8inaihfs48rzi01nlr3wp2iw0bnk318hhgpd4zg64ap3sgdsv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a60dd50c388a75ce21a5aec9acf938835d7afdbc/recipes/simple-bookmarks"; sha256 = "0jn5wzm9y4054mr9czd3224s5kbrqpcpcfmj6fi62yhy3p1ys9rb"; - name = "simple-bookmarks"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -66620,9 +86762,15 @@ license = lib.licenses.free; }; }) {}; - simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + simple-call-tree = callPackage ({ anaphora + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "simple-call-tree"; + ename = "simple-call-tree"; version = "20180224.1256"; src = fetchFromGitHub { owner = "vapniks"; @@ -66630,10 +86778,10 @@ rev = "20059eb5549408def76aeb03d0d20839903dedef"; sha256 = "0gvhn2r7h6jz7a3i3a8gwlmghv1xfzj0sdib25kz645iylazji4h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/316a5ffcb3080abd623bbe3065077809e6cbfb74/recipes/simple-call-tree"; sha256 = "1cbv4frsrwd8d3rg8r4sylwnc1hl3hgh595qwbpx0zd3dp5na2yl"; - name = "simple-call-tree"; + name = "recipe"; }; packageRequires = [ anaphora emacs ]; meta = { @@ -66641,20 +86789,25 @@ license = lib.licenses.free; }; }) {}; - simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + simple-httpd = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "simple-httpd"; - version = "20180218.538"; + ename = "simple-httpd"; + version = "20180528.903"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "868ec06abdc23c69597bc3a12da7aa2e5c0ad9c5"; - sha256 = "1grq5a74arng2nn5q1xjm7gl5gk55a1js2r22wsahm8gd0fn0jdv"; + rev = "a5eb49a6567e33586fba15dd649d63ca6e964314"; + sha256 = "0dpn92rg813c4pq7a1vzj3znyxzp2lmvxqz6pzcqi0l2xn5r3wvb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; sha256 = "1g9m8dx62pql6dqz490pifcli96i5pv6sar18w4lwrfgpfisfz8c"; - name = "simple-httpd"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -66662,20 +86815,25 @@ license = lib.licenses.free; }; }) {}; - simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + simple-mpc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "simple-mpc"; - version = "20180224.1801"; + ename = "simple-mpc"; + version = "20180715.1829"; src = fetchFromGitHub { owner = "jorenvo"; repo = "simple-mpc"; - rev = "ad74cb621e04838f8725ab7dc8716f0f38c90413"; - sha256 = "1g3pb0n5j0s4q85zgjqnw1idvpvq3kwrakv8d6if7xb066v21ng9"; + rev = "bee8520e81292b4c7353e45b193f9a13b482f5b2"; + sha256 = "1ja06pv007cmzjjgka95jlg31k7d29jrih1yxyblsxv85s9sg21q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc"; sha256 = "05x2xyys5mf6k7ndh0l6ykyiygaznb4f8bx3npbhvihrsz9ilf8r"; - name = "simple-mpc"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -66683,20 +86841,26 @@ license = lib.licenses.free; }; }) {}; - simple-paren = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + simple-paren = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "simple-paren"; - version = "20180205.1141"; + ename = "simple-paren"; + version = "20180427.218"; src = fetchFromGitHub { owner = "andreas-roehler"; repo = "simple-paren"; - rev = "f5cc9b4325a07efe92379a11a1a61035c9a1e8c4"; - sha256 = "1p931vqdnh6agrrzxf55x34ikb1x53mz1a17kskzlqchlzfmc3da"; + rev = "8d735905306c587851eff1445898499c01c530ca"; + sha256 = "0fv8s9h9sdiahi49al7zp0ldrlxi0dj46i2il75y7ay70l29wza2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren"; sha256 = "0bmw8pkh9864gymy36r3w5yw08pq894gb1n80wfqls4a78zyvkm3"; - name = "simple-paren"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -66704,20 +86868,26 @@ license = lib.licenses.free; }; }) {}; - simple-rtm = callPackage ({ dash, fetchFromGitLab, fetchurl, lib, melpaBuild, rtm }: - melpaBuild { + simple-rtm = callPackage ({ dash + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , rtm }: + melpaBuild { pname = "simple-rtm"; + ename = "simple-rtm"; version = "20160222.734"; src = fetchFromGitLab { owner = "mbunkus"; repo = "simple-rtm"; - rev = "8c7cd96cf66ef112be5c363e3378e304f8f83999"; - sha256 = "1kkhnsxr8zrb21k4ckyg69nsndwy4zdkvfw2drk4v1vnbgx8144f"; + rev = "37c5feffea7c9b571279b6f549d06cf9c0720273"; + sha256 = "0rwvlhwg66ny0rm972wjfz41ck9kqmbax49wkagrkimm1cdrjfia"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a784f931849ca836557390999b179ef9f6e775f3/recipes/simple-rtm"; sha256 = "0v5f0vr8sh62yvb7znx00wgybb83dfnkvgl8afyk3ry8n9xkhf5b"; - name = "simple-rtm"; + name = "recipe"; }; packageRequires = [ dash rtm ]; meta = { @@ -66725,9 +86895,13 @@ license = lib.licenses.free; }; }) {}; - simple-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + simple-screen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "simple-screen"; + ename = "simple-screen"; version = "20161009.220"; src = fetchFromGitHub { owner = "wachikun"; @@ -66735,10 +86909,10 @@ rev = "596e3a451d9af24730ab31a8fe15c91a4264d09d"; sha256 = "0mqlwrkipgf977s0gx57fv5xrqli67hixprvra6q64isapr86yh1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02db9a649002ed9dec03661a518f74f3c7a176d9/recipes/simple-screen"; sha256 = "16zvsmqn882w320h26hjjz5lcyl9y0x4amkf2zfps77xxmkmi5n0"; - name = "simple-screen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66746,9 +86920,13 @@ license = lib.licenses.free; }; }) {}; - simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + simpleclip = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "simpleclip"; + ename = "simpleclip"; version = "20170803.540"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -66756,10 +86934,10 @@ rev = "d461c462c237cd896553adb468cd77499d0d26ad"; sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip"; sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s"; - name = "simpleclip"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66767,20 +86945,24 @@ license = lib.licenses.free; }; }) {}; - simplenote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + simplenote = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "simplenote"; + ename = "simplenote"; version = "20141118.640"; src = fetchFromGitHub { owner = "dotemacs"; repo = "simplenote.el"; - rev = "e836fcdb5a6497a9ffd6bceddd19b4bc52189078"; - sha256 = "0xq4vy3ggdjiycd3aa62k94kd43zcpm8bfdgi8grwkb1lpvwq9i9"; + rev = "734603e877b2d642162ca45f799d2f7b956d2ea0"; + sha256 = "1cqdnnj8pshcxzwb0vivvk8zywbw7a3vibcs88kd9zxkxmdwg0fz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c1c3189da03541e3bee44847ac5d02c2a56ef98/recipes/simplenote"; sha256 = "0rnvm3q2spfj15kx2c8ic1p8hxg7rwiqgf3x2zg34j1xxayn3h2j"; - name = "simplenote"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66788,9 +86970,14 @@ license = lib.licenses.free; }; }) {}; - simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: - melpaBuild { + simplenote2 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request-deferred }: + melpaBuild { pname = "simplenote2"; + ename = "simplenote2"; version = "20171201.1806"; src = fetchFromGitHub { owner = "alpha22jp"; @@ -66798,10 +86985,10 @@ rev = "0fd6dbd0566af29964078e4b74baf69c2f52381a"; sha256 = "0qlwmxrz2kngri7ywy64bja0najq9m6asq2gr53ns0mkq1ngf0l8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm"; - name = "simplenote2"; + name = "recipe"; }; packageRequires = [ request-deferred ]; meta = { @@ -66809,20 +86996,26 @@ license = lib.licenses.free; }; }) {}; - simplezen = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + simplezen = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "simplezen"; + ename = "simplezen"; version = "20130421.300"; src = fetchFromGitHub { owner = "magnars"; repo = "simplezen.el"; - rev = "119fdf2c6890a0c56045ae72cf4fce0071a81481"; - sha256 = "0108q2b5h73rjxg9k2kmc8z6la9kgqdnz9z1x7rn61v3vbxlzqvn"; + rev = "9f91554a3f7f4e9b2b5ec009effafbf12b091973"; + sha256 = "04hg5c7pc7ms8kizjzd8s8a70gpkmazkhp8722fxcl0khbv6r3ix"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eddd3de86e14f56b59fa6f9a08fc89288e0bdbc1/recipes/simplezen"; sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j"; - name = "simplezen"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -66830,9 +87023,19 @@ license = lib.licenses.free; }; }) {}; - skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: - melpaBuild { + skeletor = callPackage ({ cl-lib ? null + , dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , s }: + melpaBuild { pname = "skeletor"; + ename = "skeletor"; version = "20170616.1746"; src = fetchFromGitHub { owner = "chrisbarrett"; @@ -66840,10 +87043,10 @@ rev = "01c330ec115fc29bba5d9bdf6c15beb4a44e2281"; sha256 = "0i3axni8y4s5n2s7qbqzz3sadcfhr3369q7qn8psk29qbicjw5wv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor"; sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v"; - name = "skeletor"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs f let-alist s ]; meta = { @@ -66851,20 +87054,25 @@ license = lib.licenses.free; }; }) {}; - skewer-less = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode }: - melpaBuild { + skewer-less = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , skewer-mode }: + melpaBuild { pname = "skewer-less"; + ename = "skewer-less"; version = "20160828.1321"; src = fetchFromGitHub { owner = "purcell"; repo = "skewer-less"; - rev = "927d6848a1ea9428d4cc995f76bd42f7b8da6bc8"; - sha256 = "11zaq1p04igg0hbmazsf5c0xz7aigx120rwg5iq7niaz2277j1k1"; + rev = "cc1a8e8fe0b62a08da89c4639fb942f5165454b4"; + sha256 = "0mqrxhy03dwm590shshz63nr2nfn19n6f0p37ybkjwqn0w7b834w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb63f7417f39bd718972f54e57360708eb48b977/recipes/skewer-less"; sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl"; - name = "skewer-less"; + name = "recipe"; }; packageRequires = [ skewer-mode ]; meta = { @@ -66872,20 +87080,27 @@ license = lib.licenses.free; }; }) {}; - skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }: - melpaBuild { + skewer-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild + , simple-httpd }: + melpaBuild { pname = "skewer-mode"; - version = "20170730.1241"; + ename = "skewer-mode"; + version = "20180706.1107"; src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "c8fc64300cbe85896f6e0719ef2c91bfba9c4fcd"; - sha256 = "1rl5rmvq0qgdr8zrzbdvahf8rxsdajj7zbyzxyqfmyqr83c9yrz5"; + rev = "a381049acc4fa2087615b4b3b26c0865841386bd"; + sha256 = "12fsp7mwmjxh5mhshriyxw8mlghzn3gfswf6hkz1hcb0yfd56d53"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm"; - name = "skewer-mode"; + name = "recipe"; }; packageRequires = [ emacs js2-mode simple-httpd ]; meta = { @@ -66893,20 +87108,25 @@ license = lib.licenses.free; }; }) {}; - skewer-reload-stylesheets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode }: - melpaBuild { + skewer-reload-stylesheets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , skewer-mode }: + melpaBuild { pname = "skewer-reload-stylesheets"; + ename = "skewer-reload-stylesheets"; version = "20160725.520"; src = fetchFromGitHub { owner = "NateEag"; repo = "skewer-reload-stylesheets"; - rev = "b9cc5635230ac3c0603a6da690c6e632d0a7490a"; - sha256 = "0c8dpbl0z45w1brllcysibmpbnk8yqjgi3iywmqnhrycb7lrda4g"; + rev = "3207abca9551660407a6b009cb40fb32bbb550da"; + sha256 = "0fgxil70yrf6annrbvza4lqaagrn65c7pmayg6pr16hy5w8wcgsk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeaa2c89b995f1ab0b0f96493db0cda44cc851ee/recipes/skewer-reload-stylesheets"; sha256 = "1hcz8q7rs5g7gbj6w72g8prry4niqjmyxvvc0ala83qw76x4cm7k"; - name = "skewer-reload-stylesheets"; + name = "recipe"; }; packageRequires = [ skewer-mode ]; meta = { @@ -66914,9 +87134,13 @@ license = lib.licenses.free; }; }) {}; - skype = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + skype = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "skype"; + ename = "skype"; version = "20160711.124"; src = fetchFromGitHub { owner = "kiwanami"; @@ -66924,10 +87148,10 @@ rev = "8e3b33e620ed355522aa36434ff41e3ced080629"; sha256 = "078gjgknsrm1n2f0diian9l056kqh1fj2w0y6ildsvzjipygdz1y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3448698a35c9d5d25639f62024f89cac03d5830/recipes/skype"; sha256 = "06p5s5agajbm9vg9xxpzv817xmjw2kmcahiw4iypn5yzwhv1aykl"; - name = "skype"; + name = "recipe"; }; packageRequires = []; meta = { @@ -66935,9 +87159,14 @@ license = lib.licenses.free; }; }) {}; - sl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sl = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sl"; + ename = "sl"; version = "20161217.604"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -66945,10 +87174,10 @@ rev = "0882117728be91276b815e18c2a66106bf9d69d3"; sha256 = "1cr3ilf96d8kkyc48nasd4iy2q84kkxjssmvlclanss1hj95nj2l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl"; sha256 = "0h90ajikr6kclsy73vs9f50jg8z3d6kqbpanm9ryh2pw3sd4rnii"; - name = "sl"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -66956,20 +87185,30 @@ license = lib.licenses.free; }; }) {}; - slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: - melpaBuild { + slack = callPackage ({ alert + , circe + , emojify + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , oauth2 + , request + , websocket }: + melpaBuild { pname = "slack"; - version = "20180315.253"; + ename = "slack"; + version = "20180712.2222"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "b7e8aaee092a45ad96ea680a812cdb615463ad6e"; - sha256 = "1hlynbydgi194j9x2na66zdnf7i2r7iklyxly4jbq7jqqh1zybgr"; + rev = "cec90237ed46443f8f67886a2188d518b0f3c7dc"; + sha256 = "0npim0rrq0jkw8vj5d8iwfi64nz3mqnciamjs9hamzkiv6z9yxkw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; sha256 = "0mybjx08yskk9vi06ayiknl5ddyd8h0mnr8c0a3zr61p1x4s6anp"; - name = "slack"; + name = "recipe"; }; packageRequires = [ alert circe emojify oauth2 request websocket ]; meta = { @@ -66977,9 +87216,14 @@ license = lib.licenses.free; }; }) {}; - slideview = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + slideview = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "slideview"; + ename = "slideview"; version = "20150324.1540"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -66987,10 +87231,10 @@ rev = "b6d170bda139aedf81b47dc55cbd1a3af512fb4c"; sha256 = "11p1pghx55a4gcn45cadw7c594134b21cdim723k2h99z14f89az"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b250f977f44a08346ee9715b416c9706375227a1/recipes/slideview"; sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1"; - name = "slideview"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -66998,9 +87242,13 @@ license = lib.licenses.free; }; }) {}; - slim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + slim-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "slim-mode"; + ename = "slim-mode"; version = "20170728.648"; src = fetchFromGitHub { owner = "slim-template"; @@ -67008,10 +87256,10 @@ rev = "3636d18ab1c8b316eea71c4732eb44743e2ded87"; sha256 = "1sqylm6ipmlh9249mmwfb16b4pv94cvzdwvi3zakdpz713phyjw5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a3b59bdbc53d7c0b4c4d6434689f7aab2546678/recipes/slim-mode"; sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac"; - name = "slim-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67019,20 +87267,26 @@ license = lib.licenses.free; }; }) {}; - slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: - melpaBuild { + slime = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , macrostep + , melpaBuild }: + melpaBuild { pname = "slime"; - version = "20180330.423"; + ename = "slime"; + version = "20180719.1821"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "a83b6ececbbe77cfdb7d54d7d24870a1071fb8c2"; - sha256 = "18hdgxjng6mq2fgy2dmisnyg547l3kwk3z7069h101xwh8dji3w5"; + rev = "289e4d7117b034dea668a6d28f9ddb7eb80f57ed"; + sha256 = "0sanswnqyk50hgkr0p0zhxm3dfg72p4xcv7ivf2vivfqq68pyvym"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign"; - name = "slime"; + name = "recipe"; }; packageRequires = [ cl-lib macrostep ]; meta = { @@ -67040,9 +87294,16 @@ license = lib.licenses.free; }; }) {}; - slime-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: - melpaBuild { + slime-company = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , slime }: + melpaBuild { pname = "slime-company"; + ename = "slime-company"; version = "20180119.1043"; src = fetchFromGitHub { owner = "anwyn"; @@ -67050,10 +87311,10 @@ rev = "4c2e2805540dea700130607fa235018a87e4a070"; sha256 = "0ihwchp6hc1rxmahrhaly1cnhqs6k6ks32iiywwsyw7fjc34alc4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company"; sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2"; - name = "slime-company"; + name = "recipe"; }; packageRequires = [ company emacs slime ]; meta = { @@ -67061,9 +87322,17 @@ license = lib.licenses.free; }; }) {}; - slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: - melpaBuild { + slime-docker = callPackage ({ cl-lib ? null + , docker-tramp + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , slime }: + melpaBuild { pname = "slime-docker"; + ename = "slime-docker"; version = "20171004.1151"; src = fetchFromGitHub { owner = "daewok"; @@ -67071,10 +87340,10 @@ rev = "13fa8be2fca516f3ff5fb70fa79dd8404bf86439"; sha256 = "005zkypg2hkyzpkcv1rzfrmg8amg1bp0534y13xjqq3rz1p602bx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker"; sha256 = "13zkkrpww51ndsblpyz2msiwrjnaz6yrk61jbzrwp0r7a2v0djsa"; - name = "slime-docker"; + name = "recipe"; }; packageRequires = [ cl-lib docker-tramp emacs slime ]; meta = { @@ -67082,9 +87351,14 @@ license = lib.licenses.free; }; }) {}; - slime-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + slime-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "slime-theme"; + ename = "slime-theme"; version = "20170808.622"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -67092,10 +87366,10 @@ rev = "8e5880ac69e0b6a079103001cc3a90bdb688998f"; sha256 = "0g90ypwyvpdzilvhj0rgfrp78a5gflply3rix2wx8rncw569qb6g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/slime-theme"; sha256 = "1b709cplxip48a6qjdnzcn5qcgsy0jq1m05d7vc8p5ywgr1f9a00"; - name = "slime-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -67103,9 +87377,13 @@ license = lib.licenses.free; }; }) {}; - slime-volleyball = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + slime-volleyball = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "slime-volleyball"; + ename = "slime-volleyball"; version = "20140717.2141"; src = fetchFromGitHub { owner = "fitzsim"; @@ -67113,10 +87391,10 @@ rev = "159b5c0f40b109e3854e94b89ec5383854c46ae3"; sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/853f47f469e372bdbae40f3cea60d9598e966fab/recipes/slime-volleyball"; sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7"; - name = "slime-volleyball"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67124,9 +87402,14 @@ license = lib.licenses.free; }; }) {}; - slirm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + slirm = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "slirm"; + ename = "slirm"; version = "20160201.625"; src = fetchFromGitHub { owner = "fbie"; @@ -67134,10 +87417,10 @@ rev = "9adfbe1fc67580e7d0d90f7e927a25d63a797464"; sha256 = "0srj0zcvzr0sjcs37zz11xz8w0yv94m69av9ny7mx8ssf4qp0pxa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6407db0f265c49fdddaa6e8f85f295e2b90a077b/recipes/slirm"; sha256 = "061xjj3vjdkkvd979fhp7bc12g5zkxqxywvcz3z9dlkgdks41ld7"; - name = "slirm"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -67145,9 +87428,13 @@ license = lib.licenses.free; }; }) {}; - slovak-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + slovak-holidays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "slovak-holidays"; + ename = "slovak-holidays"; version = "20150418.155"; src = fetchFromGitHub { owner = "Fuco1"; @@ -67155,10 +87442,10 @@ rev = "effb16dfcd14797bf7448f5113085479db339c02"; sha256 = "1y1gay1h91c0690gly4qibx1my0l1zpb6s3x58lks8m21jdwfw28"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5c6b2208ef209dfe57c2c137a88ce08a4eae475/recipes/slovak-holidays"; sha256 = "1dcw8pa3r9b7n7dc8fgzijz7ywwxb3nlfg7n0by8dnvpjq2c30bg"; - name = "slovak-holidays"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67166,9 +87453,15 @@ license = lib.licenses.free; }; }) {}; - slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + slstats = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "slstats"; + ename = "slstats"; version = "20170823.149"; src = fetchFromGitHub { owner = "davep"; @@ -67176,10 +87469,10 @@ rev = "e9696066abf3f2b7b818a57c062530dfd9377033"; sha256 = "1mjzr6lqcyx3clp3bxq77k2rpkaglnq407xdk05xkaqissirpc83"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; sha256 = "0z5y2fmb3v16g5gf87c9gll04wbjp3d1cf7gm5cxi4w3y1kw4r7q"; - name = "slstats"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -67187,20 +87480,25 @@ license = lib.licenses.free; }; }) {}; - sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sly = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sly"; - version = "20180221.1414"; + ename = "sly"; + version = "20180722.1611"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "486bfbe95612bcdc0960c490207970a188e0fbb9"; - sha256 = "0ib4q4k3h3qn88pymyjjmlmnpizdn1mfg5gpk5a715nqsgxlg09l"; + rev = "4b260fdda880f8287327c0c0055e2f18fd91201d"; + sha256 = "05s248657hgi4sp8g1d5zsq1x4nwxvairzx17psqkwflxc11cpv6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l"; - name = "sly"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -67208,30 +87506,14 @@ license = lib.licenses.free; }; }) {}; - sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: - melpaBuild { - pname = "sly-company"; - version = "20180212.1653"; - src = fetchFromGitHub { - owner = "capitaomorte"; - repo = "sly-company"; - rev = "dfe18218e4b2ee9874394b50f82f5172f41c462c"; - sha256 = "1bj8w2wfq944cnhsk5xx41mfrjv89scrg4w98kqgda5drkpdf8a7"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/sly-company"; - sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2"; - name = "sly-company"; - }; - packageRequires = [ company emacs sly ]; - meta = { - homepage = "https://melpa.org/#/sly-company"; - license = lib.licenses.free; - }; - }) {}; - sly-hello-world = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: - melpaBuild { + sly-hello-world = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sly }: + melpaBuild { pname = "sly-hello-world"; + ename = "sly-hello-world"; version = "20160119.636"; src = fetchFromGitHub { owner = "capitaomorte"; @@ -67239,10 +87521,10 @@ rev = "1bfcca692b6ec0670ed309ffe29eb9384397c183"; sha256 = "1fxsv83fcv5l7cndsysd8salvfwsabvd84sm7zli2ksf678774gp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d52ef4b249a42432eed6a260a758e26b50bc31d6/recipes/sly-hello-world"; sha256 = "03ybjgczp6ssk4hmwd486vshlk7ql27k1lyhmvk26gmrf554z90n"; - name = "sly-hello-world"; + name = "recipe"; }; packageRequires = [ sly ]; meta = { @@ -67250,20 +87532,26 @@ license = lib.licenses.free; }; }) {}; - sly-macrostep = callPackage ({ fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild, sly }: - melpaBuild { + sly-macrostep = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , macrostep + , melpaBuild + , sly }: + melpaBuild { pname = "sly-macrostep"; + ename = "sly-macrostep"; version = "20160119.434"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-macrostep"; - rev = "eb16778d104413a3e2a8d5537437c4ad76c2954b"; + rev = "b0830871e2bd96ed58876aed6b49f1328d78a3cb"; sha256 = "00lw6hkxs71abjyi7nhzi8j6n55jyhzsp81ycn6f2liyp4rmqgi7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74a0acfc6261d1c9e62ece0397f6b4d873ef5bb7/recipes/sly-macrostep"; sha256 = "1i004mb0bg13j3zhdsjz1795dh0ry8winzvdghr1wardc9np60h7"; - name = "sly-macrostep"; + name = "recipe"; }; packageRequires = [ macrostep sly ]; meta = { @@ -67271,20 +87559,25 @@ license = lib.licenses.free; }; }) {}; - sly-named-readtables = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: - melpaBuild { + sly-named-readtables = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sly }: + melpaBuild { pname = "sly-named-readtables"; + ename = "sly-named-readtables"; version = "20150817.816"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-named-readtables"; - rev = "df4ed79064cf85275804e201899b677bef4ab3f5"; - sha256 = "1xi625pn3mg77mjvr94v6a5pjyvgjavpkdbbh1lqjx1halaa2qb7"; + rev = "f3c28a2e636bd1776b6c7dbc563ef5080bed9f5c"; + sha256 = "1yw1fg1vc6l85v7d6bg16lknxpg7ns1gfw0bxyzyb698zmwzsv60"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e5a29c194bb7fc1a82131b7a9bd4c465660a2bd/recipes/sly-named-readtables"; sha256 = "11ymzbj1ji7avfjqafj9p5zx0m4y1jfjcmyanpjq1frdcz639ir9"; - name = "sly-named-readtables"; + name = "recipe"; }; packageRequires = [ sly ]; meta = { @@ -67292,9 +87585,14 @@ license = lib.licenses.free; }; }) {}; - sly-quicklisp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: - melpaBuild { + sly-quicklisp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sly }: + melpaBuild { pname = "sly-quicklisp"; + ename = "sly-quicklisp"; version = "20170112.135"; src = fetchFromGitHub { owner = "capitaomorte"; @@ -67302,10 +87600,10 @@ rev = "8a9e3c0c07c6861ec33b338cc46ac12e7ce6a477"; sha256 = "17xx79s2nx8prmg0xhfs9i8sdprbysaajc8k4131lnahj65v159l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/330d04e4e79eee221bcffb8be3e46e097306b175/recipes/sly-quicklisp"; sha256 = "1hpcz84g9c6g0x8qal02xgjj02gxqz3bysyz0l59jxiga0m634v8"; - name = "sly-quicklisp"; + name = "recipe"; }; packageRequires = [ sly ]; meta = { @@ -67313,9 +87611,15 @@ license = lib.licenses.free; }; }) {}; - sly-repl-ansi-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: - melpaBuild { + sly-repl-ansi-color = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sly }: + melpaBuild { pname = "sly-repl-ansi-color"; + ename = "sly-repl-ansi-color"; version = "20171020.816"; src = fetchFromGitHub { owner = "PuercoPop"; @@ -67323,10 +87627,10 @@ rev = "b9cd52d1cf927bf7e08582d46ab0bcf1d4fb5048"; sha256 = "0fgcn6bwgz8yyjza07kfi86siargvpq4kp4j20hs6b67ckxjxx0x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/981e01f562c40e02cb6d56dc1347e922fbad9c18/recipes/sly-repl-ansi-color"; sha256 = "0wz24kfjl6rp4qss0iq2ilav0mkg2spy2ziikypy7v0iqbssmssi"; - name = "sly-repl-ansi-color"; + name = "recipe"; }; packageRequires = [ cl-lib sly ]; meta = { @@ -67334,20 +87638,24 @@ license = lib.licenses.free; }; }) {}; - smart-backspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-backspace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-backspace"; + ename = "smart-backspace"; version = "20171013.2226"; src = fetchFromGitHub { owner = "itome"; repo = "smart-backspace"; - rev = "a10ec44ff325ec8c4c98b1a6e44e89e60a9aa4ac"; - sha256 = "0p19qikalmvs9y1lws08mxvh2k8s219mpm3nyi9aqq62ryyfwf1n"; + rev = "acb390628a181a993aa0d137624f2e5283efa6d9"; + sha256 = "08r2821skwvi9gbkj3l8zzvrizbfs3wapzxppgd0ks2mfhcnsqsl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88cd95cd623fb00d1bc6800c1dd3c665a0cce349/recipes/smart-backspace"; sha256 = "152xdxzrr91qiyq25ghvjlbpc627cw4s120axmz2p2d48pinwir9"; - name = "smart-backspace"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67355,20 +87663,24 @@ license = lib.licenses.free; }; }) {}; - smart-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-comment = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-comment"; + ename = "smart-comment"; version = "20160322.1139"; src = fetchFromGitHub { owner = "paldepind"; repo = "smart-comment"; - rev = "17ddbd83205818763e6d68aa7a1aa9aaf414cbd4"; - sha256 = "0r181rdnymr96kj74c73212n6157cfiq1d6hk2lfc54yl6h76zf4"; + rev = "ad4e0de29115dc010733b9060d3dab02836b15e1"; + sha256 = "0hg0mabh06ggqcfhcjxbw5hsbrk85bk21hafqlvpd0xizwqq0w0a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/798c3b42e568bea63edc0c1d3ce2c2d913e3440e/recipes/smart-comment"; sha256 = "0lbrasdrkyj7zybz0f3xick8p0bvci5bhb2kg6pqzz9pw2iaxw12"; - name = "smart-comment"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67376,9 +87688,13 @@ license = lib.licenses.free; }; }) {}; - smart-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-compile = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-compile"; + ename = "smart-compile"; version = "20180315.2030"; src = fetchFromGitHub { owner = "zenitani"; @@ -67386,10 +87702,10 @@ rev = "16ebc3c570f1949b8198fcc8663d6d26df32717a"; sha256 = "0i5g7inbr90l3n1rsf4152ax4wkbw2q41ks9j3x6a956zxn8q92w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93562afd7b62d7535b8010179ba6ac7e8e6280d0/recipes/smart-compile"; sha256 = "1w3vyb6wz786ydrywkjmazyvgfl0qxamn0fgnqpn17d2c5jr9c4g"; - name = "smart-compile"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67397,20 +87713,24 @@ license = lib.licenses.free; }; }) {}; - smart-cursor-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-cursor-color = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-cursor-color"; + ename = "smart-cursor-color"; version = "20141124.919"; src = fetchFromGitHub { owner = "7696122"; repo = "smart-cursor-color"; - rev = "1d190f49ca77734b55ac58f1b6276e42ada967b0"; - sha256 = "1xbd42q60pmg0hw4bn2fndjwgrfgj6ggm757fyp8m08jqh0zkarn"; + rev = "fda3510b23a118f152ece09af88c727065ba016a"; + sha256 = "0f6f7vw6kcifl4f9mwxrb6h90r6vmrcf0ayk37g3ymz6k5blj3q4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smart-cursor-color"; sha256 = "19ah55514ashkm4f49nlbnrpwxpwlfn6x3fbi4dv0x2b8v1828ss"; - name = "smart-cursor-color"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67418,19 +87738,23 @@ license = lib.licenses.free; }; }) {}; - smart-dash = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-dash = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-dash"; + ename = "smart-dash"; version = "20110130.1916"; src = fetchhg { url = "https://bitbucket.com/malsyned/smart-dash"; rev = "f8f23121ecb1"; sha256 = "069jwi74qh9hy152k19c7avdgb89zym989v92kgghbaaiyinng22"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98a2cf93cc41cb2bba14f91a83b6949267623198/recipes/smart-dash"; sha256 = "1n3lh0ximwrqawdg8q9ls6aabidrawqca5w67f8vsfmrvyfx48n4"; - name = "smart-dash"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67438,9 +87762,14 @@ license = lib.licenses.free; }; }) {}; - smart-forward = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-forward = callPackage ({ expand-region + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-forward"; + ename = "smart-forward"; version = "20140430.13"; src = fetchFromGitHub { owner = "magnars"; @@ -67448,10 +87777,10 @@ rev = "7b6dbfdbd4b646376a567c70e1a161545431b72b"; sha256 = "19l47xqzjhhm9j3izik0imssip5ygg3lnflb9ixsz1js571aaxha"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/smart-forward"; sha256 = "032yc45c19fl886jmi5q04r6q47xz5rphb040wjvpd4fnb06hr8c"; - name = "smart-forward"; + name = "recipe"; }; packageRequires = [ expand-region ]; meta = { @@ -67459,20 +87788,25 @@ license = lib.licenses.free; }; }) {}; - smart-hungry-delete = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-hungry-delete = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-hungry-delete"; + ename = "smart-hungry-delete"; version = "20170412.643"; src = fetchFromGitHub { owner = "hrehfeld"; repo = "emacs-smart-hungry-delete"; - rev = "7c1d56a92481594e14d40b5fdf6c48657a0108a0"; - sha256 = "0mxaslx5823s68a8ggbbnmfk1jiswjvip5s4sg7ihfagnci72wni"; + rev = "bae1bdf9647dfe0f92cb138fbadf7ee0f842453d"; + sha256 = "120sg7wfq3nly0qwbchhmwjrg8cdra0g3y08fk5zfngc3ddh3gk7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abbf52a856b95ab88cde1fdeeebebb81f7c61fa9/recipes/smart-hungry-delete"; sha256 = "03hw5p055dbayw5z43c1ippf2lnjgs77l7q969ng3fffqkazjq9b"; - name = "smart-hungry-delete"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -67480,9 +87814,13 @@ license = lib.licenses.free; }; }) {}; - smart-indent-rigidly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-indent-rigidly = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-indent-rigidly"; + ename = "smart-indent-rigidly"; version = "20141205.1615"; src = fetchFromGitHub { owner = "re5et"; @@ -67490,10 +87828,10 @@ rev = "323d1fe4d0b81e598249aad01bc44adb180ece0e"; sha256 = "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3083f497180d2f7d93bb9a4b98af6ae1bcbe57b9/recipes/smart-indent-rigidly"; sha256 = "12qggg1m28mlvkdn52dig8bwv58pvipkvn1mlc4r7w569arar44x"; - name = "smart-indent-rigidly"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67501,20 +87839,26 @@ license = lib.licenses.free; }; }) {}; - smart-jump = callPackage ({ dumb-jump, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-jump = callPackage ({ dumb-jump + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-jump"; - version = "20180121.2252"; + ename = "smart-jump"; + version = "20180709.2205"; src = fetchFromGitHub { owner = "jojojames"; repo = "smart-jump"; - rev = "5431fcd2052918d85507ac31c40256adb67eb77e"; - sha256 = "12224rfgb9193dmjgshcaxac70fprfl7r0m64p4aw0f6cxfr0pqp"; + rev = "1b216416a977dc94a6f3b5e40adde7b502d97c2f"; + sha256 = "1rrd4x2pcy473gbha2dysawzqywlfp8yhl6xq6z8s2ggp9c825dn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52f29e14e61b28cd1637ca5d6bd878d91a71251f/recipes/smart-jump"; sha256 = "14c7p6xqasd0fgn70zj1jlpwjxldzqx44bcdqdk6nmjihw0rk632"; - name = "smart-jump"; + name = "recipe"; }; packageRequires = [ dumb-jump emacs ]; meta = { @@ -67522,20 +87866,24 @@ license = lib.licenses.free; }; }) {}; - smart-mark = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-mark = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-mark"; + ename = "smart-mark"; version = "20150911.1910"; src = fetchFromGitHub { owner = "cheunghy"; repo = "smart-mark"; - rev = "04b522a23e3aae8381c6a976fc978532fcb2e7d0"; - sha256 = "0sqvm7iwdjk057fwid4kz6wj71igiqhdarj59s17pzy6xz34afhg"; + rev = "d179cdc3f53001a5ce99d5095f493cdf3a792567"; + sha256 = "0kd3rh6idlaqand9i6sc44s1iahg5jdhqs9jpvivxlycj6z9p7m8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a0a35a06aedbfe6f66d9d8498d325540367d3ea/recipes/smart-mark"; sha256 = "1vv65sa0pwl407mbxcp653kycgx8jz87n6wshias1dp9lv21pj6v"; - name = "smart-mark"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67543,20 +87891,26 @@ license = lib.licenses.free; }; }) {}; - smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: - melpaBuild { + smart-mode-line = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , rich-minority }: + melpaBuild { pname = "smart-mode-line"; - version = "20180323.648"; + ename = "smart-mode-line"; + version = "20180422.1459"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "9e261a2bb6ade7f8a4428bc6cb27789878b2844c"; - sha256 = "1hfngb60n3nbfx1p662p76kz7v4mjcppf0ygbqlhrlbv6a9n8ll5"; + rev = "96e7ea0caba37fec485ea8b683afb4aed46d1d24"; + sha256 = "0rrb1mgnj1hw92hl0m9ybvilrd070n6a44lb6jj42hk8ybb0cxh2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6"; - name = "smart-mode-line"; + name = "recipe"; }; packageRequires = [ emacs rich-minority ]; meta = { @@ -67564,20 +87918,27 @@ license = lib.licenses.free; }; }) {}; - smart-mode-line-powerline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, smart-mode-line }: - melpaBuild { + smart-mode-line-powerline-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , powerline + , smart-mode-line }: + melpaBuild { pname = "smart-mode-line-powerline-theme"; + ename = "smart-mode-line-powerline-theme"; version = "20160705.1738"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "9e261a2bb6ade7f8a4428bc6cb27789878b2844c"; - sha256 = "1hfngb60n3nbfx1p662p76kz7v4mjcppf0ygbqlhrlbv6a9n8ll5"; + rev = "558251e200cc555df137e60326295f2bd640fd6a"; + sha256 = "1xh1qcxw0r3j8hx8k8hsx0cl82wps5x755j4kbn01m7srzv6v167"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4"; - name = "smart-mode-line-powerline-theme"; + name = "recipe"; }; packageRequires = [ emacs powerline smart-mode-line ]; meta = { @@ -67585,20 +87946,24 @@ license = lib.licenses.free; }; }) {}; - smart-newline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-newline = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-newline"; + ename = "smart-newline"; version = "20131207.1940"; src = fetchFromGitHub { owner = "ainame"; repo = "smart-newline.el"; - rev = "0553a9e4be7188352de1a28f2eddfd28e7436f94"; - sha256 = "0w0v3gzfg3cphz701g30sf7l92v3npsd7028pjp5g7rgv3pwkgsd"; + rev = "c50ab035839b307c66d439083b6761cb7db5e972"; + sha256 = "1k853hngjrhp7n1bj18p2pk30adzk7j03knhl9i3889lfmd5p4yi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f729926f82d6b61f07f5c8a5e19d46afdcad568/recipes/smart-newline"; sha256 = "1kyk865vkgh05vzlggs3ii81v86fcbcxybfkv5rkyl3fyqpkza1w"; - name = "smart-newline"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67606,9 +87971,17 @@ license = lib.licenses.free; }; }) {}; - smart-region = callPackage ({ cl-lib ? null, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: - melpaBuild { + smart-region = callPackage ({ cl-lib ? null + , emacs + , expand-region + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multiple-cursors }: + melpaBuild { pname = "smart-region"; + ename = "smart-region"; version = "20150903.703"; src = fetchFromGitHub { owner = "uk-ar"; @@ -67616,10 +87989,10 @@ rev = "5a8017fd8e8dc3483865951c4942cab3f96f69f6"; sha256 = "0h559cdyln5f4ignx1r86ryi7wizys0gj03dj7lfzaxr7wkd0jaf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf011493ee3ebc38290ee0349c8475b0588ac928/recipes/smart-region"; sha256 = "1bcvxf62bfi5lmhprma9rh670kka9p9ygbkgmv6dg6ajjfsplgwc"; - name = "smart-region"; + name = "recipe"; }; packageRequires = [ cl-lib emacs expand-region multiple-cursors ]; meta = { @@ -67627,20 +88000,25 @@ license = lib.licenses.free; }; }) {}; - smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-semicolon = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-semicolon"; + ename = "smart-semicolon"; version = "20171007.1833"; src = fetchFromGitHub { owner = "iquiw"; repo = "smart-semicolon"; - rev = "c11096679dbed3875c37413337ee490ee7951b63"; - sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518"; + rev = "94cf665aed45c5882e94afe465704fed6326e92e"; + sha256 = "16nkxf8phxi240fd9ksazxmjs91j0xplny6890a06kx4r8s61p9f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon"; sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0"; - name = "smart-semicolon"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -67648,9 +88026,13 @@ license = lib.licenses.free; }; }) {}; - smart-shift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-shift = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-shift"; + ename = "smart-shift"; version = "20150202.2325"; src = fetchFromGitHub { owner = "hbin"; @@ -67658,10 +88040,10 @@ rev = "a26ab2b240137e62ec4bce1698ed9c5f7b6d13ae"; sha256 = "0azhfffm1bkgjx4i3p9f6x2gmw8kc3fafzqj4vxxdibhn0nizqk8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79726ff0fbfa24a44d303cc9719f5962638b47e0/recipes/smart-shift"; sha256 = "0azahlflnh6sk081k5dcqal6nmwkjnj4dq8pv8ckwf8684zp23d3"; - name = "smart-shift"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67669,9 +88051,13 @@ license = lib.licenses.free; }; }) {}; - smart-tab = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-tab = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-tab"; + ename = "smart-tab"; version = "20170902.1407"; src = fetchFromGitHub { owner = "genehack"; @@ -67679,10 +88065,10 @@ rev = "76a8ec13384975d39aa1b25e5384a02558dba574"; sha256 = "02mj2is05adq5v64aahivbkx2kzrxmmg2va650hsvl4izj3dr2x3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/smart-tab"; sha256 = "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5"; - name = "smart-tab"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67690,20 +88076,24 @@ license = lib.licenses.free; }; }) {}; - smart-tabs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-tabs-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-tabs-mode"; + ename = "smart-tabs-mode"; version = "20160629.752"; src = fetchFromGitHub { owner = "jcsalomon"; repo = "smarttabs"; - rev = "9cc2594b82b03e7d68645a4878f9359f8b8c34c5"; - sha256 = "0bjl3j047jh674vyfmh9izwak2yic8f7aqv832hn1inhnavsl3xx"; + rev = "1b2f34cc33335486f2b08b864a8037092c1a2956"; + sha256 = "07zc2iw5ijyn822z29g5xb6hhhdmg9b98pfrdwrm0kw86pypxyxk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d712f0fb9538945713faf773772bb359fe6f509f/recipes/smart-tabs-mode"; sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl"; - name = "smart-tabs-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67711,9 +88101,14 @@ license = lib.licenses.free; }; }) {}; - smart-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-window = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-window"; + ename = "smart-window"; version = "20160716.1830"; src = fetchFromGitHub { owner = "dryman"; @@ -67721,10 +88116,10 @@ rev = "5996461b7cbc5ab4509ac48537916eb29a8e4c16"; sha256 = "0p1cqpdsp2vdx85i22shyzfhz22zwf1k1dxkqcmlgh3y7f4qq8ir"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smart-window"; sha256 = "0w24v7v0477yl5zchyk6713yqp8lyfz600myvv4dp3kgppxpgd3f"; - name = "smart-window"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -67732,20 +88127,26 @@ license = lib.licenses.free; }; }) {}; - smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smartparens = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smartparens"; - version = "20180325.438"; + ename = "smartparens"; + version = "20180717.335"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "6eea872207c331c3df70caac49577b01926be45a"; - sha256 = "02qx8clgwwaggm2xmrsr0bxcapiipryyb5d4csm05xpbm19q7xv1"; + rev = "34b53320f4ac41a60d641c5363cd5e02db37089e"; + sha256 = "1yv31wzf7wzkqpvmr3rdiphg4h7224bjfv5pr17gmgzjv9hlq3k2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6"; - name = "smartparens"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -67753,9 +88154,13 @@ license = lib.licenses.free; }; }) {}; - smartrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smartrep = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smartrep"; + ename = "smartrep"; version = "20150508.1930"; src = fetchFromGitHub { owner = "myuhe"; @@ -67763,10 +88168,10 @@ rev = "f0ff5a6d7b8603603598ae3045c98b011e58d86e"; sha256 = "1sjwqi8w83qxihqmcm7z0vwmrz1az0y266qgj2nwfv39bri6y4i6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81cb649dc49767c21f79668d6bee950567b05aa0/recipes/smartrep"; sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn"; - name = "smartrep"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67774,9 +88179,13 @@ license = lib.licenses.free; }; }) {}; - smartscan = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smartscan = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smartscan"; + ename = "smartscan"; version = "20170211.1233"; src = fetchFromGitHub { owner = "mickeynp"; @@ -67784,10 +88193,10 @@ rev = "234e077145710a174c20742de792b97ed2f965f6"; sha256 = "1nzkgfr1w30yi88h4kwgiwq4lcd0fpm1cd50gy0csjcpbnyq6ykf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smartscan"; sha256 = "1q0lqms16g7avln1pbxzb49z3w96kv1r7lbh61ijlnz3jips098w"; - name = "smartscan"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67795,9 +88204,13 @@ license = lib.licenses.free; }; }) {}; - smarty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smarty-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smarty-mode"; + ename = "smarty-mode"; version = "20100703.458"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -67805,10 +88218,10 @@ rev = "3dfdfe1571f5e9ef55a29c51e5a80046d4cb7568"; sha256 = "1vl3nx0y2skb8sibqxvmc3wrmmd6z88hknbry348d0ik3cbr0ijx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/smarty-mode"; sha256 = "06cyr2330asy2dlx81g3h9gq0yhd4pbnmzfvmla7amh4pfnjg14v"; - name = "smarty-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67816,9 +88229,13 @@ license = lib.licenses.free; }; }) {}; - smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smbc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smbc"; + ename = "smbc"; version = "20171229.1008"; src = fetchFromGitHub { owner = "sakshamsharma"; @@ -67826,10 +88243,10 @@ rev = "10538e3d575ba6ef3c94d555af2744b42dfd36c7"; sha256 = "0b2fndvp9kzlr65b0gr0z5hmapa4y96a6zvc2nrlijffkgyk05nn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b4f16cd8028edc758ada842432df11c8276fd3/recipes/smbc"; sha256 = "0aviqa8mk8dxxnddfskq9jgz3knqhf0frj7gq7nk6ckxkrxrgqn4"; - name = "smbc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67837,9 +88254,14 @@ license = lib.licenses.free; }; }) {}; - smblog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smblog = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smblog"; + ename = "smblog"; version = "20170419.321"; src = fetchFromGitHub { owner = "aaptel"; @@ -67847,10 +88269,10 @@ rev = "5245e7aeac20915121946f59bba30899305d950b"; sha256 = "0i5q29b3hk644dnc0d98d613l065p0k846ljg13vgawpiic6ld6b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6469537a11972509fa2bfb10eb3f8816cc98efed/recipes/smblog"; sha256 = "1byalkpc1bcb6p4j4g1cwc4q2i7irxjcphb0hqh1b2k1zixrw5rr"; - name = "smblog"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -67858,9 +88280,14 @@ license = lib.licenses.free; }; }) {}; - smeargle = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smeargle = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smeargle"; + ename = "smeargle"; version = "20161212.1558"; src = fetchFromGitHub { owner = "syohex"; @@ -67868,10 +88295,10 @@ rev = "0665b1ff5109731898bc4a0ca6d939933b804777"; sha256 = "0p0kxmjdr02l9injlyyrnnzqdbb7mirz1xx79c3lw1rgpalf0jnf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5b985b24a23499454dc61bf071073df325de571/recipes/smeargle"; sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd"; - name = "smeargle"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -67879,9 +88306,14 @@ license = lib.licenses.free; }; }) {}; - smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smex = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smex"; + ename = "smex"; version = "20151212.1409"; src = fetchFromGitHub { owner = "nonsequitur"; @@ -67889,10 +88321,10 @@ rev = "55aaebe3d793c2c990b39a302eb26c184281c42c"; sha256 = "0xrbkpc3w7yadpjih169cpp75gilsnx4y9akgci5vfcggv4ffm26"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/smex"; sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda"; - name = "smex"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -67900,9 +88332,13 @@ license = lib.licenses.free; }; }) {}; - smiles-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smiles-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smiles-mode"; + ename = "smiles-mode"; version = "20160717.420"; src = fetchFromGitHub { owner = "stardiviner"; @@ -67910,10 +88346,10 @@ rev = "fbb381758adcb000a0c304be1b797f985f00e2de"; sha256 = "07lzr1p58v95a4n6zad8y0dpj7chbxlcmb6s144pvcxx8kjwd4dr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smiles-mode"; sha256 = "0wf02aj9bhl2m861342f5jfkx3xws1ggcyszfp9jphlykw6r0v9k"; - name = "smiles-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67921,9 +88357,13 @@ license = lib.licenses.free; }; }) {}; - sml-modeline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sml-modeline = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sml-modeline"; + ename = "sml-modeline"; version = "20170614.1411"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -67931,10 +88371,10 @@ rev = "d2f9f70174c4cf68c67eb3bb8088235735e34d9a"; sha256 = "18k2k213vgawxskp9m57r8qarg3pnza6nvbpyi6l03jnmf2kcw2b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4728fce21f03c95bcc2b562648e99c537fb09cd8/recipes/sml-modeline"; sha256 = "00kz03ixkfnm4id8dd8aij2rhakzd4arzd790jdac1y3yyd5pp3y"; - name = "sml-modeline"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67942,20 +88382,24 @@ license = lib.licenses.free; }; }) {}; - smmry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smmry = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smmry"; + ename = "smmry"; version = "20161024.201"; src = fetchFromGitHub { owner = "microamp"; repo = "smmry.el"; - rev = "986a1b0aec8ab1ef17dbfb7886f47e5558cf738a"; - sha256 = "1gq2066js1kf035217z0n6w0bf0dsyskykf56xycci5s1i7xv2vz"; + rev = "b7ee765337fa627a6c59eb4f2a91df5d280ac6df"; + sha256 = "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba2d4be4dd4d6c378eabd833f05a944afa21817b/recipes/smmry"; sha256 = "05ikcvyr74jy3digd0ad443h5kf11w29hgnmb71bclm3mfslh5wn"; - name = "smmry"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67963,9 +88407,13 @@ license = lib.licenses.free; }; }) {}; - smooth-scroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smooth-scroll = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smooth-scroll"; + ename = "smooth-scroll"; version = "20130321.2114"; src = fetchFromGitHub { owner = "k-talo"; @@ -67973,10 +88421,10 @@ rev = "02320f28abb5cae28b3a18f6b9ce93129bdbfc45"; sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ad6411f76281232848c870e8f4f5bb78e6cf328/recipes/smooth-scroll"; sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf"; - name = "smooth-scroll"; + name = "recipe"; }; packageRequires = []; meta = { @@ -67984,9 +88432,13 @@ license = lib.licenses.free; }; }) {}; - smooth-scrolling = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smooth-scrolling = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smooth-scrolling"; + ename = "smooth-scrolling"; version = "20161002.1249"; src = fetchFromGitHub { owner = "aspiers"; @@ -67994,10 +88446,10 @@ rev = "2462c13640aa4c75ab3ddad443fedc29acf68f84"; sha256 = "1h15gjq781i6fsz32qlh51knawdr8hcqvshsz6cszp752cibdcdg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e156f146649a51f6ee636aef95214944a8079a27/recipes/smooth-scrolling"; sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6"; - name = "smooth-scrolling"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68005,9 +88457,13 @@ license = lib.licenses.free; }; }) {}; - smotitah = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smotitah = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smotitah"; + ename = "smotitah"; version = "20150218.230"; src = fetchFromGitHub { owner = "laynor"; @@ -68015,10 +88471,10 @@ rev = "f9ab562128a5460549d016913533778e8c94bcf3"; sha256 = "1a097f1x9l0m4dizvnb742svlqsm6hlif73rk7qjar081sk1gjxx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/326c213450fc515573b963e794584b7b5ac995fa/recipes/smotitah"; sha256 = "1m5qjl3r96riljp48il8k4rb6rwys1xf1pl93d4qjhprwvz57mv2"; - name = "smotitah"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68026,9 +88482,13 @@ license = lib.licenses.free; }; }) {}; - smtpmail-multi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smtpmail-multi = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smtpmail-multi"; + ename = "smtpmail-multi"; version = "20160218.1549"; src = fetchFromGitHub { owner = "vapniks"; @@ -68036,10 +88496,10 @@ rev = "81eabfe56f620ee044ff9dd52fa8b6148d0a9f30"; sha256 = "0zknryfpg4791l7d7xv9hn2fx00rmbqw3737lfm75484hr10lymz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/835315ec2781ac90785824630510b9eae80c115a/recipes/smtpmail-multi"; sha256 = "0nc3k8ly4nx7fm3b2apga3p4svz5c9sldnlk86pz2lzra5h3b4ss"; - name = "smtpmail-multi"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68047,9 +88507,13 @@ license = lib.licenses.free; }; }) {}; - smyx-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smyx-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smyx-theme"; + ename = "smyx-theme"; version = "20141127.28"; src = fetchFromGitHub { owner = "tacit7"; @@ -68057,10 +88521,10 @@ rev = "6263f6b401bbabaed388c8efcfc0be2e58c51401"; sha256 = "1z2sdnf11wh5hz1rkrbg7fs4ha3zrbj9qnvfzq9005y89d7cs95x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/40a1aeabb75438252ebea0332fe1deaf028c956d/recipes/smyx-theme"; sha256 = "1r85yxr864df5akqknl3hsrmzikr4085bqr6ijrbdj27nz00vl61"; - name = "smyx-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68068,20 +88532,27 @@ license = lib.licenses.free; }; }) {}; - snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: - melpaBuild { + snakemake-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , magit-popup + , melpaBuild }: + melpaBuild { pname = "snakemake-mode"; - version = "20180320.2029"; + ename = "snakemake-mode"; + version = "20180519.1739"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "43a4b37b1374de50e2022885077968af6d0e30a5"; - sha256 = "1xjhg3921gpgnxwr2grcrw9j9ar9faggppv030lyc4i7cx5qj357"; + rev = "8bc919296755ce58f52fd800ee21863c7aefb430"; + sha256 = "1zdiy0w95f9wm27czwjzxqyb5v16q61l1q8xrahh471x9pij632s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4"; - name = "snakemake-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs magit-popup ]; meta = { @@ -68089,9 +88560,14 @@ license = lib.licenses.free; }; }) {}; - snapshot-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + snapshot-timemachine = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "snapshot-timemachine"; + ename = "snapshot-timemachine"; version = "20161221.129"; src = fetchFromGitHub { owner = "mrBliss"; @@ -68099,10 +88575,10 @@ rev = "99efcebab309b11ed512a8dc62555d3834df5efb"; sha256 = "18qibcyqxjwpvphmpghppb8ky1xcch1dd4pz91qj5f4h42684ips"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69376b802f0687227a78838877d89163b2893c5b/recipes/snapshot-timemachine"; sha256 = "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p"; - name = "snapshot-timemachine"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -68110,9 +88586,15 @@ license = lib.licenses.free; }; }) {}; - snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }: - melpaBuild { + snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq + , snapshot-timemachine }: + melpaBuild { pname = "snapshot-timemachine-rsnapshot"; + ename = "snapshot-timemachine-rsnapshot"; version = "20170324.513"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -68120,10 +88602,10 @@ rev = "72b0b700d80f1a0442e62bbbb6a0c8c59182f97f"; sha256 = "1bdy7p0bjfdlv6l6yih6fvvi7xpldal4rj8l2ajpc6sgby24h8bb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot"; sha256 = "0fxijd94p961ab0p4ddmhja4bfrif2d87v32g4c41amc1klyf25r"; - name = "snapshot-timemachine-rsnapshot"; + name = "recipe"; }; packageRequires = [ seq snapshot-timemachine ]; meta = { @@ -68131,20 +88613,26 @@ license = lib.licenses.free; }; }) {}; - snazzy-theme = callPackage ({ base16-theme, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + snazzy-theme = callPackage ({ base16-theme + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "snazzy-theme"; + ename = "snazzy-theme"; version = "20170823.1132"; src = fetchFromGitHub { owner = "weijiangan"; repo = "emacs-snazzy"; - rev = "479351a34cd7f754375ee45f161f83a19d0fd29c"; - sha256 = "0lxxg6x5kb6ibwlywci9gw1bcdw2i23s07qd7k2lm86j5ixlpjgw"; + rev = "8729d10b5c1edf1053800170dab1ffd820b6fff2"; + sha256 = "1c07yggr6cnbca2iag1rjjsp1hiaccix222wzybxrphb72fn93wq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18c89a612418e0f49b7e6ae29a678d2fc1ffaf3d/recipes/snazzy-theme"; sha256 = "0srmhwhqrp1s01p1znhjzs254l3r2i6c91v7cnlwlvrls1sbh32k"; - name = "snazzy-theme"; + name = "recipe"; }; packageRequires = [ base16-theme emacs ]; meta = { @@ -68152,9 +88640,13 @@ license = lib.licenses.free; }; }) {}; - snippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + snippet = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "snippet"; + ename = "snippet"; version = "20130210.1515"; src = fetchFromGitHub { owner = "pkazmier"; @@ -68162,10 +88654,10 @@ rev = "11d00dd803874b93836f2010b08bd2c97b0f3c63"; sha256 = "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/snippet"; sha256 = "1yld7y1hsrqs0f0iq7zfwknil5zqv65npm67nh548hbyy3rhgd68"; - name = "snippet"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68173,9 +88665,15 @@ license = lib.licenses.free; }; }) {}; - snoopy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + snoopy = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "snoopy"; + ename = "snoopy"; version = "20171008.1304"; src = fetchFromGitHub { owner = "anmonteiro"; @@ -68183,10 +88681,10 @@ rev = "ec4123bdebfe0bb7bf4feaac2dc02b59caffe386"; sha256 = "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy"; sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi"; - name = "snoopy"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -68194,9 +88692,17 @@ license = lib.licenses.free; }; }) {}; - socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: - melpaBuild { + socyl = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , s }: + melpaBuild { pname = "socyl"; + ename = "socyl"; version = "20170211.2242"; src = fetchFromGitHub { owner = "nlamirault"; @@ -68204,10 +88710,10 @@ rev = "1ef2da42f66f3ab31a34131e51648f352416f0ba"; sha256 = "0jks5dkxhhgh4gbli90p71s8354iywlwj2lq6n5fyqxbdxzk412d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl"; sha256 = "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz"; - name = "socyl"; + name = "recipe"; }; packageRequires = [ cl-lib dash pkg-info s ]; meta = { @@ -68215,9 +88721,13 @@ license = lib.licenses.free; }; }) {}; - soft-charcoal-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + soft-charcoal-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "soft-charcoal-theme"; + ename = "soft-charcoal-theme"; version = "20140420.943"; src = fetchFromGitHub { owner = "mswift42"; @@ -68225,10 +88735,10 @@ rev = "5607ab977fae6638e78b1495e02da8955c9ba19f"; sha256 = "07056pnjgsgw06c67776qp7jci96iqbzlprbavzz2l1j8ywz8cwm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/soft-charcoal-theme"; sha256 = "1j9yd4kfh7ih5ipmwvxh9qqq6wxv6qk8a9vb5jiyk90dn8a2d7g5"; - name = "soft-charcoal-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68236,9 +88746,13 @@ license = lib.licenses.free; }; }) {}; - soft-morning-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + soft-morning-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "soft-morning-theme"; + ename = "soft-morning-theme"; version = "20150918.1341"; src = fetchFromGitHub { owner = "mswift42"; @@ -68246,10 +88760,10 @@ rev = "c0f9c70c97ef2be2a093cf839c4bfe27740a111c"; sha256 = "06q82v1hndvznsqg0r6jrxvgxhycg9m65kay4db4yy0gmc66v2xf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/26f26cb5cd4ed288a042d37039da83b38b9923d0/recipes/soft-morning-theme"; sha256 = "0lzg478ax6idzh6m5sf2ds4gbv096y0c0gn15dai19f58bs63xzr"; - name = "soft-morning-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68257,9 +88771,14 @@ license = lib.licenses.free; }; }) {}; - soft-stone-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + soft-stone-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "soft-stone-theme"; + ename = "soft-stone-theme"; version = "20140614.135"; src = fetchFromGitHub { owner = "mswift42"; @@ -68267,10 +88786,10 @@ rev = "fb475514cfb02cf30ce358a61c48e46614344d48"; sha256 = "030mf8b0sf9mmzwhg85zh0ccvcg768kckwvbm0yzg7vmq1x46hjl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e87cea74119e8239662607072a44e5314eeae7ea/recipes/soft-stone-theme"; sha256 = "05jjw9z6hqln9yj8ya2xrmjnylp7psfdj9206n30m3lwnlwx399v"; - name = "soft-stone-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -68278,20 +88797,26 @@ license = lib.licenses.free; }; }) {}; - solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + solaire-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "solaire-mode"; - version = "20180328.343"; + ename = "solaire-mode"; + version = "20180521.235"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "9307486ceee18f4b622406b8d600360419e6d742"; - sha256 = "0j8vl26vpzmsfbpx23wj5c9b7ia6fdyr8advnk6vcbkcwgj8r9q2"; + rev = "abf2ce4da77d0877efb4a035687390ce921eda4f"; + sha256 = "15wszz841vd9i59gq2xxh8rk7bh7agwglh2dwhxgs70m24hsp3p4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; sha256 = "0pvgip12xl16rwz4wqmqjd8nhh3a299aknfsghazmxigamlmlsl5"; - name = "solaire-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -68299,20 +88824,27 @@ license = lib.licenses.free; }; }) {}; - solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + solarized-theme = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "solarized-theme"; - version = "20180316.859"; + ename = "solarized-theme"; + version = "20180621.1407"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "1a46af3ff988e656a12b93c503fff87324b7420b"; - sha256 = "1w8rw2fqrf5xmy2i5pr7bxlr6n21vzfhcgd65jknbp2229nggkrh"; + rev = "f829e99dd1508a1cdaf9146511012a33b0d4f68b"; + sha256 = "1a83qsz41v208iasqwfnblgzhgjjwg1lkc0vgxndvq1kk2sj18dg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12"; - name = "solarized-theme"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -68320,20 +88852,24 @@ license = lib.licenses.free; }; }) {}; - solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + solidity-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "solidity-mode"; - version = "20180328.1608"; + ename = "solidity-mode"; + version = "20180721.1614"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "55049577992638a6c6c5e68ddc4bcbc6a9af7e60"; - sha256 = "0f6f3sry2ym2fivpn42r1dz2cy5hbdgb41p9qpmix0qyf31vh034"; + rev = "d89dae03c9c6cb86f4e935081cb828c6c5c62830"; + sha256 = "11n3z0ibgsw16r34ba8i6fl43b1hx4q7b6v6g12kmfpss86dvv1d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx"; - name = "solidity-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68341,9 +88877,18 @@ license = lib.licenses.free; }; }) {}; - sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }: - melpaBuild { + sonic-pi = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , highlight + , lib + , melpaBuild + , osc }: + melpaBuild { pname = "sonic-pi"; + ename = "sonic-pi"; version = "20171205.405"; src = fetchFromGitHub { owner = "repl-electric"; @@ -68351,10 +88896,10 @@ rev = "3cf101b3b299735ed91658c7791ea4f04164e076"; sha256 = "1x2w7qcx9xcvagb47hlc5vsf5aj5mr0mzvnazyd7ajjilbzn48yr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi"; sha256 = "0j6n1qgdrma6vvi6f7xiy66qwsl8710pca4ga9i7srhxv0r47x68"; - name = "sonic-pi"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs highlight osc ]; meta = { @@ -68362,20 +88907,25 @@ license = lib.licenses.free; }; }) {}; - soothe-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + soothe-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "soothe-theme"; + ename = "soothe-theme"; version = "20141027.741"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-soothe-theme"; - rev = "0786fe70c6c1b4ddcfb932fdc6862b9611cfc09b"; - sha256 = "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw"; + rev = "0568a61eeec0b074d8911886359a6c5da13d14cb"; + sha256 = "089ph9c6ggpfcd06166s2qgsghlfw5kvkbn8mqq6hjlyc5a9mvns"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/soothe-theme"; sha256 = "124akv3a4q4vrmprdcjmq7rq6x73mz4wqxvnlczglh9vjl39ndbk"; - name = "soothe-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -68383,9 +88933,13 @@ license = lib.licenses.free; }; }) {}; - sort-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sort-words = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sort-words"; + ename = "sort-words"; version = "20160929.635"; src = fetchFromGitHub { owner = "dotemacs"; @@ -68393,10 +88947,10 @@ rev = "7b6e108f80237363faf7ec28b2c58dec270b8601"; sha256 = "18cwii9h2planb9bgrih4hkz2cqinbl8wq5sal4b8kwnaq07bbw7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a4bd566392d7cebe8a891d787439512e8d34cf9/recipes/sort-words"; sha256 = "1hvbq09byjdbqzbyashw3y1h65wins44jnqcdic7vqzd1p1mzwka"; - name = "sort-words"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68404,20 +88958,25 @@ license = lib.licenses.free; }; }) {}; - sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + sos = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "sos"; + ename = "sos"; version = "20141214.2003"; src = fetchFromGitHub { owner = "omouse"; repo = "emacs-sos"; - rev = "1573adca912b88b5010d99a25c83a5b2313bd39c"; - sha256 = "19jwnny0v6ppakpaaxv9qhr6353mksh9kxiz61kp4h12n6sfrb7p"; + rev = "2469bf1d7c47a55b0ffa8a6ceef0bb21252b3c3a"; + sha256 = "0zhz1j389jmfcxmzvp3gj2bkg996nk1mcf0sxw04wbyivh38hnql"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36e02223b4ff9c0be4662991d734ca4a4e756f4b/recipes/sos"; sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb"; - name = "sos"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -68425,20 +88984,28 @@ license = lib.licenses.free; }; }) {}; - sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }: - melpaBuild { + sotclojure = callPackage ({ cider + , clojure-mode + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sotlisp }: + melpaBuild { pname = "sotclojure"; + ename = "sotclojure"; version = "20170921.1708"; src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-clojure"; - rev = "a480c887b53cb007b7b099c5ffcab89b9e59d7bc"; - sha256 = "1gf5fsrjigzxabd9k47lb98y3wdjwpw02x9ldnjzrgxfjfbxgqm0"; + rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32"; + sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure"; sha256 = "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090"; - name = "sotclojure"; + name = "recipe"; }; packageRequires = [ cider clojure-mode emacs sotlisp ]; meta = { @@ -68446,20 +89013,25 @@ license = lib.licenses.free; }; }) {}; - sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sotlisp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sotlisp"; - version = "20170429.1945"; + ename = "sotlisp"; + version = "20180706.1049"; src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-lisp"; - rev = "89dfed2b5d2e9a3b16bfc47f169412b583626059"; - sha256 = "17g03bfaq98ncd95qwms18pdrn5jphq7g2g606pymf10qr62g3n2"; + rev = "cc5730c0803a6e0f18e22d6027784b915d304318"; + sha256 = "1s1l2lscjnv8f60ncynv82xrqg5npj1m77z28fxlx53calj6k0qk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/sotlisp"; sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk"; - name = "sotlisp"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -68467,9 +89039,15 @@ license = lib.licenses.free; }; }) {}; - sound-wav = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sound-wav = callPackage ({ cl-lib ? null + , deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sound-wav"; + ename = "sound-wav"; version = "20160725.724"; src = fetchFromGitHub { owner = "syohex"; @@ -68477,10 +89055,10 @@ rev = "406868043761524118c27b1207be0f8bbda8798e"; sha256 = "1vwszcxknkjq4q32vb4dab4rlyd7w0l3pl5rpl08haczmr2frl4d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8333470e3d84d5433be489a23e065c876bed2ab2/recipes/sound-wav"; sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f"; - name = "sound-wav"; + name = "recipe"; }; packageRequires = [ cl-lib deferred ]; meta = { @@ -68488,9 +89066,19 @@ license = lib.licenses.free; }; }) {}; - soundcloud = callPackage ({ deferred, emms, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request, request-deferred, string-utils }: - melpaBuild { + soundcloud = callPackage ({ deferred + , emms + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild + , request + , request-deferred + , string-utils }: + melpaBuild { pname = "soundcloud"; + ename = "soundcloud"; version = "20150501.2026"; src = fetchFromGitHub { owner = "thieman"; @@ -68498,10 +89086,10 @@ rev = "f998d4276ea90258909c698f6a5a51fccb667c08"; sha256 = "1m8wcm6y80gq5rrm4brd3f20kmk54s6ph26j4lz4cmilxk6gj56v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/soundcloud"; sha256 = "06cbr1h03k5ixam6lsr82lx3nh2kkp0416mlig0zfkd4b8a9mf8c"; - name = "soundcloud"; + name = "recipe"; }; packageRequires = [ deferred @@ -68516,9 +89104,20 @@ license = lib.licenses.free; }; }) {}; - soundklaus = callPackage ({ cl-lib ? null, dash, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: - melpaBuild { + soundklaus = callPackage ({ cl-lib ? null + , dash + , emacs + , emms + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , request + , s }: + melpaBuild { pname = "soundklaus"; + ename = "soundklaus"; version = "20160314.531"; src = fetchFromGitHub { owner = "r0man"; @@ -68526,10 +89125,10 @@ rev = "09ec030843482594beae2664b8fe1e0ad1e66472"; sha256 = "0w5ac515ymj43p5j19nhfqk0c3251c7x3i97r550g780niby1nc5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811d0f1d195a0c6533fd412f0e444100e0685f90/recipes/soundklaus"; sha256 = "0b63sbgwp99ff94dxrqqp2p99j268fjkkzx0g42g726hv80d4fxb"; - name = "soundklaus"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs emms pkg-info request s ]; meta = { @@ -68537,9 +89136,17 @@ license = lib.licenses.free; }; }) {}; - sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + sourcekit = callPackage ({ dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "sourcekit"; + ename = "sourcekit"; version = "20180101.34"; src = fetchFromGitHub { owner = "nathankot"; @@ -68547,10 +89154,10 @@ rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781"; sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit"; sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks"; - name = "sourcekit"; + name = "recipe"; }; packageRequires = [ dash dash-functional emacs request ]; meta = { @@ -68558,9 +89165,14 @@ license = lib.licenses.free; }; }) {}; - sourcemap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sourcemap = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sourcemap"; + ename = "sourcemap"; version = "20161215.2140"; src = fetchFromGitHub { owner = "syohex"; @@ -68568,10 +89180,10 @@ rev = "64c89d296186f48d9135fb8aad501de19f64bceb"; sha256 = "115g2mfpbfywp8xnag4gsb50klfvplqfh928a5mabb5s8v4a3582"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557d18259543263932fccdbaf44c4e7986bd277b/recipes/sourcemap"; sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5"; - name = "sourcemap"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -68579,9 +89191,13 @@ license = lib.licenses.free; }; }) {}; - sourcerer-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sourcerer-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sourcerer-theme"; + ename = "sourcerer-theme"; version = "20161014.925"; src = fetchFromGitHub { owner = "gilbertw1"; @@ -68589,10 +89205,10 @@ rev = "c7f8e665d53bb48fb72f95f706710d53d24bd407"; sha256 = "06bxsbjyrn4grp9i17p90cs4x50cmw62k6a2c6gapkw8f1xbv7xv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8532e062b1830d8cf4e7f72518131a1f32762b37/recipes/sourcerer-theme"; sha256 = "0xikcln8sz3cic5a77cdvq2aazy1csf1qfxgmcavpqz54ps14j1z"; - name = "sourcerer-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68600,20 +89216,25 @@ license = lib.licenses.free; }; }) {}; - sourcetrail = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sourcetrail = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sourcetrail"; + ename = "sourcetrail"; version = "20170410.1437"; src = fetchFromGitHub { owner = "CoatiSoftware"; repo = "emacs-sourcetrail"; - rev = "b8d5557aa565ae979622312576db20515f65f977"; - sha256 = "1aqkkbf0xw4kqsy1jjn4xhs5vk2vcsqzs7f4p2sf1plnzsqxflw8"; + rev = "2f4327b32360b1549d84fecfe06ef8a85cfdedb8"; + sha256 = "0q9fipdn77mk8gpjrcmka3cxshnklksaa45v1b5qza0nlqcg3q1y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9713bd8030657c8e867409a6aa8173219809173a/recipes/sourcetrail"; sha256 = "0qa3iw82dbfc1b45505s39m99r0m2473312prws6hch0qhjyji7h"; - name = "sourcetrail"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -68621,9 +89242,14 @@ license = lib.licenses.free; }; }) {}; - spacegray-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + spacegray-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "spacegray-theme"; + ename = "spacegray-theme"; version = "20150719.1231"; src = fetchFromGitHub { owner = "bruce"; @@ -68631,10 +89257,10 @@ rev = "7f70ee36297e5ccf9bc90b1f81472024f5a7a749"; sha256 = "1a8jp7m9zarvljg5d9c8ydir3qcmwx05c3frs696p9nwvapf6lsb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fada130a1e2927d98526f4629cc1101d93e787c5/recipes/spacegray-theme"; sha256 = "0khiddpsywpv9qvynpfdmybd80lbrhm68j3py6ranxlv7p79j9dx"; - name = "spacegray-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -68642,20 +89268,29 @@ license = lib.licenses.free; }; }) {}; - spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: - melpaBuild { + spaceline = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , powerline + , s }: + melpaBuild { pname = "spaceline"; - version = "20180330.1332"; + ename = "spaceline"; + version = "20180628.46"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "efa2ebdec8bc1d8fa067f25fa54648f5a4d22aeb"; - sha256 = "1669r27rv4a7xlp2prjvl8hijnhzdw71lgsvxp65iwz7dl0912wk"; + rev = "29ced71ed0097cd5eba15d6bfdbafd9d18f5bd82"; + sha256 = "1l929zlma30h4b3bkldzn0pp5wps4ws0pylzw141nj0l3r7b3lcg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw"; - name = "spaceline"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs powerline s ]; meta = { @@ -68663,9 +89298,17 @@ license = lib.licenses.free; }; }) {}; - spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }: - melpaBuild { + spaceline-all-the-icons = callPackage ({ all-the-icons + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , memoize + , spaceline }: + melpaBuild { pname = "spaceline-all-the-icons"; + ename = "spaceline-all-the-icons"; version = "20170829.120"; src = fetchFromGitHub { owner = "domtronn"; @@ -68673,10 +89316,10 @@ rev = "e2e195f64a541d72b6d0ba0451f1e3072234b820"; sha256 = "0lrf62gsss19z2ca4hg5c08b3nbkqaa33fqrbfa126v2c98bj583"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons"; sha256 = "1h6clkr2f29k2vw0jcrmnfbjpphaxm7s3zai6pn6qag32bgm3jq6"; - name = "spaceline-all-the-icons"; + name = "recipe"; }; packageRequires = [ all-the-icons emacs memoize spaceline ]; meta = { @@ -68684,20 +89327,24 @@ license = lib.licenses.free; }; }) {}; - spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + spacemacs-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "spacemacs-theme"; - version = "20180319.736"; + ename = "spacemacs-theme"; + version = "20180618.1129"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "3c1a613a36e80d10ecd4a536d690dca672d41242"; - sha256 = "0arg3sw1rrlkn12kag5zyx8jgn4xgfffj7ysxpyqag8as7i5mcwi"; + rev = "af8a6093cd729c158da0532a8345612956553c8b"; + sha256 = "0890cdqacm2zri0mj9fdyyd5zplvl2p4gl499073qk076840l21f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; sha256 = "0riiim6qb6x9g5hz0k3qgdymgikynlb9l07mrbfmybkv4919p992"; - name = "spacemacs-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68705,9 +89352,13 @@ license = lib.licenses.free; }; }) {}; - spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + spaces = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "spaces"; + ename = "spaces"; version = "20170809.1508"; src = fetchFromGitHub { owner = "chumpage"; @@ -68715,10 +89366,10 @@ rev = "6bdb51e9a346907d60a9625f6180bddd06be6674"; sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa5d57074f73cf11607f2f1610f92a0c77367f2a/recipes/spaces"; sha256 = "152x7fzjnjjdk9d9h0hbixdp3haqn5vdx3bq1nfqfrkvzychyr06"; - name = "spaces"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68726,20 +89377,25 @@ license = lib.licenses.free; }; }) {}; - spark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + spark = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "spark"; + ename = "spark"; version = "20160414.1901"; src = fetchFromGitHub { owner = "alvinfrancis"; repo = "spark"; - rev = "0bf148c3ede3b31d56fd75f347cdd0b0eae60025"; - sha256 = "1ykqr86j17mi95s08d9fp02d7ych1331b04dcqxzxnmpkhwngyj1"; + rev = "eec8feae7dbc8547f878fac302f03e0ff7bc9803"; + sha256 = "155ap3vcypcj0pxvjhi2p0a5a9a2rp63hqnsjczsbabmbz1mdsd5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4d1529ab86de7c033579b1a1d0084899c16f454/recipes/spark"; sha256 = "0dv7ixv9gw6xxhw5zm4gmv2ll4lja8hmn2pdizlqxaizpm245rkn"; - name = "spark"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -68747,9 +89403,14 @@ license = lib.licenses.free; }; }) {}; - sparkline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sparkline = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sparkline"; + ename = "sparkline"; version = "20150101.519"; src = fetchFromGitHub { owner = "woudshoo"; @@ -68757,10 +89418,10 @@ rev = "a2b5d817d272d6363b67ed8f8cc75499a19fa8d2"; sha256 = "1fqd3ycywxxmln2kzqwflc69xmqlvi9gwvmf7frn0rfv73w09cvp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7278ca31ee3c035c8ec754af152127776f04792e/recipes/sparkline"; sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y"; - name = "sparkline"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -68768,9 +89429,15 @@ license = lib.licenses.free; }; }) {}; - sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sparql-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sparql-mode"; + ename = "sparql-mode"; version = "20180320.1102"; src = fetchFromGitHub { owner = "ljos"; @@ -68778,10 +89445,10 @@ rev = "a00bb622c54086ac1ee96c265bf7fbef12c68089"; sha256 = "0f919alnqbp5dnc4krgmnc9acqg84xs64fmzjc78gpbmfn0kyi0m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d"; - name = "sparql-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -68789,9 +89456,14 @@ license = lib.licenses.free; }; }) {}; - speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + speech-tagger = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "speech-tagger"; + ename = "speech-tagger"; version = "20170728.1129"; src = fetchFromGitHub { owner = "cosmicexplorer"; @@ -68799,10 +89471,10 @@ rev = "61955b40d4e8b09e66a3e8033e82893f81657c06"; sha256 = "07rgs1f9z2ayphv04jdjk9v1s2s47qvksf64z6qn1zss2alc0y0v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db80aa5d95846ee02a9d762aa68325ab5e37dcf7/recipes/speech-tagger"; sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc"; - name = "speech-tagger"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -68810,9 +89482,13 @@ license = lib.licenses.free; }; }) {}; - speechd-el = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + speechd-el = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "speechd-el"; + ename = "speechd-el"; version = "20180105.1217"; src = fetchFromGitHub { owner = "brailcom"; @@ -68820,10 +89496,10 @@ rev = "0b25d3eb7ae219d2af9a7e9df2f3334652156bf5"; sha256 = "00b2851pgrzvcl828l48gxrmy779w8s1k4ngf8pf0sh1y9bd2715"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96669a664122c2fb69acd4cad2d7bf75d3e8272d/recipes/speechd-el"; sha256 = "0p8zih9s2x6l2xcfjbzriyhsicaiwxz54iq9h3c8szlzq708mayc"; - name = "speechd-el"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68831,9 +89507,15 @@ license = lib.licenses.free; }; }) {}; - speed-type = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + speed-type = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "speed-type"; + ename = "speed-type"; version = "20171230.847"; src = fetchFromGitHub { owner = "parkouss"; @@ -68841,10 +89523,10 @@ rev = "7a67fcd7bf825eee890097bd4a1b3c4f531a1135"; sha256 = "0nlmqgf4rg5qmkhpsal7j18wr5h74971k6d0wzw7rmjmpnjqhzvc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06"; - name = "speed-type"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -68852,20 +89534,25 @@ license = lib.licenses.free; }; }) {}; - speeddating = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + speeddating = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "speeddating"; + ename = "speeddating"; version = "20180319.23"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "emacs-speeddating"; - rev = "df69db0560f19636a66a74f3d88c793bbb18b21e"; - sha256 = "0mhzjia900irv0ndiw6w2vzin1gvyaf48pghi16r562ci4lr963w"; + rev = "eeaf90cd10e376bff5a295590a3d5f7fd1402523"; + sha256 = "00ybvyr8sr73i7m10cffgpy9lngwp3v8fsa0nbidc6daky84vrdr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01e23a3e2a2495e86aba60302dbd06f3b25768b4/recipes/speeddating"; sha256 = "0b5lcb1inkcx94grib5ssv1qkbzxqryzm115qizlgfs04k8cwz09"; - name = "speeddating"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -68873,9 +89560,16 @@ license = lib.licenses.free; }; }) {}; - sphinx-doc = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + sphinx-doc = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "sphinx-doc"; + ename = "sphinx-doc"; version = "20160116.317"; src = fetchFromGitHub { owner = "naiquevin"; @@ -68883,10 +89577,10 @@ rev = "f39da2e6cae55d5d7c7ce887e69755b7529bcd67"; sha256 = "1wif9wf8hwxk0q09cdnrmyas7zjg8l5b8jd6sjxd40ypn6dmz2ch"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3b80d346ad4fb415970beddb5f02ae795fbf1b4/recipes/sphinx-doc"; sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z"; - name = "sphinx-doc"; + name = "recipe"; }; packageRequires = [ cl-lib dash s ]; meta = { @@ -68894,9 +89588,13 @@ license = lib.licenses.free; }; }) {}; - sphinx-frontend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sphinx-frontend = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sphinx-frontend"; + ename = "sphinx-frontend"; version = "20161025.58"; src = fetchFromGitHub { owner = "kostafey"; @@ -68904,10 +89602,10 @@ rev = "0cbb03361c245382d3e679dded30c4fc1713c252"; sha256 = "1ksjgd995pcb4lvwip08i8ay0xpin8dcam3hcgnbjjqjg9hja1cf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf72e71f159b9eaaa0834682d5dd4eb258616cf/recipes/sphinx-frontend"; sha256 = "0hdn6zjnhzyka0lzdxqfzbj3lrj767ij406zha9zw8ibbkk7cmag"; - name = "sphinx-frontend"; + name = "recipe"; }; packageRequires = []; meta = { @@ -68915,30 +89613,41 @@ license = lib.licenses.free; }; }) {}; - sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sphinx-mode = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sphinx-mode"; - version = "20180316.856"; + ename = "sphinx-mode"; + version = "20180620.215"; src = fetchFromGitHub { owner = "Fuco1"; repo = "sphinx-mode"; - rev = "95a14a288b50db70ee10598f83e5b087ba693bfb"; - sha256 = "0c8p65jwrbn9pmk6j87g99p6fqcahfrc6wngmx94zw5m2wvxca2j"; + rev = "b5ac514e213459dcc57184086f10b5b6be3cecd8"; + sha256 = "06r50n159g18fi03xyxzkv7zr6cvs29ly1yyrmyjl9m6dn97m9mc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode"; sha256 = "0f5xkaqsmxc4bfz80njlc395dcw2dbvmzx6h9fw31mylshzbmrys"; - name = "sphinx-mode"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ dash f ]; meta = { homepage = "https://melpa.org/#/sphinx-mode"; license = lib.licenses.free; }; }) {}; - spice-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + spice-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "spice-mode"; + ename = "spice-mode"; version = "20171027.2343"; src = fetchFromGitHub { owner = "stardiviner"; @@ -68946,10 +89655,10 @@ rev = "702bf2d5c3561be44771ea77b476532d32068504"; sha256 = "1wqcy9nmhpl3vyasvc79msgd25xbbzva9nbxkdrsbpg07p1is9ik"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spice-mode"; sha256 = "1my6dbdnf4scshjf299d4n7vsdq3cxhq9kmqvirs45y3qjm7pgpg"; - name = "spice-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -68957,9 +89666,19 @@ license = lib.licenses.free; }; }) {}; - spiral = callPackage ({ a, avy, clojure-mode, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, treepy }: - melpaBuild { + spiral = callPackage ({ a + , avy + , clojure-mode + , emacs + , fetchFromGitHub + , fetchurl + , highlight + , lib + , melpaBuild + , treepy }: + melpaBuild { pname = "spiral"; + ename = "spiral"; version = "20180223.340"; src = fetchFromGitHub { owner = "unrepl"; @@ -68967,10 +89686,10 @@ rev = "907b9792467139a942ba7b07ca0276b90770baf9"; sha256 = "1rggzzvya26abbzd8bc2kpv59kzgm75wqv1vwqnj9c8im1jvs1na"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77609e10c836a26de43ddb304ecfa275e314da21/recipes/spiral"; sha256 = "18rww2nfy5s22czabk71wqzrb53r0p2635872vr44b6kfwlb6qcw"; - name = "spiral"; + name = "recipe"; }; packageRequires = [ a avy clojure-mode emacs highlight treepy ]; meta = { @@ -68978,20 +89697,25 @@ license = lib.licenses.free; }; }) {}; - splitjoin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + splitjoin = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "splitjoin"; + ename = "splitjoin"; version = "20150505.732"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-splitjoin"; - rev = "e2945ee269e6e90f0243d6f2a33e067bb0a2873c"; - sha256 = "1qdy9nc2h7mwxh7zg2p1x7yg96hxkwxqimjp6zb1119jx0s8grjc"; + rev = "39a77f1c6c7406e79095eb0385667097172a770c"; + sha256 = "0zf03v067nh964ag1nwa8bk90h98lqwbrc25vckacp2gd919ifch"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51e172f46045fbb71b6a13b3521b502339a4a02b/recipes/splitjoin"; sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l"; - name = "splitjoin"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -68999,9 +89723,13 @@ license = lib.licenses.free; }; }) {}; - splitter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + splitter = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "splitter"; + ename = "splitter"; version = "20170809.1508"; src = fetchFromGitHub { owner = "chumpage"; @@ -69009,10 +89737,10 @@ rev = "6bdb51e9a346907d60a9625f6180bddd06be6674"; sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/129f0d20616226c449bdaf672c43a06e8f281869/recipes/splitter"; sha256 = "02vdhvipzwnh6mlj25lirzxkc0shfzqfs1p4gn3smkxqx6g7mdb2"; - name = "splitter"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69020,9 +89748,14 @@ license = lib.licenses.free; }; }) {}; - spotify = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + spotify = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "spotify"; + ename = "spotify"; version = "20170302.2229"; src = fetchFromGitHub { owner = "remvee"; @@ -69030,10 +89763,10 @@ rev = "2825b5cac8406969405096660aeab6e5fef765eb"; sha256 = "1270c4l7dxxsnzkifwa0ncgv078da9pzhlyxpdfbdbsj8w70plzm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spotify"; sha256 = "07y6d3cz3nziasza3znysvcnx3kw156ab78kw5y0pdll45nw210x"; - name = "spotify"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -69041,9 +89774,16 @@ license = lib.licenses.free; }; }) {}; - spotlight = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: - melpaBuild { + spotlight = callPackage ({ counsel + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , swiper }: + melpaBuild { pname = "spotlight"; + ename = "spotlight"; version = "20150929.55"; src = fetchFromGitHub { owner = "benmaughan"; @@ -69051,10 +89791,10 @@ rev = "ab902900f22e7d1ea2dd8169441d2da7155aaa68"; sha256 = "05knlca2dvpyqp9lw8dc47fl5kh2jb04q57cygkzfjjkzvywdwq8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/26e0eba715c869c5bd295afb8971d490e80f6e2b/recipes/spotlight"; sha256 = "0mmr1spr21pi8sfy95dsgqcxn8qfsphdkfjm5w5q97lh7496z65p"; - name = "spotlight"; + name = "recipe"; }; packageRequires = [ counsel emacs swiper ]; meta = { @@ -69062,20 +89802,24 @@ license = lib.licenses.free; }; }) {}; - spray = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + spray = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "spray"; + ename = "spray"; version = "20160304.1420"; src = fetchFromGitLab { owner = "iankelling"; repo = "spray"; - rev = "00638bc916227f2f961013543d10e85a43a32e29"; - sha256 = "1avbfr32dvff26kgvd5vgan99nb5c6al9kv5xbmy2rcls17py7r2"; + rev = "69fe48e7bb079e3011476b9f4eb6ac9ae94d6d9b"; + sha256 = "0anidv7w2vwsjv8rwkvhs3x51av3y8dp435456czy5yfq6i6vfbl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4f5053aa4e1af3f636febe9c3ce8c6ae20c090d/recipes/spray"; sha256 = "1h8lngcqa343mlc091zs419frgsla65khfj93lv9fil3xbgrm7m9"; - name = "spray"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69083,9 +89827,14 @@ license = lib.licenses.free; }; }) {}; - springboard = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + springboard = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "springboard"; + ename = "springboard"; version = "20170105.2355"; src = fetchFromGitHub { owner = "jwiegley"; @@ -69093,10 +89842,10 @@ rev = "263a8cd4582c81bfc29d7db37d5267e2488b148c"; sha256 = "14mbmkqnw2kkzcb8f9z1g3c8f8f9lca3zb6f3q8jk9dsyp9vh81z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/138b8a589725ead2fc1de9ea76c55e3eb2473872/recipes/springboard"; sha256 = "17rmsidsbb4p08vr07mfn25m17wnpadcwr4nxvp79glp5a0wyyib"; - name = "springboard"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -69104,9 +89853,14 @@ license = lib.licenses.free; }; }) {}; - sprintly-mode = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }: - melpaBuild { + sprintly-mode = callPackage ({ fetchFromGitHub + , fetchurl + , furl + , lib + , melpaBuild }: + melpaBuild { pname = "sprintly-mode"; + ename = "sprintly-mode"; version = "20121005.2234"; src = fetchFromGitHub { owner = "sprintly"; @@ -69114,10 +89868,10 @@ rev = "6695892bae5860b5268bf3ae62be990ee9b63c11"; sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8730956d3f00e030e06ef54c3f2aecc10bb40f9d/recipes/sprintly-mode"; sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4"; - name = "sprintly-mode"; + name = "recipe"; }; packageRequires = [ furl ]; meta = { @@ -69125,20 +89879,24 @@ license = lib.licenses.free; }; }) {}; - sproto-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sproto-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sproto-mode"; + ename = "sproto-mode"; version = "20151115.1005"; src = fetchFromGitHub { owner = "m2q1n9"; repo = "sproto-mode"; - rev = "0583a88273204dccd884b7edaa3590cefd31e7f7"; - sha256 = "11igl9n2zwwar1xg651g5v0r0w6xl0grm8xns9wg80351ijrci7x"; + rev = "1753277d9f2163fb3bc58b983a9892831cf9874b"; + sha256 = "1brxm6hs2gsnl8mj6ps0s9kj2qp9v388wwccsqmx7s3bi9zjf10c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac2b4207c4eaa3a048e245242489462a69b4af67/recipes/sproto-mode"; sha256 = "19l6si3sx2i542r5lyr9axby9hblx76m77f17vnsjf32n3r0qgma"; - name = "sproto-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69146,9 +89904,15 @@ license = lib.licenses.free; }; }) {}; - sprunge = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + sprunge = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "sprunge"; + ename = "sprunge"; version = "20160229.1843"; src = fetchFromGitHub { owner = "tomjakubowski"; @@ -69156,10 +89920,10 @@ rev = "0fd386b8b29c4175022a04ad70ea5643185b6726"; sha256 = "03wjzk1ljclfjgqzkg6m7v8saaajgavyd0xskd8fg8rdkx13ki0l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f7b9f8cc2f2f8f8e1cf80b3e76c89b9f12cacf95/recipes/sprunge"; sha256 = "199vfl6i881aks8fi9d9w4w7mnc7n443h79p3s4srcpmbyfg6g3w"; - name = "sprunge"; + name = "recipe"; }; packageRequires = [ cl-lib request ]; meta = { @@ -69167,9 +89931,16 @@ license = lib.licenses.free; }; }) {}; - spu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, signal, timp }: - melpaBuild { + spu = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , signal + , timp }: + melpaBuild { pname = "spu"; + ename = "spu"; version = "20161213.1924"; src = fetchFromGitHub { owner = "mola-T"; @@ -69177,10 +89948,10 @@ rev = "41eec86b595816e3852e8ad1a8e07e51a27fd065"; sha256 = "1j77h761vf74y9sfjpidgaznail95hsg9akjs55sz1xiyy7hkgyw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2ef1e83c924d5411b47a931432f129db95ff2c/recipes/spu"; sha256 = "0g7j0rz6ga6x6akiijp4vg5iymvqx5d08d60cz6dccq120fi95v8"; - name = "spu"; + name = "recipe"; }; packageRequires = [ emacs signal timp ]; meta = { @@ -69188,20 +89959,25 @@ license = lib.licenses.free; }; }) {}; - sql-clickhouse = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sql-clickhouse = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sql-clickhouse"; + ename = "sql-clickhouse"; version = "20180302.755"; src = fetchFromGitHub { owner = "leethargo"; repo = "sql-clickhouse"; - rev = "2edccd94145c55a040a3a87193793f06cf01f64f"; - sha256 = "0zajd35i02h869mg6n2pn2fnb80ddny6ss1kap21b75p2gw79lb7"; + rev = "35308c9292622547a79c0cc2659db2fc9de42e93"; + sha256 = "12j9facwvwnwc8ga3nj9yddx3xp3kp28mih6lg4s1b67zj28pccg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0ef23e6825924094eb69bd8526a95d8fab210c1/recipes/sql-clickhouse"; sha256 = "083i9aaf69yk71mndl5x0pimn3bkkhp3mfppxvy0f5lzf2847q2j"; - name = "sql-clickhouse"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -69209,20 +89985,24 @@ license = lib.licenses.free; }; }) {}; - sql-impala = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sql-impala = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sql-impala"; + ename = "sql-impala"; version = "20160427.1658"; src = fetchFromGitHub { owner = "jterk"; repo = "sql-impala"; - rev = "e7a2d79d60b0a6339d730fc39ca024c3d6c56de7"; - sha256 = "0d1ksh1rslzn93b8g6p48ca27f3d0ls4kxjcadjmd700x4vzv88i"; + rev = "68248e9851b153850542ed1f709298bb9ab59610"; + sha256 = "12zyw8b8s3jga560wv141gc4yvlbldvfcmpibns8wrpx2w8aivfj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sql-impala"; sha256 = "1mh36ycqgr07r0hknkr6vb4k0r5b2h8bqd7m5faz9p56qbisgvvh"; - name = "sql-impala"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69230,41 +90010,24 @@ license = lib.licenses.free; }; }) {}; - sql-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "sql-indent"; - version = "20170112.1507"; - src = fetchFromGitHub { - owner = "bsvingen"; - repo = "sql-indent"; - rev = "761a5724d181b75f30e64040408b8836d41f9db9"; - sha256 = "13xspvqn3y3hikacv6w6jf2x1gb33gxkva6chrz0fd8bkhwdf335"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/500ec53f14b8b0dca8ff80e8a2b1b60f4266562c/recipes/sql-indent"; - sha256 = "13s38zdd9j127p6jxbcj4d4va8mkri5dx5zh39g465mnlzx7fp8g"; - name = "sql-indent"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/sql-indent"; - license = lib.licenses.free; - }; - }) {}; - sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sqlite = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sqlite"; - version = "20150416.2215"; - src = fetchFromGitHub { + ename = "sqlite"; + version = "20180708.1011"; + src = fetchFromGitLab { owner = "cnngimenez"; repo = "sqlite.el"; - rev = "9a7fb5836a19bc0ea8b4c5a50177112524380986"; - sha256 = "0zlrx8sk7gwwr6a23mc22d7iinwf8p9ff16r9krqp86fyzbhnq1d"; + rev = "b8c22fdfed10d8554137ff1776b83cf2b4b9c5fd"; + sha256 = "083fzfy9rmiam06ixxkg5djqdxg62ym0p2kpsij01fgi2vjvnhca"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e90b62bf61bcaf1596428ac1a40aa63a6403c161/recipes/sqlite"; - sha256 = "1j23rqgq00as90nk6csi489ida6b83h1myl3icxivj2iw1iikgj1"; - name = "sqlite"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/949556b57cea0fbbfc98b95d894de95257dfe1e5/recipes/sqlite"; + sha256 = "1c5dprdl8q09yd0kvpkm19z60m9rhkilj5zmj938wlj5bmdlydv8"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69272,9 +90035,13 @@ license = lib.licenses.free; }; }) {}; - sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sqlup-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sqlup-mode"; + ename = "sqlup-mode"; version = "20170610.837"; src = fetchFromGitHub { owner = "Trevoke"; @@ -69282,10 +90049,10 @@ rev = "04970977b4abb4d44301651618bbf1cdb0b263dd"; sha256 = "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; sha256 = "0ngs58iri3fwv5ny707kvb6xjq98x19pzak8c9nq4qnpw3nkr83b"; - name = "sqlup-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69293,9 +90060,13 @@ license = lib.licenses.free; }; }) {}; - sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sr-speedbar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sr-speedbar"; + ename = "sr-speedbar"; version = "20161025.131"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -69303,10 +90074,10 @@ rev = "77a83fb50f763a465c021eca7343243f465b4a47"; sha256 = "0sd12555hk7z721y00kv3crdybvcn1i08wmd148z5imayzibj153"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/sr-speedbar"; sha256 = "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052"; - name = "sr-speedbar"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69314,20 +90085,51 @@ license = lib.licenses.free; }; }) {}; - srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + srcery-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "srcery-theme"; + ename = "srcery-theme"; + version = "20180623.619"; + src = fetchFromGitHub { + owner = "srcery-colors"; + repo = "srcery-emacs"; + rev = "b81c4ff3805e3857f77008982efe30f27b78e7e7"; + sha256 = "1v7qlgdalff7m943zcgyg4da692g7sk18xj6l9zpwpnbxix8iirr"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2654fc05f55c7fab7d550b7db1d187edc9ff0f42/recipes/srcery-theme"; + sha256 = "1bnvf9v7g2mpx8519lh73fphhr4cqd33qlw22qyxnqiz5cz93lsp"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/srcery-theme"; + license = lib.licenses.free; + }; + }) {}; + srefactor = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "srefactor"; - version = "20170223.540"; + ename = "srefactor"; + version = "20180703.1110"; src = fetchFromGitHub { owner = "tuhdo"; repo = "semantic-refactor"; - rev = "531753fdc24570a1341c169f36b9fa0d4c09ff42"; - sha256 = "1rn89sznfyzjn3gpk18h8qassc7d1cchk8b7lz7rhc9zrdl6qsha"; + rev = "6f2c97d17fb70f4ca2112f5a2b99a8ec162004f5"; + sha256 = "1lyz3zjkx2csh0xdy1zpx8s32qp1p3sig57mwi9xhgpqjyf0axmb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23115ab231ab108678608f2ad0a864f896cd0f2/recipes/srefactor"; sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2"; - name = "srefactor"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -69335,20 +90137,25 @@ license = lib.licenses.free; }; }) {}; - ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ssass-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ssass-mode"; - version = "20171201.509"; + ename = "ssass-mode"; + version = "20180428.1339"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ssass-mode"; - rev = "a95c4c9f99895cc582849b35e90ae13f1587ddce"; - sha256 = "1ldw72ggk22ih5j9fyb3bl0ngyfdkzfcyg97mp0mb40w8ly68qav"; + rev = "5f36a169a1ad497f1d7a465be386ffb5e1f80bcf"; + sha256 = "1n1q26p52i6c6i8svkr0bn91hliqm540y1fcz3jci8w2ws0s5x11"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode"; sha256 = "07aym4a7l70f1lb6yvwxkhsykrwbf0lcpwlwgcn5n44kavvdbzxm"; - name = "ssass-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -69356,9 +90163,13 @@ license = lib.licenses.free; }; }) {}; - ssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ssh = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ssh"; + ename = "ssh"; version = "20120904.1342"; src = fetchFromGitHub { owner = "ieure"; @@ -69366,10 +90177,10 @@ rev = "c17cf5b43df8ac4662a0580f85898e1f078df0d1"; sha256 = "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh"; sha256 = "1wlzagcg2fxqcbpd3z02wsil2n224kzmhcd54df80jypgq5fa6k3"; - name = "ssh"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69377,20 +90188,26 @@ license = lib.licenses.free; }; }) {}; - ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ssh-agency = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ssh-agency"; - version = "20180127.1301"; + ename = "ssh-agency"; + version = "20180507.1726"; src = fetchFromGitHub { owner = "magit"; repo = "ssh-agency"; - rev = "31b2b41e33d315fff54ace8bc2234abc38adf7cc"; - sha256 = "02kw4h3hzpad39ir6y8cg8lnldd01cl0lm8p22kf4bf5f7f3sdlw"; + rev = "d9dbedd773ad3a831e02e162c47936d6814a850a"; + sha256 = "0895n7bss4wdydic1gflr03f2cwdyqywl16gvb599lpn288jhwvz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency"; sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8"; - name = "ssh-agency"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -69398,20 +90215,24 @@ license = lib.licenses.free; }; }) {}; - ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ssh-config-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ssh-config-mode"; - version = "20180224.251"; + ename = "ssh-config-mode"; + version = "20180609.251"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "e4596accfc29f34388b701c1dd5ebffcb8c70154"; - sha256 = "1jcfhxm2px19b9yy53napj4d22v8s1q76gy68c47yimkbabhmzir"; + rev = "5429a02b8f7431c40e4a50e5d1ac2cd2d08c6511"; + sha256 = "1fid0713f0m1pwwppwh49k5cyrr3akvksfj3g9p4lndpqgwc1rcd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode"; sha256 = "1jlaf1bipmf51552jyp2ax6n4gwg38n2348kyxlwd7d8vwsibbpq"; - name = "ssh-config-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69419,20 +90240,25 @@ license = lib.licenses.free; }; }) {}; - ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ssh-deploy = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ssh-deploy"; - version = "20180323.2320"; + ename = "ssh-deploy"; + version = "20180713.650"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "5a89d59a5371aac9ee9eae22996ae2065f7f2a6b"; - sha256 = "1zmlw75sdlvb99ijylan4bc2z2wm23x5zlql2bmjnfvjb1z2mh39"; + rev = "b13ba60ea175798cfd1395ab833082789724073d"; + sha256 = "0fgcxvs2ngv65chnkb9w5rrak187xkwxiwmpc25iqvrrnrfr43s6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm"; - name = "ssh-deploy"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -69440,20 +90266,26 @@ license = lib.licenses.free; }; }) {}; - ssh-tunnels = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ssh-tunnels = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ssh-tunnels"; - version = "20141219.318"; + ename = "ssh-tunnels"; + version = "20180703.1327"; src = fetchFromGitHub { owner = "death"; repo = "ssh-tunnels"; - rev = "b08ba7a560ba5b16aa95c3cc17ed6fea59529cc4"; - sha256 = "10a5havjg4yjshpfzkhgjdwbrvl44narg09ddzynczmyzm4f01wh"; + rev = "a6b6ae9a5d17afa9ea39ca8c071e889deefcf8a3"; + sha256 = "01j0yvii46bd46miihkyggw1lkcr76j03wiw682ir5i1s6lli9k9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b093a3a9a836bae8ce37a21188c64e9a878066e8/recipes/ssh-tunnels"; sha256 = "0zlf22wg9adkhycsasv6bfim2h0cknsvihyi1q2l2l4pjdp9ypqj"; - name = "ssh-tunnels"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -69461,20 +90293,27 @@ license = lib.licenses.free; }; }) {}; - stack-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: - melpaBuild { + stack-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , flycheck + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "stack-mode"; + ename = "stack-mode"; version = "20150923.823"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "stack-ide"; - rev = "f3481e239dde9817152ec00e32bfc3ebf5aaf2cb"; - sha256 = "1f2dxlc3dsf9ay417h1l43fxjkrb0a4gg96zd3asx9v2alpzgcim"; + rev = "7e93bd3e03502beafb4613b7bc690fb9f0db1314"; + sha256 = "1zi2s97idylk5whzlv5ybac9ricqckl81vlwcm79rphk0v6xi3zj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1328a676140e4b8d01af126c4043bcfa8d1b2a8c/recipes/stack-mode"; sha256 = "0s0m2lj40php7bc2i3fy9ikd5rmx4v7zbxfkp9vadmlc5s7w25gf"; - name = "stack-mode"; + name = "recipe"; }; packageRequires = [ cl-lib flycheck haskell-mode ]; meta = { @@ -69482,9 +90321,13 @@ license = lib.licenses.free; }; }) {}; - stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + stan-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stan-mode"; + ename = "stan-mode"; version = "20180110.1441"; src = fetchFromGitHub { owner = "stan-dev"; @@ -69492,10 +90335,10 @@ rev = "a8e88473ef996b455523dc3fbcf2d8520659652f"; sha256 = "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode"; sha256 = "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy"; - name = "stan-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69503,20 +90346,26 @@ license = lib.licenses.free; }; }) {}; - stan-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stan-mode, yasnippet }: - melpaBuild { + stan-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , stan-mode + , yasnippet }: + melpaBuild { pname = "stan-snippets"; + ename = "stan-snippets"; version = "20161023.1958"; src = fetchFromGitHub { owner = "stan-dev"; repo = "stan-mode"; - rev = "a8e88473ef996b455523dc3fbcf2d8520659652f"; - sha256 = "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi"; + rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac"; + sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets"; sha256 = "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85"; - name = "stan-snippets"; + name = "recipe"; }; packageRequires = [ stan-mode yasnippet ]; meta = { @@ -69524,9 +90373,13 @@ license = lib.licenses.free; }; }) {}; - standoff-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + standoff-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "standoff-mode"; + ename = "standoff-mode"; version = "20171115.931"; src = fetchFromGitHub { owner = "lueck"; @@ -69534,10 +90387,10 @@ rev = "cf84b14066d63694d931395c6026fd0245d8a62b"; sha256 = "0dbcaz3faw8knx91yjsrb988sn2d9k0i5byhs1bi1ww36y6hmgs6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode"; sha256 = "127bzpm1cz103f1pb860yqrh7mr0rdaivrm9p6ssd01kchl9nskp"; - name = "standoff-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69545,9 +90398,15 @@ license = lib.licenses.free; }; }) {}; - start-menu = callPackage ({ cl-lib ? null, config-parser, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + start-menu = callPackage ({ cl-lib ? null + , config-parser + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "start-menu"; + ename = "start-menu"; version = "20160426.525"; src = fetchFromGitHub { owner = "lujun9972"; @@ -69555,10 +90414,10 @@ rev = "f7d33fed7ad2dc61156f1c1cff9e1805366fbd69"; sha256 = "1w3l8ahal9hjisny382bcw9w1nh2swpb1jzf2djww5h0i4r2h36c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88d965f6789d3f5ba3856cbf10edbc46e37b12ae/recipes/start-menu"; sha256 = "1k1lc9i9vcl2am9afq0ksrxwsy6kppl4i0v10h0w2fq5z374rdkv"; - name = "start-menu"; + name = "recipe"; }; packageRequires = [ cl-lib config-parser ]; meta = { @@ -69566,9 +90425,13 @@ license = lib.licenses.free; }; }) {}; - stash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + stash = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stash"; + ename = "stash"; version = "20151117.627"; src = fetchFromGitHub { owner = "vermiculus"; @@ -69576,10 +90439,10 @@ rev = "c2e494d20c752b80ebbdffbf66687b3cdfc425ad"; sha256 = "0cl2y72iagmv87kg72a46a3kap2xigwnrbk2hjgvsbxv2ng5f9cr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3837ac3f1ac82e08a5ad7193766074a4d1bfa3d/recipes/stash"; sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9"; - name = "stash"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69587,20 +90450,25 @@ license = lib.licenses.free; }; }) {}; - state = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + state = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "state"; - version = "20170107.535"; + ename = "state"; + version = "20180627.1256"; src = fetchFromGitHub { owner = "thisirs"; repo = "state"; - rev = "ea6e2cf6f592cbcfc5800b68f0fc2462555cacce"; - sha256 = "1bb2rrmvkxymqdyv3w4kr36qzszwgmadqck5h87j8pi82nh9j973"; + rev = "99fb8e0a944d3b543d54769d332cbbfa92266b11"; + sha256 = "173w874iyrbvcv2a8fdylcyxq2a9s5phbabqp3qp095qh6037klf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82e955112089569c775e11888d9811119f84a4f8/recipes/state"; sha256 = "19y3n8wnbpgbpz4jxy2p7hjqxykg09arjp7s5v22yz7il3gn48l2"; - name = "state"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -69608,9 +90476,13 @@ license = lib.licenses.free; }; }) {}; - status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + status = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "status"; + ename = "status"; version = "20151230.608"; src = fetchFromGitHub { owner = "tromey"; @@ -69618,10 +90490,10 @@ rev = "b62c74bf272566f82a68622f29fb9edafea0f241"; sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dca8976de7060fcfc37a1623280869e0cef7b0a2/recipes/status"; sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3"; - name = "status"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69629,9 +90501,14 @@ license = lib.licenses.free; }; }) {}; - steam = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + steam = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "steam"; + ename = "steam"; version = "20171108.1613"; src = fetchFromGitHub { owner = "Kungsgeten"; @@ -69639,10 +90516,10 @@ rev = "d6ca2a828b0824da51978397e198bf91c51ce793"; sha256 = "16cxws1b3iwm9aqbiip298zsjm6gwjihpvkia4p0zvzynwhflw8q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25a45eb6297168cd0ce4c4db5574362addad5c69/recipes/steam"; sha256 = "10k408spgbxi266jk8x57zwav989is16nvwg41dknz91l76v63gw"; - name = "steam"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -69650,20 +90527,24 @@ license = lib.licenses.free; }; }) {}; - stem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + stem = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stem"; + ename = "stem"; version = "20131102.409"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "stem"; - rev = "d74e6611d6ba5025e0276a2cc7c8a90f46bfa9ac"; - sha256 = "1xc4v8a35c2vpfhza15j4f89x7vyg9bbgm7xnprij7814k8iy7p0"; + rev = "dd704c3447bd5d3f5ac0a4840f8987d4f855d87e"; + sha256 = "17x8zgml8sa5i828hg8bimfal84vvqzxlqdicjc7v7p8h0j57cgs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d9c38d0d4dac86848ad0fec0aeeced009c5eac7/recipes/stem"; sha256 = "1625nbi2bmb7vzjz0s7y1cy7dp8lp83dayiib3nr2bfkv76fwkcq"; - name = "stem"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69671,9 +90552,14 @@ license = lib.licenses.free; }; }) {}; - stem-english = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + stem-english = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stem-english"; + ename = "stem-english"; version = "20180108.1958"; src = fetchFromGitHub { owner = "kawabata"; @@ -69681,10 +90567,10 @@ rev = "c9fc4c6ed6bf82382e479dae80912f4ae17d31f4"; sha256 = "1bkmgjfp7xir6d0yf782xkjvf595blrqhr3hack26jg5zl8qsrya"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8e97e70e7a86b9f5e55bdd2db492994e8abdd5/recipes/stem-english"; sha256 = "15d13palwdwrki9p804cdls08ph7sxxzd44nl4bhfm3dxic4sw7x"; - name = "stem-english"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -69692,20 +90578,24 @@ license = lib.licenses.free; }; }) {}; - stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + stgit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stgit"; + ename = "stgit"; version = "20171130.759"; src = fetchFromGitHub { owner = "ctmarinas"; repo = "stgit"; - rev = "ffd7fb7a67b4c90b38f6caa7ce14448e11cbc86e"; - sha256 = "01rxlg2qqqw1bvzdqdmhikag02sp9f6fira0zhwzxmrp5gsvbh3a"; + rev = "a29fc8873fca30cb5b13d94743a9010de28e2610"; + sha256 = "1xhxba0m78zx00m55y125bs1zxibyg7d9nw8xw9gqyshcncjffpg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit"; sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g"; - name = "stgit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69713,9 +90603,13 @@ license = lib.licenses.free; }; }) {}; - sticky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sticky = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sticky"; + ename = "sticky"; version = "20170925.1736"; src = fetchFromGitHub { owner = "rubikitch"; @@ -69723,10 +90617,10 @@ rev = "fec4e1af38f17f5cd80eca361d8e8ef8772db366"; sha256 = "126zs059snzpg83q9mrb51y0pqawwrj9smr3y7rza4q4qkdp1nk0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/sticky"; sha256 = "0g98qagqchwq9j5nvdz315wak8fvdw1l972cfh0fr4yyg7gxi6xr"; - name = "sticky"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69734,9 +90628,14 @@ license = lib.licenses.free; }; }) {}; - stickyfunc-enhance = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + stickyfunc-enhance = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stickyfunc-enhance"; + ename = "stickyfunc-enhance"; version = "20150429.1114"; src = fetchFromGitHub { owner = "tuhdo"; @@ -69744,10 +90643,10 @@ rev = "13bdba51fcd83ccbc3267959d23afc94d458dcb0"; sha256 = "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e24454febf90ec18a587b2c187a2bd2101e1b7b5/recipes/stickyfunc-enhance"; sha256 = "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks"; - name = "stickyfunc-enhance"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -69755,20 +90654,26 @@ license = lib.licenses.free; }; }) {}; - stock-ticker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: - melpaBuild { + stock-ticker = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , s }: + melpaBuild { pname = "stock-ticker"; + ename = "stock-ticker"; version = "20150204.252"; src = fetchFromGitHub { owner = "hagleitn"; repo = "stock-ticker"; - rev = "f2e564142c9de84232839a5b01979cf95b04d6a9"; - sha256 = "191sg32z1iagyxmbn49i1lpfihld9g9741cw2kj830s4vag4kinx"; + rev = "74251cc810604af75f48333d51133326c053dd16"; + sha256 = "09rpn1gbxd0ppb0258l6bcnbxj8r5jhcwkvjg335sgh52srgk3ir"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/75e654f7b3f785bdfead3c594fdc09730c5d33b9/recipes/stock-ticker"; sha256 = "1slcjk2avybr4v9s7gglizmaxbb3yqg6s6gdbg12m3vvj3b72lfi"; - name = "stock-ticker"; + name = "recipe"; }; packageRequires = [ request s ]; meta = { @@ -69776,9 +90681,13 @@ license = lib.licenses.free; }; }) {}; - strace-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + strace-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "strace-mode"; + ename = "strace-mode"; version = "20171116.1239"; src = fetchFromGitHub { owner = "pkmoore"; @@ -69786,10 +90695,10 @@ rev = "2901baa968d5180ab985ac40ca22cc20914d01f5"; sha256 = "1jd930nc2g562n4cqq1ppl2d8dq7bxkr3fh9f0gjms7bcm106kz9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2003bee9992d9e79124d95d30b573c8a6bdbfe/recipes/strace-mode"; sha256 = "16v350nqdxmmk1r4z25bssm436xcm4cvnaxm7f3wxwvmg9z0gx8d"; - name = "strace-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69797,9 +90706,14 @@ license = lib.licenses.free; }; }) {}; - strie = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + strie = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "strie"; + ename = "strie"; version = "20160211.1422"; src = fetchFromGitHub { owner = "jcatw"; @@ -69807,10 +90721,10 @@ rev = "eb7efb0cccc127c414f6a64db11454869d9c10a8"; sha256 = "1kcbkf0wbmqy9slxfqg7wsyw5n2rsaz832ibrxszb642j0l8s7pr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/strie"; sha256 = "1ngvpbws7laqxk6mm023r5295msap12h8bh9zrsbr05yxfzhlx83"; - name = "strie"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -69818,9 +90732,14 @@ license = lib.licenses.free; }; }) {}; - string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + string-edit = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "string-edit"; + ename = "string-edit"; version = "20160410.2356"; src = fetchFromGitHub { owner = "magnars"; @@ -69828,10 +90747,10 @@ rev = "c44b65b4c5e9f52be9c14d88ca2f402a18d9e1dd"; sha256 = "1xm7bb3cp99ahr5jrwi0p0258qcvlbddy98wmbq00kk5pihqbzsg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20fd24f22ef734fe064c66692bf3e18eb896f1ac/recipes/string-edit"; sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8"; - name = "string-edit"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -69839,20 +90758,24 @@ license = lib.licenses.free; }; }) {}; - string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + string-inflection = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "string-inflection"; - version = "20180102.643"; + ename = "string-inflection"; + version = "20180518.1707"; src = fetchFromGitHub { owner = "akicho8"; repo = "string-inflection"; - rev = "d506eeeac59ea71601a901c311a874949a25372f"; - sha256 = "0mp9h42qrgdlk34m9ffdqmhyy65slna5vw71bpw1883aic4agq70"; + rev = "a9de404b2ece932da9b1c9aa1c29dbf7cf506e76"; + sha256 = "1km8xxb0zc3yll1yzlsrrz14ch3inblpq2nhglwp1wskqwdhwly5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection"; sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2"; - name = "string-inflection"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69860,20 +90783,25 @@ license = lib.licenses.free; }; }) {}; - string-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }: - melpaBuild { + string-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , list-utils + , melpaBuild }: + melpaBuild { pname = "string-utils"; + ename = "string-utils"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "string-utils"; - rev = "c2232d691617973ecf12a970c6008a161c21da14"; - sha256 = "1frdspm1qgksa8cpx5gkj50xk9mgz8202pgp11lqir6l3yjcj3wq"; + rev = "8b56e1f79d2de46d1e9b5e24d889e9f4c3cc85d4"; + sha256 = "0c8msw48cmvd4i7cgh7gp0d26ipiqvyn84a2d4hqqci261s08b2y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/string-utils"; sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v"; - name = "string-utils"; + name = "recipe"; }; packageRequires = [ list-utils ]; meta = { @@ -69881,9 +90809,14 @@ license = lib.licenses.free; }; }) {}; - stripe-buffer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + stripe-buffer = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stripe-buffer"; + ename = "stripe-buffer"; version = "20141208.708"; src = fetchFromGitHub { owner = "sabof"; @@ -69891,10 +90824,10 @@ rev = "c252080f55cb78c951b19ebab9687f6d00237baf"; sha256 = "0dxajh72wdcwdb9ydbcm19fmp0p1drmh1niq4r69jnbn8sah0zax"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/stripe-buffer"; sha256 = "1kjib1kf9xqdirryr16wlvc95701hq8s4h8hz4dqzg3wzyb8287b"; - name = "stripe-buffer"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -69902,19 +90835,23 @@ license = lib.licenses.free; }; }) {}; - stumpwm-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + stumpwm-mode = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stumpwm-mode"; + ename = "stumpwm-mode"; version = "20140130.1816"; src = fetchgit { url = "https://git.savannah.nongnu.org/git/stumpwm.git"; - rev = "61a7cf27e49e0779a53c018b2342f5f1c5cc70b4"; - sha256 = "03is0690p7aw77c30j4r2b5gi5rv5f70wvpixy5qhcchlaxhaw82"; + rev = "a920d31bac148e7f6afa98c05f98920135de8b89"; + sha256 = "0hg2dhgph1fz8z6c79ia2j36wnbqgi6a7fjiz3wngslhbwy28xq7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/stumpwm-mode"; sha256 = "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf"; - name = "stumpwm-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69922,19 +90859,23 @@ license = lib.licenses.free; }; }) {}; - stupid-indent-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + stupid-indent-mode = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stupid-indent-mode"; + ename = "stupid-indent-mode"; version = "20170525.417"; src = fetchgit { url = "https://gist.github.com/5487564.git"; rev = "3295e7de5e2cfddc3bf0e462e852bf58972f5d70"; sha256 = "00js2jkzvmvh1gbraijknv48y86pqyk9zv264a5n3l4sw5q6kcvk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68cd648bde8028a39849f7beae8deae78bfb877b/recipes/stupid-indent-mode"; sha256 = "12y8qxxs04qzy09m734qg0857g4612qdswx2bh9jk7dp886fpd7p"; - name = "stupid-indent-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69942,9 +90883,13 @@ license = lib.licenses.free; }; }) {}; - stylefmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + stylefmt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stylefmt"; + ename = "stylefmt"; version = "20161025.124"; src = fetchFromGitHub { owner = "KeenS"; @@ -69952,10 +90897,10 @@ rev = "7a38f26bf8ff947215f34f0a064c7ca80575ccbc"; sha256 = "0cx9llbmfjhaxb60mj483ihl78xb30ldvhd1hdldmc9d473xbvmz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/stylefmt"; sha256 = "14ap3xklmxyqz61p7z3fwgxbwjqrcbijcmvsmhfbm102x1spgbhz"; - name = "stylefmt"; + name = "recipe"; }; packageRequires = []; meta = { @@ -69963,20 +90908,25 @@ license = lib.licenses.free; }; }) {}; - stylus-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }: - melpaBuild { + stylus-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sws-mode }: + melpaBuild { pname = "stylus-mode"; + ename = "stylus-mode"; version = "20150313.812"; src = fetchFromGitHub { owner = "brianc"; repo = "jade-mode"; - rev = "4dbde92542fc7ad61df38776980905a4721d642e"; - sha256 = "0p6pfxbl98kkwa3lgx82h967w4p0wbd9s96gvs72d74ryan07ij1"; + rev = "73893e8d8f1bcaf9f0252c6f020cdb3741d7125c"; + sha256 = "0fiihkwq4s8lkqx5fp3csmnaf0blnm6kpl4hfkwsb8rywgvzh7lk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/877b5a3e612e1b1d6d51e60c66b0b79f231abdb2/recipes/stylus-mode"; sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5"; - name = "stylus-mode"; + name = "recipe"; }; packageRequires = [ sws-mode ]; meta = { @@ -69984,9 +90934,13 @@ license = lib.licenses.free; }; }) {}; - subatomic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + subatomic-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "subatomic-theme"; + ename = "subatomic-theme"; version = "20160126.738"; src = fetchFromGitHub { owner = "cryon"; @@ -69994,10 +90948,10 @@ rev = "6a4086af748b1ecb27f6ba2aa2614988db16d594"; sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de7f6009bab3e9a5b14b7b96ab16557e81e7f078/recipes/subatomic-theme"; sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc"; - name = "subatomic-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70005,9 +90959,13 @@ license = lib.licenses.free; }; }) {}; - subatomic256-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + subatomic256-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "subatomic256-theme"; + ename = "subatomic256-theme"; version = "20130620.1910"; src = fetchFromGitHub { owner = "d11wtq"; @@ -70015,10 +90973,10 @@ rev = "326177d6f99cd2b1d30df695e67ee3bc441cd96f"; sha256 = "1w7mimyqc25phlww20l49wlafnxp6c7dwibvphg3vwl61g0llpq8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06a6bdf12623847600d87a624c224b233fdf3536/recipes/subatomic256-theme"; sha256 = "1whjlkpkkirpnvvjryhlpzwphr1syz5zfyg4pb66i0db03hxwwcy"; - name = "subatomic256-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70026,9 +90984,13 @@ license = lib.licenses.free; }; }) {}; - subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + subemacs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "subemacs"; + ename = "subemacs"; version = "20170401.234"; src = fetchFromGitHub { owner = "kbauer"; @@ -70036,10 +90998,10 @@ rev = "18d53939fec8968c08dfc5aff7240ca07efb1aac"; sha256 = "1k2lg7cxr98rq77sk0ypzlr3cyl20ld20jz8y21fdaa6ci8kdvdb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18714a6b5ca4dcc51fa509fee1dc9afb0595c707/recipes/subemacs"; sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm"; - name = "subemacs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70047,9 +91009,13 @@ license = lib.licenses.free; }; }) {}; - sublime-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sublime-themes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sublime-themes"; + ename = "sublime-themes"; version = "20170606.1144"; src = fetchFromGitHub { owner = "owainlewis"; @@ -70057,10 +91023,10 @@ rev = "60ee40af82eb55b79d5ed4026f1911326311603f"; sha256 = "17fcqvavgyl9cmv1hwcid2bw513vhawlsmac1w2adiz567594i6h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/648d250c7d341b31581c839f77c1084ac29d3163/recipes/sublime-themes"; sha256 = "1nahcfcy831c7w3c69i2na0r8jsdgprffgfdvh4c41cnk4rkgdqj"; - name = "sublime-themes"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70068,9 +91034,14 @@ license = lib.licenses.free; }; }) {}; - sublimity = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sublimity = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sublimity"; + ename = "sublimity"; version = "20170820.827"; src = fetchFromGitHub { owner = "zk-phi"; @@ -70078,10 +91049,10 @@ rev = "62b0c526c599a0178a16a75f16513fc1f93a0d53"; sha256 = "0kncjm6133a84z9rvygn5dqnwdj036sw6cf1pi595rk3f9r2ccg5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e78cd1e5366a9b6d04237e9bf6a7e73424be52/recipes/sublimity"; sha256 = "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw"; - name = "sublimity"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -70089,9 +91060,13 @@ license = lib.licenses.free; }; }) {}; - sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sudden-death = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sudden-death"; + ename = "sudden-death"; version = "20180216.1623"; src = fetchFromGitHub { owner = "yewton"; @@ -70099,10 +91074,10 @@ rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb"; sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death"; sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh"; - name = "sudden-death"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70110,20 +91085,26 @@ license = lib.licenses.free; }; }) {}; - sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sudo-edit = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sudo-edit"; - version = "20170803.2052"; + ename = "sudo-edit"; + version = "20180608.911"; src = fetchFromGitHub { owner = "nflath"; repo = "sudo-edit"; - rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b"; - sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99"; + rev = "185edd69729b2adc8dccd015266636dae2df83d3"; + sha256 = "1rffxd2jjz40hjlsv7fh49pa24sym387d98sckkr95g3m9y1blvp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; sha256 = "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4"; - name = "sudo-edit"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -70131,9 +91112,13 @@ license = lib.licenses.free; }; }) {}; - sudo-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sudo-ext = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sudo-ext"; + ename = "sudo-ext"; version = "20170126.414"; src = fetchFromGitHub { owner = "rubikitch"; @@ -70141,10 +91126,10 @@ rev = "9d4580f304121ce7b8104bd4bd3b64e4dfa3c9b3"; sha256 = "1m9srlxavqg6yxmz6rz61saz1lj5hh029314dic8kh6g3bqdnh2w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/sudo-ext"; sha256 = "1zlnz68kzdrc7p90qmzs7fsr9ry4rl259xpyv55jh5icry290z4x"; - name = "sudo-ext"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70152,9 +91137,14 @@ license = lib.licenses.free; }; }) {}; - sudoku = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sudoku = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sudoku"; + ename = "sudoku"; version = "20161110.2306"; src = fetchFromGitHub { owner = "zevlg"; @@ -70162,10 +91152,10 @@ rev = "77c11b5041b58fc943cf1668b44b40bae039cb5b"; sha256 = "18nbs980y6cj6my208i80cb928rnkk5rn3zwc63prk5whjw4y77v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9861d5d4cf18466b17ac8e53f3874df5312d3f3/recipes/sudoku"; sha256 = "14nbidjnsm9lwknmqgfr721b484z5156j723kr1wbfv70j8h9kys"; - name = "sudoku"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -70173,30 +91163,46 @@ license = lib.licenses.free; }; }) {}; - suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: - melpaBuild { + suggest = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , loop + , melpaBuild + , s + , spinner }: + melpaBuild { pname = "suggest"; - version = "20180214.1523"; + ename = "suggest"; + version = "20180722.350"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "66051b2fd3d21a8e103928782a8c926ea434beba"; - sha256 = "1xj3jzsh44ymah8nvjvm7i8g81vkq6wk7mcq2rm2qvaxin4l1bcp"; + rev = "06784aba76d2681456871bd79304b62b4957b411"; + sha256 = "0qi4slfdx0x9z2rzd2ibcl2zjqcrxvnh672l5xkyhjh873f16xar"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; sha256 = "12vvakqqzmmqq5yynpd4wf4lnb0yvcnz065kni996sy7rv7rh83q"; - name = "suggest"; + name = "recipe"; }; - packageRequires = [ dash emacs f loop s ]; + packageRequires = [ dash emacs f loop s spinner ]; meta = { homepage = "https://melpa.org/#/suggest"; license = lib.licenses.free; }; }) {}; - suggestion-box = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + suggestion-box = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "suggestion-box"; + ename = "suggestion-box"; version = "20170830.107"; src = fetchFromGitHub { owner = "yuutayamada"; @@ -70204,10 +91210,10 @@ rev = "50af0776c8caf3c79c4d37fd51cbf304ea34b68e"; sha256 = "01lx20kzay5504xcq6m6yhvayyd7wpzaa1r6i67xqjnr25lqyajw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b59be8dc0a1850d3e245957fd170e1d01f4e284/recipes/suggestion-box"; sha256 = "17yai0fh7rfjbp3wz5x5r4src8lxn6qrhf7brp2gjr6cgdv40iac"; - name = "suggestion-box"; + name = "recipe"; }; packageRequires = [ emacs popup ]; meta = { @@ -70215,20 +91221,25 @@ license = lib.licenses.free; }; }) {}; - sunburn-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sunburn-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sunburn-theme"; - version = "20180317.1051"; + ename = "sunburn-theme"; + version = "20180602.1229"; src = fetchFromGitHub { owner = "mvarela"; repo = "Sunburn-Theme"; - rev = "63fbc5a609100e78d8304c99646ae8f689e17bf2"; - sha256 = "04dwqssci9xvcaw1wrhf45hsqskmj0s38lyc0fmbbg1vx53npnk3"; + rev = "ddb01b6f1f4f823398f7f8e08900c2b4a7811d3b"; + sha256 = "18qfcrr4xlwwhhaq7dwh31bbl84a53akgrw2c6lynnyyi4vk2wpq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bfd68b90234222dbf5907a29d506b6c4e61a372b/recipes/sunburn-theme"; sha256 = "09shmaaii0lfd52v49cazn91sj4jz2siqbanw682vi7zsl79jx9f"; - name = "sunburn-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -70236,9 +91247,13 @@ license = lib.licenses.free; }; }) {}; - sunny-day-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sunny-day-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sunny-day-theme"; + ename = "sunny-day-theme"; version = "20140413.1425"; src = fetchFromGitHub { owner = "mswift42"; @@ -70246,10 +91261,10 @@ rev = "420e0a6eb33fcc9b75c2c9e88ab60a975d782a00"; sha256 = "0mhyhkjjwszwl5wzkys9pgvgx9sps9r46k1s1hpzzf4s3vi015mc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11642803ccc5c8dde839508c91dea2728b2b78de/recipes/sunny-day-theme"; sha256 = "1wsfnmmbzzyggzip66vr38yyzy27blxp91wx97bafj7jpg5cyhzw"; - name = "sunny-day-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70257,9 +91272,14 @@ license = lib.licenses.free; }; }) {}; - sunshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sunshine = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sunshine"; + ename = "sunshine"; version = "20180325.548"; src = fetchFromGitHub { owner = "aaronbieber"; @@ -70267,10 +91287,10 @@ rev = "ecaccac91010f8d464646a0360b1676be71e6600"; sha256 = "0n9ppy22ijc2cgs5xix8nks7abn0shvh0v0f2ir1j7v1ckjsklc5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a0ff9a4ef4bbe8de722a4f77f4a56a851497ff1/recipes/sunshine"; sha256 = "1lxiqw7k8cpq0v6p5whgxgzqrbx3sd9174r0d4qlkrpn6rcp44vv"; - name = "sunshine"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -70278,9 +91298,13 @@ license = lib.licenses.free; }; }) {}; - suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + suomalainen-kalenteri = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "suomalainen-kalenteri"; + ename = "suomalainen-kalenteri"; version = "20170801.126"; src = fetchFromGitHub { owner = "tlikonen"; @@ -70288,10 +91312,10 @@ rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3"; sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri"; sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh"; - name = "suomalainen-kalenteri"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70299,9 +91323,14 @@ license = lib.licenses.free; }; }) {}; - super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + super-save = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "super-save"; + ename = "super-save"; version = "20171008.3"; src = fetchFromGitHub { owner = "bbatsov"; @@ -70309,10 +91338,10 @@ rev = "1c8fbd5e18277e4af0ada2678a854b1c9072db38"; sha256 = "0mh7xp71l9xybbv17b1rsbpa60bwjw79ql9krj1kzy2c2pv9hmff"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9730b65787b26d3909952cf246a01bd349e5fbab/recipes/super-save"; sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p"; - name = "super-save"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -70320,9 +91349,13 @@ license = lib.licenses.free; }; }) {}; - supergenpass = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + supergenpass = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "supergenpass"; + ename = "supergenpass"; version = "20130328.2248"; src = fetchFromGitHub { owner = "ober"; @@ -70330,10 +91363,10 @@ rev = "549072ef7b5b82913cadd4758e8a0a9926f0a04a"; sha256 = "0m02snzka243adhwwgriml133n4312lhdia3wdqjcq8y2mlp3331"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/supergenpass"; sha256 = "0ldy6j6l6rf72w0hl195rdnrabml2a5k91200s186k0r5aja4b95"; - name = "supergenpass"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70341,20 +91374,24 @@ license = lib.licenses.free; }; }) {}; - suscolors-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + suscolors-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "suscolors-theme"; + ename = "suscolors-theme"; version = "20161109.1215"; src = fetchFromGitHub { owner = "TheSuspiciousWombat"; repo = "SusColors-emacs"; - rev = "b946e7924aa02fa7441c970026898f17fe97601f"; - sha256 = "0553fgiyjy2n3wa2agwzvadf6il85waf2vjpsy75ljj6lw8glhka"; + rev = "8f5cdf8de5e58db838ef0e803b60b7d74fc2a889"; + sha256 = "1wc4l7zvb8zmh48cgrl7bkbyfj0sflzq28sc8jssghkcl2735cbg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/suscolors-theme"; sha256 = "0j8yfl3yglp9kfdpbmfj3jw7npc6nlqw48cchiczh4biry204lbw"; - name = "suscolors-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70362,9 +91399,14 @@ license = lib.licenses.free; }; }) {}; - svg-mode-line-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xmlgen }: - melpaBuild { + svg-mode-line-themes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xmlgen }: + melpaBuild { pname = "svg-mode-line-themes"; + ename = "svg-mode-line-themes"; version = "20150425.1306"; src = fetchFromGitHub { owner = "sabof"; @@ -70372,10 +91414,10 @@ rev = "80a0e01839cafbd66899202e7764c33231974259"; sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ca54d78b5e87c3bb582b178e4892af2bf447d1e/recipes/svg-mode-line-themes"; sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506"; - name = "svg-mode-line-themes"; + name = "recipe"; }; packageRequires = [ xmlgen ]; meta = { @@ -70383,9 +91425,42 @@ license = lib.licenses.free; }; }) {}; - swagger-to-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + svnwrapper = callPackage ({ e2ansi + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "svnwrapper"; + ename = "svnwrapper"; + version = "20180414.1143"; + src = fetchFromGitHub { + owner = "Lindydancer"; + repo = "svnwrapper"; + rev = "de5069f5784e5d9e87a0af0159ba5f28a3716583"; + sha256 = "08sg55cmjbk06622mzhv74f5b5dvbay7gb729zsckczxwrp1cayp"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cb43431d7a7276cdf1ea741b2b218bc46c2722f9/recipes/svnwrapper"; + sha256 = "06nb7dql7fbaa9khhpxdl8jj6zmypi24bak52sfsa0js77v51pf2"; + name = "recipe"; + }; + packageRequires = [ e2ansi ]; + meta = { + homepage = "https://melpa.org/#/svnwrapper"; + license = lib.licenses.free; + }; + }) {}; + swagger-to-org = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "swagger-to-org"; + ename = "swagger-to-org"; version = "20160610.1756"; src = fetchFromGitHub { owner = "ahungry"; @@ -70393,10 +91468,10 @@ rev = "181357c71ea24bede263f5706d8781ad65e16877"; sha256 = "0x1mxxvlhhs34j869cy68gy5pgmvpfliyl9vlrlwm3z8apbip9gp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d5a7f017593e73ea48c0e535ecf3809536bcde5/recipes/swagger-to-org"; sha256 = "1m40f5njxcxmc2snaz2q43b4scwgp51y761kq6klixjvafi0pv86"; - name = "swagger-to-org"; + name = "recipe"; }; packageRequires = [ cl-lib emacs json ]; meta = { @@ -70404,9 +91479,13 @@ license = lib.licenses.free; }; }) {}; - swap-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + swap-buffers = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "swap-buffers"; + ename = "swap-buffers"; version = "20150506.1439"; src = fetchFromGitHub { owner = "ekazakov"; @@ -70414,10 +91493,10 @@ rev = "46ab31359b70d935add6c6e9533443116dc51103"; sha256 = "1kn70570r6x0h1xfs1vr8as27pjfanyhml140yms60gdjb4ssf9r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a0172aaebdf4e0b6f6dd3093482e3cf3eb796d4/recipes/swap-buffers"; sha256 = "0ih5dhnqy3c9nlfz9m2zwy4q4jaam09ykbdqhsxx2hnwjk7p35bw"; - name = "swap-buffers"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70425,9 +91504,14 @@ license = lib.licenses.free; }; }) {}; - swap-regions = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + swap-regions = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "swap-regions"; + ename = "swap-regions"; version = "20180116.253"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -70435,10 +91519,10 @@ rev = "6e7a1bc68f11afe00809c8e27c13bca08393a91c"; sha256 = "02z552qsc96big3davdj3yaz6f4fg72ljpn7nvzccp2wwchzfa1c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6805c7710618ed1178ffd3488295d4d6b33e8ebe/recipes/swap-regions"; sha256 = "0gl4vr7wjh5gjskrwbqypaqyfigpgh379bm4l2gvbsbhahsmbj67"; - name = "swap-regions"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -70446,20 +91530,28 @@ license = lib.licenses.free; }; }) {}; - sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: - melpaBuild { + sweetgreen = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , request }: + melpaBuild { pname = "sweetgreen"; - version = "20180401.1715"; + ename = "sweetgreen"; + version = "20180604.2035"; src = fetchFromGitHub { owner = "CestDiego"; repo = "sweetgreen.el"; - rev = "ffd7a7497db05e64031eaaffe170741b40ed753a"; - sha256 = "0whciwh6avhfb2qhpxfl63x3z097hcm7hwhypx8symydy3r4cbqz"; + rev = "e933fe466b5ef0e976967e203f88bd7a012469d1"; + sha256 = "1pd13v3xma78xa0smxql4i2iax72kxqh7iwp3k16jwzrklmsdiyr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63812707948e6dcc00e00ebc3c423469593e80fd/recipes/sweetgreen"; sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy"; - name = "sweetgreen"; + name = "recipe"; }; packageRequires = [ cl-lib dash helm request ]; meta = { @@ -70467,20 +91559,26 @@ license = lib.licenses.free; }; }) {}; - swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + swift-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "swift-mode"; - version = "20180222.232"; + ename = "swift-mode"; + version = "20180721.35"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29"; - sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4"; + rev = "d2f2f1da6085c6fad2709b951d6891dd139a6080"; + sha256 = "1ldf593qzbscwlngbabxb52kcpriwhglk95l82qs8y3q1x6aj0cw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d"; - name = "swift-mode"; + name = "recipe"; }; packageRequires = [ emacs seq ]; meta = { @@ -70488,20 +91586,25 @@ license = lib.licenses.free; }; }) {}; - swift3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + swift3-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "swift3-mode"; + ename = "swift3-mode"; version = "20160918.550"; src = fetchFromGitHub { owner = "taku0"; repo = "swift3-mode"; - rev = "4e51265c6905e17d8910e35b0b37cf51e20ecdfe"; - sha256 = "0wqwjzr3z9gzsjiyyr0ds4c5zvgifb9hbjadb7vkbbpzdy6qd9s1"; + rev = "ea34d46bf9a4293e75ffdac9500d34989316d9e9"; + sha256 = "1hwc3fxv87hmw0a0mgl8khfzf1p7yp2izkc02z8f1vbkaibmmawp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ca9071199230d3c4c1b2e3a501736df87095fd3/recipes/swift3-mode"; sha256 = "14vm05p8ix09v73dkmf03i56yib8yk6h2r1zc9m4ym80fki4f520"; - name = "swift3-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -70509,20 +91612,26 @@ license = lib.licenses.free; }; }) {}; - swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + swiper = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "swiper"; - version = "20180326.919"; + ename = "swiper"; + version = "20180713.946"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f8cdaa7f3c733b88865650d10d9138bcb40a9ba8"; - sha256 = "0gfaj5ygjmvrmghyqghp7i6wf5abiayb28av4291plpyl0liz78h"; + rev = "93d51d6188956da2592c1458b68d7cef48d967ae"; + sha256 = "024kj37xa4s49z8klcmn3a30zy3yzk5n9j9damzqmzd4d8klawi6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; sha256 = "0qaia5pgsjsmrfmcdj72jmj39zq82wg4i5l2mb2z6jlf1jpbk6y9"; - name = "swiper"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -70530,9 +91639,16 @@ license = lib.licenses.free; }; }) {}; - swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }: - melpaBuild { + swiper-helm = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , swiper }: + melpaBuild { pname = "swiper-helm"; + ename = "swiper-helm"; version = "20180131.944"; src = fetchFromGitHub { owner = "abo-abo"; @@ -70540,10 +91656,10 @@ rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008"; sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm"; sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph"; - name = "swiper-helm"; + name = "recipe"; }; packageRequires = [ emacs helm swiper ]; meta = { @@ -70551,9 +91667,13 @@ license = lib.licenses.free; }; }) {}; - switch-buffer-functions = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + switch-buffer-functions = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "switch-buffer-functions"; + ename = "switch-buffer-functions"; version = "20171011.1004"; src = fetchFromGitHub { owner = "10sr"; @@ -70561,10 +91681,10 @@ rev = "651696ef9dec7affbe51c81d9318288376c35899"; sha256 = "0xv57imh6w6kbh1i1ib9k9x2h01l4vdxs2i667a76ym6dmsjbx2x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d37ebd28f4a2f770958bd9a2669cce86cc76cbe7/recipes/switch-buffer-functions"; sha256 = "1b93p8q07zncqq3nw829gddc615rwaan1ds5vgfhdb1l7bh9f37l"; - name = "switch-buffer-functions"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70572,20 +91692,25 @@ license = lib.licenses.free; }; }) {}; - switch-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + switch-window = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "switch-window"; - version = "20180222.1731"; + ename = "switch-window"; + version = "20180623.1115"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "680182240012c2ad8fb35479f915e653315b4803"; - sha256 = "0fkz29spgfbx7d1hi1xm71wa1glk448v7gidqgrdylsmbzwkj1y9"; + rev = "a5dc9a9c68ba77d86d7170f183ba1e003569ad8e"; + sha256 = "0466lk1spk6bl1fnc0v7gwr71msccc25a3j7jzd7h0zssc2l403c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2"; - name = "switch-window"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -70593,9 +91718,17 @@ license = lib.licenses.free; }; }) {}; - swoop = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, pcre2el }: - melpaBuild { + swoop = callPackage ({ async + , emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , pcre2el }: + melpaBuild { pname = "swoop"; + ename = "swoop"; version = "20160120.915"; src = fetchFromGitHub { owner = "ShingoFukuyama"; @@ -70603,10 +91736,10 @@ rev = "a5e475db7a9f5db02ba3d08cd3c1c3594e2e01d7"; sha256 = "10ka6f86n07xlf0z7w35db0mzp2zk4xhr6jd19kjdrn2j0ynlcw5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/swoop"; sha256 = "0zcxasc0bpldvlp6032f9v1s4vm9r76pzd7sjgwa9dxbajw5h7fs"; - name = "swoop"; + name = "recipe"; }; packageRequires = [ async emacs ht pcre2el ]; meta = { @@ -70614,20 +91747,24 @@ license = lib.licenses.free; }; }) {}; - sws-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sws-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sws-mode"; + ename = "sws-mode"; version = "20150317.1245"; src = fetchFromGitHub { owner = "brianc"; repo = "jade-mode"; - rev = "4dbde92542fc7ad61df38776980905a4721d642e"; - sha256 = "0p6pfxbl98kkwa3lgx82h967w4p0wbd9s96gvs72d74ryan07ij1"; + rev = "03486dce6990c96e85e53c18b8fcb35fbb8509f5"; + sha256 = "10w73i4sh6mn108lcnm6sv4xr1w0avbfw05kid28c33583h80vpm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/877b5a3e612e1b1d6d51e60c66b0b79f231abdb2/recipes/sws-mode"; sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i"; - name = "sws-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70635,20 +91772,29 @@ license = lib.licenses.free; }; }) {}; - sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: - melpaBuild { + sx = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , let-alist + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "sx"; - version = "20180212.1101"; + ename = "sx"; + version = "20180606.36"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "833435fbf90d1c9e927d165b155f3b1ef39271de"; - sha256 = "1369xaxq1vy3d9yh862ddnhddikdpg2d0wv1ly00pnvdp9v4cqgd"; + rev = "46d9498e8f501697920c79437909cdddc93d5ec6"; + sha256 = "0z21f2v8464bj0jj6y9w7b5hpz1m2r761hanc4b802k8bxb8mxh0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517"; - name = "sx"; + name = "recipe"; }; packageRequires = [ cl-lib emacs json let-alist markdown-mode ]; meta = { @@ -70656,20 +91802,25 @@ license = lib.licenses.free; }; }) {}; - symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + symbol-overlay = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "symbol-overlay"; - version = "20180306.648"; + ename = "symbol-overlay"; + version = "20180412.339"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "bb02b971b06fb8e612c62bd2517b49884bc603a0"; - sha256 = "18ib707rky1k5qw5m4zfd88y1lvgqfilc336ha3v88i7fz8bbzh9"; + rev = "b76f510037eb8e0ea018272495f356c71ff5b758"; + sha256 = "0dlb7rm4adm2ccqga5a1w6m2jvs4ics9ihf76hqyx4px9m9ca1ll"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; sha256 = "1al60x2mnjsv99jd10v5sd56zz185wsddiq7128phf1l35bkibis"; - name = "symbol-overlay"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -70677,9 +91828,15 @@ license = lib.licenses.free; }; }) {}; - symbolword-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + symbolword-mode = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "symbolword-mode"; + ename = "symbolword-mode"; version = "20180401.727"; src = fetchFromGitHub { owner = "ncaq"; @@ -70687,10 +91844,10 @@ rev = "3857c42696e20f49f274ff8bc45a6f3ee26884d4"; sha256 = "0pk20glbf73lpfky0jz6dqvxzaqvig3m11xca0786ni0g1yc4g0g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be2018e0206c3f39c1b67e83000b030d70a72ceb/recipes/symbolword-mode"; sha256 = "1fs1irnmlbrn76b4gdsy0v65nz8av85iqm0b7g9nm2rm8azcr050"; - name = "symbolword-mode"; + name = "recipe"; }; packageRequires = [ emacs f ]; meta = { @@ -70698,20 +91855,24 @@ license = lib.licenses.free; }; }) {}; - symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + symon = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "symon"; + ename = "symon"; version = "20170224.33"; src = fetchFromGitHub { owner = "zk-phi"; repo = "symon"; - rev = "8dd8b6df49b03cd7d31b85aedbe9dd08fb922335"; - sha256 = "1bbblz9qzc84h08010y48mjyciavl6lnxk2m19mwbc6b5y58vwpg"; + rev = "76461679dfe13a5dccd3c8735fb6f58b26b46733"; + sha256 = "06s7q0zhqmvnhdkqikhfzl1rgm6xzqaxp461ndf8gp44rp1alkl4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f4bbc6b3d7b2e2a9fbe7ff7f1d47cda9c859cc0/recipes/symon"; sha256 = "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz"; - name = "symon"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70719,9 +91880,15 @@ license = lib.licenses.free; }; }) {}; - symon-lingr = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, symon }: - melpaBuild { + symon-lingr = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , symon }: + melpaBuild { pname = "symon-lingr"; + ename = "symon-lingr"; version = "20150719.642"; src = fetchFromGitHub { owner = "zk-phi"; @@ -70729,10 +91896,10 @@ rev = "056d1a473e36992ff5881e5ce6fdc331cead975f"; sha256 = "030bglxnvrkf1f9grbhd8n11j4c6sxpabpjdr1ryx522v01fvx8j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/936e9a83ed73d3b6090e5c401076b6cff5d9732d/recipes/symon-lingr"; sha256 = "0kyhmw25cn10b4jv2yx7bvp8zkwcswiidpk4amyaisw25820gkv1"; - name = "symon-lingr"; + name = "recipe"; }; packageRequires = [ cl-lib symon ]; meta = { @@ -70740,9 +91907,13 @@ license = lib.licenses.free; }; }) {}; - sync-recentf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sync-recentf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sync-recentf"; + ename = "sync-recentf"; version = "20160326.1301"; src = fetchFromGitHub { owner = "ffevotte"; @@ -70750,10 +91921,10 @@ rev = "0052561d5c5b5c2684faedc3eead776aec06c3ed"; sha256 = "006siydqxqds0qqds0zxn821dk4pw14wyymyp03n594wgqzw7m8q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9858ea35f2a3faacab56b6ccba5672956560456b/recipes/sync-recentf"; sha256 = "17aji2vcw6zfd823anzwj8pcgyxamxr87bnni085jvlz0vx6gh9c"; - name = "sync-recentf"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70761,9 +91932,14 @@ license = lib.licenses.free; }; }) {}; - syndicate = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + syndicate = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "syndicate"; + ename = "syndicate"; version = "20160603.823"; src = fetchFromGitHub { owner = "KNX32542"; @@ -70771,10 +91947,10 @@ rev = "90cee202a06f5bab48268ebf9f62c43334b69f50"; sha256 = "1w0na1p9drdmbci7adj20amrabcpny9fb2v4bd967ils4f2wly75"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/626bda1691d9c7a97fcf549f7a3f0d41d832cfde/recipes/syndicate"; sha256 = "06nmldcw5dy2shhpk6nyix7gs57gsr5s9ksj57xgg8y2j3j0da95"; - name = "syndicate"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -70782,9 +91958,16 @@ license = lib.licenses.free; }; }) {}; - synonymous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + synonymous = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "synonymous"; + ename = "synonymous"; version = "20180325.1117"; src = fetchFromGitHub { owner = "toroidal-code"; @@ -70792,10 +91975,10 @@ rev = "2cb9a674d84fddf3f1b00c9d6b13a853576acb87"; sha256 = "1l0skavpj96x5gdrx9l8dqj4mrb7zcilv3jj335ak11p2i4ckcq2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf2c44c63e9f41f1733849bdef0d0c301485580/recipes/synonymous"; sha256 = "0vawa9qwvv6z1i7vzhkjdl1l9r1yham48yn5y8w8g1xyhxxp6rs5"; - name = "synonymous"; + name = "recipe"; }; packageRequires = [ cl-lib emacs request ]; meta = { @@ -70803,20 +91986,25 @@ license = lib.licenses.free; }; }) {}; - synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + synosaurus = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "synosaurus"; + ename = "synosaurus"; version = "20180125.1034"; src = fetchFromGitHub { owner = "hpdeifel"; repo = "synosaurus"; - rev = "8bf95b935976ec0a1964cf175ed57cc5f6f93bdb"; - sha256 = "06dssdq0fwmr5fw56f17hysy4ysvljlvh6np4szv7lc8bhvykki0"; + rev = "ceeb06e24d3af3643862ecfdb263590eec1f492f"; + sha256 = "1qdppyx24zmz9dzm9kjvcx30g6znik602mg2h2s835cww9n97idm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus"; sha256 = "06a48ajpickf4qr1bc14skfr8khnjjph7c35b7ajfy8jw2zwavpn"; - name = "synosaurus"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -70824,9 +92012,15 @@ license = lib.licenses.free; }; }) {}; - synquid = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + synquid = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "synquid"; + ename = "synquid"; version = "20160930.850"; src = fetchFromGitHub { owner = "cpitclaudel"; @@ -70834,10 +92028,10 @@ rev = "28701ce1a15437202f53ab93a14bcba1de83fd2c"; sha256 = "0c0pi5w8xvir9gnbjp80g1c4i3rhid65zwh4i4vkyivkh2s29f6i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ccd9f265d90a5f6a95942938532f556b223e4da/recipes/synquid"; sha256 = "10kmd9g3qbfnyfl2bdf2s70f5sd3pyzalq18dpgq5ijkwqi019k7"; - name = "synquid"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -70845,20 +92039,26 @@ license = lib.licenses.free; }; }) {}; - syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + syntactic-close = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "syntactic-close"; - version = "20180211.538"; + ename = "syntactic-close"; + version = "20180722.935"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "5ba592366b0b29b724b1cbda952cc8e25ef8b239"; - sha256 = "0b4lhvd3dsg95hpdnjmyhxrcaqkmigg7k5n98f9fb9b8k6gfdsan"; + rev = "128d5bf059512a55c77cac0e96a7775f38184139"; + sha256 = "0l9hklj39p6rsl2dcw6pka39glkp6qvyccqdy7qcnwxmffy204m6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; sha256 = "19lrzxxyzdj1nrzdgzandjz3b8b4pw7akbv86yf0mdf023d9as1f"; - name = "syntactic-close"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -70866,20 +92066,24 @@ license = lib.licenses.free; }; }) {}; - syntactic-sugar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + syntactic-sugar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "syntactic-sugar"; + ename = "syntactic-sugar"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "syntactic-sugar"; - rev = "7ddc4502c831abe1c4ad4c7d1ca628a2c9e13968"; - sha256 = "0zi11540wwcl93xcgd2yf6b72zv01zkaqbf1jfbksg82k9038m2d"; + rev = "b6a49df4b6056e2619eea9ca554c105ae67e115f"; + sha256 = "0zymxv4lz3phb2lmza0469ssw3fybribzd1w2fmp8ij1r18xy0xk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b32b9b3b3e820e498d7531a1f82da36e5e8f4e74/recipes/syntactic-sugar"; sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r"; - name = "syntactic-sugar"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70887,19 +92091,23 @@ license = lib.licenses.free; }; }) {}; - syntax-subword = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + syntax-subword = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "syntax-subword"; + ename = "syntax-subword"; version = "20160519.1205"; src = fetchhg { url = "https://bitbucket.com/jpkotta/syntax-subword"; rev = "ad0db0fcb464"; sha256 = "1wcgr6scvwwfmhhjbpq3riq0gmp4g08ffbl91fpgp72j8zrc1c6x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/syntax-subword"; sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm"; - name = "syntax-subword"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70907,30 +92115,39 @@ license = lib.licenses.free; }; }) {}; - system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + system-packages = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "system-packages"; - version = "20180331.1102"; - src = fetchFromGitHub { + ename = "system-packages"; + version = "20180516.1450"; + src = fetchFromGitLab { owner = "jabranham"; repo = "system-packages"; - rev = "fff67d190440fb076104f0f52d55a5e098207e31"; - sha256 = "0ia4nnyhk84dkahsan8l8dslmqiv0afs5abc1w2fnql7zhsiac6q"; + rev = "7f59e325e8607aeb3036c7fb1590b0f8e2caa063"; + sha256 = "0k7jflghql0sa7my1qfzz0prpwk54rmb244k6jwhbgsyfsspr12l"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; - sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1"; - name = "system-packages"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/system-packages"; + sha256 = "13nk3m8gw9kqjllk7hgkmpxsx9y5h03f0l7zydg388wc7cxsiy3l"; + name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/system-packages"; license = lib.licenses.free; }; }) {}; - system-specific-settings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + system-specific-settings = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "system-specific-settings"; + ename = "system-specific-settings"; version = "20140818.757"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; @@ -70938,10 +92155,10 @@ rev = "0050d85b2175095aa5ecf580a2fe43c069b0eef3"; sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f52c584d7435c836ba3c95c598306ba0f5c06da/recipes/system-specific-settings"; sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp"; - name = "system-specific-settings"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70949,20 +92166,25 @@ license = lib.licenses.free; }; }) {}; - systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + systemd = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "systemd"; - version = "20180101.1803"; + ename = "systemd"; + version = "20180629.1406"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "228f0b99ca3e1f3139ae8cacd15f9698d5b6da90"; - sha256 = "0cdqpzkx01qm0pk66hs6yhzv5iccrzzgfv3bh5c8i91v55d66bff"; + rev = "401d71c2dd24e424216ae5e4275c830f2a9c6b0c"; + sha256 = "06b8j64fk711fay0p4ifypvpdv2l2kz80rx1hhm6g9991h0x33bj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; sha256 = "1ykvm8mfi3fjvrkfcy9qn0sr9mhwm9x1svrmrd0gyqk418clk5i3"; - name = "systemd"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -70970,20 +92192,24 @@ license = lib.licenses.free; }; }) {}; - systemtap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + systemtap-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "systemtap-mode"; + ename = "systemtap-mode"; version = "20151122.1140"; src = fetchFromGitHub { owner = "ruediger"; repo = "systemtap-mode"; - rev = "1a968c2b1f3a054bebf91ac49739d3a81ce050a9"; - sha256 = "0343ss3y9i40y3i9rr7p7bb4k9dj950zyvdv44q1abw2xrfd2xwd"; + rev = "8b5086d6b0050a12bb37e33c24c24d1f420afd3b"; + sha256 = "14hrqz26h89sdgfpfyhwwxvqkv3j0zn67yy8wz0nbla9k2jjf6h8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1df01b4cccfb234971933d24de21a2b5648fd8c/recipes/systemtap-mode"; sha256 = "1l2jx6mvph0q2pdlhq7p4vwfw72rfl8k1rwi504bbkr5n5xwhhhz"; - name = "systemtap-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -70991,9 +92217,15 @@ license = lib.licenses.free; }; }) {}; - ta = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ta = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ta"; + ename = "ta"; version = "20160619.945"; src = fetchFromGitHub { owner = "kuanyui"; @@ -71001,10 +92233,10 @@ rev = "668ad41e71f374f8c32c8d0532f3d8485b355d35"; sha256 = "1lk7hpdp6c74sdwkg2azfvj4qmbl1ghmhms3r0j4296dj8bl5k63"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/847693b5952e99597bd77223e1058536d1beeb5c/recipes/ta"; sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll"; - name = "ta"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -71012,9 +92244,13 @@ license = lib.licenses.free; }; }) {}; - tab-group = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tab-group = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tab-group"; + ename = "tab-group"; version = "20140306.650"; src = fetchFromGitHub { owner = "tarao"; @@ -71022,10 +92258,10 @@ rev = "5a290ec2608e4100fb188fd60ecb77affcc3465b"; sha256 = "0lfvgbgvsm61kv5mcjnhnfjcnr7fy1015y0hndkf9xvdlw4hahr4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad758d865bde8c97d27c0d57cabe1606f8b36974/recipes/tab-group"; sha256 = "1i5lxpf3wmqnqj9mzgcn4gp1gjxp737awrzl1dml5wnarbbj4fs9"; - name = "tab-group"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71033,9 +92269,15 @@ license = lib.licenses.free; }; }) {}; - tab-jump-out = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tab-jump-out = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tab-jump-out"; + ename = "tab-jump-out"; version = "20151005.1830"; src = fetchFromGitHub { owner = "cheunghy"; @@ -71043,10 +92285,10 @@ rev = "1c3fec1826d2891177ea78e4e7cce1dc67e83e51"; sha256 = "0h7sfbca1nzcjylwl7zp25yj6wxnlx8g8a50zc6sg6jg4rggi2fm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3691aaaed27d0cf67af417f75fbb693ab856bd47/recipes/tab-jump-out"; sha256 = "0nlbyzym8l8g9w2xvykpcl5r449v30gal2k1dnz74rq4y8w4rh7n"; - name = "tab-jump-out"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -71054,9 +92296,13 @@ license = lib.licenses.free; }; }) {}; - tabbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tabbar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tabbar"; + ename = "tabbar"; version = "20160524.1401"; src = fetchFromGitHub { owner = "dholm"; @@ -71064,10 +92310,10 @@ rev = "b6c285a7d59dcdb1f17716f0b60787922fa4be82"; sha256 = "1akvwm4dqq4ihphlsdn8d1mm08q923y2iqh15lvc0cd0hxp3ni0q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806420d75561cbeffbc1b387345a56c21cc20179/recipes/tabbar"; sha256 = "1y376nz1xmchwns4fz8dixbb7hbqh4mln78zvsh7y32il98wzvx9"; - name = "tabbar"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71075,9 +92321,17 @@ license = lib.licenses.free; }; }) {}; - tabbar-ruler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline, tabbar }: - melpaBuild { + tabbar-ruler = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mode-icons + , powerline + , tabbar }: + melpaBuild { pname = "tabbar-ruler"; + ename = "tabbar-ruler"; version = "20160801.2007"; src = fetchFromGitHub { owner = "mattfidler"; @@ -71085,10 +92339,10 @@ rev = "535568189aa12a3eff7f977d2783e57b6a65ab6a"; sha256 = "1csj6qhwihdf4kfahcqhm163isiwac08w4nqid1hnca184bfk6xm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d69d1ef8dbab8394be01153cf9ebe8e49bf9912/recipes/tabbar-ruler"; sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d"; - name = "tabbar-ruler"; + name = "recipe"; }; packageRequires = [ cl-lib mode-icons powerline tabbar ]; meta = { @@ -71096,9 +92350,14 @@ license = lib.licenses.free; }; }) {}; - tablist = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tablist = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tablist"; + ename = "tablist"; version = "20170219.1935"; src = fetchFromGitHub { owner = "politza"; @@ -71106,10 +92365,10 @@ rev = "c834a84efb6efa32497efe1e73160fade741b836"; sha256 = "0nkrndgg0zrqxb7hilqbrywi8n1lcf3jxjjp1hfn5f0arxy64pcv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc0c6c02d609fb22710560337bd577f4b1e0c8f/recipes/tablist"; sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p"; - name = "tablist"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -71117,9 +92376,14 @@ license = lib.licenses.free; }; }) {}; - tabula-rasa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tabula-rasa = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tabula-rasa"; + ename = "tabula-rasa"; version = "20141215.2147"; src = fetchFromGitHub { owner = "idomagal"; @@ -71127,10 +92391,10 @@ rev = "e85fff9de18dc31bc6a7aca726e34a95cc5459f5"; sha256 = "1dbjfq9a7a5s9c18nrp4kcda64jkg5cp8na31kxw0hjcn98dgqa8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/tabula-rasa"; sha256 = "14j92inssmm61bn475gyn0dn0rv8kvfnqyl1zq3xliy7a0jn58zz"; - name = "tabula-rasa"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -71138,9 +92402,15 @@ license = lib.licenses.free; }; }) {}; - tagedit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + tagedit = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "tagedit"; + ename = "tagedit"; version = "20161121.55"; src = fetchFromGitHub { owner = "magnars"; @@ -71148,10 +92418,10 @@ rev = "b3a70101a0dcf85498c92b7fcfa7fdbac869746c"; sha256 = "0xq9i3axlq9wgsr27nbhi5k9hxr1wahygkb73xkvxlgmvkmikcrw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8968e2cd0bd49d54a5479b2467bd4f0a97d7a969/recipes/tagedit"; sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z"; - name = "tagedit"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -71159,9 +92429,15 @@ license = lib.licenses.free; }; }) {}; - take-off = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }: - melpaBuild { + take-off = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-server }: + melpaBuild { pname = "take-off"; + ename = "take-off"; version = "20140531.217"; src = fetchFromGitHub { owner = "tburette"; @@ -71169,10 +92445,10 @@ rev = "aa9ea45566fc74febbb6ee9c409ecc4b59246215"; sha256 = "13zwlb5805cpv0pbr7fj5b4crlg7lb0ibslvcpszm0cz6rlifcvf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d129ad161d8538c9db022bbd4e90eacda998cf4/recipes/take-off"; sha256 = "05vlajmirbp62rpbdwa2bimpzyl9xc331gg0lhn2rkivc0hma2ar"; - name = "take-off"; + name = "recipe"; }; packageRequires = [ emacs web-server ]; meta = { @@ -71180,19 +92456,23 @@ license = lib.licenses.free; }; }) {}; - tango-2-theme = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + tango-2-theme = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tango-2-theme"; + ename = "tango-2-theme"; version = "20120312.1325"; src = fetchgit { url = "https://gist.github.com/2024464.git"; rev = "64e44c98e41ebbe3b827d54280e3b9615787daaa"; sha256 = "1lqkazis9pfcfdsb2lar4l1n4pd085v60xmnlkdrdllwamqachkk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab432b0eac0bcf0d40c5b3c8a78475bc0fea47d2/recipes/tango-2-theme"; sha256 = "1a9qmz99h99gpd0sxqb71c08wr8pm3bzsg3p4cvf3vcirvav9lq6"; - name = "tango-2-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71200,9 +92480,13 @@ license = lib.licenses.free; }; }) {}; - tango-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tango-plus-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tango-plus-theme"; + ename = "tango-plus-theme"; version = "20170214.908"; src = fetchFromGitHub { owner = "tmalsburg"; @@ -71210,10 +92494,10 @@ rev = "8ba8901397e3e9f1d53110487bfa0effc65015e7"; sha256 = "025dca4yqpai45s74nk41y075v8pv59fdna11c0qqz3ihyrdhbrq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tango-plus-theme"; sha256 = "1p1b48fvmk7a8m3bnddkx2pp7kz5agac0v1ii2r6iqapdqsl22ng"; - name = "tango-plus-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71221,9 +92505,13 @@ license = lib.licenses.free; }; }) {}; - tangotango-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tangotango-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tangotango-theme"; + ename = "tangotango-theme"; version = "20170924.809"; src = fetchFromGitHub { owner = "juba"; @@ -71231,10 +92519,10 @@ rev = "e2f2ea9c35f06dfc43a29c91c14cf0cdb19f2144"; sha256 = "01gvsvha8z7pyr8c33gh3xmz47lh6b8g0nwf1gzdiw1gd0sfhs4z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebfcfa3ba4ca77443667a9478d59214810cd8cc2/recipes/tangotango-theme"; sha256 = "05cnvyqmh5h5mqys7qs7d9knzxzmi2x0j1avp77x5l5njzzv59s2"; - name = "tangotango-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71242,9 +92530,13 @@ license = lib.licenses.free; }; }) {}; - tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tao-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tao-theme"; + ename = "tao-theme"; version = "20171221.1001"; src = fetchFromGitHub { owner = "11111000000"; @@ -71252,10 +92544,10 @@ rev = "a97df8c51d77696787aaf55c67207f19c803fabe"; sha256 = "1djp4gbs6gr956a5hpkwh5laasc7pypqip32l7djd7405vx5ixp2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; sha256 = "0gl6zzk5ha6vl2xxf5fcnv1k42cw4axdjdcirr1c4r8jwdq3nl3a"; - name = "tao-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71263,20 +92555,51 @@ license = lib.licenses.free; }; }) {}; - tawny-mode = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + taskpaper-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "taskpaper-mode"; + ename = "taskpaper-mode"; + version = "20180710.158"; + src = fetchFromGitHub { + owner = "saf-dmitry"; + repo = "taskpaper-mode"; + rev = "e822c44ebc5b15750ba68af67417ea5fe67641c0"; + sha256 = "08ilrykg9ggksxwrkns0jkbjjvpzxb5w1l2s2krxnf4nj5d9x3qb"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f969b1cd58dfd22041a8a2b116db0f48e321e546/recipes/taskpaper-mode"; + sha256 = "0gayhzakiwlrkysmh24499pyzdfy3rmf8d68vamih7igxpl57gim"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/taskpaper-mode"; + license = lib.licenses.free; + }; + }) {}; + tawny-mode = callPackage ({ cider + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tawny-mode"; + ename = "tawny-mode"; version = "20170422.1502"; src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "3d353a435c7fcb0d9edae3094a9ece81914ba34e"; - sha256 = "14kb6pzj23zrxwfkcxnra1j4fxzm94a3fym0nx1gf7bx362yqn5g"; + rev = "9f11bb428a255a605c725dfbd23cc082c5d258af"; + sha256 = "0l419pvvnj850c6byr7njnjki171mcsvlqj8g2d4qk16j504n34m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; sha256 = "1xaw1six1n6rw1283fdyl15xcf6m7ngvq6gqlz0xzpf232c4b0kr"; - name = "tawny-mode"; + name = "recipe"; }; packageRequires = [ cider emacs ]; meta = { @@ -71284,20 +92607,28 @@ license = lib.licenses.free; }; }) {}; - tblui = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, tablist }: - melpaBuild { + tblui = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , magit-popup + , melpaBuild + , tablist }: + melpaBuild { pname = "tblui"; + ename = "tblui"; version = "20161007.1212"; src = fetchFromGitHub { owner = "Yuki-Inoue"; repo = "tblui.el"; - rev = "bb29323bb3e27093d50cb42db3a9329a096b6e4d"; - sha256 = "1pja9v4h3abqc2iydm7wwjxrg7ni1pn94yb4azrgjq5qc0fsgn7a"; + rev = "e280e11b35a2fdbcadf9ce901a2b62684ac7a7a3"; + sha256 = "0alb0gpdny1y90b2c5s25as56qbi3dy8rfnm9ba0k7ifwy0lmfq5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4dd6e9dcc73c57f93371ba16b15f2d98d805dae/recipes/tblui"; sha256 = "1m0zhk5zyialklnil5az974yz6g1zksw02453cxc0xpn5pf0a3xa"; - name = "tblui"; + name = "recipe"; }; packageRequires = [ cl-lib dash magit-popup tablist ]; meta = { @@ -71305,9 +92636,16 @@ license = lib.licenses.free; }; }) {}; - tbx2org = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + tbx2org = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "tbx2org"; + ename = "tbx2org"; version = "20140224.759"; src = fetchFromGitHub { owner = "istib"; @@ -71315,10 +92653,10 @@ rev = "08e9816ba6066f56936050b58d07ceb2187ae6f7"; sha256 = "1jp80qywcphql1ngd4fr24lqdfwrw0bw6q9hgq5vmzgjwfxwxwd4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d616cbf4ad7e49807afd2f7acf0a0fd2f2a0bac4/recipes/tbx2org"; sha256 = "1yvkw65la4w12c4w6l9ai73lzng170wv4b8gry99m2bakw3wr8m8"; - name = "tbx2org"; + name = "recipe"; }; packageRequires = [ cl-lib dash s ]; meta = { @@ -71326,8 +92664,11 @@ license = lib.licenses.free; }; }) {}; - tc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tc"; version = "20150113.1926"; src = fetchFromGitHub { @@ -71336,7 +92677,7 @@ rev = "6aa9d27c475be8d009adf9cd417f2cdf348a91e8"; sha256 = "1xpkrlfqb0np9zyxk41f3pxfkw98ii4q0xh8whq4llv5bmfxynzk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55fa57c74237ec7afe651d162228fae595579fe5/recipes/tc"; sha256 = "13qdnfslnik4f97lz9bxayyhgcp1knh5gaqy00ps863j3vpzjb9s"; name = "tc"; @@ -71347,20 +92688,26 @@ license = lib.licenses.free; }; }) {}; - tco = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tco = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tco"; + ename = "tco"; version = "20160810.1712"; src = fetchFromGitHub { owner = "Wilfred"; repo = "tco.el"; - rev = "97529ed7a0939c51ce0084c0aa8b12b313654735"; - sha256 = "1s8lw38d43c06w6q88h1kf480zvxzjzxmb426zb9rral61m1f0dl"; + rev = "5d3498c5f44d3a44c9aabbba71b590f6a2f85145"; + sha256 = "0vzixcp6anxdxchafj7lzs4pxfnzkqhqlyz05dxasby71zx7g49v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca33f97f0394585c8ccb31cab0ee776d1655907c/recipes/tco"; sha256 = "0hfrzwjlgynk3mydrpmic9mckak37r22fdglrfas6zdihgrg152f"; - name = "tco"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -71368,20 +92715,24 @@ license = lib.licenses.free; }; }) {}; - tdd-status-mode-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tdd-status-mode-line = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tdd-status-mode-line"; + ename = "tdd-status-mode-line"; version = "20131123.916"; src = fetchFromGitHub { owner = "algernon"; repo = "tdd-status-mode-line"; - rev = "4c082e62f4915b573338a97efcc6854d132323dc"; - sha256 = "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5"; + rev = "9b3c35b0a972772640e9fee653eab6a76e06416a"; + sha256 = "0bvxc926kaxvqnppaw4y6gp814qc0krvidn5qg761z4qwz023rax"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2da68159ebd2301b42ac52235563a5eaaf6d2cc/recipes/tdd-status-mode-line"; - sha256 = "0z1q1aw14xq72nfx7mmvz7pr2x4960l45z02jva35zxzvb1mvsgq"; - name = "tdd-status-mode-line"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/25b445a1dea5e8f1042bed6b5372471c25129fd8/recipes/tdd-status-mode-line"; + sha256 = "1i0s7f4y4v8681mymcmjlcbq0jfghgmdzrs167c453mb5ssz8yxg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71389,9 +92740,13 @@ license = lib.licenses.free; }; }) {}; - tea-time = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tea-time = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tea-time"; + ename = "tea-time"; version = "20120331.120"; src = fetchFromGitHub { owner = "konzeptual"; @@ -71399,10 +92754,10 @@ rev = "1f6cf0bdd27c5eb3508989c5095427781f858eca"; sha256 = "0b4cwkwkc4i8lc4j30xc9d6xskm3gqrc2dij60ya75h92aj0lj40"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/tea-time"; sha256 = "0qypwf0pgsixq6c5avbwp81i3ayy9dd2fngzdvq14pax913q8pg1"; - name = "tea-time"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71410,9 +92765,13 @@ license = lib.licenses.free; }; }) {}; - telepathy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + telepathy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "telepathy"; + ename = "telepathy"; version = "20131209.458"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -71420,10 +92779,10 @@ rev = "211d785b02a29ddc254422fdcc3db45262582f8c"; sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/485ef1745f07f29c45bf0d489eeb4fcdfda80b33/recipes/telepathy"; sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr"; - name = "telepathy"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71431,20 +92790,28 @@ license = lib.licenses.free; }; }) {}; - telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + telephone-line = callPackage ({ cl-generic + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "telephone-line"; - version = "20180329.1924"; + ename = "telephone-line"; + version = "20180601.1943"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "220a1a4a89ca95be9ae1fab356b92296fff5b73a"; - sha256 = "0dkmysgqpmcqchhsng2lkgb3w2nb8cpnk2sk6330h5drhp61d35c"; + rev = "1cc28a7811245e6f24234b36fc1004a1357a3df3"; + sha256 = "1qjlil6xy6jacz1lhwz76n5xqx1xw2bqlnkijrka04v9gws42jaj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3"; - name = "telephone-line"; + name = "recipe"; }; packageRequires = [ cl-generic cl-lib emacs seq ]; meta = { @@ -71452,20 +92819,55 @@ license = lib.licenses.free; }; }) {}; - temporary-persistent = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: - melpaBuild { + template-overlays = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , ov }: + melpaBuild { + pname = "template-overlays"; + ename = "template-overlays"; + version = "20180706.432"; + src = fetchFromGitHub { + owner = "mmontone"; + repo = "template-overlays"; + rev = "3cbc9a4882dcbbddf9b168883d119a6af0848784"; + sha256 = "1lnrs6zphpk1qi8pg8km9srbv5n9i70f2jvyj5zvxhlpp0jb52l2"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8856e67aae1f623714bc2a61a7b4773ed1fb2934/recipes/template-overlays"; + sha256 = "0vmadkgzp4i0mh64la67k1anvmlmd4i7iibdlr9ly8z7i3cdsxqn"; + name = "recipe"; + }; + packageRequires = [ emacs ov ]; + meta = { + homepage = "https://melpa.org/#/template-overlays"; + license = lib.licenses.free; + }; + }) {}; + temporary-persistent = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names + , s }: + melpaBuild { pname = "temporary-persistent"; + ename = "temporary-persistent"; version = "20161210.333"; src = fetchFromGitHub { owner = "kostafey"; repo = "temporary-persistent"; - rev = "ac66f3054fc701d53f11ada9d2d9ab18ea481dc0"; - sha256 = "15mjcr9gwf1ijppvcxwddnxj84y9idwz7s3lcqr910xb4d3ai8nb"; + rev = "1132e940dc1fd27f205758495640cc4a42270cff"; + sha256 = "155yyinh342k8fz8g4xzz0glqkxkjl6p6y2wym6p12phk7v2x3ic"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f89e65ce7b302a0330f0110564320c724acc254/recipes/temporary-persistent"; sha256 = "1q141cdnwchfra6gp6fs0nlkxv6fdf8rx5ry04kcpr9a1y56z362"; - name = "temporary-persistent"; + name = "recipe"; }; packageRequires = [ dash emacs names s ]; meta = { @@ -71473,9 +92875,14 @@ license = lib.licenses.free; }; }) {}; - ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ten-hundred-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ten-hundred-mode"; + ename = "ten-hundred-mode"; version = "20161028.1536"; src = fetchFromGitHub { owner = "aaron-em"; @@ -71483,10 +92890,10 @@ rev = "bdcfda49b1819e82d61fe90947e50bb948cf7933"; sha256 = "11nsh6dkd3i489lrqpd9xhr4c0ai51364rlrd6slm54720by9jql"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a0534044ff9ce0740414bf5dc3b104bbdbdacce/recipes/ten-hundred-mode"; sha256 = "17v38h33ka70ynq72mvma2chvlnm1k2amyvk62c65iv67rwilky3"; - name = "ten-hundred-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -71494,9 +92901,17 @@ license = lib.licenses.free; }; }) {}; - term-alert = callPackage ({ alert, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, term-cmd }: - melpaBuild { + term-alert = callPackage ({ alert + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , term-cmd }: + melpaBuild { pname = "term-alert"; + ename = "term-alert"; version = "20161119.145"; src = fetchFromGitHub { owner = "CallumCameron"; @@ -71504,10 +92919,10 @@ rev = "47af9e6fe483ef0d393098c145f499362a33292a"; sha256 = "1nv8ma8x9xkgsl95z7yysy8q1lb3xr0pd8a5sb01nlx8ks3clad4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d77aee0b1b2eb7834436bdfa339f95cb97da140/recipes/term-alert"; sha256 = "02qvfhklysfk1fd4ibdngf4crp9k5ab11zgg90hi1sp429a53f3m"; - name = "term-alert"; + name = "recipe"; }; packageRequires = [ alert emacs f term-cmd ]; meta = { @@ -71515,9 +92930,16 @@ license = lib.licenses.free; }; }) {}; - term-cmd = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + term-cmd = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "term-cmd"; + ename = "term-cmd"; version = "20160517.345"; src = fetchFromGitHub { owner = "CallumCameron"; @@ -71525,10 +92947,10 @@ rev = "6c9cbc659b70241d2ed1601eea34aeeca0646dac"; sha256 = "08qiipjsqc9dfbha6r2yijjbrg2s4i2mkn6zn5616086550v3kpj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e08ea89cf193414cce5073fc9c312f2b382bc842/recipes/term-cmd"; sha256 = "0pbz9fy9rjfpzspwq78ggf1wcvjslwvj8fvc05w4g56ydza0gqi4"; - name = "term-cmd"; + name = "recipe"; }; packageRequires = [ dash emacs f ]; meta = { @@ -71536,9 +92958,15 @@ license = lib.licenses.free; }; }) {}; - term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + term-manager = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "term-manager"; + ename = "term-manager"; version = "20171020.141"; src = fetchFromGitHub { owner = "IvanMalison"; @@ -71546,10 +92974,10 @@ rev = "13a0f1637a1f075d70211ccb8162e63a18a474da"; sha256 = "0hvn60wk3w27fjb023drnaw0gmys6ancha8blpl0r4vc5k203kcf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager"; sha256 = "0ab388ki7vr1wpz81bvbl2fskq9zz5bicdf5gqfg01qzv5l75iza"; - name = "term-manager"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -71557,9 +92985,15 @@ license = lib.licenses.free; }; }) {}; - term-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + term-plus = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "term-plus"; + ename = "term+"; version = "20170508.1717"; src = fetchFromGitHub { owner = "tarao"; @@ -71567,10 +93001,10 @@ rev = "c3c9239b339c127231860de43abfa08c44c0201a"; sha256 = "1mpv9vvvl1sh35vsa5415rvdv57mmbfix8s435q676zvhz3nl8yx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/term+"; sha256 = "12lvfspqmyrapmbz3x997vf160927d325y50kxdx3s6p81r7n2n8"; - name = "term-plus"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -71578,9 +93012,15 @@ license = lib.licenses.free; }; }) {}; - term-plus-key-intercept = callPackage ({ fetchFromGitHub, fetchurl, key-intercept, lib, melpaBuild, term-plus }: - melpaBuild { + term-plus-key-intercept = callPackage ({ fetchFromGitHub + , fetchurl + , key-intercept + , lib + , melpaBuild + , term-plus }: + melpaBuild { pname = "term-plus-key-intercept"; + ename = "term+key-intercept"; version = "20140210.2350"; src = fetchFromGitHub { owner = "tarao"; @@ -71588,10 +93028,10 @@ rev = "fd0771fd66b8c7a909aaac972194485c79ba48c4"; sha256 = "1dql2w8xkdw52zlrc2p9x391zn8wv4dj8a6293p4s08if7gg260w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad758d865bde8c97d27c0d57cabe1606f8b36974/recipes/term+key-intercept"; sha256 = "1564a86950xdwsrwinrs118bjsfmbv8gicq0c2dfr827v5b6zrlb"; - name = "term-plus-key-intercept"; + name = "recipe"; }; packageRequires = [ key-intercept term-plus ]; meta = { @@ -71599,9 +93039,15 @@ license = lib.licenses.free; }; }) {}; - term-plus-mux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tab-group, term-plus }: - melpaBuild { + term-plus-mux = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tab-group + , term-plus }: + melpaBuild { pname = "term-plus-mux"; + ename = "term+mux"; version = "20140210.2349"; src = fetchFromGitHub { owner = "tarao"; @@ -71609,10 +93055,10 @@ rev = "81b60e80cf008472bfd7fad9233af2ef722c208a"; sha256 = "12gfvcf7hl29xhg231cx76q04ll7cvfpvhkb0qs3qn1sqb50fs2q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad758d865bde8c97d27c0d57cabe1606f8b36974/recipes/term+mux"; sha256 = "129kzjpi5nzagqkjfikx9i7k6489dy7d3pd7ggn59p4cnh3r2rhh"; - name = "term-plus-mux"; + name = "recipe"; }; packageRequires = [ tab-group term-plus ]; meta = { @@ -71620,20 +93066,27 @@ license = lib.licenses.free; }; }) {}; - term-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: - melpaBuild { + term-projectile = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , term-manager }: + melpaBuild { pname = "term-projectile"; + ename = "term-projectile"; version = "20170421.105"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "13a0f1637a1f075d70211ccb8162e63a18a474da"; - sha256 = "0hvn60wk3w27fjb023drnaw0gmys6ancha8blpl0r4vc5k203kcf"; + rev = "7180f09078f89aadb83061420ca8fd58d929b629"; + sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; sha256 = "1mzyzjxkdfvf1kq9m3c1f6y6xzj1qq53rixawmnzmil5cmznvwag"; - name = "term-projectile"; + name = "recipe"; }; packageRequires = [ emacs projectile term-manager ]; meta = { @@ -71641,9 +93094,13 @@ license = lib.licenses.free; }; }) {}; - term-run = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + term-run = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "term-run"; + ename = "term-run"; version = "20151228.105"; src = fetchFromGitHub { owner = "10sr"; @@ -71651,10 +93108,10 @@ rev = "54650dbbabb13cb2a6c0670ff6b24b29717a6a8b"; sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cad6343104bfe5724e068660af79a6249010164/recipes/term-run"; sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs"; - name = "term-run"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71662,9 +93119,14 @@ license = lib.licenses.free; }; }) {}; - termbright-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + termbright-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "termbright-theme"; + ename = "termbright-theme"; version = "20151030.1935"; src = fetchFromGitHub { owner = "bmastenbrook"; @@ -71672,10 +93134,10 @@ rev = "bec6ab14336c0611e85f45486276004f16d20607"; sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7151773de39fe570e3e9b351daad89db9dd267f/recipes/termbright-theme"; sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj"; - name = "termbright-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -71683,20 +93145,26 @@ license = lib.licenses.free; }; }) {}; - terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + terminal-here = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "terminal-here"; - version = "20180208.944"; + ename = "terminal-here"; + version = "20180513.133"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "terminal-here"; - rev = "e769d3741d1023af4f965609f75e3567c89de6f0"; - sha256 = "0g0y8haw1476jr0pd1s9jckf78da11aigdkd9akzlawsvvx8z864"; + rev = "2b57dcfc7d78c6762eb74b37930067a75beb5ca4"; + sha256 = "01zljgwp5r8vd913y4r9s3ysrsp8qf2s7sgxl6xvh5iry06d1wpr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; sha256 = "1w64r3y88lspxxcqcqfwhakk8p9vl7q3z610dykfbqwqx61a6adj"; - name = "terminal-here"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -71704,20 +93172,27 @@ license = lib.licenses.free; }; }) {}; - tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + tern = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "tern"; + ename = "tern"; version = "20170925.1333"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "ae83725819286d3f134a6b9956f1117b341e1040"; - sha256 = "049xbwnd7qswvpqka1nsgj0zchmwqvg5dx52xg3kl6mf223xd5n7"; + rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd"; + sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; sha256 = "1am97ssslkyijpvgk4nldi67ws48g1kpj6gisqzajrrlw5q93wvd"; - name = "tern"; + name = "recipe"; }; packageRequires = [ cl-lib emacs json ]; meta = { @@ -71725,20 +93200,28 @@ license = lib.licenses.free; }; }) {}; - tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: - melpaBuild { + tern-auto-complete = callPackage ({ auto-complete + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tern }: + melpaBuild { pname = "tern-auto-complete"; + ename = "tern-auto-complete"; version = "20170521.1235"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "ae83725819286d3f134a6b9956f1117b341e1040"; - sha256 = "049xbwnd7qswvpqka1nsgj0zchmwqvg5dx52xg3kl6mf223xd5n7"; + rev = "d545bbdd8482c231211f9521c688fc06632e745e"; + sha256 = "0ribzvl5gs281chp2kqaqmjj9xji7k9l71hsblfw1vj2w9l7nw2m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; sha256 = "1i99b4awph50ygcqsnppm1h48hbf8cpq1ppd4swakrwgmcy2mn26"; - name = "tern-auto-complete"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib emacs tern ]; meta = { @@ -71746,20 +93229,27 @@ license = lib.licenses.free; }; }) {}; - tern-context-coloring = callPackage ({ context-coloring, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: - melpaBuild { + tern-context-coloring = callPackage ({ context-coloring + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tern }: + melpaBuild { pname = "tern-context-coloring"; + ename = "tern-context-coloring"; version = "20161217.2347"; src = fetchFromGitHub { owner = "jacksonrayhamilton"; repo = "tern-context-coloring"; - rev = "3a8e979d6cc83aabcb3dda3f5f31a6422532efba"; - sha256 = "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y"; + rev = "db0466c650ed4f7e6621a48dfdc53eaf5e127be9"; + sha256 = "093mdq97gc0ljw6islhm7y1yl3yf7w4gf205s96bnsnb1v952n63"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db2119d2c2d167d771ee02c2735b435d59991b93/recipes/tern-context-coloring"; sha256 = "0wkb7gn2ma6mz495bgphcjs5p0c6a869zk4a8mnm0spq41xbw4gi"; - name = "tern-context-coloring"; + name = "recipe"; }; packageRequires = [ context-coloring emacs tern ]; meta = { @@ -71767,20 +93257,27 @@ license = lib.licenses.free; }; }) {}; - tern-django = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: - melpaBuild { + tern-django = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tern }: + melpaBuild { pname = "tern-django"; + ename = "tern-django"; version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "tern-django"; - rev = "46f2cd5e96bc804069f18455a828b8e4c5ec358a"; - sha256 = "0b1279i05qmk85zgdd1qy0r823ajg7fxzi62qlhd7l03wivlbkc0"; + rev = "856fc98dc5e7cb4c8bc200f99150cc6187c82861"; + sha256 = "15jzqwfr1958s21qzimvv87kckqyq01bimqgawb51b6xi9ib3biv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9e128a795e4949e3d4c2f01db0161a34935f635/recipes/tern-django"; sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0"; - name = "tern-django"; + name = "recipe"; }; packageRequires = [ emacs f tern ]; meta = { @@ -71788,9 +93285,15 @@ license = lib.licenses.free; }; }) {}; - terraform-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }: - melpaBuild { + terraform-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , hcl-mode + , lib + , melpaBuild }: + melpaBuild { pname = "terraform-mode"; + ename = "terraform-mode"; version = "20170111.2117"; src = fetchFromGitHub { owner = "syohex"; @@ -71798,10 +93301,10 @@ rev = "6973d1acaba2835dfdf174f5a5e27de6366002e1"; sha256 = "12ww36g7mz4p4nslajcsdcm8xk6blwjwqjwhyp0n10ym6ssbh820"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode"; sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn"; - name = "terraform-mode"; + name = "recipe"; }; packageRequires = [ emacs hcl-mode ]; meta = { @@ -71809,20 +93312,25 @@ license = lib.licenses.free; }; }) {}; - test-c = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + test-c = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "test-c"; - version = "20170316.1432"; + ename = "test-c"; + version = "20180423.1020"; src = fetchFromGitHub { owner = "aaptel"; repo = "test-c"; - rev = "5a8c22a0e5ae6e2b0157bf1c41f0fe798c562a21"; - sha256 = "0g1xbb8n3006cqzb6awiqk7n0b6h54dlm7iz5r1n48zaf7mp6046"; + rev = "761a576f62c7021ba941f178f153c51289df1553"; + sha256 = "04dxgg4jz8cnw19wxybjwd36z8i9j6an15k9pz3zh3v7m72qzw7c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef915dc2d3bc09ef79eb8edde02101c89733c0b2/recipes/test-c"; sha256 = "1gy5dxkd4fpzzm2sq9g7bmi1ylwvsgh6hlvjmc1c064wjkha9j9z"; - name = "test-c"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -71830,20 +93338,25 @@ license = lib.licenses.free; }; }) {}; - test-case-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }: - melpaBuild { + test-case-mode = callPackage ({ fetchFromGitHub + , fetchurl + , fringe-helper + , lib + , melpaBuild }: + melpaBuild { pname = "test-case-mode"; + ename = "test-case-mode"; version = "20130525.734"; src = fetchFromGitHub { owner = "ieure"; repo = "test-case-mode"; - rev = "6074df10ebc97ddfcc228c71c73db179e672dac3"; - sha256 = "1r3fmb8cshgh9pppdvydfcrzlmb9cgz4m04rgv69c5xv8clwcmbr"; + rev = "26e397c0f930b7eb0be413ef7dd257b1da052bec"; + sha256 = "108csr1d7w0105rb6brzgbksb9wmq1p573vxbq0miv5k894j447f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2e0bf342713cbdf30cf98d0bbc7476b0abeb7f5/recipes/test-case-mode"; sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi"; - name = "test-case-mode"; + name = "recipe"; }; packageRequires = [ fringe-helper ]; meta = { @@ -71851,9 +93364,13 @@ license = lib.licenses.free; }; }) {}; - test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + test-kitchen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "test-kitchen"; + ename = "test-kitchen"; version = "20171129.1235"; src = fetchFromGitHub { owner = "jjasghar"; @@ -71861,10 +93378,10 @@ rev = "0fc0ca4808425f03fbeb8125246043723e2a179a"; sha256 = "1pip15ysya8nsk1xgz6k6gcjm6g60922r0im2anq4j2gjzdja79k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420d18c76f593338fb28807fcbe3b884be5b1634/recipes/test-kitchen"; sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0"; - name = "test-kitchen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71872,9 +93389,14 @@ license = lib.licenses.free; }; }) {}; - test-simple = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + test-simple = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "test-simple"; + ename = "test-simple"; version = "20170527.832"; src = fetchFromGitHub { owner = "rocky"; @@ -71882,10 +93404,10 @@ rev = "b3b69f52207d3a8111421ad7ab9ed82abbe85316"; sha256 = "0n400nmz3iyp50sdd4gz0bmfn1sfq5p6a69yv4zd09ypa9gkndws"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b76e053faee299f5b770a0e41aa615bf5fbf10/recipes/test-simple"; sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g"; - name = "test-simple"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -71893,9 +93415,13 @@ license = lib.licenses.free; }; }) {}; - tex-smart-umlauts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tex-smart-umlauts = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tex-smart-umlauts"; + ename = "tex-smart-umlauts"; version = "20160427.58"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -71903,10 +93429,10 @@ rev = "5261b931443558f4252489a1e6616034848aff02"; sha256 = "1rq1l52mgbasgwvjwpivjrfjf8l8r85wdkfpbw8213449qh9c9zh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/tex-smart-umlauts"; sha256 = "05q5mzl0pya682hdmjyp09hh121dc5y4d5vgqjffx3yfd5kgsy5w"; - name = "tex-smart-umlauts"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71914,9 +93440,15 @@ license = lib.licenses.free; }; }) {}; - texfrag = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + texfrag = callPackage ({ auctex + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "texfrag"; + ename = "texfrag"; version = "20180318.1647"; src = fetchFromGitHub { owner = "TobiasZawada"; @@ -71924,10 +93456,10 @@ rev = "8bb74e2d38139d6497545581a3507c6f7b4fa5e2"; sha256 = "03pqbx2mwz2lz7027da0aiyh12f2jifdfvxh0s83qshsnw6sipmk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag"; sha256 = "195vdpwqzypz35v8hc7ai9xpv1flrik60lgrk5m7xypnlp7mpr2x"; - name = "texfrag"; + name = "recipe"; }; packageRequires = [ auctex emacs ]; meta = { @@ -71935,9 +93467,13 @@ license = lib.licenses.free; }; }) {}; - textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + textile-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "textile-mode"; + ename = "textile-mode"; version = "20170304.916"; src = fetchFromGitHub { owner = "juba"; @@ -71945,10 +93481,10 @@ rev = "c37aaab809503df008209390e31e19abf4e23630"; sha256 = "16543im5iymc5hfcix1lglbvpq4v0441vb7sk58nbnffqba83yzy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ebe5e52bc9bb8875ca390b34ac32eb47f4e1252/recipes/textile-mode"; sha256 = "0c1l7ml9b1zipk5fhmhirrh070h0qwwiagdk84i04yvdmmcjw2nf"; - name = "textile-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71956,9 +93492,13 @@ license = lib.licenses.free; }; }) {}; - textmate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + textmate = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "textmate"; + ename = "textmate"; version = "20110816.1446"; src = fetchFromGitHub { owner = "defunkt"; @@ -71966,10 +93506,10 @@ rev = "350918b070148f0ace6d9d3cd4ebcaf15c1a8781"; sha256 = "1b7xxz1i84azmbz8rqpxdn18avmnqlj87hfrpbngbf6pj5h9jqjh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad3923ac8948de75a159e916ecc22005a17458ad/recipes/textmate"; sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v"; - name = "textmate"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71977,9 +93517,13 @@ license = lib.licenses.free; }; }) {}; - textmate-to-yas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + textmate-to-yas = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "textmate-to-yas"; + ename = "textmate-to-yas"; version = "20160409.1008"; src = fetchFromGitHub { owner = "mattfidler"; @@ -71987,10 +93531,10 @@ rev = "be3a768b7ac4c2e24b9d4aa6e9ac1d916cdc5a73"; sha256 = "1bz5ys36wd00clq9w3ahqpras368aj2b9d4bl32qc6dyp8jfknmz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/487c461bf658d50135428d72fbfbb2573a00eb7d/recipes/textmate-to-yas"; sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l"; - name = "textmate-to-yas"; + name = "recipe"; }; packageRequires = []; meta = { @@ -71998,9 +93542,14 @@ license = lib.licenses.free; }; }) {}; - textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + textx-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "textx-mode"; + ename = "textx-mode"; version = "20170516.211"; src = fetchFromGitHub { owner = "novakboskov"; @@ -72008,10 +93557,10 @@ rev = "72f9f0c5855b382024f0da8f56833c22a70a5cb3"; sha256 = "1lr9v7dk0pnmpvdvs4m5d9yvxlii0xzr8b3akknm25gvbw1y1q8k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode"; sha256 = "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn"; - name = "textx-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -72019,20 +93568,24 @@ license = lib.licenses.free; }; }) {}; - tf2-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tf2-conf-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tf2-conf-mode"; + ename = "tf2-conf-mode"; version = "20161209.820"; src = fetchFromGitHub { owner = "wynro"; repo = "emacs-tf2-conf-mode"; - rev = "536950f64c071ffd8495fb2c7ac7c63a11e25f93"; - sha256 = "0vga7kgzp9wiiji1w47llbb3gp9qgwk8v0f6s8b6jng2gmdg25bk"; + rev = "94c971da4a78d55da2848d1e76d513e5e0a8f7eb"; + sha256 = "0rg3ja6lc2bwq0nw50s0whsb690m7cs6p6an52hlb0qlfwd23mpv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43c53dca64cf0c7d59ffd0b17e9fe60f4aa90d3/recipes/tf2-conf-mode"; sha256 = "09kvb3ya1dx5pc146a6r9386fg9n9nfpcxm5mmhmyf75h9c6a25g"; - name = "tf2-conf-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72040,9 +93593,40 @@ license = lib.licenses.free; }; }) {}; - theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tfsmacs = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tablist }: + melpaBuild { + pname = "tfsmacs"; + ename = "tfsmacs"; + version = "20180629.1011"; + src = fetchFromGitHub { + owner = "sebasmonia"; + repo = "tfsmacs"; + rev = "8eb5906aa7e1ec469f6347545afabca787b2b223"; + sha256 = "0an6hz0kd5mvcx61xhdi62zw15x6yqqx8mmm7jsd008kifrk27d4"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b449d004bdb498c2a1d155671070e0745c7d7598/recipes/tfsmacs"; + sha256 = "0j9rkcjxvgkcdnw2lxgk6bwid3q460n0hjxsj4nklv13s5b1hlyk"; + name = "recipe"; + }; + packageRequires = [ emacs tablist ]; + meta = { + homepage = "https://melpa.org/#/tfsmacs"; + license = lib.licenses.free; + }; + }) {}; + theme-changer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "theme-changer"; + ename = "theme-changer"; version = "20171221.1127"; src = fetchFromGitHub { owner = "hadronzoo"; @@ -72050,10 +93634,10 @@ rev = "61945695a30d678e6a5d47cbe7c8aff59a8c30ea"; sha256 = "14xc36jfgj8896pklrkpg394fgikir051rh9vm70v132n6i9j0cn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d08b24a2aec1012751054c68f7d55bac1bd1fd11/recipes/theme-changer"; sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w"; - name = "theme-changer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72061,20 +93645,25 @@ license = lib.licenses.free; }; }) {}; - theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + theme-looper = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "theme-looper"; + ename = "theme-looper"; version = "20170425.606"; src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "875c2cfc84b3c143d3b14a7aba38905e35559157"; - sha256 = "145gbjizkkmdil1mmhsppmda22xg6blz81zqfsrd5aznwpiyw36q"; + rev = "5e3a3ea7ad31d4b38efa2cc08f0063b230736da9"; + sha256 = "06khrrjlhnzckr2zisdbx4pj6r8kmv7dbdzvzh74qz79x337lvzn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf"; - name = "theme-looper"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -72082,9 +93671,14 @@ license = lib.licenses.free; }; }) {}; - therapy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + therapy = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "therapy"; + ename = "therapy"; version = "20151113.1153"; src = fetchFromGitHub { owner = "abingham"; @@ -72092,10 +93686,10 @@ rev = "775a92bb7b6b0fcc5b38c0b5198a9d0a1bef788a"; sha256 = "12kz4alyf3y2i7lkvi26hcxy55v0blsrxv5srx9fv5jhxkdz1vq1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34e1bfdc684aaa7ebfbaa0ed60f8322c3de8a40d/recipes/therapy"; sha256 = "0y040ghb0y6aq0nchqr09vapz6h6112rkwxkqsx0v7xmqrqfjvhh"; - name = "therapy"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -72103,9 +93697,13 @@ license = lib.licenses.free; }; }) {}; - thingopt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + thingopt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "thingopt"; + ename = "thingopt"; version = "20160520.1618"; src = fetchFromGitHub { owner = "m2ym"; @@ -72113,10 +93711,10 @@ rev = "5679815852652479f3b3c9f3a98affc927384b2c"; sha256 = "12zpn0sy2yg37jjjx12h3kln56241b3z09bn5zavmjfdwnr9jd0a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b82d4102fa2c7622e76dae1154aaa8340b7f4b8/recipes/thingopt"; sha256 = "0yvzq1z2nrldr8vhcvxqgzvh4gbrjjwfmprg59p4v5hlxvhxsb1y"; - name = "thingopt"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72124,20 +93722,25 @@ license = lib.licenses.free; }; }) {}; - thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + thinks = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "thinks"; + ename = "thinks"; version = "20170802.428"; src = fetchFromGitHub { owner = "davep"; repo = "thinks.el"; - rev = "c02f236abc8c2025d9f01460b09b89ebdc96e28d"; - sha256 = "0g4ls668kyqnh4xkvz1s1z9j6n0a1gkgrzgl98hys7hny6zrk7aa"; + rev = "15e0437f5b635bdcf738ca092e26aa6d8ecdba36"; + sha256 = "1i2i8c53z8n48407jaz641adszv13yjg8cvq4k3hijddp651k555"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks"; sha256 = "11vj9mjfzmqwdmkq97aqns3fh8hkgx9scnki6c2iag5lj0av2vcq"; - name = "thinks"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -72145,9 +93748,13 @@ license = lib.licenses.free; }; }) {}; - thread-dump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + thread-dump = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "thread-dump"; + ename = "thread-dump"; version = "20170816.1150"; src = fetchFromGitHub { owner = "nd"; @@ -72155,10 +93762,10 @@ rev = "204c9600242756d4b514bb5ff6293e052bf4b49d"; sha256 = "11qx194gwizqg7p2mqy7mdfii85bdayabxfd388dmrm916i4w47n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/thread-dump"; sha256 = "0dzr86jyf2j49gq40q6qd6lppa57n65n94xzpdjjbs182hxzavp2"; - name = "thread-dump"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72166,9 +93773,15 @@ license = lib.licenses.free; }; }) {}; - threes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + threes = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "threes"; + ename = "threes"; version = "20160820.542"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -72176,10 +93789,10 @@ rev = "6981acb30b856c77cba6aba63fefbf102cbdfbb2"; sha256 = "1a7zqq6kmqxgzbsg8yczlvipzv65n10c8j26mc507p4m47nlikgv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bff7d9ffbca45629f310743aff776b762c8507cc/recipes/threes"; sha256 = "03zwcaibdj88a6whccc5ysqsnfwi76yhsgjsfp3lxjcmlkwqzjbs"; - name = "threes"; + name = "recipe"; }; packageRequires = [ emacs seq ]; meta = { @@ -72187,20 +93800,24 @@ license = lib.licenses.free; }; }) {}; - thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + thrift = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "thrift"; + ename = "thrift"; version = "20140312.1348"; src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "8fb719efb1533e3a8038c155cbb209b492a29910"; - sha256 = "01pi4qh3a6m5j4j0sk5z7h7l7m19w82scm8x3kycdwkmfgn5fxsi"; + rev = "98bebac1520bcf1dd5392535e06a751d7b2af58e"; + sha256 = "185hrigx5q15c2jimzbklmi4z6kzigsarqwr805llsmsmg9pp3wi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9"; - name = "thrift"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72208,9 +93825,13 @@ license = lib.licenses.free; }; }) {}; - thumb-through = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + thumb-through = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "thumb-through"; + ename = "thumb-through"; version = "20120118.2134"; src = fetchFromGitHub { owner = "apg"; @@ -72218,10 +93839,10 @@ rev = "08d8fb720f93c6172653e035191a8fa9c3305e63"; sha256 = "0nypcryqwwsdawqxi7hgsv6fp28zqslj9phw7zscqqxzc3svaywn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/thumb-through"; sha256 = "1544xw9lar199idk135z4d6i3n9w0v7g2bq7fnz0rjjw10kxvpcx"; - name = "thumb-through"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72229,9 +93850,14 @@ license = lib.licenses.free; }; }) {}; - tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tickscript-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tickscript-mode"; + ename = "tickscript-mode"; version = "20171218.1803"; src = fetchFromGitHub { owner = "msherry"; @@ -72239,10 +93865,10 @@ rev = "f0579f38ff14954df5002ce30ae6d4a2c978d461"; sha256 = "0b3rbsd978ch0hiv45sqg9g4zsxhjn557j5f72vjql8cx1h5d8s4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54"; - name = "tickscript-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -72250,20 +93876,26 @@ license = lib.licenses.free; }; }) {}; - tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: - melpaBuild { + tidal = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "tidal"; - version = "20171207.1452"; + ename = "tidal"; + version = "20180410.1245"; src = fetchFromGitHub { owner = "tidalcycles"; repo = "Tidal"; - rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406"; - sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg"; + rev = "ef658d3df0604f3dec955a150509ec1cc68fbd98"; + sha256 = "1ild1gnbcrw830b8d3byvqlmgm27609dgailmxgin6z7g1pg4r7z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a"; - name = "tidal"; + name = "recipe"; }; packageRequires = [ emacs haskell-mode ]; meta = { @@ -72271,20 +93903,29 @@ license = lib.licenses.free; }; }) {}; - tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: - melpaBuild { + tide = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , s + , typescript-mode }: + melpaBuild { pname = "tide"; - version = "20180327.2043"; + ename = "tide"; + version = "20180713.30"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "0db094ba1748e3add4e152fa34d64b25eb07bdd2"; - sha256 = "113lg22aaagh3bbabxp65460cfwa9whjg3yzafd5n8azkinq8s6k"; + rev = "4aaa1b3d3a978a76d773f2fbee6143eda9085f23"; + sha256 = "1vkgjy5gfiwqjnq5mbxbfh4c1f6kn2pbibki6hmq593wd4212lnn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1"; - name = "tide"; + name = "recipe"; }; packageRequires = [ cl-lib dash flycheck s typescript-mode ]; meta = { @@ -72292,9 +93933,17 @@ license = lib.licenses.free; }; }) {}; - tile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, stream }: - melpaBuild { + tile = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , stream }: + melpaBuild { pname = "tile"; + ename = "tile"; version = "20161224.1957"; src = fetchFromGitHub { owner = "IvanMalison"; @@ -72302,10 +93951,10 @@ rev = "22660f21f6e95de5aba55cd5d293d4841e9a4661"; sha256 = "1qxhrm852j93sqi1lznlrjn7s0vscsixm48g46ja70gl320chyzm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/424cfd28378ef328721bb0dc3651808e64c01306/recipes/tile"; sha256 = "1795048ilpg6y9pn0jj0js5446hwxhwm6qmk50hds0hpcb396vbv"; - name = "tile"; + name = "recipe"; }; packageRequires = [ dash emacs s stream ]; meta = { @@ -72313,9 +93962,13 @@ license = lib.licenses.free; }; }) {}; - time-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + time-ext = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "time-ext"; + ename = "time-ext"; version = "20170126.415"; src = fetchFromGitHub { owner = "rubikitch"; @@ -72323,10 +93976,10 @@ rev = "d128becf660fe3f30178eb1b05cd266741f4784a"; sha256 = "0ynxmik33hh0znmznrf7lkmsh5xggbrvbdhiqa61r0b7gs3jk5fd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/time-ext"; sha256 = "133vd63p8258wam4fvblhfg37w2zqy4a5c5c5nafwx0cy90sngwz"; - name = "time-ext"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72334,20 +93987,26 @@ license = lib.licenses.free; }; }) {}; - timecop = callPackage ({ cl-lib ? null, datetime-format, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + timecop = callPackage ({ cl-lib ? null + , datetime-format + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "timecop"; + ename = "timecop"; version = "20160520.352"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-datetime"; - rev = "e6427538b547cbe02e1bd6ed4b765c73620bdae8"; - sha256 = "1573z8wq5m8qzbzmnsz2fmbwrj9c0ava0jjfchzmwm2b3jyvqh5r"; + rev = "3a1871613facc928ff250ed8f12fbc7073e46b75"; + sha256 = "0pabb260d3vcr57jqqxqk90vp2qnm63sky37rgvhv508zix2hbva"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/timecop"; sha256 = "1hnmxcc2hjx9a4jyavx2v9hxmqacmmg1xj86rxqx3ms32hgigji5"; - name = "timecop"; + name = "recipe"; }; packageRequires = [ cl-lib datetime-format ]; meta = { @@ -72355,9 +94014,13 @@ license = lib.licenses.free; }; }) {}; - timer-revert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + timer-revert = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "timer-revert"; + ename = "timer-revert"; version = "20150122.1232"; src = fetchFromGitHub { owner = "yyr"; @@ -72365,10 +94028,10 @@ rev = "615c91dec8b440d2b9b7c725dd733d7432564e45"; sha256 = "1hidvbd1xzz9m0fc55wac1mpv4dpcf8qnw1myh3646bfvivj9c2q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/991e68c59d1fbaef06ba2583f07499ecad05586d/recipes/timer-revert"; sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy"; - name = "timer-revert"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72376,9 +94039,16 @@ license = lib.licenses.free; }; }) {}; - timesheet = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: - melpaBuild { + timesheet = callPackage ({ auctex + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , s }: + melpaBuild { pname = "timesheet"; + ename = "timesheet"; version = "20160530.1445"; src = fetchFromGitHub { owner = "tmarble"; @@ -72386,10 +94056,10 @@ rev = "2ed6fea9b508eb7eaff659d9a34a09ba064d4df8"; sha256 = "028d1sn29idznzsc95w2c1sdz3rpmf3vgk2365li0vvs99s51hi2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/40009ef2f6845c83242ca5d0a8c9c2c1e4ef8a9d/recipes/timesheet"; sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506"; - name = "timesheet"; + name = "recipe"; }; packageRequires = [ auctex org s ]; meta = { @@ -72397,20 +94067,32 @@ license = lib.licenses.free; }; }) {}; - timonier = callPackage ({ all-the-icons, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }: - melpaBuild { + timonier = callPackage ({ all-the-icons + , dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild + , pkg-info + , request + , s }: + melpaBuild { pname = "timonier"; + ename = "timonier"; version = "20170411.100"; src = fetchFromGitHub { owner = "nlamirault"; repo = "timonier"; - rev = "0a150ea87bf695b43cf1740dfd7e553e0ae7601c"; - sha256 = "18yls8zc8d5nhx8j3l5av5xvmxmjrrmbzzab59kc6zib0isgxlcz"; + rev = "3460a878269424c8d19b7d5d8e04749d0a8bf203"; + sha256 = "0hhjrmkz9xf5wazh52j2q6qqybjizk2jszvqjz9ywwg9milvqf50"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier"; sha256 = "0vb83kv2dkca2bq876icxs8iivv9qgkzmzrsxfpnvbv752b220b0"; - name = "timonier"; + name = "recipe"; }; packageRequires = [ all-the-icons @@ -72427,20 +94109,28 @@ license = lib.licenses.free; }; }) {}; - timp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fifo-class, lib, melpaBuild, signal }: - melpaBuild { + timp = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , fifo-class + , lib + , melpaBuild + , signal }: + melpaBuild { pname = "timp"; + ename = "timp"; version = "20160618.103"; src = fetchFromGitHub { owner = "mola-T"; repo = "timp"; - rev = "66b21934b1eb8ee428c06dd64b3562ad44776a35"; - sha256 = "1jbmc356cqmjann2wdjnikyb0l136lpjka6bjim0rjhipdnw2acn"; + rev = "59657bf603904635d88c3fe4ff1ce45ee6572428"; + sha256 = "13adchpry39fv3rz3mnc21hr66d176d52hbgmgh5p8p9ylay7xha"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27896aeb813215a43aec07a5ddf0ab2176df38fb/recipes/timp"; sha256 = "1vh2wsgd8bclkbzn59zqbzzfzs0xx6x82004l7vnma8z97swvhgs"; - name = "timp"; + name = "recipe"; }; packageRequires = [ cl-lib emacs fifo-class signal ]; meta = { @@ -72448,9 +94138,14 @@ license = lib.licenses.free; }; }) {}; - tinkerer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + tinkerer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "tinkerer"; + ename = "tinkerer"; version = "20170906.524"; src = fetchFromGitHub { owner = "yyr"; @@ -72458,10 +94153,10 @@ rev = "e34135555f3748b578c7f8706dfd0c888fb87581"; sha256 = "0lzrarqh965ysd7w0z5rbisl45j11fbibyxmgivgy9parvhg59hk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a28e1dfe987287bac7c45f83ae6e754bc13e345/recipes/tinkerer"; sha256 = "0qh6pzjn98jlpxcm9zf25ga0y3d3v53275a9zgswyhz33mafd7pd"; - name = "tinkerer"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -72469,20 +94164,24 @@ license = lib.licenses.free; }; }) {}; - tiny = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tiny = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tiny"; + ename = "tiny"; version = "20170903.249"; src = fetchFromGitHub { owner = "abo-abo"; repo = "tiny"; - rev = "012b2e7a67b9f067bbfa0292479861ffbaa201fa"; - sha256 = "13hwzq5ip9pb6nmsg3377haz5f45nm96khrwdls07mzni6gay8az"; + rev = "481d36e47e51f27e64c826633c01518459f17d1c"; + sha256 = "1wdv017pc7ggxd3vwmhjckybxwkfkbk9inkkz6pnc58k0fflsp7l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3029dab001fff5d12e8a2bace6ddbf897842c26/recipes/tiny"; sha256 = "183qczyb6c8zmdgmsjsj4hddmvnzzq4c7syslm861xcyxia94icy"; - name = "tiny"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72490,20 +94189,25 @@ license = lib.licenses.free; }; }) {}; - tiny-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tiny-menu = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tiny-menu"; + ename = "tiny-menu"; version = "20161213.435"; src = fetchFromGitHub { owner = "aaronbieber"; repo = "tiny-menu.el"; - rev = "05563b94537b6eb22aeddedef2a6e59e3f88d073"; - sha256 = "0k0djq60mwhjiwy9dpy9m9bs507b9p19pdl3g2s8sd9i2fk53rfy"; + rev = "f1fc844f514f57fd93602ff5e00c6125b0e93254"; + sha256 = "125ckmfsvzacd5icsnldcbfl4rkxpfal6qfindy80i84vk0qw47g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82700c97ca40130e7508c151f60220d3f23bf23c/recipes/tiny-menu"; sha256 = "1nngf6vsqfr9fx82mj8dl8zw0fpwf4kr74sflxxk7qxj4aw1jirk"; - name = "tiny-menu"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -72511,9 +94215,14 @@ license = lib.licenses.free; }; }) {}; - tinysegmenter = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tinysegmenter = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tinysegmenter"; + ename = "tinysegmenter"; version = "20141124.213"; src = fetchFromGitHub { owner = "myuhe"; @@ -72521,10 +94230,10 @@ rev = "872134704bd25c13a4c59552433da4c6881b5230"; sha256 = "1n8cn6mr26hgmsm2mkbj5gs6dv61d0pap8ija4g0n1vsibfhzd8j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4f189290799f84282ff7cdecbb12a2a7cdfd1043/recipes/tinysegmenter"; sha256 = "005yy2f8vghvwdcwakz5sr9n1gzk6cfyglm6d8b74y90d8fng0r6"; - name = "tinysegmenter"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -72532,9 +94241,39 @@ license = lib.licenses.free; }; }) {}; - tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tj3-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "tj3-mode"; + ename = "tj3-mode"; + version = "20180519.528"; + src = fetchFromGitHub { + owner = "csrhodes"; + repo = "tj3-mode"; + rev = "1d98eb23f1606392f34ef1b80517cfc940fb9950"; + sha256 = "1gzi8pvdgj4s9c54m2a8hicvg8dzac6253kyd2h71bljm4ilwl0f"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dcf0f535a543bf36df9fb2e59c7fb9dfc00820f7/recipes/tj3-mode"; + sha256 = "06mhg0jc80cymplbri6axyzv18ayxppqz3vggywq9g2ba1vqj41h"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/tj3-mode"; + license = lib.licenses.free; + }; + }) {}; + tldr = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tldr"; + ename = "tldr"; version = "20180122.312"; src = fetchFromGitHub { owner = "kuanyui"; @@ -72542,10 +94281,10 @@ rev = "398b197c8d2238628b07e1b32d0f373876279f4c"; sha256 = "0iq7qlis6c6r2qkdpncrhh5vsihkhvy5x4y1y8cjb7zxkh62w33f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr"; sha256 = "1f1xsmkbf4j1c876qqr9h8fgx3zxjgdfzvzf6capxlx2svhxzvc9"; - name = "tldr"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -72553,9 +94292,13 @@ license = lib.licenses.free; }; }) {}; - tmmofl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tmmofl = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tmmofl"; + ename = "tmmofl"; version = "20121025.401"; src = fetchFromGitHub { owner = "phillord"; @@ -72563,10 +94306,10 @@ rev = "532aa6978e994e2b069ffe37aaf9a0011a07dadc"; sha256 = "1ypbv9jbdnwv3xjsfzq8i3nmqdvziynv2rqsd6fm2r1xw0q06xd6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d29def44ae42dc4b60c1d254a57572bd09faf51/recipes/tmmofl"; sha256 = "1idflc5ky8hwdkps1rihdqy3i6cmhrh83sxz3kgf2kqjh365yr8b"; - name = "tmmofl"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72574,20 +94317,24 @@ license = lib.licenses.free; }; }) {}; - toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + toc-org = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "toc-org"; - version = "20171009.156"; + ename = "toc-org"; + version = "20180613.840"; src = fetchFromGitHub { owner = "snosov1"; repo = "toc-org"; - rev = "4d259c9cea3f575e5210974c025ebe3d51cc317f"; - sha256 = "04y7zib1wpxswkh7srxgh4bq25cpsybpi2aaynrwjms695ggh346"; + rev = "e38e81af3f12633579c62f2ccf4bd0c8f18e2b88"; + sha256 = "13jdz0b4jqpb5idfxszlsapfk7h488773m3ipj1ayfapxmly92gm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; sha256 = "06mx2b0zjck82vp3i4bwbqlrzn05i2rkf8080cn34nkizi59wlbs"; - name = "toc-org"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72595,20 +94342,24 @@ license = lib.licenses.free; }; }) {}; - todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + todotxt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "todotxt"; - version = "20170919.1141"; + ename = "todotxt"; + version = "20180626.1530"; src = fetchFromGitHub { owner = "rpdillon"; repo = "todotxt.el"; - rev = "afa4079f15f705a4fa34ea8e14b122e73028f285"; - sha256 = "07rhjxl8kvsjf23kxyl6xj51a2z1r66h4bsdsfj7nncavvybzqn3"; + rev = "f13e404304c9d26c105de872f96b4601441b3875"; + sha256 = "1yvy2pl2ncgkz1xz598qjvp2v3g66m57wz7nra2vira7m4kq4671"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/todotxt"; sha256 = "1ravnkj6y2p027yhba2lan10079xzd2q7l8gyb8n6bwq14jif127"; - name = "todotxt"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72616,9 +94367,13 @@ license = lib.licenses.free; }; }) {}; - todotxt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + todotxt-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "todotxt-mode"; + ename = "todotxt-mode"; version = "20150424.704"; src = fetchFromGitHub { owner = "avillafiorita"; @@ -72626,10 +94381,10 @@ rev = "dc6ae151edee88f329ba7abc5d39b7440002232f"; sha256 = "1k9ywi7cdgb6i600wr04r2l00423l6vr7k93qa7i7svv856nbbc7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc1926c5de86749caba1ad2d1e75225a31a8558/recipes/todotxt-mode"; sha256 = "1bs4air13ifx3xkhcfi80z29alsd63r436gnyvjyxlph2ip37v7k"; - name = "todotxt-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72637,20 +94392,25 @@ license = lib.licenses.free; }; }) {}; - togetherly = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + togetherly = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "togetherly"; + ename = "togetherly"; version = "20170425.2316"; src = fetchFromGitHub { owner = "zk-phi"; repo = "togetherly"; - rev = "a6491bd5dd84f2aded0cd112ff06ae76ff78dfeb"; - sha256 = "05x6ppfkpklxf1098acs6gpd3zm9k05vhywa7n01y2g6nhp697pw"; + rev = "65072b1d5e04c7098c318ebf1af279f596039ef9"; + sha256 = "1gjqwxpl1ysrjcmbs9w39hvim1avac7nm4rhmqhmrgwn84bxm2fl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05da36e2d57a57255423a24a34742cbac2f6c9a5/recipes/togetherly"; sha256 = "01ks160dfmgh05lx0lmyg020hba8nw49mj51dp1afcsmx4dkis2f"; - name = "togetherly"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -72658,9 +94418,14 @@ license = lib.licenses.free; }; }) {}; - toggle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + toggle = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "toggle"; + ename = "toggle"; version = "20180315.1703"; src = fetchFromGitHub { owner = "zenspider"; @@ -72668,10 +94433,10 @@ rev = "ee8a9c3052446876057ff853369d136aea7831f5"; sha256 = "15sla4n88003fclni5nhsrw3ib7bql11ks8pb7rgjyjddqrq274r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd02426ce7ab46361363c7a6c56b1575642003e0/recipes/toggle"; sha256 = "08lk8h2dk5s8k93j5vmxdlgg453pif8wbcx2w3xkjlh43dw1vdfq"; - name = "toggle"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -72679,9 +94444,13 @@ license = lib.licenses.free; }; }) {}; - toggle-quotes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + toggle-quotes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "toggle-quotes"; + ename = "toggle-quotes"; version = "20140710.226"; src = fetchFromGitHub { owner = "toctan"; @@ -72689,10 +94458,10 @@ rev = "33abc221d6887f0518337851318065cd86c34b03"; sha256 = "1w1lmqgzn9bp59h9y9plv80y53k6qhjgfmnnlqyyqfl45z3si7kg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f6e83e3184d336891f76c4740f64646d58ea980/recipes/toggle-quotes"; sha256 = "16w453v4g7ww93bydim62p785x7w4vssp9l5liy0h3ppfmgvmxhp"; - name = "toggle-quotes"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72700,20 +94469,24 @@ license = lib.licenses.free; }; }) {}; - toggle-test = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + toggle-test = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "toggle-test"; + ename = "toggle-test"; version = "20140722.2237"; src = fetchFromGitHub { owner = "rags"; repo = "toggle-test"; - rev = "e969321f274903d705995a7d0345a257576ec5ff"; - sha256 = "0sgaslqxj806byidh06h5pqmqz8jzjfz9ky8jvkif3cq3a479jby"; + rev = "a0b64834101c2b8b24da365baea1d36e57b069b5"; + sha256 = "1xx314cqi71iy7drd7nfia6hylyhwjd9jja1022l1p3imfmy2gyp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ea51a54b745d9978c5177182cd8501912aa2d01/recipes/toggle-test"; sha256 = "0n8m325jcjhz8g75ysb9whsd12gpxw8598y5065j7c7gxjzv45l1"; - name = "toggle-test"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72721,9 +94494,13 @@ license = lib.licenses.free; }; }) {}; - toggle-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + toggle-window = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "toggle-window"; + ename = "toggle-window"; version = "20141207.748"; src = fetchFromGitHub { owner = "deadghost"; @@ -72731,10 +94508,10 @@ rev = "e82c60e543933880402ede11e9423e48a17dde53"; sha256 = "0f86aij1glmvgpbhmfpi441zy0r37zblb0q3ycgq0dp92x8yny5r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5505f778052353abce10f9ceef56ce95f5a5b662/recipes/toggle-window"; sha256 = "1z080jywqj99xiwbvfclr6gjkc6spr3dqjb9kq1g4971vx4w8n9g"; - name = "toggle-window"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72742,20 +94519,24 @@ license = lib.licenses.free; }; }) {}; - tomatinho = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tomatinho = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tomatinho"; - version = "20161023.1853"; + ename = "tomatinho"; + version = "20180621.1048"; src = fetchFromGitHub { owner = "konr"; repo = "tomatinho"; - rev = "7c301d343ecf7feac7348d1146075b2d9ba7d77a"; - sha256 = "0kgd932857id83xdwpwf9x3ald1alx0s71dkkq84mj9yscxnz01p"; + rev = "b53354b9b9f496c0388d6a573b06b7d6fc53d0bd"; + sha256 = "0vf2b1c9raa723iy2gfdmxjv4q0ivixy1vbs1x5q09cibca8kp4x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe20de5b2b5e5abe5be7468cea7c87f5b26b237/recipes/tomatinho"; sha256 = "1ad3kr73v75vjrc09mdvb7a3ws834k5y5xha3v0ldah38cl1pmjz"; - name = "tomatinho"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72763,9 +94544,13 @@ license = lib.licenses.free; }; }) {}; - toml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + toml = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "toml"; + ename = "toml"; version = "20130903.555"; src = fetchFromGitHub { owner = "gongo"; @@ -72773,10 +94558,10 @@ rev = "9633a6872928e737a2335aae1065768b23d8c3b3"; sha256 = "1b3bkla6i5nvanifxchph6ab6ldrskdf240hy4d27dkmmnr3pban"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bab369a63ca0e7fcfacfcb9ac3847ac4e631b28c/recipes/toml"; sha256 = "0kqv6zkywa7kqh8kg1dzcgkbi91lwx335przdakndm1lfai38i9b"; - name = "toml"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72784,9 +94569,15 @@ license = lib.licenses.free; }; }) {}; - toml-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + toml-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "toml-mode"; + ename = "toml-mode"; version = "20161107.1000"; src = fetchFromGitHub { owner = "dryman"; @@ -72794,10 +94585,10 @@ rev = "f6c61817b00f9c4a3cab1bae9c309e0fc45cdd06"; sha256 = "05b4ksay85c8y5ncax0qsvnmplwsfiw24z16a58gkarjz938hb57"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8157d7d11f1e1848f0ba384249b4b8c6354830b/recipes/toml-mode"; sha256 = "0yghf2ixl3dkcaxnkr4qzxfa9k1rrac7w5qpw1jx2bvic0cfs40l"; - name = "toml-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -72805,9 +94596,13 @@ license = lib.licenses.free; }; }) {}; - tommyh-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tommyh-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tommyh-theme"; + ename = "tommyh-theme"; version = "20131004.1630"; src = fetchFromGitHub { owner = "wglass"; @@ -72815,10 +94610,10 @@ rev = "46d1c69ee0a1ca7c67b569b891a2f28fed89e7d5"; sha256 = "0pwbd5gzmpr6js20438870w605671930291070nhmhswvxfcdvay"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da9b40184e1559c33edd5e6dac6447013710cb79/recipes/tommyh-theme"; sha256 = "0nb9r407h08yxxdihxqx0c645bcz6qywbh2l654s3zfzdsqi1aj4"; - name = "tommyh-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72826,9 +94621,13 @@ license = lib.licenses.free; }; }) {}; - tornado-template-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tornado-template-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tornado-template-mode"; + ename = "tornado-template-mode"; version = "20141128.208"; src = fetchFromGitHub { owner = "paradoxxxzero"; @@ -72836,10 +94635,10 @@ rev = "667c0663dbbd279b6c345446b9f2bc50eb52b747"; sha256 = "0wv49gn1daylnjmnallpqsqy7630ynrp45agpiwi6kwyyqk1kdvv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f329baae028fd17618824128f312a49aa0a0807e/recipes/tornado-template-mode"; sha256 = "1sdv9rlhnabydws2sppsjcgqr0lg6bjapv753ksq5aaq21qsps0h"; - name = "tornado-template-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72847,9 +94646,14 @@ license = lib.licenses.free; }; }) {}; - total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + total-lines = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "total-lines"; + ename = "total-lines"; version = "20171227.439"; src = fetchFromGitHub { owner = "hinrik"; @@ -72857,10 +94661,10 @@ rev = "c762f08d039c8103f71c747e00304f209c2254f4"; sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines"; sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh"; - name = "total-lines"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -72868,20 +94672,26 @@ license = lib.licenses.free; }; }) {}; - totd = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: - melpaBuild { + totd = callPackage ({ cl-lib ? null + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "totd"; + ename = "totd"; version = "20150519.740"; src = fetchFromGitLab { owner = "egh"; repo = "emacs-totd"; - rev = "ca47b618ea8290776cdb5b0f1c2c335691f69660"; - sha256 = "188cdgic25wrb4jdgdcj070a0pxsh3m0rd9d2r6i1s1n1nalrs6g"; + rev = "a715f7f2df416b8a6c827a9493ce7004180a3a4f"; + sha256 = "08awv1vbqg0x0h7f036sh07vypm8lq6b5g36gq9dmyfaqci9ccw6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9dc1e001585e1743047108ace180dfd7664ab8f1/recipes/totd"; sha256 = "1bp07xl9yh9x6bi6cn8wz11x90jhv1rhxaig540iydjn5b0ny9m0"; - name = "totd"; + name = "recipe"; }; packageRequires = [ cl-lib s ]; meta = { @@ -72889,20 +94699,24 @@ license = lib.licenses.free; }; }) {}; - tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tox = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tox"; + ename = "tox"; version = "20160810.855"; src = fetchFromGitHub { owner = "chmouel"; repo = "tox.el"; - rev = "7655eb254038d5e34433e8a9d66b3ffc9c72e40c"; - sha256 = "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki"; + rev = "27a074b21238855ce3c33d22e42d69e2c2921205"; + sha256 = "1m3f0i6vrkrncd7xsgz65m6595iv6yr4gbbzlis8p01kd98wbxfk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox"; sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl"; - name = "tox"; + name = "recipe"; }; packageRequires = []; meta = { @@ -72910,19 +94724,24 @@ license = lib.licenses.free; }; }) {}; - toxi-theme = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + toxi-theme = callPackage ({ emacs + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "toxi-theme"; + ename = "toxi-theme"; version = "20160424.1426"; src = fetchhg { url = "https://bitbucket.com/postspectacular/toxi-theme"; rev = "b322fc7497a5"; sha256 = "1pnsky541m8kzcv81w98jkv0hgajh04hxqlmgddc1y0wbvi849j0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/toxi-theme"; sha256 = "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd"; - name = "toxi-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -72930,9 +94749,14 @@ license = lib.licenses.free; }; }) {}; - tql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tql-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tql-mode"; + ename = "tql-mode"; version = "20170723.1954"; src = fetchFromGitHub { owner = "tiros-dev"; @@ -72940,10 +94764,10 @@ rev = "488add79eb3fc8ec02aedaa997fe1ed9e5c3e638"; sha256 = "09vkqr5n66w1q5f7m1vgiv0555v23wg6j46ri52lnnslsxpxhlyv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a7c3dec5d970a4e819c0166a4b9846d74484b08/recipes/tql-mode"; sha256 = "0nrycix119vail6vk1kgqsli4l4cw8x49grc368n53w0xwngh0ns"; - name = "tql-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -72951,24 +94775,36 @@ license = lib.licenses.free; }; }) {}; - traad = callPackage ({ dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }: - melpaBuild { + traad = callPackage ({ dash + , deferred + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup + , request + , request-deferred + , virtualenvwrapper }: + melpaBuild { pname = "traad"; - version = "20180104.2351"; + ename = "traad"; + version = "20180720.512"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; - rev = "ad160e32f4cc9849aa570ed8e29269a0845921ae"; - sha256 = "0rj8fg66rzrw1hv707p0dmf025c1dymp373z87ryy5sxs24vn3j5"; + rev = "1a4bb39dc36ac79fe540923096411e75a6dcfdf4"; + sha256 = "0jj81p7v6qrqnlgyqdjygvzrid1phgrx5j4kfnsd3gy2k0i9k3vj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; sha256 = "08gxh5c01xfbbj9g4992jah494rw3d3bbs8j79r3mpqxllkp2znf"; - name = "traad"; + name = "recipe"; }; packageRequires = [ dash deferred + f popup request request-deferred @@ -72979,20 +94815,24 @@ license = lib.licenses.free; }; }) {}; - tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tracking = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tracking"; + ename = "tracking"; version = "20171210.1302"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "9aaad726ea0b0cce4d911eec92ab8fd2a6455fe6"; - sha256 = "1nyw9phrh1qpc7j6b8fkald18y3rldydb666r6ppphggly6lh4vd"; + rev = "571853c1f5ece6777fe745489b34d3ad7c3cb0ba"; + sha256 = "1l2zhszwg7cg96vlyi33bykk4mmig38xmasgpp02xypa4j4p11sw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z"; - name = "tracking"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73000,9 +94840,14 @@ license = lib.licenses.free; }; }) {}; - tracwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: - melpaBuild { + tracwiki-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xml-rpc }: + melpaBuild { pname = "tracwiki-mode"; + ename = "tracwiki-mode"; version = "20150119.821"; src = fetchFromGitHub { owner = "merickson"; @@ -73010,10 +94855,10 @@ rev = "6a620444d59b438f42383b48cd4c19c03105dba6"; sha256 = "1m25l1lyff4h0h4vjrcsziwbf8svqg2llvvgl8i2b4jbh7k7pk5f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e1e7315ee0e8d90df046e16948398f6f78aa3b2/recipes/tracwiki-mode"; sha256 = "1k983f0lj42rxr5szpq9l9harykfn8jr13y3y6fav86zzd1fb8j0"; - name = "tracwiki-mode"; + name = "recipe"; }; packageRequires = [ xml-rpc ]; meta = { @@ -73021,20 +94866,25 @@ license = lib.licenses.free; }; }) {}; - tramp-hdfs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tramp-hdfs = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tramp-hdfs"; + ename = "tramp-hdfs"; version = "20170821.620"; src = fetchFromGitHub { owner = "raghavgautam"; repo = "tramp-hdfs"; - rev = "f8406f77bf83b66306ced693a5e4aaf606f46762"; - sha256 = "15zr1fcmjk4mzjvmfbbkz5v9ryfgcjk0ag6rwxk8rp6wzwxcxvvl"; + rev = "b64f24d0419a80dffaa2c4ecec317aa2bba56e35"; + sha256 = "1bfqzwn19w6fs5npslw0sjqrwdswsv5m3wcdnk438pz1lp199wfy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c185553314a2a9fe18907fd9251077777b33538/recipes/tramp-hdfs"; sha256 = "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b"; - name = "tramp-hdfs"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -73042,9 +94892,13 @@ license = lib.licenses.free; }; }) {}; - tramp-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tramp-term = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tramp-term"; + ename = "tramp-term"; version = "20180223.727"; src = fetchFromGitHub { owner = "randymorris"; @@ -73052,10 +94906,10 @@ rev = "7c29f888de0385a676dbf9a4e17bac0111f5c10a"; sha256 = "1ch9y632kggl3q6yx3g685j3dfbhy7yiwqh8cbxs3wja3rvml8xa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c84660c641f0bdf3cca8ad2a0f8f6e5d18b59c3/recipes/tramp-term"; sha256 = "1vbdwj8q66j6h5ijqzxhyaqf8wf9rbs03x8ppfijxl5qd2bhc1dy"; - name = "tramp-term"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73063,20 +94917,25 @@ license = lib.licenses.free; }; }) {}; - transfer-sh = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + transfer-sh = callPackage ({ async + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "transfer-sh"; - version = "20180317.1022"; + ename = "transfer-sh"; + version = "20180603.731"; src = fetchFromGitHub { owner = "Brillow"; repo = "transfer-sh.el"; - rev = "3f0344358081bcaa3c129b401ee18ecaeecda4d9"; - sha256 = "0flsdkqhmrclnwwbxxqraawj4xv0240bwh5pbi4hgwdl5l9ihc4j"; + rev = "55da85f963d347255a2b46568954923679331798"; + sha256 = "0yv4i4ps379kz1q9qmjh4q3pk5ik77xw86faxmwpjx4yzp1wsz9v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f74dd06d4d5249beaf67b2befec4251c8c18ed/recipes/transfer-sh"; sha256 = "1gii2avqg9mdmdj2r562s9382fcmw53w9zsvprpnkcyhxhgfy8sy"; - name = "transfer-sh"; + name = "recipe"; }; packageRequires = [ async ]; meta = { @@ -73084,20 +94943,26 @@ license = lib.licenses.free; }; }) {}; - transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: - melpaBuild { + transmission = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "transmission"; - version = "20180201.1506"; + ename = "transmission"; + version = "20180610.1653"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "03a36853f141387654b7cb9217c7417db096a083"; - sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry"; + rev = "7e8c3690bb54bd8c3ff89b89092ccaa94e116652"; + sha256 = "0wwnd2fc4b8ir58vxb69nw4rcyri2yhdpaphsgrs8dw9ziixpmvx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9"; - name = "transmission"; + name = "recipe"; }; packageRequires = [ emacs let-alist ]; meta = { @@ -73105,9 +94970,13 @@ license = lib.licenses.free; }; }) {}; - transpose-frame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + transpose-frame = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "transpose-frame"; + ename = "transpose-frame"; version = "20151126.626"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -73115,10 +94984,10 @@ rev = "011f420c3496b69fc22d789f64cb8091834feba7"; sha256 = "1nhbinwv1ld13c0b0lxlvfm9s6bvxcz2vgfccqg45ncg9rx70rsw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/transpose-frame"; sha256 = "1ksdc4d9k05452hcq4xx0j5nfl9n01z8abbca6j7j66bdf3m4l1b"; - name = "transpose-frame"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73126,9 +94995,13 @@ license = lib.licenses.free; }; }) {}; - transpose-mark = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + transpose-mark = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "transpose-mark"; + ename = "transpose-mark"; version = "20150405.16"; src = fetchFromGitHub { owner = "kwrooijen"; @@ -73136,10 +95009,10 @@ rev = "667327602004794de97214cf336ac61650ef75b7"; sha256 = "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/transpose-mark"; sha256 = "1q1icp1szm1bxz9ywwyrfbsm1wmx0h4cvzywrh9q0fj1fq387qvv"; - name = "transpose-mark"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73147,20 +95020,28 @@ license = lib.licenses.free; }; }) {}; - travis = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: - melpaBuild { + travis = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , request + , s }: + melpaBuild { pname = "travis"; + ename = "travis"; version = "20150825.438"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-travis"; - rev = "754ef07c17fed17ab03664ad11e2b0b2ef5e78ed"; - sha256 = "1ciwf40ghlm4w9g4ynbc3d1a93gf6f3imm3m8z9kqfa7cnlsypb6"; + rev = "c8769d3db10ed4604969049e3bd276afa0a0138e"; + sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c064a0dc7922cbe4cff2ae65665c4f10e6dbff27/recipes/travis"; sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix"; - name = "travis"; + name = "recipe"; }; packageRequires = [ dash pkg-info request s ]; meta = { @@ -73168,9 +95049,13 @@ license = lib.licenses.free; }; }) {}; - tree-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tree-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tree-mode"; + ename = "tree-mode"; version = "20151104.531"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -73178,10 +95063,10 @@ rev = "b06078826d5875d74b0e7b7ac47b0d0917610534"; sha256 = "13bbdhdmqg4x9yghanhr8fsbsxbnypzxdxgicz31sjjm675kpnix"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/tree-mode"; sha256 = "1b15xgh96j4qas1kh4ghczcn7hb1ri86wnjgn9wz2d6bw3c6077b"; - name = "tree-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73189,20 +95074,33 @@ license = lib.licenses.free; }; }) {}; - treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: - melpaBuild { + treemacs = callPackage ({ ace-window + , cl-lib ? null + , dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , ht + , hydra + , lib + , melpaBuild + , pfuture + , s }: + melpaBuild { pname = "treemacs"; - version = "20180314.435"; + ename = "treemacs"; + version = "20180722.503"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "535e9131f1500b355b0c35a7a1118aaad56cce53"; - sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm"; + rev = "98d02cb1ca4742c6b3d7148c82109d4a0b0df27e"; + sha256 = "0kk36i7d6pddx97zxpa37mz1pa7kygbyrqzl73mmx4cbisk3c2gw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs"; sha256 = "1wcsn0kzrbawyyhxmsmrsxr1vp0llkxw6r7zx53pwyc82ia64nlv"; - name = "treemacs"; + name = "recipe"; }; packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ]; meta = { @@ -73210,20 +95108,26 @@ license = lib.licenses.free; }; }) {}; - treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: - melpaBuild { + treemacs-evil = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , treemacs }: + melpaBuild { pname = "treemacs-evil"; - version = "20180203.416"; + ename = "treemacs-evil"; + version = "20180622.426"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "535e9131f1500b355b0c35a7a1118aaad56cce53"; - sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm"; + rev = "d0f874c90990400c02a8029d4efe815d3548ba5c"; + sha256 = "0hclgsv96gr50z9cqj97rp45c5r50q2zb6hq5jcx3xmlw12k9pk7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil"; sha256 = "1i2mxqwnqb2jz775qg3z4lf7pk4mgi646fyyi2la5gdcnq6a46mg"; - name = "treemacs-evil"; + name = "recipe"; }; packageRequires = [ evil treemacs ]; meta = { @@ -73231,20 +95135,26 @@ license = lib.licenses.free; }; }) {}; - treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: - melpaBuild { + treemacs-projectile = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , treemacs }: + melpaBuild { pname = "treemacs-projectile"; - version = "20180203.416"; + ename = "treemacs-projectile"; + version = "20180614.1021"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "535e9131f1500b355b0c35a7a1118aaad56cce53"; - sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm"; + rev = "cbc75759fd54a772fcb67bd8babacf1b2020ba88"; + sha256 = "18aafgiircgb5max35zqzdfb0yjmgjqacax9sfy39ihh9x9z0vc1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-projectile"; sha256 = "1vyifik30673bwlfvbmw8pzz7f3wd4q6zzssvbj8d23zhk8kh8vc"; - name = "treemacs-projectile"; + name = "recipe"; }; packageRequires = [ projectile treemacs ]; meta = { @@ -73252,20 +95162,25 @@ license = lib.licenses.free; }; }) {}; - treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + treepy = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "treepy"; - version = "20170722.355"; + ename = "treepy"; + version = "20180722.538"; src = fetchFromGitHub { owner = "volrath"; repo = "treepy.el"; - rev = "282fbc94747fe2a00d36e2a74d147c8fa0ac4be7"; - sha256 = "0acw6c073h2a0fy8gx2xc2d1fw0yhaqikqrvs2iq53fqcqrrq81r"; + rev = "ae972c73dbf56452a4fe5dca635a75c502a78a15"; + sha256 = "1r3410v4y4zc6xdpf6z0947ivbw055zy1pcplr4215nr5346m6nc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy"; sha256 = "0jfah4vywi1b6c86h7vh8fspmklhs790qzkl51i9p7yckfggwp72"; - name = "treepy"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -73273,9 +95188,17 @@ license = lib.licenses.free; }; }) {}; - trident-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode, slime }: - melpaBuild { + trident-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , skewer-mode + , slime }: + melpaBuild { pname = "trident-mode"; + ename = "trident-mode"; version = "20130726.1207"; src = fetchFromGitHub { owner = "johnmastro"; @@ -73283,10 +95206,10 @@ rev = "ad3201f47e114de35df189c3d80f0fdea9507ea9"; sha256 = "08484fhc69rk16g52f9bzc1kzpif61ddfchxjbj1qqqammbx11ym"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/trident-mode"; sha256 = "0l81hs7bp46jlk41b9fk1lkvlp17fqc5hcz8k8kkal7rh7ari1fd"; - name = "trident-mode"; + name = "recipe"; }; packageRequires = [ dash emacs skewer-mode slime ]; meta = { @@ -73294,9 +95217,13 @@ license = lib.licenses.free; }; }) {}; - trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + trr = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "trr"; + ename = "trr"; version = "20170221.42"; src = fetchFromGitHub { owner = "kawabata"; @@ -73304,10 +95231,10 @@ rev = "83660d8343ef3367837354dc684dfdde2f95826a"; sha256 = "0h12szq1cww3bpsk09m7d2bk9bfjxrmzlw9ccviwhnric40nh67k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/56fa3c0b65e4e300f01804df7779ba6f1cb18cec/recipes/trr"; sha256 = "068vqsyx8riqzfrmjk8wr81f68r2y2b6ymc2vvl6vka9rprvsfwr"; - name = "trr"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73315,20 +95242,25 @@ license = lib.licenses.free; }; }) {}; - truthy = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }: - melpaBuild { + truthy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , list-utils + , melpaBuild }: + melpaBuild { pname = "truthy"; + ename = "truthy"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "truthy"; - rev = "8ed8d07772aa8457554547eb17e264b5df2b4a69"; - sha256 = "1mm6rrprsmx4hc622qmllm7c81yhwbqmdr0n6020krq92zmilmlm"; + rev = "782cee08fbb13f9be71ce8e88d980ec14db24a0f"; + sha256 = "0xbkq7hr14gd2nmsfkzvz4rgfi42h51m29cn2vaswr2s3prflhrh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f7a7e319dbe17e2b31353e7d7cab51d557d86e9d/recipes/truthy"; sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg"; - name = "truthy"; + name = "recipe"; }; packageRequires = [ list-utils ]; meta = { @@ -73336,9 +95268,14 @@ license = lib.licenses.free; }; }) {}; - try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + try = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "try"; + ename = "try"; version = "20170226.805"; src = fetchFromGitHub { owner = "larstvei"; @@ -73346,10 +95283,10 @@ rev = "271b0a362cadf44d0694628b9e213f54516ef913"; sha256 = "1fvpi02c6awyrwg2yqjapvcv4132qvmvd9bkbwpjmndxpicsann3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13c0ed40ad02fa0893cbf4dd9617dccb624f064b/recipes/try"; sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n"; - name = "try"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -73357,9 +95294,13 @@ license = lib.licenses.free; }; }) {}; - ts-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ts-comint = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ts-comint"; + ename = "ts-comint"; version = "20171105.2247"; src = fetchFromGitHub { owner = "josteink"; @@ -73367,10 +95308,10 @@ rev = "8817dc7b3a6eb78c3cad42e5677c2113274a1963"; sha256 = "17cw9710ib80d626vv6bx6vdjdin78h6pja1lsr4r6mz8c5ihwxj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84e7004395083b66fce7ff4676af818bc798058a/recipes/ts-comint"; sha256 = "18swvzkzcwn0wks58flsjpn9dddzcznij67xifyz6009l4fgdrzd"; - name = "ts-comint"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73378,9 +95319,17 @@ license = lib.licenses.free; }; }) {}; - tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + tss = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , json-mode + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "tss"; + ename = "tss"; version = "20150913.708"; src = fetchFromGitHub { owner = "aki2o"; @@ -73388,10 +95337,10 @@ rev = "81ac6351a2ae258fd0ebf916dae9bd5a179fefd0"; sha256 = "1bk5v9dffs65qsay0dp336s2ly065nd0cg572zz058ikwxd44zd3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d52e20f5ca38ed399d19f18f778b8601baf78460/recipes/tss"; sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm"; - name = "tss"; + name = "recipe"; }; packageRequires = [ auto-complete json-mode log4e yaxception ]; meta = { @@ -73399,9 +95348,13 @@ license = lib.licenses.free; }; }) {}; - tt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tt-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tt-mode"; + ename = "tt-mode"; version = "20130804.410"; src = fetchFromGitHub { owner = "davorg"; @@ -73409,10 +95362,10 @@ rev = "85ed3832e7eef391f7879d9990d59c7a3493c15e"; sha256 = "1gvqxk67cf779szyg907815i4m9jzrpmn5cnsmnwd62k3r3z4nxm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62959f554db7aa24b2565baded19766b01e61f62/recipes/tt-mode"; sha256 = "02dzyycn5znbibbz50b243bh1kcccp8xwknjqwljk00gpf196vzf"; - name = "tt-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73420,18 +95373,23 @@ license = lib.licenses.free; }; }) {}; - ttl-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + ttl-mode = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ttl-mode"; + ename = "ttl-mode"; version = "20160505.132"; src = fetchhg { url = "https://bitbucket.com/nxg/ttl-mode"; rev = "d790eb85ef4d"; sha256 = "14kfnpp7fcd84ly9ng7hm5hzx2sdpn2x6d8frwbkdxfb0x81kmmf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d56140a50abeab0953825d3646122d6e6ed19a7c/recipes/ttl-mode"; sha256 = "1nnn2y0n9rj3a8r85y2vp6qja5rm4drcbnj9q793zzqfjl9akqd4"; - name = "ttl-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73439,20 +95397,25 @@ license = lib.licenses.free; }; }) {}; - tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tuareg = callPackage ({ caml + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tuareg"; - version = "20180325.47"; + ename = "tuareg"; + version = "20180512.1306"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "fcf578a6aa2af815bc93fb48f374b8c3798a3e9a"; - sha256 = "0zmrmkcz019ny1cwqssyy327zmqpjmrn05xikcz4xqwy7ij8xifp"; + rev = "faa976ac930d3fba42ec59881046929c90ffa8f3"; + sha256 = "1f29bwivmdd6k7wblmrlwf7q43kdkrdadf5r3mk372p04d7c2nrx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q"; - name = "tuareg"; + name = "recipe"; }; packageRequires = [ caml ]; meta = { @@ -73460,9 +95423,15 @@ license = lib.licenses.free; }; }) {}; - tumble = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, http-post-simple, lib, melpaBuild }: - melpaBuild { + tumble = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , http-post-simple + , lib + , melpaBuild }: + melpaBuild { pname = "tumble"; + ename = "tumble"; version = "20160111.2329"; src = fetchFromGitHub { owner = "febuiles"; @@ -73470,10 +95439,10 @@ rev = "e8fd7643cccf2b6ea4170f0c5f1f87d007e7fa00"; sha256 = "1xdkgvr1pnlg3nrjmma4ra80ysr8xbslvczg7cq1x1mqw6gn9xq5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/579a441d153c4c7d9f8172be94983a632d6fab8f/recipes/tumble"; sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9"; - name = "tumble"; + name = "recipe"; }; packageRequires = [ cl-lib http-post-simple ]; meta = { @@ -73481,20 +95450,27 @@ license = lib.licenses.free; }; }) {}; - tumblesocks = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, markdown-mode, melpaBuild, oauth }: - melpaBuild { + tumblesocks = callPackage ({ fetchFromGitHub + , fetchurl + , htmlize + , lib + , markdown-mode + , melpaBuild + , oauth }: + melpaBuild { pname = "tumblesocks"; + ename = "tumblesocks"; version = "20140215.1247"; src = fetchFromGitHub { owner = "gcr"; repo = "tumblesocks"; - rev = "85a6cdc2db3390593fd886c474959b675460b310"; - sha256 = "1g7y7czan7mcs5lwc5r6cllgksrj3b9lpn1bj7khwkd1ll391jc2"; + rev = "9fd3dc5359d4e39a0f673546427935aa934cf339"; + sha256 = "17kcprr4bhnh7h799wcxb79d54vvs226fl2rqj89gf10gr6bc3fr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tumblesocks"; sha256 = "005w7vfzi4qpm59pxhq9nhp8hlwh4m1i7zj6l4knizcwm5xrm4ab"; - name = "tumblesocks"; + name = "recipe"; }; packageRequires = [ htmlize markdown-mode oauth ]; meta = { @@ -73502,20 +95478,24 @@ license = lib.licenses.free; }; }) {}; - tup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tup-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tup-mode"; + ename = "tup-mode"; version = "20140410.914"; src = fetchFromGitHub { owner = "ejmr"; repo = "tup-mode"; - rev = "bcc100c6485f1c81fdcd1215dfc6c41a81c215c8"; - sha256 = "0y1b9zvwbw3vp41siyzj04bis939fgz3j27hc5ljjzy92kd39nzm"; + rev = "945af9c8e6c402e10cd3bf8e28a9591174023d6d"; + sha256 = "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bda3260dad1c766c5b6ae9124f966bf441e24f2f/recipes/tup-mode"; sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l"; - name = "tup-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73523,20 +95503,25 @@ license = lib.licenses.free; }; }) {}; - turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + turing-machine = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "turing-machine"; + ename = "turing-machine"; version = "20180221.2038"; src = fetchFromGitHub { owner = "therockmandolinist"; repo = "turing-machine"; - rev = "fa60b76a5bac1f54b7a1b3dc55aae7602c7e385b"; - sha256 = "0k1r0zkcr44kiki8cvdqwx09xpvpz7nkbq9w6i4gqy5h78zy5k79"; + rev = "ad1dccc9c445f9e4465e1c67cbbfea9583153047"; + sha256 = "0qaz4r5ahg2fxsfyxilb8c9956i5ra9vg80l82slm8vrnsinzll6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine"; sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn"; - name = "turing-machine"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -73544,9 +95529,13 @@ license = lib.licenses.free; }; }) {}; - turkish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + turkish = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "turkish"; + ename = "turkish"; version = "20170910.811"; src = fetchFromGitHub { owner = "emres"; @@ -73554,10 +95543,10 @@ rev = "9831a316c176bb21a1b91226323ea4133163e00c"; sha256 = "0nrxi845gd24d5vymbmxz696jwld4rn6nw2dz1gzmdaks7bbv87m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12cdbdf404fa859a48d1bb69f058321d7595d2a2/recipes/turkish"; sha256 = "0pdapxjbpj3lg3hxvwjn9v51jqaiz7a8053z2bmk4485vzs34532"; - name = "turkish"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73565,9 +95554,15 @@ license = lib.licenses.free; }; }) {}; - turnip = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + turnip = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "turnip"; + ename = "turnip"; version = "20150308.2329"; src = fetchFromGitHub { owner = "kljohann"; @@ -73575,10 +95570,10 @@ rev = "2fd32562fc6fc1cda6d91aa939cfb29f9b16e9de"; sha256 = "0khl4q22x6vdn87xdqqg5f535d4dqpnfbhk6qhlh187p1w7qaiq4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73c341fec986ed965a46954b898f92a4725fdee6/recipes/turnip"; sha256 = "1vfqv71j47fn53klz3jl8r8hscywd01kkl4w96a308sac3lhbrps"; - name = "turnip"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -73586,20 +95581,24 @@ license = lib.licenses.free; }; }) {}; - twig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + twig-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "twig-mode"; + ename = "twig-mode"; version = "20130220.1050"; src = fetchFromGitHub { owner = "moljac024"; repo = "twig-mode"; - rev = "2849f273a4855d3314a9c0cc84134f5b28ad5ea6"; - sha256 = "0wvmih2y3hy7casxx2y1w8csmzfnfgbb5ivpggr94sc86p6bg8sa"; + rev = "51bcd41666a234119a855b9fd348d3dae7832de1"; + sha256 = "068m06d0gf6608zd270c5nxkjczzfw55df58r2zfbpzgdi4cxm7j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/400c75bf336b8d610f0a2c1732cc78beb502e1f3/recipes/twig-mode"; sha256 = "1m3xjgmkqg8aj536wcg2f2hf4y6whscbsh7z7448hl4b5qjwii4n"; - name = "twig-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73607,9 +95606,13 @@ license = lib.licenses.free; }; }) {}; - twilight-anti-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + twilight-anti-bright-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "twilight-anti-bright-theme"; + ename = "twilight-anti-bright-theme"; version = "20160622.148"; src = fetchFromGitHub { owner = "jimeh"; @@ -73617,10 +95620,10 @@ rev = "523b95fcdbf4a6a6483af314ad05354a3d80f23f"; sha256 = "0g6qqfgbg507r8lgq99zj2b5n3r9m23hpx19m36c3i55mh94dl2h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-anti-bright-theme"; sha256 = "1wfj570l5k0ygqi9dwjskc78rpnxw6080bkw1zd1a8kl3fa28n2k"; - name = "twilight-anti-bright-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73628,20 +95631,24 @@ license = lib.licenses.free; }; }) {}; - twilight-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + twilight-bright-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "twilight-bright-theme"; + ename = "twilight-bright-theme"; version = "20130605.143"; src = fetchFromGitHub { owner = "jimeh"; repo = "twilight-bright-theme.el"; - rev = "322157cb2f3bf7920ecd209dafc31bc1c7959f49"; - sha256 = "1awqc4rvg8693myynb1d4y4dfdaxkd5blnixxs3mdv81l07zyn8c"; + rev = "9859474333fee9f907474dbd8763f617e8bfd89c"; + sha256 = "02hiyk5v41ki0rlchj6didg3b5a9fxaw50d9shrv1v861z4hrq24"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-bright-theme"; sha256 = "039mg147cvb0pk59q3c1bpx7562bajgrs74xymylr89hvrxivxqh"; - name = "twilight-bright-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73649,9 +95656,13 @@ license = lib.licenses.free; }; }) {}; - twilight-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + twilight-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "twilight-theme"; + ename = "twilight-theme"; version = "20120412.603"; src = fetchFromGitHub { owner = "developernotes"; @@ -73659,10 +95670,10 @@ rev = "77c4741cb3dcf16e53d06d6c2ffdc660c40afb5b"; sha256 = "0d7vd1h0rwwgrh7f9kmdgy2ni0p20da9c8ylwlg33nsb26345wfs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-theme"; sha256 = "0g9bbb6m7q8x4zcw5gfmg7ljsfdmjh0335sq53b0lva0h3ra6kzx"; - name = "twilight-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73670,20 +95681,24 @@ license = lib.licenses.free; }; }) {}; - twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + twittering-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "twittering-mode"; - version = "20180107.412"; + ename = "twittering-mode"; + version = "20180507.721"; src = fetchFromGitHub { owner = "hayamiz"; repo = "twittering-mode"; - rev = "c27d9b5b1dd20a1600e89909ac9c0ccd08af9bf9"; - sha256 = "00vir1vfkprxm23if6cfjvliiwbza18n7gmh74bdnp1zkg2xy0hq"; + rev = "6d10d1765a7b4de4c723395c8a2200a1649beeb0"; + sha256 = "0pzj1yslggha5hh98ah634s03p7185wppzxfx53xws0mid6wsf85"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode"; sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1"; - name = "twittering-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73691,9 +95706,15 @@ license = lib.licenses.free; }; }) {}; - typed-clojure-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + typed-clojure-mode = callPackage ({ cider + , clojure-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "typed-clojure-mode"; + ename = "typed-clojure-mode"; version = "20151003.1122"; src = fetchFromGitHub { owner = "typedclojure"; @@ -73701,10 +95722,10 @@ rev = "3abd53d8cc1ad77ffe76e02849d0ab7731fd8364"; sha256 = "1i826xq77nh4s7qlj63r2iznbn319l1l3fzpbjb2nj0m00bwvxl6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/961471c194b508a5025f00a5be02d316b26f330a/recipes/typed-clojure-mode"; sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3"; - name = "typed-clojure-mode"; + name = "recipe"; }; packageRequires = [ cider clojure-mode ]; meta = { @@ -73712,20 +95733,24 @@ license = lib.licenses.free; }; }) {}; - typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + typescript-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "typescript-mode"; - version = "20180326.434"; + ename = "typescript-mode"; + version = "20180708.1003"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "d8501770f6ebd50bbbaada2c65b19c85564c1d1e"; - sha256 = "0hhn3bf9msmp3gbcqpsij1sqwm0zsdxpjyjqaz1r997i4lrqw2r2"; + rev = "f9cd0dd539d5d23f2b466de0cf20f9b0aef07258"; + sha256 = "1f6j2xyws9ksv192si4hznyhglhqgk7v1i31wm2kf7m007yw2ibi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; sha256 = "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha"; - name = "typescript-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73733,9 +95758,13 @@ license = lib.licenses.free; }; }) {}; - typing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + typing = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "typing"; + ename = "typing"; version = "20171115.2331"; src = fetchFromGitHub { owner = "kensanata"; @@ -73743,10 +95772,10 @@ rev = "1ada06484695b8959f4a7c41cacf7f78c2aad998"; sha256 = "0mh1y960zd7878j7nhrjijck6jxxqnbmxr579s095k7yk2ynpkkg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6e75695594ce17b618ad8786c8a04e283f68b11/recipes/typing"; sha256 = "0k2lplqzq3323nn7rybcs377sr87kbww8ci99rrka3yyb5bh1fa1"; - name = "typing"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73754,9 +95783,13 @@ license = lib.licenses.free; }; }) {}; - typing-game = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + typing-game = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "typing-game"; + ename = "typing-game"; version = "20160426.520"; src = fetchFromGitHub { owner = "lujun9972"; @@ -73764,10 +95797,10 @@ rev = "616435a5270274f4c7b698697674dbb2039049a4"; sha256 = "0dkrnn9fzqv793wvd3nc7dbslayj37q5na1w1g63g32z2s8aq09j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ced22932f0462c77d121a631c494c01a0a4eaa/recipes/typing-game"; sha256 = "0k85j9bcqp0gbzdh44q5a9wlkv5mc0g0m42ziq1bzmp6993wkmy2"; - name = "typing-game"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73775,9 +95808,16 @@ license = lib.licenses.free; }; }) {}; - typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: - melpaBuild { + typit = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mmt }: + melpaBuild { pname = "typit"; + ename = "typit"; version = "20180317.107"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -73785,10 +95825,10 @@ rev = "4fe50d616fc60e77eb9b5a824c0a1ca4010b0746"; sha256 = "0j5s86s9wb33fqw415mmkysdasyj3vdx9l8l6ca6f89ps6znr636"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; sha256 = "05m7ymcq6fgbhh93ninrf3qi7csdnf2ahhf01mkm8gxxyaqq6m4n"; - name = "typit"; + name = "recipe"; }; packageRequires = [ emacs f mmt ]; meta = { @@ -73796,9 +95836,13 @@ license = lib.licenses.free; }; }) {}; - typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + typo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "typo"; + ename = "typo"; version = "20171209.223"; src = fetchFromGitHub { owner = "jorgenschaefer"; @@ -73806,10 +95850,10 @@ rev = "9dad93b6f367f02f52c8d9bf15d446d922cec294"; sha256 = "1xaikwl265v67b7hilrhjgwzr6bcha9idnp82f27msqzdfdzxf0f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo"; sha256 = "1p8is1n525lmzq588hj6vazmhl9wi6rairnfx1g1p6g6ijdycd4h"; - name = "typo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73817,9 +95861,15 @@ license = lib.licenses.free; }; }) {}; - typoscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: - melpaBuild { + typoscript-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , use-package }: + melpaBuild { pname = "typoscript-mode"; + ename = "typoscript-mode"; version = "20170126.112"; src = fetchFromGitHub { owner = "ksjogo"; @@ -73827,10 +95877,10 @@ rev = "44e7567e921573c4f33c537b827f71fb1f565c32"; sha256 = "0i7l9s3lhxnld32mqyrvasiv1hilhwnp2fwvpdv2cx9r902q6kc8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/701de09cb97cbfa49a3a81aaeb9577817566efa2/recipes/typoscript-mode"; sha256 = "18i2wwbn8vj5dbgxp2ds29n12v8ldvxjd1zb6h1g9lfh8iyrnjmx"; - name = "typoscript-mode"; + name = "recipe"; }; packageRequires = [ emacs use-package ]; meta = { @@ -73838,9 +95888,13 @@ license = lib.licenses.free; }; }) {}; - ubuntu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ubuntu-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ubuntu-theme"; + ename = "ubuntu-theme"; version = "20150805.806"; src = fetchFromGitHub { owner = "rocher"; @@ -73848,10 +95902,10 @@ rev = "88b0eefc75d4cbcde103057e1c5968d4c3052f69"; sha256 = "1v8d1pc0vjc7wz0prr5w5vp2qb19f3gcyl6jx5130plajbvv23rc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ubuntu-theme"; sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2"; - name = "ubuntu-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73859,9 +95913,16 @@ license = lib.licenses.free; }; }) {}; - ucs-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft }: - melpaBuild { + ucs-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , list-utils + , melpaBuild + , pcache + , persistent-soft }: + melpaBuild { pname = "ucs-utils"; + ename = "ucs-utils"; version = "20150826.714"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -73869,10 +95930,10 @@ rev = "cbfd42f822bf5717934fa2d92060e6e24a813433"; sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/ucs-utils"; sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2"; - name = "ucs-utils"; + name = "recipe"; }; packageRequires = [ list-utils pcache persistent-soft ]; meta = { @@ -73880,9 +95941,13 @@ license = lib.licenses.free; }; }) {}; - uimage = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + uimage = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "uimage"; + ename = "uimage"; version = "20160901.521"; src = fetchFromGitHub { owner = "lujun9972"; @@ -73890,10 +95955,10 @@ rev = "9893d09160ef7e8c0ecdcd74fca99ffeb5f9d70d"; sha256 = "1ri50nab778kpq49m54ra75z8dphagp9sz92is0636j4qy3sbih1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/346cb25abdfdd539d121a9f34bce75b2fc5a16be/recipes/uimage"; sha256 = "0i6qpk6v4pmpk3zswygdy0dd7rxy8kl7qn8a1xanpi4aqg7wlbmd"; - name = "uimage"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73901,9 +95966,13 @@ license = lib.licenses.free; }; }) {}; - ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ujelly-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ujelly-theme"; + ename = "ujelly-theme"; version = "20180214.824"; src = fetchFromGitHub { owner = "marktran"; @@ -73911,10 +95980,10 @@ rev = "bf724ce7806a738d2043544061e5f9bbfc56e674"; sha256 = "0pz26q5qfq4wiqcpfkq26f19q5gyiv8q71sq4k77hkss5a5b5fqg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; sha256 = "0b7zgmpsdn5p3jx4kif7phxz8pb85snmmfr3yz98xf6p7h6w60gw"; - name = "ujelly-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73922,9 +95991,13 @@ license = lib.licenses.free; }; }) {}; - ukrainian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ukrainian-holidays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ukrainian-holidays"; + ename = "ukrainian-holidays"; version = "20130720.649"; src = fetchFromGitHub { owner = "abo-abo"; @@ -73932,10 +96005,10 @@ rev = "e52b0c92843e9f4d0415a7ba3b8559785497d23d"; sha256 = "033v4ck979lhkpwblci5clacfc1xnkq03p5d1m566wff8dp5flwz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a8b5ec722600bcd5bf5fcc2b20262597a9e8c40/recipes/ukrainian-holidays"; sha256 = "0kbfj2l1rcv74c88nabkwkcl7k9pkim835l24q61zv3i6wf9sykf"; - name = "ukrainian-holidays"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73943,20 +96016,24 @@ license = lib.licenses.free; }; }) {}; - uncrustify-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + uncrustify-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "uncrustify-mode"; + ename = "uncrustify-mode"; version = "20130707.659"; src = fetchFromGitHub { owner = "koko1000ban"; repo = "emacs-uncrustify-mode"; - rev = "73893d000361e95784911e5ec268ad0ab2a1473c"; - sha256 = "0366h4jfi0c7yda9wcrz4zxgf2qqdd08b8z2dr8c1rkvkdd67iam"; + rev = "2c00d5cf2d1868a5955347438746f4dd82b3b9fc"; + sha256 = "1pzg49l982a0kajnix0jl3gk7g37d7pgqg9lx838i2sk3jfwayf9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5327aa1a1143c2257e9454663ff140f2371d07e3/recipes/uncrustify-mode"; sha256 = "0amdxdfc8i99zjrw4iqmxzb47h0airs60fwmc32bc8b0ds66c3kd"; - name = "uncrustify-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -73964,20 +96041,27 @@ license = lib.licenses.free; }; }) {}; - undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }: - melpaBuild { + undercover = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , shut-up }: + melpaBuild { pname = "undercover"; - version = "20170502.912"; + ename = "undercover"; + version = "20180403.752"; src = fetchFromGitHub { owner = "sviridov"; repo = "undercover.el"; - rev = "d947e6410a3b269c657645b499a413d90d4b69ca"; - sha256 = "0c4i8qfa6mzbnjmdk9zqgw324fxyjnq5dm6bmxfadsnvnhjmn7y5"; + rev = "3fc54ef92f0b4b7d26d962d6ed29a81d526a3a66"; + sha256 = "0iqj1a6nj1ka5ahcy4rrn7k427bs1ifv0v0i7gj79m7isjj15qc4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover"; sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf"; - name = "undercover"; + name = "recipe"; }; packageRequires = [ dash emacs shut-up ]; meta = { @@ -73985,20 +96069,25 @@ license = lib.licenses.free; }; }) {}; - underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + underline-with-char = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "underline-with-char"; + ename = "underline-with-char"; version = "20170814.223"; src = fetchFromGitHub { owner = "marcowahl"; repo = "underline-with-char"; - rev = "6daeba77e17dc11558ca3ccb0495524f5104d581"; - sha256 = "1i6qgkzn8rlv44mjc4b9sksr4wpnj9a1b6p1y3g6fqpvhy5pmygg"; + rev = "f7de7a968a16c12bef5a3ed9aebcde2dcadc08be"; + sha256 = "188g8vzalkhdqjxkbypzq64vl9qmry8pq8vrbxhy28pzsljhrqxv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char"; sha256 = "0la24nvyqinla40c2f3f4a63mjjsg58096hyw3pvp0mwiff7rxyd"; - name = "underline-with-char"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -74006,20 +96095,24 @@ license = lib.licenses.free; }; }) {}; - underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + underwater-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "underwater-theme"; + ename = "underwater-theme"; version = "20131117.1602"; src = fetchFromGitHub { owner = "jmdeldin"; repo = "underwater-theme.el"; - rev = "4eb9ef014f580adc135d91d1cd68d37a310640b6"; - sha256 = "1ypxpv5vw2ls757iwrq3zld6k0s29q3kg3spcsl5ks4aqpnkxpva"; + rev = "1fbd4ecd4538256c6c46f9638f883072c73ac927"; + sha256 = "1g1ldyz42q3i2xlgvhd4s93cvkh0fm8m3l344zjcw8rvqaisyphj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7dccc77d082181629b8f0c45404ac5d8bd97590/recipes/underwater-theme"; sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr"; - name = "underwater-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74027,9 +96120,14 @@ license = lib.licenses.free; }; }) {}; - undohist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + undohist = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "undohist"; + ename = "undohist"; version = "20150315.542"; src = fetchFromGitHub { owner = "m2ym"; @@ -74037,10 +96135,10 @@ rev = "d2239a5f736724ceb9e3b6bcaa86f4064805cda0"; sha256 = "1c0daw246ky7b1x5b8h55x79pl1pjqk1k348l487bdd8zdj4w9wx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aebd16ca1ac51d9982eae5437c6084a2a3946b88/recipes/undohist"; sha256 = "0zzfzh8sf2dkz8h3kidv7zmwz2c2qq9n9qz2mab2lk0y44njzwhn"; - name = "undohist"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -74048,20 +96146,24 @@ license = lib.licenses.free; }; }) {}; - unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + unfill = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unfill"; + ename = "unfill"; version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "unfill"; - rev = "df0c4dee19a3874b11c7c7f04e8a2fba629fda9b"; - sha256 = "0bdlr8kqzwzi7aggcn7cwwih19585wi6dd9lvwj4i966zr4w84yx"; + rev = "d1056ec5ce7bb18abe8933c1e4d5932fb98fb78e"; + sha256 = "0qbcm7qf33xlbj7wx3164q8m6b8qzgv6w13pk8568nrmb1f8qna8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill"; sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv"; - name = "unfill"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74069,20 +96171,24 @@ license = lib.licenses.free; }; }) {}; - unicode-emoticons = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + unicode-emoticons = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unicode-emoticons"; + ename = "unicode-emoticons"; version = "20150204.308"; src = fetchFromGitHub { owner = "hagleitn"; repo = "unicode-emoticons"; - rev = "fb18631f342b0243cf77cf59ed2067c47aae5233"; - sha256 = "015gjf8chd6h9azhyarmskk41cm0cmg981jif7q81hakl9av6rhh"; + rev = "52a09955c2afc1807c0f37f1467ccfc1e1da690a"; + sha256 = "0z7aaw5ib1q8whnrhvybzxa4cm18qsw5sg8gv31j3yxi638yvi89"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/unicode-emoticons"; sha256 = "0sp4sb2yw9msyqxgp4q5z9pzfvqwhizd1sx8w63g1vis6n2h254r"; - name = "unicode-emoticons"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74090,20 +96196,29 @@ license = lib.licenses.free; }; }) {}; - unicode-enbox = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft, string-utils, ucs-utils }: - melpaBuild { + unicode-enbox = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , list-utils + , melpaBuild + , pcache + , persistent-soft + , string-utils + , ucs-utils }: + melpaBuild { pname = "unicode-enbox"; + ename = "unicode-enbox"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "unicode-enbox"; - rev = "77074fac1994a4236f111d6a1d0cf79ea3fca151"; - sha256 = "0936dqxyp72if9wvn2dcci670yp1gqrmpnll9xq00skp85yq9zs5"; + rev = "4e8ac89b0460eaba6d6eaa8c463eb069660218fa"; + sha256 = "1p63dk1fya0g08lr7cr1rydx9bqakg1nq30i0yma6zs0h7f5qvsi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/unicode-enbox"; sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv"; - name = "unicode-enbox"; + name = "recipe"; }; packageRequires = [ list-utils @@ -74117,20 +96232,27 @@ license = lib.licenses.free; }; }) {}; - unicode-escape = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { + unicode-escape = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names }: + melpaBuild { pname = "unicode-escape"; + ename = "unicode-escape"; version = "20160614.534"; src = fetchFromGitHub { owner = "kosh04"; repo = "unicode-escape.el"; - rev = "fc69ec780d9e54c364a9252bd0cf1d2507f3fab7"; - sha256 = "1bqknk6y7r0dqhmwhq3ac56cqf0albp18h222klnijv4bazjfcjw"; + rev = "04c7f22f90c96e93f998f084089ab08dc7f4fdd6"; + sha256 = "01i5cq7yan9z1kr6pvp4bwzsnxs0bpqsaglfbvy7v6jfp923bvdm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2ae00434b80357dc62cd0177dbd714b25fb3ac7/recipes/unicode-escape"; sha256 = "0gcwkv7qbdnvak10jfzj9irb7nkfqsfxv2n5fi8vvrk90j1a2i2k"; - name = "unicode-escape"; + name = "recipe"; }; packageRequires = [ dash emacs names ]; meta = { @@ -74138,9 +96260,18 @@ license = lib.licenses.free; }; }) {}; - unicode-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }: - melpaBuild { + unicode-fonts = callPackage ({ fetchFromGitHub + , fetchurl + , font-utils + , lib + , list-utils + , melpaBuild + , pcache + , persistent-soft + , ucs-utils }: + melpaBuild { pname = "unicode-fonts"; + ename = "unicode-fonts"; version = "20150826.1532"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -74148,10 +96279,10 @@ rev = "a36597d83e0248bd0e6b2c1d5fb95bff72add527"; sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83459421dd2eb3d60ec668c3d5bb38d99ee64aff/recipes/unicode-fonts"; sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3"; - name = "unicode-fonts"; + name = "recipe"; }; packageRequires = [ font-utils @@ -74165,19 +96296,23 @@ license = lib.licenses.free; }; }) {}; - unicode-input = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + unicode-input = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unicode-input"; + ename = "unicode-input"; version = "20141218.2320"; src = fetchhg { url = "https://bitbucket.com/m00nlight/unicode-input"; rev = "e76ccb549e6a"; sha256 = "0kzcg1wxi1z424jdn7pibk9zyfyi85kligav08sl1c2hdldzya4l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/unicode-input"; sha256 = "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8"; - name = "unicode-input"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74185,20 +96320,29 @@ license = lib.licenses.free; }; }) {}; - unicode-progress-reporter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }: - melpaBuild { + unicode-progress-reporter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , list-utils + , melpaBuild + , pcache + , persistent-soft + , ucs-utils }: + melpaBuild { pname = "unicode-progress-reporter"; + ename = "unicode-progress-reporter"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "unicode-progress-reporter"; - rev = "5e66724fd7d15743213b082474d798117b194494"; - sha256 = "16jgm70ldsngxldiagjkw3ragypalpiidnf82g5hss9ciybkd3j4"; + rev = "17415a96144506e5ffa49377d4c814023e06f425"; + sha256 = "1fdyngchr8s7gjqi50fdr1cx8zx5jd3l7ag9i15r9vmqanvr0zzf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83459421dd2eb3d60ec668c3d5bb38d99ee64aff/recipes/unicode-progress-reporter"; sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7"; - name = "unicode-progress-reporter"; + name = "recipe"; }; packageRequires = [ emacs list-utils pcache persistent-soft ucs-utils ]; meta = { @@ -74206,20 +96350,24 @@ license = lib.licenses.free; }; }) {}; - unicode-troll-stopper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + unicode-troll-stopper = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unicode-troll-stopper"; + ename = "unicode-troll-stopper"; version = "20151023.1831"; src = fetchFromGitHub { owner = "camsaul"; repo = "emacs-unicode-troll-stopper"; - rev = "15e4b57b78bf643bb56e5000078030cbb5c66e2a"; - sha256 = "0ny260mr1h810fvqsfj2hpd3zql4g309m60qj4vk6kmd83p5b60f"; + rev = "7d1331b17b29db56fbdaecec39e5fcac5b92e46f"; + sha256 = "1zpqm309x73af2i6qch7qqwr1ibnkz0r0jyvw6py4imnank9hg83"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b463925a98b7dde78d85693c7681fd2346d90895/recipes/unicode-troll-stopper"; sha256 = "0a10lq0xsfyp052iw4xjbhsdkbyg25x2gk68gys4k7p6l92la0k5"; - name = "unicode-troll-stopper"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74227,20 +96375,28 @@ license = lib.licenses.free; }; }) {}; - unicode-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }: - melpaBuild { + unicode-whitespace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , list-utils + , melpaBuild + , pcache + , persistent-soft + , ucs-utils }: + melpaBuild { pname = "unicode-whitespace"; + ename = "unicode-whitespace"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "unicode-whitespace"; - rev = "a18c6b38d78b94f2eb1dcc4cb4fa91b6a17efabe"; - sha256 = "1ayb15nd5vqr0xaghrnp55kqw7bblrjipmfrag6bqpn7jk9bvbdz"; + rev = "b0cbfe4f9998a2c1eb4cba031efcb785ef518916"; + sha256 = "1khpmmpbvi73cis7qx33v2npbmwg1cc9x4bafg9kfz7yfqkrdjws"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9892a826f3ac335d12bd1a07202334e28a44f40/recipes/unicode-whitespace"; sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy"; - name = "unicode-whitespace"; + name = "recipe"; }; packageRequires = [ list-utils pcache persistent-soft ucs-utils ]; meta = { @@ -74248,9 +96404,13 @@ license = lib.licenses.free; }; }) {}; - unidecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + unidecode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unidecode"; + ename = "unidecode"; version = "20180312.1226"; src = fetchFromGitHub { owner = "sindikat"; @@ -74258,10 +96418,10 @@ rev = "5502ada9287b4012eabb879f12f5b0a9df52c5b7"; sha256 = "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9ba8e425e37e80a2236832c3f12568546d4c7c9/recipes/unidecode"; sha256 = "0vhghnyj8a5mcqq5rzajrm1izzfry77pd1wxhmra5yp9ribw2sv5"; - name = "unidecode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74269,9 +96429,14 @@ license = lib.licenses.free; }; }) {}; - unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + unify-opening = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unify-opening"; + ename = "unify-opening"; version = "20171122.1212"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -74279,10 +96444,10 @@ rev = "502469ddba6d8d52159f53976265f7d956b6b17c"; sha256 = "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening"; sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8"; - name = "unify-opening"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -74290,9 +96455,13 @@ license = lib.licenses.free; }; }) {}; - unipoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + unipoint = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unipoint"; + ename = "unipoint"; version = "20140113.1424"; src = fetchFromGitHub { owner = "apg"; @@ -74300,10 +96469,10 @@ rev = "5da04aebac35a5c9e1d8704f2231808d42f4b36a"; sha256 = "1wl9rzys1zr2c41h5i57y6hxsavix1b26f453l2izmb6r0b1dvh0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/unipoint"; sha256 = "0fm7anwcmga9adyfwlri7x014rpvfl1r6nccyi6lrpx126wy008s"; - name = "unipoint"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74311,9 +96480,14 @@ license = lib.licenses.free; }; }) {}; - unison = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + unison = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unison"; + ename = "unison"; version = "20160704.40"; src = fetchFromGitHub { owner = "unhammer"; @@ -74321,10 +96495,10 @@ rev = "a78a04c0d1398d00f75a1bd4799622a65bcb0f28"; sha256 = "1jn23wlhpka5pv0caipxi8bg3cc6wj1fg09abibhydy4p3mb3bi5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee7ee1a68486f822c1627fb0bf066c4ae8bc0776/recipes/unison"; sha256 = "03v10r6d4r6z66s9q7mg1iyxh53f3l6q7dij7pfbf32migqjgpir"; - name = "unison"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -74332,9 +96506,13 @@ license = lib.licenses.free; }; }) {}; - unison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + unison-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unison-mode"; + ename = "unison-mode"; version = "20160513.801"; src = fetchFromGitHub { owner = "impaktor"; @@ -74342,10 +96520,10 @@ rev = "0bd6a65c0d12f87fcf7bdff15fe54444959b93bf"; sha256 = "1snbvhvx2csw1f314dbdwny8yvfq834plpkzx0vl4k3wddmr3a66"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd5b5c16e504ee8e511bbc65acbc0ff65f99eaf4/recipes/unison-mode"; sha256 = "03kyr1h5pm51vn4bykj13rm4ybln266rpnxh65y2ygw8f8md88gl"; - name = "unison-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74353,20 +96531,25 @@ license = lib.licenses.free; }; }) {}; - universal-emotions-emoticons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + universal-emotions-emoticons = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "universal-emotions-emoticons"; + ename = "universal-emotions-emoticons"; version = "20171209.1820"; src = fetchFromGitHub { owner = "grettke"; repo = "universal-emotions-emoticons"; - rev = "c89063a4f8e00f8e9c4dc6c252474b6d4bfc4e01"; - sha256 = "0wgff3bbjgskbm1c4cww6akia93hd5sqr9md5szkqm6iiqi3q95z"; + rev = "9f249b39172bf9b8e148856ad941eee485161215"; + sha256 = "1qn757pn1hcfik05i458bic32dm812xznsfz5vgxn2v8wxihjlf8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57f913112c98db2248cf69e44deb69fd09cee042/recipes/universal-emotions-emoticons"; sha256 = "1aj3k3yrvasn3zmfwz5si046hlyhnjdmxh7i8li6rc0v0qwl7p86"; - name = "universal-emotions-emoticons"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -74374,20 +96557,24 @@ license = lib.licenses.free; }; }) {}; - unkillable-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + unkillable-scratch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unkillable-scratch"; + ename = "unkillable-scratch"; version = "20160504.1903"; src = fetchFromGitHub { owner = "EricCrosson"; repo = "unkillable-scratch"; - rev = "676a5a97658830caece18fa65a23e3d113933151"; - sha256 = "14k9ad542y0haz1yid9jy8f9zvpvac6cirnf0751g8rwjbdnvr85"; + rev = "0e1d9e1574e497171a7ccfbcb8c994cb9c5880da"; + sha256 = "0bhdqpxq6cly4b6v4ya1ksw0yfdb9g2f2ifbjn4gfcq6j4zszbdm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/822ac5610f333e41b676a29ef45a6f8bfea3162e/recipes/unkillable-scratch"; sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7"; - name = "unkillable-scratch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74395,20 +96582,26 @@ license = lib.licenses.free; }; }) {}; - untitled-new-buffer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magic-filetype, melpaBuild }: - melpaBuild { + untitled-new-buffer = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magic-filetype + , melpaBuild }: + melpaBuild { pname = "untitled-new-buffer"; + ename = "untitled-new-buffer"; version = "20161212.708"; src = fetchFromGitHub { owner = "zonuexe"; repo = "untitled-new-buffer.el"; - rev = "4eabc6937b0e83062ffce9de0d42110224063a6c"; - sha256 = "139gysva6hpsk006bcbm1689pzaj18smxs2ar5pv0yvkh60wjvlr"; + rev = "e359ae63bc6310e315b7c25157858f9b9796ed3d"; + sha256 = "0wgyc798pn9224ck3c4xndrrmsd4j12qdxhy6i7y7i27y1gw6ckj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de62e48115e1e5f9506e6d47a3b23c0420c1205b/recipes/untitled-new-buffer"; sha256 = "1hpv7k7jhpif9csdrd2gpz71s3fp4svsvrd1nh8hbx7avjl66pjf"; - name = "untitled-new-buffer"; + name = "recipe"; }; packageRequires = [ emacs magic-filetype ]; meta = { @@ -74416,20 +96609,53 @@ license = lib.licenses.free; }; }) {}; - uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + upbo = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "upbo"; + ename = "upbo"; + version = "20180422.122"; + src = fetchFromGitHub { + owner = "shiren"; + repo = "upbo"; + rev = "63514c484e70cd6eeae828f7e58216e1a3429184"; + sha256 = "0dwff302v38hxxspfap49w1afx8g3scl4gm30ksybnfph1pa29l4"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5232078b065dcca04388ccc76aa01a6159395d5/recipes/upbo"; + sha256 = "15rqz9z49363anrhli08vk155wp21hq3j7xsvd98lkq9ip6aglns"; + name = "recipe"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/upbo"; + license = lib.licenses.free; + }; + }) {}; + uptimes = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "uptimes"; - version = "20170830.533"; + ename = "uptimes"; + version = "20180416.623"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "c2c1b44b16a0fd873193b17c580ef3dfdacea580"; - sha256 = "1rq4m77fydkawdwkbw8125ihmvv6aisr03nwb1857k3hxhrg0gwv"; + rev = "5e81f8bb419836602819045e7d5a74b76ad3e69c"; + sha256 = "04l452k249s3ilfj0da0k7rrfyjnxxdsipa2al46xqjds8l3h2rn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h"; - name = "uptimes"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -74437,9 +96663,13 @@ license = lib.licenses.free; }; }) {}; - url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + url-shortener = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "url-shortener"; + ename = "url-shortener"; version = "20170804.1942"; src = fetchFromGitHub { owner = "yuyang0"; @@ -74447,10 +96677,10 @@ rev = "06db8270213b9e352d6c335b0663059a1353d05e"; sha256 = "1ndcajgvfl46zw2iwgghvcldsy9p778pifkhlanivc6azajhpjhh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/url-shortener"; sha256 = "08zsirsndhr8xny2vkzznkvjs0b6490lzd915ws6crdwxp6mx5si"; - name = "url-shortener"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74458,9 +96688,13 @@ license = lib.licenses.free; }; }) {}; - urlenc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + urlenc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "urlenc"; + ename = "urlenc"; version = "20140116.656"; src = fetchFromGitHub { owner = "buzztaiki"; @@ -74468,10 +96702,10 @@ rev = "835a6dcb783bbe84714bae87a3464aa0b128bfac"; sha256 = "0xwr0v4f64d7hi5ldig4r5yjn8h3f8by49g5820187lsp7ng2nw4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c36c416a13328ab762041dd62407b7b0696de93/recipes/urlenc"; sha256 = "0n6shh95m11162zsnf62zy1ljswdjznjilxx2dbqyqdrn7qr2dgh"; - name = "urlenc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74479,9 +96713,13 @@ license = lib.licenses.free; }; }) {}; - usage-memo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + usage-memo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "usage-memo"; + ename = "usage-memo"; version = "20170925.1737"; src = fetchFromGitHub { owner = "rubikitch"; @@ -74489,10 +96727,10 @@ rev = "88e15a9942a3e0a6e36e9c3e51e3edb746067b1a"; sha256 = "1aalrgyk8pwsc07qmczqhgccjli6mcckkbgpass3kvrkcfxdl2zk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/usage-memo"; sha256 = "0fv96xd6gk12nv98zccwncr00qms0pmrp0cv7iipbz54s20g0745"; - name = "usage-memo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74500,20 +96738,26 @@ license = lib.licenses.free; }; }) {}; - use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + use-package = callPackage ({ bind-key + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "use-package"; - version = "20180314.1143"; + ename = "use-package"; + version = "20180715.1101"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "512aa50b025018cb8574498d868814f73c02bb9b"; - sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; + rev = "3fb8f39f5901a4c0ef7887283e56e60b541675ea"; + sha256 = "0am5kh073x52lrh1225m5wl4r18wffznlvhrrmm1wbya6n406q9h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp"; - name = "use-package"; + name = "recipe"; }; packageRequires = [ bind-key emacs ]; meta = { @@ -74521,20 +96765,28 @@ license = lib.licenses.free; }; }) {}; - use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }: - melpaBuild { + use-package-chords = callPackage ({ bind-chord + , bind-key + , fetchFromGitHub + , fetchurl + , key-chord + , lib + , melpaBuild + , use-package }: + melpaBuild { pname = "use-package-chords"; - version = "20180127.1413"; + ename = "use-package-chords"; + version = "20180703.1258"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "512aa50b025018cb8574498d868814f73c02bb9b"; - sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; + rev = "4f0f5856798b8575d3d466fce2a3aed0ebf1acf1"; + sha256 = "1j1wgyhb0lvj0znkq56q5vv3irfgb6w3mwpcrvxq0b0wkwr121gz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords"; sha256 = "1217l0gpxcp8532p0d3g1xd2015qpx2g5xm0kwsbxdmffqqdaar3"; - name = "use-package-chords"; + name = "recipe"; }; packageRequires = [ bind-chord bind-key key-chord use-package ]; meta = { @@ -74542,9 +96794,14 @@ license = lib.licenses.free; }; }) {}; - use-package-el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: - melpaBuild { + use-package-el-get = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , use-package }: + melpaBuild { pname = "use-package-el-get"; + ename = "use-package-el-get"; version = "20180130.2105"; src = fetchFromGitHub { owner = "edvorg"; @@ -74552,10 +96809,10 @@ rev = "f33c448ed43ecb003b60ff601ee7ef9b08cff947"; sha256 = "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee4a96cf467bcab171a0adfd4ef754abec1a9971/recipes/use-package-el-get"; sha256 = "0sg9ijkjax6w25p0q7rw5rjn8r2i83z5jfzjkvy8pxil5cg8zyh0"; - name = "use-package-el-get"; + name = "recipe"; }; packageRequires = [ use-package ]; meta = { @@ -74563,20 +96820,26 @@ license = lib.licenses.free; }; }) {}; - use-package-ensure-system-package = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, system-packages, use-package }: - melpaBuild { + use-package-ensure-system-package = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , system-packages + , use-package }: + melpaBuild { pname = "use-package-ensure-system-package"; - version = "20180316.1307"; + ename = "use-package-ensure-system-package"; + version = "20180710.29"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "512aa50b025018cb8574498d868814f73c02bb9b"; - sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw"; + rev = "cfce01be52162d2eb4526bbb9b3bf721cca74202"; + sha256 = "0wlyl0zya165kbf5f8swnkkbqnzxwggyc597xz0wy5wmiyr55v4l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package"; sha256 = "1cl61nwgsz5dh3v9rdiww8mq2k1sbx27gr6izb4ij4pnzjp7aaj6"; - name = "use-package-ensure-system-package"; + name = "recipe"; }; packageRequires = [ system-packages use-package ]; meta = { @@ -74584,9 +96847,41 @@ license = lib.licenses.free; }; }) {}; - usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + use-ttf = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "use-ttf"; + ename = "use-ttf"; + version = "20180608.2252"; + src = fetchFromGitHub { + owner = "jcs090218"; + repo = "use-ttf"; + rev = "be1599e10ae5c095cd263a1d9be3e8270f770f55"; + sha256 = "141gpnpj4gia7wyn60v24r0ysr0m2cx0p3sdh956hsk6bh29l78h"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8af853b2db58300ba1685e3547a9f96c05b04df6/recipes/use-ttf"; + sha256 = "08bylry03q1vy1dx8vcdc4drrn4c97hr45nsz5xc0369jmfvqavs"; + name = "recipe"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/use-ttf"; + license = lib.licenses.free; + }; + }) {}; + usql = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "usql"; + ename = "usql"; version = "20180305.1523"; src = fetchFromGitHub { owner = "nickbarnwell"; @@ -74594,10 +96889,10 @@ rev = "bfaf428b366a9a185eef84f0d645a98dc918fe3d"; sha256 = "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql"; sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84"; - name = "usql"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -74605,20 +96900,25 @@ license = lib.licenses.free; }; }) {}; - utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + utop = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "utop"; - version = "20180228.305"; + ename = "utop"; + version = "20180706.1549"; src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "1b4bd052c6513d38f6cc626c24665637d25fdc07"; - sha256 = "05pv6nj88im1jf9nngv56z362wrp9pmkzrjn3nm846rdzbc5f21j"; + rev = "48100fcf769bdaeb4a6c93bbb33c37b85c1dcb10"; + sha256 = "1cr1i5ywn9abqbrl4iq1c82vdjwrbh43v67zv1a8i4fvh99yzlv1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7"; - name = "utop"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -74626,9 +96926,13 @@ license = lib.licenses.free; }; }) {}; - uuid = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + uuid = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "uuid"; + ename = "uuid"; version = "20120910.151"; src = fetchFromGitHub { owner = "nicferrier"; @@ -74636,10 +96940,10 @@ rev = "1519bfeb0e31602b840bc8dd35d7c7e732c159fe"; sha256 = "0r74gw8gcbrr62rvj4anz0c3n6kwi1xpb42d3pkzlh4igblhi5zj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/uuid"; sha256 = "0d69z9686gnd1bb17wa44v1rbbgccacn4kicwf9niwwp05nccfw6"; - name = "uuid"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74647,9 +96951,13 @@ license = lib.licenses.free; }; }) {}; - uuidgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + uuidgen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "uuidgen"; + ename = "uuidgen"; version = "20140918.1601"; src = fetchFromGitHub { owner = "kanru"; @@ -74657,10 +96965,10 @@ rev = "7eb96415484c3854a3f383d1a3e10b87ae674e22"; sha256 = "19bf6vpc2b9hfjkjanji96fflvk1lbillasnpwcb6zzyq0cs47bw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bdeb5848d0b160a74e834ed918e83653d7342bf/recipes/uuidgen"; sha256 = "1qaz7hg0wsdkl0jb7v7vrkjs554i2zgpxl8xq2f8q7m4bs2m5k48"; - name = "uuidgen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74668,9 +96976,16 @@ license = lib.licenses.free; }; }) {}; - v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request }: - melpaBuild { + v2ex-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , request }: + melpaBuild { pname = "v2ex-mode"; + ename = "v2ex-mode"; version = "20160719.2045"; src = fetchFromGitHub { owner = "aborn"; @@ -74678,10 +96993,10 @@ rev = "b7d19bb594b43ea3824a6f215dd1e5d1d4c0e8ad"; sha256 = "0hhj5xfm7mp3ajrbj9ai5p2d9akaqkj89rmqmg1vpyfp3x2f4h2k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b27b7d777415aa350c8c30822e239b9a4c02e77d/recipes/v2ex-mode"; sha256 = "04frd6jbnf9g7ak2fdbik9iji7b0903cpbg1hx7rai1853af7gh1"; - name = "v2ex-mode"; + name = "recipe"; }; packageRequires = [ cl-lib let-alist request ]; meta = { @@ -74689,9 +97004,13 @@ license = lib.licenses.free; }; }) {}; - vagrant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vagrant = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vagrant"; + ename = "vagrant"; version = "20170301.1406"; src = fetchFromGitHub { owner = "ottbot"; @@ -74699,10 +97018,10 @@ rev = "636ce2f9af32ea199170335a9cf1201b64873440"; sha256 = "06zws69z327p00jw3zaf67niji2d4j339xmhbsrwbcr4w65dmz94"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/vagrant"; sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf"; - name = "vagrant"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74710,9 +97029,14 @@ license = lib.licenses.free; }; }) {}; - vagrant-tramp = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vagrant-tramp = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vagrant-tramp"; + ename = "vagrant-tramp"; version = "20160427.1632"; src = fetchFromGitHub { owner = "dougm"; @@ -74720,10 +97044,10 @@ rev = "453ba605b28d2964bb4e10074f1e6891ebb4d2d6"; sha256 = "138gw90wa2qyzyicig3cwhpb1xc5bh9g0vb87y91afjlykhzr6a5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/baea9f16e245aec3f62e55471358c7208f61372d/recipes/vagrant-tramp"; sha256 = "0ij7k27zj22sl7inx141l4dg0ymywnvyabjvaqzc0xjdj0cky5c5"; - name = "vagrant-tramp"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -74731,9 +97055,13 @@ license = lib.licenses.free; }; }) {}; - vala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vala-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vala-mode"; + ename = "vala-mode"; version = "20150324.1525"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -74741,10 +97069,10 @@ rev = "fb2871a4492d75d03d72e60474919ab89adb267b"; sha256 = "10vs4d8csww781j1ps3f6dczy5zzza36z7a8zqk40fg4x57ikw44"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cea26fa67a524b7c14be2952cfbd4f657431415f/recipes/vala-mode"; sha256 = "164dhlsiflhpdymk3q5x0bv8gpbwfp34lnkhm2x90kdakfzqf91p"; - name = "vala-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74752,9 +97080,14 @@ license = lib.licenses.free; }; }) {}; - vala-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + vala-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "vala-snippets"; + ename = "vala-snippets"; version = "20150428.2052"; src = fetchFromGitHub { owner = "gopar"; @@ -74762,10 +97095,10 @@ rev = "671439501060449bd100b9fffd524a86064fbfbb"; sha256 = "0iscaz8lm4fk6w13f68ysqk8ppng2wj9fkkkq1rfqz77ws66f8nq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70f130c5751f47c1ead5f8915680e817e0239a2a/recipes/vala-snippets"; sha256 = "14hmmic0px3z38dm2dg0kis6cz1p3p1hj7xaqnqjmv02dkx2mmcy"; - name = "vala-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -74773,9 +97106,16 @@ license = lib.licenses.free; }; }) {}; - vbasense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + vbasense = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "vbasense"; + ename = "vbasense"; version = "20140221.1553"; src = fetchFromGitHub { owner = "aki2o"; @@ -74783,10 +97123,10 @@ rev = "8c61a492d7c15218ae1a96e2aebfe6f78bfff6db"; sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e7dd1e985d55149f48e4f93a31fb28ec01a4add/recipes/vbasense"; sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n"; - name = "vbasense"; + name = "recipe"; }; packageRequires = [ auto-complete log4e yaxception ]; meta = { @@ -74794,9 +97134,13 @@ license = lib.licenses.free; }; }) {}; - vc-auto-commit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vc-auto-commit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vc-auto-commit"; + ename = "vc-auto-commit"; version = "20170107.533"; src = fetchFromGitHub { owner = "thisirs"; @@ -74804,10 +97148,10 @@ rev = "446f664f4ec835532f4f18ba18b5fb731f6030aa"; sha256 = "18jjl656ps75p7n3hf16mcjrgiagnjvb8m8dl4i261cbnq98qmav"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/770ab1e99fe63789726fc6c8c5d7e9a0287bc5fa/recipes/vc-auto-commit"; sha256 = "1xpp7vbld3jgcr249m5h7il919kfg7d5ap3zs64i27axzdhv26zk"; - name = "vc-auto-commit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74815,9 +97159,13 @@ license = lib.licenses.free; }; }) {}; - vc-check-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vc-check-status = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vc-check-status"; + ename = "vc-check-status"; version = "20170107.534"; src = fetchFromGitHub { owner = "thisirs"; @@ -74825,10 +97173,10 @@ rev = "37734beb16bfd8633ea328059bf9a47eed826d5c"; sha256 = "0mspksr2i6hkb7bhs38ydmn0d2mn7g1hjva60paq86kl7k76f7ra"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0387e08dd7ed69b291e896d85bd975c4f5dcbd09/recipes/vc-check-status"; sha256 = "1kwnxa0ndfj8b211xy5d47sxkwmsay0kk8q7azfm5ag5dkg56zgi"; - name = "vc-check-status"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74836,9 +97184,14 @@ license = lib.licenses.free; }; }) {}; - vc-darcs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vc-darcs = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vc-darcs"; + ename = "vc-darcs"; version = "20170904.2020"; src = fetchFromGitHub { owner = "velkyel"; @@ -74846,10 +97199,10 @@ rev = "390fb1ebdda1ffac45b9be02626dde3b6d95ac11"; sha256 = "1fcqkavc7hlbhswx5nnaqhash42cjsbr72ijznx5cplr582g3mfq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54f89c50ae45365e86bdadcf67b2411c0f4c5603/recipes/vc-darcs"; sha256 = "1xskl9wjxkbdpi0fm769ymbvya70vssi944x5252w2d3layibm6m"; - name = "vc-darcs"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -74857,9 +97210,13 @@ license = lib.licenses.free; }; }) {}; - vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vc-fossil = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vc-fossil"; + ename = "vc-fossil"; version = "20180215.835"; src = fetchFromGitHub { owner = "venks1"; @@ -74867,10 +97224,10 @@ rev = "7c5af95181213db38f81f5f9586f3334301a3ea0"; sha256 = "1c18ywvs0l5w7ip2igksjy48awzas8mph7plpvp1v8c67a3a3m2m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c5ee4b625b90c1af66d7d11a25af8e1aa307b1/recipes/vc-fossil"; sha256 = "11ps2wrkjrjm1d984mf80wwj1hzskw5qrn0nv7md21lp75kxsvxb"; - name = "vc-fossil"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74878,20 +97235,26 @@ license = lib.licenses.free; }; }) {}; - vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + vc-msg = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "vc-msg"; - version = "20171106.1747"; + ename = "vc-msg"; + version = "20180604.1758"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "vc-msg"; - rev = "9d40d94c0a73f46047e2f6d40be795638e5c3ebc"; - sha256 = "1fgkaa93hyszgp2r98rzr7c84f83q1kb9vr9xmj8g9sqak4y1dsr"; + rev = "ffd8db482cbd9fb63dace0e5ddcc7207a9c99f5e"; + sha256 = "1zq01k50d958prl8aaz8n2sv541lrq3s1dn8vnfal4drn3iffgv9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg"; sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9"; - name = "vc-msg"; + name = "recipe"; }; packageRequires = [ emacs popup ]; meta = { @@ -74899,9 +97262,13 @@ license = lib.licenses.free; }; }) {}; - vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vc-osc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vc-osc"; + ename = "vc-osc"; version = "20161119.1155"; src = fetchFromGitHub { owner = "aspiers"; @@ -74909,10 +97276,10 @@ rev = "8c09a0d5f69237285101554261b77d76b546a24b"; sha256 = "153zwhljkjl0dajd1l6p5icva0bnpa2rj8byjblb3xv8rq7p1fzc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a1fa5fdfdfa9ec5607524be62eb44fe82e91b0/recipes/vc-osc"; sha256 = "0rp33945xk5d986brganqnn55psmlkj6glbimxakhgv9a1r85sxz"; - name = "vc-osc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74920,9 +97287,13 @@ license = lib.licenses.free; }; }) {}; - vcl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vcl-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vcl-mode"; + ename = "vcl-mode"; version = "20170119.1251"; src = fetchFromGitHub { owner = "ssm"; @@ -74930,10 +97301,10 @@ rev = "3d86c1352a7370d558d25f4c8f7be744e7d27332"; sha256 = "1zp59p8pw65qy7s9y17a52y1pm35hajdfn3p1kfm1y3vmfxf9x3a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bcbe3892fd20e624117de534ca92ba3fba1669a1/recipes/vcl-mode"; sha256 = "1h0a1briinp9ka7ga3ipdhyf7yfinwvf7babv36myi720900wcq5"; - name = "vcl-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74941,9 +97312,13 @@ license = lib.licenses.free; }; }) {}; - vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vcomp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vcomp"; + ename = "vcomp"; version = "20140906.1508"; src = fetchFromGitHub { owner = "tarsius"; @@ -74951,10 +97326,10 @@ rev = "092ef48a78e950c0576269d889be6caf9f6e61c5"; sha256 = "0fzz26c1pdaz3i58ndhzd2520mhny487daqs21yajxi9x2m00zrl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/561442ea9f75ebe8444db1a0c40f7756fcbca482/recipes/vcomp"; sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0"; - name = "vcomp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -74962,20 +97337,26 @@ license = lib.licenses.free; }; }) {}; - vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: - melpaBuild { + vdiff = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild }: + melpaBuild { pname = "vdiff"; - version = "20170525.1231"; + ename = "vdiff"; + version = "20180719.1327"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff"; - rev = "66ae1ac324d9ec7ef87abee38f260734f036cf3d"; - sha256 = "0d8zam8p6qyzjr99n0jpmjav429qkjgg59gidmhgf0cbx2pyvy8s"; + rev = "40ffc92c566b55264f48167a02c17518743870b4"; + sha256 = "0r17cw58yabrkjrqis5bz7ikr1lgczpzd7zz895fzqrg4n901bj5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; sha256 = "11gw0l63fssbiyhngqb7ykrp7m1vy55wlf27ybhh2dkwh1cpkr4l"; - name = "vdiff"; + name = "recipe"; }; packageRequires = [ emacs hydra ]; meta = { @@ -74983,20 +97364,27 @@ license = lib.licenses.free; }; }) {}; - vdiff-magit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, vdiff }: - melpaBuild { + vdiff-magit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild + , vdiff }: + melpaBuild { pname = "vdiff-magit"; - version = "20170519.1407"; + ename = "vdiff-magit"; + version = "20180719.1401"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff-magit"; - rev = "1ccf0a8be5aad18648fd59c775a8dd6070398b74"; - sha256 = "1skcrpfgz2c9s9r2xvwanrvyczcqjgmjrwjm188d55l4pn8ylr83"; + rev = "73912622680ce761779158526e993933a2dbcb9e"; + sha256 = "1vcqfi94xs0ri5zv5h1pw8i0jy1gbx8811i2fshw70f1rmlzmaid"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2159275fabde8ec8b297f6635546b1314d519b8b/recipes/vdiff-magit"; sha256 = "1vjc1r5xfdg9bmscgppx1fps1w5bd0zpp6ab5z5dxlg2zx2vdldw"; - name = "vdiff-magit"; + name = "recipe"; }; packageRequires = [ emacs magit vdiff ]; meta = { @@ -75004,20 +97392,28 @@ license = lib.licenses.free; }; }) {}; - vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }: - melpaBuild { + vdirel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , org-vcard + , seq }: + melpaBuild { pname = "vdirel"; + ename = "vdirel"; version = "20170605.43"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "vdirel"; - rev = "72399f5e09f53aa25a068be8689cb711b8accf08"; - sha256 = "1xlzm2c6wcmrjjwl61552yaijjsiazbs2lxn1y5p7xbj9x7jrkn9"; + rev = "a1e6ea3ed5faaf70667c62bc5591dc810331cb1a"; + sha256 = "1z8q3akm0hq7z7nqclra1wv7a6m0cbskhnd3ca4v9wf9dajiwnsb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel"; sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj"; - name = "vdirel"; + name = "recipe"; }; packageRequires = [ emacs helm org-vcard seq ]; meta = { @@ -75025,20 +97421,24 @@ license = lib.licenses.free; }; }) {}; - vector-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vector-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vector-utils"; + ename = "vector-utils"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "vector-utils"; - rev = "c38ca1c6a23b2b51a6ac36c2c64e50e21cbe9d21"; - sha256 = "1wa03gb98x650q798aqshm43kh6gfxaz1rlyrmvka5dxgf48whmf"; + rev = "5f9ced3960a318d611c3d20ffdc9ca74054fa8b7"; + sha256 = "11mqjymcgssahlpc83qflcavjs2lrk0rq4pq2nq9sxm2dgnvrz86"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/081aa3e1d50c2c9e5a9b9ce0716258a93279f605/recipes/vector-utils"; sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n"; - name = "vector-utils"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75046,9 +97446,14 @@ license = lib.licenses.free; }; }) {}; - verify-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + verify-url = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "verify-url"; + ename = "verify-url"; version = "20160426.528"; src = fetchFromGitHub { owner = "lujun9972"; @@ -75056,10 +97461,10 @@ rev = "d6f3623cda8cd526a2d198619b137059cb1ba1ab"; sha256 = "1y6vjw5qzaxr37spg5d4nxffmhiipzsrd7mvh8bs3jcfrsg3080n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2070f7b1901c83e59468f6498bd5f79077ccb79d/recipes/verify-url"; sha256 = "1gd83rb1q0kywchd0345p5axqj1sv4f5kadympx5pbp4n5p1dqb2"; - name = "verify-url"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -75067,9 +97472,14 @@ license = lib.licenses.free; }; }) {}; - vertica = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sql ? null }: - melpaBuild { + vertica = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sql ? null }: + melpaBuild { pname = "vertica"; + ename = "vertica"; version = "20131217.711"; src = fetchFromGitHub { owner = "r0man"; @@ -75077,10 +97487,10 @@ rev = "3c9647b425c5c13c30bf0cba483646af18196588"; sha256 = "1mp71axs3vdrdwlhgywfldvnr6a1g2qbxiywmpfmcv59n5n58p1j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f98a06b794ef0936db953f63679a63232295a849/recipes/vertica"; sha256 = "1ljjk6zrbr2k0s0iaqd9iq3j45cavijcx0rqdidliswnfllav4ng"; - name = "vertica"; + name = "recipe"; }; packageRequires = [ sql ]; meta = { @@ -75088,9 +97498,14 @@ license = lib.licenses.free; }; }) {}; - vertica-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + vertica-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "vertica-snippets"; + ename = "vertica-snippets"; version = "20180208.154"; src = fetchFromGitHub { owner = "baron42bba"; @@ -75098,10 +97513,10 @@ rev = "5959d86c77d4b8f67383f65f7f6ca3e0db2a9529"; sha256 = "0hmvd2kly7k51qfhkg6rzcq0a5ksskr1r0x07i0imz0idm77g29z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c8cb5c0fdbb6820a08091d8936dd53a3c43c56/recipes/vertica-snippets"; sha256 = "0044qcf6dyxp2h14ij6w19zs7ikx9xalfrz6jqbl8sy35wcihmhn"; - name = "vertica-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -75109,20 +97524,25 @@ license = lib.licenses.free; }; }) {}; - vertigo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vertigo = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vertigo"; - version = "20160429.2105"; + ename = "vertigo"; + version = "20180408.920"; src = fetchFromGitHub { owner = "noctuid"; repo = "vertigo.el"; - rev = "70b56a57c3a37735cc9e92ffaa6dc27c64437738"; - sha256 = "044vy6yi9yfk3h2gd3a718w50py02h1b5fr0i7a08rjlq4l3srka"; + rev = "117450dfad5d5ad45d40995cdf9a626cf9c2b136"; + sha256 = "1bxf2kzdj4xmy6wmajwvn40msp2q4szp25ylah49biw92dwi2bzw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1957e7fa03b6b8eb2f3250bd814d707bce3cfa3/recipes/vertigo"; sha256 = "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83"; - name = "vertigo"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -75130,9 +97550,13 @@ license = lib.licenses.free; }; }) {}; - vhdl-capf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vhdl-capf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vhdl-capf"; + ename = "vhdl-capf"; version = "20160221.934"; src = fetchFromGitHub { owner = "sh-ow"; @@ -75140,10 +97564,10 @@ rev = "290abe217050f33532bc9ccb04f894123402f414"; sha256 = "185a7962h94122q783ih7s8r28xifm0bcrqvkd0g4p64mijlbh3d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6192f5777bc8be6ddc5523f92ab641ed3af1a504/recipes/vhdl-capf"; sha256 = "06dkw5ra9wnscpgrnx851vyfgr5797xd60qdimsr2v1bqd8si9km"; - name = "vhdl-capf"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75151,20 +97575,28 @@ license = lib.licenses.free; }; }) {}; - vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: - melpaBuild { + vhdl-tools = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ggtags + , helm + , lib + , melpaBuild + , outshine }: + melpaBuild { pname = "vhdl-tools"; - version = "20171111.930"; + ename = "vhdl-tools"; + version = "20180610.958"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "6bbcbdfbff7154517178290371b0182a176c09b5"; - sha256 = "16k2h8n85ldfjb4zh7f202q370zs0rmmjhgf2jr4xfrvbdmgr8pa"; + rev = "4e9df06c3519be22f1f713d18c80d325a5b0c3d2"; + sha256 = "0n6mmbg8g3ip3dkbc4kxqxsd4p1h7jry25n1cqvzm24x1adwlcfm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw"; - name = "vhdl-tools"; + name = "recipe"; }; packageRequires = [ emacs ggtags helm outshine ]; meta = { @@ -75172,20 +97604,25 @@ license = lib.licenses.free; }; }) {}; - vi-tilde-fringe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vi-tilde-fringe = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vi-tilde-fringe"; + ename = "vi-tilde-fringe"; version = "20141027.1942"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "vi-tilde-fringe"; - rev = "f1597a8d54535bb1d84b442577b2024e6f910308"; - sha256 = "0wdm8k49zl6i6wnh7vjkswdh5m9lix56jv37xvc90inipwgs402z"; + rev = "e6e15638e8c45a5e68d0874d5d8c9a46c4f38a54"; + sha256 = "08bsman85x2l94ighzcj3xkis1snjc96bmgc8yfk63vqlybv5pw9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b3359d57148f8205f8a863a21d92fe4912f31cc/recipes/vi-tilde-fringe"; sha256 = "0jhwv46gjwjbs1ai65nm6k15y0q4yl9m5mawgp3n4f45dh02cawp"; - name = "vi-tilde-fringe"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -75193,9 +97630,13 @@ license = lib.licenses.free; }; }) {}; - viewer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + viewer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "viewer"; + ename = "viewer"; version = "20170106.1802"; src = fetchFromGitHub { owner = "rubikitch"; @@ -75203,10 +97644,10 @@ rev = "6c8db025bf4021428f7f2c3ef9d74fb13f5d267a"; sha256 = "1sj4a9zwfv94m0ac503gan6hf9sl2658khab1fnj8szcq7hrdvq1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/viewer"; sha256 = "10rw3b8akd2fl8gsqf1m24zi6q4n0z68lvvv1vx9c9b7ghqcqxw1"; - name = "viewer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75214,9 +97655,13 @@ license = lib.licenses.free; }; }) {}; - viking-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + viking-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "viking-mode"; + ename = "viking-mode"; version = "20160705.1327"; src = fetchFromGitHub { owner = "tlinden"; @@ -75224,10 +97669,10 @@ rev = "c76aa265d13ad91d6890d242e142d05e31f0340b"; sha256 = "1944p3kbskzj4d9w9prbi7z59lrn087v3gphbhwjplz6mvwbl8g6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5805575f353c14a62d00543a23eb4c638d9d52dc/recipes/viking-mode"; sha256 = "13g6gw8yc4pgi1zjig6nlpnsh52dzmprisq95r6lx6hk0xbzrx16"; - name = "viking-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75235,20 +97680,25 @@ license = lib.licenses.free; }; }) {}; - vim-empty-lines-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vim-empty-lines-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vim-empty-lines-mode"; + ename = "vim-empty-lines-mode"; version = "20150110.2026"; src = fetchFromGitHub { owner = "jmickelin"; repo = "vim-empty-lines-mode"; - rev = "d4a5034ca8ea0c962ad6e92c86c0fa2a74d2964b"; - sha256 = "11qh6fpf6269j9syf06v5wnkgi65wnn7dbyjwb6yz72rvq7ihhcz"; + rev = "442a29b0ba1635a3b352c9dd1faf9ce99656d048"; + sha256 = "09x857vbx35rpyc5x1322ajby613gva090x4vawaczk22idq65h4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e93a8dcd2ff159203288e71da6b8f28eab0d2006/recipes/vim-empty-lines-mode"; sha256 = "17bl1g4ais73ws596mha0l8dgckfqhx9k2v9m9k0gw7kg7dcjhnb"; - name = "vim-empty-lines-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -75256,9 +97706,14 @@ license = lib.licenses.free; }; }) {}; - vim-region = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vim-region = callPackage ({ expand-region + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vim-region"; + ename = "vim-region"; version = "20140329.924"; src = fetchFromGitHub { owner = "ongaeshi"; @@ -75266,10 +97721,10 @@ rev = "7c4a99ce3678fee40c83ab88e8ad075d2a935fdf"; sha256 = "13g2hin100c8h5bd7hzhyqzj02ab9c35giyv963l7y044v7sbwig"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23249b485ca8e66a21f858712f46aa76b8554f28/recipes/vim-region"; sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx"; - name = "vim-region"; + name = "recipe"; }; packageRequires = [ expand-region ]; meta = { @@ -75277,20 +97732,27 @@ license = lib.licenses.free; }; }) {}; - vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vimish-fold = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vimish-fold"; + ename = "vimish-fold"; version = "20171231.2212"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "c904cd3e8515e76fb836615305e174369211f6df"; - sha256 = "1kwd6f2qi3p41kryd8z01lkiw7ikpgywgpfy9zbjyb5x6z2hn35s"; + rev = "1469c953bc20d21d87ce5d92def767e551cda07c"; + sha256 = "0nywz6nk1qanx7z9sykf28h9c2qj7xzs9w4hya4vmhwigqqbhldl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3"; - name = "vimish-fold"; + name = "recipe"; }; packageRequires = [ cl-lib emacs f ]; meta = { @@ -75298,9 +97760,13 @@ license = lib.licenses.free; }; }) {}; - vimrc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vimrc-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vimrc-mode"; + ename = "vimrc-mode"; version = "20170814.1837"; src = fetchFromGitHub { owner = "mcandre"; @@ -75308,10 +97774,10 @@ rev = "ba8140fba6e03a35b123acbd62fc8c6f0a03bf4a"; sha256 = "07pwmjaa24hh20bcanmxgnaf050c0j6190i0qfvpd0gpc4p80pxx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vimrc-mode"; sha256 = "05zmr624qwsj9wqsmjlhjvjl1fc1qxz4vvbb3ljr5fbpxdjrbnpn"; - name = "vimrc-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75319,20 +97785,24 @@ license = lib.licenses.free; }; }) {}; - virtualenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + virtualenv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "virtualenv"; + ename = "virtualenv"; version = "20140220.1501"; src = fetchFromGitHub { owner = "aculich"; repo = "virtualenv.el"; - rev = "276c0f4d6493b402dc4d22ecdf17b2b072e911b3"; - sha256 = "0rd7hyv66278dj32yva5q9z1749y84c6fwl2iqrns512j1l4kl8q"; + rev = "cc82856b6316d5e78073de717f0d5d1a4ee35fa6"; + sha256 = "1appaxy44njjyp5jp8l0nyqrvbi8hkdvbdfvvf5n08ad43g281p1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/923e4fcf29423ad55b13132d53759bc436466ef9/recipes/virtualenv"; sha256 = "1djqzzlbwsp9xyjqjbjwdck73wzikbpq19irzamybk90nc98wirl"; - name = "virtualenv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75340,9 +97810,15 @@ license = lib.licenses.free; }; }) {}; - virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + virtualenvwrapper = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "virtualenvwrapper"; + ename = "virtualenvwrapper"; version = "20180211.1744"; src = fetchFromGitHub { owner = "porterjamesj"; @@ -75350,10 +97826,10 @@ rev = "bf13158dde071bdf4901709ed101aba6b8a25f7f"; sha256 = "003nj9i6kfjyw1bdz1y3dssp3ff7irhsfq21r430xvdfnzrby4ky"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i"; - name = "virtualenvwrapper"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -75361,20 +97837,24 @@ license = lib.licenses.free; }; }) {}; - visible-mark = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + visible-mark = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "visible-mark"; + ename = "visible-mark"; version = "20150623.2150"; src = fetchFromGitLab { owner = "iankelling"; repo = "visible-mark"; - rev = "a584db9bc88953b23a9648b3e14ade90767207f8"; - sha256 = "1rsi9irv9i03627cmfaqz03f9cvpm7555ga8n2gs622lzp6bb3jf"; + rev = "c1852e13b6b61982738b56977a452ec9026faf1b"; + sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/visible-mark"; sha256 = "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80"; - name = "visible-mark"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75382,9 +97862,13 @@ license = lib.licenses.free; }; }) {}; - visual-ascii-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + visual-ascii-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "visual-ascii-mode"; + ename = "visual-ascii-mode"; version = "20150129.246"; src = fetchFromGitHub { owner = "Dewdrops"; @@ -75392,10 +97876,10 @@ rev = "99285a099a17472ddd9f1b4f74e9d092dd8c5947"; sha256 = "1cv8mf3l92a9p8qmkfiphk3r81f2ihg2gyw2r4jbbd5ppwbxkl0n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21df748a3f383d62c921e184e2a4c9ae4118ca98/recipes/visual-ascii-mode"; sha256 = "1h0143h39dq61afswlzlgpknk0gv574x91ar6klqmnaf1snab59g"; - name = "visual-ascii-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75403,20 +97887,25 @@ license = lib.licenses.free; }; }) {}; - visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + visual-fill-column = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "visual-fill-column"; - version = "20170502.1300"; + ename = "visual-fill-column"; + version = "20180511.211"; src = fetchFromGitHub { owner = "joostkremers"; repo = "visual-fill-column"; - rev = "d97017e9bcca79e6a0f3ef63414a954319feb879"; - sha256 = "11w3krp5z6yxchqlz45kqiqf0y9drplmanixw3q4r5cwaspx94qh"; + rev = "606d86e38ca99704cf745fe9cadd603d6001cb0d"; + sha256 = "1fjzlw6i4jpd0lmdxkzgaypgr2cx5klkb6xwc5k684ly3xp8snc2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column"; sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5"; - name = "visual-fill-column"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -75424,9 +97913,14 @@ license = lib.licenses.free; }; }) {}; - visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + visual-regexp = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "visual-regexp"; + ename = "visual-regexp"; version = "20170228.1716"; src = fetchFromGitHub { owner = "benma"; @@ -75434,10 +97928,10 @@ rev = "b3096c2d391ff4e28a2a4e8cd82efbf11071ea85"; sha256 = "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp"; sha256 = "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z"; - name = "visual-regexp"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -75445,9 +97939,14 @@ license = lib.licenses.free; }; }) {}; - visual-regexp-steroids = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, visual-regexp }: - melpaBuild { + visual-regexp-steroids = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , visual-regexp }: + melpaBuild { pname = "visual-regexp-steroids"; + ename = "visual-regexp-steroids"; version = "20170221.1853"; src = fetchFromGitHub { owner = "benma"; @@ -75455,10 +97954,10 @@ rev = "a6420b25ec0fbba43bf57875827092e1196d8a9e"; sha256 = "1isqa4ck6pm4ykcrkr0g1qj8664jkpcsrq0f8dlb0sksns2dqkwj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f105ebce741956b7becc86e4bdfcafecf59af74/recipes/visual-regexp-steroids"; sha256 = "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr"; - name = "visual-regexp-steroids"; + name = "recipe"; }; packageRequires = [ visual-regexp ]; meta = { @@ -75466,30 +97965,13 @@ license = lib.licenses.free; }; }) {}; - vkill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "vkill"; - version = "20091203.1022"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "vkill"; - rev = "8ffe640ed03ddcc23db1c74c76d1acbf25250ad9"; - sha256 = "0hb845pnh2yska6alca8hbbxh65x7g81pr7852h8fddm0qd1agkd"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1fe8711711d5c7e1dfdf81b8153a193e6940a16c/recipes/vkill"; - sha256 = "09siqsip6d2h3jrxbdbhylkqm42dx3d2dqlkkdw3a81c7ga9lpwm"; - name = "vkill"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/vkill"; - license = lib.licenses.free; - }; - }) {}; - vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vlf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vlf"; + ename = "vlf"; version = "20180201.1454"; src = fetchFromGitHub { owner = "m00natic"; @@ -75497,10 +97979,10 @@ rev = "31b292dc85a374fb343789e217015683bfbdf5f1"; sha256 = "18ll47if9ajv0jj2aps8592bj7xqhxy74sbsqn07x9ywinxxi9mn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8"; - name = "vlf"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75508,9 +97990,14 @@ license = lib.licenses.free; }; }) {}; - vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vmd-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vmd-mode"; + ename = "vmd-mode"; version = "20180223.556"; src = fetchFromGitHub { owner = "blak3mill3r"; @@ -75518,10 +98005,10 @@ rev = "24e38a20951dfad6e3e985c7cc6286c1e271da5f"; sha256 = "00anpbnf0h6iikhpqz4mss507j41xwvv27svw41kpgcwsnrmrqwm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vmd-mode"; sha256 = "1xjyl2xh3vig2rzjqm1a4h2ridygbanmal78s4yc32hacy0lfyrx"; - name = "vmd-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -75529,9 +98016,14 @@ license = lib.licenses.free; }; }) {}; - voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + voca-builder = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "voca-builder"; + ename = "voca-builder"; version = "20161101.945"; src = fetchFromGitHub { owner = "yitang"; @@ -75539,10 +98031,10 @@ rev = "51573beec8cd8308477b0faf453aad93e17f57c5"; sha256 = "1gd7zqmyn389dfyx1yll1bw5f8kjib87k33s9hxsbx0db8vas9q6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42a930e024ce525b2890ccd5a1eb4844859faafd/recipes/voca-builder"; sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y"; - name = "voca-builder"; + name = "recipe"; }; packageRequires = [ popup ]; meta = { @@ -75550,9 +98042,13 @@ license = lib.licenses.free; }; }) {}; - volatile-highlights = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + volatile-highlights = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "volatile-highlights"; + ename = "volatile-highlights"; version = "20160611.1855"; src = fetchFromGitHub { owner = "k-talo"; @@ -75560,10 +98056,10 @@ rev = "9a20091f0ce7fc0a6b3e641a6a46d5f3ac4d8392"; sha256 = "1dsa6769lphyyv7yg92vkkpk395w52q4m7hdn8xy7s6lh5c6a955"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/volatile-highlights"; sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d"; - name = "volatile-highlights"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75571,9 +98067,13 @@ license = lib.licenses.free; }; }) {}; - volume = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + volume = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "volume"; + ename = "volume"; version = "20150718.1309"; src = fetchFromGitHub { owner = "dbrock"; @@ -75581,10 +98081,10 @@ rev = "ecc1550b3c8b501d37e0f0116b54b535d15f90f6"; sha256 = "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bde261750a2754c5bcf01b9a9260429609b8c2bf/recipes/volume"; sha256 = "1r01v453bpyh561j8ja36609hy60gc30arvmz4z3c1cybhv8sk1i"; - name = "volume"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75592,20 +98092,24 @@ license = lib.licenses.free; }; }) {}; - vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vue-html-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vue-html-mode"; - version = "20180104.1421"; + ename = "vue-html-mode"; + version = "20180428.1335"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "vue-html-mode"; - rev = "3fa65f8ac8a4c54f13c32fd43c9865c92c22ce07"; - sha256 = "00mj1qmcsfndnk7vif7aa9nqy7hd3cnbmn6fhik1mmsqrazcbp0h"; + rev = "361a9fa117f044c3072dc5a7344ff7be31725849"; + sha256 = "1z1pphxli8fcahw9fhmxls1v9nyd34pz51jwwa6g468zvdmcjb77"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode"; sha256 = "1f4pjfp4298jkvhacxygddg557hhyivgnm5x3yhjipfv6fjkgl2s"; - name = "vue-html-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75613,20 +98117,28 @@ license = lib.licenses.free; }; }) {}; - vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: - melpaBuild { + vue-mode = callPackage ({ edit-indirect + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mmm-mode + , ssass-mode + , vue-html-mode }: + melpaBuild { pname = "vue-mode"; - version = "20180104.1611"; + ename = "vue-mode"; + version = "20180515.2012"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "b489a63dabe0f2fee2730121ecabb1b4f4c11761"; - sha256 = "09fkyyj0lg3q9q0874q0jpvx1h8rf26g96sn9a2xw0j3fl5ab1n4"; + rev = "5491a4a765814c392de13617ca3ad4a32edd6399"; + sha256 = "10m5kc0zsvfwr1km66c36qzs6bckq1x0cx4r79vs7sxwwfz8mq2b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0"; - name = "vue-mode"; + name = "recipe"; }; packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ]; meta = { @@ -75634,9 +98146,39 @@ license = lib.licenses.free; }; }) {}; - w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vyper-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "vyper-mode"; + ename = "vyper-mode"; + version = "20180707.1235"; + src = fetchFromGitHub { + owner = "ralexstokes"; + repo = "vyper-mode"; + rev = "323dfddfc38f0b11697e9ebaf04d1b53297e54e5"; + sha256 = "1vxqgc9c1lj61ipaw05xfby3nl7wn3kp5ga6kpr17v0jlm0667s5"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/492d42d60bc188a567c5e438b838a275a124c699/recipes/vyper-mode"; + sha256 = "0mf1w4mw0ijmd9zxip1df85cp15fbvv9j5dqjmb8lfm4m43wpd96"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/vyper-mode"; + license = lib.licenses.free; + }; + }) {}; + w32-browser = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "w32-browser"; + ename = "w32-browser"; version = "20170101.1154"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -75644,10 +98186,10 @@ rev = "e5c60eafd8f8d3546a0fa295ad5af2414d36b4e6"; sha256 = "18hcr9l5id2xdin20wrg9sdmwfad7qk78iryyg24ci9lvl53m02x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/w32-browser"; sha256 = "16sp0gn4yv7iaa55i2kvfsqw3610gr3x31l9lqa14r9xmfhda1rn"; - name = "w32-browser"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75655,20 +98197,24 @@ license = lib.licenses.free; }; }) {}; - w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + w3m = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "w3m"; - version = "20180221.2059"; + ename = "w3m"; + version = "20180404.2220"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "4b9664bab3794379af42d549d9540735c16b5a25"; - sha256 = "16wics5k7w7b23zayh9j6jbh6dflk6r8wq75p9bnpw1n36gmm8ig"; + rev = "ea64ccb3d792b60f0815309f588bf46b1f0ca80e"; + sha256 = "13dhr36177363x5zjbm5ig4g9xg0x6j0j37smzqlwy2bp244mm06"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; sha256 = "0a4jql7ky62ickccbr2xnyggix5wf726d4pfz7mi3yxlw6i8m79s"; - name = "w3m"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75676,9 +98222,15 @@ license = lib.licenses.free; }; }) {}; - wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wacspace = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wacspace"; + ename = "wacspace"; version = "20180311.1650"; src = fetchFromGitHub { owner = "shosti"; @@ -75686,10 +98238,10 @@ rev = "54d19aab6fd2bc5945b7ffc58104e695064927e2"; sha256 = "1nfx1qsl2gxjqbbc5xsr8f3xz2qyb4wnz3634k3hglb1jpa78j3n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58e5ff4c5853c5350d0534894ddb358daa83cee9/recipes/wacspace"; sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl"; - name = "wacspace"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -75697,19 +98249,23 @@ license = lib.licenses.free; }; }) {}; - waf-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + waf-mode = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "waf-mode"; + ename = "waf-mode"; version = "20170403.1240"; src = fetchgit { url = "https://bitbucket.org/dvalchuk/waf-mode"; - rev = "20c75eabd1d54fbce8e0dbef785c9fb68577ee4f"; - sha256 = "09jqxbkkprsrcj7gj9hi8ll7d17425lyjmdmqf12ffqv5pz6aq87"; + rev = "91c761336aa137b85b88b53b3f0cc60786d70800"; + sha256 = "1j2bqhmxjfai343m6iv3a8z37hv154h9kbidbi39d1pz2fl5lv43"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44c1aa152ba47113a91878df78d9b56eead98744/recipes/waf-mode"; sha256 = "16rplrs599a67dcxcdc33zb9bqivv4a2mvrshvyip1lp75f36r5h"; - name = "waf-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75717,9 +98273,14 @@ license = lib.licenses.free; }; }) {}; - waher-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + waher-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "waher-theme"; + ename = "waher-theme"; version = "20141115.430"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -75727,10 +98288,10 @@ rev = "60d31519fcfd8e797723d47961b255ae2f2e2c0a"; sha256 = "0w59ix8cbbcyhh882c8vkrbh84i8d03h9w7dchr3qy233b8wcxlc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c734ba401d7d9255e0934c31ca5269866af035db/recipes/waher-theme"; sha256 = "091kipkb6z6x9ic4chprim9rvnmx4yj4419ijmvpn70w69aspnb5"; - name = "waher-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -75738,9 +98299,13 @@ license = lib.licenses.free; }; }) {}; - wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wakatime-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wakatime-mode"; + ename = "wakatime-mode"; version = "20170517.2053"; src = fetchFromGitHub { owner = "wakatime"; @@ -75748,10 +98313,10 @@ rev = "b1eae15f38a367017e519c10837c44650631b154"; sha256 = "0l2nwjz978lamlikipljw143j40bnli7rzf9rixsia9iby4krl25"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a46036a0e53afbebacafd3bc9545c99af79ccfcc/recipes/wakatime-mode"; sha256 = "1rhy2bwkqlha4bj3zmb0iassiglch7yb2kbas0bbpl3d0hdki2i8"; - name = "wakatime-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75759,9 +98324,41 @@ license = lib.licenses.free; }; }) {}; - wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + wakib-keys = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "wakib-keys"; + ename = "wakib-keys"; + version = "20180610.1952"; + src = fetchFromGitHub { + owner = "darkstego"; + repo = "wakib-keys"; + rev = "682e3241ebc9147f4e316627cbff456dd316e372"; + sha256 = "191j9pk989jwhczwimr8smx1qiiwy5d85j195z8aqg252m656fnw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b8ef5ae0dcb92e1cf019be3d53ab9b47d89f45bd/recipes/wakib-keys"; + sha256 = "1cgd15zwl15k2bxy3by17pphh6x1z8lanwkfjy4qyp5sxkjvw1cl"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/wakib-keys"; + license = lib.licenses.free; + }; + }) {}; + wand = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "wand"; + ename = "wand"; version = "20180112.454"; src = fetchFromGitHub { owner = "cmpitg"; @@ -75769,10 +98366,10 @@ rev = "e8939812e03255fff3e15c5d0f9d4da849aaf07b"; sha256 = "0l79vhf0s5rz9s02bmcfyx7yn4pvn3dnxkr50qfhqajrvfx1105g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand"; sha256 = "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l"; - name = "wand"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -75780,9 +98377,16 @@ license = lib.licenses.free; }; }) {}; - wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: - melpaBuild { + wandbox = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , s }: + melpaBuild { pname = "wandbox"; + ename = "wandbox"; version = "20170603.531"; src = fetchFromGitHub { owner = "kosh04"; @@ -75790,10 +98394,10 @@ rev = "e002fe41f2cd9b4ce2b1dc80b83301176e9117f1"; sha256 = "0fnbj3k21lisgs94pf8z13cdymmclgpn994xq3xly4gq6l8k0an5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox"; sha256 = "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz"; - name = "wandbox"; + name = "recipe"; }; packageRequires = [ emacs request s ]; meta = { @@ -75801,20 +98405,25 @@ license = lib.licenses.free; }; }) {}; - wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: - melpaBuild { + wanderlust = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , semi }: + melpaBuild { pname = "wanderlust"; - version = "20180316.1534"; + ename = "wanderlust"; + version = "20180605.631"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "f0c8c4e55be6569c4c56a1d041f5c53769e4d5ac"; - sha256 = "11p5kqp16bvas26i0zgdazqhgz6jb6j612q032g6d4476yb8df26"; + rev = "395826e99b84051396d503392f52462b6cb683a5"; + sha256 = "1i182aq8fmp232flwdvf3v6367pmzxvjjn4snvsy16wk5710vg3b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; sha256 = "0lq7fvqc0isv49lcm7ql6prc3hpcj5cx4kf8f4gcnfv5k8159cq9"; - name = "wanderlust"; + name = "recipe"; }; packageRequires = [ semi ]; meta = { @@ -75822,9 +98431,14 @@ license = lib.licenses.free; }; }) {}; - warm-night-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + warm-night-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "warm-night-theme"; + ename = "warm-night-theme"; version = "20161101.728"; src = fetchFromGitHub { owner = "mswift42"; @@ -75832,10 +98446,10 @@ rev = "020f084d23409b5035150508ba6e57c2509edd64"; sha256 = "1jmjyx06p0cvqi1vlg5px2g965q9pgi3j61msxjf5skzw53vlc88"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/312e3298d51b8ed72028df34dbd7620cdd03d8dd/recipes/warm-night-theme"; sha256 = "1nrjkrr64rry6fjya22b0lcs0f8a2ijvr87192z311y9mw5rvb29"; - name = "warm-night-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -75843,20 +98457,24 @@ license = lib.licenses.free; }; }) {}; - watch-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + watch-buffer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "watch-buffer"; + ename = "watch-buffer"; version = "20120331.1344"; src = fetchFromGitHub { owner = "mjsteger"; repo = "watch-buffer"; - rev = "761fd7252e6d7bf5148283c2a7ee935f087d9427"; - sha256 = "0i84ndnxma8s07kf5ixqyhv5f89mzc4iymgazj5inmxhvbc7s7r2"; + rev = "a01cf15608c5bf91df253104053041ca1afdf411"; + sha256 = "1gbhcvysrgg3xxyvkl3lkyafqmzxhfg5nb7k3zwlvmxmndnzssg8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/watch-buffer"; sha256 = "05f58kg05kfl4srwwjaf7w9jml50yx6bn4x8m1npswp882dsjyh9"; - name = "watch-buffer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75864,9 +98482,13 @@ license = lib.licenses.free; }; }) {}; - wavefront-obj-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wavefront-obj-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wavefront-obj-mode"; + ename = "wavefront-obj-mode"; version = "20170808.1016"; src = fetchFromGitHub { owner = "abend"; @@ -75874,10 +98496,10 @@ rev = "34027915de6496460d8e68b5991dd24d47d54859"; sha256 = "0yj4wb5sdsbh3gp0sh2ajrrn6s8vg492809g4gxkxp30jhr6xc9q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d48e4fdc6c7079a1ca70c1e879473a98c11bbe6c/recipes/wavefront-obj-mode"; sha256 = "0qqismh6g2fvi45q2q52lq0n9nrh95wgamlsy5j4rx4syfgzxbrk"; - name = "wavefront-obj-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75885,9 +98507,13 @@ license = lib.licenses.free; }; }) {}; - wc-goal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wc-goal-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wc-goal-mode"; + ename = "wc-goal-mode"; version = "20140829.659"; src = fetchFromGitHub { owner = "bnbeckwith"; @@ -75895,10 +98521,10 @@ rev = "bf21ab9c5a449bcc20dd207a4915dcec218d2699"; sha256 = "0p7j4hvcxfyjf0na9s3xv29dvmwq82s56lincfasd0ydcpz4fbwc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f003b6d6bc91e6f9e510de8f5f5f9189d1c7334/recipes/wc-goal-mode"; sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419"; - name = "wc-goal-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75906,9 +98532,13 @@ license = lib.licenses.free; }; }) {}; - wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wc-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wc-mode"; + ename = "wc-mode"; version = "20170126.2029"; src = fetchFromGitHub { owner = "bnbeckwith"; @@ -75916,10 +98546,10 @@ rev = "f218f42709a651b34d6c1ddd98856f44648ef707"; sha256 = "0h79kf37pns92w4zsgazwhg087vkjvnhk9p1npll5ka87zbknndm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode"; sha256 = "191dmxfpqnj7d43cr0fhdmj5ldfs7w9zg5pb2lv9wvlfl7asdid6"; - name = "wc-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75927,20 +98557,24 @@ license = lib.licenses.free; }; }) {}; - wcheck-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wcheck-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wcheck-mode"; - version = "20160711.2213"; + ename = "wcheck-mode"; + version = "20180126.416"; src = fetchFromGitHub { owner = "tlikonen"; repo = "wcheck-mode"; - rev = "d56345a1ec910a7d95103a441536cfba10ec9672"; - sha256 = "1vdw9519rqqc3gidrlqpal01vllryi5ljzlrx2aayf8rf98lg6dy"; + rev = "6aa26626ccc6f7f670de092c7d40e44ab8b410f9"; + sha256 = "0dgjg136s2qwsnvfs5y6n81ra7zmi8rwxrs6dn08z7mj7pac5kq9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d10b59f568fdedf248c2e8eaa06c4a74032ca56/recipes/wcheck-mode"; sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k"; - name = "wcheck-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -75948,9 +98582,15 @@ license = lib.licenses.free; }; }) {}; - weather-metno = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + weather-metno = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "weather-metno"; + ename = "weather-metno"; version = "20150831.1807"; src = fetchFromGitHub { owner = "ruediger"; @@ -75958,10 +98598,10 @@ rev = "bfc7137095e0ee71aad70ac46f2af677f3c051b6"; sha256 = "05gfc67724b0mwg8kvk3dsazx3dld50b9xjq8h1nc6jvdz3zxb9z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/75beac314565b9becb701ddd9bc85660e268c3ae/recipes/weather-metno"; sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6"; - name = "weather-metno"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -75969,9 +98609,15 @@ license = lib.licenses.free; }; }) {}; - web = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + web = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "web"; + ename = "web"; version = "20141231.1201"; src = fetchFromGitHub { owner = "nicferrier"; @@ -75979,10 +98625,10 @@ rev = "483188dac4bc6b409b985c9dae45f3324a425efd"; sha256 = "03xcadplw1hg5hxw6bfrhw5xkkxk3i4105f114c6m3d2525jq4y5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web"; sha256 = "141idn49b7x7llz249zbg2yq8snjxpmlpchsd3n1axlrbmx6pfpz"; - name = "web"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -75990,9 +98636,13 @@ license = lib.licenses.free; }; }) {}; - web-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + web-beautify = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "web-beautify"; + ename = "web-beautify"; version = "20161115.1447"; src = fetchFromGitHub { owner = "yasuyk"; @@ -76000,10 +98650,10 @@ rev = "e1b45321d8c11b404b12c8e55afe55eaa7c84ee9"; sha256 = "03b5pj58m00lkazyvvasa4qndrkh2kjzv2y7qhxljfg5mngyg3zg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d528d3e20b1656dff40860cac0e0fa9dc1a3e87/recipes/web-beautify"; sha256 = "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f"; - name = "web-beautify"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76011,9 +98661,13 @@ license = lib.licenses.free; }; }) {}; - web-completion-data = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + web-completion-data = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "web-completion-data"; + ename = "web-completion-data"; version = "20160318.148"; src = fetchFromGitHub { owner = "osv"; @@ -76021,10 +98675,10 @@ rev = "c272c94e8a71b779c29653a532f619acad433a4f"; sha256 = "19nzjgvd2i5745283ck3k2vylrr6lnk9h3ggzwrwdhyd3m9433vm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604f155a3ce7e5375dcf8b9c149c5af403ef48bd/recipes/web-completion-data"; sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9"; - name = "web-completion-data"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76032,20 +98686,25 @@ license = lib.licenses.free; }; }) {}; - web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + web-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "web-mode"; - version = "20180401.810"; + ename = "web-mode"; + version = "20180628.422"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "1a61f347cc1ac3cf2a68f917b7100fdcb21b488c"; - sha256 = "1yswl44kgz34nn5r5z0wck85ilyniysql2pwc94pn32lpzypa4ah"; + rev = "471e1235d976e209de5262e75ecf7cc3e1fec39f"; + sha256 = "00m3yyx83sfdsn70iqr80vpj060nfddb2j6gzzsdmsnm0nl0hg8j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i"; - name = "web-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -76053,9 +98712,15 @@ license = lib.licenses.free; }; }) {}; - web-mode-edit-element = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }: - melpaBuild { + web-mode-edit-element = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-mode }: + melpaBuild { pname = "web-mode-edit-element"; + ename = "web-mode-edit-element"; version = "20161114.954"; src = fetchFromGitHub { owner = "jtkDvlp"; @@ -76063,10 +98728,10 @@ rev = "8b8ac07aa8c920dafd94c96a51effb0d6c0ed1ce"; sha256 = "0aj1ibmnrbaxrkwjf1fac2qzazrj39pql3prcibnchc2bmp191aa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web-mode-edit-element"; sha256 = "1kcycsjjv1bzfn93aq3cdh5d913izrr8cdxmknbyriyipsqryh3l"; - name = "web-mode-edit-element"; + name = "recipe"; }; packageRequires = [ emacs web-mode ]; meta = { @@ -76074,20 +98739,25 @@ license = lib.licenses.free; }; }) {}; - web-narrow-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }: - melpaBuild { + web-narrow-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-mode }: + melpaBuild { pname = "web-narrow-mode"; + ename = "web-narrow-mode"; version = "20170406.1910"; src = fetchFromGitHub { owner = "Qquanwei"; repo = "web-narrow-mode"; - rev = "73bdcb7d0701abe65dab4fc295d944885e05ae33"; - sha256 = "1wg54vyfbacmyh8lyd5fgh88lfby17v24l98jjgxscaqgms86bch"; + rev = "b25fae07844875d5b62d14b98442c88817b7e139"; + sha256 = "1yk390g41yxh84lsxnbf72x67yik6hqv20magxlazrfrwngvk0cx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a910da9e0566344d4b195423b5f270cb2bdcc1e5/recipes/web-narrow-mode"; sha256 = "09k3xp4l235wrffl7a4026wpikxhp10fh3182dlp4pa4wr2vzipi"; - name = "web-narrow-mode"; + name = "recipe"; }; packageRequires = [ web-mode ]; meta = { @@ -76095,20 +98765,25 @@ license = lib.licenses.free; }; }) {}; - web-search = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + web-search = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "web-search"; + ename = "web-search"; version = "20170911.1246"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "web-search.el"; - rev = "bdf590e7d6d62e874810aa4c5017c48e4e93f823"; - sha256 = "0fwxjmnhkpla6gb58nkcazjh1q9b92w89rfi12pw7qj0449rmihb"; + rev = "410c490ecf82a3693db3eb62003302233471ff84"; + sha256 = "0hib0ffwikdydkm5asmvzj6l49pd9694psnn2c010j3ixw6i8gsl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503ef2042cc14dbe53e7121b8d0b5ccbdf6c882b/recipes/web-search"; sha256 = "08iflbp6rmsxsy2lahsdjj9ki70ixqhsas0vxzawz5pi5vk2x9gj"; - name = "web-search"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -76116,9 +98791,14 @@ license = lib.licenses.free; }; }) {}; - web-server = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + web-server = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "web-server"; + ename = "web-server"; version = "20140905.1706"; src = fetchFromGitHub { owner = "eschulte"; @@ -76126,10 +98806,10 @@ rev = "469cd3bc117bfb8da0c03a2a2fb185e80c81d068"; sha256 = "0mbhyk7sgisx0l0xiz2xgy4jfbgwazlnxjvajsh4nysyig5rys05"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70e724b4e6c76d0299d5ea8d2211f48c1c611afe/recipes/web-server"; sha256 = "1f0iyvwq1kq3zfxx2v596cmah7jfk2a04g2rjllbgxxnzwms29z3"; - name = "web-server"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -76137,9 +98817,15 @@ license = lib.licenses.free; }; }) {}; - webkit-color-picker = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, posframe }: - melpaBuild { + webkit-color-picker = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , posframe }: + melpaBuild { pname = "webkit-color-picker"; + ename = "webkit-color-picker"; version = "20180325.36"; src = fetchFromGitHub { owner = "osener"; @@ -76147,10 +98833,10 @@ rev = "765cac80144cad4bc0bf59025ea0199f0486f737"; sha256 = "0a6nirdn1l7cymjycbns38ja9an1z4l5lwjk5h428aly3pmkvdqj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af9d2e39385c6833eff6b7c7e5a039238563c00f/recipes/webkit-color-picker"; sha256 = "1i9244zghabyavxhz86d22fn40qspzdn2sjql8pl3mm8ks7a49a3"; - name = "webkit-color-picker"; + name = "recipe"; }; packageRequires = [ emacs posframe ]; meta = { @@ -76158,20 +98844,25 @@ license = lib.licenses.free; }; }) {}; - weblogger = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: - melpaBuild { + weblogger = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xml-rpc }: + melpaBuild { pname = "weblogger"; + ename = "weblogger"; version = "20110926.918"; src = fetchFromGitHub { owner = "hexmode"; repo = "weblogger-el"; - rev = "b3dd4aead9d3a87e6d85e7fef4f4f3bd40d87b53"; - sha256 = "03dkabszk6ya3vaps1ap16psk5bbar8zd5ipn1lmyzsbd3hwm8mj"; + rev = "40cfbfc69be6a619173804441db2f407e3fa1731"; + sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ccb10a5d1f4db3b20f96dee3c14ee64f4674e2/recipes/weblogger"; sha256 = "0k0l715lnqb0a4hlkfjkyhr8i1jaml8z2xzhal7ryhjgvf8xinvs"; - name = "weblogger"; + name = "recipe"; }; packageRequires = [ xml-rpc ]; meta = { @@ -76179,9 +98870,16 @@ license = lib.licenses.free; }; }) {}; - webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + webpaste = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "webpaste"; + ename = "webpaste"; version = "20180127.1434"; src = fetchFromGitHub { owner = "etu"; @@ -76189,10 +98887,10 @@ rev = "14fd97bc3c8554d9394b698610dca1186ff68b03"; sha256 = "1q7pqkww6ggh9sdnqa4vbq6nzivw0w011w3mvwx1mi4zp0dv50zs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; sha256 = "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm"; - name = "webpaste"; + name = "recipe"; }; packageRequires = [ cl-lib emacs request ]; meta = { @@ -76200,20 +98898,25 @@ license = lib.licenses.free; }; }) {}; - websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + websocket = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "websocket"; - version = "20171113.2045"; + ename = "websocket"; + version = "20180422.1716"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "7d2adf218743c52578c8e8fd5584a5e54732e256"; - sha256 = "0k8n710ip4av51n6l9ap1254qkifj987a6k86pgj3y6bw76ry08f"; + rev = "0d96ba2ff5a25c6cd6c66f417cc9b5f38a4308ba"; + sha256 = "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg"; - name = "websocket"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -76221,9 +98924,13 @@ license = lib.licenses.free; }; }) {}; - wedge-ws = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wedge-ws = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wedge-ws"; + ename = "wedge-ws"; version = "20140714.1449"; src = fetchFromGitHub { owner = "aes"; @@ -76231,10 +98938,10 @@ rev = "4669115f02d9c6fee067cc5369bb38c0f9db88b2"; sha256 = "19hgb5knqqc4rb8yl8s604xql8ar6m9r4d379cfakn15jvwqnl98"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fb11fe717b5fe73f4a6fa4e199ef4c58a85eb2/recipes/wedge-ws"; sha256 = "07i2dr807np4fwq3ryxlw11vbc1sik1iv7x5740q258jyc9zfgll"; - name = "wedge-ws"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76242,20 +98949,28 @@ license = lib.licenses.free; }; }) {}; - weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: - melpaBuild { + weechat = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , tracking }: + melpaBuild { pname = "weechat"; - version = "20180112.1217"; + ename = "weechat"; + version = "20180513.310"; src = fetchFromGitHub { owner = "the-kenny"; repo = "weechat.el"; - rev = "4842e966a557e13fa4f16052cb60d221cdb886cf"; - sha256 = "0y4vdsm4rb221hmr2a2sn0kj51jsgndkmhwcjiryqxzn2giy9siw"; + rev = "bcf714e32b012c6a89d5c0a82ab3a74d454908ff"; + sha256 = "1gm2yhz3qy55qqwf0ccrqw4nifxaig4jpdqmcl0ydx1n3myxx64l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat"; sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46"; - name = "weechat"; + name = "recipe"; }; packageRequires = [ cl-lib emacs s tracking ]; meta = { @@ -76263,9 +98978,16 @@ license = lib.licenses.free; }; }) {}; - weechat-alert = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, weechat }: - melpaBuild { + weechat-alert = callPackage ({ alert + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , weechat }: + melpaBuild { pname = "weechat-alert"; + ename = "weechat-alert"; version = "20160416.548"; src = fetchFromGitHub { owner = "Kungi"; @@ -76273,10 +98995,10 @@ rev = "a8fd557c8f335322f132c1c6c08b6741d6394e2e"; sha256 = "1hkhim2jfdywx6ks4qfcizycp5qsx4ms6929kbgmzzb8i7j380x6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a69ad48eabb166f66e6eb5c5cdc75aefc8b989f/recipes/weechat-alert"; sha256 = "026hkddvd4a6wy7s8s0lklw8b99fpjawdgi7amvpcrn79ylwbf22"; - name = "weechat-alert"; + name = "recipe"; }; packageRequires = [ alert cl-lib weechat ]; meta = { @@ -76284,9 +99006,14 @@ license = lib.licenses.free; }; }) {}; - weibo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + weibo = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "weibo"; + ename = "weibo"; version = "20150307.1442"; src = fetchFromGitHub { owner = "austin-----"; @@ -76294,10 +99021,10 @@ rev = "a8abb50b7602fe15fe2bc6400ac29780e956b390"; sha256 = "0hc5iyjpcik996ns84akrl28scndmn0gd1zfdf1nnqq6n2m5zvgh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21f4c1b34f86331ecbcdbdc39858a191232902f2/recipes/weibo"; sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd"; - name = "weibo"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -76305,20 +99032,24 @@ license = lib.licenses.free; }; }) {}; - wgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wgrep = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wgrep"; - version = "20141016.1656"; + ename = "wgrep"; + version = "20180710.2326"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d"; - sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6"; + rev = "414be70bd313e482cd9f0b70fd2daad4ee23497c"; + sha256 = "1sdhd587q3pg92lhiayph87azhalmf1gzrnsprkmqvnphv7mvks9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep"; sha256 = "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4"; - name = "wgrep"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76326,20 +99057,25 @@ license = lib.licenses.free; }; }) {}; - wgrep-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: - melpaBuild { + wgrep-ack = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , wgrep }: + melpaBuild { pname = "wgrep-ack"; + ename = "wgrep-ack"; version = "20141012.311"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d"; - sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6"; + rev = "9448a9d597bd089ae61e58add2c5dbecb0aa2b8f"; + sha256 = "0x27h0ccq93avsmb8gim43zklbsb4ghfw30a7hjvz0ilfx02gdca"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-ack"; sha256 = "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh"; - name = "wgrep-ack"; + name = "recipe"; }; packageRequires = [ wgrep ]; meta = { @@ -76347,20 +99083,26 @@ license = lib.licenses.free; }; }) {}; - wgrep-ag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: - melpaBuild { + wgrep-ag = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , wgrep }: + melpaBuild { pname = "wgrep-ag"; + ename = "wgrep-ag"; version = "20160923.403"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d"; - sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6"; + rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8"; + sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c50b704343c4cac5e2a62a67e284ba6d8e15f8a/recipes/wgrep-ag"; sha256 = "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a"; - name = "wgrep-ag"; + name = "recipe"; }; packageRequires = [ cl-lib wgrep ]; meta = { @@ -76368,9 +99110,14 @@ license = lib.licenses.free; }; }) {}; - wgrep-helm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: - melpaBuild { + wgrep-helm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , wgrep }: + melpaBuild { pname = "wgrep-helm"; + ename = "wgrep-helm"; version = "20170510.1539"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -76378,10 +99125,10 @@ rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d"; sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-helm"; sha256 = "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b"; - name = "wgrep-helm"; + name = "recipe"; }; packageRequires = [ wgrep ]; meta = { @@ -76389,20 +99136,25 @@ license = lib.licenses.free; }; }) {}; - wgrep-pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: - melpaBuild { + wgrep-pt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , wgrep }: + melpaBuild { pname = "wgrep-pt"; + ename = "wgrep-pt"; version = "20140510.1531"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d"; - sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6"; + rev = "cd8df1be69257da2e48dc3eae4badc674468b61c"; + sha256 = "1df7lal4c0zsinrfjp4qv2k3xi1kbl66d36in47pmiam1kkqs9fs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39faef3b9c2e1867cd48341d9878b714dbed4eb/recipes/wgrep-pt"; sha256 = "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg"; - name = "wgrep-pt"; + name = "recipe"; }; packageRequires = [ wgrep ]; meta = { @@ -76410,20 +99162,24 @@ license = lib.licenses.free; }; }) {}; - what-the-commit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + what-the-commit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "what-the-commit"; + ename = "what-the-commit"; version = "20150901.616"; src = fetchFromGitHub { owner = "danielbarbarito"; repo = "what-the-commit.el"; - rev = "868c80a1b8614bcbd2225cd0290142c72f2a7956"; - sha256 = "04w62davpqqqvympkr52bg54c2i45p09q9bs70p9ff5jvc6i3g76"; + rev = "42604410cfd5be715c8aa730aef4673773454e8b"; + sha256 = "00fnjjlmc64bqjzmyprscfqr8fa1jbzfj6xjvm19an2qhnzh126q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d22725c2fce506c659bd33aabca182be0048905/recipes/what-the-commit"; sha256 = "0nnyb6hq6r21wf1x3q41ab48b3dmcz5lyli771a59dk1gs8qpgak"; - name = "what-the-commit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76431,20 +99187,25 @@ license = lib.licenses.free; }; }) {}; - which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + which-key = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "which-key"; - version = "20180321.331"; + ename = "which-key"; + version = "20180621.1238"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "bc97659029bffda0861a418da092656b379dd0cd"; - sha256 = "0j1kpykqz691f8dlb2grfgv5rafr9xvb64yfc9pb07r4f8791fgc"; + rev = "ff79dfff66f880885c5893dd6fd05dc51173a476"; + sha256 = "0x9bmm4s5gq9k9x1rkwxr8zz8p2hgsxvzpji138m8m4j809l6cn4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59"; - name = "which-key"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -76452,9 +99213,14 @@ license = lib.licenses.free; }; }) {}; - whitaker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + whitaker = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "whitaker"; + ename = "whitaker"; version = "20150814.422"; src = fetchFromGitHub { owner = "Fuco1"; @@ -76462,10 +99228,10 @@ rev = "eaf26ea647b729ca705b73ea70312d5ffdf89448"; sha256 = "1y75cylvqgn54h8yqahz4wi1qj5yhbs66i7x23jmbmah3q0rycab"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b5d717e2eaf35ce33b26be049a39f2f75a7de72/recipes/whitaker"; sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj"; - name = "whitaker"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -76473,9 +99239,14 @@ license = lib.licenses.free; }; }) {}; - white-sand-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + white-sand-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "white-sand-theme"; + ename = "white-sand-theme"; version = "20151117.848"; src = fetchFromGitHub { owner = "mswift42"; @@ -76483,10 +99254,10 @@ rev = "97621edd69267dd143760d94393db2c2558c9ea4"; sha256 = "0sh92g5vd518f80klvljqkjpw4ji909439dpc3sfaccf5jiwn9xn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b124575c4a4f783b6726d0526b83e67b4ad65cc9/recipes/white-sand-theme"; sha256 = "19qsiic6yf7g60ygjmw7kg1i28nqpm3zja8cmdh33ny2bbkwxsz5"; - name = "white-sand-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -76494,9 +99265,14 @@ license = lib.licenses.free; }; }) {}; - white-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + white-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "white-theme"; + ename = "white-theme"; version = "20160917.1043"; src = fetchFromGitHub { owner = "anler"; @@ -76504,10 +99280,10 @@ rev = "e9e6d5b9d43da6eb15e86f5fbc8b1ba83abe8c78"; sha256 = "1yqfq1gzkrw79myvj16nfi30ynfyz8yrpbzjcj8nhsc5rfrrmym2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/white-theme"; sha256 = "04l5hjhd465w9clrqc4dr8bx8hj4i9dx4nfr9hympgv101bpgy4x"; - name = "white-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -76515,20 +99291,24 @@ license = lib.licenses.free; }; }) {}; - whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + whitespace-cleanup-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "whitespace-cleanup-mode"; + ename = "whitespace-cleanup-mode"; version = "20170505.1923"; src = fetchFromGitHub { owner = "purcell"; repo = "whitespace-cleanup-mode"; - rev = "6d0a35159ee04ef9f3b1a80c548f545643ddb397"; - sha256 = "0pqvrhws49aqyfp25kcrk9q7ib0ckx9gi6avzmymnpxy9aicnb3r"; + rev = "d375bfb61cb70947a93004cba8ea17a0bc76f5a9"; + sha256 = "0w6jwg1lyz0hwkhbx3kx6yddakff6azj2ipyxw26rv886gx8a226"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode"; sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3"; - name = "whitespace-cleanup-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76536,20 +99316,25 @@ license = lib.licenses.free; }; }) {}; - whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + whizzml-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "whizzml-mode"; - version = "20171015.938"; + ename = "whizzml-mode"; + version = "20180711.910"; src = fetchFromGitHub { owner = "whizzml"; repo = "whizzml-mode"; - rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22"; - sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b"; + rev = "f457052dc5426d542ca69185a5a87905f08f1310"; + sha256 = "15nlnch97rgpcsxv5prw4ikzl5gbnzycqmq4h1x8n16ianbgh249"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; sha256 = "0gas9xfpz5v9fbhjxhd4msihwz9w4a05l5icsaclxvh06f92wcyk"; - name = "whizzml-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -76557,9 +99342,13 @@ license = lib.licenses.free; }; }) {}; - whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + whole-line-or-region = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "whole-line-or-region"; + ename = "whole-line-or-region"; version = "20180324.2119"; src = fetchFromGitHub { owner = "purcell"; @@ -76567,10 +99356,10 @@ rev = "944290d443a395ef0578531929186d6274ab03e9"; sha256 = "04hbs8hrm5csnjxvxkfbd9fky0rd6xpr105cy0bvya5c14anzcd4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region"; sha256 = "0zz9i1jxayw2p6ggfxjvhb1mc3ly9iy4jvk23ycndz9lnnzkch0y"; - name = "whole-line-or-region"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76578,9 +99367,13 @@ license = lib.licenses.free; }; }) {}; - wide-column = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wide-column = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wide-column"; + ename = "wide-column"; version = "20170925.913"; src = fetchFromGitHub { owner = "phillord"; @@ -76588,10 +99381,10 @@ rev = "ce9ef4675485a7bea381077866368ef875226b10"; sha256 = "0qh8hy4jl59bfg4323a8h4q4a78gn4hsglfk2h23hqssbv4mhsp2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d29def44ae42dc4b60c1d254a57572bd09faf51/recipes/wide-column"; sha256 = "1kyyvq9fgaypvhiy9vbvr99xsac5vhylkbjsxn5fhylyc5n867sb"; - name = "wide-column"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76599,20 +99392,24 @@ license = lib.licenses.free; }; }) {}; - widget-mvc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + widget-mvc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "widget-mvc"; + ename = "widget-mvc"; version = "20150101.2006"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-widget-mvc"; - rev = "ff5a85880df7b87f9f480fe3c28438a0712b7b87"; - sha256 = "1s0srhklmkmj3lfs8vr1dqi3s48z7fwx9mxqxckk5njld317hqg7"; + rev = "2576e6f0c35d8dedfa9c2cd6ea4fb4c14cb72b63"; + sha256 = "0fqv63m8z5m5ghh4j8ccdnmgcdkvi4jqpg9z7lp17g4p9pq3xfjf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76d3c38e205076a22628f490d8e8ddd80d091eab/recipes/widget-mvc"; sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f"; - name = "widget-mvc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76620,20 +99417,28 @@ license = lib.licenses.free; }; }) {}; - widgetjs = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, s }: - melpaBuild { + widgetjs = callPackage ({ fetchFromGitHub + , fetchurl + , js2-mode + , js2-refactor + , lib + , makey + , melpaBuild + , s }: + melpaBuild { pname = "widgetjs"; + ename = "widgetjs"; version = "20160719.804"; src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "900cf8213df6e58bdd3244b446ea02c67b7555d8"; - sha256 = "1yn2hadcpcsgnf0wy7x8zcfw97c90dpp2ipdml176191vz41n7nb"; + rev = "a1e91bdcecdea50c80f5ff87f7a4f7a2c249713e"; + sha256 = "1gr430rf8k282ra587qnbgwvccg47ar1n09m6czig5splhnf0086"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; sha256 = "0y5h1ag2m7w47l4nx4d18yz3fvd411rm1h5w7zz4xh67bnx4zyy1"; - name = "widgetjs"; + name = "recipe"; }; packageRequires = [ js2-mode js2-refactor makey s ]; meta = { @@ -76641,9 +99446,15 @@ license = lib.licenses.free; }; }) {}; - wiki-nav = callPackage ({ button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash }: - melpaBuild { + wiki-nav = callPackage ({ button-lock + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nav-flash }: + melpaBuild { pname = "wiki-nav"; + ename = "wiki-nav"; version = "20150223.554"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -76651,10 +99462,10 @@ rev = "f9082feb329432fcf2ac49a95e64bed9fda24d58"; sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/baa49e7d2d5c07ebf77e7941c240b88fcfd0fc8b/recipes/wiki-nav"; sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy"; - name = "wiki-nav"; + name = "recipe"; }; packageRequires = [ button-lock nav-flash ]; meta = { @@ -76662,20 +99473,25 @@ license = lib.licenses.free; }; }) {}; - wiki-summary = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wiki-summary = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wiki-summary"; + ename = "wiki-summary"; version = "20150408.1422"; src = fetchFromGitHub { owner = "jozefg"; repo = "wiki-summary.el"; - rev = "ed3755dd09f5f73ef78ec295fe842d08b316c8a0"; - sha256 = "02bczc1mb1cs1aryz5pw6cmpydjmxja2zj91893cz8rnfn1r031i"; + rev = "ec11f6b7177a3fc50702c771d347d1e86f4462fc"; + sha256 = "0c1j12lzkgb6rfq2zyfk9mj11qilymcpfp9lf38pkki527akxixl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31877f182ab82fd5bb73ec4ddd8526a032d9edf9/recipes/wiki-summary"; sha256 = "1hiyi3w6rvins8hfxd96bgpihxarmv192q96sadqcwshcqi14zmw"; - name = "wiki-summary"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -76683,9 +99499,16 @@ license = lib.licenses.free; }; }) {}; - wilt = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + wilt = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "wilt"; + ename = "wilt"; version = "20180220.54"; src = fetchFromGitHub { owner = "sixty-north"; @@ -76693,10 +99516,10 @@ rev = "04dbe37fa35d0b24c791421785d2c97a8cbfe2cc"; sha256 = "197kqp22pyy1in2rq063mahvrf00vrfvgnfkqp0zy7hpkhiiqvim"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eea4f2ca8b4f9ea93cc02151fdda6cfee5b68b70/recipes/wilt"; sha256 = "0nw6zr06zq60j72qfjmbqrxyz022fnisb0bsh6xmlnd1k1kqlrz6"; - name = "wilt"; + name = "recipe"; }; packageRequires = [ dash emacs s ]; meta = { @@ -76704,9 +99527,13 @@ license = lib.licenses.free; }; }) {}; - win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + win-switch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "win-switch"; + ename = "win-switch"; version = "20161009.927"; src = fetchFromGitHub { owner = "genovese"; @@ -76714,10 +99541,10 @@ rev = "954eb5e4c5737f0c06368c42a7f1c3dd374d782f"; sha256 = "1xpx4sc1g1w8w0yc39k2dys83m8skrpvi745bfrzdl47jngrf54h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/win-switch"; sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my"; - name = "win-switch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76725,9 +99552,13 @@ license = lib.licenses.free; }; }) {}; - windata = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + windata = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "windata"; + ename = "windata"; version = "20090830.340"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -76735,10 +99566,10 @@ rev = "a723fc446ceaec23d5f29ecc8245d94c99d91625"; sha256 = "0y8yw5hazsir5kjskrh4mr63mmz87dc7yy5ddmlwpmn03wanqpha"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/windata"; sha256 = "1mah2vy46pxwjd6c6ac14d2qfcixs2yrgwmzmisnfgsvprdlxryb"; - name = "windata"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76746,20 +99577,24 @@ license = lib.licenses.free; }; }) {}; - window-end-visible = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + window-end-visible = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "window-end-visible"; + ename = "window-end-visible"; version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "window-end-visible"; - rev = "525500fb2ebc08f3f9ea493972e5f2e1d79f89ef"; - sha256 = "0g69r64gyz4p3k6n8l0i1837mszycbrp23acnp0iy0y3mg67x3pn"; + rev = "f0ed55aa5f7875634fb4c8b6fbaa93633bc57d85"; + sha256 = "0xx2hmfwpdd1nxjds45d4jlfa6p4lcjwy2ryjs4qiwvrc2d03xbq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/window-end-visible"; sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq"; - name = "window-end-visible"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76767,9 +99602,13 @@ license = lib.licenses.free; }; }) {}; - window-jump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + window-jump = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "window-jump"; + ename = "window-jump"; version = "20170809.1508"; src = fetchFromGitHub { owner = "chumpage"; @@ -76777,10 +99616,10 @@ rev = "6bdb51e9a346907d60a9625f6180bddd06be6674"; sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d44fc32e12f00bbaa799b4054e9ff0fc0d3bfbfb/recipes/window-jump"; sha256 = "1gmqb7j5fb3q3krgx7arrln5nvyg9vcpph6wlxj6py679wfa3lwr"; - name = "window-jump"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76788,9 +99627,13 @@ license = lib.licenses.free; }; }) {}; - window-layout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + window-layout = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "window-layout"; + ename = "window-layout"; version = "20170214.1633"; src = fetchFromGitHub { owner = "kiwanami"; @@ -76798,10 +99641,10 @@ rev = "cd2e4f967b610c2bbef53182829e47250d027056"; sha256 = "0wgqi8r844lbx52fn6az8c1n8m681rp6dkfzd54wmdk1ka7zmvv6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/window-layout"; sha256 = "061mvxcj4mg2pmkln7nn6gyscs08aid4cfc6xck0x5gzr1snr639"; - name = "window-layout"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76809,9 +99652,13 @@ license = lib.licenses.free; }; }) {}; - window-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + window-number = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "window-number"; + ename = "window-number"; version = "20170731.1851"; src = fetchFromGitHub { owner = "nikolas"; @@ -76819,10 +99666,10 @@ rev = "d41722de646ffeb3f70d26e4a86a5a1ba5c6be87"; sha256 = "1ifs7zp8c5m9da5dz0y4cq7pgqgdkz63v00ib07xdycnfjp4w17i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74523af6e22ebae2f5fe7c4da4e8af8fac5fa074/recipes/window-number"; sha256 = "1ivd701h6q48i263fxxi44haacaz8cjg562ry8dxd10rbhhsjsq0"; - name = "window-number"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76830,9 +99677,13 @@ license = lib.licenses.free; }; }) {}; - window-numbering = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + window-numbering = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "window-numbering"; + ename = "window-numbering"; version = "20160809.1110"; src = fetchFromGitHub { owner = "nschum"; @@ -76840,10 +99691,10 @@ rev = "10809b3993a97c7b544240bf5d7ce9b1110a1b89"; sha256 = "1nlgzrjg5k7wyaka8ziqyv683vsc0f2lw5kr5xajcqlamwbzs7vi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce1dc80f69894736b276885e4ec3ce571a8612c9/recipes/window-numbering"; sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x"; - name = "window-numbering"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76851,20 +99702,28 @@ license = lib.licenses.free; }; }) {}; - window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }: - melpaBuild { + window-purpose = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , imenu-list + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "window-purpose"; - version = "20171107.659"; + ename = "window-purpose"; + version = "20180531.1336"; src = fetchFromGitHub { owner = "bmag"; repo = "emacs-purpose"; - rev = "2655bbe3399f00d3297ded58f92e7be22876148a"; - sha256 = "1yn9ha7qly4fw70ifdlvvi2hm3c6svkpy9q9nqxgzbg8j51gqzql"; + rev = "8737c5d8cb4a0d749771a04a136a784e5d519d5e"; + sha256 = "0w186mgs7ww52mvqrp02bnwazznhyy6j2g8r21x2d4ri3vavmwrl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; sha256 = "1y70jrba3gf9fyf2qdihfshbsblzb88yv9fkcswdzrpq5kmgwp84"; - name = "window-purpose"; + name = "recipe"; }; packageRequires = [ cl-lib emacs imenu-list let-alist ]; meta = { @@ -76872,9 +99731,13 @@ license = lib.licenses.free; }; }) {}; - windsize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + windsize = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "windsize"; + ename = "windsize"; version = "20151121.540"; src = fetchFromGitHub { owner = "grammati"; @@ -76882,10 +99745,10 @@ rev = "beb6376fdf52afa6f220c89032448460faf76e7f"; sha256 = "0hijf56ahbc5inn7n39nj96d948c4d05n9d5ci3g3vbl5hsyb121"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/windsize"; sha256 = "1fzqf86d7pimnc87xdgvpv4hnv7j6ngmk1sjvazj6726xygswkyv"; - name = "windsize"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76893,9 +99756,16 @@ license = lib.licenses.free; }; }) {}; - windwow = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + windwow = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "windwow"; + ename = "windwow"; version = "20170815.1848"; src = fetchFromGitHub { owner = "vijumathew"; @@ -76903,10 +99773,10 @@ rev = "77bad26f651744b68d31b389389147014d250f23"; sha256 = "0vbmmf8wm76k389g5ncs0grwlpwp3glpwvhdi5dfxaqcp2phaaad"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12aba18872021ce0affa96c46a17353c7d073ca2/recipes/windwow"; sha256 = "0cbkp98pwzj484akdbidvdz4kqxv6ix6paimpxnag6fffciq245h"; - name = "windwow"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -76914,20 +99784,25 @@ license = lib.licenses.free; }; }) {}; - winnow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + winnow = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "winnow"; + ename = "winnow"; version = "20170903.506"; src = fetchFromGitHub { owner = "dgtized"; repo = "winnow.el"; - rev = "18cb6b94338f3b7b4f2cd0331dad22f82dd9e0d3"; - sha256 = "1wp00zxxcibvl6vjwmvhkgcbi76dyb2g8c30wy4kp7876cpc8hgv"; + rev = "9ea0ac309d6a7a4aedb2647a13e9106a3b59c46d"; + sha256 = "0zsnd03mydzhskpcvffmlwbsi28dq0akz1nph7idn4zqca8sx2ia"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58891c2057ec834f999e3bf82af15e0617a4d4cf/recipes/winnow"; sha256 = "07kwjdmvzgvg7gc53dv10jfi212m0pimzrhiga38lrqrnrw631m0"; - name = "winnow"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -76935,20 +99810,24 @@ license = lib.licenses.free; }; }) {}; - winpoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + winpoint = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "winpoint"; + ename = "winpoint"; version = "20131023.1013"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "winpoint"; - rev = "e6050093c076308184566fa1d1012423d6934773"; - sha256 = "1qrbvidnmgg7jyasb28bc0z1x4a4ayzq5jmv38dsx0qs080s85wy"; + rev = "b32ab55f7b8797b9b042a8a89d89d6f79bc356a9"; + sha256 = "0qbsmqg4mh20k2lf7j92mc8p8qkvjc1a58klhqivpdl60z906z2a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/665e24e490618c7caeae4a9d17d1f614dc0a2617/recipes/winpoint"; sha256 = "10ji7xd9ipmy6c2qxljqdxgqf5sb8h7lwz43mr6ixbn7v1b7pp6w"; - name = "winpoint"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76956,20 +99835,24 @@ license = lib.licenses.free; }; }) {}; - winring = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + winring = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "winring"; - version = "20150804.1108"; + ename = "winring"; + version = "20180529.1718"; src = fetchFromGitLab { owner = "warsaw"; repo = "winring"; - rev = "ad400939b420b5a7914103b7cfe3f0f6574ea48f"; - sha256 = "1igld3zkvm3qbg1k77cn7rlxi8jqy8cvvp7z5mqwx9ifyihiwd0b"; + rev = "f2d072bd446b73e93b127523f19ea82b99b9267f"; + sha256 = "1j0g52panhx91hqw5glnlv5vnnpnjyx49xc8xif8mjf0m27723fv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2476a28c33502f908b7161c5a9c63c86b8d7b57d/recipes/winring"; sha256 = "1mgr5z4h7mf677xx8md3pqd31k17qs62z9iamfih206fcwgh24k4"; - name = "winring"; + name = "recipe"; }; packageRequires = []; meta = { @@ -76977,9 +99860,15 @@ license = lib.licenses.free; }; }) {}; - winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + winum = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "winum"; + ename = "winum"; version = "20171028.702"; src = fetchFromGitHub { owner = "deb0ch"; @@ -76987,10 +99876,10 @@ rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c"; sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw"; - name = "winum"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -76998,19 +99887,23 @@ license = lib.licenses.free; }; }) {}; - wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + wisp-mode = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wisp-mode"; - version = "20160419.1232"; + ename = "wisp-mode"; + version = "20180520.58"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "d04938232934"; - sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c"; + rev = "db4210a0af51"; + sha256 = "0f3yn8dxg21q711533d1zgxwr2y3df1msmchvd5x4rikm8nayp8a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc"; - name = "wisp-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77018,9 +99911,14 @@ license = lib.licenses.free; }; }) {}; - wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wispjs-mode = callPackage ({ clojure-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wispjs-mode"; + ename = "wispjs-mode"; version = "20170720.1219"; src = fetchFromGitHub { owner = "krisajenkins"; @@ -77028,10 +99926,10 @@ rev = "60f9f5fd9d1556e2d008939f67eb1b1d0f325fa8"; sha256 = "1hhd8ixb2wr06vrd1kw0cd5jh08zm86h2clbvzv9wmqpawwxfm5f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a628330ee8deeab2bd5c2d4b61b33f119c4549d8/recipes/wispjs-mode"; sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p"; - name = "wispjs-mode"; + name = "recipe"; }; packageRequires = [ clojure-mode ]; meta = { @@ -77039,20 +99937,26 @@ license = lib.licenses.free; }; }) {}; - with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + with-editor = callPackage ({ async + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "with-editor"; - version = "20180318.1253"; + ename = "with-editor"; + version = "20180618.1602"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "ff3e96929d4532e33422a5980a6e3ca9f2fcf032"; - sha256 = "1fhn2wd0wszbnfpvnjmlw8gxqzy8f4q7dg7r16jpa1cmk0fpcdi0"; + rev = "fb9fdde14eddd5bd180d4baabfedc45e5492e115"; + sha256 = "07jfqnh4mvpky3mm7wyrdwpwnk2a7r1v2k7q5rxmg8i59k99q7bn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb"; - name = "with-editor"; + name = "recipe"; }; packageRequires = [ async emacs ]; meta = { @@ -77060,20 +99964,26 @@ license = lib.licenses.free; }; }) {}; - with-namespace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, loop, melpaBuild }: - melpaBuild { + with-namespace = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , loop + , melpaBuild }: + melpaBuild { pname = "with-namespace"; + ename = "with-namespace"; version = "20130407.1122"; src = fetchFromGitHub { owner = "Wilfred"; repo = "with-namespace.el"; - rev = "8ac52da3a09cf46087720e30cf730d00f140cde6"; - sha256 = "1c7g8f3jr7bb0xxprammfg433gd63in5iiiaq8rjmc94h6hdcys3"; + rev = "36828a40428c8e53c117f2df830b2f7a59ddd306"; + sha256 = "0qq8ckk5w3hlm4wihhnlpn75gij62aa2nafmvin7q8i454pxbg7a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/with-namespace"; sha256 = "1199k1xvvv7ald6ywrh2sfpw2v42ckpcsw6mcj617bg3b5m7770i"; - name = "with-namespace"; + name = "recipe"; }; packageRequires = [ dash loop ]; meta = { @@ -77081,20 +99991,27 @@ license = lib.licenses.free; }; }) {}; - with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: - melpaBuild { + with-simulated-input = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , seq }: + melpaBuild { pname = "with-simulated-input"; + ename = "with-simulated-input"; version = "20170820.2317"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "with-simulated-input"; - rev = "af9a38ce28a741e6d8742750bef5d7b5afa13796"; - sha256 = "0iann7zi9bgd3vmvxvg2n6x24hkyzbchbli1ymsmfrn8rif9byf7"; + rev = "1012ccbec77d7d162790706c07bb23c039ccc61f"; + sha256 = "1489njq2xbsd89kh3z560vwm892zzjbs12lzk1pr0fajqvnm62r5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input"; sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk"; - name = "with-simulated-input"; + name = "recipe"; }; packageRequires = [ emacs s seq ]; meta = { @@ -77102,9 +100019,14 @@ license = lib.licenses.free; }; }) {}; - wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wn-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wn-mode"; + ename = "wn-mode"; version = "20151109.2152"; src = fetchFromGitHub { owner = "luismbo"; @@ -77112,10 +100034,10 @@ rev = "f05c3151523e529af5a0a3fa8c948b61fb369f6e"; sha256 = "12rfpkyjkhikjh0mihhp5h5pzbm4br68nwf8k1ja9djl77vfzv36"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6213c01e6954985daff8cd1a5a3ef004431f0477/recipes/wn-mode"; sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3"; - name = "wn-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77123,9 +100045,13 @@ license = lib.licenses.free; }; }) {}; - wolfram = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wolfram = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wolfram"; + ename = "wolfram"; version = "20170122.2356"; src = fetchFromGitHub { owner = "hsjunnesson"; @@ -77133,10 +100059,10 @@ rev = "6b5dceae3fd6cdb4d7562510deeafa02c93c010b"; sha256 = "1ijyjw2793i7n00i30ma8lw4fzi9w63m6k0xgjx6j78r5y7pfj2g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/785b5b1ec73e6376f2f2bb405707a1078398fa3a/recipes/wolfram"; sha256 = "02xp1916v9rydh0586jkx71v256qdg63f87s3m0agc2znnrni9h4"; - name = "wolfram"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77144,9 +100070,14 @@ license = lib.licenses.free; }; }) {}; - wolfram-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wolfram-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wolfram-mode"; + ename = "wolfram-mode"; version = "20180306.1613"; src = fetchFromGitHub { owner = "kawabata"; @@ -77154,10 +100085,10 @@ rev = "be680190cac6ccf579dbce107deaae495928d1b3"; sha256 = "1cvdw28gvhbr9l65xkv8ld12rb0pcf53jd55gns2b0abz1lg1jc4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/40ded2302e413e233d867caa4776c54a778b8b99/recipes/wolfram-mode"; sha256 = "0rc39vvpyhpn0m52i4hs23j6avqfddmrkhjqg339apfq7z35fpli"; - name = "wolfram-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77165,20 +100096,28 @@ license = lib.licenses.free; }; }) {}; - wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }: - melpaBuild { + wonderland = callPackage ({ dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multi }: + melpaBuild { pname = "wonderland"; + ename = "wonderland"; version = "20130912.1819"; src = fetchFromGitHub { owner = "kurisuwhyte"; repo = "emacs-wonderland"; - rev = "89d274ad694b0e748efdac23ccd60b7d8b73d7c6"; - sha256 = "0hacc8ha5w44cgwkipa3nwh1q5gdrcxhjkmw2gnvb1l01crgnack"; + rev = "28cf6b37000c395ece9519db53147fb826a42bc4"; + sha256 = "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed02d5e4cba10023ebc7c26f90ba8d1e8ee32a08/recipes/wonderland"; sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi"; - name = "wonderland"; + name = "recipe"; }; packageRequires = [ dash dash-functional emacs multi ]; meta = { @@ -77186,9 +100125,15 @@ license = lib.licenses.free; }; }) {}; - wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wordgen = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wordgen"; + ename = "wordgen"; version = "20170803.1120"; src = fetchFromGitHub { owner = "Fanael"; @@ -77196,10 +100141,10 @@ rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d"; sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen"; sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m"; - name = "wordgen"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -77207,9 +100152,14 @@ license = lib.licenses.free; }; }) {}; - wordnut = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wordnut = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wordnut"; + ename = "wordnut"; version = "20180312.2143"; src = fetchFromGitHub { owner = "gromnitsky"; @@ -77217,10 +100167,10 @@ rev = "feac531404041855312c1a046bde7ea18c674915"; sha256 = "1jl0b6g64a9w0q7bfvwha67vgws5xd15b7mkfyb5gkz3pymqhfxn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/321c5e171eb4da85980968ac3c8ef4300101c0b1/recipes/wordnut"; sha256 = "1gqmjb2f9izra0x9ds1jyk7h204qsll6viwkvdnmxczyyc0wx44n"; - name = "wordnut"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77228,9 +100178,13 @@ license = lib.licenses.free; }; }) {}; - wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wordsmith-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wordsmith-mode"; + ename = "wordsmith-mode"; version = "20171025.730"; src = fetchFromGitHub { owner = "istib"; @@ -77238,10 +100192,10 @@ rev = "589a97412138145bea70e0450eeddeb7f138d538"; sha256 = "1zm4grysjpynibldvic75awhcmmnjmlkkvslw8bvirmi58qwvwzj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b5fda506e5b388cd6824d433b89032ed46858dc/recipes/wordsmith-mode"; sha256 = "0s6b6dfqn31jdcgs2mlmvwgpr5a4zs4xi8m002ly11c6sn035xb1"; - name = "wordsmith-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77249,20 +100203,28 @@ license = lib.licenses.free; }; }) {}; - worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: - melpaBuild { + worf = callPackage ({ ace-link + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild + , swiper + , zoutline }: + melpaBuild { pname = "worf"; - version = "20180316.926"; + ename = "worf"; + version = "20180620.1011"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "543bfe21727c0ea96ee0c1022ed334103c0acdf0"; - sha256 = "0ia74ijp6cdhxjfygvjb5kx36iyakbdws9lsz20761xlp8vw0dfq"; + rev = "b48e0c9bbd617ed8a8962174d804ce7a6da1c10a"; + sha256 = "14xik793sgjcg8nby8v77x1x8zspgkhz95kzzlzqalbblak3mgbs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi"; - name = "worf"; + name = "recipe"; }; packageRequires = [ ace-link hydra swiper zoutline ]; meta = { @@ -77270,9 +100232,13 @@ license = lib.licenses.free; }; }) {}; - workgroups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + workgroups = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "workgroups"; + ename = "workgroups"; version = "20110726.941"; src = fetchFromGitHub { owner = "tlh"; @@ -77280,10 +100246,10 @@ rev = "9572b3492ee09054dc329f64ed846c962b395e39"; sha256 = "0q32z54qafj8ap3ybx82i3fm1msmzwvpxgmkaglzhi8nccgzbn2n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/585d3f522920b41845294af50b1da99dff256f8d/recipes/workgroups"; sha256 = "1v01yr3lk6l0qn80i3r8fq3di0a8bmqjyhwx19hcgiap57xl80h8"; - name = "workgroups"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77291,9 +100257,17 @@ license = lib.licenses.free; }; }) {}; - workgroups2 = callPackage ({ anaphora, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + workgroups2 = callPackage ({ anaphora + , cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "workgroups2"; + ename = "workgroups2"; version = "20141102.1122"; src = fetchFromGitHub { owner = "pashinin"; @@ -77301,10 +100275,10 @@ rev = "928d509157ec8a4a2e343b6115dff034c3243a7a"; sha256 = "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4f9cfb740cce05a6805d9a047e4c1380305da4df/recipes/workgroups2"; sha256 = "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v"; - name = "workgroups2"; + name = "recipe"; }; packageRequires = [ anaphora cl-lib dash f ]; meta = { @@ -77312,9 +100286,13 @@ license = lib.licenses.free; }; }) {}; - world-time-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + world-time-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "world-time-mode"; + ename = "world-time-mode"; version = "20140627.107"; src = fetchFromGitHub { owner = "nicferrier"; @@ -77322,10 +100300,10 @@ rev = "ce7a3b45c87eb24cfe61eee453175d64f741d7cc"; sha256 = "0i00xm4rynbp2v3gm6h46ajgj8h8nxnsjh6db1659b0hbpnah0ji"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1429650400baf2b1523b5556eaf6a2178d515d4/recipes/world-time-mode"; sha256 = "10gdlz4l9iqw1zdlk5i3knysn36iqxdh3xabjq8kq04jkl7i36dl"; - name = "world-time-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77333,9 +100311,15 @@ license = lib.licenses.free; }; }) {}; - wotd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + wotd = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "wotd"; + ename = "wotd"; version = "20170328.1248"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -77343,10 +100327,10 @@ rev = "d2937a3d91e014f8028a1f33d21c18cc0b065a64"; sha256 = "0nwq5ymj9kx1fx3kfc789nkd80gwzljwmk7xxzzsrdrv47gm047m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a52690a9bae634825bdfb5b6b17e5faccb93e13/recipes/wotd"; sha256 = "145knl4n35kpqqzqkz1vd18d619nw011d93f8qp5h82xm92p3sb5"; - name = "wotd"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -77354,20 +100338,25 @@ license = lib.licenses.free; }; }) {}; - wrap-region = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wrap-region = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wrap-region"; + ename = "wrap-region"; version = "20140116.2320"; src = fetchFromGitHub { owner = "rejeep"; repo = "wrap-region.el"; - rev = "fbae9b0f106187af19823f1a6260b5c68b7252e6"; - sha256 = "1k5q925igdv5lnpbmy0c2f0j3rj7yh4l6bxbd61g9lcnyl0j3ym9"; + rev = "5a910ad23ebb0649e644bf62ad042587341da5da"; + sha256 = "03hjwm51sngkh7jjiwnqhflllqq6i99ib47rm2ja9ii0qyhj1qa0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/wrap-region"; sha256 = "058518smxj3j3mr6ljzh7c9x5g23d24104p58sl9nhpw0cq9k28i"; - name = "wrap-region"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -77375,20 +100364,24 @@ license = lib.licenses.free; }; }) {}; - writegood-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + writegood-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "writegood-mode"; - version = "20170925.647"; + ename = "writegood-mode"; + version = "20180525.643"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "writegood-mode"; - rev = "416453af5a44da52646052fa2ee3a63acfd7bf8a"; - sha256 = "08z35gc3j25h02jmlkzsis4n7a6sy6zy2qykcnp8b3s8y51d0dg0"; + rev = "b71757ec337e226909fb0422f0224e31acc71733"; + sha256 = "038gliy6l931r02bf2dbhmp188sgk1rq46ngg9nhf5q5rkf3pi8p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode"; sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d"; - name = "writegood-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77396,9 +100389,15 @@ license = lib.licenses.free; }; }) {}; - writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }: - melpaBuild { + writeroom-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , visual-fill-column }: + melpaBuild { pname = "writeroom-mode"; + ename = "writeroom-mode"; version = "20170623.327"; src = fetchFromGitHub { owner = "joostkremers"; @@ -77406,10 +100405,10 @@ rev = "9e924dd7dd83f10b026c89cddef7e1646f1a3869"; sha256 = "1v7hbmi9dqdqyr3png1xwhg3k05jr2q6jdjmj48bxiixl9zhcq9p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk"; - name = "writeroom-mode"; + name = "recipe"; }; packageRequires = [ emacs visual-fill-column ]; meta = { @@ -77417,20 +100416,24 @@ license = lib.licenses.free; }; }) {}; - ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ws-butler = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ws-butler"; + ename = "ws-butler"; version = "20170111.1534"; src = fetchFromGitHub { owner = "lewang"; repo = "ws-butler"; - rev = "52321b99be69aa1b661da7743c4421a30d8b6bcb"; - sha256 = "1b6hxhwhzs6xq12w0jmvvjw0bx4czw71xzj3qizq9gx0q4n7a0qf"; + rev = "323b651dd70ee40a25accc940b8f80c3a3185205"; + sha256 = "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ws-butler"; sha256 = "1k5nhj37r51i0czrlafra53wir73p0nbq83jjccqmw4p4xk6axl3"; - name = "ws-butler"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77438,9 +100441,13 @@ license = lib.licenses.free; }; }) {}; - wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wsd-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wsd-mode"; + ename = "wsd-mode"; version = "20170731.837"; src = fetchFromGitHub { owner = "josteink"; @@ -77448,10 +100455,10 @@ rev = "566ae4b45b4a34b985f1b363d6cdbd463ab6aba6"; sha256 = "0k30i1gq6ljxwf97f6nlz8b6blh6hg0b4syfx64lzf0zc22di2l4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/wsd-mode"; sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc"; - name = "wsd-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77459,9 +100466,15 @@ license = lib.licenses.free; }; }) {}; - wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: - melpaBuild { + wttrin = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xterm-color }: + melpaBuild { pname = "wttrin"; + ename = "wttrin"; version = "20170614.506"; src = fetchFromGitHub { owner = "bcbcarl"; @@ -77469,10 +100482,10 @@ rev = "df5427ce2a5ad4dab652dbb1c4a1834d7ddc2abc"; sha256 = "1ai655f10iayb4vw0ass2j3x83f4vsv90326mnywkzfl3sxd432z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b2b6876562f1fadd4af1ea9b279ac4dc1b21660/recipes/wttrin"; sha256 = "0msp8lja9nz6khz3dkasv8hnhkaayqxd7m58kma03hpkcjxnaxil"; - name = "wttrin"; + name = "recipe"; }; packageRequires = [ emacs xterm-color ]; meta = { @@ -77480,9 +100493,13 @@ license = lib.licenses.free; }; }) {}; - wwtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wwtime = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wwtime"; + ename = "wwtime"; version = "20151122.810"; src = fetchFromGitHub { owner = "ndw"; @@ -77490,10 +100507,10 @@ rev = "d04d8fa814b5d3644efaeb28f25520ada69acbbd"; sha256 = "0ba193ilqmp7l35hhzfym4kvbnj9h57m8mwsxdj6rdj2cwrifx8r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f034fbabe9de76e2e4ae44be8c8240b08f0535/recipes/wwtime"; sha256 = "0n37k23lkjgaj9wxnr41yk3mwvy62mc9im5l86czqmw5gy4l63ic"; - name = "wwtime"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77501,9 +100518,15 @@ license = lib.licenses.free; }; }) {}; - www-synonyms = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + www-synonyms = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "www-synonyms"; + ename = "www-synonyms"; version = "20170128.1451"; src = fetchFromGitHub { owner = "spebern"; @@ -77511,10 +100534,10 @@ rev = "7e37ea35064ff31c9945f0198a653647d408c936"; sha256 = "0l4fvq5zdzqvlwxqgqbfx9x0aimvk4x3la9yz9gw3vvj1rwf340i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2fe69ac09c3e24af9c4e24308e57d7c3c3425096/recipes/www-synonyms"; sha256 = "0rp5p26hd67k4dsb40hj7jv24i9wncaay88dmiqla48843j4ymgh"; - name = "www-synonyms"; + name = "recipe"; }; packageRequires = [ cl-lib request ]; meta = { @@ -77522,30 +100545,14 @@ license = lib.licenses.free; }; }) {}; - x-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "x-dict"; - version = "20091203.1023"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "x-dict"; - rev = "920b2430bff9fb8c4bb7944aa358622545c00cee"; - sha256 = "0i7bgbhk4lvdkdjh6z4xs69mbdi49985j82cjikzyyskjcqd2klq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0567fcc7b7aff08094095292fb701da3be8403c3/recipes/x-dict"; - sha256 = "1w51xhiaxk50wlch262dxs2ybjvjj8qzx01xlgiimvggb8h5arlc"; - name = "x-dict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/x-dict"; - license = lib.licenses.free; - }; - }) {}; - x-path-walker = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + x-path-walker = callPackage ({ fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "x-path-walker"; + ename = "x-path-walker"; version = "20160922.1135"; src = fetchFromGitHub { owner = "lompik"; @@ -77553,10 +100560,10 @@ rev = "3b01dbd7a039c6c84fdf8c8ee53ba72090ee950a"; sha256 = "1gb3lnl3gvckbakc4fy22fcvif3xdfkdaw334xmp33phjb8gjqvj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c51f2aba59cb93f4bb104a7dde214963cbf002a6/recipes/x-path-walker"; sha256 = "03l83ph0d8g5pxnzp1gs3gdbwl3vhgvyk186yhqy6sbknq627k2x"; - name = "x-path-walker"; + name = "recipe"; }; packageRequires = [ helm-core ]; meta = { @@ -77564,20 +100571,26 @@ license = lib.licenses.free; }; }) {}; - x509-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + x509-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "x509-mode"; - version = "20180313.153"; + ename = "x509-mode"; + version = "20180702.36"; src = fetchFromGitHub { owner = "jobbflykt"; repo = "x509-mode"; - rev = "d59058608bea1840fdba44810d7184b47bc88410"; - sha256 = "1srqlzgrp75spygw360d1h2jfhlhmgszfsz9kyn8h564mlc3m35k"; + rev = "89bdeca8c7494eaaea115031b3235f0bfbd4d945"; + sha256 = "04m51c7w7nzh5nwpsyzwdcdfk1gsj9cy56xz51x53kla7xbwkdl8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode"; sha256 = "15k3pxj3a2vaf64cl2xrzzlvzbqzqc29qyfd8brhq6yc69snr0vj"; - name = "x509-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -77585,20 +100598,26 @@ license = lib.licenses.free; }; }) {}; - x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + x86-lookup = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "x86-lookup"; - version = "20180321.1802"; + ename = "x86-lookup"; + version = "20180528.935"; src = fetchFromGitHub { owner = "skeeto"; repo = "x86-lookup"; - rev = "a72e282d3db72fc1078623f405c2874bd48b9205"; - sha256 = "0ayjdq50kd3karg0rc9ffxdn8pv0fbf7yfbq5vics8p5w7fl55x0"; + rev = "609b2ba70dc5a246ac9b4b5f89eb5ef4331519bf"; + sha256 = "19zgq7mcc3wx847xc911fibvphbsws99m2l3k54xdjp8mb5qfdzm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup"; sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd"; - name = "x86-lookup"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -77606,20 +100625,25 @@ license = lib.licenses.free; }; }) {}; - xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xah-css-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xah-css-mode"; - version = "20180219.2311"; + ename = "xah-css-mode"; + version = "20180629.107"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "cf452fd0f2e742812a4c69e41cb5403f22b0a16a"; - sha256 = "1wjj3sj90az5y4a7cy0pblwxi0xbj5gg72jdr9wbm95si582vk58"; + rev = "9293a1a21cb7c2a6fb4ae9af0e581f30d2e45016"; + sha256 = "0wlci3z71qk3l19pkxddd4f3w9mg2si9ab4l3da381hnpi6d3iyp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode"; sha256 = "1kkwfyf94v3ni3d4szy28v49p6f3hy8ww9mlris2vvgc726wy6hr"; - name = "xah-css-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77627,20 +100651,25 @@ license = lib.licenses.free; }; }) {}; - xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xah-elisp-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xah-elisp-mode"; - version = "20180328.1205"; + ename = "xah-elisp-mode"; + version = "20180710.124"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "78d6c6d675804c601737e2cffc46d6663bb203b5"; - sha256 = "1p0irlff1qfkfqmcjj9l028x7a6d6dx72q732ix1mwb51vl3fb0b"; + rev = "b2fe52007d90934053a6ba885b77d228d6c2bff6"; + sha256 = "1ma095ivzxblm0daxmgf3lcs59nkxgh4bfaw8vqxysfy0svqrff7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode"; sha256 = "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij"; - name = "xah-elisp-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77648,9 +100677,14 @@ license = lib.licenses.free; }; }) {}; - xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xah-find = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xah-find"; + ename = "xah-find"; version = "20180310.450"; src = fetchFromGitHub { owner = "xahlee"; @@ -77658,10 +100692,10 @@ rev = "0cd985675c286bfa5f07ab9d00231f8a23505537"; sha256 = "01h5wdbzf7swrmddai2vsakr8rsqg447w9bnp7akxla426fsr8wg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-find"; sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq"; - name = "xah-find"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77669,20 +100703,25 @@ license = lib.licenses.free; }; }) {}; - xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xah-fly-keys = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xah-fly-keys"; - version = "20180331.2108"; + ename = "xah-fly-keys"; + version = "20180702.1521"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "4bb464eb0ea68cdd3f4c544371c876418b47107d"; - sha256 = "0i8q15rygavs336nfvbg4riwsgyk10s796qff3bmcxi7l0v8byzq"; + rev = "11db1184a7f68ee6be0cafe5bd9a304cb0036488"; + sha256 = "0j4mx27fnx95ri8sm3zsp0xwk4n8civbnn2ld1932kazbhwfwgqv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs"; - name = "xah-fly-keys"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77690,9 +100729,14 @@ license = lib.licenses.free; }; }) {}; - xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xah-get-thing = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xah-get-thing"; + ename = "xah-get-thing"; version = "20170821.353"; src = fetchFromGitHub { owner = "xahlee"; @@ -77700,10 +100744,10 @@ rev = "e3ef069ea9fea3a092689d45c94c6211b51d0ea4"; sha256 = "0z9pflz99p2i7czccpzvw7bkbshfycpb6js9n8a12yhc1ndbz6z0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-get-thing"; sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg"; - name = "xah-get-thing"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77711,9 +100755,14 @@ license = lib.licenses.free; }; }) {}; - xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xah-lookup = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xah-lookup"; + ename = "xah-lookup"; version = "20171108.241"; src = fetchFromGitHub { owner = "xahlee"; @@ -77721,10 +100770,10 @@ rev = "3029d8ec04e841c57b7482c244a1733eb4c77cb5"; sha256 = "0ygkl663cqs25kicfnpy06j3sm6jjpagvv90wx3llspjy9adcxvx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-lookup"; sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc"; - name = "xah-lookup"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77732,20 +100781,25 @@ license = lib.licenses.free; }; }) {}; - xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xah-math-input = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xah-math-input"; - version = "20180328.1515"; + ename = "xah-math-input"; + version = "20180709.2228"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "6e240b83bd3bc19b0edf8a85413b216dbf27f441"; - sha256 = "1ff3r1a3jgvv33sahi9ajs04m4sch9cmqwx0dlwkn1595smwk8k5"; + rev = "87e46fcaaada3e87dc828e75a52bec05c8c4c262"; + sha256 = "1vb53wr93n2m419y81c6naixxc6791bjynbfydm234da7ixsc7mk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input"; sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a"; - name = "xah-math-input"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77753,9 +100807,13 @@ license = lib.licenses.free; }; }) {}; - xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xah-reformat-code = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xah-reformat-code"; + ename = "xah-reformat-code"; version = "20170821.411"; src = fetchFromGitHub { owner = "xahlee"; @@ -77763,10 +100821,10 @@ rev = "7fec8b28e46b8cc2813fac5149e3bbb56c0aa6b1"; sha256 = "0mz47laig0p7fwwiv66x60f5jg0kh8zvjd1vg3nnn3xvk37lv2cw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-reformat-code"; sha256 = "1sj407nbh4x586hvsq4ycr0ahhxin0wgfwdj0551cz8793wvjpzp"; - name = "xah-reformat-code"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77774,20 +100832,25 @@ license = lib.licenses.free; }; }) {}; - xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xah-replace-pairs = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xah-replace-pairs"; - version = "20170823.2028"; + ename = "xah-replace-pairs"; + version = "20180507.1949"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-replace-pairs"; - rev = "f051772e097723bafd05a7a05f283b900375ebd7"; - sha256 = "0r85y1qaqvnj36c931cz4qzxwf86ai35xjaw6bwy7hjjdxp82cz0"; + rev = "4d845cfbce32d45befd7c454e3476c3ce40d2b43"; + sha256 = "1mkglrc8mbsjag3pc9zrmqa9x3n009hza1p1jvn3n97wjpc1qxlk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-replace-pairs"; sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x"; - name = "xah-replace-pairs"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77795,9 +100858,14 @@ license = lib.licenses.free; }; }) {}; - xahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xahk-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xahk-mode"; + ename = "xahk-mode"; version = "20170821.407"; src = fetchFromGitHub { owner = "xahlee"; @@ -77805,10 +100873,10 @@ rev = "02012b20603c00e3b2ef32159a690ed1e05d12c3"; sha256 = "09nakcfczb95vd48f8z77igmi1kbcblmgpzfzm9i7df4jcfkkh3c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xahk-mode"; sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9"; - name = "xahk-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77816,9 +100884,13 @@ license = lib.licenses.free; }; }) {}; - xbm-life = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xbm-life = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xbm-life"; + ename = "xbm-life"; version = "20160103.217"; src = fetchFromGitHub { owner = "wasamasa"; @@ -77826,10 +100898,10 @@ rev = "dd6a98ac9ea81b681e68f6318fed47158e5d469e"; sha256 = "08hzsqf4gawcr9q2h3rxrf1igvdja84aaa821657k04kdq4dpcbj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6cb4c55583338dafee61fd9c266d2ee7cae2b1ed/recipes/xbm-life"; sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q"; - name = "xbm-life"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77837,20 +100909,28 @@ license = lib.licenses.free; }; }) {}; - xcode-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, s }: - melpaBuild { + xcode-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multiple-cursors + , s }: + melpaBuild { pname = "xcode-mode"; + ename = "xcode-mode"; version = "20160907.508"; src = fetchFromGitHub { owner = "nicklanasa"; repo = "xcode-mode"; - rev = "2ae4f512d6c601ea39d5ab785c2b5288eac24b59"; - sha256 = "0pi85ylxvjj63cmibgvi493d4ybcp2blhlwgrwzn2hjz31jldh0y"; + rev = "5b5f0a4f505d44840a4924b24e3ef73b8528d98b"; + sha256 = "0g2vc13rc9vk20m9l1a1rxkdsc099k33pya3z10sg9pa09a4a2a2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/845c731bed7dbe9c41c09e47e219299f17d0d489/recipes/xcode-mode"; sha256 = "1d8r2bc7fiwma1lcrzd9gxhdpvyf2pc6kplx7nyr40ghsb9jlpiw"; - name = "xcode-mode"; + name = "recipe"; }; packageRequires = [ dash emacs multiple-cursors s ]; meta = { @@ -77858,20 +100938,25 @@ license = lib.licenses.free; }; }) {}; - xcode-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xcode-project = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xcode-project"; - version = "20170922.612"; + ename = "xcode-project"; + version = "20180509.1218"; src = fetchFromGitHub { owner = "nhojb"; repo = "xcode-project"; - rev = "ec5d503a51430205daa6f5f382d921b6412b4b55"; - sha256 = "0m3262mqqhjcpzw8m4n403kr75m561kxvwf8clzwmv0fvkf8aazk"; + rev = "fe95fb1d1da89f4f03d5dff330fd2d663101f8f0"; + sha256 = "1fvk92zbl4rl0kz0wnrmrry1amcpqxqqprsjgn209b4i7sh05p06"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49b866ebf7e707bc74525f83dd5038e6e860fcef/recipes/xcode-project"; sha256 = "0igp30f6ypmp4l8zmdfpa5bza4avm7mq2gj8v7b3ii655v91n6vi"; - name = "xcode-project"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -77879,20 +100964,24 @@ license = lib.licenses.free; }; }) {}; - xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xcscope = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xcscope"; - version = "20160628.2324"; + ename = "xcscope"; + version = "20180426.12"; src = fetchFromGitHub { owner = "dkogan"; repo = "xcscope.el"; - rev = "1e4c8e60eb841a3ecb56ff4115b6a8ae5c0bf779"; - sha256 = "1cc3bmi4fxlgqha7sxswn9lcc126xnr2j8xz6wszjnqh5w274fpp"; + rev = "57bff67460c587acf60f513de622b4c7ab312081"; + sha256 = "1l1k85wlmjb2mgzx1la9f0p7j3q0mzj4hlrs98pf4bbfkdbqg7a7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/068c7846e70b91ce7e88330937fc64a60281802a/recipes/xcscope"; sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w"; - name = "xcscope"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77900,20 +100989,25 @@ license = lib.licenses.free; }; }) {}; - xkcd = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + xkcd = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "xkcd"; + ename = "xkcd"; version = "20160419.430"; src = fetchFromGitHub { owner = "vibhavp"; repo = "emacs-xkcd"; - rev = "66e928706fd660cfdab204c98a347b49c4267bdf"; - sha256 = "0znhjwlpgg05g39b16ddgw3a71a93fn2dicfsxjkziffn2a95m0s"; + rev = "2c538d41a9728939cc5e8292faa78ed50997877d"; + sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xkcd"; sha256 = "0gy2952zg1rq5gl10x7iwbchz5jibfcvikd3chifqbmil80wh6b5"; - name = "xkcd"; + name = "recipe"; }; packageRequires = [ json ]; meta = { @@ -77921,9 +101015,15 @@ license = lib.licenses.free; }; }) {}; - xml-plus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xml-plus = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xml-plus"; + ename = "xml+"; version = "20170727.1651"; src = fetchFromGitHub { owner = "bddean"; @@ -77931,10 +101031,10 @@ rev = "232fa863c08fc159b21dd58c39ea45dce3334895"; sha256 = "0b7v59dya346ds1wad0avrqhjimx5n9r3pcgqafagzf34hdcv3jy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/244388d158efda6fe8c1362a65b89b352c444422/recipes/xml+"; sha256 = "0xgqyfdn6kkp89zj4h54r009a44sbff0nrhh582zw5rlklypwdz1"; - name = "xml-plus"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -77942,9 +101042,13 @@ license = lib.licenses.free; }; }) {}; - xml-quotes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xml-quotes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xml-quotes"; + ename = "xml-quotes"; version = "20151230.1449"; src = fetchFromGitHub { owner = "ndw"; @@ -77952,10 +101056,10 @@ rev = "26db170e80b9295861227cdf970721b12539ed44"; sha256 = "0z3yd3dzcsd7584jchv9q55fx04ig4yjzp8ay2pa112lykv4jxxd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab315d783765730aceab43b4fd8c4872a1f1cc05/recipes/xml-quotes"; sha256 = "1lmafa695xkhd90k6yiv8a57ch1jx33l1zpm39z0kj546mn6y8aq"; - name = "xml-quotes"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77963,9 +101067,13 @@ license = lib.licenses.free; }; }) {}; - xml-rpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xml-rpc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xml-rpc"; + ename = "xml-rpc"; version = "20160430.1458"; src = fetchFromGitHub { owner = "hexmode"; @@ -77973,10 +101081,10 @@ rev = "0ab093d60140d19e31d217c8abdc7dbdac944486"; sha256 = "0g52bmamcd54acyk6i47ar5jawad6ycvm9g656inb994wprnjin9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/547d773e07d6229d2135d1b081b5401039ffad39/recipes/xml-rpc"; sha256 = "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js"; - name = "xml-rpc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -77984,9 +101092,13 @@ license = lib.licenses.free; }; }) {}; - xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xmlgen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xmlgen"; + ename = "xmlgen"; version = "20170411.617"; src = fetchFromGitHub { owner = "philjackson"; @@ -77994,10 +101106,10 @@ rev = "dba66681f0c5e621a9e70e8afb34903c9ffe93c4"; sha256 = "096i29v0badx0a6339h9ckdz78zj59gbjdp7vj7vhkq9d830392s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xmlgen"; sha256 = "0c77la6kl02qkapfzbjmhac60f8p837kwg8bp0686ylxh5s31zsh"; - name = "xmlgen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78005,9 +101117,13 @@ license = lib.licenses.free; }; }) {}; - xmlunicode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xmlunicode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xmlunicode"; + ename = "xmlunicode"; version = "20160319.912"; src = fetchFromGitHub { owner = "ndw"; @@ -78015,10 +101131,10 @@ rev = "f5d185da46414c0509ebd0aa0fab416becf94612"; sha256 = "178bdfwiinhf98qm88ivmgy6rd0qjx5gnckkclanybva0r8l6832"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b636126a389a337a3685f9d0dcbca9bf8e784f20/recipes/xmlunicode"; sha256 = "1ylpvx2p5l863r9qv9jdsm9rbv989c8xn0zpjl8zkcfxqxix4h4p"; - name = "xmlunicode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78026,9 +101142,13 @@ license = lib.licenses.free; }; }) {}; - xo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xo"; + ename = "xo"; version = "20160402.2346"; src = fetchFromGitHub { owner = "j-em"; @@ -78036,10 +101156,10 @@ rev = "72fcd867cfa332fdb82f732925cf8977e690af78"; sha256 = "0761amc73mbgaydp3iyfzgyjxp77yk440s24h69hvk87c5vn1cz3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd8cec754da662e4873186c23c1ba13c52cccbba/recipes/xo"; sha256 = "0kpbnxh8sa2dk8anrvgc7d39qap13pyjxh154gpm8xdb9zhfwl25"; - name = "xo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78047,20 +101167,25 @@ license = lib.licenses.free; }; }) {}; - xquery-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xquery-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xquery-mode"; + ename = "xquery-mode"; version = "20170214.319"; src = fetchFromGitHub { owner = "xquery-mode"; repo = "xquery-mode"; - rev = "1b655ccf83d02a7bd473d2cf02359ed60bdf7369"; - sha256 = "1iprgfjrbx3fmqhkgjxdxnlzz2s6h895q270lhjrhkwgpphgna2c"; + rev = "19e6f9553ce05380843582b879712de00679e4ab"; + sha256 = "0q04p75qkcbij7cqvhwnfx2729f1v4si05xjv433v7f6dfxxkhhl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ea1c9e26963f290d912df21b81afd689543658/recipes/xquery-mode"; sha256 = "13xrvygk7wdby6599q6yxw8cm45qqki8szrm49fc3b6pr6vzpidg"; - name = "xquery-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -78068,20 +101193,24 @@ license = lib.licenses.free; }; }) {}; - xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xquery-tool = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xquery-tool"; + ename = "xquery-tool"; version = "20170605.126"; src = fetchFromGitHub { owner = "paddymcall"; repo = "xquery-tool.el"; - rev = "0d1e2960c48701b83be5255d56324f65a6ee182e"; - sha256 = "0x6927x18nimh9rgnkl8dyc6r437a03byzscgg053lbg0cf2mqp1"; + rev = "171abb0c4560c1a50e1a7def07eb61052ed30609"; + sha256 = "1h3zqq4izzwlg22lj0813bid4j4r5m0blcx33rfak1ngw34zrcza"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool"; sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0"; - name = "xquery-tool"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78089,9 +101218,15 @@ license = lib.licenses.free; }; }) {}; - xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: - melpaBuild { + xref-js2 = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild }: + melpaBuild { pname = "xref-js2"; + ename = "xref-js2"; version = "20170530.126"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -78099,10 +101234,10 @@ rev = "d5f93605405989529c2f66b542def6c32429b927"; sha256 = "1vzsw257xkqwlgfj8d5hnrirjhxzzs9d8ms40ihb2zwsxn70im53"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5dab444ead98210b4ab3a6f9a61d013aed6d5b7/recipes/xref-js2"; sha256 = "1mfyszdi1wx2lqd9fyqm0ra227dcsjs8asc1dw2li0alwh7n4xs3"; - name = "xref-js2"; + name = "recipe"; }; packageRequires = [ emacs js2-mode ]; meta = { @@ -78110,20 +101245,24 @@ license = lib.licenses.free; }; }) {}; - xresources-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xresources-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xresources-theme"; + ename = "xresources-theme"; version = "20160331.702"; src = fetchFromGitHub { owner = "CQQL"; repo = "xresources-theme"; - rev = "feb0552d31cb54210eabbc1abe32c8ea62841b6f"; - sha256 = "1dfksid7dc27dz43lrriyr724qs7pf7dqhkmcai6b5qbi893ib8y"; + rev = "09a0bfc1684161dd1cdc899c027808a99646a652"; + sha256 = "171vffga2yzxqmgh77vila6x96bz1i6818f1pfaxblw1hz2ga341"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cef3a5683ea572f823d915ec2a94d591ac915d6/recipes/xresources-theme"; sha256 = "0spqa3xn3p2lmvlc5hdn7prq4vb70nkyrryx1kavha9igzhlyaga"; - name = "xresources-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78131,9 +101270,14 @@ license = lib.licenses.free; }; }) {}; - xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xterm-color = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xterm-color"; + ename = "xterm-color"; version = "20180202.1518"; src = fetchFromGitHub { owner = "atomontage"; @@ -78141,10 +101285,10 @@ rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c"; sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj"; - name = "xterm-color"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -78152,30 +101296,16 @@ license = lib.licenses.free; }; }) {}; - xterm-frobs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "xterm-frobs"; - version = "20161207.1609"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "xterm-frobs"; - rev = "0832d588598dbf6bd8aa8e05c611d7c098c3f9d8"; - sha256 = "0snrylgv2d6r3d6nv05vqs6ng3sgrxkvqpx7m4ga2y7a1m5lmxkw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bb3be63b798967f5525cf118579a1cc756ee1a/recipes/xterm-frobs"; - sha256 = "02v8kh2g6a2fpxy911630zsg985hyakvqbd6v2xyfbz0vnd6i1lf"; - name = "xterm-frobs"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/xterm-frobs"; - license = lib.licenses.free; - }; - }) {}; - xterm-keybinder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: - melpaBuild { + xterm-keybinder = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "xterm-keybinder"; + ename = "xterm-keybinder"; version = "20160522.1756"; src = fetchFromGitHub { owner = "yuutayamada"; @@ -78183,10 +101313,10 @@ rev = "b29c4f700b0fa0c9f627f6725b36462b8fab06d6"; sha256 = "0ya7c73acwp29glwjd1hf19h8jij2afwmwq7a3h91qx5zdn09wvh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/656f8e27b4e6055a634249f134a4fc0667fa0e95/recipes/xterm-keybinder"; sha256 = "1n0zp1mc7x7z0671lf7p9r4qxic90bkf5q3zwz4vinpiw2qh88lz"; - name = "xterm-keybinder"; + name = "recipe"; }; packageRequires = [ cl-lib emacs let-alist ]; meta = { @@ -78194,41 +101324,25 @@ license = lib.licenses.free; }; }) {}; - xterm-title = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "xterm-title"; - version = "20091203.1023"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "xterm-title"; - rev = "b6ea73d297d191d48bba7dd1e2adc23bbdfa1c3c"; - sha256 = "06cbr7y3wp7j8lnbys57g6md4fdx9xhlnxl73pj7xpfa5i2x9ifl"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bc25d156c8631b552a463f5088a99a3370166e03/recipes/xterm-title"; - sha256 = "08z8qg9x6vjpybbhxa8x46qnp3951miz1264fivg776y76cg3ck6"; - name = "xterm-title"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/xterm-title"; - license = lib.licenses.free; - }; - }) {}; - xtest = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xtest = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xtest"; + ename = "xtest"; version = "20141214.906"; src = fetchFromGitHub { owner = "promethial"; repo = "xtest"; - rev = "2c2bdf32667506dd9ddf6eb311832add616bdf1c"; - sha256 = "09mn8s7gzzxgs7kskld8l68zjrcgnvml3fqj69wrfq7b1g62hhxy"; + rev = "8099be9c2d856f98489834ddb20a01c6fd8922f1"; + sha256 = "1i4hxpvdxhcdxkfg39jmjqn3zdknccj6apgk80hs4k80am0l881z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/378fe14c66072ecb899a074c56f95077dfc9667e/recipes/xtest"; sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7"; - name = "xtest"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -78236,9 +101350,14 @@ license = lib.licenses.free; }; }) {}; - xwidgete = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xwidgete = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xwidgete"; + ename = "xwidgete"; version = "20171118.1316"; src = fetchFromGitHub { owner = "tuhdo"; @@ -78246,10 +101365,10 @@ rev = "e4e8410fe32176df85b46234717824519443fb04"; sha256 = "04j4xwcdxlnrwxs89605zmwxszbi2j0z67v80651pshgnhj5p19i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xwidgete"; sha256 = "1v1dfykkb6nwjwz2623i6x1rl53z4457l6fpa4nv4krdqq79gl5d"; - name = "xwidgete"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -78257,9 +101376,13 @@ license = lib.licenses.free; }; }) {}; - yabin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yabin = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yabin"; + ename = "yabin"; version = "20140205.1951"; src = fetchFromGitHub { owner = "d5884"; @@ -78267,10 +101390,10 @@ rev = "db8c404507560ef9147fcce2b94cd706fbfa03b5"; sha256 = "0f6pvwzhncycw8gnjy24h6q1qglfgvdjfs5dzqx9s43j3yg63lzm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc44b28e32ff9b35f60744a175c2d1e3036db8bc/recipes/yabin"; sha256 = "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17"; - name = "yabin"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78278,9 +101401,13 @@ license = lib.licenses.free; }; }) {}; - yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yafolding = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yafolding"; + ename = "yafolding"; version = "20170304.1917"; src = fetchFromGitHub { owner = "zenozeng"; @@ -78288,10 +101415,10 @@ rev = "57c015ddd7c3454571c80825bc5391d7a10fa1d7"; sha256 = "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yafolding"; sha256 = "1yb1rlxa5f1y1xjqs7ndr5jnf9j5cv0ccqdpbrx4l9xkm3npw9zl"; - name = "yafolding"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78299,20 +101426,25 @@ license = lib.licenses.free; }; }) {}; - yagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yagist = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yagist"; + ename = "yagist"; version = "20160417.2208"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "yagist.el"; - rev = "dcdbd84f348414815d02f3da8a6ee0ac271632d4"; - sha256 = "0lgy9b893mq4harxh80n0n2zia00s2c6ga8p654q563idrskgz17"; + rev = "10da4baa272ff0f7052f17debecc340764c7003f"; + sha256 = "0cxrq5azj2wb8swkzaygizkvdph61v6yr68gjanzgslhvkn66rz1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97ea1250ffbf159d7870710b9348ef26616dbedb/recipes/yagist"; sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd"; - name = "yagist"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -78320,9 +101452,14 @@ license = lib.licenses.free; }; }) {}; - yahoo-weather = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yahoo-weather = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yahoo-weather"; + ename = "yahoo-weather"; version = "20170822.1544"; src = fetchFromGitHub { owner = "lujun9972"; @@ -78330,10 +101467,10 @@ rev = "a74e29bc81b13efe285b87fa4d0694d75f8e2bb5"; sha256 = "1nimmv84q5zsv81ji3nmvpmi30f8xh0ypa88hpdpykc5iirj1m0x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae5ca93d48a2d24787c3d4ed7ab3a65aa8023f4f/recipes/yahoo-weather"; sha256 = "1kzi6yp186wfcqh5q1v9vw6b1h8x89sba6wlnacfpjbarwapfif0"; - name = "yahoo-weather"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -78341,20 +101478,25 @@ license = lib.licenses.free; }; }) {}; - yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yahtzee = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yahtzee"; + ename = "yahtzee"; version = "20171022.712"; src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "c2912e845d74a22436bdf720eb9bc543d0e0c45c"; - sha256 = "1swnr1nrlyd7ij4m05dvqwdfmpj41b3ibfqmb45qm073f27gvj65"; + rev = "5263fb8883d37d79a4ed34dd3216a8947d2ae4a0"; + sha256 = "1qv8p3zpxkkp0ncq3cs8sq2bj4jrxs4s5jfc5hbs905a9z8bsnq9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; sha256 = "1fnywiami9mszagmms27dmak6chcichdi7q70x5c6aimc4jb98jk"; - name = "yahtzee"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -78362,9 +101504,13 @@ license = lib.licenses.free; }; }) {}; - yalinum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yalinum = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yalinum"; + ename = "yalinum"; version = "20130217.243"; src = fetchFromGitHub { owner = "tm8st"; @@ -78372,10 +101518,10 @@ rev = "d3e0cbe3f4f5ca311e3298e684901d6fea3ad973"; sha256 = "12dd4ahg9f1493982d49g7sxx0n6ss4xcfhxwzyaqxckwzfranp0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yalinum"; sha256 = "0jzsvkcvy2mkfmri4bzgrlgw2y0z3hxz44md83s5zmw09mshkahf"; - name = "yalinum"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78383,20 +101529,25 @@ license = lib.licenses.free; }; }) {}; - yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yaml-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yaml-mode"; - version = "20180212.1556"; + ename = "yaml-mode"; + version = "20180408.2307"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "3fc5a33760b0bbb6e67adbce48ab3dc4ae34b847"; - sha256 = "1ijq7ay5lx77nibzqc1kih64v4bg4790as1zg26igp7ivg66l1m6"; + rev = "40067a10ac1360f0b9533f0bbbb2eea128e2574d"; + sha256 = "0v7646vdsbbhxh9ywsypq2ycdsrf6m7wv788qaircbjgn1pk4v7i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc"; - name = "yaml-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -78404,20 +101555,25 @@ license = lib.licenses.free; }; }) {}; - yaml-tomato = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + yaml-tomato = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "yaml-tomato"; + ename = "yaml-tomato"; version = "20151122.2353"; src = fetchFromGitHub { owner = "RadekMolenda"; repo = "yaml-tomato"; - rev = "f9df1c9bdfcec629b03031b2d2032f9dc533cb14"; - sha256 = "1xgqqgg4q3hrhiap8gmr8iifdr1mg4dl0j236b6alhrgmykbhimy"; + rev = "1272c502fac6ce6b0f8b7f8a9beb353f0b35e13c"; + sha256 = "0caz0ls8qlh92hr75xv593d2sk27yscb8nzhgzhiarpdxx447jzz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yaml-tomato"; sha256 = "1asy4nf759lcgksah2g7jvzwwlq9lxfkiji460csk5ycsv8aa99s"; - name = "yaml-tomato"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -78425,9 +101581,13 @@ license = lib.licenses.free; }; }) {}; - yandex-weather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yandex-weather = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yandex-weather"; + ename = "yandex-weather"; version = "20160311.1237"; src = fetchFromGitHub { owner = "abstractionlayer"; @@ -78435,10 +101595,10 @@ rev = "6f823fd9e04ff9efb2aa65f333079e9f7e6e5b28"; sha256 = "0pw44klm8ldsdjphybzkknv8yh23xhzwg76w3d9cqs79jkd0rw8w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5221cee4c89dde5cebd9cddb3b4e4c5814b898d7/recipes/yandex-weather"; sha256 = "11hspadm520cjlv1wk2bdpzg7hg2g0chbh26qijj9jgvca26x0md"; - name = "yandex-weather"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78446,9 +101606,13 @@ license = lib.licenses.free; }; }) {}; - yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yang-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yang-mode"; + ename = "yang-mode"; version = "20180306.407"; src = fetchFromGitHub { owner = "mbj4668"; @@ -78456,10 +101620,10 @@ rev = "340aec635e359609b22f7e94df15af1af2b070f6"; sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; sha256 = "0rl90xbcf3383ls95g1dixh2dr02kc4g60d324cqbb4h59wffp40"; - name = "yang-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78467,20 +101631,25 @@ license = lib.licenses.free; }; }) {}; - yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yankpad = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yankpad"; - version = "20180328.532"; + ename = "yankpad"; + version = "20180624.1615"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "e2ffe7d90bd5a88b794afa1b462f773d8b772db2"; - sha256 = "0a5b8bdzi0h00bk2980mp5mfm1hb7hk5i6jlijmiin89bgs19xpc"; + rev = "ad8ce33fec5d9eb2a7e1111b1097e4015f78c0ed"; + sha256 = "03645wr6ksx6f7q3wpjcx3c7n1bm4v03j8kjkxx2790y77yns3ri"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; sha256 = "1w5r9zk33cjgsmk45znfg32ym06nyqj5q3knr59jmn1fafx7a3z4"; - name = "yankpad"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -78488,9 +101657,13 @@ license = lib.licenses.free; }; }) {}; - yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yapfify = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yapfify"; + ename = "yapfify"; version = "20180105.1447"; src = fetchFromGitHub { owner = "JorisE"; @@ -78498,10 +101671,10 @@ rev = "9e63a9135bd8dbfbee55819837a3aa0d119c5e6f"; sha256 = "1bf09hah2g8x0jbrdh4fm1v01qjymiv38yvv8a5qmfpv5k93lcrc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify"; sha256 = "0scl8lk1c5i7jp1qj5gg8zf3zyi8lkb57ijkmvcs4czzlyv3y9bm"; - name = "yapfify"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78509,9 +101682,14 @@ license = lib.licenses.free; }; }) {}; - yara-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yara-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yara-mode"; + ename = "yara-mode"; version = "20170719.2351"; src = fetchFromGitHub { owner = "binjo"; @@ -78519,10 +101697,10 @@ rev = "af5c05b34a29fc1bd73a6d21c82cc76320b33e5c"; sha256 = "1v8z3cwwla42d3r317091g5i7bj1hlbr9sd1p9s9b7y134gpd1xp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef22d2dad1bae62721710bbff4b7228204d7c425/recipes/yara-mode"; sha256 = "12j25nbfg65bkil4wv6f27sszlj3jm6h0zczr0v26xr5syppis17"; - name = "yara-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -78530,9 +101708,13 @@ license = lib.licenses.free; }; }) {}; - yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yard-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yard-mode"; + ename = "yard-mode"; version = "20170817.537"; src = fetchFromGitHub { owner = "pd"; @@ -78540,10 +101722,10 @@ rev = "ba74a47463b0320ae152bd42a7dd7aeecd7b5748"; sha256 = "0zry3p66bvrk32icnd6kkk8y5rrr8crnqjp6wlp889c8c7wm00n1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/afad2677f901b8d27922389afb1d235d5c8edc39/recipes/yard-mode"; sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx"; - name = "yard-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78551,9 +101733,13 @@ license = lib.licenses.free; }; }) {}; - yari = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yari = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yari"; + ename = "yari"; version = "20151127.2339"; src = fetchFromGitHub { owner = "hron"; @@ -78561,10 +101747,10 @@ rev = "a2cb9656ee5dfe1fc2ee3854f3079a1c8e85dbe9"; sha256 = "0w9a6j0ndpfwaz1g974vv5jqgbzxw26l19kq51j3ah73063cavpf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yari"; sha256 = "0sch9x899mzwdacg55w5j583k2r4vn71ish7gqpghd7cj13ii66h"; - name = "yari"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78572,20 +101758,25 @@ license = lib.licenses.free; }; }) {}; - yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yarn-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yarn-mode"; + ename = "yarn-mode"; version = "20170709.1237"; src = fetchFromGitHub { owner = "anachronic"; repo = "yarn-mode"; - rev = "998b408d6be05fd1c3a9fd8db6ffaab3bf86d06b"; - sha256 = "09mrcv30n6zmgnwgl5pb2cyk6122a0ng1xg20grpmlwbq3qlr424"; + rev = "99891000efe31214b065fa9446cd5e68c5c42ed8"; + sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode"; sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg"; - name = "yarn-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -78593,9 +101784,14 @@ license = lib.licenses.free; }; }) {}; - yascroll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yascroll = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yascroll"; + ename = "yascroll"; version = "20170315.1206"; src = fetchFromGitHub { owner = "m2ym"; @@ -78603,10 +101799,10 @@ rev = "fe4494e5f4faf2832e665c7de0fed99cdbb39478"; sha256 = "09y8phmvqdwp1k9w84rf6p609jrg0mhgx6akwda8rsvxrrbsh6j4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yascroll"; sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f"; - name = "yascroll"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -78614,20 +101810,25 @@ license = lib.licenses.free; }; }) {}; - yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yasnippet = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yasnippet"; - version = "20180319.607"; + ename = "yasnippet"; + version = "20180620.1750"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "fa6a71c42de7fecd58193e2fd3681a0225b71dc5"; - sha256 = "0zxwqc2ksk43p47svhcxsbw8fazl7krarfj8d1i1r9nkwhx5sqqi"; + rev = "d3bb879356288ef38975fbf85947c7371b8c9759"; + sha256 = "1bmwgbi303z1mvar46077vj4974bf7596fs0p4ncnqhcjl75m80j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; sha256 = "1r37vz5b8nj6hr6c2ki9fdbrs3kkb4zwimh8r4ixm10kdkk5jqds"; - name = "yasnippet"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -78635,20 +101836,25 @@ license = lib.licenses.free; }; }) {}; - yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + yasnippet-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "yasnippet-snippets"; - version = "20180324.1124"; + ename = "yasnippet-snippets"; + version = "20180714.622"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "79fc648da3550ada25ec38cebe394c7e5ca8f7b9"; - sha256 = "0sdd021wdighn71mgb9ih4qa8i0msx8sg390kjhqgqfvg8xzrfd4"; + rev = "d153af6d1d8ab8dfbc57f4065cee72f86d5cd2c4"; + sha256 = "0dkhac40kiyqnq42c2fcdb1jzshgakabq4rq796qfhjpc5j8x5wk"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; - sha256 = "0i6rk50a9l26r47v9xsnx35ziz4spx5pml3ys8y30n0r0xjdsj51"; - name = "yasnippet-snippets"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/42490bbdac871bce302fbc9a0488ff7de354627e/recipes/yasnippet-snippets"; + sha256 = "0daawvlw78ya38bbi95swjq8qk5jf5shsyv164m81y2gd8i5c183"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -78656,20 +101862,26 @@ license = lib.licenses.free; }; }) {}; - yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + yatemplate = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "yatemplate"; - version = "20180114.734"; + ename = "yatemplate"; + version = "20180617.252"; src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "4ab835c5ee90a1dbc31c4275a563a9e741a78c6a"; - sha256 = "119i1p1rj329yh7d5a1wizrwhbvnildzzhl2bv50vkswg9nvg3na"; + rev = "4f4fca9f04f7088c98aa195cf33635a35a6055cb"; + sha256 = "04nd9fcp0ff2sjhwrq4nqjicc50m7498vq1qzw2cn5c5gaqmzff8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q"; - name = "yatemplate"; + name = "recipe"; }; packageRequires = [ emacs yasnippet ]; meta = { @@ -78677,18 +101889,23 @@ license = lib.licenses.free; }; }) {}; - yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + yatex = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yatex"; - version = "20180223.2345"; + ename = "yatex"; + version = "20180601.2357"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex"; - rev = "af4601ee3c6a"; - sha256 = "1r0irbkg8c5aapd1i7il31wv2fmhi0bzspiy21k670m896jqx50p"; + rev = "ea6956f10ce7"; + sha256 = "192x3qi781hf4xpx2b33clc2xsq1d7vi3fzjv82d5pq1687kjl93"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex"; sha256 = "1qbqdsqf5s61hyyzx84csnby242n5sdcmcw55pa8r16j8kyzgrc0"; - name = "yatex"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78696,20 +101913,24 @@ license = lib.licenses.free; }; }) {}; - yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yaxception = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yaxception"; + ename = "yaxception"; version = "20150105.652"; src = fetchFromGitHub { owner = "aki2o"; repo = "yaxception"; - rev = "4e94cf3e0b9b5631b0e90eb4b7de597ee7185875"; - sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8"; + rev = "21a36020c6a5319ea6461f4524aa3a0589df3bbd"; + sha256 = "06fnm2c17hmlfp40mq8lxk1blmcy10z0xxdpy8ykyv1r1r6syjf8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da5261081fc66910d935b81e52391c071e52379/recipes/yaxception"; sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58"; - name = "yaxception"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78717,9 +101938,13 @@ license = lib.licenses.free; }; }) {}; - ycm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ycm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ycm"; + ename = "ycm"; version = "20150822.1136"; src = fetchFromGitHub { owner = "neuromage"; @@ -78727,10 +101952,10 @@ rev = "4da8a14abcd0f4fa3235042ade2e12b5068c0601"; sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44e168f757cb51249db2deb9f781eff99cf6fb7c/recipes/ycm"; sha256 = "16ahgvi85ddjlrjxld14zm2vvam0m89mwskizjd5clcz0snk51sc"; - name = "ycm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78738,20 +101963,33 @@ license = lib.licenses.free; }; }) {}; - ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: - melpaBuild { + ycmd = callPackage ({ cl-lib ? null + , dash + , deferred + , emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , pkg-info + , request + , request-deferred + , s }: + melpaBuild { pname = "ycmd"; - version = "20171111.854"; + ename = "ycmd"; + version = "20180520.353"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2"; - sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl"; + rev = "966594701c1eef1f6d4dad0c71c6d43a029977d7"; + sha256 = "05b8l82l3p15r072zhmmwpcnxyyyrhzka5gc3vkzz2sa7wa7sp7j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; sha256 = "10jqr6xz2fnrd1ihips9jmbcd28zha432h4pxjpswz3ivwjqhxna"; - name = "ycmd"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -78769,20 +102007,24 @@ license = lib.licenses.free; }; }) {}; - ydk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ydk-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ydk-mode"; + ename = "ydk-mode"; version = "20170113.121"; src = fetchFromGitHub { owner = "jacksonrayhamilton"; repo = "ydk-mode"; - rev = "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e"; - sha256 = "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi"; + rev = "3de9ef27dbdf5887f05092895e4ba93e7659e0ec"; + sha256 = "1kc1qsblfxfxrbgv3ksqf87gzic463136k2v7ryaj3x2r9mc0j3l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/865b9ee86ca28fc1cedc0a432a292400184711ae/recipes/ydk-mode"; sha256 = "1z9digf39d7dd736svp0cy6773l3nklzc263q23gwfcg0jswbdyg"; - name = "ydk-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78790,20 +102032,27 @@ license = lib.licenses.free; }; }) {}; - yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + yesql-ghosts = callPackage ({ cider + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "yesql-ghosts"; + ename = "yesql-ghosts"; version = "20150220.437"; src = fetchFromGitHub { owner = "magnars"; repo = "yesql-ghosts"; - rev = "8f1faf0137b85a5072d13e1240a463d9a35ce2bb"; - sha256 = "1fyvvkx6pa41bcr9cyh4yclwdzc5bs742s9fxr6wb4a5scq3hg9m"; + rev = "416198cdc4f316b0912af5e413410937b9b8432b"; + sha256 = "0liys4arxias4a0ilssaixml4pvjwk80w93njdxb9f5i8mwwznpj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c652657be0f9b9dcb236e01c3abd2fd717190d7/recipes/yesql-ghosts"; sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf"; - name = "yesql-ghosts"; + name = "recipe"; }; packageRequires = [ cider dash s ]; meta = { @@ -78811,9 +102060,13 @@ license = lib.licenses.free; }; }) {}; - yoficator = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + yoficator = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yoficator"; + ename = "yoficator"; version = "20180129.1252"; src = fetchFromGitLab { owner = "link2xt"; @@ -78821,10 +102074,10 @@ rev = "e0dc076cb0d1999cb41585b5f36322681109fe86"; sha256 = "1vq07ndxrdry26dx3ci4yz1a1qdcr20yznj62y2f0wkyccrai9y9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5156f01564978718dd99ab3a54f19b6512de5c3c/recipes/yoficator"; sha256 = "0b6lv6wk5ammhb9rws9kig02wkm84i5avm7a1vd4sb7wkgm9nj9r"; - name = "yoficator"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78832,9 +102085,13 @@ license = lib.licenses.free; }; }) {}; - yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yoshi-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yoshi-theme"; + ename = "yoshi-theme"; version = "20170330.0"; src = fetchFromGitHub { owner = "ryuslash"; @@ -78842,10 +102099,10 @@ rev = "eab4fb67e8fec47c25c4c1393ac1211f043dbd44"; sha256 = "01al6pzl9mz04b43a3lwnhdvr5i71qhafz6frl5m9q2k6x1x2n2f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme"; sha256 = "1kzdjs3rzg9rxrjgsk0wk75rwvbip6ixg1apcxv2c1a6biqqf2hv"; - name = "yoshi-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78853,20 +102110,29 @@ license = lib.licenses.free; }; }) {}; - youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup, pos-tip }: - melpaBuild { + youdao-dictionary = callPackage ({ chinese-word-at-point + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names + , popup + , pos-tip }: + melpaBuild { pname = "youdao-dictionary"; - version = "20170226.49"; + ename = "youdao-dictionary"; + version = "20180713.2114"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "youdao-dictionary.el"; - rev = "44548f56a1c736e6a7fae4546657bff0a94bf3cb"; - sha256 = "1bazpqibydns36d4m6spvhk7vh6l4xz3w4d3jj78xrvcvi2z2rg2"; + rev = "9496ea3ba8aa999db3dbde88d6aa37f3579d8dea"; + sha256 = "0kn07ksjdrwl0m1wiac83ljg5drrmyf65gxm4m6r3iz1awd1akbb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/712bdf83f71c2105754f9b549a889ffc5b7ba565/recipes/youdao-dictionary"; sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym"; - name = "youdao-dictionary"; + name = "recipe"; }; packageRequires = [ chinese-word-at-point emacs names popup pos-tip ]; meta = { @@ -78874,9 +102140,15 @@ license = lib.licenses.free; }; }) {}; - z3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + z3-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "z3-mode"; + ename = "z3-mode"; version = "20151120.1455"; src = fetchFromGitHub { owner = "zv"; @@ -78884,10 +102156,10 @@ rev = "163dc01d59e9880b4dc188d4e1ad84d6c0c852e1"; sha256 = "1k7m3xk5ksbr2s3ypz5yqafz9sfav1m0qk2jz1xyi3fdaw2j0w2z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e056fb14b46b97ff31b1db3b8bd31e395a54cd87/recipes/z3-mode"; sha256 = "183lzhgjj480ca2939za3rlnsbfn24mgi501n66h5wim950v7vgd"; - name = "z3-mode"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -78895,9 +102167,13 @@ license = lib.licenses.free; }; }) {}; - zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zeal-at-point = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zeal-at-point"; + ename = "zeal-at-point"; version = "20180131.1554"; src = fetchFromGitHub { owner = "jinzhu"; @@ -78905,10 +102181,10 @@ rev = "0fc3263f44e95acd3e9d91057677621ce4d297ee"; sha256 = "0aq9w9pjyzdgf63hwffhph6k43vv3cxmffklrjkjj3hqv796k8yd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point"; sha256 = "1cz53plk5bax5azm13y7xz530qcfh0scm0cgrkrgwja2wwlxirnw"; - name = "zeal-at-point"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78916,20 +102192,26 @@ license = lib.licenses.free; }; }) {}; - zel = callPackage ({ emacs, fetchFromGitHub, fetchurl, frecency, lib, melpaBuild }: - melpaBuild { + zel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , frecency + , lib + , melpaBuild }: + melpaBuild { pname = "zel"; + ename = "zel"; version = "20171014.132"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "zel"; - rev = "9dae2d212224d1deae1f62561fa8e4d689fd09f2"; - sha256 = "1518wp3zjfdvzz5r22cjgn735c4yxr345qzj40b5agww4dsxmwmp"; + rev = "23b12d107f123667ddd443b9f3e2047209e0055a"; + sha256 = "1m8bw588r2a1034ynigrzgab857261nrjwnzag5i3rgwn27brfcz"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b48132eb4c0fd01b9fc31236c5c4701f8f83a806/recipes/zel"; - sha256 = "14qf83n1wz8hg9wfmbh8b50c5xshc28x1xq6wh4g4lfqbfm7marh"; - name = "zel"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/25b445a1dea5e8f1042bed6b5372471c25129fd8/recipes/zel"; + sha256 = "0fwc1fghsw2rg4fv10kgc9d6rhbq20xa9diqcvp1f1cqs12rfhpd"; + name = "recipe"; }; packageRequires = [ emacs frecency ]; meta = { @@ -78937,9 +102219,13 @@ license = lib.licenses.free; }; }) {}; - zen-and-art-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zen-and-art-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zen-and-art-theme"; + ename = "zen-and-art-theme"; version = "20120622.737"; src = fetchFromGitHub { owner = "developernotes"; @@ -78947,10 +102233,10 @@ rev = "a7226cbce0bca2501d69a620cb2aeabfc396c232"; sha256 = "0dnaxhsw549k54j0mgydm7qbl4pizgipfyzc15f9afsxa107rpnl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/692cfa0e9edbc1b7114e2ae2f36bef34b20ad17c/recipes/zen-and-art-theme"; sha256 = "0b2lflji955z90xl9iz2y1vm04yljghbw4948gh5vv5p7mwibgf2"; - name = "zen-and-art-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78958,20 +102244,24 @@ license = lib.licenses.free; }; }) {}; - zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zenburn-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zenburn-theme"; - version = "20180222.1757"; + ename = "zenburn-theme"; + version = "20180531.902"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "af752f46306eb710158904b89c1bf0d6786d0a4d"; - sha256 = "0w3s3c1h7s5j02h7jgbnnh85cx1cmqb5jd8w6fgsp4jna6wn5627"; + rev = "eea429cb2cbde8674b2a17ccc2bda94b54575c01"; + sha256 = "12nyjxvlvr1m7wrkfv7l4w16h8n66ssw2mvwcl4b7xbx4d45x1da"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9"; - name = "zenburn-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -78979,9 +102269,13 @@ license = lib.licenses.free; }; }) {}; - zencoding-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zencoding-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zencoding-mode"; + ename = "zencoding-mode"; version = "20140213.22"; src = fetchFromGitHub { owner = "rooney"; @@ -78989,10 +102283,10 @@ rev = "58e42af182c98cb9941d27cd042d227fbf4e146c"; sha256 = "1y3wj15kfbgskl29glmba6lzq43rcm141p4i5s180aqcw7ydp5vr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7f2ebb9d860aa4f0797cdaadaa35fb3f5c4460b/recipes/zencoding-mode"; sha256 = "1fclad1dyngyg9ncfkcqfxybvy8482i2bd409cgxi9y4h1wc7ws7"; - name = "zencoding-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -79000,19 +102294,24 @@ license = lib.licenses.free; }; }) {}; - zenity-color-picker = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + zenity-color-picker = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zenity-color-picker"; + ename = "zenity-color-picker"; version = "20160302.354"; src = fetchgit { url = "https://bitbucket.org/Soft/zenity-color-picker.el"; - rev = "4f4f46676a461ebc881487fb70c8c181e323db5e"; - sha256 = "14i2k52qz77dv04w39fyp9hfq983fwa3803anqragk608xgwpf4s"; + rev = "bdece51052ef7037e0a3481fc1f487939f57777e"; + sha256 = "12s2zw99q1zn3a1rn5i27mp506nhqh23v3df5inzfsq1b3dji2bl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/zenity-color-picker"; sha256 = "0rim1mbhlb2lj302c58rs5l7bd168nxg1jpir6cbpf8rp0k35ldb"; - name = "zenity-color-picker"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -79020,20 +102319,27 @@ license = lib.licenses.free; }; }) {}; - zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + zephir-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "zephir-mode"; + ename = "zephir-mode"; version = "20170917.2125"; src = fetchFromGitHub { owner = "sergeyklay"; repo = "zephir-mode"; - rev = "c2c6b7451667e68e29c353616f54ef9195c3fffd"; - sha256 = "1h5iv0ggh4jzv180mg8lz72d91b6kcqwy6ypgy3rn50bk6pz06kg"; + rev = "1e0c287a0928ce2d5bce7399ee12be051a4c78a3"; + sha256 = "05p237h79x6li9vckavxd38zv4rm5zhl3d47gj1sjg454q7qba33"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode"; sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j"; - name = "zephir-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs pkg-info ]; meta = { @@ -79041,20 +102347,27 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: - melpaBuild { + zerodark-theme = callPackage ({ all-the-icons + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "zerodark-theme"; - version = "20180308.957"; + ename = "zerodark-theme"; + version = "20180528.26"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "2a240de8cd89c741612d807a521d6b3e51088324"; - sha256 = "10r806hzmgwnysjgg5lx252ychnhyma1bpwm980pf46vlywws5a0"; + rev = "876cafc58a54c567456c4823f8c16edce94ba3ac"; + sha256 = "1g03d1sd1v91f2i66v4m02jy487r9dczif4rnrrwpi5j2iq0ycqx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; - name = "zerodark-theme"; + name = "recipe"; }; packageRequires = [ all-the-icons flycheck magit ]; meta = { @@ -79062,9 +102375,14 @@ license = lib.licenses.free; }; }) {}; - zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zig-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zig-mode"; + ename = "zig-mode"; version = "20180309.1458"; src = fetchFromGitHub { owner = "zig-lang"; @@ -79072,10 +102390,10 @@ rev = "4f281e4748a4eae64efaa98d9dfd9b7c163fbed8"; sha256 = "0pip0kgbxh4cf60j2kzgb9lvrm5vksg83mllk1pcs9mkbxdgjyww"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5cba49d25ebbaa9240d5d87d0c7ca48d928b2e4b/recipes/zig-mode"; sha256 = "005lsgnsaj8rjkzbhi23g99xy9zln4ggkad11xqmn4xa6g199wly"; - name = "zig-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -79083,9 +102401,13 @@ license = lib.licenses.free; }; }) {}; - zlc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zlc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zlc"; + ename = "zlc"; version = "20151010.1857"; src = fetchFromGitHub { owner = "mooz"; @@ -79093,10 +102415,10 @@ rev = "4dd2ba267ecdeac845a7cbb3147294ee7daa25f4"; sha256 = "1gb51bqdf87yibs1zngk6q090p05293cpwlwbwzhnih9sl6wkq8x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/zlc"; sha256 = "0qw0qf14l09mcnw7h0ccbw17psfpra76qfawkc10zpdb5a2167d0"; - name = "zlc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -79104,9 +102426,14 @@ license = lib.licenses.free; }; }) {}; - znc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + znc = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "znc"; + ename = "znc"; version = "20160627.1332"; src = fetchFromGitHub { owner = "sshirokov"; @@ -79114,10 +102441,10 @@ rev = "ce468d185e4a949c45fdd7586313144bc69d4fe5"; sha256 = "0jh11lbzsndsz9i143av7510417nzwy4j3mmpq7cjixfbmnxdq06"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/znc"; sha256 = "1017dlzbpb3ww0zb370bgsdrzr4kcc72ddby9j63d95chz2jg0hb"; - name = "znc"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -79125,9 +102452,13 @@ license = lib.licenses.free; }; }) {}; - zombie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zombie = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zombie"; + ename = "zombie"; version = "20141222.816"; src = fetchFromGitHub { owner = "zk-phi"; @@ -79135,10 +102466,10 @@ rev = "ff8cd1b4cdbb4b0b9b8fd1ec8f6fb93eba249345"; sha256 = "1gm3ly6czbw4vrxcslm50jy6nxf2qsl656cjwbyhw251wppn75cg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0da12385908c0e2ecd087ea7572fedf0a2dcf03f/recipes/zombie"; sha256 = "0ji3nsxwbxmmygd6plpbc1lkw6i5zw4y6x3r5n2ah3ds4vjr7cnv"; - name = "zombie"; + name = "recipe"; }; packageRequires = []; meta = { @@ -79146,20 +102477,27 @@ license = lib.licenses.free; }; }) {}; - zombie-trellys-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: - melpaBuild { + zombie-trellys-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "zombie-trellys-mode"; + ename = "zombie-trellys-mode"; version = "20150304.648"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "zombie-trellys-mode"; - rev = "7f0c45fdda3a44c3b6d1762d116abb1421b8fba2"; - sha256 = "04m53hzk5n9vxh0gxi8jzpdhsdjlxnvz7hmsisr3bs99v603ha01"; + rev = "03b8d3635f65dbf38f9a19b5d1a8dfdcb38ba423"; + sha256 = "0rp615k41v5v9m9g3ydyzgwr6a7wqrmsdkz3pc2frl1zij8jpjm4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e66db80ab82a69542688cd57c9e0ec10e6616c87/recipes/zombie-trellys-mode"; sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv"; - name = "zombie-trellys-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs haskell-mode ]; meta = { @@ -79167,9 +102505,14 @@ license = lib.licenses.free; }; }) {}; - zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zone-nyan = callPackage ({ esxml + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zone-nyan"; + ename = "zone-nyan"; version = "20170818.944"; src = fetchFromGitHub { owner = "wasamasa"; @@ -79177,10 +102520,10 @@ rev = "4b1f8d95f130946718d52806489ffe2762aebfdc"; sha256 = "1axq4ch7garlfrybq9kgv6x7d8y4dw5y9pqbqlqvlwf4xmdrvzmm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zone-nyan"; sha256 = "1g7i5p26gb9gny64b84x6zqml7fly5q9aykmc6l6c1kfl6pqxs94"; - name = "zone-nyan"; + name = "recipe"; }; packageRequires = [ esxml ]; meta = { @@ -79188,9 +102531,14 @@ license = lib.licenses.free; }; }) {}; - zone-rainbow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zone-rainbow = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zone-rainbow"; + ename = "zone-rainbow"; version = "20160120.534"; src = fetchFromGitHub { owner = "kawabata"; @@ -79198,10 +102546,10 @@ rev = "2ba4f1a87c69c4712124ebf12c1f3ea171e1af36"; sha256 = "0w550l9im3mhxhja1b7cr9phdcbvx5lprw551lj0d1lv7qvjasz0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f678d32c8cd1bcc8ec042e7e68ca3a5259da65/recipes/zone-rainbow"; sha256 = "0l51fmhvx9vsxbs62cbjgqphb691397f651nqin7cj3dfvchzh4j"; - name = "zone-rainbow"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -79209,9 +102557,15 @@ license = lib.licenses.free; }; }) {}; - zone-select = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zone-select = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zone-select"; + ename = "zone-select"; version = "20160118.619"; src = fetchFromGitHub { owner = "kawabata"; @@ -79219,10 +102573,10 @@ rev = "bf30da12f1625fe6563448fccf3c506acad10af7"; sha256 = "17mrzf85ym0x5ih4l6sjdjlcmviabf8c8rpvpkd90gp9qxd8pyx1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ecad1475d9a04ddd84f86ed950f742f68bcf71f8/recipes/zone-select"; sha256 = "05kc211invmy4ajwf71vgr2b7bdgn99c4a26m95gcjqgy3sh5xzz"; - name = "zone-select"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -79230,20 +102584,25 @@ license = lib.licenses.free; }; }) {}; - zone-sl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zone-sl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zone-sl"; + ename = "zone-sl"; version = "20160201.410"; src = fetchFromGitHub { owner = "kawabata"; repo = "zone-sl"; - rev = "7ec22e3661c6348382f9fc39a9d0063dbd2352ff"; + rev = "737b21b4b35c28a487ad8a31598e745bc183b209"; sha256 = "0m1q45pza61j0fp8cxkgmds5fyjrk0nqpwhg8m91610m3pvyc3ap"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11c976519e0cb320e48f40f4d735e557b3dfc1b9/recipes/zone-sl"; sha256 = "04rwd6vj3abk3bzhq3swxwcq5da2n9cldrcmvnqgjr975np4cgs3"; - name = "zone-sl"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -79251,20 +102610,25 @@ license = lib.licenses.free; }; }) {}; - zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zoom = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zoom"; + ename = "zoom"; version = "20180310.421"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "zoom"; - rev = "a72714bb14eb32c1c5e7ad1cb4bdeb208450e507"; - sha256 = "176fbhsh2rk6rn8fisfq4ja71lqvf1zbb393wzfsgg68df39mqyh"; + rev = "c97ffaf6d0032007f13974b4d542558f9d686e39"; + sha256 = "0jfz9z6g1zf2jmw5sinnnwnd6z0q8qrgj337f8d2g7mchy85l6fv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; sha256 = "09bk0nnfj72an2b3rravd6qp21gdgcm1m55qnf2r8rzbgqymq5ls"; - name = "zoom"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -79272,9 +102636,14 @@ license = lib.licenses.free; }; }) {}; - zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zoom-window = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zoom-window"; + ename = "zoom-window"; version = "20170302.27"; src = fetchFromGitHub { owner = "syohex"; @@ -79282,10 +102651,10 @@ rev = "cd6ecc103fc30b171bda7daf1f44a550854d0dbf"; sha256 = "1rfhdzwyag32s15ysmf75976nvkx995581afaa4ychj45vwnaqfm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window"; sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3"; - name = "zoom-window"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -79293,9 +102662,14 @@ license = lib.licenses.free; }; }) {}; - zop-to-char = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zop-to-char = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zop-to-char"; + ename = "zop-to-char"; version = "20160212.754"; src = fetchFromGitHub { owner = "thierryvolpiatto"; @@ -79303,10 +102677,10 @@ rev = "816ea90337db0545a2f0a5079f4d7b3a2822af7d"; sha256 = "14waf3g7b92k3qd5088w4pn0wcspxjfkbswlzf7nnkjliw1yh0kf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9277f1a5f1aef8886e739c73dea91d3f81dc5/recipes/zop-to-char"; sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga"; - name = "zop-to-char"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -79314,20 +102688,25 @@ license = lib.licenses.free; }; }) {}; - zossima = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: - melpaBuild { + zossima = callPackage ({ fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild }: + melpaBuild { pname = "zossima"; + ename = "zossima"; version = "20121123.1635"; src = fetchFromGitHub { owner = "technomancy"; repo = "zossima"; - rev = "991676635c374d2a12714dcf48c1ce2d6f97a375"; - sha256 = "0fgwxw7r3zfv0b7xi8bx7kxff2r5hdw9gxf16kwq04fnh18nhi39"; + rev = "0b3f17c77bc1791687cdb4e15c889f774f9e2c0f"; + sha256 = "11ygifz67zyrqqqmjs5xrrch796n2na4c9g1mrpdspf7ndiqjbw2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7566fe6fffc38981ea33582d783c58f3842fe28/recipes/zossima"; sha256 = "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb"; - name = "zossima"; + name = "recipe"; }; packageRequires = [ inf-ruby ]; meta = { @@ -79335,9 +102714,14 @@ license = lib.licenses.free; }; }) {}; - zotelo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zotelo = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zotelo"; + ename = "zotelo"; version = "20160602.249"; src = fetchFromGitHub { owner = "vspinu"; @@ -79345,10 +102729,10 @@ rev = "d9dc089b9adfcc70a63f2a84269a12eb7cb4c748"; sha256 = "1gff44nwiqhqhppwmsn38njkph4g9bw669p95m8p2avb7x7kiybl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/zotelo"; sha256 = "0y6s5ma7633h5pf9zj7vkazidlf211va7nk47ppb1q0iyfkyln36"; - name = "zotelo"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -79356,20 +102740,25 @@ license = lib.licenses.free; }; }) {}; - zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }: - melpaBuild { + zotxt = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , request-deferred }: + melpaBuild { pname = "zotxt"; - version = "20180218.1053"; + ename = "zotxt"; + version = "20180517.1847"; src = fetchFromGitLab { owner = "egh"; repo = "zotxt-emacs"; - rev = "5b3715bab55c9f17f134a8fada5b68c07aa66cad"; - sha256 = "1hz1m4190yi6knz3y088ql8wy3pmsl8lsznqby2vpnn9p74fvl37"; + rev = "23a4a9f74a658222027d53a9a83cd4bcc583ca8b"; + sha256 = "09fq3w9yk9kn6bz7y9kgpiw612dvj3yzsdk734js6zgb0p8lfd2c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt"; sha256 = "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5"; - name = "zotxt"; + name = "recipe"; }; packageRequires = [ request-deferred ]; meta = { @@ -79377,9 +102766,13 @@ license = lib.licenses.free; }; }) {}; - zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zoutline = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zoutline"; + ename = "zoutline"; version = "20180314.1059"; src = fetchFromGitHub { owner = "abo-abo"; @@ -79387,10 +102780,10 @@ rev = "b3ee0f0e0b916838c2d2c249beba74ffdb8d5699"; sha256 = "0sd0017piw0dis6dhpq5dkqd3acisxqgipl7dj8gmc1vnswhdwr8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline"; sha256 = "1yyww84b58ymbx0w1gkgd0csr0cwlghdmnxk0jbzwc45g9g42k1m"; - name = "zoutline"; + name = "recipe"; }; packageRequires = []; meta = { @@ -79398,19 +102791,27 @@ license = lib.licenses.free; }; }) {}; - zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }: - melpaBuild { + zpresent = callPackage ({ dash + , emacs + , fetchhg + , fetchurl + , lib + , melpaBuild + , org-parser + , request }: + melpaBuild { pname = "zpresent"; - version = "20180224.2212"; + ename = "zpresent"; + version = "20180604.2138"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "e2e34c061ff5"; - sha256 = "00rj8lgp5b856csvlrin1vwas1109nmywbrnpny4qck4yghv6zqb"; + rev = "55fc14b66e2e"; + sha256 = "17wkhl1a7jmg4ks011lf5h4f2vbhf8dl6vgzdzlmljk15f9hmw35"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; sha256 = "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j"; - name = "zpresent"; + name = "recipe"; }; packageRequires = [ dash emacs org-parser request ]; meta = { @@ -79418,20 +102819,25 @@ license = lib.licenses.free; }; }) {}; - ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ztree = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ztree"; - version = "20180215.1021"; + ename = "ztree"; + version = "20180512.1150"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "67a1d90595353ab57fd424651c567df9851b9494"; - sha256 = "01qv400zp4bdfah62l3ixkc3kvkwrjj5ngc36m6w783q0zmr105r"; + rev = "50412fa553fb68fcd7218cc44cf66b5342ab6889"; + sha256 = "00s3sa90yi6q0260ziqqmx00xl0nnf46mwcl8fbr5mdw14hvk9dl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; sha256 = "1fk5xz8qq3azc66f954x5qvym94xnv4fg6wy83ihdfwycsas7j20"; - name = "ztree"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -79439,20 +102845,24 @@ license = lib.licenses.free; }; }) {}; - zweilight-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zweilight-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zweilight-theme"; + ename = "zweilight-theme"; version = "20170112.2205"; src = fetchFromGitHub { owner = "philiparvidsson"; repo = "emacs-zweilight-theme"; - rev = "7f45ab9e23164d65538edb2beb9692ecdc24c31e"; - sha256 = "142ixk47a1x6xz8ibavzq7jxppjc2qvfwbly4sdyiwfpznbi4l3a"; + rev = "890f27c939d8a358c9ef0f402fc3314f475ec874"; + sha256 = "0pl254c61405n6sgr01qj4z42vqdvbmf59nz55cl23l2q7kdbfdv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37422e259ada59122e1b4a31a4ae4dc00be797b9/recipes/zweilight-theme"; sha256 = "1ykhnyiv5jvn34178mzg2cy6ynvc7jild6zwdqwr3qay87zffmjf"; - name = "zweilight-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -79460,9 +102870,13 @@ license = lib.licenses.free; }; }) {}; - zygospore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zygospore = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zygospore"; + ename = "zygospore"; version = "20140703.152"; src = fetchFromGitHub { owner = "LouisKottmann"; @@ -79470,10 +102884,10 @@ rev = "1af5ee663f5a7aa08d96a77cacff834dcdf55ea8"; sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/zygospore"; sha256 = "0n9qs6fymdjly0i4rmx87y8gapfn5sqivsivcffi42vcb5f17kxj"; - name = "zygospore"; + name = "recipe"; }; packageRequires = []; meta = { @@ -79481,20 +102895,27 @@ license = lib.licenses.free; }; }) {}; - zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zzz-to-char = callPackage ({ avy + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zzz-to-char"; + ename = "zzz-to-char"; version = "20171231.2219"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "db8d9e660ad18a15159779efe34d7a98ef0df535"; - sha256 = "1wlzlhabq75iqrhg9p2xx8l7rnfzpcjjflxmgyhaxhq188bwrqk6"; + rev = "8ddda49de3356d8fa0308d79b5d68272baf2c57b"; + sha256 = "17d8mmmgj2w4nm2nfg12g35i7zbp4bp47ix5ifqqm1zvwmbmzrqx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh"; - name = "zzz-to-char"; + name = "recipe"; }; packageRequires = [ avy cl-lib emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index d23c735aba47b961a82593bd927e85573b1b9ef9..bec845b815ce7687fb250a5a1180a4d08491b9ac 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -52,19 +52,9 @@ self: # part of a larger package caml = dontConfigure super.caml; - # part of a larger package - # upstream issue: missing package version - cmake-mode = markBroken (dontConfigure super.cmake-mode); - # Expects bash to be at /bin/bash company-rtags = markBroken super.company-rtags; - # upstream issue: missing file header - connection = markBroken super.connection; - - # upstream issue: missing file header - dictionary = markBroken super.dictionary; - easy-kill-extras = super.easy-kill-extras.override { inherit (self.melpaPackages) easy-kill; }; @@ -75,18 +65,20 @@ self: # upstream issue: missing file header elmine = markBroken super.elmine; - # upstream issue: missing dependency redshank - emr = markBroken super.emr; - ess-R-data-view = super.ess-R-data-view.override { inherit (self.melpaPackages) ess ctable popup; }; - # upstream issue: missing dependency highlight - evil-search-highlight-persist = markBroken super.evil-search-highlight-persist; + evil-magit = super.evil-magit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); - # upstream issue: missing dependency highlight - floobits = markBroken super.floobits; + # missing dependencies + evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: { + packageRequires = with self; [ evil highlight ]; + }); # missing OCaml flycheck-ocaml = markBroken super.flycheck-ocaml; @@ -94,9 +86,6 @@ self: # Expects bash to be at /bin/bash flycheck-rtags = markBroken super.flycheck-rtags; - # upstream issue: missing file header - fold-dwim = markBroken super.fold-dwim; - # build timeout graphene = markBroken super.graphene; @@ -106,8 +95,13 @@ self: # Expects bash to be at /bin/bash helm-rtags = markBroken super.helm-rtags; - # upstream issue: missing file header - helm-words = markBroken super.helm-words; + # Build same version as Haskell package + hindent = super.hindent.overrideAttrs (attrs: { + version = external.hindent.version; + src = external.hindent.src; + packageRequires = [ self.haskell-mode ]; + propagatedUserEnvPkgs = [ external.hindent ]; + }); # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; @@ -115,23 +109,42 @@ self: # upstream issue: missing file header initsplit = super.initsplit; + # tries to write a log file to $HOME + insert-shebang = super.insert-shebang.overrideAttrs (attrs: { + HOME = "/tmp"; + }); + # Expects bash to be at /bin/bash ivy-rtags = markBroken super.ivy-rtags; # upstream issue: missing file header jsfmt = markBroken super.jsfmt; - # upstream issue: missing file header - link = markBroken super.link; - # upstream issue: missing file header maxframe = markBroken super.maxframe; - # version of magit-popup needs to match magit - # https://github.com/magit/magit/issues/3286 - magit = super.magit.override { - inherit (self.melpaPackages) magit-popup; - }; + magit = + (super.magit.override { + # version of magit-popup needs to match magit + # https://github.com/magit/magit/issues/3286 + inherit (self.melpaPackages) magit-popup; + }).overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-annex = super.magit-annex.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); # missing OCaml merlin = markBroken super.merlin; @@ -149,14 +162,17 @@ self: # missing OCaml ocp-indent = markBroken super.ocp-indent; - # upstream issue: missing dependency - org-readme = markBroken super.org-readme; - - # upstream issue: missing file header - perl-completion = markBroken super.perl-completion; + orgit = + (super.orgit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + })); - # upstream issue: truncated file - powershell = markBroken super.powershell; + # tries to write to $HOME + php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { + HOME = "/tmp"; + }); # upstream issue: mismatched filename processing-snippets = markBroken super.processing-snippets; @@ -164,18 +180,9 @@ self: # upstream issue: missing file header qiita = markBroken super.qiita; - # upstream issue: missing package version - quack = markBroken super.quack; - - # upstream issue: missing file header - railgun = markBroken super.railgun; - # upstream issue: missing file footer seoul256-theme = markBroken super.seoul256-theme; - # upstream issue: missing dependency highlight - sonic-pi = markBroken super.sonic-pi; - spaceline = super.spaceline.override { inherit (self.melpaPackages) powerline; }; @@ -195,18 +202,18 @@ self: # missing OCaml utop = markBroken super.utop; + vdiff-magit = + (super.vdiff-magit.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + })); + # upstream issue: missing file header voca-builder = markBroken super.voca-builder; - # upstream issue: missing dependency - weechat-alert = markBroken super.weechat-alert; - # upstream issue: missing file header window-numbering = markBroken super.window-numbering; - # upstream issue: missing file header - zeitgeist = markBroken super.zeitgeist; - w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { prePatch = @@ -219,6 +226,10 @@ self: }); }; - melpaPackages = super // overrides; + melpaPackages = + removeAttrs (super // overrides) + [ + "show-marks" # missing dependency: fm + ]; in melpaPackages // { inherit melpaPackages; } diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 83f6a56da0af31db26a181e8e8ca82d3adbc81dc..df0ec7fcb12e0a8e50acf91381486e59355485d0 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1,7 +1,12 @@ -{ callPackage }: { - _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { +{ callPackage }: + { + _0blayout = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "_0blayout"; + ename = "0blayout"; version = "1.0.2"; src = fetchFromGitHub { owner = "etu"; @@ -9,10 +14,10 @@ rev = "b8bb44b5336965b5519b9a826a0f46f8ee31c471"; sha256 = "1apv5zd3zzni2llj9is7h2bzq1xxbx67kr7c07dfjd26n7l0zvfi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout"; sha256 = "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92"; - name = "_0blayout"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20,20 +25,25 @@ license = lib.licenses.free; }; }) {}; - a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + a = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "a"; - version = "0.1.0alpha4"; + ename = "a"; + version = "0.1.0.-3.4"; src = fetchFromGitHub { owner = "plexus"; repo = "a.el"; rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361"; sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a"; sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886"; - name = "a"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -41,9 +51,15 @@ license = lib.licenses.free; }; }) {}; - aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }: - melpaBuild { + aa-edit-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , navi2ch }: + melpaBuild { pname = "aa-edit-mode"; + ename = "aa-edit-mode"; version = "0.0.2"; src = fetchFromGitHub { owner = "zonuexe"; @@ -51,10 +67,10 @@ rev = "2e56f3b627f0f19fbfce4968180b4d736f7afb5d"; sha256 = "1rh9n97z1vi7w60qzam5vc025wwm346fgzym2zs1cm7ykyfh3mgd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20d00f782f2db87264c7fb1aac7455e44b8b24e7/recipes/aa-edit-mode"; sha256 = "00b99ik04xx4b2a1cm1z8dl42hjnb5r32qypjyyx8924n1dhxzgn"; - name = "aa-edit-mode"; + name = "recipe"; }; packageRequires = [ emacs navi2ch ]; meta = { @@ -62,9 +78,13 @@ license = lib.licenses.free; }; }) {}; - abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + abc-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "abc-mode"; + ename = "abc-mode"; version = "20140225.944"; src = fetchFromGitHub { owner = "mkjunker"; @@ -72,10 +92,10 @@ rev = "6b5ab7402287dab5a091e94fec9982dc45d9d287"; sha256 = "13f4l9xzx4xm5m80kkb49zh31w0bn0kw9m5ca28rrx4aysqmwryv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaee9dc5de06747374f311d86a550d3cc15beed1/recipes/abc-mode"; sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx"; - name = "abc-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -83,9 +103,14 @@ license = lib.licenses.free; }; }) {}; - abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + abyss-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "abyss-theme"; + ename = "abyss-theme"; version = "0.7"; src = fetchFromGitHub { owner = "mgrbyte"; @@ -93,10 +118,10 @@ rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14"; sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme"; sha256 = "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c"; - name = "abyss-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -104,20 +129,27 @@ license = lib.licenses.free; }; }) {}; - ac-alchemist = callPackage ({ alchemist, auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-alchemist = callPackage ({ alchemist + , auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-alchemist"; + ename = "ac-alchemist"; version = "0.1"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-alchemist"; - rev = "31114f3e1e7cc1e101d0b81819d7876d8861df92"; - sha256 = "0a8widshsm39cbala17pmnk1sazazhhyqppwalysli170whk49c5"; + rev = "b1496f6c7f968725076341d3797fe33fb2d36e39"; + sha256 = "06d6yhknrq1wqdg3ykkswsb515bvhkz23gbclws9lmqslns7g1jf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef9037aa41a8d9467838495bb235db32c19cc417/recipes/ac-alchemist"; sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0"; - name = "ac-alchemist"; + name = "recipe"; }; packageRequires = [ alchemist auto-complete cl-lib ]; meta = { @@ -125,9 +157,15 @@ license = lib.licenses.free; }; }) {}; - ac-capf = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-capf = callPackage ({ auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-capf"; + ename = "ac-capf"; version = "0.1"; src = fetchFromGitHub { owner = "syohex"; @@ -135,10 +173,10 @@ rev = "17571dba0a8f98111f2ab758e9bea285b263781b"; sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/929da263f57b904c50f5f17b09d4c4b480999c97/recipes/ac-capf"; sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm"; - name = "ac-capf"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib ]; meta = { @@ -146,9 +184,16 @@ license = lib.licenses.free; }; }) {}; - ac-cider = callPackage ({ auto-complete, cider, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-cider = callPackage ({ auto-complete + , cider + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-cider"; + ename = "ac-cider"; version = "0.2.3"; src = fetchFromGitHub { owner = "clojure-emacs"; @@ -156,10 +201,10 @@ rev = "4be034e5f82421b0a836ec7ff45815c67caffcee"; sha256 = "12s7wy7fyk5z9q287j871gcsrvj90f4c81h39p66d99jw0cl93qj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8adefaf2e284ef91baec3dbd3e10c868de69926/recipes/ac-cider"; sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6"; - name = "ac-cider"; + name = "recipe"; }; packageRequires = [ auto-complete cider cl-lib ]; meta = { @@ -167,20 +212,29 @@ license = lib.licenses.free; }; }) {}; - ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: - melpaBuild { + ac-clang = callPackage ({ auto-complete + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pos-tip + , yasnippet }: + melpaBuild { pname = "ac-clang"; - version = "2.1.0"; + ename = "ac-clang"; + version = "2.1.3"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "daddbea033d3c6f934e5043cc2fff8eca3b6e5f7"; - sha256 = "1hp3xpv0kwmilfivif2smbbgknjyk8kcgp399dghdcq71qsxz3wr"; + rev = "3294b968eb1a8317049190940193f9da47c085ef"; + sha256 = "160hda911vsc2zcs56560cpv7kj0966vjzwmc0md6fkz3wrj7w0n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4"; - name = "ac-clang"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib emacs pos-tip yasnippet ]; meta = { @@ -188,9 +242,15 @@ license = lib.licenses.free; }; }) {}; - ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }: - melpaBuild { + ac-dcd = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , flycheck-dmd-dub + , lib + , melpaBuild }: + melpaBuild { pname = "ac-dcd"; + ename = "ac-dcd"; version = "0.4"; src = fetchFromGitHub { owner = "atilaneves"; @@ -198,10 +258,10 @@ rev = "4cb14b1e9fcfc4bf4a084765bc1eb10abfbbbd49"; sha256 = "0a3s880nswc2s6yh2v5zsmws550q917i7av8nrxc5sp1d03xqwmn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64142a4b14531409f45f02a8053ed8948f48221d/recipes/ac-dcd"; sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r"; - name = "ac-dcd"; + name = "recipe"; }; packageRequires = [ auto-complete flycheck-dmd-dub ]; meta = { @@ -209,20 +269,26 @@ license = lib.licenses.free; }; }) {}; - ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-emacs-eclim = callPackage ({ auto-complete + , eclim + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-emacs-eclim"; + ename = "ac-emacs-eclim"; version = "0.4"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6"; - sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3"; + rev = "94508ebd071ff1052d68a20f7f1bf1038439fe43"; + sha256 = "0l72zw93wv8ncn98d6ybnykhi3a60bc0kyx6z699wfhnnhhxhl0p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; sha256 = "0bkh7x6zj5drdvm9ji4vwqdxv7limd9a1idy8lsg0lcca3rjq3s5"; - name = "ac-emacs-eclim"; + name = "recipe"; }; packageRequires = [ auto-complete eclim ]; meta = { @@ -230,9 +296,15 @@ license = lib.licenses.free; }; }) {}; - ac-emoji = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-emoji = callPackage ({ auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-emoji"; + ename = "ac-emoji"; version = "0.2"; src = fetchFromGitHub { owner = "syohex"; @@ -240,10 +312,10 @@ rev = "53677f754929ead403ccde64b714ebb6b8fc808e"; sha256 = "0cc3jpc4pihbyznyzvf6i3xwc2x78gb5m36ba9gkvxhabsljnlfg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15f591f9cba367b071046fef5ae01bbbd0475ce3/recipes/ac-emoji"; sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw"; - name = "ac-emoji"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib ]; meta = { @@ -251,9 +323,14 @@ license = lib.licenses.free; }; }) {}; - ac-etags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-etags = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-etags"; + ename = "ac-etags"; version = "0.6"; src = fetchFromGitHub { owner = "syohex"; @@ -261,10 +338,10 @@ rev = "8cd188b2e4908285ba8178bbd18a555edd7282e8"; sha256 = "0ijni3qgd68jhznhirhgcl59cr7hwfvbwgf6z120x56jmp8h01d2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fda9c7def8bc54af4ab17dc049dd94324c8f10fa/recipes/ac-etags"; sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb"; - name = "ac-etags"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -272,9 +349,15 @@ license = lib.licenses.free; }; }) {}; - ac-geiser = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, geiser, lib, melpaBuild }: - melpaBuild { + ac-geiser = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , geiser + , lib + , melpaBuild }: + melpaBuild { pname = "ac-geiser"; + ename = "ac-geiser"; version = "0.1"; src = fetchFromGitHub { owner = "xiaohanyu"; @@ -282,10 +365,10 @@ rev = "0e2e36532336f27e3dc3b01fff55ad1a4329817d"; sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/586ef409e3ae758b459b625d4bf0108f0525a085/recipes/ac-geiser"; sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx"; - name = "ac-geiser"; + name = "recipe"; }; packageRequires = [ auto-complete geiser ]; meta = { @@ -293,9 +376,15 @@ license = lib.licenses.free; }; }) {}; - ac-haskell-process = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: - melpaBuild { + ac-haskell-process = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "ac-haskell-process"; + ename = "ac-haskell-process"; version = "0.7"; src = fetchFromGitHub { owner = "purcell"; @@ -303,10 +392,10 @@ rev = "0362d4323511107ec70e7165cb612f3ab01b712f"; sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98bd259b6bfd9b49a8ae421807a4ab3821f09608/recipes/ac-haskell-process"; sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw"; - name = "ac-haskell-process"; + name = "recipe"; }; packageRequires = [ auto-complete haskell-mode ]; meta = { @@ -314,9 +403,16 @@ license = lib.licenses.free; }; }) {}; - ac-helm = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }: - melpaBuild { + ac-helm = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "ac-helm"; + ename = "ac-helm"; version = "2.1"; src = fetchFromGitHub { owner = "yasuyk"; @@ -324,10 +420,10 @@ rev = "f2110576b0eb35850a7f638c1a991a9fa0c8da3a"; sha256 = "1gw38phyaslpql7szvlpwgyfngdgd21f6lq406vq0gjwwmxgig34"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50427d365c79aff84ac759d19ce177b4f7ed2751/recipes/ac-helm"; sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq"; - name = "ac-helm"; + name = "recipe"; }; packageRequires = [ auto-complete helm popup ]; meta = { @@ -335,9 +431,15 @@ license = lib.licenses.free; }; }) {}; - ac-html = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: - melpaBuild { + ac-html = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-completion-data }: + melpaBuild { pname = "ac-html"; + ename = "ac-html"; version = "0.31"; src = fetchFromGitHub { owner = "cheunghy"; @@ -345,10 +447,10 @@ rev = "415a78c3b84855b0c0411832d21a0fb63239b184"; sha256 = "19v9515ixg22m7h7riix8w3vyhzax1m2pbwdirp59v532xn9b0cz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce370d60b2f4dd0570b631f6ca92a221e1fe2de6/recipes/ac-html"; sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa"; - name = "ac-html"; + name = "recipe"; }; packageRequires = [ auto-complete web-completion-data ]; meta = { @@ -356,9 +458,14 @@ license = lib.licenses.free; }; }) {}; - ac-html-bootstrap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: - melpaBuild { + ac-html-bootstrap = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-completion-data }: + melpaBuild { pname = "ac-html-bootstrap"; + ename = "ac-html-bootstrap"; version = "0.9.3"; src = fetchFromGitHub { owner = "osv"; @@ -366,10 +473,10 @@ rev = "591e1e996c820da218ea1eee0a500c556769f128"; sha256 = "1zmjqnlbfchnb7n2v7ms7q06xma1lmf9ry3v6f4pfnwlmz5lsf3a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6cf8aed547ca2390395dcf52d6c542b6944697af/recipes/ac-html-bootstrap"; sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1"; - name = "ac-html-bootstrap"; + name = "recipe"; }; packageRequires = [ web-completion-data ]; meta = { @@ -377,9 +484,14 @@ license = lib.licenses.free; }; }) {}; - ac-html-csswatcher = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: - melpaBuild { + ac-html-csswatcher = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-completion-data }: + melpaBuild { pname = "ac-html-csswatcher"; + ename = "ac-html-csswatcher"; version = "0.1.7"; src = fetchFromGitHub { owner = "osv"; @@ -387,10 +499,10 @@ rev = "dadc3c595cf1708291096c03987f1981f3cabc6b"; sha256 = "0p18wxyyc1jmcwx9y5i77s25v4jszv7cmm4bkwm4dzhkxd33kh1f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fba8b9bf212e6fa389eae8394d0b3bbce9eb0f92/recipes/ac-html-csswatcher"; sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn"; - name = "ac-html-csswatcher"; + name = "recipe"; }; packageRequires = [ web-completion-data ]; meta = { @@ -398,9 +510,15 @@ license = lib.licenses.free; }; }) {}; - ac-inf-ruby = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: - melpaBuild { + ac-inf-ruby = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild }: + melpaBuild { pname = "ac-inf-ruby"; + ename = "ac-inf-ruby"; version = "0.4"; src = fetchFromGitHub { owner = "purcell"; @@ -408,10 +526,10 @@ rev = "3e22b66d3d3e2712a0fe783b5cdd0583a0d4c318"; sha256 = "1acm13n59sdgvvzicscxzrr5j1x5sa5x4rc4cnkbwb28nw5a5ysm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a72abe0fe1253149afb45b0d9e81b6846a926c0/recipes/ac-inf-ruby"; sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr"; - name = "ac-inf-ruby"; + name = "recipe"; }; packageRequires = [ auto-complete inf-ruby ]; meta = { @@ -419,9 +537,15 @@ license = lib.licenses.free; }; }) {}; - ac-ispell = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-ispell = callPackage ({ auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-ispell"; + ename = "ac-ispell"; version = "0.7"; src = fetchFromGitHub { owner = "syohex"; @@ -429,10 +553,10 @@ rev = "a8c84f7f0b96dc091abc51b1698f24e9c994e6aa"; sha256 = "16qsj3wni4xhcrjx2rnxdzq6jb7jrl4bngi4an37vgdlrx3w8m6l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b41acb7387ebef9af2906fa16298b64d6431bfb0/recipes/ac-ispell"; sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67"; - name = "ac-ispell"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib ]; meta = { @@ -440,9 +564,16 @@ license = lib.licenses.free; }; }) {}; - ac-mozc = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }: - melpaBuild { + ac-mozc = callPackage ({ auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mozc }: + melpaBuild { pname = "ac-mozc"; + ename = "ac-mozc"; version = "0.0.4"; src = fetchFromGitHub { owner = "igjit"; @@ -450,10 +581,10 @@ rev = "4c6c8be4701010d9362184437c0f783e0335c631"; sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3f74039d397037e640cc371d24bdb60ac90bf1/recipes/ac-mozc"; sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f"; - name = "ac-mozc"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib mozc ]; meta = { @@ -461,20 +592,25 @@ license = lib.licenses.free; }; }) {}; - ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ac-octave = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ac-octave"; + ename = "ac-octave"; version = "0.7"; src = fetchFromGitHub { owner = "coldnew"; repo = "ac-octave"; - rev = "6d09b94a86f43de84c60e9a699b5e1be61c0f138"; - sha256 = "1kg5q0bw0ymynsn3j7bjavb6wr8b0bjwm6jfj254g80y1inn4bp4"; + rev = "ffc12874320bbbde940e5d446898435e7da495f8"; + sha256 = "1h6g44rl5xia1l7shvihrnxlg0b8xsgvas212d1nvybc572yvbbc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave"; sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z"; - name = "ac-octave"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -482,20 +618,27 @@ license = lib.licenses.free; }; }) {}; - ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + ac-php = callPackage ({ ac-php-core + , auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "ac-php"; - version = "2.0.4"; + ename = "ac-php"; + version = "2.0.5"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "326721527b2f88df7227cdc41708912b2f9c8494"; - sha256 = "1rrjzaa1qqzbnwp6ykk4qbdqlrwprdg2z4xqsb8098p052jjdpii"; + rev = "f489da3ceb04ff6efd9da5c5f56d71f49966e1d4"; + sha256 = "081v4srqzzwd8v07z013m756qrxll5fpzwf8km0686nc5gcg6q9l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; sha256 = "1wqwwgdln98snlq5msdx94b7985krvqfn264hxs1h94r85kgn1ba"; - name = "ac-php"; + name = "recipe"; }; packageRequires = [ ac-php-core auto-complete yasnippet ]; meta = { @@ -503,20 +646,31 @@ license = lib.licenses.free; }; }) {}; - ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: - melpaBuild { + ac-php-core = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , php-mode + , popup + , s + , xcscope }: + melpaBuild { pname = "ac-php-core"; - version = "2.0.4"; + ename = "ac-php-core"; + version = "2.0.5"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "326721527b2f88df7227cdc41708912b2f9c8494"; - sha256 = "1rrjzaa1qqzbnwp6ykk4qbdqlrwprdg2z4xqsb8098p052jjdpii"; + rev = "c815709f46b87cd3677f0b29eecae4973709645a"; + sha256 = "04rbq9q86am6fm4z78pm7lkgjr2p01iq41yfd0qmas5bnvfbzsvk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; sha256 = "0vk3jsxb7dgk5a6pap3bdqkqwpszil0rck1c3y0wyxrlj2y1jcvn"; - name = "ac-php-core"; + name = "recipe"; }; packageRequires = [ dash emacs f php-mode popup s xcscope ]; meta = { @@ -524,9 +678,16 @@ license = lib.licenses.free; }; }) {}; - ac-racer = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: - melpaBuild { + ac-racer = callPackage ({ auto-complete + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , racer }: + melpaBuild { pname = "ac-racer"; + ename = "ac-racer"; version = "0.2"; src = fetchFromGitHub { owner = "syohex"; @@ -534,10 +695,10 @@ rev = "4408c2d652dec0432e20c05e001db8222d778c6b"; sha256 = "01154kqzh3pjy57vxhv27nm69p85a1fwl7r95c7pzmzxgxigfz1p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4318daf4dbb6864ee41f41287c89010fb811641/recipes/ac-racer"; sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp"; - name = "ac-racer"; + name = "recipe"; }; packageRequires = [ auto-complete emacs racer ]; meta = { @@ -545,20 +706,26 @@ license = lib.licenses.free; }; }) {}; - ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: - melpaBuild { + ac-rtags = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , rtags }: + melpaBuild { pname = "ac-rtags"; + ename = "ac-rtags"; version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; - sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; + rev = "7e6b6f21935eedbe4678ba91c5531ac162b51a5a"; + sha256 = "12629d1s8rplhjh17n3bmgnkpscq4gljgyl84j8qyhh40dwq1qk0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; sha256 = "1w9v32di9135mm598c4506gxf0xr5jyz8dyd9dhga5d60q7g9641"; - name = "ac-rtags"; + name = "recipe"; }; packageRequires = [ auto-complete rtags ]; meta = { @@ -566,9 +733,16 @@ license = lib.licenses.free; }; }) {}; - ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: - melpaBuild { + ac-slime = callPackage ({ auto-complete + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , slime }: + melpaBuild { pname = "ac-slime"; + ename = "ac-slime"; version = "0.8"; src = fetchFromGitHub { owner = "purcell"; @@ -576,10 +750,10 @@ rev = "df6c4e88b5ba2d15d47a651ecf7edc0986624112"; sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ac-slime"; sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg"; - name = "ac-slime"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib slime ]; meta = { @@ -587,9 +761,14 @@ license = lib.licenses.free; }; }) {}; - ace-flyspell = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-flyspell = callPackage ({ avy + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-flyspell"; + ename = "ace-flyspell"; version = "0.1.3"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -597,10 +776,10 @@ rev = "044d38fb8eb390ef1f51cf92cfe5c4ffd103044c"; sha256 = "0yy7g2903v78a8pavhxi8c7vqbmifn2sjk84zhw5aygihp3d6vf0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-flyspell"; sha256 = "1zgywb90cg64nllbbk0x9ipm6znyc5yh7vkajrrnw06r5vabyp9y"; - name = "ace-flyspell"; + name = "recipe"; }; packageRequires = [ avy ]; meta = { @@ -608,9 +787,17 @@ license = lib.licenses.free; }; }) {}; - ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }: - melpaBuild { + ace-isearch = callPackage ({ ace-jump-mode + , avy + , emacs + , fetchFromGitHub + , fetchurl + , helm-swoop + , lib + , melpaBuild }: + melpaBuild { pname = "ace-isearch"; + ename = "ace-isearch"; version = "0.1.4"; src = fetchFromGitHub { owner = "tam17aki"; @@ -618,10 +805,10 @@ rev = "7e041d058492c5c35ec70de0e7c5586043e7e5ec"; sha256 = "0233ai62zhsy5yhv72016clygwp2pcg80y6kr4cjm2k1k2wwy7m9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/344f0cf784a027cde196b7d766024fb415fa1968/recipes/ace-isearch"; sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm"; - name = "ace-isearch"; + name = "recipe"; }; packageRequires = [ ace-jump-mode avy emacs helm-swoop ]; meta = { @@ -629,9 +816,15 @@ license = lib.licenses.free; }; }) {}; - ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-jump-buffer = callPackage ({ avy + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-jump-buffer"; + ename = "ace-jump-buffer"; version = "0.4.1"; src = fetchFromGitHub { owner = "waymondo"; @@ -639,10 +832,10 @@ rev = "02797c22c10a817dbbdfbd8fddceeba6c4f0499a"; sha256 = "13wq92ia18q9vyhmvnz1grl1l18hxnaisb7hv13dhfc06alcsrw2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer"; sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi"; - name = "ace-jump-buffer"; + name = "recipe"; }; packageRequires = [ avy dash ]; meta = { @@ -650,9 +843,15 @@ license = lib.licenses.free; }; }) {}; - ace-jump-helm-line = callPackage ({ avy, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + ace-jump-helm-line = callPackage ({ avy + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "ace-jump-helm-line"; + ename = "ace-jump-helm-line"; version = "0.5.0"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -660,10 +859,10 @@ rev = "8779050e4794279946892b6a156d0086554a9c9e"; sha256 = "1d4bxxcnjbdr6cjr3jmz2zrnzjv5pwrypbp4xqgqyv9rz02n7ac1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8925f3daa92ff39776b55642aa9ec0e49245c0c7/recipes/ace-jump-helm-line"; sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9"; - name = "ace-jump-helm-line"; + name = "recipe"; }; packageRequires = [ avy helm ]; meta = { @@ -671,9 +870,13 @@ license = lib.licenses.free; }; }) {}; - ace-jump-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-jump-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-jump-mode"; + ename = "ace-jump-mode"; version = "2.0"; src = fetchFromGitHub { owner = "winterTTr"; @@ -681,10 +884,10 @@ rev = "a62a6867811cd739dd98a5e00a2d2e17edfb5b71"; sha256 = "1bwvzh056ls2v7y26a0s4j5mj582dmds04lx4x6iqihs04ss74bb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ace-jump-mode"; sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6"; - name = "ace-jump-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -692,9 +895,15 @@ license = lib.licenses.free; }; }) {}; - ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-jump-zap = callPackage ({ ace-jump-mode + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-jump-zap"; + ename = "ace-jump-zap"; version = "0.1.2"; src = fetchFromGitHub { owner = "waymondo"; @@ -702,10 +911,10 @@ rev = "1a9bf779d8f9225ede9ec482b840942bb58111df"; sha256 = "0r875w4aq3p091hcrpkpqsivn1q9hmq2ppa1rvxzdaq0rhl9kfz4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap"; sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb"; - name = "ace-jump-zap"; + name = "recipe"; }; packageRequires = [ ace-jump-mode dash ]; meta = { @@ -713,9 +922,14 @@ license = lib.licenses.free; }; }) {}; - ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-link = callPackage ({ avy + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-link"; + ename = "ace-link"; version = "0.5.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -723,10 +937,10 @@ rev = "7b9bc8d916b60a501c32b63ce81f315486ad44e9"; sha256 = "147dz79vg4ym5wg3d544bw2khdb2j3hr73rw4qfm64wf0q2dj0vk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5"; - name = "ace-link"; + name = "recipe"; }; packageRequires = [ avy ]; meta = { @@ -734,9 +948,16 @@ license = lib.licenses.free; }; }) {}; - ace-pinyin = callPackage ({ ace-jump-mode, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: - melpaBuild { + ace-pinyin = callPackage ({ ace-jump-mode + , avy + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pinyinlib }: + melpaBuild { pname = "ace-pinyin"; + ename = "ace-pinyin"; version = "0.2.5"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -744,10 +965,10 @@ rev = "c444d8d6861dafd06dd41e694dc9db32652e3b7c"; sha256 = "1d2g873zwq78ggs47954lccmaky20746wg0gafyj93d1qyc3m8rn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-pinyin"; sha256 = "1b3asvzm3k66lsdkmlsgmnf8xlyic8zv294j1iahzkwm6bzqj8wd"; - name = "ace-pinyin"; + name = "recipe"; }; packageRequires = [ ace-jump-mode avy pinyinlib ]; meta = { @@ -755,9 +976,15 @@ license = lib.licenses.free; }; }) {}; - ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-popup-menu = callPackage ({ avy-menu + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-popup-menu"; + ename = "ace-popup-menu"; version = "0.2.1"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -765,10 +992,10 @@ rev = "e7cc8bace9dda5c9fbe545c6fbd41c12679c3d7d"; sha256 = "1khqh5b9c7ass3q2gc04ayc8idanabkyfpaqvfnag063x16fv40c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s"; - name = "ace-popup-menu"; + name = "recipe"; }; packageRequires = [ avy-menu emacs ]; meta = { @@ -776,20 +1003,25 @@ license = lib.licenses.free; }; }) {}; - ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ace-window = callPackage ({ avy + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ace-window"; + ename = "ace-window"; version = "0.9.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "eef897e590c4ce63c28fd29ebff3c97aec8a69ae"; - sha256 = "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6"; + rev = "56ef753268de8dffebaa96607fb9f0246ebe9d0f"; + sha256 = "0zx0d695nrh2xiw9ylzr10fd7chkcb6dvhw8fkcyavlyb34dj49y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa"; - name = "ace-window"; + name = "recipe"; }; packageRequires = [ avy ]; meta = { @@ -797,8 +1029,11 @@ license = lib.licenses.free; }; }) {}; - ack-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ack-menu = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ack-menu"; version = "0.2.3"; src = fetchFromGitHub { @@ -807,7 +1042,7 @@ rev = "37e9979eb65e3803fc00829377397b4e6f2bd059"; sha256 = "0hib4a8385q2czi1yqs0hwnva2xi7kw0bdfnrgha1hrl30rilp2f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ff331ed45e5b7697e4862e723408602ecc98bc7/recipes/ack-menu"; sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9"; name = "ack-menu"; @@ -818,9 +1053,13 @@ license = lib.licenses.free; }; }) {}; - actionscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + actionscript-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "actionscript-mode"; + ename = "actionscript-mode"; version = "7.2.2"; src = fetchFromGitHub { owner = "austinhaas"; @@ -828,10 +1067,10 @@ rev = "fddd7220342d29e7eca734f6b798b7a2849717a5"; sha256 = "0zybch8hz3mj63i0pxynb4d76ywqcy7b4fsa4hh71c2kb0bnczb3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c11e74f2156f109b713380cebf83022d7159d4a/recipes/actionscript-mode"; sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq"; - name = "actionscript-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -839,20 +1078,25 @@ license = lib.licenses.free; }; }) {}; - adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + adafruit-wisdom = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "adafruit-wisdom"; + ename = "adafruit-wisdom"; version = "0.2.1"; src = fetchFromGitHub { owner = "gonewest818"; repo = "adafruit-wisdom.el"; - rev = "2b353f9029f359eb4eb4f0364bd2fbbedf081e42"; - sha256 = "0zyqnwmrj7yigk1z9baqxmzxnwhpxfjz9r1gl090harl69hdp67d"; + rev = "77a2e92d55a419055dd67fc85dc62fb3166d3b8d"; + sha256 = "00bdhrzkyzkcayqhakk93fqyr6ciwswrizljcyx242am6x5fc77s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom"; sha256 = "0ckh420cirspwg2yd5q9y1az03j2l1jzd67g8dpvqjkgdp485gad"; - name = "adafruit-wisdom"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -860,9 +1104,13 @@ license = lib.licenses.free; }; }) {}; - add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + add-hooks = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "add-hooks"; + ename = "add-hooks"; version = "3.1.1"; src = fetchFromGitHub { owner = "nickmccurdy"; @@ -870,10 +1118,10 @@ rev = "a1043b7cdb1ea98055a2c99f8d37584a553ca362"; sha256 = "1jv9fpcsm572zg0j1mbpbfkqgdlqapy89xhhj19pswkhjns1y2wl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; sha256 = "09a5b3prznibkb5igfn8x3vsjrlkh3534zycs8g25g4li87mcb6p"; - name = "add-hooks"; + name = "recipe"; }; packageRequires = []; meta = { @@ -881,9 +1129,13 @@ license = lib.licenses.free; }; }) {}; - add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + add-node-modules-path = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "add-node-modules-path"; + ename = "add-node-modules-path"; version = "1.2.0"; src = fetchFromGitHub { owner = "codesuki"; @@ -891,10 +1143,10 @@ rev = "6f7801b2c41e3711406b7e1654257ad5557f5bb3"; sha256 = "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path"; sha256 = "0gbl875fgqr5np6r4cs8njs6fil1qmy8a5wir88x78ybdwwxsmbl"; - name = "add-node-modules-path"; + name = "recipe"; }; packageRequires = []; meta = { @@ -902,9 +1154,14 @@ license = lib.licenses.free; }; }) {}; - addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + addressbook-bookmark = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "addressbook-bookmark"; + ename = "addressbook-bookmark"; version = "1.0"; src = fetchFromGitHub { owner = "thierryvolpiatto"; @@ -912,10 +1169,10 @@ rev = "ad3c73369b804a48803fdfdf2ab613e6220260de"; sha256 = "012kfqkmpagn8jrp09acpx631qmjim7b33j0pahv1fcqhin89pn6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark"; sha256 = "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r"; - name = "addressbook-bookmark"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -923,9 +1180,14 @@ license = lib.licenses.free; }; }) {}; - adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }: - melpaBuild { + adoc-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , markup-faces + , melpaBuild }: + melpaBuild { pname = "adoc-mode"; + ename = "adoc-mode"; version = "0.6.6"; src = fetchFromGitHub { owner = "sensorflo"; @@ -933,10 +1195,10 @@ rev = "995785538489e573ad208f73c4e833ba60c5cfdb"; sha256 = "0kp2aafjhqxz3mjr9hkkss85r4n51chws5a2qj1xzb63dh36liwm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/adoc-mode"; sha256 = "0jd3zr4zpb4qqn504azl0y02cryv7n9wphv64b0fbpipr7w5hm2c"; - name = "adoc-mode"; + name = "recipe"; }; packageRequires = [ markup-faces ]; meta = { @@ -944,9 +1206,13 @@ license = lib.licenses.free; }; }) {}; - aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + aes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aes"; + ename = "aes"; version = "0.9"; src = fetchFromGitHub { owner = "Sauermann"; @@ -954,10 +1220,10 @@ rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af"; sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes"; sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v"; - name = "aes"; + name = "recipe"; }; packageRequires = []; meta = { @@ -965,20 +1231,27 @@ license = lib.licenses.free; }; }) {}; - ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ag = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ag"; + ename = "ag"; version = "0.47"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "f2cfea210b165564e8d44f4c980b2fedac2462c1"; - sha256 = "15kp99vwyi7hb1jkq3lwvqzw3v62ycixsq6y4pd1x0nn2v5p5m5r"; + rev = "b4b0e39b7fb706fc3208e238c2a7e517ebdb999c"; + sha256 = "1ra5nrc4nvp41rcdc4nkjs9lk7131zd54v63c6lyi3zkg3dyl7im"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g"; - name = "ag"; + name = "recipe"; }; packageRequires = [ cl-lib dash s ]; meta = { @@ -986,9 +1259,15 @@ license = lib.licenses.free; }; }) {}; - aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + aggressive-indent = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aggressive-indent"; + ename = "aggressive-indent"; version = "1.9.0"; src = fetchFromGitHub { owner = "Malabarba"; @@ -996,10 +1275,10 @@ rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3"; sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2"; - name = "aggressive-indent"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1007,9 +1286,14 @@ license = lib.licenses.free; }; }) {}; - ahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ahk-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ahk-mode"; + ename = "ahk-mode"; version = "1.5.6"; src = fetchFromGitHub { owner = "ralesi"; @@ -1017,10 +1301,10 @@ rev = "bf3205efe7b7a40f3c8978f68f14ea3a939cffa8"; sha256 = "02nkcin0piv7s93c9plhy361dbqr78m0gd19myc7qb7gnm36kzpn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8674b54ad5e17d1da1e499c7d8113f8acd8fd5d/recipes/ahk-mode"; sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni"; - name = "ahk-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1028,9 +1312,14 @@ license = lib.licenses.free; }; }) {}; - ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ahungry-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ahungry-theme"; + ename = "ahungry-theme"; version = "1.10.0"; src = fetchFromGitHub { owner = "ahungry"; @@ -1038,10 +1327,10 @@ rev = "45bf75f17752c8e8dd4c8a4531c0aa419cdccb84"; sha256 = "03xypgq6vy7819r42g23kgn7p775bc0v9blzhi0zp5c61p4cw8v3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; sha256 = "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy"; - name = "ahungry-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1049,9 +1338,14 @@ license = lib.licenses.free; }; }) {}; - airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: - melpaBuild { + airline-themes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , powerline }: + melpaBuild { pname = "airline-themes"; + ename = "airline-themes"; version = "1.7"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; @@ -1059,10 +1353,10 @@ rev = "bd9624a94618f4144762032a93549f53ffc1e7b3"; sha256 = "1rlszg7z5k8c6fmjk4sjgrc9xgcjc1jah6c7kdl9kypha7y8s4bq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih"; - name = "airline-themes"; + name = "recipe"; }; packageRequires = [ powerline ]; meta = { @@ -1070,9 +1364,45 @@ license = lib.licenses.free; }; }) {}; - alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + alan-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { + pname = "alan-mode"; + ename = "alan-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "M-industries"; + repo = "AlanForEmacs"; + rev = "0089e7c874c6d35e55be6ecd479ada2b97688a1f"; + sha256 = "0mw9ja0f2jsj0vqk1zqwpzxm9j2yfahiibd8xkhx0wan0dggx592"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6e52314db81dad3517ab400099b032260c3e3e6f/recipes/alan-mode"; + sha256 = "1528rh26kr9zj43djbrfb7vmq78spfay3k3ps5apc580ipx1a4hg"; + name = "recipe"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/alan-mode"; + license = lib.licenses.free; + }; + }) {}; + alchemist = callPackage ({ company + , dash + , elixir-mode + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "alchemist"; + ename = "alchemist"; version = "1.8.2"; src = fetchFromGitHub { owner = "tonini"; @@ -1080,10 +1410,10 @@ rev = "34caeed1bd231c7dfa8d2b9aa5c5de2b2a059601"; sha256 = "1cci0sq568ghx6x7my96m0iiwvqz2f4dh6k3gn3mmfyvi7bmrpww"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369"; - name = "alchemist"; + name = "recipe"; }; packageRequires = [ company dash elixir-mode emacs pkg-info ]; meta = { @@ -1091,20 +1421,25 @@ license = lib.licenses.free; }; }) {}; - alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + alda-mode = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "alda-mode"; + ename = "alda-mode"; version = "0.2.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jgkamat"; repo = "alda-mode"; rev = "97c20b1fd9ad3f138e1100e3a837d05108c4c564"; sha256 = "1wsvs756cbwbxlaxij352kman7196m39684m6sqnfb685cfrwzdj"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; - sha256 = "0vpxiw3k0qxp6s19n93qkkyrr44rbw38ygriqdrfpp84pa09wprh"; - name = "alda-mode"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/848cb17d871287c401496e4483e400b44696e89d/recipes/alda-mode"; + sha256 = "0qvaxh4392rpxikylcnn31z13wabaydj5aa4jyn499ggqdz7liw9"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1112,9 +1447,14 @@ license = lib.licenses.free; }; }) {}; - alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + alect-themes = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "alect-themes"; + ename = "alect-themes"; version = "0.8"; src = fetchFromGitHub { owner = "alezost"; @@ -1122,10 +1462,10 @@ rev = "1812abbe0079d1075525d9fb2da6fcfec7db3766"; sha256 = "0sl2njnhm37cya06y39ls8p3zwpjwyv1pd7w3yfk5frz24vaxlcq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8"; - name = "alect-themes"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1133,9 +1473,15 @@ license = lib.licenses.free; }; }) {}; - alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: - melpaBuild { + alert = callPackage ({ fetchFromGitHub + , fetchurl + , gntp + , lib + , log4e + , melpaBuild }: + melpaBuild { pname = "alert"; + ename = "alert"; version = "1.2"; src = fetchFromGitHub { owner = "jwiegley"; @@ -1143,10 +1489,10 @@ rev = "b301478e34a5c8bd27c17fc7605e6dd576e97935"; sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118"; - name = "alert"; + name = "recipe"; }; packageRequires = [ gntp log4e ]; meta = { @@ -1154,9 +1500,15 @@ license = lib.licenses.free; }; }) {}; - all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize }: - melpaBuild { + all-the-icons = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , memoize }: + melpaBuild { pname = "all-the-icons"; + ename = "all-the-icons"; version = "3.2.0"; src = fetchFromGitHub { owner = "domtronn"; @@ -1164,10 +1516,10 @@ rev = "52d1f2d36468146c93aaf11399f581401a233306"; sha256 = "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; - name = "all-the-icons"; + name = "recipe"; }; packageRequires = [ emacs memoize ]; meta = { @@ -1175,9 +1527,16 @@ license = lib.licenses.free; }; }) {}; - all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + all-the-icons-ivy = callPackage ({ all-the-icons + , emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "all-the-icons-ivy"; + ename = "all-the-icons-ivy"; version = "0.1.2"; src = fetchFromGitHub { owner = "asok"; @@ -1185,10 +1544,10 @@ rev = "aa791d6b0055bce3ac68970a8ef6abf0726edf0f"; sha256 = "0mmimibzn5ncy4rpyq6vkk2m2qlki54nf8yirphabh4m2zf9marg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy"; sha256 = "1xv67gxd2sqj6zld4i3qcid0x5qsbd7baz55m93y1ivdqi7x7gr2"; - name = "all-the-icons-ivy"; + name = "recipe"; }; packageRequires = [ all-the-icons emacs ivy ]; meta = { @@ -1196,9 +1555,21 @@ license = lib.licenses.free; }; }) {}; - amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: - melpaBuild { + amd-mode = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , js2-mode + , js2-refactor + , lib + , makey + , melpaBuild + , projectile + , s + , seq }: + melpaBuild { pname = "amd-mode"; + ename = "amd-mode"; version = "2.8"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -1206,10 +1577,10 @@ rev = "977b53e28b3141408fff4814be8b67ee23650cac"; sha256 = "0m80bwar80qsga735cqrn6rbvfz4w9a036zh8inhsigylv3vwqjv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06"; - name = "amd-mode"; + name = "recipe"; }; packageRequires = [ emacs @@ -1226,41 +1597,56 @@ license = lib.licenses.free; }; }) {}; - amx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + amx = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "amx"; - version = "1.1.1"; + ename = "amx"; + version = "3.2"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "amx"; - rev = "7d5d7974057a36a332f8b30e99fe464f25b6e0ae"; - sha256 = "0jqvah4i2r5di8k3rx6hyjnxdr3alzqmlv6iab5wdhkafyvwl0dq"; + rev = "09e919512692dc31df079ad2cd1a3ca3ac4f1949"; + sha256 = "180841qv24z6kn3qry5216ija1h50ymm4kcmcxg4pc47bhzcjn1h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx"; sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap"; - name = "amx"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/amx"; license = lib.licenses.free; }; }) {}; - anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: - melpaBuild { + anaconda-mode = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pythonic + , s }: + melpaBuild { pname = "anaconda-mode"; - version = "0.1.9"; + ename = "anaconda-mode"; + version = "0.1.12"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "89fc16d50b889a17521084347b28f3011b84e113"; - sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g"; + rev = "1879842b0b3772e48e558340a5667fad42526a57"; + sha256 = "00plc9jsvzh151xmva6xdpfqyxcvy3z3vnsn4g8wpw94n647lrxx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r"; - name = "anaconda-mode"; + name = "recipe"; }; packageRequires = [ dash emacs f pythonic s ]; meta = { @@ -1268,20 +1654,24 @@ license = lib.licenses.free; }; }) {}; - anaphora = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + anaphora = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "anaphora"; - version = "1.0.0"; + ename = "anaphora"; + version = "1.0.4"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "anaphora"; - rev = "20bf7dcfa502538d23525f0905b4f845d97993d3"; - sha256 = "0fnxxvw81c34zhmiyr5awl92wr5941n4gklvzjc4jphaf2nhkg4w"; + rev = "3b2da3f759b244975852e79721c4a2dbad3905cf"; + sha256 = "11fgiy029sqz7nvdm7dcal95lacryz9zql0x5h05z48nrrcl4bib"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8505db1945071a15ba0f2bb74b58d4a6875ca7d6/recipes/anaphora"; sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2"; - name = "anaphora"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1289,9 +1679,13 @@ license = lib.licenses.free; }; }) {}; - android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + android-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "android-mode"; + ename = "android-mode"; version = "0.5.0"; src = fetchFromGitHub { owner = "remvee"; @@ -1299,10 +1693,10 @@ rev = "f274da87429617b0b9c5889d46b36de64d982da4"; sha256 = "17m4hp2qb54widwadv23amc1lasnbwzh2ipc6180fnajg8zcbvyw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode"; sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc"; - name = "android-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1310,20 +1704,24 @@ license = lib.licenses.free; }; }) {}; - angular-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + angular-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "angular-mode"; + ename = "angular-mode"; version = "1.0"; src = fetchFromGitHub { owner = "omouse"; repo = "angularjs-mode"; - rev = "7c0fb37f59dfd9e69f00b50e90a0e88c4e25d8c2"; - sha256 = "1798nv4djhxzbin68zf6w7dbfm9sc39d0kygky52ii36arg5r1zp"; + rev = "026558260eb2890c72df6a59ae8762669772282b"; + sha256 = "0ljwaccb0jrp7zrnkp0383185vg3r9pf324al72d445syff5pa6y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b120c7f97e8d313387d2e9d9210e7fcdd10523b/recipes/angular-mode"; sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i"; - name = "angular-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1331,9 +1729,15 @@ license = lib.licenses.free; }; }) {}; - angular-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + angular-snippets = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "angular-snippets"; + ename = "angular-snippets"; version = "0.2.3"; src = fetchFromGitHub { owner = "magnars"; @@ -1341,10 +1745,10 @@ rev = "8f737c2cf5fce758a7a3833ebad2952b5398568d"; sha256 = "0h9i0iimanbvhbqy0cj9na335rs961pvhxjj4k8y53qc73xm102a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96a0ad5fdbc52f803846e580856fb9c58181c020/recipes/angular-snippets"; sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c"; - name = "angular-snippets"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -1352,9 +1756,13 @@ license = lib.licenses.free; }; }) {}; - annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + annotate = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "annotate"; + ename = "annotate"; version = "0.4.7"; src = fetchFromGitHub { owner = "bastibe"; @@ -1362,10 +1770,10 @@ rev = "e6af7f8ef7d241fdc9f866d57dce24beb4bb6b87"; sha256 = "19a419rnqqsmvrcl2vwy3gl7mvbfg669vyin2h2xpm56rxsinvy1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate"; sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy"; - name = "annotate"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1373,9 +1781,13 @@ license = lib.licenses.free; }; }) {}; - annoying-arrows-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + annoying-arrows-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "annoying-arrows-mode"; + ename = "annoying-arrows-mode"; version = "0.1.0"; src = fetchFromGitHub { owner = "magnars"; @@ -1383,10 +1795,10 @@ rev = "fe59f3fd464e7a87cc43fb8a1f135b3bdf8a2fb3"; sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/annoying-arrows-mode"; sha256 = "1vswlfypn6ijn0wwa3dsqkz5n3pillpmli2ha4q9snhd3a667vyh"; - name = "annoying-arrows-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1394,9 +1806,15 @@ license = lib.licenses.free; }; }) {}; - ansi = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ansi = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ansi"; + ename = "ansi"; version = "0.4.1"; src = fetchFromGitHub { owner = "rejeep"; @@ -1404,10 +1822,10 @@ rev = "a042c5954453bab9a74177e2b78ad17a824caebc"; sha256 = "1hbddxarr40ygvaw4pwaivq2l4f0brszw73w1r50lkjlggb7bl3g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ansi"; sha256 = "0b5xnv6z471jm53g37njxin6l8yflsgm80y4wxahfgy8apipcq89"; - name = "ansi"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -1415,9 +1833,15 @@ license = lib.licenses.free; }; }) {}; - ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ansible = callPackage ({ f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ansible"; + ename = "ansible"; version = "0.1.0"; src = fetchFromGitHub { owner = "k1LoW"; @@ -1425,10 +1849,10 @@ rev = "e9b9431738de4808d8ef70871069f68885cc0d98"; sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible"; sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g"; - name = "ansible"; + name = "recipe"; }; packageRequires = [ f s ]; meta = { @@ -1436,9 +1860,14 @@ license = lib.licenses.free; }; }) {}; - ansible-doc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ansible-doc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ansible-doc"; + ename = "ansible-doc"; version = "0.4"; src = fetchFromGitHub { owner = "lunaryorn"; @@ -1446,10 +1875,10 @@ rev = "bc8128a85a79b14f4a121105d87a5eddc33975ad"; sha256 = "0z3y69sfzka764wjbx31dywdq4d6bfsafv2gmmbpmxqmwfmy8sz4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9/recipes/ansible-doc"; sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w"; - name = "ansible-doc"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1457,9 +1886,14 @@ license = lib.licenses.free; }; }) {}; - ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ansible-vault = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ansible-vault"; + ename = "ansible-vault"; version = "0.3.4"; src = fetchFromGitHub { owner = "zellio"; @@ -1467,10 +1901,10 @@ rev = "57cf7e6da30250587c28ebf592d7bca9a3bae1df"; sha256 = "1m9r3vicmljypq6mhgr86lzgi26dnnlp7g0jbl9bjdk48xfg79wb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault"; sha256 = "0pmsvpc866rgcajb2ihhb62g3rwhda7vvq2kxkvr566y609vv021"; - name = "ansible-vault"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1478,9 +1912,13 @@ license = lib.licenses.free; }; }) {}; - anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + anti-zenburn-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "anti-zenburn-theme"; + ename = "anti-zenburn-theme"; version = "2.5.1"; src = fetchFromGitHub { owner = "m00natic"; @@ -1488,10 +1926,10 @@ rev = "c80cc51bb1aaf11dd53b9d08e01d61bc9b32622f"; sha256 = "1c97d2jkh7iawgsbcg19gha9ffnxypbcfz0sgcsgf9vy4bvnc350"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f6f803dc99a1b1fdb5b4e79f1c9cf72b702d091/recipes/anti-zenburn-theme"; sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk"; - name = "anti-zenburn-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1499,20 +1937,24 @@ license = lib.licenses.free; }; }) {}; - anyins = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + anyins = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "anyins"; + ename = "anyins"; version = "0.1.1"; src = fetchFromGitHub { owner = "antham"; repo = "anyins"; - rev = "1ff4673ca197c9bf64c65f718573bf7d478fc562"; - sha256 = "1z6l72dn98icqsmxb3rrj6l63ijc3xgfa3vdl19yqa2rfy6ya721"; + rev = "1fa85deff82f1dfbd7a5ae89ad427c2cd417f9af"; + sha256 = "1v5s43myf8vhgyq64frlbcn87728za7hc9q2v7b2x7h2r6zz6fxr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a367da2cb71fc0b144f9e608dc4857624991f19c/recipes/anyins"; sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c"; - name = "anyins"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1520,9 +1962,15 @@ license = lib.licenses.free; }; }) {}; - anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + anzu = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "anzu"; + ename = "anzu"; version = "0.62"; src = fetchFromGitHub { owner = "syohex"; @@ -1530,10 +1978,10 @@ rev = "3328619fec138862302bbe1b9acf2eea624a4c5e"; sha256 = "1lzvc0ihcbplir4hqfyxfqpsd78arz15gk92kmq4f8ggbkl37fan"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anzu"; sha256 = "181hzwy9bc0zfhax26p20q9cjibrmi9ngps5fa3ja5g6scxfs9g1"; - name = "anzu"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1541,9 +1989,13 @@ license = lib.licenses.free; }; }) {}; - apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + apache-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "apache-mode"; + ename = "apache-mode"; version = "2.1"; src = fetchFromGitHub { owner = "emacs-php"; @@ -1551,10 +2003,10 @@ rev = "0906559e0cb2997405d98ea6b2195954e3935d3b"; sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode"; sha256 = "0wzfx3kaiwvya30ihq3vpdhy6znkzf25w5x43x457ifdn2vrh9zi"; - name = "apache-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1562,9 +2014,14 @@ license = lib.licenses.free; }; }) {}; - apib-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { + apib-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "apib-mode"; + ename = "apib-mode"; version = "0.7"; src = fetchFromGitHub { owner = "w-vi"; @@ -1572,10 +2029,10 @@ rev = "6cc7c6f21b8e415b1718bb6a07ab2182e9e9dde6"; sha256 = "1717f78kaqkmbhfwb9kzsv5wi2zabcbwb4wh1jklhcaalvmk3z7d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode"; sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb"; - name = "apib-mode"; + name = "recipe"; }; packageRequires = [ markdown-mode ]; meta = { @@ -1583,20 +2040,25 @@ license = lib.licenses.free; }; }) {}; - apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + apiwrap = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "apiwrap"; - version = "0.4"; + ename = "apiwrap"; + version = "0.5"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "7935275ee45f0359d887b8563ffd1d002f0c618e"; - sha256 = "1p6sj46135dh7fgpzrfzsp5zkmx5si5lndwc7pnk30fbz5pindsw"; + rev = "e4c9c57d6620a788ec8a715ff1bb50542edea3a6"; + sha256 = "0xpb8mmssajy42r2h1m9inhv1chx19wkp5p0p63nwpk7mhjj8bis"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; sha256 = "0n50n1n5pvcgcp1gmna3ci36pnbanjdbjpgv7zyarlb80hywbiyw"; - name = "apiwrap"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1604,9 +2066,13 @@ license = lib.licenses.free; }; }) {}; - apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + apples-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "apples-mode"; + ename = "apples-mode"; version = "0.0.2"; src = fetchFromGitHub { owner = "tequilasunset"; @@ -1614,10 +2080,10 @@ rev = "fac47b6255e79a373c5d5e1abe66ea5d74588e9f"; sha256 = "13j2r4nx2x6j3qx50d5rdnqd8nl5idxdkhizsk7ccz3v2607fbyy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca765a6a2f312f585624ec8b82dc9eb6b9bbc0c/recipes/apples-mode"; sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s"; - name = "apples-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1625,9 +2091,13 @@ license = lib.licenses.free; }; }) {}; - aproject = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + aproject = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aproject"; + ename = "aproject"; version = "0.3"; src = fetchFromGitHub { owner = "vietor"; @@ -1635,10 +2105,10 @@ rev = "3c7d23c341862dfd77fd0a64775df12ddb44ab54"; sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de10c48976352f273e8363c2f6fa60602ee86c9b/recipes/aproject"; sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2"; - name = "aproject"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1646,9 +2116,13 @@ license = lib.licenses.free; }; }) {}; - apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + apropospriate-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "apropospriate-theme"; + ename = "apropospriate-theme"; version = "0.1.0"; src = fetchFromGitHub { owner = "waymondo"; @@ -1656,10 +2130,10 @@ rev = "0d918da74a7a225fe5a586e26f5d834e579c5323"; sha256 = "0hqsq7y89crcmqcfbgn885dlvj7f7b0zd9q6adbhyscphk7kasjw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9"; - name = "apropospriate-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1667,9 +2141,13 @@ license = lib.licenses.free; }; }) {}; - artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + artbollocks-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "artbollocks-mode"; + ename = "artbollocks-mode"; version = "1.1.2"; src = fetchFromGitHub { owner = "sachac"; @@ -1677,10 +2155,10 @@ rev = "583c7048a1b09cd79554423d5115f5ddd129d190"; sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode"; sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp"; - name = "artbollocks-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1688,9 +2166,13 @@ license = lib.licenses.free; }; }) {}; - arview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + arview = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "arview"; + ename = "arview"; version = "1.2"; src = fetchFromGitHub { owner = "afainer"; @@ -1698,10 +2180,10 @@ rev = "5437b4221b64b238c273a651d4792c577dba6d45"; sha256 = "1yvirfmvf6v5khl7zhx2ddv9bbxnx1qhwfzi0gy2nmbxlykb6s2j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31574cd756f4f93e2c6bcad5eca33a3294cccd54/recipes/arview"; sha256 = "0d935lj0x3rbar94l7288xrgbcp1wmz6r2l0b7i89r5piczyiy1y"; - name = "arview"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1709,9 +2191,15 @@ license = lib.licenses.free; }; }) {}; - asilea = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + asilea = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "asilea"; + ename = "asilea"; version = "0.2.1"; src = fetchFromGitHub { owner = "Fanael"; @@ -1719,10 +2207,10 @@ rev = "2aab1cc63b64ef08d12e84fd7ba5c94065f6039f"; sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/858e673c66e876d80f41d47d307c944d7bdb147d/recipes/asilea"; sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j"; - name = "asilea"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1730,9 +2218,15 @@ license = lib.licenses.free; }; }) {}; - assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }: - melpaBuild { + assess = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , m-buffer + , melpaBuild }: + melpaBuild { pname = "assess"; + ename = "assess"; version = "0.4"; src = fetchFromGitHub { owner = "phillord"; @@ -1740,10 +2234,10 @@ rev = "87118057b3ae0e6542fa5e22050eb44d6efe8baa"; sha256 = "0cilb32zr38x9kfzfyr1ciag5pzbgp1dk62r7lhn8dxc2ip6f11j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess"; sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr"; - name = "assess"; + name = "recipe"; }; packageRequires = [ emacs m-buffer ]; meta = { @@ -1751,20 +2245,24 @@ license = lib.licenses.free; }; }) {}; - async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + async = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "async"; - version = "1.9.2"; + ename = "async"; + version = "1.9.3"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "d6222c2959caaca5c4980038756097da8a51e505"; - sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn"; + rev = "caad15ce64c1aac5e17d480c59ee6c85ebcb6bb2"; + sha256 = "1zsnb6dy8p6y68xgidv3dfxaga4biramfw8fq7wac0sc50vc98vq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; sha256 = "0s2qrmkqqfgi1ilzbj0rfk27f89p4dycdl1lqkbsm23j0zya53w4"; - name = "async"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1772,9 +2270,13 @@ license = lib.licenses.free; }; }) {}; - atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + atom-one-dark-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "atom-one-dark-theme"; + ename = "atom-one-dark-theme"; version = "0.4.0"; src = fetchFromGitHub { owner = "jonathanchu"; @@ -1782,10 +2284,10 @@ rev = "c2ae343971f8cda7f5b5392552ce9281f52e53de"; sha256 = "1xyn8qiikng6vf5rbpfqz9ac10c69aip0w6v9l46w0qxsy8svyaj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; sha256 = "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw"; - name = "atom-one-dark-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1793,20 +2295,27 @@ license = lib.licenses.free; }; }) {}; - atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: - melpaBuild { + atomic-chrome = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , websocket }: + melpaBuild { pname = "atomic-chrome"; + ename = "atomic-chrome"; version = "2.0.0"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "38ce9127285e1ff45f0f39b9da36a682103bdb96"; - sha256 = "01zwpdmq13iy3hsgijnqsg0yahjxngfbrnn1dd2x1bzpmr8hpxnz"; + rev = "5518562aed5b6897a292fc5048a8f590e6047f30"; + sha256 = "1javrl1aa6hv286hk20yc3h4gvg21a2hagkx0z26g97h4jzb6m24"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; sha256 = "0dx12mjdc4vhbvrcl61a7j247mgs71vvy0qqj6czbpfawfl46am9"; - name = "atomic-chrome"; + name = "recipe"; }; packageRequires = [ emacs let-alist websocket ]; meta = { @@ -1814,20 +2323,25 @@ license = lib.licenses.free; }; }) {}; - auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auctex-latexmk = callPackage ({ auctex + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auctex-latexmk"; + ename = "auctex-latexmk"; version = "1.0.2"; src = fetchFromGitHub { owner = "tom-tan"; repo = "auctex-latexmk"; - rev = "4d353522650d7685acbf1d38f7dbc504f734bd84"; - sha256 = "0qvscgffmzqk8lkcg3yk91vciim5ygk2m4crk02qn72ipkw5q13m"; + rev = "64967712b1bbfac8069aa5940fddef938a692a1a"; + sha256 = "0syd65b6x6lz6as5ih5pldmwgbmq0v3d9pay2n04vqrvsij6m3qy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; sha256 = "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327"; - name = "auctex-latexmk"; + name = "recipe"; }; packageRequires = [ auctex ]; meta = { @@ -1835,9 +2349,16 @@ license = lib.licenses.free; }; }) {}; - aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + aurel = callPackage ({ bui + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aurel"; + ename = "aurel"; version = "0.9"; src = fetchFromGitHub { owner = "alezost"; @@ -1845,10 +2366,10 @@ rev = "fc7ad208f43f8525f84a18941c9b55f956df8961"; sha256 = "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel"; sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl"; - name = "aurel"; + name = "recipe"; }; packageRequires = [ bui dash emacs ]; meta = { @@ -1856,9 +2377,13 @@ license = lib.licenses.free; }; }) {}; - aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + aurora-config-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "aurora-config-mode"; + ename = "aurora-config-mode"; version = "0.0.2"; src = fetchFromGitHub { owner = "bdd"; @@ -1866,10 +2391,10 @@ rev = "0a7ca7987c3a0824e25470389c7d25c337a81593"; sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode"; sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; - name = "aurora-config-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1877,9 +2402,14 @@ license = lib.licenses.free; }; }) {}; - auth-source-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auth-source-pass = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auth-source-pass"; + ename = "auth-source-pass"; version = "4.0.1"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -1887,10 +2417,10 @@ rev = "5690092e40c790384692d8e8da3451e6878d8c17"; sha256 = "1dv202z8briifd4aqn8yvn4kd6zi1cabb2p86qcjj40lzkgn6w3p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass"; sha256 = "0icwdwz2zy3f9ynksr81pgq482iapsbx8lpyssiklyw0xgd1k8ak"; - name = "auth-source-pass"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -1898,9 +2428,15 @@ license = lib.licenses.free; }; }) {}; - auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: - melpaBuild { + auto-compile = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , packed }: + melpaBuild { pname = "auto-compile"; + ename = "auto-compile"; version = "1.4.3"; src = fetchFromGitHub { owner = "emacscollective"; @@ -1908,10 +2444,10 @@ rev = "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f"; sha256 = "013vw4sgw6hpz7kskilndv7i7ik40asrkgicghjbygwk0lj5ran3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf"; - name = "auto-compile"; + name = "recipe"; }; packageRequires = [ emacs packed ]; meta = { @@ -1919,9 +2455,15 @@ license = lib.licenses.free; }; }) {}; - auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + auto-complete = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "auto-complete"; + ename = "auto-complete"; version = "1.5.1"; src = fetchFromGitHub { owner = "auto-complete"; @@ -1929,10 +2471,10 @@ rev = "0655b7f1e6c0f8475adc55f2b86404a877f26a77"; sha256 = "04i9b11iksg6acn885wl3qgi5xpsm3yszlqmd2x21yhprndlz7gb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete"; sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3"; - name = "auto-complete"; + name = "recipe"; }; packageRequires = [ cl-lib popup ]; meta = { @@ -1940,20 +2482,24 @@ license = lib.licenses.free; }; }) {}; - auto-complete-clang-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-complete-clang-async = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-complete-clang-async"; + ename = "auto-complete-clang-async"; version = "0.5"; src = fetchFromGitHub { owner = "Golevka"; repo = "emacs-clang-complete-async"; - rev = "a5114e3477793ccb9420acc5cd6a1cb26be65964"; - sha256 = "1kp2l1cgzlg2g3wllz4gl1ssn4lnx2sn26xqigfrpr8y5rj2bsfj"; + rev = "5eb63c8a1e4ca3af124baf0f8f801b949888f9b8"; + sha256 = "09f8hqs9n13lkb7b352ig07b9xm1w0mbbnqfy2s5cw4cppmakf2n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23aa24b025216359c5e600eee2f2cd4ecc7556e3/recipes/auto-complete-clang-async"; sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh"; - name = "auto-complete-clang-async"; + name = "recipe"; }; packageRequires = []; meta = { @@ -1961,9 +2507,14 @@ license = lib.licenses.free; }; }) {}; - auto-complete-exuberant-ctags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-complete-exuberant-ctags = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-complete-exuberant-ctags"; + ename = "auto-complete-exuberant-ctags"; version = "0.0.7"; src = fetchFromGitHub { owner = "k1LoW"; @@ -1971,10 +2522,10 @@ rev = "ff6121ff8b71beb5aa606d28fd389c484ed49765"; sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1cc9786ed8cea2461b592f860d8e2a0897c57068/recipes/auto-complete-exuberant-ctags"; sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd"; - name = "auto-complete-exuberant-ctags"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -1982,9 +2533,14 @@ license = lib.licenses.free; }; }) {}; - auto-complete-nxml = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-complete-nxml = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-complete-nxml"; + ename = "auto-complete-nxml"; version = "0.5.0"; src = fetchFromGitHub { owner = "aki2o"; @@ -1992,10 +2548,10 @@ rev = "ac7b09a23e45f9bd02affb31847263de4180163a"; sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c89dcbf03a802a4361e44174a332a312e352be36/recipes/auto-complete-nxml"; sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a"; - name = "auto-complete-nxml"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -2003,20 +2559,27 @@ license = lib.licenses.free; }; }) {}; - auto-complete-pcmp = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + auto-complete-pcmp = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "auto-complete-pcmp"; + ename = "auto-complete-pcmp"; version = "0.0.2"; src = fetchFromGitHub { owner = "aki2o"; repo = "auto-complete-pcmp"; - rev = "2595d3dab1ef3549271ca922f212928e9d830eec"; - sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26"; + rev = "dc5c0af834d327dd686d74a4171e5d9170007a6c"; + sha256 = "0ygak7hypc27d0wvciksnmg8c5njw2skf1ml60vs63a1krkax63i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f5c53a8aeaaab23e032a8e7cb5cad7e531a1662c/recipes/auto-complete-pcmp"; sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna"; - name = "auto-complete-pcmp"; + name = "recipe"; }; packageRequires = [ auto-complete log4e yaxception ]; meta = { @@ -2024,20 +2587,26 @@ license = lib.licenses.free; }; }) {}; - auto-complete-sage = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }: - melpaBuild { + auto-complete-sage = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sage-shell-mode }: + melpaBuild { pname = "auto-complete-sage"; + ename = "auto-complete-sage"; version = "0.0.5"; src = fetchFromGitHub { owner = "stakemori"; repo = "auto-complete-sage"; - rev = "a61a4e58b14134712e0737280281c0b10e56da93"; - sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3"; + rev = "84f808aea247af41f90c872bcfde5edc61ba0974"; + sha256 = "1rhcgpqdw5v2ghsjsaw0xi9r5vyvdr3mwm8mr0kimqcv4nd4ifn0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1cd78dcd58d559c47873f8fcfcab089a8493dd6/recipes/auto-complete-sage"; sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1"; - name = "auto-complete-sage"; + name = "recipe"; }; packageRequires = [ auto-complete sage-shell-mode ]; meta = { @@ -2045,9 +2614,13 @@ license = lib.licenses.free; }; }) {}; - auto-dictionary = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-dictionary = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-dictionary"; + ename = "auto-dictionary"; version = "1.1"; src = fetchFromGitHub { owner = "nschum"; @@ -2055,10 +2628,10 @@ rev = "0e3567a81f7bb0ad53ed9f20c7d3d1ac40c26ad1"; sha256 = "191294k92qp8gmfypf0q8j8qrym96aqikzvyb9p03wqvbr3r1dsk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1711d710ac09fe407fde89ee351ccdcb78555d35/recipes/auto-dictionary"; sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16"; - name = "auto-dictionary"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2066,9 +2639,13 @@ license = lib.licenses.free; }; }) {}; - auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-indent-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-indent-mode"; + ename = "auto-indent-mode"; version = "0.126"; src = fetchFromGitHub { owner = "mattfidler"; @@ -2076,10 +2653,10 @@ rev = "ad7032ee058a74405d04d775b0b384351536bc53"; sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49af78177278e7072c70fde0eaa5bb82490ebe9d/recipes/auto-indent-mode"; sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz"; - name = "auto-indent-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2087,20 +2664,25 @@ license = lib.licenses.free; }; }) {}; - auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-minor-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-minor-mode"; - version = "20170716"; + ename = "auto-minor-mode"; + version = "20180527.1"; src = fetchFromGitHub { owner = "joewreschnig"; repo = "auto-minor-mode"; - rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2"; - sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd"; + rev = "c62f4e04c7b73835c399f0348bea0ade2720bcbb"; + sha256 = "0vqqy6nbb884h8qhzqvjycvfqbm9pbhqxr3dlxrhfx8m6c3iasq1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; sha256 = "1dpdylrpw1pvlmhh229b3lqs07drx9kdhw4vcv5a48qah14dz6qa"; - name = "auto-minor-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2108,9 +2690,15 @@ license = lib.licenses.free; }; }) {}; - auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + auto-package-update = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "auto-package-update"; + ename = "auto-package-update"; version = "1.6.1"; src = fetchFromGitHub { owner = "rranelli"; @@ -2118,10 +2706,10 @@ rev = "cdef79f9fc6f8347fdd05664978fb9a948ea0410"; sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78f549a299a06941edce13381f597f3a61e8c723/recipes/auto-package-update"; sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k"; - name = "auto-package-update"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -2129,9 +2717,15 @@ license = lib.licenses.free; }; }) {}; - auto-shell-command = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: - melpaBuild { + auto-shell-command = callPackage ({ deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popwin }: + melpaBuild { pname = "auto-shell-command"; + ename = "auto-shell-command"; version = "1.0.2"; src = fetchFromGitHub { owner = "ongaeshi"; @@ -2139,10 +2733,10 @@ rev = "59d4abce779a3ce3e920592bf5696b54b2e192c7"; sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea710bfa77fee7c2688eea8258ca9d2105d1896e/recipes/auto-shell-command"; sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j"; - name = "auto-shell-command"; + name = "recipe"; }; packageRequires = [ deferred popwin ]; meta = { @@ -2150,9 +2744,14 @@ license = lib.licenses.free; }; }) {}; - auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + auto-yasnippet = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "auto-yasnippet"; + ename = "auto-yasnippet"; version = "0.3.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -2160,10 +2759,10 @@ rev = "5cc54edbe03c0061bf69883a3e39d3bb16019e0f"; sha256 = "0n3r7j83csby2s7284hy5pycynazyrkljxkn6xqn08gvxbbbdpdq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d33c0aee6a5d27217bbae28fc8f448c3badc8a4b/recipes/auto-yasnippet"; sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa"; - name = "auto-yasnippet"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -2171,9 +2770,13 @@ license = lib.licenses.free; }; }) {}; - autodisass-java-bytecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + autodisass-java-bytecode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "autodisass-java-bytecode"; + ename = "autodisass-java-bytecode"; version = "1.3"; src = fetchFromGitHub { owner = "gbalats"; @@ -2181,10 +2784,10 @@ rev = "3d61dbe266133c950b39e880f78d142751c7dc4c"; sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a094845521d76754a29435012af5fba9f7975a8e/recipes/autodisass-java-bytecode"; sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc"; - name = "autodisass-java-bytecode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2192,9 +2795,13 @@ license = lib.licenses.free; }; }) {}; - autodisass-llvm-bitcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + autodisass-llvm-bitcode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "autodisass-llvm-bitcode"; + ename = "autodisass-llvm-bitcode"; version = "1.1"; src = fetchFromGitHub { owner = "gbalats"; @@ -2202,10 +2809,10 @@ rev = "14bb1bfe2be3b04d6e0c87a7a9d1e88ce15506d0"; sha256 = "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/657e8f6bd0e44f11db8480ca42fb29d85fc3ec29/recipes/autodisass-llvm-bitcode"; sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01"; - name = "autodisass-llvm-bitcode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2213,9 +2820,14 @@ license = lib.licenses.free; }; }) {}; - autopair = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + autopair = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "autopair"; + ename = "autopair"; version = "0.6.1"; src = fetchFromGitHub { owner = "capitaomorte"; @@ -2223,10 +2835,10 @@ rev = "2d1eb81d12f71248ad305e70cceddf08d4fe2b39"; sha256 = "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/autopair"; sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28"; - name = "autopair"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -2234,9 +2846,16 @@ license = lib.licenses.free; }; }) {}; - autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + autothemer = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "autothemer"; + ename = "autothemer"; version = "0.2.2"; src = fetchFromGitHub { owner = "sebastiansturm"; @@ -2244,10 +2863,10 @@ rev = "8c467f57571c154129d660dfccebd151c998f2d9"; sha256 = "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d7beed6ba10d7aa6a36328a696ba2d0d21dc2/recipes/autothemer"; sha256 = "1lcyqfzx7qpkr3ajk0zi0mn32yvcwn06f61vhghn9c66xambsr7f"; - name = "autothemer"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -2255,9 +2874,15 @@ license = lib.licenses.free; }; }) {}; - avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + avy = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "avy"; + ename = "avy"; version = "0.4.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -2265,10 +2890,10 @@ rev = "369af594e5ea28be1d91b22753aace16baadc046"; sha256 = "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag"; - name = "avy"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2276,9 +2901,15 @@ license = lib.licenses.free; }; }) {}; - avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + avy-menu = callPackage ({ avy + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "avy-menu"; + ename = "avy-menu"; version = "0.1.1"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -2286,10 +2917,10 @@ rev = "71b71e64900d0637e17013781042e086e9bf56e7"; sha256 = "1mxrq2fpx3qa9vy121wnv02r43sb7djc2j8z7c2vh8x56h8bpial"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw"; - name = "avy-menu"; + name = "recipe"; }; packageRequires = [ avy emacs ]; meta = { @@ -2297,9 +2928,16 @@ license = lib.licenses.free; }; }) {}; - avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: - melpaBuild { + avy-migemo = callPackage ({ avy + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , migemo }: + melpaBuild { pname = "avy-migemo"; + ename = "avy-migemo"; version = "0.3.2"; src = fetchFromGitHub { owner = "momomo5717"; @@ -2307,10 +2945,10 @@ rev = "ce87777bea76c45be5f185e9fe356a8efe5c2d16"; sha256 = "0s6m44b49jm5cnrx1pvk7rfw3zhwiw5xasdlgmlvv7wws7m5snd9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296"; - name = "avy-migemo"; + name = "recipe"; }; packageRequires = [ avy emacs migemo ]; meta = { @@ -2318,9 +2956,14 @@ license = lib.licenses.free; }; }) {}; - avy-zap = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + avy-zap = callPackage ({ avy + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "avy-zap"; + ename = "avy-zap"; version = "0.1.4"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -2328,10 +2971,10 @@ rev = "67fed60d0dfe9087ca4fe3332f4a78e775b8d239"; sha256 = "0lmv34pi9qdh76fi3w4lrfyfhzr824nsiif4nyjvpnmrabxgk309"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10a2a57c78ac1d8ab621031caa21e8574daeb9a0/recipes/avy-zap"; sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx"; - name = "avy-zap"; + name = "recipe"; }; packageRequires = [ avy ]; meta = { @@ -2339,9 +2982,13 @@ license = lib.licenses.free; }; }) {}; - babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + babel = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "babel"; + ename = "babel"; version = "1.4"; src = fetchFromGitHub { owner = "juergenhoetzel"; @@ -2349,10 +2996,10 @@ rev = "65b55ad89017c9b3a1c8c241ac4b4541eabdaf5f"; sha256 = "0px1xggk6qyrwkma1p3d7b4z2id2gbrsxkliw3nwc1q4zndg1zr7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0d748fa06b3cbe336cb01a7e3ed7b0421d885cc/recipes/babel"; sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c"; - name = "babel"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2360,9 +3007,18 @@ license = lib.licenses.free; }; }) {}; - back-button = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash, pcache, persistent-soft, smartrep, ucs-utils }: - melpaBuild { + back-button = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nav-flash + , pcache + , persistent-soft + , smartrep + , ucs-utils }: + melpaBuild { pname = "back-button"; + ename = "back-button"; version = "0.6.6"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -2370,10 +3026,10 @@ rev = "c7b50a3e087a8dc5588d7292379cd387a1afff87"; sha256 = "0hmn3jlsqgpc602lbcs9wzw0hgr5qpjdcxi2hjlc1cp27ilyscnf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/back-button"; sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85"; - name = "back-button"; + name = "recipe"; }; packageRequires = [ nav-flash @@ -2387,9 +3043,14 @@ license = lib.licenses.free; }; }) {}; - badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + badwolf-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "badwolf-theme"; + ename = "badwolf-theme"; version = "1.2"; src = fetchFromGitHub { owner = "bkruczyk"; @@ -2397,10 +3058,10 @@ rev = "24a557f92a702f632901a5b7bee59945a0a8cde9"; sha256 = "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/badwolf-theme"; sha256 = "15n33l0iaq2pk70rpw7qdm8dlwcinfclpnlr3bs7vcb1dknp4g9v"; - name = "badwolf-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2408,9 +3069,39 @@ license = lib.licenses.free; }; }) {}; - base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + banner-comment = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "banner-comment"; + ename = "banner-comment"; + version = "2.6.2"; + src = fetchFromGitHub { + owner = "WJCFerguson"; + repo = "banner-comment"; + rev = "fedbb071d043106a30e378ee58b96e349e8068ed"; + sha256 = "1d6yp96rv6p9f3b8ddrpzb3ng2v0vlqb1akcpd7dria6y6aai8l4"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb69f15cb6be38a86abf4d15450a29c9a819068/recipes/banner-comment"; + sha256 = "0i5nkfdwfr9mcir2ijdhw563azmr5p7hyl6rfy1r04fzs8j7w2pc"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/banner-comment"; + license = lib.licenses.free; + }; + }) {}; + base16-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "base16-theme"; + ename = "base16-theme"; version = "2.2"; src = fetchFromGitHub { owner = "belak"; @@ -2418,10 +3109,10 @@ rev = "10180e88d6d9434cec367b6c91222dd2fc3bd8ae"; sha256 = "01w89g413s1da6rf94y1xnhw79cjy2bqb01yfjs58cy492cm0vr6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; sha256 = "115dhr3gfvdz5wv76fwpv3b4dywiwbk69qrhkfhij8vpcfybrpzx"; - name = "base16-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2429,20 +3120,24 @@ license = lib.licenses.free; }; }) {}; - bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bash-completion = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bash-completion"; - version = "2.0.0"; + ename = "bash-completion"; + version = "2.1.0"; src = fetchFromGitHub { owner = "szermatt"; repo = "emacs-bash-completion"; - rev = "9588a9c0ddf18f9869d4145a67e6446a4b66eba2"; - sha256 = "11rlmrjdpa3vnf0h9vcd75946q9jyf1mpbm7h12hmpj6g2pavgdd"; + rev = "6aedd690006e07199b2fcd319b9b840a527650e5"; + sha256 = "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion"; sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj"; - name = "bash-completion"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2450,9 +3145,14 @@ license = lib.licenses.free; }; }) {}; - bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bazel-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bazel-mode"; + ename = "bazel-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "codesuki"; @@ -2460,10 +3160,10 @@ rev = "6103da2dd9c9461e35a45fc0544ddf33410baa25"; sha256 = "0lbiih6lj7qf2h1l2nxcwfkhdzccrs01lcdqsyhp5hysp0zdcr66"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode"; sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586"; - name = "bazel-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2471,9 +3171,13 @@ license = lib.licenses.free; }; }) {}; - bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bbcode-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bbcode-mode"; + ename = "bbcode-mode"; version = "2.1.0"; src = fetchFromGitHub { owner = "lassik"; @@ -2481,10 +3185,10 @@ rev = "73c56a40301c8b017d3e64c08dccc80d1dc47e59"; sha256 = "0g0dxk33pz18awv7ncv64c2a4lmdx9sigppkvq2mb9za47azk8dh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode"; sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb"; - name = "bbcode-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2492,9 +3196,16 @@ license = lib.licenses.free; }; }) {}; - bbdb- = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + bbdb- = callPackage ({ bbdb + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "bbdb-"; + ename = "bbdb-"; version = "0.0.2"; src = fetchFromGitHub { owner = "aki2o"; @@ -2502,10 +3213,10 @@ rev = "2839e84c894de2513af41053e80a277a1b483d22"; sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01e7a8cc1dde506cb2fcfd9270f15dc61c43ec17/recipes/bbdb-"; sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf"; - name = "bbdb-"; + name = "recipe"; }; packageRequires = [ bbdb log4e yaxception ]; meta = { @@ -2513,9 +3224,13 @@ license = lib.licenses.free; }; }) {}; - bbdb-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bbdb-vcard = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bbdb-vcard"; + ename = "bbdb-vcard"; version = "0.3"; src = fetchFromGitHub { owner = "tohojo"; @@ -2523,10 +3238,10 @@ rev = "9e11fafef1a94bc6395bd1eeacd00f94848ac560"; sha256 = "0fg72qnb40djyciy4gzj359lqlcbbrq0indbkzd0dj09zipkx0df"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd5d9027c49beae89f78d2a30dfa4bd070dff1bd/recipes/bbdb-vcard"; sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj"; - name = "bbdb-vcard"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2534,9 +3249,14 @@ license = lib.licenses.free; }; }) {}; - bbdb2erc = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bbdb2erc = callPackage ({ bbdb + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bbdb2erc"; + ename = "bbdb2erc"; version = "0.1.3"; src = fetchFromGitHub { owner = "unhammer"; @@ -2544,10 +3264,10 @@ rev = "f39a36351e1e6f1105c9e32970e7502b77b0dbcd"; sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/bbdb2erc"; sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd"; - name = "bbdb2erc"; + name = "recipe"; }; packageRequires = [ bbdb ]; meta = { @@ -2555,9 +3275,14 @@ license = lib.licenses.free; }; }) {}; - beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + beacon = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "beacon"; + ename = "beacon"; version = "1.3.4"; src = fetchFromGitHub { owner = "Malabarba"; @@ -2565,10 +3290,10 @@ rev = "729338b02a0e331a4faf475da9f54771a3470106"; sha256 = "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon"; sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq"; - name = "beacon"; + name = "recipe"; }; packageRequires = [ seq ]; meta = { @@ -2576,30 +3301,40 @@ license = lib.licenses.free; }; }) {}; - beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + beeminder = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "beeminder"; - version = "1.0.0"; + ename = "beeminder"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Sodaware"; repo = "beeminder.el"; - rev = "54cc1277f2a7667a7b0d999dc49ceffcf2862b44"; - sha256 = "01d10algmi9a4xd7mzf7n3zxfs2qf5as66wx17mff5cd8dahxj1q"; + rev = "3e95a669474e27cd51a16caea030456377f83062"; + sha256 = "1bj9yzjvglnb0f4glh8fg478xlm5nqmd9jqm1casdj5m30i4kafn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/beeminder"; sha256 = "1cb8xmgsv23b464hpchm9f9i64p3fyf7aillrwk1aa2l1008kyww"; - name = "beeminder"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ org ]; meta = { homepage = "https://melpa.org/#/beeminder"; license = lib.licenses.free; }; }) {}; - beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + beginend = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "beginend"; + ename = "beginend"; version = "2.0.0"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -2607,10 +3342,10 @@ rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd"; sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq"; - name = "beginend"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2618,20 +3353,24 @@ license = lib.licenses.free; }; }) {}; - benchmark-init = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + benchmark-init = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "benchmark-init"; + ename = "benchmark-init"; version = "1.0"; src = fetchFromGitHub { owner = "dholm"; repo = "benchmark-init-el"; - rev = "7a0f263282bbc86b01b662636306f22813082647"; - sha256 = "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94"; + rev = "8e4c32f32ec869fe521fb4d3c0a69406830b4178"; + sha256 = "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54b9ae6fc10b0c56fcc7a0ad73743ffc85a3e9a0/recipes/benchmark-init"; sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal"; - name = "benchmark-init"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2639,9 +3378,13 @@ license = lib.licenses.free; }; }) {}; - benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + benchstat = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "benchstat"; + ename = "benchstat"; version = "1.0.0"; src = fetchFromGitHub { owner = "Quasilyte"; @@ -2649,10 +3392,10 @@ rev = "b39a97f3072c2d3c1d3f86790b9e134d05b8d7e6"; sha256 = "0j508n860dp4in1psnkcriqck6by1jvnscalyff5na8hx6xgyysm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat"; sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9"; - name = "benchstat"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2660,9 +3403,13 @@ license = lib.licenses.free; }; }) {}; - better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + better-defaults = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "better-defaults"; + ename = "better-defaults"; version = "0.1.3"; src = fetchFromGitHub { owner = "technomancy"; @@ -2670,10 +3417,10 @@ rev = "90df5752a0a0602feb47aadfd3542aa7fc841bd8"; sha256 = "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bb729c1ad8602a5c0c27e81c9442981a54a924a/recipes/better-defaults"; sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm"; - name = "better-defaults"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2681,9 +3428,14 @@ license = lib.licenses.free; }; }) {}; - better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + better-shell = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "better-shell"; + ename = "better-shell"; version = "1.2"; src = fetchFromGitHub { owner = "killdash9"; @@ -2691,10 +3443,10 @@ rev = "f231404b6f8efce33b48e31e5b1566108d0ba000"; sha256 = "1g5bljvigga856ksyvgix9hk0pp9nzic088kp0bqx0zqvcl82v0b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell"; sha256 = "0si8nj18i3jlhdb8m6f21rmi0lxians34vhw4xhvxw2yr9l85lj6"; - name = "better-shell"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2702,20 +3454,26 @@ license = lib.licenses.free; }; }) {}; - biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + biblio = callPackage ({ biblio-core + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "biblio"; - version = "0.1"; + ename = "biblio"; + version = "0.2"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "biblio.el"; - rev = "2550042b647b2b5c400c9cd8ec5fc80adb0fa6df"; - sha256 = "0skg8wcgdfzd59ay4fbbbdd258cm8q7v321iml46bdipzk0r5lnw"; + rev = "a5a68fcf677f286f205f32dc7486f6c9f66aa6af"; + sha256 = "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fbaa8c59b0e64d13beb0e0f18b0734afa84f51/recipes/biblio"; sha256 = "0ym7xvcfd7hh3qdpfb8zpa7w8s4lpg0vngh9d0ns3s3lnhz4mi0g"; - name = "biblio"; + name = "recipe"; }; packageRequires = [ biblio-core emacs ]; meta = { @@ -2723,20 +3481,28 @@ license = lib.licenses.free; }; }) {}; - biblio-core = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, seq }: - melpaBuild { + biblio-core = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "biblio-core"; - version = "0.1"; + ename = "biblio-core"; + version = "0.2"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "biblio.el"; - rev = "2550042b647b2b5c400c9cd8ec5fc80adb0fa6df"; - sha256 = "0skg8wcgdfzd59ay4fbbbdd258cm8q7v321iml46bdipzk0r5lnw"; + rev = "0036495a2e0d4b02b9e957e498f9437e394d6ed9"; + sha256 = "1f0p5fgvabdpafil7s8sy82hgcfzg1skxfgj72ylv3crq36bn4vp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f086d3e8fd6a95ce198e148cd3ede35dd73fb8/recipes/biblio-core"; sha256 = "0zpfamrb2gka41h834a05hxdbw4h55777kh6rhjikjfmy765nl97"; - name = "biblio-core"; + name = "recipe"; }; packageRequires = [ dash emacs let-alist seq ]; meta = { @@ -2744,9 +3510,40 @@ license = lib.licenses.free; }; }) {}; - bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bicycle = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "bicycle"; + ename = "bicycle"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "bicycle"; + rev = "30c451e6c6910c5aa5ed2b189679ca5e3bc0d6f7"; + sha256 = "1kyiyq79shwkycgl3373pwgqbg1aqxsai44yl9vw17s37hhff70n"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec9b4138ffaf81b556e01b85ce4b112e77909260/recipes/bicycle"; + sha256 = "16ikqbmsjyknj3580wdnp8ffs85bq9idf9hvxm0ihgw5gy469xqj"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bicycle"; + license = lib.licenses.free; + }; + }) {}; + bifocal = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bifocal"; + ename = "bifocal"; version = "0.0.3"; src = fetchFromGitHub { owner = "riscy"; @@ -2754,10 +3551,10 @@ rev = "a8b222b069a6bd64531b4780905989797bad8abe"; sha256 = "0c6vzh35lj3pg9wd4v2fy6xdmcg9kq3n5br6rp4lx257gxglzpwh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal"; sha256 = "07qrxsby611l3cwsmw3d53h1n7cd1vg53j4vlc2isg56l2m4qks5"; - name = "bifocal"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2765,9 +3562,14 @@ license = lib.licenses.free; }; }) {}; - binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + binclock = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "binclock"; + ename = "binclock"; version = "1.11"; src = fetchFromGitHub { owner = "davep"; @@ -2775,10 +3577,10 @@ rev = "b964e437311e5406a31c0ec7038b3bf1fd02b876"; sha256 = "0ljxb70vx7x0yn8y1ilf4phk0hamprl43dh23fm3njqqgw60hzbk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock"; sha256 = "1s0072kcd1xp8355j8aph94gb3a1wqmzx1hhfp9d6bzqf6cij8gk"; - name = "binclock"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -2786,20 +3588,24 @@ license = lib.licenses.free; }; }) {}; - bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bind-key = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bind-key"; + ename = "bind-key"; version = "2.3"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "cd58b268a8a025451c11c3cb1ba18d4f27f245da"; - sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang"; + rev = "d867b0370e4e311c71665ccaa418374a15097461"; + sha256 = "193a9x1d6c8hprinrls2mpplrab2syn64zjyfgxwzisjqgik02dy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm"; - name = "bind-key"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2807,9 +3613,14 @@ license = lib.licenses.free; }; }) {}; - bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bind-map = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bind-map"; + ename = "bind-map"; version = "1.1.1"; src = fetchFromGitHub { owner = "justbur"; @@ -2817,10 +3628,10 @@ rev = "bf4181e3a41463684adfffc6c5c305b30480e30f"; sha256 = "0vrk17yg3jbww92p433p64ijmjf7cjg2wmzi9w418235w1xdfzz8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map"; sha256 = "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358"; - name = "bind-map"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2828,20 +3639,24 @@ license = lib.licenses.free; }; }) {}; - bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bing-dict = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bing-dict"; + ename = "bing-dict"; version = "0.2.3"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "bing-dict.el"; - rev = "7c067b7a3a1a4797476f03a65f4a0b4a269a70c7"; - sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6"; + rev = "da071309f6ffbb9e66e6720dd05e31964ff402a9"; + sha256 = "1wl810k3zl0v4i4280mzjdgd9mdc7q9s13s5svj197mlsx7gkifw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bing-dict"; sha256 = "1cqjndq8xm2bwjvdj95dn377bp9r6rrkp1z4a45faj408mipahli"; - name = "bing-dict"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2849,9 +3664,13 @@ license = lib.licenses.free; }; }) {}; - birds-of-paradise-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + birds-of-paradise-plus-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "birds-of-paradise-plus-theme"; + ename = "birds-of-paradise-plus-theme"; version = "0.1.1"; src = fetchFromGitHub { owner = "jimeh"; @@ -2859,10 +3678,10 @@ rev = "ba2c4443388a73f2c5e2de0c24d3106676aeb6fa"; sha256 = "1r3f5d67x257g8kvdbdsl4w3y1dvc1d6s9x8bygbkvyahfi5m5hn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3932853232c269f158806aebe416b456c752a9bb/recipes/birds-of-paradise-plus-theme"; sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m"; - name = "birds-of-paradise-plus-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2870,20 +3689,24 @@ license = lib.licenses.free; }; }) {}; - bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bm"; - version = "201610"; + ename = "bm"; + version = "201807"; src = fetchFromGitHub { owner = "joodland"; repo = "bm"; - rev = "c77ea49f5632b5d987243eddb4b36e84b870bf42"; - sha256 = "0jfi24kck1ag19lfcfzbivwb1zhid173p7f8chc01cz68l1pp7jw"; + rev = "b1bc10b1e9f01c48a7eedb9b08a22d05e7baed3c"; + sha256 = "16kfzi6chf28jyrsmz0jba3qq3mvxqambsdh09vr76ivmwbv48gh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm"; sha256 = "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g"; - name = "bm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2891,9 +3714,14 @@ license = lib.licenses.free; }; }) {}; - bnfc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bnfc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bnfc"; + ename = "bnfc"; version = "0.4"; src = fetchFromGitHub { owner = "jmitchell"; @@ -2901,10 +3729,10 @@ rev = "1b58df1dd0cb9b81900632fb2843a03b94f56fdb"; sha256 = "0lmqrcy80nw6vmf81kh6q39x8pwhzrj6lbk31xpl8mvwnpqaykmn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7871b6372a391ace76edea40c6f92ceb10b70bf9/recipes/bnfc"; sha256 = "0h6qhyi7vcikg7zhv8lywdz033kp27a8z1ymq5wgs4aqs184igm6"; - name = "bnfc"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2912,9 +3740,14 @@ license = lib.licenses.free; }; }) {}; - bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bog = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bog"; + ename = "bog"; version = "1.3.1"; src = fetchFromGitHub { owner = "kyleam"; @@ -2922,10 +3755,10 @@ rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611"; sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl"; - name = "bog"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -2933,9 +3766,13 @@ license = lib.licenses.free; }; }) {}; - bongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bongo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bongo"; + ename = "bongo"; version = "1.0"; src = fetchFromGitHub { owner = "dbrock"; @@ -2943,10 +3780,10 @@ rev = "c5280a11fe8ff39fba4b09ec4a39b0f799d2b59c"; sha256 = "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/692428769cd792dc0644641682c2793103dd00c6/recipes/bongo"; sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv"; - name = "bongo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -2954,9 +3791,14 @@ license = lib.licenses.free; }; }) {}; - bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bool-flip = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bool-flip"; + ename = "bool-flip"; version = "1.0.1"; src = fetchFromGitHub { owner = "michaeljb"; @@ -2964,10 +3806,10 @@ rev = "0f7cc9b387429239fb929896511727d4e49a795b"; sha256 = "1051gy7izy25jwh079231d4lh9azchbqc6nvfrkv8s9ck407a65a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f56377a7c3f4b75206ad9ba570c35dbf752079e9/recipes/bool-flip"; sha256 = "1xfspqxshx7m8gh6g1snkaahka9f71fnq7hx81nik4s9s8pmxj9c"; - name = "bool-flip"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -2975,9 +3817,17 @@ license = lib.licenses.free; }; }) {}; - boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: - melpaBuild { + boon = callPackage ({ dash + , emacs + , expand-region + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multiple-cursors }: + melpaBuild { pname = "boon"; + ename = "boon"; version = "1.0"; src = fetchFromGitHub { owner = "jyp"; @@ -2985,10 +3835,10 @@ rev = "d9f0545708bbbbe3df23b2b91cdd2824beb0df56"; sha256 = "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb"; - name = "boon"; + name = "recipe"; }; packageRequires = [ dash emacs expand-region multiple-cursors ]; meta = { @@ -2996,9 +3846,13 @@ license = lib.licenses.free; }; }) {}; - borg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + borg = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "borg"; + ename = "borg"; version = "2.0.0"; src = fetchFromGitHub { owner = "emacscollective"; @@ -3006,10 +3860,10 @@ rev = "34eac585d6829e17ce59b09fe6ad5d675302c096"; sha256 = "1q7k2c7pxcywg6xjk8awg73skyw59a6w4aa9sxbsz9vdj2zn04k9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; sha256 = "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr"; - name = "borg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3017,9 +3871,14 @@ license = lib.licenses.free; }; }) {}; - boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + boxquote = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "boxquote"; + ename = "boxquote"; version = "2.1"; src = fetchFromGitHub { owner = "davep"; @@ -3027,10 +3886,10 @@ rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883"; sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote"; sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s"; - name = "boxquote"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -3038,9 +3897,41 @@ license = lib.licenses.free; }; }) {}; - browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + browse-at-remote = callPackage ({ cl-lib ? null + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "browse-at-remote"; + ename = "browse-at-remote"; + version = "0.10.0"; + src = fetchFromGitHub { + owner = "rmuslimov"; + repo = "browse-at-remote"; + rev = "47bab994640f086939c30cc6416e770ad067e950"; + sha256 = "0vhia7xmszcb3lxrb8wh93a3knjfzj48h8nhj4fh8zj1pjz6args"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote"; + sha256 = "0s088ba047azba60rlfn3jbqr321vnm953i7dqw2gj9xml90kbm4"; + name = "recipe"; + }; + packageRequires = [ cl-lib f s ]; + meta = { + homepage = "https://melpa.org/#/browse-at-remote"; + license = lib.licenses.free; + }; + }) {}; + browse-kill-ring = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "browse-kill-ring"; + ename = "browse-kill-ring"; version = "2.0.0"; src = fetchFromGitHub { owner = "browse-kill-ring"; @@ -3048,10 +3939,10 @@ rev = "2a7acf98c348c4f405a6b2ab216224ca14915be8"; sha256 = "0y9m6cv70pzcm0v2v8nwmyh1xx40831chx72m85h5ic5db03gy7b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/294dc32a672e6b6b0ebfc46cdf0ff9ceacf73e89/recipes/browse-kill-ring"; sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4"; - name = "browse-kill-ring"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3059,9 +3950,14 @@ license = lib.licenses.free; }; }) {}; - browse-url-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }: - melpaBuild { + browse-url-dwim = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , string-utils }: + melpaBuild { pname = "browse-url-dwim"; + ename = "browse-url-dwim"; version = "0.6.8"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -3069,10 +3965,10 @@ rev = "11f1c53126619c7ef1bb5f5d6914ce0b3cce0e30"; sha256 = "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/browse-url-dwim"; sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf"; - name = "browse-url-dwim"; + name = "recipe"; }; packageRequires = [ string-utils ]; meta = { @@ -3080,9 +3976,15 @@ license = lib.licenses.free; }; }) {}; - bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bshell = callPackage ({ buffer-manage + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bshell"; + ename = "bshell"; version = "0.3"; src = fetchFromGitHub { owner = "plandes"; @@ -3090,10 +3992,10 @@ rev = "884a8b906617d305e9d5d2c3750618d2f86f9aed"; sha256 = "16qh71yhpxs5cxjmkiqiia8xrxa0ym2n32znp4yc7xiv2xfw2ss4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell"; sha256 = "1ds8xvh74i6wqswjp8i30knr74l4gbalkb2jil8qjb9wp9l1gw9z"; - name = "bshell"; + name = "recipe"; }; packageRequires = [ buffer-manage emacs ]; meta = { @@ -3101,9 +4003,13 @@ license = lib.licenses.free; }; }) {}; - buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buffer-flip = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buffer-flip"; + ename = "buffer-flip"; version = "2.1"; src = fetchFromGitHub { owner = "killdash9"; @@ -3111,10 +4017,10 @@ rev = "e093360e05164c78255866c1ac8f966aa38ba514"; sha256 = "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip"; sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098"; - name = "buffer-flip"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3122,20 +4028,27 @@ license = lib.licenses.free; }; }) {}; - buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buffer-manage = callPackage ({ choice-program + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buffer-manage"; - version = "0.6"; + ename = "buffer-manage"; + version = "0.7"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "44b26d5c17a4ecea3484727fa46c3d734569a018"; - sha256 = "0c9hz2532vcbn69am7pd2zyraqgw0q139qsck9hs1vfxnsj4v8dc"; + rev = "8bbe342a4dafcfdaf305baea98bd4208036ab89a"; + sha256 = "027d71ppkcq60lkzgal8wv4xpjs4hzgih5ry9q2d4g0dr7wkjp3j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb"; - name = "buffer-manage"; + name = "recipe"; }; packageRequires = [ choice-program dash emacs ]; meta = { @@ -3143,9 +4056,13 @@ license = lib.licenses.free; }; }) {}; - buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buffer-move = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buffer-move"; + ename = "buffer-move"; version = "0.6.2"; src = fetchFromGitHub { owner = "lukhas"; @@ -3153,10 +4070,10 @@ rev = "9bf3ff940011c7af3fdd172fa3ea2511c7a8a190"; sha256 = "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e30e053eab078a8bef73e42b90299231ea0997ee/recipes/buffer-move"; sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg"; - name = "buffer-move"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3164,9 +4081,13 @@ license = lib.licenses.free; }; }) {}; - buffer-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buffer-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buffer-utils"; + ename = "buffer-utils"; version = "0.1.0"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -3174,10 +4095,10 @@ rev = "b4d325543e25518d725a2122b49cd72a0d6a079a"; sha256 = "0rp9hiysy13c4in7b420r7yjza2knlmvphj7l01xbxphbilplqk5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/buffer-utils"; sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2"; - name = "buffer-utils"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3185,20 +4106,25 @@ license = lib.licenses.free; }; }) {}; - buffer-watcher = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buffer-watcher = callPackage ({ f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buffer-watcher"; + ename = "buffer-watcher"; version = "0.1"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "buffer-watcher"; - rev = "353d76882c65d44341b6f28bd86279dda00c3440"; - sha256 = "0x9bcnya47pf78p6ksdvs1ca5arvbgyi1q8b9yxq55fg3k9523ln"; + rev = "056ad29ce1c33c575b371b856b80d580a4b9a7d2"; + sha256 = "0c4w7mpkc82886gng14h2srlbr138vf7kcs8ajwj6is47zc75nkb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8681776d467951d14d8247e6939bd9a6f2a80ec/recipes/buffer-watcher"; sha256 = "0v096021xk7k821bxb5zddw6sljqa6fs8f7s8j0w3pv6lmhra1ln"; - name = "buffer-watcher"; + name = "recipe"; }; packageRequires = [ f ]; meta = { @@ -3206,20 +4132,24 @@ license = lib.licenses.free; }; }) {}; - bufshow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bufshow = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bufshow"; + ename = "bufshow"; version = "0.1.0"; src = fetchFromGitHub { owner = "pjones"; repo = "bufshow"; - rev = "d8424e412d63dcc721c64fbd2ddd2420a03b4e8b"; - sha256 = "0x9q4amsmawi8jqj9xxg81khvb3gyyf9hjvb0w6vhrgjwpxiq8sy"; + rev = "984dc947992cada3dcdb7ea066a9794e45daa66f"; + sha256 = "1mjykz21kx2aj0r9x7j2rh6mr64wd0m7wzn9ppxrw6296l2y253m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/543a734795eed11aa47a8e1348d14e362b341af0/recipes/bufshow"; sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h"; - name = "bufshow"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3227,9 +4157,13 @@ license = lib.licenses.free; }; }) {}; - bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bug-reference-github = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bug-reference-github"; + ename = "bug-reference-github"; version = "1.0.0"; src = fetchFromGitHub { owner = "arnested"; @@ -3237,10 +4171,10 @@ rev = "f570a0532bfb44f095b42cf68ab1f69799101137"; sha256 = "09rbxgrk7jp9xajya6nccj0ak7fc48wyxq4sfmjmy3q1qfszdsc3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dfce86371692dddef78a6c1d772138b487b82cb/recipes/bug-reference-github"; sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6"; - name = "bug-reference-github"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3248,9 +4182,15 @@ license = lib.licenses.free; }; }) {}; - bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bui = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bui"; + ename = "bui"; version = "1.1.0"; src = fetchFromGitHub { owner = "alezost"; @@ -3258,10 +4198,10 @@ rev = "3bf8af2f339d2483203eda2c97a61b8771c3269d"; sha256 = "1qx7cdm7jd15rf1silwj1yh0mg5fhldfi001k1msi50nyni90c82"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; sha256 = "0a4g55k02hi3cwvk4d35lk2x5kc4fabskl2025i83hx0rqw4w3f1"; - name = "bui"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -3269,9 +4209,14 @@ license = lib.licenses.free; }; }) {}; - build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + build-status = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "build-status"; + ename = "build-status"; version = "0.0.2"; src = fetchFromGitHub { owner = "sshaw"; @@ -3279,10 +4224,10 @@ rev = "c29a0146c5d0be274f5e17921e01698f572c23a1"; sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status"; sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92"; - name = "build-status"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -3290,9 +4235,14 @@ license = lib.licenses.free; }; }) {}; - bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: - melpaBuild { + bundler = callPackage ({ fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild }: + melpaBuild { pname = "bundler"; + ename = "bundler"; version = "1.1.0"; src = fetchFromGitHub { owner = "tobiassvn"; @@ -3300,10 +4250,10 @@ rev = "4cb4fafe092d587cc9e58ff61cf900fb7f409adf"; sha256 = "18d74nwcpk1i8adxzfwz1lgqqcxsc4wkrb490v64pph79dxsi80h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ade7d0f0f0e553b48634e60ecaf7b91d0776d5f0/recipes/bundler"; sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4"; - name = "bundler"; + name = "recipe"; }; packageRequires = [ inf-ruby ]; meta = { @@ -3311,20 +4261,24 @@ license = lib.licenses.free; }; }) {}; - bury-successful-compilation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + bury-successful-compilation = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "bury-successful-compilation"; + ename = "bury-successful-compilation"; version = "0.1"; src = fetchFromGitHub { owner = "EricCrosson"; repo = "bury-successful-compilation"; - rev = "ca58a5df0aa3f266a8df0e3e5d3d962c086be0a9"; - sha256 = "03hab3iw2jjckal20zwsw7cm38nf7pan0m96d8ab4i75phy6liyw"; + rev = "7b16dc71b43914928cc16da674e69d7af975238a"; + sha256 = "08ny1iycsgpal99g180w9yvk6ql8qn2kkc9xk9lmfv5p1wqm3l4w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f66e2e23c7a1fa0ce6fa8a0e814242b7c46c299c/recipes/bury-successful-compilation"; sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3"; - name = "bury-successful-compilation"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3332,9 +4286,16 @@ license = lib.licenses.free; }; }) {}; - butler = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + butler = callPackage ({ deferred + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "butler"; + ename = "butler"; version = "0.2.4"; src = fetchFromGitHub { owner = "AshtonKem"; @@ -3342,10 +4303,10 @@ rev = "0e91e0f01ac9c09422f076a096ee567ee138e7a4"; sha256 = "1pii9dw4skq7nr4na6qxqasl36av8cwjp71bf1fgppqpcd9z8skj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c86e3f5083e59568afac69eed9aa8c1a0bd76e2e/recipes/butler"; sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq"; - name = "butler"; + name = "recipe"; }; packageRequires = [ deferred emacs json ]; meta = { @@ -3353,20 +4314,24 @@ license = lib.licenses.free; }; }) {}; - buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + buttercup = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "buttercup"; - version = "1.11"; + ename = "buttercup"; + version = "1.12"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "8d27bb99463bc230a76dee96378dd337622988f5"; - sha256 = "0s5vfzcfsiqb6bc6jh95a2dyy23b4bvhdpzn2fcq8awldbpx51fh"; + rev = "39d625ce53bb1e1b9b03d9c9c70aa81e94fcc66a"; + sha256 = "1y97af0kl0yiirnajn44jcz865acndjwkr3zhpf65lm0bbaxfp2a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb"; - name = "buttercup"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3374,20 +4339,24 @@ license = lib.licenses.free; }; }) {}; - button-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + button-lock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "button-lock"; + ename = "button-lock"; version = "1.0.2"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "button-lock"; - rev = "cd0bf4a3c2f224d851e6ed8a54a6e80c129b225f"; - sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2"; + rev = "9a8f950e06ff222b667c38facf4fb9d6ef6f1d8e"; + sha256 = "1rga1m50bhps4kv841g798w7vn80kcwyinb4ra33ldri7jyx34qj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83459421dd2eb3d60ec668c3d5bb38d99ee64aff/recipes/button-lock"; sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp"; - name = "button-lock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3395,9 +4364,14 @@ license = lib.licenses.free; }; }) {}; - cacoo = callPackage ({ concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cacoo = callPackage ({ concurrent + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cacoo"; + ename = "cacoo"; version = "2.1.2"; src = fetchFromGitHub { owner = "kiwanami"; @@ -3405,10 +4379,10 @@ rev = "c2e6a8830144810cd4e51de3646cb8200bcebbc6"; sha256 = "1k2hmc87ifww95k3m8ksiswkk2z0y8grssba7381g8dnlp6jgprx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd55f5c29876c2483001cd9deaca68cab5054b9/recipes/cacoo"; sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z"; - name = "cacoo"; + name = "recipe"; }; packageRequires = [ concurrent ]; meta = { @@ -3416,9 +4390,14 @@ license = lib.licenses.free; }; }) {}; - cake-inflector = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + cake-inflector = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "cake-inflector"; + ename = "cake-inflector"; version = "1.1.1"; src = fetchFromGitHub { owner = "k1LoW"; @@ -3426,10 +4405,10 @@ rev = "40bf11890842ba305954528694e1c39a8b73737b"; sha256 = "1w7yq35gzzwyf480d8gc5r6jbnawg09l6663q068ir6zr9pp4far"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77c46238b632047160d6dfac9b257f57b0c4283b/recipes/cake-inflector"; sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf"; - name = "cake-inflector"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -3437,9 +4416,13 @@ license = lib.licenses.free; }; }) {}; - calendar-norway = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calendar-norway = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calendar-norway"; + ename = "calendar-norway"; version = "0.9.3"; src = fetchFromGitHub { owner = "unhammer"; @@ -3447,10 +4430,10 @@ rev = "8501b2ee515e995f345365391b03f44c812cabdf"; sha256 = "0lch835rq2rqyh0vyi75dhyl7hm6bv27f2z753wggh0jyg6qxi7a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5d01230027d5cec9da2545a9ce9270a611f6567/recipes/calendar-norway"; sha256 = "1i23ks0bnq62bvn3szvqf0ikcam4s92yvr998mkjxhdhc94zd19c"; - name = "calendar-norway"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3458,9 +4441,13 @@ license = lib.licenses.free; }; }) {}; - calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calfw = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calfw"; + ename = "calfw"; version = "1.6"; src = fetchFromGitHub { owner = "kiwanami"; @@ -3468,10 +4455,10 @@ rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw"; sha256 = "0am1nafc16zax8082gjlz0pi85lryjhrx0v80nzgr23iybj5mfx4"; - name = "calfw"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3479,20 +4466,24 @@ license = lib.licenses.free; }; }) {}; - calfw-cal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calfw-cal = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calfw-cal"; + ename = "calfw-cal"; version = "1.6"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; - sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + rev = "136dce009a26e7d8a8064af422c2cf8170e852c5"; + sha256 = "1hiip8hfl7myimgba7ggs1ki1pk3ag7nyfa8j2zzm87n93g5xia4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal"; sha256 = "1wylkd7jl1ifq56jj04l5b9wfrjkhwncxzrjgnbgg1cl2klf6v4m"; - name = "calfw-cal"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3500,20 +4491,24 @@ license = lib.licenses.free; }; }) {}; - calfw-howm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calfw-howm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calfw-howm"; + ename = "calfw-howm"; version = "1.6"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; - sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + rev = "4f6e5d4d917b9d346a8867941b90133e50e820d8"; + sha256 = "0dkilf8kvxcy6rr2bynzyk5kf8dqcxhm9b9h36g8h11j181p6bl7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm"; sha256 = "08cv16cq211sy2v1i0gk7d81f0gyywv0i9szmamnrbjif3rrv2m0"; - name = "calfw-howm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3521,20 +4516,24 @@ license = lib.licenses.free; }; }) {}; - calfw-ical = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calfw-ical = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calfw-ical"; + ename = "calfw-ical"; version = "1.6"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; - sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + rev = "a67fa1023b3fddc1d1f38114c1d207376c8e6289"; + sha256 = "0g8s3pgivqk1vqdgkndznkl48c4m5yiahkjxyqyv2781hdb4f6xa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical"; sha256 = "1bh9ahwp9b5knjxph79kl19fgs48x3w7dga299l0xvbxq2jhs95q"; - name = "calfw-ical"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3542,20 +4541,24 @@ license = lib.licenses.free; }; }) {}; - calfw-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + calfw-org = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "calfw-org"; + ename = "calfw-org"; version = "1.6"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; - sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + rev = "e03ae470788778e7714b73520014eadc03a88abd"; + sha256 = "0rhasr818qijd2pcgifi0j3q4fkbiw2ck1nivajk7m810p53bxbj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org"; sha256 = "1cfpjh08djz3k067w3580yb15p1csks3gzch9c4cbrbcjvg8inh5"; - name = "calfw-org"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3563,9 +4566,18 @@ license = lib.licenses.free; }; }) {}; - call-graph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }: - melpaBuild { + call-graph = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , hierarchy + , ivy + , lib + , melpaBuild + , tree-mode }: + melpaBuild { pname = "call-graph"; + ename = "call-graph"; version = "0.1.0"; src = fetchFromGitHub { owner = "beacoder"; @@ -3573,10 +4585,10 @@ rev = "0bbe292b1b9c7ba1d8a65ed5e475f6a53f5f9f27"; sha256 = "0kckjs7yg8d04nir5z3f00k05272kgma98794g0ycgfn1vrck0h0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph"; sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc"; - name = "call-graph"; + name = "recipe"; }; packageRequires = [ cl-lib emacs hierarchy ivy tree-mode ]; meta = { @@ -3584,9 +4596,16 @@ license = lib.licenses.free; }; }) {}; - camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { + camcorder = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names }: + melpaBuild { pname = "camcorder"; + ename = "camcorder"; version = "0.2"; src = fetchFromGitHub { owner = "Malabarba"; @@ -3594,10 +4613,10 @@ rev = "a2b5e0629ee3c01ead684e148965ac68e533efbd"; sha256 = "0v927m3l5cf0j0rs0nfk5whwqmmxs941d8qalxi19j1ihspjz8d6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/camcorder"; sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi"; - name = "camcorder"; + name = "recipe"; }; packageRequires = [ cl-lib emacs names ]; meta = { @@ -3605,20 +4624,24 @@ license = lib.licenses.free; }; }) {}; - caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + caml = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "caml"; - version = "4.6.1"; + ename = "caml"; + version = "4.7.0"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "81dc8e8fcf923baa5e5208f9bc4228930c7c3d56"; - sha256 = "0pn25c3v8xnihnyzk1w297ci5ca05hcdv46m21522sgpcinbvkc7"; + rev = "ca71bda2ac7e5143f58fa9a1693f97e709a91332"; + sha256 = "1ksx2ym5s68m87rnjjkdwhp5ci6cfw0yhmjjmq1r4a0d0r77x4lr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c"; - name = "caml"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3626,9 +4649,15 @@ license = lib.licenses.free; }; }) {}; - cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: - melpaBuild { + cargo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , rust-mode }: + melpaBuild { pname = "cargo"; + ename = "cargo"; version = "0.4.1"; src = fetchFromGitHub { owner = "kwrooijen"; @@ -3636,10 +4665,10 @@ rev = "b0487f95a7de7a1d6f03cdd05220f633977d65a2"; sha256 = "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx"; - name = "cargo"; + name = "recipe"; }; packageRequires = [ emacs rust-mode ]; meta = { @@ -3647,9 +4676,17 @@ license = lib.licenses.free; }; }) {}; - caseformat = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + caseformat = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "caseformat"; + ename = "caseformat"; version = "0.1.0"; src = fetchFromGitHub { owner = "HKey"; @@ -3657,10 +4694,10 @@ rev = "72707c9f0f0819b4e2aa45876432a293aa07f814"; sha256 = "0mg49rpz362ipn5qzqhyfs3d6fpb51rfa73kna3gxdw0wxq2sa7g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba158fbeebcda6b6122b18c97ab8042b1c0a0bc0/recipes/caseformat"; sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk"; - name = "caseformat"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs s ]; meta = { @@ -3668,20 +4705,31 @@ license = lib.licenses.free; }; }) {}; - cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: - melpaBuild { + cask = callPackage ({ cl-lib ? null + , dash + , epl + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , package-build + , s + , shut-up }: + melpaBuild { pname = "cask"; - version = "0.8.3"; + ename = "cask"; + version = "0.8.4"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "ccfe38ae133cc843865f87607d3f4f3960b76870"; - sha256 = "1bv0lganh5xhjp2r84js596p1sqndvxnhn3q6l7m7lcdxrjckcy8"; + rev = "ba5f6eb78178deb954ab9ac02e0e370315097ebe"; + sha256 = "1p37lq8xpyq0rc7phxgsw3b73h8vf9rkpa5959rb5k46w6ps9686"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5"; - name = "cask"; + name = "recipe"; }; packageRequires = [ cl-lib dash epl f package-build s shut-up ]; meta = { @@ -3689,20 +4737,25 @@ license = lib.licenses.free; }; }) {}; - cask-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cask-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cask-mode"; + ename = "cask-mode"; version = "0.1"; src = fetchFromGitHub { owner = "Wilfred"; repo = "cask-mode"; - rev = "5203b1beac4dd2ee07a6e993bc86719f5f35dbbf"; - sha256 = "09y4cr32i2cw06lnq698lajxmqyzq2ah426f4dm176xfbrim89d5"; + rev = "90a257549aa201a12c2b07157f650e3cdd7af06e"; + sha256 = "07qisn5sqdw6y0avfhhj57rwbdjxc0dfxmpf0ax5l8fgq6m0h5qc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d8bc1afaf69b4f29ba1bb0243c25574bc1197cc/recipes/cask-mode"; sha256 = "0fs9zyihipr3klnh3w22h43qz0wnxplm62x4kx7pm1chq9bc9kz6"; - name = "cask-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -3710,9 +4763,21 @@ license = lib.licenses.free; }; }) {}; - cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: - melpaBuild { + cask-package-toolset = callPackage ({ ansi + , cl-lib ? null + , commander + , dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , shut-up }: + melpaBuild { pname = "cask-package-toolset"; + ename = "cask-package-toolset"; version = "0.9.2"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; @@ -3720,10 +4785,10 @@ rev = "2c74cd827e88c7f8360581a841e45f0b794510e7"; sha256 = "1hk5q6p1j7cqg5srr3v21xfyy7aas4hfj1a66h21c2xvfjra3hxw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset"; sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g"; - name = "cask-package-toolset"; + name = "recipe"; }; packageRequires = [ ansi cl-lib commander dash emacs f s shut-up ]; meta = { @@ -3731,9 +4796,15 @@ license = lib.licenses.free; }; }) {}; - caskxy = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + caskxy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "caskxy"; + ename = "caskxy"; version = "0.0.5"; src = fetchFromGitHub { owner = "aki2o"; @@ -3741,10 +4812,10 @@ rev = "279f3ab79bd77fe69cb3148a79896b9bf118a9b3"; sha256 = "1j1lw5zifp7q1ykm6si0nzxfp7n3z2lzla2njkkxmc2s6m7w4x1a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d61aea505e4913879f68081497e85542e9fd786/recipes/caskxy"; sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s"; - name = "caskxy"; + name = "recipe"; }; packageRequires = [ log4e yaxception ]; meta = { @@ -3752,18 +4823,23 @@ license = lib.licenses.free; }; }) {}; - catmacs = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + catmacs = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "catmacs"; + ename = "catmacs"; version = "0.1.1"; src = fetchgit { url = "https://bitbucket.org/pymaximus/catmacs"; rev = "c6e8277bd2aab3f5fbf10d419111110f3b33564f"; sha256 = "0kdlmmqgpgmhbbvafywllqdwkkd5a41rf8zhfmxhs3ydza86hmlg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e62e45ea234a574ed602f27c3c6bc240bcd4fa43/recipes/catmacs"; sha256 = "0ym1szmq9ib75yiyy5jw647fcs7gg0d5dkskqc293pg81qf3im50"; - name = "catmacs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3771,9 +4847,14 @@ license = lib.licenses.free; }; }) {}; - cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cbm = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cbm"; + ename = "cbm"; version = "0.6"; src = fetchFromGitHub { owner = "akermu"; @@ -3781,10 +4862,10 @@ rev = "5b41c936ba9f6d170309a85ffebc9939c1050b31"; sha256 = "091ln3d0jhdgahbwfdm1042b19886n3kwipw5gk8d0jnq5vwrkws"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm"; sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn"; - name = "cbm"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -3792,20 +4873,24 @@ license = lib.licenses.free; }; }) {}; - cdlatex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cdlatex = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cdlatex"; + ename = "cdlatex"; version = "4.7"; src = fetchFromGitHub { owner = "cdominik"; repo = "cdlatex"; - rev = "b7183c2200392b6d85fca69390f4a65fac7a7b19"; + rev = "1d491c2dddb05cdace1ae0e1f56a36009b065d85"; sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cdlatex"; sha256 = "021gj0jw93r8gk0cacw1ldfibpwr6fpkcrnign7b4nqqnb3135k9"; - name = "cdlatex"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3813,9 +4898,17 @@ license = lib.licenses.free; }; }) {}; - cdnjs = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + cdnjs = callPackage ({ dash + , deferred + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "cdnjs"; + ename = "cdnjs"; version = "0.2.1"; src = fetchFromGitHub { owner = "yasuyk"; @@ -3823,10 +4916,10 @@ rev = "ce19880d3ec3d81e6c665d0b1dfea99cc7a3f908"; sha256 = "02j45ngddx7n5gvy42r8y3s22bmxlnvg2pqjfh0li8m599fnd11h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66e4ce4e2c7e4aaac9dc0ce476c4759b000ff5d6/recipes/cdnjs"; sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7"; - name = "cdnjs"; + name = "recipe"; }; packageRequires = [ dash deferred f pkg-info ]; meta = { @@ -3834,9 +4927,17 @@ license = lib.licenses.free; }; }) {}; - celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + celery = callPackage ({ dash-functional + , deferred + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "celery"; + ename = "celery"; version = "0.0.3"; src = fetchFromGitHub { owner = "ardumont"; @@ -3844,10 +4945,10 @@ rev = "163ebede3f6a7f59202ff319675b0873dd1de365"; sha256 = "07h5g905i1jglsryl0dnqxz8yya5kkyjjggzbk4nl3rcj41lyas7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b896b2b89d990a7ce2f4bf4ce0aee0d126f3e55/recipes/celery"; sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h"; - name = "celery"; + name = "recipe"; }; packageRequires = [ dash-functional deferred emacs s ]; meta = { @@ -3855,20 +4956,28 @@ license = lib.licenses.free; }; }) {}; - cerbere = callPackage ({ f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, pkg-info, s }: - melpaBuild { + cerbere = callPackage ({ f + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild + , pkg-info + , s }: + melpaBuild { pname = "cerbere"; + ename = "cerbere"; version = "0.1.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "cerbere"; - rev = "11de1e7ec5126083ae697f5a9993facdb9895f9d"; - sha256 = "08hqgsjvs62l1cfzshbpj80xd8365qmx2b5r5jq20d5cj68s36wl"; + rev = "f9fb567b01bde8870ce36293ed8206a056169bbd"; + sha256 = "1nkqah0igjwv5yhx5yrp42pyi87vzlp1q10sn4l3a0spixn1mnlf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4145e270a2113f30f8bb4d0f6c335f1c76f77b1c/recipes/cerbere"; sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06"; - name = "cerbere"; + name = "recipe"; }; packageRequires = [ f go-mode pkg-info s ]; meta = { @@ -3876,9 +4985,14 @@ license = lib.licenses.free; }; }) {}; - ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ceylon-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ceylon-mode"; + ename = "ceylon-mode"; version = "0.2"; src = fetchFromGitHub { owner = "lucaswerkmeister"; @@ -3886,10 +5000,10 @@ rev = "00f790b3ed5ec48e2461e20a4d466ba45c634e13"; sha256 = "08zk6aspy59gv3989zxz0ibxxwkbjasa83ilpzvpcwszrzq8x640"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode"; sha256 = "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4"; - name = "ceylon-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -3897,20 +5011,24 @@ license = lib.licenses.free; }; }) {}; - cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cfengine-code-style = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cfengine-code-style"; - version = "3.11.0"; + ename = "cfengine-code-style"; + version = "3.12.0"; src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "520851447dba901097b121b58b1a0da370481a2c"; - sha256 = "0sz4zqw2s7f5rhqad4kmrfdsl24xqflfsm4hzfbwzvsrlp7ndis7"; + rev = "10e43677e99a29d8072bb120e7cd7b9d03b1218f"; + sha256 = "0mncl7wb2vi620snk4z01k0wdbvvd5b2nw9nlnfr9a4hkn3fg44r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a"; - name = "cfengine-code-style"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3918,20 +5036,27 @@ license = lib.licenses.free; }; }) {}; - cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cframe = callPackage ({ buffer-manage + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cframe"; + ename = "cframe"; version = "0.1"; src = fetchFromGitHub { owner = "plandes"; repo = "cframe"; - rev = "bb99672502046e87c8f029ce98c637f762a4fc54"; - sha256 = "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4"; + rev = "61844d948e4464625f7023de62aeb27ca742b36f"; + sha256 = "1v413kvygfkdiqi9zg6ypihf2vcks0vs80qshg0ynm5zy27f984y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe"; sha256 = "0pngdaflk1pk2xmwbij4b520b3mlacnjab4r3jby0phah44ziv4l"; - name = "cframe"; + name = "recipe"; }; packageRequires = [ buffer-manage dash emacs ]; meta = { @@ -3939,20 +5064,24 @@ license = lib.licenses.free; }; }) {}; - chapel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chapel-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chapel-mode"; + ename = "chapel-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "russel"; repo = "Emacs-Chapel-Mode"; - rev = "936a76a26bdc4f9570c4d54369f74bcd1cb0a698"; - sha256 = "0n93qz5hzsnrs6c3y5yighfpdpkkmabxyi5i755hfcs5007v199v"; + rev = "816a1a54ff5ffdd20b6a4d249ace774740a3924c"; + sha256 = "0kp18xlc1005hbkfhng03y4xgaicqf6b5vwgnwbbw9s5qzirmhix"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff32db72ad55a7191b5105192480e17535c7edde/recipes/chapel-mode"; sha256 = "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz"; - name = "chapel-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -3960,9 +5089,15 @@ license = lib.licenses.free; }; }) {}; - char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + char-menu = callPackage ({ avy-menu + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "char-menu"; + ename = "char-menu"; version = "0.1.1"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -3970,10 +5105,10 @@ rev = "f4d8bf8fa6787e2aaca2ccda5223646541d7a4b2"; sha256 = "0zyi1ha17jk3zz7nirasrrx43j3jkrsfz7ypbc4mk44w7hsvx2hj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l"; - name = "char-menu"; + name = "recipe"; }; packageRequires = [ avy-menu emacs ]; meta = { @@ -3981,9 +5116,13 @@ license = lib.licenses.free; }; }) {}; - charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + charmap = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "charmap"; + ename = "charmap"; version = "0.0.1"; src = fetchFromGitHub { owner = "lateau"; @@ -3991,10 +5130,10 @@ rev = "165193d91ef96f563ae8366ed4c1a2df5a4eaed2"; sha256 = "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11c549fca81c4276054f614d86d17fa7af4ab32e/recipes/charmap"; sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84"; - name = "charmap"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4002,9 +5141,13 @@ license = lib.licenses.free; }; }) {}; - chatwork = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chatwork = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chatwork"; + ename = "chatwork"; version = "0.3"; src = fetchFromGitHub { owner = "ataka"; @@ -4012,10 +5155,10 @@ rev = "fea231d479f06bf40dbfcf45de143eecc9ed744c"; sha256 = "163xr18lm4awfgh4lcp7pr04jirpvlk8w1g4445zbxbpjfvv268z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77ae72e62b8771e890525c063522e7091ca8f674/recipes/chatwork"; sha256 = "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p"; - name = "chatwork"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4023,9 +5166,14 @@ license = lib.licenses.free; }; }) {}; - cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cheat-sh = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cheat-sh"; + ename = "cheat-sh"; version = "1.7"; src = fetchFromGitHub { owner = "davep"; @@ -4033,10 +5181,10 @@ rev = "6409bb66241255cc9a0362f2acdcb0b34344f9f2"; sha256 = "1nmsja1s45fs93v2vbalfralixvzp88rgv47vf9p80i7x6w2149m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; sha256 = "0f6wqyh3c3ap0l6khikqlw8sqqi6fsl468gn157faza4x63j9z80"; - name = "cheat-sh"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4044,9 +5192,15 @@ license = lib.licenses.free; }; }) {}; - checkbox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + checkbox = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "checkbox"; + ename = "checkbox"; version = "0.2.1"; src = fetchFromGitHub { owner = "camdez"; @@ -4054,10 +5208,10 @@ rev = "2afc2011fa35ccfa0ce9ef46cb1896911fa340d1"; sha256 = "09ypxhfad3v1pz0xhw4xgxvfj7ad2kb3ff9zy1mnw7fzsa7gw6nj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81c4a9d10238836865716f5ea45f8e0e625a87c6/recipes/checkbox"; sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa"; - name = "checkbox"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -4065,9 +5219,42 @@ license = lib.licenses.free; }; }) {}; - chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + chee = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "chee"; + ename = "chee"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "eikek"; + repo = "chee"; + rev = "beeaa5bb2ce92f1a745440c7ff7468e5f6524701"; + sha256 = "1n0n6rnhms2mgh9yjc5whhf3n37y5lp9jk3ban6f6hn55f8p1gmk"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/25b445a1dea5e8f1042bed6b5372471c25129fd8/recipes/chee"; + sha256 = "1sw84qaca2cwgrw332wfqjp3kg3axgi9n6wx5a6h2n3liq5yr1wj"; + name = "recipe"; + }; + packageRequires = [ dash f s ]; + meta = { + homepage = "https://melpa.org/#/chee"; + license = lib.licenses.free; + }; + }) {}; + chinese-word-at-point = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "chinese-word-at-point"; + ename = "chinese-word-at-point"; version = "0.2.3"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -4075,10 +5262,10 @@ rev = "36a03cce32fe059d2b581cb2e029715c0be81074"; sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9b7785eca577218feade982c979694389f37ec3/recipes/chinese-word-at-point"; sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4"; - name = "chinese-word-at-point"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -4086,9 +5273,15 @@ license = lib.licenses.free; }; }) {}; - choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + choice-program = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "choice-program"; + ename = "choice-program"; version = "0.4"; src = fetchFromGitHub { owner = "plandes"; @@ -4096,10 +5289,10 @@ rev = "27607ec1fe241c58fbc1f861454a8e2ec1fd7b15"; sha256 = "0q8krgsydrc2xc29y60qljifdvxfmxnvbncxsh64xhrzsnrgwmq5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program"; sha256 = "0a21yd3b8sb15vms9mclaa7xnnk0as08p6q38mwdwjp9sgcfyh1b"; - name = "choice-program"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -4107,20 +5300,30 @@ license = lib.licenses.free; }; }) {}; - cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: - melpaBuild { + cider = callPackage ({ clojure-mode + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , queue + , seq + , spinner }: + melpaBuild { pname = "cider"; - version = "0.16.0"; + ename = "cider"; + version = "0.17.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "74f7901b416efbd032bb4f8b5c25f57fdf731115"; - sha256 = "0n2b6q8r2gzr3ghyvg5sawir47rk7jmsslvxx6by27bn77h4nzil"; + rev = "5b1c148078b3c6083f7777f2c3349d5c6403fdba"; + sha256 = "0yl1s84kq3438rbndzaxsxghjps82pgjpv76n5dwbkzcwpb84wn9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx"; - name = "cider"; + name = "recipe"; }; packageRequires = [ clojure-mode emacs pkg-info queue seq spinner ]; meta = { @@ -4128,9 +5331,16 @@ license = lib.licenses.free; }; }) {}; - cider-eval-sexp-fu = callPackage ({ emacs, eval-sexp-fu, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: - melpaBuild { + cider-eval-sexp-fu = callPackage ({ emacs + , eval-sexp-fu + , fetchFromGitHub + , fetchurl + , highlight + , lib + , melpaBuild }: + melpaBuild { pname = "cider-eval-sexp-fu"; + ename = "cider-eval-sexp-fu"; version = "1.1"; src = fetchFromGitHub { owner = "clojure-emacs"; @@ -4138,10 +5348,10 @@ rev = "6b437bf073b21543e72d76fd0392a28fba7cbfbe"; sha256 = "1frpr5dwg7aa0pjr2sarck498lj11li8xi36s5qa8qhflgl29jpn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/947f4d106d70f95ca8aac124ab0d90b2975208df/recipes/cider-eval-sexp-fu"; sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq"; - name = "cider-eval-sexp-fu"; + name = "recipe"; }; packageRequires = [ emacs eval-sexp-fu highlight ]; meta = { @@ -4149,20 +5359,24 @@ license = lib.licenses.free; }; }) {}; - cil-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cil-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cil-mode"; + ename = "cil-mode"; version = "0.4"; src = fetchFromGitHub { owner = "ForNeVeR"; repo = "cil-mode"; - rev = "a78a88ca9a66a82f069329a96e34b67478ae2d9b"; + rev = "8023b45ec60961bf4c3a3d8a564727c463ed09d1"; sha256 = "06p6hz6jrnvnlbxdr1pjgf5wh4n34kf6al4589qg1s88r2lf86bl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ccbf4a7c9df3c85207c7160ee68ecc4ba4f3801a/recipes/cil-mode"; sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y"; - name = "cil-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4170,20 +5384,25 @@ license = lib.licenses.free; }; }) {}; - circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + circadian = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "circadian"; - version = "0.3.1"; + ename = "circadian"; + version = "0.3.2"; src = fetchFromGitHub { owner = "GuidoSchmidt"; repo = "circadian.el"; - rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee"; - sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk"; + rev = "9894361dcd6ffb6d4629b4cbbabda2153699eb8e"; + sha256 = "0wpsykmai3idz0bgfl07hwl9nr4x9sgprvqgw8jln4dz2wf5gdic"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; sha256 = "13797y1w1636bibisz5i5p2xp0smd3apnhc1nx8ijm75smx679id"; - name = "circadian"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4191,20 +5410,25 @@ license = lib.licenses.free; }; }) {}; - circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + circe = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "circe"; - version = "2.7"; + ename = "circe"; + version = "2.10"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "661a2cdb3a3d9bc11ee511a4f90116c88e0d3484"; - sha256 = "19fcvmm915dz9l2w1rna4yik96rb3hrk7042012g961xn4sgs0ih"; + rev = "fedfa7eb8516a53fa70b6a1f4fce4b5ab66ea91f"; + sha256 = "10gi14kwxd81blddpvqh95lgmpbfgp0m955naxix3bs3r6a75n4s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07"; - name = "circe"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -4212,9 +5436,16 @@ license = lib.licenses.free; }; }) {}; - circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + circe-notifications = callPackage ({ alert + , circe + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "circe-notifications"; + ename = "circe-notifications"; version = "1.0"; src = fetchFromGitHub { owner = "eqyiel"; @@ -4222,10 +5453,10 @@ rev = "80c44441ecd3ae04ae63760aa20afa837c1ed05b"; sha256 = "0s0iw5vclciziga78f1lvj6sdg84a132in39k4vz0pj598ypin1w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications"; sha256 = "06y525x5yc0xgbw0cf16mc72ca9bv8j8z4gpgznbad2qp7psf53c"; - name = "circe-notifications"; + name = "recipe"; }; packageRequires = [ alert circe emacs ]; meta = { @@ -4233,9 +5464,44 @@ license = lib.licenses.free; }; }) {}; - cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + citeproc = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , queue + , s + , string-inflection }: + melpaBuild { + pname = "citeproc"; + ename = "citeproc"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "andras-simonyi"; + repo = "citeproc-el"; + rev = "6d68f52ebd150e035b33dcaa59d9e2aceab69b84"; + sha256 = "04xz3y3j8k1pv5v6v9wqscqlpmgqi85fs3igrv8c9y0xagild29k"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc"; + sha256 = "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq"; + name = "recipe"; + }; + packageRequires = [ dash emacs f queue s string-inflection ]; + meta = { + homepage = "https://melpa.org/#/citeproc"; + license = lib.licenses.free; + }; + }) {}; + cl-format = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cl-format"; + ename = "cl-format"; version = "1.1"; src = fetchFromGitHub { owner = "alvinfrancis"; @@ -4243,10 +5509,10 @@ rev = "4380cb8009c47cc6d9098b383082b93b1aefa460"; sha256 = "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cl-format"; sha256 = "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy"; - name = "cl-format"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4254,9 +5520,14 @@ license = lib.licenses.free; }; }) {}; - cl-lib-highlight = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cl-lib-highlight = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cl-lib-highlight"; + ename = "cl-lib-highlight"; version = "1.0.0"; src = fetchFromGitHub { owner = "skeeto"; @@ -4264,10 +5535,10 @@ rev = "c117451df8455769701af6c8e92a8fb29c05e1fa"; sha256 = "12vgi5dicx3lxzngjcg9g3nflrhfy9wdw6ldm72zarp1h96jy5cw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/696c79669478b0d1c9769cc6f0fe581ee056cf32/recipes/cl-lib-highlight"; sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8"; - name = "cl-lib-highlight"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -4275,9 +5546,14 @@ license = lib.licenses.free; }; }) {}; - click-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + click-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "click-mode"; + ename = "click-mode"; version = "0.0.4"; src = fetchFromGitHub { owner = "bmalehorn"; @@ -4285,10 +5561,10 @@ rev = "c074e7b5b0a88434d0d3411f18884d1f6e288b33"; sha256 = "0w34ixzk8vs2nv5xr7l1b3k0crl1lqvbq6gs5r4b8rhsx9b6c1mb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1859bb26e3efd66394d7d9f4d2296cbeeaf5ba4d/recipes/click-mode"; sha256 = "1p5dz4a74w5zxdlw17h5z9dglapia4p29880liw3bif2c7dzkg0r"; - name = "click-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4296,9 +5572,15 @@ license = lib.licenses.free; }; }) {}; - cliphist = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + cliphist = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "cliphist"; + ename = "cliphist"; version = "0.5.5"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -4306,10 +5588,10 @@ rev = "e454254f8bd9dbaea28e95c786d7297a2d4e920a"; sha256 = "1lxsy78kmrrb82y7nlaaaq2qsly7f3wa8jw1bagjax4rwvld0vim"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29"; - name = "cliphist"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -4317,20 +5599,24 @@ license = lib.licenses.free; }; }) {}; - clips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clips-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clips-mode"; + ename = "clips-mode"; version = "0.7"; src = fetchFromGitHub { owner = "grettke"; repo = "clips-mode"; - rev = "a3ab4a3e958d54a16544ec38fe6338f27df20817"; - sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd"; + rev = "f7869b67c2a8f061ce05f1e48abbcb41a6c455ce"; + sha256 = "07r01g5xcr3w0kq09m4rb8ws0ss77szczycybvas4379sf3g8dv9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d28484bf5e9ad72778ad63f73deeea1eb1263236/recipes/clips-mode"; sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf"; - name = "clips-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4338,9 +5624,24 @@ license = lib.licenses.free; }; }) {}; - clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }: - melpaBuild { + clj-refactor = callPackage ({ cider + , clojure-mode + , edn + , emacs + , fetchFromGitHub + , fetchurl + , hydra + , inflections + , lib + , melpaBuild + , multiple-cursors + , paredit + , s + , seq + , yasnippet }: + melpaBuild { pname = "clj-refactor"; + ename = "clj-refactor"; version = "2.3.1"; src = fetchFromGitHub { owner = "clojure-emacs"; @@ -4348,10 +5649,10 @@ rev = "9005de31ed05122d3db9f503fbc69722abf3634b"; sha256 = "1pvxwvx36fl971j9dfhfk33sqg70nsw57brsi6kgphq7dgzmv7dk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz"; - name = "clj-refactor"; + name = "recipe"; }; packageRequires = [ cider @@ -4371,9 +5672,16 @@ license = lib.licenses.free; }; }) {}; - cljr-helm = callPackage ({ cl-lib ? null, clj-refactor, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + cljr-helm = callPackage ({ cl-lib ? null + , clj-refactor + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "cljr-helm"; + ename = "cljr-helm"; version = "0.11"; src = fetchFromGitHub { owner = "philjackson"; @@ -4381,10 +5689,10 @@ rev = "f2fc7b698a56e4a44d5dfbc6a55d77a93c0fa9a4"; sha256 = "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d99b67e295ef59916211bf22b57b4d093e3d53ab/recipes/cljr-helm"; sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc"; - name = "cljr-helm"; + name = "recipe"; }; packageRequires = [ cl-lib clj-refactor helm-core ]; meta = { @@ -4392,20 +5700,26 @@ license = lib.licenses.free; }; }) {}; - clocker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + clocker = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "clocker"; + ename = "clocker"; version = "0.0.11"; src = fetchFromGitHub { owner = "roman"; repo = "clocker.el"; - rev = "4a4831ed4e42e18976edd16b844cb16cb78f3c17"; - sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0"; + rev = "07338bc4b850d262eb263ac306ae3366cac6e078"; + sha256 = "0f6qav92lyp36irdlamcxhzfd4p1i4iq18d5cmr7fgfwi894ikcg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dadd3f5abad2e1f7863c4d654ff065f641395f64/recipes/clocker"; sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k"; - name = "clocker"; + name = "recipe"; }; packageRequires = [ dash projectile ]; meta = { @@ -4413,9 +5727,15 @@ license = lib.licenses.free; }; }) {}; - clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + clojure-cheatsheet = callPackage ({ cider + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "clojure-cheatsheet"; + ename = "clojure-cheatsheet"; version = "0.4.0"; src = fetchFromGitHub { owner = "clojure-emacs"; @@ -4423,10 +5743,10 @@ rev = "f8db406b7b13a580c142d08865c9a03c101235fa"; sha256 = "1x1kfycf3023z0r3v7xqci59k8jv5wn2vqc9y0nx7k5qgifmswrx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0569da79bd8145df334965c5d4364a50b6b548fa/recipes/clojure-cheatsheet"; sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv"; - name = "clojure-cheatsheet"; + name = "recipe"; }; packageRequires = [ cider helm ]; meta = { @@ -4434,20 +5754,25 @@ license = lib.licenses.free; }; }) {}; - clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clojure-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clojure-mode"; - version = "5.6.1"; + ename = "clojure-mode"; + version = "5.8.1"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "fdbdfb91e0a5731bf9a739b70c5f217c5d12ae6d"; - sha256 = "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y"; + rev = "09831e36efaaa3aa284c241cca1f53ac55cbe410"; + sha256 = "1fw5lbyyhjcfl23i1day8shs3diihvlqx59372c7k7gw8wb8phnq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np"; - name = "clojure-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4455,20 +5780,25 @@ license = lib.licenses.free; }; }) {}; - clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clojure-mode-extra-font-locking = callPackage ({ clojure-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clojure-mode-extra-font-locking"; - version = "5.6.1"; + ename = "clojure-mode-extra-font-locking"; + version = "5.8.1"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "fdbdfb91e0a5731bf9a739b70c5f217c5d12ae6d"; - sha256 = "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y"; + rev = "9bbc8d59b3b4dfe3f0564f0d06832a309b4e4e4e"; + sha256 = "0brwcxlz337bd1y1vjlix2aq6qjzqqrl0g9hag5lmpkimnbbnbv1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n"; - name = "clojure-mode-extra-font-locking"; + name = "recipe"; }; packageRequires = [ clojure-mode ]; meta = { @@ -4476,9 +5806,15 @@ license = lib.licenses.free; }; }) {}; - clojure-quick-repls = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clojure-quick-repls = callPackage ({ cider + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clojure-quick-repls"; + ename = "clojure-quick-repls"; version = "0.1.0"; src = fetchFromGitHub { owner = "symfrog"; @@ -4486,10 +5822,10 @@ rev = "90f82e294cfdfb65231adc456177580cd69bfc00"; sha256 = "0sw34yjp8934xd2n76lbwyvxkbyz5pxszj6gkflas8lfjvms9z7d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e618430057eb3ac235ab4a44767524919c870036/recipes/clojure-quick-repls"; sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0"; - name = "clojure-quick-repls"; + name = "recipe"; }; packageRequires = [ cider dash ]; meta = { @@ -4497,9 +5833,14 @@ license = lib.licenses.free; }; }) {}; - clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + clojure-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "clojure-snippets"; + ename = "clojure-snippets"; version = "1.0.1"; src = fetchFromGitHub { owner = "mpenet"; @@ -4507,10 +5848,10 @@ rev = "83785faa607884308a42b81f160854f2cecfd098"; sha256 = "1sdgf1avfw7w3m3i7nqb9m9nhqk8lr0bri686lrkq23ds2b44454"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets"; sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij"; - name = "clojure-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -4518,20 +5859,26 @@ license = lib.licenses.free; }; }) {}; - closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + closql = callPackage ({ emacs + , emacsql-sqlite + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "closql"; - version = "0.5.1"; + ename = "closql"; + version = "0.6.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d"; - sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si"; + rev = "faed079570c2e70b0e4988177e35b7990afa4752"; + sha256 = "0ni2akjb1n5w6vz3b210c3bya9mbyyxiygn8hna707qnszd0li8r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; sha256 = "13ybna20w2d1b3n0y5p1ybhkw0j0zh5nd43p1yvf8h1haj983l87"; - name = "closql"; + name = "recipe"; }; packageRequires = [ emacs emacsql-sqlite ]; meta = { @@ -4539,9 +5886,14 @@ license = lib.licenses.free; }; }) {}; - clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + clues-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "clues-theme"; + ename = "clues-theme"; version = "1.0.1"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -4549,10 +5901,10 @@ rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7"; sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/clues-theme"; sha256 = "0b0gypmxx8qjd8hgxf4kbvci1nwacsxl7rm5s1bcnk9cwc6k2jpr"; - name = "clues-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4560,9 +5912,14 @@ license = lib.licenses.free; }; }) {}; - cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cm-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cm-mode"; + ename = "cm-mode"; version = "1.6"; src = fetchFromGitHub { owner = "joostkremers"; @@ -4570,10 +5927,10 @@ rev = "276d49c859822265070ae5dfbb403fd7d8d06436"; sha256 = "0mqbjw9wiaq735v307hd7g0g6i3a4k7h71bi4g9rr2jbgiljmql4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode"; sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x"; - name = "cm-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -4581,9 +5938,17 @@ license = lib.licenses.free; }; }) {}; - cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }: - melpaBuild { + cmake-ide = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , levenshtein + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "cmake-ide"; + ename = "cmake-ide"; version = "0.5"; src = fetchFromGitHub { owner = "atilaneves"; @@ -4591,10 +5956,10 @@ rev = "a2e476ad42e61075cae9beb35fb83e3c1bf8619e"; sha256 = "0n169i4y2c450bk5r284bakjk3hsg74pply5fqxvdm6p5p1z2vr1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg"; - name = "cmake-ide"; + name = "recipe"; }; packageRequires = [ cl-lib emacs levenshtein seq ]; meta = { @@ -4602,20 +5967,24 @@ license = lib.licenses.free; }; }) {}; - cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cmake-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cmake-mode"; - version = "3.11.0"; + ename = "cmake-mode"; + version = "3.12.0"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "61fd4c742013a7f9139db190f936703b656540ff"; - sha256 = "1iiyysw16asqj1c077gk6s9pqy8qij6d83kwxc59swc7xgcy1g0d"; + rev = "d88451568dae61422d9d1b5796ad450ad28e0eb6"; + sha256 = "1hg99q4w0cfhm53qmiqirzrfk1bnx1lmb5kx2swfwcrxyyp80kby"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7"; - name = "cmake-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4623,9 +5992,13 @@ license = lib.licenses.free; }; }) {}; - cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cmake-project = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cmake-project"; + ename = "cmake-project"; version = "0.7"; src = fetchFromGitHub { owner = "alamaison"; @@ -4633,10 +6006,10 @@ rev = "ec61f687772cccdb699f64ebe1e8dc8ba83f790f"; sha256 = "10xlny2agxjknvnjdnw41cyb3d361yy0wvpc8l1d0xwnmmfh3bxk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0857c4db1027981ea73bc32bcaa15e5df53edea3/recipes/cmake-project"; sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3"; - name = "cmake-project"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4644,20 +6017,25 @@ license = lib.licenses.free; }; }) {}; - cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cnfonts = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cnfonts"; + ename = "cnfonts"; version = "0.9.1"; src = fetchFromGitHub { owner = "tumashu"; repo = "cnfonts"; - rev = "cbe1ddd49e33b790a568c55351146aa5b909f173"; - sha256 = "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx"; + rev = "5cfe656554c91b3d0dcc5417e43afa85d2a7a182"; + sha256 = "1px5gc83g70whdiysq7mmxz7rm74mhsjs2y1vbzgg8k1z0cs9wkp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts"; sha256 = "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w"; - name = "cnfonts"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4665,9 +6043,15 @@ license = lib.licenses.free; }; }) {}; - codic = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + codic = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "codic"; + ename = "codic"; version = "0.3"; src = fetchFromGitHub { owner = "syohex"; @@ -4675,10 +6059,10 @@ rev = "52bbb6997ef4ab9fb7fea43bbfff7f04671aa557"; sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/codic"; sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn"; - name = "codic"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -4686,9 +6070,15 @@ license = lib.licenses.free; }; }) {}; - coffee-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + coffee-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "coffee-mode"; + ename = "coffee-mode"; version = "0.6.3"; src = fetchFromGitHub { owner = "defunkt"; @@ -4696,10 +6086,10 @@ rev = "adfb7ae73d6ee2ef790c780dd3c967e62930e94a"; sha256 = "0yhmg5j051mviqp5laz7y1zjs1w9ykbbxqm7vrgf2py0hpd1kcrg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode"; sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1"; - name = "coffee-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -4707,9 +6097,15 @@ license = lib.licenses.free; }; }) {}; - color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-identifiers-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-identifiers-mode"; + ename = "color-identifiers-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "ankurdave"; @@ -4717,10 +6113,10 @@ rev = "536151410dbb198b328dc62b829d9692cec0b1bd"; sha256 = "1zwgyp65jivds9zvbp5k5q3gazffh3w0mvs739ddq93lkf165rwh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode"; sha256 = "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq"; - name = "color-identifiers-mode"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -4728,9 +6124,14 @@ license = lib.licenses.free; }; }) {}; - color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-theme-modern = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-theme-modern"; + ename = "color-theme-modern"; version = "0.0.2"; src = fetchFromGitHub { owner = "emacs-jp"; @@ -4738,10 +6139,10 @@ rev = "7107540d22e8ff045e0707de84c8b179fd829302"; sha256 = "0apvqrva3f7valjrxpslln8460kpr82z4zazj3lg3j82k102zla9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2db82e101916d8709b711034da5ca6e4072e1077/recipes/color-theme-modern"; sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm"; - name = "color-theme-modern"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4749,9 +6150,13 @@ license = lib.licenses.free; }; }) {}; - color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-theme-sanityinc-solarized"; + ename = "color-theme-sanityinc-solarized"; version = "2.29"; src = fetchFromGitHub { owner = "purcell"; @@ -4759,10 +6164,10 @@ rev = "554e941131d009c0a5d7129ed96796182b4cc590"; sha256 = "13jmg05skv409z8pg5m9rzkajj9knyln0ff8a3i1pbpyrnpngmmc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized"; sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf"; - name = "color-theme-sanityinc-solarized"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4770,9 +6175,13 @@ license = lib.licenses.free; }; }) {}; - color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "color-theme-sanityinc-tomorrow"; + ename = "color-theme-sanityinc-tomorrow"; version = "1.17"; src = fetchFromGitHub { owner = "purcell"; @@ -4780,10 +6189,10 @@ rev = "81d8990085960824f700520d08027e6aca58feaa"; sha256 = "1x3aq6hadp158vh8mf9hmj5rikq0qz7a1frv7vbl39xr3wcnjj23"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd"; - name = "color-theme-sanityinc-tomorrow"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4791,9 +6200,14 @@ license = lib.licenses.free; }; }) {}; - colormaps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + colormaps = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "colormaps"; + ename = "colormaps"; version = "0.1.2"; src = fetchFromGitHub { owner = "lepisma"; @@ -4801,10 +6215,10 @@ rev = "3a88961ba66b09a49ea5aa92b2b8776b2c92d68c"; sha256 = "083hks2zzalizdsgabiwc1kd114r748v5i3w3kfk8pv37i2gay35"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4c795d9e323b08bc8354a6933a061644705a2ec/recipes/colormaps"; sha256 = "16plhgpfz1wb58p6h8wxjhplhgv0mbj3f2xj34p6vydh44l8w8q2"; - name = "colormaps"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4812,9 +6226,17 @@ license = lib.licenses.free; }; }) {}; - commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + commander = callPackage ({ cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "commander"; + ename = "commander"; version = "0.7.0"; src = fetchFromGitHub { owner = "rejeep"; @@ -4822,10 +6244,10 @@ rev = "2c8a57b9c619e29ccbe2d5a85921b9c689e95bf9"; sha256 = "1j6hhyzww7wfwk6bllbb5mk4hw4qs8hsgfbfdifsam9c6i4spm45"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b308e05dd85856addbc04a9438f5026803cebd7/recipes/commander"; sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393"; - name = "commander"; + name = "recipe"; }; packageRequires = [ cl-lib dash f s ]; meta = { @@ -4833,9 +6255,13 @@ license = lib.licenses.free; }; }) {}; - comment-dwim-2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + comment-dwim-2 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "comment-dwim-2"; + ename = "comment-dwim-2"; version = "1.2.2"; src = fetchFromGitHub { owner = "remyferre"; @@ -4843,10 +6269,10 @@ rev = "8cedecde018b5872195bfead6511af822776a430"; sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac6ac97875117013515a36c9a4452fbd6c0d74c/recipes/comment-dwim-2"; sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj"; - name = "comment-dwim-2"; + name = "recipe"; }; packageRequires = []; meta = { @@ -4854,9 +6280,15 @@ license = lib.licenses.free; }; }) {}; - comment-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + comment-tags = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "comment-tags"; + ename = "comment-tags"; version = "0.1"; src = fetchFromGitHub { owner = "vincekd"; @@ -4864,10 +6296,10 @@ rev = "293a30026d7750f6657d6c2e6d6428abf1d7db5a"; sha256 = "06s0phgqpzkkv81gl0cm6x8rjs53lhs8b2j56xamflqiydq0fz7n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ac71f4ffc19bce4f571001f9270d5be855dfc3c/recipes/comment-tags"; sha256 = "13slv150zch0b7zpxa2dbqjzpqh0iy559m6rc0zs0dwdagzryp3i"; - name = "comment-tags"; + name = "recipe"; }; packageRequires = [ emacs pkg-info ]; meta = { @@ -4875,9 +6307,15 @@ license = lib.licenses.free; }; }) {}; - commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: - melpaBuild { + commenter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "commenter"; + ename = "commenter"; version = "0.5.2"; src = fetchFromGitHub { owner = "yuutayamada"; @@ -4885,10 +6323,10 @@ rev = "6d1885419434ba779270c6fda0e30d390bb074bd"; sha256 = "1jwd3whag39qhzhbsfivzdlcr6vj37dv5ychkhmilw8v6dfdnpdb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/437afab17b22c0c559617afa06923b5bc73a3ae8/recipes/commenter"; sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3"; - name = "commenter"; + name = "recipe"; }; packageRequires = [ emacs let-alist ]; meta = { @@ -4896,9 +6334,14 @@ license = lib.licenses.free; }; }) {}; - common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + common-lisp-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "common-lisp-snippets"; + ename = "common-lisp-snippets"; version = "0.1.2"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -4906,10 +6349,10 @@ rev = "fc5c2683952328927a6d1c1f2694b85ddf7e9053"; sha256 = "1835kg05794p1wdi7fsmpzlnnqy79dgfnfrxjfjj2j1gzcwmynsw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets"; sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl"; - name = "common-lisp-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -4917,9 +6360,14 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company"; + ename = "company"; version = "0.9.6"; src = fetchFromGitHub { owner = "company-mode"; @@ -4927,10 +6375,10 @@ rev = "4711695af3df93f1bbceee165c505fea5bfc49ac"; sha256 = "0x8zwq88k85ikzr0klm6nfa6i1wbykzfa790cg9cmi7wrsywimm1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4"; - name = "company"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -4938,9 +6386,18 @@ license = lib.licenses.free; }; }) {}; - company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + company-anaconda = callPackage ({ anaconda-mode + , cl-lib ? null + , company + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "company-anaconda"; + ename = "company-anaconda"; version = "0.2.0"; src = fetchFromGitHub { owner = "proofit404"; @@ -4948,10 +6405,10 @@ rev = "182a8fdabc01630f255beeb2708728c0cd5c6316"; sha256 = "1rqf9i4l32njpwx4aiwxqr994g3jzispwprs6nwjfvg70xkvm4m0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda"; sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl"; - name = "company-anaconda"; + name = "recipe"; }; packageRequires = [ anaconda-mode cl-lib company dash s ]; meta = { @@ -4959,20 +6416,26 @@ license = lib.licenses.free; }; }) {}; - company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-ansible = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-ansible"; - version = "0.7.0"; + ename = "company-ansible"; + version = "0.7.1"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "42753d43333c6e4ad83797f0234149b76b463369"; - sha256 = "1g93vnizl42k52ar47g7yn2csjyzsqvwb6siwbpfvjgbsr5d5d01"; + rev = "c6dc714e3a15f89671ae5e8fe668858b20ef63e8"; + sha256 = "01nly13i2bs77lrvkm26i96vrrigbxpb9cakski9fv3xrvfxq9bv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d"; - name = "company-ansible"; + name = "recipe"; }; packageRequires = [ company emacs ]; meta = { @@ -4980,9 +6443,16 @@ license = lib.licenses.free; }; }) {}; - company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-cabal = callPackage ({ cl-lib ? null + , company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-cabal"; + ename = "company-cabal"; version = "0.2.1"; src = fetchFromGitHub { owner = "iquiw"; @@ -4990,10 +6460,10 @@ rev = "f458de88cad16ed48a605e8347e56433e73dcef8"; sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal"; sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra"; - name = "company-cabal"; + name = "recipe"; }; packageRequires = [ cl-lib company emacs ]; meta = { @@ -5001,9 +6471,18 @@ license = lib.licenses.free; }; }) {}; - company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + company-coq = callPackage ({ cl-lib ? null + , company + , company-math + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "company-coq"; + ename = "company-coq"; version = "1.0"; src = fetchFromGitHub { owner = "cpitclaudel"; @@ -5011,10 +6490,10 @@ rev = "bb507a11b088a8c9bb6500b384ed588bc690fcea"; sha256 = "0s6gzdmxlsl1l0vh52xspxys1wmsq063p6nva6qisg1r622gjzjl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; sha256 = "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa"; - name = "company-coq"; + name = "recipe"; }; packageRequires = [ cl-lib company company-math dash yasnippet ]; meta = { @@ -5022,20 +6501,27 @@ license = lib.licenses.free; }; }) {}; - company-dict = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }: - melpaBuild { + company-dict = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parent-mode }: + melpaBuild { pname = "company-dict"; + ename = "company-dict"; version = "1.2.7"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-company-dict"; - rev = "d51b801fe319e7984cbc202c4745214d84039942"; - sha256 = "16ai8ljp0i75kby1knj7ldysd8s6kd6drmlh9ygyddxbi2i35x61"; + rev = "cc2f7aecc0a9d5b44c471a5550a49fd3ca535360"; + sha256 = "1swd87p4vxlxqcajfh0clypqdwdkn85k3iy9gms1hm4m23wj6a4m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict"; sha256 = "1377b40f1j4rmw7lnhy1zsm6r234ds5zsn02v1ajm3bzrpkkmin0"; - name = "company-dict"; + name = "recipe"; }; packageRequires = [ company emacs parent-mode ]; meta = { @@ -5043,9 +6529,17 @@ license = lib.licenses.free; }; }) {}; - company-edbi = callPackage ({ cl-lib ? null, company, edbi, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + company-edbi = callPackage ({ cl-lib ? null + , company + , edbi + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "company-edbi"; + ename = "company-edbi"; version = "0.1"; src = fetchFromGitHub { owner = "proofit404"; @@ -5053,10 +6547,10 @@ rev = "08dc69ccfbcf10ca83f7075e9b735c6885cd7e11"; sha256 = "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d881ff0927d5bd7f8192f58927ceabb9bad4beb/recipes/company-edbi"; sha256 = "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm"; - name = "company-edbi"; + name = "recipe"; }; packageRequires = [ cl-lib company edbi s ]; meta = { @@ -5064,20 +6558,27 @@ license = lib.licenses.free; }; }) {}; - company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-emacs-eclim = callPackage ({ cl-lib ? null + , company + , eclim + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-emacs-eclim"; + ename = "company-emacs-eclim"; version = "0.4"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6"; - sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3"; + rev = "94508ebd071ff1052d68a20f7f1bf1038439fe43"; + sha256 = "0l72zw93wv8ncn98d6ybnykhi3a60bc0kyx6z699wfhnnhhxhl0p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; sha256 = "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig"; - name = "company-emacs-eclim"; + name = "recipe"; }; packageRequires = [ cl-lib company eclim ]; meta = { @@ -5085,9 +6586,15 @@ license = lib.licenses.free; }; }) {}; - company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-emoji = callPackage ({ cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-emoji"; + ename = "company-emoji"; version = "2.5.0"; src = fetchFromGitHub { owner = "dunn"; @@ -5095,10 +6602,10 @@ rev = "8dc88ffe0773ef44321f245d39430c14a1bc2b82"; sha256 = "1y8l9wnc13g79znyw2qsbm33da2bhkj270ppikkg9h4x2qpmxilq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji"; sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3"; - name = "company-emoji"; + name = "recipe"; }; packageRequires = [ cl-lib company ]; meta = { @@ -5106,9 +6613,16 @@ license = lib.licenses.free; }; }) {}; - company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }: - melpaBuild { + company-erlang = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , ivy-erlang-complete + , lib + , melpaBuild }: + melpaBuild { pname = "company-erlang"; + ename = "company-erlang"; version = "0.1.1"; src = fetchFromGitHub { owner = "s-kostyaev"; @@ -5116,10 +6630,10 @@ rev = "bc0524a16f17b66c7397690e4ca0e004f09ea6c5"; sha256 = "04wm3i65fpzln7sdcny88hfjfm0n7wy44ffsr3697x4l95d0bnyh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219/recipes/company-erlang"; sha256 = "0qlc89c05523kjzsb7j3yfi022la47kgixl74ggkafhn60scwdm7"; - name = "company-erlang"; + name = "recipe"; }; packageRequires = [ company emacs ivy-erlang-complete ]; meta = { @@ -5127,9 +6641,17 @@ license = lib.licenses.free; }; }) {}; - company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }: - melpaBuild { + company-ghc = callPackage ({ cl-lib ? null + , company + , emacs + , fetchFromGitHub + , fetchurl + , ghc + , lib + , melpaBuild }: + melpaBuild { pname = "company-ghc"; + ename = "company-ghc"; version = "1.1.0"; src = fetchFromGitHub { owner = "iquiw"; @@ -5137,10 +6659,10 @@ rev = "64e4f9d0cf9377138a8dee34c69e7d578fd71090"; sha256 = "0y9i0q37xjbnlnlxq7xjvnpn6ykzbd55g6nbw10z1wg0m2v7f96r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc"; sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn"; - name = "company-ghc"; + name = "recipe"; }; packageRequires = [ cl-lib company emacs ghc ]; meta = { @@ -5148,20 +6670,26 @@ license = lib.licenses.free; }; }) {}; - company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + company-go = callPackage ({ company + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "company-go"; + ename = "company-go"; version = "20170907"; src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1"; - sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb"; + rev = "84b76ec55b44739143088371a34ef30a4719dfe4"; + sha256 = "0ig9jsx9gv3cya11r0w07xpby9rzlh3iz02mir0z7ffnf8qawmrc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29"; - name = "company-go"; + name = "recipe"; }; packageRequires = [ company go-mode ]; meta = { @@ -5169,9 +6697,17 @@ license = lib.licenses.free; }; }) {}; - company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: - melpaBuild { + company-irony = callPackage ({ cl-lib ? null + , company + , emacs + , fetchFromGitHub + , fetchurl + , irony + , lib + , melpaBuild }: + melpaBuild { pname = "company-irony"; + ename = "company-irony"; version = "1.1.0"; src = fetchFromGitHub { owner = "Sarcasm"; @@ -5179,10 +6715,10 @@ rev = "52aca45bcd0f2cb0648fcafa2bbb4f8ad4b2fee7"; sha256 = "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony"; sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km"; - name = "company-irony"; + name = "recipe"; }; packageRequires = [ cl-lib company emacs irony ]; meta = { @@ -5190,9 +6726,16 @@ license = lib.licenses.free; }; }) {}; - company-irony-c-headers = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: - melpaBuild { + company-irony-c-headers = callPackage ({ cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , irony + , lib + , melpaBuild }: + melpaBuild { pname = "company-irony-c-headers"; + ename = "company-irony-c-headers"; version = "1.0.0"; src = fetchFromGitHub { owner = "hotpxl"; @@ -5200,10 +6743,10 @@ rev = "ba304fe7eebdff90bbc7dea063b45b82638427fa"; sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f9f62d8ef438a9ba4872bd7731768eddc5905de/recipes/company-irony-c-headers"; sha256 = "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8"; - name = "company-irony-c-headers"; + name = "recipe"; }; packageRequires = [ cl-lib company irony ]; meta = { @@ -5211,9 +6754,17 @@ license = lib.licenses.free; }; }) {}; - company-jedi = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }: - melpaBuild { + company-jedi = callPackage ({ cl-lib ? null + , company + , emacs + , fetchFromGitHub + , fetchurl + , jedi-core + , lib + , melpaBuild }: + melpaBuild { pname = "company-jedi"; + ename = "company-jedi"; version = "0.4"; src = fetchFromGitHub { owner = "syohex"; @@ -5221,10 +6772,10 @@ rev = "ad49407451c7f28fe137f9c8f3a7fc89e8693a1b"; sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/company-jedi"; sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj"; - name = "company-jedi"; + name = "recipe"; }; packageRequires = [ cl-lib company emacs jedi-core ]; meta = { @@ -5232,9 +6783,18 @@ license = lib.licenses.free; }; }) {}; - company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: - melpaBuild { + company-lsp = callPackage ({ company + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild + , s }: + melpaBuild { pname = "company-lsp"; + ename = "company-lsp"; version = "2.0.1"; src = fetchFromGitHub { owner = "tigersoldier"; @@ -5242,10 +6802,10 @@ rev = "4512d062c38922d8b8cf402ca6043c246e915694"; sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l"; - name = "company-lsp"; + name = "recipe"; }; packageRequires = [ company dash emacs lsp-mode s ]; meta = { @@ -5253,9 +6813,15 @@ license = lib.licenses.free; }; }) {}; - company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: - melpaBuild { + company-math = callPackage ({ company + , fetchFromGitHub + , fetchurl + , lib + , math-symbol-lists + , melpaBuild }: + melpaBuild { pname = "company-math"; + ename = "company-math"; version = "1.3"; src = fetchFromGitHub { owner = "vspinu"; @@ -5263,10 +6829,10 @@ rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4"; sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87"; - name = "company-math"; + name = "recipe"; }; packageRequires = [ company math-symbol-lists ]; meta = { @@ -5274,9 +6840,15 @@ license = lib.licenses.free; }; }) {}; - company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-ngram = callPackage ({ cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-ngram"; + ename = "company-ngram"; version = "0.8.0"; src = fetchFromGitHub { owner = "kshramt"; @@ -5284,10 +6856,10 @@ rev = "d15182df3eac72b29772802759b77c9eafef5066"; sha256 = "05108s2a3c857n9j3c34hdni3fyq149pva4m3f51lis4wqrm4zv7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; sha256 = "1y9k9s8c248m91xld4f5l75j4swml333rpwq590bsx7mrsq131xx"; - name = "company-ngram"; + name = "recipe"; }; packageRequires = [ cl-lib company ]; meta = { @@ -5295,20 +6867,27 @@ license = lib.licenses.free; }; }) {}; - company-nixos-options = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nixos-options }: - melpaBuild { + company-nixos-options = callPackage ({ cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nixos-options }: + melpaBuild { pname = "company-nixos-options"; + ename = "company-nixos-options"; version = "0.0.1"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "5fc8fa29bea9dd8e9c822af92f9bc6ddc223635f"; - sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld"; + rev = "a3475995f9e107d339b9ea7a739ac6ebe2bf050f"; + sha256 = "1jp6z1hrh80irvhz5lv5blbcc821w98y67ni1fmnlwdiv2mp049l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options"; sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0"; - name = "company-nixos-options"; + name = "recipe"; }; packageRequires = [ cl-lib company nixos-options ]; meta = { @@ -5316,20 +6895,27 @@ license = lib.licenses.free; }; }) {}; - company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-php = callPackage ({ ac-php-core + , cl-lib ? null + , company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-php"; - version = "2.0.4"; + ename = "company-php"; + version = "2.0.5"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "326721527b2f88df7227cdc41708912b2f9c8494"; - sha256 = "1rrjzaa1qqzbnwp6ykk4qbdqlrwprdg2z4xqsb8098p052jjdpii"; + rev = "e452a20a9f94113260b9cba9af7fb44cc8c647ef"; + sha256 = "08gvn4gq2j349rz24ask6nzqnvw15p9c8r2lby4n6n0zc6iaxzm5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; sha256 = "1gnhklfkg17vxfx7fw65lr4nr07jx71y84mhs9zszwcr9p840hh5"; - name = "company-php"; + name = "recipe"; }; packageRequires = [ ac-php-core cl-lib company ]; meta = { @@ -5337,9 +6923,44 @@ license = lib.licenses.free; }; }) {}; - company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: - melpaBuild { + company-prescient = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , prescient }: + melpaBuild { + pname = "company-prescient"; + ename = "company-prescient"; + version = "2.0"; + src = fetchFromGitHub { + owner = "raxod502"; + repo = "prescient.el"; + rev = "515959a2523b43608c9d06dcf8adde8911ce42b9"; + sha256 = "1k8xk154sql3b2b7hpyxslcgl88aaxq5ak2sr760jsq2qk7878bw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b92c34e493bbefab1d7747b0855d1ab2f984cb7c/recipes/company-prescient"; + sha256 = "0cp918ihbjqxfgqnifknl5hphmvq5bl42dhp5ylvijsfa8kvbsb9"; + name = "recipe"; + }; + packageRequires = [ company emacs prescient ]; + meta = { + homepage = "https://melpa.org/#/company-prescient"; + license = lib.licenses.free; + }; + }) {}; + company-quickhelp = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pos-tip }: + melpaBuild { pname = "company-quickhelp"; + ename = "company-quickhelp"; version = "2.3.0"; src = fetchFromGitHub { owner = "expez"; @@ -5347,10 +6968,10 @@ rev = "b2953c725654650677e3d66eaeec666826d5f65f"; sha256 = "08ccsfvwdpzpj0gai3xrdb2bv1nl6myjkxsc5774pbvlq9nkfdvr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g"; - name = "company-quickhelp"; + name = "recipe"; }; packageRequires = [ company emacs pos-tip ]; meta = { @@ -5358,20 +6979,29 @@ license = lib.licenses.free; }; }) {}; - company-restclient = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, know-your-http-well, lib, melpaBuild, restclient }: - melpaBuild { + company-restclient = callPackage ({ cl-lib ? null + , company + , emacs + , fetchFromGitHub + , fetchurl + , know-your-http-well + , lib + , melpaBuild + , restclient }: + melpaBuild { pname = "company-restclient"; + ename = "company-restclient"; version = "0.1.0"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-restclient"; - rev = "98e4b2af0e84ba4192c16288123aed96541c6401"; - sha256 = "0i1fh5lvqwlgn3g3fzh0xacxyljx6gkryipn133vfkv4jbns51n4"; + rev = "c228f559cf845b4ac8e35728841e5352c1bec3b6"; + sha256 = "0dq7vsk2pp2q6g8wp2agwfn0jjjb80kyq004biyci0p96qxr4li4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient"; sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb"; - name = "company-restclient"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -5385,20 +7015,27 @@ license = lib.licenses.free; }; }) {}; - company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: - melpaBuild { + company-rtags = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , rtags }: + melpaBuild { pname = "company-rtags"; + ename = "company-rtags"; version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; - sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; + rev = "e4060b551575be378344c0cc1aedf11446b4f264"; + sha256 = "01xc5r2am0xck7q6jal3zyrqbzpx68fzqi9af7zb1klyw2s5v807"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f"; - name = "company-rtags"; + name = "recipe"; }; packageRequires = [ company emacs rtags ]; meta = { @@ -5406,9 +7043,17 @@ license = lib.licenses.free; }; }) {}; - company-shell = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-shell = callPackage ({ cl-lib ? null + , company + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-shell"; + ename = "company-shell"; version = "1.2.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; @@ -5416,10 +7061,10 @@ rev = "acdbf8cba6ad9831d81a77bab7bbfd50f19edd86"; sha256 = "1dk927da7g4a39sva9bda978bx6hpiz5kf341fj8sb7xhryvh5r2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell"; sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz"; - name = "company-shell"; + name = "recipe"; }; packageRequires = [ cl-lib company dash emacs ]; meta = { @@ -5427,9 +7072,18 @@ license = lib.licenses.free; }; }) {}; - company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: - melpaBuild { + company-sourcekit = callPackage ({ company + , dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sourcekit }: + melpaBuild { pname = "company-sourcekit"; + ename = "company-sourcekit"; version = "0.2.0"; src = fetchFromGitHub { owner = "nathankot"; @@ -5437,10 +7091,10 @@ rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit"; sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs"; - name = "company-sourcekit"; + name = "recipe"; }; packageRequires = [ company dash dash-functional emacs sourcekit ]; meta = { @@ -5448,9 +7102,15 @@ license = lib.licenses.free; }; }) {}; - company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + company-statistics = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "company-statistics"; + ename = "company-statistics"; version = "0.2.2"; src = fetchFromGitHub { owner = "company-mode"; @@ -5458,10 +7118,10 @@ rev = "906d8137224c1a5bd1dc913940e0d32ffecf5523"; sha256 = "0c98kfg7gimjx9cf8dmbk9mdsrybhphshrdl8dhif3zqvn6gxyd7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics"; sha256 = "1fl4ldj17m3xhi6xbw3bp9c2jir34xv3jh9daiw8g912fv2l5dcj"; - name = "company-statistics"; + name = "recipe"; }; packageRequires = [ company emacs ]; meta = { @@ -5469,9 +7129,19 @@ license = lib.licenses.free; }; }) {}; - company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }: - melpaBuild { + company-tern = callPackage ({ cl-lib ? null + , company + , dash + , dash-functional + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , tern }: + melpaBuild { pname = "company-tern"; + ename = "company-tern"; version = "0.3.0"; src = fetchFromGitHub { owner = "proofit404"; @@ -5479,10 +7149,10 @@ rev = "b20b3e490bf277c8480712210e3c92ea489859ef"; sha256 = "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern"; sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh"; - name = "company-tern"; + name = "recipe"; }; packageRequires = [ cl-lib company dash dash-functional s tern ]; meta = { @@ -5490,20 +7160,27 @@ license = lib.licenses.free; }; }) {}; - company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }: - melpaBuild { + company-terraform = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , terraform-mode }: + melpaBuild { pname = "company-terraform"; - version = "1.1"; + ename = "company-terraform"; + version = "1.2"; src = fetchFromGitHub { owner = "rafalcieslak"; repo = "emacs-company-terraform"; - rev = "b08ced5bac44c0253e3725a7f7a6246bdf1cf2b6"; - sha256 = "10922ykv6ii28rnhg4vri2g1fs5897xjxw6a5pk1rw2mld5kx57r"; + rev = "45a2bd090af79c119f92414c4dee8939b38903d1"; + sha256 = "0gcg20f4nld54y48mssd3sfc7fxq07iff9gsi5av4b86kyzjfr6x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform"; sha256 = "198ppqn6f7y9bg582z5s4cl9gg1q9ibsr7mmn68b50zvma7ankzh"; - name = "company-terraform"; + name = "recipe"; }; packageRequires = [ company emacs terraform-mode ]; meta = { @@ -5511,20 +7188,28 @@ license = lib.licenses.free; }; }) {}; - company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: - melpaBuild { + company-web = callPackage ({ cl-lib ? null + , company + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-completion-data }: + melpaBuild { pname = "company-web"; - version = "2.0"; + ename = "company-web"; + version = "2.1"; src = fetchFromGitHub { owner = "osv"; repo = "company-web"; - rev = "935c65de0411ebbcb4f2223f31e756e093eaae07"; - sha256 = "0kw0fc1lg7qd23fx26y9m543sql32n1dlvr4rg7bmq6im7dwz4hy"; + rev = "f0cc9187c9c34f72ad71f5649a69c74f996bae9a"; + sha256 = "1xcwwcy2866vzaqgn7hrl7j8k48mk74i4shm40v7ybacws47s9nr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web"; sha256 = "1q2am684l4d038a3ymyy6gg2ds9lq5mcfc4in8dmvap5grdhia4b"; - name = "company-web"; + name = "recipe"; }; packageRequires = [ cl-lib company dash web-completion-data ]; meta = { @@ -5532,9 +7217,20 @@ license = lib.licenses.free; }; }) {}; - company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: - melpaBuild { + company-ycmd = callPackage ({ company + , dash + , deferred + , f + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , s + , ycmd }: + melpaBuild { pname = "company-ycmd"; + ename = "company-ycmd"; version = "1.2"; src = fetchFromGitHub { owner = "abingham"; @@ -5542,10 +7238,10 @@ rev = "d042a673b4d717c3ca9d641f120bfe16c994c740"; sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; sha256 = "1dycbp2q8grvv94mwp9n8s7xpz2zjs05l3lf471j3nlbk6xfsn5d"; - name = "company-ycmd"; + name = "recipe"; }; packageRequires = [ company dash deferred f let-alist s ycmd ]; meta = { @@ -5553,20 +7249,25 @@ license = lib.licenses.free; }; }) {}; - composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + composable = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "composable"; + ename = "composable"; version = "0.0.1"; src = fetchFromGitHub { owner = "paldepind"; repo = "composable.el"; - rev = "4739b6a730498e7526d06222810c3ccf3723d509"; - sha256 = "1mii790r6gaz0nidlaib50wj4vryfvw7ls6b4mg1nw5km7hplpgq"; + rev = "a3c582994582603ef037db4464f8ea49d759a42e"; + sha256 = "0qlrvr5z9gi6yr9angp5ijmjzqqhwbxlpz9265113x9cy9kjdkpl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable"; sha256 = "1fs4pczjn9sv12sladf6zbkz0cmzxr0jaqkiwryydal1l5nqqxcy"; - name = "composable"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -5574,9 +7275,18 @@ license = lib.licenses.free; }; }) {}; - composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }: - melpaBuild { + composer = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , s + , seq }: + melpaBuild { pname = "composer"; + ename = "composer"; version = "0.0.8"; src = fetchFromGitHub { owner = "emacs-php"; @@ -5584,10 +7294,10 @@ rev = "2d16d3bb65c53e9e26f4b7b22ad38590a4a48ee1"; sha256 = "1zxqqd12p1db75icbwbdj51fvp8zzhivi8ssnxda1r5y5crbiqdv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer"; sha256 = "01w9cywhfngkrl9az8kfpzm12nc0zwmax01pyxlbi2l2icmvp5s1"; - name = "composer"; + name = "recipe"; }; packageRequires = [ emacs f request s seq ]; meta = { @@ -5595,20 +7305,26 @@ license = lib.licenses.free; }; }) {}; - concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + concurrent = callPackage ({ deferred + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "concurrent"; + ename = "concurrent"; version = "0.5.1"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c"; - sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h"; + rev = "9668749635472a63e7a9282e2124325405199b79"; + sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf"; - name = "concurrent"; + name = "recipe"; }; packageRequires = [ deferred emacs ]; meta = { @@ -5616,9 +7332,18 @@ license = lib.licenses.free; }; }) {}; - conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: - melpaBuild { + conda = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pythonic + , s }: + melpaBuild { pname = "conda"; + ename = "conda"; version = "0.0.9"; src = fetchFromGitHub { owner = "necaris"; @@ -5626,10 +7351,10 @@ rev = "64b804c33f2667e8232689770a9f2e332c2dd0ab"; sha256 = "1w1p1m2d0mwi3frkah5cnphyqsix7fp1li8glhlwf923cg48cxfq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; sha256 = "1hi292h6ccl7vkvyxcwwcdxw8q2brv3hy0mnlikzj2qy5pbnfg4y"; - name = "conda"; + name = "recipe"; }; packageRequires = [ dash emacs f pythonic s ]; meta = { @@ -5637,9 +7362,13 @@ license = lib.licenses.free; }; }) {}; - conkeror-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + conkeror-minor-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "conkeror-minor-mode"; + ename = "conkeror-minor-mode"; version = "1.6.2"; src = fetchFromGitHub { owner = "Malabarba"; @@ -5647,10 +7376,10 @@ rev = "476e81c27b056e21c192391fe674a2bf875466b0"; sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/conkeror-minor-mode"; sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933"; - name = "conkeror-minor-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5658,9 +7387,16 @@ license = lib.licenses.free; }; }) {}; - conllu-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsec }: - melpaBuild { + conllu-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parsec }: + melpaBuild { pname = "conllu-mode"; + ename = "conllu-mode"; version = "0.1.0"; src = fetchFromGitHub { owner = "odanoburu"; @@ -5668,10 +7404,10 @@ rev = "993fd6bc2b5c7b70815a3ecede1642f607513615"; sha256 = "0x6ga4h084qcf9h6nak7c66qq1slq907n64sqx41gnd3zbscmwxa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode"; sha256 = "1wffvvs8d0xcnz6mcm9rbr8imyj4npyc148yh0gzfzlgjm0fiz1v"; - name = "conllu-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs parsec ]; meta = { @@ -5679,20 +7415,24 @@ license = lib.licenses.free; }; }) {}; - connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + connection = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "connection"; + ename = "connection"; version = "1.10"; src = fetchFromGitHub { owner = "myrkr"; repo = "dictionary-el"; - rev = "9ef1672ecd367827381bbbc9af93685980083c5c"; - sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s"; + rev = "a5ef20b2c32457880827ceda58f927ad9a26d2b7"; + sha256 = "0ahn0v6qdfwvv9n0m6jcgrzmyarbsbvpgq8g4qy2g37ak4j60hp7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/connection"; sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q"; - name = "connection"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5700,9 +7440,16 @@ license = lib.licenses.free; }; }) {}; - contextual = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + contextual = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "contextual"; + ename = "contextual"; version = "1.0.1"; src = fetchFromGitHub { owner = "lshift-de"; @@ -5710,10 +7457,10 @@ rev = "8134a2d8034c624f4fdbbb0b3893de12f4257909"; sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44e5b799e411b8e2d89c8e9aeb4720126ac908b7/recipes/contextual"; sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx"; - name = "contextual"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -5721,9 +7468,13 @@ license = lib.licenses.free; }; }) {}; - contextual-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + contextual-menubar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "contextual-menubar"; + ename = "contextual-menubar"; version = "1.0.0"; src = fetchFromGitHub { owner = "aaronjensen"; @@ -5731,10 +7482,10 @@ rev = "cc2e7c952b59401188b81d84be81dead9d0da3db"; sha256 = "01mk5xzsg52vfqjri1my193y6jczg2dp3pa2d0v0vw11m1k433h3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cba21d98f3abbf1f45d1fdd9164d4660b7d3e368/recipes/contextual-menubar"; sha256 = "0r9bsnvf45h7gsdfhsz7h02nskjvflfa2yjarjv9fcl7aipz8rr6"; - name = "contextual-menubar"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5742,9 +7493,14 @@ license = lib.licenses.free; }; }) {}; - copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + copy-as-format = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "copy-as-format"; + ename = "copy-as-format"; version = "0.0.7"; src = fetchFromGitHub { owner = "sshaw"; @@ -5752,10 +7508,10 @@ rev = "971957166fe64d914ec4be209b4f80efeeabbb19"; sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; sha256 = "1yij5mqm0dg6326yms0a2w8gs42kdxq0ih8dhkpdar54r0bk3m8k"; - name = "copy-as-format"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -5763,20 +7519,28 @@ license = lib.licenses.free; }; }) {}; - copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + copy-file-on-save = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "copy-file-on-save"; - version = "0.0.3"; + ename = "copy-file-on-save"; + version = "0.0.5"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-auto-deployment"; - rev = "aaa847b43af225ccb282aab2d9cddafe500d9f62"; - sha256 = "0n2z91g7p9i724xqx2qq4s5xnxnf4vjccnvy1i706cddpjn02d6f"; + rev = "5af6d5fcc35ddf9050eada96fd5f334bf0661b62"; + sha256 = "1q9liby1dmwwmg2jz13gx2ld47bpcqb9c7vx4qgky75wb5c2q1xz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; sha256 = "1mcwgkhd241aijnmzrrqqn9f7hiq5k1w4fj83v50aixrcs049gc3"; - name = "copy-file-on-save"; + name = "recipe"; }; packageRequires = [ cl-lib emacs f s ]; meta = { @@ -5784,20 +7548,26 @@ license = lib.licenses.free; }; }) {}; - copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + copyit = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "copyit"; + ename = "copyit"; version = "0.0.2"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emacs-copyit"; - rev = "c973d3650208a033aaf845989d023f9c6e572ddd"; - sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w"; + rev = "be8dca96ef434d6658e4707b042c094e909d5141"; + sha256 = "1058qvgl6fkz5srizny0hfbjgqfsb5l9id7zrs5fb5qkilk9s01v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit"; sha256 = "1m28irqixzl44c683dxvc5x6l3qcqlpy6jzk6629paqkdi5mx1c0"; - name = "copyit"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -5805,9 +7575,16 @@ license = lib.licenses.free; }; }) {}; - copyit-pandoc = callPackage ({ copyit, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pandoc }: - melpaBuild { + copyit-pandoc = callPackage ({ copyit + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pandoc }: + melpaBuild { pname = "copyit-pandoc"; + ename = "copyit-pandoc"; version = "0.0.2"; src = fetchFromGitHub { owner = "zonuexe"; @@ -5815,10 +7592,10 @@ rev = "c973d3650208a033aaf845989d023f9c6e572ddd"; sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit-pandoc"; sha256 = "03v448gh6glq126r95w4y6s2p08jgjhkc6zgsplx0v9d5f2mwaqk"; - name = "copyit-pandoc"; + name = "recipe"; }; packageRequires = [ copyit emacs pandoc ]; meta = { @@ -5826,20 +7603,24 @@ license = lib.licenses.free; }; }) {}; - corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + corral = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "corral"; + ename = "corral"; version = "0.3.20"; src = fetchFromGitHub { owner = "nivekuil"; repo = "corral"; - rev = "e7ab6aa118e46b93d4933d1364bc273f57cd6911"; - sha256 = "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7"; + rev = "8813288de240956641b37deafaaa4811548246df"; + sha256 = "06l2imhxm6dijkqlhk9s0vsa5a0ghybpy7qk7wpkgv0dlm3k3w7n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b0d7e326f0401de0488b77d39af7bd7b8e8fdd4/recipes/corral"; sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da"; - name = "corral"; + name = "recipe"; }; packageRequires = []; meta = { @@ -5847,9 +7628,15 @@ license = lib.licenses.free; }; }) {}; - counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: - melpaBuild { + counsel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , swiper }: + melpaBuild { pname = "counsel"; + ename = "counsel"; version = "0.10.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -5857,10 +7644,10 @@ rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6"; - name = "counsel"; + name = "recipe"; }; packageRequires = [ emacs swiper ]; meta = { @@ -5868,9 +7655,15 @@ license = lib.licenses.free; }; }) {}; - counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + counsel-bbdb = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-bbdb"; + ename = "counsel-bbdb"; version = "0.0.3"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -5878,10 +7671,10 @@ rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1"; sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp"; - name = "counsel-bbdb"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -5889,9 +7682,18 @@ license = lib.licenses.free; }; }) {}; - counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }: - melpaBuild { + counsel-dash = callPackage ({ counsel + , dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , helm-dash + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-dash"; + ename = "counsel-dash"; version = "0.1.3"; src = fetchFromGitHub { owner = "nathankot"; @@ -5899,10 +7701,10 @@ rev = "a342340bbd8e50e4d1015e0b91d8ecd8f6cdf9f2"; sha256 = "1ma67lc4y9y3byrz8v6635w8q2scp6f2cqagq09k723k5nnwisfj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8af4d854f972bfed3d2122b4c089f72d8b5f2a/recipes/counsel-dash"; sha256 = "0pzh8ww1p2jb859gdjr5ypya3rwhiyg3c79xhx8filxrqxgjv5fk"; - name = "counsel-dash"; + name = "recipe"; }; packageRequires = [ counsel dash dash-functional emacs helm-dash ]; meta = { @@ -5910,20 +7712,26 @@ license = lib.licenses.free; }; }) {}; - counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + counsel-etags = callPackage ({ counsel + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-etags"; - version = "1.5.1"; + ename = "counsel-etags"; + version = "1.6.2"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "307638efaa172539e77fe425626eac99f7abf654"; - sha256 = "0c0fqn9hin9738bcxib354al6pd64arj2pccacjiyg1sa5h3mwj3"; + rev = "9437ce4e4adb7140df6af0a4528069b9e54de44b"; + sha256 = "14q7w6pz3pslwr4s1f2b8wiq6k1jvp09mwml9x2j5ljw7j3145pi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; sha256 = "1h3dlczm1m21d4h41vz9ngg5fi02g6f95qalfxdnsvz0d4w4yxk0"; - name = "counsel-etags"; + name = "recipe"; }; packageRequires = [ counsel emacs ]; meta = { @@ -5931,20 +7739,26 @@ license = lib.licenses.free; }; }) {}; - counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + counsel-gtags = callPackage ({ counsel + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-gtags"; + ename = "counsel-gtags"; version = "0.1"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-counsel-gtags"; - rev = "8066dd4cd6eb157345fb43788bacf2c5d746b497"; - sha256 = "07kxv56p340a913673h30q65814ji7lwc6gsn9vcr18rsdaj7qwi"; + rev = "88c47af65fafaabd908e80dec4cf2aae921581c0"; + sha256 = "0qgvic4vdmgr46c0jya80v1ky2v9viqvqgkxzmq4i81zl6f7ad4d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags"; sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax"; - name = "counsel-gtags"; + name = "recipe"; }; packageRequires = [ counsel emacs ]; meta = { @@ -5952,9 +7766,15 @@ license = lib.licenses.free; }; }) {}; - counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + counsel-projectile = callPackage ({ counsel + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "counsel-projectile"; + ename = "counsel-projectile"; version = "0.2.0"; src = fetchFromGitHub { owner = "ericdanan"; @@ -5962,10 +7782,10 @@ rev = "536872f022f449548bdb97faa1776d1d44499d73"; sha256 = "0pm5sqhr24n2ffycazxgl3d3dl7gai8svwz01vc0pgx9c0x75kl8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; sha256 = "1gshphxaa902kq878rnizn3k1zycakwqkciz92z3xxb3bdyy0hnl"; - name = "counsel-projectile"; + name = "recipe"; }; packageRequires = [ counsel projectile ]; meta = { @@ -5973,9 +7793,15 @@ license = lib.licenses.free; }; }) {}; - counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + counsel-tramp = callPackage ({ counsel + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "counsel-tramp"; + ename = "counsel-tramp"; version = "0.4.1"; src = fetchFromGitHub { owner = "masasam"; @@ -5983,10 +7809,10 @@ rev = "3f5ae75a6bde00bffeb2877b4ed4bd45610c0dfa"; sha256 = "06dhhjrgpikzpdl1hck0ckjbx8yzx8jbymb3ajfxglgvrvid4l1k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp"; sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5"; - name = "counsel-tramp"; + name = "recipe"; }; packageRequires = [ counsel emacs ]; meta = { @@ -5994,9 +7820,15 @@ license = lib.licenses.free; }; }) {}; - coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }: - melpaBuild { + coverage = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , ov }: + melpaBuild { pname = "coverage"; + ename = "coverage"; version = "0.3"; src = fetchFromGitHub { owner = "trezona-lecomte"; @@ -6004,10 +7836,10 @@ rev = "c73d984168955ca0f47f44b0464aa45282df42b6"; sha256 = "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd70e138534551dd12ba4d165ba56fbd1e033241/recipes/coverage"; sha256 = "0ja7wsx2sj0h01sk1l3c0aidbs1ld4gj3kiwq6brs7r018sz45pm"; - name = "coverage"; + name = "recipe"; }; packageRequires = [ cl-lib ov ]; meta = { @@ -6015,30 +7847,40 @@ license = lib.licenses.free; }; }) {}; - coverlay = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + coverlay = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "coverlay"; - version = "0.4.0"; + ename = "coverlay"; + version = "3.0.1"; src = fetchFromGitHub { owner = "twada"; repo = "coverlay.el"; - rev = "b4d5d4dd702152bc7e7ca788d22e4feb74dc32fe"; - sha256 = "0ji8n4sv0zqmfn4g7ay927d8ya6wrvqdzvd5sc6vicma9gn27lvj"; + rev = "8205a845d58755dd7640b2e2b5991bf842998935"; + sha256 = "1mppan4ml4dblwxdgr8pli7nj864frc7n7c6h47q4vfb4flg29n0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coverlay"; sha256 = "1n0fblacwps94mhbdwpi22frhqp3pxg4323ghb79rvszb7in9i8j"; - name = "coverlay"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/coverlay"; license = lib.licenses.free; }; }) {}; - cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cpputils-cmake = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cpputils-cmake"; + ename = "cpputils-cmake"; version = "5.5"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -6046,10 +7888,10 @@ rev = "55e5c69554379632692a0fa20bfadeef9194fbdd"; sha256 = "1rk0bwdvfrp24z69flh7jg3c8vgvwk6vciixmmmldnrlwhpnbh6i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake"; sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60"; - name = "cpputils-cmake"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6057,9 +7899,14 @@ license = lib.licenses.free; }; }) {}; - creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + creamsody-theme = callPackage ({ autothemer + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "creamsody-theme"; + ename = "creamsody-theme"; version = "0.3.7"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -6067,10 +7914,10 @@ rev = "32fa3f4e461da92700523b1b20e7b28974c19a26"; sha256 = "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7"; - name = "creamsody-theme"; + name = "recipe"; }; packageRequires = [ autothemer ]; meta = { @@ -6078,9 +7925,15 @@ license = lib.licenses.free; }; }) {}; - creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + creds = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "creds"; + ename = "creds"; version = "0.0.6.1"; src = fetchFromGitHub { owner = "ardumont"; @@ -6088,10 +7941,10 @@ rev = "00ebefd10005c170b790a01380cb6a98f798ce5c"; sha256 = "169ai0xkh3988racnhaapxw0v1pbxvcaq470x1qacdzdpka4a7bs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81b032049ccc3837e8693f010b39716912f76bba/recipes/creds"; sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk"; - name = "creds"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -6099,9 +7952,17 @@ license = lib.licenses.free; }; }) {}; - cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + cricbuzz = callPackage ({ dash + , enlive + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "cricbuzz"; + ename = "cricbuzz"; version = "0.3.5"; src = fetchFromGitHub { owner = "lepisma"; @@ -6109,10 +7970,10 @@ rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889"; sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip"; - name = "cricbuzz"; + name = "recipe"; }; packageRequires = [ dash enlive f s ]; meta = { @@ -6120,9 +7981,14 @@ license = lib.licenses.free; }; }) {}; - crm-custom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + crm-custom = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "crm-custom"; + ename = "crm-custom"; version = "0.5"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; @@ -6130,10 +7996,10 @@ rev = "f1aaccf64306a5f99d9bf7ba815d7ea41c15518d"; sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e0752ba601a8d518d3c7fb54fd008602e7dc19f/recipes/crm-custom"; sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c"; - name = "crm-custom"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -6141,9 +8007,14 @@ license = lib.licenses.free; }; }) {}; - crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + crux = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "crux"; + ename = "crux"; version = "0.3.0"; src = fetchFromGitHub { owner = "bbatsov"; @@ -6151,10 +8022,10 @@ rev = "5b3c8155a9e9fe6f189645d175976026a2dc7b8d"; sha256 = "0809pb8626i6z1dics3i1cs30p4qd8bzqcgr20lx9k3yq2abq2k7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c"; - name = "crux"; + name = "recipe"; }; packageRequires = [ seq ]; meta = { @@ -6162,20 +8033,24 @@ license = lib.licenses.free; }; }) {}; - cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cryptol-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cryptol-mode"; + ename = "cryptol-mode"; version = "0.1.0"; src = fetchFromGitHub { owner = "thoughtpolice"; repo = "cryptol-mode"; - rev = "a54d000d24757fad2a91ae2853b16a97ebe52771"; - sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w"; + rev = "b893e81452b631b464e5a98d17abd3d6627cc629"; + sha256 = "0s62xpwx1m875cqcpd1c5yxgjglwvpa1pz3f7fkl485q5ip4zydl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode"; sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2"; - name = "cryptol-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6183,9 +8058,14 @@ license = lib.licenses.free; }; }) {}; - crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + crystal-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "crystal-mode"; + ename = "crystal-mode"; version = "0.1.0"; src = fetchFromGitHub { owner = "crystal-lang-tools"; @@ -6193,10 +8073,10 @@ rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10"; sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode"; sha256 = "1fgpz7zab6nc6kvjzjsbvrbg8shf4by0f20cvjvyky8kym72q0hk"; - name = "crystal-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -6204,20 +8084,24 @@ license = lib.licenses.free; }; }) {}; - csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + csharp-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "csharp-mode"; - version = "0.9.0"; + ename = "csharp-mode"; + version = "0.9.2"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "6c0a0d6cf602666d63a06c3652ce522b3a5a7661"; - sha256 = "1pw96s0675rf35hwaxdzids9s8ynkb0g66yximiiz6ryh4ama0wn"; + rev = "5e47b7764b3f4c97c260a902e8072d444dbd0f1b"; + sha256 = "1dnhpxcinrwc7dmwgzbg4lnly05h38f00zrfsjincvii6d8rjiw0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0"; - name = "csharp-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6225,9 +8109,16 @@ license = lib.licenses.free; }; }) {}; - csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: - melpaBuild { + csound-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multi + , shut-up }: + melpaBuild { pname = "csound-mode"; + ename = "csound-mode"; version = "0.2.0"; src = fetchFromGitHub { owner = "hlolli"; @@ -6235,10 +8126,10 @@ rev = "5a892e6ad72e7844e8e14c0da04fcb6bc125fe5e"; sha256 = "1gzg2r7agllz2asp7dbxykydpnw3861whs2pfhr3fwwb39xf1pva"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; sha256 = "047a78nhkn6qycsz8w9a0r1xyz5wyf4rds3z5yx9sn5wkv54w95d"; - name = "csound-mode"; + name = "recipe"; }; packageRequires = [ emacs multi shut-up ]; meta = { @@ -6246,9 +8137,13 @@ license = lib.licenses.free; }; }) {}; - csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + csv = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "csv"; + ename = "csv"; version = "2.1"; src = fetchFromGitLab { owner = "u11"; @@ -6256,10 +8151,10 @@ rev = "aa1dfa1263565d5fac3879c21d8ddf5f8915e411"; sha256 = "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/233f9de5f65fd8374f2c1912503c30905aa6691d/recipes/csv"; sha256 = "1rvi5p27lsb284zqgv4cdqkbqc9r92axmvg7sv52rm7qcj8njwqd"; - name = "csv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6267,9 +8162,13 @@ license = lib.licenses.free; }; }) {}; - ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ctable = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ctable"; + ename = "ctable"; version = "0.1.2"; src = fetchFromGitHub { owner = "kiwanami"; @@ -6277,10 +8176,10 @@ rev = "08a017bde6d24ea585e39ce2637bebe28774d316"; sha256 = "13zq8kym1y6bzrpxbcdz32323a6azy5px4ridff6xh8bfprwlay3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/ctable"; sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1"; - name = "ctable"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6288,9 +8187,13 @@ license = lib.licenses.free; }; }) {}; - ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ctags-update = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ctags-update"; + ename = "ctags-update"; version = "1.0"; src = fetchFromGitHub { owner = "jixiuf"; @@ -6298,10 +8201,10 @@ rev = "ff4f211e42df94fdeba376e62b65dc67f0388589"; sha256 = "09vdfmm846zhn5nxnndi7qg7rdsf5xd4zhynbx0mnm00cfw1vf0y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update"; sha256 = "07548jjpx4var2817y47i6br8iicjlj66n1b33h0av6r1h514nci"; - name = "ctags-update"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6309,9 +8212,16 @@ license = lib.licenses.free; }; }) {}; - ctxmenu = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }: - melpaBuild { + ctxmenu = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , popup + , yaxception }: + melpaBuild { pname = "ctxmenu"; + ename = "ctxmenu"; version = "0.3.0"; src = fetchFromGitHub { owner = "aki2o"; @@ -6319,10 +8229,10 @@ rev = "5c2376859562b98c07c985d2b483658e4c0e888e"; sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc4f51bb6ce8fa9e37c0aeb51696b1980aece0c/recipes/ctxmenu"; sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp"; - name = "ctxmenu"; + name = "recipe"; }; packageRequires = [ log4e popup yaxception ]; meta = { @@ -6330,20 +8240,26 @@ license = lib.licenses.free; }; }) {}; - cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cubicaltt = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cubicaltt"; + ename = "cubicaltt"; version = "1.0"; src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "3257eadf70826fb3ef060c46f85b7a4d60464b1d"; - sha256 = "1c5nfzsj4bi2rk3d3r2iw03kkpc5dg9p3q3xzj7cxfg2wmg1xaxk"; + rev = "260b34e710cf18883f61f30bfcaf4e3823bebc0c"; + sha256 = "0wdc26niyx2h49hfqshwqbvg0sbsg5dlfmwnl5y9jwf12170a9q3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; sha256 = "1wgy6965cnw201wx4a2pn71sa40mh2712y0d0470klr156krj0n9"; - name = "cubicaltt"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -6351,20 +8267,24 @@ license = lib.licenses.free; }; }) {}; - cubicle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cubicle-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cubicle-mode"; + ename = "cubicle-mode"; version = "1.1.2"; src = fetchFromGitHub { owner = "cubicle-model-checker"; repo = "cubicle"; - rev = "b043b0247bf9b144a5c3360e5096a4b141dd1fb6"; - sha256 = "0zsfz1h68xpbgdb1ln8l081vwrgd7i01ap4rjlyrsk8j3q3ry5wz"; + rev = "9d108b900e0123236b4991c2d06b5061f34feee8"; + sha256 = "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode"; sha256 = "0xcmd0s6dfryl1ihfaqq0pfqc906yzzwk3d3nv8g6b6w78pv1lzv"; - name = "cubicle-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6372,9 +8292,13 @@ license = lib.licenses.free; }; }) {}; - cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cuda-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cuda-mode"; + ename = "cuda-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "chachi"; @@ -6382,10 +8306,10 @@ rev = "c8cf7d92b8039cdd0bd525c258ab42f49a0f91cf"; sha256 = "1y685qfdkjyl7dwyvivlgc2lwp102vy6hvcb9zynw84c49f726sn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d21cf17a4a9ae391e2e9cf9be3399095fa23ef55/recipes/cuda-mode"; sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300"; - name = "cuda-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6393,20 +8317,26 @@ license = lib.licenses.free; }; }) {}; - cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: - melpaBuild { + cwl-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yaml-mode }: + melpaBuild { pname = "cwl-mode"; + ename = "cwl-mode"; version = "0.2.5"; src = fetchFromGitHub { owner = "tom-tan"; repo = "cwl-mode"; - rev = "bdeb9c0734126f940db80bfb8b1dc735dab671c7"; - sha256 = "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3"; + rev = "2fa8c8db68a8665ed555126975edd8749bcfc009"; + sha256 = "0zgnnvf8k5zcigykcf6slgcjmwb1l0jdfaqm19r34wp3md8wf0v1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode"; sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j"; - name = "cwl-mode"; + name = "recipe"; }; packageRequires = [ emacs yaml-mode ]; meta = { @@ -6414,20 +8344,24 @@ license = lib.licenses.free; }; }) {}; - cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cyberpunk-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cyberpunk-theme"; - version = "1.19"; + ename = "cyberpunk-theme"; + version = "1.21"; src = fetchFromGitHub { owner = "n3mo"; repo = "cyberpunk-theme.el"; - rev = "8c3cc39bcff5def0d476c080b5248436da7f990f"; - sha256 = "1npwrw3pgdmvqhihcqcfi2yrs178iiip5fcj8zhpp6cr9yqsvvgi"; + rev = "17f68f8ac70b712d2870ecb6adb3841b992074fa"; + sha256 = "05mfgr9aj7knn7niadv9p6z3qrfpq2lbbi2wxxx62xywim9maw2y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme"; sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9"; - name = "cyberpunk-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6435,9 +8369,14 @@ license = lib.licenses.free; }; }) {}; - cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cyphejor = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cyphejor"; + ename = "cyphejor"; version = "0.1.2"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -6445,10 +8384,10 @@ rev = "d7842388a1872b165489624a1a68f536de97e28d"; sha256 = "1gi7rp0vf3iahljzjhs3rj9c0rvfcfs93hr8a3hl0ch3h9qq8ng2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g"; - name = "cyphejor"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -6456,20 +8395,24 @@ license = lib.licenses.free; }; }) {}; - cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + cython-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "cython-mode"; - version = "0.28.1"; + ename = "cython-mode"; + version = "0.28.4"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "89cfbb4a3a0540abeec1703fd3ee31eba9293936"; - sha256 = "1ndabmdzqfhkg3z9zaavp5bz8l86n4g9lwi0ji0vs7q7rpsykqdw"; + rev = "9f3f99fd6378ffb17976d74356fd3ba7e22f85b3"; + sha256 = "164ksml3i5gmcwripjsn5byfvnnjf86wrkkd9saw481ym6imii3c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i"; - name = "cython-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6477,20 +8420,24 @@ license = lib.licenses.free; }; }) {}; - d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + d-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "d-mode"; + ename = "d-mode"; version = "2.0.9"; src = fetchFromGitHub { owner = "Emacs-D-Mode-Maintainers"; repo = "Emacs-D-Mode"; - rev = "98af62e67026fee1dda9155e1a463917fc83802e"; - sha256 = "0fzplvi1sm8k2sabfdvrd7j2xypwqh0g9v1mxa75dajdmcd85zpj"; + rev = "d7f46a28aca981e719d12460bf9b71e355d79565"; + sha256 = "0kg91rdlvq2ypc6cww9gakbyd631lakcmqmbs7v0agc7vmba61xz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode"; sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2"; - name = "d-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6498,9 +8445,14 @@ license = lib.licenses.free; }; }) {}; - dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dad-joke = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dad-joke"; + ename = "dad-joke"; version = "1.4"; src = fetchFromGitHub { owner = "davep"; @@ -6508,10 +8460,10 @@ rev = "bee47e7b746b403228fa7d7361cb095de19ac9ba"; sha256 = "14snnnjs28jg6k8x6g90m3dbcx10306ipcd256d3l6czk9p17vpd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke"; sha256 = "1cg8iaq79w5zx1s3dirdl7ymcp162mmsy5c4vly90v20yrijblad"; - name = "dad-joke"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -6519,20 +8471,25 @@ license = lib.licenses.free; }; }) {}; - daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + daemons = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "daemons"; - version = "1.1.0"; + ename = "daemons"; + version = "1.2.0"; src = fetchFromGitHub { owner = "cbowdon"; repo = "daemons.el"; - rev = "75b54be70a909282b20c872b5f01d30e18e19f84"; - sha256 = "0jv1i66b035yvj2mj83ihylk6vv7skljnr6kxa15zzj4daw9462c"; + rev = "9e6868e2559ea7d70fbad8c419798124f406cc40"; + sha256 = "00ijgm22ck76gw0x79krl05yy0m8a502yfakazfy5xhpn1zi6ab7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons"; sha256 = "14givkrw9p0m261hawahzi0n8jarapb63kv1s62faq57mqnq23jr"; - name = "daemons"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -6540,20 +8497,30 @@ license = lib.licenses.free; }; }) {}; - dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: - melpaBuild { + dante = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , flycheck + , haskell-mode + , lib + , melpaBuild + , s }: + melpaBuild { pname = "dante"; + ename = "dante"; version = "1.4"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "1a25bf26ee8d9878ce858cfaff84b083339056d6"; - sha256 = "0kvsx9n8qm9s2w9bz167jzcb1b3d4fgc807w1miwil9dcyar6rkk"; + rev = "3500ade60c5c4e831b04c92c56dc888063335d3b"; + sha256 = "07nc1bgb67nlsf567cky6kvd3blm0w7nwpr92xga7jm6dqnqhlkg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; - name = "dante"; + name = "recipe"; }; packageRequires = [ dash emacs f flycheck haskell-mode s ]; meta = { @@ -6561,9 +8528,13 @@ license = lib.licenses.free; }; }) {}; - darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + darcula-theme = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "darcula-theme"; + ename = "darcula-theme"; version = "2.0"; src = fetchFromGitLab { owner = "fommil"; @@ -6571,10 +8542,10 @@ rev = "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976"; sha256 = "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; sha256 = "1n9mpkdyf5jpxc5azfs38ccp9p0b5ii87sz4c7z4khs94y0gxqh3"; - name = "darcula-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6582,9 +8553,14 @@ license = lib.licenses.free; }; }) {}; - darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + darktooth-theme = callPackage ({ autothemer + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "darktooth-theme"; + ename = "darktooth-theme"; version = "0.3.7"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -6592,10 +8568,10 @@ rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555"; sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs"; - name = "darktooth-theme"; + name = "recipe"; }; packageRequires = [ autothemer ]; meta = { @@ -6603,9 +8579,18 @@ license = lib.licenses.free; }; }) {}; - dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: - melpaBuild { + dart-mode = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , s }: + melpaBuild { pname = "dart-mode"; + ename = "dart-mode"; version = "1.0.3"; src = fetchFromGitHub { owner = "nex3"; @@ -6613,10 +8598,10 @@ rev = "f3a7c7b71fb12d02fa02700bc10426cb10010d01"; sha256 = "1g0c37qfqki7v1a5rxf6sy7k07i529rw3f1wmjl7g1zhd9bwsml2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla"; - name = "dart-mode"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs flycheck s ]; meta = { @@ -6624,20 +8609,24 @@ license = lib.licenses.free; }; }) {}; - dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dash = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dash"; - version = "2.13.0"; + ename = "dash"; + version = "2.14.1"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "4ae329aa2160411c8b47794de067fcf29bc38a22"; - sha256 = "12gvpn0a07kgbj2lrzw1vv4njp1w4gl38rl68yh0jp3rhvacbsg0"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz"; - name = "dash"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6645,20 +8634,26 @@ license = lib.licenses.free; }; }) {}; - dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dash-functional = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dash-functional"; - version = "2.13.0"; + ename = "dash-functional"; + version = "2.14.1"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "4ae329aa2160411c8b47794de067fcf29bc38a22"; - sha256 = "12gvpn0a07kgbj2lrzw1vv4njp1w4gl38rl68yh0jp3rhvacbsg0"; + rev = "528e5a51f1af668e3075f2beccd2b39785ccb2ba"; + sha256 = "0c65wkyzqsi0jignbhl0j9hh0711069x0l54sqbfb72viy0sppck"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p"; - name = "dash-functional"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -6666,9 +8661,15 @@ license = lib.licenses.free; }; }) {}; - dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: - melpaBuild { + dashboard = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , page-break-lines }: + melpaBuild { pname = "dashboard"; + ename = "dashboard"; version = "1.2.4"; src = fetchFromGitHub { owner = "rakanalh"; @@ -6676,10 +8677,10 @@ rev = "8594c4f55448148b720eda5b72d51667fb7a8a39"; sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; sha256 = "08pdpjfrg8v80gljy146cwpz624dshhbz8843zl1zszwp2p00kqy"; - name = "dashboard"; + name = "recipe"; }; packageRequires = [ emacs page-break-lines ]; meta = { @@ -6687,9 +8688,13 @@ license = lib.licenses.free; }; }) {}; - date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + date-at-point = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "date-at-point"; + ename = "date-at-point"; version = "0.1"; src = fetchFromGitHub { owner = "alezost"; @@ -6697,10 +8702,10 @@ rev = "662f8350a83311503dc0aae47a28752f9f1270c9"; sha256 = "06aprbhhxb6bbzmf0r5yq2ry6x7708vp4d94ja3ir6zcwc96wn0k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6dbeddd236f312fac1d5542dfd2edf81df8fad2/recipes/date-at-point"; sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0"; - name = "date-at-point"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6708,20 +8713,27 @@ license = lib.licenses.free; }; }) {}; - date-field = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + date-field = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "date-field"; + ename = "date-field"; version = "0.0.1"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-date-field"; - rev = "11c9170d1f7b343233f7716d4c0a62be024c1654"; - sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w"; + rev = "3b0af9c49293fc4346078ed2e13a6ebf41bbe54e"; + sha256 = "1skvkbbqvwbw58ahdbf2m1z7s0kfi5v7c0lavc9ifrs91pqpqx9z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe790729a67d2210cbccefce43805daa20db647d/recipes/date-field"; sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk"; - name = "date-field"; + name = "recipe"; }; packageRequires = [ dash log4e yaxception ]; meta = { @@ -6729,9 +8741,15 @@ license = lib.licenses.free; }; }) {}; - datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + datetime = callPackage ({ emacs + , extmap + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "datetime"; + ename = "datetime"; version = "0.4.1"; src = fetchFromGitHub { owner = "doublep"; @@ -6739,10 +8757,10 @@ rev = "d8674ac11f9ebb702e5bbac10a4a6e5542958ef5"; sha256 = "19d4wximzwdcs0i2r48k6m60wwxcx5f89jw75k4hr0wvx0352a82"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime"; sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj"; - name = "datetime"; + name = "recipe"; }; packageRequires = [ emacs extmap ]; meta = { @@ -6750,20 +8768,55 @@ license = lib.licenses.free; }; }) {}; - debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: - melpaBuild { + deadgrep = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , s + , spinner }: + melpaBuild { + pname = "deadgrep"; + ename = "deadgrep"; + version = "0.4"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "deadgrep"; + rev = "160fa79bc76fa79ab727e369c5053bd61ca62a49"; + sha256 = "0csval9g9w606dvj24rv2x5f6rbaj1lczavvcldq0wgj8fivkyh1"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/93389fae7233b83ea904e17bdaf83f8247cda3d8/recipes/deadgrep"; + sha256 = "01m5ds7lic9g11a5iwzw86k6xcv56wbbzjm1343ckbbi255h9i09"; + name = "recipe"; + }; + packageRequires = [ dash emacs projectile s spinner ]; + meta = { + homepage = "https://melpa.org/#/deadgrep"; + license = lib.licenses.free; + }; + }) {}; + debpaste = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xml-rpc }: + melpaBuild { pname = "debpaste"; + ename = "debpaste"; version = "0.1.5"; src = fetchFromGitHub { owner = "alezost"; repo = "debpaste.el"; - rev = "6f2a400665062468ebd03a2ce1de2a73d9084958"; - sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq"; + rev = "038f0ff7824f4e3dd455e2232eeca70fa8abcec5"; + sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/debpaste"; sha256 = "0h3hx3vgdhchmndabmzprddq3bxd80jnv4xvma9v6k1v07bl721v"; - name = "debpaste"; + name = "recipe"; }; packageRequires = [ xml-rpc ]; meta = { @@ -6771,9 +8824,13 @@ license = lib.licenses.free; }; }) {}; - decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + decide = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "decide"; + ename = "decide"; version = "0.7"; src = fetchFromGitHub { owner = "lifelike"; @@ -6781,10 +8838,10 @@ rev = "90133687118c236142b8110571c463304b3192f9"; sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide"; sha256 = "1gjkays48lhrifi9jwja5n2dpxjbl7f9rmka1nsqg9vf7s59vhhc"; - name = "decide"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6792,9 +8849,13 @@ license = lib.licenses.free; }; }) {}; - dedicated = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dedicated = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dedicated"; + ename = "dedicated"; version = "1.0.0"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -6802,10 +8863,10 @@ rev = "8275fb672f9cc4ba6682ebda0ef91db827e32992"; sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/dedicated"; sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9"; - name = "dedicated"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6813,9 +8874,13 @@ license = lib.licenses.free; }; }) {}; - default-text-scale = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + default-text-scale = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "default-text-scale"; + ename = "default-text-scale"; version = "0.1"; src = fetchFromGitHub { owner = "purcell"; @@ -6823,10 +8888,10 @@ rev = "c90c08b9fe5f25474067a00c4a4babdb413b25b1"; sha256 = "031f8ls1q80j717cg6b4pjd37wk7vrl5hcycsn8ca7yssmqa8q81"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db5e0b70e2d9c80aa41ae2c397f822789c2d3cc2/recipes/default-text-scale"; sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi"; - name = "default-text-scale"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6834,9 +8899,14 @@ license = lib.licenses.free; }; }) {}; - deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + deferred = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "deferred"; + ename = "deferred"; version = "0.5.1"; src = fetchFromGitHub { owner = "kiwanami"; @@ -6844,10 +8914,10 @@ rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c"; sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred"; sha256 = "1i8jfapzmw86iqwhnnlqmcj6zh4hyhizdcwjxcnxdj6kvxmwyysm"; - name = "deferred"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -6855,9 +8925,14 @@ license = lib.licenses.free; }; }) {}; - define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + define-word = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "define-word"; + ename = "define-word"; version = "0.1.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -6865,10 +8940,10 @@ rev = "38e2f94779652fc6280a51b68dc910431513a8e1"; sha256 = "1lyqd9cgj7cb2lasf6ycw5j8wnsx2nrfm8ra4sg3dgcspm01a89g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word"; sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a"; - name = "define-word"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -6876,9 +8951,13 @@ license = lib.licenses.free; }; }) {}; - deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + deft = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "deft"; + ename = "deft"; version = "0.8"; src = fetchFromGitHub { owner = "jrblevin"; @@ -6886,10 +8965,10 @@ rev = "c4b30d780bfa732ff52d85f0311e4a045f44a7b4"; sha256 = "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp"; - name = "deft"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6897,20 +8976,26 @@ license = lib.licenses.free; }; }) {}; - demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + demangle-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "demangle-mode"; - version = "1.2.1"; + ename = "demangle-mode"; + version = "1.2.2"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "0f9436f98225e0f5a5deecea4680c173e76f0322"; - sha256 = "0n10c45lvdfczhd2mpkciggv4d83mcnbpmjhxzvmnf7n5ar6aw6a"; + rev = "374c84a0b190f0f0ea76b956035003228077d1e0"; + sha256 = "02z2mjillglyv65ijdlc62hbjddp3xv185xg7s93xz7ymg04c394"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk"; - name = "demangle-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -6918,9 +9003,14 @@ license = lib.licenses.free; }; }) {}; - describe-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yabin }: - melpaBuild { + describe-number = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yabin }: + melpaBuild { pname = "describe-number"; + ename = "describe-number"; version = "0.3.1"; src = fetchFromGitHub { owner = "netromdk"; @@ -6928,10 +9018,10 @@ rev = "40618345a37831804b29589849a785ef5aa5ac24"; sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5ed9063f7e9f540bc90c1df4e3604d4af9bcfe5/recipes/describe-number"; sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji"; - name = "describe-number"; + name = "recipe"; }; packageRequires = [ yabin ]; meta = { @@ -6939,9 +9029,42 @@ license = lib.licenses.free; }; }) {}; - desktop-plus = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + desktop-environment = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "desktop-environment"; + ename = "desktop-environment"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "desktop-environment"; + rev = "10df99c6c6805a01acbbdfb7d02dc8cf2780d88d"; + sha256 = "1fal3yfmqg10cb53qsf5gsq2gvyz9w16wmlpnpjwjzwnjfn6l73r"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe988e0dd4a1272ecf7b2fe758ef0c81e2acad2/recipes/desktop-environment"; + sha256 = "0iai1awpkv4n8k263854mx95c8yh2vvif6z91mgn6hck8774v9zp"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/desktop-environment"; + license = lib.licenses.free; + }; + }) {}; + desktop-plus = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "desktop-plus"; + ename = "desktop+"; version = "0.2"; src = fetchFromGitHub { owner = "ffevotte"; @@ -6949,10 +9072,10 @@ rev = "a9cb8dd0af5071d9f148211b408c54306239381c"; sha256 = "10f5dkrwfd6a1ab98j2kywkh1h01pnanvj2i7fv9a9vxnmiywrcf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b009b42c73490d56d4613dcf5a57447fb4ccab4/recipes/desktop+"; sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8"; - name = "desktop-plus"; + name = "recipe"; }; packageRequires = [ dash emacs f ]; meta = { @@ -6960,9 +9083,13 @@ license = lib.licenses.free; }; }) {}; - desktop-registry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + desktop-registry = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "desktop-registry"; + ename = "desktop-registry"; version = "1.2.0"; src = fetchFromGitHub { owner = "ryuslash"; @@ -6970,10 +9097,10 @@ rev = "244c2e7f9f0a1050aa8a47ad0b38f4e4584682dd"; sha256 = "11qvhbz7149vqh61fgqqn4inw0ic6ib9lz2xgr9m54pdw9a901mp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/desktop-registry"; sha256 = "1sfj0w6hlrx37js63fn1v5xc9ngmahv07g42z68717md6w3c8g0v"; - name = "desktop-registry"; + name = "recipe"; }; packageRequires = []; meta = { @@ -6981,20 +9108,50 @@ license = lib.licenses.free; }; }) {}; - dictionary = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + diary-manager = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "diary-manager"; + ename = "diary-manager"; + version = "2.0.1"; + src = fetchFromGitHub { + owner = "raxod502"; + repo = "diary-manager"; + rev = "01851f42aee0526995ea88c3d42b7fe12e1cb7fd"; + sha256 = "1q1zrqawrr844lzjc5l480im6rjdyagir0dr805vgyv31fhp1vmw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a014f4d862a2480f7edb1266f79ce0801cca13c2/recipes/diary-manager"; + sha256 = "1sk0pvadx4jmv93dj796ysn3jh2wvywayd7dd20v22kdvnlii73d"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/diary-manager"; + license = lib.licenses.free; + }; + }) {}; + dictionary = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dictionary"; + ename = "dictionary"; version = "1.10"; src = fetchFromGitHub { owner = "myrkr"; repo = "dictionary-el"; - rev = "9ef1672ecd367827381bbbc9af93685980083c5c"; - sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s"; + rev = "3a461aec5aa5b78a1ad8919eab11abfb0d5d65b3"; + sha256 = "10hnxy2n1njskh3nrjagp2lphhliw66cp8pjyh4m2zbj60ciz0ci"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/dictionary"; sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w"; - name = "dictionary"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7002,9 +9159,14 @@ license = lib.licenses.free; }; }) {}; - diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + diff-hl = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "diff-hl"; + ename = "diff-hl"; version = "1.8.4"; src = fetchFromGitHub { owner = "dgutov"; @@ -7012,10 +9174,10 @@ rev = "e93367512080e540dc5dd126dfcb38b4a5e9415b"; sha256 = "03pvh213w0sgyvv0xrkj43bs53p2xfr7162yhzdh24qwa8dd23qv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; sha256 = "135jgjfaiq6kj72ji5k22v4pqc8gjjmcv80r5rkjbjigzlvcvvj2"; - name = "diff-hl"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -7023,9 +9185,17 @@ license = lib.licenses.free; }; }) {}; - difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: - melpaBuild { + difflib = callPackage ({ cl-generic + , emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , s }: + melpaBuild { pname = "difflib"; + ename = "difflib"; version = "0.3.8"; src = fetchFromGitHub { owner = "dieggsy"; @@ -7033,10 +9203,10 @@ rev = "b08850251812d71e62fd6956081299590acdf37b"; sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib"; sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6"; - name = "difflib"; + name = "recipe"; }; packageRequires = [ cl-generic emacs ht s ]; meta = { @@ -7044,9 +9214,13 @@ license = lib.licenses.free; }; }) {}; - diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + diffview = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "diffview"; + ename = "diffview"; version = "1.0"; src = fetchFromGitHub { owner = "mgalgs"; @@ -7054,10 +9228,10 @@ rev = "471dc36af93e68849bf2da0db991e186283b3546"; sha256 = "1ci2gmyl0i736b2sxh77fyg4hs2pkn6rn9z7v2hzv6xlgqd6j3z6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea5dd4c9c114618ac20f565c878f509ce8d9872/recipes/diffview"; sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k"; - name = "diffview"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7065,9 +9239,13 @@ license = lib.licenses.free; }; }) {}; - digistar-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + digistar-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "digistar-mode"; + ename = "digistar-mode"; version = "0.4"; src = fetchFromGitHub { owner = "retroj"; @@ -7075,10 +9253,10 @@ rev = "0dcde58ec6e473042e55d4f283b223554546de5b"; sha256 = "0jzwaivsqh66py9hd3dg1ys5rc3p6pn8ndpwpvgyivk4pg6zhhj6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/851fa17152b664df99b80a654e5c055bb5227181/recipes/digistar-mode"; sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s"; - name = "digistar-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7086,20 +9264,25 @@ license = lib.licenses.free; }; }) {}; - dim = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dim = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dim"; + ename = "dim"; version = "0.1"; src = fetchFromGitHub { owner = "alezost"; repo = "dim.el"; - rev = "0c19a510580ebdc77e6db536f0f8ed2840b9b33e"; - sha256 = "1vrd74vmm60gb69a4in412mjncnhkjbfpakpaa6w9rj7w4kyfiz1"; + rev = "aee695f4c227e11aa22376667712815aafbb3616"; + sha256 = "1nixb8xw7rdrq9da1767jl8xximfdcwav2fs0kwmxjc6vahh7ya1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a740ab40cab3a1890f56df808f41a2d541aa77c/recipes/dim"; sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52"; - name = "dim"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7107,20 +9290,24 @@ license = lib.licenses.free; }; }) {}; - dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dim-autoload = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dim-autoload"; + ename = "dim-autoload"; version = "2.0.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; - rev = "788320fe089fafbdf1cb09d2ab4d29d64a804e21"; - sha256 = "0iyhjww7p274x418n1iw1xj2fkmn5k9icav0jyzbwmy83a2nmr52"; + rev = "2ff7ded0c9f8bb582fb9018bea47ead44d048cf8"; + sha256 = "0lbfgfx3015b1kspqrsnlpvzl7i06yxafj1i2lpcy7ay4fv5rp54"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload"; sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9"; - name = "dim-autoload"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7128,9 +9315,13 @@ license = lib.licenses.free; }; }) {}; - diminish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + diminish = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "diminish"; + ename = "diminish"; version = "0.45"; src = fetchFromGitHub { owner = "myrjola"; @@ -7138,10 +9329,10 @@ rev = "0211de96b7cfba9c9dc8d2d392dbd4ccdb22bc65"; sha256 = "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1bfb4acb381cada46458cf60eae9b88d007294d5/recipes/diminish"; sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43"; - name = "diminish"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7149,9 +9340,14 @@ license = lib.licenses.free; }; }) {}; - dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dimmer = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dimmer"; + ename = "dimmer"; version = "0.3.0"; src = fetchFromGitHub { owner = "gonewest818"; @@ -7159,10 +9355,10 @@ rev = "12fc52a6570ec25020281735f5a0ca780a9105af"; sha256 = "1jv9rrv15nb5hpwcaqlpjj932gyisrkwbv11czkg3v0bn7qn6yif"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r"; - name = "dimmer"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7170,9 +9366,19 @@ license = lib.licenses.free; }; }) {}; - dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }: - melpaBuild { + dionysos = callPackage ({ alert + , cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , libmpdee + , melpaBuild + , pkg-info + , s }: + melpaBuild { pname = "dionysos"; + ename = "dionysos"; version = "0.6.0"; src = fetchFromGitHub { owner = "nlamirault"; @@ -7180,10 +9386,10 @@ rev = "98bc789d20e41020d6e62d63d3c78f8032fa4bf2"; sha256 = "1hma72dyn3w6cwd3vrgg4hdlrxgwqs55cjyxb05vs9csz7r42208"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/890445eca3c555acd2639a6f509c8e83b687f2bd/recipes/dionysos"; sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz"; - name = "dionysos"; + name = "recipe"; }; packageRequires = [ alert cl-lib dash libmpdee pkg-info s ]; meta = { @@ -7191,9 +9397,14 @@ license = lib.licenses.free; }; }) {}; - dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-atool = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-atool"; + ename = "dired-atool"; version = "1.1.0"; src = fetchFromGitHub { owner = "HKey"; @@ -7201,10 +9412,10 @@ rev = "a2470f805c8cfbeee459b000edaaa5474bac35f9"; sha256 = "1d813b4wiamif48v0za5invnss52mn7yw3hzrlxd4918gy5y2r74"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool"; sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w"; - name = "dired-atool"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7212,9 +9423,13 @@ license = lib.licenses.free; }; }) {}; - dired-efap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-efap = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-efap"; + ename = "dired-efap"; version = "0.8"; src = fetchFromGitHub { owner = "juan-leon"; @@ -7222,10 +9437,10 @@ rev = "2b849bc5c09d0b752a177495ea1b851ee821f5bf"; sha256 = "1m0nx8wd6q56qbp5mbp9n466kyglrz34nflwvgd1qnmi08jwswgv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5669ca2adc48f3349eb59276850e6174e37f9de7/recipes/dired-efap"; sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00"; - name = "dired-efap"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7233,20 +9448,50 @@ license = lib.licenses.free; }; }) {}; - dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-explorer = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "dired-explorer"; + ename = "dired-explorer"; + version = "0.6"; + src = fetchFromGitHub { + owner = "jidaikobo-shibata"; + repo = "dired-explorer"; + rev = "3ade0a31b5340271d05e9bf443f2504960f6c6dd"; + sha256 = "0lbm326na005k3pa11rqq5nbhvm55dydi2a7fzs3bzlqwbx7d6fq"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/acd40e02185847dfdcd70b3cacea703133e4356d/recipes/dired-explorer"; + sha256 = "12mymmcl663ci543vqzg8jai8kgfbb3gw5wsbcm4ln3j8d5fgzd9"; + name = "recipe"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/dired-explorer"; + license = lib.licenses.free; + }; + }) {}; + dired-fdclone = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-fdclone"; - version = "1.5.2"; + ename = "dired-fdclone"; + version = "1.5.4"; src = fetchFromGitHub { owner = "knu"; repo = "dired-fdclone.el"; - rev = "8144c013d46c55b0471f31cdc3b5ead303286cbf"; - sha256 = "0lrc4082ghg77x5jl26hj8c7cp48yjvqhv4g3j0pznpzb4qyfnq0"; + rev = "903d7a736d240ef7352989a4e5d0ff9129c2ee3c"; + sha256 = "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone"; sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9"; - name = "dired-fdclone"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7254,9 +9499,14 @@ license = lib.licenses.free; }; }) {}; - dired-hide-dotfiles = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-hide-dotfiles = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-hide-dotfiles"; + ename = "dired-hide-dotfiles"; version = "0.1"; src = fetchFromGitHub { owner = "mattiasb"; @@ -7264,10 +9514,10 @@ rev = "32cf3b6f90dc56f6ff271c28d827aab303bc6221"; sha256 = "1fpzgmvbgfgl6wdrynlpvvdlbm8npgrmnzfz2133zvf5x3zfzq6r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba64a50f85fdb0ad54149dfed4051b4c1a719cbb/recipes/dired-hide-dotfiles"; sha256 = "0yy131cvj9a9sz02ari7pzwf22r5y7acyg757h3jvih317v6jyp0"; - name = "dired-hide-dotfiles"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7275,9 +9525,14 @@ license = lib.licenses.free; }; }) {}; - dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-icon = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-icon"; + ename = "dired-icon"; version = "0.5"; src = fetchFromGitLab { owner = "xuhdev"; @@ -7285,10 +9540,10 @@ rev = "dbace8d2250f84487d31b39050fcdc260fcde804"; sha256 = "1d9105ibaw858gqp19rx2m6xm3hl57vzsmdqir883cy46qpvwhki"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a96249947cba52cd75515b3dc83b0842fedf624/recipes/dired-icon"; sha256 = "0nyiqcywc1p8kw3psisl4zxwmf2g0x82kanka85zxxdz15s509j1"; - name = "dired-icon"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7296,9 +9551,13 @@ license = lib.licenses.free; }; }) {}; - dired-imenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-imenu = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-imenu"; + ename = "dired-imenu"; version = "0.5.0"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -7306,10 +9565,10 @@ rev = "610e21fe0988c85931d34894d3eee2442c79ab0a"; sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e346de86b7f7fd5dad548f0936cde54ac11e3f79/recipes/dired-imenu"; sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1"; - name = "dired-imenu"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7317,9 +9576,14 @@ license = lib.licenses.free; }; }) {}; - dired-k = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-k = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-k"; + ename = "dired-k"; version = "0.19"; src = fetchFromGitHub { owner = "syohex"; @@ -7327,10 +9591,10 @@ rev = "3f0b9315f87b0f930d51089e311d41282d5f8b15"; sha256 = "09xh097v3fd0mjxqlmbfwjlr1v4a99mj4rvwdb6kqgajmlhgi9hx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k"; sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8"; - name = "dired-k"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7338,9 +9602,14 @@ license = lib.licenses.free; }; }) {}; - dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }: - melpaBuild { + dired-quick-sort = callPackage ({ fetchFromGitLab + , fetchurl + , hydra + , lib + , melpaBuild }: + melpaBuild { pname = "dired-quick-sort"; + ename = "dired-quick-sort"; version = "0.1"; src = fetchFromGitLab { owner = "xuhdev"; @@ -7348,10 +9617,10 @@ rev = "fe39cfb2d4a7ba6b30f98134548b4e4bac67c469"; sha256 = "1a9r1kz5irpvb2byabbf27sy7rjzaygfpqimpag41sj955wlgy9a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort"; sha256 = "01vrk3wqq2zmcblyp9abi2lvrzr2a5ca8r8gjjnr5223037ppl3l"; - name = "dired-quick-sort"; + name = "recipe"; }; packageRequires = [ hydra ]; meta = { @@ -7359,9 +9628,41 @@ license = lib.licenses.free; }; }) {}; - dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-rsync = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "dired-rsync"; + ename = "dired-rsync"; + version = "0.4"; + src = fetchFromGitHub { + owner = "stsquad"; + repo = "dired-rsync"; + rev = "3ee95c35d1b7d62ffbc38f16f8c79904ad22a84d"; + sha256 = "1zrpmymd0fj74apkx413mpxvz3iwvfdxq5zx3sw5akpqc9nphn8n"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ce9f41ad832cef527dde97f829a8b8339e6ac48b/recipes/dired-rsync"; + sha256 = "0lykj7nfpaspwn90macvr7iir4jlrx88i0s9spii7iic2fnm51ql"; + name = "recipe"; + }; + packageRequires = [ dash emacs s ]; + meta = { + homepage = "https://melpa.org/#/dired-rsync"; + license = lib.licenses.free; + }; + }) {}; + dired-single = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-single"; + ename = "dired-single"; version = "0.1.3"; src = fetchFromGitHub { owner = "crocket"; @@ -7369,10 +9670,10 @@ rev = "5b002927fd8c7f954eec187227ac59dcaa8edfa3"; sha256 = "0mfvyjbx7l7a1sfq47m6rb507xxw92nykkkpzmi2mpwv30f1c22j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41669decbb7ad5c4dbe152a863f16d87e7bba493/recipes/dired-single"; sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf"; - name = "dired-single"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7380,9 +9681,13 @@ license = lib.licenses.free; }; }) {}; - dired-toggle-sudo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dired-toggle-sudo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dired-toggle-sudo"; + ename = "dired-toggle-sudo"; version = "1.0"; src = fetchFromGitHub { owner = "renard"; @@ -7390,10 +9695,10 @@ rev = "02449dbda4e168f99fe5352c9628df5d39e11483"; sha256 = "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5cdee2d52c0c53566fdd77a5d42edf365764acff/recipes/dired-toggle-sudo"; sha256 = "0fy05af9aq9791ij4j9pscdk5j44pbg0kmhpqli41qiazjw7v2va"; - name = "dired-toggle-sudo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7401,9 +9706,14 @@ license = lib.licenses.free; }; }) {}; - diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + diredfl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "diredfl"; + ename = "diredfl"; version = "0.4"; src = fetchFromGitHub { owner = "purcell"; @@ -7411,10 +9721,10 @@ rev = "45e9c46f58c655694758d4986b9195c8bb40ddf3"; sha256 = "1zb2lz7rp58zqvpniqcsmqabi7nqg2d8bfd0hgmq68bn2hd25b5z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; sha256 = "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn"; - name = "diredfl"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7422,9 +9732,13 @@ license = lib.licenses.free; }; }) {}; - diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + diredful = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "diredful"; + ename = "diredful"; version = "1.10"; src = fetchFromGitHub { owner = "thamer"; @@ -7432,10 +9746,10 @@ rev = "b17b3087e0084a5571a9ac4d47ccfc36d96b109e"; sha256 = "1d8n8wj5k82a1sfg93kn3ajci804mpp9j206x5f185zd48wb25z8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76f3d178e7c3982b53c7ee0096c839397534d732/recipes/diredful"; sha256 = "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x"; - name = "diredful"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7443,9 +9757,16 @@ license = lib.licenses.free; }; }) {}; - direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: - melpaBuild { + direnv = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , with-editor }: + melpaBuild { pname = "direnv"; + ename = "direnv"; version = "1.4.0"; src = fetchFromGitHub { owner = "wbolster"; @@ -7453,10 +9774,10 @@ rev = "03c4edffba45722a9511d6d10992578f140d095f"; sha256 = "1b8xp0yprpy1sc8hmim6jcdmgpc8yj6wjzgj4rdy77k7l96016v8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd"; - name = "direnv"; + name = "recipe"; }; packageRequires = [ dash emacs with-editor ]; meta = { @@ -7464,9 +9785,13 @@ license = lib.licenses.free; }; }) {}; - direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + direx = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "direx"; + ename = "direx"; version = "1.0.0"; src = fetchFromGitHub { owner = "m2ym"; @@ -7474,10 +9799,10 @@ rev = "423caeed13249e37afc937dc8134cb3c53e0f111"; sha256 = "0p8c2hjgr81idm1psv3i3v5hr5rv0875ig8app2yqjwzvl0nn73f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b0903466d63b1c87abc002b0e064e36a8cddd3/recipes/direx"; sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm"; - name = "direx"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7485,9 +9810,14 @@ license = lib.licenses.free; }; }) {}; - direx-grep = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + direx-grep = callPackage ({ direx + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "direx-grep"; + ename = "direx-grep"; version = "0.1.0"; src = fetchFromGitHub { owner = "aki2o"; @@ -7495,10 +9825,10 @@ rev = "1109a512a80b2673a70b18b8568514049017faad"; sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a88a29090a0d6c636f4aeb5214433db66367d9e/recipes/direx-grep"; sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2"; - name = "direx-grep"; + name = "recipe"; }; packageRequires = [ direx ]; meta = { @@ -7506,9 +9836,13 @@ license = lib.licenses.free; }; }) {}; - disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + disable-mouse = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "disable-mouse"; + ename = "disable-mouse"; version = "0.3"; src = fetchFromGitHub { owner = "purcell"; @@ -7516,10 +9850,10 @@ rev = "81639930bcaeedadbcc19728e91719afcac84613"; sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse"; sha256 = "0c0ps39s6wg3grspvgck0cwxnas73nfaahfa87l0mmgsrsvas5m7"; - name = "disable-mouse"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7527,9 +9861,14 @@ license = lib.licenses.free; }; }) {}; - discover = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: - melpaBuild { + discover = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , makey + , melpaBuild }: + melpaBuild { pname = "discover"; + ename = "discover"; version = "0.3"; src = fetchFromGitHub { owner = "mickeynp"; @@ -7537,10 +9876,10 @@ rev = "bbfda2b4e429985a8fa7971d264c942767cfa816"; sha256 = "0qxw30zrlcxhxb0alrgyiclrk44dysal8xsbz2mvgrb6jli8wg18"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e32e98758aa6fd31218e98608bd54a76c3e83/recipes/discover"; sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga"; - name = "discover"; + name = "recipe"; }; packageRequires = [ makey ]; meta = { @@ -7548,20 +9887,24 @@ license = lib.licenses.free; }; }) {}; - discover-my-major = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: - melpaBuild { + discover-my-major = callPackage ({ fetchgit + , fetchurl + , lib + , makey + , melpaBuild }: + melpaBuild { pname = "discover-my-major"; + ename = "discover-my-major"; version = "1.0"; - src = fetchFromGitHub { - owner = "steckerhalter"; - repo = "discover-my-major"; - rev = "57d76fd21ec54706289cf9396fc871250569951e"; - sha256 = "1wlqyl03hhnflbyay3qlvdzqzvv5rbybcjpfddggda7ias9h0pr4"; + src = fetchgit { + url = "https://framagit.org/steckerhalter/discover-my-major.git"; + rev = "aca4ee2b45e96c7fd6167d006531472944c389ad"; + sha256 = "1c2p31a1mlaqi4h83ij0y3vhrw2hja5cz3kf52qpnhqva7si5fx9"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/274185fa94a3442c56593f3c8b99bdc6b9bd4994/recipes/discover-my-major"; - sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg"; - name = "discover-my-major"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/discover-my-major"; + sha256 = "1b10bwhls5bx83hzhqq1ylc2civ3bsivd6db46f3s5hpgvr4q17n"; + name = "recipe"; }; packageRequires = [ makey ]; meta = { @@ -7569,9 +9912,13 @@ license = lib.licenses.free; }; }) {}; - dispass = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dispass = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dispass"; + ename = "dispass"; version = "1.1.2"; src = fetchFromGitHub { owner = "ryuslash"; @@ -7579,10 +9926,10 @@ rev = "38b880e72cfe5e65179b16791903b0900c73eff4"; sha256 = "1b1a1bwc6nv6wkd8jg1cqmjb9m9pxi5i2wbrz97fgii23dwfmlnl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dispass"; sha256 = "09c9v41rh63hjpdh377rbfvpial33r41dn5bss3632fi34az5l9n"; - name = "dispass"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7590,8 +9937,11 @@ license = lib.licenses.free; }; }) {}; - ditz-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + ditz-mode = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ditz-mode"; version = "0.3"; src = fetchhg { @@ -7599,7 +9949,7 @@ rev = "beac4c1f3b7e"; sha256 = "1cbsy4lchl41zmyxfq828cjpl3h2dwvn8xf1qgf2lbscdb6cwbwb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02e2a2a25f42929626d7237511136ba6826dad33/recipes/ditz-mode"; sha256 = "0shzm9l31n4ffjs1d26ykxsycd478lhlpl8xcwzbjryywg4gf5nd"; name = "ditz-mode"; @@ -7610,9 +9960,14 @@ license = lib.licenses.free; }; }) {}; - dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dix = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dix"; + ename = "dix"; version = "0.3.5"; src = fetchFromGitHub { owner = "unhammer"; @@ -7620,10 +9975,10 @@ rev = "86880826a0cc878e2e5d50bc835eed5c8e2f001a"; sha256 = "00qyzpqdw4im7c4bqqpiayv4kr9iqlm6mhsziazjvrjsvvi0p9ij"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; sha256 = "0c5fmknpy6kwlz7nx0csbbia1maz0szj7yha1p7wq28s3a5426xq"; - name = "dix"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -7631,20 +9986,26 @@ license = lib.licenses.free; }; }) {}; - dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dix-evil = callPackage ({ dix + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dix-evil"; + ename = "dix-evil"; version = "0.3.5"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "86880826a0cc878e2e5d50bc835eed5c8e2f001a"; - sha256 = "00qyzpqdw4im7c4bqqpiayv4kr9iqlm6mhsziazjvrjsvvi0p9ij"; + rev = "1cfef0d3376a18c78dd1dfc1ac9ac3ad0e8c4475"; + sha256 = "0p2cvr7mjpag86wacxm6s39y7p118gh2ccqw02jzabwxlfasfbw3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; sha256 = "1jscaksnl5qmpqgkjkv6sx56llz0w4p5h7j73c4a1hld94gwklh3"; - name = "dix-evil"; + name = "recipe"; }; packageRequires = [ dix evil ]; meta = { @@ -7652,20 +10013,31 @@ license = lib.licenses.free; }; }) {}; - docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: - melpaBuild { + docker = callPackage ({ dash + , docker-tramp + , emacs + , fetchFromGitHub + , fetchurl + , json-mode + , lib + , magit-popup + , melpaBuild + , s + , tablist }: + melpaBuild { pname = "docker"; - version = "0.5.3"; + ename = "docker"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "9ffeff244318ed119279d0a44784b7f690d1393d"; - sha256 = "13c7x9pf6690w8l1jqnjf0bi9np9ndzmw1n6imy9cks8bpqbkdyd"; + rev = "0bcc50fa0c94c1647511d37efcb46fa8b5d23db3"; + sha256 = "12qggbxjmj939zzv774cqydfa3ykw7v77qphkjvlx2j2vq7r1d90"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk"; - name = "docker"; + name = "recipe"; }; packageRequires = [ dash @@ -7681,9 +10053,16 @@ license = lib.licenses.free; }; }) {}; - docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: - melpaBuild { + docker-compose-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yaml-mode }: + melpaBuild { pname = "docker-compose-mode"; + ename = "docker-compose-mode"; version = "1.1.0"; src = fetchFromGitHub { owner = "meqif"; @@ -7691,10 +10070,10 @@ rev = "7f4cd0b1718df2ab93d51bd395b2f37df9482265"; sha256 = "1fbcxwfvm33xcdj3cs26d9i1zyrryyjjkv7sc3mfxd45nq8d3ivj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g"; - name = "docker-compose-mode"; + name = "recipe"; }; packageRequires = [ dash emacs yaml-mode ]; meta = { @@ -7702,9 +10081,15 @@ license = lib.licenses.free; }; }) {}; - docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + docker-tramp = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "docker-tramp"; + ename = "docker-tramp"; version = "0.1"; src = fetchFromGitHub { owner = "emacs-pe"; @@ -7712,10 +10097,10 @@ rev = "d8b510365d8e65551f4f792f251e7212411708c3"; sha256 = "0lxvzmfg52fhxrhbvp92zwp7cv4i1rlxnkyyzgngj3sjm7y60yvg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker-tramp"; sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w"; - name = "docker-tramp"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -7723,9 +10108,13 @@ license = lib.licenses.free; }; }) {}; - dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dockerfile-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dockerfile-mode"; + ename = "dockerfile-mode"; version = "1.2"; src = fetchFromGitHub { owner = "spotify"; @@ -7733,10 +10122,10 @@ rev = "9a75fcd119c5b2a1d723d440bbe4b1db56df90cc"; sha256 = "1cmh8pwwa6dhl4w66wy8s5yqxs326mnaalg1ig2yhl4bjk8gi4m2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode"; sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa"; - name = "dockerfile-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7744,9 +10133,13 @@ license = lib.licenses.free; }; }) {}; - dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dokuwiki-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dokuwiki-mode"; + ename = "dokuwiki-mode"; version = "0.1.1"; src = fetchFromGitHub { owner = "kai2nenobu"; @@ -7754,10 +10147,10 @@ rev = "e4e116f6fcc373e3f5937c1a7daa5c2c9c6d3fa1"; sha256 = "0bmcm7lvzm8sg2l1j7bg02jasxb8g81q9ilycblmsl1ckbfwq0yp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/dokuwiki-mode"; sha256 = "1jc3sn61mipkhgr91wp74s673jk2w5991p54jlw05qqpf5gmxd7v"; - name = "dokuwiki-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7765,9 +10158,14 @@ license = lib.licenses.free; }; }) {}; - doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + doom = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "doom"; + ename = "doom"; version = "1.3"; src = fetchFromGitHub { owner = "kensanata"; @@ -7775,10 +10173,10 @@ rev = "5e2d3f54e5b84eaa533cbdb6cf17b1b6009f0730"; sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0960deb3b1d106ad2ffa95a44f34cb9efc026f01/recipes/doom"; sha256 = "1ji2fdiw5b13n76nv2wvkz6v155b0qgh1rxwmv3m5nnrbmklfjh5"; - name = "doom"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -7786,9 +10184,54 @@ license = lib.licenses.free; }; }) {}; - doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + doom-modeline = callPackage ({ all-the-icons + , dash + , eldoc-eval + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , shrink-path }: + melpaBuild { + pname = "doom-modeline"; + ename = "doom-modeline"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "seagle0128"; + repo = "doom-modeline"; + rev = "845e0319d3cce53424e2c804290c16014df53709"; + sha256 = "135152m1a96549blh658lvk4q76dy3bhnl2f0vf78q1pxnrv9mx1"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f610757f85fb01bd9b1dd212ddbea8f34f3ecd/recipes/doom-modeline"; + sha256 = "0pscrhhgk4wpz1f2r94ficgan4f9blbhqzvav1wjahwp7fn5m29j"; + name = "recipe"; + }; + packageRequires = [ + all-the-icons + dash + eldoc-eval + emacs + projectile + shrink-path + ]; + meta = { + homepage = "https://melpa.org/#/doom-modeline"; + license = lib.licenses.free; + }; + }) {}; + doom-themes = callPackage ({ all-the-icons + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "doom-themes"; + ename = "doom-themes"; version = "2.1.1"; src = fetchFromGitHub { owner = "hlissner"; @@ -7796,10 +10239,10 @@ rev = "98120f9b362b53983e932f126cf92848297b745a"; sha256 = "03pnnbqa09iqyypgbgwlkxr6w1j46rla6pivbq7fy366yk2x03x0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; sha256 = "0plqhis9ki3ck1pbv4hiqk4x428fps8qsfx72mamdayyx2nncdrs"; - name = "doom-themes"; + name = "recipe"; }; packageRequires = [ all-the-icons cl-lib emacs ]; meta = { @@ -7807,9 +10250,14 @@ license = lib.licenses.free; }; }) {}; - dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dotenv-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dotenv-mode"; + ename = "dotenv-mode"; version = "0.2.4"; src = fetchFromGitHub { owner = "preetpalS"; @@ -7817,10 +10265,10 @@ rev = "f4c52bcd5313379b9f2460db7f7a33119dfa96ea"; sha256 = "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode"; sha256 = "1lwfzfri6vywcjkc9wassrz0rdrg0kvljxsm6b4smlnphp6pdbbs"; - name = "dotenv-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7828,20 +10276,24 @@ license = lib.licenses.free; }; }) {}; - downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + downplay-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "downplay-mode"; + ename = "downplay-mode"; version = "0.1"; src = fetchFromGitHub { owner = "tobias"; repo = "downplay-mode"; - rev = "225a4b3ca09e6f463dfdd54941c98b02be8d574c"; - sha256 = "13czcxmmvy4g9ysfjr6lb91c0fqv1xv8ppd27wbfsrgxm3aaqimb"; + rev = "bd03a160e5e191eed1c20dfb8e69f2e314ef4e64"; + sha256 = "1i22pbnpi4zdh3c4drhhi8x6b9k3k4vz758vyajzb9mc2i67llxm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d67ea3c4d92b4093373d5e4ff07b7d5a3dc537/recipes/downplay-mode"; sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b"; - name = "downplay-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7849,9 +10301,14 @@ license = lib.licenses.free; }; }) {}; - dr-racket-like-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dr-racket-like-unicode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dr-racket-like-unicode"; + ename = "dr-racket-like-unicode"; version = "1.1.0"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -7859,10 +10316,10 @@ rev = "4953f1c8a68472e157a0dcd0a7e35a4ec2577133"; sha256 = "1i7k7d2gnzd2izplhdmjbkcxvkwnc3y3y0hrcp2rq60bjpkcl1gv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e612ede00c4b44ace741d2b6baabc61571af15c/recipes/dr-racket-like-unicode"; sha256 = "0cqcbn4hmv99d8z03xc0rqw4yh5by6g09y33h75dhl9nh95rybgf"; - name = "dr-racket-like-unicode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7870,20 +10327,25 @@ license = lib.licenses.free; }; }) {}; - dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dracula-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dracula-theme"; - version = "1.2.5"; + ename = "dracula-theme"; + version = "1.4.0"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "509293bebeaf26ee662ff35a28a7af019190f286"; - sha256 = "0ddznxn75qk22g0ah4490ysghvb9r6nin1a005y0zmschz46bar8"; + rev = "1f649824d996b1ecdcc5980210b774f0cb950e9a"; + sha256 = "1gsj8na6nnz0vv9j215wdf39q834chc6pmk9mv8hcvcbdbc4f8wa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; sha256 = "1px162v7h7136rasafq875yzw0h8n6wvzbyh73c3w093kd30bmh8"; - name = "dracula-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -7891,20 +10353,24 @@ license = lib.licenses.free; }; }) {}; - draft-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + draft-mode = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "draft-mode"; + ename = "draft-mode"; version = "0.1.1"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "gaudecker"; repo = "draft-mode"; - rev = "4779fb32daf53746459da2def7e08004492d4f18"; - sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y"; + rev = "f059c04b044f62aec764c7698adddad301bfe89c"; + sha256 = "01dspkv7g4xmmqgz6f1p190h5p4f4vrw8r9dikrjch02bb76wqir"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d5ee50f467025fb8b9a3b4577fc471a2b2ee191a/recipes/draft-mode"; - sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh"; - name = "draft-mode"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cbfefacda071c0f5ee698a4c345a2d6fea6a0d24/recipes/draft-mode"; + sha256 = "19lq1a3rj6fck3xq2vcz8fk30hpx25kyfz6c7hmq36kx4lv0mjpa"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7912,9 +10378,13 @@ license = lib.licenses.free; }; }) {}; - drag-stuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + drag-stuff = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "drag-stuff"; + ename = "drag-stuff"; version = "0.3.0"; src = fetchFromGitHub { owner = "rejeep"; @@ -7922,10 +10392,10 @@ rev = "d49fe376d24f0f8ac5ade67b6d7fccc2487c81db"; sha256 = "1jrr59iazih3imkl9ja1lbni9v3xv6b8gmqs015g2mxhlql35jka"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/drag-stuff"; sha256 = "1q67q20gfhixzkmddhzp6fd8z2qfpsmyyvymmaffjcscnjaz21w4"; - name = "drag-stuff"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7933,9 +10403,14 @@ license = lib.licenses.free; }; }) {}; - drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: - melpaBuild { + drupal-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , php-mode }: + melpaBuild { pname = "drupal-mode"; + ename = "drupal-mode"; version = "0.7.3"; src = fetchFromGitHub { owner = "arnested"; @@ -7943,10 +10418,10 @@ rev = "49ce63c659aa0af7a2daf0c9e74e58fbce6deb71"; sha256 = "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn"; - name = "drupal-mode"; + name = "recipe"; }; packageRequires = [ php-mode ]; meta = { @@ -7954,9 +10429,13 @@ license = lib.licenses.free; }; }) {}; - drupal-spell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + drupal-spell = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "drupal-spell"; + ename = "drupal-spell"; version = "0.2.2"; src = fetchFromGitHub { owner = "arnested"; @@ -7964,10 +10443,10 @@ rev = "a69f5e3b62c4c0da74ce26c1d00d5b8f7395e4ae"; sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb859d9755bde3fd852bc7d08f2fab2429ba31b3/recipes/drupal-spell"; sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3"; - name = "drupal-spell"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7975,9 +10454,13 @@ license = lib.licenses.free; }; }) {}; - dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dtrt-indent = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dtrt-indent"; + ename = "dtrt-indent"; version = "0.7"; src = fetchFromGitHub { owner = "jscheid"; @@ -7985,10 +10468,10 @@ rev = "0ac070c9576e4ebab12cd6800ac2ac3abcecc2c1"; sha256 = "0dambn5l0wvbhccvhh5hbz9hw66y4mp1la3wj85dl9kgr7hq1ry7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5"; - name = "dtrt-indent"; + name = "recipe"; }; packageRequires = []; meta = { @@ -7996,9 +10479,14 @@ license = lib.licenses.free; }; }) {}; - ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ducpel = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ducpel"; + ename = "ducpel"; version = "0.1"; src = fetchFromGitHub { owner = "alezost"; @@ -8006,10 +10494,10 @@ rev = "ece785baaa102bd2e9d54257af3a92bacc5757bc"; sha256 = "17yldk76mxakhb90bma7r4z9jgx02wankgk17r2di196mc04bj7b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d64adac965e1dac0f29dab9a587cd6ce9c3bb3a/recipes/ducpel"; sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc"; - name = "ducpel"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -8017,9 +10505,18 @@ license = lib.licenses.free; }; }) {}; - dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: - melpaBuild { + dumb-jump = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup + , s }: + melpaBuild { pname = "dumb-jump"; + ename = "dumb-jump"; version = "0.5.2"; src = fetchFromGitHub { owner = "jacktasia"; @@ -8027,10 +10524,10 @@ rev = "260054500d4731c36574b6cbc519de29fdd22f43"; sha256 = "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; sha256 = "1j90n8gydsp2v07rysz1k5vf6hspybcl27214sib1iz3hbimid1w"; - name = "dumb-jump"; + name = "recipe"; }; packageRequires = [ dash emacs f popup s ]; meta = { @@ -8038,8 +10535,13 @@ license = lib.licenses.free; }; }) {}; - dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + dyalog-mode = callPackage ({ cl-lib ? null + , emacs + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dyalog-mode"; version = "0.7"; src = fetchhg { @@ -8047,7 +10549,7 @@ rev = "87db00b912be"; sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq"; name = "dyalog-mode"; @@ -8058,9 +10560,16 @@ license = lib.licenses.free; }; }) {}; - dynamic-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, melpaBuild, pcache, persistent-soft }: - melpaBuild { + dynamic-fonts = callPackage ({ fetchFromGitHub + , fetchurl + , font-utils + , lib + , melpaBuild + , pcache + , persistent-soft }: + melpaBuild { pname = "dynamic-fonts"; + ename = "dynamic-fonts"; version = "0.6.4"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -8068,10 +10577,10 @@ rev = "d318498b377d8941c7420f51616c78e3440d00f5"; sha256 = "1ppwlill1z4vqd566h9zi6zx5jb7hggmnmqrga84j5n7fwqvgz7f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/dynamic-fonts"; sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q"; - name = "dynamic-fonts"; + name = "recipe"; }; packageRequires = [ font-utils pcache persistent-soft ]; meta = { @@ -8079,9 +10588,13 @@ license = lib.licenses.free; }; }) {}; - dynamic-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + dynamic-ruler = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "dynamic-ruler"; + ename = "dynamic-ruler"; version = "0.1.6"; src = fetchFromGitHub { owner = "rocher"; @@ -8089,10 +10602,10 @@ rev = "c9c0de6fe5721f06b50e01d9b4684b519c71b367"; sha256 = "09skp2d5likqjlrsfis3biqw59sjkgid5249fld9ahqm5f1wq296"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/926c43867120db429807ff5aaacc8af65a1738c8/recipes/dynamic-ruler"; sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc"; - name = "dynamic-ruler"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8100,9 +10613,14 @@ license = lib.licenses.free; }; }) {}; - e2wm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }: - melpaBuild { + e2wm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , window-layout }: + melpaBuild { pname = "e2wm"; + ename = "e2wm"; version = "1.4"; src = fetchFromGitHub { owner = "kiwanami"; @@ -8110,10 +10628,10 @@ rev = "4353d3394c77a49f8f0291c239858c8c5e877549"; sha256 = "12midsrx07pdrsr1qbl2rpi7xyhxqx08bkz7n7gf8vsmqkpfp56s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8da85815c39f58552a968ae68ee07c08c53b0f61/recipes/e2wm"; sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la"; - name = "e2wm"; + name = "recipe"; }; packageRequires = [ window-layout ]; meta = { @@ -8121,9 +10639,14 @@ license = lib.licenses.free; }; }) {}; - e2wm-R = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + e2wm-R = callPackage ({ e2wm + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "e2wm-R"; + ename = "e2wm-R"; version = "0.4"; src = fetchFromGitHub { owner = "myuhe"; @@ -8131,10 +10654,10 @@ rev = "fe17906bf48324032a1beaec9af32b9b49ea9125"; sha256 = "1yf081rac0chvkjha9z9xi1p983gmhjph0hai6ppsz5hzf2vikpp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a3ba9843bdf275815b149e4c4b0a947bbc5e614/recipes/e2wm-R"; sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh"; - name = "e2wm-R"; + name = "recipe"; }; packageRequires = [ e2wm ]; meta = { @@ -8142,9 +10665,15 @@ license = lib.licenses.free; }; }) {}; - e2wm-direx = callPackage ({ direx, e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + e2wm-direx = callPackage ({ direx + , e2wm + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "e2wm-direx"; + ename = "e2wm-direx"; version = "0.0.5"; src = fetchFromGitHub { owner = "aki2o"; @@ -8152,10 +10681,10 @@ rev = "f319625b56c44e601af7c17fc6dbb88e5d70ebae"; sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8320cf626050cf455c97ef22e7a8ccfb253e3243/recipes/e2wm-direx"; sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg"; - name = "e2wm-direx"; + name = "recipe"; }; packageRequires = [ direx e2wm ]; meta = { @@ -8163,20 +10692,26 @@ license = lib.licenses.free; }; }) {}; - e2wm-pkgex4pl = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild, plsense-direx }: - melpaBuild { + e2wm-pkgex4pl = callPackage ({ e2wm + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , plsense-direx }: + melpaBuild { pname = "e2wm-pkgex4pl"; + ename = "e2wm-pkgex4pl"; version = "0.0.1"; src = fetchFromGitHub { owner = "aki2o"; repo = "e2wm-pkgex4pl"; - rev = "7ea994450727190c4f3cb46cb429ba41b692ecc0"; - sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d"; + rev = "b72561b75e98961f05544a2159d83592c964ba1e"; + sha256 = "1cx6kdxhq9ybwwvc1vpwcfy08yf1h4xacgimm36kp9xayvxsmq2j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f84b421cb1673d2a9fe820cee11dc4a6e72adad/recipes/e2wm-pkgex4pl"; sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil"; - name = "e2wm-pkgex4pl"; + name = "recipe"; }; packageRequires = [ e2wm plsense-direx ]; meta = { @@ -8184,20 +10719,25 @@ license = lib.licenses.free; }; }) {}; - e2wm-sww = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + e2wm-sww = callPackage ({ e2wm + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "e2wm-sww"; + ename = "e2wm-sww"; version = "0.0.2"; src = fetchFromGitHub { owner = "aki2o"; repo = "e2wm-sww"; - rev = "1063f9854bd34db5ac771cd1036cecc89834729d"; - sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g"; + rev = "db454ac3eddd53a62f2725f6e2d5ac455caf200c"; + sha256 = "1a8z94z0wp9r4kh44bn2m74k866jwq7zvjihxmmzr0rfb85q2d99"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc873e8271e9f372e08da5d0e4b77c8ba0e3a8cb/recipes/e2wm-sww"; sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8"; - name = "e2wm-sww"; + name = "recipe"; }; packageRequires = [ e2wm ]; meta = { @@ -8205,9 +10745,16 @@ license = lib.licenses.free; }; }) {}; - e2wm-term = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + e2wm-term = callPackage ({ e2wm + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "e2wm-term"; + ename = "e2wm-term"; version = "0.0.5"; src = fetchFromGitHub { owner = "aki2o"; @@ -8215,10 +10762,10 @@ rev = "65b5ac88043d5c4048920a048f3599904ca55981"; sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9a800f5af893cb670cedb47e4a723c407be8429/recipes/e2wm-term"; sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g"; - name = "e2wm-term"; + name = "recipe"; }; packageRequires = [ e2wm log4e yaxception ]; meta = { @@ -8226,20 +10773,26 @@ license = lib.licenses.free; }; }) {}; - eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + eacl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "eacl"; - version = "1.1.2"; + ename = "eacl"; + version = "1.1.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "80113a9f6cc246cef67e3e20ec052788c38ab116"; - sha256 = "1pwppn0m288d6j9b7cdshgc3rxv0nfs94klc1fpsyfxqx0a6f23z"; + rev = "ccf1401b1acff67fe445c95e8be7b09e8c3ae5d8"; + sha256 = "0v02asdmhj5la9nqck2230s04gf518cjs7wa4lykf8j46bc13vac"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr"; - name = "eacl"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -8247,20 +10800,26 @@ license = lib.licenses.free; }; }) {}; - easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + easy-hugo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "easy-hugo"; - version = "3.2.23"; + ename = "easy-hugo"; + version = "3.3.30"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "161354d0f06e2cdbe63610fb11880ae54e050181"; - sha256 = "12dxb0kzb02h6zal65n6bviy3zdkqjfbzsf7ncsbbmq8f1xrajmc"; + rev = "8bf48b973905c4ab488633226b3dfb3317d8c745"; + sha256 = "0yjxg1mql7ha6wa5wdkngs6y3lqz5y5y0hbsmpvqdw61paqm2ggs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g"; - name = "easy-hugo"; + name = "recipe"; }; packageRequires = [ emacs popup ]; meta = { @@ -8268,20 +10827,25 @@ license = lib.licenses.free; }; }) {}; - easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + easy-jekyll = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "easy-jekyll"; - version = "1.6.12"; + ename = "easy-jekyll"; + version = "1.6.15"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "faeff895ab2aa0ee9c6df18046817e8a3f0b62a1"; - sha256 = "1dp1r16rr5gqbh3aw900v2jz146c3qnlbjf5k75fazdglkbnagxk"; + rev = "84c19d0380617ce2e40a2b42ce9bedf65e52779d"; + sha256 = "1vbb60vb98nqbwrxl6p3gcvjpnjlscp0hp4k53rcgjd75w9vbnsj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv"; - name = "easy-jekyll"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -8289,20 +10853,26 @@ license = lib.licenses.free; }; }) {}; - easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + easy-kill = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "easy-kill"; + ename = "easy-kill"; version = "0.9.3"; src = fetchFromGitHub { owner = "leoliu"; repo = "easy-kill"; - rev = "e3b2442e2096cefff94ea8656e49af07fee58f47"; - sha256 = "0r56nqrj6iaz57ys6hqdq5qkyliv7dj6dv274l228r7x0axrwd9m"; + rev = "20ed0d595e5893e2c57a634a3137ef87b1714f17"; + sha256 = "0ppxx5798zxwm9dzqjmf1maz2a6asv3fwiw8ypdmzx77y0vbckv0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d0a74c2a7d8859e9311bc8d71f5e6cf5a8063b6/recipes/easy-kill"; sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i"; - name = "easy-kill"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -8310,9 +10880,14 @@ license = lib.licenses.free; }; }) {}; - easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + easy-kill-extras = callPackage ({ easy-kill + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "easy-kill-extras"; + ename = "easy-kill-extras"; version = "0.9.4.1"; src = fetchFromGitHub { owner = "knu"; @@ -8320,10 +10895,10 @@ rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd"; sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras"; sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy"; - name = "easy-kill-extras"; + name = "recipe"; }; packageRequires = [ easy-kill ]; meta = { @@ -8331,9 +10906,14 @@ license = lib.licenses.free; }; }) {}; - easy-repeat = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + easy-repeat = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "easy-repeat"; + ename = "easy-repeat"; version = "0.2"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -8341,10 +10921,10 @@ rev = "060f0e6801c82c40c06961dc0528a00e18947a8c"; sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1f5e0d19043f6a24ab4069c9c850e96cbe61a8f/recipes/easy-repeat"; sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06"; - name = "easy-repeat"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -8352,9 +10932,15 @@ license = lib.licenses.free; }; }) {}; - ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ebal = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ebal"; + ename = "ebal"; version = "0.3.1"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -8362,10 +10948,10 @@ rev = "4d19565516785348894c4911e757e33a270b3efd"; sha256 = "1wj9h8ypi70az387c7pcrpc59lpf89dkp2q4df2ighxw3l648mb7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg"; - name = "ebal"; + name = "recipe"; }; packageRequires = [ emacs f ]; meta = { @@ -8373,9 +10959,16 @@ license = lib.licenses.free; }; }) {}; - ebf = callPackage ({ cl-lib ? null, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ebf = callPackage ({ cl-lib ? null + , dash + , dash-functional + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ebf"; + ename = "ebf"; version = "1.0.0"; src = fetchFromGitHub { owner = "rexim"; @@ -8383,10 +10976,10 @@ rev = "d0bd4fe1abbe327e7d9228eff09927fec57e8378"; sha256 = "16hiwz8a1hyyiflzn53v97704v783pg18yxapn7pqk90fbcf7czw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22e2f6383f2a7a01778c0524af19a68af57796ae/recipes/ebf"; sha256 = "072w1hczzb4z0dadvqy8px9zfnfd2z0w8nwa7q2qm5njg30rrqpb"; - name = "ebf"; + name = "recipe"; }; packageRequires = [ cl-lib dash dash-functional ]; meta = { @@ -8394,20 +10987,28 @@ license = lib.licenses.free; }; }) {}; - ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: - melpaBuild { + ebib = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parsebib + , seq }: + melpaBuild { pname = "ebib"; - version = "2.11.8"; + ename = "ebib"; + version = "2.11.11"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "fb43f9354f9f9c4c65091ae15732b1d941475186"; - sha256 = "16l6l2qpkq10wkd95vbch2f7qcsb0jw4rjdf0gck2q8si8i2xi9h"; + rev = "212dea4a52f04eaa1d13a895fffea04f5884f12b"; + sha256 = "150dggfk79pk11qlzfl2sk1xaibdy0sbh6n94r7i2w235p2yg8p5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid"; - name = "ebib"; + name = "recipe"; }; packageRequires = [ dash emacs parsebib seq ]; meta = { @@ -8415,20 +11016,30 @@ license = lib.licenses.free; }; }) {}; - eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: - melpaBuild { + eclim = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild + , popup + , s + , yasnippet }: + melpaBuild { pname = "eclim"; + ename = "eclim"; version = "0.4"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6"; - sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3"; + rev = "6da0025d387119bb88c8bc870156fb1a8411ac4e"; + sha256 = "1jpscpjlfgjcfivz86sg6d41m6c8brwali8annhxwk3qykxdh9ik"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; sha256 = "1n60ci6kjmzy2khr3gs7s8gf21j1f9zjaj5a1yy2dyygsarbxw7b"; - name = "eclim"; + name = "recipe"; }; packageRequires = [ cl-lib dash json popup s yasnippet ]; meta = { @@ -8436,9 +11047,19 @@ license = lib.licenses.free; }; }) {}; - ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ecukes = callPackage ({ ansi + , commander + , dash + , espuds + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ecukes"; + ename = "ecukes"; version = "0.6.17"; src = fetchFromGitHub { owner = "ecukes"; @@ -8446,10 +11067,10 @@ rev = "3a77ba9f1064c2bca47b401974c009e65727c46e"; sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0"; - name = "ecukes"; + name = "recipe"; }; packageRequires = [ ansi commander dash espuds f s ]; meta = { @@ -8457,20 +11078,27 @@ license = lib.licenses.free; }; }) {}; - edbi = callPackage ({ concurrent, ctable, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edbi = callPackage ({ concurrent + , ctable + , epc + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edbi"; + ename = "edbi"; version = "0.1.2"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-edbi"; - rev = "39b833d2e51ae5ce66ebdec7c5425ff0d34e02d2"; - sha256 = "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s"; + rev = "ad3cebf1fa90a92d112ce6ecf404dc0192ea9367"; + sha256 = "0j9pkb4r5rmx0h0rsvgnkp75ars63v6llhv9vc41fbjir14fs81x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/238a11afa52d2c01d69eb16ffd7d07ccd6dff403/recipes/edbi"; sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr"; - name = "edbi"; + name = "recipe"; }; packageRequires = [ concurrent ctable epc ]; meta = { @@ -8478,9 +11106,14 @@ license = lib.licenses.free; }; }) {}; - edbi-minor-mode = callPackage ({ edbi, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edbi-minor-mode = callPackage ({ edbi + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edbi-minor-mode"; + ename = "edbi-minor-mode"; version = "0.1"; src = fetchFromGitHub { owner = "proofit404"; @@ -8488,10 +11121,10 @@ rev = "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec"; sha256 = "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb878b60c7ecbb1e3a47aef1d9765061c510644/recipes/edbi-minor-mode"; sha256 = "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi"; - name = "edbi-minor-mode"; + name = "recipe"; }; packageRequires = [ edbi ]; meta = { @@ -8499,20 +11132,24 @@ license = lib.licenses.free; }; }) {}; - ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ede-php-autoload = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ede-php-autoload"; + ename = "ede-php-autoload"; version = "1.1.0"; src = fetchFromGitHub { owner = "stevenremot"; repo = "ede-php-autoload"; - rev = "28a989232c276ee7fc5112c9050b1c29f628be9f"; - sha256 = "0kc51bb5jxrsra9ycg43n35dd8kngby321qbcixaj68cksf0whrm"; + rev = "3f13302b9e8dbb6a24205c4bc21acadff487d30b"; + sha256 = "03mjw824d0l2g8n07ys3j89x8chbx64znhhz14y6ni4b9650njdf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; sha256 = "0b7qbighncipgfaksvggpyldc5h0wxbjbiyaghglvycc4p1sfjd0"; - name = "ede-php-autoload"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8520,9 +11157,16 @@ license = lib.licenses.free; }; }) {}; - ede-php-autoload-composer-installers = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ede-php-autoload-composer-installers = callPackage ({ ede-php-autoload + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ede-php-autoload-composer-installers"; + ename = "ede-php-autoload-composer-installers"; version = "0.1.0"; src = fetchFromGitHub { owner = "xendk"; @@ -8530,10 +11174,10 @@ rev = "f9942e07d0773444040084ac84652e69f0fd46d5"; sha256 = "04gw8ma5c898ai7haxvdagmxx8zw9ncc9v0cv8a5ddg6arvzkl1z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e0e9058593b32b8d9fd7873d4698b4dd516930f/recipes/ede-php-autoload-composer-installers"; sha256 = "0s7dv81niz4h8kj0648x2nbmz47hqxchfs2rjmjpy2lcbifvj268"; - name = "ede-php-autoload-composer-installers"; + name = "recipe"; }; packageRequires = [ ede-php-autoload f s ]; meta = { @@ -8541,20 +11185,27 @@ license = lib.licenses.free; }; }) {}; - ede-php-autoload-drupal = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ede-php-autoload-drupal = callPackage ({ ede-php-autoload + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ede-php-autoload-drupal"; + ename = "ede-php-autoload-drupal"; version = "0.1.1"; src = fetchFromGitHub { owner = "xendk"; repo = "ede-php-autoload-drupal"; - rev = "6b62ffa7a69f52aab79067eaed80b2720f7e3fc2"; - sha256 = "001yhxngr6h7v1sjz0wskd5dv6fiby7m1mbc8vdz1h93150wzahp"; + rev = "9fbda34704a15136f934d628b2a24b5e30f8510b"; + sha256 = "095w19b9lhqfsf7fg58k5v2w1wxkfc44dd828ah62083a2ph5d56"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal"; sha256 = "139sr7jy5hb8h5zmw5mw01r0dy7yvbbyaxzj62m1a589n8w6a964"; - name = "ede-php-autoload-drupal"; + name = "recipe"; }; packageRequires = [ ede-php-autoload f s ]; meta = { @@ -8562,9 +11213,14 @@ license = lib.licenses.free; }; }) {}; - edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edit-indirect = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edit-indirect"; + ename = "edit-indirect"; version = "0.1.5"; src = fetchFromGitHub { owner = "Fanael"; @@ -8572,10 +11228,10 @@ rev = "032ac0ec690d4999d564fd882588c7a197efe8dd"; sha256 = "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect"; sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439"; - name = "edit-indirect"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -8583,9 +11239,13 @@ license = lib.licenses.free; }; }) {}; - edit-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edit-list = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edit-list"; + ename = "edit-list"; version = "0.3"; src = fetchFromGitHub { owner = "emacsmirror"; @@ -8593,10 +11253,10 @@ rev = "f460d3f9e208a4e606fe6ded307f1b011916ca71"; sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8aa348ce5289a8b1238f186affac1d544af755/recipes/edit-list"; sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv"; - name = "edit-list"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8604,20 +11264,24 @@ license = lib.licenses.free; }; }) {}; - edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edit-server = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edit-server"; + ename = "edit-server"; version = "1.15"; src = fetchFromGitHub { owner = "stsquad"; repo = "emacs_chrome"; - rev = "4e959de2f78268b348d2eaac4e43c846792d345f"; - sha256 = "0xxby3ghs38i1l7kag12rnzlzcg9297pm8k6kqq3aqzsg9d2950y"; + rev = "7e083580f8cc00ee88d9db00b8b47ae4349502a5"; + sha256 = "0kvvs9pkwydarpzmar4mbqvp05jrkvq06yz99l3llklaw09g7bfv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server"; sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0"; - name = "edit-server"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8625,20 +11289,25 @@ license = lib.licenses.free; }; }) {}; - editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + editorconfig = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "editorconfig"; - version = "0.7.11"; + ename = "editorconfig"; + version = "0.7.12"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "2ec90f13ad98481c5324eea4877de7a80d814d86"; - sha256 = "160f7ciy8yp75gja3abm4rjy61wmk2b7b0k032qimiawkvg57bx2"; + rev = "ae856b02a6513521bdf6a77a7ef51805fb0abf57"; + sha256 = "0y13276ajz12rw1xcfqnr7q6kkk6zi0f55p10nblfkhxclhr0f7z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; sha256 = "0zv96m07ml8i3k7zm7sdci4hn611n3ypna7zppfkwbdyr7d5k2gc"; - name = "editorconfig"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -8646,20 +11315,25 @@ license = lib.licenses.free; }; }) {}; - editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + editorconfig-custom-majormode = callPackage ({ editorconfig + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "editorconfig-custom-majormode"; - version = "0.0.1"; + ename = "editorconfig-custom-majormode"; + version = "0.0.3"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-custom-majormode-el"; - rev = "338742889240bad23f8e90c0a89b8e641ce2befa"; - sha256 = "0f3cdg5pdwghm7vyg3kxhddfk0rmjpg30h330pa20pf7qnk3gwip"; + rev = "ae613f0a56364afbbab19d4377c108406d5cfc7c"; + sha256 = "0sm3xdysnqzc6nc2n7rcnr478l7qdy7bv8rhq500240aprzv63y4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd47bf4630442ad1a941ad432cef64c7746aa71/recipes/editorconfig-custom-majormode"; sha256 = "0ykvjg3gwxky6w5cm0y5s63q9820b7d25fy9plw8sarxwy2a5lxy"; - name = "editorconfig-custom-majormode"; + name = "recipe"; }; packageRequires = [ editorconfig ]; meta = { @@ -8667,9 +11341,18 @@ license = lib.licenses.free; }; }) {}; - edn = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, peg, s }: - melpaBuild { + edn = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , peg + , s }: + melpaBuild { pname = "edn"; + ename = "edn"; version = "1.1.2"; src = fetchFromGitHub { owner = "expez"; @@ -8677,10 +11360,10 @@ rev = "bb035dcbeccccdb2c899d2cce8e81486764d0ad7"; sha256 = "06v34l9dkykrrdfpnm3zi5wjm0fdvy76pbkfnk92wqkjp8fqimhd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/305dd770d9db86d5ee602e6bd571b7c4f6c4ddbe/recipes/edn"; sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg"; - name = "edn"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs peg s ]; meta = { @@ -8688,20 +11371,24 @@ license = lib.licenses.free; }; }) {}; - edts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + edts = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "edts"; + ename = "edts"; version = "0.1.0"; src = fetchFromGitHub { owner = "tjarvstrand"; repo = "edts"; - rev = "61855db6f1315ea45f97ed95b47a3f182ec4c6be"; - sha256 = "1a1apa48n24yisd2zw5k4lfkngx3016x6y11qi80hg75vrnmg7f1"; + rev = "f25b8450efaee916900d8cb7b3fb0f3c5d1990f5"; + sha256 = "00i7nd3lkak360klfmq3zngfm251l4d319lrwln0ajlk0x2gljag"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts"; sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr"; - name = "edts"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8709,9 +11396,15 @@ license = lib.licenses.free; }; }) {}; - eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eg = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eg"; + ename = "eg"; version = "1.1"; src = fetchFromGitHub { owner = "davep"; @@ -8719,10 +11412,10 @@ rev = "0791452498719afb7409d1f723dbea2ec26d56f1"; sha256 = "1y16pah8f4jp117vihvlcwvsw2i85gdk45h9y9r1w9mslb24faac"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg"; sha256 = "1ic6qzk0zmay3vvbb8jg35irqkc0k68dmgbq4j9isiawy449zvp7"; - name = "eg"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -8730,20 +11423,24 @@ license = lib.licenses.free; }; }) {}; - egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + egg = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "egg"; + ename = "egg"; version = "1.0.9"; src = fetchFromGitHub { owner = "byplayer"; repo = "egg"; - rev = "499894195528203cfcf309228bf7578dd8cd5698"; - sha256 = "1ryb7smvf66hk307yazkjn9bqzbwzbyyb5db200fq6j2zdjwsmaj"; + rev = "59e87b5f150ba5add385b29f8e07cb41e6588bca"; + sha256 = "16cs1ba2v2pm8wsm6z71s7ad619f45vi4v6hwqswi6fljjhmc175"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1c97870c2641d73685f07a12f010530cc186544/recipes/egg"; sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i"; - name = "egg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8751,20 +11448,24 @@ license = lib.licenses.free; }; }) {}; - egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + egison-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "egison-mode"; + ename = "egison-mode"; version = "3.7.10"; src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "b7c073e0a29c9632d82b501849e270d62304e22f"; - sha256 = "13p6nfsjnbhw0cgy1s28ww9dk4hmwmanf2j6ydhcafvbynp964zs"; + rev = "0f8289294b1a8de029f89643438e8384e7ee789f"; + sha256 = "1rkxz4gj11z1jpd3g71m6sbzb5j4ggm6sixk3r18wb8wv91v4fgs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi"; - name = "egison-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8772,18 +11473,50 @@ license = lib.licenses.free; }; }) {}; - eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + eglot = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , jsonrpc + , lib + , melpaBuild }: + melpaBuild { + pname = "eglot"; + ename = "eglot"; + version = "1.1"; + src = fetchFromGitHub { + owner = "joaotavora"; + repo = "eglot"; + rev = "9211f162dc3eb956c51faeb3e7195603fa84c60c"; + sha256 = "0p3fry60xvh7za0p8pyz4h21nzj6df1cbl9lxdzd19rwfd35fzpp"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6c644530eca56f93d94fac2c9d7663c35c2b8c01/recipes/eglot"; + sha256 = "17w39hcgv4p49g841qaicjdx7xac72yxvsc83jf1rrakg713pj7y"; + name = "recipe"; + }; + packageRequires = [ emacs jsonrpc ]; + meta = { + homepage = "https://melpa.org/#/eglot"; + license = lib.licenses.free; + }; + }) {}; + eide = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eide"; - version = "2.1.2"; + ename = "eide"; + version = "2.1.3"; src = fetchgit { - url = "https://git.tuxfamily.org/eide/emacs-ide.git"; - rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3"; - sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n"; + url = "https://framagit.org/eide/eide.git"; + rev = "7e4f101923d1aaa4ad4626ff60375ece8dd13e1d"; + sha256 = "0j343hdarrlgznc4f59gbix20zlpr4wv5b8db6m0262ajc5q5zfb"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/34b70a5616e27ff9904a2803c86e049acfe9b26d/recipes/eide"; - sha256 = "168f4mz10byq1kdcfd029gkb3j6jk6lc4kdr4g204823x073f0ni"; - name = "eide"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a42244392719c620b47bc43a7a8501dab4b6f74e/recipes/eide"; + sha256 = "1962shxcfn3v1ljann7182ca6ciy5xfbcd6l9l8rc8gikp55qv8m"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8791,20 +11524,33 @@ license = lib.licenses.free; }; }) {}; - ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: - melpaBuild { + ein = callPackage ({ auto-complete + , cl-generic + , dash + , deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , request-deferred + , s + , skewer-mode + , websocket }: + melpaBuild { pname = "ein"; - version = "0.13.0"; + ename = "ein"; + version = "0.14.1"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "213cea559e7a8fb50e303ea25e1626fefddaf4bd"; - sha256 = "18ysd78pfyymqd0f6ipma9p9x61pw21f0jwk118r5yi00wnry9za"; + rev = "fcf9bff0af071f5e2020ac77d9a9473325e4c5bb"; + sha256 = "1xk7k4av9hy0i7zqwpzis0rjp5myvxs52k45ah00zg8wi5hybq1x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r"; - name = "ein"; + name = "recipe"; }; packageRequires = [ auto-complete @@ -8822,9 +11568,13 @@ license = lib.licenses.free; }; }) {}; - eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eink-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eink-theme"; + ename = "eink-theme"; version = "1.0.0"; src = fetchFromGitHub { owner = "maio"; @@ -8832,10 +11582,10 @@ rev = "93d25c097b105594472c4f99d693f439b4b709f0"; sha256 = "0m7qsk378c30fva2n2ag99rsdklx5nsqc395msg1ab11sbpxvis0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme"; sha256 = "0z437cpf1b8bqyi7bv0w0dnc52q4f5g17530lwdcxjkr38s9b1zn"; - name = "eink-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8843,9 +11593,13 @@ license = lib.licenses.free; }; }) {}; - el-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-autoyas = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-autoyas"; + ename = "el-autoyas"; version = "0.5"; src = fetchFromGitHub { owner = "mattfidler"; @@ -8853,10 +11607,10 @@ rev = "bde0251ecb504f585dfa27c205c8e312655310cc"; sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc4845343dbb8f8294394f6850788e4f1fe6b99b/recipes/el-autoyas"; sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c"; - name = "el-autoyas"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8864,9 +11618,13 @@ license = lib.licenses.free; }; }) {}; - el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-get = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-get"; + ename = "el-get"; version = "5.1"; src = fetchFromGitHub { owner = "dimitri"; @@ -8874,10 +11632,10 @@ rev = "bfffd553f4c72b818e9ee94f05458eae7a16056b"; sha256 = "1awyh9ffd6a4cia239s89asb88ddqlnrv757d76vcb701pq412bz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz"; - name = "el-get"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8885,9 +11643,16 @@ license = lib.licenses.free; }; }) {}; - el-init = callPackage ({ anaphora, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-init = callPackage ({ anaphora + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-init"; + ename = "el-init"; version = "0.2.0"; src = fetchFromGitHub { owner = "HKey"; @@ -8895,10 +11660,10 @@ rev = "25fd21d820bca1cf576b8f70c8d5a3bc76792597"; sha256 = "1mzla7ijmq1mgzr6bf16mjdycbf8ylsf4zdk4j6fh5kw5n4k6c5n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c18cc62ffaaf839284ed7b261cc6f375fab813/recipes/el-init"; sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5"; - name = "el-init"; + name = "recipe"; }; packageRequires = [ anaphora cl-lib emacs ]; meta = { @@ -8906,20 +11671,30 @@ license = lib.licenses.free; }; }) {}; - el-init-viewer = callPackage ({ anaphora, cl-lib ? null, ctable, dash, el-init, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-init-viewer = callPackage ({ anaphora + , cl-lib ? null + , ctable + , dash + , el-init + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-init-viewer"; + ename = "el-init-viewer"; version = "0.1.0"; src = fetchFromGitHub { owner = "HKey"; repo = "el-init-viewer"; - rev = "dcc595ba51b5aff972292278aa528c7ddb46f1b5"; - sha256 = "1488wv0f9ihzzf9fl8cki044k61b0kva604hdwpb2qk9gnjr4g1l"; + rev = "5e42667c53aa096f671c011474e0d75cf1947a18"; + sha256 = "057hbf78p8ihpnschmzng4yn1jqpw12drvgxk4l8csr3fpqw4spf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f90e6be757783352c4a7732177ff2e2c0a066247/recipes/el-init-viewer"; sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m"; - name = "el-init-viewer"; + name = "recipe"; }; packageRequires = [ anaphora cl-lib ctable dash el-init emacs ]; meta = { @@ -8927,9 +11702,13 @@ license = lib.licenses.free; }; }) {}; - el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-mock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-mock"; + ename = "el-mock"; version = "1.25.1"; src = fetchFromGitHub { owner = "rejeep"; @@ -8937,10 +11716,10 @@ rev = "3069931de75bb6704ecf565af5390009dc4dae00"; sha256 = "13mv1rhgkwiww2wh5w926jz7idppp492wir1vdl245c5x50dh4f7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock"; sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l"; - name = "el-mock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8948,20 +11727,25 @@ license = lib.licenses.free; }; }) {}; - el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-patch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-patch"; - version = "1.2"; + ename = "el-patch"; + version = "2.1"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "cc26f37e19ebc60ca75067115d3794cda88003c5"; - sha256 = "0b8yy51dy5280y7yvq0ylm20m9bvzi7lzs3c9m1i2gb3ssx7267w"; + rev = "c10108162bc72b8d09ccf9c914e892e1209f9c20"; + sha256 = "0fibq04fncv8pia8xjaxc6gc4x046cg26ag6dw6gg0wj79gpyrv9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; sha256 = "1imijmsni8c8fxjrzprnanf94c1pma3h5w9p75c4y99l8l3xmj7g"; - name = "el-patch"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -8969,9 +11753,13 @@ license = lib.licenses.free; }; }) {}; - el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-spice = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-spice"; + ename = "el-spice"; version = "0.3.0"; src = fetchFromGitHub { owner = "vedang"; @@ -8979,10 +11767,10 @@ rev = "972dace20ec61cd27b9322432d0c7a688c6f061a"; sha256 = "1wrb46y4s4v0lwwyriz2qn1j1l804jyb4dmadf462jxln85rml70"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4666eee9f6837d6d9dba77e04aa4c8c4a93b47b5/recipes/el-spice"; sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg"; - name = "el-spice"; + name = "recipe"; }; packageRequires = []; meta = { @@ -8990,20 +11778,24 @@ license = lib.licenses.free; }; }) {}; - el-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el-x = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el-x"; + ename = "el-x"; version = "0.3.1"; src = fetchFromGitHub { owner = "sigma"; repo = "el-x"; - rev = "e96541c1f32e0a3aca4ad0a0eb382bd898250163"; - sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5"; + rev = "b0b69b182f7a81a550ccf9b3a14d8d91560b4f70"; + sha256 = "1dky0vydwh7l786w7gci4x17kkf6dg8gijmqzl4y0ij9zm9kfxzz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0346f6349cf39a0414cd055b06d8ed193f4972d4/recipes/el-x"; sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g"; - name = "el-x"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9011,9 +11803,14 @@ license = lib.licenses.free; }; }) {}; - el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + el2org = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "el2org"; + ename = "el2org"; version = "0.6.0"; src = fetchFromGitHub { owner = "tumashu"; @@ -9021,10 +11818,10 @@ rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e"; sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; sha256 = "02kyvzpjws2mrp414i4zm4fmrnzgkaax6bnrlyhp17a8aqaggbnh"; - name = "el2org"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9032,9 +11829,15 @@ license = lib.licenses.free; }; }) {}; - elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + elbank = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "elbank"; + ename = "elbank"; version = "1.2"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -9042,10 +11845,10 @@ rev = "f494716105b1a9f4f52f43bc3dd37c9cd0309bf5"; sha256 = "0bvx6nq0gjjbjs0mzd1x1ajyjpa181z0n4kv4aknh3is210gbpbb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; sha256 = "1ry84aiajyrnrspf7w4yjm0rmdam8ijrz0s7291yr8c70hslc997"; - name = "elbank"; + name = "recipe"; }; packageRequires = [ emacs seq ]; meta = { @@ -9053,9 +11856,41 @@ license = lib.licenses.free; }; }) {}; - eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elcouch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , json-mode + , lib + , libelcouch + , melpaBuild }: + melpaBuild { + pname = "elcouch"; + ename = "elcouch"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "elcouch"; + rev = "d22e8cab9328966b2e2d5bc4fc17a4abbb222736"; + sha256 = "0l9ah3ijlidjshwkazfcdasm3hmigw8dcyqgi9pmpv0kw9096y64"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d9a35dd5a272a592d248993ea7e5dda8fdf0ab/recipes/elcouch"; + sha256 = "1dp7chvnz6gadqgyqbvdxpva3hm3sx60izsa690mp2rifjyxgqf1"; + name = "recipe"; + }; + packageRequires = [ emacs json-mode libelcouch ]; + meta = { + homepage = "https://melpa.org/#/elcouch"; + license = lib.licenses.free; + }; + }) {}; + eldoc-eval = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eldoc-eval"; + ename = "eldoc-eval"; version = "1.1"; src = fetchFromGitHub { owner = "thierryvolpiatto"; @@ -9063,10 +11898,10 @@ rev = "deca5e39f31282a06531002d289258cd099433c0"; sha256 = "1fh9dx669czkwy4msylcg64azz3az27akx55ipnazb5ghmsi7ivk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63ba2004d3db4c5a71676dca82ad880328cf6073/recipes/eldoc-eval"; sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c"; - name = "eldoc-eval"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9074,9 +11909,16 @@ license = lib.licenses.free; }; }) {}; - electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { + electric-operator = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names }: + melpaBuild { pname = "electric-operator"; + ename = "electric-operator"; version = "1.0.0"; src = fetchFromGitHub { owner = "davidshepherd7"; @@ -9084,10 +11926,10 @@ rev = "16df9e16da8efe25d410ba17165d7f5c1ad4e043"; sha256 = "010zr6dgix6bf8xshs8kascpzcrg83vqd1w71qin9anw6rf3z4d4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2"; - name = "electric-operator"; + name = "recipe"; }; packageRequires = [ dash emacs names ]; meta = { @@ -9095,9 +11937,14 @@ license = lib.licenses.free; }; }) {}; - elf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elf-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elf-mode"; + ename = "elf-mode"; version = "0.1.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -9105,10 +11952,10 @@ rev = "cd280d683cd3341d8bb31af6db7e3b74a133e6ab"; sha256 = "0cbvjbk2893ag1iy8ggixpirfiyhssm7fii96hb9jqdz874cdl0k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/368d1ff91f310e5ffe68f872ab0a91584a41a66e/recipes/elf-mode"; sha256 = "0xwpaqg4mc0a0d8a4dxbd1sqzvi01gfhwr75f7i3sjzx0fj8vcwd"; - name = "elf-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9116,20 +11963,25 @@ license = lib.licenses.free; }; }) {}; - elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elfeed = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elfeed"; - version = "2.3.0"; + ename = "elfeed"; + version = "3.0.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "00b25d974abc4f3e61676068397758035bfdfc30"; - sha256 = "0qivqhz2mhjyqrqkfjrv8q6387cbzwvmyay2jbws5vibwbxjciwz"; + rev = "7e0abfee1470ae6323b559a7a9f843dd0076d622"; + sha256 = "01x4ww63lvn04c7f3ab5vx2s20xqisvv8213qwswz7vr9nxja5yi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9"; - name = "elfeed"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9137,20 +11989,27 @@ license = lib.licenses.free; }; }) {}; - elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elfeed-protocol = callPackage ({ cl-lib ? null + , elfeed + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elfeed-protocol"; - version = "0.5.2"; + ename = "elfeed-protocol"; + version = "0.5.3"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "e809a0f1c5b9713ec8d1932fa6412c57bc10150b"; - sha256 = "0ly7g9a85r5vm8fr45km43vdl9jbzdqyiy9a7d95wx63p6aip7vs"; + rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec"; + sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; sha256 = "1gd2ny764qsnnqf3j7rbdqhh7hqd5c0fzwxx6wacd0dpbq4w56qi"; - name = "elfeed-protocol"; + name = "recipe"; }; packageRequires = [ cl-lib elfeed emacs ]; meta = { @@ -9158,20 +12017,27 @@ license = lib.licenses.free; }; }) {}; - elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: - melpaBuild { + elfeed-web = callPackage ({ elfeed + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , simple-httpd }: + melpaBuild { pname = "elfeed-web"; - version = "2.3.0"; + ename = "elfeed-web"; + version = "3.0.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "00b25d974abc4f3e61676068397758035bfdfc30"; - sha256 = "0qivqhz2mhjyqrqkfjrv8q6387cbzwvmyay2jbws5vibwbxjciwz"; + rev = "7e0abfee1470ae6323b559a7a9f843dd0076d622"; + sha256 = "01x4ww63lvn04c7f3ab5vx2s20xqisvv8213qwswz7vr9nxja5yi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n"; - name = "elfeed-web"; + name = "recipe"; }; packageRequires = [ elfeed emacs simple-httpd ]; meta = { @@ -9179,9 +12045,17 @@ license = lib.licenses.free; }; }) {}; - elisp-def = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + elisp-def = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "elisp-def"; + ename = "elisp-def"; version = "1.0"; src = fetchFromGitHub { owner = "Wilfred"; @@ -9189,10 +12063,10 @@ rev = "5e0d766a5db537f4e7145c2053c22829d736ceba"; sha256 = "0l9az09yw40rr2xrvf01c3idfqplddr1kk880qscnzj8v9p06l4x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def"; sha256 = "1y29nsgjv9nb03g0jc5hb1a8k23r54ivdlv9h0a384cig8i91hsz"; - name = "elisp-def"; + name = "recipe"; }; packageRequires = [ dash emacs f s ]; meta = { @@ -9200,9 +12074,14 @@ license = lib.licenses.free; }; }) {}; - elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elisp-lint = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elisp-lint"; + ename = "elisp-lint"; version = "0.2.0"; src = fetchFromGitHub { owner = "gonewest818"; @@ -9210,10 +12089,10 @@ rev = "9d894e99377859171ee54cb7d2b2e7f2cc7c267c"; sha256 = "11pvqskjhxxsyxmy8wllqwa0qg0j9280h0m5rzjghgsdcnlisyvq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint"; sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63"; - name = "elisp-lint"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9221,30 +12100,42 @@ license = lib.licenses.free; }; }) {}; - elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: - melpaBuild { + elisp-refs = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , loop + , melpaBuild + , s }: + melpaBuild { pname = "elisp-refs"; - version = "1.2"; + ename = "elisp-refs"; + version = "1.3"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "8f2da5ba5b728a8f278813c95d0fda3364cca40c"; - sha256 = "0i0xjy4x3i349jbpbqhfz57frk8cdakwi78fw1mlycx4qinlx2n0"; + rev = "788f6f65d5171b1887b3ff9e4cad900e8046b2b1"; + sha256 = "0c7hcbjqynw6k5idpmfxn6xbr192ahhk8a2g72npap97flpw6cdq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx"; - name = "elisp-refs"; + name = "recipe"; }; - packageRequires = [ dash f list-utils loop s ]; + packageRequires = [ dash loop s ]; meta = { homepage = "https://melpa.org/#/elisp-refs"; license = lib.licenses.free; }; }) {}; - elisp-slime-nav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elisp-slime-nav = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elisp-slime-nav"; + ename = "elisp-slime-nav"; version = "0.9"; src = fetchFromGitHub { owner = "purcell"; @@ -9252,10 +12143,10 @@ rev = "0e96d9f1f0d334f09414b509d44d5c000b51f432"; sha256 = "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/elisp-slime-nav"; sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c"; - name = "elisp-slime-nav"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -9263,9 +12154,15 @@ license = lib.licenses.free; }; }) {}; - elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + elixir-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "elixir-mode"; + ename = "elixir-mode"; version = "2.3.1"; src = fetchFromGitHub { owner = "elixir-lang"; @@ -9273,10 +12170,10 @@ rev = "a1f4d60ec555574c945201359d2e32b183c69f4b"; sha256 = "06bi68x49v6f7flpz279mm4jpg31ll3s274givm3pvr8slcxs6xg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode"; sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf"; - name = "elixir-mode"; + name = "recipe"; }; packageRequires = [ emacs pkg-info ]; meta = { @@ -9284,9 +12181,14 @@ license = lib.licenses.free; }; }) {}; - elixir-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + elixir-yasnippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "elixir-yasnippets"; + ename = "elixir-yasnippets"; version = "0.0.1"; src = fetchFromGitHub { owner = "hisea"; @@ -9294,10 +12196,10 @@ rev = "6b55c88ce483932f226b6bca0212b589d1d393ea"; sha256 = "0dx5h3sfccc2bp1jxnqqki95x5hp1skw8n5n4lnh703yjga5gkrz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c37a13d56e9a0a4e7e2c11349ed87610a0f6b2c/recipes/elixir-yasnippets"; sha256 = "0vmkcd88wfafv31lyw0983p4qjj387qf258q7py1ij47fcmfp579"; - name = "elixir-yasnippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -9305,9 +12207,17 @@ license = lib.licenses.free; }; }) {}; - elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: - melpaBuild { + elm-mode = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , s }: + melpaBuild { pname = "elm-mode"; + ename = "elm-mode"; version = "0.20.3"; src = fetchFromGitHub { owner = "jcollard"; @@ -9315,10 +12225,10 @@ rev = "29f50a940113d793a21998f3bb414fdd9b0c5daa"; sha256 = "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1"; - name = "elm-mode"; + name = "recipe"; }; packageRequires = [ emacs f let-alist s ]; meta = { @@ -9326,9 +12236,15 @@ license = lib.licenses.free; }; }) {}; - elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + elmacro = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "elmacro"; + ename = "elmacro"; version = "1.1.0"; src = fetchFromGitHub { owner = "Silex"; @@ -9336,10 +12252,10 @@ rev = "9ed19a362b63d9c7436a78feb91bc694194cfefe"; sha256 = "00qqa9p9z50gxna4qrsvph4nj41gldl1qj210ywk3lgwn0jjm0k9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro"; sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz"; - name = "elmacro"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -9347,9 +12263,13 @@ license = lib.licenses.free; }; }) {}; - elmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elmine = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elmine"; + ename = "elmine"; version = "0.3"; src = fetchFromGitHub { owner = "leoc"; @@ -9357,10 +12277,10 @@ rev = "091f61c70c9e7630a74b7b127488051d143a35e7"; sha256 = "080nnw6ddsczbm7gk50x4dkahi77fsybfiki5iyp39fjpa7lfzq3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elmine"; sha256 = "1xkx1wwrzd2dl13z8n4qh3gl202j0i9crab5b3788z8mq0g4v4bn"; - name = "elmine"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9368,9 +12288,13 @@ license = lib.licenses.free; }; }) {}; - elpa-audit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elpa-audit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elpa-audit"; + ename = "elpa-audit"; version = "0.4"; src = fetchFromGitHub { owner = "purcell"; @@ -9378,10 +12302,10 @@ rev = "a7a1806278c73ea6cb6d235714e7bc8088971df5"; sha256 = "1q4krfrc2dy0vr7q148msfpkcwj55mlsrn4n5xjnya4xj0134ib7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elpa-audit"; sha256 = "18a8n22g53d8fxzr3snb2px28gvxbkx44grrx8lywaprz1f1lwdi"; - name = "elpa-audit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9389,9 +12313,15 @@ license = lib.licenses.free; }; }) {}; - elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elpa-clone = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elpa-clone"; + ename = "elpa-clone"; version = "0.0.6"; src = fetchFromGitHub { owner = "dochang"; @@ -9399,10 +12329,10 @@ rev = "92f4c9d3570ad002575a90d0cc4a522c203a1110"; sha256 = "0m5w5wgyslvakcqpr3d198sy3561w2h002gflw0jp47v17hba1r7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone"; sha256 = "172gpmpwf75y41n3v05l47w34x83vy63bqk97fd8a6b4dkj91lqa"; - name = "elpa-clone"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -9410,9 +12340,14 @@ license = lib.licenses.free; }; }) {}; - elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elpa-mirror = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elpa-mirror"; + ename = "elpa-mirror"; version = "2.1.1"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -9420,31 +12355,42 @@ rev = "83a38b5721c459d311833522903de96f874e1a4e"; sha256 = "0j2nk1nhbihfqajkmzp3501mhv5617qhb7qbj46qz8azs8a1dvri"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8"; - name = "elpa-mirror"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/elpa-mirror"; license = lib.licenses.free; }; }) {}; - elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: - melpaBuild { + elpy = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , find-file-in-project + , highlight-indentation + , lib + , melpaBuild + , pyvenv + , s + , yasnippet }: + melpaBuild { pname = "elpy"; - version = "1.19.0"; + ename = "elpy"; + version = "1.22.0"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "8b04039b8112fd18392861718dc30ba011626dee"; - sha256 = "0yyn1a8sdn8avmwmlg98365irr9b2rx2jrjxs3y93d1bhlmr816i"; + rev = "47eac168f38e40fc07f56ea37fb1bee7f645e42a"; + sha256 = "09inijph1r0l94balf0z01g2dgx22y53c346cxf4fkm2hcjd2fd7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; sha256 = "1ri3dwnkw005plj1g5grmmq9np41sqk4s2v18pwsvr18ysnq6nnr"; - name = "elpy"; + name = "recipe"; }; packageRequires = [ company @@ -9460,20 +12406,25 @@ license = lib.licenses.free; }; }) {}; - elscreen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elscreen = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elscreen"; - version = "2018snapshot3snapshot21"; + ename = "elscreen"; + version = "2018.-4.3.-4.21"; src = fetchFromGitHub { owner = "knu"; repo = "elscreen"; rev = "02164afab2c5fbff6e4aa7c59e0daedc6c504772"; sha256 = "1jzp7w2c9xl8x8kdxcchgp8s3ygvj70pi2vwwg1qilkya7yv61p0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6140694c1dea0a573586d23d1f63d46c9b22936/recipes/elscreen"; sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s"; - name = "elscreen"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9481,9 +12432,15 @@ license = lib.licenses.free; }; }) {}; - elscreen-fr = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + elscreen-fr = callPackage ({ elscreen + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "elscreen-fr"; + ename = "elscreen-fr"; version = "0.0.3"; src = fetchFromGitHub { owner = "rocher"; @@ -9491,10 +12448,10 @@ rev = "b9c11f80d277086d5d5bf88623e15fc7adbbbe3c"; sha256 = "1dz8jqd2agh06hya59vbybrmgyhyz2rk6c9panrm49w37v0bwksb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18730986df5eb9816eec7ad479abe1e338d3c66f/recipes/elscreen-fr"; sha256 = "1kmga1zz9mb3hxd2sxja2vz45pix5a52yl0g9z4vmak32x9rgqrm"; - name = "elscreen-fr"; + name = "recipe"; }; packageRequires = [ elscreen seq ]; meta = { @@ -9502,9 +12459,14 @@ license = lib.licenses.free; }; }) {}; - elscreen-mew = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elscreen-mew = callPackage ({ elscreen + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elscreen-mew"; + ename = "elscreen-mew"; version = "1.0.2"; src = fetchFromGitHub { owner = "masutaka"; @@ -9512,10 +12474,10 @@ rev = "89871fad690ae161dc076e16ef481b1965612077"; sha256 = "14hwl5jzmm43qa4jbpsyswbz4hk1l2iwqh3ank6502bz58877k6c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47404ea3cfb591b780ca7e31095951a708b0a6b7/recipes/elscreen-mew"; sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4"; - name = "elscreen-mew"; + name = "recipe"; }; packageRequires = [ elscreen ]; meta = { @@ -9523,9 +12485,14 @@ license = lib.licenses.free; }; }) {}; - elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elwm = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elwm"; + ename = "elwm"; version = "0.0.2"; src = fetchFromGitHub { owner = "Fuco1"; @@ -9533,10 +12500,10 @@ rev = "c33b183f006ad476c3a44dab316f580f8b369930"; sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb45a6141b797243973695be4c0582c9ad6965d/recipes/elwm"; sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9"; - name = "elwm"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -9544,20 +12511,25 @@ license = lib.licenses.free; }; }) {}; - elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + elx = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "elx"; - version = "1.2.2"; + ename = "elx"; + version = "1.2.4"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "c5fb4853d8a7d266c8d484522cbaa6b31e745695"; - sha256 = "1lc9kdflssp4j220p252hskd5ikl0fbvhqp6fksfynrj1j02p4jg"; + rev = "10a21c35915e249d5487aa3ced70fcfb749a9d0c"; + sha256 = "1jl2lp4gas89vx1xjx5gzh56fhx16mvfqwqs84cpxdbwb2qzch21"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz"; - name = "elx"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9565,9 +12537,13 @@ license = lib.licenses.free; }; }) {}; - emacs-setup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacs-setup = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacs-setup"; + ename = "emacs-setup"; version = "1.0"; src = fetchFromGitHub { owner = "echosa"; @@ -9575,10 +12551,10 @@ rev = "cc36ad5318c6c0e65d1b9ff8dff5ea2437675de2"; sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abb7101b2d48af56af09d1dc85c540300dba7b3c/recipes/emacs-setup"; sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh"; - name = "emacs-setup"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9586,20 +12562,25 @@ license = lib.licenses.free; }; }) {}; - emacsagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsagist = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsagist"; + ename = "emacsagist"; version = "1.0.0"; src = fetchFromGitHub { owner = "echosa"; repo = "emacsagist"; - rev = "aba342ba59c254a88017f25e9fb7a8cd6f2fda83"; - sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2"; + rev = "539b9c4c0652d793391135ba1fc2e503dbb7deba"; + sha256 = "0n5cpmbyf8mhq03ikhzbycjwkxv3fmjwq1a9zvv3z9ik8yxnbw99"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/07612d46faebb28e1eeb8ddae2ac20e2dc0175f6/recipes/emacsagist"; sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64"; - name = "emacsagist"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -9607,9 +12588,13 @@ license = lib.licenses.free; }; }) {}; - emacsc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsc"; + ename = "emacsc"; version = "1.2.20131027"; src = fetchFromGitHub { owner = "knu"; @@ -9617,10 +12602,10 @@ rev = "69607bdc3a0c070e924a3bcac93180f917992368"; sha256 = "1r6cpb7fck5znb7q7zrxcsjn7d3xiqhq8dp1ar1rsd6k4h05by4j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/emacsc"; sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk"; - name = "emacsc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9628,9 +12613,17 @@ license = lib.licenses.free; }; }) {}; - emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: - melpaBuild { + emacsql = callPackage ({ cl-generic + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , finalize + , lib + , melpaBuild }: + melpaBuild { pname = "emacsql"; + ename = "emacsql"; version = "2.0.3"; src = fetchFromGitHub { owner = "skeeto"; @@ -9638,10 +12631,10 @@ rev = "dcf0dda9391f3978896547582efb72b5632c2ffe"; sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; - sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax"; - name = "emacsql"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9c3b6175b5c64f03b0b9dfdc10f393081d681309/recipes/emacsql"; + sha256 = "0c2d0kymzr53wh87fq1wy2x5ahfsymz0cw8qbrqx0k613l3mpr38"; + name = "recipe"; }; packageRequires = [ cl-generic cl-lib emacs finalize ]; meta = { @@ -9649,20 +12642,28 @@ license = lib.licenses.free; }; }) {}; - emacsql-mysql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsql-mysql = callPackage ({ cl-generic + , cl-lib ? null + , emacs + , emacsql + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsql-mysql"; + ename = "emacsql-mysql"; version = "2.0.3"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "dcf0dda9391f3978896547582efb72b5632c2ffe"; - sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; + rev = "5df2891557f52eadd094eca618775163b1618af5"; + sha256 = "18916pxlgamprv9lk0g0bfyx040imyfzry5r35gyf4s4jb8kjnsm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy"; - name = "emacsql-mysql"; + name = "recipe"; }; packageRequires = [ cl-generic cl-lib emacs emacsql ]; meta = { @@ -9670,20 +12671,29 @@ license = lib.licenses.free; }; }) {}; - emacsql-psql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: - melpaBuild { + emacsql-psql = callPackage ({ cl-generic + , cl-lib ? null + , emacs + , emacsql + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pg }: + melpaBuild { pname = "emacsql-psql"; + ename = "emacsql-psql"; version = "2.0.3"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "dcf0dda9391f3978896547582efb72b5632c2ffe"; - sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; + rev = "5df2891557f52eadd094eca618775163b1618af5"; + sha256 = "18916pxlgamprv9lk0g0bfyx040imyfzry5r35gyf4s4jb8kjnsm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3"; - name = "emacsql-psql"; + name = "recipe"; }; packageRequires = [ cl-generic cl-lib emacs emacsql pg ]; meta = { @@ -9691,20 +12701,28 @@ license = lib.licenses.free; }; }) {}; - emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsql-sqlite = callPackage ({ cl-generic + , cl-lib ? null + , emacs + , emacsql + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsql-sqlite"; + ename = "emacsql-sqlite"; version = "2.0.3"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "dcf0dda9391f3978896547582efb72b5632c2ffe"; - sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; + rev = "e597696682a9a7f9d2a8350dfe1f7beb05365da4"; + sha256 = "1900aca9nbcwmmmpm5h46zblzay47i2v4x4zb0w7mnzcidq8g1h4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x"; - name = "emacsql-sqlite"; + name = "recipe"; }; packageRequires = [ cl-generic cl-lib emacs emacsql ]; meta = { @@ -9712,20 +12730,24 @@ license = lib.licenses.free; }; }) {}; - emacsshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emacsshot = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emacsshot"; + ename = "emacsshot"; version = "0.4"; src = fetchFromGitHub { owner = "marcowahl"; repo = "emacsshot"; - rev = "f2f8996d877ece5469c459c9bb7f33fe43c95822"; - sha256 = "00q344vgihl2s0snibfwsjvxqkbvy2jlqnnid7qw5gcni673b2hl"; + rev = "eeb4bf9cc9d15250fc3c080492dd147ecd378bce"; + sha256 = "1wqxhdhblf0v32sk1q92hnsgzjl13vvwsh9l35mkfn8563ih6il5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efdd85accc6053f92efcbfdb7ddc37b23a07a3b0/recipes/emacsshot"; sha256 = "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j"; - name = "emacsshot"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9733,9 +12755,14 @@ license = lib.licenses.free; }; }) {}; - emamux = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emamux = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emamux"; + ename = "emamux"; version = "0.14"; src = fetchFromGitHub { owner = "syohex"; @@ -9743,10 +12770,10 @@ rev = "573dd1cf18584a1fd240efb16c7726b6fd790b73"; sha256 = "19y69qw79miim9cz5ji54gwspjkcp9g2c1xr5s7jj2fiabnxax6b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux"; sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz"; - name = "emamux"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -9754,9 +12781,40 @@ license = lib.licenses.free; }; }) {}; - embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "embrace"; + emaps = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "emaps"; + ename = "emaps"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "GuiltyDolphin"; + repo = "emaps"; + rev = "823b8f72e6459c9f1a5dd62451ee4005ef71d955"; + sha256 = "1g9637j8f65q3l6k4aw5p847m891irh74kg3pa2p9w0ppsa6n3jm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4faeda02aabc0b6c5003cdf5d1fdfca0fd71b0d7/recipes/emaps"; + sha256 = "151rh6lyqi0ps2w022shzjj67nkg6y4m1nfj90qyc7jgl64qb9qw"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/emaps"; + license = lib.licenses.free; + }; + }) {}; + embrace = callPackage ({ cl-lib ? null + , expand-region + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "embrace"; + ename = "embrace"; version = "0.1.4"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -9764,10 +12822,10 @@ rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2"; sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace"; sha256 = "1w9zp9n91703d6jd4adl2xk574wsr7fm2a9v32b1i9bi3hr0hdjc"; - name = "embrace"; + name = "recipe"; }; packageRequires = [ cl-lib expand-region ]; meta = { @@ -9775,9 +12833,13 @@ license = lib.licenses.free; }; }) {}; - emmet-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emmet-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emmet-mode"; + ename = "emmet-mode"; version = "1.0.8"; src = fetchFromGitHub { owner = "smihica"; @@ -9785,10 +12847,10 @@ rev = "bf76d717c60f33d223cdac35513105e9f9244885"; sha256 = "1dsa85bk33j90h1ypaz1ylqh9yp2xvlga237h3kwa5y3sb0d5ydi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/emmet-mode"; sha256 = "0wjv4hqddjvbdrmsxzav5rpwnm2n6lr86jzkrnav8f2kyzypdsnr"; - name = "emmet-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9796,19 +12858,24 @@ license = lib.licenses.free; }; }) {}; - emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + emms = callPackage ({ cl-lib ? null + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms"; - version = "4.4"; + ename = "emms"; + version = "5.0"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "88fecd0234da595843ce6be4d3f9f2b755ff612d"; - sha256 = "0ycm2lggljhzrb10r3c322c7bb580gk125x9nvpvjrvsp74p8im0"; + rev = "cffef39bd9297154b3ed91a68f8fc230e0f87fba"; + sha256 = "1xzfpmcp3vnslv38ql7ympmmcbl0q3wzdvkbfn245g94iyz3a97f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94"; - name = "emms"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -9816,9 +12883,15 @@ license = lib.licenses.free; }; }) {}; - emms-mode-line-cycle = callPackage ({ emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emms-mode-line-cycle = callPackage ({ emacs + , emms + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms-mode-line-cycle"; + ename = "emms-mode-line-cycle"; version = "0.2.5"; src = fetchFromGitHub { owner = "momomo5717"; @@ -9826,10 +12899,10 @@ rev = "2c2f395e484a1d345050ddd61ff5fab71a92a6bc"; sha256 = "0q80f0plch6k4lhs8c9qm3mfycfbp3kn5sjrk9zxgxwnn901y9mp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dab676acd774616a32a0373f30647f3cb4522afc/recipes/emms-mode-line-cycle"; sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca"; - name = "emms-mode-line-cycle"; + name = "recipe"; }; packageRequires = [ emacs emms ]; meta = { @@ -9837,20 +12910,25 @@ license = lib.licenses.free; }; }) {}; - emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emms-player-mpv = callPackage ({ emms + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms-player-mpv"; - version = "0.0.13"; + ename = "emms-player-mpv"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "6d526fe618c3cebf7fbc5f0d3f0a225de16a76c7"; - sha256 = "0jq67lngpz7iqwqfsl95r5p26cnnq7ldcj534nm86hwm6jfij564"; + rev = "9c9ffc6f00a737a6db6377681a88e5292ebcf86b"; + sha256 = "17kvkx63q30p5r2lsv6pqdm2zi8my3yn3js7j3c2qlygd9sf80pz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y"; - name = "emms-player-mpv"; + name = "recipe"; }; packageRequires = [ emms ]; meta = { @@ -9858,9 +12936,16 @@ license = lib.licenses.free; }; }) {}; - emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emms-player-simple-mpv = callPackage ({ cl-lib ? null + , emacs + , emms + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms-player-simple-mpv"; + ename = "emms-player-simple-mpv"; version = "0.4.0"; src = fetchFromGitHub { owner = "momomo5717"; @@ -9868,10 +12953,10 @@ rev = "bcc056364df5f405716006a8b7bb90102a57f62f"; sha256 = "0kz31qsn3nrpi8r31nlxlkkkah0qcdkq9a9i9ypv4ky7pvnzx6m5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv"; sha256 = "1lv1rhd5vya068mnnaysfh56raar79hf2g413ysrk3yhyajk6316"; - name = "emms-player-simple-mpv"; + name = "recipe"; }; packageRequires = [ cl-lib emacs emms ]; meta = { @@ -9879,9 +12964,14 @@ license = lib.licenses.free; }; }) {}; - emms-state = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emms-state = callPackage ({ emms + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emms-state"; + ename = "emms-state"; version = "0.2"; src = fetchFromGitHub { owner = "alezost"; @@ -9889,10 +12979,10 @@ rev = "77930300222333b71eafd495cc1fee3a3585eb23"; sha256 = "1kipxa9ax8zi9qqk19mknpg7nnlzgr734kh9bnklydipwnsy00pi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2798e22c6ccbadf73e65d8a8d901e47f55cb83/recipes/emms-state"; sha256 = "080y02hxxqfn0a0dhq5vm0r020v2q3h1612a2zkq5fxi8ssvhp9i"; - name = "emms-state"; + name = "recipe"; }; packageRequires = [ emms ]; meta = { @@ -9900,9 +12990,15 @@ license = lib.licenses.free; }; }) {}; - emoji-cheat-sheet-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + emoji-cheat-sheet-plus = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "emoji-cheat-sheet-plus"; + ename = "emoji-cheat-sheet-plus"; version = "1.2.1"; src = fetchFromGitHub { owner = "syl20bnr"; @@ -9910,10 +13006,10 @@ rev = "96a003127d646a2683d81ca906a17eace0a6413e"; sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffbfae9577673ef8d50b55624f94288e315deba4/recipes/emoji-cheat-sheet-plus"; sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv"; - name = "emoji-cheat-sheet-plus"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -9921,9 +13017,13 @@ license = lib.licenses.free; }; }) {}; - emoji-fontset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + emoji-fontset = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "emoji-fontset"; + ename = "emoji-fontset"; version = "0.1.1"; src = fetchFromGitHub { owner = "zonuexe"; @@ -9931,10 +13031,10 @@ rev = "e460c9a08e48ec4103e38a7a04acae20880149a9"; sha256 = "0xdlqsrwdf0smi5z9rjj46nwrrfpl0gzanf0jmdg8zzn62l6ldck"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60df435eb82fcc9a8a02a0a271bb6a2d5a161bc4/recipes/emoji-fontset"; sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d"; - name = "emoji-fontset"; + name = "recipe"; }; packageRequires = []; meta = { @@ -9942,9 +13042,16 @@ license = lib.licenses.free; }; }) {}; - emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: - melpaBuild { + emojify = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "emojify"; + ename = "emojify"; version = "1.0"; src = fetchFromGitHub { owner = "iqbalansari"; @@ -9952,10 +13059,10 @@ rev = "9fac58de9b8f7539bfd4c6983bc826e27d060b30"; sha256 = "1z5j4nr9c6806f6ys4p3b2byxca7zc34ap1bysai8nvzxz02rzf6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; sha256 = "1sgd32qm43hwby75a9q2pz1yfzj988i35d8p9f18zvbxypy7b2yp"; - name = "emojify"; + name = "recipe"; }; packageRequires = [ emacs ht seq ]; meta = { @@ -9963,25 +13070,42 @@ license = lib.licenses.free; }; }) {}; - emr = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }: - melpaBuild { + emr = callPackage ({ cl-lib ? null + , clang-format + , dash + , emacs + , fetchFromGitHub + , fetchurl + , iedit + , lib + , list-utils + , melpaBuild + , paredit + , popup + , projectile + , redshank + , s }: + melpaBuild { pname = "emr"; - version = "0.3.6"; + ename = "emr"; + version = "0.3.7"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "emacs-refactor"; - rev = "fd20fc1887e2ebcf752f0170b1f3bf697043fd4b"; - sha256 = "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4"; + rev = "ff330b50526fa6da34bd410b506cb89408ef8c1e"; + sha256 = "1jbyg3b1y8rs2s7xq79gzllfnxcr1whg6zja2kl7zk23kkn65s7r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr"; sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x"; - name = "emr"; + name = "recipe"; }; packageRequires = [ cl-lib + clang-format dash emacs + iedit list-utils paredit popup @@ -9994,9 +13118,13 @@ license = lib.licenses.free; }; }) {}; - engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + engine-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "engine-mode"; + ename = "engine-mode"; version = "2.0.0"; src = fetchFromGitHub { owner = "hrs"; @@ -10004,10 +13132,10 @@ rev = "243d04691475b47a4453ad7106d8268ca14d9f28"; sha256 = "02xas46nl28mascqsyr1zcd4hn15bh0fjv2xlxv1kmrj0pis94ml"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode"; sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c"; - name = "engine-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10015,20 +13143,25 @@ license = lib.licenses.free; }; }) {}; - enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + enh-ruby-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "enh-ruby-mode"; + ename = "enh-ruby-mode"; version = "20180330"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "c9c39ff07f8cf45814071a77b559477bd57bc3b1"; - sha256 = "1w563cnxadmjbfnwbazqazrpmw2k5xyk4yaxgfk2glxahk4dr0fn"; + rev = "b9d7d986c761e7f43993da0c3012e4fe77b19281"; + sha256 = "190x5l5jhyxhfy57hvxk06yzxji2r3f99vw6a8ngyshvyxap7wq3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns"; - name = "enh-ruby-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -10036,9 +13169,13 @@ license = lib.licenses.free; }; }) {}; - enlive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + enlive = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "enlive"; + ename = "enlive"; version = "0.0.1"; src = fetchFromGitHub { owner = "zweifisch"; @@ -10046,10 +13183,10 @@ rev = "60facaf8bc48b660d209551c0ce4d17e5c907ab8"; sha256 = "08j6b79vy8ry4ad1abk3hvxjbb4ylrhkvrbrnq1gcikl4h1p2v63"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/388fa2580e687d9608b11cdc069841831b414b29/recipes/enlive"; sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz"; - name = "enlive"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10057,20 +13194,24 @@ license = lib.licenses.free; }; }) {}; - enotify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + enotify = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "enotify"; + ename = "enotify"; version = "0.1.3"; src = fetchFromGitHub { owner = "laynor"; repo = "enotify"; - rev = "75c84b53703e5d52cb18acc9251b87ffa400f388"; - sha256 = "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5"; + rev = "6bbd67c5e469d5613d9a8d60b0e13612df265c35"; + sha256 = "1yxw1x4xixxj16pm4a4vk062hr50aaqidh91aljrx0jhv0akybdw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/enotify"; sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi"; - name = "enotify"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10078,9 +13219,20 @@ license = lib.licenses.free; }; }) {}; - ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: - melpaBuild { + ensime = callPackage ({ company + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup + , s + , sbt-mode + , scala-mode + , yasnippet }: + melpaBuild { pname = "ensime"; + ename = "ensime"; version = "2.0.2"; src = fetchFromGitHub { owner = "ensime"; @@ -10088,10 +13240,10 @@ rev = "3d3ab18436ad6089496b3bce1d49c64a86965431"; sha256 = "0p821zwpiznjh736af5avnx9abssx0zbb9xhs74yhh1mcdi1whq7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; sha256 = "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby"; - name = "ensime"; + name = "recipe"; }; packageRequires = [ company @@ -10107,20 +13259,28 @@ license = lib.licenses.free; }; }) {}; - eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }: - melpaBuild { + eopengrok = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild + , s }: + melpaBuild { pname = "eopengrok"; + ename = "eopengrok"; version = "0.5.0"; src = fetchFromGitHub { owner = "youngker"; repo = "eopengrok.el"; - rev = "11c99f7e1e2c1c7d70cbda496cb5b6c7f6e4082a"; - sha256 = "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns"; + rev = "7c61cb06972708665f8e2921e6b9e7234e75cc24"; + sha256 = "1r70k8ckfwdhya0zb2w5whpqvl8jx6w7i04vws99rzdw08ashack"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545/recipes/eopengrok"; sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av"; - name = "eopengrok"; + name = "recipe"; }; packageRequires = [ cl-lib dash magit s ]; meta = { @@ -10128,9 +13288,15 @@ license = lib.licenses.free; }; }) {}; - epc = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + epc = callPackage ({ concurrent + , ctable + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "epc"; + ename = "epc"; version = "0.1.1"; src = fetchFromGitHub { owner = "kiwanami"; @@ -10138,10 +13304,10 @@ rev = "16e975efad63093a1f1f7b59f8fda5a3cf34f2a0"; sha256 = "0smk23f23jdnvmrisj5d4isna36sr15bbvh53dq5261y8ddxlkvw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/epc"; sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx"; - name = "epc"; + name = "recipe"; }; packageRequires = [ concurrent ctable ]; meta = { @@ -10149,20 +13315,27 @@ license = lib.licenses.free; }; }) {}; - epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + epkg = callPackage ({ closql + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "epkg"; - version = "3.0.0"; + ename = "epkg"; + version = "3.1.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "1768e91e02a2d6441c2d82a711912a9498d2316e"; - sha256 = "02fknkqxqxzqdqa2vj7ql6swrl83v1xs5iym5r6yr6mpj69di8bd"; + rev = "b3dac5d4596d304f17a283c5cfe9dc77989fa96a"; + sha256 = "17qdywa8qw6n8a3r4s1cbjbmh2a4vjnxp6fqhiglbbfc1xqw2p1n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; sha256 = "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww"; - name = "epkg"; + name = "recipe"; }; packageRequires = [ closql dash emacs ]; meta = { @@ -10170,9 +13343,14 @@ license = lib.licenses.free; }; }) {}; - epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + epl = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "epl"; + ename = "epl"; version = "0.9"; src = fetchFromGitHub { owner = "cask"; @@ -10180,10 +13358,10 @@ rev = "fd906d3f92d58ecf24169055744409886ceb06ce"; sha256 = "0d3z5z90ln8ipk1yds1n1p8fj9yyh2kpspqjs7agl38indra3nb4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl"; sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn"; - name = "epl"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -10191,20 +13369,26 @@ license = lib.licenses.free; }; }) {}; - epm = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + epm = callPackage ({ emacs + , epl + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "epm"; - version = "0.1beta2"; + ename = "epm"; + version = "0.1.-2.2"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "epm"; rev = "ee004d00c8c8fbe32c4e5baf6279c5e68dc5f201"; sha256 = "0llkgjqr9hl66nya1ppvrlcvmy3rh4pwc25ywq4zi0fbl25qsf5d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e12e8ae2e8e8aff7cbd75a951dd328cb9ccf58b0/recipes/epm"; sha256 = "0k94qhzxjzw5d0c53jnyx1xfciwr9qib845awyjaybzzs34s8r08"; - name = "epm"; + name = "recipe"; }; packageRequires = [ emacs epl ]; meta = { @@ -10212,9 +13396,14 @@ license = lib.licenses.free; }; }) {}; - erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-crypt = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-crypt"; + ename = "erc-crypt"; version = "1.6"; src = fetchFromGitHub { owner = "atomontage"; @@ -10222,10 +13411,10 @@ rev = "731f9264a5bf08a8fc0b5ce69e72058c86f873a5"; sha256 = "13jpq5ws5dm8fyjrskk4icxwz8k5wgh396cc8f8wxrjna4wb843w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt"; sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3"; - name = "erc-crypt"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -10233,8 +13422,15 @@ license = lib.licenses.free; }; }) {}; - erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }: - melpaBuild { + erc-hipchatify = callPackage ({ alert + , emacs + , fetchhg + , fetchurl + , lib + , melpaBuild + , request + , s }: + melpaBuild { pname = "erc-hipchatify"; version = "0.1"; src = fetchhg { @@ -10242,7 +13438,7 @@ rev = "a53227513692"; sha256 = "0av0y65hz7fbiiqzmk5mmw6jv7fivhcd1w3s2xn5y5jpgps56mrc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify"; sha256 = "1a4gl05i757vvap0rzrfwms7mhw80sa84gvbwafrvj3x11rja24x"; name = "erc-hipchatify"; @@ -10253,20 +13449,24 @@ license = lib.licenses.free; }; }) {}; - erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-hl-nicks = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-hl-nicks"; - version = "1.3.2"; + ename = "erc-hl-nicks"; + version = "1.3.3"; src = fetchFromGitHub { owner = "leathekd"; repo = "erc-hl-nicks"; - rev = "be181920ce6af0ab5d00d1c638e4e598b3998643"; - sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7"; + rev = "756c4438a8245ccd3e389bf6c9850ee8453783ec"; + sha256 = "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks"; sha256 = "03hxsknf31vrja2amfa317ig4c34i5jpdq35zczrp00ap0s31nbq"; - name = "erc-hl-nicks"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10274,20 +13474,26 @@ license = lib.licenses.free; }; }) {}; - erc-scrolltoplace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, switch-buffer-functions }: - melpaBuild { + erc-scrolltoplace = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , switch-buffer-functions }: + melpaBuild { pname = "erc-scrolltoplace"; + ename = "erc-scrolltoplace"; version = "0.1.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jgkamat"; repo = "erc-scrolltoplace"; rev = "7539654e4a72edcc5bba07a101961e5bf0a9d449"; sha256 = "11zpqwh1mlfifbgnvhc63bvnhg340jgxssm3m43hr1sxsyb52lh6"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ba300957fc00f5e53cf63dfa1e37a27b0d6d60/recipes/erc-scrolltoplace"; - sha256 = "1cr5nxdk854zcb1w0xvmi4mg45lxv011gap4i96nvdpd4qxmcxph"; - name = "erc-scrolltoplace"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/848cb17d871287c401496e4483e400b44696e89d/recipes/erc-scrolltoplace"; + sha256 = "0632i1p26z3f633iinkqka0x2dd55x02xidk9qr66jh0dzfs6q3i"; + name = "recipe"; }; packageRequires = [ emacs switch-buffer-functions ]; meta = { @@ -10295,9 +13501,15 @@ license = lib.licenses.free; }; }) {}; - erc-twitch = callPackage ({ erc ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + erc-twitch = callPackage ({ erc ? null + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "erc-twitch"; + ename = "erc-twitch"; version = "1.1"; src = fetchFromGitHub { owner = "vibhavp"; @@ -10305,10 +13517,10 @@ rev = "6938191c787d66fef4c13674e0a98a9d64eff364"; sha256 = "1xsxykmhz34gmyj4jb26qfai7j95kzlc7vfydrajc6is7xlrwhfk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46f8640b24bade45cc729eeb370adf959f99526f/recipes/erc-twitch"; sha256 = "08vlwcxrzc2ndm52112z1r0qnz6jlmjhiwq2j3j59fbw82ys61ia"; - name = "erc-twitch"; + name = "recipe"; }; packageRequires = [ erc json ]; meta = { @@ -10316,9 +13528,13 @@ license = lib.licenses.free; }; }) {}; - erc-youtube = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erc-youtube = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erc-youtube"; + ename = "erc-youtube"; version = "0.1"; src = fetchFromGitHub { owner = "kidd"; @@ -10326,10 +13542,10 @@ rev = "97054ba8475b442e2aa81e5a291f668b7f28697f"; sha256 = "0kh4amx3l3a14qaiyvjyak1jbybs6n49mdvzjrd1i2vd1y74zj5w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a80ee9617a30a8ad1d457a0b0c7f35e6ec1c0bb2/recipes/erc-youtube"; sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx"; - name = "erc-youtube"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10337,9 +13553,13 @@ license = lib.licenses.free; }; }) {}; - ercn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ercn = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ercn"; + ename = "ercn"; version = "1.1.1"; src = fetchFromGitHub { owner = "leathekd"; @@ -10347,10 +13567,10 @@ rev = "73b00dadf83b97dd9edd8381a4b27f583c08b7f6"; sha256 = "19jninbf0dhdw3kn4d38bxmklg0v7sh3m9dwj6z69w99r5pcw480"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a12f264653d79224adeb5d0ae76518dc408ff1e9/recipes/ercn"; sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp"; - name = "ercn"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10358,9 +13578,14 @@ license = lib.licenses.free; }; }) {}; - erefactor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erefactor = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erefactor"; + ename = "erefactor"; version = "0.7.0"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -10368,10 +13593,10 @@ rev = "fde3fd42c815c76e8015f69518a92f6bfcfde990"; sha256 = "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18063e16a6f556b1871e1a5b74e353a85a794e63/recipes/erefactor"; sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7"; - name = "erefactor"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -10379,9 +13604,16 @@ license = lib.licenses.free; }; }) {}; - ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: - melpaBuild { + ergoemacs-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , undo-tree }: + melpaBuild { pname = "ergoemacs-mode"; + ename = "ergoemacs-mode"; version = "5.16.10.12"; src = fetchFromGitHub { owner = "ergoemacs"; @@ -10389,10 +13621,10 @@ rev = "ac70b2563fb6e3d69ea382fddc87b5721c20c292"; sha256 = "0ydxyylijdd6da4n9by441352shphrpfyk2631ld5aq3gz27z9gi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62"; - name = "ergoemacs-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs undo-tree ]; meta = { @@ -10400,20 +13632,25 @@ license = lib.licenses.free; }; }) {}; - erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + erlang = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "erlang"; - version = "20.3.2"; + ename = "erlang"; + version = "21.0.3"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "c5ee502e6031986983d3596745cad7fd547fd9c2"; - sha256 = "0cd7rz32cxghxb2q7g3p52sxbhwqn4pkjlf28hy1dms6q7f85zv1"; + rev = "9d5af99762b3795c763fb62c1516247bd3f8e12f"; + sha256 = "0anlp0qj2blgdjzdw8rxmpz659yzbdl3r69b6slm1c1aa77ayc17"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq"; - name = "erlang"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -10421,9 +13658,13 @@ license = lib.licenses.free; }; }) {}; - ert-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ert-async = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ert-async"; + ename = "ert-async"; version = "0.1.2"; src = fetchFromGitHub { owner = "rejeep"; @@ -10431,10 +13672,10 @@ rev = "f64a7ed5b0d2900c9a3d8cc33294bf8a79bc8526"; sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ec669e3fc73b0b499b84cec87d0f8621274732e/recipes/ert-async"; sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5"; - name = "ert-async"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10442,19 +13683,24 @@ license = lib.licenses.free; }; }) {}; - ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + ert-junit = callPackage ({ ert ? null + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ert-junit"; - version = "0.1.1"; + ename = "ert-junit"; + version = "0.3"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; - rev = "341c755e7b60f8d2081303951377968b1d1a6c23"; - sha256 = "0y06i97bbim6lmvk8l3adifwzhkjyrgyxv02ksshk4npr0b627gx"; + rev = "cd1f63627d4e6635086322f34be09ba535e26b97"; + sha256 = "0a2ddvpm8yparl3zq05mp239k5dgplcmc9s61ak9d5qn65l8mwyr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit"; sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g"; - name = "ert-junit"; + name = "recipe"; }; packageRequires = [ ert ]; meta = { @@ -10462,9 +13708,19 @@ license = lib.licenses.free; }; }) {}; - ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: - melpaBuild { + ert-runner = callPackage ({ ansi + , commander + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , shut-up }: + melpaBuild { pname = "ert-runner"; + ename = "ert-runner"; version = "0.7.0"; src = fetchFromGitHub { owner = "rejeep"; @@ -10472,10 +13728,10 @@ rev = "00056c37817f15b1870ccedd13cedf102e3194dd"; sha256 = "0rdgdslspzb4s0n4a68hnwfm8vm8baasa8nzrdinf0nryn7rrhbf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner"; sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48"; - name = "ert-runner"; + name = "recipe"; }; packageRequires = [ ansi commander dash f s shut-up ]; meta = { @@ -10483,9 +13739,14 @@ license = lib.licenses.free; }; }) {}; - es-lib = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + es-lib = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "es-lib"; + ename = "es-lib"; version = "0.4"; src = fetchFromGitHub { owner = "sabof"; @@ -10493,10 +13754,10 @@ rev = "753b27363e39c10edc9e4e452bdbbbe4d190df4a"; sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/es-lib"; sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n"; - name = "es-lib"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -10504,9 +13765,16 @@ license = lib.licenses.free; }; }) {}; - es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }: - melpaBuild { + es-mode = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , spark }: + melpaBuild { pname = "es-mode"; + ename = "es-mode"; version = "4.3.0"; src = fetchFromGitHub { owner = "dakrone"; @@ -10514,10 +13782,10 @@ rev = "996730ebce57d810d2c275c7fadb11c2b1134dea"; sha256 = "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; sha256 = "0zp84k5idqkrvc9qci49ains0b86kpk97lk1jcwyj75s4xsfyp1y"; - name = "es-mode"; + name = "recipe"; }; packageRequires = [ cl-lib dash spark ]; meta = { @@ -10525,9 +13793,15 @@ license = lib.licenses.free; }; }) {}; - es-windows = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + es-windows = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "es-windows"; + ename = "es-windows"; version = "0.3"; src = fetchFromGitHub { owner = "sabof"; @@ -10535,10 +13809,10 @@ rev = "7ebe6c6e0831373847d7adbedeaa2e506b54b2af"; sha256 = "0cjchwrhk7bw87bg10zgcwkga50rvs0jn5v2jf6bbsxbcqx2nfc9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/944d4cd54e040d2a58e1778cb282727deee83f92/recipes/es-windows"; sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx"; - name = "es-windows"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -10546,9 +13820,14 @@ license = lib.licenses.free; }; }) {}; - esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + esa = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "esa"; + ename = "esa"; version = "0.8.13"; src = fetchFromGitHub { owner = "nabinno"; @@ -10556,10 +13835,10 @@ rev = "0f69f9f45ac15018c48853509ac38e68286f9c0e"; sha256 = "0cairmqsaghl2ddb2v8zhcwy5ik756m7gkair8xrbigz4jklpcv9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa"; sha256 = "0y4mbq0z6vp0faxq6dq5hhxnsbi685amxqbvpxkxahl1nckp76lb"; - name = "esa"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -10567,20 +13846,26 @@ license = lib.licenses.free; }; }) {}; - esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + esh-autosuggest = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "esh-autosuggest"; + ename = "esh-autosuggest"; version = "2.0.0"; src = fetchFromGitHub { owner = "dieggsy"; repo = "esh-autosuggest"; - rev = "a8a9381e76ea2e0d934bc70caa47f23209bcc155"; - sha256 = "116pdjgpjy9b0psm5kzwkwy7dq8vn0p6dy75dl1zsy2xrjf1iqdw"; + rev = "95078aa17a104bc724283df48af36abfe4125853"; + sha256 = "0fwxk26wlk2wkqs82zs5m3rd6670mjf6bar928cqam1f63fvx09q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest"; sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx"; - name = "esh-autosuggest"; + name = "recipe"; }; packageRequires = [ company emacs ]; meta = { @@ -10588,9 +13873,14 @@ license = lib.licenses.free; }; }) {}; - esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + esh-help = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "esh-help"; + ename = "esh-help"; version = "1.0.1"; src = fetchFromGitHub { owner = "tom-tan"; @@ -10598,10 +13888,10 @@ rev = "8a8a9d4d9852f8bd96da3b94e95ff57097ac8ec6"; sha256 = "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help"; sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w"; - name = "esh-help"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -10609,9 +13899,13 @@ license = lib.licenses.free; }; }) {}; - eshell-autojump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-autojump = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-autojump"; + ename = "eshell-autojump"; version = "0.2"; src = fetchFromGitHub { owner = "coldnew"; @@ -10619,10 +13913,10 @@ rev = "c0866d7f2789831665ebb01b812bae89d085bff0"; sha256 = "0nkmwwx224r50y2xnrz3v26l3ngqshvy5hs861gy4zagwllqfmvc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bd1a8ec9d17eff2d23e15b3686f7c0b8723126/recipes/eshell-autojump"; sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5"; - name = "eshell-autojump"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10630,9 +13924,14 @@ license = lib.licenses.free; }; }) {}; - eshell-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-bookmark = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-bookmark"; + ename = "eshell-bookmark"; version = "2.0.0"; src = fetchFromGitHub { owner = "Fuco1"; @@ -10640,10 +13939,10 @@ rev = "deda4b848b2fb979dbe73ead2cb866610e3596ed"; sha256 = "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bf4702a907727990fcc676980f2b219e22ab0c/recipes/eshell-bookmark"; sha256 = "1bybxlq1h5chrjxqjb23kq8dmgw2xrjwkrnvpbphblqzpdy5ck0s"; - name = "eshell-bookmark"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -10651,9 +13950,15 @@ license = lib.licenses.free; }; }) {}; - eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-did-you-mean = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-did-you-mean"; + ename = "eshell-did-you-mean"; version = "0.1"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -10661,10 +13966,10 @@ rev = "7cb6ef8e2274d0a50a9e114d412307a6543533d5"; sha256 = "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7649eca21a21ddbbc7131f29cbbd91a00a84060/recipes/eshell-did-you-mean"; sha256 = "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz"; - name = "eshell-did-you-mean"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -10672,9 +13977,16 @@ license = lib.licenses.free; }; }) {}; - eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-git-prompt = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-git-prompt"; + ename = "eshell-git-prompt"; version = "0.1.2"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -10682,10 +13994,10 @@ rev = "b6bb2d7bd4e393b4170b29891cfefb72ae020aab"; sha256 = "02i00an9wa8ns66xq900la68m7pd4hwv95g83cvf22bypivx7p2y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt"; sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s"; - name = "eshell-git-prompt"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -10693,9 +14005,13 @@ license = lib.licenses.free; }; }) {}; - eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-prompt-extras = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-prompt-extras"; + ename = "eshell-prompt-extras"; version = "0.96"; src = fetchFromGitHub { owner = "hiddenlotus"; @@ -10703,10 +14019,10 @@ rev = "7581c109673c40aceff278cd524273f50ffe170d"; sha256 = "1m1jisjz974cfz89i6l2zq666yzhsqipc6dmqlrm8mw81fxsfm1h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; sha256 = "0kh4lvjkayjdz5lqvdqmdcblxizxk9kwmigjwa68kx8z6ngmfwa5"; - name = "eshell-prompt-extras"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10714,9 +14030,14 @@ license = lib.licenses.free; }; }) {}; - eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-up = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-up"; + ename = "eshell-up"; version = "0.0.3"; src = fetchFromGitHub { owner = "peterwvj"; @@ -10724,10 +14045,10 @@ rev = "653121392acd607d5dfbca0832927e06806a2d39"; sha256 = "05mfwp8zira7p2ip1rmqa08arlbkv7w1mbx7s5saj655scg7jaq3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-up"; sha256 = "1jyaaw950isissjjgqflfn2bllgdfcyphpbi7il06mv9p0dzpwvy"; - name = "eshell-up"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -10735,9 +14056,14 @@ license = lib.licenses.free; }; }) {}; - eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eshell-z = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eshell-z"; + ename = "eshell-z"; version = "0.3.2"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -10745,10 +14071,10 @@ rev = "96ec3f5f8a801c893d2c6a6b140e333ef2bfd8b5"; sha256 = "1aac4m814jgxwpz7lbyx5r4z5dmawp4sk7pwbx0zqpnbcsaq5wwc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z"; sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d"; - name = "eshell-z"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -10756,9 +14082,13 @@ license = lib.licenses.free; }; }) {}; - eslint-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eslint-fix = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eslint-fix"; + ename = "eslint-fix"; version = "1.0.0"; src = fetchFromGitHub { owner = "codesuki"; @@ -10766,10 +14096,10 @@ rev = "be90d1e78b1dfd43b6b3b1c06868539e2ac27d3a"; sha256 = "1l7pm0ywjby0giilyn6qsz1zh54sgmvmii7y9jhrva13c5kgg9an"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eslint-fix"; sha256 = "0ry271jlv95nhdqx6qxmvkpa10lpwkg1q6asnliviwplq2mxw2da"; - name = "eslint-fix"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10777,30 +14107,43 @@ license = lib.licenses.free; }; }) {}; - eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eslintd-fix = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eslintd-fix"; - version = "1.0.0"; + ename = "eslintd-fix"; + version = "1.1.0"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "555fdad8ebee4ca0d990b8c80151c77c8bd6b773"; - sha256 = "0xmlr98gyq56vas02nnjdfv7x6zjddy4b1qpy3zz770jnpnrgq33"; + rev = "97e8aa9b106e3e4b3a44c775ca972bdd2feda9ec"; + sha256 = "1g6bv58m1052x2f5ffs17ryyqv0ay8vii5bwqs7dyfhlpppsn6c8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v"; - name = "eslintd-fix"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ dash emacs ]; meta = { homepage = "https://melpa.org/#/eslintd-fix"; license = lib.licenses.free; }; }) {}; - espuds = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + espuds = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "espuds"; + ename = "espuds"; version = "0.3.3"; src = fetchFromGitHub { owner = "ecukes"; @@ -10808,10 +14151,10 @@ rev = "1405972873339e056517217136de4ad3202d744a"; sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds"; sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c"; - name = "espuds"; + name = "recipe"; }; packageRequires = [ dash f s ]; meta = { @@ -10819,20 +14162,25 @@ license = lib.licenses.free; }; }) {}; - ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: - melpaBuild { + ess = callPackage ({ fetchFromGitHub + , fetchurl + , julia-mode + , lib + , melpaBuild }: + melpaBuild { pname = "ess"; + ename = "ess"; version = "17.11"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "a218dec600c25687a81419e42b555141911504c6"; - sha256 = "0wl90xiifn83clm25ya953pa91734h0sav1426y5czrmswzw7mj1"; + rev = "f59a95e72ba2803229cc9aeb7559186c528dbcea"; + sha256 = "0lwajgf39r75g239plbhlbppgj7vyc5via72qq906jqy89b5iic7"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; - sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i"; - name = "ess"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/156a6fa9e6ee16174d215c1dcd524aff847b3bf0/recipes/ess"; + sha256 = "1psqrw9k7d2ha8zid2mkc6bgcyalrm3n53c00g3cgckkbahl7r6n"; + name = "recipe"; }; packageRequires = [ julia-mode ]; meta = { @@ -10840,9 +14188,16 @@ license = lib.licenses.free; }; }) {}; - ess-R-data-view = callPackage ({ ctable, ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + ess-R-data-view = callPackage ({ ctable + , ess + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "ess-R-data-view"; + ename = "ess-R-data-view"; version = "1.0"; src = fetchFromGitHub { owner = "myuhe"; @@ -10850,10 +14205,10 @@ rev = "d6e98d3ae1e2a2ea39a56eebcdb73e99d29562e9"; sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/492c90bd0ee97c0b895efa0c5e647b2becc6db11/recipes/ess-R-data-view"; sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0"; - name = "ess-R-data-view"; + name = "recipe"; }; packageRequires = [ ctable ess popup ]; meta = { @@ -10861,9 +14216,13 @@ license = lib.licenses.free; }; }) {}; - ess-smart-underscore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ess-smart-underscore = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ess-smart-underscore"; + ename = "ess-smart-underscore"; version = "0.79"; src = fetchFromGitHub { owner = "mattfidler"; @@ -10871,10 +14230,10 @@ rev = "ef18a160aeb3b1a7ae5fe93759f8e92147da8746"; sha256 = "1avb6dng4xgw3bp7bw0j60wl6s4y26alfys9vwwj29rlzvjrlh74"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4d6166f5c80cf37c79256402fa633ad2274d065/recipes/ess-smart-underscore"; sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2"; - name = "ess-smart-underscore"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10882,9 +14241,15 @@ license = lib.licenses.free; }; }) {}; - esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + esup = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "esup"; + ename = "esup"; version = "0.6"; src = fetchFromGitHub { owner = "jschaf"; @@ -10892,10 +14257,10 @@ rev = "53355b13dc9f1636ba681ffff830162ebbd3b223"; sha256 = "1a4b8390azimlrr5ayxvaks1w7009vfbm56q11ybx00xxrd26v43"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0"; - name = "esup"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -10903,9 +14268,13 @@ license = lib.licenses.free; }; }) {}; - esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + esxml = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "esxml"; + ename = "esxml"; version = "0.3.4"; src = fetchFromGitHub { owner = "tali713"; @@ -10913,10 +14282,10 @@ rev = "5548ceba17deae0c3c6d0092672edc4de3c75ce3"; sha256 = "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml"; sha256 = "1375gryii984l33gc8f8yhl3vncjmw1w9k6xpvjgmnpx2fwr1vbq"; - name = "esxml"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10924,9 +14293,16 @@ license = lib.licenses.free; }; }) {}; - eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: - melpaBuild { + eterm-256color = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xterm-color }: + melpaBuild { pname = "eterm-256color"; + ename = "eterm-256color"; version = "0.3.13"; src = fetchFromGitHub { owner = "dieggsy"; @@ -10934,10 +14310,10 @@ rev = "dab96af559deb443c4c9c00e23389926e1607192"; sha256 = "0ysxblc90kjcz84siprnyxwh94scflivqbxylzkvjm7hbx93rsh1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color"; sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b"; - name = "eterm-256color"; + name = "recipe"; }; packageRequires = [ emacs f xterm-color ]; meta = { @@ -10945,20 +14321,24 @@ license = lib.licenses.free; }; }) {}; - ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ethan-wspace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ethan-wspace"; + ename = "ethan-wspace"; version = "0.7.1"; src = fetchFromGitHub { owner = "glasserc"; repo = "ethan-wspace"; - rev = "e055ee6730c0b03525d32e67511ef6c51e4c29e4"; - sha256 = "0ik3y60xd3ap1pg5dr5ab6bq4qh8gblpgz1iiprmv7acr3ckzc41"; + rev = "14ae43130e019034367cd2b6e2bf9a067955dd33"; + sha256 = "19i8y8ys58mvzmz0ijcdv9nnrs3b85zbgl087d68734vhp73iy78"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace"; sha256 = "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws"; - name = "ethan-wspace"; + name = "recipe"; }; packageRequires = []; meta = { @@ -10966,9 +14346,16 @@ license = lib.licenses.free; }; }) {}; - eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: - melpaBuild { + eval-in-repl = callPackage ({ ace-window + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , paredit }: + melpaBuild { pname = "eval-in-repl"; + ename = "eval-in-repl"; version = "0.9.6"; src = fetchFromGitHub { owner = "kaz-yos"; @@ -10976,10 +14363,10 @@ rev = "7e2b42570b449b2a3c2922f3036a027d1e393a60"; sha256 = "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl"; sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63"; - name = "eval-in-repl"; + name = "recipe"; }; packageRequires = [ ace-window dash paredit ]; meta = { @@ -10987,30 +14374,41 @@ license = lib.licenses.free; }; }) {}; - eval-sexp-fu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eval-sexp-fu = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , highlight + , lib + , melpaBuild }: + melpaBuild { pname = "eval-sexp-fu"; - version = "0.4.0"; + ename = "eval-sexp-fu"; + version = "0.4.2"; src = fetchFromGitHub { owner = "hchbaw"; repo = "eval-sexp-fu.el"; - rev = "b28d9c4d57511072aa17b2464693e38b769482e0"; - sha256 = "0lwpl9akdxml9f51pgsv0g7k7mr8dvqm94l01i7vq8jl6vd6v6i5"; + rev = "1cfd0f3e167d63080692fad97ffe0091b024ad73"; + sha256 = "0l20ja8s0881jlrlmba496iyizfa0j5bvc2x39rshn8qqyka2dq2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b1a896521cac1f54f7571ad5837ff215d01044d/recipes/eval-sexp-fu"; sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs"; - name = "eval-sexp-fu"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ cl-lib highlight ]; meta = { homepage = "https://melpa.org/#/eval-sexp-fu"; license = lib.licenses.free; }; }) {}; - evalator = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + evalator = callPackage ({ fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "evalator"; + ename = "evalator"; version = "1.0.0"; src = fetchFromGitHub { owner = "seanirby"; @@ -11018,10 +14416,10 @@ rev = "edf3840f5aa025cf38d0c2677b2f88f59079409e"; sha256 = "1a3y69s7lb24zdivxcpsjh9l6adxyjqxbpgradnj0q1n6kdyq679"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/544a503d72c0a501f9ca854cd11181a7783294a3/recipes/evalator"; sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk"; - name = "evalator"; + name = "recipe"; }; packageRequires = [ helm-core ]; meta = { @@ -11029,9 +14427,17 @@ license = lib.licenses.free; }; }) {}; - evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: - melpaBuild { + evil = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , goto-chg + , lib + , melpaBuild + , undo-tree }: + melpaBuild { pname = "evil"; + ename = "evil"; version = "1.2.13"; src = fetchFromGitHub { owner = "emacs-evil"; @@ -11039,10 +14445,10 @@ rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a"; sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39"; - name = "evil"; + name = "recipe"; }; packageRequires = [ cl-lib emacs goto-chg undo-tree ]; meta = { @@ -11050,20 +14456,26 @@ license = lib.licenses.free; }; }) {}; - evil-anzu = callPackage ({ anzu, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-anzu = callPackage ({ anzu + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-anzu"; + ename = "evil-anzu"; version = "0.3"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-evil-anzu"; - rev = "64cc08a3546373f28cd7bfd76a3e93bd78efa251"; - sha256 = "0lw7fg4gqwj30r0l6k2ni36sxqkf65zf0d0z3rxnpwbxlf8dlkrr"; + rev = "995141132bbf063fe568a6562bcf8bb8a827c784"; + sha256 = "04a66f5yq3zmdw5ids6dm0kzzk1ivqagbw17a5656gg0ahzpsppv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06b0609b56016d938b28d56d9eeb6305116b38af/recipes/evil-anzu"; sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70"; - name = "evil-anzu"; + name = "recipe"; }; packageRequires = [ anzu evil ]; meta = { @@ -11071,20 +14483,25 @@ license = lib.licenses.free; }; }) {}; - evil-args = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-args = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-args"; + ename = "evil-args"; version = "1.0"; src = fetchFromGitHub { owner = "wcsmith"; repo = "evil-args"; - rev = "2a88b4d19953a11227cc1e91973b92149116f44c"; - sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq"; + rev = "b554f83a31dd47cac9799725f379675f54ed0a6a"; + sha256 = "08743swy936v8fhbaplrr0wpwlp7vplvy2iwkh56p7gb5gqmlfli"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0976c82a22f1a8701b9da0b8ba4753ed48191376/recipes/evil-args"; sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w"; - name = "evil-args"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11092,9 +14509,16 @@ license = lib.licenses.free; }; }) {}; - evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-colemak-basics = callPackage ({ emacs + , evil + , evil-snipe + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-colemak-basics"; + ename = "evil-colemak-basics"; version = "2.1.0"; src = fetchFromGitHub { owner = "wbolster"; @@ -11102,10 +14526,10 @@ rev = "7844079b47f47bb1dc24c885b0ac2e67524fa960"; sha256 = "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics"; sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k"; - name = "evil-colemak-basics"; + name = "recipe"; }; packageRequires = [ emacs evil evil-snipe ]; meta = { @@ -11113,9 +14537,14 @@ license = lib.licenses.free; }; }) {}; - evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-commentary = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-commentary"; + ename = "evil-commentary"; version = "2.1.1"; src = fetchFromGitHub { owner = "linktohack"; @@ -11123,10 +14552,10 @@ rev = "395f91014b69844b81660c155f42eb9b1b3d199d"; sha256 = "0zjs9zyqfygnpxapvf0ymmiid40i06cxbhjzd81zw33nafgkf6r4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary"; sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz"; - name = "evil-commentary"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11134,20 +14563,27 @@ license = lib.licenses.free; }; }) {}; - evil-embrace = callPackage ({ emacs, embrace, evil-surround, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-embrace = callPackage ({ emacs + , embrace + , evil-surround + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-embrace"; + ename = "evil-embrace"; version = "0.1.1"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "evil-embrace.el"; - rev = "4379adea032b25e359d01a36301b4a5afdd0d1b7"; - sha256 = "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a"; + rev = "8b2083c514af143f6d2f5d1cb4272c5bfb7437a3"; + sha256 = "1cplq9s3fw8nadcipjrix46jfcjbgg3xhz6d226wcqgmg90aclfn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace"; sha256 = "10cfkksh3llyfk26x36b7ri0x6a6hrcv275pxk7ckhs1pyhb14y7"; - name = "evil-embrace"; + name = "recipe"; }; packageRequires = [ emacs embrace evil-surround ]; meta = { @@ -11155,9 +14591,16 @@ license = lib.licenses.free; }; }) {}; - evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-escape = callPackage ({ cl-lib ? null + , emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-escape"; + ename = "evil-escape"; version = "3.14"; src = fetchFromGitHub { owner = "syl20bnr"; @@ -11165,10 +14608,10 @@ rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec"; sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape"; sha256 = "0jiwsgcqw8m6z4z82gx0m0r0vbvkcxc0czhn4mqjwkhhglwzgi8l"; - name = "evil-escape"; + name = "recipe"; }; packageRequires = [ cl-lib emacs evil ]; meta = { @@ -11176,9 +14619,15 @@ license = lib.licenses.free; }; }) {}; - evil-iedit-state = callPackage ({ evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: - melpaBuild { + evil-iedit-state = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , iedit + , lib + , melpaBuild }: + melpaBuild { pname = "evil-iedit-state"; + ename = "evil-iedit-state"; version = "1.1"; src = fetchFromGitHub { owner = "syl20bnr"; @@ -11186,10 +14635,10 @@ rev = "eab7d5e3e7d25c4a852fedb6c0c7f50dd9e9bd7c"; sha256 = "0r9gif2sgf84z8qniz6chr32av9g2i38rlyms81m8ssghf0j86ss"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0b6b7d09c023cfe34da65fa1eb8f3fdbe7b1290/recipes/evil-iedit-state"; sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl"; - name = "evil-iedit-state"; + name = "recipe"; }; packageRequires = [ evil iedit ]; meta = { @@ -11197,9 +14646,14 @@ license = lib.licenses.free; }; }) {}; - evil-leader = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-leader = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-leader"; + ename = "evil-leader"; version = "0.4.3"; src = fetchFromGitHub { owner = "cofi"; @@ -11207,10 +14661,10 @@ rev = "753b01eb4958370ae2226b3780ff31fe157c2852"; sha256 = "1k2zinchs0jjllp8zkpggckyy63dkyi5yig3p46vh4w45jdzysk5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/evil-leader"; sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6"; - name = "evil-leader"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11218,9 +14672,16 @@ license = lib.licenses.free; }; }) {}; - evil-lisp-state = callPackage ({ bind-map, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: - melpaBuild { + evil-lisp-state = callPackage ({ bind-map + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , smartparens }: + melpaBuild { pname = "evil-lisp-state"; + ename = "evil-lisp-state"; version = "8.2"; src = fetchFromGitHub { owner = "syl20bnr"; @@ -11228,10 +14689,10 @@ rev = "3c65fecd9917a41eaf6460f22187e2323821f3ce"; sha256 = "1n6r8xs670r5qp4b5f72nr9g8nlqcrx1v7yqqlbkgv8gns8n5xgh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-lisp-state"; sha256 = "16h6zi0kkq2zlrwqiz6avnw2ady3h9gmxyinvk5gbkskxf12d1pz"; - name = "evil-lisp-state"; + name = "recipe"; }; packageRequires = [ bind-map evil smartparens ]; meta = { @@ -11239,9 +14700,15 @@ license = lib.licenses.free; }; }) {}; - evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + evil-magit = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "evil-magit"; + ename = "evil-magit"; version = "0.4.2"; src = fetchFromGitHub { owner = "emacs-evil"; @@ -11249,10 +14716,10 @@ rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a"; sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; sha256 = "02ncki7qrl22804576h76xl4d5lvvk32lzn9gvxn63hb19r0s980"; - name = "evil-magit"; + name = "recipe"; }; packageRequires = [ evil magit ]; meta = { @@ -11260,9 +14727,14 @@ license = lib.licenses.free; }; }) {}; - evil-mark-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-mark-replace = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-mark-replace"; + ename = "evil-mark-replace"; version = "0.0.4"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -11270,10 +14742,10 @@ rev = "56cf191724a3e82239ca47a17b071c20aedb0617"; sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/089accfa2646fc4f265cb8e9b9a05dcf5aa4c4f6/recipes/evil-mark-replace"; sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0"; - name = "evil-mark-replace"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11281,20 +14753,25 @@ license = lib.licenses.free; }; }) {}; - evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-matchit = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-matchit"; - version = "2.2.6"; + ename = "evil-matchit"; + version = "2.2.8"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "50bb88241983f0bf06d35a455a87c04eddc11c83"; - sha256 = "1qn5nydh2pinjlyyplrdxrn2r828im6mgij95ahs8z14y9yxwcif"; + rev = "8a10046f25e4b707ccf8ff6fbcb74e71bd32498d"; + sha256 = "0ik105g50frj87c5awy4gkq43gm4hmlzr6klx7x5fbyjx9d9f2id"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq"; - name = "evil-matchit"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11302,9 +14779,16 @@ license = lib.licenses.free; }; }) {}; - evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-mc = callPackage ({ cl-lib ? null + , emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-mc"; + ename = "evil-mc"; version = "0.0.3"; src = fetchFromGitHub { owner = "gabesoft"; @@ -11312,10 +14796,10 @@ rev = "be2259b8cedd62011b25ddbcc1774bbbe9a66c61"; sha256 = "0p435ykkq41nksd40qczlhz6kvs2zpkxch661wy0w93wffwnq3b9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs"; - name = "evil-mc"; + name = "recipe"; }; packageRequires = [ cl-lib emacs evil ]; meta = { @@ -11323,9 +14807,17 @@ license = lib.licenses.free; }; }) {}; - evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: - melpaBuild { + evil-multiedit = callPackage ({ cl-lib ? null + , emacs + , evil + , fetchFromGitHub + , fetchurl + , iedit + , lib + , melpaBuild }: + melpaBuild { pname = "evil-multiedit"; + ename = "evil-multiedit"; version = "1.3.8"; src = fetchFromGitHub { owner = "hlissner"; @@ -11333,10 +14825,10 @@ rev = "c0cb6858399863e51935dae62c7c61ebc68f92eb"; sha256 = "010y4vxj7rr5kr4csbh72s60ndqzqxdrvgkyb65vxb5vskr1n1wm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit"; sha256 = "0p02q9skqw2zhx7sfadqgs7vn518s72856962dam0xw4sqasplfp"; - name = "evil-multiedit"; + name = "recipe"; }; packageRequires = [ cl-lib emacs evil iedit ]; meta = { @@ -11344,30 +14836,39 @@ license = lib.licenses.free; }; }) {}; - evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-nerd-commenter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-nerd-commenter"; - version = "3.1.3"; + ename = "evil-nerd-commenter"; + version = "3.2.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "41d43709210711c07de69497c5f7db646b7e7a96"; - sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14"; + rev = "34d411715ead5829d6d8969511047feb703b067e"; + sha256 = "0ax846dy2hbrbvkj7nzfkcl5i1x9rga8bvg0ln55ivhq0iiy1lkv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d"; - name = "evil-nerd-commenter"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/evil-nerd-commenter"; license = lib.licenses.free; }; }) {}; - evil-numbers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-numbers = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-numbers"; + ename = "evil-numbers"; version = "0.4"; src = fetchFromGitHub { owner = "cofi"; @@ -11375,10 +14876,10 @@ rev = "8834eb2e8bd93561a706363946701d0d90546a9f"; sha256 = "13jg2xbh4p02x1nj77b6csb93hh56c1nv8kslcq2hjj3caipk4m8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/evil-numbers"; sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2"; - name = "evil-numbers"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11386,9 +14887,15 @@ license = lib.licenses.free; }; }) {}; - evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }: - melpaBuild { + evil-opener = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , opener }: + melpaBuild { pname = "evil-opener"; + ename = "evil-opener"; version = "0.2.2"; src = fetchFromGitHub { owner = "0robustus1"; @@ -11396,10 +14903,10 @@ rev = "c384f67278046fdcd220275fdd212ab85672cbeb"; sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-opener"; sha256 = "0cld853pyzlaa306rpypw2wm4953i6y06irlk96bql9aa1zx977g"; - name = "evil-opener"; + name = "recipe"; }; packageRequires = [ evil opener ]; meta = { @@ -11407,9 +14914,15 @@ license = lib.licenses.free; }; }) {}; - evil-org = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + evil-org = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "evil-org"; + ename = "evil-org"; version = "0.1.1"; src = fetchFromGitHub { owner = "Somelauw"; @@ -11417,10 +14930,10 @@ rev = "2d7c58dbeca0d4ac7b4eab5f47b77946951f27e9"; sha256 = "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; sha256 = "18glpsnpxap4dvnvkl59h9pnwlp20libsfbbkmvrbzsvbdyspg6z"; - name = "evil-org"; + name = "recipe"; }; packageRequires = [ evil org ]; meta = { @@ -11428,9 +14941,14 @@ license = lib.licenses.free; }; }) {}; - evil-quickscope = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-quickscope = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-quickscope"; + ename = "evil-quickscope"; version = "0.1.4"; src = fetchFromGitHub { owner = "blorbx"; @@ -11438,10 +14956,10 @@ rev = "37a20e4c56c6058abf186ad4013c155e695e876f"; sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec118caf243c74d243f533c9e12f7de0d6c43bc4/recipes/evil-quickscope"; sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489"; - name = "evil-quickscope"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11449,9 +14967,15 @@ license = lib.licenses.free; }; }) {}; - evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-replace-with-char = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-replace-with-char"; + ename = "evil-replace-with-char"; version = "1.0.0"; src = fetchFromGitHub { owner = "ninrod"; @@ -11459,10 +14983,10 @@ rev = "dddbbafdd620cc48dd0a257baf4010e1b415ebe8"; sha256 = "0gcmva2q1bxqp3p8cl1nf19kh4nkgfdm64havyzhnkwq18q84pxi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char"; sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r"; - name = "evil-replace-with-char"; + name = "recipe"; }; packageRequires = [ emacs evil ]; meta = { @@ -11470,9 +14994,14 @@ license = lib.licenses.free; }; }) {}; - evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-rsi = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-rsi"; + ename = "evil-rsi"; version = "2.0.0"; src = fetchFromGitHub { owner = "linktohack"; @@ -11480,10 +15009,10 @@ rev = "236bf6ed1e2285698db808463e5f2f69f5f5e7c0"; sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24f438b47e8ede0ef84261424c122d2ac28b90cb/recipes/evil-rsi"; sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345"; - name = "evil-rsi"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11491,9 +15020,14 @@ license = lib.licenses.free; }; }) {}; - evil-search-highlight-persist = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: - melpaBuild { + evil-search-highlight-persist = callPackage ({ fetchFromGitHub + , fetchurl + , highlight + , lib + , melpaBuild }: + melpaBuild { pname = "evil-search-highlight-persist"; + ename = "evil-search-highlight-persist"; version = "1.8"; src = fetchFromGitHub { owner = "naclander"; @@ -11501,10 +15035,10 @@ rev = "0e2b3d4e3dec5f38ae95f62519eb2736f73c0b85"; sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist"; sha256 = "08l8ymrp9vkpwprq9gp4562yvcnd4hfc3z7n4n5lz7h6ffv3zym3"; - name = "evil-search-highlight-persist"; + name = "recipe"; }; packageRequires = [ highlight ]; meta = { @@ -11512,9 +15046,16 @@ license = lib.licenses.free; }; }) {}; - evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: - melpaBuild { + evil-smartparens = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , smartparens }: + melpaBuild { pname = "evil-smartparens"; + ename = "evil-smartparens"; version = "0.4.0"; src = fetchFromGitHub { owner = "expez"; @@ -11522,10 +15063,10 @@ rev = "9fe4eed1c6327197afe6c13bb0771e18908aff00"; sha256 = "1di4qz5fbrlwbg16c2j0m7y8zqfxw027qd7zqmc3rwk9znbhg7wl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens"; sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza"; - name = "evil-smartparens"; + name = "recipe"; }; packageRequires = [ emacs evil smartparens ]; meta = { @@ -11533,9 +15074,16 @@ license = lib.licenses.free; }; }) {}; - evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-snipe = callPackage ({ cl-lib ? null + , emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-snipe"; + ename = "evil-snipe"; version = "2.0.8"; src = fetchFromGitHub { owner = "hlissner"; @@ -11543,10 +15091,10 @@ rev = "dc62ac317fd29f018e9785c1b3b7dd7ad57b3938"; sha256 = "18j33smlajj7ynigfgm64z3kfys5idbxin2gd93civ2564n85r33"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn"; - name = "evil-snipe"; + name = "recipe"; }; packageRequires = [ cl-lib emacs evil ]; meta = { @@ -11554,9 +15102,14 @@ license = lib.licenses.free; }; }) {}; - evil-space = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-space = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-space"; + ename = "evil-space"; version = "0.0.6"; src = fetchFromGitHub { owner = "linktohack"; @@ -11564,10 +15117,10 @@ rev = "f77860fa00662e2def3e1885adac777f051e1e61"; sha256 = "1rchanv0vq9rx6x69608dlpdybvkn8a9ymx8wzm7gqpz9qh6xqrk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e5a4b9427038f90898ac0e237e71ba7152501f5/recipes/evil-space"; sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23"; - name = "evil-space"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11575,9 +15128,16 @@ license = lib.licenses.free; }; }) {}; - evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }: - melpaBuild { + evil-string-inflection = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , string-inflection }: + melpaBuild { pname = "evil-string-inflection"; + ename = "evil-string-inflection"; version = "1.0.0"; src = fetchFromGitHub { owner = "ninrod"; @@ -11585,10 +15145,10 @@ rev = "f6a3eca0f0fa8e56e6938e1dd48537eef1fae05f"; sha256 = "1akk0yylwcw4f91hprrrsijhbdcmrx1nnpgfyzpl4k5d4b30y8d5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection"; sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh"; - name = "evil-string-inflection"; + name = "recipe"; }; packageRequires = [ emacs evil string-inflection ]; meta = { @@ -11596,20 +15156,25 @@ license = lib.licenses.free; }; }) {}; - evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-surround = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-surround"; + ename = "evil-surround"; version = "1.0.1"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "f6162a7b5a65a297c8ebb8a81ce6e1278f958bbc"; - sha256 = "0kqkji4yn4khfrgghwkzgbh687fs3p07lj61x4i7w1ay1416lvn9"; + rev = "55c820083a5f28d5361baeb9cd7da92549e5b3f5"; + sha256 = "0qnv0c1byvzlclc8yaq6jjy61vza3zq2i773b30ss0rfpa03p13z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; sha256 = "0aphv5zinb0lzdx22qbzcr7fn6jbpkdczar7py3df6mzxw5wvcm1"; - name = "evil-surround"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11617,9 +15182,14 @@ license = lib.licenses.free; }; }) {}; - evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-swap-keys = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-swap-keys"; + ename = "evil-swap-keys"; version = "1.0.0"; src = fetchFromGitHub { owner = "wbolster"; @@ -11627,10 +15197,10 @@ rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a"; sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6"; - name = "evil-swap-keys"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -11638,9 +15208,14 @@ license = lib.licenses.free; }; }) {}; - evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-test-helpers = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-test-helpers"; + ename = "evil-test-helpers"; version = "1.2.13"; src = fetchFromGitHub { owner = "emacs-evil"; @@ -11648,10 +15223,10 @@ rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a"; sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; sha256 = "0l4skyznzgr76z518q22lf90ymlsfcs02w8vqkg8az1nfl3ch7fs"; - name = "evil-test-helpers"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11659,20 +15234,26 @@ license = lib.licenses.free; }; }) {}; - evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-text-object-python = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-text-object-python"; + ename = "evil-text-object-python"; version = "1.0.1"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-text-object-python"; - rev = "3b3fb01e7ad7eeeeae1143695547fe75148cc44f"; - sha256 = "1alin2rmx1xa1w3b1nb76bplmg10il55jxxm6jj7qs6z1izzllci"; + rev = "7aae5558be25b4a33abdede8a91da1cc7d08f1bc"; + sha256 = "0qfqfqbq3jijnmg0rp6agz9skcv2drnpyn481c7f455z46xi87kl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d0893b07bc4a057561a1c1a85b7520c50f31e12/recipes/evil-text-object-python"; sha256 = "0jdzs1yn8nrxq890427yjrxdvnzj8jy7bs3jj4w4c0fik26ngqhm"; - name = "evil-text-object-python"; + name = "recipe"; }; packageRequires = [ emacs evil ]; meta = { @@ -11680,9 +15261,15 @@ license = lib.licenses.free; }; }) {}; - evil-textobj-anyblock = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-textobj-anyblock = callPackage ({ cl-lib ? null + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-textobj-anyblock"; + ename = "evil-textobj-anyblock"; version = "0.1"; src = fetchFromGitHub { owner = "noctuid"; @@ -11690,10 +15277,10 @@ rev = "068d26a625cd6202aaf70a8ff399f9130c0ffa68"; sha256 = "0vsf7yzlb2j7c5c7cnk81y1979psy6a9v7klg6c2j9lkcn3cqpvj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36b734960313d4cb484cebaac0f112781436631c/recipes/evil-textobj-anyblock"; sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa"; - name = "evil-textobj-anyblock"; + name = "recipe"; }; packageRequires = [ cl-lib evil ]; meta = { @@ -11701,20 +15288,25 @@ license = lib.licenses.free; }; }) {}; - evil-tutor = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-tutor = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-tutor"; + ename = "evil-tutor"; version = "1.0"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-tutor"; - rev = "909273bac88b98a565f1b89bbb13d523b7edce2b"; - sha256 = "1rskvkmz30xyy8xfjf2i35f3dxh663gb3plfy3f0j6z17i086jl2"; + rev = "79b47a9f444ddaa289c66e8995ee116941429c24"; + sha256 = "11hiaxiqc2f522y7rgfr6bjnmx4nrssq1q9g96w4rsb10627qvsf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b7bfffdc34e181893b8cf4d1cc091f6c3f91126/recipes/evil-tutor"; sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn"; - name = "evil-tutor"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11722,9 +15314,15 @@ license = lib.licenses.free; }; }) {}; - evil-visual-mark-mode = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-visual-mark-mode = callPackage ({ dash + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-visual-mark-mode"; + ename = "evil-visual-mark-mode"; version = "0.0.3"; src = fetchFromGitHub { owner = "roman"; @@ -11732,10 +15330,10 @@ rev = "094ee37599492885ff3144918fcdd9b74dadaaa0"; sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/293cdd3387f26e4c8f21582d75a194963ac9cff7/recipes/evil-visual-mark-mode"; sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48"; - name = "evil-visual-mark-mode"; + name = "recipe"; }; packageRequires = [ dash evil ]; meta = { @@ -11743,9 +15341,14 @@ license = lib.licenses.free; }; }) {}; - evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-visual-replace = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-visual-replace"; + ename = "evil-visual-replace"; version = "0.0.5"; src = fetchFromGitHub { owner = "troyp"; @@ -11753,10 +15356,10 @@ rev = "163fc827a1ffc106475da470c37fb26f4cc9b008"; sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace"; sha256 = "1dq3bd9aqpk3jq1c9yzlpjyw6mi8l428l111vrmfg156k1w22v01"; - name = "evil-visual-replace"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11764,20 +15367,25 @@ license = lib.licenses.free; }; }) {}; - evil-visualstar = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evil-visualstar = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evil-visualstar"; + ename = "evil-visualstar"; version = "0.2.0"; src = fetchFromGitHub { owner = "bling"; repo = "evil-visualstar"; - rev = "eb996eca0081b6e8bab70b2c0a86ef1c71087bf6"; - sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk"; + rev = "bd9e1b50c03b37c57355d387f291c2ec8ce51eec"; + sha256 = "17m4kdz1is4ipnyiv9n3vss49faswbbd6v57df9npzsbn5jyydd0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/578d33f3f8e68ef1b3ca3fb8af9b9ff77b649bd3/recipes/evil-visualstar"; sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy"; - name = "evil-visualstar"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -11785,9 +15393,15 @@ license = lib.licenses.free; }; }) {}; - evm = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + evm = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "evm"; + ename = "evm"; version = "0.4.2"; src = fetchFromGitHub { owner = "rejeep"; @@ -11795,10 +15409,10 @@ rev = "d0623b2355436a5fd9f7238b419782080c79196b"; sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bbcead697f745d197459f90ee05b172e35af2411/recipes/evm"; sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03"; - name = "evm"; + name = "recipe"; }; packageRequires = [ dash f ]; meta = { @@ -11806,9 +15420,13 @@ license = lib.licenses.free; }; }) {}; - eww-lnum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eww-lnum = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eww-lnum"; + ename = "eww-lnum"; version = "1.1"; src = fetchFromGitHub { owner = "m00natic"; @@ -11816,10 +15434,10 @@ rev = "daef49974446ed4c1001e0549c3f74679bca6bd3"; sha256 = "0gs6bi3s2sszc6v2b26929azmn5513kvyin99n4d0ark1jdbjmv2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eww-lnum"; sha256 = "1hhc6q8zlj335v27j4dq6ms7frqpivfabs9w3vkaly5kjr60fw7c"; - name = "eww-lnum"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11827,20 +15445,26 @@ license = lib.licenses.free; }; }) {}; - exato = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + exato = callPackage ({ emacs + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "exato"; + ename = "exato"; version = "0.0.6"; src = fetchFromGitHub { owner = "ninrod"; repo = "exato"; - rev = "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6"; - sha256 = "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm"; + rev = "39c08f56483243c28a39886a7218039a138e5f63"; + sha256 = "1q0jjaw5k9bql7bk5idin724vbcgx0iwn2dm4mg1c51cczqsd2rg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato"; sha256 = "1h2dd3yhv1n0sznznw8ncx98g53hgi1rg1zkd0nmldih2rd5qisn"; - name = "exato"; + name = "recipe"; }; packageRequires = [ emacs evil ]; meta = { @@ -11848,20 +15472,24 @@ license = lib.licenses.free; }; }) {}; - exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + exec-path-from-shell = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "exec-path-from-shell"; + ename = "exec-path-from-shell"; version = "1.11"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "4d6a6aa18031a4bbdd5b3bfad8686dc5ff942ab2"; - sha256 = "0n86zj350jw1lxnaa450qmggza0za3a1zg9k9clwb9cjz4wwghsi"; + rev = "5e80a4159b1b78d66f99aa1c071b778f6c64e6e6"; + sha256 = "1pqyv78cknj6zwg2xvbxp4qkdjs0bic3w9w3mj7chja4qza83ijg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell"; sha256 = "014bfcs7znds4if1njyq4s5zrfnr6b3wj6722b4l5r58gh9mlrr5"; - name = "exec-path-from-shell"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11869,19 +15497,24 @@ license = lib.licenses.free; }; }) {}; - exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + exiftool = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "exiftool"; + ename = "exiftool"; version = "0.3"; src = fetchgit { url = "https://git.systemreboot.net/exiftool.el/"; rev = "8dd70ba5214a73960361a0c6220bb4aa72b9e478"; sha256 = "0sb71bj8djppzac02bpl3v7fy0jlidd4aagg8bmmgyp7zx84xws8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool"; sha256 = "1zvcps64yvz8lsjhi1j0808983fv2s7kx67yjr8ps454mcl8bpab"; - name = "exiftool"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -11889,9 +15522,13 @@ license = lib.licenses.free; }; }) {}; - expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + expand-region = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "expand-region"; + ename = "expand-region"; version = "0.11.0"; src = fetchFromGitHub { owner = "magnars"; @@ -11899,10 +15536,10 @@ rev = "0bc14fc7fbbcca5da4fdd9695cfd7cbd36eb3b96"; sha256 = "0h40dhc3kn8fq86xnwi5lz7ql8my8737y7wkqr897p15y90swr35"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region"; sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg"; - name = "expand-region"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11910,9 +15547,14 @@ license = lib.licenses.free; }; }) {}; - express = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }: - melpaBuild { + express = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , string-utils }: + melpaBuild { pname = "express"; + ename = "express"; version = "0.6.0"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -11920,10 +15562,10 @@ rev = "e6dc9abdc395ef537408befebeb4fd3ed4ee5c60"; sha256 = "106yh793scbyharsk1dvrirkj3c6666w8jqilpkaz78vwyw3zs5y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a97f5f81af13c49f5bea31455d7da0bf2c12e4f/recipes/express"; sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9"; - name = "express"; + name = "recipe"; }; packageRequires = [ string-utils ]; meta = { @@ -11931,9 +15573,14 @@ license = lib.licenses.free; }; }) {}; - exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + exsqlaim-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "exsqlaim-mode"; + ename = "exsqlaim-mode"; version = "0.0.1"; src = fetchFromGitHub { owner = "ahmadnazir"; @@ -11941,10 +15588,10 @@ rev = "e77d2a07addffd7df4393019d9c3dad1ab1925d9"; sha256 = "19v5sf3nf6dciakvs7ksbg66b5z1hybc4ivs24hm6k3fziblfzzs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode"; sha256 = "0ssn48wcn3x066nsl8y78y57ndasqv5x6ifxbifdxl3f5vjhyvg7"; - name = "exsqlaim-mode"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -11952,9 +15599,13 @@ license = lib.licenses.free; }; }) {}; - extend-dnd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + extend-dnd = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "extend-dnd"; + ename = "extend-dnd"; version = "0.5"; src = fetchFromGitHub { owner = "mattfidler"; @@ -11962,10 +15613,10 @@ rev = "a1923d57f8f5e862cc66c189b5e6627bc84a2119"; sha256 = "1k2j8szavyq2wy5c0skvs03a88cr9njy7y63b7knh2m92nw4830d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2d866ca12cb997b7fad878808c0966f3413b73d/recipes/extend-dnd"; sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417"; - name = "extend-dnd"; + name = "recipe"; }; packageRequires = []; meta = { @@ -11973,9 +15624,14 @@ license = lib.licenses.free; }; }) {}; - extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + extmap = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "extmap"; + ename = "extmap"; version = "1.0"; src = fetchFromGitHub { owner = "doublep"; @@ -11983,10 +15639,10 @@ rev = "3860b69fb19c962425d4e271ee0a24547b67d323"; sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap"; sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j"; - name = "extmap"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -11994,9 +15650,20 @@ license = lib.licenses.free; }; }) {}; - exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }: - melpaBuild { + exwm-x = callPackage ({ bind-key + , cl-lib ? null + , counsel + , exwm + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , swiper + , switch-window }: + melpaBuild { pname = "exwm-x"; + ename = "exwm-x"; version = "1.8.1"; src = fetchFromGitHub { owner = "tumashu"; @@ -12004,10 +15671,10 @@ rev = "4f7946db67d6599baba6b3961e8f543a68707742"; sha256 = "00lcn5106xig2y9gyir1f1gzyp2i05rwq1lbbbah8aipkdi3z9xl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3"; - name = "exwm-x"; + name = "recipe"; }; packageRequires = [ bind-key @@ -12023,9 +15690,15 @@ license = lib.licenses.free; }; }) {}; - eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eyebrowse = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eyebrowse"; + ename = "eyebrowse"; version = "0.7.7"; src = fetchFromGitHub { owner = "wasamasa"; @@ -12033,10 +15706,10 @@ rev = "7294ed5fbf5f38407b599a10a335b8c4ec15a8d5"; sha256 = "1lhpf88042mg9q328w2d328ka9pild4ppdynbn3rsib9zgxp8waq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861"; - name = "eyebrowse"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -12044,20 +15717,24 @@ license = lib.licenses.free; }; }) {}; - eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + eziam-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "eziam-theme"; - version = "0.4.5"; + ename = "eziam-theme"; + version = "1.0"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "4a79230739cfaa607f39fbfe53339692b83c3933"; - sha256 = "0cdaayp2ca6wcqh11snmc50p4gl6sika58jxvn5dklsipzxv75v8"; + rev = "a2bdda95f840c15240975c32b66d4d1e0682a1e1"; + sha256 = "1z0m3pzhyif1rx8g4gzg1wfdqdkxdaahjjq8hx2fj4k4l16bia99"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; sha256 = "0iz3r4r54ai8y4qhnix291ra7qfmk8dbr06f52pgmz3gzin1cqpb"; - name = "eziam-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12065,9 +15742,15 @@ license = lib.licenses.free; }; }) {}; - f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + f = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "f"; + ename = "f"; version = "0.20.0"; src = fetchFromGitHub { owner = "rejeep"; @@ -12075,10 +15758,10 @@ rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48"; sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f"; sha256 = "18qax8i24gpccif4xcxccclpwl00plxjf3zbq9dry37b1r4mj57s"; - name = "f"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -12086,9 +15769,16 @@ license = lib.licenses.free; }; }) {}; - f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + f3 = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "f3"; + ename = "f3"; version = "0.1"; src = fetchFromGitHub { owner = "cosmicexplorer"; @@ -12096,10 +15786,10 @@ rev = "19120dda2d760d3dd6c6aa620121d1de0a40932d"; sha256 = "1qg48zbjdjqimw4516ymrsilz41zkib9321q0caf9474s9xyp2bi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; sha256 = "099wibgp9k6sgglaqigic5ay6qg7aqijnis5crwjl7b81ddqp610"; - name = "f3"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -12107,9 +15797,13 @@ license = lib.licenses.free; }; }) {}; - fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fabric = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fabric"; + ename = "fabric"; version = "0.2.0"; src = fetchFromGitHub { owner = "nlamirault"; @@ -12117,10 +15811,10 @@ rev = "004934318f63d8cf955022f87b2c33eb97ada280"; sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83939d2a4d5874244a4916eee9ae6b327af18b5d/recipes/fabric"; sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m"; - name = "fabric"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12128,20 +15822,24 @@ license = lib.licenses.free; }; }) {}; - factlog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + factlog = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "factlog"; + ename = "factlog"; version = "0.0.1"; src = fetchFromGitHub { owner = "tkf"; repo = "factlog"; - rev = "c834fdab81ec5b1bdc0ee2721a12cecb48a319bf"; - sha256 = "01l8dlfpyy97b17djbza46rq11xlbkhd5kn2r26r2xac8klj4pka"; + rev = "6b83e4f54097a59a13bcccfd29805e432f4e9584"; + sha256 = "1mmyl3ndv5c17mvwxrmv0czjnr5i9b7zydg8swipwgshc3kvn7l0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9075a42edee1ac7de0812d2eefcba5681859eb6e/recipes/factlog"; sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7"; - name = "factlog"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12149,20 +15847,24 @@ license = lib.licenses.free; }; }) {}; - faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + faff-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "faff-theme"; - version = "2.0"; + ename = "faff-theme"; + version = "2.2"; src = fetchFromGitHub { owner = "WJCFerguson"; repo = "emacs-faff-theme"; - rev = "0835c25b5e4ae7a79f0c1c4c44867f2d2e73b642"; - sha256 = "0msh7w8qmrd9977zamyh0qifzf5bwl6g1012gc8lsr995c6gwm87"; + rev = "8fbdf71a2e63a8ec997c387bd8319c0dc825a938"; + sha256 = "17ckad411h033l4cpg337vkwvyxrpvqvi9pa56p7mpxzfg3q8a3v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; sha256 = "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g"; - name = "faff-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12170,9 +15872,14 @@ license = lib.licenses.free; }; }) {}; - fancy-battery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fancy-battery = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fancy-battery"; + ename = "fancy-battery"; version = "0.2"; src = fetchFromGitHub { owner = "lunaryorn"; @@ -12180,10 +15887,10 @@ rev = "5b8115bbeb67c52d4202a12dcd5726fb66e0a1ff"; sha256 = "05lwcwf412m717yhwpjrswqkm8c3i7391rmiwv2k8xc1vk6dpp4g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eae3af4145c534992d1c1ee5bb6420651c7c5d82/recipes/fancy-battery"; sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii"; - name = "fancy-battery"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -12191,20 +15898,24 @@ license = lib.licenses.free; }; }) {}; - fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fancy-narrow = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fancy-narrow"; + ename = "fancy-narrow"; version = "0.9.5"; src = fetchFromGitHub { owner = "Malabarba"; repo = "fancy-narrow"; - rev = "c0f70b4333d4764323b7154e37a378adb1610ab7"; - sha256 = "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y"; + rev = "4737d706d1f3e90885e6642ba782f1fa605414c6"; + sha256 = "0825hyz8b2biil0pd2bgjxqd2zm3gw9si7br5hnh51qasbaw9hid"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow"; sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv"; - name = "fancy-narrow"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12212,9 +15923,15 @@ license = lib.licenses.free; }; }) {}; - fastdef = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, w3m }: - melpaBuild { + fastdef = callPackage ({ fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , w3m }: + melpaBuild { pname = "fastdef"; + ename = "fastdef"; version = "0.2.0"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -12222,10 +15939,10 @@ rev = "0696f41dc150d35ce31fe8d2ea74f4173818bb55"; sha256 = "1p5vmbx7zdzxnyjzcp2vxscd3dwf7xk82wk9dfiv99svwqv2ki3w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6effb2fbccc71e8a44c53138e3c21f10dc55fbc/recipes/fastdef"; sha256 = "1cf4slxhcp2z7h9k3l31h06nnqsyb4smwnj55ivil2lm0fa0vlzj"; - name = "fastdef"; + name = "recipe"; }; packageRequires = [ ivy w3m ]; meta = { @@ -12233,9 +15950,13 @@ license = lib.licenses.free; }; }) {}; - fastnav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fastnav = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fastnav"; + ename = "fastnav"; version = "1.0.7"; src = fetchFromGitHub { owner = "gleber"; @@ -12243,10 +15964,10 @@ rev = "54626e9e7cc7be5bc2bd01732e95ed2afc2312a1"; sha256 = "0h32w63vv451797zi6206j529fd4j8l3fp7rqip3s8xn8d4728x1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2a7dce6617bf4ed250dba150e6787bf48891c64/recipes/fastnav"; sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5"; - name = "fastnav"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12254,9 +15975,13 @@ license = lib.licenses.free; }; }) {}; - faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + faust-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "faust-mode"; + ename = "faust-mode"; version = "0.6"; src = fetchFromGitHub { owner = "rukano"; @@ -12264,10 +15989,10 @@ rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c"; sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode"; sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z"; - name = "faust-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12275,19 +16000,25 @@ license = lib.licenses.free; }; }) {}; - faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + faustine = callPackage ({ emacs + , faust-mode + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "faustine"; + ename = "faustine"; version = "0.4"; src = fetchgit { url = "https://bitbucket.org/yphil/faustine"; - rev = "f186461e2bc38ec8ae38bd5ab727cc769218a168"; - sha256 = "16p7qmljjki4svci3mxzydmvpxaprbnfq6794b3adyyixkmgr6k7"; + rev = "feb938af3a5363e0e0210aa98a447e1896ceca47"; + sha256 = "1c0xc1nk9djjk39ksysszliphibnpm7c472p4lvgkmrsmg28i23k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/faustine"; sha256 = "1blmz993xrwkyr7snj7rm07s07imgpdlfqi6wxkm4ns6iwa2q60s"; - name = "faustine"; + name = "recipe"; }; packageRequires = [ emacs faust-mode ]; meta = { @@ -12295,9 +16026,13 @@ license = lib.licenses.free; }; }) {}; - fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fcitx = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fcitx"; + ename = "fcitx"; version = "0.2.3"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -12305,10 +16040,10 @@ rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f"; sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx"; - name = "fcitx"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12316,9 +16051,13 @@ license = lib.licenses.free; }; }) {}; - feature-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + feature-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "feature-mode"; + ename = "feature-mode"; version = "0.4"; src = fetchFromGitHub { owner = "michaelklishin"; @@ -12326,10 +16065,10 @@ rev = "4bd8f19da816115094beb4b0e085822eb298ac37"; sha256 = "1cxjygg05v8s96c8z6plk3hl34jaiwg7s7dl7dsk20rj5f54kgw7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a70991695f9ff305f12cfa45e0a597f4a782ba3/recipes/feature-mode"; sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg"; - name = "feature-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12337,9 +16076,13 @@ license = lib.licenses.free; }; }) {}; - fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fill-column-indicator = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fill-column-indicator"; + ename = "fill-column-indicator"; version = "1.90"; src = fetchFromGitHub { owner = "alpaker"; @@ -12347,10 +16090,10 @@ rev = "f7b3f99b41ff017f50a21ad53eed16f8ef5ab7ee"; sha256 = "0snjznxdwwfdgccdcvrnk467416r244r2r5qcm2sga8l0ha9gw9z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator"; sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma"; - name = "fill-column-indicator"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12358,9 +16101,43 @@ license = lib.licenses.free; }; }) {}; - finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fill-function-arguments = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "fill-function-arguments"; + ename = "fill-function-arguments"; + version = "0.9"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "fill-function-arguments"; + rev = "bf4b390de851b0bb81309865835fd3ec4c7bfb72"; + sha256 = "1qq5ab39zyis11lhaarcbpd7s9fvmpymw8wi92iq16fp720l6pfa"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b78eab67517b19516e5d265018afcbff0acfa9ec/recipes/fill-function-arguments"; + sha256 = "1gigzzz2csl3a55jmjx391a5k3ymixnwpblsn0pfgkkk4p3674q0"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/fill-function-arguments"; + license = lib.licenses.free; + }; + }) {}; + finalize = callPackage ({ cl-generic + , cl-lib ? null + , eieio ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "finalize"; + ename = "finalize"; version = "2.0.0"; src = fetchFromGitHub { owner = "skeeto"; @@ -12368,10 +16145,10 @@ rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27"; sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize"; sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq"; - name = "finalize"; + name = "recipe"; }; packageRequires = [ cl-generic cl-lib eieio emacs ]; meta = { @@ -12379,9 +16156,14 @@ license = lib.licenses.free; }; }) {}; - find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: - melpaBuild { + find-by-pinyin-dired = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pinyinlib }: + melpaBuild { pname = "find-by-pinyin-dired"; + ename = "find-by-pinyin-dired"; version = "0.0.3"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -12389,10 +16171,10 @@ rev = "2c48434637bd63840fca4d2c6cf9ebd5dd44658f"; sha256 = "0ial0lbvg0xbrwn8cm68xc5wxj3xgp110y2zgypkdpak8gkv8b5h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired"; sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq"; - name = "find-by-pinyin-dired"; + name = "recipe"; }; packageRequires = [ pinyinlib ]; meta = { @@ -12400,20 +16182,26 @@ license = lib.licenses.free; }; }) {}; - find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + find-file-in-project = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "find-file-in-project"; - version = "5.6.0"; + ename = "find-file-in-project"; + version = "5.6.8"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "ad6c8fce30ac927b4c2297894b6436e1cf724501"; - sha256 = "1mq544h03laphwvcff2qaxdbb7krmnw1vxmnc9jchz8ascx2x28n"; + rev = "1c54325cb60bde7496dad4e19f4c2a857999df58"; + sha256 = "1pxqqpj6cdwbhca6vaj98d86f1l0vl09zp054wf0sv759l25ac0l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy"; - name = "find-file-in-project"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -12421,9 +16209,13 @@ license = lib.licenses.free; }; }) {}; - find-file-in-repository = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + find-file-in-repository = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "find-file-in-repository"; + ename = "find-file-in-repository"; version = "1.2"; src = fetchFromGitHub { owner = "hoffstaetter"; @@ -12431,10 +16223,10 @@ rev = "8b888f85029a2ff9159a724b42aeacdb051c3420"; sha256 = "0wbmmrd7brf4498pdyilz17rzv7221cj8sd4h11gac2r72f1q2md"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58705ac6201b73851ce4ce9ebeb0e65463765961/recipes/find-file-in-repository"; sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6"; - name = "find-file-in-repository"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12442,9 +16234,14 @@ license = lib.licenses.free; }; }) {}; - fiplr = callPackage ({ fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: - melpaBuild { + fiplr = callPackage ({ fetchFromGitHub + , fetchurl + , grizzl + , lib + , melpaBuild }: + melpaBuild { pname = "fiplr"; + ename = "fiplr"; version = "0.2.4"; src = fetchFromGitHub { owner = "grizzl"; @@ -12452,10 +16249,10 @@ rev = "100dfc33f43da8c49e50e8a2222b9d95532f6e24"; sha256 = "0lwgbd9zwdv7qs39c3fp4hrc17d9wrwwjgba7a14zwrhb27m7j07"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/fiplr"; sha256 = "1a4w0yqdkz477lfyin4lb9k9qkfpx4350kfxmrqx6dj3aadkikca"; - name = "fiplr"; + name = "recipe"; }; packageRequires = [ grizzl ]; meta = { @@ -12463,20 +16260,27 @@ license = lib.licenses.free; }; }) {}; - firefox-controller = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, moz, popwin }: - melpaBuild { + firefox-controller = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , moz + , popwin }: + melpaBuild { pname = "firefox-controller"; + ename = "firefox-controller"; version = "2.1"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "emacs-firefox-controller"; - rev = "a8af8cbf70afaf6b89a26d6ac69af8e92afc181f"; - sha256 = "0icgl88pwizwzkdqsxbwhnc6pdyqsfd7wgjnkvg3206i7hcqwpsp"; + rev = "5b1bedec83206f41672b1b65bba859f235bff48b"; + sha256 = "04afwxgydrn23bv93zqf9bd2cp02i9dcfqbi809arkmh8723qf6k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a69c20f8dcf73c878f2172dcc9f1796fdc0408/recipes/firefox-controller"; sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6"; - name = "firefox-controller"; + name = "recipe"; }; packageRequires = [ cl-lib moz popwin ]; meta = { @@ -12484,9 +16288,13 @@ license = lib.licenses.free; }; }) {}; - fireplace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fireplace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fireplace"; + ename = "fireplace"; version = "1.1.2"; src = fetchFromGitHub { owner = "johanvts"; @@ -12494,10 +16302,10 @@ rev = "2b966ed65b714c613f79e9144d004dfa3b28f1ed"; sha256 = "1f5053bbvjdmm64zv6r2qkswkpwvx0s3qz4bwm9zya583a6g0nv8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c1ac52c1cfe7ccf46092c2d299ebbffdc1b7609/recipes/fireplace"; sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw"; - name = "fireplace"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12505,9 +16313,13 @@ license = lib.licenses.free; }; }) {}; - firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + firestarter = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "firestarter"; + ename = "firestarter"; version = "0.2.5"; src = fetchFromGitHub { owner = "wasamasa"; @@ -12515,10 +16327,10 @@ rev = "4d6b106f325ac1802eabce3c8a7cd0a4c7a32864"; sha256 = "13daz15v0sshl7lxcg1xcbpl64gklgh50pzk0qxmn5ygw7nlifn0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b046eb3b63220b937e1b70f633cb5424dc782a1/recipes/firestarter"; sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp"; - name = "firestarter"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12526,9 +16338,14 @@ license = lib.licenses.free; }; }) {}; - fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fish-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fish-mode"; + ename = "fish-mode"; version = "0.1.4"; src = fetchFromGitHub { owner = "wwwjfy"; @@ -12536,10 +16353,10 @@ rev = "bac709ac1235751952d6022dddc6307d9135d096"; sha256 = "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14"; - name = "fish-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -12547,9 +16364,14 @@ license = lib.licenses.free; }; }) {}; - fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fix-input = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fix-input"; + ename = "fix-input"; version = "0.1.1"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -12557,10 +16379,10 @@ rev = "a70edfa7880ff9b082f358607d2a9ad6a8dcc8f3"; sha256 = "121m0h0nwxr27f9d2llbgl63ni1makcg66lnvg24wx07wggf0n8z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p"; - name = "fix-input"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -12568,9 +16390,13 @@ license = lib.licenses.free; }; }) {}; - fix-muscle-memory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fix-muscle-memory = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fix-muscle-memory"; + ename = "fix-muscle-memory"; version = "0.93"; src = fetchFromGitHub { owner = "jonnay"; @@ -12578,10 +16404,10 @@ rev = "df687aea23c6eac4b751f993893c2fd56e5a8a3b"; sha256 = "02nl4vz6fnbjc7w1lk1y9z0qw5bsxr407ww0b2wqw6h8spmcpcrc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b0501714a6d82657b88d11e3f79d75eea17d8e/recipes/fix-muscle-memory"; sha256 = "0qhasnjw0bj5hzw27r8vj6shhwc3zxcp3wmxijh1rpdw4773f7n8"; - name = "fix-muscle-memory"; + name = "recipe"; }; packageRequires = []; meta = { @@ -12589,9 +16415,15 @@ license = lib.licenses.free; }; }) {}; - fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fix-word = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fix-word"; + ename = "fix-word"; version = "0.1.2"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -12599,10 +16431,10 @@ rev = "91552cbceac8e2b7c23036f044fc84f5c6f8e338"; sha256 = "1pilsd3hkryyl4sd6s4nvmraszkdmcn3qdqi939yjgzp4lz3q412"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc"; - name = "fix-word"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -12610,9 +16442,19 @@ license = lib.licenses.free; }; }) {}; - fixmee = callPackage ({ back-button, button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash, smartrep, string-utils, tabulated-list ? null }: - melpaBuild { + fixmee = callPackage ({ back-button + , button-lock + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nav-flash + , smartrep + , string-utils + , tabulated-list ? null }: + melpaBuild { pname = "fixmee"; + ename = "fixmee"; version = "0.8.6"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -12620,10 +16462,10 @@ rev = "aa3be8ad9fcc9c0c7ff15f70cda4ba77de96dd74"; sha256 = "1hnxdmzqmnp3dr7mpr58pjmigykb3cxwphxzia013kfi37ipf5a0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f5d06db82e237e6c6babd92a1fd2b58c29662e4f/recipes/fixmee"; sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp"; - name = "fixmee"; + name = "recipe"; }; packageRequires = [ back-button @@ -12638,9 +16480,14 @@ license = lib.licenses.free; }; }) {}; - flatui-dark-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flatui-dark-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flatui-dark-theme"; + ename = "flatui-dark-theme"; version = "0.3.0"; src = fetchFromGitHub { owner = "theasp"; @@ -12648,10 +16495,10 @@ rev = "af5c84e2a2810748cc71a68ec7ba333097cc1f63"; sha256 = "0c0pm67d8w9jdraap0sswvx7ywly9ifimij2c5w9p4hiph8gisr9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f9dc5abeb37422c63cac74f9a006d54c4a7c5a5/recipes/flatui-dark-theme"; sha256 = "1mswmkhi43fm0cmdgf0ywpy9lmapy0syl65kqh68sa3jqbznhm6y"; - name = "flatui-dark-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -12659,9 +16506,16 @@ license = lib.licenses.free; }; }) {}; - flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flex-compile = callPackage ({ buffer-manage + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flex-compile"; + ename = "flex-compile"; version = "0.2"; src = fetchFromGitHub { owner = "plandes"; @@ -12669,10 +16523,10 @@ rev = "82e217aaab34dfd1faf7d03c82eca49706190232"; sha256 = "1zp0gki61g487x6bypxlkbjzi972y80pzmhqdisl6qx9yrmk60vy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile"; sha256 = "1hlh4k7qgln87xajnjjhf1yyg6bgdwd0iczhlfw8gdwfj5xpjd38"; - name = "flex-compile"; + name = "recipe"; }; packageRequires = [ buffer-manage dash emacs ]; meta = { @@ -12680,9 +16534,15 @@ license = lib.licenses.free; }; }) {}; - floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: - melpaBuild { + floobits = callPackage ({ fetchFromGitHub + , fetchurl + , highlight + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "floobits"; + ename = "floobits"; version = "1.9.2"; src = fetchFromGitHub { owner = "Floobits"; @@ -12690,10 +16550,10 @@ rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f"; sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf"; - name = "floobits"; + name = "recipe"; }; packageRequires = [ highlight json ]; meta = { @@ -12701,9 +16561,14 @@ license = lib.licenses.free; }; }) {}; - flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flow-minor-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flow-minor-mode"; + ename = "flow-minor-mode"; version = "0.3"; src = fetchFromGitHub { owner = "an-sh"; @@ -12711,10 +16576,10 @@ rev = "50dded94ad201fdc9453656a8b15179981cd5acd"; sha256 = "1vaqml0ypbc14mnwycgm9slkds3bgg6x5qz99kck98acbcfijxk6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s"; - name = "flow-minor-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -12722,20 +16587,26 @@ license = lib.licenses.free; }; }) {}; - flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flower = callPackage ({ clomacs + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flower"; - version = "0.4.1"; + ename = "flower"; + version = "0.4.2"; src = fetchFromGitHub { owner = "PositiveTechnologies"; repo = "flower"; - rev = "98c53b03da698833058b9ad6b6eb8be46cfd00f6"; - sha256 = "08wq66gvqy14mcpm8x14xz3hvw4h7rcd5ivynma91d4358qrmqap"; + rev = "4d05448dc0118078ec320f564d87acaa740ae47c"; + sha256 = "02p74f5hfhrhv5l7b9cwfbczsgkpqajlmr66qmkdljgc8ksr86n2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower"; sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd"; - name = "flower"; + name = "recipe"; }; packageRequires = [ clomacs emacs ]; meta = { @@ -12743,9 +16614,14 @@ license = lib.licenses.free; }; }) {}; - flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flx = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flx"; + ename = "flx"; version = "0.6.1"; src = fetchFromGitHub { owner = "lewang"; @@ -12753,10 +16629,10 @@ rev = "7fce6a4cdb65ac1b52e2b409ba548767581ce34c"; sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx"; sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9"; - name = "flx"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -12764,9 +16640,15 @@ license = lib.licenses.free; }; }) {}; - flx-ido = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: - melpaBuild { + flx-ido = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , flx + , lib + , melpaBuild }: + melpaBuild { pname = "flx-ido"; + ename = "flx-ido"; version = "0.6.1"; src = fetchFromGitHub { owner = "lewang"; @@ -12774,10 +16656,10 @@ rev = "7fce6a4cdb65ac1b52e2b409ba548767581ce34c"; sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx-ido"; sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc"; - name = "flx-ido"; + name = "recipe"; }; packageRequires = [ cl-lib flx ]; meta = { @@ -12785,9 +16667,18 @@ license = lib.licenses.free; }; }) {}; - flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: - melpaBuild { + flycheck = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , pkg-info + , seq }: + melpaBuild { pname = "flycheck"; + ename = "flycheck"; version = "31"; src = fetchFromGitHub { owner = "flycheck"; @@ -12795,10 +16686,10 @@ rev = "401b115d10e202a1b31f57340438420081af21ce"; sha256 = "141i6wzqlb0dslmca6930cal7q4y5wbwzmxrpjk3hgm6nxz483p8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr"; - name = "flycheck"; + name = "recipe"; }; packageRequires = [ dash emacs let-alist pkg-info seq ]; meta = { @@ -12806,9 +16697,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-apertium = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-apertium = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-apertium"; + ename = "flycheck-apertium"; version = "0.2"; src = fetchFromGitHub { owner = "unhammer"; @@ -12816,10 +16712,10 @@ rev = "71cf49d5aaee962b995583384bfa045a1d4c3db7"; sha256 = "14idjjz6fhmq806mmncmqnr9bvcjks6spin8z6jb0gqcg1dbhm06"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f6cec0d312f0e86e17829e6fd8f87acabc0174f/recipes/flycheck-apertium"; sha256 = "1cc15sljqs6gvb3wiw7n1wkd714qkvfpw6l1kg4lfx9r4jalcvw7"; - name = "flycheck-apertium"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -12827,9 +16723,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-cask = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-cask = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-cask"; + ename = "flycheck-cask"; version = "0.4"; src = fetchFromGitHub { owner = "flycheck"; @@ -12837,10 +16740,10 @@ rev = "b4667500dcf52f96ec7e0fa10dd07edf191cbf5b"; sha256 = "1wm5saf29gw0gp0qq5glf9qq3iras99npc2rip7bsnn0czr2mscy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-cask"; sha256 = "0d2m7mg91k1nazysayryxagql1vi975n7iv0snknhbw4wisqp82f"; - name = "flycheck-cask"; + name = "recipe"; }; packageRequires = [ dash emacs flycheck ]; meta = { @@ -12848,9 +16751,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-checkbashisms = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-checkbashisms"; + ename = "flycheck-checkbashisms"; version = "1.5"; src = fetchFromGitHub { owner = "Gnouc"; @@ -12858,10 +16767,10 @@ rev = "39362240b8e38e6ddc1da2e2c2229e3fecdf6057"; sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f5678ea5aef4dc8a517d6d9381a64f182645d344/recipes/flycheck-checkbashisms"; sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz"; - name = "flycheck-checkbashisms"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -12869,9 +16778,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-checkpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-checkpatch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-checkpatch"; + ename = "flycheck-checkpatch"; version = "0.1"; src = fetchFromGitHub { owner = "zpp0"; @@ -12879,10 +16794,10 @@ rev = "aca98ea79f8b26a95f9dbdd4142b01fdd2def866"; sha256 = "0bs36dp1jy2z9zfq4mnrin9ik0ffl7023h6dx3qbfya1gcxs07py"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/193aaae5640434559cd479df1463ee44eab14d86/recipes/flycheck-checkpatch"; sha256 = "1apjn26n663rjddv5iagfs65fdf22049ykmzggybbnprvnmasf55"; - name = "flycheck-checkpatch"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -12890,20 +16805,28 @@ license = lib.licenses.free; }; }) {}; - flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: - melpaBuild { + flycheck-clojure = callPackage ({ cider + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-clojure"; + ename = "flycheck-clojure"; version = "0.1.5"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "squiggly-clojure"; - rev = "fc0f1473c85b5287c8a62c1eee86894c98fbb84c"; - sha256 = "0dqnv7l82h09janakq2b3ncz3jj99418pb91w0gabvfylww3pm21"; + rev = "67985fba99d0b2e524d426f266e58499ab8c5514"; + sha256 = "1bv5px1px4cbaqc3d805px6irx654b3asj5g8frk6hxr99l6x93w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure"; sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28"; - name = "flycheck-clojure"; + name = "recipe"; }; packageRequires = [ cider emacs flycheck let-alist ]; meta = { @@ -12911,20 +16834,27 @@ license = lib.licenses.free; }; }) {}; - flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-color-mode-line = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-color-mode-line"; + ename = "flycheck-color-mode-line"; version = "0.3"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-color-mode-line"; - rev = "c85319f8d2579e770c9060bfef11bedc1370d8be"; - sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5"; + rev = "9b69ab84f4fa51abeec4882b3a8d1453dfddb744"; + sha256 = "0qll32rhw8q7z41qwzcsh9k5yhdg6bp4wx6w8j65ky52qia767k4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line"; sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq"; - name = "flycheck-color-mode-line"; + name = "recipe"; }; packageRequires = [ dash emacs flycheck ]; meta = { @@ -12932,20 +16862,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-crystal = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-crystal"; + ename = "flycheck-crystal"; version = "0.1.0"; src = fetchFromGitHub { owner = "crystal-lang-tools"; repo = "emacs-crystal-mode"; - rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10"; - sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m"; + rev = "5795e05450016d1337c1a198ae7ea76deeec40e2"; + sha256 = "0yipv79gcwp4i3y8gxjd1npgi8fx2iv8lipb14a8165y84ygkf4l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal"; sha256 = "04avxav2rayprm09xkphs1ni10j1kk10j7m77afcac0gnma5rwyn"; - name = "flycheck-crystal"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -12953,9 +16888,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-dmd-dub = callPackage ({ f + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-dmd-dub"; + ename = "flycheck-dmd-dub"; version = "0.12"; src = fetchFromGitHub { owner = "atilaneves"; @@ -12963,10 +16904,10 @@ rev = "41a839e18eb7159175c59a2f8b2f5f283191e33f"; sha256 = "0a78np6nb9ciz440n9ks6kybwggkq99knzv7swbmvngvhg96khbx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm"; - name = "flycheck-dmd-dub"; + name = "recipe"; }; packageRequires = [ f flycheck ]; meta = { @@ -12974,9 +16915,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-gometalinter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-gometalinter"; + ename = "flycheck-gometalinter"; version = "0.1.4"; src = fetchFromGitHub { owner = "favadi"; @@ -12984,10 +16931,10 @@ rev = "2e863429cc953cf4c14783e249df56d1ae669868"; sha256 = "07r2csy2psflvg0pl6n9scfwhnp9mv7hs02hz861v5kbkfx0ajzw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter"; sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2"; - name = "flycheck-gometalinter"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -12995,9 +16942,19 @@ license = lib.licenses.free; }; }) {}; - flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: - melpaBuild { + flycheck-haskell = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , haskell-mode + , let-alist + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "flycheck-haskell"; + ename = "flycheck-haskell"; version = "0.8"; src = fetchFromGitHub { owner = "flycheck"; @@ -13005,10 +16962,10 @@ rev = "ee3401d97cc5e8edc216f2369e9dea3d363e462c"; sha256 = "0yryd346cp5zir3icldkhjzwjb0bkq8rlidbr62dry1cw9bic6z0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7"; - name = "flycheck-haskell"; + name = "recipe"; }; packageRequires = [ dash emacs flycheck haskell-mode let-alist seq ]; meta = { @@ -13016,9 +16973,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-hdevtools = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-hdevtools = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-hdevtools"; + ename = "flycheck-hdevtools"; version = "0.3"; src = fetchFromGitHub { owner = "flycheck"; @@ -13026,10 +16988,10 @@ rev = "fbf90b9a7d2d90f69ac55b57d18f0f4a47afed61"; sha256 = "136mdg21a8sqxhijsjsvpli7r7sb40nmf80p6gmgb1ghwmhlm8k3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e210eb2405cc85dd1d03e9119d2249178950398/recipes/flycheck-hdevtools"; sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93"; - name = "flycheck-hdevtools"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -13037,9 +16999,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-irony = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, irony, lib, melpaBuild }: - melpaBuild { + flycheck-irony = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , irony + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-irony"; + ename = "flycheck-irony"; version = "0.1.0"; src = fetchFromGitHub { owner = "Sarcasm"; @@ -13047,10 +17016,10 @@ rev = "34940ae5ab8f4c721d9c1118ebfc3496d7e67a84"; sha256 = "0qa5a8wzvzxwqql92ibc9s43k8sj3vwn7skz9hfr8av0skkhx996"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e367afce9a792c168ef1e7e20cc5903f7b570d8/recipes/flycheck-irony"; sha256 = "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z"; - name = "flycheck-irony"; + name = "recipe"; }; packageRequires = [ emacs flycheck irony ]; meta = { @@ -13058,20 +17027,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-joker = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-joker"; - version = "1.1.0"; + ename = "flycheck-joker"; + version = "1.2.0"; src = fetchFromGitHub { owner = "candid82"; repo = "flycheck-joker"; - rev = "c34c3922a2e8bc918f250602e0ddf655cdcad456"; - sha256 = "0fp7h0pmxk02x1kisqvnb9wkjjn9bl91capmnllrb7qmb24w6pd5"; + rev = "0d8d5683a273093ca12841bf93d10dae97ccbc5d"; + sha256 = "0r9w0ky1522yz1jdi8fd36lpdjm30vxq41x77vswikqxvscri3dq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker"; sha256 = "0war80zdljpjhfihqrind8471ic7l4z7j74zmrysybxvnd5nr7l3"; - name = "flycheck-joker"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -13079,9 +17053,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-julia = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-julia"; + ename = "flycheck-julia"; version = "0.1.1"; src = fetchFromGitHub { owner = "gdkrmr"; @@ -13089,10 +17069,10 @@ rev = "213b60a5a9a1cb7887260e1d159b5bb27167cbb6"; sha256 = "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia"; sha256 = "0340bv0lifs8pajk7gh7rngdjg62vaggn5biyysng642dlg5fwqs"; - name = "flycheck-julia"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -13100,20 +17080,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-kotlin = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-kotlin = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-kotlin"; + ename = "flycheck-kotlin"; version = "0.3"; src = fetchFromGitHub { owner = "whirm"; repo = "flycheck-kotlin"; - rev = "cbb9fbf70dbe8efcc3971b3606ee95c97469b1fe"; - sha256 = "0bxjx7xcpscv6vv4yxll8hh43aabv2dnrvkymb47jm3yvjr9cs1c"; + rev = "44dfae49a7355232492e17c150b7f80a84835c45"; + sha256 = "1495yxk308d1j3hw8gfdrsg8xs1imzgwfnwadrz9hx36rjd2dhj5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f158727cc8892aadba0a613dd08e65e2fc791b48/recipes/flycheck-kotlin"; sha256 = "0vh4f3ap1ciddf2fvfnjz668d6spyx49xs2wfp1hrzxn5yqpnra5"; - name = "flycheck-kotlin"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -13121,9 +17106,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-ledger = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-ledger = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-ledger"; + ename = "flycheck-ledger"; version = "0.4"; src = fetchFromGitHub { owner = "purcell"; @@ -13131,10 +17121,10 @@ rev = "9401b6c83f60bfd29edfc62fee76f75e17a3a41e"; sha256 = "1pdssw5k88ym5fczllfjv26sp4brlyrywnlzq5baha5pq91h9cb6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger"; sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl"; - name = "flycheck-ledger"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -13142,9 +17132,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-mix = callPackage ({ elixir-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-mix = callPackage ({ elixir-mode + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-mix"; + ename = "flycheck-mix"; version = "1.0.0"; src = fetchFromGitHub { owner = "tomekowal"; @@ -13152,10 +17148,10 @@ rev = "c565ebb12a48fcd49cc65656d79295c3288fcb84"; sha256 = "1yncail979sfljmib7b1m9aw376xd4b76apz4d50hj83lrfy169c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd2a4d71b7f4c0082b687a23fd367d55186625a9/recipes/flycheck-mix"; sha256 = "1wp8lp45lc519w3xsws2c91jlbfmc0pc8764kxsifk74akwcizfl"; - name = "flycheck-mix"; + name = "recipe"; }; packageRequires = [ elixir-mode flycheck ]; meta = { @@ -13163,20 +17159,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-mmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-mmark = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-mmark"; + ename = "flycheck-mmark"; version = "0.1.0"; src = fetchFromGitHub { owner = "mmark-md"; repo = "flycheck-mmark"; - rev = "b73b40cb9c5cf6bc6fa501aa87a4c30b210c0c5f"; - sha256 = "1w75accl67i0qwadwp7dgpxaj0i8zwckvv5isyn93vknzw5dz66x"; + rev = "9ac97f2ff7c669f1c5581b1a6677daa2383b0884"; + sha256 = "0yis6dgvclm434zycc731y48ac4wviafn1k9w18qmlz9qnjqpivd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2fd10423ab80e32245bb494005c8f87a8987fffb/recipes/flycheck-mmark"; sha256 = "0lnw7pz40hijcpi9b92vjxvvyh9v50ww2f2r8z9pyhl9mjy2245x"; - name = "flycheck-mmark"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -13184,9 +17186,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, nim-mode }: - melpaBuild { + flycheck-nimsuggest = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , nim-mode }: + melpaBuild { pname = "flycheck-nimsuggest"; + ename = "flycheck-nimsuggest"; version = "0.8.1"; src = fetchFromGitHub { owner = "yuutayamada"; @@ -13194,10 +17203,10 @@ rev = "8b1c69e9aa924368bc4dadd4cde818ff158cd3f0"; sha256 = "0vnwy7b3xs2smbr6ah6yk8hq7vvsciq7d6m1qr91nfnazdgvxmvg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest"; sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv"; - name = "flycheck-nimsuggest"; + name = "recipe"; }; packageRequires = [ emacs flycheck nim-mode ]; meta = { @@ -13205,20 +17214,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-objc-clang = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-objc-clang"; - version = "2.0.1"; + ename = "flycheck-objc-clang"; + version = "2.0.2"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "07f17d1dbe878fdcabac791a8916ddf643571a68"; - sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9"; + rev = "f4a76ac199b67ff383ab5e70434c9b98b48c92d5"; + sha256 = "0ryanx4vmy9jwqjnwvma6dm136y4fh227cyhz206km6595bbn3nc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; sha256 = "07mzwd04a69d7xpkjmhfmf95j69h6accnf9bb9br7jb1hi9vdalp"; - name = "flycheck-objc-clang"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -13226,9 +17241,17 @@ license = lib.licenses.free; }; }) {}; - flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }: - melpaBuild { + flycheck-ocaml = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild + , merlin }: + melpaBuild { pname = "flycheck-ocaml"; + ename = "flycheck-ocaml"; version = "0.3"; src = fetchFromGitHub { owner = "flycheck"; @@ -13236,10 +17259,10 @@ rev = "9b4cd83ad2a87cc94b5d4e1ac26ac235475f1e6c"; sha256 = "1phfarws2aajkgcl96hqa4ydmb1yncg10q2ldzf8ff6yd6mvk51l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ce9283eb1285953a2578eb7c4d280b4d98c801f/recipes/flycheck-ocaml"; sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7"; - name = "flycheck-ocaml"; + name = "recipe"; }; packageRequires = [ emacs flycheck let-alist merlin ]; meta = { @@ -13247,9 +17270,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }: - melpaBuild { + flycheck-package = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , package-lint }: + melpaBuild { pname = "flycheck-package"; + ename = "flycheck-package"; version = "0.12"; src = fetchFromGitHub { owner = "purcell"; @@ -13257,10 +17286,10 @@ rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38"; sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package"; sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d"; - name = "flycheck-package"; + name = "recipe"; }; packageRequires = [ flycheck package-lint ]; meta = { @@ -13268,9 +17297,42 @@ license = lib.licenses.free; }; }) {}; - flycheck-pony = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-phpstan = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , phpstan }: + melpaBuild { + pname = "flycheck-phpstan"; + ename = "flycheck-phpstan"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "phpstan.el"; + rev = "3653f2a316f4199cbd3238e984eea2325e2618d5"; + sha256 = "1dyba8hpr16nsdv1i45pl3w97728w7p8vl9gf5gvd18xcll4848d"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/flycheck-phpstan"; + sha256 = "1dr0h6cnwxdjmhlackv4gpsljwzs27gk41p8q99r0m44dada9gaf"; + name = "recipe"; + }; + packageRequires = [ emacs flycheck phpstan ]; + meta = { + homepage = "https://melpa.org/#/flycheck-phpstan"; + license = lib.licenses.free; + }; + }) {}; + flycheck-pony = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-pony"; + ename = "flycheck-pony"; version = "0.2.1"; src = fetchFromGitHub { owner = "SeanTAllen"; @@ -13278,10 +17340,10 @@ rev = "3d3387133a44f5b3f0fb178ef4addf6e1ce1df2f"; sha256 = "1da10q378k5kbcj0rrpzhm7r3ym4rfwc7v1ialcndbmflsn09m5s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2bcb82f4ddb92243058c9ab1a67d4f7ef87b155/recipes/flycheck-pony"; sha256 = "18w1d7y3jsmsc4wg0909p72cnvbxzsmnirmrahhwgsb963fij5qk"; - name = "flycheck-pony"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -13289,9 +17351,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: - melpaBuild { + flycheck-popup-tip = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "flycheck-popup-tip"; + ename = "flycheck-popup-tip"; version = "0.12.2"; src = fetchFromGitHub { owner = "flycheck"; @@ -13299,10 +17368,10 @@ rev = "ef86aad907f27ca076859d8d9416f4f7727619c6"; sha256 = "1bi6f9nm4bylsbjv4qnkar35s6xzdf2cc2cxi3g691p9527apdz6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip"; sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx"; - name = "flycheck-popup-tip"; + name = "recipe"; }; packageRequires = [ emacs flycheck popup ]; meta = { @@ -13310,9 +17379,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: - melpaBuild { + flycheck-pos-tip = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , pos-tip }: + melpaBuild { pname = "flycheck-pos-tip"; + ename = "flycheck-pos-tip"; version = "0.3"; src = fetchFromGitHub { owner = "flycheck"; @@ -13320,10 +17396,10 @@ rev = "3f1d5297fdff44a14ee624160eefdc678e2bd0bd"; sha256 = "0qxx3xdgk5l793yg5ffbi5qhrxrf6akwdz93n2vibpkdjkvzyh2y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip"; sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9"; - name = "flycheck-pos-tip"; + name = "recipe"; }; packageRequires = [ emacs flycheck pos-tip ]; meta = { @@ -13331,20 +17407,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-pycheckers = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-pycheckers"; - version = "0.7.1"; + ename = "flycheck-pycheckers"; + version = "0.9"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "bb814165f12ad25d93f6c224502887c89089e750"; - sha256 = "14g3ia2nr12068rq1695lz5xnm30x8ngbcq1pxqf0pmaka4akf8l"; + rev = "526488b4d8a2067ca666ed8f4de631db79651fb3"; + sha256 = "17arb41j884gg8xdbc7nf0raahzinkslkpr161497dvs2xfpb9zi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; sha256 = "18ski3bp8x33589pc273i5ia3hffvlb4czrd97wkfgr4k59ww6yq"; - name = "flycheck-pycheckers"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -13352,9 +17433,14 @@ license = lib.licenses.free; }; }) {}; - flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-rebar3 = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-rebar3"; + ename = "flycheck-rebar3"; version = "1.1.0"; src = fetchFromGitHub { owner = "joedevivo"; @@ -13362,10 +17448,10 @@ rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6"; sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3"; sha256 = "1ml9k61n5vy4c2q6c10q9j10ky0iqkinx21bl7hip1r6b5b1kmmc"; - name = "flycheck-rebar3"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -13373,20 +17459,27 @@ license = lib.licenses.free; }; }) {}; - flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }: - melpaBuild { + flycheck-rtags = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , rtags }: + melpaBuild { pname = "flycheck-rtags"; + ename = "flycheck-rtags"; version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; - sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; + rev = "7e6b6f21935eedbe4678ba91c5531ac162b51a5a"; + sha256 = "12629d1s8rplhjh17n3bmgnkpscq4gljgyl84j8qyhh40dwq1qk0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4"; - name = "flycheck-rtags"; + name = "recipe"; }; packageRequires = [ emacs flycheck rtags ]; meta = { @@ -13394,20 +17487,28 @@ license = lib.licenses.free; }; }) {}; - flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: - melpaBuild { + flycheck-status-emoji = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-status-emoji"; - version = "1.2.2"; + ename = "flycheck-status-emoji"; + version = "1.3"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; - rev = "2f323cb210a280fc05061f3fc689c627b40bfcb3"; - sha256 = "0gz18jp5bcwm86w6ir8vyf8rb3l2h524zfvx0jpfk0k1mmxj9cs7"; + rev = "61e93ac41847d27b8eea3a334ced2d1783687b77"; + sha256 = "104zz9fihvd5klzdcaxsdmmfp0q5qisq5bbff48rfwdxnlp8dskr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p"; - name = "flycheck-status-emoji"; + name = "recipe"; }; packageRequires = [ cl-lib emacs flycheck let-alist ]; meta = { @@ -13415,9 +17516,15 @@ license = lib.licenses.free; }; }) {}; - flycheck-swift = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-swift = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-swift"; + ename = "flycheck-swift"; version = "2.0"; src = fetchFromGitHub { owner = "swift-emacs"; @@ -13425,10 +17532,10 @@ rev = "822d1415eabfd464adc52063f9c44da1c87f0ff9"; sha256 = "0gf7cxrsrf62kamm4xy1fi4v264szm6qk607ifg4bi5dmdc10b0k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd99bea06079c4231363c37e3361bd9e5b1ba490/recipes/flycheck-swift"; sha256 = "1s6rn4wyz9la6bw228jfxx8dxjyk5hf8r3vbmq0k808p772zki0z"; - name = "flycheck-swift"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -13436,20 +17543,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-swift3 = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-swift3"; - version = "2.0.1"; + ename = "flycheck-swift3"; + version = "2.0.2"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d"; - sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q"; + rev = "06a6f98d7e498860b345bbd03e96bfe59608f508"; + sha256 = "0h1n4x0fvqfb6jcapbab1ck6bj4d7irbn9zz2hxv2rlrkqxfsmh3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; sha256 = "05yfrn42svcvdkr8mx16ii8llhzn33lxdawksjqiqg671s6fgdpa"; - name = "flycheck-swift3"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -13457,9 +17570,16 @@ license = lib.licenses.free; }; }) {}; - flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: - melpaBuild { + flycheck-tip = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "flycheck-tip"; + ename = "flycheck-tip"; version = "0.5.0"; src = fetchFromGitHub { owner = "yuutayamada"; @@ -13467,10 +17587,10 @@ rev = "0bfddf52ae4ec48d970324f8336a5d62986bbc9e"; sha256 = "0azjr5mfb3hnb66m1b2319i035mn5i9qz24y7fj5crhnc9vp8w3s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip"; sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656"; - name = "flycheck-tip"; + name = "recipe"; }; packageRequires = [ emacs flycheck popup ]; meta = { @@ -13478,20 +17598,26 @@ license = lib.licenses.free; }; }) {}; - flycheck-title = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-title = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-title"; + ename = "flycheck-title"; version = "1.0"; src = fetchFromGitHub { owner = "Wilfred"; repo = "flycheck-title"; - rev = "2b7a11c39420e517a07d0c95126455c1617f2c61"; - sha256 = "07p3bwf4mvsdxvqwl9zd35rm6ax6ywqiy8gsh1ag3ygqbmd94cwy"; + rev = "4686fa30069f6f3d996bd63978b8fd47f534df24"; + sha256 = "18s60kvvh9glk7b1fj5b18shif0h9cfkh0zrvljscxid01nk9l7k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2996b70645cd6fd093e3b31b9586ce5acb036cf6/recipes/flycheck-title"; sha256 = "1cxid9qmzy8pl8qkvr6kgvfqm05pjw8cxpz66x619hbkw2vr7sza"; - name = "flycheck-title"; + name = "recipe"; }; packageRequires = [ emacs flycheck ]; meta = { @@ -13499,20 +17625,25 @@ license = lib.licenses.free; }; }) {}; - flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { + flycheck-yamllint = callPackage ({ fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { pname = "flycheck-yamllint"; + ename = "flycheck-yamllint"; version = "0.1.0"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "flycheck-yamllint"; - rev = "aa211b1243168a4f752888c0014c5b9d2da178b1"; - sha256 = "1dg2lymb53vp16isdc6k0gq1a43h7vjpksbacskyd4nwmsxaf2bm"; + rev = "110d310fae409e1869b82c34e60936bd3783dc69"; + sha256 = "0xfmnwmc26wzfw1r4q70yxzm9qqvcpxx953pvssavrxfyg3bdgf4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/932ee0a1f13a52d53102b90911da79145208cbb5/recipes/flycheck-yamllint"; sha256 = "1q2sy0hsbnwdlwq99wk8n5gi9fd8bs4jvi859np8bylbhhb3kj8m"; - name = "flycheck-yamllint"; + name = "recipe"; }; packageRequires = [ flycheck ]; meta = { @@ -13520,9 +17651,18 @@ license = lib.licenses.free; }; }) {}; - flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: - melpaBuild { + flycheck-ycmd = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild + , ycmd }: + melpaBuild { pname = "flycheck-ycmd"; + ename = "flycheck-ycmd"; version = "1.2"; src = fetchFromGitHub { owner = "abingham"; @@ -13530,10 +17670,10 @@ rev = "d042a673b4d717c3ca9d641f120bfe16c994c740"; sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; sha256 = "114k5y3jy470g5zzhxy03036gcayc08n6g61cidlr2zlyq80glyr"; - name = "flycheck-ycmd"; + name = "recipe"; }; packageRequires = [ dash emacs flycheck let-alist ycmd ]; meta = { @@ -13541,9 +17681,14 @@ license = lib.licenses.free; }; }) {}; - flymake-coffee = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-coffee = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-coffee"; + ename = "flymake-coffee"; version = "0.12"; src = fetchFromGitHub { owner = "purcell"; @@ -13551,10 +17696,10 @@ rev = "d4ef325255ea36d1dd622f29284fe72c3fc9abc0"; sha256 = "1svj5n7mmzhq03azlv4n33rz0nyqb00qr8ihdbc8hh2xnp63j5rc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-coffee"; sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d"; - name = "flymake-coffee"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -13562,9 +17707,14 @@ license = lib.licenses.free; }; }) {}; - flymake-css = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-css = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-css"; + ename = "flymake-css"; version = "0.3"; src = fetchFromGitHub { owner = "purcell"; @@ -13572,10 +17722,10 @@ rev = "3e56d47d3c53e39741aa4f702bb9fb827cce22ed"; sha256 = "054ws88fcfz3hf3cha7dvndm52v5n4jc4vzif1lif44xq0iggwqa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-css"; sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5"; - name = "flymake-css"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -13583,9 +17733,14 @@ license = lib.licenses.free; }; }) {}; - flymake-cursor = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }: - melpaBuild { + flymake-cursor = callPackage ({ fetchFromGitHub + , fetchurl + , flymake ? null + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-cursor"; + ename = "flymake-cursor"; version = "1.0.2"; src = fetchFromGitHub { owner = "flymake"; @@ -13593,10 +17748,10 @@ rev = "5cac5045398b1436ceb143d48961b50d38ae1396"; sha256 = "0xaq8zfd90kqqwg8ik081jblrdyj6p3fh2xpf6a4sdj8826ry93v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a02597edee67c84bef259d7fc5c5b61bd39a5b86/recipes/flymake-cursor"; sha256 = "0v5abg3h9kmybr0cyr7hqy4rn88h84snzxbsmqcbjw24s10v9p0s"; - name = "flymake-cursor"; + name = "recipe"; }; packageRequires = [ flymake ]; meta = { @@ -13604,20 +17759,24 @@ license = lib.licenses.free; }; }) {}; - flymake-easy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flymake-easy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-easy"; + ename = "flymake-easy"; version = "0.10"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-easy"; - rev = "2a24f260cdc3b9c8f9263b653a475d90efa1d392"; - sha256 = "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c"; + rev = "09deafbcb5f094de8465c2bbfe270ba0f517f515"; + sha256 = "1ld0g3hrbplmw3xgg6jg032hncnlxyc3hid4vn38lkcj3y7ls61b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flymake-easy"; sha256 = "0y7nm2p5x1f0nqfj73zr6xzbpf4wrzx8sn8154yx0qm0qh3id39v"; - name = "flymake-easy"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13625,9 +17784,13 @@ license = lib.licenses.free; }; }) {}; - flymake-gjshint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flymake-gjshint = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-gjshint"; + ename = "flymake-gjshint"; version = "0.0.6"; src = fetchFromGitHub { owner = "yasuyk"; @@ -13635,10 +17798,10 @@ rev = "71495ee5303de18293decd57ab9f9abdbaabfa05"; sha256 = "002s01cymgx4z4l3j2pqirg7899pljdx2hmbz8k6cksdxlymzmkd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4673825b15519e9eb2204ade5cc045751771c52/recipes/flymake-gjshint"; sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44"; - name = "flymake-gjshint"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13646,9 +17809,14 @@ license = lib.licenses.free; }; }) {}; - flymake-haml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-haml = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-haml"; + ename = "flymake-haml"; version = "0.8"; src = fetchFromGitHub { owner = "purcell"; @@ -13656,10 +17824,10 @@ rev = "343449920866238db343d61343bc845cc8bc5e1b"; sha256 = "1b3lf5jwan03k7rb97g4bb982dacdwsfdddnwc0inx9gs3qq1zni"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-haml"; sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1"; - name = "flymake-haml"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -13667,9 +17835,14 @@ license = lib.licenses.free; }; }) {}; - flymake-haskell-multi = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-haskell-multi = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-haskell-multi"; + ename = "flymake-haskell-multi"; version = "0.3"; src = fetchFromGitHub { owner = "purcell"; @@ -13677,10 +17850,10 @@ rev = "d2c9aeffd33440d360c1ea0c5aef6d1f171599f9"; sha256 = "0k1qc0r0gr7f9l5if2a67cv4k73z5yxd6vxd6l1bqw500y0aajxz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e879eca5eb11b2ae77ee2cb8d8150d85e9e93ebd/recipes/flymake-haskell-multi"; sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij"; - name = "flymake-haskell-multi"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -13688,9 +17861,14 @@ license = lib.licenses.free; }; }) {}; - flymake-hlint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-hlint = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-hlint"; + ename = "flymake-hlint"; version = "0.2"; src = fetchFromGitHub { owner = "purcell"; @@ -13698,10 +17876,10 @@ rev = "d540e250a80a09da3036c16bf86f9deb6d738c9c"; sha256 = "1ygg51r4ym4x7h4svizwllsvr72x9np6jvjqpk8ayv3w2fpb9l31"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17820f32d46e845cc44b237d0bfd5c2d898721de/recipes/flymake-hlint"; sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x"; - name = "flymake-hlint"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -13709,9 +17887,13 @@ license = lib.licenses.free; }; }) {}; - flymake-jslint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flymake-jslint = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-jslint"; + ename = "flymake-jslint"; version = "0.23"; src = fetchFromGitHub { owner = "purcell"; @@ -13719,10 +17901,10 @@ rev = "30693f75059bab53a9d2eb676c68751f4d8b091c"; sha256 = "00zkm3wqlss386qd6jiq0siga7c48n5ykh0vf9q5v83rmpd79yri"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-jslint"; sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm"; - name = "flymake-jslint"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13730,9 +17912,14 @@ license = lib.licenses.free; }; }) {}; - flymake-json = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-json = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-json"; + ename = "flymake-json"; version = "0.1"; src = fetchFromGitHub { owner = "purcell"; @@ -13740,10 +17927,10 @@ rev = "ad8e482db1ad29e23bdd9d089b9bc3615649ce65"; sha256 = "0rzlw80mi39147yqnpzcvw9wvr5svksd3kn6s3w8191f2kc6xzzv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acb0a4d29159aa6d74f754911f63152dac3425bd/recipes/flymake-json"; sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d"; - name = "flymake-json"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -13751,9 +17938,14 @@ license = lib.licenses.free; }; }) {}; - flymake-less = callPackage ({ fetchFromGitHub, fetchurl, less-css-mode, lib, melpaBuild }: - melpaBuild { + flymake-less = callPackage ({ fetchFromGitHub + , fetchurl + , less-css-mode + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-less"; + ename = "flymake-less"; version = "0.3"; src = fetchFromGitHub { owner = "purcell"; @@ -13761,10 +17953,10 @@ rev = "8cbb5e41c8f4b988cee3ef4449cfa9aea3540893"; sha256 = "0ggvmsjj6p6a7cwr2bzhlcf8ab4v6a2bz5djsscd2ryy570p367z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d4eae8b7b7d81ebf4d85f38fc3a17b4bc918318/recipes/flymake-less"; sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0"; - name = "flymake-less"; + name = "recipe"; }; packageRequires = [ less-css-mode ]; meta = { @@ -13772,9 +17964,14 @@ license = lib.licenses.free; }; }) {}; - flymake-perlcritic = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }: - melpaBuild { + flymake-perlcritic = callPackage ({ fetchFromGitHub + , fetchurl + , flymake ? null + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-perlcritic"; + ename = "flymake-perlcritic"; version = "1.0.3"; src = fetchFromGitHub { owner = "illusori"; @@ -13782,10 +17979,10 @@ rev = "0692d6ad5495f6e5438bde0a10345829b8e1def8"; sha256 = "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/flymake-perlcritic"; sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8"; - name = "flymake-perlcritic"; + name = "recipe"; }; packageRequires = [ flymake ]; meta = { @@ -13793,9 +17990,14 @@ license = lib.licenses.free; }; }) {}; - flymake-php = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-php = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-php"; + ename = "flymake-php"; version = "0.5"; src = fetchFromGitHub { owner = "purcell"; @@ -13803,10 +18005,10 @@ rev = "91f867e209011af31a2ca2d8f6874b994403bcb2"; sha256 = "0dzyid0av9icp77wv0zcsygpw46z24qibq1ra0iwnkzl3kqvkyzh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-php"; sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk"; - name = "flymake-php"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -13814,9 +18016,14 @@ license = lib.licenses.free; }; }) {}; - flymake-python-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-python-pyflakes = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-python-pyflakes"; + ename = "flymake-python-pyflakes"; version = "0.9"; src = fetchFromGitHub { owner = "purcell"; @@ -13824,10 +18031,10 @@ rev = "78806a25b0f01f03df4210a79a6eaeec59511d7a"; sha256 = "0l8qpcbzfi32h3vy7iwydx3hg2w60x9l3v3rabzjx412m5d00gsh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49091c0eca4158b80269b6ff5f7f3fc8e981420b/recipes/flymake-python-pyflakes"; sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497"; - name = "flymake-python-pyflakes"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -13835,9 +18042,14 @@ license = lib.licenses.free; }; }) {}; - flymake-ruby = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-ruby = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-ruby"; + ename = "flymake-ruby"; version = "0.8"; src = fetchFromGitHub { owner = "purcell"; @@ -13845,10 +18057,10 @@ rev = "e14e8e2abda223bd3920dbad0eefd5af5973ae6d"; sha256 = "0d2vmpgr5c2cbpxcqm5x1ckfysbpwcbaa9frcnp2yfp8scvkvqj0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-ruby"; sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr"; - name = "flymake-ruby"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -13856,9 +18068,14 @@ license = lib.licenses.free; }; }) {}; - flymake-sass = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-sass = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-sass"; + ename = "flymake-sass"; version = "0.6"; src = fetchFromGitHub { owner = "purcell"; @@ -13866,10 +18083,10 @@ rev = "1c7664818db539de7f3dab396c013528a3f5b8b4"; sha256 = "0c74qdgy9c4hv3nyjnbqdzypbg9399vq3p5ngp5lasc7iz6vi0h8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-sass"; sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d"; - name = "flymake-sass"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -13877,9 +18094,14 @@ license = lib.licenses.free; }; }) {}; - flymake-shell = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: - melpaBuild { + flymake-shell = callPackage ({ fetchFromGitHub + , fetchurl + , flymake-easy + , lib + , melpaBuild }: + melpaBuild { pname = "flymake-shell"; + ename = "flymake-shell"; version = "0.8"; src = fetchFromGitHub { owner = "purcell"; @@ -13887,10 +18109,10 @@ rev = "ec097bd77db5523a04ceb15a128e01689d36fb90"; sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-shell"; sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i"; - name = "flymake-shell"; + name = "recipe"; }; packageRequires = [ flymake-easy ]; meta = { @@ -13898,9 +18120,13 @@ license = lib.licenses.free; }; }) {}; - flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flyspell-correct = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flyspell-correct"; + ename = "flyspell-correct"; version = "0.4"; src = fetchFromGitHub { owner = "d12frosted"; @@ -13908,10 +18134,10 @@ rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; sha256 = "0d2205h234na9s942s83yvkq89l9w9jnl5yfrxkkdiq8pw0dvymd"; - name = "flyspell-correct"; + name = "recipe"; }; packageRequires = []; meta = { @@ -13919,9 +18145,15 @@ license = lib.licenses.free; }; }) {}; - flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }: - melpaBuild { + flyspell-correct-helm = callPackage ({ fetchFromGitHub + , fetchurl + , flyspell-correct + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "flyspell-correct-helm"; + ename = "flyspell-correct-helm"; version = "0.4"; src = fetchFromGitHub { owner = "d12frosted"; @@ -13929,10 +18161,10 @@ rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; sha256 = "18s2bzszy6x31avqg7j2lsll2cf4asb8njwhmx4mm215agack976"; - name = "flyspell-correct-helm"; + name = "recipe"; }; packageRequires = [ flyspell-correct helm ]; meta = { @@ -13940,9 +18172,15 @@ license = lib.licenses.free; }; }) {}; - flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }: - melpaBuild { + flyspell-correct-ivy = callPackage ({ fetchFromGitHub + , fetchurl + , flyspell-correct + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "flyspell-correct-ivy"; + ename = "flyspell-correct-ivy"; version = "0.4"; src = fetchFromGitHub { owner = "d12frosted"; @@ -13950,10 +18188,10 @@ rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; sha256 = "1n5iyab6bj761w6vxncyqvqzwh9k60pzq5f2n00ifrz74pqs537i"; - name = "flyspell-correct-ivy"; + name = "recipe"; }; packageRequires = [ flyspell-correct ivy ]; meta = { @@ -13961,9 +18199,15 @@ license = lib.licenses.free; }; }) {}; - flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }: - melpaBuild { + flyspell-correct-popup = callPackage ({ fetchFromGitHub + , fetchurl + , flyspell-correct + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "flyspell-correct-popup"; + ename = "flyspell-correct-popup"; version = "0.4"; src = fetchFromGitHub { owner = "d12frosted"; @@ -13971,10 +18215,10 @@ rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; sha256 = "1fr8ajwldcl58i8xm31dz1mjwbi9f4q8s58x5jrqhqha0x4p4h9l"; - name = "flyspell-correct-popup"; + name = "recipe"; }; packageRequires = [ flyspell-correct popup ]; meta = { @@ -13982,9 +18226,13 @@ license = lib.licenses.free; }; }) {}; - flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + flyspell-lazy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "flyspell-lazy"; + ename = "flyspell-lazy"; version = "0.6.10"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -13992,10 +18240,10 @@ rev = "31786fe04a4732d2f845e1c7e96fcb030182ef10"; sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/flyspell-lazy"; sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y"; - name = "flyspell-lazy"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14003,9 +18251,14 @@ license = lib.licenses.free; }; }) {}; - flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + flyspell-popup = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "flyspell-popup"; + ename = "flyspell-popup"; version = "0.3"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -14013,10 +18266,10 @@ rev = "29311849bfd253b9b689bf331860b4c4d3bd4dde"; sha256 = "0x7jilwb0fgzsr7ma59sgd0d4122cl0hwzr28vi3z5s8wdab7nc4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/186d00724137c055b521a5f5c54acf71c4b16c32/recipes/flyspell-popup"; sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql"; - name = "flyspell-popup"; + name = "recipe"; }; packageRequires = [ popup ]; meta = { @@ -14024,41 +18277,28 @@ license = lib.licenses.free; }; }) {}; - fm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fm"; - version = "1.0"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fm"; - rev = "6266840de17ac396dd7275a71da72cd5120c35a6"; - sha256 = "0r2j238iyxnww60xpbxggjmz6y2waayw4m51f0l39hszbhags2cv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e4a74b87c05b408433545a2236000ac081af36bf/recipes/fm"; - sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f"; - name = "fm"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fm"; - license = lib.licenses.free; - }; - }) {}; - fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fn = callPackage ({ cl-lib ? null + , dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fn"; + ename = "fn"; version = "0.1.2"; src = fetchFromGitHub { owner = "troyp"; repo = "fn.el"; - rev = "2842e3c6d1b5c96184fa638c37b25ce5b347a1a6"; - sha256 = "0kxpy87f44gkfzrnhcrprca0irkpddpbw7wbrm4aidw0synpab91"; + rev = "fe65dc654d319e6fa9cef4d7eca0f8dd847b6a32"; + sha256 = "1j2rrwizafwramlzrjcsfv8xbz72qmiaa120cb1ri8wp6nyvhys0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn"; sha256 = "0cb98rxdb6sd0kws6bc4pa536kiyw3yk0hlfqcm3ps81hcgqjhhn"; - name = "fn"; + name = "recipe"; }; packageRequires = [ cl-lib dash dash-functional emacs ]; meta = { @@ -14066,9 +18306,15 @@ license = lib.licenses.free; }; }) {}; - focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + focus = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "focus"; + ename = "focus"; version = "0.1.1"; src = fetchFromGitHub { owner = "larstvei"; @@ -14076,10 +18322,10 @@ rev = "75202c9445f52eab6fb82f00006f37cd20dae6b2"; sha256 = "1v9y3dp7sd4rsm31myp3l1jxpwjw3madajb6yz9rw0yhdirfwgbg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8"; - name = "focus"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -14087,20 +18333,24 @@ license = lib.licenses.free; }; }) {}; - fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fold-dwim = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fold-dwim"; + ename = "fold-dwim"; version = "1.2"; src = fetchFromGitHub { - owner = "emacsmirror"; + owner = "emacsattic"; repo = "fold-dwim"; rev = "4764b0246a722d37eb8ec9f204ffaccaad1755d0"; sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim"; - sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d"; - name = "fold-dwim"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/62064e272a658d998b1ccf13dc3c2e3e454acade/recipes/fold-dwim"; + sha256 = "1k5186s69qahwbzvwq70af3bkcglls9a82c5jw5mdw3ic8k631sh"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14108,9 +18358,14 @@ license = lib.licenses.free; }; }) {}; - fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }: - melpaBuild { + fold-dwim-org = callPackage ({ fetchFromGitHub + , fetchurl + , fold-dwim + , lib + , melpaBuild }: + melpaBuild { pname = "fold-dwim-org"; + ename = "fold-dwim-org"; version = "0.6"; src = fetchFromGitHub { owner = "mattfidler"; @@ -14118,10 +18373,10 @@ rev = "c09bb2b46d65afbd1d0febc6fded7495be7a3037"; sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97d22d9feaf521ce576b80d2933ecbc166c1dbe7/recipes/fold-dwim-org"; sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn"; - name = "fold-dwim-org"; + name = "recipe"; }; packageRequires = [ fold-dwim ]; meta = { @@ -14129,9 +18384,13 @@ license = lib.licenses.free; }; }) {}; - fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fold-this = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fold-this"; + ename = "fold-this"; version = "0.3.0"; src = fetchFromGitHub { owner = "magnars"; @@ -14139,10 +18398,10 @@ rev = "90b41d7b588ab1c3295bf69f7dd87bf31b543a6a"; sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c/recipes/fold-this"; sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d"; - name = "fold-this"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14150,9 +18409,15 @@ license = lib.licenses.free; }; }) {}; - font-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }: - melpaBuild { + font-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , persistent-soft }: + melpaBuild { pname = "font-utils"; + ename = "font-utils"; version = "0.7.8"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -14160,10 +18425,10 @@ rev = "9192d3f8ee6a4e75f34c3fed10378674cc2b11d3"; sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2af0a1644116e89c5a705ffe0885ffe3ee874eaf/recipes/font-utils"; sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5"; - name = "font-utils"; + name = "recipe"; }; packageRequires = [ pcache persistent-soft ]; meta = { @@ -14171,9 +18436,15 @@ license = lib.licenses.free; }; }) {}; - fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + fontawesome = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "fontawesome"; + ename = "fontawesome"; version = "0.4"; src = fetchFromGitHub { owner = "syohex"; @@ -14181,10 +18452,10 @@ rev = "72b4f2f83c7fdacd225aee58f93acefc53166626"; sha256 = "1icwjd1rbyr1g8ifyhvpi21wjff2qrddq2rmp5lmiajnwrlfli0d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome"; sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3"; - name = "fontawesome"; + name = "recipe"; }; packageRequires = [ emacs helm-core ]; meta = { @@ -14192,9 +18463,43 @@ license = lib.licenses.free; }; }) {}; - foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + fontify-face = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "fontify-face"; + ename = "fontify-face"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "fontify-face"; + rev = "5bbd4bbbb69f3fe156af53d32000a4b769ed4cbd"; + sha256 = "0s2vwzjd08xj4vpmx7knyrld44k6dd9mhync50r580wpgrgfxm04"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/72bd6750dd5a7d9ed6e408e690f76c260ffd7d9e/recipes/fontify-face"; + sha256 = "1w7xlkladqkbh7gpnkbi53a7k9p5wzma4y9jgwbc58hng9ggm1k0"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fontify-face"; + license = lib.licenses.free; + }; + }) {}; + foreman-mode = callPackage ({ dash + , dash-functional + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "foreman-mode"; + ename = "foreman-mode"; version = "0.0.1"; src = fetchFromGitHub { owner = "zweifisch"; @@ -14202,10 +18507,10 @@ rev = "e90d2b56e83ab914f9ba9e78126bd7a534d5b8fb"; sha256 = "199kybf2bvywqfnwr5w893km82829k1j7sp079y6s2601hq8ylw9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edeeb2b52ac70f8bdad38d3af62a7e434853c504/recipes/foreman-mode"; sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv"; - name = "foreman-mode"; + name = "recipe"; }; packageRequires = [ dash dash-functional emacs f s ]; meta = { @@ -14213,9 +18518,13 @@ license = lib.licenses.free; }; }) {}; - form-feed = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + form-feed = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "form-feed"; + ename = "form-feed"; version = "0.2.2"; src = fetchFromGitHub { owner = "wasamasa"; @@ -14223,10 +18532,10 @@ rev = "eac6724c093458745e9ae0e37221077fa2ad0ff6"; sha256 = "171jna631b2iqcimfsik9c66gii8nc0zdb58m077w00rn7rcxbh2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/468503d8103766e8196e977325e3bcb696219f6b/recipes/form-feed"; sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh"; - name = "form-feed"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14234,9 +18543,13 @@ license = lib.licenses.free; }; }) {}; - format-sql = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + format-sql = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "format-sql"; + ename = "format-sql"; version = "0.4"; src = fetchFromGitHub { owner = "paetzke"; @@ -14244,10 +18557,10 @@ rev = "97f475c245cd6c81a72a265678e2087cee66ac7b"; sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/085c03104aa5a809a112525547eec51100b6fb09/recipes/format-sql"; sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj"; - name = "format-sql"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14255,9 +18568,13 @@ license = lib.licenses.free; }; }) {}; - fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fortune-cookie = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fortune-cookie"; + ename = "fortune-cookie"; version = "1.0.0"; src = fetchFromGitHub { owner = "andschwa"; @@ -14265,10 +18582,10 @@ rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6"; sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie"; sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78"; - name = "fortune-cookie"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14276,9 +18593,14 @@ license = lib.licenses.free; }; }) {}; - fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fountain-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fountain-mode"; + ename = "fountain-mode"; version = "2.5.3"; src = fetchFromGitHub { owner = "rnkn"; @@ -14286,10 +18608,10 @@ rev = "8269066a9035fcf50eb835de3745a62c1cb96660"; sha256 = "1s1wyhjdyp12iz3zk333z5wlbxl5x3hki9q16164fk9ifhkrppxd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840"; - name = "fountain-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -14297,9 +18619,15 @@ license = lib.licenses.free; }; }) {}; - frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + frames-only-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "frames-only-mode"; + ename = "frames-only-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "davidshepherd7"; @@ -14307,10 +18635,10 @@ rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28"; sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h"; - name = "frames-only-mode"; + name = "recipe"; }; packageRequires = [ emacs seq ]; meta = { @@ -14318,20 +18646,25 @@ license = lib.licenses.free; }; }) {}; - frameshot = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + frameshot = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "frameshot"; + ename = "frameshot"; version = "0.1.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "frameshot"; - rev = "4e7b252e9fd9227de8b25f384af2c855ec45279a"; - sha256 = "020irzkqr7gs99xsvdd0haja0jvw46dk40xi7ab0m3cq7957srjh"; + rev = "65994602fdf3d8881f0cabffebbce6c0e493e3c8"; + sha256 = "0crvvacpajlhdida54gvv4y11xx78qscr6nznx0bhdb12sj3n45q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot"; sha256 = "1z5f988m9s25miyxbhaxk6m4af9afvblb2p5mdidva04szjklr70"; - name = "frameshot"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -14339,9 +18672,14 @@ license = lib.licenses.free; }; }) {}; - free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + free-keys = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "free-keys"; + ename = "free-keys"; version = "1.0.0"; src = fetchFromGitHub { owner = "Fuco1"; @@ -14349,10 +18687,10 @@ rev = "edfd69dc369b2647447b7c28c7c1163b1ddf45b4"; sha256 = "0xgifa7s9n882f9ymyyz9gc11xfbj3vfpnxiq1fqfm5hmwx9pwbc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55067e899ba618d4394ad9657322c92a667a0774/recipes/free-keys"; sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj"; - name = "free-keys"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -14360,9 +18698,13 @@ license = lib.licenses.free; }; }) {}; - fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fringe-helper = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fringe-helper"; + ename = "fringe-helper"; version = "1.0.1"; src = fetchFromGitHub { owner = "nschum"; @@ -14370,10 +18712,10 @@ rev = "0f10a196c6e57222b8d4c94eafc40a96e7b20f1b"; sha256 = "1c3yx9j3q8fkfiay4nzcabsq9i4ydqf6vxk8vv80h78gg9afrzrj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fringe-helper"; sha256 = "1i5wra4j0rvrsl9vbg7fzga8cadw43ka2rwdj1m11wq8m3cs8g7m"; - name = "fringe-helper"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14381,9 +18723,13 @@ license = lib.licenses.free; }; }) {}; - fsbot-data-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fsbot-data-browser = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fsbot-data-browser"; + ename = "fsbot-data-browser"; version = "0.3"; src = fetchFromGitHub { owner = "benaiah"; @@ -14391,10 +18737,10 @@ rev = "6bca4f7de63e31839d2542f6c678b79931dec344"; sha256 = "0lvpgfp89sz6f6rn576g1g88s0q3ibj5ghydjwfcg9w6h7vx5b5s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37a0901b98e1c66be6906234e6d6520a6e940e97/recipes/fsbot-data-browser"; sha256 = "0jijvl07jk200fs01ln4dmw5nx9jg3f9b7gjaknyd18vyvbwr3s5"; - name = "fsbot-data-browser"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14402,20 +18748,31 @@ license = lib.licenses.free; }; }) {}; - fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: - melpaBuild { + fsharp-mode = callPackage ({ company + , company-quickhelp + , dash + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , popup + , pos-tip + , s }: + melpaBuild { pname = "fsharp-mode"; - version = "1.9.11"; + ename = "fsharp-mode"; + version = "1.9.12"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "5504550605354146842c8f5c34482ece778b7b31"; - sha256 = "0hjqgyjch8fdz54akcpw5kmx2z1yvck6k8qyc0mzzmb54iiayf5a"; + rev = "68d2121a7317d90fe3794c9295d117f4aebd1438"; + sha256 = "0mymvik20slbgsasjpn6nkqcb4z6z4mvd1sf1xalv0qjk24vrlmk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z"; - name = "fsharp-mode"; + name = "recipe"; }; packageRequires = [ company @@ -14431,9 +18788,15 @@ license = lib.licenses.free; }; }) {}; - fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fstar-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fstar-mode"; + ename = "fstar-mode"; version = "0.9.4.0"; src = fetchFromGitHub { owner = "FStarLang"; @@ -14441,10 +18804,10 @@ rev = "3a9be64827bbed8e34d38803b5c44d8d4f6cd688"; sha256 = "0manmkd66355g1fw2q1q96ispd0vxf842i8dcr6g592abrz5lhi7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; sha256 = "1kwa6gqh91265vpp4gcady2brkizfkfjj0gnya9lar6x7rn4gj7s"; - name = "fstar-mode"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -14452,9 +18815,13 @@ license = lib.licenses.free; }; }) {}; - full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + full-ack = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "full-ack"; + ename = "full-ack"; version = "1.0"; src = fetchFromGitHub { owner = "nschum"; @@ -14462,10 +18829,10 @@ rev = "0aef4be1686535f83217cafb1524818071bd8325"; sha256 = "0c3w3xs2jbdqgsqw0qmdbwii6p395qfznird4gg0hfr7lby2kmjq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/full-ack"; sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309"; - name = "full-ack"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14473,9 +18840,14 @@ license = lib.licenses.free; }; }) {}; - fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fullframe = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fullframe"; + ename = "fullframe"; version = "0.5.0"; src = fetchFromGitHub { owner = "tomterl"; @@ -14483,10 +18855,10 @@ rev = "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd"; sha256 = "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13d1dc5c39543b65c6bb4150c3690211872c00dc/recipes/fullframe"; sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a"; - name = "fullframe"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -14494,9 +18866,14 @@ license = lib.licenses.free; }; }) {}; - function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + function-args = callPackage ({ fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "function-args"; + ename = "function-args"; version = "0.6.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -14504,10 +18881,10 @@ rev = "0b07db81c0c1fa88d1ec763219ee57640858f79d"; sha256 = "0lg9bhwn3za4jvz38zld389gdl48qf34nqqqrzj0r119g1jqdrg1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args"; sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak"; - name = "function-args"; + name = "recipe"; }; packageRequires = [ ivy ]; meta = { @@ -14515,17 +18892,21 @@ license = lib.licenses.free; }; }) {}; - futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + futhark-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "futhark-mode"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "631c493b97b3e2f928892fb25fa29daca4927f83"; - sha256 = "1a6qr5r62q84m1jcs1xj36p7jr9c042gh38lb7cmfcxf2x693h68"; + rev = "784e3147196bfe82ea9499628467335ea1d036f9"; + sha256 = "07dqqpacvap034jzvdvnpjyryzicbvjx2imnsghsxw9m52jsb9wn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; sha256 = "1k22xkg6vd60hk58zkxhmsw2gs6ikzmidvxcdglnr46m6x7r7pnq"; name = "futhark-mode"; @@ -14536,9 +18917,13 @@ license = lib.licenses.free; }; }) {}; - fuzzy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fuzzy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fuzzy"; + ename = "fuzzy"; version = "0.1"; src = fetchFromGitHub { owner = "auto-complete"; @@ -14546,10 +18931,10 @@ rev = "939f4e9a3f08d83925b41dd3d23b2321f3f6b09c"; sha256 = "1g7my9ha5cnwg3pjwa86wncg5gphv18xpnpmj3xc3vg7z5m45rss"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0197df173fbd7ec1e7e35c47476fcf2aaa483f/recipes/fuzzy"; sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h"; - name = "fuzzy"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14557,9 +18942,13 @@ license = lib.licenses.free; }; }) {}; - fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fvwm-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fvwm-mode"; + ename = "fvwm-mode"; version = "1.6.4"; src = fetchFromGitHub { owner = "theBlackDragon"; @@ -14567,10 +18956,10 @@ rev = "d48a309bb7db21f5404b6619c6ee861fe0457704"; sha256 = "0c3g0yfclczdh6nxmg9lljjf288zibqy51bhh1b1cgdmxcbpg8bv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac39130f8a031d6fe7df4411a5f94f2cdf652449/recipes/fvwm-mode"; sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb"; - name = "fvwm-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14578,9 +18967,13 @@ license = lib.licenses.free; }; }) {}; - fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fwb-cmds = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fwb-cmds"; + ename = "fwb-cmds"; version = "1.1.1"; src = fetchFromGitHub { owner = "tarsius"; @@ -14588,10 +18981,10 @@ rev = "90258a5c7dbbaa2ac227e0fb4ff6c7d5aec3628f"; sha256 = "1xwvv8wjgdaz96v1x1xc5w697bfvcanlcixd0n5qbx6ryakqrb72"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds"; sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx"; - name = "fwb-cmds"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14599,9 +18992,14 @@ license = lib.licenses.free; }; }) {}; - fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + fxrd-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "fxrd-mode"; + ename = "fxrd-mode"; version = "1.0"; src = fetchFromGitHub { owner = "msherry"; @@ -14609,10 +19007,10 @@ rev = "795b969346982b75e24b5c8619b46197982fbb4d"; sha256 = "0aha13vqj6ygyr7bflrxll837g4z6wrmrhh5rhcd0vphqg70frgn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode"; sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r"; - name = "fxrd-mode"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -14620,9 +19018,14 @@ license = lib.licenses.free; }; }) {}; - fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + fzf = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "fzf"; + ename = "fzf"; version = "0.2"; src = fetchFromGitHub { owner = "bling"; @@ -14630,10 +19033,10 @@ rev = "383a050920e9b99d37c21d041deb7f38b202485c"; sha256 = "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0"; - name = "fzf"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -14641,41 +19044,50 @@ license = lib.licenses.free; }; }) {}; - gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gams-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gams-mode"; - version = "6.4"; + ename = "gams-mode"; + version = "6.5"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "2d6b5c29d84a42421ddc2f7f1e9c3a141d81c31c"; - sha256 = "0cri329g0b7ywqarg4jlmry574z7v15gdd9j7jnikq1s2jjgnb85"; + rev = "0a7f3f5d44ea59c34677049882f0a34ff9935bc9"; + sha256 = "0wl2dfcfvjy23gcwk6qfxbxjlykw438fi9h1y2855adcc9zrhwzx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci"; - name = "gams-mode"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/gams-mode"; license = lib.licenses.free; }; }) {}; - gather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gather = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gather"; + ename = "gather"; version = "1.1.0"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-gather"; - rev = "303af57dd2ae0fc1363a3d1a84d475167f58c84a"; - sha256 = "1q9bz294bc6bplwfrfzsczh444v9152wv7zm2l1pcpwv8n8581p6"; + rev = "b9038e5b960039688e7a80ee770e0aee81d5c6c8"; + sha256 = "1b73n7ydkckrq2sjq4jb2hva8lfqaiaaad2gcgjx2y15rvbb26d0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/595e40c7102294684badf86deb72d86bbc3c1426/recipes/gather"; sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk"; - name = "gather"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14683,9 +19095,15 @@ license = lib.licenses.free; }; }) {}; - geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + geben = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "geben"; + ename = "geben"; version = "1.1.1"; src = fetchFromGitHub { owner = "ahungry"; @@ -14693,10 +19111,10 @@ rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc"; sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; sha256 = "1ai1qcx76m8xh80c8zixq9cqbhnqmj3jk3r7lj3ngbiwx4pnlnwf"; - name = "geben"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -14704,20 +19122,27 @@ license = lib.licenses.free; }; }) {}; - geben-helm-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, geben, helm-projectile, lib, melpaBuild }: - melpaBuild { + geben-helm-projectile = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , geben + , helm-projectile + , lib + , melpaBuild }: + melpaBuild { pname = "geben-helm-projectile"; + ename = "geben-helm-projectile"; version = "0.0.4"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben-helm-projectile"; - rev = "31ce0faca5dcc71924884f03fd5a7a25d00ccd9b"; - sha256 = "0a1srhwfbgkvndjfi9irg5s6snlxyqrw1vwyqg1sn8aqnbpgib04"; + rev = "14db489efcb20c5aa9102288c94cec3c5a87c35d"; + sha256 = "1nd1jhy393vkn2g65zhygxkpgna0l8gkndxr8jb6qjkkapk58k8l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7d28c45304a69e6ca78b3d00df2563171c027ee/recipes/geben-helm-projectile"; sha256 = "11zhapys6wx2cadflvjimsmilwvjpfd4ihwzzmap8shxpyllsq9r"; - name = "geben-helm-projectile"; + name = "recipe"; }; packageRequires = [ emacs geben helm-projectile ]; meta = { @@ -14725,20 +19150,24 @@ license = lib.licenses.free; }; }) {}; - geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + geiser = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "geiser"; + ename = "geiser"; version = "0.10"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jaor"; repo = "geiser"; rev = "775d1d734a677274fbbf4af780592bb3768d3f9b"; sha256 = "086qlii1w7sqxwnxwxvc4d6d71p829jabhgwvi0l0bjkxn7bx8pq"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; - sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596"; - name = "geiser"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/67dc8d6e33f3522043f96761b23ea68c9c27084e/recipes/geiser"; + sha256 = "1g7z6c3lfa7slwrxk7q8awqs39qibcv2kc4c2fwlwvgbcfhkw085"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14746,9 +19175,17 @@ license = lib.licenses.free; }; }) {}; - genrnc = callPackage ({ concurrent, deferred, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + genrnc = callPackage ({ concurrent + , deferred + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "genrnc"; + ename = "genrnc"; version = "0.1.0"; src = fetchFromGitHub { owner = "aki2o"; @@ -14756,10 +19193,10 @@ rev = "da75b1966a73ad215ec2ced4522c25f4d0bf1f9a"; sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd2d908ba5fa96d90643091573939e54d9165aaa/recipes/genrnc"; sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm"; - name = "genrnc"; + name = "recipe"; }; packageRequires = [ concurrent deferred log4e yaxception ]; meta = { @@ -14767,9 +19204,13 @@ license = lib.licenses.free; }; }) {}; - german-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + german-holidays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "german-holidays"; + ename = "german-holidays"; version = "0.2.0"; src = fetchFromGitHub { owner = "rudolfochrist"; @@ -14777,10 +19218,10 @@ rev = "8388b3bf5b5c38f9b9fcc9216ca26ef0640c6edc"; sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5b3807ff989b13f95e8d6fad2f26a42ff0643c/recipes/german-holidays"; sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn"; - name = "german-holidays"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14788,9 +19229,40 @@ license = lib.licenses.free; }; }) {}; - ggo-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gf = callPackage ({ fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "gf"; + ename = "gf"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "grammaticalframework"; + repo = "gf-emacs-mode"; + rev = "4ab35bb727bd0717e0691d3c490f72551e13d683"; + sha256 = "0al1ad92ga84wm0kx66wplnn1p05mxf7ik4r5gknr8jp6aa1lcqd"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2cc74eb19c54219cd5c5c11d886074859f0948/recipes/gf"; + sha256 = "170q5a7lwa9pbpn0ghcfzny0jfn42wgns1lcv8fngr0k1njfj6v8"; + name = "recipe"; + }; + packageRequires = [ ht s ]; + meta = { + homepage = "https://melpa.org/#/gf"; + license = lib.licenses.free; + }; + }) {}; + ggo-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ggo-mode"; + ename = "ggo-mode"; version = "20130521"; src = fetchFromGitHub { owner = "mkjunker"; @@ -14798,10 +19270,10 @@ rev = "ea5097f87072309c7b77204888d459d084bf630f"; sha256 = "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e055994c3c3042eab11f11ec916ad5b56689809f/recipes/ggo-mode"; sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p"; - name = "ggo-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14809,9 +19281,15 @@ license = lib.licenses.free; }; }) {}; - ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ggtags = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ggtags"; + ename = "ggtags"; version = "0.8.12"; src = fetchFromGitHub { owner = "leoliu"; @@ -14819,10 +19297,10 @@ rev = "7a7ee76a8055531482927e6abf7e0ef676165dd2"; sha256 = "1kyg26wdimy5k5icglgqg9gdfvzkgk4xis12nx1xkh01j2imzl97"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw"; - name = "ggtags"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -14830,9 +19308,16 @@ license = lib.licenses.free; }; }) {}; - gh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, logito, melpaBuild, pcache }: - melpaBuild { + gh = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , logito + , melpaBuild + , pcache }: + melpaBuild { pname = "gh"; + ename = "gh"; version = "0.10.0"; src = fetchFromGitHub { owner = "sigma"; @@ -14840,10 +19325,10 @@ rev = "d0471dd1ba279072cbf8caf6368f3008d7120f25"; sha256 = "099msgsxdqyjrd18jv2mfkpaylp2scq18782354lcpr3fbp8vbsl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0"; - name = "gh"; + name = "recipe"; }; packageRequires = [ emacs logito pcache ]; meta = { @@ -14851,20 +19336,25 @@ license = lib.licenses.free; }; }) {}; - ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: - melpaBuild { + ghc = callPackage ({ fetchFromGitHub + , fetchurl + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "ghc"; + ename = "ghc"; version = "5.8.0.0"; src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "35690941aadbe44d9401102ab44a39753e0bb2b5"; - sha256 = "0fcaxj2lhkhkm2h91d9fdqas2b99wblwl74l2y6ckpf05hrc4w1q"; + rev = "a96d820753030fb8de0944727ddc3fed191eab00"; + sha256 = "1xdb4482i03lily4lj41y9wsadh2qwqmh8wrzzal966gqk4m25i4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; sha256 = "02nc7a9khqpd4ca2snam8dq72m53q8x7v5awx56bjq31z6vcmav5"; - name = "ghc"; + name = "recipe"; }; packageRequires = [ haskell-mode ]; meta = { @@ -14872,9 +19362,14 @@ license = lib.licenses.free; }; }) {}; - ghc-imported-from = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ghc-imported-from = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ghc-imported-from"; + ename = "ghc-imported-from"; version = "0.1.2"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -14882,10 +19377,10 @@ rev = "fcff08628a19f5d26151564659218cc677779b79"; sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghc-imported-from"; sha256 = "063kbymk4r1yrg5ks660d2byrnia6gs6nimjzrvqfi2ib1psc7jc"; - name = "ghc-imported-from"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -14893,9 +19388,13 @@ license = lib.licenses.free; }; }) {}; - ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ghq = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ghq"; + ename = "ghq"; version = "0.1.2"; src = fetchFromGitHub { owner = "rcoedo"; @@ -14903,10 +19402,10 @@ rev = "aae4b8cb22fd6c24d2c9e3962c7e8e9dac6d9825"; sha256 = "0rh2k93c3a0vl073a3s3a3h6gkw454v1lyd7y8l3pd24vw9hc628"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9daa3b0039f6b296b8176523cffbbe27506bb02/recipes/ghq"; sha256 = "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh"; - name = "ghq"; + name = "recipe"; }; packageRequires = []; meta = { @@ -14914,20 +19413,26 @@ license = lib.licenses.free; }; }) {}; - ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: - melpaBuild { + ghub = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "ghub"; - version = "2.0.0"; + ename = "ghub"; + version = "2.0.1"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "ae37bef2eb3afb8232bb0a6f7306a8da2390abf4"; - sha256 = "1k8bim7yk3swpzsx5lwm6qbjfqf2lsssir0zlqzrkid61d3ixfgy"; + rev = "9496d29d645823b52db347d5571cfd3c4ddcff06"; + sha256 = "1xa5pdzp18ykm59kc10bx3rqh0c1vq203yrikvqdj1gx088ksmj7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub"; sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps"; - name = "ghub"; + name = "recipe"; }; packageRequires = [ emacs let-alist ]; meta = { @@ -14935,20 +19440,27 @@ license = lib.licenses.free; }; }) {}; - ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: - melpaBuild { + ghub-plus = callPackage ({ apiwrap + , emacs + , fetchFromGitHub + , fetchurl + , ghub + , lib + , melpaBuild }: + melpaBuild { pname = "ghub-plus"; - version = "0.2.1"; + ename = "ghub+"; + version = "0.3"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "8cfdaf42446a68e6aa4eb0655d43563407cb5636"; - sha256 = "0acfqf1219bnzyf64sv68fvpi4a13nc0wv8dz5a8h6r1j0ysx6qj"; + rev = "b4a9662f5a6562f8d1dfdda2f009ec78a107c9a2"; + sha256 = "0xi7xhdla64xbcfqi8x8yzqc6v6rrqxd4q8lcrv7sw08ap5ykfas"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; sha256 = "0xx7nwmjx3f7z6z164x1lb9arbb3m3d16mpn92v66w572rhbr34n"; - name = "ghub-plus"; + name = "recipe"; }; packageRequires = [ apiwrap emacs ghub ]; meta = { @@ -14956,9 +19468,15 @@ license = lib.licenses.free; }; }) {}; - gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: - melpaBuild { + gist = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , gh + , lib + , melpaBuild }: + melpaBuild { pname = "gist"; + ename = "gist"; version = "1.4.0"; src = fetchFromGitHub { owner = "defunkt"; @@ -14966,10 +19484,10 @@ rev = "a03f142455e8b39f77fbd57ee1c1e44478c1f9e2"; sha256 = "1xisjaxr54zrxzxj8cp8f90kzphd5v3j56d14534fm5r1f5343vp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist"; sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3"; - name = "gist"; + name = "recipe"; }; packageRequires = [ emacs gh ]; meta = { @@ -14977,9 +19495,16 @@ license = lib.licenses.free; }; }) {}; - git = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + git = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "git"; + ename = "git"; version = "0.1.1"; src = fetchFromGitHub { owner = "rejeep"; @@ -14987,10 +19512,10 @@ rev = "8b7f1477ef367b5b7de452589dd9a8ab30150d0a"; sha256 = "06ws3x5qa92drmn6rcp502jk2yil6q9gkzdmb2gww9gb2g695wl5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce19d2716416295966716db47241a0e37b412ab5/recipes/git"; sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5"; - name = "git"; + name = "recipe"; }; packageRequires = [ dash f s ]; meta = { @@ -14998,9 +19523,13 @@ license = lib.licenses.free; }; }) {}; - git-annex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-annex = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-annex"; + ename = "git-annex"; version = "1.1"; src = fetchFromGitHub { owner = "jwiegley"; @@ -15008,10 +19537,10 @@ rev = "7d41775a1709b5754a7779e9f64f15d336ea5c8c"; sha256 = "0fm62lm29wp1ljgyi6pqqkzwzps53cjjbj5j3y0c2013ry7va6c5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c91e16bb9e92db9dc9be6a7af3944c3290d2f14/recipes/git-annex"; sha256 = "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l"; - name = "git-annex"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15019,9 +19548,14 @@ license = lib.licenses.free; }; }) {}; - git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-attr = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-attr"; + ename = "git-attr"; version = "0.0.3"; src = fetchFromGitHub { owner = "arnested"; @@ -15029,10 +19563,10 @@ rev = "c03078637a00ea301cbcc7ae301ae928b10af889"; sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr"; sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi"; - name = "git-attr"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -15040,9 +19574,13 @@ license = lib.licenses.free; }; }) {}; - git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-auto-commit-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-auto-commit-mode"; + ename = "git-auto-commit-mode"; version = "4.4.0"; src = fetchFromGitHub { owner = "ryuslash"; @@ -15050,10 +19588,10 @@ rev = "075e5f9ded66c2035581a7b216896556cc586814"; sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5660fb76ce93e5fe56227698d079c6994ef3305f/recipes/git-auto-commit-mode"; sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl"; - name = "git-auto-commit-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15061,9 +19599,16 @@ license = lib.licenses.free; }; }) {}; - git-command = callPackage ({ fetchFromGitHub, fetchurl, git-ps1-mode, lib, melpaBuild, term-run, with-editor }: - melpaBuild { + git-command = callPackage ({ fetchFromGitHub + , fetchurl + , git-ps1-mode + , lib + , melpaBuild + , term-run + , with-editor }: + melpaBuild { pname = "git-command"; + ename = "git-command"; version = "0.2.0"; src = fetchFromGitHub { owner = "10sr"; @@ -15071,10 +19616,10 @@ rev = "6cc5c17ca3cc1967b5402bb9a0538fb90933428d"; sha256 = "0a3ws852ypi34ash39srkwzkfish4n3c5lma10d9xzddjrwapgj9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55d697bc95a7026c7788c13e4765e1b71075e3/recipes/git-command"; sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg"; - name = "git-command"; + name = "recipe"; }; packageRequires = [ git-ps1-mode term-run with-editor ]; meta = { @@ -15082,20 +19627,27 @@ license = lib.licenses.free; }; }) {}; - git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: - melpaBuild { + git-commit = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , with-editor }: + melpaBuild { pname = "git-commit"; - version = "2.12.1"; + ename = "git-commit"; + version = "2.13.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "44508d71fb400910adb5d0594b56d3c34aa3a5de"; - sha256 = "0cpcdrikfcmkb6sj13bvznilyk8yc054pq5md874s3j224bdxcnx"; + rev = "e03685e813330a750c1d2e525a8f8c74901fccfb"; + sha256 = "119x8lg8alf97j8r3swmy6yf9112a9s2z2584n74bk847mxl2qwz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2"; - name = "git-commit"; + name = "recipe"; }; packageRequires = [ dash emacs with-editor ]; meta = { @@ -15103,9 +19655,19 @@ license = lib.licenses.free; }; }) {}; - git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }: - melpaBuild { + git-commit-insert-issue = callPackage ({ bitbucket + , fetchFromGitLab + , fetchurl + , github-issues + , gitlab + , helm + , lib + , melpaBuild + , projectile + , s }: + melpaBuild { pname = "git-commit-insert-issue"; + ename = "git-commit-insert-issue"; version = "0.3.1"; src = fetchFromGitLab { owner = "emacs-stuff"; @@ -15113,10 +19675,10 @@ rev = "5f08c17bf93b17915415d435ee41923d924fe20b"; sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue"; sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax"; - name = "git-commit-insert-issue"; + name = "recipe"; }; packageRequires = [ bitbucket github-issues gitlab helm projectile s ]; meta = { @@ -15124,9 +19686,15 @@ license = lib.licenses.free; }; }) {}; - git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-gutter = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-gutter"; + ename = "git-gutter"; version = "0.90"; src = fetchFromGitHub { owner = "syohex"; @@ -15134,10 +19702,10 @@ rev = "a786465bd527c13e32c73c02b95086560c1be878"; sha256 = "1abagq0psip7cgsqbfjv72qy60ywsny0ibsfcn74ldj6a9v17mz5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter"; sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg"; - name = "git-gutter"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -15145,9 +19713,17 @@ license = lib.licenses.free; }; }) {}; - git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }: - melpaBuild { + git-gutter-fringe = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , fringe-helper + , git-gutter + , lib + , melpaBuild }: + melpaBuild { pname = "git-gutter-fringe"; + ename = "git-gutter-fringe"; version = "0.23"; src = fetchFromGitHub { owner = "syohex"; @@ -15155,10 +19731,10 @@ rev = "dfc93d1064df154a809aab350942830408051da3"; sha256 = "18jpa5i99x0gqizs2qbqr8c1jlza8x9vpb6wg9zqd4np1p6q4lan"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter-fringe"; sha256 = "10k07dzmkxsxzwc70vpv05rxjyps9494y6k7yhlv8d46x7xjyp0z"; - name = "git-gutter-fringe"; + name = "recipe"; }; packageRequires = [ cl-lib emacs fringe-helper git-gutter ]; meta = { @@ -15166,9 +19742,15 @@ license = lib.licenses.free; }; }) {}; - git-gutter-fringe-plus = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, git-gutter-plus, lib, melpaBuild }: - melpaBuild { + git-gutter-fringe-plus = callPackage ({ fetchFromGitHub + , fetchurl + , fringe-helper + , git-gutter-plus + , lib + , melpaBuild }: + melpaBuild { pname = "git-gutter-fringe-plus"; + ename = "git-gutter-fringe+"; version = "0.1"; src = fetchFromGitHub { owner = "nonsequitur"; @@ -15176,10 +19758,10 @@ rev = "ce9d594c0189e78d78df26a0c26bbcf886e373cd"; sha256 = "1c7ijbpa7xw831k55cdm2gl8r597rxnp22jcmqnfpwqkqmk48ln9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad46c349d13f7d40db706b487319ede40b96b09c/recipes/git-gutter-fringe+"; sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc"; - name = "git-gutter-fringe-plus"; + name = "recipe"; }; packageRequires = [ fringe-helper git-gutter-plus ]; meta = { @@ -15187,9 +19769,14 @@ license = lib.licenses.free; }; }) {}; - git-gutter-plus = callPackage ({ fetchFromGitHub, fetchurl, git-commit, lib, melpaBuild }: - melpaBuild { + git-gutter-plus = callPackage ({ fetchFromGitHub + , fetchurl + , git-commit + , lib + , melpaBuild }: + melpaBuild { pname = "git-gutter-plus"; + ename = "git-gutter+"; version = "0.4"; src = fetchFromGitHub { owner = "nonsequitur"; @@ -15197,10 +19784,10 @@ rev = "f8daebb6569bb116086d8653da3505382e03d940"; sha256 = "101hracd77mici778x3ixwrcicd6fqkcr9z76kapkr0dq5z42yjb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2db25d23c2a1a4f38867aac25d687a150e95c2b/recipes/git-gutter+"; sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0"; - name = "git-gutter-plus"; + name = "recipe"; }; packageRequires = [ git-commit ]; meta = { @@ -15208,20 +19795,25 @@ license = lib.licenses.free; }; }) {}; - git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-lens = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-lens"; + ename = "git-lens"; version = "0.7.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "pidu"; repo = "git-lens"; rev = "ea49e2e005af977a08331f8caa8f64d102b3b932"; sha256 = "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens"; - sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb"; - name = "git-lens"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/git-lens"; + sha256 = "02a393b5y4vpmf9ixgyi3a4gbzk4146zql827ljlav3j0434ssw2"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -15229,30 +19821,41 @@ license = lib.licenses.free; }; }) {}; - git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-link = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-link"; - version = "0.5.1"; + ename = "git-link"; + version = "0.7.1"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "472af75eca7aba42a1934f408c4bda55e34c9dcf"; - sha256 = "0xgvwg2zxb9akk3kxxcz5cvgw4zkbqx5p4b5in01z5aj4lqmjw6s"; + rev = "efd14ab5f17f5942d25e165210447f3983f3250e"; + sha256 = "0rd2g4s73xk8m595aa11vr59gnn5mx7lbcf0040w1xqvlrryzyc9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7"; - name = "git-link"; + name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/git-link"; license = lib.licenses.free; }; }) {}; - git-messenger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + git-messenger = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "git-messenger"; + ename = "git-messenger"; version = "0.18"; src = fetchFromGitHub { owner = "syohex"; @@ -15260,10 +19863,10 @@ rev = "9297464c010dd8a2d584ac8e012876856655a8b5"; sha256 = "04fnby2nblk8l70gv09asxkmnn53fh1pdfs77ix44npp99fyw8ix"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger"; sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn"; - name = "git-messenger"; + name = "recipe"; }; packageRequires = [ emacs popup ]; meta = { @@ -15271,9 +19874,13 @@ license = lib.licenses.free; }; }) {}; - git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-ps1-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-ps1-mode"; + ename = "git-ps1-mode"; version = "0.2.2"; src = fetchFromGitHub { owner = "10sr"; @@ -15281,10 +19888,10 @@ rev = "288e5c4d0ff20a4e1ac9e72b6af632f67f1d7525"; sha256 = "1hyq3il03cm6apfawps60r4km8r6pw0vphzba30smsqfk50z3ya3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea177b5ea168828881bd8dcd29ef6b4cb81317f0/recipes/git-ps1-mode"; sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6"; - name = "git-ps1-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15292,20 +19899,25 @@ license = lib.licenses.free; }; }) {}; - git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + git-timemachine = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "git-timemachine"; + ename = "git-timemachine"; version = "4.5"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "pidu"; repo = "git-timemachine"; rev = "dbcb92ffaa5f8350d47f4fbd74512f4000b8c043"; sha256 = "1ml06jfjyrcqmbpr5hqvbpi3yy6l2aa836jq8qjla1h74g9qka7z"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; - sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq"; - name = "git-timemachine"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/git-timemachine"; + sha256 = "06xdzic7j3d3pqgwxp1q6fs8sf3mi02a9phjvhk90kyvbr8h94ck"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -15313,20 +19925,25 @@ license = lib.licenses.free; }; }) {}; - git-wip-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + git-wip-timemachine = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "git-wip-timemachine"; + ename = "git-wip-timemachine"; version = "1.0"; src = fetchFromGitHub { owner = "itsjeyd"; repo = "git-wip-timemachine"; - rev = "7da7f2acec0b1d1252d7474b13190ae88e5b205d"; - sha256 = "0igawn43i81icshimj5agv33ab120hd6182knlrn3i46p7lcs3lx"; + rev = "ae1600263608c7b84f6f136fca929875cd385bc1"; + sha256 = "1y5h817lymsaqpj8wv3hha36ihspv4c17mwl020x91r82ijd1aym"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81b5dd5765f52efdb88fdc14f48af641a18b3dcb/recipes/git-wip-timemachine"; sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw"; - name = "git-wip-timemachine"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -15334,20 +19951,24 @@ license = lib.licenses.free; }; }) {}; - gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gitattributes-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gitattributes-mode"; + ename = "gitattributes-mode"; version = "1.2.7"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; - sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; + rev = "95ad581ae2aeba87b418ae9554eb326cdba9837d"; + sha256 = "15irwyc0fmp0k5dag1n07xa8ka7n84drbrg2savslvb9m71011dg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x"; - name = "gitattributes-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15355,9 +19976,13 @@ license = lib.licenses.free; }; }) {}; - gitconfig = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gitconfig = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gitconfig"; + ename = "gitconfig"; version = "1.0.0"; src = fetchFromGitHub { owner = "tonini"; @@ -15365,10 +19990,10 @@ rev = "6c313a39e20702ddcebc12d146f69db1ce668901"; sha256 = "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gitconfig"; sha256 = "0lqm04nfhhhsdagrjnnagkpg7vpswd8lkd3l52lmpdh0fy16kgrf"; - name = "gitconfig"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15376,20 +20001,24 @@ license = lib.licenses.free; }; }) {}; - gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gitconfig-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gitconfig-mode"; + ename = "gitconfig-mode"; version = "1.2.7"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; - sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; + rev = "ae6e897c06d3ff609a65a3ac2500d21ccc888822"; + sha256 = "111pm9wwq8p3wiqgap7gyi20say3daadlaxgq2v3mwxyax8fyx34"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1"; - name = "gitconfig-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15397,9 +20026,14 @@ license = lib.licenses.free; }; }) {}; - github-browse-file = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + github-browse-file = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "github-browse-file"; + ename = "github-browse-file"; version = "0.5.0"; src = fetchFromGitHub { owner = "osener"; @@ -15407,10 +20041,10 @@ rev = "fa5cc00a40869430fb44596792961a4cddf9c265"; sha256 = "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8bca60348fc5e2ad55663e69b8690093cf861ca/recipes/github-browse-file"; sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr"; - name = "github-browse-file"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -15418,9 +20052,16 @@ license = lib.licenses.free; }; }) {}; - github-clone = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: - melpaBuild { + github-clone = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , gh + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "github-clone"; + ename = "github-clone"; version = "0.2"; src = fetchFromGitHub { owner = "dgtized"; @@ -15428,10 +20069,10 @@ rev = "ab048cf49d9ebda73acae803bc44e731e629d540"; sha256 = "18c169nxvdl7iv18pyqx690ldg6pkc8njaxdg1cww6ykqzqnfxh7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba11d6a5cc2fbc76037687c842f90dc815a6468e/recipes/github-clone"; sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9"; - name = "github-clone"; + name = "recipe"; }; packageRequires = [ emacs gh magit ]; meta = { @@ -15439,20 +20080,27 @@ license = lib.licenses.free; }; }) {}; - github-elpa = callPackage ({ commander, fetchFromGitHub, fetchurl, git, lib, melpaBuild, package-build }: - melpaBuild { + github-elpa = callPackage ({ commander + , fetchFromGitHub + , fetchurl + , git + , lib + , melpaBuild + , package-build }: + melpaBuild { pname = "github-elpa"; + ename = "github-elpa"; version = "0.0.1"; src = fetchFromGitHub { owner = "10sr"; repo = "github-elpa"; - rev = "c5960375ed5d67465412be7eb0ac558082feebc7"; - sha256 = "02710iy9zz4ymmb2ydrca5kbdc5i06fjg7212iyvpd58yfzxjj2m"; + rev = "649e66cd84e5af6f7fe13fd502e799d19aac0cda"; + sha256 = "09q6v0vsk344chzwp6sp5cwyr7hkvzi2r1w6xxg1zwy7rzy4klfz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81ec06e370f51b750ba3313b661d7386710cffb0/recipes/github-elpa"; sha256 = "1981dnz49l5r4qsn49i4dhy6x4ln0haff6gl2zx0p5p0zfkzbi7x"; - name = "github-elpa"; + name = "recipe"; }; packageRequires = [ commander git package-build ]; meta = { @@ -15460,9 +20108,14 @@ license = lib.licenses.free; }; }) {}; - github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + github-notifier = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "github-notifier"; + ename = "github-notifier"; version = "0.1"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -15470,10 +20123,10 @@ rev = "f8d011ebef9f626a94a27b5576c8ed06e6ff8987"; sha256 = "0glkn36fs93y2n1583k8v958qfhl212hbdk3cpkq432hj08wzjnr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier"; sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw"; - name = "github-notifier"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -15481,9 +20134,15 @@ license = lib.licenses.free; }; }) {}; - github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: - melpaBuild { + github-search = callPackage ({ fetchFromGitHub + , fetchurl + , gh + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "github-search"; + ename = "github-search"; version = "0.0.1"; src = fetchFromGitHub { owner = "IvanMalison"; @@ -15491,10 +20150,10 @@ rev = "1a5c1f8291f4d41e57367a8522699cb08eea8fc4"; sha256 = "1382hda3hgpx3c3d1kjzz8hs4l5hi3s7c485hsgihhr6xdd5wrgm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/733a808400858513137e0e3d7d38b5b25e8ddc5a/recipes/github-search"; sha256 = "1pwrzbbwnq0il5494561fyvkr0vmm5jqlvpffgkk28c54vs7ms0b"; - name = "github-search"; + name = "recipe"; }; packageRequires = [ gh magit ]; meta = { @@ -15502,20 +20161,24 @@ license = lib.licenses.free; }; }) {}; - gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gitignore-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gitignore-mode"; + ename = "gitignore-mode"; version = "1.2.7"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab"; - sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy"; + rev = "ae6e897c06d3ff609a65a3ac2500d21ccc888822"; + sha256 = "111pm9wwq8p3wiqgap7gyi20say3daadlaxgq2v3mwxyax8fyx34"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn"; - name = "gitignore-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15523,20 +20186,28 @@ license = lib.licenses.free; }; }) {}; - gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: - melpaBuild { + gitlab = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , request + , s }: + melpaBuild { pname = "gitlab"; + ename = "gitlab"; version = "0.8.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4"; - sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa"; + rev = "cffba49c1260421b8e388c65365b229970098e5c"; + sha256 = "1wh6z7ni8nwqigvgz77zgqszx60s1k1chpzgzs1k3kfby7apxww1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab"; sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq"; - name = "gitlab"; + name = "recipe"; }; packageRequires = [ dash pkg-info request s ]; meta = { @@ -15544,9 +20215,15 @@ license = lib.licenses.free; }; }) {}; - gitlab-ci-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, yaml-mode }: - melpaBuild { + gitlab-ci-mode = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , yaml-mode }: + melpaBuild { pname = "gitlab-ci-mode"; + ename = "gitlab-ci-mode"; version = "20180306.1"; src = fetchFromGitLab { owner = "joewreschnig"; @@ -15554,10 +20231,10 @@ rev = "313431fa5b8b5ce4512909dfc15675bb99395f6f"; sha256 = "0zdj3f0a5fg4vwhbv851jv4fs1dqfz2w4jsxqbri2zhzdjxc97vn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode"; sha256 = "1jg6ihrgccrcwg30ysyqw9k7rmvfmsrp70skr2057hfamvccwn4f"; - name = "gitlab-ci-mode"; + name = "recipe"; }; packageRequires = [ emacs yaml-mode ]; meta = { @@ -15565,9 +20242,16 @@ license = lib.licenses.free; }; }) {}; - gitlab-ci-mode-flycheck = callPackage ({ emacs, fetchFromGitLab, fetchurl, flycheck, gitlab-ci-mode, lib, melpaBuild }: - melpaBuild { + gitlab-ci-mode-flycheck = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , flycheck + , gitlab-ci-mode + , lib + , melpaBuild }: + melpaBuild { pname = "gitlab-ci-mode-flycheck"; + ename = "gitlab-ci-mode-flycheck"; version = "20180304.1"; src = fetchFromGitLab { owner = "joewreschnig"; @@ -15575,10 +20259,10 @@ rev = "388fd05f3ea88ed3ebafb09868fc021f6ecc7625"; sha256 = "0idpg4265rfx5i0i8cgfs6w3gncc766mbg81ldxqjhzvq3n28z39"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck"; sha256 = "19ixd60yynsvmaj7mkppp6k73793x794vrnhx3hh6n7dap1rsjdh"; - name = "gitlab-ci-mode-flycheck"; + name = "recipe"; }; packageRequires = [ emacs flycheck gitlab-ci-mode ]; meta = { @@ -15586,9 +20270,14 @@ license = lib.licenses.free; }; }) {}; - gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gitpatch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gitpatch"; + ename = "gitpatch"; version = "0.5.1"; src = fetchFromGitHub { owner = "tumashu"; @@ -15596,10 +20285,10 @@ rev = "94d40a2ee2b7cd7b209546ea02568079176b0034"; sha256 = "1drf4fvmak7brf16axkh4nfz8pg44i7pjhfjz3dbkycbpp8y5vig"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch"; sha256 = "0qaswkk06z24v40nkjkv7f6gfv0dlsjd6wchkn0ppqw95883vhv1"; - name = "gitpatch"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -15607,9 +20296,15 @@ license = lib.licenses.free; }; }) {}; - gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: - melpaBuild { + gitter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "gitter"; + ename = "gitter"; version = "1"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -15617,10 +20312,10 @@ rev = "bd2ba457109dd5d3e4b419e3ef5cbd3b5c9498d6"; sha256 = "1fzl40bwdfbcq55p3kvbzjqr5w0703imzgrmqcf4f6jhav127zk6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter"; sha256 = "1ad5abqgfh6x2fcqbbdvgbg8xin69j0h93z7bav1hs3jla7mgwnv"; - name = "gitter"; + name = "recipe"; }; packageRequires = [ emacs let-alist ]; meta = { @@ -15628,9 +20323,13 @@ license = lib.licenses.free; }; }) {}; - gl-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gl-conf-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gl-conf-mode"; + ename = "gl-conf-mode"; version = "0.3"; src = fetchFromGitHub { owner = "llloret"; @@ -15638,10 +20337,10 @@ rev = "1a53e548277eb9c669bbeda4bee9be32be7a82ec"; sha256 = "059m30vvp71y630pcam6qfv5bxc35ygj26wcg28p56pccxxyj3q9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3117e62d429e44506f7d82fc64252d41bc1a4b6/recipes/gl-conf-mode"; sha256 = "0lf8xmq309aqyf16ymqlr8gj2qawlsqagbdndj0kgj72dnnw4cfm"; - name = "gl-conf-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15649,20 +20348,26 @@ license = lib.licenses.free; }; }) {}; - glab = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: - melpaBuild { + glab = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ghub + , lib + , melpaBuild }: + melpaBuild { pname = "glab"; - version = "2.0.0"; + ename = "glab"; + version = "2.0.1"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "ae37bef2eb3afb8232bb0a6f7306a8da2390abf4"; - sha256 = "1k8bim7yk3swpzsx5lwm6qbjfqf2lsssir0zlqzrkid61d3ixfgy"; + rev = "4831933da059ee084a16016558b9ccd8c581a8ff"; + sha256 = "1b5jrpj3z989r3mf4jfch8rnaaa5hyb2395xz3v37f0vsphd7s0y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab"; sha256 = "0ym8bgym11mdv5bw22lgkcxyqy7qgxxm0yjmrq8qx7i55gqayyb8"; - name = "glab"; + name = "recipe"; }; packageRequires = [ emacs ghub ]; meta = { @@ -15670,9 +20375,14 @@ license = lib.licenses.free; }; }) {}; - gmail-message-mode = callPackage ({ fetchFromGitHub, fetchurl, ham-mode, lib, melpaBuild }: - melpaBuild { + gmail-message-mode = callPackage ({ fetchFromGitHub + , fetchurl + , ham-mode + , lib + , melpaBuild }: + melpaBuild { pname = "gmail-message-mode"; + ename = "gmail-message-mode"; version = "1.4"; src = fetchFromGitHub { owner = "Malabarba"; @@ -15680,10 +20390,10 @@ rev = "ec36672a9dc93c09ebe2f77597b498d11883d008"; sha256 = "0xcdd3abcrqr7nabdmmh0kgfar64hhgnrhsiwg3q201cymhnv49p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/gmail-message-mode"; sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk"; - name = "gmail-message-mode"; + name = "recipe"; }; packageRequires = [ ham-mode ]; meta = { @@ -15691,9 +20401,13 @@ license = lib.licenses.free; }; }) {}; - gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gmail2bbdb = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gmail2bbdb"; + ename = "gmail2bbdb"; version = "0.0.6"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -15701,10 +20415,10 @@ rev = "181ef6039227bb30a02041d8cfdc435551a7d948"; sha256 = "0205ldrw1i7czq44pqdl374cl0rjp5w5zadrayw8brl7mmw92byn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb"; sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j"; - name = "gmail2bbdb"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15712,9 +20426,13 @@ license = lib.licenses.free; }; }) {}; - gmpl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gmpl-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gmpl-mode"; + ename = "gmpl-mode"; version = "0.1.0"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -15722,10 +20440,10 @@ rev = "25d20f9d24594e85cb6f80d35d7c73b7e82cbc71"; sha256 = "0x0a94bfkk72kqyr5m6arx450qsg1axmp5r0c4r9m84z8j08r4v1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c89a523f87db358c477e5840b0e043e9f253e640/recipes/gmpl-mode"; sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz"; - name = "gmpl-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15733,9 +20451,13 @@ license = lib.licenses.free; }; }) {}; - gntp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gntp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gntp"; + ename = "gntp"; version = "0.1"; src = fetchFromGitHub { owner = "tekai"; @@ -15743,10 +20465,10 @@ rev = "767571135e2c0985944017dc59b0be79af222ef5"; sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c69a148d3b72d1be6ea10100a8e0cbbd918baa9c/recipes/gntp"; sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f"; - name = "gntp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15754,9 +20476,13 @@ license = lib.licenses.free; }; }) {}; - gnuplot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gnuplot = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gnuplot"; + ename = "gnuplot"; version = "0.7.0"; src = fetchFromGitHub { owner = "bruceravel"; @@ -15764,10 +20490,10 @@ rev = "aefd4f671485fbcea42511ce79a7a60e5e0110a3"; sha256 = "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78be03893e4b0502ce999375e5630d32bda56ac1/recipes/gnuplot"; sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds"; - name = "gnuplot"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15775,20 +20501,25 @@ license = lib.licenses.free; }; }) {}; - gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: - melpaBuild { + gnus-desktop-notify = callPackage ({ fetchFromGitLab + , fetchurl + , gnus ? null + , lib + , melpaBuild }: + melpaBuild { pname = "gnus-desktop-notify"; + ename = "gnus-desktop-notify"; version = "1.4"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "wavexx"; repo = "gnus-desktop-notify.el"; rev = "210c70f0021ee78e724f1d8e00ca96e1e99928ca"; sha256 = "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify"; - sha256 = "08k32vhdp6i8c03rp1k6b5jmvj5ijplj26mdblrgasklcqbdnlfs"; - name = "gnus-desktop-notify"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/gnus-desktop-notify"; + sha256 = "1cfcmmq0ywgp41g0rf8s5fabh3yqbv9iacxi7v74kqh59bqdnz3x"; + name = "recipe"; }; packageRequires = [ gnus ]; meta = { @@ -15796,20 +20527,26 @@ license = lib.licenses.free; }; }) {}; - gnus-x-gm-raw = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + gnus-x-gm-raw = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "gnus-x-gm-raw"; + ename = "gnus-x-gm-raw"; version = "0.0.1"; src = fetchFromGitHub { owner = "aki2o"; repo = "gnus-x-gm-raw"; - rev = "978bdfcecc8844465b71641c2e909fcdc66b22be"; - sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril"; + rev = "c2c8c5e94ac94f4c40e023452119c088ac59eac9"; + sha256 = "0gf418ri69yzi9cbxdyna9kxjsniyw72xix2r94m439k1axpwa3f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/263b87e40e32421ae56a99971a7e1baca0484778/recipes/gnus-x-gm-raw"; sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg"; - name = "gnus-x-gm-raw"; + name = "recipe"; }; packageRequires = [ log4e yaxception ]; meta = { @@ -15817,9 +20554,15 @@ license = lib.licenses.free; }; }) {}; - go-add-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + go-add-tags = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "go-add-tags"; + ename = "go-add-tags"; version = "0.4"; src = fetchFromGitHub { owner = "syohex"; @@ -15827,10 +20570,10 @@ rev = "54879945e46a0884c5f93d7fd6c866a9cdf401ac"; sha256 = "1gr65skrd41pk46ilfsbxfdng4br6h9c6blf1q1wx6i9ylhs0ak5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags"; sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim"; - name = "go-add-tags"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -15838,20 +20581,25 @@ license = lib.licenses.free; }; }) {}; - go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-autocomplete = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-autocomplete"; + ename = "go-autocomplete"; version = "20170907"; src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1"; - sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb"; + rev = "beae6bdcc6fc300059038961b7a3e977e0fb7c61"; + sha256 = "0fhs17v2x24nhs0kd2yjzr56jni2767yrjxims6phsaxs9m5aih2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a"; - name = "go-autocomplete"; + name = "recipe"; }; packageRequires = [ auto-complete ]; meta = { @@ -15859,9 +20607,15 @@ license = lib.licenses.free; }; }) {}; - go-direx = callPackage ({ cl-lib ? null, direx, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-direx = callPackage ({ cl-lib ? null + , direx + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-direx"; + ename = "go-direx"; version = "0.4"; src = fetchFromGitHub { owner = "syohex"; @@ -15869,10 +20623,10 @@ rev = "aecb9fef4d56d04d230d37c75c260c8392b5ad9f"; sha256 = "05yc0nylg3457an5j7yp3x23157j0hbi21qhcpgsa01144mwnwln"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/032c0c3cd04f36f1bc66bb7d9d789d354c620a09/recipes/go-direx"; sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7"; - name = "go-direx"; + name = "recipe"; }; packageRequires = [ cl-lib direx ]; meta = { @@ -15880,9 +20634,14 @@ license = lib.licenses.free; }; }) {}; - go-dlv = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-dlv = callPackage ({ fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-dlv"; + ename = "go-dlv"; version = "0.1.0"; src = fetchFromGitHub { owner = "benma"; @@ -15890,10 +20649,10 @@ rev = "45a9e8a047c9995eb7c802268d96b3e527569f41"; sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv"; sha256 = "0lb5v9pmd6m8nvk4c9gcda5dmshrf5812gg1arq5p2g0nzg32mm8"; - name = "go-dlv"; + name = "recipe"; }; packageRequires = [ go-mode ]; meta = { @@ -15901,9 +20660,15 @@ license = lib.licenses.free; }; }) {}; - go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-eldoc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-eldoc"; + ename = "go-eldoc"; version = "0.30"; src = fetchFromGitHub { owner = "syohex"; @@ -15911,10 +20676,10 @@ rev = "f1ad302ec4073354801e613293be2f55ba770618"; sha256 = "0hkwhmgjyn5jxrd0k1nakrvy4d7cz7sxb1nw4hb1rqmz4yd14c8i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc"; sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk"; - name = "go-eldoc"; + name = "recipe"; }; packageRequires = [ emacs go-mode ]; meta = { @@ -15922,9 +20687,13 @@ license = lib.licenses.free; }; }) {}; - go-errcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-errcheck = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-errcheck"; + ename = "go-errcheck"; version = "1.1.2"; src = fetchFromGitHub { owner = "dominikh"; @@ -15932,10 +20701,10 @@ rev = "1b0cd6af048a8b2074ace14ab51fb6c987beb430"; sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c874f608a55cafcc6e57ca2c80bdae6b1c2e47e9/recipes/go-errcheck"; sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs"; - name = "go-errcheck"; + name = "recipe"; }; packageRequires = []; meta = { @@ -15943,20 +20712,25 @@ license = lib.licenses.free; }; }) {}; - go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-fill-struct = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-fill-struct"; + ename = "go-fill-struct"; version = "0.1"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "go-fill-struct"; - rev = "3c97c92e78f3629a7a1069404c7c641881c16d0e"; - sha256 = "0ara9qqv31pr7dpcby6xp24llf79m0dmwrx4yv6w0bhxi197fmlx"; + rev = "814ccc8c5e50e6be4190259439c450afe7fb6ef4"; + sha256 = "0zkdff390b00y0g1gfm2pgniq7allda55544cw7ccsvdaqayyhjc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct"; sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7"; - name = "go-fill-struct"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -15964,20 +20738,26 @@ license = lib.licenses.free; }; }) {}; - go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-guru = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-guru"; + ename = "go-guru"; version = "1.5.0"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2"; - sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf"; + rev = "d13feb239b13b910ec4db19356f34c3801299407"; + sha256 = "1a1c1b7isa9smazfnr8w2wzxxjzz3xcr6l3dvmq41g752wfakb3i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; sha256 = "01f0gz65z8d0iv8k49xl2sp6q4qnsvwhd4g8fb2irp7iclb0xmvk"; - name = "go-guru"; + name = "recipe"; }; packageRequires = [ cl-lib go-mode ]; meta = { @@ -15985,9 +20765,15 @@ license = lib.licenses.free; }; }) {}; - go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-impl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-impl"; + ename = "go-impl"; version = "0.14"; src = fetchFromGitHub { owner = "syohex"; @@ -15995,10 +20781,10 @@ rev = "69f0d0ef05771487e15abec500cd06befd171abf"; sha256 = "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl"; sha256 = "09frwpwc080rfpwkb63yv47dyj741lrpyrp65sq2bn4sf03xw0cx"; - name = "go-impl"; + name = "recipe"; }; packageRequires = [ emacs go-mode ]; meta = { @@ -16006,9 +20792,13 @@ license = lib.licenses.free; }; }) {}; - go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + go-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "go-mode"; + ename = "go-mode"; version = "1.5.0"; src = fetchFromGitHub { owner = "dominikh"; @@ -16016,10 +20806,10 @@ rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2"; sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; sha256 = "0ghqm4lbkfla79plqiyb1lzf5kbz0380h9vf8px15zal00xrv0bl"; - name = "go-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16027,9 +20817,16 @@ license = lib.licenses.free; }; }) {}; - go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: - melpaBuild { + go-playground = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , go-mode + , gotest + , lib + , melpaBuild }: + melpaBuild { pname = "go-playground"; + ename = "go-playground"; version = "1.3"; src = fetchFromGitHub { owner = "grafov"; @@ -16037,10 +20834,10 @@ rev = "eebb1fec2177bc85b746b948beac873a77bea4a2"; sha256 = "0ixpcms4f0q8327jyp2k48x03vjxwmzdsq76vg4j0kmjs9dfad1v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6"; - name = "go-playground"; + name = "recipe"; }; packageRequires = [ emacs go-mode gotest ]; meta = { @@ -16048,20 +20845,25 @@ license = lib.licenses.free; }; }) {}; - go-rename = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-rename = callPackage ({ fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-rename"; + ename = "go-rename"; version = "1.5.0"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2"; - sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf"; + rev = "d13feb239b13b910ec4db19356f34c3801299407"; + sha256 = "1a1c1b7isa9smazfnr8w2wzxxjzz3xcr6l3dvmq41g752wfakb3i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; sha256 = "1cd2nfgwnqzylbry11ahahdip8w66w5hnrndrs65ip10s08w2xki"; - name = "go-rename"; + name = "recipe"; }; packageRequires = [ go-mode ]; meta = { @@ -16069,9 +20871,15 @@ license = lib.licenses.free; }; }) {}; - go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-scratch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-scratch"; + ename = "go-scratch"; version = "0.0.1"; src = fetchFromGitHub { owner = "shosti"; @@ -16079,10 +20887,10 @@ rev = "3f68cbcce04f59eb8e83af109164731ec0454be0"; sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1713e6f02f8908b828ac2722a3185ea7cceb0609/recipes/go-scratch"; sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5"; - name = "go-scratch"; + name = "recipe"; }; packageRequires = [ emacs go-mode ]; meta = { @@ -16090,9 +20898,15 @@ license = lib.licenses.free; }; }) {}; - go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: - melpaBuild { + go-tag = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild }: + melpaBuild { pname = "go-tag"; + ename = "go-tag"; version = "1.1.0"; src = fetchFromGitHub { owner = "brantou"; @@ -16100,10 +20914,10 @@ rev = "8dbcb7d42dccac046c7beb31bdf79bb09a0fef40"; sha256 = "1l20az4lhgbrh96sk6bpvp3w4bh29653fms4bimmiaqmhn2n14y2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag"; sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f"; - name = "go-tag"; + name = "recipe"; }; packageRequires = [ emacs go-mode ]; meta = { @@ -16111,20 +20925,24 @@ license = lib.licenses.free; }; }) {}; - godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + godoctor = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "godoctor"; - version = "0.0.9"; + ename = "godoctor"; + version = "0.6.0"; src = fetchFromGitHub { owner = "microamp"; repo = "godoctor.el"; - rev = "f892a4dbabe61186540d6035c5185fd929a6a543"; - sha256 = "1cg09mihvqchgvdxwlrg9vcdj1kvmmy8zmlkscxi6smaxbi0yvjm"; + rev = "4b45ff3d0572f0e84056e4c3ba91fcc178199859"; + sha256 = "12gga1ghc54r6f2adyaq30hm2yxspvgg54zd4k82c3d6cj51qwci"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor"; sha256 = "0k734hry9npsr6zhsplcvmcjqw6jdf79pv4k9dw0xvd598hkpazz"; - name = "godoctor"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16132,9 +20950,13 @@ license = lib.licenses.free; }; }) {}; - golden-ratio = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + golden-ratio = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "golden-ratio"; + ename = "golden-ratio"; version = "1.0"; src = fetchFromGitHub { owner = "roman"; @@ -16142,10 +20964,10 @@ rev = "79b1743fc1a2f3462445e9ddd0a869f30065bb6d"; sha256 = "00igv83hiyx7x3pf2grmjpd379brn33fm85f05k104mkkrhg99nm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e87b2af052d0406431957d75aa3717899bdbc8ae/recipes/golden-ratio"; sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81"; - name = "golden-ratio"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16153,9 +20975,13 @@ license = lib.licenses.free; }; }) {}; - google-maps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + google-maps = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "google-maps"; + ename = "google-maps"; version = "1.0.0"; src = fetchFromGitHub { owner = "jd"; @@ -16163,10 +20989,10 @@ rev = "90151ab59e693243ca8da660ce7b9ce361ea5126"; sha256 = "183igr5lp20zcqi7rc01fk76sfxdhksd74i11v16gdsifdkjimd0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps"; sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx"; - name = "google-maps"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16174,9 +21000,14 @@ license = lib.licenses.free; }; }) {}; - google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + google-this = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "google-this"; + ename = "google-this"; version = "1.12"; src = fetchFromGitHub { owner = "Malabarba"; @@ -16184,10 +21015,10 @@ rev = "8a2e3ca5da6a8c89bfe99a21486c6c7db125dc84"; sha256 = "1dbra309w8awmi0g0pp7r2dm9nwrj2j9lpl7md8wa89rnzazwahl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this"; sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c"; - name = "google-this"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -16195,9 +21026,13 @@ license = lib.licenses.free; }; }) {}; - google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + google-translate = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "google-translate"; + ename = "google-translate"; version = "0.11.14"; src = fetchFromGitHub { owner = "atykhonov"; @@ -16205,10 +21040,10 @@ rev = "486c63bbfa0338589589f628703c38112035a5b2"; sha256 = "08b4lxnwy9iqxacbjjljybvvdkl9g2dy6vga6hw7h7h32qra8w2j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47"; - name = "google-translate"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16216,9 +21051,14 @@ license = lib.licenses.free; }; }) {}; - gorepl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gorepl-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gorepl-mode"; + ename = "gorepl-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "manute"; @@ -16226,10 +21066,10 @@ rev = "17e025951f5964a0542a4b353ddddbc734c01eed"; sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gorepl-mode"; sha256 = "0xcjjh9hf3pv5jgv089c6bb00s215fc9qwn72fav1xbm5f49nkaq"; - name = "gorepl-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -16237,9 +21077,17 @@ license = lib.licenses.free; }; }) {}; - gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: - melpaBuild { + gotest = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild + , s }: + melpaBuild { pname = "gotest"; + ename = "gotest"; version = "0.14.0"; src = fetchFromGitHub { owner = "nlamirault"; @@ -16247,10 +21095,10 @@ rev = "8a5ef7363f83edb3b77c5e23876f13dd8c23b2b9"; sha256 = "1ksi37kmy9mnrjr5lf9f0ga5nvi3r2kc85g6yvdfj0mbsjm1pnp7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest"; sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9"; - name = "gotest"; + name = "recipe"; }; packageRequires = [ emacs f go-mode s ]; meta = { @@ -16258,9 +21106,13 @@ license = lib.licenses.free; }; }) {}; - gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gotham-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gotham-theme"; + ename = "gotham-theme"; version = "1.1.8"; src = fetchFromGitHub { owner = "wasamasa"; @@ -16268,10 +21120,10 @@ rev = "417d61978d139cb5d089c5365fc8d3166d76d3ac"; sha256 = "0rc40cfj2mby1q7bk1pp1fxdi72nh9ip80spjdm1csvjjc4dbkwr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme"; sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl"; - name = "gotham-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16279,9 +21131,13 @@ license = lib.licenses.free; }; }) {}; - goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + goto-chg = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "goto-chg"; + ename = "goto-chg"; version = "1.7.2"; src = fetchFromGitHub { owner = "emacs-evil"; @@ -16289,10 +21145,10 @@ rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4"; sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy"; - name = "goto-chg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16300,20 +21156,25 @@ license = lib.licenses.free; }; }) {}; - goto-gem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + goto-gem = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "goto-gem"; + ename = "goto-gem"; version = "1.2"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "pidu"; repo = "goto-gem"; rev = "6f5bd405c096ef879fed1298c09d0daa0bae5dac"; sha256 = "188q7jr1y872as3w32m8lf6vwl2by1ibgdk6zk7dhpcjwd0ik7x7"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5f576f6fab4ee466c54ce2c50569a447b6d617cc/recipes/goto-gem"; - sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a"; - name = "goto-gem"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/goto-gem"; + sha256 = "0i79z1isdbnqmz5rlqjjys68l27nl90m1gzks4f9d6dsgfryhgwx"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -16321,9 +21182,13 @@ license = lib.licenses.free; }; }) {}; - goto-last-change = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + goto-last-change = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "goto-last-change"; + ename = "goto-last-change"; version = "1.2.1"; src = fetchFromGitHub { owner = "camdez"; @@ -16331,10 +21196,10 @@ rev = "58b0928bc255b47aad318cd183a5dce8f62199cc"; sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d68945f5845e5e44fb6c11726a56acd4dc56e101/recipes/goto-last-change"; sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx"; - name = "goto-last-change"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16342,20 +21207,29 @@ license = lib.licenses.free; }; }) {}; - govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: - melpaBuild { + govc = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , json-mode + , lib + , magit-popup + , melpaBuild + , s }: + melpaBuild { pname = "govc"; - version = "0.17.1"; + ename = "govc"; + version = "0.18.0"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "123ed177021588bac57b5c87c1a84270ddf2eca8"; - sha256 = "0m144lpjbyil8cs57dw9q72abjhrd8cfwbalvzyaldgnx10j8gkc"; + rev = "e3a01f9611c32b2362366434bcd671516e78955d"; + sha256 = "0cicd4m8ll7y1n0c97drmvmqwsqaspwpzc6nfp73f887m8ff1xis"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; sha256 = "1ivgaziv25wlzg6y4zh8x7mv97pnyhi7p8jpvgh5fg5lnqpzhl4v"; - name = "govc"; + name = "recipe"; }; packageRequires = [ dash emacs json-mode magit-popup s ]; meta = { @@ -16363,9 +21237,40 @@ license = lib.licenses.free; }; }) {}; - grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gpastel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "gpastel"; + ename = "gpastel"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "gpastel"; + rev = "21b7d79530134d6a47eeb252b684f884c769d291"; + sha256 = "1s1gnkpz6byf6by8r1bl9vq3slmsdavjb2ybp2zgic48favz1qm2"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9b70e05ff0a074f9e2f1373e8495dc8df462deea/recipes/gpastel"; + sha256 = "0mjy4n26s89b481dby018l80glgfwfaacihmd7vhh2c75ns671a6"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gpastel"; + license = lib.licenses.free; + }; + }) {}; + grab-mac-link = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grab-mac-link"; + ename = "grab-mac-link"; version = "0.2"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -16373,10 +21278,10 @@ rev = "8bf05a69758fd10a4303c5c458cd91a49ab8b1b2"; sha256 = "12x47k3mm5hvhgn7fmfi7bqfa3naz8w1sx6fl3rmnbzvldb89i1k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link"; sha256 = "1a4wyvx1mlgnd45nn99lwy3vaiwhi1nrphfln86pb6z939dxakj3"; - name = "grab-mac-link"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -16384,9 +21289,15 @@ license = lib.licenses.free; }; }) {}; - grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grab-x-link = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grab-x-link"; + ename = "grab-x-link"; version = "0.5"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -16394,10 +21305,10 @@ rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c"; sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link"; sha256 = "1kni49n1v716w4hjfm49mk25jshfc6idpby0k58qvngbfqk3kzy5"; - name = "grab-x-link"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -16405,9 +21316,14 @@ license = lib.licenses.free; }; }) {}; - gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + gradle-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "gradle-mode"; + ename = "gradle-mode"; version = "0.5.5"; src = fetchFromGitHub { owner = "jacobono"; @@ -16415,10 +21331,10 @@ rev = "579de06674551919cddac9cfe42129f4fb0155c9"; sha256 = "0k86lrb55d701nj6pvlw3kjp1dcd3lzfya0hv6q56c529y69d782"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/771cc597daebf9b4aa308f8b350af91a515b44c9/recipes/gradle-mode"; sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g"; - name = "gradle-mode"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -16426,9 +21342,14 @@ license = lib.licenses.free; }; }) {}; - grails = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grails = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grails"; + ename = "grails"; version = "0.4.1"; src = fetchFromGitHub { owner = "lifeisfoo"; @@ -16436,10 +21357,10 @@ rev = "fa638abe5c37f3f8af4fcd32f212453185ce50b1"; sha256 = "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be0196207245ea9d23fda09121d624db9ea6d83d/recipes/grails"; sha256 = "177y6xv35d2dhc3pdx5qhpywlmlqgfnjpzfm9yxc8l6q2rgs8irw"; - name = "grails"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -16447,20 +21368,24 @@ license = lib.licenses.free; }; }) {}; - grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grails-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grails-mode"; + ename = "grails-mode"; version = "2.0"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24"; - sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2"; + rev = "50801257d376fd7383ddf9c19ff567183c24ad0b"; + sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; sha256 = "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4"; - name = "grails-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16468,9 +21393,16 @@ license = lib.licenses.free; }; }) {}; - grails-projectile-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + grails-projectile-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "grails-projectile-mode"; + ename = "grails-projectile-mode"; version = "1.1.2"; src = fetchFromGitHub { owner = "yveszoundi"; @@ -16478,10 +21410,10 @@ rev = "8efca50ce92b556fe9d467b157d7aec635bcc017"; sha256 = "0xnj0wp0na53l0y8fiaah50ij4r80j8a29hbjbcicska21p5w1s1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35d49029c1f665ad40e543040d98d5a770bfea96/recipes/grails-projectile-mode"; sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn"; - name = "grails-projectile-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs projectile ]; meta = { @@ -16489,20 +21421,23 @@ license = lib.licenses.free; }; }) {}; - grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grandshell-theme = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grandshell-theme"; + ename = "grandshell-theme"; version = "1.3"; - src = fetchFromGitHub { - owner = "steckerhalter"; - repo = "grandshell-theme"; - rev = "22c8df52c0fb8899fa748fa2980947ab38b53380"; - sha256 = "08556ci80iycm4qkvbnrci55wyv91b4fh6sjp0im0ywndmrq3yyc"; + src = fetchgit { + url = "https://framagit.org/steckerhalter/grandshell-theme.git"; + rev = "8e18bfcfb66db8591ce742308a40b6341e75d335"; + sha256 = "13y3plbia4vli9c3mv01nf520zh7ilzywpqj0nsl7x6pzw9fx0np"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; - sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa"; - name = "grandshell-theme"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/grandshell-theme"; + sha256 = "1r0r0r0g116f4jp3rip8mjqqgdam4h5dr5qvdglr9xpirfcw6wq3"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16510,20 +21445,35 @@ license = lib.licenses.free; }; }) {}; - graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }: - melpaBuild { + graphene = callPackage ({ company + , dash + , exec-path-from-shell + , fetchFromGitHub + , fetchurl + , flycheck + , graphene-meta-theme + , ido-completing-read-plus + , lib + , melpaBuild + , ppd-sr-speedbar + , smartparens + , smex + , sr-speedbar + , web-mode }: + melpaBuild { pname = "graphene"; - version = "0.9.9"; + ename = "graphene"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene"; - rev = "9dbd50e532ca45076e03db0f96a57d21528fc460"; - sha256 = "0sqxnjmfbr0plahdmp87j8xpl3qkyimf9vkqall4ccljx8irdl6s"; + rev = "cc8477fcfb7771ea4e5bbaf3c01f9e679234c1c1"; + sha256 = "0j0igcmfl61c4pakqmyxpwr4kjar9i81vkl84rw19phc7k9497nb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene"; sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k"; - name = "graphene"; + name = "recipe"; }; packageRequires = [ company @@ -16543,9 +21493,13 @@ license = lib.licenses.free; }; }) {}; - graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + graphene-meta-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "graphene-meta-theme"; + ename = "graphene-meta-theme"; version = "0.0.5"; src = fetchFromGitHub { owner = "rdallasgray"; @@ -16553,10 +21507,10 @@ rev = "62cc73fee31f1bd9474027b83a249feee050271e"; sha256 = "1ydl6dlg5z4infq8j09izwgs6n97yza6nbq5rs1xfv00zd9gr63c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme"; sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q"; - name = "graphene-meta-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16564,9 +21518,13 @@ license = lib.licenses.free; }; }) {}; - graphviz-dot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + graphviz-dot-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "graphviz-dot-mode"; + ename = "graphviz-dot-mode"; version = "0.4"; src = fetchFromGitHub { owner = "ppareit"; @@ -16574,10 +21532,10 @@ rev = "7301cc276206b6995d265bcb9eb308bb83c760be"; sha256 = "1zk664ilyz14p11csmqgzs73gx08hy32h3pnyymzqkavmgb6h3s0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e2f1e66b33fd95142be4622c996911e38d56281/recipes/graphviz-dot-mode"; sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2"; - name = "graphviz-dot-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16585,9 +21543,13 @@ license = lib.licenses.free; }; }) {}; - grapnel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grapnel = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grapnel"; + ename = "grapnel"; version = "0.5.3"; src = fetchFromGitHub { owner = "leathekd"; @@ -16595,10 +21557,10 @@ rev = "7387234eb3f0285a490fddb1e06a4bf029719fb7"; sha256 = "0xcj1kqzgxifhrhpl9j2nfpnkd6213ix5z7f97269v3inpzaiyf5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd482e4b2c45921b81c5fb3dfce53acfec3c3093/recipes/grapnel"; sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r"; - name = "grapnel"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16606,8 +21568,13 @@ license = lib.licenses.free; }; }) {}; - grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + grass-mode = callPackage ({ cl-lib ? null + , dash + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grass-mode"; version = "0.1"; src = fetchhg { @@ -16615,7 +21582,7 @@ rev = "1ae8eae88117"; sha256 = "1sl3d5759fjm98pb50ykz2c05czb2298ipccwj2qz2hdzq63hfv8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v"; name = "grass-mode"; @@ -16626,9 +21593,13 @@ license = lib.licenses.free; }; }) {}; - green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + green-is-the-new-black-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "green-is-the-new-black-theme"; + ename = "green-is-the-new-black-theme"; version = "0.0.6"; src = fetchFromGitHub { owner = "fredcamps"; @@ -16636,10 +21607,10 @@ rev = "8a03687a2b8b55c5dc7f099086019278d505d8d8"; sha256 = "07j5sv8dskqxpbzr5f58n75cziyqm9v01c3f7wmwfs8jl7h5nc4m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; sha256 = "03q0vj409icmawffy2kd9yl04r453q80cy1p9y4i3xk368z0362g"; - name = "green-is-the-new-black-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16647,9 +21618,13 @@ license = lib.licenses.free; }; }) {}; - green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + green-screen-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "green-screen-theme"; + ename = "green-screen-theme"; version = "1.0.24"; src = fetchFromGitHub { owner = "rbanffy"; @@ -16657,10 +21632,10 @@ rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0"; sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme"; sha256 = "0a45xcl74kp3v39bl169sq46mqxiwvvis6jzwcy6yrl2vqqi4mab"; - name = "green-screen-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16668,7 +21643,39 @@ license = lib.licenses.free; }; }) {}; - grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + grep-context = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "grep-context"; + ename = "grep-context"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "grep-context"; + rev = "4c63d0f2654dee1e249c2054d118d674a757bd45"; + sha256 = "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context"; + sha256 = "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g"; + name = "recipe"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/grep-context"; + license = lib.licenses.free; + }; + }) {}; + grin = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grin"; version = "1.0"; src = fetchhg { @@ -16676,7 +21683,7 @@ rev = "f541aa22da52"; sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/grin"; sha256 = "0rak710fp9c7wx39qn4dc9d0xfjr5w7hwklxh99v1x1ihkla9378"; name = "grin"; @@ -16687,9 +21694,13 @@ license = lib.licenses.free; }; }) {}; - grizzl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grizzl = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grizzl"; + ename = "grizzl"; version = "0.1.1"; src = fetchFromGitHub { owner = "grizzl"; @@ -16697,10 +21708,10 @@ rev = "c775de1c34d1e5a374e2f40c1ae2396b4b003fe7"; sha256 = "1bq73kcx744xnlm2yvccrzlbyx91c492sg7blx2a9z643v3gg1zs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/grizzl"; sha256 = "0354xskqzxc38l14zxqs31hadwh27v9lyx67y3hnd94d8abr0qcb"; - name = "grizzl"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16708,9 +21719,16 @@ license = lib.licenses.free; }; }) {}; - groovy-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: - melpaBuild { + groovy-imports = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , s }: + melpaBuild { pname = "groovy-imports"; + ename = "groovy-imports"; version = "1.0"; src = fetchFromGitHub { owner = "mbezjak"; @@ -16718,10 +21736,10 @@ rev = "e56d7dda617555ec6205644d32ffddf2e1fa43d9"; sha256 = "060zxl2y4p50g5fwgplgx07h5akfplp49rkv5cx09rqlcyzqhqwa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b18a6842805856062e9452dc32bf0fd458f7d51a/recipes/groovy-imports"; sha256 = "09yjkwsm192lgala1pvxw47id4j7362sl3j1hn9ald2m8m3ddyfs"; - name = "groovy-imports"; + name = "recipe"; }; packageRequires = [ emacs pcache s ]; meta = { @@ -16729,9 +21747,15 @@ license = lib.licenses.free; }; }) {}; - groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + groovy-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "groovy-mode"; + ename = "groovy-mode"; version = "2.0"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; @@ -16739,10 +21763,10 @@ rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24"; sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal"; - name = "groovy-mode"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -16750,9 +21774,13 @@ license = lib.licenses.free; }; }) {}; - gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gruber-darker-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gruber-darker-theme"; + ename = "gruber-darker-theme"; version = "0.6"; src = fetchFromGitHub { owner = "rexim"; @@ -16760,10 +21788,10 @@ rev = "0c08d77e615aceb9e6e1ca66b1fbde275200cfe4"; sha256 = "14h0rcd3nkw3pmx8jwip20p6rzl9qdkip5g52gfjjbqfvaffsrkd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme"; sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi"; - name = "gruber-darker-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16771,9 +21799,15 @@ license = lib.licenses.free; }; }) {}; - grunt = callPackage ({ ansi-color ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + grunt = callPackage ({ ansi-color ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "grunt"; + ename = "grunt"; version = "1.3.2"; src = fetchFromGitHub { owner = "gempesaw"; @@ -16781,10 +21815,10 @@ rev = "e27dbb6b3de9b36c7fb28f69aa06b4b2ea32d4b9"; sha256 = "0zpmhjwj64s72iv3dgsy07pfh20f25ngsy3pszmlrfkxk0926d8k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/grunt"; sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz"; - name = "grunt"; + name = "recipe"; }; packageRequires = [ ansi-color dash ]; meta = { @@ -16792,20 +21826,25 @@ license = lib.licenses.free; }; }) {}; - gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gruvbox-theme = callPackage ({ autothemer + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gruvbox-theme"; - version = "1.22.1"; + ename = "gruvbox-theme"; + version = "1.26.0"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "b6d93d25faff573a7f7712bc33fce1fe422473e0"; - sha256 = "1j8ivqhzrz5kaq1as4s5vljjpan8adqdc5s2ms8p3p83b2kg55si"; + rev = "796999e5db2a0e43ad64c062c1bec3c966d095bc"; + sha256 = "0qj5k0c1592ikrb7gcibqwf8hhj6lq4cw7zrb3kmpk4zakzy7a2w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32"; - name = "gruvbox-theme"; + name = "recipe"; }; packageRequires = [ autothemer ]; meta = { @@ -16813,9 +21852,13 @@ license = lib.licenses.free; }; }) {}; - gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gscholar-bibtex = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gscholar-bibtex"; + ename = "gscholar-bibtex"; version = "0.3.3"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -16823,10 +21866,10 @@ rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c"; sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az"; - name = "gscholar-bibtex"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16834,9 +21877,14 @@ license = lib.licenses.free; }; }) {}; - guide-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: - melpaBuild { + guide-key = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popwin }: + melpaBuild { pname = "guide-key"; + ename = "guide-key"; version = "1.2.5"; src = fetchFromGitHub { owner = "kai2nenobu"; @@ -16844,10 +21892,10 @@ rev = "626f3aacfe4561eddc46617570426246b88e9cab"; sha256 = "1bmcvn8a7g9ahpv2fww673hx9pa7nnrj9kpljq65azf61vq2an2g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/490b81308ae8132d8c3fd8c3951be88159719172/recipes/guide-key"; sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf"; - name = "guide-key"; + name = "recipe"; }; packageRequires = [ popwin ]; meta = { @@ -16855,9 +21903,15 @@ license = lib.licenses.free; }; }) {}; - guide-key-tip = callPackage ({ fetchFromGitHub, fetchurl, guide-key, lib, melpaBuild, pos-tip }: - melpaBuild { + guide-key-tip = callPackage ({ fetchFromGitHub + , fetchurl + , guide-key + , lib + , melpaBuild + , pos-tip }: + melpaBuild { pname = "guide-key-tip"; + ename = "guide-key-tip"; version = "0.0.1"; src = fetchFromGitHub { owner = "aki2o"; @@ -16865,10 +21919,10 @@ rev = "e08b2585228529aeaae5e0ae0948f898e83a6200"; sha256 = "040mcfhj2gggp8w1pgip7rxb1bnb23rxlm02wl6x1qv5i0q7g5x3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f23db7563654ab58632d56e3b01d2f78276fc3e/recipes/guide-key-tip"; sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06"; - name = "guide-key-tip"; + name = "recipe"; }; packageRequires = [ guide-key pos-tip ]; meta = { @@ -16876,30 +21930,44 @@ license = lib.licenses.free; }; }) {}; - guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: - melpaBuild { + guix = callPackage ({ bui + , dash + , edit-indirect + , emacs + , fetchFromGitHub + , fetchurl + , geiser + , lib + , magit-popup + , melpaBuild }: + melpaBuild { pname = "guix"; - version = "0.3.4"; + ename = "guix"; + version = "0.4.1.1"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "a43828f6e5d6dc4e623a4b78e0dfdddbf5b20185"; - sha256 = "0c19njb5cg6g3fav9322hkbl4h9zwcbymhc5wr0k9yqi7pv8gz0v"; + rev = "60a922a0d48747f1c1d945a725f40a9d1f1fa3a9"; + sha256 = "0jp0bjy9l2m3kii0p1fnqmvsbz9hafv5s5840czsda3mc9x9c7b0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; sha256 = "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9"; - name = "guix"; + name = "recipe"; }; - packageRequires = [ bui dash emacs geiser magit-popup ]; + packageRequires = [ bui dash edit-indirect emacs geiser magit-popup ]; meta = { homepage = "https://melpa.org/#/guix"; license = lib.licenses.free; }; }) {}; - guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + guru-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "guru-mode"; + ename = "guru-mode"; version = "0.2"; src = fetchFromGitHub { owner = "bbatsov"; @@ -16907,10 +21975,10 @@ rev = "62a9a0025249f2f8866b94683c4114c39f48e1fa"; sha256 = "1y46qd9cgkfb0wp2cvksjncyp77hd2jnr4bm4zafqirc3qhbysx0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e60af6ccb902d8ef00cfecbb13cafebbe3b00d89/recipes/guru-mode"; sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs"; - name = "guru-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -16918,9 +21986,14 @@ license = lib.licenses.free; }; }) {}; - gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + gxref = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "gxref"; + ename = "gxref"; version = "0.1"; src = fetchFromGitHub { owner = "dedi"; @@ -16928,10 +22001,10 @@ rev = "15723a9d910d7dd9ea18cab0336332cf988aeceb"; sha256 = "1l5d1kh2dy3w42i8c3z63c7mzarxixxiby2g7ay2i809yxj10y1n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; sha256 = "06qlfjclfx00m8pr7lk6baim3vjk5i0m75i1p4aihp2vflvgjaby"; - name = "gxref"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -16939,9 +22012,14 @@ license = lib.licenses.free; }; }) {}; - hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hacker-typer = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hacker-typer"; + ename = "hacker-typer"; version = "1.0.6"; src = fetchFromGitHub { owner = "therockmandolinist"; @@ -16949,10 +22027,10 @@ rev = "d5a23714a4ccc5071580622f278597d5973f40bd"; sha256 = "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e04a3a1606ea23865c04d93e3dc77cb55b9931f/recipes/hacker-typer"; sha256 = "128y562cxi8rblnqjdzhqc6b58bxi67f6hz569gqw4jywz0xcd0g"; - name = "hacker-typer"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -16960,9 +22038,14 @@ license = lib.licenses.free; }; }) {}; - hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + hackernews = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "hackernews"; + ename = "hackernews"; version = "0.4.0"; src = fetchFromGitHub { owner = "clarete"; @@ -16970,10 +22053,10 @@ rev = "22a15dc57dd6aab7793c0f9c2b72e161e0bee00c"; sha256 = "0bpbiadv4bf3lllsm0w1jcw8nc7c9zl97m972hbxb1dgv90gvs5b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a"; - name = "hackernews"; + name = "recipe"; }; packageRequires = [ json ]; meta = { @@ -16981,9 +22064,15 @@ license = lib.licenses.free; }; }) {}; - ham-mode = callPackage ({ fetchFromGitHub, fetchurl, html-to-markdown, lib, markdown-mode, melpaBuild }: - melpaBuild { + ham-mode = callPackage ({ fetchFromGitHub + , fetchurl + , html-to-markdown + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "ham-mode"; + ename = "ham-mode"; version = "1.1.2"; src = fetchFromGitHub { owner = "Malabarba"; @@ -16991,10 +22080,10 @@ rev = "3a141986a21c2aa6eefb428983352abb8b7907d2"; sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/ham-mode"; sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz"; - name = "ham-mode"; + name = "recipe"; }; packageRequires = [ html-to-markdown markdown-mode ]; meta = { @@ -17002,9 +22091,14 @@ license = lib.licenses.free; }; }) {}; - hamburger-menu = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + hamburger-menu = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hamburger-menu"; + ename = "hamburger-menu"; version = "1.0.5"; src = fetchFromGitLab { owner = "iain"; @@ -17012,10 +22106,10 @@ rev = "fd37f013c2f2619a88d3ed5311a9d1308cc82614"; sha256 = "196ydb57h4mjagjaiflvb20my561i6mdc6v6694ibdik2yns2inm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8017730403cc0e613e3939017f85074753c3778/recipes/hamburger-menu"; sha256 = "0ws9729i51arjqwpiywcpb7y3c5sm3c9wrq8q0k0m9hpq8h11wdb"; - name = "hamburger-menu"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -17023,9 +22117,14 @@ license = lib.licenses.free; }; }) {}; - haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: - melpaBuild { + haml-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , ruby-mode ? null }: + melpaBuild { pname = "haml-mode"; + ename = "haml-mode"; version = "3.1.9"; src = fetchFromGitHub { owner = "nex3"; @@ -17033,10 +22132,10 @@ rev = "5e0baf7b795b9e41ac03b55f8feff6b51027c43b"; sha256 = "0fmr7ji8x5ki9fzybpbg3xbhzws6n7ffk7d0zf9jl1x3jd8d6988"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode"; sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f"; - name = "haml-mode"; + name = "recipe"; }; packageRequires = [ ruby-mode ]; meta = { @@ -17044,9 +22143,13 @@ license = lib.licenses.free; }; }) {}; - hardcore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hardcore-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hardcore-mode"; + ename = "hardcore-mode"; version = "0.1.0"; src = fetchFromGitHub { owner = "magnars"; @@ -17054,10 +22157,10 @@ rev = "5ab75594a7a0ca236e2ac87882ee439ff6155d96"; sha256 = "08l6p9n2ggg4filad1k663qc2gjgfbia4knnnif4sw7h92yb31jl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b929b3343cd5925944665e4e09b4524bca873c95/recipes/hardcore-mode"; sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd"; - name = "hardcore-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17065,9 +22168,14 @@ license = lib.licenses.free; }; }) {}; - hardhat = callPackage ({ fetchFromGitHub, fetchurl, ignoramus, lib, melpaBuild }: - melpaBuild { + hardhat = callPackage ({ fetchFromGitHub + , fetchurl + , ignoramus + , lib + , melpaBuild }: + melpaBuild { pname = "hardhat"; + ename = "hardhat"; version = "0.4.6"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -17075,10 +22183,10 @@ rev = "9038a49ab55cd4c502cf7f07ed0d1b9b6bc3626e"; sha256 = "0j9z46j777y3ljpai5czdlwl07f0irp4fsk4677n11ndyqm1amb5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/081aa3e1d50c2c9e5a9b9ce0716258a93279f605/recipes/hardhat"; sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z"; - name = "hardhat"; + name = "recipe"; }; packageRequires = [ ignoramus ]; meta = { @@ -17086,9 +22194,16 @@ license = lib.licenses.free; }; }) {}; - harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }: - melpaBuild { + harvest = callPackage ({ fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild + , s + , swiper }: + melpaBuild { pname = "harvest"; + ename = "harvest"; version = "0.3.8"; src = fetchFromGitHub { owner = "kostajh"; @@ -17096,10 +22211,10 @@ rev = "69041907bdca68d3ab6802e08ec698c3448f28a1"; sha256 = "0rqxi668wra1mfzq4fqscjghis5gqnwpazgidgix13brybaxydx4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/harvest"; sha256 = "1r6brld6iq03wsr1b3jhdkxwrcxa6g6fwa1jiy1kgjsr9dq1m51c"; - name = "harvest"; + name = "recipe"; }; packageRequires = [ hydra s swiper ]; meta = { @@ -17107,9 +22222,13 @@ license = lib.licenses.free; }; }) {}; - haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + haskell-emacs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "haskell-emacs"; + ename = "haskell-emacs"; version = "4.0.3"; src = fetchFromGitHub { owner = "knupfer"; @@ -17117,10 +22236,10 @@ rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9"; sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs"; sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6"; - name = "haskell-emacs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17128,20 +22247,25 @@ license = lib.licenses.free; }; }) {}; - haskell-emacs-base = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }: - melpaBuild { + haskell-emacs-base = callPackage ({ fetchFromGitHub + , fetchurl + , haskell-emacs + , lib + , melpaBuild }: + melpaBuild { pname = "haskell-emacs-base"; + ename = "haskell-emacs-base"; version = "4.0.3"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9"; - sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam"; + rev = "7f91f65254902b8ff04fdb679bc569b2f6a51637"; + sha256 = "17i9l6wgrvmp31ca4xrax31f7bjnn0vn2figycxhfaq9f6vxgkkn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-base"; sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb"; - name = "haskell-emacs-base"; + name = "recipe"; }; packageRequires = [ haskell-emacs ]; meta = { @@ -17149,20 +22273,25 @@ license = lib.licenses.free; }; }) {}; - haskell-emacs-text = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }: - melpaBuild { + haskell-emacs-text = callPackage ({ fetchFromGitHub + , fetchurl + , haskell-emacs + , lib + , melpaBuild }: + melpaBuild { pname = "haskell-emacs-text"; + ename = "haskell-emacs-text"; version = "4.0.3"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9"; - sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam"; + rev = "cc240612740fc3fd6e3c3d8cdfe486a89954f5d1"; + sha256 = "09g6b1ad7qi9k58ymgmssgapwapxcwf30qhmfl2w8sl045ngzlkk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-text"; sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy"; - name = "haskell-emacs-text"; + name = "recipe"; }; packageRequires = [ haskell-emacs ]; meta = { @@ -17170,9 +22299,14 @@ license = lib.licenses.free; }; }) {}; - haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + haskell-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "haskell-mode"; + ename = "haskell-mode"; version = "16.1"; src = fetchFromGitHub { owner = "haskell"; @@ -17180,10 +22314,10 @@ rev = "d2ea5239bf02f3917a78a5c2dcbc5b6f6dd1b359"; sha256 = "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp"; - name = "haskell-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -17191,9 +22325,14 @@ license = lib.licenses.free; }; }) {}; - haskell-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + haskell-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "haskell-snippets"; + ename = "haskell-snippets"; version = "0.1.0"; src = fetchFromGitHub { owner = "haskell"; @@ -17201,10 +22340,10 @@ rev = "bcf12cf33a67ddc2f023a55072859e637fe4fa25"; sha256 = "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5534e58ea66fd90ba4a69262f0b303c7fb85af4/recipes/haskell-snippets"; sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2"; - name = "haskell-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -17212,19 +22351,23 @@ license = lib.licenses.free; }; }) {}; - haskell-tab-indent = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + haskell-tab-indent = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "haskell-tab-indent"; + ename = "haskell-tab-indent"; version = "0.1.0"; src = fetchgit { url = "https://git.spwhitton.name/haskell-tab-indent"; rev = "38d50e9bb8f64ba13ffbd9bcff32db820403a0fc"; sha256 = "00bjmww8pc9jr4ssqcv7k0migbxl1c8qs2l1khf25fxvgd1nyy02"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/371f9f45e441cdf4e95557d1e9692619fab3024a/recipes/haskell-tab-indent"; sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7"; - name = "haskell-tab-indent"; + name = "recipe"; }; packageRequires = []; meta = { @@ -17232,20 +22375,26 @@ license = lib.licenses.free; }; }) {}; - hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hasky-extensions = callPackage ({ avy-menu + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hasky-extensions"; + ename = "hasky-extensions"; version = "0.2.0"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "65bf7bc3967cbda23789d6c505daf73eed9a43aa"; - sha256 = "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7"; + rev = "51cff958785c1d26f76decd2e2b95bd15ab48096"; + sha256 = "0bqcg18apfj8ibzklw7yip35s1wkjfb8z3qyxn43vyylkynvrj37"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; sha256 = "0ymigba1d0qkrk3ccd3cx754safzmx1v5d13976571rszgmkvr15"; - name = "hasky-extensions"; + name = "recipe"; }; packageRequires = [ avy-menu emacs ]; meta = { @@ -17253,9 +22402,16 @@ license = lib.licenses.free; }; }) {}; - hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: - melpaBuild { + hasky-stack = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , magit-popup + , melpaBuild }: + melpaBuild { pname = "hasky-stack"; + ename = "hasky-stack"; version = "0.8.0"; src = fetchFromGitHub { owner = "hasky-mode"; @@ -17263,10 +22419,10 @@ rev = "3e17ce07dd6b0207474e4ff14ad7b8c467382947"; sha256 = "0cdsdlgapf9xxj928hlb7ch9x8rznayrvj7n8j2vzfa0kfmg7qwf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; sha256 = "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8"; - name = "hasky-stack"; + name = "recipe"; }; packageRequires = [ emacs f magit-popup ]; meta = { @@ -17274,9 +22430,14 @@ license = lib.licenses.free; }; }) {}; - haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + haxor-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "haxor-mode"; + ename = "haxor-mode"; version = "0.7.0"; src = fetchFromGitHub { owner = "krzysztof-magosa"; @@ -17284,10 +22445,10 @@ rev = "6fa25a8e6b6a59481bc0354c2fe1e0ed53cbdc91"; sha256 = "0pdfvqbz4wmjl15wi3k4h7myij8v63vmyiq8g9fai18f7ad2klp1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haxor-mode"; sha256 = "0ss0kkwjyc7z7vcb89qr02p70c6m2jarr34mxmdv6ipwil58jj1s"; - name = "haxor-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -17295,9 +22456,14 @@ license = lib.licenses.free; }; }) {}; - hcl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hcl-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hcl-mode"; + ename = "hcl-mode"; version = "0.3"; src = fetchFromGitHub { owner = "syohex"; @@ -17305,10 +22471,10 @@ rev = "6a6daf37522188a2f2fcdebc60949fc3bdabbc06"; sha256 = "0jqrgq15jz6pvx38pnwkizzfiih0d3nxqphyrc92nqpcyimg8b6g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode"; sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin"; - name = "hcl-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -17316,20 +22482,54 @@ license = lib.licenses.free; }; }) {}; - helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: - melpaBuild { + heaven-and-hell = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "heaven-and-hell"; + ename = "heaven-and-hell"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "valignatev"; + repo = "heaven-and-hell"; + rev = "c2af013e0def7d3234e0eb2fb66a0a2374d5a7f2"; + sha256 = "08n7sr0l4di1c4zgfa17i3x43451sd60z70pjka8rmznys766lsg"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/685edd63bf65520be304cbd564db7f5974fc5ae1/recipes/heaven-and-hell"; + sha256 = "19r0p78r9c78ly8awkgc33xa5b75zkkrb5kwvxbagirxdgkjv74r"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/heaven-and-hell"; + license = lib.licenses.free; + }; + }) {}; + helm = callPackage ({ async + , emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "helm"; - version = "2.9.0"; + ename = "helm"; + version = "2.9.8"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69"; - sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy"; + rev = "8de42d08f45a7052ed858132de43a76f933f58f7"; + sha256 = "1g36knyppz8lfbcn84hx6ivf8b34s26wx5dh4xw85sq6pwi5yn7s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; sha256 = "03la01d0syikjgsjq0krlp3p894djwfxqfmd2srddwks7ish6xjf"; - name = "helm"; + name = "recipe"; }; packageRequires = [ async emacs helm-core popup ]; meta = { @@ -17337,9 +22537,15 @@ license = lib.licenses.free; }; }) {}; - helm-ack = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ack = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ack"; + ename = "helm-ack"; version = "0.13"; src = fetchFromGitHub { owner = "syohex"; @@ -17347,10 +22553,10 @@ rev = "5982f3cb6ec9f460ebbe06ec0ce7b3590bca3118"; sha256 = "0ps86zpyywibjwcm9drmamla979ad61fyqr8d6bv71fr56k9ak21"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/258d447778525c26c65a5819ba1edc00e2bb65e5/recipes/helm-ack"; sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni"; - name = "helm-ack"; + name = "recipe"; }; packageRequires = [ cl-lib helm ]; meta = { @@ -17358,9 +22564,15 @@ license = lib.licenses.free; }; }) {}; - helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ag = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ag"; + ename = "helm-ag"; version = "0.58"; src = fetchFromGitHub { owner = "syohex"; @@ -17368,10 +22580,10 @@ rev = "39ed137823665fca2fa5b215f7c3e8701173f7b7"; sha256 = "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; sha256 = "050qh5xqh8lwkgmz3jxm8gql5nd7bq8sp9q6mzm2z7367qy4qqyf"; - name = "helm-ag"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -17379,9 +22591,14 @@ license = lib.licenses.free; }; }) {}; - helm-aws = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-aws = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-aws"; + ename = "helm-aws"; version = "1.0.0"; src = fetchFromGitHub { owner = "istib"; @@ -17389,10 +22606,10 @@ rev = "172a4a3427d31c999e27e9ee06aa8e3822364a8c"; sha256 = "015p5sszd54x81qm96gx6xwjkvbi4f3j9i2nhcvlkk75s95w1ijv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/421182006b8af17dae8b5ad453cc11e2d990a053/recipes/helm-aws"; sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5"; - name = "helm-aws"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -17400,9 +22617,16 @@ license = lib.licenses.free; }; }) {}; - helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + helm-backup = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-backup"; + ename = "helm-backup"; version = "1.0.0"; src = fetchFromGitHub { owner = "antham"; @@ -17410,10 +22634,10 @@ rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb"; sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3"; - name = "helm-backup"; + name = "recipe"; }; packageRequires = [ cl-lib helm s ]; meta = { @@ -17421,9 +22645,15 @@ license = lib.licenses.free; }; }) {}; - helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-bbdb = callPackage ({ bbdb + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-bbdb"; + ename = "helm-bbdb"; version = "1.1"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -17431,10 +22661,10 @@ rev = "20513422102fea4c08a0433d728a7783bb4968c8"; sha256 = "0ns537fimv774n1bq0r8k4qwdpapbw96linqyhx9mxp23zkhlg80"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb"; sha256 = "1wlacbfs23shvyaq616r1p84h8321zz1k5nzir5qg8nr6lssi8vp"; - name = "helm-bbdb"; + name = "recipe"; }; packageRequires = [ bbdb helm ]; meta = { @@ -17442,9 +22672,20 @@ license = lib.licenses.free; }; }) {}; - helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: - melpaBuild { + helm-bibtex = callPackage ({ biblio + , cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , parsebib + , s }: + melpaBuild { pname = "helm-bibtex"; + ename = "helm-bibtex"; version = "2.0.0"; src = fetchFromGitHub { owner = "tmalsburg"; @@ -17452,10 +22693,10 @@ rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca"; sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; sha256 = "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z"; - name = "helm-bibtex"; + name = "recipe"; }; packageRequires = [ biblio cl-lib dash f helm parsebib s ]; meta = { @@ -17463,9 +22704,17 @@ license = lib.licenses.free; }; }) {}; - helm-bm = callPackage ({ bm, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + helm-bm = callPackage ({ bm + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-bm"; + ename = "helm-bm"; version = "0.3"; src = fetchFromGitHub { owner = "yasuyk"; @@ -17473,10 +22722,10 @@ rev = "d66341f5646c23178d4d8bffb6cfebe3fb73f1d7"; sha256 = "011k37p4vnzm1x8vyairllanvjfknskl20bdfv0glf64xgbdpfil"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/115033d7b02d3ca42902195de933f62c5f927ae4/recipes/helm-bm"; sha256 = "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh"; - name = "helm-bm"; + name = "recipe"; }; packageRequires = [ bm cl-lib helm s ]; meta = { @@ -17484,9 +22733,14 @@ license = lib.licenses.free; }; }) {}; - helm-books = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-books = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-books"; + ename = "helm-books"; version = "1.0.1"; src = fetchFromGitHub { owner = "grugrut"; @@ -17494,10 +22748,10 @@ rev = "b4c57d2aed596faad41a753dccbcd0a31a717b76"; sha256 = "1yr5prp9xvd73balxbn4yn52zah2advq1186ba5aanj436pal0fh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acba3db40f37e74e1bf9e30f2abed431c259ff50/recipes/helm-books"; sha256 = "0xh53vji7nsnpi0b38cjh97x26ryxk61mj7bd6m63qwh8dyhs3yx"; - name = "helm-books"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -17505,9 +22759,14 @@ license = lib.licenses.free; }; }) {}; - helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-bundle-show = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-bundle-show"; + ename = "helm-bundle-show"; version = "1.1.5"; src = fetchFromGitHub { owner = "masutaka"; @@ -17515,10 +22774,10 @@ rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a"; sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f10f7387cca102696c38af1d8dc0fe5da5e366f/recipes/helm-bundle-show"; sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7"; - name = "helm-bundle-show"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -17526,9 +22785,16 @@ license = lib.licenses.free; }; }) {}; - helm-c-yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, yasnippet }: - melpaBuild { + helm-c-yasnippet = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "helm-c-yasnippet"; + ename = "helm-c-yasnippet"; version = "0.6.7"; src = fetchFromGitHub { owner = "emacs-jp"; @@ -17536,10 +22802,10 @@ rev = "1fa400233ba8e990066c47cca1e2af64bd192d4d"; sha256 = "108584bmadgidqkdfvf333zkyb5v9f84pasz5h01fkh57ks8by9f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2fc20598a2cd22efb212ba43159c6728f0249e5e/recipes/helm-c-yasnippet"; sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90"; - name = "helm-c-yasnippet"; + name = "recipe"; }; packageRequires = [ cl-lib helm-core yasnippet ]; meta = { @@ -17547,9 +22813,16 @@ license = lib.licenses.free; }; }) {}; - helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + helm-cider = callPackage ({ cider + , emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-cider"; + ename = "helm-cider"; version = "0.4.0"; src = fetchFromGitHub { owner = "clojure-emacs"; @@ -17557,10 +22830,10 @@ rev = "9a948b834dd31b3f60d4701d6dd0ecfab0adbb72"; sha256 = "0wssd9jv6xighjhfh3p8if1anz3rcrjr71a4j063v6gyknb7fv27"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x"; - name = "helm-cider"; + name = "recipe"; }; packageRequires = [ cider emacs helm-core ]; meta = { @@ -17568,9 +22841,17 @@ license = lib.licenses.free; }; }) {}; - helm-circe = callPackage ({ circe, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-circe = callPackage ({ circe + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-circe"; + ename = "helm-circe"; version = "0.4"; src = fetchFromGitHub { owner = "lesharris"; @@ -17578,10 +22859,10 @@ rev = "9091651d9fdd8d49d8ff6f9dcf3a2ae416c9f15a"; sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-circe"; sha256 = "07559rg55b0glxiw787xmvxrhms14jz21bvprc5n24b4j827g9xw"; - name = "helm-circe"; + name = "recipe"; }; packageRequires = [ circe cl-lib emacs helm ]; meta = { @@ -17589,9 +22870,17 @@ license = lib.licenses.free; }; }) {}; - helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + helm-codesearch = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-codesearch"; + ename = "helm-codesearch"; version = "0.4.0"; src = fetchFromGitHub { owner = "youngker"; @@ -17599,10 +22888,10 @@ rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116"; sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q"; - name = "helm-codesearch"; + name = "recipe"; }; packageRequires = [ cl-lib dash helm s ]; meta = { @@ -17610,20 +22899,28 @@ license = lib.licenses.free; }; }) {}; - helm-commandlinefu = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, json ? null, let-alist, lib, melpaBuild }: - melpaBuild { + helm-commandlinefu = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , json ? null + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "helm-commandlinefu"; + ename = "helm-commandlinefu"; version = "0.3"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-commandlinefu"; - rev = "e11cd3e961c1c4c973b51d8d12592e7235a4971b"; - sha256 = "1l61csd1gqz7kg5zjx60cfy824g42p682z7pk0rqzlrz8498wvkh"; + rev = "83839c0250ff3a35d3052eab3111450e0caa5fe1"; + sha256 = "0fxxwxxpqvhzc3wgskaarxagf4si83kk5k5j67kzklgrlklhf1xn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7eaf1e41ef2fa90b6bb6a80891ef1bf52ef1029b/recipes/helm-commandlinefu"; sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd"; - name = "helm-commandlinefu"; + name = "recipe"; }; packageRequires = [ emacs helm json let-alist ]; meta = { @@ -17631,9 +22928,15 @@ license = lib.licenses.free; }; }) {}; - helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-company = callPackage ({ company + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-company"; + ename = "helm-company"; version = "0.2.2"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; @@ -17641,10 +22944,10 @@ rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d"; sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; sha256 = "1wl1mzm1h9ig351y77yascdv4z0cka1gayi8cnnlayk763is7q34"; - name = "helm-company"; + name = "recipe"; }; packageRequires = [ company helm ]; meta = { @@ -17652,20 +22955,26 @@ license = lib.licenses.free; }; }) {}; - helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + helm-core = callPackage ({ async + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "helm-core"; - version = "2.9.0"; + ename = "helm-core"; + version = "2.9.8"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69"; - sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy"; + rev = "8de42d08f45a7052ed858132de43a76f933f58f7"; + sha256 = "1g36knyppz8lfbcn84hx6ivf8b34s26wx5dh4xw85sq6pwi5yn7s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda"; - name = "helm-core"; + name = "recipe"; }; packageRequires = [ async emacs ]; meta = { @@ -17673,9 +22982,17 @@ license = lib.licenses.free; }; }) {}; - helm-cscope = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xcscope }: - melpaBuild { + helm-cscope = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , xcscope }: + melpaBuild { pname = "helm-cscope"; + ename = "helm-cscope"; version = "0.1.1"; src = fetchFromGitHub { owner = "alpha22jp"; @@ -17683,10 +23000,10 @@ rev = "b82db54071bd2d1c77db2e648f8b4e61b1abe288"; sha256 = "0xnqkc4z22m41v5lgf87dd8xc4gmf932zbnbdhf9xic1gal1779c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2e3460df1ec750053bc8402ad6eb822c10c697/recipes/helm-cscope"; sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4"; - name = "helm-cscope"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm xcscope ]; meta = { @@ -17694,9 +23011,15 @@ license = lib.licenses.free; }; }) {}; - helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-dash = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-dash"; + ename = "helm-dash"; version = "1.3.0"; src = fetchFromGitHub { owner = "areina"; @@ -17704,10 +23027,10 @@ rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe"; sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; sha256 = "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb"; - name = "helm-dash"; + name = "recipe"; }; packageRequires = [ cl-lib helm ]; meta = { @@ -17715,9 +23038,14 @@ license = lib.licenses.free; }; }) {}; - helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-descbinds = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-descbinds"; + ename = "helm-descbinds"; version = "1.13"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -17725,10 +23053,10 @@ rev = "6d5ddc11e6cef86548bd6b3e0d840112d602659c"; sha256 = "03b79wdcp4im0fwadzhyc8jxl2wqvg8gmpflnznrwz3l71bi4sqq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds"; sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7"; - name = "helm-descbinds"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -17736,20 +23064,26 @@ license = lib.licenses.free; }; }) {}; - helm-directory = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-directory = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-directory"; + ename = "helm-directory"; version = "0.6.4"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-directory"; - rev = "2c6d45404506ba744888dcdb65e9f63878f2da16"; - sha256 = "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h"; + rev = "caa013b820b5263bf1c6446debfea0766dae8ab8"; + sha256 = "15ljhz7cik7qzbh69l28c9mcvls5zgk42lp5bm9kl9fg6m6aasvq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory"; sha256 = "01c5a08v6rd867kdyrfwdvj05z4srzj9g6xy4scirlbwbff0q76n"; - name = "helm-directory"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -17757,9 +23091,15 @@ license = lib.licenses.free; }; }) {}; - helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-dired-history = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-dired-history"; + ename = "helm-dired-history"; version = "1.3"; src = fetchFromGitHub { owner = "jixiuf"; @@ -17767,10 +23107,10 @@ rev = "281523f9fc46cf00fafd670ba5cd16552a607212"; sha256 = "1bqavj5ljr350dckyf39i9plkb0rbhyd17ka94n2g6daapgpq0x6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dired-history"; sha256 = "0qciafa42rbw0dxgkp5mbbwbrcziswmwdj2lszm0px1bip4x7yb8"; - name = "helm-dired-history"; + name = "recipe"; }; packageRequires = [ cl-lib helm ]; meta = { @@ -17778,9 +23118,17 @@ license = lib.licenses.free; }; }) {}; - helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-emms = callPackage ({ cl-lib ? null + , emacs + , emms + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-emms"; + ename = "helm-emms"; version = "1.3"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -17788,10 +23136,10 @@ rev = "d7da090af0f63b92c5d735197992c732adbeef3d"; sha256 = "0fs0i33di3liyx1f55xpg5nmac1b750n37g3pkxw2mil7fx7dz32"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms"; sha256 = "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5"; - name = "helm-emms"; + name = "recipe"; }; packageRequires = [ cl-lib emacs emms helm ]; meta = { @@ -17799,20 +23147,25 @@ license = lib.licenses.free; }; }) {}; - helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-etags-plus = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-etags-plus"; + ename = "helm-etags-plus"; version = "1.1"; src = fetchFromGitHub { owner = "jixiuf"; repo = "helm-etags-plus"; - rev = "99512856918e485862ceb21460476adb0349f525"; - sha256 = "08ddxp1hm0ckx6gq9yl6dhh0jrfb6f747snchykl3z5p0ayknvlm"; + rev = "647e267af51caff9f49d8aa00657b7e08cc3bce4"; + sha256 = "1j8z7bgm5kjp1hrjrmnr3k0frajvwcmpv1mjvw0pxhqf3gyvzf3n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/helm-etags-plus"; sha256 = "0lw21yp1q6iggzlb1dks3p6qdfppnqf50f3rijjs18lisp4izp99"; - name = "helm-etags-plus"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -17820,9 +23173,15 @@ license = lib.licenses.free; }; }) {}; - helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ext = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ext"; + ename = "helm-ext"; version = "0.1.2"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -17830,10 +23189,10 @@ rev = "c8ac56918b200239b3f73a4e6a031deecc2c5646"; sha256 = "08c6n4zr6s3h7y0kk6g51xqs6hs29hkfmn55jfjw6hpimbk3vi1j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext"; sha256 = "0la2i0b7nialib4wq26cxcak8nq1jzavsw8f0mvbavsb7hfwkpgw"; - name = "helm-ext"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -17841,20 +23200,27 @@ license = lib.licenses.free; }; }) {}; - helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-firefox = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-firefox"; + ename = "helm-firefox"; version = "1.3"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-firefox"; - rev = "0ad34b7b5abc485a86cae6920c14de861cbeb085"; - sha256 = "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs"; + rev = "294850c4ce16ae25f2214f863cee0118add60974"; + sha256 = "1kaa58xlnr82qsvdzn8sxk5kkd2lxqnvfciyw7kfi2fdrl6nr4pf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox"; sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs"; - name = "helm-firefox"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -17862,9 +23228,16 @@ license = lib.licenses.free; }; }) {}; - helm-flycheck = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, helm-core, lib, melpaBuild }: - melpaBuild { + helm-flycheck = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , flycheck + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-flycheck"; + ename = "helm-flycheck"; version = "0.4"; src = fetchFromGitHub { owner = "yasuyk"; @@ -17872,10 +23245,10 @@ rev = "a15e62a6432c165c4f2c17388686873383400d7d"; sha256 = "0q9yksx66ry4x3vkcyyj437il225s2ad5h6vkxpyz04p62g3ysnx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cce1662d4ca7b7d868685084294d22ebf6c39e9/recipes/helm-flycheck"; sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b"; - name = "helm-flycheck"; + name = "recipe"; }; packageRequires = [ dash flycheck helm-core ]; meta = { @@ -17883,20 +23256,28 @@ license = lib.licenses.free; }; }) {}; - helm-ghc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ghc, helm, lib, melpaBuild }: - melpaBuild { + helm-ghc = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , ghc + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ghc"; + ename = "helm-ghc"; version = "0.1.0"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "helm-ghc"; - rev = "d3603ee18299b789be255297dc42af16dd431869"; - sha256 = "00ls9v3jdpz3wka90crd193z3ipwnf1b0slmldn4vb9ivrndh6wn"; + rev = "3947bfd6b5a05074e776f0b51f414f1a5a724888"; + sha256 = "0j8mbn33rv4jky9zh1hgw8da8wgs2760057mx8rv5x6i1qcm3bqd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-ghc"; sha256 = "0bv0sfpya1jyay9p80lv0w6h9kdp96r8lnp6nj15w660p1b51c0d"; - name = "helm-ghc"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ghc helm ]; meta = { @@ -17904,9 +23285,14 @@ license = lib.licenses.free; }; }) {}; - helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ghq = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ghq"; + ename = "helm-ghq"; version = "1.7.0"; src = fetchFromGitHub { owner = "masutaka"; @@ -17914,10 +23300,10 @@ rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56"; sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq"; sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6"; - name = "helm-ghq"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -17925,9 +23311,14 @@ license = lib.licenses.free; }; }) {}; - helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + helm-git-grep = callPackage ({ fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-git-grep"; + ename = "helm-git-grep"; version = "0.10.1"; src = fetchFromGitHub { owner = "yasuyk"; @@ -17935,10 +23326,10 @@ rev = "744cea07dba6e6a5effbdba83f1b786c78fd86d3"; sha256 = "172m7wbgx9qnv9n1slbzpd9j24p6blddik49z6bq3zdg1vlnf3dv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi"; - name = "helm-git-grep"; + name = "recipe"; }; packageRequires = [ helm-core ]; meta = { @@ -17946,20 +23337,26 @@ license = lib.licenses.free; }; }) {}; - helm-github-stars = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-github-stars = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-github-stars"; - version = "1.3.2"; + ename = "helm-github-stars"; + version = "1.3.5"; src = fetchFromGitHub { owner = "Sliim"; repo = "helm-github-stars"; - rev = "9211be3fbb65ca8819e0d1a54524ed8abbfaa4fa"; - sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn"; + rev = "809cf88e2984b121348b1046e1d3890f1fd580b4"; + sha256 = "09ywdsymh479syq9ps15bgyqf5gr94z8wn4jvlcxqz5aq5fil9vq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e77f4a75504ca3e1091cdc757e91fb1ae361fa7/recipes/helm-github-stars"; sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy"; - name = "helm-github-stars"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -17967,20 +23364,28 @@ license = lib.licenses.free; }; }) {}; - helm-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, helm, lib, melpaBuild, s }: - melpaBuild { + helm-gitlab = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , gitlab + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-gitlab"; + ename = "helm-gitlab"; version = "0.8.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4"; - sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa"; + rev = "cffba49c1260421b8e388c65365b229970098e5c"; + sha256 = "1wh6z7ni8nwqigvgz77zgqszx60s1k1chpzgzs1k3kfby7apxww1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab"; sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd"; - name = "helm-gitlab"; + name = "recipe"; }; packageRequires = [ dash gitlab helm s ]; meta = { @@ -17988,9 +23393,17 @@ license = lib.licenses.free; }; }) {}; - helm-go-package = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, go-mode, helm-core, lib, melpaBuild }: - melpaBuild { + helm-go-package = callPackage ({ deferred + , emacs + , fetchFromGitHub + , fetchurl + , go-mode + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-go-package"; + ename = "helm-go-package"; version = "0.3.0"; src = fetchFromGitHub { owner = "yasuyk"; @@ -17998,10 +23411,10 @@ rev = "7db5ea9ce97502152a6bb1fe38f8fabb5a49abd2"; sha256 = "08llqkswilzsigh28w9qjbqi5g5z0ylfabz5sqia7c18gjshvz0h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/449d272b94c189176305ca17652d76adac087ce5/recipes/helm-go-package"; sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6"; - name = "helm-go-package"; + name = "recipe"; }; packageRequires = [ deferred emacs go-mode helm-core ]; meta = { @@ -18009,9 +23422,15 @@ license = lib.licenses.free; }; }) {}; - helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-gtags = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-gtags"; + ename = "helm-gtags"; version = "1.5.6"; src = fetchFromGitHub { owner = "syohex"; @@ -18019,10 +23438,10 @@ rev = "dbe0d2d9d08058d469ad2d729bd782515b5b3b62"; sha256 = "0zyspn9rqfs3hkq8qx0q1w5qiv30ignbmycyv0vn3a6q7a5fsnhx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags"; sha256 = "1kbpfqhhbxmp3f70h91x2fws9mhx87zx4nzjjl29lpl93vf8xckl"; - name = "helm-gtags"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -18030,9 +23449,14 @@ license = lib.licenses.free; }; }) {}; - helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-hatena-bookmark = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-hatena-bookmark"; + ename = "helm-hatena-bookmark"; version = "2.2.3"; src = fetchFromGitHub { owner = "masutaka"; @@ -18040,10 +23464,10 @@ rev = "d64833a5bbb4ae112ed176f6473232e526138572"; sha256 = "01b6nlbidk93arnnd2irm088qlws4i4p1sagsh9v153x6sk0r38k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark"; sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id"; - name = "helm-hatena-bookmark"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -18051,9 +23475,16 @@ license = lib.licenses.free; }; }) {}; - helm-hayoo = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, helm, json ? null, lib, melpaBuild }: - melpaBuild { + helm-hayoo = callPackage ({ fetchFromGitHub + , fetchurl + , haskell-mode + , helm + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "helm-hayoo"; + ename = "helm-hayoo"; version = "0.0.5"; src = fetchFromGitHub { owner = "markus1189"; @@ -18061,10 +23492,10 @@ rev = "f49a77e8b8704bb7eb0d1097eefb8010a6617664"; sha256 = "1imfzz6cfdq7fgrcgrafy2nln929mgh31vybk9frm7a9jpamqdxp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-hayoo"; sha256 = "06nbilb6vfa8959ss5d06zbcwqxlbyi3cb5jnbdag0jnpxvv1hqb"; - name = "helm-hayoo"; + name = "recipe"; }; packageRequires = [ haskell-mode helm json ]; meta = { @@ -18072,20 +23503,25 @@ license = lib.licenses.free; }; }) {}; - helm-ispell = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + helm-ispell = callPackage ({ fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ispell"; + ename = "helm-ispell"; version = "0.1"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ispell"; - rev = "640723ace794d21b8a5892012db99f963149415b"; - sha256 = "0bz2ngw816jvpw1a10j31y5hf1knz0mzz60l073h33qci11jbwid"; + rev = "9dd7e24cacf755879e569891700520554972b5c8"; + sha256 = "1qh84a9qxdr13w9qbn4l1rqs0rq7pmn4is3kmwg7ya85yh3wmzyb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edc42b26027dcd7daf0d6f2bd19ca4736fc12d6d/recipes/helm-ispell"; sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0"; - name = "helm-ispell"; + name = "recipe"; }; packageRequires = [ helm-core ]; meta = { @@ -18093,8 +23529,11 @@ license = lib.licenses.free; }; }) {}; - helm-lobsters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + helm-lobsters = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "helm-lobsters"; version = "0.1.0"; src = fetchFromGitHub { @@ -18103,7 +23542,7 @@ rev = "d798bebb1a65e255c8ec791753a0c78e6b19243b"; sha256 = "1nd562lffc41r3y5x7y46f37ra97avllk2m95w23f9g42h47f1ar"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6247e3786131e5b2a7824804e49927ed65d266d5/recipes/helm-lobsters"; sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp"; name = "helm-lobsters"; @@ -18114,9 +23553,14 @@ license = lib.licenses.free; }; }) {}; - helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ls-git = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ls-git"; + ename = "helm-ls-git"; version = "1.9.1"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -18124,10 +23568,10 @@ rev = "7b7b6dc2554603ad98412927f84a803625069ab3"; sha256 = "1s748a5abj58hd7cwzfggfnnmyzhj04gpbqqwqmskn8xlsq5qcdi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj"; - name = "helm-ls-git"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -18135,9 +23579,14 @@ license = lib.licenses.free; }; }) {}; - helm-ls-hg = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-ls-hg = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-ls-hg"; + ename = "helm-ls-hg"; version = "1.8.0"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -18145,10 +23594,10 @@ rev = "61b91a22fcfb62d0fc56e361ec01ce96973c7165"; sha256 = "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a22c9ec281330c4603aec6feb04cf580dee340/recipes/helm-ls-hg"; sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh"; - name = "helm-ls-hg"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -18156,20 +23605,26 @@ license = lib.licenses.free; }; }) {}; - helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: - melpaBuild { + helm-make = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "helm-make"; + ename = "helm-make"; version = "0.1.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "6558a79d20d04465419b312da198190be6832647"; - sha256 = "17ls0bplnja2qvg3129x2irgsgs7l4bjj0qi7b9z16i6knjkwfya"; + rev = "4bedccdaa65fcd4ea5b643738ea55bf865532c1a"; + sha256 = "0c9hgazfaf56iv7ghww9ni6db3bv6897785n0mz3b3khf2mj2388"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc"; - name = "helm-make"; + name = "recipe"; }; packageRequires = [ helm projectile ]; meta = { @@ -18177,9 +23632,16 @@ license = lib.licenses.free; }; }) {}; - helm-migemo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, migemo }: - melpaBuild { + helm-migemo = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild + , migemo }: + melpaBuild { pname = "helm-migemo"; + ename = "helm-migemo"; version = "1.22"; src = fetchFromGitHub { owner = "emacs-jp"; @@ -18187,10 +23649,10 @@ rev = "2d964309a5415cf47f5154271e6fe7b6a7fffec7"; sha256 = "03588hanfa20pjp9w1bqy8wsf5x6az0vfq0bmcnr4xvlf6fhkyxs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce6eb840368f8cbee66dc061478d5096b9dacb68/recipes/helm-migemo"; sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x"; - name = "helm-migemo"; + name = "recipe"; }; packageRequires = [ cl-lib helm-core migemo ]; meta = { @@ -18198,20 +23660,25 @@ license = lib.licenses.free; }; }) {}; - helm-mode-manager = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-mode-manager = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-mode-manager"; + ename = "helm-mode-manager"; version = "1.0.0"; src = fetchFromGitHub { owner = "istib"; repo = "helm-mode-manager"; - rev = "1fc1d65a27bc57d3a5bbd359f3eb77a6353fa4a5"; - sha256 = "1srx5f0s9x7zan7ayqd6scxfhcvr3nkd4yzs96hphd87rb18apzk"; + rev = "12d762eadaf67df9e5e0f607e7a8cf1f6eea778b"; + sha256 = "17zvv089845j0v5d4hc3d2hq8mkxq2cafx29qgvbvgpfifxx1z3h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-mode-manager"; sha256 = "04yhqbb9cliv1922b0abpc1wrladvhyfmwn8ifqfkzaks4067rhl"; - name = "helm-mode-manager"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -18219,9 +23686,17 @@ license = lib.licenses.free; }; }) {}; - helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }: - melpaBuild { + helm-mt = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , multi-term }: + melpaBuild { pname = "helm-mt"; + ename = "helm-mt"; version = "0.9"; src = fetchFromGitHub { owner = "dfdeshom"; @@ -18229,10 +23704,10 @@ rev = "d2bff4100118483bc398c56d0ff095294209265b"; sha256 = "1wci63y0vjvrvrylkhhrz8p9q0ml6la5cpj4rx5cwin9rkmislm6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e726bf0b9b3f371b21f1f0d75175e0dda62f6fb0/recipes/helm-mt"; sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a"; - name = "helm-mt"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm multi-term ]; meta = { @@ -18240,20 +23715,26 @@ license = lib.licenses.free; }; }) {}; - helm-nixos-options = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, nixos-options }: - melpaBuild { + helm-nixos-options = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , nixos-options }: + melpaBuild { pname = "helm-nixos-options"; + ename = "helm-nixos-options"; version = "0.0.1"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "5fc8fa29bea9dd8e9c822af92f9bc6ddc223635f"; - sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld"; + rev = "5ee8a6b22c464028d19d5cebc8f69087bb667c01"; + sha256 = "1cn8drnkna9vr56fb6w0gmz5kyy9r8a71ph48fsblgqr9fjqw31j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options"; sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933"; - name = "helm-nixos-options"; + name = "recipe"; }; packageRequires = [ helm nixos-options ]; meta = { @@ -18261,9 +23742,15 @@ license = lib.licenses.free; }; }) {}; - helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }: - melpaBuild { + helm-notmuch = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , notmuch }: + melpaBuild { pname = "helm-notmuch"; + ename = "helm-notmuch"; version = "1.1"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -18271,10 +23758,10 @@ rev = "782c221bf293eee55990de5b54171f08d881dcee"; sha256 = "04mlsjqhh2nw2javxz8m1hbnsq0s70dw5pnwdbx8s9dk1p8ikxvw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch"; sha256 = "1ixdc1ba4ygxl0lpg6ijk06dgj2hfv5p5k6ivq60ss0axyisnnv0"; - name = "helm-notmuch"; + name = "recipe"; }; packageRequires = [ helm notmuch ]; meta = { @@ -18282,9 +23769,16 @@ license = lib.licenses.free; }; }) {}; - helm-open-github = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }: - melpaBuild { + helm-open-github = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , gh + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-open-github"; + ename = "helm-open-github"; version = "0.15"; src = fetchFromGitHub { owner = "syohex"; @@ -18292,10 +23786,10 @@ rev = "553f3ab0fe0a028015e9b6cb7c35fb139ec222fc"; sha256 = "1xj5b44nkdvbxhk1bnllqm2qq393w22ccy708prrhiq8fmk53aa8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-open-github"; sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx"; - name = "helm-open-github"; + name = "recipe"; }; packageRequires = [ emacs gh helm-core ]; meta = { @@ -18303,20 +23797,29 @@ license = lib.licenses.free; }; }) {}; - helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + helm-org-rifle = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "helm-org-rifle"; - version = "1.5.0"; + ename = "helm-org-rifle"; + version = "1.6.0"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "68f01726795ca3054cfc6327dcdb22c9c83dfdfa"; - sha256 = "0vak9phqgxz5dk1zj3i4cs94y797h77qadirsf33gl073cg95l8a"; + rev = "349a3d717d4201404d88c1ee71eb2cd8dc17aeb2"; + sha256 = "1i35cy8yk9r6k2fq07cnbqf7wlfmdqhwihffqkzdp2wm5m762mnv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; sha256 = "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3"; - name = "helm-org-rifle"; + name = "recipe"; }; packageRequires = [ dash emacs f helm s ]; meta = { @@ -18324,9 +23827,14 @@ license = lib.licenses.free; }; }) {}; - helm-orgcard = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + helm-orgcard = callPackage ({ fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-orgcard"; + ename = "helm-orgcard"; version = "0.2"; src = fetchFromGitHub { owner = "emacs-jp"; @@ -18334,10 +23842,10 @@ rev = "9655ac340d1ccc5f3d1c0f7c49be8dd3556d4d0d"; sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce6eb840368f8cbee66dc061478d5096b9dacb68/recipes/helm-orgcard"; sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p"; - name = "helm-orgcard"; + name = "recipe"; }; packageRequires = [ helm-core ]; meta = { @@ -18345,9 +23853,16 @@ license = lib.licenses.free; }; }) {}; - helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-pages = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-pages"; + ename = "helm-pages"; version = "0.1.1"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -18355,10 +23870,10 @@ rev = "e334ca3312e51d6fdfa989df5d3ebe683d673c0e"; sha256 = "1r2ndmrw5ivawb940j8jnmqzxv46qrzd3cqh9fvxx5yicf020fjf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a33cb19b6e71240896bbe5da07ab25f2ee11f0b/recipes/helm-pages"; sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj"; - name = "helm-pages"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -18366,9 +23881,16 @@ license = lib.licenses.free; }; }) {}; - helm-perldoc = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-perldoc = callPackage ({ cl-lib ? null + , deferred + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-perldoc"; + ename = "helm-perldoc"; version = "0.7"; src = fetchFromGitHub { owner = "syohex"; @@ -18376,10 +23898,10 @@ rev = "18645f2065a07acce2c6b50a2f9d7a2554e532a3"; sha256 = "01cj2897hqz02mfz32nxlyyp59iwm0gz1zj11s8ll7pwy9q3r90g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-perldoc"; sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb"; - name = "helm-perldoc"; + name = "recipe"; }; packageRequires = [ cl-lib deferred helm ]; meta = { @@ -18387,9 +23909,15 @@ license = lib.licenses.free; }; }) {}; - helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, perspeen }: - melpaBuild { + helm-perspeen = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , perspeen }: + melpaBuild { pname = "helm-perspeen"; + ename = "helm-perspeen"; version = "0.1.2"; src = fetchFromGitHub { owner = "jimo1001"; @@ -18397,10 +23925,10 @@ rev = "aec145d5196aed1689563d138a2aa37b139e1759"; sha256 = "1wv13mvm9149nl9p93znl3d2yfnq4rph440ja07w804cd61qjhq9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen"; sha256 = "07cnsfhph807fqyai3by2c5ml9a40gxkq280f27disf8sc45rg1y"; - name = "helm-perspeen"; + name = "recipe"; }; packageRequires = [ helm perspeen ]; meta = { @@ -18408,9 +23936,14 @@ license = lib.licenses.free; }; }) {}; - helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-proc = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-proc"; + ename = "helm-proc"; version = "0.0.5"; src = fetchFromGitHub { owner = "markus1189"; @@ -18418,10 +23951,10 @@ rev = "0a75a86e4f381143134e0cdcd8c84c5b5b0fb2d6"; sha256 = "0bgpd50ningqyzwhfinfrn6gqacard5ynwllhg9clq0f683sbck2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-proc"; sha256 = "11mh8ny8mhdmp16s21vy9yyql56zxcgmj2aapqs5jy4yad5q62rz"; - name = "helm-proc"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -18429,20 +23962,26 @@ license = lib.licenses.free; }; }) {}; - helm-project-persist = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, project-persist }: - melpaBuild { + helm-project-persist = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , project-persist }: + melpaBuild { pname = "helm-project-persist"; + ename = "helm-project-persist"; version = "1.0.0"; src = fetchFromGitHub { owner = "Sliim"; repo = "helm-project-persist"; - rev = "df63a21b9118f9639f0f4a336127b4fb8ec6deec"; - sha256 = "1q7hfj8ldwivhjp9ns5pvsn0ds6pyvl2zhl366c22s6q8jmbr8ik"; + rev = "6ed96dafb7eb2e8cc5010f960262927f4a0f8cdf"; + sha256 = "0fcn4kx8dsda8z13fwdnv94hyb2fkv61qdx1263fmsnhllya9ygg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98780edaf8b1d97aec9e25d07d93289c90fd5069/recipes/helm-project-persist"; sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld"; - name = "helm-project-persist"; + name = "recipe"; }; packageRequires = [ helm project-persist ]; meta = { @@ -18450,9 +23989,17 @@ license = lib.licenses.free; }; }) {}; - helm-projectile = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: - melpaBuild { + helm-projectile = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "helm-projectile"; + ename = "helm-projectile"; version = "0.14.0"; src = fetchFromGitHub { owner = "bbatsov"; @@ -18460,10 +24007,10 @@ rev = "1a90f93732f1a1e8080098d65eadd6a1cd799e31"; sha256 = "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; sha256 = "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a"; - name = "helm-projectile"; + name = "recipe"; }; packageRequires = [ cl-lib dash helm projectile ]; meta = { @@ -18471,9 +24018,14 @@ license = lib.licenses.free; }; }) {}; - helm-pt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-pt = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-pt"; + ename = "helm-pt"; version = "0.2"; src = fetchFromGitHub { owner = "ralesi"; @@ -18481,10 +24033,10 @@ rev = "03e35e2bb5b683d79897d07acb57ee67009cc6cd"; sha256 = "0jm6nnnjyd4kmm1knh0mq3xhnw2hvs3linwlynj8yaliqvlv6brv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550eb9f42c90fd9e80714579c12ee6bfcacb5bb7/recipes/helm-pt"; sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi"; - name = "helm-pt"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -18492,9 +24044,16 @@ license = lib.licenses.free; }; }) {}; - helm-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, window-purpose }: - melpaBuild { + helm-purpose = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , window-purpose }: + melpaBuild { pname = "helm-purpose"; + ename = "helm-purpose"; version = "0.1"; src = fetchFromGitHub { owner = "bmag"; @@ -18502,10 +24061,10 @@ rev = "115a9d612aa07bb6f7f7b18f42b34918699660b9"; sha256 = "1jy9l4an2aqynj86pw2qxpzw446xm376n2ykiz17qlimqbxhwkgz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-purpose"; sha256 = "16c9if636v7l8z5df011vdj4a3ci5kf3rdfk4g9hdbbl639yca79"; - name = "helm-purpose"; + name = "recipe"; }; packageRequires = [ emacs helm window-purpose ]; meta = { @@ -18513,9 +24072,15 @@ license = lib.licenses.free; }; }) {}; - helm-pydoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: - melpaBuild { + helm-pydoc = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild }: + melpaBuild { pname = "helm-pydoc"; + ename = "helm-pydoc"; version = "0.7"; src = fetchFromGitHub { owner = "syohex"; @@ -18523,10 +24088,10 @@ rev = "30f1814b5b16db0413ffe74b0d0420b38e153df9"; sha256 = "1ik0vllakh73kc2zbgii4sm33n9pj388gaz69j4drz2mik307zvs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-pydoc"; sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7"; - name = "helm-pydoc"; + name = "recipe"; }; packageRequires = [ cl-lib helm-core ]; meta = { @@ -18534,9 +24099,14 @@ license = lib.licenses.free; }; }) {}; - helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-qiita = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-qiita"; + ename = "helm-qiita"; version = "1.0.2"; src = fetchFromGitHub { owner = "masutaka"; @@ -18544,10 +24114,10 @@ rev = "1eb97a44ba6fbfe61a0735b0c62171ee5217eda1"; sha256 = "1swkj65fhk48704ny3x6h95qqm2g21d94vzd8s8qqyjmnajj07i3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita"; sha256 = "1iz2w1901zz3zk9zazikmnkzng5klnvqn4ph1id7liksrcdpdmpm"; - name = "helm-qiita"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -18555,9 +24125,15 @@ license = lib.licenses.free; }; }) {}; - helm-rdefs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-rdefs = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-rdefs"; + ename = "helm-rdefs"; version = "1.0.1"; src = fetchFromGitHub { owner = "saidie"; @@ -18565,10 +24141,10 @@ rev = "cd3a6b3af3015ee58ef30cb7c81c79ebe5fc867b"; sha256 = "0ji7ak9pkmw0wxzmw5a1amvn3pkj90v9jv1yi12w388njxn7qsvj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1c7a20847513dc1153d54a3a700bc120f71dc6b/recipes/helm-rdefs"; sha256 = "0z3nrqrz63j9nxkbxdsjj3z8zhsqlik28iry3j1plgsxq1mhrn0y"; - name = "helm-rdefs"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -18576,9 +24152,14 @@ license = lib.licenses.free; }; }) {}; - helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-recoll = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-recoll"; + ename = "helm-recoll"; version = "0.5"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -18586,10 +24167,10 @@ rev = "cc4c4fa9c8f4f99383647baa8512b60523dc8b36"; sha256 = "1ic2k8ls084yn9h96pk8815wlvxkwwdq75zhm1ls197pkbw7gh7y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a0d168f96470753c22b92ad863be98d8c421ccd/recipes/helm-recoll"; sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b"; - name = "helm-recoll"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -18597,9 +24178,17 @@ license = lib.licenses.free; }; }) {}; - helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-rg = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-rg"; + ename = "helm-rg"; version = "0.1"; src = fetchFromGitHub { owner = "cosmicexplorer"; @@ -18607,10 +24196,10 @@ rev = "96dcbeb366caa0b158668384113458ee5f7c4dfd"; sha256 = "1k9yv9iw694alf5w7555ygk2i1b26i90rqq7ny63a4nd3y5cbs5f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg"; sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v"; - name = "helm-rg"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs helm ]; meta = { @@ -18618,9 +24207,14 @@ license = lib.licenses.free; }; }) {}; - helm-robe = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-robe = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-robe"; + ename = "helm-robe"; version = "0.2"; src = fetchFromGitHub { owner = "syohex"; @@ -18628,10 +24222,10 @@ rev = "7348d0bc0251b51979554ea678b970fd01c0efe9"; sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7018f57f6f0e4bd71e172ae23c050b44276581b/recipes/helm-robe"; sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw"; - name = "helm-robe"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -18639,20 +24233,26 @@ license = lib.licenses.free; }; }) {}; - helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }: - melpaBuild { + helm-rtags = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , rtags }: + melpaBuild { pname = "helm-rtags"; + ename = "helm-rtags"; version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; - sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; + rev = "ccba23e842a43e8079e22c2fc93d022ac40dedaf"; + sha256 = "091gh5mmgz357mz0jpmbzzrsy04bjczac02i94jxf49p6yw9v4ga"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; sha256 = "1vv6wnniplyls344qzgcf1ivv25c8qilax6sbhvsf46lvrwnr48n"; - name = "helm-rtags"; + name = "recipe"; }; packageRequires = [ helm rtags ]; meta = { @@ -18660,9 +24260,16 @@ license = lib.licenses.free; }; }) {}; - helm-rubygems-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-rubygems-org = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-rubygems-org"; + ename = "helm-rubygems-org"; version = "0.0.1"; src = fetchFromGitHub { owner = "neomantic"; @@ -18670,10 +24277,10 @@ rev = "6aaed984f698cbdf9f9aceb0221404563e28764d"; sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/655be547d57d358eff968f42c13dcf4371529a72/recipes/helm-rubygems-org"; sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs"; - name = "helm-rubygems-org"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -18681,9 +24288,16 @@ license = lib.licenses.free; }; }) {}; - helm-sage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, sage-shell-mode }: - melpaBuild { + helm-sage = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , sage-shell-mode }: + melpaBuild { pname = "helm-sage"; + ename = "helm-sage"; version = "0.0.4"; src = fetchFromGitHub { owner = "stakemori"; @@ -18691,10 +24305,10 @@ rev = "b42b4ba5fd1b17c4b54c30376a053281686beeb8"; sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09760a7f7b3cff6551c394fc7b2298567ca88eb0/recipes/helm-sage"; sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj"; - name = "helm-sage"; + name = "recipe"; }; packageRequires = [ cl-lib helm sage-shell-mode ]; meta = { @@ -18702,9 +24316,16 @@ license = lib.licenses.free; }; }) {}; - helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }: - melpaBuild { + helm-smex = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , smex }: + melpaBuild { pname = "helm-smex"; + ename = "helm-smex"; version = "0.3"; src = fetchFromGitHub { owner = "ptrv"; @@ -18712,10 +24333,10 @@ rev = "2269375dfa452b88b5170d1a5d5849ebb2c1e413"; sha256 = "0n2ki7g0hygsq4bi5zkhp3v772ld7niiajfznxmv11dgn949a52s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex"; sha256 = "02jvq2hyq4wwc9v8gaxr9vkjldc60khdbjf71p8w2iny5w3k0jbj"; - name = "helm-smex"; + name = "recipe"; }; packageRequires = [ emacs helm smex ]; meta = { @@ -18723,9 +24344,15 @@ license = lib.licenses.free; }; }) {}; - helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, spaces }: - melpaBuild { + helm-spaces = callPackage ({ fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild + , spaces }: + melpaBuild { pname = "helm-spaces"; + ename = "helm-spaces"; version = "0.4"; src = fetchFromGitHub { owner = "yasuyk"; @@ -18733,10 +24360,10 @@ rev = "877e2b5178926308d6a7c2a37477bb12c33a96d4"; sha256 = "1cz8aw6zprzfalagma7jmbycwll2chk2l4n5hkgqyhakdfm2ryzm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ffb50643223b68a62fab348cd5aba24ce92e6/recipes/helm-spaces"; sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791"; - name = "helm-spaces"; + name = "recipe"; }; packageRequires = [ helm-core spaces ]; meta = { @@ -18744,9 +24371,15 @@ license = lib.licenses.free; }; }) {}; - helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-swoop = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-swoop"; + ename = "helm-swoop"; version = "1.7.4"; src = fetchFromGitHub { owner = "ShingoFukuyama"; @@ -18754,10 +24387,10 @@ rev = "c66336b8245ddc51c4206f19c119f1081920985c"; sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop"; sha256 = "1b3nyh4h5kcvwam539va4gzxa3rl4a0rdcriif21yq340yifjbdx"; - name = "helm-swoop"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -18765,20 +24398,27 @@ license = lib.licenses.free; }; }) {}; - helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: - melpaBuild { + helm-system-packages = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "helm-system-packages"; - version = "1.8.0"; + ename = "helm-system-packages"; + version = "1.10.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "beb7e488454402a122b9dec9a019ea190b9b7dc3"; - sha256 = "0wclsv69v84d7bknnlralham94s7iqal7aczsvfxgj97hpwgywfz"; + rev = "a82a25a94a670b36e34c5ae192f41b4a104955e5"; + sha256 = "0y5wzvfycb1bvgdk782xyl744fih43vz14wmq6gcqjarw6xfniz5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; sha256 = "01mndx2zzh7r7gmpn6gd1vy1w3l6dnhvgn7n2p39viji1r8b39s4"; - name = "helm-system-packages"; + name = "recipe"; }; packageRequires = [ emacs helm seq ]; meta = { @@ -18786,9 +24426,14 @@ license = lib.licenses.free; }; }) {}; - helm-themes = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-themes = callPackage ({ fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-themes"; + ename = "helm-themes"; version = "0.5"; src = fetchFromGitHub { owner = "syohex"; @@ -18796,10 +24441,10 @@ rev = "8c979f4efc6174eed7df5f3b62db955246202818"; sha256 = "0rzbdrs5d5a0icpxrqik2iaz8i5bacw6nm2caf75s9w9j0j6s9li"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-themes"; sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j"; - name = "helm-themes"; + name = "recipe"; }; packageRequires = [ helm ]; meta = { @@ -18807,20 +24452,26 @@ license = lib.licenses.free; }; }) {}; - helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-tramp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-tramp"; - version = "0.9.5"; + ename = "helm-tramp"; + version = "1.0.5"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "34cc68bededd3ff6cbec8140f33c530fd3206a64"; - sha256 = "1lway52ssh6zn6jw8157fp8d4brrkdln03vgll2r53bd69i2ipmn"; + rev = "07d2f02166038c14052009f6fb9c2a163118e2cc"; + sha256 = "1yi4wq484nrjb1yphp6dbaqjgfq7hr78gh9v9cys7dqg910ngy4f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; sha256 = "0wqnabaywkhj1fnc3wpx7czrqbja1hsqwcpixmvv0fyrflmza517"; - name = "helm-tramp"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -18828,20 +24479,26 @@ license = lib.licenses.free; }; }) {}; - helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-unicode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-unicode"; + ename = "helm-unicode"; version = "0.0.3"; src = fetchFromGitHub { owner = "bomgar"; repo = "helm-unicode"; - rev = "3b2a61dd9d4c9e85946567e07d8e70e276c5136b"; - sha256 = "1247ghg1jkslgvwbffzsaxabz5l6qszw14vrwgln9smsc42cxjy2"; + rev = "87a738b9ff2b3a0a136dd45f4cc354bf6dd8573f"; + sha256 = "0kq1775b04jxlww6bvns5d4wl6rk6cvfl8f2avam8l9q1gw80y8h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f720b9f9b667bf9ff3080938beab36aa0036dc92/recipes/helm-unicode"; sha256 = "1j95qy2zwdb46dl30ankfx7013l0akc61m14s473j93w320j5224"; - name = "helm-unicode"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -18849,9 +24506,16 @@ license = lib.licenses.free; }; }) {}; - helm-w32-launcher = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-w32-launcher = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-w32-launcher"; + ename = "helm-w32-launcher"; version = "0.1.6"; src = fetchFromGitHub { owner = "Fanael"; @@ -18859,10 +24523,10 @@ rev = "01aa370a32900e7521330fba495474f2aa435e19"; sha256 = "0s8zp3kx2kxlfyd26yr3lphwcybhbm8qa9vzmxr3kaylwy6jpz5q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa678329a5081e1affa460c00239dabfd1b9dd82/recipes/helm-w32-launcher"; sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri"; - name = "helm-w32-launcher"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -18870,9 +24534,17 @@ license = lib.licenses.free; }; }) {}; - helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }: - melpaBuild { + helm-w3m = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , w3m }: + melpaBuild { pname = "helm-w3m"; + ename = "helm-w3m"; version = "1.0"; src = fetchFromGitHub { owner = "emacs-helm"; @@ -18880,10 +24552,10 @@ rev = "280673470672c9fbc57fd6a91defeb9f6641fc8a"; sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m"; sha256 = "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz"; - name = "helm-w3m"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm w3m ]; meta = { @@ -18891,9 +24563,16 @@ license = lib.licenses.free; }; }) {}; - helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + helm-zhihu-daily = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "helm-zhihu-daily"; + ename = "helm-zhihu-daily"; version = "0.3"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -18901,10 +24580,10 @@ rev = "be27dcc6be1eb97663b65581a9a5c0fc81cfaba7"; sha256 = "1s8q97pra27bacvm5knj0sjgj7iqljlhxqiniaw8ij8w4fhcdh93"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27246ec2bad3c85f8bb76aa26ebcd800edfe0d70/recipes/helm-zhihu-daily"; sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r"; - name = "helm-zhihu-daily"; + name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; meta = { @@ -18912,20 +24591,31 @@ license = lib.licenses.free; }; }) {}; - helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: - melpaBuild { + helpful = callPackage ({ dash + , dash-functional + , elisp-refs + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , shut-up }: + melpaBuild { pname = "helpful"; - version = "0.9"; + ename = "helpful"; + version = "0.12"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "c527d0a9f66b50c28dfc44b88c5dd634c770ade2"; - sha256 = "0mbqwxnk689mx58yjqs6dyyfkcgakginm35nqzp3kdwsvwvvkxzb"; + rev = "5f3fb4752de3868e688ff2046790bda569bb6e23"; + sha256 = "0z56icc8pmm537n34gy8a50a0i42glr58i860xmzlpxdn9f66dxp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; - name = "helpful"; + name = "recipe"; }; packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ]; meta = { @@ -18933,9 +24623,13 @@ license = lib.licenses.free; }; }) {}; - hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hfst-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hfst-mode"; + ename = "hfst-mode"; version = "0.4.0"; src = fetchFromGitHub { owner = "unhammer"; @@ -18943,10 +24637,10 @@ rev = "ac1bb9dd92545d3e7fdc05c83996c227cc15c6b8"; sha256 = "0zsz8542kh51clzy8j7g29bwm8zcnfxm9sjzh3xjpqk2ziqf4ii6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e324bb114997f9cc57d76d8a66fec4ff4d1d71fe/recipes/hfst-mode"; sha256 = "1w342n5k9ak1m5znysvrplpr9dhmi7hxbkr4d1dx51dn0azbpjh7"; - name = "hfst-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -18954,9 +24648,13 @@ license = lib.licenses.free; }; }) {}; - hi2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hi2 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hi2"; + ename = "hi2"; version = "1.0"; src = fetchFromGitHub { owner = "nilcons"; @@ -18964,10 +24662,10 @@ rev = "c9d199727b5cdcb9e36a972b38131ce4611fd6c8"; sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba880f0130707098e5b648f74d14e151b0110e4e/recipes/hi2"; sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2"; - name = "hi2"; + name = "recipe"; }; packageRequires = []; meta = { @@ -18975,9 +24673,13 @@ license = lib.licenses.free; }; }) {}; - hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hide-lines = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hide-lines"; + ename = "hide-lines"; version = "20130623.1701"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -18985,10 +24687,10 @@ rev = "4bfb4c6f4769bd6c637e4c18bbf65506832fc9f0"; sha256 = "01cy7v9ql70bsvjz3idq23jpyb8jb61bs9ff8vf5y3fj45pc32ps"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/hide-lines"; sha256 = "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d"; - name = "hide-lines"; + name = "recipe"; }; packageRequires = []; meta = { @@ -18996,9 +24698,14 @@ license = lib.licenses.free; }; }) {}; - hide-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hide-mode-line = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hide-mode-line"; + ename = "hide-mode-line"; version = "1.0.1"; src = fetchFromGitHub { owner = "hlissner"; @@ -19006,10 +24713,10 @@ rev = "86b9057391edad75467261c2e579603567e608f9"; sha256 = "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2af28365f9fbc6ae71043a67966490c5d18a6095/recipes/hide-mode-line"; sha256 = "0yl6aicpib5h1ckqi3gyilh2nwvp8gf1017n1w1755j01gw1p9hl"; - name = "hide-mode-line"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19017,9 +24724,14 @@ license = lib.licenses.free; }; }) {}; - hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hierarchy = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hierarchy"; + ename = "hierarchy"; version = "0.7.0"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -19027,10 +24739,10 @@ rev = "4ab1372c252847c316f8978a81e2fe92ff79579e"; sha256 = "1kykbb1sil5cycfa5aj8dhsxc5yrx1641i2np5kwdjid6ahdlz5r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; sha256 = "0fh1a590pdq21b4mwh9wrfsmm2lw2faw18r35cdzy8fgyf89yimp"; - name = "hierarchy"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19038,9 +24750,14 @@ license = lib.licenses.free; }; }) {}; - highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-blocks = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-blocks"; + ename = "highlight-blocks"; version = "0.1.16"; src = fetchFromGitHub { owner = "Fanael"; @@ -19048,10 +24765,10 @@ rev = "9c4240a5d16008db430d1a81c76dad474d3deb0c"; sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaf524488c408483ea8f2c3a71174b1b5fc3f5da/recipes/highlight-blocks"; sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1"; - name = "highlight-blocks"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19059,9 +24776,14 @@ license = lib.licenses.free; }; }) {}; - highlight-defined = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-defined = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-defined"; + ename = "highlight-defined"; version = "0.1.5"; src = fetchFromGitHub { owner = "Fanael"; @@ -19069,10 +24791,10 @@ rev = "9cc03c7136b56c04ea053fbe08a3a4a6af26b90e"; sha256 = "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/highlight-defined"; sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms"; - name = "highlight-defined"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19080,9 +24802,13 @@ license = lib.licenses.free; }; }) {}; - highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-indentation = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-indentation"; + ename = "highlight-indentation"; version = "0.7.0"; src = fetchFromGitHub { owner = "antonj"; @@ -19090,10 +24816,10 @@ rev = "cd6d8168ccb04c6c0394f42e9512c58f23c01689"; sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c443de5088410c0fe1b1c18f664b33ad259277/recipes/highlight-indentation"; sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6"; - name = "highlight-indentation"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19101,9 +24827,15 @@ license = lib.licenses.free; }; }) {}; - highlight-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }: - melpaBuild { + highlight-numbers = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parent-mode }: + melpaBuild { pname = "highlight-numbers"; + ename = "highlight-numbers"; version = "0.2.3"; src = fetchFromGitHub { owner = "Fanael"; @@ -19111,10 +24843,10 @@ rev = "b7adef0286aaa5bca8e98a12d0ffed3a880e25aa"; sha256 = "1r07mpyr7rhd7bkg778hx6vbhb4n9ixgzkpszhgks7ri6ia38pj8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/882e3a4877ddd22cc52f56f0ce3d55b6e4831c7a/recipes/highlight-numbers"; sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv"; - name = "highlight-numbers"; + name = "recipe"; }; packageRequires = [ emacs parent-mode ]; meta = { @@ -19122,9 +24854,13 @@ license = lib.licenses.free; }; }) {}; - highlight-parentheses = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-parentheses = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-parentheses"; + ename = "highlight-parentheses"; version = "1.1.0"; src = fetchFromGitHub { owner = "tsdh"; @@ -19132,10 +24868,10 @@ rev = "5aa800a68e3795716de1e7f2722e836781190f31"; sha256 = "08ld4wjrkd77cghmrf1n2hn2yzid7bdqwz6b1rzzqaiwxl138iy9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/highlight-parentheses"; sha256 = "1d38wxk5bwblddr74crzwjwpgyr8zgcl5h5ilywg35jpv7n66lp5"; - name = "highlight-parentheses"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19143,9 +24879,14 @@ license = lib.licenses.free; }; }) {}; - highlight-quoted = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-quoted = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-quoted"; + ename = "highlight-quoted"; version = "0.1"; src = fetchFromGitHub { owner = "Fanael"; @@ -19153,10 +24894,10 @@ rev = "cdd7164f9ad3a9929387c08af641ef6f5f013f4f"; sha256 = "1ahg9qzss67jpw0wp2izys6lyss4nqjy9320fpa4vdx39msdmjjb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93b5ba18e4bc31ca60aee9cb4674586cd8523bcf/recipes/highlight-quoted"; sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl"; - name = "highlight-quoted"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19164,9 +24905,13 @@ license = lib.licenses.free; }; }) {}; - highlight-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + highlight-symbol = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "highlight-symbol"; + ename = "highlight-symbol"; version = "1.3"; src = fetchFromGitHub { owner = "nschum"; @@ -19174,10 +24919,10 @@ rev = "6136dac6d4328c19077a838dfbae2efc4caa4db2"; sha256 = "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/highlight-symbol"; sha256 = "01zw7xrkpgc89m55d60dx3s3kjajh5c164f64s2fzrgl9xj92h0r"; - name = "highlight-symbol"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19185,20 +24930,25 @@ license = lib.licenses.free; }; }) {}; - hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hindent = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hindent"; - version = "5.2.5"; + ename = "hindent"; + version = "5.2.6"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "cba1110ca413a41a443b8368d63d295d7d36de7a"; - sha256 = "020dj6q483b7fabspgvnjqw0rhrgj3q1ncdcpafmyn1fgip5y0zq"; + rev = "dc47d8b98ebd6ee7fdd7de5f75e65e5b5eedf72f"; + sha256 = "0xp3mpiyrc6886bi9rih4vbmsar56h8i5sapigd3gn2pv2v688bc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz"; - name = "hindent"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -19206,9 +24956,13 @@ license = lib.licenses.free; }; }) {}; - hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hippie-expand-slime = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hippie-expand-slime"; + ename = "hippie-expand-slime"; version = "0.1"; src = fetchFromGitHub { owner = "purcell"; @@ -19216,10 +24970,10 @@ rev = "de31fbc9f9d55891a006463bcee7670b47084015"; sha256 = "0mzk4agkcaaw7gryi0wrxv0blqndqsjf1ivdvr2nrnqi798sdhbr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime"; sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m"; - name = "hippie-expand-slime"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19227,9 +24981,13 @@ license = lib.licenses.free; }; }) {}; - hippie-namespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hippie-namespace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hippie-namespace"; + ename = "hippie-namespace"; version = "0.5.8"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -19237,10 +24995,10 @@ rev = "79a662dfe9e61341e071b879f4f9101ca027ad10"; sha256 = "0nfr8ad0klqwi97fjchvwx9mfc672lhv3ll166sr8vn6jlh7rkv0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/hippie-namespace"; sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0"; - name = "hippie-namespace"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19248,9 +25006,14 @@ license = lib.licenses.free; }; }) {}; - history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + history = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "history"; + ename = "history"; version = "1.0.0"; src = fetchFromGitHub { owner = "boyw165"; @@ -19258,10 +25021,10 @@ rev = "adef53ecc2f6067bb61f020a2b66c5185a51632d"; sha256 = "0dy98sg92xvnr4algm2v2bnjcdwzv0b0vqk0312b0ziinkzisas1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f51d4cc6521546c99197adeb35459fcd53bd67d4/recipes/history"; sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g"; - name = "history"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19269,9 +25032,13 @@ license = lib.licenses.free; }; }) {}; - historyf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + historyf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "historyf"; + ename = "historyf"; version = "0.0.9"; src = fetchFromGitHub { owner = "k1LoW"; @@ -19279,10 +25046,10 @@ rev = "64ab6c9d2cd6dec6982622bf675326e011373cd2"; sha256 = "1mxicha6m61qxz1mv9z76x4g9fpqk4ch9i6jf7nnpxd6x4xz3f7z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a67279875c19475433fa13625c95ee5855962a59/recipes/historyf"; sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s"; - name = "historyf"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19290,9 +25057,14 @@ license = lib.licenses.free; }; }) {}; - hl-anything = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hl-anything = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hl-anything"; + ename = "hl-anything"; version = "0.0.9"; src = fetchFromGitHub { owner = "hl-anything"; @@ -19300,10 +25072,10 @@ rev = "de631c87d3a6602cdbf84c1623558334fda354fa"; sha256 = "0889dzrwizpkyh3wms13k8zx27ipsrsxfa4j4yzk4cwk3aicckcr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f38d26ede4e2e1d495a02c68e3b5041702b032e8/recipes/hl-anything"; sha256 = "0czpc82j5hbzprc66aall72lqnk38dxgpzx4rs8sbx95cag12dxa"; - name = "hl-anything"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19311,9 +25083,13 @@ license = lib.licenses.free; }; }) {}; - hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hl-sentence = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hl-sentence"; + ename = "hl-sentence"; version = "3"; src = fetchFromGitHub { owner = "milkypostman"; @@ -19321,10 +25097,10 @@ rev = "f88882772f1a29fabb54194cc8aacd80d7f5b085"; sha256 = "1hgigbgppdhmr7rc901r95kyydjk05dck8mwbryh7kpglns365fa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence"; sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs"; - name = "hl-sentence"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19332,41 +25108,24 @@ license = lib.licenses.free; }; }) {}; - hl-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "hl-sexp"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "hl-sexp"; - rev = "0606100422321c18db51ceda80f25cd7717c2e01"; - sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp"; - sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm"; - name = "hl-sexp"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-sexp"; - license = lib.licenses.free; - }; - }) {}; - hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hl-todo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hl-todo"; - version = "1.8.1"; + ename = "hl-todo"; + version = "1.9.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "fbe311b3be34cb5719e612f71d46a87b99954309"; - sha256 = "0f7dsp2b0hzzz6klcmawwlid1jyl90ax0p2ph7bh2791jhywq60k"; + rev = "770c9862ed79a2437b764050a1006c62f9e32747"; + sha256 = "0vp8n7ymy7i3db2mqgj2a3sbd2hisj9kjvl6apn6y0bpw5vknfdy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4"; - name = "hl-todo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19374,9 +25133,15 @@ license = lib.licenses.free; }; }) {}; - hoa-pp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { + hoa-pp-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names }: + melpaBuild { pname = "hoa-pp-mode"; + ename = "hoa-pp-mode"; version = "0.3.0"; src = fetchFromGitHub { owner = "hoaproject"; @@ -19384,10 +25149,10 @@ rev = "a72104a191214fba502653643a0d166a8f5341d9"; sha256 = "1wg6vc9swwspi6s6jpig3my83i2pq8vkq2cy1q3an87rczacmfzp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c0d707dad9dc86bb3d6a829a60e21e92a5f3160/recipes/hoa-pp-mode"; sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla"; - name = "hoa-pp-mode"; + name = "recipe"; }; packageRequires = [ emacs names ]; meta = { @@ -19395,9 +25160,16 @@ license = lib.licenses.free; }; }) {}; - homebrew-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: - melpaBuild { + homebrew-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild }: + melpaBuild { pname = "homebrew-mode"; + ename = "homebrew-mode"; version = "1.3.6"; src = fetchFromGitHub { owner = "dunn"; @@ -19405,10 +25177,10 @@ rev = "d422307aee2f897d1a92e3b959c3214bc54cbe38"; sha256 = "1z4d0niz8q24f2z8rnfnc2rlmkffkf7qc57qn4695jbkzb7galfz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4007f6d15574098722fb427b6a9903f77afb21/recipes/homebrew-mode"; sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj"; - name = "homebrew-mode"; + name = "recipe"; }; packageRequires = [ dash emacs inf-ruby ]; meta = { @@ -19416,9 +25188,15 @@ license = lib.licenses.free; }; }) {}; - hookify = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + hookify = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "hookify"; + ename = "hookify"; version = "0.2.1"; src = fetchFromGitHub { owner = "Silex"; @@ -19426,10 +25204,10 @@ rev = "e76127230716f7fab6662410c03c3872d17a172b"; sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa04ccd0ac05beed5de8d51ed96ccbf0071fdea1/recipes/hookify"; sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy"; - name = "hookify"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -19437,9 +25215,15 @@ license = lib.licenses.free; }; }) {}; - hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + hound = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "hound"; + ename = "hound"; version = "1.1.0"; src = fetchFromGitHub { owner = "ryoung786"; @@ -19447,10 +25231,10 @@ rev = "28cb804d99f9240d690d60098644e4300336b5fa"; sha256 = "1zyd6350mbah7wjz7qrwyh9pr4jpk5i1v8p7cfmdlja92fpqj9rh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90cfc34eb4e8be7bf887533b85feba91131a435b/recipes/hound"; sha256 = "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v"; - name = "hound"; + name = "recipe"; }; packageRequires = [ cl-lib request ]; meta = { @@ -19458,20 +25242,25 @@ license = lib.licenses.free; }; }) {}; - ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ht = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ht"; + ename = "ht"; version = "2.2"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "a23a72342fda1eb3cc8d792f86efabe45eb0d1fd"; - sha256 = "1p3qa7g0wa0wbviv2f8bda39cjys3naayk5xjm3nxxmqsyy8papx"; + rev = "a741bac82797d25ec0542764df7443e9e7241033"; + sha256 = "1m1v31bfaw2g3jymcxsl2bi1z37pj0sfhmldljk8m9zgjll56g6c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd"; - name = "ht"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -19479,9 +25268,13 @@ license = lib.licenses.free; }; }) {}; - html-to-markdown = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + html-to-markdown = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "html-to-markdown"; + ename = "html-to-markdown"; version = "1.5.1"; src = fetchFromGitHub { owner = "Malabarba"; @@ -19489,10 +25282,10 @@ rev = "0fa0effd71acd8981a425ef11e0e63d53aea3199"; sha256 = "0c648dl5zwjrqx9n6zr6nyzx2zcnv05d5i4hvhjpl9q3y011ncns"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/html-to-markdown"; sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv"; - name = "html-to-markdown"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19500,9 +25293,13 @@ license = lib.licenses.free; }; }) {}; - htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + htmlize = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "htmlize"; + ename = "htmlize"; version = "1.53"; src = fetchFromGitHub { owner = "hniksic"; @@ -19510,10 +25307,10 @@ rev = "1bc2f1b0feb852fa5a289a1d72646b16ac84adf1"; sha256 = "0dr235c0z8is3pi5xdgqyqljg6px0b2aya6qb79zkyi477bmz4ip"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; sha256 = "16nvvsi4nxi0zzk5a6mwmp43p0ls20zdx9r18mxz6bsaw6jangh2"; - name = "htmlize"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19521,20 +25318,24 @@ license = lib.licenses.free; }; }) {}; - httpcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + httpcode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "httpcode"; + ename = "httpcode"; version = "0.1"; src = fetchFromGitHub { owner = "rspivak"; repo = "httpcode.el"; - rev = "2c8eb3b5455254ba70fb71f7178886bfc2d3af90"; - sha256 = "1h9n388fi17nbyfciqywgrq3n165kpiildbimx59qyk2ac3v7rqk"; + rev = "9f860730ffa0b11f48ad8db3eb57b3e844918c4e"; + sha256 = "1wk9dkf2g95zsdfcvbazi9hls5k3yia86npsmyk486pj0ij9xmvj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906da23e26d44f8c71ba57ab59bb089caea673a9/recipes/httpcode"; sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh"; - name = "httpcode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19542,9 +25343,16 @@ license = lib.licenses.free; }; }) {}; - httprepl = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + httprepl = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "httprepl"; + ename = "httprepl"; version = "1.1"; src = fetchFromGitHub { owner = "gregsexton"; @@ -19552,10 +25360,10 @@ rev = "d2de8a676544deed1a5e084631a7799e487dbe55"; sha256 = "0dd257988bdar9hl2711ch5qshx9jc11fqxcvbrd7rc1va5cshs9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c49824f6e2dc2f3482e607c2d3a1e2d7685bf688/recipes/httprepl"; sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh"; - name = "httprepl"; + name = "recipe"; }; packageRequires = [ dash emacs s ]; meta = { @@ -19563,20 +25371,27 @@ license = lib.licenses.free; }; }) {}; - hugsql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + hugsql-ghosts = callPackage ({ cider + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "hugsql-ghosts"; - version = "0.1.1"; + ename = "hugsql-ghosts"; + version = "0.1.3"; src = fetchFromGitHub { owner = "rkaercher"; repo = "hugsql-ghosts"; - rev = "9d76acb41333c6377c7fe79e936008d10fe55420"; - sha256 = "18wkqvmfr5v3mf3si0mwmwlc5gms82jzb5p3q3kpbmsayzg3xi8n"; + rev = "f3ebc60c66204ad39058cb84eb4bd5facce091df"; + sha256 = "0pcr39x8yxl5aa0sz20gw20ixz5imw5m19bzhzbzyn7slr65hlqn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/969fd5e51bf93b5eff6919956c43c041a3b24d1e/recipes/hugsql-ghosts"; sha256 = "1v1iypis5iyimdr9796qpqw0qmhzijap0nbr0mhhyp4001kakkwz"; - name = "hugsql-ghosts"; + name = "recipe"; }; packageRequires = [ cider dash s ]; meta = { @@ -19584,9 +25399,13 @@ license = lib.licenses.free; }; }) {}; - hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hungry-delete = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hungry-delete"; + ename = "hungry-delete"; version = "1.1.5"; src = fetchFromGitHub { owner = "nflath"; @@ -19594,10 +25413,10 @@ rev = "78a787a87aceb821818bbe2a322fbf2e5cbf80c3"; sha256 = "171s7akqcpj0jcbm8w19b4n9kdzw0acf7cv0ymwdz5mmgmfiy292"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete"; sha256 = "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz"; - name = "hungry-delete"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19605,20 +25424,28 @@ license = lib.licenses.free; }; }) {}; - hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + hy-mode = callPackage ({ dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "hy-mode"; - version = "1.0.2"; + ename = "hy-mode"; + version = "1.0.3"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "267a3b163136d207d8d9ecd0d2aa14dc30fd0690"; - sha256 = "11n60zzhad68vff7fqzkvbj04i3xc3xp9yc2v26v8y6zpqizhib0"; + rev = "27a9e6bee0df741f2699e00e64ea2c7a279b401d"; + sha256 = "1jxximiznz7fw9ys5k6plw85zrbzvxidql7py1fdi425fdp4058z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m"; - name = "hy-mode"; + name = "recipe"; }; packageRequires = [ dash dash-functional emacs s ]; meta = { @@ -19626,20 +25453,26 @@ license = lib.licenses.free; }; }) {}; - hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hyai = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hyai"; + ename = "hyai"; version = "1.0.0"; src = fetchFromGitHub { owner = "iquiw"; repo = "hyai"; - rev = "7c644d31f62943c75ccf5a772e43450b462cc08f"; - sha256 = "1b8992vzq5bh01pjlj181nzqjrqs4fbjpwvv8h7gjq42sf8w59sm"; + rev = "a6d936a68ddbdfa314662c7c3e2b40538334ddeb"; + sha256 = "108i53sbjdwx2bz5cfbi0a06vy3a44vgwag43nkbpjk116bnjkc9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd9bd1cfd2f3b760b664a4677b0e4e617cbdfa6/recipes/hyai"; sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s"; - name = "hyai"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -19647,9 +25480,13 @@ license = lib.licenses.free; }; }) {}; - hydandata-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hydandata-light-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hydandata-light-theme"; + ename = "hydandata-light-theme"; version = "0.9.0"; src = fetchFromGitHub { owner = "hydandata"; @@ -19657,10 +25494,10 @@ rev = "3b9bb5f213029a8331818b1d670194ef26d9505a"; sha256 = "11vgz64f8vs8vqp4scj9qvrfdshag7bs615ly9zvzzlk68jivdya"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/413c617f15947782891159a240e0c9014f1f7d11/recipes/hydandata-light-theme"; sha256 = "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60"; - name = "hydandata-light-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19668,9 +25505,13 @@ license = lib.licenses.free; }; }) {}; - hyde = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hyde = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hyde"; + ename = "hyde"; version = "0.2"; src = fetchFromGitHub { owner = "nibrahim"; @@ -19678,10 +25519,10 @@ rev = "181f9d2f91c2678a22243c5485162fa7999fd893"; sha256 = "0nwsmc4c3v0wbfy917ik9k7yz8yclfac695p7p9sh9y354k3maw4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151f5c1097e5020dbc13e41f2657aae781c5942b/recipes/hyde"; sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3"; - name = "hyde"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19689,9 +25530,14 @@ license = lib.licenses.free; }; }) {}; - hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + hydra = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "hydra"; + ename = "hydra"; version = "0.14.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -19699,10 +25545,10 @@ rev = "943636fe4a35298d9d234222bc4520dec9ef2305"; sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw"; - name = "hydra"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -19710,9 +25556,14 @@ license = lib.licenses.free; }; }) {}; - ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ialign = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ialign"; + ename = "ialign"; version = "0.4.2"; src = fetchFromGitHub { owner = "mkcms"; @@ -19720,10 +25571,10 @@ rev = "7ad88c8f7922adc616b8f060b65fa1add8952ea1"; sha256 = "0bh03w91i622hbar5dcq631ndxx1y8kd3h655pgw1g0lqkv1mlnc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j"; - name = "ialign"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19731,20 +25582,25 @@ license = lib.licenses.free; }; }) {}; - ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + ibuffer-projectile = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "ibuffer-projectile"; + ename = "ibuffer-projectile"; version = "0.2"; src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-projectile"; - rev = "8b225dc779088ce65b81d8d86dc5d394baa53e2e"; - sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc"; + rev = "36b3fc2d42337174d4fa37c4d2a77e6153634965"; + sha256 = "0kvf2mn6b1dkn72cs1bpamy2wc5j1n48j4x6kl3ihvh7bibqg115"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile"; sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk"; - name = "ibuffer-projectile"; + name = "recipe"; }; packageRequires = [ projectile ]; meta = { @@ -19752,20 +25608,24 @@ license = lib.licenses.free; }; }) {}; - ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ibuffer-tramp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ibuffer-tramp"; + ename = "ibuffer-tramp"; version = "1.0.0"; src = fetchFromGitHub { owner = "svend"; repo = "ibuffer-tramp"; - rev = "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3"; - sha256 = "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f"; + rev = "41fab2ad174f53a4cf5ef7d2ebef518dede82ab4"; + sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a7449b15cb2a89cf06ea3de2cfdc6bc387db3b/recipes/ibuffer-tramp"; sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32"; - name = "ibuffer-tramp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19773,9 +25633,14 @@ license = lib.licenses.free; }; }) {}; - ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ibuffer-vc = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ibuffer-vc"; + ename = "ibuffer-vc"; version = "0.10"; src = fetchFromGitHub { owner = "purcell"; @@ -19783,10 +25648,10 @@ rev = "b2bac7aa69335933ebb2e6f34259fa96d2c8d46a"; sha256 = "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ibuffer-vc"; sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla"; - name = "ibuffer-vc"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -19794,9 +25659,13 @@ license = lib.licenses.free; }; }) {}; - identica-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + identica-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "identica-mode"; + ename = "identica-mode"; version = "1.3.1"; src = fetchFromGitHub { owner = "gabrielsaldana"; @@ -19804,10 +25673,10 @@ rev = "cf9183ee11ac922e85c7c908f04e2d00b03111b3"; sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/812b7c1fbc435f0530b7f66a1e65f62f5f00da01/recipes/identica-mode"; sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q"; - name = "identica-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19815,9 +25684,13 @@ license = lib.licenses.free; }; }) {}; - idle-highlight-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + idle-highlight-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "idle-highlight-mode"; + ename = "idle-highlight-mode"; version = "1.1.3"; src = fetchFromGitHub { owner = "nonsequitur"; @@ -19825,10 +25698,10 @@ rev = "c466f2a9e291f9da1167dc879577b2e1a7880482"; sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/idle-highlight-mode"; sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc"; - name = "idle-highlight-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19836,20 +25709,25 @@ license = lib.licenses.free; }; }) {}; - ido-at-point = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-at-point = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-at-point"; + ename = "ido-at-point"; version = "1.0.0"; src = fetchFromGitHub { owner = "katspaugh"; repo = "ido-at-point"; - rev = "e5907bbe8a3d148d07698b76bd994dc3076e16ee"; - sha256 = "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp"; + rev = "6b267f202dc3d3d924c904fbd894e9a209f231de"; + sha256 = "1bj8k5fq6x3s5qmr02bnkcls7sndmg4wjjjrsd3fr6yl8c4jcy3k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ffbfa66c4284a134265efc606fdc7652b0a7f75/recipes/ido-at-point"; sha256 = "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0"; - name = "ido-at-point"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19857,9 +25735,13 @@ license = lib.licenses.free; }; }) {}; - ido-complete-space-or-hyphen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-complete-space-or-hyphen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-complete-space-or-hyphen"; + ename = "ido-complete-space-or-hyphen"; version = "1.1"; src = fetchFromGitHub { owner = "doitian"; @@ -19867,10 +25749,10 @@ rev = "ad9baaec10e06be3f85db97b6c8fd970cf20df77"; sha256 = "1ffmsmi31jc0gqnbdxrd8ipsy790bn6hgq3rmayylavmdpg3qfd5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59e11094068d3a0c0e4edc1f82158c43d3b15e0e/recipes/ido-complete-space-or-hyphen"; sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc"; - name = "ido-complete-space-or-hyphen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -19878,20 +25760,28 @@ license = lib.licenses.free; }; }) {}; - ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: - melpaBuild { + ido-completing-read-plus = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , memoize + , s }: + melpaBuild { pname = "ido-completing-read-plus"; - version = "4.7"; + ename = "ido-completing-read+"; + version = "4.11"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; - sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; + rev = "03bdf989a9af88d4eeed4003ae74c98baf58ff72"; + sha256 = "08d77ysbzd25rm8rjslckhqlsyim047c9zwq2ybbzqpjy3q52qfy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z"; - name = "ido-completing-read-plus"; + name = "recipe"; }; packageRequires = [ cl-lib emacs memoize s ]; meta = { @@ -19899,9 +25789,14 @@ license = lib.licenses.free; }; }) {}; - ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-describe-bindings = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-describe-bindings"; + ename = "ido-describe-bindings"; version = "0.0.11"; src = fetchFromGitHub { owner = "danil"; @@ -19909,10 +25804,10 @@ rev = "a142ff1c33df23ed9665497d0dcae2943b3c706a"; sha256 = "0967709jyp9s04i6gi90axgqzhz03cdf1j1w39yrkds6q1b6v7jw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31b8e255630f1348a5b5730f7b624ad550d219ad/recipes/ido-describe-bindings"; sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2"; - name = "ido-describe-bindings"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -19920,9 +25815,14 @@ license = lib.licenses.free; }; }) {}; - ido-grid-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-grid-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-grid-mode"; + ename = "ido-grid-mode"; version = "1.1.5"; src = fetchFromGitHub { owner = "larkery"; @@ -19930,10 +25830,10 @@ rev = "8bbd66e365d4f6f352bbb17673be5869ab26d7ab"; sha256 = "0f1p6cnl0arcc2y1h99nqcflp7byvyf6hj6fmv5xqggs66qc72lb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ido-grid-mode"; sha256 = "0sq1d2fwvv247rr9lqg9x87d5h910k5ifqr9cjyskc74mvhrcsr3"; - name = "ido-grid-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -19941,9 +25841,15 @@ license = lib.licenses.free; }; }) {}; - ido-load-library = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }: - melpaBuild { + ido-load-library = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , persistent-soft }: + melpaBuild { pname = "ido-load-library"; + ename = "ido-load-library"; version = "0.2.0"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -19951,10 +25857,10 @@ rev = "8589cb1e4303066eb333f1cfc789835d1cbe21df"; sha256 = "1z7az7h90v72llxvdclcywvf1qd0nhkfa45bp99xi7cy7sqsqssf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/baa49e7d2d5c07ebf77e7941c240b88fcfd0fc8b/recipes/ido-load-library"; sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj"; - name = "ido-load-library"; + name = "recipe"; }; packageRequires = [ pcache persistent-soft ]; meta = { @@ -19962,9 +25868,14 @@ license = lib.licenses.free; }; }) {}; - ido-occur = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-occur = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-occur"; + ename = "ido-occur"; version = "0.2.0"; src = fetchFromGitHub { owner = "danil"; @@ -19972,10 +25883,10 @@ rev = "b0e67fe4835c162cbcf8a982bdf377955b9ac5ae"; sha256 = "13f21vx3q1qbnl13n3lx1rnr8dhq3zwch22pvy53h8q6sdf7r73a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a576d8569bf82be01e7d50defcc99a90aab1436/recipes/ido-occur"; sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji"; - name = "ido-occur"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -19983,30 +25894,13 @@ license = lib.licenses.free; }; }) {}; - ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: - melpaBuild { - pname = "ido-ubiquitous"; - version = "4.7"; - src = fetchFromGitHub { - owner = "DarwinAwardWinner"; - repo = "ido-completing-read-plus"; - rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; - sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; - sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; - name = "ido-ubiquitous"; - }; - packageRequires = [ cl-lib ido-completing-read-plus ]; - meta = { - homepage = "https://melpa.org/#/ido-ubiquitous"; - license = lib.licenses.free; - }; - }) {}; - ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ido-vertical-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ido-vertical-mode"; + ename = "ido-vertical-mode"; version = "0.1.6"; src = fetchFromGitHub { owner = "creichert"; @@ -20014,10 +25908,10 @@ rev = "c3e0514405ba5c15b5527e7f8e2d42dff259788f"; sha256 = "1lv82q639xjnmvby56nwqn23ijh6f163bk675s33dkingm8csj8k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4bbd212ea4606b9871cf583d06b5cee2f6ce0a9/recipes/ido-vertical-mode"; sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm"; - name = "ido-vertical-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20025,9 +25919,14 @@ license = lib.licenses.free; }; }) {}; - ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: - melpaBuild { + ido-yes-or-no = callPackage ({ fetchFromGitHub + , fetchurl + , ido-completing-read-plus + , lib + , melpaBuild }: + melpaBuild { pname = "ido-yes-or-no"; + ename = "ido-yes-or-no"; version = "1.4"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; @@ -20035,10 +25934,10 @@ rev = "9ddee9e878ad62d58c9f4b3a7685f22b8e36e420"; sha256 = "046ns1nqisz830f6xwlly1qgmi4v2ikw6vmj0f93jprv4vkjylpq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e575f46b8597a34523df6b6a75da5a640f4c5a2e/recipes/ido-yes-or-no"; sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana"; - name = "ido-yes-or-no"; + name = "recipe"; }; packageRequires = [ ido-completing-read-plus ]; meta = { @@ -20046,9 +25945,13 @@ license = lib.licenses.free; }; }) {}; - idomenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + idomenu = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "idomenu"; + ename = "idomenu"; version = "0.1"; src = fetchFromGitHub { owner = "birkenfeld"; @@ -20056,10 +25959,10 @@ rev = "5daaf7e06e4704ae43c825488109d7eb8c049321"; sha256 = "0bq0kx0889rdy8aasxbpmb0a4awpk2b24zv6x1dmhacmc5rj11i0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f856045bc5ab2aee4dd4ad9806917e27e56ec64c/recipes/idomenu"; sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h"; - name = "idomenu"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20067,20 +25970,27 @@ license = lib.licenses.free; }; }) {}; - idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: - melpaBuild { + idris-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , prop-menu }: + melpaBuild { pname = "idris-mode"; + ename = "idris-mode"; version = "0.9.19"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "314a0baea5752069de08e814bb134a9643fb675d"; - sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92"; + rev = "66a822a621e7bade71fdeb32e9fe520b322c8967"; + sha256 = "1c3drq4f62p9arm92arp4dby1cw2fh5x3lmlb63rxbpsh5askw75"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s"; - name = "idris-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs prop-menu ]; meta = { @@ -20088,9 +25998,13 @@ license = lib.licenses.free; }; }) {}; - iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iedit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iedit"; + ename = "iedit"; version = "0.9.9.9"; src = fetchFromGitHub { owner = "victorhge"; @@ -20098,10 +26012,10 @@ rev = "39919478f9472ce7a808ca601f4c19261ecc2f99"; sha256 = "1pwkrm98vlpzsy5iwwfksdaz3zzyi7bvdf5fglhsn4ssf47p787g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit"; sha256 = "0bh8ir6kspxjsvjww5y3b5hl3flbm2cc77jh8vnnva3z086f18mh"; - name = "iedit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20109,9 +26023,13 @@ license = lib.licenses.free; }; }) {}; - iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iflipb = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iflipb"; + ename = "iflipb"; version = "1.4"; src = fetchFromGitHub { owner = "jrosdahl"; @@ -20119,10 +26037,10 @@ rev = "a5ad1fbd1173cff5228dab265515c92c0778f86a"; sha256 = "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb"; sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d"; - name = "iflipb"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20130,9 +26048,13 @@ license = lib.licenses.free; }; }) {}; - ignoramus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ignoramus = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ignoramus"; + ename = "ignoramus"; version = "0.7.4"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -20140,10 +26062,10 @@ rev = "00385fcd0d42de3a470f61c1fdbe7e19fbef9c5b"; sha256 = "1ca2n6vv2z7c3550w0jzwmp6xp0rmrrbljr1ik2ijign62r35a3q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac5439afe2f9a902e615f0cf919ef7138559c0f0/recipes/ignoramus"; sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9"; - name = "ignoramus"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20151,9 +26073,15 @@ license = lib.licenses.free; }; }) {}; - image-archive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + image-archive = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "image-archive"; + ename = "image-archive"; version = "0.0.7"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -20161,10 +26089,10 @@ rev = "699e967fa7b1dfcce2bf2ec878e74f4238bb6e45"; sha256 = "0imvxzcja91cd19zm2frqfpxm8j0bc89w9s7q0pkpvyjz44kjbq8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17464f31b07f64da0e9db187cd6f5facee3ad7ce/recipes/image-archive"; sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp"; - name = "image-archive"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -20172,9 +26100,14 @@ license = lib.licenses.free; }; }) {}; - image-dired-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + image-dired-plus = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "image-dired-plus"; + ename = "image-dired+"; version = "0.7.2"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -20182,10 +26115,10 @@ rev = "b68094625d963056ad64e0e44af0e2266b2eadc7"; sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98f83f450804f1dc496a7bda17818cdae3f52151/recipes/image-dired+"; sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy"; - name = "image-dired-plus"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -20193,9 +26126,14 @@ license = lib.licenses.free; }; }) {}; - image-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + image-plus = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "image-plus"; + ename = "image+"; version = "0.6.2"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -20203,10 +26141,10 @@ rev = "967508a6c151e6ab6e97d3ac332dc5599011830d"; sha256 = "0k69xbih0273xvmj035vcmm67l6hgjb99pb1jbva5x0pnszb1vdv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02d7400477a993b7a3cae327501dbf8db97dfa28/recipes/image+"; sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg"; - name = "image-plus"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -20214,9 +26152,14 @@ license = lib.licenses.free; }; }) {}; - imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + imake = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "imake"; + ename = "imake"; version = "1.0.1"; src = fetchFromGitHub { owner = "tarsius"; @@ -20224,10 +26167,10 @@ rev = "7df5fb9684a0288313ef5f64594078d477105959"; sha256 = "0xc19ir5ak1bfq0ag48ql5rj58zd565csgxhpa30s9lvvkc8kvr5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake"; sha256 = "0j732fi6999n9990w4l28raw140fvqfbynyh4x65yilhw95r7c34"; - name = "imake"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -20235,20 +26178,24 @@ license = lib.licenses.free; }; }) {}; - imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + imapfilter = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "imapfilter"; + ename = "imapfilter"; version = "1.0.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "imapfilter"; - rev = "79bbbe918319bc1e8f42a0bef53dc7c77fe868ea"; - sha256 = "0lqhwh8kav7f526a40rjdy2hzarzph1i3ig2dmbf02gp32sl7rg9"; + rev = "5e842a8c60ba98f344edf1b1e65f5a480ed938ed"; + sha256 = "16k7cxzdjbblzckp5qppw1ga0rzdh3ww2ni7ry1h43p9cfna0kcx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter"; sha256 = "0i893kqj6yzadhza800r6ri7fihl01r57z8yrzzh3d09qaias5vz"; - name = "imapfilter"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20256,9 +26203,14 @@ license = lib.licenses.free; }; }) {}; - imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + imenu-anywhere = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "imenu-anywhere"; + ename = "imenu-anywhere"; version = "1.1.4"; src = fetchFromGitHub { owner = "vspinu"; @@ -20266,10 +26218,10 @@ rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3"; sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; sha256 = "1ylqzdnd3nzcpyyd6rh6i5q9mvf8c99rvpk51fzfm3yq2kyw4dbq"; - name = "imenu-anywhere"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -20277,9 +26229,14 @@ license = lib.licenses.free; }; }) {}; - imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + imenu-list = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "imenu-list"; + ename = "imenu-list"; version = "0.8"; src = fetchFromGitHub { owner = "bmag"; @@ -20287,10 +26244,10 @@ rev = "27170d27c9594989587c03c23f753a809f6a0e10"; sha256 = "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list"; sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s"; - name = "imenu-list"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -20298,9 +26255,14 @@ license = lib.licenses.free; }; }) {}; - imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + imenus = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "imenus"; + ename = "imenus"; version = "0.2"; src = fetchFromGitHub { owner = "alezost"; @@ -20308,10 +26270,10 @@ rev = "ee1bbd2228dbb86df2865dc9004d375421b171ba"; sha256 = "1y57xp0w0c6hg3gn4f1l3612a18li4gwhfa4dy18fy94gr54ycpx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc571105a8d7e2ea85391812f1fa639787fa7563/recipes/imenus"; sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r"; - name = "imenus"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -20319,9 +26281,13 @@ license = lib.licenses.free; }; }) {}; - immutant-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + immutant-server = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "immutant-server"; + ename = "immutant-server"; version = "1.2.0"; src = fetchFromGitHub { owner = "leathekd"; @@ -20329,10 +26295,10 @@ rev = "6f3d303354a229780a33e6bae64460a95bfefe60"; sha256 = "1pf7pqh8yzyvh4gzvp5npfq8kcfjcbzra0kkw7zmz769xxc8v84x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6e906492f9982e2cebd1e4838d7b7c81a295efa/recipes/immutant-server"; sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i"; - name = "immutant-server"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20340,20 +26306,27 @@ license = lib.licenses.free; }; }) {}; - impatient-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, simple-httpd }: - melpaBuild { + impatient-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild + , simple-httpd }: + melpaBuild { pname = "impatient-mode"; - version = "1.0.0"; + ename = "impatient-mode"; + version = "1.1"; src = fetchFromGitHub { owner = "skeeto"; repo = "impatient-mode"; - rev = "eba1efce3dd20b5f5017ab64bae0cfb3b181c2b0"; - sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj"; + rev = "96c068d5add95595dc5be42115d100cf99f908ba"; + sha256 = "18fawpnqcm1yv7f83sz05pjihwydmafmccfmizyg0hlgayhj0izf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaa64c4d43139075d77f4518de94bcbe475d21fc/recipes/impatient-mode"; sha256 = "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j"; - name = "impatient-mode"; + name = "recipe"; }; packageRequires = [ cl-lib htmlize simple-httpd ]; meta = { @@ -20361,9 +26334,15 @@ license = lib.licenses.free; }; }) {}; - import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: - melpaBuild { + import-js = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , grizzl + , lib + , melpaBuild }: + melpaBuild { pname = "import-js"; + ename = "import-js"; version = "2.0.0"; src = fetchFromGitHub { owner = "Galooshi"; @@ -20371,10 +26350,10 @@ rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250"; sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js"; sha256 = "00b2qv1y8879cf8ayplmwqd36w7sppx57myi2wjhy9i2rnvdbmgn"; - name = "import-js"; + name = "recipe"; }; packageRequires = [ emacs grizzl ]; meta = { @@ -20382,9 +26361,15 @@ license = lib.licenses.free; }; }) {}; - import-popwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: - melpaBuild { + import-popwin = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popwin }: + melpaBuild { pname = "import-popwin"; + ename = "import-popwin"; version = "0.10"; src = fetchFromGitHub { owner = "syohex"; @@ -20392,10 +26377,10 @@ rev = "6a21efc7fd44f8c2484d22eadf298e4bfd4bc003"; sha256 = "1h4c3cib87hvgp37c30lx7cpyxvgdsb9hp7z0nfrkbbif0acrj2i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6f0629515f36e2e98839a6894ca8c0f58862dc2/recipes/import-popwin"; sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy"; - name = "import-popwin"; + name = "recipe"; }; packageRequires = [ emacs popwin ]; meta = { @@ -20403,20 +26388,27 @@ license = lib.licenses.free; }; }) {}; - importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + importmagic = callPackage ({ emacs + , epc + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "importmagic"; + ename = "importmagic"; version = "1.1"; src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5"; - sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5"; + rev = "ab9e5c260a2044578597a467eff59e5598a7ef1c"; + sha256 = "1ifv6zfrknivjsgk0p8wh0n2bqqs1zfy8551216dfvigqs20wvq4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; sha256 = "1kpmgpll0zz3zlr3q863v1fq6wmwdwx7mn676x0r7g4iy1bdslmv"; - name = "importmagic"; + name = "recipe"; }; packageRequires = [ emacs epc f ]; meta = { @@ -20424,9 +26416,13 @@ license = lib.licenses.free; }; }) {}; - indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + indent-guide = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "indent-guide"; + ename = "indent-guide"; version = "20160630"; src = fetchFromGitHub { owner = "zk-phi"; @@ -20434,10 +26430,10 @@ rev = "feb207cb5610f351c7cdcf266e0c99117b2f786c"; sha256 = "0ykddzily3b6c6k7fvq274pqdjf3934n8p3nrmnsw6c93i1ndd4f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide"; sha256 = "029fj9rr9vfmkysi6lzpwra92j6ppw675qpj3sinfq7fqqlicvp7"; - name = "indent-guide"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20445,9 +26441,18 @@ license = lib.licenses.free; }; }) {}; - indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: - melpaBuild { + indium = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild + , seq + , websocket }: + melpaBuild { pname = "indium"; + ename = "indium"; version = "1.2.0"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -20455,10 +26460,10 @@ rev = "5ece767ea30a350dcdb1a4defaca174e85efedc5"; sha256 = "1djkzjxv7idqg5pmbqf60lmvibp3ccvgdkdwb48wzn2yvnqr2vw6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl"; - name = "indium"; + name = "recipe"; }; packageRequires = [ company emacs js2-mode seq websocket ]; meta = { @@ -20466,9 +26471,15 @@ license = lib.licenses.free; }; }) {}; - inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inf-clojure = callPackage ({ clojure-mode + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inf-clojure"; + ename = "inf-clojure"; version = "2.1.0"; src = fetchFromGitHub { owner = "clojure-emacs"; @@ -20476,10 +26487,10 @@ rev = "247ca70f8ba5104be292aea20fbde6adb37e359f"; sha256 = "11hyva006bc4hbhzjwb4brilm6fb7qfm5h66nl0gmmyva40y6412"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl"; - name = "inf-clojure"; + name = "recipe"; }; packageRequires = [ clojure-mode emacs ]; meta = { @@ -20487,9 +26498,15 @@ license = lib.licenses.free; }; }) {}; - inf-crystal = callPackage ({ crystal-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inf-crystal = callPackage ({ crystal-mode + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inf-crystal"; + ename = "inf-crystal"; version = "0.1.0"; src = fetchFromGitHub { owner = "brantou"; @@ -20497,10 +26514,10 @@ rev = "71a330f2d29e2fb4f51d223cf6230b88620a80af"; sha256 = "0vija33n2j4j5inzm29qk1bjzaxjm97zn263j15258pqxwkbddv3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff84c742eebb84577f362b2739f4bcf1434d58ac/recipes/inf-crystal"; sha256 = "09ssq7i5c2fxxbrsp3nn1f1ah1yv2nb19n5s1iqyykkk316k2q26"; - name = "inf-crystal"; + name = "recipe"; }; packageRequires = [ crystal-mode emacs ]; meta = { @@ -20508,9 +26525,13 @@ license = lib.licenses.free; }; }) {}; - inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inf-ruby = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inf-ruby"; + ename = "inf-ruby"; version = "2.5.1"; src = fetchFromGitHub { owner = "nonsequitur"; @@ -20518,10 +26539,10 @@ rev = "81adadf0f98122b655d0c2bee9c8074d2b6a3ee2"; sha256 = "1r452h6cyypqlc59q8dx5smkwhck4qjcg1pf9qdw539cpva5q77z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp"; - name = "inf-ruby"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20529,9 +26550,15 @@ license = lib.licenses.free; }; }) {}; - inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inflections = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inflections"; + ename = "inflections"; version = "2.5"; src = fetchFromGitHub { owner = "eschulte"; @@ -20539,10 +26566,10 @@ rev = "40a7ffdf734ffe7d1968909663146255d7ba69c8"; sha256 = "1ig1wdjg914p9ng1nir2fid4mb3xz2dbpmkdnfy1klq2zp0xw2s3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections"; sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70"; - name = "inflections"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -20550,9 +26577,13 @@ license = lib.licenses.free; }; }) {}; - info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + info-buffer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "info-buffer"; + ename = "info-buffer"; version = "0.2"; src = fetchFromGitHub { owner = "llvilanova"; @@ -20560,10 +26591,10 @@ rev = "d35dad6e766c6e2ddb8dc6acb4ce5b6e10fbcaa7"; sha256 = "0czkp7cf7qmdm1jdn67gxyxz8b4qj2kby8if50d450xqwbx0da7x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer"; sha256 = "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4"; - name = "info-buffer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20571,9 +26602,14 @@ license = lib.licenses.free; }; }) {}; - info-colors = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + info-colors = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "info-colors"; + ename = "info-colors"; version = "0.2"; src = fetchFromGitHub { owner = "ubolonton"; @@ -20581,10 +26617,10 @@ rev = "13dd9b6a7288e6bb692b210bcb9cd72016658dae"; sha256 = "1h2q19574sc1lrxm9k78668pwcg3z17bnbgykmah01zlmbs264sx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors"; sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x"; - name = "info-colors"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -20592,9 +26628,14 @@ license = lib.licenses.free; }; }) {}; - inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inherit-local = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inherit-local"; + ename = "inherit-local"; version = "1.1.1"; src = fetchFromGitHub { owner = "shlevy"; @@ -20602,10 +26643,10 @@ rev = "b1f4ff9c41f9d64e4adaf5adcc280b82f084cdc7"; sha256 = "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87"; - name = "inherit-local"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -20613,9 +26654,13 @@ license = lib.licenses.free; }; }) {}; - init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + init-loader = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "init-loader"; + ename = "init-loader"; version = "0.2"; src = fetchFromGitHub { owner = "emacs-jp"; @@ -20623,10 +26668,10 @@ rev = "128ee76adbf431f0b8c30a3a29cb20c9c5100cde"; sha256 = "031vb7ndz68x0119v4pyizz0ykd341ywcp5s7i4z35zx1vcqj8az"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e46e6ec79ff4c76fc85e13321e6dabd5797c5f45/recipes/init-loader"; sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r"; - name = "init-loader"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20634,9 +26679,14 @@ license = lib.licenses.free; }; }) {}; - init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + init-open-recentf = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "init-open-recentf"; + ename = "init-open-recentf"; version = "0.0.3"; src = fetchFromGitHub { owner = "zonuexe"; @@ -20644,10 +26694,10 @@ rev = "a4f5338a14302d44fa5aebb1ddc7aff3dc9abbe3"; sha256 = "0iph5cpz2dva1rnvp5xynmkndny87z308pziadk1qgf05mc0i61d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db8b6eced50726c788d7343137f6b4558575abf/recipes/init-open-recentf"; sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r"; - name = "init-open-recentf"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -20655,9 +26705,13 @@ license = lib.licenses.free; }; }) {}; - initsplit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + initsplit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "initsplit"; + ename = "initsplit"; version = "1.6"; src = fetchFromGitHub { owner = "dabrahams"; @@ -20665,10 +26719,10 @@ rev = "950bdc568e3fd08e6106170953caf98ac582a431"; sha256 = "1rfw38a63bvzglqx7mb8wlnzjvlmkhkn35hn66snqqgvnmnvi54g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a908c8fad08cd4d7dbb586570d0f0b384bf9071/recipes/initsplit"; sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq"; - name = "initsplit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20676,9 +26730,13 @@ license = lib.licenses.free; }; }) {}; - inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inline-crypt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inline-crypt"; + ename = "inline-crypt"; version = "0.1.4"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; @@ -20686,10 +26744,10 @@ rev = "497ce9dc29a8ccac0b6dd6854f5d120514350282"; sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b04fffe5e52f26e92930a112a64531228f94e340/recipes/inline-crypt"; sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n"; - name = "inline-crypt"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20697,9 +26755,13 @@ license = lib.licenses.free; }; }) {}; - inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inlineR = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inlineR"; + ename = "inlineR"; version = "1.0"; src = fetchFromGitHub { owner = "myuhe"; @@ -20707,10 +26769,10 @@ rev = "29357186beca825e3d0451b700ec09b9ed65e37b"; sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a7228e5f23a4e66f4510b2f6fc41c36aa791991/recipes/inlineR"; sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw"; - name = "inlineR"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20718,9 +26780,13 @@ license = lib.licenses.free; }; }) {}; - insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + insert-shebang = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "insert-shebang"; + ename = "insert-shebang"; version = "0.9.6"; src = fetchFromGitHub { owner = "psachin"; @@ -20728,10 +26794,10 @@ rev = "adfa473f07443b231914d277c20a3419b30399b6"; sha256 = "10zy3vg5fr30hhv0q3jldffhjacg1yrv5d9gfkdz55ry277l3xz1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang"; sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v"; - name = "insert-shebang"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20739,8 +26805,11 @@ license = lib.licenses.free; }; }) {}; - instapaper = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + instapaper = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "instapaper"; version = "0.9.5"; src = fetchhg { @@ -20748,7 +26817,7 @@ rev = "8daa0058ede7"; sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/instapaper"; sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn"; name = "instapaper"; @@ -20759,9 +26828,38 @@ license = lib.licenses.free; }; }) {}; - intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + intel-hex-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "intel-hex-mode"; + ename = "intel-hex-mode"; + version = "0.1.3"; + src = fetchFromGitHub { + owner = "mschuldt"; + repo = "intel-hex-mode"; + rev = "e83c94e1c31a8435a88b3ae395f2bc842ef83217"; + sha256 = "0jpc6wh3agdh38wdjr1x880iiaj6698nr8dkgx114fsfj1la6f7v"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f1bf82134671b1383f5f4d4a3c180081bea66814/recipes/intel-hex-mode"; + sha256 = "02ffbrkr3zajqhrxc3grmqm632ji4fmgnfabn42islpcfq12q3i4"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/intel-hex-mode"; + license = lib.licenses.free; + }; + }) {}; + intellij-theme = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "intellij-theme"; + ename = "intellij-theme"; version = "1.3"; src = fetchFromGitLab { owner = "fommil"; @@ -20769,10 +26867,10 @@ rev = "1bbfff8e6742d18e9b77ed796f44da3b7bd10606"; sha256 = "0ml1gi2cn6h3xm5c78vxwv327r0rgimia1vqqi9jb09yb6lckbgj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme"; sha256 = "1g8cninmq840sl8fmhq2hcsmz7nccbjmprzcl8w1zdavfp86b97g"; - name = "intellij-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20780,9 +26878,13 @@ license = lib.licenses.free; }; }) {}; - interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + interleave = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "interleave"; + ename = "interleave"; version = "1.1.0"; src = fetchFromGitHub { owner = "rudolfochrist"; @@ -20790,10 +26892,10 @@ rev = "6b28363eac939227c6cdc8a73a1d3ea5b002442d"; sha256 = "1qs6j9cz152wfy54c5d1a558l0df6wxv3djlvfl2mx58wf0sk73h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy"; - name = "interleave"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20801,20 +26903,28 @@ license = lib.licenses.free; }; }) {}; - intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: - melpaBuild { + intero = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "intero"; - version = "0.1.29"; + ename = "intero"; + version = "0.1.31"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "73997cf10277e9781682768113ebd87eeb6d2882"; - sha256 = "1mf2ddpgnyjiq2km1qc4l926xp8mj9vrszlizh39hn3acxqlac7s"; + rev = "14a31536061fa6ad643456f79abe39636c48ffd9"; + sha256 = "0gabipr8bvxhigidkivczqyv67nl6ylf0gipb0f4lxs8mcnwzcvn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; sha256 = "15n7ipsq8ylmq4blsycpszkx034j9sb92vqvaz30j5v307fmvs99"; - name = "intero"; + name = "recipe"; }; packageRequires = [ company emacs flycheck haskell-mode ]; meta = { @@ -20822,8 +26932,11 @@ license = lib.licenses.free; }; }) {}; - inverse-acme-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + inverse-acme-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "inverse-acme-theme"; version = "1.12.0"; src = fetchFromGitHub { @@ -20832,7 +26945,7 @@ rev = "e57f494fd94e49321a6396f530b8a13bae8b57df"; sha256 = "16f9vszl0f1dkjvqk5hxi570gf4l8p6fk27p0d7j11grsck0yzly"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme"; sha256 = "03g6h8dpn42qnr593ryhj22lj1h2nx4rdr1knhkvxygfv3c4lgh5"; name = "inverse-acme-theme"; @@ -20843,9 +26956,13 @@ license = lib.licenses.free; }; }) {}; - iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iplayer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iplayer"; + ename = "iplayer"; version = "0.1"; src = fetchFromGitHub { owner = "csrhodes"; @@ -20853,10 +26970,10 @@ rev = "48b664e36e1a8e37eeb3eee80b91ff7126ed449a"; sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a97667365f1c30f53a6aeeb7b909a78888eb1/recipes/iplayer"; sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r"; - name = "iplayer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20864,9 +26981,14 @@ license = lib.licenses.free; }; }) {}; - ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ipython-shell-send = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ipython-shell-send"; + ename = "ipython-shell-send"; version = "1.0.2"; src = fetchFromGitHub { owner = "jackkamm"; @@ -20874,10 +26996,10 @@ rev = "36523a387c15ee1652a5b0e291d4d4838da5e912"; sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send"; sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8"; - name = "ipython-shell-send"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -20885,9 +27007,13 @@ license = lib.licenses.free; }; }) {}; - ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ir-black-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ir-black-theme"; + ename = "ir-black-theme"; version = "1.0.1"; src = fetchFromGitHub { owner = "jmdeldin"; @@ -20895,10 +27021,10 @@ rev = "b1ca1d0778e3e6228ff756e7fdaf5f5982000fa2"; sha256 = "036q933yw7pimnnq43ydaqqfccgf4iwvjhjmsavp7l6y1w16rvmy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e725582bc322d03c9dca2b22e8606444fd8753c/recipes/ir-black-theme"; sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v"; - name = "ir-black-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20906,9 +27032,15 @@ license = lib.licenses.free; }; }) {}; - irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + irony = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "irony"; + ename = "irony"; version = "1.2.0"; src = fetchFromGitHub { owner = "Sarcasm"; @@ -20916,10 +27048,10 @@ rev = "78b06aa2df5251adaabb6c749febc1f1bd2ad605"; sha256 = "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a"; - name = "irony"; + name = "recipe"; }; packageRequires = [ cl-lib json ]; meta = { @@ -20927,9 +27059,13 @@ license = lib.licenses.free; }; }) {}; - isgd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + isgd = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "isgd"; + ename = "isgd"; version = "1.1"; src = fetchFromGitHub { owner = "chmouel"; @@ -20937,10 +27073,10 @@ rev = "764306dadd5a9213799081a48aba22f7c75cca9a"; sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5ff75b269fd57c5822277b9ed850c69b626f1a5/recipes/isgd"; sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi"; - name = "isgd"; + name = "recipe"; }; packageRequires = []; meta = { @@ -20948,20 +27084,25 @@ license = lib.licenses.free; }; }) {}; - iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iter2 = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iter2"; - version = "0.9.6"; + ename = "iter2"; + version = "0.9.7"; src = fetchFromGitHub { owner = "doublep"; repo = "iter2"; - rev = "b0e8ecebe2d6807403a5eb1c75d68a4706259d4e"; - sha256 = "038z7scy572n6cx0z59kiz59v7zqvn70wg2bwka5f3pglr67wzhp"; + rev = "f8fb8dc7230cdcd37c5d0e4e5a432125c13816d2"; + sha256 = "13q8p9cjz9c9j2l4vlwy6nvwh9y3b0aclg1b32zfdqhs6kmypisd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2"; sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65"; - name = "iter2"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -20969,9 +27110,14 @@ license = lib.licenses.free; }; }) {}; - ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ivy = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ivy"; + ename = "ivy"; version = "0.10.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -20979,10 +27125,10 @@ rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; sha256 = "0xf5p91r2ljl93wbr5wbgnb4hzhs00wkaf4fmdlf31la8xwwp5ci"; - name = "ivy"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -20990,20 +27136,31 @@ license = lib.licenses.free; }; }) {}; - ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: - melpaBuild { + ivy-bibtex = callPackage ({ biblio + , cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parsebib + , s + , swiper }: + melpaBuild { pname = "ivy-bibtex"; + ename = "ivy-bibtex"; version = "2.0.0"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca"; - sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"; + rev = "8be32be58e96e3d57b0cc667d05f98c63aa2a32e"; + sha256 = "1rsn0gxqibw2b31k3hx1fix46f3qmwp013njkpn31fzg3gckbwra"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; sha256 = "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2"; - name = "ivy-bibtex"; + name = "recipe"; }; packageRequires = [ biblio cl-lib dash f parsebib s swiper ]; meta = { @@ -21011,9 +27168,16 @@ license = lib.licenses.free; }; }) {}; - ivy-dired-history = callPackage ({ cl-lib ? null, counsel, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + ivy-dired-history = callPackage ({ cl-lib ? null + , counsel + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-dired-history"; + ename = "ivy-dired-history"; version = "1.0"; src = fetchFromGitHub { owner = "jixiuf"; @@ -21021,10 +27185,10 @@ rev = "3604840f85e4ff2d7ecab6233e820cb2ec5c8733"; sha256 = "0slisbnfcdx8jv0p67ag6s4l0m0jmrwcpm5a2jm6sai9x67ayn4l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad37f6b04ff45fbffeadefc94db16baa27bcc2ac/recipes/ivy-dired-history"; sha256 = "1vj073k5m0l8rx9iiisikzl053ad9mlhvbk30f5zmw9sw7b9blyl"; - name = "ivy-dired-history"; + name = "recipe"; }; packageRequires = [ cl-lib counsel ivy ]; meta = { @@ -21032,9 +27196,18 @@ license = lib.licenses.free; }; }) {}; - ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + ivy-erlang-complete = callPackage ({ async + , counsel + , emacs + , erlang + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-erlang-complete"; + ename = "ivy-erlang-complete"; version = "0.3.1"; src = fetchFromGitHub { owner = "s-kostyaev"; @@ -21042,10 +27215,10 @@ rev = "62e2b14ff25b0c143c882cb38d029b216acc3dd6"; sha256 = "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; sha256 = "00fqjgrhvcn3ibpgiy4b0sr4x9p6ym5r1rvi4rdzsw2i3nxmgf3a"; - name = "ivy-erlang-complete"; + name = "recipe"; }; packageRequires = [ async counsel emacs erlang ivy ]; meta = { @@ -21053,20 +27226,53 @@ license = lib.licenses.free; }; }) {}; - ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }: - melpaBuild { + ivy-feedwrangler = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ivy-feedwrangler"; + ename = "ivy-feedwrangler"; + version = "0.4.2"; + src = fetchFromGitHub { + owner = "asimpson"; + repo = "ivy-feedwrangler"; + rev = "051eac49cae32b16fab2e06ff0115cd8fb5dc499"; + sha256 = "1irp76kbg8d7wmgvfjbb4c3wmd29bdrl503jkq4w52fl57g94cvj"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1c112939545f6d157111eabcb573738b09ef7c/recipes/ivy-feedwrangler"; + sha256 = "1mxm37biix8c0s32gfv4pidffvlgdz5i9325zk71fhgfzqwkf5vx"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ivy-feedwrangler"; + license = lib.licenses.free; + }; + }) {}; + ivy-gitlab = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , gitlab + , ivy + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ivy-gitlab"; + ename = "ivy-gitlab"; version = "0.8.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4"; - sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa"; + rev = "5e2add142f26da9c8f114ea8b0a1a2c7cdeea09f"; + sha256 = "0lhmxwb653l22y8micn0ay43nsmhm7vm71qdy55ln4qzzfxn508s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab"; sha256 = "0gbwsmb6my0327f9j96s20mybnjaw9yaiwhs3sy3vav0qww91z1y"; - name = "ivy-gitlab"; + name = "recipe"; }; packageRequires = [ dash gitlab ivy s ]; meta = { @@ -21074,9 +27280,16 @@ license = lib.licenses.free; }; }) {}; - ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: - melpaBuild { + ivy-hydra = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , hydra + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-hydra"; + ename = "ivy-hydra"; version = "0.10.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -21084,10 +27297,10 @@ rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; sha256 = "1xv8nfi6dzhx868h44ydq4f5jmsa7rbqfa7jk8g0z0ifv477hrvx"; - name = "ivy-hydra"; + name = "recipe"; }; packageRequires = [ emacs hydra ivy ]; meta = { @@ -21095,20 +27308,28 @@ license = lib.licenses.free; }; }) {}; - ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }: - melpaBuild { + ivy-mpdel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , libmpdel + , melpaBuild + , mpdel }: + melpaBuild { pname = "ivy-mpdel"; - version = "0.3.0"; + ename = "ivy-mpdel"; + version = "0.4.0"; src = fetchFromGitHub { owner = "mpdel"; repo = "ivy-mpdel"; - rev = "271673afc60fdb78052cbee390f2f4e6db0f83ec"; - sha256 = "02ijq7z3j3hzaazpgdf38n02w1yid2702nc7n46bg0zs2dl10p53"; + rev = "f9f745792abfed85d535b4cb5b2a95f944bbad1d"; + sha256 = "1sxd9hny0n751irf87bab0g3ygq6j4g32gdy4yk27y3r00i9g4b6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel"; sha256 = "1v9xiy4bs7r24li6fwi5dfqav8dfr3dy0xhj3wnzvcgwxp5ji56r"; - name = "ivy-mpdel"; + name = "recipe"; }; packageRequires = [ emacs ivy libmpdel mpdel ]; meta = { @@ -21116,9 +27337,15 @@ license = lib.licenses.free; }; }) {}; - ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + ivy-pages = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "ivy-pages"; + ename = "ivy-pages"; version = "0.1.1"; src = fetchFromGitHub { owner = "igorepst"; @@ -21126,10 +27353,10 @@ rev = "428a901f94c9625c8407fd2bf76f9d7714d40d87"; sha256 = "11lcv8dqlmfqvhn7n3wfp9idr5hf30312p213y5pvs4m70lbc9k2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93f1183beb74aa4a96de8cd043a2a8eefdd7ad7e/recipes/ivy-pages"; sha256 = "0zz8nbjma8r6r7xxbg7xfz13202d77k1ybzpib41slmljzh7xgwv"; - name = "ivy-pages"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -21137,9 +27364,44 @@ license = lib.licenses.free; }; }) {}; - ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }: - melpaBuild { + ivy-prescient = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , prescient }: + melpaBuild { + pname = "ivy-prescient"; + ename = "ivy-prescient"; + version = "2.0"; + src = fetchFromGitHub { + owner = "raxod502"; + repo = "prescient.el"; + rev = "515959a2523b43608c9d06dcf8adde8911ce42b9"; + sha256 = "1k8xk154sql3b2b7hpyxslcgl88aaxq5ak2sr760jsq2qk7878bw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient"; + sha256 = "017ibpbj390q5d051k3wn50774wvcixzbwikvi5ifzqkhgixqk9c"; + name = "recipe"; + }; + packageRequires = [ emacs ivy prescient ]; + meta = { + homepage = "https://melpa.org/#/ivy-prescient"; + license = lib.licenses.free; + }; + }) {}; + ivy-purpose = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , window-purpose }: + melpaBuild { pname = "ivy-purpose"; + ename = "ivy-purpose"; version = "0.1"; src = fetchFromGitHub { owner = "bmag"; @@ -21147,10 +27409,10 @@ rev = "0495f2f3aed64d7e0028125e76a9a68f8fc4107e"; sha256 = "1hiw7mnrr0cnnp0a2mh837pzdaknadwv0sk82vya6blx0a7m691g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1fa2a37a1a6492eddf638216acec4b9d54d3498d/recipes/ivy-purpose"; sha256 = "0c5n7x3sa57wslwnldvc0i315xhyi1zndyhr07rzka1rhj8v1c4v"; - name = "ivy-purpose"; + name = "recipe"; }; packageRequires = [ emacs ivy window-purpose ]; meta = { @@ -21158,20 +27420,26 @@ license = lib.licenses.free; }; }) {}; - ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }: - melpaBuild { + ivy-rtags = callPackage ({ fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , rtags }: + melpaBuild { pname = "ivy-rtags"; + ename = "ivy-rtags"; version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; - sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; + rev = "7e6b6f21935eedbe4678ba91c5531ac162b51a5a"; + sha256 = "12629d1s8rplhjh17n3bmgnkpscq4gljgyl84j8qyhh40dwq1qk0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; sha256 = "18f0jak643dd8lmx701wgk95miajabd8190ls35831slr28lqxsq"; - name = "ivy-rtags"; + name = "recipe"; }; packageRequires = [ ivy rtags ]; meta = { @@ -21179,9 +27447,16 @@ license = lib.licenses.free; }; }) {}; - ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }: - melpaBuild { + ivy-youtube = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild + , request }: + melpaBuild { pname = "ivy-youtube"; + ename = "ivy-youtube"; version = "0.3.2"; src = fetchFromGitHub { owner = "squiter"; @@ -21189,10 +27464,10 @@ rev = "23e1089d4c4fc32db20df14ba10078aabf117e87"; sha256 = "0m70vxjj49kf8bzni2qchgzgx808z1fcfh02cflkhjcb77dkq8d6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube"; sha256 = "1masw9qc33valx55klfhzx0bg1hfazmn5yd9wh12q2gjsz8nxyw4"; - name = "ivy-youtube"; + name = "recipe"; }; packageRequires = [ cl-lib ivy request ]; meta = { @@ -21200,20 +27475,25 @@ license = lib.licenses.free; }; }) {}; - ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }: - melpaBuild { + ix = callPackage ({ fetchFromGitHub + , fetchurl + , grapnel + , lib + , melpaBuild }: + melpaBuild { pname = "ix"; + ename = "ix"; version = "0.7"; src = fetchFromGitHub { owner = "theanalyst"; repo = "ix.el"; - rev = "498dac674f4f1910d39087b1457c5da5465a0614"; - sha256 = "0rpxh1jv98dl9b5ldjkljk70z4hkl61kcmvy1lhpj3lxn8ysv87a"; + rev = "47632caf925fbb3cc8633834d2d619032d039336"; + sha256 = "1j6axmi6fxcl2ja4660ygxchggm2dzjngi0k3g6pimawykvgxs3n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a9d68fcf5bddbf07909b77682474dc592077051/recipes/ix"; sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3"; - name = "ix"; + name = "recipe"; }; packageRequires = [ grapnel ]; meta = { @@ -21221,9 +27501,13 @@ license = lib.licenses.free; }; }) {}; - iy-go-to-char = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + iy-go-to-char = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "iy-go-to-char"; + ename = "iy-go-to-char"; version = "3.2.1"; src = fetchFromGitHub { owner = "doitian"; @@ -21231,10 +27515,10 @@ rev = "77b40d64eef9dad11eca59f4e3fbc6e849de7434"; sha256 = "1mb0k4lmbkbpn6qzzg8n14pybhd5zla77ppqac6a9kw89fj2qj4i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/iy-go-to-char"; sha256 = "10szn9y7gl8947p3f9w6p6vzjf1a9cjif9mbj3qdqx4vbsl9mqpz"; - name = "iy-go-to-char"; + name = "recipe"; }; packageRequires = []; meta = { @@ -21242,9 +27526,13 @@ license = lib.licenses.free; }; }) {}; - j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + j-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "j-mode"; + ename = "j-mode"; version = "1.1.1"; src = fetchFromGitHub { owner = "zellio"; @@ -21252,10 +27540,10 @@ rev = "caa55dfaae01d1875380929826952c2b3ef8a653"; sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode"; sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i"; - name = "j-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -21263,7 +27551,11 @@ license = lib.licenses.free; }; }) {}; - jabber = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + jabber = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jabber"; version = "0.8.92"; src = fetchgit { @@ -21271,7 +27563,7 @@ rev = "2999f58619dd9c20cc6cac8060c4c850a504cbbd"; sha256 = "03x93wkd8syj2ybf5ymwcm6khx0h5nhrl8pyync1520294pq6i1i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jabber"; sha256 = "0saajvfpzgcsqa7h7aa6l0bns6swr40c46md6s0d90x9lrvwp7ws"; name = "jabber"; @@ -21282,9 +27574,13 @@ license = lib.licenses.free; }; }) {}; - jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jade-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jade-mode"; + ename = "jade-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "brianc"; @@ -21292,10 +27588,10 @@ rev = "4e7a20db492719062f40b225ed730ed50be5db56"; sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/877b5a3e612e1b1d6d51e60c66b0b79f231abdb2/recipes/jade-mode"; sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94"; - name = "jade-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -21303,9 +27599,13 @@ license = lib.licenses.free; }; }) {}; - jammer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jammer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jammer"; + ename = "jammer"; version = "0.1.1"; src = fetchFromGitHub { owner = "wasamasa"; @@ -21313,10 +27613,10 @@ rev = "1ba232b71507b468c60dc53c2bc8888bef36c858"; sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cb82a6e936e2d5d1dd5930b600ede52dac3ceb33/recipes/jammer"; sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z"; - name = "jammer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -21324,9 +27624,13 @@ license = lib.licenses.free; }; }) {}; - japanlaw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + japanlaw = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "japanlaw"; + ename = "japanlaw"; version = "0.9.1"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -21334,10 +27638,10 @@ rev = "d90b204b018893d5d75286c92948c0bddf94cce2"; sha256 = "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6192e1db76f017c3b1315453144cffc47cdd495d/recipes/japanlaw"; sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa"; - name = "japanlaw"; + name = "recipe"; }; packageRequires = []; meta = { @@ -21345,9 +27649,16 @@ license = lib.licenses.free; }; }) {}; - java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: - melpaBuild { + java-imports = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , s }: + melpaBuild { pname = "java-imports"; + ename = "java-imports"; version = "0.1.0"; src = fetchFromGitHub { owner = "dakrone"; @@ -21355,10 +27666,10 @@ rev = "275f354c245df741b45e88d085660722e81a12be"; sha256 = "1bngn6v6w60qb3zz7s3px7v3wk99a3hfvzrg9l06dz1q7xgyvsi1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f6f4e4c14c422c2066f2200bb9b8f35e2ecc896/recipes/java-imports"; sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98"; - name = "java-imports"; + name = "recipe"; }; packageRequires = [ emacs pcache s ]; meta = { @@ -21366,9 +27677,14 @@ license = lib.licenses.free; }; }) {}; - javadoc-lookup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + javadoc-lookup = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "javadoc-lookup"; + ename = "javadoc-lookup"; version = "1.1.0"; src = fetchFromGitHub { owner = "skeeto"; @@ -21376,10 +27692,10 @@ rev = "507a2dd443d60b537b8f779c1847e2cd0ccd1382"; sha256 = "16gywcma1s8kslwznlxwlx0xj0gs5g31637kb74vfdplk48f04zj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d5f55c7d90181cc4eff68bb472f772f070a93/recipes/javadoc-lookup"; sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79"; - name = "javadoc-lookup"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -21387,9 +27703,14 @@ license = lib.licenses.free; }; }) {}; - jdecomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jdecomp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jdecomp"; + ename = "jdecomp"; version = "0.2.0"; src = fetchFromGitHub { owner = "xiongtx"; @@ -21397,10 +27718,10 @@ rev = "1590b06f139f036c1041e1ce5c0acccaa24b31a7"; sha256 = "0sb9vzn6cycys31r98kxwgpn7v9aw5ck86nkskmn9hhhkrfsabii"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jdecomp"; sha256 = "1vgjmz7rxvgy9lprzr5b018lzqy3h0zg8913la1bzgwlm3mr68y5"; - name = "jdecomp"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -21408,9 +27729,16 @@ license = lib.licenses.free; }; }) {}; - jedi = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }: - melpaBuild { + jedi = callPackage ({ auto-complete + , emacs + , fetchFromGitHub + , fetchurl + , jedi-core + , lib + , melpaBuild }: + melpaBuild { pname = "jedi"; + ename = "jedi"; version = "0.2.7"; src = fetchFromGitHub { owner = "tkf"; @@ -21418,10 +27746,10 @@ rev = "8da022c8cda511428c72a6dc4c5be3c0a0c88584"; sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi"; sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4"; - name = "jedi"; + name = "recipe"; }; packageRequires = [ auto-complete emacs jedi-core ]; meta = { @@ -21429,9 +27757,17 @@ license = lib.licenses.free; }; }) {}; - jedi-core = callPackage ({ cl-lib ? null, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, python-environment }: - melpaBuild { + jedi-core = callPackage ({ cl-lib ? null + , emacs + , epc + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , python-environment }: + melpaBuild { pname = "jedi-core"; + ename = "jedi-core"; version = "0.2.7"; src = fetchFromGitHub { owner = "tkf"; @@ -21439,10 +27775,10 @@ rev = "8da022c8cda511428c72a6dc4c5be3c0a0c88584"; sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi-core"; sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f"; - name = "jedi-core"; + name = "recipe"; }; packageRequires = [ cl-lib emacs epc python-environment ]; meta = { @@ -21450,9 +27786,16 @@ license = lib.licenses.free; }; }) {}; - jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jetbrains = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jetbrains"; + ename = "jetbrains"; version = "0.0.2"; src = fetchFromGitHub { owner = "emacs-php"; @@ -21460,10 +27803,10 @@ rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8"; sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains"; sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7"; - name = "jetbrains"; + name = "recipe"; }; packageRequires = [ cl-lib emacs f ]; meta = { @@ -21471,9 +27814,13 @@ license = lib.licenses.free; }; }) {}; - jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jinja2-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jinja2-mode"; + ename = "jinja2-mode"; version = "0.2"; src = fetchFromGitHub { owner = "paradoxxxzero"; @@ -21481,10 +27828,10 @@ rev = "cfaa7bbe7bb290cc500440124ce89686f3e26f86"; sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b79196cf0dc0b436ff75eabea369a62f92825d9f/recipes/jinja2-mode"; sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx"; - name = "jinja2-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -21492,9 +27839,15 @@ license = lib.licenses.free; }; }) {}; - jpop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jpop = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jpop"; + ename = "jpop"; version = "3.2.3"; src = fetchFromGitHub { owner = "domtronn"; @@ -21502,10 +27855,10 @@ rev = "f3eed65e54dc2daaa7678e6eb169d35c4a7d1e63"; sha256 = "17wiv1b8c56c2zi9b9mjm37kl7yc735nk3188wnmq3fqjgdpwpwg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a52a3cf909d12201196b92685435f9fa338b7ba/recipes/jpop"; sha256 = "00chh1aqnkkkhdp44sapdjx37cbn92g42wapdq7kcl8v1v0xmnjr"; - name = "jpop"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -21513,9 +27866,14 @@ license = lib.licenses.free; }; }) {}; - jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jq-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jq-mode"; + ename = "jq-mode"; version = "0.3.0"; src = fetchFromGitHub { owner = "ljos"; @@ -21523,10 +27881,10 @@ rev = "8384a1926cc22000e5e42f86f28d807fd6149f8e"; sha256 = "0fa84jln0vddrc218s8scz6hx12ym0wimh6dm58wqxias7gm9fgk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin"; - name = "jq-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -21534,20 +27892,25 @@ license = lib.licenses.free; }; }) {}; - js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + js-auto-format-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "js-auto-format-mode"; + ename = "js-auto-format-mode"; version = "1.1.0"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "6bd44162ac422304803f606278bb0c08ab940a5d"; - sha256 = "1hy4wyw7yi93ngagg9qmkljjqaypfnzks3vny1pn6d5nw2acb1vx"; + rev = "1558fb539e0beb7f98901280d695968a2351384d"; + sha256 = "16l2mjklazmfpdin3vz3ddf083phhyrhi18n0rfhv5rwh9m23wr9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs"; - name = "js-auto-format-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -21555,9 +27918,14 @@ license = lib.licenses.free; }; }) {}; - js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + js-comint = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "js-comint"; + ename = "js-comint"; version = "1.1.1"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -21565,10 +27933,10 @@ rev = "83e932e4a83d1a69098ee87e0ab911d299368e60"; sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1"; - name = "js-comint"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -21576,9 +27944,14 @@ license = lib.licenses.free; }; }) {}; - js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: - melpaBuild { + js2-closure = callPackage ({ fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild }: + melpaBuild { pname = "js2-closure"; + ename = "js2-closure"; version = "2.2.1"; src = fetchFromGitHub { owner = "jart"; @@ -21586,10 +27959,10 @@ rev = "74a75f001a8bc2b9c02b9e8b4557f7ee3c5f84fb"; sha256 = "1gapx656s4ngy8s8y1p56xxnclwf4qqg83l3jizknxky7yhayyl9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bf3e70ae38a78184f0b373ff6f0db234f51cb2/recipes/js2-closure"; sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7"; - name = "js2-closure"; + name = "recipe"; }; packageRequires = [ js2-mode ]; meta = { @@ -21597,9 +27970,14 @@ license = lib.licenses.free; }; }) {}; - js2-highlight-vars = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: - melpaBuild { + js2-highlight-vars = callPackage ({ fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild }: + melpaBuild { pname = "js2-highlight-vars"; + ename = "js2-highlight-vars"; version = "0.1.0"; src = fetchFromGitHub { owner = "unhammer"; @@ -21607,10 +27985,10 @@ rev = "bf38d12cf65eebc8b81866fd03f6a0389bb2a9ed"; sha256 = "0r2szaxr3q0gvxqd9asn03q8jf3nclxv4mqdsjn96s98n45x388l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f4a7c90be2e032277ae87b8de36d2e3f6146f09/recipes/js2-highlight-vars"; sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475"; - name = "js2-highlight-vars"; + name = "recipe"; }; packageRequires = [ js2-mode ]; meta = { @@ -21618,9 +27996,15 @@ license = lib.licenses.free; }; }) {}; - js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + js2-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "js2-mode"; + ename = "js2-mode"; version = "20180301"; src = fetchFromGitHub { owner = "mooz"; @@ -21628,10 +28012,10 @@ rev = "38e425785d5ea4600c3642f6500062ecedf694a4"; sha256 = "1afvm8cp9h0v0pk7v3jwag6f608v1787l7m7a9541ld616cgb5x7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv"; - name = "js2-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -21639,9 +28023,18 @@ license = lib.licenses.free; }; }) {}; - js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: - melpaBuild { + js2-refactor = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild + , multiple-cursors + , s + , yasnippet }: + melpaBuild { pname = "js2-refactor"; + ename = "js2-refactor"; version = "0.9.0"; src = fetchFromGitHub { owner = "magnars"; @@ -21649,10 +28042,10 @@ rev = "089c7800e3e7b0a89ee2392037ac07851bcee298"; sha256 = "1iwblf5i7k1i1ax9pjv7n8zv9q157krirdn0gwcib6dwza2i30jp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r"; - name = "js2-refactor"; + name = "recipe"; }; packageRequires = [ dash js2-mode multiple-cursors s yasnippet ]; meta = { @@ -21660,20 +28053,24 @@ license = lib.licenses.free; }; }) {}; - js3-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + js3-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "js3-mode"; + ename = "js3-mode"; version = "1.1.0"; src = fetchFromGitHub { owner = "thomblake"; repo = "js3-mode"; - rev = "5ccda46ba39998a74bd724fdffb34634be5b6563"; - sha256 = "17d0nf1kz7mgv5qz57q6khy4w5vrmsliqirggahk9s6nnsx1j56n"; + rev = "a1943e3b69ccf7592ef6e3c992c06af978823da5"; + sha256 = "1ild74qgx88gxrsmza5zjn51636zwxyc1j1c31m1xfw0najvl0dd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/805a7c7fee2bafd8785813963bf91ac1ca417fd1/recipes/js3-mode"; sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r"; - name = "js3-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -21681,20 +28078,24 @@ license = lib.licenses.free; }; }) {}; - jsfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jsfmt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jsfmt"; + ename = "jsfmt"; version = "0.2.0"; src = fetchFromGitHub { owner = "brettlangdon"; repo = "jsfmt.el"; - rev = "c5d9742872509143db0250a77db705ef78f02cd0"; - sha256 = "0pjmslxwmlb9cb3j5qfsyxq1lg1ywzw1p9dvj330c2m7nla1j70x"; + rev = "192a3db81145c6fb9c0a9830db01ac4ec4f5d677"; + sha256 = "07bnvacmg6xm8r8ksiv7zkaghmad3s1qwy00fsy5pa47spxm3lxn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ddc99843dec18a295dfc36e7b429f0e1ab7fb71/recipes/jsfmt"; sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd"; - name = "jsfmt"; + name = "recipe"; }; packageRequires = []; meta = { @@ -21702,9 +28103,15 @@ license = lib.licenses.free; }; }) {}; - json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }: - melpaBuild { + json-mode = callPackage ({ fetchFromGitHub + , fetchurl + , json-reformat + , json-snatcher + , lib + , melpaBuild }: + melpaBuild { pname = "json-mode"; + ename = "json-mode"; version = "1.7.0"; src = fetchFromGitHub { owner = "joshwnj"; @@ -21712,10 +28119,10 @@ rev = "9ba01b868a6b138feeff82b9eb0abd331d29325f"; sha256 = "0i79lqzdg59vkqwjd3q092xxn9vhxspb1vn4pkis0vfvn46g01jy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode"; sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70"; - name = "json-mode"; + name = "recipe"; }; packageRequires = [ json-reformat json-snatcher ]; meta = { @@ -21723,9 +28130,15 @@ license = lib.licenses.free; }; }) {}; - json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }: - melpaBuild { + json-navigator = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , hierarchy + , lib + , melpaBuild }: + melpaBuild { pname = "json-navigator"; + ename = "json-navigator"; version = "0.1.0"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -21733,10 +28146,10 @@ rev = "bc5634fc78d2e43ebd3c255350829877f3e4549c"; sha256 = "1j2lic9sn00j6pzq5qslv9m2z0rvsxkvz73z8swp7vcrsgz7qvqd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator"; sha256 = "0yfl31cg0mkgsbpgx00m9h2cxnhsavcf7zlspb0qr4g2zq6ya1wx"; - name = "json-navigator"; + name = "recipe"; }; packageRequires = [ emacs hierarchy ]; meta = { @@ -21744,9 +28157,13 @@ license = lib.licenses.free; }; }) {}; - json-reformat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + json-reformat = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "json-reformat"; + ename = "json-reformat"; version = "0.0.6"; src = fetchFromGitHub { owner = "gongo"; @@ -21754,10 +28171,10 @@ rev = "b9bd375ec1deb10d2ba09c409bdcf99c56d7a716"; sha256 = "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c7976237f327fdfa58eea26ac8679f40ef3163/recipes/json-reformat"; sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na"; - name = "json-reformat"; + name = "recipe"; }; packageRequires = []; meta = { @@ -21765,9 +28182,14 @@ license = lib.licenses.free; }; }) {}; - json-snatcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + json-snatcher = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "json-snatcher"; + ename = "json-snatcher"; version = "1.0.0"; src = fetchFromGitHub { owner = "Sterlingg"; @@ -21775,10 +28197,10 @@ rev = "c4cecc0a5051bd364373aa499c47a1bb7a5ac51c"; sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/990de179e20c169aa02ffec42c89f18ce02239c8/recipes/json-snatcher"; sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4"; - name = "json-snatcher"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -21786,20 +28208,25 @@ license = lib.licenses.free; }; }) {}; - jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jsonnet-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jsonnet-mode"; + ename = "jsonnet-mode"; version = "0.0.1"; src = fetchFromGitHub { owner = "mgyucht"; repo = "jsonnet-mode"; - rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1"; - sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29"; + rev = "a729ccf20aa04041b0dfe1178ba70d750f648e2f"; + sha256 = "1ry95sv9ydcr3da16gjjh26wrn4ssf06c5zv084s33id6cipg2n3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode"; sha256 = "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia"; - name = "jsonnet-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -21807,9 +28234,13 @@ license = lib.licenses.free; }; }) {}; - jsx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jsx-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jsx-mode"; + ename = "jsx-mode"; version = "0.1.10"; src = fetchFromGitHub { owner = "jsx"; @@ -21817,10 +28248,10 @@ rev = "1ca260b76f6e6251c528ed89501597a5b456c179"; sha256 = "1wx28rr5dk238yz07xn95v88qmv10c1gz9pcxard2kszpnmrn6dx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dea24e922f18c1f7e1b97da07ba2e4f33170557/recipes/jsx-mode"; sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b"; - name = "jsx-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -21828,20 +28259,27 @@ license = lib.licenses.free; }; }) {}; - jump = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }: - melpaBuild { + jump = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , findr + , inflections + , lib + , melpaBuild }: + melpaBuild { pname = "jump"; + ename = "jump"; version = "2.5"; src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; - rev = "40a7ffdf734ffe7d1968909663146255d7ba69c8"; - sha256 = "1ig1wdjg914p9ng1nir2fid4mb3xz2dbpmkdnfy1klq2zp0xw2s3"; + rev = "9519c675e8a650f6afade7d870e925d0fb50f112"; + sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump"; sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364"; - name = "jump"; + name = "recipe"; }; packageRequires = [ cl-lib findr inflections ]; meta = { @@ -21849,9 +28287,13 @@ license = lib.licenses.free; }; }) {}; - jump-to-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jump-to-line = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jump-to-line"; + ename = "jump-to-line"; version = "0.2.0"; src = fetchFromGitHub { owner = "ongaeshi"; @@ -21859,10 +28301,10 @@ rev = "01ef8c3529d85e6c59cc20840acbc4a8e8325bc8"; sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b6c700a28b65cbbad36a9bbaf88cc36c8191eb0/recipes/jump-to-line"; sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr"; - name = "jump-to-line"; + name = "recipe"; }; packageRequires = []; meta = { @@ -21870,9 +28312,15 @@ license = lib.licenses.free; }; }) {}; - jvm-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + jvm-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "jvm-mode"; + ename = "jvm-mode"; version = "0.2.0"; src = fetchFromGitHub { owner = "martintrojer"; @@ -21880,10 +28328,10 @@ rev = "16d84c8c80bb214367bae6ed30b08756521c27d6"; sha256 = "1785nsv61m51lpykai2wxrv6zmwbm5654v937fgw177p37054s83"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdb7d7d7b955405eb6357277b5d049df8aa85ce/recipes/jvm-mode"; sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w"; - name = "jvm-mode"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -21891,9 +28339,14 @@ license = lib.licenses.free; }; }) {}; - kaesar = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kaesar = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kaesar"; + ename = "kaesar"; version = "0.9.0"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -21901,10 +28354,10 @@ rev = "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea"; sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fac8639e59dc923ea31da1f84a99f83d51b47/recipes/kaesar"; sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l"; - name = "kaesar"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -21912,9 +28365,14 @@ license = lib.licenses.free; }; }) {}; - kaesar-file = callPackage ({ fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }: - melpaBuild { + kaesar-file = callPackage ({ fetchFromGitHub + , fetchurl + , kaesar + , lib + , melpaBuild }: + melpaBuild { pname = "kaesar-file"; + ename = "kaesar-file"; version = "0.9.0"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -21922,10 +28380,10 @@ rev = "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea"; sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fac8639e59dc923ea31da1f84a99f83d51b47/recipes/kaesar-file"; sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc"; - name = "kaesar-file"; + name = "recipe"; }; packageRequires = [ kaesar ]; meta = { @@ -21933,9 +28391,15 @@ license = lib.licenses.free; }; }) {}; - kaesar-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }: - melpaBuild { + kaesar-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , kaesar + , lib + , melpaBuild }: + melpaBuild { pname = "kaesar-mode"; + ename = "kaesar-mode"; version = "0.9.0"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -21943,10 +28407,10 @@ rev = "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea"; sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fac8639e59dc923ea31da1f84a99f83d51b47/recipes/kaesar-mode"; sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry"; - name = "kaesar-mode"; + name = "recipe"; }; packageRequires = [ cl-lib kaesar ]; meta = { @@ -21954,9 +28418,14 @@ license = lib.licenses.free; }; }) {}; - kakapo-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kakapo-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kakapo-mode"; + ename = "kakapo-mode"; version = "1.2"; src = fetchFromGitHub { owner = "listx"; @@ -21964,10 +28433,10 @@ rev = "fe3d579867f7465cd3ad04f29b4b2b3b820edc01"; sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode"; sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss"; - name = "kakapo-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -21975,20 +28444,27 @@ license = lib.licenses.free; }; }) {}; - kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kaolin-themes = callPackage ({ autothemer + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kaolin-themes"; - version = "1.3.1"; + ename = "kaolin-themes"; + version = "1.3.5"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "8a229fcd1d73876920a063f0eba906a5080275a7"; - sha256 = "0w35862sjyizj7grb9ixjns8kpxq2wgdgn1n06jdhmnnaqdyq911"; + rev = "e183b7adb06338046f1a17a94e18ec67e62d4e42"; + sha256 = "1mvspqll53p8rz66588lvdflwfx4av6cnzigid6n10d1cy35p5vg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw"; - name = "kaolin-themes"; + name = "recipe"; }; packageRequires = [ autothemer cl-lib emacs ]; meta = { @@ -21996,20 +28472,24 @@ license = lib.licenses.free; }; }) {}; - karma = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + karma = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "karma"; + ename = "karma"; version = "0.1.0"; src = fetchFromGitHub { owner = "tonini"; repo = "karma.el"; - rev = "f4ee856e7f59649e9d9021c46f872f9b4f5b7e6e"; - sha256 = "0avcg307r4navvgj3hjkggk4gr7mzs4mljhxh223r8g69l9bm6m8"; + rev = "940b8b8f228b04f2dbd9f9f4451ffa561a35af93"; + sha256 = "0ha4y7p100n2qkin9f4kna0s9ysa6dgvvvmgvqgnbz8x5v2ak22y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/681e12556c3ab3e2a8376d5c7c33ee5a213de650/recipes/karma"; sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc"; - name = "karma"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22017,9 +28497,13 @@ license = lib.licenses.free; }; }) {}; - key-chord = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + key-chord = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "key-chord"; + ename = "key-chord"; version = "0.6"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -22027,10 +28511,10 @@ rev = "8468998946367157830df19a1e92785d22a34178"; sha256 = "10ldhwp9a21r9g72hzaig1h5yh2zblny0r36nf5nz6gzikfcq0cd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/key-chord"; sha256 = "1g0jqmnn575h5n4figxbc5xs76zl8b1cdqa6wbi3d1p2rn3g8scr"; - name = "key-chord"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22038,9 +28522,13 @@ license = lib.licenses.free; }; }) {}; - key-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + key-combo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "key-combo"; + ename = "key-combo"; version = "1.6"; src = fetchFromGitHub { owner = "uk-ar"; @@ -22048,10 +28536,10 @@ rev = "0bc0cf6466a4257047a21a6d01913e92e6862165"; sha256 = "14ijniyvcfmj4y77yhiplsclincng2r3jbdnmmdnwzliv65f7l6q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/99b422ef5f7b9dda894207e3133791fb9963a092/recipes/key-combo"; sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf"; - name = "key-combo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22059,9 +28547,14 @@ license = lib.licenses.free; }; }) {}; - key-seq = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: - melpaBuild { + key-seq = callPackage ({ fetchFromGitHub + , fetchurl + , key-chord + , lib + , melpaBuild }: + melpaBuild { pname = "key-seq"; + ename = "key-seq"; version = "1.0.1"; src = fetchFromGitHub { owner = "vlevit"; @@ -22069,10 +28562,10 @@ rev = "e29b083a6427d061638749194fc249ef69ad2cc0"; sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d54ab1b6973a44362e50559dd91344d0b17f513/recipes/key-seq"; sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74"; - name = "key-seq"; + name = "recipe"; }; packageRequires = [ key-chord ]; meta = { @@ -22080,20 +28573,25 @@ license = lib.licenses.free; }; }) {}; - keycast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keycast = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keycast"; + ename = "keycast"; version = "0.1.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "keycast"; - rev = "46370b8a72922902921d3ed2fa194564568053dc"; - sha256 = "0wgicba3v5l7a0wmmr3awf026vhf4grrn8c4i2hipi9ij3wckqzc"; + rev = "0d28c26b07a062ab58c01c6cbedc3e68bd4ec8a1"; + sha256 = "0wfy5wbr150y57mlzsxhb6bq9ycqj2jk5i6nhwl4q8b6xd3mh6p6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast"; sha256 = "19qq5y1zjp3029kfq0c59xl9xnxqmdn2pd04sblznchcr9jdy5id"; - name = "keycast"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -22101,9 +28599,13 @@ license = lib.licenses.free; }; }) {}; - keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keychain-environment = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keychain-environment"; + ename = "keychain-environment"; version = "2.4.1"; src = fetchFromGitHub { owner = "tarsius"; @@ -22111,10 +28613,10 @@ rev = "d3643196de6dc79ea77f9f4805028350fd76100b"; sha256 = "0wzs77nwal6apinc39d4arj3lralv2cb9aw9gkikk46fgk404hwj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4382c9e7e8dee2cafea9ee49965d0952ca359dd5/recipes/keychain-environment"; sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v"; - name = "keychain-environment"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22122,9 +28624,13 @@ license = lib.licenses.free; }; }) {}; - keydef = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keydef = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keydef"; + ename = "keydef"; version = "1.15"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -22132,10 +28638,10 @@ rev = "dff2be9f58d12d8c6a490ad0c1b2b10b55528dc0"; sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/keydef"; sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992"; - name = "keydef"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22143,9 +28649,13 @@ license = lib.licenses.free; }; }) {}; - keyfreq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keyfreq = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keyfreq"; + ename = "keyfreq"; version = "1.8"; src = fetchFromGitHub { owner = "dacap"; @@ -22153,10 +28663,10 @@ rev = "f3a96693e2e4c6893198a0223e3f3c648ae09cec"; sha256 = "1x87mbnzkggx5llh0i0s3sj1nfw7liwnlqc9csya517w4x5mhl8i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd7157bad0f3039321b5b279a88e7e4fce895543/recipes/keyfreq"; sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7"; - name = "keyfreq"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22164,9 +28674,14 @@ license = lib.licenses.free; }; }) {}; - keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keymap-utils = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keymap-utils"; + ename = "keymap-utils"; version = "3.0.1"; src = fetchFromGitHub { owner = "tarsius"; @@ -22174,10 +28689,10 @@ rev = "1ad766dbc111ec78b1a292da97b9bd4856cd2ff7"; sha256 = "0imx8zp21bm066bzdynvasylrlhw0gr8mpk2bwkz8j1y5lsp54v8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9"; - name = "keymap-utils"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -22185,9 +28700,15 @@ license = lib.licenses.free; }; }) {}; - keyset = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + keyset = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "keyset"; + ename = "keyset"; version = "0.1.2"; src = fetchFromGitHub { owner = "HKey"; @@ -22195,10 +28716,10 @@ rev = "25658ef79d26971ce41d9df207dff58d38daa091"; sha256 = "0z6sgz8nywsd00zaayafwy5hfi7kzxfifjkfr5cn1l7wlypyksfv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bad8a1f1b94fbfbde5d8035f7e22431e64a9eec/recipes/keyset"; sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg"; - name = "keyset"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -22206,9 +28727,15 @@ license = lib.licenses.free; }; }) {}; - kibit-helper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + kibit-helper = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "kibit-helper"; + ename = "kibit-helper"; version = "0.1.1"; src = fetchFromGitHub { owner = "brunchboy"; @@ -22216,10 +28743,10 @@ rev = "ec5f154db3bb0c838e86f527353f08644cede926"; sha256 = "0ky167xh1hrmqsldybzjhyqjizgjzs1grn5mf8sm2j9qwcvjw2zv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f7fee551ca9ed226f1285dffe87027e1e1047f65/recipes/kibit-helper"; sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s"; - name = "kibit-helper"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -22227,9 +28754,15 @@ license = lib.licenses.free; }; }) {}; - kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kill-or-bury-alive = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kill-or-bury-alive"; + ename = "kill-or-bury-alive"; version = "0.1.3"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -22237,10 +28770,10 @@ rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041"; sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8"; - name = "kill-or-bury-alive"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -22248,9 +28781,13 @@ license = lib.licenses.free; }; }) {}; - kill-ring-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kill-ring-search = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kill-ring-search"; + ename = "kill-ring-search"; version = "1.1"; src = fetchFromGitHub { owner = "nschum"; @@ -22258,10 +28795,10 @@ rev = "3a5bc1767f742c91aa788df79ecec836a0946edb"; sha256 = "0axvhikhg4fikiz4ifg0p4a5ygphbpjs0wd0gcbx29n0y54d1i93"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kill-ring-search"; sha256 = "1jggi6r5j2dr9y17v4cyskc0wydfdpqgp1pib5dr2kg6n6w0s5xl"; - name = "kill-ring-search"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22269,9 +28806,13 @@ license = lib.licenses.free; }; }) {}; - killer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + killer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "killer"; + ename = "killer"; version = "0.2.2"; src = fetchFromGitHub { owner = "tarsius"; @@ -22279,10 +28820,10 @@ rev = "52256640aebbb8c25f8527843c2425b848031cd8"; sha256 = "0imylcaiwpzvvb3g8kpsna1vk7v7bwdjfcsa98i41m1rv9yla86l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd8c3ec8fa272273128134dea96c0c999a524549/recipes/killer"; sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma"; - name = "killer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22290,20 +28831,24 @@ license = lib.licenses.free; }; }) {}; - kivy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kivy-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kivy-mode"; - version = "1.10.0"; + ename = "kivy-mode"; + version = "1.10.1"; src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "a4116a58d7c5448a4c6615021302375cbe3e129a"; - sha256 = "070ybsn66spb82jp1fzrnkn6xlbn7jn8zprmxkz8jv0lf5lg6ggk"; + rev = "0c63c698fdf3f283581dcb53f2909a0bf7ab2737"; + sha256 = "0jn16i7qnf80irxi149cfn8z38czii8paazfs8mz1qzgmx2ycj2i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1"; - name = "kivy-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22311,9 +28856,15 @@ license = lib.licenses.free; }; }) {}; - kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + kiwix = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "kiwix"; + ename = "kiwix"; version = "0.4.0"; src = fetchFromGitHub { owner = "stardiviner"; @@ -22321,10 +28872,10 @@ rev = "b84a5ff33efdf13dda22ed32ea37a09b15cd1690"; sha256 = "07nb141hxjabin8vr14hpn80vzrjaq1b3h6p76m0bwxvzbi8765r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix"; sha256 = "0x5ld557kxzx5s8ziy5axgvm1fxlq81l9gvinfgs8f257vjlki07"; - name = "kiwix"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -22332,20 +28883,24 @@ license = lib.licenses.free; }; }) {}; - know-your-http-well = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + know-your-http-well = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "know-your-http-well"; + ename = "know-your-http-well"; version = "0.5.0"; src = fetchFromGitHub { owner = "for-GET"; repo = "know-your-http-well"; - rev = "c381a9735f3ea86ebc9667e35cdfeab0b67fefb7"; - sha256 = "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k"; + rev = "ab8cf84ad8031ff85b983c528ebb7117dc784aad"; + sha256 = "19qky551arnb7gl7w0yp54kkdls03m9wn9bxnr7hm5nv1bml2y64"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ab50ae6278022281b2b7297c086089e5e669c7a/recipes/know-your-http-well"; sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q"; - name = "know-your-http-well"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22353,20 +28908,25 @@ license = lib.licenses.free; }; }) {}; - ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ksp-cfg-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ksp-cfg-mode"; - version = "0.5"; + ename = "ksp-cfg-mode"; + version = "0.5.1"; src = fetchFromGitHub { owner = "lashtear"; repo = "ksp-cfg-mode"; - rev = "713a22ee28688e581ec3ad60228c853b516a14b6"; - sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3"; + rev = "fda64705f605fb8fccee53a5040fe4865ca17d44"; + sha256 = "19brscxk85cky2kzwyyljz6xqrfvyyyg7dqmadlnlrf8kw9wnb2x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode"; sha256 = "0azcn4qvziacbw1qy33fwdaldw7xpzr672vzjsqhr0b2vg9m2ipi"; - name = "ksp-cfg-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -22374,9 +28934,16 @@ license = lib.licenses.free; }; }) {}; - kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + kubernetes = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "kubernetes"; + ename = "kubernetes"; version = "0.12.0"; src = fetchFromGitHub { owner = "chrisbarrett"; @@ -22384,10 +28951,10 @@ rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c"; sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes"; sha256 = "06357a8y3rpvid03r9vhmjgq97hmiah5g8gff32dij9424vidil9"; - name = "kubernetes"; + name = "recipe"; }; packageRequires = [ dash emacs magit ]; meta = { @@ -22395,9 +28962,15 @@ license = lib.licenses.free; }; }) {}; - kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }: - melpaBuild { + kubernetes-evil = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , kubernetes + , lib + , melpaBuild }: + melpaBuild { pname = "kubernetes-evil"; + ename = "kubernetes-evil"; version = "0.12.0"; src = fetchFromGitHub { owner = "chrisbarrett"; @@ -22405,10 +28978,10 @@ rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c"; sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil"; sha256 = "12ygfs6g9aivf2ws3lxwjm5xnd2kidhli889icpygd5v7gnk9pg8"; - name = "kubernetes-evil"; + name = "recipe"; }; packageRequires = [ evil kubernetes ]; meta = { @@ -22416,9 +28989,15 @@ license = lib.licenses.free; }; }) {}; - kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + kurecolor = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "kurecolor"; + ename = "kurecolor"; version = "1.2.6"; src = fetchFromGitHub { owner = "emacsfodder"; @@ -22426,10 +29005,10 @@ rev = "a27153f6a01f38226920772dc4917b73166da5e6"; sha256 = "04av67q5841jli6rp39hav3a5gr2vcf3db4qsv553i23ffplb955"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor"; sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f"; - name = "kurecolor"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -22437,9 +29016,13 @@ license = lib.licenses.free; }; }) {}; - labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + labburn-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "labburn-theme"; + ename = "labburn-theme"; version = "1.0.0"; src = fetchFromGitHub { owner = "ksjogo"; @@ -22447,10 +29030,10 @@ rev = "bfa1d9f1c7e107cb45754fe57e4e72a9be70e9d1"; sha256 = "1r221fwfigr6fk4p3xh00wgw9wxm2gpzvj17jf5pgd7cvyspchsy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; sha256 = "09qqb62hfga88zka0pc27rc8i43cxi84cv1x8wj0vvzx6mvic1lm"; - name = "labburn-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22458,20 +29041,25 @@ license = lib.licenses.free; }; }) {}; - langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + langtool = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "langtool"; - version = "1.6.0"; + ename = "langtool"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "d976e4f0cadb2309b798540429558936f8f45889"; - sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh"; + rev = "d93286722cff3fecf8641a4a6c3b0691f30362fe"; + sha256 = "17xa055705n4jb7nafqvqgl0a6fdaxp3b3q8q0gsv5vzycsc74ga"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw"; - name = "langtool"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -22479,9 +29067,15 @@ license = lib.licenses.free; }; }) {}; - latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + latex-extra = callPackage ({ auctex + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "latex-extra"; + ename = "latex-extra"; version = "1.14"; src = fetchFromGitHub { owner = "Malabarba"; @@ -22489,10 +29083,10 @@ rev = "82d99b8b0c2db20e5270749582e03bcc2443ffb5"; sha256 = "15m7zvdhg5z7d8alrw66p703wdp5r57lxrgq3zz7xc4hscwghlb1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra"; sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj"; - name = "latex-extra"; + name = "recipe"; }; packageRequires = [ auctex cl-lib ]; meta = { @@ -22500,9 +29094,13 @@ license = lib.licenses.free; }; }) {}; - latex-math-preview = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + latex-math-preview = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "latex-math-preview"; + ename = "latex-math-preview"; version = "0.7.2"; src = fetchFromGitLab { owner = "latex-math-preview"; @@ -22510,10 +29108,10 @@ rev = "c1c87c4c5501f98b97af19f7e3454a2369265edc"; sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e413b7684e9199510b00035825aa861d670e072/recipes/latex-math-preview"; sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr"; - name = "latex-math-preview"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22521,9 +29119,13 @@ license = lib.licenses.free; }; }) {}; - latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + latex-unicode-math-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "latex-unicode-math-mode"; + ename = "latex-unicode-math-mode"; version = "0.3.1"; src = fetchFromGitHub { owner = "Christoph-D"; @@ -22531,10 +29133,10 @@ rev = "3b82347291edcb32e4062b0048c367a3079b3e8c"; sha256 = "1xylfg8xpyb2m0qnysf58cl05ibbg4drhgq7msiiql2qrdzvpx9f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode"; sha256 = "1p9gpp28vylibv1s95bzfgscznw146ybgk6f3qdbbnafrcrmifcr"; - name = "latex-unicode-math-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22542,20 +29144,25 @@ license = lib.licenses.free; }; }) {}; - lcb-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lcb-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lcb-mode"; + ename = "lcb-mode"; version = "0.1.1"; src = fetchFromGitHub { owner = "peter-b"; repo = "lcb-mode"; - rev = "be0768e9aa6f9b8e76f2230f4f7f4d152a766b9a"; - sha256 = "0mgcqqhjadm8ckp6x37f9j4xcs61g73m9v8qr4zbw115yci2d0xk"; + rev = "e5b0b6ca6c5feeb2502d66a760ddf5bb590d04c4"; + sha256 = "0i58qz4l5rzwp9kx4r9f818ly21ys71zh1zjxppp220p3yydljfq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd1380a9ba363f62f297e3ab2995341258b51fd1/recipes/lcb-mode"; sha256 = "184vd5ll0ms2lspzv8zz2zbairsr8i9p3gs28hrnnwm6mrpx4n18"; - name = "lcb-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -22563,9 +29170,15 @@ license = lib.licenses.free; }; }) {}; - lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lcr = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lcr"; + ename = "lcr"; version = "0.9"; src = fetchFromGitHub { owner = "jyp"; @@ -22573,10 +29186,10 @@ rev = "3bc341205bba437c8fec4fefefaf39793c0405ae"; sha256 = "0jvdnb3fn33wq7ixb7ayrallq1j5gc9nh3i3nmy03yg11h60h1am"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr"; sha256 = "07syirjlrw8g95zk273953mnmg9x4bv8jpyvvzghhin4saiiiw3k"; - name = "lcr"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -22584,9 +29197,20 @@ license = lib.licenses.free; }; }) {}; - leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: - melpaBuild { + leanote = callPackage ({ async + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , pcache + , request + , s }: + melpaBuild { pname = "leanote"; + ename = "leanote"; version = "0.4.0"; src = fetchFromGitHub { owner = "aborn"; @@ -22594,10 +29218,10 @@ rev = "1bd49fdf13ef707bae7edaa724a1592aa7fb002f"; sha256 = "1k58rhk5p819cvfa6zg7j3ysvzhq6dc433fzhh1ff0gwga2vrqbz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote"; sha256 = "1xnfv7bpkw3ir402962zbp856d56nas098nkf7bamnsnax6kkqw7"; - name = "leanote"; + name = "recipe"; }; packageRequires = [ async cl-lib emacs let-alist pcache request s ]; meta = { @@ -22605,9 +29229,13 @@ license = lib.licenses.free; }; }) {}; - ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ledger-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ledger-mode"; + ename = "ledger-mode"; version = "3.1.1"; src = fetchFromGitHub { owner = "ledger"; @@ -22615,10 +29243,10 @@ rev = "96c4e81eed52e0ef514dc15a6ea6d877b3409a2a"; sha256 = "12q6wblwnb6y5c1882jz14742fqbm6p5jpzlvz7p90ylqfl7h989"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; sha256 = "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf"; - name = "ledger-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22626,9 +29254,18 @@ license = lib.licenses.free; }; }) {}; - lentic = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild, s }: - melpaBuild { + lentic = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , m-buffer + , melpaBuild + , s }: + melpaBuild { pname = "lentic"; + ename = "lentic"; version = "0.11"; src = fetchFromGitHub { owner = "phillord"; @@ -22636,10 +29273,10 @@ rev = "8655ecd51e189bbdd6a4d8405dc3ea2e689c709a"; sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cbb6f9cc3c1040b80fbf3f2df2ac2c3c8d18b6b1/recipes/lentic"; sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m"; - name = "lentic"; + name = "recipe"; }; packageRequires = [ dash emacs f m-buffer s ]; meta = { @@ -22647,9 +29284,13 @@ license = lib.licenses.free; }; }) {}; - less-css-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + less-css-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "less-css-mode"; + ename = "less-css-mode"; version = "0.21"; src = fetchFromGitHub { owner = "purcell"; @@ -22657,10 +29298,10 @@ rev = "59bf174c4e9f053ec2a7ef8c8a8198490390f6fb"; sha256 = "1rkjamdy2a80w439vb2hhr7vqjj47wi2azlr7yq2xdz9851xsx9f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/less-css-mode"; sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8"; - name = "less-css-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22668,9 +29309,13 @@ license = lib.licenses.free; }; }) {}; - letcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + letcheck = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "letcheck"; + ename = "letcheck"; version = "0.4"; src = fetchFromGitHub { owner = "Fuco1"; @@ -22678,10 +29323,10 @@ rev = "e85b185993a2eaeec6490709f4c131fde2edd672"; sha256 = "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a0937f704e33bbb9ea8f101cd87c44e8050afb/recipes/letcheck"; sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2"; - name = "letcheck"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22689,9 +29334,13 @@ license = lib.licenses.free; }; }) {}; - lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lfe-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lfe-mode"; + ename = "lfe-mode"; version = "1.3"; src = fetchFromGitHub { owner = "rvirding"; @@ -22699,10 +29348,10 @@ rev = "af14b1439097850ffa39935419ed83f5bcaa6d09"; sha256 = "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; sha256 = "0smncyby53ipm8yqslz88sqjafk0x6r8d0qwk4wzk0pbgfyklhgs"; - name = "lfe-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22710,20 +29359,52 @@ license = lib.licenses.free; }; }) {}; - libmpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "libmpdel"; - version = "0.5.0"; + libelcouch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { + pname = "libelcouch"; + ename = "libelcouch"; + version = "0.8.0"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "libelcouch"; + rev = "1396144ebbb9790d4c744db0d4aacc0211b8e8e6"; + sha256 = "1r0wrqiqar3jw5xbp1qv7kj7m1fdzciyy9690hwiq99dcm8nlri3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/209d5c507cfe42b152c21a4534c3ba549186420f/recipes/libelcouch"; + sha256 = "1zfjyfyjd59z0ns32v2b0r5g9ypjxrlmkx3djmxsmzd4an8ciq3p"; + name = "recipe"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/libelcouch"; + license = lib.licenses.free; + }; + }) {}; + libmpdel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "libmpdel"; + ename = "libmpdel"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mpdel"; repo = "libmpdel"; - rev = "abb748b6cb35de4652df80ce8539bfc63189619d"; - sha256 = "0ccqcn85131pywzga4644f0azxrsl5ay69m6jz27zzvshs7gzzjv"; + rev = "fcc719c2f23df4b5838eab76a40fef11055203de"; + sha256 = "0qw6rrb16bbhwg1gci4ymn2nshzf21lcf2nyphxbn4vcv400cw4k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel"; sha256 = "0qi9g3czwzi9hhp7gjczpzjx9vgzz52xi91332l0sxcxmwbawjp1"; - name = "libmpdel"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -22731,9 +29412,13 @@ license = lib.licenses.free; }; }) {}; - lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lice = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lice"; + ename = "lice"; version = "0.2"; src = fetchFromGitHub { owner = "buzztaiki"; @@ -22741,10 +29426,10 @@ rev = "69f2d87984f3f3d469db35e241fbbe979384cd03"; sha256 = "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2508699ebfc846742940c5e4356b095b540e2405/recipes/lice"; sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x"; - name = "lice"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22752,20 +29437,24 @@ license = lib.licenses.free; }; }) {}; - line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + line-up-words = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "line-up-words"; + ename = "line-up-words"; version = "1.0.0"; src = fetchFromGitHub { owner = "janestreet"; repo = "line-up-words"; - rev = "54d2c51c1c3da7e06be47b829bf465bf467ab53f"; - sha256 = "0qda9i5yjjf2x5cpg6nxkzqwa8fzzjxk0yyc4295kbawwd83vglr"; + rev = "8de4f19b24caed1ca409925a93fef2625c84fe87"; + sha256 = "1qdn24zan6iiai7cfzxn4x8jslb52yhz83mpgmv4932yk4pfcmsd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words"; sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79"; - name = "line-up-words"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22773,9 +29462,13 @@ license = lib.licenses.free; }; }) {}; - lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lingr = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lingr"; + ename = "lingr"; version = "0.2"; src = fetchFromGitHub { owner = "lugecy"; @@ -22783,10 +29476,10 @@ rev = "c9c20dd9b4967aa2f8873d6890d6797e6a498d23"; sha256 = "11sw43z5b0vypmhi0yysf2bxjy8fqpzl61y503jb7nhcfywmfkys"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5d29710ab17b1a98f9b559344e4dd40a2b9c08/recipes/lingr"; sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff"; - name = "lingr"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22794,20 +29487,24 @@ license = lib.licenses.free; }; }) {}; - link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + link = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "link"; + ename = "link"; version = "1.10"; src = fetchFromGitHub { owner = "myrkr"; repo = "dictionary-el"; - rev = "9ef1672ecd367827381bbbc9af93685980083c5c"; - sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s"; + rev = "a5ef20b2c32457880827ceda58f927ad9a26d2b7"; + sha256 = "0ahn0v6qdfwvv9n0m6jcgrzmyarbsbvpgq8g4qy2g37ak4j60hp7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/link"; sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8"; - name = "link"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22815,8 +29512,11 @@ license = lib.licenses.free; }; }) {}; - link-hint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + link-hint = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "link-hint"; version = "0.1"; src = fetchFromGitHub { @@ -22825,7 +29525,7 @@ rev = "d26b5330e6e42b4bed4e4730054b4c5e308ceab2"; sha256 = "1v4fadxv7ym6lc09nd2xpz2k5vrikjv7annw99ii5cqrwhqa5838"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint"; sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89"; name = "link-hint"; @@ -22836,9 +29536,13 @@ license = lib.licenses.free; }; }) {}; - linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + linum-relative = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "linum-relative"; + ename = "linum-relative"; version = "0.6"; src = fetchFromGitHub { owner = "coldnew"; @@ -22846,10 +29550,10 @@ rev = "896df4b40c1e1eb59f55fcee48a1543f0ccd724e"; sha256 = "0b3n1gk2w1p72x0zfdz9l70winq2fnjpjrgq0awxx730xk7ypp5n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative"; sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj"; - name = "linum-relative"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22857,9 +29561,19 @@ license = lib.licenses.free; }; }) {}; - lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, multiple-cursors, swiper }: - melpaBuild { + lispy = callPackage ({ ace-window + , emacs + , fetchFromGitHub + , fetchurl + , hydra + , iedit + , lib + , melpaBuild + , multiple-cursors + , swiper }: + melpaBuild { pname = "lispy"; + ename = "lispy"; version = "0.26.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -22867,10 +29581,10 @@ rev = "7756a8fbbadbebbd5e20768569ed92ad6c402c5c"; sha256 = "05iqhnhj61f30yk4ih63rimmyp134gyq18frc8qgrnwym64dsm6l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g"; - name = "lispy"; + name = "recipe"; }; packageRequires = [ ace-window @@ -22885,9 +29599,13 @@ license = lib.licenses.free; }; }) {}; - lispyscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lispyscript-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lispyscript-mode"; + ename = "lispyscript-mode"; version = "0.3.5"; src = fetchFromGitHub { owner = "krisajenkins"; @@ -22895,10 +29613,10 @@ rev = "9a4200085e2a15725a58616d131a56f5edce214b"; sha256 = "0qyj04p63fdh3iasp5cna1z5fhibmfyl9lvwyh22ajzsfbr3nhnk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf912fa20edc9cff12645381b303e37f2de14976/recipes/lispyscript-mode"; sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr"; - name = "lispyscript-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22906,9 +29624,16 @@ license = lib.licenses.free; }; }) {}; - list-packages-ext = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, persistent-soft, s }: - melpaBuild { + list-packages-ext = callPackage ({ fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , persistent-soft + , s }: + melpaBuild { pname = "list-packages-ext"; + ename = "list-packages-ext"; version = "0.1.0"; src = fetchFromGitHub { owner = "laynor"; @@ -22916,10 +29641,10 @@ rev = "344719b313c208c644490f8f1130e21405402f05"; sha256 = "197cqkiwxgamhfwbc8h492cmjll3fypkwzcphj26dfnr22v63kwq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71c217d98c6967d979f57f89ca26200304b0fc37/recipes/list-packages-ext"; sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk"; - name = "list-packages-ext"; + name = "recipe"; }; packageRequires = [ ht persistent-soft s ]; meta = { @@ -22927,9 +29652,14 @@ license = lib.licenses.free; }; }) {}; - list-unicode-display = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + list-unicode-display = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "list-unicode-display"; + ename = "list-unicode-display"; version = "0.1"; src = fetchFromGitHub { owner = "purcell"; @@ -22937,10 +29667,10 @@ rev = "59770cf3572bd36c3e9ba044846dc420c0dca09b"; sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8e2a974a56665b97d7622b0428994edadc88a0/recipes/list-unicode-display"; sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha"; - name = "list-unicode-display"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -22948,9 +29678,13 @@ license = lib.licenses.free; }; }) {}; - list-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + list-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "list-utils"; + ename = "list-utils"; version = "0.4.4"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -22958,10 +29692,10 @@ rev = "acf18aca1131a90f8d673974673e3c5d8fdc6a86"; sha256 = "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9fcd716cbb9f5a4de82a49e57bcb20c483d05f6/recipes/list-utils"; sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3"; - name = "list-utils"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22969,20 +29703,24 @@ license = lib.licenses.free; }; }) {}; - lit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lit-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lit-mode"; + ename = "lit-mode"; version = "0.1.1"; src = fetchFromGitHub { owner = "HectorAE"; repo = "lit-mode"; - rev = "c61c403afc8333a5649c5421ab1a6341dc1c7d92"; - sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd"; + rev = "bfecbe898223393f34340ca379977be753ee497a"; + sha256 = "1sjyb5v3s9z128ifjqx7a1dsgds2iz185y82581qxakl7ylmn15k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a6a1c79c9bba7b17c150ea0663bc61936f15d83/recipes/lit-mode"; sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59"; - name = "lit-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -22990,9 +29728,15 @@ license = lib.licenses.free; }; }) {}; - literal-string = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { + literal-string = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "literal-string"; + ename = "literal-string"; version = "0.1"; src = fetchFromGitHub { owner = "joodie"; @@ -23000,10 +29744,10 @@ rev = "46dd2b620df70d681261616f1a26afa4a032e2d5"; sha256 = "02a1jvxk2m1lb21p3281cr9xyhzix31cn8a9la53w90sz569i66r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6519bb53f409eeb0d557809b338849e473c193c4/recipes/literal-string"; sha256 = "0ylv9dpw17w272f92vn5cldklyz1d8daihi1fsh5ylvxqpinyrkn"; - name = "literal-string"; + name = "recipe"; }; packageRequires = [ emacs markdown-mode ]; meta = { @@ -23011,9 +29755,14 @@ license = lib.licenses.free; }; }) {}; - literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + literate-coffee-mode = callPackage ({ coffee-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "literate-coffee-mode"; + ename = "literate-coffee-mode"; version = "0.4"; src = fetchFromGitHub { owner = "syohex"; @@ -23021,10 +29770,10 @@ rev = "39fe3bfa1f68a7b8b91160875589219b214a2cd6"; sha256 = "1fh9wrw5irn0g3dy8gkk63csdcxgi3w2038mxx3sk6ki3r2bmhw8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/literate-coffee-mode"; sha256 = "18fdgay7xfgza75z3xma666f414m9dn7d50w94wzzmv7ja74sp64"; - name = "literate-coffee-mode"; + name = "recipe"; }; packageRequires = [ coffee-mode ]; meta = { @@ -23032,9 +29781,16 @@ license = lib.licenses.free; }; }) {}; - live-code-talks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, narrowed-page-navigation }: - melpaBuild { + live-code-talks = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , narrowed-page-navigation }: + melpaBuild { pname = "live-code-talks"; + ename = "live-code-talks"; version = "0.2.1"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -23042,10 +29798,10 @@ rev = "3a2ecdb49b2651d87999d4cad56ba8f1004c7a99"; sha256 = "1cwydbhhbs5v9y2s872zxc5lflqmfrdvnc8xz0qars52d7lg4br5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/live-code-talks"; sha256 = "1ji4lww71dqxnn5c9inix8xqcmgc76wbps0ylxhhgs44ki4hlyrm"; - name = "live-code-talks"; + name = "recipe"; }; packageRequires = [ cl-lib emacs narrowed-page-navigation ]; meta = { @@ -23053,9 +29809,14 @@ license = lib.licenses.free; }; }) {}; - live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + live-py-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "live-py-mode"; + ename = "live-py-mode"; version = "2.22.0"; src = fetchFromGitHub { owner = "donkirkby"; @@ -23063,10 +29824,10 @@ rev = "ab2f9bea32dbad11a6464a4880e5487645a0f65a"; sha256 = "0w3kpszsrh0gj0a62iqhnhm3flmmgq0pl0d6w5r61mvlq9wck5dv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq"; - name = "live-py-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -23074,9 +29835,13 @@ license = lib.licenses.free; }; }) {}; - lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lively = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lively"; + ename = "lively"; version = "0.2"; src = fetchFromGitHub { owner = "purcell"; @@ -23084,10 +29849,10 @@ rev = "6ec648fcde85e81393db1ed1364860f960179c92"; sha256 = "06sdaj2akwjg1a7yvmm3gsip66iaq9bhm3gr45szwg6z622q4gvf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively"; sha256 = "1q8cbl3sr3dpvzk57985giy4xmz4lvg94jcw7shbhz1v9q05dr5g"; - name = "lively"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23095,8 +29860,12 @@ license = lib.licenses.free; }; }) {}; - lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + lms = callPackage ({ emacs + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lms"; version = "0.7"; src = fetchhg { @@ -23104,7 +29873,7 @@ rev = "f07ac3678e27"; sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms"; sha256 = "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1"; name = "lms"; @@ -23115,9 +29884,13 @@ license = lib.licenses.free; }; }) {}; - load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + load-relative = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "load-relative"; + ename = "load-relative"; version = "1.0"; src = fetchFromGitHub { owner = "rocky"; @@ -23125,10 +29898,10 @@ rev = "15ffaa9ebf1b7bbfcc307d1716eec135253b3b8d"; sha256 = "1fq4bnngbh9a18hq8mvnqkzs74k3g4c0lmwsncbhy6n21njv3kdy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative"; sha256 = "0j8ybbjzhzgjx47pqqdbsqi8n6pzqcf6zqc38x7cf1kkklgc87ay"; - name = "load-relative"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23136,20 +29909,24 @@ license = lib.licenses.free; }; }) {}; - loc-changes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + loc-changes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "loc-changes"; + ename = "loc-changes"; version = "1.1"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-loc-changes"; - rev = "8447baff7cb4839ef8d1d747a14e5da85d0cee5b"; - sha256 = "1089sbx20r30sis39vwy29fxhb2n3hh35rdv09lpzdxdq01s8wwp"; + rev = "2a0cf1a5890a8937089e4e10f383f4d40c3ac587"; + sha256 = "0xjnpwj0hddpcl2jd6xk64g32djs6xnnms9bhmxs25p894aa40py"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ce68d573d19f26ecfd190f8e6cd1f384ca3e8a/recipes/loc-changes"; sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh"; - name = "loc-changes"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23157,20 +29934,24 @@ license = lib.licenses.free; }; }) {}; - log4e = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + log4e = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "log4e"; + ename = "log4e"; version = "0.3.0"; src = fetchFromGitHub { owner = "aki2o"; repo = "log4e"; - rev = "6592682ab7de0e3d1915aa4d3c53e083be79fbeb"; - sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022"; + rev = "ec74a535796c74310c0fbbb9002595d322d03192"; + sha256 = "0ws87an0a591pdqk4y3b9xlbgv1lk7qsyviqv0khj0m49dy68w81"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d0e451c5a8eb25db95990b058964a9acea4b89/recipes/log4e"; sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34"; - name = "log4e"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23178,9 +29959,13 @@ license = lib.licenses.free; }; }) {}; - logalimacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + logalimacs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "logalimacs"; + ename = "logalimacs"; version = "1.0.0"; src = fetchFromGitHub { owner = "logaling"; @@ -23188,10 +29973,10 @@ rev = "cfd7aaa925934f876eee6e8c550cf6e7a239a2ac"; sha256 = "0g5vq9xy9lwczs77lr91c1srhhfmasnnnmjvgc55hbl6iwmbizbm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef9833a5ca4d455f1d33b9367860e2051d60662f/recipes/logalimacs"; sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6"; - name = "logalimacs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23199,9 +29984,14 @@ license = lib.licenses.free; }; }) {}; - logito = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + logito = callPackage ({ eieio ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "logito"; + ename = "logito"; version = "0.1"; src = fetchFromGitHub { owner = "sigma"; @@ -23209,10 +29999,10 @@ rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052"; sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logito"; sha256 = "0xi7zbxpialsn4pknj8aqmkbiwwsbapwynrrjb8avhli2hd4s3fl"; - name = "logito"; + name = "recipe"; }; packageRequires = [ eieio ]; meta = { @@ -23220,20 +30010,26 @@ license = lib.licenses.free; }; }) {}; - logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + logview = callPackage ({ datetime + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "logview"; - version = "0.9"; + ename = "logview"; + version = "0.11.1"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "9ec279d933923dab2d8d1f140adc43073dab6433"; - sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02"; + rev = "902c881f5e1ca802761b856b3945bd418847dd79"; + sha256 = "1df41wabldg1ahcbqi5szwml5hqdjm6p3hj5b8ajkkagykrnh8xg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh"; - name = "logview"; + name = "recipe"; }; packageRequires = [ datetime emacs ]; meta = { @@ -23241,20 +30037,24 @@ license = lib.licenses.free; }; }) {}; - loop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + loop = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "loop"; + ename = "loop"; version = "1.3"; src = fetchFromGitHub { owner = "Wilfred"; repo = "loop.el"; - rev = "c3598bd3ad0677f66e061b3ba51a05d05275283e"; - sha256 = "1gs95xnmnn8aa4794k7h8mw1sz1nfdh9v0caqj6yvnsdnwy74n5x"; + rev = "3e175e479a49cf419cb54042449aba0bd6cd9e08"; + sha256 = "07r6jc6dr6x0s2a6p18ad0m23p7d5dv4w8c5ilkj7vs18dwr1vmv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba481ca96469b3bd518e4fd8f24947338c8af014/recipes/loop"; sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar"; - name = "loop"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23262,9 +30062,14 @@ license = lib.licenses.free; }; }) {}; - love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }: - melpaBuild { + love-minor-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , lua-mode + , melpaBuild }: + melpaBuild { pname = "love-minor-mode"; + ename = "love-minor-mode"; version = "1.2"; src = fetchFromGitHub { owner = "ejmr"; @@ -23272,10 +30077,10 @@ rev = "3ca8f3405338f2d6f4fbcdd5e89342a46378543a"; sha256 = "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f224c4c7519b3668b1270c957227e486896b7b6/recipes/love-minor-mode"; sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m"; - name = "love-minor-mode"; + name = "recipe"; }; packageRequires = [ lua-mode ]; meta = { @@ -23283,20 +30088,25 @@ license = lib.licenses.free; }; }) {}; - lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lsp-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lsp-mode"; - version = "4.1"; + ename = "lsp-mode"; + version = "4.2"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "065c36f1fceb6322b7ff8fd4bc623aa0cf6136ba"; - sha256 = "0129h8h2abc7vcv0h5b2lsr6swa0zq597s5r7zcfj3macga7iifr"; + rev = "8d20214293637beca0e8d50a864ac4980b9064e8"; + sha256 = "0l8i5ra5hzbj3r6qw26v7lqjdvc4yb956j2h2nv7ahmd4g5f95np"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9"; - name = "lsp-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -23304,20 +30114,26 @@ license = lib.licenses.free; }; }) {}; - lsp-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: - melpaBuild { + lsp-ocaml = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { pname = "lsp-ocaml"; - version = "0.1.0"; + ename = "lsp-ocaml"; + version = "0.2.0"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ocaml"; - rev = "e826f82929b8a388a90600d3570cf66c020f0b91"; - sha256 = "1mb912ffw8w5dggxaijz700j2yhzq69fil81gki3r66n077nacmr"; + rev = "5a8c776b6d75b502703243b3d628fccd813481b0"; + sha256 = "1431f8r8c4h8jbghggk1s2bwqr1qlxys3d52xsvf35bbk1gki5an"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7be2d7a7af3d744c531e5e018d791bf2566df428/recipes/lsp-ocaml"; sha256 = "17334qcgqrz4jd5npizyq20fmxy07z2p3pq98s5np2kc4h9ara33"; - name = "lsp-ocaml"; + name = "recipe"; }; packageRequires = [ emacs lsp-mode ]; meta = { @@ -23325,9 +30141,13 @@ license = lib.licenses.free; }; }) {}; - lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + lua-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "lua-mode"; + ename = "lua-mode"; version = "20151025"; src = fetchFromGitHub { owner = "immerrr"; @@ -23335,10 +30155,10 @@ rev = "bdf121b2c05bc74d3d7961a91d7afeb6176e0f45"; sha256 = "1qawjd0nbj1c142van7r01pmq74vkzcvnn27jgn79wwhplp9gm99"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94"; - name = "lua-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23346,9 +30166,91 @@ license = lib.licenses.free; }; }) {}; - m-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + lusty-explorer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "lusty-explorer"; + ename = "lusty-explorer"; + version = "3.0"; + src = fetchFromGitHub { + owner = "sjbach"; + repo = "lusty-emacs"; + rev = "fc4b2f0f8a07db107234490fdfbf72f8b76a6643"; + sha256 = "014fivh9shi7p3x31bl22x48agrgygp0pf2lgzzflrxcynmprbnp"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/efedaa3b1de5f6406c7dcd842eee42eefaf8ab50/recipes/lusty-explorer"; + sha256 = "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/lusty-explorer"; + license = lib.licenses.free; + }; + }) {}; + lv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "lv"; + ename = "lv"; + version = "0.14.0"; + src = fetchFromGitHub { + owner = "abo-abo"; + repo = "hydra"; + rev = "a07b92a8755dfb064701210b634e2dc4839552ac"; + sha256 = "11k0ifmr90vdinibhyqqyqrmpxbn9c5pjpzhr4p66wv6249s540w"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5114349617617673d5055fe28cb8f8c86cf41f83/recipes/lv"; + sha256 = "1lkm40rwpj9hmckng9bz5g4jbx9g9i3wlqgl6rq0m6i14syr69v4"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/lv"; + license = lib.licenses.free; + }; + }) {}; + lxc-tramp = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "lxc-tramp"; + ename = "lxc-tramp"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "montag451"; + repo = "lxc-tramp"; + rev = "17fc5962e7c27ac4f0bcc4ed7312dd5709063341"; + sha256 = "03h6aw98mbwwqj08bzpg147hanx97r8fr8jv790zw7iqqjp46hsm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2464020a5b3d89bddcd122cad81fed84ded9b117/recipes/lxc-tramp"; + sha256 = "0rksh7k30kh3i23c98qinffz2zj6h1bshaw994hwy8qwgm38vx61"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/lxc-tramp"; + license = lib.licenses.free; + }; + }) {}; + m-buffer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "m-buffer"; + ename = "m-buffer"; version = "0.15"; src = fetchFromGitHub { owner = "phillord"; @@ -23356,10 +30258,10 @@ rev = "6eb1d2535a82707a83733173bc400a0d8e520c80"; sha256 = "1sx76i59razwccvn6x7rx5a124bfyjw9fcbxf4gj7nsg33qiq809"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer"; sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94"; - name = "m-buffer"; + name = "recipe"; }; packageRequires = [ seq ]; meta = { @@ -23367,9 +30269,14 @@ license = lib.licenses.free; }; }) {}; - mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mac-pseudo-daemon = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mac-pseudo-daemon"; + ename = "mac-pseudo-daemon"; version = "2.1"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; @@ -23377,10 +30284,10 @@ rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc"; sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon"; sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0"; - name = "mac-pseudo-daemon"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -23388,9 +30295,13 @@ license = lib.licenses.free; }; }) {}; - macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + macro-math = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "macro-math"; + ename = "macro-math"; version = "1.0"; src = fetchFromGitHub { owner = "nschum"; @@ -23398,10 +30309,10 @@ rev = "105e03c80290d1b88984b2d265a149a13d722920"; sha256 = "0dgsl1x6r8m9vvff1ia0kmz21h0dji2jl5cqlpx1m947zh45dahj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macro-math"; sha256 = "072ycszl4cjc9nvv4axsgyfzz9djpgh4y1xqfr1nxi41nsdfc9kn"; - name = "macro-math"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23409,20 +30320,25 @@ license = lib.licenses.free; }; }) {}; - macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + macrostep = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "macrostep"; + ename = "macrostep"; version = "0.9"; src = fetchFromGitHub { owner = "joddie"; repo = "macrostep"; - rev = "1e2593279f3722e31d8a8f07e297a5c546586cba"; - sha256 = "0g9bnq4p3ffvva30hpll80dn3i41m51mcvw3qf787zg1nmc5a0j6"; + rev = "9a6b04a5f7e57e4ba42309e8ce257cd7637514ec"; + sha256 = "0aqlk9rlxfqlb3qr88xxcii5lcxxiyygg62kzxpv16prhv1n8a3i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macrostep"; sha256 = "1h1gag21x05a14j0wbg0lg502fq2hbqfhjlg05kysw9f870whfq2"; - name = "macrostep"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -23430,9 +30346,15 @@ license = lib.licenses.free; }; }) {}; - magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + magic-filetype = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "magic-filetype"; + ename = "magic-filetype"; version = "0.3.0"; src = fetchFromGitHub { owner = "emacs-php"; @@ -23440,10 +30362,10 @@ rev = "019494add5ff02dd36cb3f500142fc51125522cc"; sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype"; sha256 = "0f0j8fgh2gpkarz9308pns0d89wc2dchyim6hbixkdpqzg9gskc3"; - name = "magic-filetype"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -23451,20 +30373,32 @@ license = lib.licenses.free; }; }) {}; - magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: - melpaBuild { + magit = callPackage ({ async + , dash + , emacs + , fetchFromGitHub + , fetchurl + , ghub + , git-commit + , let-alist + , lib + , magit-popup + , melpaBuild + , with-editor }: + melpaBuild { pname = "magit"; - version = "2.12.1"; + ename = "magit"; + version = "2.13.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "44508d71fb400910adb5d0594b56d3c34aa3a5de"; - sha256 = "0cpcdrikfcmkb6sj13bvznilyk8yc054pq5md874s3j224bdxcnx"; + rev = "e03685e813330a750c1d2e525a8f8c74901fccfb"; + sha256 = "119x8lg8alf97j8r3swmy6yf9112a9s2z2584n74bk847mxl2qwz"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; - sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga"; - name = "magit"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ac8feccfa0f4eb5bda2ef561a6be66ba145c00e0/recipes/magit"; + sha256 = "03iv74rgng5fcy3qfr76hiy0hj6x2z0pis1yj8wm1naq5rc55hjn"; + name = "recipe"; }; packageRequires = [ async @@ -23481,20 +30415,26 @@ license = lib.licenses.free; }; }) {}; - magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-annex = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-annex"; - version = "1.4.0"; + ename = "magit-annex"; + version = "1.6.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "895c229c2b0d822a4debb302d8638105ecb4ee20"; - sha256 = "0316csgc95dalqmkxj6qlb7inzcg4csfs9n3im1ygswcswpdaajh"; + rev = "42ccbe9137718151accc85abc2726b4f3729b5cb"; + sha256 = "1zrqm4nhy1d2pg6gwd6m4225smcns5pl8kpcpi3072gprblncphl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys"; - name = "magit-annex"; + name = "recipe"; }; packageRequires = [ cl-lib magit ]; meta = { @@ -23502,9 +30442,15 @@ license = lib.licenses.free; }; }) {}; - magit-filenotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-filenotify = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-filenotify"; + ename = "magit-filenotify"; version = "0.1"; src = fetchFromGitHub { owner = "ruediger"; @@ -23512,10 +30458,10 @@ rev = "575c4321f61fb8f25e4779f9ffd4514ac086ae96"; sha256 = "1vn6x53kpwv3zf2b5xjswyz6v853r8b9dg88qhwd2h480hrx6kal"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca5541d2ce3553e9ade2c1ec1c0d78103dfd0c4d/recipes/magit-filenotify"; sha256 = "1ihk5yi6psqkccpi2bq2h70kn7k874zl7wcinjaq21lirk4z7bvn"; - name = "magit-filenotify"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -23523,9 +30469,15 @@ license = lib.licenses.free; }; }) {}; - magit-find-file = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-find-file = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-find-file"; + ename = "magit-find-file"; version = "2.1.0"; src = fetchFromGitHub { owner = "bradwright"; @@ -23533,10 +30485,10 @@ rev = "035da838b1a19e7a5ee135b4ca8475f4e235b61e"; sha256 = "1jlww053s580d7rlvmr1dl79wxasa0hhh2jnwb1ra353d6h3a73w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/magit-find-file"; sha256 = "1y66nsq1hbv1sb4n71gdxv7p1rz37vd9lkf7zl7avy0dchs499ik"; - name = "magit-find-file"; + name = "recipe"; }; packageRequires = [ dash magit ]; meta = { @@ -23544,9 +30496,14 @@ license = lib.licenses.free; }; }) {}; - magit-gerrit = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-gerrit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-gerrit"; + ename = "magit-gerrit"; version = "0.3"; src = fetchFromGitHub { owner = "terranpro"; @@ -23554,10 +30511,10 @@ rev = "699c5c39c6dbdc8d730721eaf1491f982dd78142"; sha256 = "0ym24gjd6c04zry08abcb09zvjbgj8nc1j12q0r51fhzzadxcxbb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f7cc000debed666ad6800e31c114eedb7384317c/recipes/magit-gerrit"; sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4"; - name = "magit-gerrit"; + name = "recipe"; }; packageRequires = [ magit ]; meta = { @@ -23565,9 +30522,18 @@ license = lib.licenses.free; }; }) {}; - magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }: - melpaBuild { + magit-gh-pulls = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , gh + , lib + , magit + , melpaBuild + , pcache + , s }: + melpaBuild { pname = "magit-gh-pulls"; + ename = "magit-gh-pulls"; version = "0.5.3"; src = fetchFromGitHub { owner = "sigma"; @@ -23575,10 +30541,10 @@ rev = "d526f4c9ee1709c79f8a4630699ce1f25ae054e7"; sha256 = "11fd3c7wnqy08khj6za8spbsm3k1rqqih21lbax2iwvxl8jv4dv0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls"; sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d"; - name = "magit-gh-pulls"; + name = "recipe"; }; packageRequires = [ emacs gh magit pcache s ]; meta = { @@ -23586,9 +30552,15 @@ license = lib.licenses.free; }; }) {}; - magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }: - melpaBuild { + magit-gitflow = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , magit + , magit-popup + , melpaBuild }: + melpaBuild { pname = "magit-gitflow"; + ename = "magit-gitflow"; version = "2.2.3"; src = fetchFromGitHub { owner = "jtatarik"; @@ -23596,10 +30568,10 @@ rev = "cc41b561ec6eea947fe9a176349fb4f771ed865b"; sha256 = "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow"; sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf"; - name = "magit-gitflow"; + name = "recipe"; }; packageRequires = [ magit magit-popup ]; meta = { @@ -23607,20 +30579,26 @@ license = lib.licenses.free; }; }) {}; - magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-imerge = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-imerge"; - version = "0.3.0"; + ename = "magit-imerge"; + version = "0.3.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "f337f178a1b4d2e4c1199fa02338febe216ab902"; - sha256 = "1x0714qxryj3fg9qwnsxrksdja1q98vvjpdwn8h9anifxa0wknh6"; + rev = "d798ceef08c01f0475c78d394544a2ae910a9cea"; + sha256 = "0x86b9xh8j9qywqh78w6b6jj75yzzdcz17cqz8sy48y12zy2skpi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4"; - name = "magit-imerge"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -23628,20 +30606,26 @@ license = lib.licenses.free; }; }) {}; - magit-org-todos = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-org-todos = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-org-todos"; - version = "0.1.1"; + ename = "magit-org-todos"; + version = "0.1.2"; src = fetchFromGitHub { owner = "danielma"; repo = "magit-org-todos.el"; - rev = "d772f5220037cb7ad049250df2671e488c65da94"; - sha256 = "19m1p8z016mqxj2b29961rnbjclxcpspx5bkmqhrwhfysyvcjqg5"; + rev = "0bfa36bbc50e62de0a3406031cb93e2f57dcdc55"; + sha256 = "07r5x256k1fjjxs1yfg41kc94nwvnjlk2vvknkra3j8v9p0j88m7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84480cad490cab2f087a484ed7b9d3d3064bbd29/recipes/magit-org-todos"; sha256 = "0yywgzm2jzvsccm9h0a0s1q8fag9dfajnznwk6iqz5pywq5mxijr"; - name = "magit-org-todos"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -23649,9 +30633,16 @@ license = lib.licenses.free; }; }) {}; - magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + magit-popup = callPackage ({ async + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "magit-popup"; + ename = "magit-popup"; version = "2.12.3"; src = fetchFromGitHub { owner = "magit"; @@ -23659,10 +30650,10 @@ rev = "32e6da899abd6657c098534c5775fc7177047f49"; sha256 = "0nrvs7gwd9kn4n808akrydn7zggvy9zyk38yrcmm561kw0h0h903"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; sha256 = "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv"; - name = "magit-popup"; + name = "recipe"; }; packageRequires = [ async dash emacs ]; meta = { @@ -23670,20 +30661,26 @@ license = lib.licenses.free; }; }) {}; - magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-stgit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-stgit"; + ename = "magit-stgit"; version = "2.1.3"; src = fetchFromGitHub { owner = "magit"; repo = "magit-stgit"; - rev = "1b064485d512ab547d606dcea9ad4298f355095c"; - sha256 = "01mgnm5nr2yg377pk4bwlzzgbabsx611wrpx2vzsbiwd97yppdqf"; + rev = "9d13effdbc213a0c8dcce78e1825011631fa0652"; + sha256 = "163a1rddl54jgxm5dygnbp1pz1as4hhjszan1rcabvzcfnfdpakj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit"; sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv"; - name = "magit-stgit"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -23691,9 +30688,15 @@ license = lib.licenses.free; }; }) {}; - magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-svn = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-svn"; + ename = "magit-svn"; version = "2.2.1"; src = fetchFromGitHub { owner = "magit"; @@ -23701,10 +30704,10 @@ rev = "c833903732a14478f5c4cfc561bae7c50671b36c"; sha256 = "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn"; sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0"; - name = "magit-svn"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -23712,9 +30715,15 @@ license = lib.licenses.free; }; }) {}; - magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-tbdiff = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-tbdiff"; + ename = "magit-tbdiff"; version = "0.2.0"; src = fetchFromGitHub { owner = "magit"; @@ -23722,10 +30731,10 @@ rev = "2e7d54d290260e5834cca06863d78fc563d7373c"; sha256 = "07i0bnjkflgrrg246z996slzy28b2kjhhv13z0lcb72w46l935yr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff"; sha256 = "1wydmw4f1072k8frk8mi8aaky7dndinq8n7kn10q583bjlxgw80r"; - name = "magit-tbdiff"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -23733,20 +30742,72 @@ license = lib.licenses.free; }; }) {}; - magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: - melpaBuild { + magit-todos = callPackage ({ a + , anaphora + , async + , dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , hl-todo + , lib + , magit + , melpaBuild + , pcre2el + , s }: + melpaBuild { + pname = "magit-todos"; + ename = "magit-todos"; + version = "1.0.3"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "magit-todos"; + rev = "d12e2e3ccad4b87d5df5285ade0c56ec5f46ad63"; + sha256 = "006yy13hjzalwz7pz0br32zifxlxrrf8cvnz0j3km55sxpdvqmil"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos"; + sha256 = "0vqmbw0qj8a5wf4ig9hgc0v3l1agdkvgprzjv178hs00297br2s8"; + name = "recipe"; + }; + packageRequires = [ + a + anaphora + async + dash + emacs + f + hl-todo + magit + pcre2el + s + ]; + meta = { + homepage = "https://melpa.org/#/magit-todos"; + license = lib.licenses.free; + }; + }) {}; + magit-topgit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "magit-topgit"; + ename = "magit-topgit"; version = "2.1.2"; src = fetchFromGitHub { owner = "magit"; repo = "magit-topgit"; - rev = "11489ea798bc88d0ea5244bbf725285eedfefbef"; - sha256 = "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q"; + rev = "243fdfa7ce62dce4efd01b6b818a2791868db2f0"; + sha256 = "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-topgit"; sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i"; - name = "magit-topgit"; + name = "recipe"; }; packageRequires = [ emacs magit ]; meta = { @@ -23754,20 +30815,30 @@ license = lib.licenses.free; }; }) {}; - magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: - melpaBuild { + magithub = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ghub-plus + , git-commit + , lib + , magit + , markdown-mode + , melpaBuild + , s }: + melpaBuild { pname = "magithub"; - version = "0.1.5"; + ename = "magithub"; + version = "0.1.7"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "08a1c1341d0982248ec86e1697fa1b6418cd80f5"; - sha256 = "062xghazkm8lh207fpqp7csd3nwgkz47g831hqa94iz28n97x0pq"; + rev = "81e75cbbbac820a3297e6b6a1e5dc6d9cfe091d0"; + sha256 = "1iq8c939c0a6v8gq31vcjw6nxwnz4fpavcd6xf4h2rb6rkmxmhvl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab"; - name = "magithub"; + name = "recipe"; }; packageRequires = [ emacs ghub-plus git-commit magit markdown-mode s ]; meta = { @@ -23775,9 +30846,13 @@ license = lib.licenses.free; }; }) {}; - make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + make-color = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "make-color"; + ename = "make-color"; version = "0.4"; src = fetchFromGitHub { owner = "alezost"; @@ -23785,10 +30860,10 @@ rev = "b19cb40c0619e267f2948ed37aff67b712a6deed"; sha256 = "0fp5gbin1sgsdz39spk74vadkzig3ydwhpzx9vg7f231kk5f6wzx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb765469c65589ae9d7dbc420a8edcf44c3be5d1/recipes/make-color"; sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k"; - name = "make-color"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23796,9 +30871,14 @@ license = lib.licenses.free; }; }) {}; - makey = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + makey = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "makey"; + ename = "makey"; version = "0.3"; src = fetchFromGitHub { owner = "mickeynp"; @@ -23806,10 +30886,10 @@ rev = "a61781e69d3b451551e269446e1c5f624ab81137"; sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e32e98758aa6fd31218e98608bd54a76c3e83/recipes/makey"; sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4"; - name = "makey"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -23817,20 +30897,30 @@ license = lib.licenses.free; }; }) {}; - malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }: - melpaBuild { + malinka = callPackage ({ cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , rtags + , s }: + melpaBuild { pname = "malinka"; + ename = "malinka"; version = "0.3.1"; src = fetchFromGitHub { owner = "LefterisJP"; repo = "malinka"; - rev = "81cf7dd81fbf124ceda31ee963cce8c3616f28f1"; - sha256 = "0hwxwwjzjxv2mmkxmalr2hp3x8apwcyvn2bz4d4yd4wrzcscay97"; + rev = "899e2c0020f283a00f7a24244749af5b9abfe3fe"; + sha256 = "0m7dkycpfjch8h3983ddasxil4pf4gf0xbjlamijb00n25bxv1dg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka"; sha256 = "1zmnlgy9k1s1s2wgkhlwfsnknmhggy0rx3l495a5x1kqsx6i0c9y"; - name = "malinka"; + name = "recipe"; }; packageRequires = [ cl-lib dash f projectile rtags s ]; meta = { @@ -23838,9 +30928,13 @@ license = lib.licenses.free; }; }) {}; - mallard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mallard-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mallard-mode"; + ename = "mallard-mode"; version = "0.3.0"; src = fetchFromGitHub { owner = "jhradilek"; @@ -23848,10 +30942,10 @@ rev = "152cd44d53c881457fe57c1aba77e8e2fca4d1b0"; sha256 = "1272fsjzsza9dxm8s64b7x2jzr3ks8wjpwvgcxha2dnsjzklcdcj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19c5543664ca685a70e53baa1357842e83cbf8f7/recipes/mallard-mode"; sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd"; - name = "mallard-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23859,9 +30953,13 @@ license = lib.licenses.free; }; }) {}; - map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + map-progress = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "map-progress"; + ename = "map-progress"; version = "0.5.0"; src = fetchFromGitHub { owner = "tarsius"; @@ -23869,10 +30967,10 @@ rev = "6b8ef6b60626772082b2e80ec54d1f1275e1a1b8"; sha256 = "1fkijm0gikbwmxa9hf7s1rcwb0ipzjygd1mlicsm78rxvdd8k877"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ed3335eaf0be7368059bcdb52c46f5e47c0c1a5/recipes/map-progress"; sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7"; - name = "map-progress"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23880,9 +30978,14 @@ license = lib.licenses.free; }; }) {}; - map-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + map-regexp = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "map-regexp"; + ename = "map-regexp"; version = "0.3.0"; src = fetchFromGitHub { owner = "tarsius"; @@ -23890,10 +30993,10 @@ rev = "b8e06284ec1c593d7d2bda5f35597a63de46333f"; sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/927314443ecc00d94e7125de669e82832c5a125c/recipes/map-regexp"; sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj"; - name = "map-regexp"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -23901,9 +31004,17 @@ license = lib.licenses.free; }; }) {}; - marcopolo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: - melpaBuild { + marcopolo = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , request + , s }: + melpaBuild { pname = "marcopolo"; + ename = "marcopolo"; version = "0.3.0"; src = fetchFromGitHub { owner = "nlamirault"; @@ -23911,10 +31022,10 @@ rev = "ce6ad40d7feab0568924e3bd9659b76e3eecd55e"; sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/936a1cff601594575c5b550c5eb16e7dafc8a5ab/recipes/marcopolo"; sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0"; - name = "marcopolo"; + name = "recipe"; }; packageRequires = [ dash pkg-info request s ]; meta = { @@ -23922,9 +31033,13 @@ license = lib.licenses.free; }; }) {}; - mark-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mark-tools = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mark-tools"; + ename = "mark-tools"; version = "0.3"; src = fetchFromGitHub { owner = "stsquad"; @@ -23932,10 +31047,10 @@ rev = "0e7ac2522ac84155cab341dc49f7f0b81067133c"; sha256 = "0fcyspz7n97n84d9203mxgn8ar4rn52qa49s3vayfrbkn038j5qw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ca36020392807aca9658d13481868d8b6c23d51/recipes/mark-tools"; sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq"; - name = "mark-tools"; + name = "recipe"; }; packageRequires = []; meta = { @@ -23943,9 +31058,15 @@ license = lib.licenses.free; }; }) {}; - markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + markdown-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "markdown-mode"; + ename = "markdown-mode"; version = "2.3"; src = fetchFromGitHub { owner = "jrblevin"; @@ -23953,10 +31074,10 @@ rev = "cde5c5d2bcce470c494b76e23cfe1364b6291c20"; sha256 = "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14"; - name = "markdown-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -23964,9 +31085,14 @@ license = lib.licenses.free; }; }) {}; - markdown-mode-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { + markdown-mode-plus = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "markdown-mode-plus"; + ename = "markdown-mode+"; version = "0.8"; src = fetchFromGitHub { owner = "milkypostman"; @@ -23974,10 +31100,10 @@ rev = "f35e63284c5caed19b29501730e134018a78e441"; sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/markdown-mode+"; sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00"; - name = "markdown-mode-plus"; + name = "recipe"; }; packageRequires = [ markdown-mode ]; meta = { @@ -23985,9 +31111,19 @@ license = lib.licenses.free; }; }) {}; - markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }: - melpaBuild { + markdown-preview-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild + , uuidgen + , web-server + , websocket }: + melpaBuild { pname = "markdown-preview-mode"; + ename = "markdown-preview-mode"; version = "0.9"; src = fetchFromGitHub { owner = "ancane"; @@ -23995,10 +31131,10 @@ rev = "134fd336750b8b3165bc906f0a7161c25eb6f589"; sha256 = "0j1jdvmn8psarjdl1j4d3rsjmnb3gcissh2l78xj2c8vckmp2g24"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode"; sha256 = "1cam5wfxca91q3i1kl0qbdvnfy62hr5ksargi4430kgaz34bcbyn"; - name = "markdown-preview-mode"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -24013,9 +31149,16 @@ license = lib.licenses.free; }; }) {}; - markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }: - melpaBuild { + markdown-toc = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , markdown-mode + , melpaBuild + , s }: + melpaBuild { pname = "markdown-toc"; + ename = "markdown-toc"; version = "0.1.2"; src = fetchFromGitHub { owner = "ardumont"; @@ -24023,10 +31166,10 @@ rev = "15587c76bec43dd778a2034035f98a79ad29e96a"; sha256 = "00rvpbfcdy1npddxa7yynqpzwrx1h2bm69x9yh42dv6ss3vk1sjs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc"; sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv"; - name = "markdown-toc"; + name = "recipe"; }; packageRequires = [ dash markdown-mode s ]; meta = { @@ -24034,9 +31177,14 @@ license = lib.licenses.free; }; }) {}; - markup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + markup = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "markup"; + ename = "markup"; version = "2.0.1"; src = fetchFromGitHub { owner = "leoc"; @@ -24044,10 +31192,10 @@ rev = "876da2d3f23473475bb0fd0a1480ae11d2671291"; sha256 = "0rggadka5aqgrik3qky6s75s5yb5bfj6fcpxjz1iyrwi0fka0akd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a75c955ad6b2f68b8933329e545625d948f6f8f4/recipes/markup"; sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf"; - name = "markup"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -24055,9 +31203,13 @@ license = lib.licenses.free; }; }) {}; - markup-faces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + markup-faces = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "markup-faces"; + ename = "markup-faces"; version = "1.0.0"; src = fetchFromGitHub { owner = "sensorflo"; @@ -24065,10 +31217,10 @@ rev = "c43612633c6c161857a3bab5752ae192bb03f5f3"; sha256 = "0nk2rm14ccwrh1aaxzm80rllsz8g38h9w52m0pf3nnwh6sa757nk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/markup-faces"; sha256 = "06fawlv4ih2lsmk7x6h9p5rppl8vw2w3nvlss95kb8fj5fwf7mw9"; - name = "markup-faces"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24076,9 +31228,16 @@ license = lib.licenses.free; }; }) {}; - marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: - melpaBuild { + marshal = callPackage ({ eieio ? null + , fetchFromGitHub + , fetchurl + , ht + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "marshal"; + ename = "marshal"; version = "0.8.2"; src = fetchFromGitHub { owner = "sigma"; @@ -24086,10 +31245,10 @@ rev = "d714219aeb388ded88582c47940f2c6febae333c"; sha256 = "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl"; - name = "marshal"; + name = "recipe"; }; packageRequires = [ eieio ht json ]; meta = { @@ -24097,9 +31256,14 @@ license = lib.licenses.free; }; }) {}; - mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mastodon = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mastodon"; + ename = "mastodon"; version = "0.7.2"; src = fetchFromGitHub { owner = "jdenen"; @@ -24107,10 +31271,10 @@ rev = "ae8dabda04e377a6ac22cb854e4844f68073f533"; sha256 = "1avf2wkzd14dj27i9skm3mn3ipkr1zp93yrwxrk2q5kphj1qji2j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; sha256 = "1bsyf4j6zs9gin0k7p22yv5gaqd6m3vdc2fiagfbs7gxsmhb6p4i"; - name = "mastodon"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -24118,20 +31282,25 @@ license = lib.licenses.free; }; }) {}; - material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + material-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "material-theme"; + ename = "material-theme"; version = "1.2"; src = fetchFromGitHub { owner = "cpaulik"; repo = "emacs-material-theme"; - rev = "b66838d220ad380a16da1d8878936974b26f815d"; - sha256 = "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2"; + rev = "c59b4874914b5b28068be25292690325f19739dd"; + sha256 = "1sp2h2n0ihp0r6q7c1861awg7rqh6bcxz4hgnny1gj5vjz9h7rch"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme"; sha256 = "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq"; - name = "material-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -24139,9 +31308,13 @@ license = lib.licenses.free; }; }) {}; - math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + math-symbol-lists = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "math-symbol-lists"; + ename = "math-symbol-lists"; version = "1.2"; src = fetchFromGitHub { owner = "vspinu"; @@ -24149,10 +31322,10 @@ rev = "328f792599e4e298d164e3c6331a2426d82ebf64"; sha256 = "1kj9r2mvmvnj6m2bwhbj8fspqiq8fdrhkaj0ir43f7qmd4imblsj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/math-symbol-lists"; sha256 = "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27"; - name = "math-symbol-lists"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24160,9 +31333,15 @@ license = lib.licenses.free; }; }) {}; - maven-test-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + maven-test-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "maven-test-mode"; + ename = "maven-test-mode"; version = "0.1.5"; src = fetchFromGitHub { owner = "rranelli"; @@ -24170,10 +31349,10 @@ rev = "f79409907375591283291eb96af4754b1ccc0e6f"; sha256 = "0x92b1qrhyrdh0z0xriyjc12h0wpk16x4yawj5i828ca6mz0qh5g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc7f677c53431542cb8d7c95666d021dead2b98/recipes/maven-test-mode"; sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm"; - name = "maven-test-mode"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -24181,9 +31360,13 @@ license = lib.licenses.free; }; }) {}; - maxframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + maxframe = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "maxframe"; + ename = "maxframe"; version = "0.5"; src = fetchFromGitHub { owner = "rmm5t"; @@ -24191,10 +31374,10 @@ rev = "4f1dbbe68048864037eae277b9280b90fd701ff1"; sha256 = "08gbkd8wln89j9yxp0zzd539hbwy1db31gca3vxxrpszixx8280y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/maxframe"; sha256 = "1lxj60qcvv8vakdq79k1brzv3ki74kajrx8620dzx76bnfkryxk8"; - name = "maxframe"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24202,9 +31385,14 @@ license = lib.licenses.free; }; }) {}; - mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mb-url = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mb-url"; + ename = "mb-url"; version = "0.1.0"; src = fetchFromGitHub { owner = "dochang"; @@ -24212,10 +31400,10 @@ rev = "129a0bb6a684be76fb9f09010e710065d0e5baaa"; sha256 = "1apy7abjhdbgh8001rzv41q40bfl444rcz62lvgdwj3lg45zb8xc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url"; sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h"; - name = "mb-url"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -24223,20 +31411,26 @@ license = lib.licenses.free; }; }) {}; - mbe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mbe = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mbe"; + ename = "mbe"; version = "0.1"; src = fetchFromGitHub { owner = "ijp"; repo = "mbe.el"; - rev = "b022030d6e26198bb8a93a5b0bfe7aa891cd59ec"; - sha256 = "00gwd2jf5ncgyay5w2jc2mhv18jf4ydnzpfkxaxw9zjbdxg4ym2i"; + rev = "06d5b8e240e6c277978314ceec31ad48b3b2966e"; + sha256 = "10zpm6b7r0h7b5hn84a92r1a747zvwgxr4gpa2wbjd74l5b0qciq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a8a16e485d608dbd59151d77e252048a49f9d25/recipes/mbe"; sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3"; - name = "mbe"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -24244,9 +31438,14 @@ license = lib.licenses.free; }; }) {}; - mc-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: - melpaBuild { + mc-extras = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multiple-cursors }: + melpaBuild { pname = "mc-extras"; + ename = "mc-extras"; version = "1.2.4"; src = fetchFromGitHub { owner = "knu"; @@ -24254,10 +31453,10 @@ rev = "f0ba639e9b18cc56e80ae45bbb2b694dbad9171a"; sha256 = "0d6ncj6zd0lfsdpffbh3l25ycjw5hn0rwi5znp5hpl06b1ycyk4s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12747bb8603ebc09ce0873f3317a99e34d818313/recipes/mc-extras"; sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym"; - name = "mc-extras"; + name = "recipe"; }; packageRequires = [ multiple-cursors ]; meta = { @@ -24265,20 +31464,24 @@ license = lib.licenses.free; }; }) {}; - mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mediawiki = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mediawiki"; - version = "2.2.5"; + ename = "mediawiki"; + version = "2.2.9"; src = fetchFromGitHub { owner = "hexmode"; repo = "mediawiki-el"; - rev = "f8f95722193cb74da2f6a01a0e558707c9b8c46d"; - sha256 = "1vsla0a5x4kfyj3ca4r1v8cspp12dadi0frpailclaxfmpmpl5d3"; + rev = "8473e12d1839f5287a4227586bf117dad820f867"; + sha256 = "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki"; sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6"; - name = "mediawiki"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24286,20 +31489,28 @@ license = lib.licenses.free; }; }) {}; - meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: - melpaBuild { + meghanada = callPackage ({ company + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "meghanada"; - version = "0.9.2"; + ename = "meghanada"; + version = "1.0.8"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0"; - sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8"; + rev = "1fe888ad929f0ebed9a8cde7bb0a605881e1386c"; + sha256 = "1b7cri71fikvyxcc6q9rci1zc4q45a1bvz00ks7gvx6w2sd7h5gd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4"; - name = "meghanada"; + name = "recipe"; }; packageRequires = [ company emacs flycheck yasnippet ]; meta = { @@ -24307,9 +31518,14 @@ license = lib.licenses.free; }; }) {}; - melpa-upstream-visit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + melpa-upstream-visit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "melpa-upstream-visit"; + ename = "melpa-upstream-visit"; version = "1.0.0"; src = fetchFromGitHub { owner = "laynor"; @@ -24317,10 +31533,10 @@ rev = "7310c74fdead3c0f86ad6eff76cf989e63f70f66"; sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c110538a1ae2419505ea8f144ef7de2d67cad568/recipes/melpa-upstream-visit"; sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf"; - name = "melpa-upstream-visit"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -24328,9 +31544,13 @@ license = lib.licenses.free; }; }) {}; - memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + memoize = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "memoize"; + ename = "memoize"; version = "1.1"; src = fetchFromGitHub { owner = "skeeto"; @@ -24338,10 +31558,10 @@ rev = "636defefa9168f90bce6fc27431352ac7d01a890"; sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize"; sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6"; - name = "memoize"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24349,9 +31569,16 @@ license = lib.licenses.free; }; }) {}; - mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }: - melpaBuild { + mentor = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq + , xml-rpc }: + melpaBuild { pname = "mentor"; + ename = "mentor"; version = "0.3.1"; src = fetchFromGitHub { owner = "skangas"; @@ -24359,10 +31586,10 @@ rev = "2b6aea26fd998d6e6fdac5e6b768f9a1751e268a"; sha256 = "1j6wf2z4816qj17bm45frhmxk1snsad3jvkjpasyg8pscf4kqi07"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor"; sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s"; - name = "mentor"; + name = "recipe"; }; packageRequires = [ cl-lib seq xml-rpc ]; meta = { @@ -24370,20 +31597,24 @@ license = lib.licenses.free; }; }) {}; - merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + merlin = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "merlin"; - version = "3.0.5"; + ename = "merlin"; + version = "3.1.0"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "a5dbf8e321ff162476555e62264468dd6f55c279"; - sha256 = "0mq4ddr3g64dd4bhq812hb5xvlkswfmib1nw34f3m8sghmaxcd5z"; + rev = "a9149b6ec88b455e0e040da6a6c0ca325d052904"; + sha256 = "1f9aqlic7i9ib5lfsix731bkzh857djcgfsqggxy95xvxswm8xpr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; sha256 = "177cy9xcrjckxv8gvi1zhg2ndfr8cmsr37inyvpi5dxqy6d6alhp"; - name = "merlin"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24391,9 +31622,40 @@ license = lib.licenses.free; }; }) {}; - meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + merlin-eldoc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "merlin-eldoc"; + ename = "merlin-eldoc"; + version = "1.2"; + src = fetchFromGitHub { + owner = "khady"; + repo = "merlin-eldoc"; + rev = "33544dcc389003ed6e3eabdade90c81db62ab0af"; + sha256 = "0p24l4jnsiaq3a36dq99pb74djnzjx7qjddns3w5l9s1hkrh79g5"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a7130ec893175323775e887babbcec7a1e324c01/recipes/merlin-eldoc"; + sha256 = "0r4997813yz81zvmdgvr0xcp9c321h55z39lajpj1plmrs3c7bry"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/merlin-eldoc"; + license = lib.licenses.free; + }; + }) {}; + meson-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "meson-mode"; + ename = "meson-mode"; version = "0.1"; src = fetchFromGitHub { owner = "wentasah"; @@ -24401,10 +31663,10 @@ rev = "212d9f38a08074f1cb6e914e12b60bc52dcb8bee"; sha256 = "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode"; sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80"; - name = "meson-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -24412,9 +31674,13 @@ license = lib.licenses.free; }; }) {}; - meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + meta-presenter = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "meta-presenter"; + ename = "meta-presenter"; version = "1.0.0"; src = fetchFromGitHub { owner = "myTerminal"; @@ -24422,10 +31688,10 @@ rev = "7ba8d30e36ce6de6e563c7f3a41a24d288787c48"; sha256 = "0m23qsbai8j0bx0px7v3ipw92i4y8maxibna6zqrw3msv1j3s7cw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; sha256 = "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d"; - name = "meta-presenter"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24433,9 +31699,14 @@ license = lib.licenses.free; }; }) {}; - metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: - melpaBuild { + metaweblog = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xml-rpc }: + melpaBuild { pname = "metaweblog"; + ename = "metaweblog"; version = "1.0.1"; src = fetchFromGitHub { owner = "punchagan"; @@ -24443,10 +31714,10 @@ rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a"; sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog"; sha256 = "10kwqnfafby4ap0572mfkkdssr13y9p2gl9z3nmxqjjy04fkfi8b"; - name = "metaweblog"; + name = "recipe"; }; packageRequires = [ xml-rpc ]; meta = { @@ -24454,20 +31725,24 @@ license = lib.licenses.free; }; }) {}; - mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mew = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mew"; - version = "6.7"; + ename = "mew"; + version = "6.8"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "08289430ce14780a03789b71d2060ff4392fbae6"; - sha256 = "1dhws4a298zrm88cdn66sikdk06n0p60d32cxsgybakkhg5c5wgr"; + rev = "972677a1aeb138709727634418c391316a3bf33c"; + sha256 = "14ahl8xdm3a168qfnlbw99rlhvr6nhw94nj01m6ny4f3rkh1p2hk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk"; - name = "mew"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24475,20 +31750,25 @@ license = lib.licenses.free; }; }) {}; - mgmtconfig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mgmtconfig-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mgmtconfig-mode"; + ename = "mgmtconfig-mode"; version = "0.0.15"; src = fetchFromGitHub { owner = "purpleidea"; repo = "mgmt"; - rev = "3ad7097c8aa7eab7f895aab9af22338c0cf82986"; - sha256 = "04sq8qn6wpsn5yxyf1g2cxv74v3r7n1n32jv174qdn4qknc9khkv"; + rev = "f01eea33e9b396f1e7501944216271d0d9b8df6f"; + sha256 = "19grypbx6kxgdlqnj1h7rz2clvrwk98z5sk9dar0077ncp2k1f80"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode"; sha256 = "0bdjaqfk68av4lfc4cpacrl2mxvimplfkbadi9l6wb65vlqz6sil"; - name = "mgmtconfig-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -24496,20 +31776,25 @@ license = lib.licenses.free; }; }) {}; - mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mhc = callPackage ({ calfw + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mhc"; - version = "1.1.1"; + ename = "mhc"; + version = "1.2.0"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "46d2a983b77b3139c9694ffba16ae875edc7d5b0"; - sha256 = "1bp4xqklf422n0zwwyj0ag3a4nndg8klazrga6rlvpy01hgg3drl"; + rev = "e29e69ab2f282131039a63f56f48e39d56c175d9"; + sha256 = "0lxn4vg3qxzdxad1fv0ssnw4rjhzvrys4k3lqx87sbg28l9ykk77"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql"; - name = "mhc"; + name = "recipe"; }; packageRequires = [ calfw ]; meta = { @@ -24517,9 +31802,13 @@ license = lib.licenses.free; }; }) {}; - migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + migemo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "migemo"; + ename = "migemo"; version = "1.9.1"; src = fetchFromGitHub { owner = "emacs-jp"; @@ -24527,10 +31816,10 @@ rev = "97e07796573c4c47f286bfe8eeb6428cb474526e"; sha256 = "1ckb5hymwj4wmsxakalsky4mkzn9vxhxr6416b2cr6r5jxj4xgsl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2424b0328a0198a03359455abdb3024a8067c857/recipes/migemo"; sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr"; - name = "migemo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24538,9 +31827,13 @@ license = lib.licenses.free; }; }) {}; - milkode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + milkode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "milkode"; + ename = "milkode"; version = "0.4"; src = fetchFromGitHub { owner = "ongaeshi"; @@ -24548,10 +31841,10 @@ rev = "ba97e2aeefa1d9d0b3835bf08edd0de248b0c513"; sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29fffbec2d3067c046c456602779af8c04bf898f/recipes/milkode"; sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh"; - name = "milkode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24559,9 +31852,13 @@ license = lib.licenses.free; }; }) {}; - minibuffer-complete-cycle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minibuffer-complete-cycle = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minibuffer-complete-cycle"; + ename = "minibuffer-complete-cycle"; version = "1.25.20130814"; src = fetchFromGitHub { owner = "knu"; @@ -24569,10 +31866,10 @@ rev = "3df80135887d0169e02294a948711f6dfeca4a6f"; sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/afac2cf41fe57efa8d313fdbab0b0b795ec144e4/recipes/minibuffer-complete-cycle"; sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2"; - name = "minibuffer-complete-cycle"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24580,9 +31877,13 @@ license = lib.licenses.free; }; }) {}; - minibuffer-cua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minibuffer-cua = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minibuffer-cua"; + ename = "minibuffer-cua"; version = "1.0.0"; src = fetchFromGitHub { owner = "knu"; @@ -24590,10 +31891,10 @@ rev = "e8dcddc24d4f2e8d7987336fb58259e3cc78bbcb"; sha256 = "07nbn2pwlp33kr136xsm6lzddhjs538xkz0fbays89psblmy4kwj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3b0f1f260b02c14da4d584b6af08b2fa3adf39c/recipes/minibuffer-cua"; sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw"; - name = "minibuffer-cua"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24601,9 +31902,13 @@ license = lib.licenses.free; }; }) {}; - miniedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + miniedit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "miniedit"; + ename = "miniedit"; version = "2.0"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -24611,10 +31916,10 @@ rev = "e12bf659c3eb92dd8a4cb77642dc0865c54667a3"; sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/miniedit"; sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87"; - name = "miniedit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24622,9 +31927,13 @@ license = lib.licenses.free; }; }) {}; - minimal-session-saver = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minimal-session-saver = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minimal-session-saver"; + ename = "minimal-session-saver"; version = "0.6.2"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -24632,10 +31941,10 @@ rev = "aaba48a8525e1310b221eeb96763304c22e9a4b4"; sha256 = "0kjhn48sf2ps3k5pv06gqmqc4hlk6di9ld3ssw6vwfh8313x1fc5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/minimal-session-saver"; sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i"; - name = "minimal-session-saver"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24643,20 +31952,26 @@ license = lib.licenses.free; }; }) {}; - minions = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minions = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minions"; + ename = "minions"; version = "0.2.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "minions"; - rev = "4fa1b333ecc13f577fab84ee64b8ee385a214b1e"; - sha256 = "0gzp1n0jpjmlskbw8mpdpql0d050qdcxwkcw1bfpp07xbs071w0l"; + rev = "536653d2dcae8362f2d02fee3ca8b65d4c875db7"; + sha256 = "1wa35cbffvzg0ciif93nv6jv7b0m72ixic0w8iwc5wbbvk9k5wip"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/769a2167d7f6dfdbbfda058ddea036f80b97d230/recipes/minions"; sha256 = "0ximlj93yp6646bh99r2vnayk15ky26sibrmrqqysfw1pzs4a940"; - name = "minions"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -24664,9 +31979,14 @@ license = lib.licenses.free; }; }) {}; - minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + minitest = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "minitest"; + ename = "minitest"; version = "0.8.0"; src = fetchFromGitHub { owner = "arthurnn"; @@ -24674,10 +31994,10 @@ rev = "2bed01262b0d888473468b5c7bd7d73694d31320"; sha256 = "0nd0jl5r5drnh98wdpqj2i7pgs7zvcizsh4qbvh8n0iw0c3f0pwh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41b2e55c0fe48267dc4f55924c782c6f934d8ca4/recipes/minitest"; sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw"; - name = "minitest"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -24685,9 +32005,13 @@ license = lib.licenses.free; }; }) {}; - mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mips-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mips-mode"; + ename = "mips-mode"; version = "1.1.1"; src = fetchFromGitHub { owner = "hlissner"; @@ -24695,10 +32019,10 @@ rev = "e6c25201a3325b555e64388908d584f3f81d9e32"; sha256 = "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; sha256 = "0gg18v80lbndi2yyr5nl37mz0zpamwv9ha4clajkf0bc0vplxkj7"; - name = "mips-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24706,9 +32030,14 @@ license = lib.licenses.free; }; }) {}; - mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: - melpaBuild { + mmm-jinja2 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mmm-mode }: + melpaBuild { pname = "mmm-jinja2"; + ename = "mmm-jinja2"; version = "0.1"; src = fetchFromGitHub { owner = "glynnforrest"; @@ -24716,10 +32045,10 @@ rev = "c8cb763174fa2fb61b9a0e5e0ff8cb0210f8492f"; sha256 = "0big2i3bg4cm14f68ncaiz2h6dk6zqiisrz4l0bv10q9kaa9q2sj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2"; sha256 = "0zg4psrgikb8644x3vmsns0id71ni9fcpm591zn16b4j64llvgsi"; - name = "mmm-jinja2"; + name = "recipe"; }; packageRequires = [ mmm-mode ]; meta = { @@ -24727,8 +32056,12 @@ license = lib.licenses.free; }; }) {}; - mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }: - melpaBuild { + mmm-mako = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild + , mmm-mode }: + melpaBuild { pname = "mmm-mako"; version = "1.1"; src = fetchhg { @@ -24736,7 +32069,7 @@ rev = "5c9ff92137b5"; sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/mmm-mako"; sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn"; name = "mmm-mako"; @@ -24747,9 +32080,15 @@ license = lib.licenses.free; }; }) {}; - mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mmt = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mmt"; + ename = "mmt"; version = "0.2.0"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -24757,10 +32096,10 @@ rev = "f7db836a10720ee50217012e7e2597ebcf624f90"; sha256 = "13vbfc5597v0gd87qyhn10f93nb477vjpg3jlpphbax9fvkf4gav"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq"; - name = "mmt"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -24768,9 +32107,14 @@ license = lib.licenses.free; }; }) {}; - mocha = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: - melpaBuild { + mocha = callPackage ({ fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild }: + melpaBuild { pname = "mocha"; + ename = "mocha"; version = "1.1"; src = fetchFromGitHub { owner = "scottaj"; @@ -24778,10 +32122,10 @@ rev = "4ca9495d4b00b753f055152bd4256c07d7b208f4"; sha256 = "0yj9kc59c227727kh1zjxwrhijzd7rdhix7qqm4na1z6s4ycpxbm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx"; - name = "mocha"; + name = "recipe"; }; packageRequires = [ js2-mode ]; meta = { @@ -24789,9 +32133,14 @@ license = lib.licenses.free; }; }) {}; - mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + mocha-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "mocha-snippets"; + ename = "mocha-snippets"; version = "1.0.0"; src = fetchFromGitHub { owner = "cowboyd"; @@ -24799,10 +32148,10 @@ rev = "e054137bd78f0d236e983874da1f345d30a71816"; sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets"; sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds"; - name = "mocha-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -24810,9 +32159,15 @@ license = lib.licenses.free; }; }) {}; - mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mocker = callPackage ({ eieio ? null + , el-x + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mocker"; + ename = "mocker"; version = "0.3.1"; src = fetchFromGitHub { owner = "sigma"; @@ -24820,10 +32175,10 @@ rev = "55b078b53ea49e48bd1821d96f0fb86f794fdc6c"; sha256 = "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a4fe34a6f354d396c24ff13e15157510202259/recipes/mocker"; sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3"; - name = "mocker"; + name = "recipe"; }; packageRequires = [ eieio el-x ]; meta = { @@ -24831,9 +32186,14 @@ license = lib.licenses.free; }; }) {}; - modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + modalka = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "modalka"; + ename = "modalka"; version = "0.1.5"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -24841,10 +32201,10 @@ rev = "1259afa084f58d143d133aac56a6c0c10bc460f2"; sha256 = "0ggj8q92sb6wp3hs1vhpmy56id0p3i9zwnw24g2v7xa7w8ac9s7l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c"; - name = "modalka"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -24852,9 +32212,15 @@ license = lib.licenses.free; }; }) {}; - mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mode-icons = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mode-icons"; + ename = "mode-icons"; version = "0.4.0"; src = fetchFromGitHub { owner = "ryuslash"; @@ -24862,10 +32228,10 @@ rev = "37581ed911e4469f773ddfb7b40a85592d323b76"; sha256 = "1ykj68d4h92i4qv90zgwrf9jhy1n22l2h9k5f1zsn8hvz9mhj1av"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons"; sha256 = "1dqcry27rz7afyvjg7345wysp6wmh8fpj32ysk5iw5i7v5scf6kf"; - name = "mode-icons"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -24873,9 +32239,13 @@ license = lib.licenses.free; }; }) {}; - mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mode-line-debug = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mode-line-debug"; + ename = "mode-line-debug"; version = "1.2.3"; src = fetchFromGitHub { owner = "tarsius"; @@ -24883,10 +32253,10 @@ rev = "a0fcc394b07d2414bd6f722da10f1c7567333f6b"; sha256 = "04vsb0lniy90bhnqb590dap9y4wac64xz0lc2rlfczic0nrqd1aa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0080ab9ef1eca5dd19b3fd9af536d8aa17773a2/recipes/mode-line-debug"; sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd"; - name = "mode-line-debug"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24894,9 +32264,13 @@ license = lib.licenses.free; }; }) {}; - modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + modern-cpp-font-lock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "modern-cpp-font-lock"; + ename = "modern-cpp-font-lock"; version = "0.1.3"; src = fetchFromGitHub { owner = "ludwigpacifici"; @@ -24904,10 +32278,10 @@ rev = "3e9c18b5a2ade485565f5191f12a724f1969dbb0"; sha256 = "0jg5yix4c18gvy5n4wsi7zg2sb7r0bw0xlmq0w15g3z63nhy69vc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock"; sha256 = "0h43icb5rqbkc5699kdy2mrjs5448phl18jch45ylp2wy2r8c2qj"; - name = "modern-cpp-font-lock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24915,9 +32289,39 @@ license = lib.licenses.free; }; }) {}; - monitor = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + moe-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "moe-theme"; + ename = "moe-theme"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "kuanyui"; + repo = "moe-theme.el"; + rev = "b8f0206614ab40ffb75e50ce6c38675fb9c7cf2e"; + sha256 = "0pn3a1rrj7ycxh91x3q008b6rmq7rbl8ir6diqzqfp6y465pn2w2"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; + sha256 = "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/moe-theme"; + license = lib.licenses.free; + }; + }) {}; + monitor = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "monitor"; + ename = "monitor"; version = "0.3.0"; src = fetchFromGitHub { owner = "GuiltyDolphin"; @@ -24925,10 +32329,10 @@ rev = "8c67c06f60a89b2583bae90afc91a7e7d73260fd"; sha256 = "1r2sns49f5fw4f122s165sa41nkrkq2qs20n98g2pfd1whflqfnb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9df614e8e7b9dfdbd7eec552a2b13e0f5acfc22/recipes/monitor"; sha256 = "11n4nv6vkjw434yrwqjw20229m2sxqxxdp7sg99gzrd5gjyab643"; - name = "monitor"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -24936,20 +32340,24 @@ license = lib.licenses.free; }; }) {}; - monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + monokai-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "monokai-theme"; - version = "3.5.2"; + ename = "monokai-theme"; + version = "3.5.3"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "da23ef64d4848636e47a026259526575381bd164"; - sha256 = "08py8dmwlqhc16fjcjf24dmpfbv2xpq8b0l43cx8f44f6791r2qf"; + rev = "1143c072f5153ae1a69807e5e8af163069b947d2"; + sha256 = "0dy8c3349j7fmp8052hbgvk0b7ldlv5jqpg0paq1i0hlypivd30i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a"; - name = "monokai-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24957,9 +32365,13 @@ license = lib.licenses.free; }; }) {}; - monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + monroe = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "monroe"; + ename = "monroe"; version = "0.3.1"; src = fetchFromGitHub { owner = "sanel"; @@ -24967,10 +32379,10 @@ rev = "0b9b043f042145bf62969add7ec476ea51da7cbd"; sha256 = "101lfrykdbv37spkbw7zihhx26bc1lhjyxbanrcp9880bxj04jiy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig"; - name = "monroe"; + name = "recipe"; }; packageRequires = []; meta = { @@ -24978,20 +32390,25 @@ license = lib.licenses.free; }; }) {}; - moody = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + moody = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "moody"; - version = "0.2.0"; + ename = "moody"; + version = "0.3.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "moody"; - rev = "db27ba168503bd6e6c98c313e73699dc403a10aa"; - sha256 = "1y0zg0flcv3sawyqvwilh1ysvbn1bsnkn0b2n89lj00zyb5dj5z8"; + rev = "adf652f35cba1bb3d0f254e1905e2deeeb0fbdba"; + sha256 = "1zspq29n60r0kd9fy7d50zdypljigwcjb0qa5gkwiipnhpcnf9bp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody"; sha256 = "095241sjw330fb5lk48aa4zx8xbzk8s4ml22n6a8bzr99nkhn5jy"; - name = "moody"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -24999,20 +32416,50 @@ license = lib.licenses.free; }; }) {}; - morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + moom = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "moom"; + ename = "moom"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "takaxp"; + repo = "moom"; + rev = "536eac1dd2b187f65ed85ad8efc95f7e2bcaadb2"; + sha256 = "12v2m66dlvnggmraxgmcfq4ycv6wdc56dv63gggrcy7zhlxwi9vp"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c55081230ee02346ed02e0ab19ee2302e7b9ffa7/recipes/moom"; + sha256 = "11l4yc8fhxsrsjfksqj4cxr13jln0khhd2dn09i94n71dx7lybh1"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/moom"; + license = lib.licenses.free; + }; + }) {}; + morlock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "morlock"; + ename = "morlock"; version = "1.0.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "morlock"; - rev = "b883d48024ddfffebe2d0dd69f5ed54c617f8834"; - sha256 = "0xns4f39x012n7piiv6kgb45n932wxs5fp4yyq44p1mnr0m8v4y8"; + rev = "5fd655ba3050981ab8059bcddf5b19c21f9ceea1"; + sha256 = "0bgrqydh9bb059j6b6y86xn6qdq85y0radsi1zq20p5xmrsgivbn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ef53bbc80edda12a90a8a9705fe14415972833/recipes/morlock"; sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna"; - name = "morlock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25020,20 +32467,25 @@ license = lib.licenses.free; }; }) {}; - mosey = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mosey = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mosey"; - version = "0.1"; + ename = "mosey"; + version = "0.2"; src = fetchFromGitHub { owner = "alphapapa"; repo = "mosey.el"; - rev = "4d28bf359242477a45994336c2ce37243965c65e"; - sha256 = "1xakw1q5m3iahvj7xapyi008pr2nrl3msgdfdfsk561ci7bc2008"; + rev = "2e3ac9d334fa2937ed5267193dfd25d8e1f14dc2"; + sha256 = "1yxy6m5igvsy37vn93ijs0b479v50vsnsyp8zi548iy2ribr0qr5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76a9a43eea68db9f82c07677235c481a6f243aa2/recipes/mosey"; sha256 = "0zprzr5aqv77kmg1ki9w6fw1nc2ap6yqjl4ak05a1i9cq8g6nf3m"; - name = "mosey"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -25041,9 +32493,13 @@ license = lib.licenses.free; }; }) {}; - move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + move-dup = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "move-dup"; + ename = "move-dup"; version = "1.0.0"; src = fetchFromGitHub { owner = "wyuenho"; @@ -25051,10 +32507,10 @@ rev = "dae61de7aa5e2bf56a7bab1fa36fa3a39520a3c0"; sha256 = "1mrrxx2slxi1qgf483nnxv3y8scfsc844sfnzn4b7hjpfpali0r8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup"; sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f"; - name = "move-dup"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25062,20 +32518,24 @@ license = lib.licenses.free; }; }) {}; - move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + move-text = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "move-text"; + ename = "move-text"; version = "2.0.8"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "move-text"; - rev = "bdaf3e3a0d33cd528cad1d10facbdf0635232e4d"; - sha256 = "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1"; + rev = "daaa5c3e01d1b88f4eea8e1421acd2453c2df350"; + sha256 = "1hm2j28vf7zh5h552wszawxsp2c4jwpc33017ld1vc9qcccp3895"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text"; sha256 = "04bfrkanafmbrdyw06ciw9kiyn7h3kpikxk3clx2gc04jl67hzgy"; - name = "move-text"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25083,20 +32543,24 @@ license = lib.licenses.free; }; }) {}; - mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mowedline = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mowedline"; + ename = "mowedline"; version = "3.3.0"; src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "c17501b48ded8261d815ab60bf14cddf7040be72"; - sha256 = "1k3b018xq2qqq30v0ik13imy9c84241kyavj5ascxhywx956v18g"; + rev = "bde4de0a4e1404127b0a48897d8cd1d1cb8a263d"; + sha256 = "0wwl9f01b9sgs8n19a4i7h08xaf6zdljf2plbdpyy4gzi2iiqcc4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb"; - name = "mowedline"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25104,20 +32568,24 @@ license = lib.licenses.free; }; }) {}; - moz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + moz = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "moz"; + ename = "moz"; version = "1.1.0"; src = fetchFromGitHub { owner = "bard"; repo = "mozrepl"; - rev = "646208b67e6c9c56d188db1eba999846d518935f"; - sha256 = "13bf5jn1kgqg59j5czlzvajq2fw1rz4h5jqfc7x8w1a067nymf2c"; + rev = "9a3e3e08c12379a54d51ec92a012995c9597c566"; + sha256 = "1g7rriy8xnsx0xpdw54ywra2pzz6ynqlf6mpmr59xf6v8wpz85pk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6839c5e52364fb32f6d8a351e5c2f21fbd6669a1/recipes/moz"; sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi"; - name = "moz"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25125,9 +32593,14 @@ license = lib.licenses.free; }; }) {}; - moz-controller = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, moz }: - melpaBuild { + moz-controller = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , moz }: + melpaBuild { pname = "moz-controller"; + ename = "moz-controller"; version = "1.0"; src = fetchFromGitHub { owner = "RenWenshan"; @@ -25135,10 +32608,10 @@ rev = "42fd842039620de7fb122f7e4ffc1ab802ee97c5"; sha256 = "1w1i1clkjg9mj1g4i2y3xw3hyj8s7h9gr04qgyb9c1q8vh11z8d0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcc20337594a76a547f696adece121ae592c6917/recipes/moz-controller"; sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd"; - name = "moz-controller"; + name = "recipe"; }; packageRequires = [ moz ]; meta = { @@ -25146,9 +32619,16 @@ license = lib.licenses.free; }; }) {}; - mozc-temp = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }: - melpaBuild { + mozc-temp = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mozc }: + melpaBuild { pname = "mozc-temp"; + ename = "mozc-temp"; version = "1.0.0"; src = fetchFromGitHub { owner = "HKey"; @@ -25156,10 +32636,10 @@ rev = "7f5dd5fc8ceeca9b1822f7e056a4be67e2e74959"; sha256 = "1gdi2pz8450h11aknz3hbgjlx09w6c4l8d8sz0zv3pb1z8cqkgqv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0c77275d759bf73df11fa151b4e737d7cb15adf/recipes/mozc-temp"; sha256 = "0x1bsa1py0kn73hzbsb4ijl0bqng8nib191vgn6xq8f5cx55044d"; - name = "mozc-temp"; + name = "recipe"; }; packageRequires = [ dash emacs mozc ]; meta = { @@ -25167,20 +32647,26 @@ license = lib.licenses.free; }; }) {}; - mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, libmpdel, melpaBuild }: - melpaBuild { + mpdel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , libmpdel + , melpaBuild }: + melpaBuild { pname = "mpdel"; - version = "0.4.0"; + ename = "mpdel"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mpdel"; repo = "mpdel"; - rev = "3786dd31a9f0a3355c967889323742cfe61f4141"; - sha256 = "0fqdhjmywyw9yd97glrw12j962kmq062djgz2ymv6kspy2g1xv9y"; + rev = "a1e05828e3bc03679530b4cfff1306706171cb78"; + sha256 = "1avfhkklhkkazy1b0ymcmc0walrs29ak36vbvaxs480r5s16dkjd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel"; sha256 = "1py6zk16yl7pyql2qxzd770clzszw7c769hw70n963kns1qmpif8"; - name = "mpdel"; + name = "recipe"; }; packageRequires = [ emacs libmpdel ]; meta = { @@ -25188,20 +32674,26 @@ license = lib.licenses.free; }; }) {}; - mpmc-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }: - melpaBuild { + mpmc-queue = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , queue }: + melpaBuild { pname = "mpmc-queue"; + ename = "mpmc-queue"; version = "0.1.1"; src = fetchFromGitHub { owner = "smizoe"; repo = "mpmc-queue"; - rev = "4775ddcb120528828ef1fcb7ee761524a0907a31"; - sha256 = "0fbrx288vpd0vx2cph7kfclr7hhplqjgynr6csmkh8jaskv26p79"; + rev = "5e14451bdebaa17a1de9a78a712abf833e2652d8"; + sha256 = "1vlpfw79s9gczdwy6a7hl4rn94ld7jrbslga0pz8am9jnq0i9dh0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30511f1e5eaf45b5f43fbacdd6c7254cb39b1d2c/recipes/mpmc-queue"; sha256 = "08jcmhfl87nsg6zgv582yfs152bqihbcssh085gxxqn2x99li354"; - name = "mpmc-queue"; + name = "recipe"; }; packageRequires = [ emacs queue ]; meta = { @@ -25209,9 +32701,18 @@ license = lib.licenses.free; }; }) {}; - mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }: - melpaBuild { + mpv = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild + , names + , org }: + melpaBuild { pname = "mpv"; + ename = "mpv"; version = "0.1.0"; src = fetchFromGitHub { owner = "kljohann"; @@ -25219,10 +32720,10 @@ rev = "059135de3979e044f14503806047476d9be9f0e8"; sha256 = "1pjhch8vah0kf73fl2fk6khhrx1kflggd3zlxrf7w4fxr0qn8la3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2392c1d1042ac6a42bbf9aa7e394c03e178829d0/recipes/mpv"; sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l"; - name = "mpv"; + name = "recipe"; }; packageRequires = [ cl-lib emacs json names org ]; meta = { @@ -25230,9 +32731,44 @@ license = lib.licenses.free; }; }) {}; - msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mqtt-mode = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mqtt-mode"; + ename = "mqtt-mode"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "andrmuel"; + repo = "mqtt-mode"; + rev = "613e70e9b9940e635e779994b5c83f86eb62c8e6"; + sha256 = "1ci1w4yma6axiigz55b2ip0r7zy8v215532jc0rkb3wyn14nsrh7"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b85c84ff9523026620e5b3cf864bbc7b9f81d57a/recipes/mqtt-mode"; + sha256 = "1zbnhd65c9wz9yr29j37c8z7vz3axpfwkzx0z8xjplp40mafpz1z"; + name = "recipe"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/mqtt-mode"; + license = lib.licenses.free; + }; + }) {}; + msvc = callPackage ({ ac-clang + , cedet ? null + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "msvc"; + ename = "msvc"; version = "1.3.7"; src = fetchFromGitHub { owner = "yaruopooner"; @@ -25240,10 +32776,10 @@ rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3"; sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3"; - name = "msvc"; + name = "recipe"; }; packageRequires = [ ac-clang cedet cl-lib emacs ]; meta = { @@ -25251,9 +32787,14 @@ license = lib.licenses.free; }; }) {}; - mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mtg-deck-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mtg-deck-mode"; + ename = "mtg-deck-mode"; version = "0.2"; src = fetchFromGitHub { owner = "mattiasb"; @@ -25261,10 +32802,10 @@ rev = "7774641630ef85999ab2f6d57eebddbc7c1e7244"; sha256 = "12ajrlgyj14jf66if7bdgj69jm72wzrmiclx7x8dpsz4zpj38m20"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; sha256 = "07hszf33nawhp218f90qr4s713yyjdd7zzkq0s8q0fb6aai5iiih"; - name = "mtg-deck-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -25272,9 +32813,17 @@ license = lib.licenses.free; }; }) {}; - mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: - melpaBuild { + mu4e-alert = callPackage ({ alert + , emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , s }: + melpaBuild { pname = "mu4e-alert"; + ename = "mu4e-alert"; version = "1.0"; src = fetchFromGitHub { owner = "iqbalansari"; @@ -25282,10 +32831,10 @@ rev = "3453e25ff6c07c1b768b2a79fdb9fc5c97100e76"; sha256 = "1nvsfbfsma59ilf7c3vjngnmx3aapwvvvaafdy5szm5r6lkicqvg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert"; sha256 = "0b74ky51nx75vcrrbabr5cj2cx4yax5kgaq479hjp5yc5mq2q46r"; - name = "mu4e-alert"; + name = "recipe"; }; packageRequires = [ alert emacs ht s ]; meta = { @@ -25293,9 +32842,13 @@ license = lib.licenses.free; }; }) {}; - mu4e-maildirs-extension = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mu4e-maildirs-extension = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mu4e-maildirs-extension"; + ename = "mu4e-maildirs-extension"; version = "0.8"; src = fetchFromGitHub { owner = "agpchil"; @@ -25303,10 +32856,10 @@ rev = "8b384b0bbda46c473dea3ee7dc68c2b3f2548528"; sha256 = "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-maildirs-extension"; sha256 = "0bisxm0rph5q1p3zjr7vyyr0jqr3ihs6ihiwyfr8d3dvba1zhffc"; - name = "mu4e-maildirs-extension"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25314,9 +32867,14 @@ license = lib.licenses.free; }; }) {}; - multi = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + multi = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multi"; + ename = "multi"; version = "2.0.1"; src = fetchFromGitHub { owner = "kurisuwhyte"; @@ -25324,10 +32882,10 @@ rev = "884203b11fdac8374ec644cca975469aab263404"; sha256 = "11zabs7qpdhri6n90ck7pgwcbz46d813nyl73h5m1i8jvz1wzx7v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9fea5cf529bcdf412af2926e55b8d77edc07eca/recipes/multi"; sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig"; - name = "multi"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -25335,9 +32893,18 @@ license = lib.licenses.free; }; }) {}; - multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: - melpaBuild { + multi-line = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , shut-up }: + melpaBuild { pname = "multi-line"; + ename = "multi-line"; version = "0.1.5"; src = fetchFromGitHub { owner = "IvanMalison"; @@ -25345,10 +32912,10 @@ rev = "778c7510b7f066f53cf1f96a6ad1079fda5dc1f7"; sha256 = "0lr1i2a4fw40iz8qz2zqch63ci9pwvrri219phv22kn76jqn39mh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line"; sha256 = "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp"; - name = "multi-line"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs s shut-up ]; meta = { @@ -25356,8 +32923,12 @@ license = lib.licenses.free; }; }) {}; - multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + multi-project = callPackage ({ emacs + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multi-project"; version = "0.0.26"; src = fetchhg { @@ -25365,7 +32936,7 @@ rev = "a6e7c1542c0b"; sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x"; name = "multi-project"; @@ -25376,9 +32947,15 @@ license = lib.licenses.free; }; }) {}; - multi-run = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }: - melpaBuild { + multi-run = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , window-layout }: + melpaBuild { pname = "multi-run"; + ename = "multi-run"; version = "1"; src = fetchFromGitHub { owner = "sagarjha"; @@ -25386,10 +32963,10 @@ rev = "87d9eed414999fd94685148d39e5308c099e65ca"; sha256 = "0m4wk6sf01b7bq5agmyfcm9kpmwmd90wbvh7fkhs61mrs86s2zw8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run"; sha256 = "1iv4a49czdjl0slp8590f1ya0vm8g2ycnkwrdpqi3b55haaqp91h"; - name = "multi-run"; + name = "recipe"; }; packageRequires = [ emacs window-layout ]; meta = { @@ -25397,9 +32974,13 @@ license = lib.licenses.free; }; }) {}; - multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + multi-term = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multi-term"; + ename = "multi-term"; version = "1.2"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -25407,10 +32988,10 @@ rev = "c9e67edb772f2d9f9da8d887dc746459cfbce244"; sha256 = "1bn6zx931vz2fa72ab999r33bxv8brn3cqmalvq25x7s4z3q1lyi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/multi-term"; sha256 = "16idk4nd7qpyrvyspbrdl8gdfaclng6ny0xigk6fqdv352djalal"; - name = "multi-term"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25418,9 +32999,13 @@ license = lib.licenses.free; }; }) {}; - multi-web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + multi-web-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multi-web-mode"; + ename = "multi-web-mode"; version = "0.2.1"; src = fetchFromGitHub { owner = "fgallina"; @@ -25428,10 +33013,10 @@ rev = "0517b9e2b3052533ac0cb71eba7073ed309fce06"; sha256 = "1d9y3dw27pgzgv6wk575d5ign55xdqgbl3ycyq1z7sji1477lz6b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/multi-web-mode"; sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5"; - name = "multi-web-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25439,9 +33024,14 @@ license = lib.licenses.free; }; }) {}; - multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + multiple-cursors = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "multiple-cursors"; + ename = "multiple-cursors"; version = "1.4.0"; src = fetchFromGitHub { owner = "magnars"; @@ -25449,10 +33039,10 @@ rev = "b3bd49c756cd959c0fb998d27eaf3d273570b05e"; sha256 = "1ijgvzv5r44xqvz751fd5drbvrspapw6xwv47582w255j363r6ss"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors"; sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x"; - name = "multiple-cursors"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -25460,20 +33050,27 @@ license = lib.licenses.free; }; }) {}; - mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: - melpaBuild { + mustache = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , s }: + melpaBuild { pname = "mustache"; + ename = "mustache"; version = "0.23"; src = fetchFromGitHub { owner = "Wilfred"; repo = "mustache.el"; - rev = "b0ea352813592424164520a49e86c04600242752"; - sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q"; + rev = "9963a8ddd42ba01899b9d3c74c518745dfe1a2fb"; + sha256 = "0514fdiq81qqcz6x9fajn9qxsg11q8dkg3n8b36xx4zpyawz59c4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1bcf9599ca6d2c29333071a80f96808d4ab52e2/recipes/mustache"; sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g"; - name = "mustache"; + name = "recipe"; }; packageRequires = [ dash ht s ]; meta = { @@ -25481,9 +33078,13 @@ license = lib.licenses.free; }; }) {}; - mustache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mustache-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mustache-mode"; + ename = "mustache-mode"; version = "1.3"; src = fetchFromGitHub { owner = "mustache"; @@ -25491,10 +33092,10 @@ rev = "bf9897eb287ca47ced65d7d4e07ea61ea0aec39f"; sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mustache-mode"; sha256 = "1xmqh663r5i42a586xn0wzw6h1jkvhbnw5iwvjv96w452slhkr36"; - name = "mustache-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25502,9 +33103,13 @@ license = lib.licenses.free; }; }) {}; - mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mwim = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mwim"; + ename = "mwim"; version = "0.4"; src = fetchFromGitHub { owner = "alezost"; @@ -25512,10 +33117,10 @@ rev = "462207227b98a6a4356d51419f5ad5ba9356e5cf"; sha256 = "06lw6064i82daasgm87gm58d142pypqc1q3cnx1cm35hyj4skd32"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim"; sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k"; - name = "mwim"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25523,9 +33128,15 @@ license = lib.licenses.free; }; }) {}; - mykie = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + mykie = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "mykie"; + ename = "mykie"; version = "0.3.1"; src = fetchFromGitHub { owner = "yuutayamada"; @@ -25533,10 +33144,10 @@ rev = "ab8f7549f9018c26278d101af1b90997c9e5e0b3"; sha256 = "0550k0rfm0zai306642v689mcpsw9pbd5vs0il82cihwvrxjifc5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e10504a19e052c080be2ccc9b1b8fd2e73a852e0/recipes/mykie"; sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj"; - name = "mykie"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -25544,9 +33155,15 @@ license = lib.licenses.free; }; }) {}; - mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + mysql-to-org = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "mysql-to-org"; + ename = "mysql-to-org"; version = "1.0.0"; src = fetchFromGitHub { owner = "mallt"; @@ -25554,10 +33171,10 @@ rev = "0f51b174a0ee6c9820baf9d79783923b270f3ffc"; sha256 = "1gxp1a26sna0p3xq6by8bk4yphhh32bvll0sdm2p3wkpdaci7hyz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mysql-to-org"; sha256 = "0jjdv6ywdn1618l36bw3xa3mdgg3rc8r0rdv9xdqx8mmg648a7gj"; - name = "mysql-to-org"; + name = "recipe"; }; packageRequires = [ emacs s ]; meta = { @@ -25565,9 +33182,15 @@ license = lib.licenses.free; }; }) {}; - myterminal-controls = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + myterminal-controls = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "myterminal-controls"; + ename = "myterminal-controls"; version = "1.0.0"; src = fetchFromGitHub { owner = "myTerminal"; @@ -25575,10 +33198,10 @@ rev = "59ff3a02e34969a2ac608906937cb65cb514f9f1"; sha256 = "11b0m09n1qqhjbdmcilb1g1408k17700qn37m3wavjrcjvdhnd5n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2"; - name = "myterminal-controls"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -25586,9 +33209,16 @@ license = lib.licenses.free; }; }) {}; - name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + name-this-color = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "name-this-color"; + ename = "name-this-color"; version = "0.3.0"; src = fetchFromGitHub { owner = "knl"; @@ -25596,10 +33226,10 @@ rev = "e37cd1291d5d68d4c8d6386eab9cb9d94fd3bcfa"; sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/name-this-color"; sha256 = "15x3dp135p45gv4qn4ll3pd6zqi4glcpv6fzvjxnx0dcval9z4d8"; - name = "name-this-color"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -25607,9 +33237,14 @@ license = lib.licenses.free; }; }) {}; - nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nameless = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nameless"; + ename = "nameless"; version = "1.0.2"; src = fetchFromGitHub { owner = "Malabarba"; @@ -25617,10 +33252,10 @@ rev = "ab1a5c589378334eafca105af1a17f73b9065423"; sha256 = "107q1rximjnag9r9vgwh0iv687i3rsscbdnjc46f8l16j6vi4n7d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless"; sha256 = "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq"; - name = "nameless"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -25628,9 +33263,15 @@ license = lib.licenses.free; }; }) {}; - names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + names = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "names"; + ename = "names"; version = "20151201.0"; src = fetchFromGitHub { owner = "Malabarba"; @@ -25638,10 +33279,10 @@ rev = "00862c57ae6363ba86d1e5ce138929a1b6d5c7e6"; sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names"; sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg"; - name = "names"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -25649,9 +33290,14 @@ license = lib.licenses.free; }; }) {}; - narrow-reindent = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + narrow-reindent = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "narrow-reindent"; + ename = "narrow-reindent"; version = "0.2.0"; src = fetchFromGitHub { owner = "emallson"; @@ -25659,10 +33305,10 @@ rev = "87466aac4dbeb79597124dd077bf5c704872fd3d"; sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73c7f01a009dc7ac1b9da8ce41859695a97b7878/recipes/narrow-reindent"; sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0"; - name = "narrow-reindent"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -25670,9 +33316,15 @@ license = lib.licenses.free; }; }) {}; - narrowed-page-navigation = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + narrowed-page-navigation = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "narrowed-page-navigation"; + ename = "narrowed-page-navigation"; version = "0.1.0"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -25680,10 +33332,10 @@ rev = "b215adbac4873f56fbab65772062f0f5be8058a1"; sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37e993fec280428f094b6c8ec418fe5ba8c6d49/recipes/narrowed-page-navigation"; sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7"; - name = "narrowed-page-navigation"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -25691,9 +33343,14 @@ license = lib.licenses.free; }; }) {}; - nasm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nasm-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nasm-mode"; + ename = "nasm-mode"; version = "1.1.1"; src = fetchFromGitHub { owner = "skeeto"; @@ -25701,10 +33358,10 @@ rev = "d990ed94d902b74a5c834fb567e03307607cee45"; sha256 = "1dyc50a1zskx9fqxl2iy2x74f3bkb2ccz908v0aj13rqfqqnns9j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a832b3bd7c2f2d3cee8bcfb5421d22acf5523e/recipes/nasm-mode"; sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17"; - name = "nasm-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -25712,9 +33369,13 @@ license = lib.licenses.free; }; }) {}; - nav-flash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nav-flash = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nav-flash"; + ename = "nav-flash"; version = "1.1.0"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -25722,10 +33383,10 @@ rev = "9054a0f9b51da9e5207672efc029ba265ba28f34"; sha256 = "119hy8rs83f17d6zizdaxn2ck3sylxbyz7adszbznjc8zrbaw0ic"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/nav-flash"; sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3"; - name = "nav-flash"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25733,20 +33394,24 @@ license = lib.licenses.free; }; }) {}; - navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + navi-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "navi-mode"; + ename = "navi-mode"; version = "2.0"; src = fetchFromGitHub { owner = "alphapapa"; repo = "navi"; - rev = "5c979b3b3873b0e67751a1321a9e271d066f2022"; - sha256 = "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh"; + rev = "c1b91438aebe2115a4e5d8ebec995dade74f19c4"; + sha256 = "175l9s269wzqlg0axs7lr4834x7ghkgfz43xqcxnd2sdsmyrdd7s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode"; sha256 = "0pc52iq8lng2g0vpnrhdfxmibc1dx9ksmrjg0303as1yv41fnc69"; - name = "navi-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25754,9 +33419,16 @@ license = lib.licenses.free; }; }) {}; - navorski = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, multi-term, s }: - melpaBuild { + navorski = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multi-term + , s }: + melpaBuild { pname = "navorski"; + ename = "navorski"; version = "0.2.7"; src = fetchFromGitHub { owner = "roman"; @@ -25764,10 +33436,10 @@ rev = "4546d4e4dfbec20ee8c423c045408a3388a9eab9"; sha256 = "09cb07f98aclgq8jf5419305zydkk1hz4nvzrwqz7syrlpvx8xi5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9246cef94029d2da2211345c076ed55deb91e8fa/recipes/navorski"; sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7"; - name = "navorski"; + name = "recipe"; }; packageRequires = [ dash multi-term s ]; meta = { @@ -25775,9 +33447,14 @@ license = lib.licenses.free; }; }) {}; - ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ncl-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ncl-mode"; + ename = "ncl-mode"; version = "0.99.2"; src = fetchFromGitHub { owner = "yyr"; @@ -25785,10 +33462,10 @@ rev = "164e504e25cec1812fbae5c3dae164d9f6018ece"; sha256 = "1m3llm87qgd7sr6ci22nd835vdg0qprs5m9lqcx74k689jl89cni"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode"; sha256 = "1niy0w24q6q6j7s0l9fcaqai7zz2gg1qlk2s9sxb8j79jc41y47k"; - name = "ncl-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -25796,20 +33473,24 @@ license = lib.licenses.free; }; }) {}; - nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nemerle = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nemerle"; + ename = "nemerle"; version = "1.2"; src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "556270ce8b97668a65e9ec20a05f78c3dffeac60"; - sha256 = "19xxg4ya6vndk2ljdnl284zs8qf9dkq4ghr7pmsclp9n7zh46v48"; + rev = "69cec44ed3861ddfa0e23a4e44b926dda8a9716b"; + sha256 = "0hk18jd4bz0gp7b0qn2vgh3sc7r7cygc3gg269dyv5v4n1vyxx79"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle"; sha256 = "1rbalq3s2inwz9cf6bfmnxgqd9ylba3crflfjs6b4mnp33z4swny"; - name = "nemerle"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25817,20 +33498,24 @@ license = lib.licenses.free; }; }) {}; - neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + neon-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "neon-mode"; - version = "1.2.2"; + ename = "neon-mode"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "044040df9e83a015ddfe58940b503b6197fc29ce"; - sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa"; + rev = "99d15e46beaf1e7d71e39a00cce810df1f33229d"; + sha256 = "07vsi07m5q070fvkqhz32qa2y7dgnyi1kggairimbiwbn98bh642"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; sha256 = "0kgyc0rkxvvks5ykizfv82f2cx7ck17sk63plj7bld6khlcgv0y6"; - name = "neon-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25838,9 +33523,14 @@ license = lib.licenses.free; }; }) {}; - neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + neotree = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "neotree"; + ename = "neotree"; version = "0.5.2"; src = fetchFromGitHub { owner = "jaypei"; @@ -25848,10 +33538,10 @@ rev = "5e1271655170f4cdc6849258e383c548a4e6e3d0"; sha256 = "0hx72fq10772bbyqrj7mhhp02k26cccjxdadiqm1ykainhfmn1x0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06"; - name = "neotree"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -25859,9 +33549,38 @@ license = lib.licenses.free; }; }) {}; - nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + netease-music = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "netease-music"; + ename = "netease-music"; + version = "1.0"; + src = fetchFromGitHub { + owner = "nicehiro"; + repo = "netease-music"; + rev = "f3bba59664e1c4c4ed47f16fa786151272d99a70"; + sha256 = "1a6r7cmxvg83fa285drli2nac9a56kyd2pn4y1vfcg7jiy6czhiw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca3d4a8f8d9080e26a8fe2c38c0001d5cfc3c88c/recipes/netease-music"; + sha256 = "1vb81f1l45v6rny91rcqvnhzqh5ybdr0r39yrcaih8zhvamk685z"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/netease-music"; + license = lib.licenses.free; + }; + }) {}; + nginx-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nginx-mode"; + ename = "nginx-mode"; version = "1.1.9"; src = fetchFromGitHub { owner = "ajc"; @@ -25869,10 +33588,10 @@ rev = "a2bab83c2eb233d57d76b236e7c141c2ccc97005"; sha256 = "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode"; sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c"; - name = "nginx-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25880,9 +33599,13 @@ license = lib.licenses.free; }; }) {}; - niceify-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + niceify-info = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "niceify-info"; + ename = "niceify-info"; version = "1.0.1"; src = fetchFromGitHub { owner = "aaron-em"; @@ -25890,10 +33613,10 @@ rev = "66b45916f1994e16ee023d29fa7cf8fec48078f1"; sha256 = "0dzcaa88l7yjc7fhyhkvbzs7bmhi6bb6rx41wsnnidlnpzbgdrk7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2a923da7363d904eb848eb335736974e05dba1/recipes/niceify-info"; sha256 = "1s9c8yxbab9zl5jx38alwa2hpp4zj5cb9a5gfm3x09jf3iw768bl"; - name = "niceify-info"; + name = "recipe"; }; packageRequires = []; meta = { @@ -25901,9 +33624,44 @@ license = lib.licenses.free; }; }) {}; - nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: - melpaBuild { + night-owl-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "night-owl-theme"; + ename = "night-owl-theme"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "aaronjensen"; + repo = "night-owl-emacs"; + rev = "250824cbbdb37c631c9abc71fdf21cf35d476d8b"; + sha256 = "0rjwvc0fm0bcnz611q9vxvkzax5bryyc8g8b6sawz9m3l2sqdrch"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/77fe194a0e58bdb9789c85f3c50895eb886b4016/recipes/night-owl-theme"; + sha256 = "121jc59ry60h1ml1vxx4a6l4a6jcxk7fc4wz32fqv5pr03rzgs7h"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/night-owl-theme"; + license = lib.licenses.free; + }; + }) {}; + nim-mode = callPackage ({ commenter + , emacs + , epc + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "nim-mode"; + ename = "nim-mode"; version = "0.4.1"; src = fetchFromGitHub { owner = "nim-lang"; @@ -25911,10 +33669,10 @@ rev = "86abed21b9b718ac65cc167f208e0bd5b92c79ed"; sha256 = "0h1paf9z6xvkay97ns74w2w9plwi46md5f2kik4jvjy74p57gxal"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6"; - name = "nim-mode"; + name = "recipe"; }; packageRequires = [ commenter emacs epc flycheck let-alist ]; meta = { @@ -25922,20 +33680,25 @@ license = lib.licenses.free; }; }) {}; - ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ninja-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ninja-mode"; + ename = "ninja-mode"; version = "1.8.2"; src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "253e94c1fa511704baeb61cf69995bbf09ba435e"; - sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f"; + rev = "484c16336f19bd8970bb6e75322d61b92a229899"; + sha256 = "1wc0cvmfhpvfzdy127d1n812q93dd9sp3mmqnc8jzy8i3frqqqq6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik"; - name = "ninja-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -25943,9 +33706,15 @@ license = lib.licenses.free; }; }) {}; - nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nix-buffer = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nix-buffer"; + ename = "nix-buffer"; version = "3.1.1"; src = fetchFromGitHub { owner = "shlevy"; @@ -25953,10 +33722,10 @@ rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099"; sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd"; - name = "nix-buffer"; + name = "recipe"; }; packageRequires = [ emacs f ]; meta = { @@ -25964,20 +33733,25 @@ license = lib.licenses.free; }; }) {}; - nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nix-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nix-mode"; - version = "1.2.1"; + ename = "nix-mode"; + version = "1.2.2"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "d5e839692a1273b128003eaed543318e7e5965a7"; - sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz"; + rev = "cc23fd6a0e394aeeed603e2bfeb4a5ebc63db660"; + sha256 = "1vz3s2jx14nzy53f04d821n4f2s22ys5h9s7af6cnpynkwawyhhq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5"; - name = "nix-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -25985,9 +33759,15 @@ license = lib.licenses.free; }; }) {}; - nixos-options = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + nixos-options = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "nixos-options"; + ename = "nixos-options"; version = "0.0.1"; src = fetchFromGitHub { owner = "travisbhartwell"; @@ -25995,10 +33775,10 @@ rev = "5fc8fa29bea9dd8e9c822af92f9bc6ddc223635f"; sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options"; sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm"; - name = "nixos-options"; + name = "recipe"; }; packageRequires = [ emacs json ]; meta = { @@ -26006,20 +33786,25 @@ license = lib.licenses.free; }; }) {}; - no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + no-littering = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "no-littering"; - version = "0.5.13"; + ename = "no-littering"; + version = "0.5.14"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "57bf044e2f779a03c7bb80c9131d31286ca9660d"; - sha256 = "0fdsm6d3v2hjcyl2kcrzv1fzy17qy8l5a5kpkrv3xq3s25l7dqx1"; + rev = "9bffebc0f4858a06ba374f1d48a7dffd3537b93e"; + sha256 = "02dhplz597r5qp1mljy1npx2kzg07l938d2xivwy9cd6jlkj35ya"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh"; - name = "no-littering"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -26027,20 +33812,24 @@ license = lib.licenses.free; }; }) {}; - noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + noccur = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "noccur"; + ename = "noccur"; version = "0.2"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "noccur.el"; - rev = "6cc02ce07178a61ae38a849f80472c01969272bc"; - sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7"; + rev = "ff2a76883c43b283a08680733ec3ad403a1b1827"; + sha256 = "0y18hpwgzvm1i9yb3b6fxpbh3fmzkmyldq4as65i5s8n66i7mr6j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41f15b8298390310e95cbe137ea1516c0be10b94/recipes/noccur"; sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g"; - name = "noccur"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26048,9 +33837,13 @@ license = lib.licenses.free; }; }) {}; - nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nodejs-repl = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nodejs-repl"; + ename = "nodejs-repl"; version = "0.1.6"; src = fetchFromGitHub { owner = "abicky"; @@ -26058,10 +33851,10 @@ rev = "16770656a4072f8fbbd29d0cace4893a3d5541b1"; sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl"; sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907"; - name = "nodejs-repl"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26069,9 +33862,40 @@ license = lib.licenses.free; }; }) {}; - nofrils-acme-theme = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + nodemcu-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "nodemcu-mode"; + ename = "nodemcu-mode"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "andrmuel"; + repo = "nodemcu-mode"; + rev = "8effd9f3df40b6b92a2f05e4d54750b624afc4a7"; + sha256 = "1s19sshsm4cdx8kj5prmsq8ryz4843xcqmdayvlfl99jxsp9j4pm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a414f8b30954a50d74e4ae42abcf436cfca8d2b4/recipes/nodemcu-mode"; + sha256 = "0xx5dys8vifgaf3hb4q762xhhn1jybc4xwajqj98iban4nrakb3a"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nodemcu-mode"; + license = lib.licenses.free; + }; + }) {}; + nofrils-acme-theme = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nofrils-acme-theme"; + ename = "nofrils-acme-theme"; version = "0.1.0"; src = fetchFromGitLab { owner = "esessoms"; @@ -26079,10 +33903,10 @@ rev = "7825f88cb881a84eaa5cd1689772819a18eb2943"; sha256 = "009did3i3i8yi0virq606l02w1mw0gdyiqablqg7m368gx0gfvh5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c59ddaa5e41d3c25c446b1ed1905d7f88b448e0a/recipes/nofrils-acme-theme"; sha256 = "01xqsn8whczv34lfa9vbm5rpvrvsrlpav8pzng10jvax1a9wdp3a"; - name = "nofrils-acme-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26090,9 +33914,14 @@ license = lib.licenses.free; }; }) {}; - nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nord-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nord-theme"; + ename = "nord-theme"; version = "0.3.0"; src = fetchFromGitHub { owner = "arcticicestudio"; @@ -26100,10 +33929,10 @@ rev = "290aa9221a10e107acb0f06d0ec338fcb3e44785"; sha256 = "0az5l8y3jg6yk587wvgz1v5671d8p1vf9m0529x9axi1x7yzxry1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; sha256 = "0p4fqg4i2ayimd8kxsqnb1xkapzhhxf7szxi1skva4dcym3z67cc"; - name = "nord-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26111,7 +33940,11 @@ license = lib.licenses.free; }; }) {}; - nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + nose = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nose"; version = "0.1.1"; src = fetchhg { @@ -26119,7 +33952,7 @@ rev = "194d7789bf79"; sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nose"; sha256 = "1xdqsxq06x2m9rcfn1qh89g0mz1rvzl246d3sfmciwcyl932x682"; name = "nose"; @@ -26130,18 +33963,23 @@ license = lib.licenses.free; }; }) {}; - notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + notmuch = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "notmuch"; - version = "0.26"; + ename = "notmuch"; + version = "0.27"; src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - rev = "3c4e64d976eb561ac5157df1bbe5882e3e65b583"; - sha256 = "00a9ggrc63n88g7vp57c09r859pl2dbxnqgf543ks94lm0jzyz3f"; + rev = "c20a5eb80520a11cb697a45b0d9553c68e2199c8"; + sha256 = "13gpsgx5k26x8r38q56y01mfz2r1haxw76hc52mq8vypfl1gpw3x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; sha256 = "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7"; - name = "notmuch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26149,9 +33987,14 @@ license = lib.licenses.free; }; }) {}; - notmuch-labeler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, notmuch }: - melpaBuild { + notmuch-labeler = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , notmuch }: + melpaBuild { pname = "notmuch-labeler"; + ename = "notmuch-labeler"; version = "0.1"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -26159,10 +34002,10 @@ rev = "d65d1129555d368243df4770ecc1e7ccb88efc58"; sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e9940e66bbf70ec868dbdaaeaa1fbd4f076a2e1/recipes/notmuch-labeler"; sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0"; - name = "notmuch-labeler"; + name = "recipe"; }; packageRequires = [ notmuch ]; meta = { @@ -26170,20 +34013,27 @@ license = lib.licenses.free; }; }) {}; - nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nov = callPackage ({ dash + , emacs + , esxml + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nov"; - version = "0.2.3"; + ename = "nov"; + version = "0.2.4"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "e7bb37334ca85ce0e3f5c980464f652266a11218"; - sha256 = "1lymf4ir9kja0dpifbx230cq3n1li25kcdn3x3bh8fskiil1pqm0"; + rev = "3be6e8cd1a6311b0782ca2aa3d9961bec6183632"; + sha256 = "1i7caa7s0c2qmf8bf9bi6sp7yavpnxlck6gm9fc0lkywrjfq0ixs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; sha256 = "0hlcncpdazi4rn5yxd0zq85v7gpjhw7a6dl2i99zf4ymsan97lhq"; - name = "nov"; + name = "recipe"; }; packageRequires = [ dash emacs esxml ]; meta = { @@ -26191,20 +34041,24 @@ license = lib.licenses.free; }; }) {}; - noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + noxml-fold = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "noxml-fold"; + ename = "noxml-fold"; version = "0.0.2"; src = fetchFromGitHub { owner = "paddymcall"; repo = "noXML-fold"; - rev = "56fbc44b25cee9f8719edb3c7f8b1c4327dc1051"; - sha256 = "00h6nwbx2l0rp2i7n0328w6ckp4gkspqk3q91ciixb4lkhh20cz2"; + rev = "69138e030f4c25e635f0af94d2272504ec88992d"; + sha256 = "0amg0d733njmj654lf2q92j8ql76h29zjk37fj692mjykcqsbf98"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13d2af88b292293cb5ab50819c63acfe936630c8/recipes/noxml-fold"; sha256 = "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc"; - name = "noxml-fold"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26212,9 +34066,14 @@ license = lib.licenses.free; }; }) {}; - npm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + npm-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "npm-mode"; + ename = "npm-mode"; version = "0.6.0"; src = fetchFromGitHub { owner = "mojochao"; @@ -26222,10 +34081,10 @@ rev = "84b35211cba4f2d5f03b8dc2b60ae4b03d90bf8a"; sha256 = "1mh6nbffciw4yhv049kdhh796ysj1x21ndm3fwymhskb3dy0w1ss"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22dd6b2f8a94f56a61f4b70bd7e44b1bcf96eb18/recipes/npm-mode"; sha256 = "1aym4jfr6im6hdc5d7995q6myhgig286fk9hpaxdf418h1s17rqr"; - name = "npm-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26233,20 +34092,25 @@ license = lib.licenses.free; }; }) {}; - nrepl-sync = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nrepl-sync = callPackage ({ cider + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nrepl-sync"; + ename = "nrepl-sync"; version = "0.3.1"; src = fetchFromGitHub { owner = "phillord"; repo = "lein-sync"; - rev = "471a08df87687a3eab61b3b8bf25a2e0962b5d5b"; - sha256 = "1l07nrlfd5qj8jnqacjba7mb6prapg8d8h3881l3kb66sn02ahgy"; + rev = "9506238562c2e0c0df744e0d81edff4c74322a7d"; + sha256 = "1si5pfczk3iypdx2ydhirznx2hvp6r7sq2hy64gn3mn4r68svlfi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2059ab6f2a3adc5af4f0876546e344e806e22ee5/recipes/nrepl-sync"; sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd"; - name = "nrepl-sync"; + name = "recipe"; }; packageRequires = [ cider ]; meta = { @@ -26254,9 +34118,13 @@ license = lib.licenses.free; }; }) {}; - nsis-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nsis-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nsis-mode"; + ename = "nsis-mode"; version = "0.44"; src = fetchFromGitHub { owner = "mattfidler"; @@ -26264,10 +34132,10 @@ rev = "f1bf701c37680553c8f51462e0829d0dd6c53187"; sha256 = "0c4qfbb345yna5c30czq8nhcx283z1fnpp6h16p7vjqs6y37czsl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9b169a80c7afdeb0c6e17cd289114b5d3d97266/recipes/nsis-mode"; sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l"; - name = "nsis-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26275,20 +34143,24 @@ license = lib.licenses.free; }; }) {}; - number-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + number-lock = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "number-lock"; + ename = "number-lock"; version = "1.0.0"; src = fetchFromGitHub { owner = "Liu233w"; repo = "number-lock.el"; - rev = "846e86e2b3b07410f69e70d3ba7afb072b5585da"; - sha256 = "12gza7lxpwrp191gi9gm61wpvgwsrda52zva9bz3ncqfp7w0y32i"; + rev = "1c71e31ae4974e04a21c22c6f059a59221793901"; + sha256 = "0iy16jbp4zaaxf9lk1yw9n1dzqbvsmqnny3iplvlp69a70q0j2z8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c107adabe2e4c5b35ebb6b21db076cdea0e9c24/recipes/number-lock"; sha256 = "13xqn4bcjm01zl0rgbwzad58x35230lm2qiipbyqkh2ma0a9pqn4"; - name = "number-lock"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26296,9 +34168,14 @@ license = lib.licenses.free; }; }) {}; - numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + numbers = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "numbers"; + ename = "numbers"; version = "1.4"; src = fetchFromGitHub { owner = "davep"; @@ -26306,10 +34183,10 @@ rev = "74be68b94143f042ce461b2a69202f515acaf20c"; sha256 = "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers"; sha256 = "02cx19fi34yvc0icajnwrmb8lr2g8y08kis08v9xxalfxz06kb3h"; - name = "numbers"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26317,9 +34194,17 @@ license = lib.licenses.free; }; }) {}; - nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + nvm = callPackage ({ dash + , dash-functional + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "nvm"; + ename = "nvm"; version = "0.2.0"; src = fetchFromGitHub { owner = "rejeep"; @@ -26327,10 +34212,10 @@ rev = "d18b13e8275a57ee6c55dc71b671f02a8e6522ad"; sha256 = "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm"; sha256 = "0md1ybc2r2fxykwk21acjhdzy2kw326bdwa1d15c6f48lknzvg4w"; - name = "nvm"; + name = "recipe"; }; packageRequires = [ dash dash-functional f s ]; meta = { @@ -26338,9 +34223,13 @@ license = lib.licenses.free; }; }) {}; - nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + nyan-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "nyan-mode"; + ename = "nyan-mode"; version = "1.1.2"; src = fetchFromGitHub { owner = "TeMPOraL"; @@ -26348,10 +34237,10 @@ rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a"; sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode"; sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv"; - name = "nyan-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26359,20 +34248,24 @@ license = lib.licenses.free; }; }) {}; - o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + o-blog = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "o-blog"; + ename = "o-blog"; version = "2.0"; src = fetchFromGitHub { owner = "renard"; repo = "o-blog"; - rev = "5db9594c6e3439c000b183551d7975c2e29131f4"; - sha256 = "0r12023yy8j96bp8z2ml6ffyr2c9rcd5abkh6vqnkwsdxkzx6wrs"; + rev = "069220e1046988ecd4658b09f9e2470c476c34e1"; + sha256 = "16x0wy3w0vqpp17k5scbd53zwi8dxngm064rzg1kc24md8q6kqib"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5f24e70260f46445b119817bc1326f29b367c4b/recipes/o-blog"; sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja"; - name = "o-blog"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26380,9 +34273,42 @@ license = lib.licenses.free; }; }) {}; - ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-async = callPackage ({ async + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { + pname = "ob-async"; + ename = "ob-async"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "astahlman"; + repo = "ob-async"; + rev = "4bd85c9065f4b075190ffa5a721b9191bc84d6e9"; + sha256 = "0i8551vhn6l7gfw3zxnrimp6nzlxkp13gkvzmcmjs1c5pbxqrrik"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; + sha256 = "0k7kv71nnibp53lav774c61w9pzhq8qvch9rvpyyrwbyd67ninl8"; + name = "recipe"; + }; + packageRequires = [ async dash emacs org ]; + meta = { + homepage = "https://melpa.org/#/ob-async"; + license = lib.licenses.free; + }; + }) {}; + ob-blockdiag = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-blockdiag"; + ename = "ob-blockdiag"; version = "20170728.113"; src = fetchFromGitHub { owner = "corpix"; @@ -26390,10 +34316,10 @@ rev = "634fcf64a4ae735afe7001d865b03f5d71e23046"; sha256 = "0xr3bv4wxz13b1grfyl2qnrszzab3n9735za837nf4lxh527ksaj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag"; sha256 = "1lmawbgrlp6qd7p664jcl98y1xd2yqw9np6j52bh9i6s3cz6628g"; - name = "ob-blockdiag"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26401,20 +34327,24 @@ license = lib.licenses.free; }; }) {}; - ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-coffeescript = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-coffeescript"; + ename = "ob-coffeescript"; version = "1.0.0"; src = fetchFromGitHub { owner = "brantou"; repo = "ob-coffeescript"; - rev = "b70f3d822c707cb02333fcb739ba4874614cad2a"; - sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd"; + rev = "219c83f6c44e3612a7718c996365df1de747127d"; + sha256 = "14va23m0wab1jf6jc5m61y2c0kcmc8dha463vyci1mvs3p1psjr8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript"; sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p"; - name = "ob-coffeescript"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26422,20 +34352,26 @@ license = lib.licenses.free; }; }) {}; - ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + ob-http = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "ob-http"; + ename = "ob-http"; version = "0.2.0"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "20393dd8130d21a3f06d8514da14c5ffdd88ae44"; - sha256 = "0xa7rgsb0d1d96h5bb0n0sy1hgmd2fg6r6g2aqp1c29ld4hpi7r7"; + rev = "d57a9d4bb8727f36cb264189fe0a4cd9ef7c1c56"; + sha256 = "1iqcfzkk4b923mnh20g4dfpjp35a8qcwbmi86li8jj11bknrx6dw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss"; - name = "ob-http"; + name = "recipe"; }; packageRequires = [ cl-lib s ]; meta = { @@ -26443,20 +34379,25 @@ license = lib.licenses.free; }; }) {}; - ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-hy = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-hy"; - version = "1.0.0"; + ename = "ob-hy"; + version = "1.0.1"; src = fetchFromGitHub { owner = "brantou"; repo = "ob-hy"; - rev = "a3512f274709dc4ab6c18d7955d361f8715505f0"; - sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw"; + rev = "a42ecaf440adc03e279afe43ee5ef6093ddd542a"; + sha256 = "0kv92r6j0dcqcg1s0g4iq1xvanscg6crwniysbrq6ifvmc4lvfdj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy"; sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7"; - name = "ob-hy"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26464,9 +34405,13 @@ license = lib.licenses.free; }; }) {}; - ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-prolog = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-prolog"; + ename = "ob-prolog"; version = "1.0.2"; src = fetchFromGitHub { owner = "ljos"; @@ -26474,10 +34419,10 @@ rev = "efa86bb70fd1907806f3e43705aff54d35582442"; sha256 = "0g25nn2h7djgc9rp59spx9096jdypsizd0vfzwj96cpq90lkysjx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog"; sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s"; - name = "ob-prolog"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26485,9 +34430,16 @@ license = lib.licenses.free; }; }) {}; - ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: - melpaBuild { + ob-sagemath = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , sage-shell-mode }: + melpaBuild { pname = "ob-sagemath"; + ename = "ob-sagemath"; version = "0.4"; src = fetchFromGitHub { owner = "stakemori"; @@ -26495,10 +34447,10 @@ rev = "450d510a5eb1fd644d0037e9f02271ca33639fb0"; sha256 = "00i7jszlfh67xzvqnp137aaia68rkk4ri5v0fs32ym10pcj8l4dp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; sha256 = "02ispac1y4g7p7iyscf5p8lvp92ncrn6281jm9igyiny1w6hivy7"; - name = "ob-sagemath"; + name = "recipe"; }; packageRequires = [ emacs s sage-shell-mode ]; meta = { @@ -26506,9 +34458,14 @@ license = lib.licenses.free; }; }) {}; - ob-sml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sml-mode }: - melpaBuild { + ob-sml = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sml-mode }: + melpaBuild { pname = "ob-sml"; + ename = "ob-sml"; version = "0.2"; src = fetchFromGitHub { owner = "swannodette"; @@ -26516,10 +34473,10 @@ rev = "5dc966acbe65e9e158bfa90018035bf52d4dafd4"; sha256 = "1xx6hyq3gk4bavcx6i9bhipbn4mn5rv2ga9lryq09qgq2l9znclk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1b0fbe1198fa624771c2f61249db502de57942a/recipes/ob-sml"; sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn"; - name = "ob-sml"; + name = "recipe"; }; packageRequires = [ sml-mode ]; meta = { @@ -26527,9 +34484,15 @@ license = lib.licenses.free; }; }) {}; - ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }: - melpaBuild { + ob-translate = callPackage ({ fetchFromGitHub + , fetchurl + , google-translate + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ob-translate"; + ename = "ob-translate"; version = "0.1.2"; src = fetchFromGitHub { owner = "krisajenkins"; @@ -26537,10 +34500,10 @@ rev = "6b39cc1a94a1071107a4391684b1bffb5b9826f3"; sha256 = "10hm20dzhkxk61ass3bd5gdn1bs2l60y3zjnpkxinzn7m6aaniia"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d89e4006afc51bd44e23f87a1d1ef1140489ab3/recipes/ob-translate"; sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz"; - name = "ob-translate"; + name = "recipe"; }; packageRequires = [ google-translate org ]; meta = { @@ -26548,9 +34511,13 @@ license = lib.licenses.free; }; }) {}; - ob-uart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ob-uart = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ob-uart"; + ename = "ob-uart"; version = "0.1.0"; src = fetchFromGitHub { owner = "andrmuel"; @@ -26558,10 +34525,10 @@ rev = "90daeac90a9e75c20cdcf71234c67b812110c50e"; sha256 = "1syxxq411izmyfrhlywasax7n5c3yjy487mvfdjzjg8csmmk0m9v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5334f1a48b8ea6b7a660db27910769093c76113d/recipes/ob-uart"; sha256 = "1dkbyk8da0zw784dgwi8njnz304s54341dyfzvlb0lhcn41dmkz7"; - name = "ob-uart"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26569,9 +34536,14 @@ license = lib.licenses.free; }; }) {}; - obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + obfusurl = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "obfusurl"; + ename = "obfusurl"; version = "2.1"; src = fetchFromGitHub { owner = "davep"; @@ -26579,10 +34551,10 @@ rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5"; sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl"; sha256 = "0xx2zsjbkd17iy7xzqc66f9xgc97f9js3nz656yhmmxakjk2krra"; - name = "obfusurl"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -26590,9 +34562,14 @@ license = lib.licenses.free; }; }) {}; - ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }: - melpaBuild { + ocodo-svg-modelines = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , svg-mode-line-themes }: + melpaBuild { pname = "ocodo-svg-modelines"; + ename = "ocodo-svg-modelines"; version = "0.1.4"; src = fetchFromGitHub { owner = "ocodo"; @@ -26600,10 +34577,10 @@ rev = "a6c5b9a7536c7a8fa3bd9d9dafdebc8d99903018"; sha256 = "05ay599nc6jdw2fjss4izz1ynv2wc4svff932n8j9hvrhygipb2w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b9651865f4f8009c9b31fa1e5561de97a5ad8de/recipes/ocodo-svg-modelines"; sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay"; - name = "ocodo-svg-modelines"; + name = "recipe"; }; packageRequires = [ svg-mode-line-themes ]; meta = { @@ -26611,9 +34588,13 @@ license = lib.licenses.free; }; }) {}; - ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ocp-indent = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ocp-indent"; + ename = "ocp-indent"; version = "1.6.1"; src = fetchFromGitHub { owner = "OCamlPro"; @@ -26621,10 +34602,10 @@ rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c"; sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw"; - name = "ocp-indent"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26632,20 +34613,25 @@ license = lib.licenses.free; }; }) {}; - octicons = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + octicons = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "octicons"; + ename = "octicons"; version = "0.1"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-octicons"; - rev = "77bb1a49045f89b3eaf9bcffeefbb9e1abaee556"; - sha256 = "19fg6r7aiirfsbp2h1a824476sn1ln4nz8kvpdzkzvyf1hzx68gw"; + rev = "7ffc50ac99d43bc92928dec9f269eceb7e76bf0b"; + sha256 = "17hpcr864lx0g68by4n2n013zbplnihvidqm629zgr9b9ybanxy8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c62867eae1a254eb5fe820d4387dd4e8a0ff9be2/recipes/octicons"; sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk"; - name = "octicons"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -26653,9 +34639,13 @@ license = lib.licenses.free; }; }) {}; - offlineimap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + offlineimap = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "offlineimap"; + ename = "offlineimap"; version = "1"; src = fetchFromGitHub { owner = "jd"; @@ -26663,10 +34653,10 @@ rev = "646482203aacdf847d57d0a96263fddcfc33fb61"; sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/offlineimap"; sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b"; - name = "offlineimap"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26674,20 +34664,25 @@ license = lib.licenses.free; }; }) {}; - olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + olivetti = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "olivetti"; - version = "1.5.9"; + ename = "olivetti"; + version = "1.6.1"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "35d275d8bdfc5107c25db5a4995b65ba936f1d56"; - sha256 = "00havcpsbk54xfcys9lhm9sv1d753jk3cmvssa2c52pp5frpxz3i"; + rev = "02272654f1d920ea2da5a4b553acd5e5cc096ab1"; + sha256 = "0f7i2f42mlr27d9wa9h2zvz0k0xyqvwndzgz81x8gsm0w1iv15k9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd"; - name = "olivetti"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26695,9 +34690,13 @@ license = lib.licenses.free; }; }) {}; - omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + omni-kill = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "omni-kill"; + ename = "omni-kill"; version = "0.6.0"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; @@ -26705,10 +34704,10 @@ rev = "904549c8fd6ac3cf22b5d7111ca8944e179cffea"; sha256 = "1mlnh5pdqdv1qb8jvi0wvkgbpy74zq807gmp04bp6cpxdns9j63f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill"; sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k"; - name = "omni-kill"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26716,9 +34715,17 @@ license = lib.licenses.free; }; }) {}; - omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: - melpaBuild { + omni-log = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , s }: + melpaBuild { pname = "omni-log"; + ename = "omni-log"; version = "0.3.6"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; @@ -26726,10 +34733,10 @@ rev = "20021eb788cbeec0371145468430b259686f519d"; sha256 = "1sf2zbhjaz5b9xmz6632338cga7d326ibgw8b8c6c6b4vk16yhqc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log"; sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r"; - name = "omni-log"; + name = "recipe"; }; packageRequires = [ dash emacs ht s ]; meta = { @@ -26737,9 +34744,18 @@ license = lib.licenses.free; }; }) {}; - omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }: - melpaBuild { + omni-quotes = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , omni-log + , s }: + melpaBuild { pname = "omni-quotes"; + ename = "omni-quotes"; version = "0.5.0"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; @@ -26747,10 +34763,10 @@ rev = "454116c1dd6581baaeefd6b9310b1b6b7a5c36d0"; sha256 = "1h8lrpi5wizi5vncdz83cxlx7c71xw3sw89sfg462zfbz2sq8afl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes"; sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs"; - name = "omni-quotes"; + name = "recipe"; }; packageRequires = [ dash f ht omni-log s ]; meta = { @@ -26758,9 +34774,13 @@ license = lib.licenses.free; }; }) {}; - omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + omni-scratch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "omni-scratch"; + ename = "omni-scratch"; version = "0.6.0"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; @@ -26768,10 +34788,10 @@ rev = "636374c59c7d33c2f72c97ad8ba9fb4854f2324d"; sha256 = "0w62bk2m0gs4b605s691z4iap9baz1z6c8z4v9vb05917qlsx5xb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9"; - name = "omni-scratch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26779,20 +34799,26 @@ license = lib.licenses.free; }; }) {}; - omni-tags = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }: - melpaBuild { + omni-tags = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcre2el }: + melpaBuild { pname = "omni-tags"; + ename = "omni-tags"; version = "0.1.2"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-tags.el"; - rev = "a7078bfbc9a6256efd0e57530df9fd7808bc2185"; - sha256 = "0c34rci5793hd674x2srhqvnj46llrbkrw1xpzf73s4ib5zhh7xi"; + rev = "a39bcb31647d3d6c81253d2476bd50ceb1179a4b"; + sha256 = "0688xl5izq3189w4fxzw255md3r092f56xhbbsszqf8rra42qq42"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c77e57f41484c08cae9f47c4379d1752ccf43ce2/recipes/omni-tags"; sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl"; - name = "omni-tags"; + name = "recipe"; }; packageRequires = [ cl-lib pcre2el ]; meta = { @@ -26800,20 +34826,34 @@ license = lib.licenses.free; }; }) {}; - omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: - melpaBuild { + omnisharp = callPackage ({ auto-complete + , cl-lib ? null + , csharp-mode + , dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , popup + , s + , shut-up }: + melpaBuild { pname = "omnisharp"; + ename = "omnisharp"; version = "4.2"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "c00a3a9157432c578fffb79169232e4a81d4ad31"; - sha256 = "0ghwqf1wbiywzdx0qlgs4y94z4ivlgac8rpg1bimlb8xfx62sia0"; + rev = "588b8482685adedbc56933cb13c58d9cc6a82456"; + sha256 = "1iqwxc19jvcb2gsm2aq59zblg1qjmbxgb2yl3h3aybqp968j3i00"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; sha256 = "0gh0wwdpdx2cjf95pcagj52inf7mrmiq7x8p0x5c7lvl4pfzhh87"; - name = "omnisharp"; + name = "recipe"; }; packageRequires = [ auto-complete @@ -26832,20 +34872,25 @@ license = lib.licenses.free; }; }) {}; - opam = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + opam = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "opam"; + ename = "opam"; version = "0.1"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "opam.el"; - rev = "83fb2850d29ec792754e0af18b015e089aad2695"; - sha256 = "119pk7gg4fw5bdvir8077ra603b5nbqvd7ph9cqrwxa056jzvry8"; + rev = "d5b15e6f75e4e46e6d4064ef45fb25c90515aa85"; + sha256 = "00alzjidp7v0ll4pb5ybkk3hly6phzn4izar4n4clmpwn623fjf8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4e2076ebaefe7e241607ff6920fe243d10ccd0/recipes/opam"; sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa"; - name = "opam"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26853,9 +34898,13 @@ license = lib.licenses.free; }; }) {}; - opencl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + opencl-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "opencl-mode"; + ename = "opencl-mode"; version = "1.0"; src = fetchFromGitHub { owner = "salmanebah"; @@ -26863,10 +34912,10 @@ rev = "14109a4bb56105a9c052ae49ad4c638b4cc210b2"; sha256 = "0n64l1jrrk60g192nn0240qcv2p9r138mi9gb38qq5k65wffbc21"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d97575fdae88d55b55686aa6814f858813cad171/recipes/opencl-mode"; sha256 = "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79"; - name = "opencl-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26874,20 +34923,27 @@ license = lib.licenses.free; }; }) {}; - opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + opener = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "opener"; + ename = "opener"; version = "0.2.2"; src = fetchFromGitHub { owner = "0robustus1"; repo = "opener.el"; - rev = "c384f67278046fdcd220275fdd212ab85672cbeb"; - sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h"; + rev = "ab75048b1073fb1b1452dabae94ab55e0cfb57c4"; + sha256 = "00kh8m23jzwb0wipwjdm2wad08xqrlcg00vzc4vzijgrapz0da3h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener"; sha256 = "0fhny4m7x19wnlnr19s4rkl04dkx95yppd51jzrkr96xiznw97s7"; - name = "opener"; + name = "recipe"; }; packageRequires = [ cl-lib emacs request ]; meta = { @@ -26895,9 +34951,17 @@ license = lib.licenses.free; }; }) {}; - opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: - melpaBuild { + opensource = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , request + , s }: + melpaBuild { pname = "opensource"; + ename = "opensource"; version = "0.2.0"; src = fetchFromGitHub { owner = "OpenSourceOrg"; @@ -26905,10 +34969,10 @@ rev = "27d06be45c852e84e47c33cbd0f4c344fd9a0370"; sha256 = "1rjf78vki4xp8y856v95877093p3zgfc9mx92npscsi1g93dxn80"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec4255a403e912a14a7013ea96f554d3588dfc30/recipes/opensource"; sha256 = "17gi20s2vi7m75qqaff907x1g8ja5ny90klldpqmj258m2j6a6my"; - name = "opensource"; + name = "recipe"; }; packageRequires = [ dash pkg-info request s ]; meta = { @@ -26916,9 +34980,13 @@ license = lib.licenses.free; }; }) {}; - operate-on-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + operate-on-number = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "operate-on-number"; + ename = "operate-on-number"; version = "1.1.0"; src = fetchFromGitHub { owner = "knu"; @@ -26926,10 +34994,10 @@ rev = "6a17272e2b6e23260edb1b5eeb01905a1f37e0a6"; sha256 = "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aec74eff8ca3d5e381d7a6d61c73f1a0716f1c60/recipes/operate-on-number"; sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk"; - name = "operate-on-number"; + name = "recipe"; }; packageRequires = []; meta = { @@ -26937,20 +35005,27 @@ license = lib.licenses.free; }; }) {}; - org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + org-ac = callPackage ({ auto-complete-pcmp + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "org-ac"; + ename = "org-ac"; version = "0.0.2"; src = fetchFromGitHub { owner = "aki2o"; repo = "org-ac"; - rev = "9cbbda79e2fe964ded3f39cf7a2e74f1be3d6b9a"; - sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca"; + rev = "b637dfdacdeea8a61303eea338c8ca9b73eb5fff"; + sha256 = "16j9zalchijdskfwz38icdwhfnxbkvybzqnzdjjm2ihk734yl6vg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/adf598f8dae69ff286ae78d353a2a5d4363b4480/recipes/org-ac"; sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr"; - name = "org-ac"; + name = "recipe"; }; packageRequires = [ auto-complete-pcmp log4e yaxception ]; meta = { @@ -26958,9 +35033,14 @@ license = lib.licenses.free; }; }) {}; - org-agenda-property = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-agenda-property = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-agenda-property"; + ename = "org-agenda-property"; version = "1.3.1"; src = fetchFromGitHub { owner = "Malabarba"; @@ -26968,10 +35048,10 @@ rev = "2ff628a14a3e758863bbd88fba4db9f77fd2c3a8"; sha256 = "0gkxxzdk8bd1yi5x9217pkq9d01ccq8znxc7h8qcw0p1336rigfc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/org-agenda-property"; sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk"; - name = "org-agenda-property"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -26979,9 +35059,16 @@ license = lib.licenses.free; }; }) {}; - org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + org-alert = callPackage ({ alert + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "org-alert"; + ename = "org-alert"; version = "0.1.0"; src = fetchFromGitHub { owner = "groksteve"; @@ -26989,10 +35076,10 @@ rev = "685c18aa5ce994360c7f9e8bbf49590c412187ac"; sha256 = "0gkv2sfl9nb64qqh5xhgq68r9kfmsny3vpcmnzk2mqjcb9nh657s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert"; sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152"; - name = "org-alert"; + name = "recipe"; }; packageRequires = [ alert dash s ]; meta = { @@ -27000,9 +35087,13 @@ license = lib.licenses.free; }; }) {}; - org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-autolist = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-autolist"; + ename = "org-autolist"; version = "0.14"; src = fetchFromGitHub { owner = "calvinwyoung"; @@ -27010,10 +35101,10 @@ rev = "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1"; sha256 = "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca8e2cdb282674b20881bf6b4fc49af42a5d09a7/recipes/org-autolist"; sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj"; - name = "org-autolist"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27021,20 +35112,28 @@ license = lib.licenses.free; }; }) {}; - org-babel-eval-in-repl = callPackage ({ emacs, ess, eval-in-repl, fetchFromGitHub, fetchurl, lib, matlab-mode, melpaBuild }: - melpaBuild { + org-babel-eval-in-repl = callPackage ({ emacs + , ess + , eval-in-repl + , fetchFromGitHub + , fetchurl + , lib + , matlab-mode + , melpaBuild }: + melpaBuild { pname = "org-babel-eval-in-repl"; + ename = "org-babel-eval-in-repl"; version = "1.4"; src = fetchFromGitHub { owner = "diadochos"; repo = "org-babel-eval-in-repl"; - rev = "bfa72c582ac1531ad42aba23e2b1267ab68e31f6"; - sha256 = "1jm56zxa99s163jv02vhfrshmykvld7girq7gmj1x60g3wjzhn5k"; + rev = "36ebf7d855df8ace9429270cfc48cf2e949775eb"; + sha256 = "1hjwxmn1gsq9wfhhydqlnss66zq4wl13vkq4irf0l50xspzscg8l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl"; sha256 = "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx"; - name = "org-babel-eval-in-repl"; + name = "recipe"; }; packageRequires = [ emacs ess eval-in-repl matlab-mode ]; meta = { @@ -27042,9 +35141,13 @@ license = lib.licenses.free; }; }) {}; - org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-beautify-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-beautify-theme"; + ename = "org-beautify-theme"; version = "0.3.1"; src = fetchFromGitHub { owner = "jonnay"; @@ -27052,10 +35155,10 @@ rev = "7b7a7cbd4f25f77e8bd81783f517b2b182220fd9"; sha256 = "0nqw4apv642vqbjjqbi960zim9lkbnaszrlasf25c9fnzdg1m134"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme"; sha256 = "0rrlyn61xh3szw8aihxpbmg809xx5ac66xqzj895dn1raz129h2w"; - name = "org-beautify-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27063,9 +35166,13 @@ license = lib.licenses.free; }; }) {}; - org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-board = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-board"; + ename = "org-board"; version = "1018"; src = fetchFromGitHub { owner = "scallywag"; @@ -27073,10 +35180,10 @@ rev = "405bfd630f1b31bd77158bc8e79aab86812cba65"; sha256 = "066shdqp0bca2xlds1m0c5ml3yxqfyzsyyy7sy72ybv41n5b11x3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; sha256 = "00jsrxc8f85cvrh7364n7337frdj12yknlfp28fhdgk2ph6d7bp4"; - name = "org-board"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27084,9 +35191,14 @@ license = lib.licenses.free; }; }) {}; - org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-bookmark-heading = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-bookmark-heading"; + ename = "org-bookmark-heading"; version = "1.0.0"; src = fetchFromGitHub { owner = "alphapapa"; @@ -27094,10 +35206,10 @@ rev = "70b014e09977371a8c9bad03085c116693062b19"; sha256 = "0j765rb2yfwnc0ri53jb8d6lxj6knpmy495bk3sd63492kdrxf93"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaadbd149399c6e3c48ac5cbeedeb29a3f5791f1/recipes/org-bookmark-heading"; sha256 = "1q92rg9d945ypcpb7kig2r0cr7nb7avsylaa7nxjib25advx80n9"; - name = "org-bookmark-heading"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -27105,9 +35217,13 @@ license = lib.licenses.free; }; }) {}; - org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-bullets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-bullets"; + ename = "org-bullets"; version = "0.2.4"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -27115,10 +35231,10 @@ rev = "b70ac2ec805bcb626a6e39ea696354577c681b36"; sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe60fc3c60d87b5fd7aa24e858c79753d5f7d2f6/recipes/org-bullets"; sha256 = "0yrfgd6r71rng3qipp3y9i5mpm6510k4xsfgyidcn25v27fysk3v"; - name = "org-bullets"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27126,9 +35242,15 @@ license = lib.licenses.free; }; }) {}; - org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-category-capture = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-category-capture"; + ename = "org-category-capture"; version = "1.1.0"; src = fetchFromGitHub { owner = "IvanMalison"; @@ -27136,10 +35258,10 @@ rev = "48f621b595e748c5e03431f237facf258ffc9443"; sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; sha256 = "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav"; - name = "org-category-capture"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -27147,9 +35269,15 @@ license = lib.licenses.free; }; }) {}; - org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: - melpaBuild { + org-clock-csv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , s }: + melpaBuild { pname = "org-clock-csv"; + ename = "org-clock-csv"; version = "1.1"; src = fetchFromGitHub { owner = "atheriel"; @@ -27157,10 +35285,10 @@ rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6"; sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; sha256 = "02spjrzdf1kmvyvqkzg7nnmq9kqv75zwxn5ifqmg0f7a1gw28f0l"; - name = "org-clock-csv"; + name = "recipe"; }; packageRequires = [ org s ]; meta = { @@ -27168,9 +35296,16 @@ license = lib.licenses.free; }; }) {}; - org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-commentary = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-commentary"; + ename = "org-commentary"; version = "0.3.0"; src = fetchFromGitHub { owner = "smaximov"; @@ -27178,10 +35313,10 @@ rev = "2eeeb0f506e30ef82263e67279d837a79cbde021"; sha256 = "02an98pc52yfxsxmz1kib692yx93rqdi1q3lpvblzyd3hhd51rlr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e0a40d9ea5849b9c22378a84ac8122e4eb2737d/recipes/org-commentary"; sha256 = "0ym1rq2zhyhc6hkk40wsa9jni2h1z5dkaisldqzg8ggl7iv3v4fx"; - name = "org-commentary"; + name = "recipe"; }; packageRequires = [ dash emacs org ]; meta = { @@ -27189,9 +35324,13 @@ license = lib.licenses.free; }; }) {}; - org-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-doing = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-doing"; + ename = "org-doing"; version = "0.1"; src = fetchFromGitHub { owner = "omouse"; @@ -27199,10 +35338,10 @@ rev = "e099514cfc162f8fe3d383456a7964743b0455d5"; sha256 = "1hvnrw0y3chlfv6zxsczmm8zybrnakn3x13ykv2zblw96am9kd2s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c497b87e14ab614c963f4b2f041bc0111b6e936/recipes/org-doing"; sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j"; - name = "org-doing"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27210,9 +35349,40 @@ license = lib.licenses.free; }; }) {}; - org-dp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-download = callPackage ({ async + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "org-download"; + ename = "org-download"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "abo-abo"; + repo = "org-download"; + rev = "a57beffd0f09b218a9487d1750960878c1d5b12c"; + sha256 = "1disqqfwjl366kv6xgc28w7zbc4xl9a0jmdj7w27mb00sxzfk3vb"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; + sha256 = "19yjx0qqpmrdwagp3d6lwwv7dcb745m9ccq3m29sin74f5p4svsi"; + name = "recipe"; + }; + packageRequires = [ async ]; + meta = { + homepage = "https://melpa.org/#/org-download"; + license = lib.licenses.free; + }; + }) {}; + org-dp = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-dp"; + ename = "org-dp"; version = "1"; src = fetchFromGitHub { owner = "tj64"; @@ -27220,10 +35390,10 @@ rev = "d740c2065120f71762c48877da1a31dea881e98e"; sha256 = "0cxccxz17pj67wgmyxr74n381mknqgqkyav3jkxs4ghg59g5nygl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f337375082da316ed07b8ce9c775b484b8cdbf6/recipes/org-dp"; sha256 = "0fnrzpgw8l0g862j20yy4mw1wfcm2i04r6dxi4yd7yay8bw2i4yq"; - name = "org-dp"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -27231,9 +35401,15 @@ license = lib.licenses.free; }; }) {}; - org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-edit-latex = callPackage ({ auctex + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-edit-latex"; + ename = "org-edit-latex"; version = "0.8.3"; src = fetchFromGitHub { owner = "et2010"; @@ -27241,10 +35417,10 @@ rev = "39cbc9a99acb030f537c7269ab93958187321871"; sha256 = "1w0lyz71dq8x28ira4hig1b70bqn1dr53w3k5dgch9szcf6xa86y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex"; sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry"; - name = "org-edit-latex"; + name = "recipe"; }; packageRequires = [ auctex emacs ]; meta = { @@ -27252,9 +35428,15 @@ license = lib.licenses.free; }; }) {}; - org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-elisp-help = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-elisp-help"; + ename = "org-elisp-help"; version = "1.0.0"; src = fetchFromGitHub { owner = "tarsius"; @@ -27262,10 +35444,10 @@ rev = "3e33ab1a2933dd7f2782ef91d667a37f12d633ab"; sha256 = "088pbafz1x4z7qi70cjbrvfrcdrjp4zy0yl115klbidshqhxycmj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help"; sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h"; - name = "org-elisp-help"; + name = "recipe"; }; packageRequires = [ cl-lib org ]; meta = { @@ -27273,9 +35455,47 @@ license = lib.licenses.free; }; }) {}; - org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }: - melpaBuild { + org-evil = callPackage ({ dash + , evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , monitor + , org }: + melpaBuild { + pname = "org-evil"; + ename = "org-evil"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "GuiltyDolphin"; + repo = "org-evil"; + rev = "3b4620edc606412ef75c0b5aa637af22486eb126"; + sha256 = "0aqya9l9s55h5wd728iz15f53p5xajrfk8pn9gjxnw0i8m4d09sd"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; + sha256 = "0wvd201k9b9ghg39rwbah6rw8b7hyyd27vvqjynjwbk3v8rp5zyn"; + name = "recipe"; + }; + packageRequires = [ dash evil monitor org ]; + meta = { + homepage = "https://melpa.org/#/org-evil"; + license = lib.licenses.free; + }; + }) {}; + org-gcal = callPackage ({ alert + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , request-deferred }: + melpaBuild { pname = "org-gcal"; + ename = "org-gcal"; version = "0.2"; src = fetchFromGitHub { owner = "myuhe"; @@ -27283,10 +35503,10 @@ rev = "badd3629e6243563c30ff1dd0452b7601f6cc036"; sha256 = "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal"; sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q"; - name = "org-gcal"; + name = "recipe"; }; packageRequires = [ alert cl-lib emacs org request-deferred ]; meta = { @@ -27294,9 +35514,16 @@ license = lib.licenses.free; }; }) {}; - org-gnome = callPackage ({ alert, fetchFromGitHub, fetchurl, gnome-calendar, lib, melpaBuild, telepathy }: - melpaBuild { + org-gnome = callPackage ({ alert + , fetchFromGitHub + , fetchurl + , gnome-calendar + , lib + , melpaBuild + , telepathy }: + melpaBuild { pname = "org-gnome"; + ename = "org-gnome"; version = "0.3"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -27304,10 +35531,10 @@ rev = "1012d47886cfd30eed25b73d9f18e475e0155f88"; sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4f7ebd2d2312954d098fe4afd07c3d02b4df475d/recipes/org-gnome"; sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v"; - name = "org-gnome"; + name = "recipe"; }; packageRequires = [ alert gnome-calendar telepathy ]; meta = { @@ -27315,9 +35542,13 @@ license = lib.licenses.free; }; }) {}; - org-if = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + org-if = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-if"; + ename = "org-if"; version = "0.2.0"; src = fetchFromGitLab { owner = "elzair"; @@ -27325,10 +35556,10 @@ rev = "fab602cc1bbee7a4e99c0083e129219d3f9ed2e8"; sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09df84b60c46678ad40d8dabc08fcfe518f5ad79/recipes/org-if"; sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96"; - name = "org-if"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27336,20 +35567,54 @@ license = lib.licenses.free; }; }) {}; - org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: - melpaBuild { + org-index = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "org-index"; + ename = "org-index"; + version = "5.8.9"; + src = fetchFromGitHub { + owner = "marcihm"; + repo = "org-index"; + rev = "c26f48ec26f5d345e354845c7686fed4751d2136"; + sha256 = "0n571b2r0c6l9jklqgr0nxz5ca2jw7yfqpngl21lq06zz95lw9lw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index"; + sha256 = "1dp52xqrhby2xyi6p2d0ggp5irqsqwicp62ndg5wszyd33clxab5"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-index"; + license = lib.licenses.free; + }; + }) {}; + org-jira = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , s }: + melpaBuild { pname = "org-jira"; - version = "3.0.0"; + ename = "org-jira"; + version = "3.1.1"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "51a1b2248ec421aecdd38aaf5c2876a036b08bb7"; - sha256 = "0zyh5nn9hgiz0ic67ypahaah5f3vjmall7z0ffn4gl0fy22sar6h"; + rev = "03d6ebcf177db7b208c6a99386695e839f314314"; + sha256 = "07hy37by9ics7rc1sgkpg8qk2xzp67ny4i4rkd7q7j4abqdr131v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib"; - name = "org-jira"; + name = "recipe"; }; packageRequires = [ cl-lib emacs request s ]; meta = { @@ -27357,51 +35622,68 @@ license = lib.licenses.free; }; }) {}; - org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-journal = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-journal"; - version = "1.13.0"; + ename = "org-journal"; + version = "1.14.2"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "5fddd231b9848f09daab3f0928e4d6e570b15174"; - sha256 = "1xl5nkndvlxv5in6x2lq9lkvafqh7zwyyzr6vrcdp1wv4qb207m2"; + rev = "2395db4deb255c05d0d3a75c95f53263b74939c9"; + sha256 = "018wjn7v8a1z4z1sycz7b01rdck73ap13cr3lvfqvp9mms94qq71"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b"; - name = "org-journal"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/org-journal"; license = lib.licenses.free; }; }) {}; - org-kanban = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-kanban = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-kanban"; - version = "0.2.0"; + ename = "org-kanban"; + version = "0.4.6"; src = fetchFromGitHub { owner = "gizmomogwai"; repo = "org-kanban"; - rev = "2f0909f6f988f5185026a46a9cc929404652672f"; - sha256 = "08imw445bic3r8x7wls78dqskgx9ny5lixdksrvnp806vixq0f94"; + rev = "84c9e429ec9fcbe8d6091f15545ee7ebfc1cb589"; + sha256 = "1jpl56mpw0l2camknzcpng6ji4yb6gz2g29i019iprz9cik5g0xm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban"; sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41"; - name = "org-kanban"; + name = "recipe"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ dash emacs org ]; meta = { homepage = "https://melpa.org/#/org-kanban"; license = lib.licenses.free; }; }) {}; - org-link-travis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-link-travis = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-link-travis"; + ename = "org-link-travis"; version = "0.0.1"; src = fetchFromGitHub { owner = "aki2o"; @@ -27409,10 +35691,10 @@ rev = "596615ad8373d9090bd4138da683524f0ad0bda5"; sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c7f9539630e5ac7748fe36fd27c3486649ab74/recipes/org-link-travis"; sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs"; - name = "org-link-travis"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -27420,9 +35702,15 @@ license = lib.licenses.free; }; }) {}; - org-linkany = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + org-linkany = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "org-linkany"; + ename = "org-linkany"; version = "0.0.2"; src = fetchFromGitHub { owner = "aki2o"; @@ -27430,10 +35718,10 @@ rev = "ed4a6614b56c9baef31647ea728b3d5fae6ed3a2"; sha256 = "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df82cf95e34775b22da0a8bb29750f603c58f259/recipes/org-linkany"; sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c"; - name = "org-linkany"; + name = "recipe"; }; packageRequires = [ log4e yaxception ]; meta = { @@ -27441,9 +35729,44 @@ license = lib.licenses.free; }; }) {}; - org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-make-toc = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , s }: + melpaBuild { + pname = "org-make-toc"; + ename = "org-make-toc"; + version = "0.2"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "org-make-toc"; + rev = "c27e3600473100daa3007fb134cd3fe13e821d90"; + sha256 = "0078qpimkx6ps1cnyb1kaxiz4k93ppm7axsbrm18qic6mvp6i2nc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/df87749128bcfd27ca93a65084a2e88cd9ed5c3f/recipes/org-make-toc"; + sha256 = "0xaw3d1axvln4pr7p0jnqf0j6fd1g6cra1gykvf6y12zx02xkchh"; + name = "recipe"; + }; + packageRequires = [ dash emacs org s ]; + meta = { + homepage = "https://melpa.org/#/org-make-toc"; + license = lib.licenses.free; + }; + }) {}; + org-mime = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-mime"; + ename = "org-mime"; version = "0.1.1"; src = fetchFromGitHub { owner = "org-mime"; @@ -27451,10 +35774,10 @@ rev = "0752659f7a19cead182584fabc9544464f69b83e"; sha256 = "06lay5w03ah3w156spgh4bv2ma4x42pyhr3glfxw7vplfr5klvfz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6"; - name = "org-mime"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -27462,20 +35785,25 @@ license = lib.licenses.free; }; }) {}; - org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-mru-clock = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-mru-clock"; - version = "0.1.2"; + ename = "org-mru-clock"; + version = "0.2.1"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832"; - sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q"; + rev = "0e2dcb7799fb82bbe55c8aa9930192871e8b6109"; + sha256 = "08z6jc7qhj7zmzf1sag1n4nqh77k1dis2ijc6s2pzqlaxm3rhxyw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; sha256 = "1arww5x6vdyyn1bwxry91w88phbr9l6nk8xxrw40iqmmbhggahgm"; - name = "org-mru-clock"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -27483,9 +35811,16 @@ license = lib.licenses.free; }; }) {}; - org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-multiple-keymap = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-multiple-keymap"; + ename = "org-multiple-keymap"; version = "0.2"; src = fetchFromGitHub { owner = "myuhe"; @@ -27493,10 +35828,10 @@ rev = "20eb3be6be9f0abbad9f0d007e40cb00c8109201"; sha256 = "0yxfhzygiki8sha1dddac4g72r51yi4jnga2scmk51f9jgwqbihp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a22beed723d149282e70e3411b79e8ce9f5ab2b/recipes/org-multiple-keymap"; sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f"; - name = "org-multiple-keymap"; + name = "recipe"; }; packageRequires = [ cl-lib emacs org ]; meta = { @@ -27504,20 +35839,27 @@ license = lib.licenses.free; }; }) {}; - org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-noter = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-noter"; - version = "1.0.1"; + ename = "org-noter"; + version = "1.1.0"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "32cdf41079ca67c5906a10215eb7fbaefebab994"; - sha256 = "11hhw8fk1qn63hwdx49h9h58p2hmxhmni6qdazd0ipk68finmy8f"; + rev = "8f86583bd573cb0f146aae5d2394e615efb0cafe"; + sha256 = "0fgmn7gqh146zrmvc1p7dik93sjajay0n8i8qdd4sbdzw64shzl1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; sha256 = "0vsc2b1yz9lw0zv1vnm722pl35kxpwhcdi7h6mijhnw8vv7rhixf"; - name = "org-noter"; + name = "recipe"; }; packageRequires = [ cl-lib emacs org ]; meta = { @@ -27525,9 +35867,13 @@ license = lib.licenses.free; }; }) {}; - org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-outlook = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-outlook"; + ename = "org-outlook"; version = "0.11"; src = fetchFromGitHub { owner = "mattfidler"; @@ -27535,10 +35881,10 @@ rev = "070c37d017ccb71d94c3c69c99632fa6570ec2cc"; sha256 = "15fy6xpz6mk4j3nkrhiqal2dp77rhxmk8a7xiw037xr1jgq9sd9a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/804a4b6802d2cf53e5415d956f0b4772853f4c69/recipes/org-outlook"; sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9"; - name = "org-outlook"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27546,9 +35892,17 @@ license = lib.licenses.free; }; }) {}; - org-page = callPackage ({ fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org }: - melpaBuild { + org-page = callPackage ({ fetchFromGitHub + , fetchurl + , ht + , htmlize + , lib + , melpaBuild + , mustache + , org }: + melpaBuild { pname = "org-page"; + ename = "org-page"; version = "0.41"; src = fetchFromGitHub { owner = "kelvinh"; @@ -27556,10 +35910,10 @@ rev = "09febf89d8dcb226aeedf8164169b31937b64439"; sha256 = "0zc20m63a1iz9aziid5jsvcbl86k9dg9js4k3almchh55az4a0i3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page"; sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v"; - name = "org-page"; + name = "recipe"; }; packageRequires = [ ht htmlize mustache org ]; meta = { @@ -27567,19 +35921,25 @@ license = lib.licenses.free; }; }) {}; - org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }: - melpaBuild { + org-password-manager = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild + , org + , s }: + melpaBuild { pname = "org-password-manager"; + ename = "org-password-manager"; version = "0.0.1"; src = fetchgit { - url = "https://git.leafac.com/org-password-manager"; - rev = "d3a33ddfe583180bdb76cfb8bbd772e0078b24a3"; - sha256 = "0pqmnhd3qdg06agj6h8v8lm4m5q8px0qmd7a1bfn6i5g2bq9zrck"; + url = "https://github.com/leafac/org-password-manager"; + rev = "108ad275965c9a65905d1a0064e7d9b5f6a62d3f"; + sha256 = "0551fd71qbxzxxmhxqvlkh3skkswgcc1sgdl30mf5chylbnw8kly"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; - sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm"; - name = "org-password-manager"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fba84d698f7d16ffc0dc16618efcd1cdc0b39d79/recipes/org-password-manager"; + sha256 = "0wxvl6ypgn6ky1z3dh33ya3rh73znkh5f8qhqwfmwp7hy2mbl4la"; + name = "recipe"; }; packageRequires = [ org s ]; meta = { @@ -27587,9 +35947,15 @@ license = lib.licenses.free; }; }) {}; - org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: - melpaBuild { + org-pdfview = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , pdf-tools }: + melpaBuild { pname = "org-pdfview"; + ename = "org-pdfview"; version = "0.4"; src = fetchFromGitHub { owner = "markus1189"; @@ -27597,10 +35963,10 @@ rev = "3a96bfb57cb158ac02cfb4225512699c66f5221d"; sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview"; sha256 = "1qhlmzf2ffcrjnx4yghv7n6rsry8bcwnkw489spgraq9vxvqklah"; - name = "org-pdfview"; + name = "recipe"; }; packageRequires = [ org pdf-tools ]; meta = { @@ -27608,9 +35974,15 @@ license = lib.licenses.free; }; }) {}; - org-pomodoro = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-pomodoro = callPackage ({ alert + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-pomodoro"; + ename = "org-pomodoro"; version = "2.1.0"; src = fetchFromGitHub { owner = "lolownia"; @@ -27618,10 +35990,10 @@ rev = "a6d867865f1a033fb5a09cca6643045d7ebac49c"; sha256 = "0r5shgikm34d66i2hblyknbblpg92lb2zc9x4bcb28xkh7m9d0xv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e54e77c5619b56e9b488b3fe8761188b6b3b4198/recipes/org-pomodoro"; sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27"; - name = "org-pomodoro"; + name = "recipe"; }; packageRequires = [ alert cl-lib ]; meta = { @@ -27629,9 +36001,18 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }: - melpaBuild { + org-projectile = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org-category-capture + , projectile + , s }: + melpaBuild { pname = "org-projectile"; + ename = "org-projectile"; version = "1.1.0"; src = fetchFromGitHub { owner = "IvanMalison"; @@ -27639,10 +36020,10 @@ rev = "48f621b595e748c5e03431f237facf258ffc9443"; sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; sha256 = "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw"; - name = "org-projectile"; + name = "recipe"; }; packageRequires = [ dash emacs org-category-capture projectile s ]; meta = { @@ -27650,20 +36031,27 @@ license = lib.licenses.free; }; }) {}; - org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }: - melpaBuild { + org-projectile-helm = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , org-projectile }: + melpaBuild { pname = "org-projectile-helm"; + ename = "org-projectile-helm"; version = "1.1.0"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "48f621b595e748c5e03431f237facf258ffc9443"; - sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; + rev = "fc62993b5a0b9c13d4e6abeff5a504fc75edad85"; + sha256 = "08gbgzn8dxl9wl3y4igq1lsnlxi94ak5w7pn9ykw7y6nr2714bms"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; sha256 = "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4"; - name = "org-projectile-helm"; + name = "recipe"; }; packageRequires = [ emacs helm org-projectile ]; meta = { @@ -27671,20 +36059,24 @@ license = lib.licenses.free; }; }) {}; - org-protocol-jekyll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-protocol-jekyll = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-protocol-jekyll"; + ename = "org-protocol-jekyll"; version = "0.1"; src = fetchFromGitHub { owner = "vonavi"; repo = "org-protocol-jekyll"; - rev = "c1ac46793eb9bf22b1a601e841947428be5c9766"; - sha256 = "1cxjzj955rvp0ijbp7ifpmkxdhimz8hqjw5c9gv6zwjqb5iih9ry"; + rev = "ed09d166d665ad45f61184cfddcfc24b62e37bc7"; + sha256 = "1iz6g1c37xrlrpi9avalkad6wmfb2l7yiawng0kbqm9i0bqkjhhs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1ee7c75da91fcf303ea89d148a05ac1e58e23e/recipes/org-protocol-jekyll"; sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs"; - name = "org-protocol-jekyll"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27692,9 +36084,15 @@ license = lib.licenses.free; }; }) {}; - org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-random-todo = callPackage ({ alert + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-random-todo"; + ename = "org-random-todo"; version = "0.5.2"; src = fetchFromGitHub { owner = "unhammer"; @@ -27702,10 +36100,10 @@ rev = "60364c18725d2f3898a9099e7e546ae406dd6578"; sha256 = "0k86hqmqilvkam886mb85v991ivwnglallwj4l9ghszl7awy207m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; sha256 = "0yflppdbkfn2phd21zkjdlidzasfm846mzniay83v3akz0qx31lr"; - name = "org-random-todo"; + name = "recipe"; }; packageRequires = [ alert emacs ]; meta = { @@ -27713,9 +36111,17 @@ license = lib.licenses.free; }; }) {}; - org-readme = callPackage ({ fetchFromGitHub, fetchurl, header2, http-post-simple, lib, lib-requires, melpaBuild, yaoddmuse }: - melpaBuild { + org-readme = callPackage ({ fetchFromGitHub + , fetchurl + , header2 + , http-post-simple + , lib + , lib-requires + , melpaBuild + , yaoddmuse }: + melpaBuild { pname = "org-readme"; + ename = "org-readme"; version = "20130322.926"; src = fetchFromGitHub { owner = "mattfidler"; @@ -27723,10 +36129,10 @@ rev = "15054e42351b5ec6b629c55760a578516e035355"; sha256 = "0hhgfw0sqvl9jmmslwxn6v3dii99v09yz2h0ia5np9lzyxsc207a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/317318e6071b174e0ec6302ea4f526976d837db4/recipes/org-readme"; sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh"; - name = "org-readme"; + name = "recipe"; }; packageRequires = [ header2 http-post-simple lib-requires yaoddmuse ]; meta = { @@ -27734,9 +36140,23 @@ license = lib.licenses.free; }; }) {}; - org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: - melpaBuild { + org-ref = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , helm + , helm-bibtex + , hydra + , ivy + , key-chord + , lib + , melpaBuild + , pdf-tools + , s }: + melpaBuild { pname = "org-ref"; + ename = "org-ref"; version = "1.1.1"; src = fetchFromGitHub { owner = "jkitchin"; @@ -27744,10 +36164,10 @@ rev = "db6c52f41faba686a378a8c57356a563f5cef496"; sha256 = "0kx6w3zz5gmlmr9bx1mdq1k8ykkbnll6m91z90p6f2xm96j627j6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; sha256 = "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08"; - name = "org-ref"; + name = "recipe"; }; packageRequires = [ dash @@ -27766,9 +36186,13 @@ license = lib.licenses.free; }; }) {}; - org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-repo-todo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-repo-todo"; + ename = "org-repo-todo"; version = "0.0.3"; src = fetchFromGitHub { owner = "waymondo"; @@ -27776,10 +36200,10 @@ rev = "cba6145c6821fd2bbd96a1c9ef2346c281b76ad2"; sha256 = "0b57qy87sa8qcki16rgh16ldziay57yd7f98cpinaq0adcrqywy0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo"; sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1"; - name = "org-repo-todo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27787,20 +36211,25 @@ license = lib.licenses.free; }; }) {}; - org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-rich-yank = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-rich-yank"; - version = "0.1.1"; + ename = "org-rich-yank"; + version = "0.2.0"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-rich-yank"; - rev = "ffa90b29604e27a60ad341c06d0e43769af19715"; - sha256 = "1z9137nirbaydqpw5b7ii3qnpn09v1kiqnyxsxkgc0q3arb1m1f6"; + rev = "f6bbf973bef7063c6ab475db25a630bc7ee317da"; + sha256 = "1by1ymypwlnnnh8fx4ndcwsrif83xyx56mlvmv2lx6wmyliv0py9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank"; sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y"; - name = "org-rich-yank"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -27808,20 +36237,25 @@ license = lib.licenses.free; }; }) {}; - org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-static-blog = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-static-blog"; - version = "1.1.1"; + ename = "org-static-blog"; + version = "1.2.1"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-static-blog"; - rev = "8ea4456b0ca5642fff5868e54fe23f3b5109a579"; - sha256 = "0zh1vb6q8xwaawizv9rq86ahpvxsmrjrzhgh6k4xv6rx8k7k1i7g"; + rev = "f69d2fd6671fb250fbd87df5efa898a7bf5b9bda"; + sha256 = "1h9c96rbxxk1jypib5f9pfi5zkimkvhxi61j0sps6r39435dd3w7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; sha256 = "07vh2k7cj0cs1yzfmrrz9p03x5mbfh0bigbl93s72h1wf7i05rkw"; - name = "org-static-blog"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -27829,9 +36263,16 @@ license = lib.licenses.free; }; }) {}; - org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-sync = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-sync"; + ename = "org-sync"; version = "0.3.0"; src = fetchFromGitHub { owner = "arbox"; @@ -27839,10 +36280,10 @@ rev = "8c65dceaa2f3d436f83ed591916f22556a6e7f91"; sha256 = "0zx9gpvm5gy9k45lbhaks9s935id727lszsh40gmpdp5zxf3rjk1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync"; sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad"; - name = "org-sync"; + name = "recipe"; }; packageRequires = [ cl-lib emacs org ]; meta = { @@ -27850,9 +36291,13 @@ license = lib.licenses.free; }; }) {}; - org-table-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-table-comment = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-table-comment"; + ename = "org-table-comment"; version = "0.2.0"; src = fetchFromGitHub { owner = "mattfidler"; @@ -27860,10 +36305,10 @@ rev = "33b9966c33ecbc3e27cca67c2f2cdea04364d74e"; sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c1f08c41969bc8a7104fb914564b4f6cab667e2/recipes/org-table-comment"; sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz"; - name = "org-table-comment"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27871,9 +36316,14 @@ license = lib.licenses.free; }; }) {}; - org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-table-sticky-header = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-table-sticky-header"; + ename = "org-table-sticky-header"; version = "0.1.1"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -27881,10 +36331,10 @@ rev = "4dba2dc9a3ed63f58aa946aeec84a52d46ca4043"; sha256 = "0az4lzd9qk4cx7jjfj36r2fvlkwyrhn3xqhha5d1pydglnhd9amy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header"; sha256 = "1rk41279rcsdma39zpr1ka5p47gh1d0969wahd0jbm5xlmx5gz2m"; - name = "org-table-sticky-header"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -27892,9 +36342,16 @@ license = lib.licenses.free; }; }) {}; - org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + org-tfl = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "org-tfl"; + ename = "org-tfl"; version = "0.4.0"; src = fetchFromGitHub { owner = "storax"; @@ -27902,10 +36359,10 @@ rev = "f0d7d39106a1de5457f5160cddd98ab892b61066"; sha256 = "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl"; sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf"; - name = "org-tfl"; + name = "recipe"; }; packageRequires = [ cl-lib emacs org ]; meta = { @@ -27913,9 +36370,14 @@ license = lib.licenses.free; }; }) {}; - org-themis = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-themis = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-themis"; + ename = "org-themis"; version = "0.4.1"; src = fetchFromGitHub { owner = "zellio"; @@ -27923,10 +36385,10 @@ rev = "4b4bf1fa1e853664bf006dda8afe2db00e522aaa"; sha256 = "12fksqi9flf84h1lbmbcjnqxa7dairp50wvlwfhbp1hbb8l9z63a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60e0efe4f201ed96e90c437e3e7205e0344d4676/recipes/org-themis"; sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln"; - name = "org-themis"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -27934,9 +36396,15 @@ license = lib.licenses.free; }; }) {}; - org-time-budgets = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-time-budgets = callPackage ({ alert + , cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-time-budgets"; + ename = "org-time-budgets"; version = "1.0.1"; src = fetchFromGitHub { owner = "leoc"; @@ -27944,10 +36412,10 @@ rev = "f2a8fe3d9d6104f3dd61fabbb385a596363b360b"; sha256 = "09iw2jffb2qrx5r07zd1j8sk5wafamjkc2khqyfwc5kx6xyp1f46"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/776b58b433ab7dde5870300d288c3e6734fc32c0/recipes/org-time-budgets"; sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah"; - name = "org-time-budgets"; + name = "recipe"; }; packageRequires = [ alert cl-lib ]; meta = { @@ -27955,9 +36423,13 @@ license = lib.licenses.free; }; }) {}; - org-toodledo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-toodledo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-toodledo"; + ename = "org-toodledo"; version = "2.1.0"; src = fetchFromGitHub { owner = "myuhe"; @@ -27965,10 +36437,10 @@ rev = "5473c1a2762371b198862aa8fd83fd3ec57485a4"; sha256 = "0qqa62fsmra6v4061kpki8wbhfcwkgnb2gzxwvnaqlcmhivksg6v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4956fb6c5f1076a02f07d0f953e846fee39bfaa6/recipes/org-toodledo"; sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3"; - name = "org-toodledo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -27976,9 +36448,15 @@ license = lib.licenses.free; }; }) {}; - org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-tracktable = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-tracktable"; + ename = "org-tracktable"; version = "0.3.1"; src = fetchFromGitHub { owner = "tty-tourist"; @@ -27986,10 +36464,10 @@ rev = "8e0e60a582a034bd66d5efb72d513140b7d4d90a"; sha256 = "1aq7qv5jyc2x2a4iphnzmmsvak6dbi7nwdcf3m8nly8w75vrl5lj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57263d996e321f842d0741898370390146606c63/recipes/org-tracktable"; sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00"; - name = "org-tracktable"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -27997,9 +36475,15 @@ license = lib.licenses.free; }; }) {}; - org-transform-tree-table = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + org-transform-tree-table = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "org-transform-tree-table"; + ename = "org-transform-tree-table"; version = "0.1.2"; src = fetchFromGitHub { owner = "jplindstrom"; @@ -28007,10 +36491,10 @@ rev = "0a9bf07f01bc5fc3b349aff64e83999a8de83b52"; sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/afca0e652a993848610606866609edbf2f5f76ae/recipes/org-transform-tree-table"; sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r"; - name = "org-transform-tree-table"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -28018,9 +36502,13 @@ license = lib.licenses.free; }; }) {}; - org-tree-slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-tree-slide = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-tree-slide"; + ename = "org-tree-slide"; version = "2.8.4"; src = fetchFromGitHub { owner = "takaxp"; @@ -28028,10 +36516,10 @@ rev = "dccd80418a4444df5e8301695ff0d0dfe86a3c21"; sha256 = "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6160c259bc4bbcf3b98c220222430f798ee6463f/recipes/org-tree-slide"; sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn"; - name = "org-tree-slide"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28039,9 +36527,18 @@ license = lib.licenses.free; }; }) {}; - org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }: - melpaBuild { + org-trello = callPackage ({ dash + , dash-functional + , deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request-deferred + , s }: + melpaBuild { pname = "org-trello"; + ename = "org-trello"; version = "0.8.1"; src = fetchFromGitHub { owner = "org-trello"; @@ -28049,10 +36546,10 @@ rev = "c38c36159cdeb2348c4e9ca75246aa9cc1dfd76c"; sha256 = "02gx3kv4mkij69ln8x8wf9n28x17pbb4kv85v78d3lxph7ykqimc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello"; sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i"; - name = "org-trello"; + name = "recipe"; }; packageRequires = [ dash dash-functional deferred request-deferred s ]; meta = { @@ -28060,20 +36557,24 @@ license = lib.licenses.free; }; }) {}; - org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-vcard = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-vcard"; + ename = "org-vcard"; version = "0.2.0"; src = fetchFromGitHub { owner = "flexibeast"; repo = "org-vcard"; - rev = "a6ab82ab28fa78f7c985d3ea9c9fafdd17f7ea8b"; - sha256 = "14l3xqahqmnfl3sskqcr33xpcsic8dm9cr9wmbv5la3xv14n10k7"; + rev = "a697c966579a8a67e02ad6b5d7f7897a1b5b4620"; + sha256 = "1fx36yqq21wmccv055kd8p0ks2gmycyw68x4v57lszadg5rcf77k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard"; sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl"; - name = "org-vcard"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28081,9 +36582,16 @@ license = lib.licenses.free; }; }) {}; - org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + org-wild-notifier = callPackage ({ alert + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "org-wild-notifier"; + ename = "org-wild-notifier"; version = "0.2.4"; src = fetchFromGitHub { owner = "akhramov"; @@ -28091,10 +36599,10 @@ rev = "5da63fc00db20b60eb46a241cc8308547d85b3ad"; sha256 = "1269az078d6d0x7ims2qa6wdv8ql2hn70fwigfqw116v9602ywjr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; - name = "org-wild-notifier"; + name = "recipe"; }; packageRequires = [ alert dash emacs ]; meta = { @@ -28102,9 +36610,17 @@ license = lib.licenses.free; }; }) {}; - org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }: - melpaBuild { + org2blog = callPackage ({ fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild + , metaweblog + , org + , xml-rpc }: + melpaBuild { pname = "org2blog"; + ename = "org2blog"; version = "1.0.2"; src = fetchFromGitHub { owner = "punchagan"; @@ -28112,10 +36628,10 @@ rev = "bd2028b6a79daa63fc5481deaed63c4efc681be0"; sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40"; - name = "org2blog"; + name = "recipe"; }; packageRequires = [ htmlize metaweblog org xml-rpc ]; meta = { @@ -28123,9 +36639,16 @@ license = lib.licenses.free; }; }) {}; - org2jekyll = callPackage ({ dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + org2jekyll = callPackage ({ dash-functional + , deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "org2jekyll"; + ename = "org2jekyll"; version = "0.1.9"; src = fetchFromGitHub { owner = "ardumont"; @@ -28133,10 +36656,10 @@ rev = "35e11ffa24b140d2e247df195489fca344bd0c08"; sha256 = "089nqbda5mg1ippqnsl5wcx9n1gpnaqhl6kz54n47kivb400bidh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48a1e5bd5e338bd3593f004f95b6fbb12595bfb7/recipes/org2jekyll"; sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv"; - name = "org2jekyll"; + name = "recipe"; }; packageRequires = [ dash-functional deferred s ]; meta = { @@ -28144,9 +36667,21 @@ license = lib.licenses.free; }; }) {}; - org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: - melpaBuild { + org2web = callPackage ({ cl-lib ? null + , dash + , el2org + , fetchFromGitHub + , fetchurl + , ht + , htmlize + , lib + , melpaBuild + , mustache + , org + , simple-httpd }: + melpaBuild { pname = "org2web"; + ename = "org2web"; version = "0.9.1"; src = fetchFromGitHub { owner = "tumashu"; @@ -28154,10 +36689,10 @@ rev = "5243b399927a4c474bb3b8d1c8a00799df1f27d7"; sha256 = "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web"; sha256 = "0lcqf0pgkd7jilasw1485fy45k269jxvyl7hl7qrcs94s6fy2vaf"; - name = "org2web"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -28174,9 +36709,15 @@ license = lib.licenses.free; }; }) {}; - orgbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + orgbox = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "orgbox"; + ename = "orgbox"; version = "0.5.0"; src = fetchFromGitHub { owner = "yasuhito"; @@ -28184,10 +36725,10 @@ rev = "ecaf5a064431cf92922338c974df8fce1a8f1734"; sha256 = "02mxp17p7bj4xamg0m6zk832hmpqcgzc7bjbjcnvbvrawhc255hy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1948eca5a18f35b61b9a0baf532753fd105ba3a/recipes/orgbox"; sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8"; - name = "orgbox"; + name = "recipe"; }; packageRequires = [ cl-lib org ]; meta = { @@ -28195,9 +36736,17 @@ license = lib.licenses.free; }; }) {}; - orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: - melpaBuild { + orgit = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild + , org }: + melpaBuild { pname = "orgit"; + ename = "orgit"; version = "1.5.1"; src = fetchFromGitHub { owner = "magit"; @@ -28205,10 +36754,10 @@ rev = "d909f92d3b1b42184143fd5e6d4c6a2762477ab7"; sha256 = "1jdc874bxkpbfpllak3vmfsn82p930s565bzff341vzv7aw2528c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w"; - name = "orgit"; + name = "recipe"; }; packageRequires = [ dash emacs magit org ]; meta = { @@ -28216,20 +36765,27 @@ license = lib.licenses.free; }; }) {}; - orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + orglink = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "orglink"; + ename = "orglink"; version = "1.1.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "orglink"; - rev = "e9e90e16ddaceaf99c9b251a215d6338b9762b4d"; - sha256 = "0vqyidi54rbpqwqi6iv1xaqkr9gfr0pfhr1msxckh8jy6avgy319"; + rev = "82ea67b7f1bf10627759044acb74828f66a85a83"; + sha256 = "0zqbz1idj73wz3kljkkzl7mvalk73j7xpl3di6mb16ylscg9sraw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink"; sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b"; - name = "orglink"; + name = "recipe"; }; packageRequires = [ dash emacs org ]; meta = { @@ -28237,20 +36793,24 @@ license = lib.licenses.free; }; }) {}; - orgtbl-show-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + orgtbl-show-header = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "orgtbl-show-header"; + ename = "orgtbl-show-header"; version = "1.0.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "orgtbl-show-header"; - rev = "f0f48ccc0f96d4aa2a676ff609d9dddd71748e6f"; - sha256 = "0zfiq9d5jqzpmscngb1s2jgfiqmbi4dyw0fqa59v2g84gxjg793x"; + rev = "2f13391f56cf94f8fe1dc79d6eccb662198f9b69"; + sha256 = "0s3pf18n7vh67am1pjaa22gh645088dbz2rgxixr9avpfyalaycj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c5ea906b1d642405ca532d89dbb32cf79f53582/recipes/orgtbl-show-header"; sha256 = "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k"; - name = "orgtbl-show-header"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28258,9 +36818,15 @@ license = lib.licenses.free; }; }) {}; - osx-browse = callPackage ({ browse-url-dwim, fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }: - melpaBuild { + osx-browse = callPackage ({ browse-url-dwim + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , string-utils }: + melpaBuild { pname = "osx-browse"; + ename = "osx-browse"; version = "0.8.8"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -28268,10 +36834,10 @@ rev = "6186a6020e143e90d557c8d062c44fcdba0516c7"; sha256 = "0g1xhh88a65vcq6rlh7ii16pra4pv519ajcws0h93ldbbjiy7p0m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/081aa3e1d50c2c9e5a9b9ce0716258a93279f605/recipes/osx-browse"; sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm"; - name = "osx-browse"; + name = "recipe"; }; packageRequires = [ browse-url-dwim string-utils ]; meta = { @@ -28279,9 +36845,13 @@ license = lib.licenses.free; }; }) {}; - osx-clipboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + osx-clipboard = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "osx-clipboard"; + ename = "osx-clipboard"; version = "0.1"; src = fetchFromGitHub { owner = "joddie"; @@ -28289,10 +36859,10 @@ rev = "e46dd31327a3f92f77b013b4c9b1e5fdd0e5c73d"; sha256 = "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71b85cd2b2122a2742f919d10bfcb054b681e61e/recipes/osx-clipboard"; sha256 = "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f"; - name = "osx-clipboard"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28300,9 +36870,14 @@ license = lib.licenses.free; }; }) {}; - osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + osx-dictionary = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "osx-dictionary"; + ename = "osx-dictionary"; version = "0.4"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -28310,10 +36885,10 @@ rev = "0e5e5f1b0077a62673855889d529dd4f0cc8f665"; sha256 = "1zpr50q7i4wg1x7vsj69rh1b8xvk9r0591y4fvvs3a2l1llca2mq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary"; sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82"; - name = "osx-dictionary"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -28321,9 +36896,13 @@ license = lib.licenses.free; }; }) {}; - osx-location = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + osx-location = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "osx-location"; + ename = "osx-location"; version = "0.4"; src = fetchFromGitHub { owner = "purcell"; @@ -28331,10 +36910,10 @@ rev = "110aee945b53ea550e4debe69bf3c077d940ec8c"; sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8673dafb02a8d70c278bfd2c063f40992defe3a3/recipes/osx-location"; sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c"; - name = "osx-location"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28342,41 +36921,24 @@ license = lib.licenses.free; }; }) {}; - osx-plist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "osx-plist"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "osx-plist"; - rev = "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0"; - sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f3686dc818bd12be247bad915c01736a95690041/recipes/osx-plist"; - sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8"; - name = "osx-plist"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/osx-plist"; - license = lib.licenses.free; - }; - }) {}; - osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + osx-pseudo-daemon = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "osx-pseudo-daemon"; + ename = "osx-pseudo-daemon"; version = "2.1"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "mac-pseudo-daemon"; - rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc"; - sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2"; + rev = "0358b3acd932082082971c489012bf139f5860dc"; + sha256 = "1scdqy8g8dx3qzii70p3m2gddqqy7dkv63p8nfkp7vw1y5m19426"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon"; sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z"; - name = "osx-pseudo-daemon"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28384,9 +36946,14 @@ license = lib.licenses.free; }; }) {}; - osx-trash = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + osx-trash = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "osx-trash"; + ename = "osx-trash"; version = "0.2"; src = fetchFromGitHub { owner = "lunaryorn"; @@ -28394,10 +36961,10 @@ rev = "529619b84d21e18a38ec5255eb40f6b8ede38b2a"; sha256 = "1n44wdffkw14si9kb7bpkp6d9cjwjrvksfh22y9549dhs1vav6qq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f4c86e5b86df6c5c2c484f041fa3e434bbfbbb1/recipes/osx-trash"; sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj"; - name = "osx-trash"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28405,9 +36972,14 @@ license = lib.licenses.free; }; }) {}; - outlook = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + outlook = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "outlook"; + ename = "outlook"; version = "0.1"; src = fetchFromGitHub { owner = "asavonic"; @@ -28415,10 +36987,10 @@ rev = "5847c6f13b106cb54529080e9050be5b8b5be867"; sha256 = "13wlfklk342gv5fmzpnz69mc07vm8x6xmh7li1w7f13ci3v4s045"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5ce3e6800213b117578a1022f25407f2ec1604f/recipes/outlook"; sha256 = "0yq9zl7dr8kkm4rps5np4dwvjfhzsxq9wd1af7zwcmms4l3qry6k"; - name = "outlook"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28426,20 +36998,24 @@ license = lib.licenses.free; }; }) {}; - outorg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + outorg = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "outorg"; + ename = "outorg"; version = "2.0"; src = fetchFromGitHub { owner = "alphapapa"; repo = "outorg"; - rev = "e946cda497bae53fca6fa1579910237e216170bf"; - sha256 = "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp"; + rev = "04986bdb0b91fdd97974e032dced01dd8de759a4"; + sha256 = "154nkvjaa78zhazmyv8ia8axgs7s1xr3zpv0z3mjl3v0ny7s5j21"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg"; sha256 = "10jh64d1nalfig69nnsib46915jinv37lvmxa0aj91zymq2szdm9"; - name = "outorg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28447,20 +37023,24 @@ license = lib.licenses.free; }; }) {}; - outshine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + outshine = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "outshine"; + ename = "outshine"; version = "2.0"; src = fetchFromGitHub { owner = "alphapapa"; repo = "outshine"; - rev = "cf1097692b3ea0367d3c821769399fec5831e200"; - sha256 = "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98"; + rev = "2313595aa2d72ec35e5bee31d1513752eafac01c"; + sha256 = "1jw09qh4vcp3d4qbp9bi4a4kxy88jrxfskh3r1pdbcjlci4wfhjm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine"; sha256 = "1qqmvs17hq5s047nqplg4sa09xg5ck6zwqyg91xmbh71bx80v28v"; - name = "outshine"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28468,9 +37048,14 @@ license = lib.licenses.free; }; }) {}; - ov = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ov = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ov"; + ename = "ov"; version = "1.0.6"; src = fetchFromGitHub { owner = "ShingoFukuyama"; @@ -28478,10 +37063,10 @@ rev = "4e1c254d74bc1773c92f1613c3865cdcb4bc7095"; sha256 = "0qxk2rf84j86syxi8xknsq252irwg7sz396v3bb4wqz4prpj0kzc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18d8a10ba3018cb61924af3a1682b82f543f2d98/recipes/ov"; sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb"; - name = "ov"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28489,20 +37074,25 @@ license = lib.licenses.free; }; }) {}; - overcast-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + overcast-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "overcast-theme"; + ename = "overcast-theme"; version = "1.1.0"; src = fetchFromGitHub { owner = "myTerminal"; repo = "overcast-theme"; - rev = "009257956522dedf07d9e136ee41ac0b1b0b3518"; - sha256 = "1g3s44n839s7fw3spkph31m0a5walilj151v0jyp302mjfn396nh"; + rev = "faafe7c19106cb4db29ba716d117fbb6ebdda3f4"; + sha256 = "1kjvx2wjb9ksdr7w0c4xnvqa4sbplj6rwlh85lbmcg8lwkb1s2sy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86691c61fc880954a05502a6474cc2fa0d0a43b/recipes/overcast-theme"; sha256 = "1v8hdnvc4pfmadkvdm6b8z0cy20pminvhjdlr13q5m9immr88a4r"; - name = "overcast-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28510,9 +37100,16 @@ license = lib.licenses.free; }; }) {}; - overseer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + overseer = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "overseer"; + ename = "overseer"; version = "0.3.0"; src = fetchFromGitHub { owner = "tonini"; @@ -28520,10 +37117,10 @@ rev = "cf532a4e373e3da2077ccbaa48d4bfacd14661ba"; sha256 = "0jz8p6bwpfncxwi6ssmi6ngx8sjjica565i6ln0gsr5i11zfb7nx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer"; sha256 = "0zbh0j21h6wsqnqvnzai6y6rpccdciksb7g64qw7fx0cpg5x2ms8"; - name = "overseer"; + name = "recipe"; }; packageRequires = [ dash emacs pkg-info ]; meta = { @@ -28531,9 +37128,16 @@ license = lib.licenses.free; }; }) {}; - owdriver = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, smartrep, yaxception }: - melpaBuild { + owdriver = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , smartrep + , yaxception }: + melpaBuild { pname = "owdriver"; + ename = "owdriver"; version = "0.0.6"; src = fetchFromGitHub { owner = "aki2o"; @@ -28541,10 +37145,10 @@ rev = "0479389d9df9e70ff9ce69dff06252d3aa40fc86"; sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3f9c1bb19345c6027a945e7f265632da1a391cb/recipes/owdriver"; sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd"; - name = "owdriver"; + name = "recipe"; }; packageRequires = [ log4e smartrep yaxception ]; meta = { @@ -28552,20 +37156,26 @@ license = lib.licenses.free; }; }) {}; - ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-epub = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-epub"; + ename = "ox-epub"; version = "0.3"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d"; - sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7"; + rev = "7991155e4b80bafee616108014be5281c22bae83"; + sha256 = "09di3qq0nc9m3dnqik392vbdps829wlkxdsjlcpdm0dfms9wq10v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; sha256 = "15q6vsmgv76c0qfdxa3prqvgmr6n7k4rd4bpi05574ibi23y0ynh"; - name = "ox-epub"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -28573,9 +37183,13 @@ license = lib.licenses.free; }; }) {}; - ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ox-gfm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ox-gfm"; + ename = "ox-gfm"; version = "1.0"; src = fetchFromGitHub { owner = "larstvei"; @@ -28583,10 +37197,10 @@ rev = "99f93011b069e02b37c9660b8fcb45dab086a07f"; sha256 = "0drdypmgxk3238hmkqw9s3cw9wv94cyfqar5ar0bv0k69s92pxj8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q"; - name = "ox-gfm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28594,9 +37208,15 @@ license = lib.licenses.free; }; }) {}; - ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-hugo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-hugo"; + ename = "ox-hugo"; version = "0.8"; src = fetchFromGitHub { owner = "kaushalmodi"; @@ -28604,10 +37224,10 @@ rev = "9751d34e1133b89a533a978c085b0715f85db648"; sha256 = "11h464cyc28ld0b0zridgm4drydc1qjxbm1y24zrwlkyqqjk6yr7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; sha256 = "1niarxj2y4a14lrv2nqcc36msw7k61h8fbjpcdrfbaw3n0kchd40"; - name = "ox-hugo"; + name = "recipe"; }; packageRequires = [ emacs org ]; meta = { @@ -28615,20 +37235,28 @@ license = lib.licenses.free; }; }) {}; - ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + ox-ioslide = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-ioslide"; + ename = "ox-ioslide"; version = "0.2"; src = fetchFromGitHub { owner = "coldnew"; repo = "org-ioslide"; - rev = "e81f7a6dab512da7eaa8c2c50c673538b97db267"; - sha256 = "047fcvpvwzaqisw4q3p6hxgjyqsi2n9nms1qx9w4znvxrnjq8jz3"; + rev = "6cb628e022ef224e9fe8b8b6c123713449d8f06b"; + sha256 = "1ipscvm7rdp8vcpd2f9516k5mjhdx03sb1p2c9j7krkhigfrbpsr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b960abca4d642c47e640300876eefee1851e6b86/recipes/ox-ioslide"; sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc"; - name = "ox-ioslide"; + name = "recipe"; }; packageRequires = [ cl-lib emacs f org ]; meta = { @@ -28636,9 +37264,17 @@ license = lib.licenses.free; }; }) {}; - ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: - melpaBuild { + ox-pandoc = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , ht + , lib + , melpaBuild + , org }: + melpaBuild { pname = "ox-pandoc"; + ename = "ox-pandoc"; version = "1.150707"; src = fetchFromGitHub { owner = "kawabata"; @@ -28646,10 +37282,10 @@ rev = "035f1d60a0139349232c382cfd23a96902b7003d"; sha256 = "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc"; sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc"; - name = "ox-pandoc"; + name = "recipe"; }; packageRequires = [ dash emacs ht org ]; meta = { @@ -28657,9 +37293,13 @@ license = lib.licenses.free; }; }) {}; - ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ox-twbs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ox-twbs"; + ename = "ox-twbs"; version = "1.1.1"; src = fetchFromGitHub { owner = "marsmining"; @@ -28667,10 +37307,10 @@ rev = "2414e6b1de7deb6dd2ae79a7be633fdccb9c2f28"; sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-twbs"; sha256 = "050rv270jlkc1v7wp47cv9cwr9pz3n840dd4jxxhfs6s47b9ln73"; - name = "ox-twbs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28678,9 +37318,13 @@ license = lib.licenses.free; }; }) {}; - pabbrev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pabbrev = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pabbrev"; + ename = "pabbrev"; version = "4.1"; src = fetchFromGitHub { owner = "phillord"; @@ -28688,10 +37332,10 @@ rev = "127a8b10cf352b0491fefd2f4178ba78ee587564"; sha256 = "073qpa223ja673p63mhvy4l6yyv3k7z05ifwvn7bmq4b5fq42hw6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c032b0d126e0196b4526ee04f5103582610681ea/recipes/pabbrev"; sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3"; - name = "pabbrev"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28699,20 +37343,25 @@ license = lib.licenses.free; }; }) {}; - package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + package-build = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "package-build"; - version = "1.2"; + ename = "package-build"; + version = "2.2"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "d6f926e3688d1c8d3c9d06cbfdd5a31f85accf00"; - sha256 = "072dlzskl0w4xcnrzgy36gzn4sla4hw84yr82rv04akb9mg4ya9m"; + rev = "9aac3517bde14346eadbe2c7d354672a456b9db3"; + sha256 = "0wa7d5vzxql499knlpbs07l5mw7kmxgwzv63i42arm1sqfplq5df"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; sha256 = "0kr82j9rbvmapsph0jdxy24p0b8mcnj01sg1myywf428nf30cgbh"; - name = "package-build"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -28720,20 +37369,26 @@ license = lib.licenses.free; }; }) {}; - package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + package-lint = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "package-lint"; + ename = "package-lint"; version = "0.5"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "1cee5135bd9a12e1b28e515a28093a751b4f7dd1"; - sha256 = "1qvvdr5wx37x5jrw4hkx5vl4jmi3l1bjn97nnvwlsmzi6sgkcwsr"; + rev = "f3ad224da996126873ee75484caafa874476ace6"; + sha256 = "03hgzm1d8srimkp9qpb3xi6sh8rvkdwkv7mr005fzhax6awd5a2h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; sha256 = "0w7nkj4yz5yqmhr3mr7kxa6aqqfs75m3l2578s39940a5sdzirwy"; - name = "package-lint"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -28741,9 +37396,13 @@ license = lib.licenses.free; }; }) {}; - package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + package-plus = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "package-plus"; + ename = "package+"; version = "1.1.0"; src = fetchFromGitHub { owner = "zenspider"; @@ -28751,10 +37410,10 @@ rev = "4a9618a44ec4f26a14e0136cd9d3c4855fceb25b"; sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49cfbbc4535aa7e175aa819d67b8aa52a6f94384/recipes/package+"; sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn"; - name = "package-plus"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28762,9 +37421,15 @@ license = lib.licenses.free; }; }) {}; - package-safe-delete = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + package-safe-delete = callPackage ({ emacs + , epl + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "package-safe-delete"; + ename = "package-safe-delete"; version = "0.1.7"; src = fetchFromGitHub { owner = "Fanael"; @@ -28772,10 +37437,10 @@ rev = "138171e4fc03c0ef05a8260cbb5cd2e114c1c194"; sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61b961211276bd95655b6a0967eda5037a3d240b/recipes/package-safe-delete"; sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw"; - name = "package-safe-delete"; + name = "recipe"; }; packageRequires = [ emacs epl ]; meta = { @@ -28783,20 +37448,25 @@ license = lib.licenses.free; }; }) {}; - package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restart-emacs }: - melpaBuild { + package-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , restart-emacs }: + melpaBuild { pname = "package-utils"; - version = "1.0.0"; + ename = "package-utils"; + version = "1.0.1"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "652531caf1a1df916d2185e7f47085bd0509c940"; - sha256 = "0lmz4szrfs2445q8nyqnh9hgm69bwdf7q78sfqyxiw1fqaj205si"; + rev = "5621b95c56b55499f0463fd8b29501da25d861bd"; + sha256 = "1mhsf0l0253d9b7n3c68mw5kwnsk7wf217y7m2fiybh51bdgjfnd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r"; - name = "package-utils"; + name = "recipe"; }; packageRequires = [ restart-emacs ]; meta = { @@ -28804,20 +37474,25 @@ license = lib.licenses.free; }; }) {}; - packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + packed = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "packed"; + ename = "packed"; version = "3.0.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "packed"; - rev = "c41c3dfda86ae33832ffc146923e2a4675cbacfa"; - sha256 = "1272xmb3l8ddfijqzci3x0kxwibqb0sbkci4rbcv9ba9hpxp4d1v"; + rev = "788ea94bff319d6a776954c32cff1de8b400f051"; + sha256 = "1sga68hf6zf5j8sb56zqy35p5gn6x7c12m6h8q1gzazfy7xz57p0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd"; - name = "packed"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28825,9 +37500,13 @@ license = lib.licenses.free; }; }) {}; - page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + page-break-lines = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "page-break-lines"; + ename = "page-break-lines"; version = "0.11"; src = fetchFromGitHub { owner = "purcell"; @@ -28835,10 +37514,10 @@ rev = "67b5928a7f14568baf2716b5741e13659a86b9ea"; sha256 = "1wp974716ih2cz9kdmdz7xwjy1qnnfzdzlfr9kchknagw8d9nn12"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines"; sha256 = "0i5kx191wnq9763jyqxbyh33hvdaqbd98a1rhgqd97zhvg0hslz1"; - name = "page-break-lines"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28846,9 +37525,17 @@ license = lib.licenses.free; }; }) {}; - pallet = callPackage ({ cask, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + pallet = callPackage ({ cask + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "pallet"; + ename = "pallet"; version = "0.9.2"; src = fetchFromGitHub { owner = "rdallasgray"; @@ -28856,10 +37543,10 @@ rev = "0e1ae11e1ebfe644cbf832df62ac2dbf6ecd0501"; sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf977287e9bd668efbd972c9937906384ee832c6/recipes/pallet"; sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7"; - name = "pallet"; + name = "recipe"; }; packageRequires = [ cask dash f s ]; meta = { @@ -28867,20 +37554,25 @@ license = lib.licenses.free; }; }) {}; - panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + panda-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "panda-theme"; + ename = "panda-theme"; version = "0.1"; src = fetchFromGitHub { owner = "jamiecollinson"; repo = "emacs-panda-theme"; - rev = "ae24179e7a8a9667b169f00dbd891257530c1d22"; - sha256 = "05vv4idl9h59jd089hpd09xcy1ix30bq0c4fif2b66170aychvii"; + rev = "4016c16709889ca974bc194c039523b85c29c903"; + sha256 = "1kfg8dswg9hp07mcafz6s78md31wyn03r3pzz1jvysnlfdg9ak7c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme"; sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7"; - name = "panda-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28888,20 +37580,25 @@ license = lib.licenses.free; }; }) {}; - pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pandoc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pandoc"; + ename = "pandoc"; version = "0.0.1"; src = fetchFromGitHub { owner = "zonuexe"; repo = "pandoc.el"; - rev = "0f59533bbd8494fea3172551efb6ec49f61ba285"; - sha256 = "0xqd64k8liaywsf65apj5xmf7ip6sikjmpc4740nld8iywhq8gf4"; + rev = "d45e35c917d9d775c05747d9feb49a1a831ad831"; + sha256 = "15ks8wlaj6n50cqmvw48pz191ha96krfwd38ygwq0kk1nm7y1y8g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c21ff09d67fad2658e0de08bc2edb7588c504a/recipes/pandoc"; sha256 = "0x81anxam7agr2v2zqgc331zs5s5zxcw54kzpanndda23n51h5cc"; - name = "pandoc"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -28909,20 +37606,26 @@ license = lib.licenses.free; }; }) {}; - pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: - melpaBuild { + pandoc-mode = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild }: + melpaBuild { pname = "pandoc-mode"; - version = "2.23"; + ename = "pandoc-mode"; + version = "2.25"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "58f893d54c0916ad832097a579288ef8ce405da5"; - sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i"; + rev = "436a5847df3326436ec546dbb360d23c8e0e2030"; + sha256 = "0qvfhgwvzfchzg2ap62f3giw0fnbapb2w67j3allpcra34qpnszd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781"; - name = "pandoc-mode"; + name = "recipe"; }; packageRequires = [ dash hydra ]; meta = { @@ -28930,9 +37633,13 @@ license = lib.licenses.free; }; }) {}; - pangu-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pangu-spacing = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pangu-spacing"; + ename = "pangu-spacing"; version = "0.4"; src = fetchFromGitHub { owner = "coldnew"; @@ -28940,10 +37647,10 @@ rev = "034b4ef8a1b29bf7bfed6a916380941506ed26ed"; sha256 = "0gmdzagyg0p7q1gyj2a3aqp2g4asljpib3n67nikr0v99c2mki5y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0b00eda1d20ff2cbffe3ac606e5fd60d915a5d6/recipes/pangu-spacing"; sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8"; - name = "pangu-spacing"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28951,20 +37658,29 @@ license = lib.licenses.free; }; }) {}; - paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: - melpaBuild { + paradox = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , hydra + , let-alist + , lib + , melpaBuild + , seq + , spinner }: + melpaBuild { pname = "paradox"; + ename = "paradox"; version = "2.5.2"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245"; - sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r"; + rev = "17a6690d42a1e854ec270ed930c7494077570fc8"; + sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2"; - name = "paradox"; + name = "recipe"; }; packageRequires = [ emacs hydra let-alist seq spinner ]; meta = { @@ -28972,18 +37688,23 @@ license = lib.licenses.free; }; }) {}; - paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + paredit = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "paredit"; + ename = "paredit"; version = "24"; src = fetchgit { url = "https://mumble.net/~campbell/git/paredit.git"; rev = "82bb75ceb2ddc272d6618d94874b7fc13181a409"; sha256 = "13wzz5fahbz5svc4ql3ajzzpd1fv0ynwpa5widklbcp5yqncv1vm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit"; sha256 = "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653"; - name = "paredit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -28991,9 +37712,14 @@ license = lib.licenses.free; }; }) {}; - paredit-everywhere = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: - melpaBuild { + paredit-everywhere = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , paredit }: + melpaBuild { pname = "paredit-everywhere"; + ename = "paredit-everywhere"; version = "0.4"; src = fetchFromGitHub { owner = "purcell"; @@ -29001,10 +37727,10 @@ rev = "72b7cd5dcdc02233a32e9f1a6c2d21dc30532170"; sha256 = "0jbjwjl92pf0kih3p2x20ms2kpyzzam8fir661nimpmk802ahgkj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/593890222d074c6a308eb1b809077c6861e1af30/recipes/paredit-everywhere"; sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36"; - name = "paredit-everywhere"; + name = "recipe"; }; packageRequires = [ paredit ]; meta = { @@ -29012,20 +37738,24 @@ license = lib.licenses.free; }; }) {}; - paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + paren-face = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "paren-face"; + ename = "paren-face"; version = "1.0.4"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "a45d111153a76c481fa0b36d6172ac90e073dfc4"; - sha256 = "1cr0vnm57lxs48z17ddcv7qlfvks7wdsp01zsw0c7i3h5ajl8myp"; + rev = "42b2141b5427bc78d640229821b2b8053e6743d2"; + sha256 = "1f1srk4100rsc7i6257q460g4ykmqx4fwrpgb57dlp83d3342c6h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf"; - name = "paren-face"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29033,9 +37763,13 @@ license = lib.licenses.free; }; }) {}; - parent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + parent-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "parent-mode"; + ename = "parent-mode"; version = "2.3"; src = fetchFromGitHub { owner = "Fanael"; @@ -29043,10 +37777,10 @@ rev = "db692cf08deff2f0e973e6e86e26662b44813d1b"; sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9736d8f6c3065c46b8c4e0056e9d592d3ec973e9/recipes/parent-mode"; sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig"; - name = "parent-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29054,9 +37788,15 @@ license = lib.licenses.free; }; }) {}; - parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + parinfer = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "parinfer"; + ename = "parinfer"; version = "0.4.10"; src = fetchFromGitHub { owner = "DogLooksGood"; @@ -29064,10 +37804,10 @@ rev = "5b3b247d68eeaf7404598cbcbf2158e07f16e65d"; sha256 = "0v97ncb0w1slb0x8861l3yr1kqz6fgw1fwl1z9lz6hh8p2ih34sk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; sha256 = "05w4w7j6xyj19dm63073amd4n7fw4zm3qnn4x02fk2011iw8fq7i"; - name = "parinfer"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -29075,9 +37815,14 @@ license = lib.licenses.free; }; }) {}; - parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + parsebib = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "parsebib"; + ename = "parsebib"; version = "2.3.2"; src = fetchFromGitHub { owner = "joostkremers"; @@ -29085,10 +37830,10 @@ rev = "c8d59deb20552f9a1885297b5ae0b8f753d191a5"; sha256 = "1b1iiiy184czp014gg1bb3jks9frmkw8hs5z2l2lnzjmfjr6jm6g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd"; - name = "parsebib"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29096,9 +37841,15 @@ license = lib.licenses.free; }; }) {}; - parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + parsec = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "parsec"; + ename = "parsec"; version = "0.1.3"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -29106,10 +37857,10 @@ rev = "8f0c266d8b9b0ee5fcf9b80c518644b2849ff3b3"; sha256 = "1zwdh3dwqvw9z79mxgf9kf1l2c0pb32sknhrs7ppca613nk9c58j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; sha256 = "1p3364sv5r868xjj1411xqj4acxqmbzcdl900sd03585ql5wbypj"; - name = "parsec"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -29117,9 +37868,43 @@ license = lib.licenses.free; }; }) {}; - pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: - melpaBuild { + parseclj = callPackage ({ a + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "parseclj"; + ename = "parseclj"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "clojure-emacs"; + repo = "parseclj"; + rev = "93a0f43529598984835f88e64b62fa68bebda89b"; + sha256 = "03bm5dm4hmkqimv4wqxjjh5814pxysmm7z54bv2rf7zwv1x7dggr"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a977779a7ee49f57b849b14e581210a7f47d61/recipes/parseclj"; + sha256 = "077qigx0qyjyvm3437ffnv05rmnpqxvpxf69yyfdgnay1xclv172"; + name = "recipe"; + }; + packageRequires = [ a emacs ]; + meta = { + homepage = "https://melpa.org/#/parseclj"; + license = lib.licenses.free; + }; + }) {}; + pass = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , password-store }: + melpaBuild { pname = "pass"; + ename = "pass"; version = "1.7"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -29127,10 +37912,10 @@ rev = "2ccf4f68fa4d2aab7efbdc26ebdc45ac1ef1819c"; sha256 = "11b8c0qihgkl46hjqx6g1p1ifd7lc3q7jhqds3gr41zsrnlyi3p8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr"; - name = "pass"; + name = "recipe"; }; packageRequires = [ emacs f password-store ]; meta = { @@ -29138,41 +37923,52 @@ license = lib.licenses.free; }; }) {}; - passmm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + passmm = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , password-store }: + melpaBuild { pname = "passmm"; - version = "0.2.0"; + ename = "passmm"; + version = "0.3.1"; src = fetchFromGitHub { owner = "pjones"; repo = "passmm"; - rev = "983fc8e3e6d24bb8088e2e89254ecd5e03db787d"; - sha256 = "1mcxfk3yqhxslsjl3j25n87di5i2a3v9rk1cj1vnf46695s2fk38"; + rev = "2e0cd4e8ef7e6017dbc295664c925d32d6fdc688"; + sha256 = "0f2nkmbphmrnfkx4yw7w0ch33kpdzqjalah2pf6nj0rm629b1dad"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae2a1e10375f9cd55d19502c9740b2737eba209/recipes/passmm"; sha256 = "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b"; - name = "passmm"; + name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs password-store ]; meta = { homepage = "https://melpa.org/#/passmm"; license = lib.licenses.free; }; }) {}; - passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + passthword = callPackage ({ cl-lib ? null + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "passthword"; + ename = "passthword"; version = "1.4"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "pidu"; repo = "passthword"; rev = "58a91defdbeec9014b4e46f909a7411b3a627285"; sha256 = "1g0mvg9i8f2qccb4b0m4d74zkjx9gjfv47x57by6cdaf9yywqryi"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/399bb6d6e36ca4c1e54566e66d7065fe1011f99c/recipes/passthword"; - sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn"; - name = "passthword"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/passthword"; + sha256 = "19zv80kidb6a3985n3zij507hvffcxhcvlfxd01gwx64wvfc0c3c"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -29180,30 +37976,45 @@ license = lib.licenses.free; }; }) {}; - password-store = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + password-store = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , with-editor }: + melpaBuild { pname = "password-store"; - version = "1.7.1"; + ename = "password-store"; + version = "1.7.2"; src = fetchFromGitHub { owner = "zx2c4"; repo = "password-store"; - rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf"; - sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87"; + rev = "65cead8c0fdb07ce3821f6b97bdcb32684d0c3f7"; + sha256 = "0rm364l9mg2gl16ng5zd02gkfq8592mhrp81sk1v0wwh8wlyrzrh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; sha256 = "03r8j14l12yc42b51fzvn1jh8j85nyl1rg6c80r0a7ihwkj27jv6"; - name = "password-store"; + name = "recipe"; }; - packageRequires = [ f s ]; + packageRequires = [ emacs f s with-editor ]; meta = { homepage = "https://melpa.org/#/password-store"; license = lib.licenses.free; }; }) {}; - password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }: - melpaBuild { + password-store-otp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , password-store + , s }: + melpaBuild { pname = "password-store-otp"; + ename = "password-store-otp"; version = "0.1.5"; src = fetchFromGitHub { owner = "volrath"; @@ -29211,10 +38022,10 @@ rev = "a39a64a91de36e87b852339635bd3c5fb0e32441"; sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp"; sha256 = "0m3n4gjf6hmcs2kg80h1whzbl74zsj79ihliyqfcdfc4v31m32sg"; - name = "password-store-otp"; + name = "recipe"; }; packageRequires = [ emacs password-store s ]; meta = { @@ -29222,20 +38033,24 @@ license = lib.licenses.free; }; }) {}; - pastehub = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pastehub = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pastehub"; + ename = "pastehub"; version = "0.5.2"; src = fetchFromGitHub { owner = "kiyoka"; repo = "pastehub"; - rev = "37b045c67659c078f1517d0fbd5282dab58dca23"; - sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n"; + rev = "3cc5dcb87104f3b4320a6d7fa20fa7340e6b7026"; + sha256 = "0wbb5689n9k351gf3s9mqr3bi00lpajk0h1k9gx1b2mdbb7lq7xd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb8645a9880c586ef2ad16f3a4e61ba76176c224/recipes/pastehub"; sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v"; - name = "pastehub"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29243,9 +38058,14 @@ license = lib.licenses.free; }; }) {}; - pastelmac-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pastelmac-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pastelmac-theme"; + ename = "pastelmac-theme"; version = "1.0"; src = fetchFromGitHub { owner = "bmastenbrook"; @@ -29253,10 +38073,10 @@ rev = "bead21741e3f46f6506e8aef4469d4240a819389"; sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7151773de39fe570e3e9b351daad89db9dd267f/recipes/pastelmac-theme"; sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f"; - name = "pastelmac-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29264,9 +38084,15 @@ license = lib.licenses.free; }; }) {}; - pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + pastery = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "pastery"; + ename = "pastery"; version = "0.2.1"; src = fetchFromGitHub { owner = "diasbruno"; @@ -29274,10 +38100,10 @@ rev = "4493be98b743b4d062cb4e00760125e394a55022"; sha256 = "0bmm18d84lrkclg4md46k1ma03w7a97s10hrvjcm9yj8xbrjqqsc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery"; sha256 = "006qawjc86spbbs2pxvhg9w94rcsxap577cndqwaiw1k0cc8vkhp"; - name = "pastery"; + name = "recipe"; }; packageRequires = [ emacs request ]; meta = { @@ -29285,9 +38111,13 @@ license = lib.licenses.free; }; }) {}; - pathify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pathify = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pathify"; + ename = "pathify"; version = "0.1"; src = fetchFromGitHub { owner = "alezost"; @@ -29295,10 +38125,10 @@ rev = "335332a900717ae01bde5ccb8f3dc97a5350f123"; sha256 = "1brdyrp2sz1pszdfr6f4w94qxk5lrd6kphc1xa5pywfns14c9386"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/459460c977b9cf033e22937899ad380e01efcf11/recipes/pathify"; sha256 = "1z970xnzbhmfikj1rkfx24jvwc7f1xxw6hk7kmahxvphjxrvgc2f"; - name = "pathify"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29306,9 +38136,15 @@ license = lib.licenses.free; }; }) {}; - paxedit = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: - melpaBuild { + paxedit = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , paredit }: + melpaBuild { pname = "paxedit"; + ename = "paxedit"; version = "1.1.8"; src = fetchFromGitHub { owner = "promethial"; @@ -29316,10 +38152,10 @@ rev = "644eb7036a475fbcba4de5d46d6940b1e8ef33cd"; sha256 = "0jmhr658cczblag8knr8j77q58yj268rkhh5dmga66l0sb30wb21"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/106b272c2f0741d21d31a0ddfa4f521c575559c1/recipes/paxedit"; sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic"; - name = "paxedit"; + name = "recipe"; }; packageRequires = [ cl-lib paredit ]; meta = { @@ -29327,9 +38163,14 @@ license = lib.licenses.free; }; }) {}; - pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pcache = callPackage ({ eieio ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pcache"; + ename = "pcache"; version = "0.4.2"; src = fetchFromGitHub { owner = "sigma"; @@ -29337,10 +38178,10 @@ rev = "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740"; sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcache"; sha256 = "0wwx20x6gzlli3hh4zd9pfv2cmqfm38xbl9p4vsgy08q1rm5agva"; - name = "pcache"; + name = "recipe"; }; packageRequires = [ eieio ]; meta = { @@ -29348,9 +38189,15 @@ license = lib.licenses.free; }; }) {}; - pcomplete-extension = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pcomplete-extension = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pcomplete-extension"; + ename = "pcomplete-extension"; version = "1.0"; src = fetchFromGitHub { owner = "thierryvolpiatto"; @@ -29358,10 +38205,10 @@ rev = "839740c90de857e18db2f578d6660951522faab5"; sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6cb8a938418f84a5b0ede92e84a516f38e4b1011/recipes/pcomplete-extension"; sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc"; - name = "pcomplete-extension"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -29369,20 +38216,26 @@ license = lib.licenses.free; }; }) {}; - pcre2el = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pcre2el = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pcre2el"; + ename = "pcre2el"; version = "1.8"; src = fetchFromGitHub { owner = "joddie"; repo = "pcre2el"; - rev = "166a10472002010692dbc35f323ffb8110a294c5"; - sha256 = "1dpfhrxbaqpgjzac3m9hclbzlnrxq9b8bx6za53aqvml72yzxc6i"; + rev = "3eba762d3a9619496d7ef2929d95117040ca93fa"; + sha256 = "0m76flv62z6f167hlw5lmnzrwyzj412vfpgcw1lrla2l7mjv011z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f04a25e467cc4c7d9a263330a7a1a53d67c6eb9b/recipes/pcre2el"; sha256 = "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3"; - name = "pcre2el"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -29390,9 +38243,13 @@ license = lib.licenses.free; }; }) {}; - pcsv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pcsv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pcsv"; + ename = "pcsv"; version = "1.3.6"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -29400,10 +38257,10 @@ rev = "91599aaba70a8e8593fa2f36165af82cbd35e41e"; sha256 = "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80ffaf99b2a4566a3f9d0309cd7b63f563f3826e/recipes/pcsv"; sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl"; - name = "pcsv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29411,9 +38268,16 @@ license = lib.licenses.free; }; }) {}; - pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: - melpaBuild { + pdf-tools = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , tablist }: + melpaBuild { pname = "pdf-tools"; + ename = "pdf-tools"; version = "0.80"; src = fetchFromGitHub { owner = "politza"; @@ -29421,10 +38285,10 @@ rev = "920e598c1ec6eb9a48dde32282d10adc9cc3b011"; sha256 = "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw"; - name = "pdf-tools"; + name = "recipe"; }; packageRequires = [ emacs let-alist tablist ]; meta = { @@ -29432,9 +38296,13 @@ license = lib.licenses.free; }; }) {}; - peg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + peg = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "peg"; + ename = "peg"; version = "0.6"; src = fetchFromGitHub { owner = "ellerh"; @@ -29442,10 +38310,10 @@ rev = "081efeca91d790c7fbc90871ac22c40935f4833b"; sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b9b55a02e903ae7e75f8b636fdb1cf907c5db7c/recipes/peg"; sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm"; - name = "peg"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29453,19 +38321,24 @@ license = lib.licenses.free; }; }) {}; - pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + pelican-mode = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pelican-mode"; + ename = "pelican-mode"; version = "20170808"; src = fetchgit { url = "https://git.korewanetadesu.com/pelican-mode.git"; rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c"; sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi"; - name = "pelican-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29473,8 +38346,12 @@ license = lib.licenses.free; }; }) {}; - per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + per-buffer-theme = callPackage ({ cl-lib ? null + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "per-buffer-theme"; version = "1.5"; src = fetchhg { @@ -29482,7 +38359,7 @@ rev = "9e6200da91b3"; sha256 = "0w02l91x624cgzdg33a9spgcwy12m607dsfnr1xbc1fi08np4sd1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/per-buffer-theme"; sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn"; name = "per-buffer-theme"; @@ -29493,20 +38370,25 @@ license = lib.licenses.free; }; }) {}; - persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + persistent-scratch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "persistent-scratch"; - version = "0.3"; + ename = "persistent-scratch"; + version = "0.3.1"; src = fetchFromGitHub { owner = "Fanael"; repo = "persistent-scratch"; - rev = "551c655fa349e6f48e4e29f427fff7594f76ac1d"; - sha256 = "1iqfr8s4cvnnmqw5yxyr6b6nghbsc95mgjlc61qxa8wa1mpv31rz"; + rev = "0bfd717d28ce9e262741b06341c61306602c7711"; + sha256 = "1fq3m3p81rrvv1yp0cxfznphx7gava11sn09x706lmm1js62jnip"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch"; sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1"; - name = "persistent-scratch"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29514,9 +38396,15 @@ license = lib.licenses.free; }; }) {}; - persistent-soft = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache }: - melpaBuild { + persistent-soft = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , list-utils + , melpaBuild + , pcache }: + melpaBuild { pname = "persistent-soft"; + ename = "persistent-soft"; version = "0.8.10"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -29524,10 +38412,10 @@ rev = "a1e0ddf2a12a6f18cab565dee250f070384cbe02"; sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/persistent-soft"; sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc"; - name = "persistent-soft"; + name = "recipe"; }; packageRequires = [ list-utils pcache ]; meta = { @@ -29535,9 +38423,15 @@ license = lib.licenses.free; }; }) {}; - persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: - melpaBuild { + persp-fr = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , persp-mode }: + melpaBuild { pname = "persp-fr"; + ename = "persp-fr"; version = "0.0.3"; src = fetchFromGitHub { owner = "rocher"; @@ -29545,10 +38439,10 @@ rev = "4d2d1a75019f520742da79f1aeed9c4a960677e0"; sha256 = "1waakbmxwm0xdnl0iznyk61ccwdjvwv5g1naml31r7q0cnk0jfz8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr"; sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2"; - name = "persp-fr"; + name = "recipe"; }; packageRequires = [ emacs persp-mode ]; meta = { @@ -29556,9 +38450,13 @@ license = lib.licenses.free; }; }) {}; - persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + persp-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "persp-mode"; + ename = "persp-mode"; version = "2.9.6"; src = fetchFromGitHub { owner = "Bad-ptr"; @@ -29566,10 +38464,10 @@ rev = "1dfea0de788f6d25ee47b5c62ddbeaf9e8e92f06"; sha256 = "11ww8hg9p8qlmr8zpir0m5xzzbvd1faiqjx6vn4b05d4ll03rnhm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w"; - name = "persp-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29577,9 +38475,16 @@ license = lib.licenses.free; }; }) {}; - persp-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, perspective, projectile }: - melpaBuild { + persp-projectile = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , perspective + , projectile }: + melpaBuild { pname = "persp-projectile"; + ename = "persp-projectile"; version = "0.2.0"; src = fetchFromGitHub { owner = "bbatsov"; @@ -29587,10 +38492,10 @@ rev = "7686633acf44402fa90429759cca6a155e4df2b9"; sha256 = "0rqyzsmg32sdr4k9i2lf3jfyr9bskkl7gfb5ndl16iip9py7403z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/persp-projectile"; sha256 = "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm"; - name = "persp-projectile"; + name = "recipe"; }; packageRequires = [ cl-lib perspective projectile ]; meta = { @@ -29598,20 +38503,25 @@ license = lib.licenses.free; }; }) {}; - perspective = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + perspective = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "perspective"; - version = "1.12"; + ename = "perspective"; + version = "2.2"; src = fetchFromGitHub { owner = "nex3"; repo = "perspective-el"; - rev = "3a8d59045a6370fae1ec2011865190a7465d707f"; - sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q"; + rev = "8e2f122de408d7866136dd861d513a9575cf32e6"; + sha256 = "0pd5sqrrz6y3md20yh6ffy32jdcgb1gc9b4j14pm6r54bqxik68h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspective"; sha256 = "021ax1c2ys82dcjs5jl7b4nb83n6gax2imnpm030rcbihjl1lzm7"; - name = "perspective"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -29619,20 +38529,24 @@ license = lib.licenses.free; }; }) {}; - perspeen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + perspeen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "perspeen"; + ename = "perspeen"; version = "0.1"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "30ee14339cf8fe2e59e5384085afee3f8eb58dda"; - sha256 = "0mi7ipx0zg0vrm9da24i4j0300xj0dm3jjg35f466pm3a7xafrsg"; + rev = "4079e254d542876eaa7e37b3c4b77d4f6a0f4e16"; + sha256 = "1y54zlrrzc7h1kflvayhxnmh2xrv2nc708hd9m63h99li4xqcdzp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen"; sha256 = "0kwmllas9vnppsfaviy58d0nk4hmlqp566mfr4l53x46sybv1y04"; - name = "perspeen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29640,9 +38554,14 @@ license = lib.licenses.free; }; }) {}; - pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pfuture = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pfuture"; + ename = "pfuture"; version = "1.2"; src = fetchFromGitHub { owner = "Alexander-Miller"; @@ -29650,10 +38569,10 @@ rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb"; sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; sha256 = "15fr9wkpv8v1p22wz7hsyihq7f807ck105c2crfs8y7capfvs53s"; - name = "pfuture"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29661,9 +38580,14 @@ license = lib.licenses.free; }; }) {}; - ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ph = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ph"; + ename = "ph"; version = "0.1.0"; src = fetchFromGitHub { owner = "gromnitsky"; @@ -29671,10 +38595,10 @@ rev = "ed45c371642e313810b56c45af08fdfbd71a7dfe"; sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f62ca074ca2df780ab32aac50b2b828ee6a9934c/recipes/ph"; sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l"; - name = "ph"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -29682,20 +38606,27 @@ license = lib.licenses.free; }; }) {}; - phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + phan = callPackage ({ composer + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "phan"; - version = "0.0.3"; + ename = "phan"; + version = "0.0.4"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phan.el"; - rev = "17b44a62580272bcf5ee91fb58098292e9de6f83"; - sha256 = "002qak8jlim6pjj3ckikzzcc6n40mcqd5qvzakazi1q01z1ffsnd"; + rev = "6b077b3421a0b2c0b98a6906b8ab0d14d9d7bf50"; + sha256 = "1af4pam149dgxqzwqkjklxxqq2n8fg3l1b9w6bmaw24lx1pdxcyv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan"; sha256 = "17ar6nxy0plx5li49kgf4f0h99wwmnnp5kwmpf34jg9ygyhaglvb"; - name = "phan"; + name = "recipe"; }; packageRequires = [ composer emacs f ]; meta = { @@ -29703,9 +38634,13 @@ license = lib.licenses.free; }; }) {}; - phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + phi-search = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "phi-search"; + ename = "phi-search"; version = "20160630"; src = fetchFromGitHub { owner = "zk-phi"; @@ -29713,10 +38648,10 @@ rev = "40b86bfe9ae15377fbee842b1de3d93c2eb7dd69"; sha256 = "10kyq3lkhmbmj1hl9awzc0w8073dn9mbjd5skh660ljg5mmi6x62"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0274300c33f19ca6f868e1d570ffee513dbdf7/recipes/phi-search"; sha256 = "0nj06ixl76dd80zg83q4bi8k224mcwb612mr4gd1xppj5k8xl03g"; - name = "phi-search"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29724,9 +38659,15 @@ license = lib.licenses.free; }; }) {}; - phi-search-mc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, phi-search }: - melpaBuild { + phi-search-mc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multiple-cursors + , phi-search }: + melpaBuild { pname = "phi-search-mc"; + ename = "phi-search-mc"; version = "2.2.1"; src = fetchFromGitHub { owner = "knu"; @@ -29734,10 +38675,10 @@ rev = "4c6d2d39feb502febb81fc98b7b5854d88150c69"; sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83cf3fa3736eb2583dcf6bca16b9acb89e3408a3/recipes/phi-search-mc"; sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8"; - name = "phi-search-mc"; + name = "recipe"; }; packageRequires = [ multiple-cursors phi-search ]; meta = { @@ -29745,20 +38686,26 @@ license = lib.licenses.free; }; }) {}; - php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }: - melpaBuild { + php-auto-yasnippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , php-mode + , yasnippet }: + melpaBuild { pname = "php-auto-yasnippets"; + ename = "php-auto-yasnippets"; version = "2.3.1"; src = fetchFromGitHub { - owner = "ejmr"; + owner = "emacs-php"; repo = "php-auto-yasnippets"; rev = "1950d83cbcc5c5d62cd3bc432e1595870fe8cabf"; sha256 = "0zs11811kx6x1zgc1icd8gw420saa7z6zshpzmrddnbznya4qql6"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d47ca8cd5900a80a2ede1b354547addf9b2bbbac/recipes/php-auto-yasnippets"; - sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn"; - name = "php-auto-yasnippets"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28b2d8802f98e339ff01ecf9733b71b6c631123e/recipes/php-auto-yasnippets"; + sha256 = "047i51ks2nn7ydrx2hjx9qvsh3lxnyxp8a6c3h3nb1acy84f5bd1"; + name = "recipe"; }; packageRequires = [ php-mode yasnippet ]; meta = { @@ -29766,20 +38713,25 @@ license = lib.licenses.free; }; }) {}; - php-cs-fixer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + php-cs-fixer = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "php-cs-fixer"; - version = "1.0beta4"; + ename = "php-cs-fixer"; + version = "1.0.-2.4"; src = fetchFromGitHub { owner = "OVYA"; repo = "php-cs-fixer"; - rev = "ca2c075a22ad156c336d2aa093fb6394c9f6c112"; - sha256 = "1axjfsfasg7xyq5ax2bx7rh2mgf8caw5bh858hhp1gk9xvi21qhx"; + rev = "2e28b82d192c6f420ecb8cbef04256f3c9c47c4b"; + sha256 = "1lh37z4z09nz4wfp8ly94dwrmjsqpg6phw5r8y4gjhfnfbgpq4b9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3631c4b81c1784995ae9e74d832e301d79214e2/recipes/php-cs-fixer"; sha256 = "1xvz6v1fwngi2rizrx5sf0wrs4cy8rb13467r26k8hb7z8h1rqmf"; - name = "php-cs-fixer"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -29787,20 +38739,26 @@ license = lib.licenses.free; }; }) {}; - php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + php-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "php-mode"; - version = "1.19.0"; + ename = "php-mode"; + version = "1.19.1"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "c68013a583e2f0bd0792e0988ff9ce3e6deae531"; - sha256 = "0ycqf8fr3f4flgww9ffiga2hkj8l6ikcdj93iafp7qxqs1bzjxfl"; + rev = "aacb133b3d89ed0da8d936a162f49afc2aa5dfd4"; + sha256 = "1al6l37377psiykk6syyyc3sfifr7x3mqyb2rms5kqqkff53x1yx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y"; - name = "php-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -29808,9 +38766,15 @@ license = lib.licenses.free; }; }) {}; - php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + php-runtime = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "php-runtime"; + ename = "php-runtime"; version = "0.1.0"; src = fetchFromGitHub { owner = "emacs-php"; @@ -29818,10 +38782,10 @@ rev = "fa4312863245511462b75cb31df2f8558288f4df"; sha256 = "1glwy0cgnn0z4rnd45pqy0bmyaddhxfjlj778hz7ghy40h9kqbdn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime"; sha256 = "0dvnwajrjsgyqzglzpkx9vwx3f55mrag6dsbdjqc9vvpvxhmgfwb"; - name = "php-runtime"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -29829,9 +38793,41 @@ license = lib.licenses.free; }; }) {}; - phpcbf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + phpactor = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "phpactor"; + ename = "phpactor"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "phpactor.el"; + rev = "fc301e6388332bb23162adaff2c59bb9214d66a4"; + sha256 = "1iy7pqs2p2h98kr4blnif577qbbyp7ldyrl20g6515k9g888fxab"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d67b98ecd541c227c011615f67d7a0890f5e1af3/recipes/phpactor"; + sha256 = "0w2iszi74y3s6rcn6p2ic545cg319y4jpy83npbh5m98y8jma84m"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/phpactor"; + license = lib.licenses.free; + }; + }) {}; + phpcbf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "phpcbf"; + ename = "phpcbf"; version = "0.9.2"; src = fetchFromGitHub { owner = "nishimaki10"; @@ -29839,10 +38835,10 @@ rev = "b556b548ceb061b002389d6165d2cc63d8bddb5d"; sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77ef54e3fb2715a081786dc54f99ae74def5c77c/recipes/phpcbf"; sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv"; - name = "phpcbf"; + name = "recipe"; }; packageRequires = [ s ]; meta = { @@ -29850,9 +38846,44 @@ license = lib.licenses.free; }; }) {}; - phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: - melpaBuild { + phpstan = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "phpstan"; + ename = "phpstan"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "phpstan.el"; + rev = "09102b062b607affc93f2d8a113a9fc9f9cf3016"; + sha256 = "0n21vyvd5c42v03xcfx94dz252z3s413i0f9pwjrssq2yd3x2bgm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/phpstan"; + sha256 = "0j3xb3h6fqgk0nv5mlfz7lgfkcy0z04an9qy8nq5y473hdj87qzm"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/phpstan"; + license = lib.licenses.free; + }; + }) {}; + phpunit = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , s }: + melpaBuild { pname = "phpunit"; + ename = "phpunit"; version = "0.16.0"; src = fetchFromGitHub { owner = "nlamirault"; @@ -29860,10 +38891,10 @@ rev = "a13706733f98be3639c47311fc820b3b50f4bc33"; sha256 = "0vfvybjinj0knim4ax0xspz7zr3n2y9ap1lvwqx1gwydr06w4jrl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit"; sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8"; - name = "phpunit"; + name = "recipe"; }; packageRequires = [ cl-lib emacs f pkg-info s ]; meta = { @@ -29871,9 +38902,14 @@ license = lib.licenses.free; }; }) {}; - pillar = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: - melpaBuild { + pillar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , makey + , melpaBuild }: + melpaBuild { pname = "pillar"; + ename = "pillar"; version = "1.0.0"; src = fetchFromGitHub { owner = "pillar-markup"; @@ -29881,20 +38917,50 @@ rev = "13a7f676544cc66005ccd8e6fc1c25e4ccd6f909"; sha256 = "19i8hgzr7kdj4skf0cnv6vlsklq9qcyxcv3p33k9vgq7y4f9mah8"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bff55f1182f3bd0bc8a8773921f703168d87de21/recipes/pillar"; - sha256 = "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js"; - name = "pillar"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bff55f1182f3bd0bc8a8773921f703168d87de21/recipes/pillar"; + sha256 = "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js"; + name = "recipe"; + }; + packageRequires = [ makey ]; + meta = { + homepage = "https://melpa.org/#/pillar"; + license = lib.licenses.free; + }; + }) {}; + pinboard-popular = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , loop + , melpaBuild }: + melpaBuild { + pname = "pinboard-popular"; + ename = "pinboard-popular"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "asimpson"; + repo = "pinboard-popular"; + rev = "df6f5928f1e5a614fb770f6f4b9aefe0bf4d1c25"; + sha256 = "1x3qaqj81w1wblkd4rd1b7nggmgnf6jahh3zh2p6nlr200fg52lq"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/094f63e451622571aac832b14221a0d5a96de9c5/recipes/pinboard-popular"; + sha256 = "0d9ng4mclnb9yfzh8wzz03fbhfxayns0dg31bdixkwvy2vk00rkf"; + name = "recipe"; }; - packageRequires = [ makey ]; + packageRequires = [ loop ]; meta = { - homepage = "https://melpa.org/#/pillar"; + homepage = "https://melpa.org/#/pinboard-popular"; license = lib.licenses.free; }; }) {}; - pinyin-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pinyin-search = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pinyin-search"; + ename = "pinyin-search"; version = "1.1.0"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -29902,10 +38968,10 @@ rev = "5895cccfa6b43263ee243c5642cc16dd9a69fb4e"; sha256 = "12jhdkgfck2a6d5jj65l9d98dm34gsyi0ya4h21dbbvz35zivz70"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03da6f02778f7fae77a00cdc420cfbafead6dec4/recipes/pinyin-search"; sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z"; - name = "pinyin-search"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29913,9 +38979,13 @@ license = lib.licenses.free; }; }) {}; - pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pinyinlib = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pinyinlib"; + ename = "pinyinlib"; version = "0.1.1"; src = fetchFromGitHub { owner = "cute-jumper"; @@ -29923,10 +38993,10 @@ rev = "39943d226c2a42a9013421a0b4b6d5d3696bf234"; sha256 = "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib"; sha256 = "0kv67qa3825fw64qimkph2b65pilrsx5730y4c7f7c1f8giz5vxr"; - name = "pinyinlib"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29934,9 +39004,14 @@ license = lib.licenses.free; }; }) {}; - pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pip-requirements = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pip-requirements"; + ename = "pip-requirements"; version = "0.5"; src = fetchFromGitHub { owner = "Wilfred"; @@ -29944,10 +39019,10 @@ rev = "93e0595f037e3a95c1c1cd6f00f7e052a9a25912"; sha256 = "016r7y5nfnx6iws3hq4xnyrcv00y6zmd453psxhivi896wb8szfq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5eaf6987f92070ccc33d3e28c6bb2b96f72ba1aa/recipes/pip-requirements"; sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz"; - name = "pip-requirements"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -29955,9 +39030,13 @@ license = lib.licenses.free; }; }) {}; - pixiv-novel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pixiv-novel-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pixiv-novel-mode"; + ename = "pixiv-novel-mode"; version = "0.0.3"; src = fetchFromGitHub { owner = "zonuexe"; @@ -29965,10 +39044,10 @@ rev = "4dd9caf749190fab8f0b33862b3894b635de46c5"; sha256 = "1wg8pcwd70ixn2bxh01934zl12ry4pgx3l9dccpbjdi40gira00d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92092c1c13c37520f98b952d40745aa062f062c1/recipes/pixiv-novel-mode"; sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px"; - name = "pixiv-novel-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -29976,9 +39055,14 @@ license = lib.licenses.free; }; }) {}; - pkg-info = callPackage ({ epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pkg-info = callPackage ({ epl + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pkg-info"; + ename = "pkg-info"; version = "0.6"; src = fetchFromGitHub { owner = "lunaryorn"; @@ -29986,10 +39070,10 @@ rev = "f9bb471ee95d1c5fe9adc6b0e98db2ddff3ddc0e"; sha256 = "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pkg-info"; sha256 = "1k23hmpcq534060qcxbrv4g6bw9nzcbjg192mbdp20kwidw7p81n"; - name = "pkg-info"; + name = "recipe"; }; packageRequires = [ epl ]; meta = { @@ -29997,9 +39081,13 @@ license = lib.licenses.free; }; }) {}; - pkgbuild-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pkgbuild-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pkgbuild-mode"; + ename = "pkgbuild-mode"; version = "0.14"; src = fetchFromGitHub { owner = "juergenhoetzel"; @@ -30007,10 +39095,10 @@ rev = "6bb7cb3b0599ac0ae3c1d8d5014aefc1ecff7965"; sha256 = "0a8qb1ldk6bjs7fpxgxrf90md7q46fhl71gmay8yafdkh6hn0kqr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/pkgbuild-mode"; sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x"; - name = "pkgbuild-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30018,20 +39106,25 @@ license = lib.licenses.free; }; }) {}; - plain-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + plain-theme = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "plain-theme"; + ename = "plain-theme"; version = "8"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "yegortimoshenko"; repo = "plain-theme"; rev = "2609a811335d58cfb73a65d6307c156fe09037d3"; sha256 = "0g5vl4xigdm2pn2mnkwgj1kxdjr66w7ynr77bchy3ij6qvzdzkqd"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; - sha256 = "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8"; - name = "plain-theme"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b147fb05a1b4296e1b85d31ba018d132a5bb5ed2/recipes/plain-theme"; + sha256 = "10qq7cy6hqh6c8qi796y9lk4wyyjbhdn1pvkcw3g29cfh857x50m"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -30039,9 +39132,13 @@ license = lib.licenses.free; }; }) {}; - plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + plantuml-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "plantuml-mode"; + ename = "plantuml-mode"; version = "1.2.5"; src = fetchFromGitHub { owner = "skuro"; @@ -30049,10 +39146,10 @@ rev = "5a2e8d0dd2ba9286fc3c82d8689d25050290f68d"; sha256 = "1gcv5gmps371wd2sjbq4g5p2yj2ip8lpn81lypwb5xavqa7gjhlv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode"; sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h"; - name = "plantuml-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30060,9 +39157,14 @@ license = lib.licenses.free; }; }) {}; - platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + platformio-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "platformio-mode"; + ename = "platformio-mode"; version = "0.2.2"; src = fetchFromGitHub { owner = "ZachMassia"; @@ -30070,10 +39172,10 @@ rev = "470a80c1d764a6e1680a2b41ca5a847869a07a27"; sha256 = "1nznbkl06cdq4pyqmvkp9jynsjibn0fd6ai4mggz6ggcwzcixbf0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/platformio-mode"; sha256 = "1v1pp3365wj19a5wmsxyyy5n548z3lmcbm2pwl914wip3ca7546f"; - name = "platformio-mode"; + name = "recipe"; }; packageRequires = [ projectile ]; meta = { @@ -30081,9 +39183,16 @@ license = lib.licenses.free; }; }) {}; - play-crystal = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + play-crystal = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "play-crystal"; + ename = "play-crystal"; version = "0.1.2"; src = fetchFromGitHub { owner = "veelenga"; @@ -30091,10 +39200,10 @@ rev = "86b54346e7c832c14f8e5654a462f6490a6b11d7"; sha256 = "0kvkr24f8r21pahm2lsvbr9bg53770wxwpdfmmjljs2zmgxf2c40"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92715977136afa731e85e894542dc88b664b3304/recipes/play-crystal"; sha256 = "1jqf36b1mhyf4j7fs386g6isy09q7k8zwdc4rb34mhjg1a56gcnf"; - name = "play-crystal"; + name = "recipe"; }; packageRequires = [ dash emacs request ]; meta = { @@ -30102,9 +39211,13 @@ license = lib.licenses.free; }; }) {}; - play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + play-routes-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "play-routes-mode"; + ename = "play-routes-mode"; version = "1.0"; src = fetchFromGitHub { owner = "brocode"; @@ -30112,10 +39225,10 @@ rev = "d7eb682cd474d90b3a3d005290cd6d4fe9f94cae"; sha256 = "0slfaclbhjm5paw8l7rr3y9xxjyhkizp9lwyvlgpkd38n4pgj2bx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode"; sha256 = "17phqil2zf5rfvhs5v743dh4lix4v2azbf33z9n97ahs7j66y2gz"; - name = "play-routes-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30123,9 +39236,13 @@ license = lib.licenses.free; }; }) {}; - plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + plenv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "plenv"; + ename = "plenv"; version = "0.32"; src = fetchFromGitHub { owner = "karupanerura"; @@ -30133,10 +39250,10 @@ rev = "ee937d0f3a1a7ba2d035f45be896d3ed8fefaee2"; sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0819979b9567ac5fab9ed6821eba8fe7ee6a299/recipes/plenv"; sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4"; - name = "plenv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30144,9 +39261,16 @@ license = lib.licenses.free; }; }) {}; - plsense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + plsense = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "plsense"; + ename = "plsense"; version = "0.4.7"; src = fetchFromGitHub { owner = "aki2o"; @@ -30154,10 +39278,10 @@ rev = "f6fb22607a5252b2556d2e7fa14f1bcab5d9747a"; sha256 = "0f00dv5jwbhs99j4jc6lvr5n0mv1y80yg7zpp6yrmhww6829l5rg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb1025f146514e9c142cd96cac9f2989d6d1a8c5/recipes/plsense"; sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va"; - name = "plsense"; + name = "recipe"; }; packageRequires = [ auto-complete log4e yaxception ]; meta = { @@ -30165,9 +39289,17 @@ license = lib.licenses.free; }; }) {}; - plsense-direx = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, plsense, yaxception }: - melpaBuild { + plsense-direx = callPackage ({ direx + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , plsense + , yaxception }: + melpaBuild { pname = "plsense-direx"; + ename = "plsense-direx"; version = "0.2.0"; src = fetchFromGitHub { owner = "aki2o"; @@ -30175,10 +39307,10 @@ rev = "8a2f465264c74e04524cc789cdad0190ace43f6c"; sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/65fb1d8b4ed12f097958842d1b00dcdf3660b184/recipes/plsense-direx"; sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j"; - name = "plsense-direx"; + name = "recipe"; }; packageRequires = [ direx log4e plsense yaxception ]; meta = { @@ -30186,9 +39318,14 @@ license = lib.licenses.free; }; }) {}; - plur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + plur = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "plur"; + ename = "plur"; version = "0.1"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -30196,10 +39333,10 @@ rev = "5bdd3b9a2f0624414bd596e798644713cd1545f0"; sha256 = "0qlxj19hj96l4lw81xh5r14ppf6kp63clikk060s9yw00q7gnl6a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38f6f53fcd1186efd5e6752166da4e23b712cdb1/recipes/plur"; sha256 = "0nf1dc7xf2zp316rssnz8sv374akcr54hp0rb219qvgyck9bdqiv"; - name = "plur"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -30207,18 +39344,23 @@ license = lib.licenses.free; }; }) {}; - po-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + po-mode = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "po-mode"; + ename = "po-mode"; version = "0.19.8.1"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "c737bf843616ca984c9416048a2da845e9ad3f50"; - sha256 = "0hlvnq3cigpb8f4yxy2llcmmn0b38prlb1awwy6zl5fwwi9ksrwk"; + rev = "7fa0c2779d7de8a263271abfbe684185dbf6898b"; + sha256 = "1w154dzp98kjqsid4g0jq7cnpm4mivgffgjks6gr89dssq9qc3yh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w"; - name = "po-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30226,9 +39368,51 @@ license = lib.licenses.free; }; }) {}; - pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: - melpaBuild { + pocket-lib = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , kv + , lib + , melpaBuild + , request + , s }: + melpaBuild { + pname = "pocket-lib"; + ename = "pocket-lib"; + version = "0.1"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "pocket-lib.el"; + rev = "ef3bcf452129b74e7b82265f6c08f9569fd19515"; + sha256 = "0r2y6idzwkvaclsnaskdlzk9afvxnm9kkyy8y38cfwany3kbmyzj"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/71f17ce28f4fc8c2c100848be8aec15526ef8697/recipes/pocket-lib"; + sha256 = "0v619blifmvm36dr773wjf35fjji4dj3pyck9nkz0m8zmpz0fg78"; + name = "recipe"; + }; + packageRequires = [ dash emacs kv request s ]; + meta = { + homepage = "https://melpa.org/#/pocket-lib"; + license = lib.licenses.free; + }; + }) {}; + pocket-reader = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , kv + , lib + , melpaBuild + , org-web-tools + , ov + , pocket-lib + , rainbow-identifiers + , s }: + melpaBuild { pname = "pocket-reader"; + ename = "pocket-reader"; version = "0.1.1"; src = fetchFromGitHub { owner = "alphapapa"; @@ -30236,10 +39420,10 @@ rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574"; sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf"; - name = "pocket-reader"; + name = "recipe"; }; packageRequires = [ dash @@ -30256,20 +39440,24 @@ license = lib.licenses.free; }; }) {}; - point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + point-pos = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "point-pos"; + ename = "point-pos"; version = "0.1"; src = fetchFromGitHub { owner = "alezost"; repo = "point-pos.el"; - rev = "4cd0f8c8d1296c5c64f708b6a5835e8520c51b68"; - sha256 = "1l3mlz51wp729rm6wf72x2fk1fla2n2s1qh8h8z58inipdi2qydp"; + rev = "f4126b64567a81e7f22058f09d56c63b2ff06632"; + sha256 = "1sbwz9kxvnd5r24q9x6bhcjajjnm2z8q6khgqs4gl4ycs60kn0s6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23a1e835155fba51f595c10c46487a4c269f43ff/recipes/point-pos"; sha256 = "1zv6hx8i8jwq52j4la1ff0ar0bpbs2pb4gcsh9hypghba11gnync"; - name = "point-pos"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30277,20 +39465,26 @@ license = lib.licenses.free; }; }) {}; - pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pomidor = callPackage ({ alert + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pomidor"; + ename = "pomidor"; version = "0.2"; src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "5780ce2aaa98882a79e92f5eefaaf10fd8dbee3a"; + rev = "3f9186e4dc8fe8bf06b8f2ac9c68ecd8aafb4a65"; sha256 = "19bz3pg3s265wpcwb458i84138z170rgd1qybn6vrll2brvwsf8b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; sha256 = "0pdzipyza98dhnz6am8lrmz8fh3p1c21v2mhs56fb9lwyvcgv8fi"; - name = "pomidor"; + name = "recipe"; }; packageRequires = [ alert emacs ]; meta = { @@ -30298,9 +39492,14 @@ license = lib.licenses.free; }; }) {}; - pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + pony-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "pony-snippets"; + ename = "pony-snippets"; version = "0.0.1"; src = fetchFromGitHub { owner = "SeanTAllen"; @@ -30308,10 +39507,10 @@ rev = "56018b23a11563c6766ed706024b22aa5a4556b4"; sha256 = "0xjvxfkrl6wl31s7rvbv9zczn6d6i9vf20waqlr3c2ff3zy55ygy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pony-snippets"; sha256 = "12ygvpfkzldq6s4mwbrxs4x9927i7pa7ywn7lf1r3gg4h29ar9gn"; - name = "pony-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -30319,9 +39518,14 @@ license = lib.licenses.free; }; }) {}; - ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ponylang-mode = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ponylang-mode"; + ename = "ponylang-mode"; version = "0.0.9"; src = fetchFromGitHub { owner = "SeanTAllen"; @@ -30329,10 +39533,10 @@ rev = "38786ba7f9f5709d511e27b85028b2dc6aff532d"; sha256 = "0cr22scxk3y2qdlhhfvwf4fkk2ql1c0r73fxzhw64dhwm4q01pih"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode"; sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1"; - name = "ponylang-mode"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -30340,9 +39544,16 @@ license = lib.licenses.free; }; }) {}; - pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }: - melpaBuild { + pophint = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , popup + , yaxception }: + melpaBuild { pname = "pophint"; + ename = "pophint"; version = "0.9.3"; src = fetchFromGitHub { owner = "aki2o"; @@ -30350,10 +39561,10 @@ rev = "28dc6a76e726f371bcca3160c27ae2017324399c"; sha256 = "18i0kivn6prh5pwdr7b4pxfxqsc8l4mks1h6cfs7iwnfn15g5k19"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0055c2887acbbd8a2803bf3f81ac2cc444cc805a/recipes/pophint"; sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72"; - name = "pophint"; + name = "recipe"; }; packageRequires = [ log4e popup yaxception ]; meta = { @@ -30361,9 +39572,14 @@ license = lib.licenses.free; }; }) {}; - popup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + popup = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "popup"; + ename = "popup"; version = "0.5.3"; src = fetchFromGitHub { owner = "auto-complete"; @@ -30371,10 +39587,10 @@ rev = "46632ab9652dacad56fd961cd6def25a015170ae"; sha256 = "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/popup"; sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2"; - name = "popup"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -30382,9 +39598,14 @@ license = lib.licenses.free; }; }) {}; - popup-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + popup-complete = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "popup-complete"; + ename = "popup-complete"; version = "0.2"; src = fetchFromGitHub { owner = "syohex"; @@ -30392,10 +39613,10 @@ rev = "e362d4a005b36646ffbaa6be604e9e31bc406ca9"; sha256 = "084hb3zn1aiabbyxgaalszb2qjf9z64z960ks5fvz8nh7n6y7ny4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b43b85f90c476a3b88f94927a7db90bdc72cd171/recipes/popup-complete"; sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1"; - name = "popup-complete"; + name = "recipe"; }; packageRequires = [ popup ]; meta = { @@ -30403,9 +39624,16 @@ license = lib.licenses.free; }; }) {}; - popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }: - melpaBuild { + popup-imenu = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , flx-ido + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "popup-imenu"; + ename = "popup-imenu"; version = "0.6"; src = fetchFromGitHub { owner = "ancane"; @@ -30413,10 +39641,10 @@ rev = "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09"; sha256 = "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca5d65d6a9c7ef3fa2684271fe087dc132d3a61/recipes/popup-imenu"; sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn"; - name = "popup-imenu"; + name = "recipe"; }; packageRequires = [ dash flx-ido popup ]; meta = { @@ -30424,9 +39652,13 @@ license = lib.licenses.free; }; }) {}; - popwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + popwin = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "popwin"; + ename = "popwin"; version = "1.0.0"; src = fetchFromGitHub { owner = "m2ym"; @@ -30434,10 +39666,10 @@ rev = "95dea14c60019d6cccf9a3b33e0dec4e1f22c304"; sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3d6a8b734e0820fd904c215a83fe5519496dc3/recipes/popwin"; sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf"; - name = "popwin"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30445,9 +39677,13 @@ license = lib.licenses.free; }; }) {}; - pos-tip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pos-tip = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pos-tip"; + ename = "pos-tip"; version = "0.4.6"; src = fetchFromGitHub { owner = "pitkali"; @@ -30455,10 +39691,10 @@ rev = "1b81694d1dc29253db0e855b82563f84a32b38d4"; sha256 = "0w8bnspnk871qndp18hs0wk4x9x31xr9rwbvf5dc8mcbnj29ch33"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/306e9978d2a071548cc9d8c531a1ce6c6c6b99aa/recipes/pos-tip"; sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh"; - name = "pos-tip"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30466,9 +39702,14 @@ license = lib.licenses.free; }; }) {}; - powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + powerline = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "powerline"; + ename = "powerline"; version = "2.4"; src = fetchFromGitHub { owner = "milkypostman"; @@ -30476,10 +39717,10 @@ rev = "d3dcfc57a36111d8e0b037d90c6ffce85ce071b2"; sha256 = "1hp3xp18943n0rlggz55150020ivw8gvi1vyxkr4z8xhpwq4gaar"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx"; - name = "powerline"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -30487,20 +39728,24 @@ license = lib.licenses.free; }; }) {}; - powershell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + powershell = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "powershell"; + ename = "powershell"; version = "0.1"; src = fetchFromGitHub { owner = "jschaf"; repo = "powershell.el"; - rev = "7316f44d0b528552f5a0692f778e5f0efd964299"; - sha256 = "010b151wblgxlfpy590yanbl2r8qhpbqgi02v0pyir340frm9ngn"; + rev = "4865dff0d20a8b36569f7f5d2634a7e27e8f3a65"; + sha256 = "1zqsnyfkxvaagrasxm86pxyv6qz9h3149p3k61nq1095b9c3sgqf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7002c50f2734675134791916aa9d8b82b4582fcb/recipes/powershell"; sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk"; - name = "powershell"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30508,9 +39753,15 @@ license = lib.licenses.free; }; }) {}; - ppd-sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist-drawer, sr-speedbar }: - melpaBuild { + ppd-sr-speedbar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , project-persist-drawer + , sr-speedbar }: + melpaBuild { pname = "ppd-sr-speedbar"; + ename = "ppd-sr-speedbar"; version = "0.0.6"; src = fetchFromGitHub { owner = "rdallasgray"; @@ -30518,10 +39769,10 @@ rev = "19d3e924407f40a6bb38c8fe427a159af755adce"; sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f930f54048d06f6a97824b66fbb74649eed40b54/recipes/ppd-sr-speedbar"; sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8"; - name = "ppd-sr-speedbar"; + name = "recipe"; }; packageRequires = [ project-persist-drawer sr-speedbar ]; meta = { @@ -30529,9 +39780,13 @@ license = lib.licenses.free; }; }) {}; - prassee-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prassee-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "prassee-theme"; + ename = "prassee-theme"; version = "1.0"; src = fetchFromGitHub { owner = "prassee"; @@ -30539,10 +39794,10 @@ rev = "9850c806d39acffdef8e91e1a31b54a7620cbae3"; sha256 = "1agghimrmh4kh71y51l6lzampjl15ac6jxrrhdviw95c3rxfll4x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme"; sha256 = "1j0817hxxri6mq9pplgwf5jp2dagk6hay7g1a1lgz4qgkf5jnshs"; - name = "prassee-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30550,9 +39805,66 @@ license = lib.licenses.free; }; }) {}; - pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prescient = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "prescient"; + ename = "prescient"; + version = "2.0"; + src = fetchFromGitHub { + owner = "raxod502"; + repo = "prescient.el"; + rev = "515959a2523b43608c9d06dcf8adde8911ce42b9"; + sha256 = "1k8xk154sql3b2b7hpyxslcgl88aaxq5ak2sr760jsq2qk7878bw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec02349e31531c347e4a43fbde56ae4386898cc6/recipes/prescient"; + sha256 = "04js3hblavfrc6kqp942x5yjdl3ndazf3n64p83423ldsmhbip6s"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/prescient"; + license = lib.licenses.free; + }; + }) {}; + presentation = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "presentation"; + ename = "presentation"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "emacs-presentation-mode"; + rev = "e9e402d05a8b6d9e1e7fe853503c92fea4cf65cb"; + sha256 = "10pvjdnb48fk663232qvh4gapk2yiz4iawpffzjrbs3amxh50bi7"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/747afd0339215528bf104f778a13edacbac510b7/recipes/presentation"; + sha256 = "0zdpfvg6kbvi6b4lb7vbdjrkgk0j1q6gzyd0s2b0603fnyy4sqdg"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/presentation"; + license = lib.licenses.free; + }; + }) {}; + pretty-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pretty-mode"; + ename = "pretty-mode"; version = "2.0.3"; src = fetchFromGitHub { owner = "akatov"; @@ -30560,10 +39872,10 @@ rev = "4ba8fceb7dd733361ed975d80ac2caa3612fa78b"; sha256 = "013fig9i4fyx16krp2vfv953p3rwdzr38zs6i50af4pqz4vrcfvh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2fe9feae4c1f007e51272a97917a63dcf6bbe5/recipes/pretty-mode"; sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f"; - name = "pretty-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30571,9 +39883,14 @@ license = lib.licenses.free; }; }) {}; - processing-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + processing-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "processing-mode"; + ename = "processing-mode"; version = "1.0"; src = fetchFromGitHub { owner = "ptrv"; @@ -30581,10 +39898,10 @@ rev = "228bc56369675787d60f637223b50ce3a1afebbd"; sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-mode"; sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m"; - name = "processing-mode"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -30592,8 +39909,11 @@ license = lib.licenses.free; }; }) {}; - processing-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + processing-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "processing-snippets"; version = "1.0"; src = fetchFromGitHub { @@ -30602,7 +39922,7 @@ rev = "228bc56369675787d60f637223b50ce3a1afebbd"; sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-snippets"; sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r"; name = "processing-snippets"; @@ -30613,9 +39933,17 @@ license = lib.licenses.free; }; }) {}; - prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + prodigy = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "prodigy"; + ename = "prodigy"; version = "0.7.0"; src = fetchFromGitHub { owner = "rejeep"; @@ -30623,10 +39951,10 @@ rev = "3bacca898db9b3493883c95f923a87eb1ce807eb"; sha256 = "1whnk1902f8q03clm9xlfl47gkpsywf3mx0ykp70c1q496ab39qj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy"; sha256 = "0lfxb80jqjnzssjs6l511jcsmhkpzb5rh5czrb16dkqcz0cl5b2p"; - name = "prodigy"; + name = "recipe"; }; packageRequires = [ dash emacs f s ]; meta = { @@ -30634,9 +39962,44 @@ license = lib.licenses.free; }; }) {}; - project-explorer = callPackage ({ cl-lib ? null, emacs, es-lib, es-windows, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prog-fill = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "prog-fill"; + ename = "prog-fill"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "ahungry"; + repo = "prog-fill"; + rev = "3fbf7da6dd826e95c9077d659566ee29814a31d8"; + sha256 = "167is1hbv3nsskz26g9q3zdndqsw9d3rwhbasj0r7a3wabpr8j4r"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/90d680ed481688c9899adb28fbd9a22a17fa8943/recipes/prog-fill"; + sha256 = "0wnqzkzhaywcyw93z86pngpycsrd1mi79psmck6qbhms1aia79p3"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/prog-fill"; + license = lib.licenses.free; + }; + }) {}; + project-explorer = callPackage ({ cl-lib ? null + , emacs + , es-lib + , es-windows + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "project-explorer"; + ename = "project-explorer"; version = "0.14.3"; src = fetchFromGitHub { owner = "sabof"; @@ -30644,10 +40007,10 @@ rev = "7c2cc86a81f679dda355110f916366b64893a5d4"; sha256 = "1hv8ifrpwn434sm41vkgbwni21ma5kfybkwasi6zp0f2b5i9ziw7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2e5d686b8a18c7a17965ff6c5af8f5817b7ab31/recipes/project-explorer"; sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m"; - name = "project-explorer"; + name = "recipe"; }; packageRequires = [ cl-lib emacs es-lib es-windows ]; meta = { @@ -30655,9 +40018,13 @@ license = lib.licenses.free; }; }) {}; - project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + project-persist = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "project-persist"; + ename = "project-persist"; version = "0.3.2"; src = fetchFromGitHub { owner = "rdallasgray"; @@ -30665,10 +40032,10 @@ rev = "a4e5de1833edb60656d8a04357c527d34e81d27c"; sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd81d1f8a30ed951ed94b9a4db13a2f7735ea878/recipes/project-persist"; sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24"; - name = "project-persist"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30676,9 +40043,14 @@ license = lib.licenses.free; }; }) {}; - project-persist-drawer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist }: - melpaBuild { + project-persist-drawer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , project-persist }: + melpaBuild { pname = "project-persist-drawer"; + ename = "project-persist-drawer"; version = "0.0.4"; src = fetchFromGitHub { owner = "rdallasgray"; @@ -30686,10 +40058,10 @@ rev = "35bbe132a4fab6a0fec15ce6c0fd2fe6a4aa9626"; sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23084af52d2243016eee73a5ee0cd3e945eec71d/recipes/project-persist-drawer"; sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb"; - name = "project-persist-drawer"; + name = "recipe"; }; packageRequires = [ project-persist ]; meta = { @@ -30697,8 +40069,11 @@ license = lib.licenses.free; }; }) {}; - project-root = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + project-root = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "project-root"; version = "0.7"; src = fetchhg { @@ -30706,7 +40081,7 @@ rev = "843ca1f4ab2b"; sha256 = "0nw02f5lmbqdfnw93d3383sdxx1d31szk23zvjlrmmdwv2124281"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/project-root"; sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb"; name = "project-root"; @@ -30717,41 +40092,53 @@ license = lib.licenses.free; }; }) {}; - projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + projectile = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "projectile"; - version = "0.14.0"; + ename = "projectile"; + version = "1.0.0"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "19fb9fa6590e1dc49afc3c8c5bd69cff6cf743a7"; - sha256 = "1kp0y81csmjxwyrdbj60f89phw3gkg3hm5xp3k4fvymzsrxrhm9l"; + rev = "09d1ef17a20c42dc6a2b1622df8faa8fb1c6ad9f"; + sha256 = "1yyphiy2bc4kzc1bz1akfz5rrdrs0bq3zvsyam9bsx03jixzn7yv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn"; - name = "projectile"; + name = "recipe"; }; - packageRequires = [ dash pkg-info ]; + packageRequires = [ emacs pkg-info ]; meta = { homepage = "https://melpa.org/#/projectile"; license = lib.licenses.free; }; }) {}; - projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: - melpaBuild { + projectile-git-autofetch = callPackage ({ alert + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile }: + melpaBuild { pname = "projectile-git-autofetch"; - version = "0.1.0"; + ename = "projectile-git-autofetch"; + version = "0.1.1"; src = fetchFromGitHub { owner = "andrmuel"; repo = "projectile-git-autofetch"; - rev = "9692ed2a3935ee7b56e59af8b986e532839597dd"; - sha256 = "0vg0d8alxzzzkk8s564wzbb71laj48gkpbpk3qnwj5hfk14jzaqv"; + rev = "da02069d906e6e7f28ea1dd6a9196529315a5cba"; + sha256 = "106kj49rxsrdh6awvql3zyr3ramdcn0aaq4rmbmd45hz9ij7x1wh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch"; sha256 = "0m0raddsw5yvjrw2v6bdaswffmva8y9hxksdgf9axpvrd3rzlk9n"; - name = "projectile-git-autofetch"; + name = "recipe"; }; packageRequires = [ alert projectile ]; meta = { @@ -30759,9 +40146,19 @@ license = lib.licenses.free; }; }) {}; - projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: - melpaBuild { + projectile-rails = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , inf-ruby + , inflections + , lib + , melpaBuild + , projectile + , rake }: + melpaBuild { pname = "projectile-rails"; + ename = "projectile-rails"; version = "0.16.0"; src = fetchFromGitHub { owner = "asok"; @@ -30769,10 +40166,10 @@ rev = "31c9f90d472e07cb8e49fa8992b187b67c9c9a71"; sha256 = "0j38zbprkga3iq5wb77zvfa5r3sj3sqv8qh0ab62wm68qy60d6g3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq"; - name = "projectile-rails"; + name = "recipe"; }; packageRequires = [ emacs f inf-ruby inflections projectile rake ]; meta = { @@ -30780,9 +40177,15 @@ license = lib.licenses.free; }; }) {}; - projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }: - melpaBuild { + projectile-ripgrep = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , ripgrep }: + melpaBuild { pname = "projectile-ripgrep"; + ename = "projectile-ripgrep"; version = "0.4.0"; src = fetchFromGitHub { owner = "nlamirault"; @@ -30790,10 +40193,10 @@ rev = "73595f1364f2117db49e1e4a49290bd6d430e345"; sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; sha256 = "1iczizyayql40wcljvpc1mvfvn9r28b1dkrkcmdxif732gd01jjg"; - name = "projectile-ripgrep"; + name = "recipe"; }; packageRequires = [ projectile ripgrep ]; meta = { @@ -30801,9 +40204,15 @@ license = lib.licenses.free; }; }) {}; - projectile-sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sift }: - melpaBuild { + projectile-sift = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , sift }: + melpaBuild { pname = "projectile-sift"; + ename = "projectile-sift"; version = "0.2.0"; src = fetchFromGitHub { owner = "nlamirault"; @@ -30811,10 +40220,10 @@ rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13"; sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/projectile-sift"; sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i"; - name = "projectile-sift"; + name = "recipe"; }; packageRequires = [ projectile sift ]; meta = { @@ -30822,9 +40231,19 @@ license = lib.licenses.free; }; }) {}; - projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: - melpaBuild { + projectile-trailblazer = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , inf-ruby + , inflections + , lib + , melpaBuild + , projectile + , rake }: + melpaBuild { pname = "projectile-trailblazer"; + ename = "projectile-trailblazer"; version = "0.2.0"; src = fetchFromGitHub { owner = "micdahl"; @@ -30832,10 +40251,10 @@ rev = "79299498d74876f2ac3fe8075716b39a5bdd04cd"; sha256 = "1lkj9jdr3g7nl80fxvic6g5cn7vbkyxys7m3kcmd6xa9mq7nvci4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer"; sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4"; - name = "projectile-trailblazer"; + name = "recipe"; }; packageRequires = [ emacs f inf-ruby inflections projectile rake ]; meta = { @@ -30843,9 +40262,15 @@ license = lib.licenses.free; }; }) {}; - projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + projectile-variable = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "projectile-variable"; + ename = "projectile-variable"; version = "0.0.2"; src = fetchFromGitHub { owner = "emacs-php"; @@ -30853,10 +40278,10 @@ rev = "8d348ac70bdd6dc320c13a12941b32b38140e264"; sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/projectile-variable"; sha256 = "15qc5n91nxyfvb100iyihfmrdr57qgw6098yv3nfqgw3zx1qchdw"; - name = "projectile-variable"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -30864,9 +40289,14 @@ license = lib.licenses.free; }; }) {}; - projekt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + projekt = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "projekt"; + ename = "projekt"; version = "0.1"; src = fetchFromGitHub { owner = "tekai"; @@ -30874,10 +40304,10 @@ rev = "107232c191375b59d065354470d0af83062e2a4c"; sha256 = "1rw55w2fpb3rw7j136kclkhppz21f7d7di4cvlv7zj5zpdl5zz88"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a854ed4fef114861bcc7814cd064c16d3c074c/recipes/projekt"; sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8"; - name = "projekt"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -30885,20 +40315,24 @@ license = lib.licenses.free; }; }) {}; - prompt-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prompt-text = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "prompt-text"; + ename = "prompt-text"; version = "0.1.0"; src = fetchFromGitHub { owner = "10sr"; repo = "prompt-text-el"; - rev = "bb9265ebfada42d0e3c67c809665e1e5d980691e"; - sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2"; + rev = "3cc486c070b7a7c806c8d6002f9ba4979f56107d"; + sha256 = "1hv4p1x5sli5lplm8hl6frxmwvbc1vmamgj9m2ryk17ykqmr05r5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17d2bc3e53865fe8c98aabb6ef0ad1d10fcb1061/recipes/prompt-text"; sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc"; - name = "prompt-text"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30906,9 +40340,15 @@ license = lib.licenses.free; }; }) {}; - prop-menu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + prop-menu = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "prop-menu"; + ename = "prop-menu"; version = "0.1.2"; src = fetchFromGitHub { owner = "david-christiansen"; @@ -30916,10 +40356,10 @@ rev = "50b102c1c0935fd3e0c465feed7f27d66b21cdf3"; sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d3a013cc9c489987fe689c8d73bbaa3445bdeb3/recipes/prop-menu"; sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i"; - name = "prop-menu"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -30927,20 +40367,24 @@ license = lib.licenses.free; }; }) {}; - protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + protobuf-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "protobuf-mode"; - version = "3.5.2"; + ename = "protobuf-mode"; + version = "3.6.0.1"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "b5fbb742af122b565925987e65c08957739976a7"; - sha256 = "14gq6rnv03zvcb5hym240z4yqiphrmd5y4zx9a77n37rwvfgx5qy"; + rev = "4674cc7c073f1b8d5efd2a42ffcf3ca30a907bfe"; + sha256 = "0sspwvwxyqq9aibf3piv6cp5vb28w2fnfk6x7wkmaiy7a4gcklcv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj"; - name = "protobuf-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -30948,9 +40392,14 @@ license = lib.licenses.free; }; }) {}; - protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + protocols = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "protocols"; + ename = "protocols"; version = "1.6"; src = fetchFromGitHub { owner = "davep"; @@ -30958,10 +40407,10 @@ rev = "f5549f5d873a683af45a0e19c732524d5b964026"; sha256 = "0v9is6r307814gvrnch2d3mvikd7j8lnmsqb2c3gj6gvfj4p9y7r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols"; sha256 = "1wg3qh8a1ms82lkzz4i1bk787147a8agcj8rszj1zfvwg0ckqq1a"; - name = "protocols"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -30969,9 +40418,18 @@ license = lib.licenses.free; }; }) {}; - psci = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }: - melpaBuild { + psci = callPackage ({ dash + , deferred + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , purescript-mode + , s }: + melpaBuild { pname = "psci"; + ename = "psci"; version = "0.0.6"; src = fetchFromGitHub { owner = "purescript-emacs"; @@ -30979,10 +40437,10 @@ rev = "8c2d5a0ba604ec593f83f632b2830a87f41f84d4"; sha256 = "0wgxrwl7dpy084sc76wiwpixycb171g7xwc66m5gnlrv79qyac73"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci"; sha256 = "1iwkr58b910vrwwxyk00psy74vp201vmm3b0cm4k5fh3glr31vp9"; - name = "psci"; + name = "recipe"; }; packageRequires = [ dash deferred f purescript-mode s ]; meta = { @@ -30990,30 +40448,44 @@ license = lib.licenses.free; }; }) {}; - psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + psession = callPackage ({ async + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "psession"; - version = "1.3"; + ename = "psession"; + version = "1.5"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "3488f7777486aa6c85ebc04d011860163d3cf0fc"; - sha256 = "0v9pg9ywwdqmahmmhg4gwzmibznlbmiyz4hf90brb59ns013jb53"; + rev = "702d20897c0839568201bc6921d5f0f80b8778c0"; + sha256 = "0ynd69fyjpgs6rs3kkznpx19kmdmd25wb46bj9zq61gj138b6p33"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a"; - name = "psession"; + name = "recipe"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ async cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/psession"; license = lib.licenses.free; }; }) {}; - psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + psysh = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "psysh"; + ename = "psysh"; version = "0.0.4"; src = fetchFromGitHub { owner = "emacs-php"; @@ -31021,10 +40493,10 @@ rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa"; sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/psysh"; sha256 = "00rzfw8nlbcmfbjnzbfl08136dhgvrrn9g1s9l623xgpbcay63sg"; - name = "psysh"; + name = "recipe"; }; packageRequires = [ emacs f s ]; meta = { @@ -31032,9 +40504,13 @@ license = lib.licenses.free; }; }) {}; - pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pt"; + ename = "pt"; version = "0.0.3"; src = fetchFromGitHub { owner = "bling"; @@ -31042,10 +40518,10 @@ rev = "a539dc11ecb2d69760ff50f76c96f49895ce1e1e"; sha256 = "1p0k770h96iw8bxm8ssi0a91m050s615q036870lrlsz35mzc5kw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34c51783af154f203489f5f7df7012ca61932caa/recipes/pt"; sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj"; - name = "pt"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31053,9 +40529,15 @@ license = lib.licenses.free; }; }) {}; - pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pug-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pug-mode"; + ename = "pug-mode"; version = "1.0.7"; src = fetchFromGitHub { owner = "hlissner"; @@ -31063,10 +40545,10 @@ rev = "96718f802dad3acd5a3f770b1452b81e39f77d92"; sha256 = "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85"; - name = "pug-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -31074,9 +40556,13 @@ license = lib.licenses.free; }; }) {}; - punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + punctuality-logger = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "punctuality-logger"; + ename = "punctuality-logger"; version = "0.8"; src = fetchFromGitLab { owner = "elzair"; @@ -31084,10 +40570,10 @@ rev = "708cae8e67dbae293c7c4be0ca5e49d76fac6714"; sha256 = "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/punctuality-logger"; sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm"; - name = "punctuality-logger"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31095,9 +40581,15 @@ license = lib.licenses.free; }; }) {}; - pungi = callPackage ({ fetchFromGitHub, fetchurl, jedi, lib, melpaBuild, pyvenv }: - melpaBuild { + pungi = callPackage ({ fetchFromGitHub + , fetchurl + , jedi + , lib + , melpaBuild + , pyvenv }: + melpaBuild { pname = "pungi"; + ename = "pungi"; version = "1.1"; src = fetchFromGitHub { owner = "mgrbyte"; @@ -31105,10 +40597,10 @@ rev = "41c9f8b7795e083bfd63ba0d06c789c250998723"; sha256 = "012lv7hrwlhvins81vw3yjkhdwbpi6g1dx55i101qyrpzv5ifngm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d504c6028c029268d380c0eac25b1c4886aa6e98/recipes/pungi"; sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1"; - name = "pungi"; + name = "recipe"; }; packageRequires = [ jedi pyvenv ]; meta = { @@ -31116,9 +40608,16 @@ license = lib.licenses.free; }; }) {}; - puppet-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { + puppet-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info }: + melpaBuild { pname = "puppet-mode"; + ename = "puppet-mode"; version = "0.3"; src = fetchFromGitHub { owner = "voxpupuli"; @@ -31126,10 +40625,10 @@ rev = "d943149691abd7b66c85d58aee9657bfcf822c02"; sha256 = "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; sha256 = "1qn71j6fkwnrsq1s6fhfcxhic3rbspg5cy9n7jv451ji7ywyhakf"; - name = "puppet-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs pkg-info ]; meta = { @@ -31137,9 +40636,13 @@ license = lib.licenses.free; }; }) {}; - purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + purescript-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "purescript-mode"; + ename = "purescript-mode"; version = "13.10"; src = fetchFromGitHub { owner = "dysinger"; @@ -31147,10 +40650,10 @@ rev = "6a4d4bdd178c65183a715c7729941a0b8fe5f253"; sha256 = "1wk319akv0scvyyjsd48pisi2i1gkahhsan9hfszrs6xx3anvfd9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode"; sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m"; - name = "purescript-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31158,9 +40661,15 @@ license = lib.licenses.free; }; }) {}; - pushbullet = callPackage ({ fetchFromGitHub, fetchurl, grapnel, json ? null, lib, melpaBuild }: - melpaBuild { + pushbullet = callPackage ({ fetchFromGitHub + , fetchurl + , grapnel + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "pushbullet"; + ename = "pushbullet"; version = "0.5.2"; src = fetchFromGitHub { owner = "theanalyst"; @@ -31168,10 +40677,10 @@ rev = "73c59a0f1dc04875b3e5a2c8afbc26c32128e445"; sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2649d60dd1ed3b3171ff1448b89967c5f7759a0/recipes/pushbullet"; sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl"; - name = "pushbullet"; + name = "recipe"; }; packageRequires = [ grapnel json ]; meta = { @@ -31179,9 +40688,13 @@ license = lib.licenses.free; }; }) {}; - py-autopep8 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + py-autopep8 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "py-autopep8"; + ename = "py-autopep8"; version = "2016.1"; src = fetchFromGitHub { owner = "paetzke"; @@ -31189,10 +40702,10 @@ rev = "68e12d8788c91c7ec53a68acf1d23adb2ffa4788"; sha256 = "16fmym6hvi2lx0mmbrrhld1vzki5iqfqx2m0xa9021gjjzb33lw6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c400e0f3cfe70821e621fe85d239b4f6596d5171/recipes/py-autopep8"; sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp"; - name = "py-autopep8"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31200,9 +40713,13 @@ license = lib.licenses.free; }; }) {}; - py-isort = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + py-isort = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "py-isort"; + ename = "py-isort"; version = "2016.1"; src = fetchFromGitHub { owner = "paetzke"; @@ -31210,10 +40727,10 @@ rev = "e67306f459c47c53a65604e4eea88a3914596560"; sha256 = "08i55gv392wc12x8v3dca0dmz8a8p9ljsqhyajsb6qv1k120wqhx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44377d11da07b49c8dc6887c948cc5ddfc065bd2/recipes/py-isort"; sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb"; - name = "py-isort"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31221,9 +40738,13 @@ license = lib.licenses.free; }; }) {}; - py-yapf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + py-yapf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "py-yapf"; + ename = "py-yapf"; version = "2016.1"; src = fetchFromGitHub { owner = "paetzke"; @@ -31231,10 +40752,10 @@ rev = "a878304202ad827a1f3de3dce1badd9ca8731146"; sha256 = "1mmzqdigxx46my0h9497l25cjydy3vykg6slxkch4dzvhhlbap48"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3306c6906d4b21868b9407de27fbebdaed3d00d5/recipes/py-yapf"; sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f"; - name = "py-yapf"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31242,9 +40763,15 @@ license = lib.licenses.free; }; }) {}; - pycarddavel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + pycarddavel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "pycarddavel"; + ename = "pycarddavel"; version = "1.0.1"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -31252,10 +40779,10 @@ rev = "6ead921066fa0156f20155b7126e5875ce11c328"; sha256 = "0qg1kjzsv2mcvlsivqy8ys3djbs5yala37r9h2zcxdicl88q0l11"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b3d2cd943f26dcff322efb16d55dd3bd71dea07/recipes/pycarddavel"; sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a"; - name = "pycarddavel"; + name = "recipe"; }; packageRequires = [ emacs helm ]; meta = { @@ -31263,9 +40790,13 @@ license = lib.licenses.free; }; }) {}; - pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pydoc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pydoc"; + ename = "pydoc"; version = "0.1"; src = fetchFromGitHub { owner = "statmobile"; @@ -31273,10 +40804,10 @@ rev = "5392248e33d83ef05d3b2809b0c6b207786b2644"; sha256 = "1m0jb5pk1a1ww5jx2y5nz21by4dh7nlnhdn6bigz53ra449rrxii"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc"; sha256 = "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n"; - name = "pydoc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31284,9 +40815,14 @@ license = lib.licenses.free; }; }) {}; - pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }: - melpaBuild { + pyenv-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pythonic }: + melpaBuild { pname = "pyenv-mode"; + ename = "pyenv-mode"; version = "0.1.0"; src = fetchFromGitHub { owner = "proofit404"; @@ -31294,10 +40830,10 @@ rev = "b96c15fa1b83cad855e472eda06319ad35e34513"; sha256 = "1y3q1k195wp2kgp00a1y34i20zm80wdv2kxigh6gbn2r6qzkqrar"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode"; sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59"; - name = "pyenv-mode"; + name = "recipe"; }; packageRequires = [ pythonic ]; meta = { @@ -31305,9 +40841,18 @@ license = lib.licenses.free; }; }) {}; - pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: - melpaBuild { + pyim = callPackage ({ async + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup + , pyim-basedict }: + melpaBuild { pname = "pyim"; + ename = "pyim"; version = "1.7"; src = fetchFromGitHub { owner = "tumashu"; @@ -31315,10 +40860,10 @@ rev = "3b1c5fbdf3b910f96771935785e28cf33d8d54cc"; sha256 = "1ijfsnjvyys941kgcq00d5dgnkbzj14gb7c9pks0x11bsdl0vr6p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j"; - name = "pyim"; + name = "recipe"; }; packageRequires = [ async cl-lib emacs popup pyim-basedict ]; meta = { @@ -31326,9 +40871,13 @@ license = lib.licenses.free; }; }) {}; - pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pyim-basedict = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pyim-basedict"; + ename = "pyim-basedict"; version = "0.3.1"; src = fetchFromGitHub { owner = "tumashu"; @@ -31336,10 +40885,10 @@ rev = "f71d0ffd9d2421f2b51cd0ccb89fd9eb43c09585"; sha256 = "0576r8ap9gp91ycjf1d47pn13kxp0f9fysn09zlq44hr0s1y2y5d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-basedict"; sha256 = "1y8cmccli3im5bvws2h582z7k4nj6p8brgypl8h09y3na6yjy2z9"; - name = "pyim-basedict"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31347,9 +40896,14 @@ license = lib.licenses.free; }; }) {}; - pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: - melpaBuild { + pyim-wbdict = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pyim }: + melpaBuild { pname = "pyim-wbdict"; + ename = "pyim-wbdict"; version = "0.1"; src = fetchFromGitHub { owner = "tumashu"; @@ -31357,10 +40911,10 @@ rev = "114489ed97e825ae11a8d09da6e873820cf23106"; sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict"; sha256 = "1s0i9xcnpy8kxqhsv7rqxabv5vnxsciyng398mn32mknib03315i"; - name = "pyim-wbdict"; + name = "recipe"; }; packageRequires = [ pyim ]; meta = { @@ -31368,20 +40922,26 @@ license = lib.licenses.free; }; }) {}; - pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + pyimport = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "pyimport"; + ename = "pyimport"; version = "1.0"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pyimport"; - rev = "2c05712748f6b6624b15d524323f6391612683f4"; - sha256 = "0p9fsbb7c1kr8916vlk1ngq7xmm158a47v6ja5j5n57b505ssy8q"; + rev = "c99d2fd9ca3963deac13a51ce0123f70d303af27"; + sha256 = "19gxiaikwwfjz65nbbbrwgh91d66s76yzrkls58jzjwghz56pbv3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; sha256 = "1qwigplawknykw1kbm5babyyknzn43ddhbdpahvzh4wy3kycn6n8"; - name = "pyimport"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -31389,9 +40949,18 @@ license = lib.licenses.free; }; }) {}; - pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: - melpaBuild { + pynt = callPackage ({ deferred + , ein + , emacs + , epc + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { pname = "pynt"; + ename = "pynt"; version = "1.0.0"; src = fetchFromGitHub { owner = "ebanner"; @@ -31399,10 +40968,10 @@ rev = "bc750cd244141005ea3b7bb87f75c6f6c5a5778f"; sha256 = "0mj8lkc40iv8d6afl4dba7gsbi0mgnx9ivanvczq6pxp5d4kgfsn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt"; sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3"; - name = "pynt"; + name = "recipe"; }; packageRequires = [ deferred ein emacs epc helm ]; meta = { @@ -31410,9 +40979,14 @@ license = lib.licenses.free; }; }) {}; - python-environment = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + python-environment = callPackage ({ deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "python-environment"; + ename = "python-environment"; version = "0.0.2"; src = fetchFromGitHub { owner = "tkf"; @@ -31420,10 +40994,10 @@ rev = "401006584e32864a10c69d29f14414828909362e"; sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/283155ad56cd8eda416c83a9b7f8d43d4d1570c2/recipes/python-environment"; sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7"; - name = "python-environment"; + name = "recipe"; }; packageRequires = [ deferred ]; meta = { @@ -31431,9 +41005,13 @@ license = lib.licenses.free; }; }) {}; - python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + python-mode = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "python-mode"; + ename = "python-mode"; version = "6.2.3"; src = fetchFromGitLab { owner = "python-mode-devs"; @@ -31441,10 +41019,10 @@ rev = "a0a534639bc6142c2c2f44bd7ca5878ad5f79518"; sha256 = "0sj2hfjwpcdg9djsgl3y5aa3gnvl4s87477x6a9d14m11db3p7ml"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; sha256 = "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k"; - name = "python-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31452,9 +41030,19 @@ license = lib.licenses.free; }; }) {}; - python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }: - melpaBuild { + python-pytest = callPackage ({ dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , magit-popup + , melpaBuild + , projectile + , s }: + melpaBuild { pname = "python-pytest"; + ename = "python-pytest"; version = "0.3.1"; src = fetchFromGitHub { owner = "wbolster"; @@ -31462,10 +41050,10 @@ rev = "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70"; sha256 = "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest"; sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4"; - name = "python-pytest"; + name = "recipe"; }; packageRequires = [ dash @@ -31480,20 +41068,26 @@ license = lib.licenses.free; }; }) {}; - python-x = callPackage ({ fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: - melpaBuild { + python-x = callPackage ({ fetchFromGitLab + , fetchurl + , folding + , lib + , melpaBuild + , python ? null }: + melpaBuild { pname = "python-x"; + ename = "python-x"; version = "1.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "wavexx"; repo = "python-x.el"; rev = "e606469aafec2e6beda8c589540b88a5a6f6f33f"; sha256 = "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x"; - sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn"; - name = "python-x"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/python-x"; + sha256 = "03px1z27yhvc9084h9j2p0khvhkwmfxdskf0ndvz79ywp6nl7mb6"; + name = "recipe"; }; packageRequires = [ folding python ]; meta = { @@ -31501,20 +41095,29 @@ license = lib.licenses.free; }; }) {}; - pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + pythonic = callPackage ({ cl-lib ? null + , dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "pythonic"; - version = "0.1.0"; + ename = "pythonic"; + version = "0.1.1"; src = fetchFromGitHub { owner = "proofit404"; repo = "pythonic"; - rev = "959b3f5d5607eb41ef26ad61d7ec15ceecb8e37a"; - sha256 = "1af9cd8l5ac58mj92xc7a3diy995cv29abnbb3fl6x4208l4xs3c"; + rev = "c59a158942634d3c07e506b2376d96e8d5d1466f"; + sha256 = "0219s900kdpi3cxllvmwm8hb2lwqzikplq578f7pyxhzljjh2lma"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic"; sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51"; - name = "pythonic"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs f s ]; meta = { @@ -31522,20 +41125,24 @@ license = lib.licenses.free; }; }) {}; - pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + pyvenv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "pyvenv"; - version = "1.13"; + ename = "pyvenv"; + version = "1.16"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "70a755d79b04964bdb969e41166f2473e21f277e"; - sha256 = "1sim74ccvwifradjdq726jbfcbw52cizbj1vh8q7c75qis6nhb7x"; + rev = "c1123def7e0d9da57d034d3a6bd3044a738aa8db"; + sha256 = "0mi86m5z3hig65yd0k224wx6x9i0nz9fcv91njy0ypifxh5hcd8v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v"; - name = "pyvenv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31543,20 +41150,24 @@ license = lib.licenses.free; }; }) {}; - qiita = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + qiita = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "qiita"; + ename = "qiita"; version = "0.0.1"; src = fetchFromGitHub { owner = "gongo"; repo = "qiita-el"; - rev = "33b6d3450bb4b3d0186c2475f6c78269c71fd1ff"; - sha256 = "110z27n3h7p2yalicfhnv832ikfcf7p0hrf5qkryz1sdmz79wb3f"; + rev = "542be60f1dbc67e8ec778e5d7790b863d3dbc151"; + sha256 = "0hp7c51d9d8l0cx0wdq7003clyf3k61dq8ns8zq6lfpbvaliq7yq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8065a58e297c50c031de97d2d80bce5857bd803/recipes/qiita"; sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl"; - name = "qiita"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31564,9 +41175,39 @@ license = lib.licenses.free; }; }) {}; - qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ql = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ql"; + ename = "ql"; + version = "1.1"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "ql-el"; + rev = "d976414ba6aa576ad524b5ee5bfa620efd072258"; + sha256 = "138h4ndnzpphsmi4b8yw53mxc3rnqrj1c3jp8njx5pkmiqkp1q00"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303/recipes/ql"; + sha256 = "0wxjblqacs5nx2hyh7r6rlv1yngbhn6phn5rni4dw2dms98zj34z"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ql"; + license = lib.licenses.free; + }; + }) {}; + qml-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "qml-mode"; + ename = "qml-mode"; version = "0.4"; src = fetchFromGitHub { owner = "coldnew"; @@ -31574,10 +41215,10 @@ rev = "6c5f33ba88ae010bf201a80ee8095e20a724558c"; sha256 = "1sncsvzjfgmhp4m8w5jd4y51k24n2jfpgvrkd64wlhhzbj3wb947"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3abc88ddbb6b8ecafa45e75ceba9a1294ad88d4/recipes/qml-mode"; sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n"; - name = "qml-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31585,20 +41226,25 @@ license = lib.licenses.free; }; }) {}; - qt-pro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + qt-pro-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "qt-pro-mode"; + ename = "qt-pro-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "EricCrosson"; repo = "qt-pro-mode"; - rev = "66601441cc728a609765b149ee0d7dcfb74dc8bf"; - sha256 = "0azx8a7kwgn5byijgwar2rib9xv2p9w7w3yyb5bk19g3id2f8gdw"; + rev = "1e0052fcfb89c15cb47714c1546d4e8ec6e01ae6"; + sha256 = "11bwxq4nwfbnlk4clg0m8jh2xz0ldv4ggyaw645sy7hprvwkp8y4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9af710be77ccde8ffa5f22168d2c8a06b73dd6a/recipes/qt-pro-mode"; sha256 = "1k3ph9bqvvg6i6n623qrwdpsffs8w9rv9nihmlggb4w30dwqc9nf"; - name = "qt-pro-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -31606,9 +41252,13 @@ license = lib.licenses.free; }; }) {}; - quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + quasi-monochrome-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "quasi-monochrome-theme"; + ename = "quasi-monochrome-theme"; version = "1.1"; src = fetchFromGitHub { owner = "lbolla"; @@ -31616,10 +41266,10 @@ rev = "7d3afe41c2696ee25e3e4bcce987af1f589208d6"; sha256 = "0bn1yzxzj6r1k3xcp45l04flq4avzlh0sbjfyiw4nglfhliyvwcf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme"; sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0"; - name = "quasi-monochrome-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31627,9 +41277,14 @@ license = lib.licenses.free; }; }) {}; - quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + quickrun = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "quickrun"; + ename = "quickrun"; version = "2.2.8"; src = fetchFromGitHub { owner = "syohex"; @@ -31637,10 +41292,10 @@ rev = "70e93e06778f44113f405aedec6187b925311d57"; sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy"; - name = "quickrun"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -31648,9 +41303,15 @@ license = lib.licenses.free; }; }) {}; - quiz = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + quiz = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "quiz"; + ename = "quiz"; version = "1.4"; src = fetchFromGitHub { owner = "davep"; @@ -31658,10 +41319,10 @@ rev = "69629937eaf994a51dad39c26355e1a56b9dcb95"; sha256 = "06k1kv9ijg9gx8c5jid8ckbmjkviyzh59rygp9drbkpihwdwyfmj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz"; sha256 = "0pcjfhk109ifi834jw8lndwhpfcv764wym1dhiqhp5qd2vf431kg"; - name = "quiz"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -31669,9 +41330,13 @@ license = lib.licenses.free; }; }) {}; - r-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + r-autoyas = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "r-autoyas"; + ename = "r-autoyas"; version = "0.28"; src = fetchFromGitHub { owner = "mattfidler"; @@ -31679,10 +41344,10 @@ rev = "563254f01ce530ca4c9be1f23395e3fd7d520ff9"; sha256 = "02bddznlqys37fnhdpp2g9xa9m7kfgrj1vl0hc5kr42hggk9wwmg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a095d3a687055c6ac43a4338826542d14a25127/recipes/r-autoyas"; sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4"; - name = "r-autoyas"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31690,20 +41355,29 @@ license = lib.licenses.free; }; }) {}; - racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: - melpaBuild { + racer = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , rust-mode + , s }: + melpaBuild { pname = "racer"; + ename = "racer"; version = "1.2"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "8ad54e7674e49735390d63e3aea828a4d4bcddd0"; - sha256 = "0xj5iki10cg8j8vvqjlw6lfx97k3agwirhchcjnzbnkry48x9qi6"; + rev = "10aa2119c47584959fd1abe6cfa770818852d3b4"; + sha256 = "0rl8rnchd1pch1ndgs9s0rrcmn8kq9xxk1wqkb50lyspv64dl46d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi"; - name = "racer"; + name = "recipe"; }; packageRequires = [ dash emacs f rust-mode s ]; meta = { @@ -31711,9 +41385,13 @@ license = lib.licenses.free; }; }) {}; - railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + railscasts-reloaded-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "railscasts-reloaded-theme"; + ename = "railscasts-reloaded-theme"; version = "1.5.0"; src = fetchFromGitHub { owner = "thegeorgeous"; @@ -31721,10 +41399,10 @@ rev = "077af9cb791d9eba4c561cd7cb3b10d2fcfc39d2"; sha256 = "1wd6j7m3w81rks6q8mrq5n6p6in0bc93szksds7sx2j2rz6vhfkn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; sha256 = "1iy30mnm3s7p7qigrm3lvv7xjgwvinwg6yg0hry2aifwn88cnwmz"; - name = "railscasts-reloaded-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31732,9 +41410,13 @@ license = lib.licenses.free; }; }) {}; - rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rainbow-blocks = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rainbow-blocks"; + ename = "rainbow-blocks"; version = "1.0.0"; src = fetchFromGitHub { owner = "istib"; @@ -31742,10 +41424,10 @@ rev = "8335993563aadd4290c5fa09dd7a6a81691b0690"; sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks"; sha256 = "1zf1z1hnp8q0s9za7nnpq83isbpmz26l8hxafz0h0b5dz1w2vlvs"; - name = "rainbow-blocks"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31753,9 +41435,13 @@ license = lib.licenses.free; }; }) {}; - rainbow-delimiters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rainbow-delimiters = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rainbow-delimiters"; + ename = "rainbow-delimiters"; version = "2.1.3"; src = fetchFromGitHub { owner = "Fanael"; @@ -31763,10 +41449,10 @@ rev = "93cd2dc873e7fedca7abc599cd97d46db4376ac7"; sha256 = "0vs9pf8lqq5p5qz1770pxgw47ym4xj8axxmwamn66br59mykdhv0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2cf11dbff76f0e3581b865f48bb44a307aa7f23/recipes/rainbow-delimiters"; sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg"; - name = "rainbow-delimiters"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31774,9 +41460,14 @@ license = lib.licenses.free; }; }) {}; - rainbow-identifiers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rainbow-identifiers = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rainbow-identifiers"; + ename = "rainbow-identifiers"; version = "0.2.2"; src = fetchFromGitHub { owner = "Fanael"; @@ -31784,10 +41475,10 @@ rev = "19fbfded1baa98d12335f26f6d7b20e5ae44ce2e"; sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/975aadd9fe1faf9ad617ba6200ca77185b87e7c0/recipes/rainbow-identifiers"; sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp"; - name = "rainbow-identifiers"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -31795,9 +41486,16 @@ license = lib.licenses.free; }; }) {}; - rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rake = callPackage ({ cl-lib ? null + , dash + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rake"; + ename = "rake"; version = "0.4.1"; src = fetchFromGitHub { owner = "asok"; @@ -31805,10 +41503,10 @@ rev = "e680f1a8f2591af7c80cad188340601b101b5ddc"; sha256 = "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake"; sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns"; - name = "rake"; + name = "recipe"; }; packageRequires = [ cl-lib dash f ]; meta = { @@ -31816,9 +41514,14 @@ license = lib.licenses.free; }; }) {}; - ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ranger = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ranger"; + ename = "ranger"; version = "0.9.8.5"; src = fetchFromGitHub { owner = "ralesi"; @@ -31826,10 +41529,10 @@ rev = "584e4ae8cce1c54a44b40dd4c77fbb2f06d73ecb"; sha256 = "01rphv92g1r0cw5bwkbrh02s0na7fjrddxx1dckk2y7qr97s7l8j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger"; sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4"; - name = "ranger"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -31837,9 +41540,13 @@ license = lib.licenses.free; }; }) {}; - rase = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rase = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rase"; + ename = "rase"; version = "1.1"; src = fetchFromGitHub { owner = "m00natic"; @@ -31847,10 +41554,10 @@ rev = "59b5f7e8102570b65040e8d55781c7ea28de7338"; sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/334419debe065c34665bb0207574d1d4dfb9e8ae/recipes/rase"; sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0"; - name = "rase"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31858,9 +41565,16 @@ license = lib.licenses.free; }; }) {}; - rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: - melpaBuild { + rats = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , go-mode + , lib + , melpaBuild + , s }: + melpaBuild { pname = "rats"; + ename = "rats"; version = "0.2.0"; src = fetchFromGitHub { owner = "ane"; @@ -31868,10 +41582,10 @@ rev = "8ad4023a4b9b00c1224b10b0060f6dc60b4814a4"; sha256 = "0rwgwz1x9w447y8mxy9hrx1rzi3ac9dwk2y5yg1p08z5b7dy6vcz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a62cbae1b2d9af2322bb6a27949de8c8bfddc2b7/recipes/rats"; sha256 = "0jhwiq9yzwpyqhk3c32vqx8nryingzh58psxbzjl3812b7xdqphr"; - name = "rats"; + name = "recipe"; }; packageRequires = [ cl-lib go-mode s ]; meta = { @@ -31879,9 +41593,13 @@ license = lib.licenses.free; }; }) {}; - rbenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rbenv = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rbenv"; + ename = "rbenv"; version = "0.0.3"; src = fetchFromGitHub { owner = "senny"; @@ -31889,10 +41607,10 @@ rev = "a613ee1941efa48ef5321bad39ac1ed8ad1540b8"; sha256 = "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rbenv"; sha256 = "1skh1v8dgwl1f9m3pmy2s3rnzp8n3cydi3579fgjv4mzi81k3d5q"; - name = "rbenv"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31900,9 +41618,13 @@ license = lib.licenses.free; }; }) {}; - rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rc-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rc-mode"; + ename = "rc-mode"; version = "1.0.13"; src = fetchFromGitHub { owner = "mrhmouse"; @@ -31910,10 +41632,10 @@ rev = "fe2e0570bf9c19a292e16b18fd4b0a256df5d93f"; sha256 = "0skjg3l3ss8nlrpnpjjflmf7wjib4jfarkmx4438nc6vm6553fmn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode"; sha256 = "0p77mckw8jyxcwspj1ffm8mz0k01ddm67hh9j8rw812wddwnj7qf"; - name = "rc-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31921,9 +41643,14 @@ license = lib.licenses.free; }; }) {}; - rcirc-styles = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rcirc-styles = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rcirc-styles"; + ename = "rcirc-styles"; version = "1.3.2"; src = fetchFromGitHub { owner = "aaron-em"; @@ -31931,10 +41658,10 @@ rev = "f313bf6a7470bed314b27c7a40558cb787d7bc67"; sha256 = "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10771a996c8a9dc1eb211cddff53db7b2b01e00b/recipes/rcirc-styles"; sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r"; - name = "rcirc-styles"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -31942,9 +41669,13 @@ license = lib.licenses.free; }; }) {}; - rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rdf-prefix = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rdf-prefix"; + ename = "rdf-prefix"; version = "1.10"; src = fetchFromGitHub { owner = "simenheg"; @@ -31952,10 +41683,10 @@ rev = "164136d05505275d42d1ca3a390f55fcc89694b8"; sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm"; - name = "rdf-prefix"; + name = "recipe"; }; packageRequires = []; meta = { @@ -31963,9 +41694,14 @@ license = lib.licenses.free; }; }) {}; - react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + react-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "react-snippets"; + ename = "react-snippets"; version = "0.1"; src = fetchFromGitHub { owner = "johnmastro"; @@ -31973,10 +41709,10 @@ rev = "bfc4b68b81374a6a080240592641091a7e8a6d61"; sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets"; sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73"; - name = "react-snippets"; + name = "recipe"; }; packageRequires = [ yasnippet ]; meta = { @@ -31984,20 +41720,24 @@ license = lib.licenses.free; }; }) {}; - real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + real-auto-save = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "real-auto-save"; + ename = "real-auto-save"; version = "0.4"; src = fetchFromGitHub { owner = "chillaranand"; repo = "real-auto-save"; - rev = "879144ca7e9bfa09a4fb57d5fe92a80250311f1e"; - sha256 = "1ka5q2q18hgh7wl5yn04489121bq4nx369rz8nb7dr5l14cas0xm"; + rev = "2775cf497cce60335091817f9fea14f838cd725f"; + sha256 = "0s19qy5idnzhd7aq0v538x3ysqh7lzddm98mkf8wmqf4xpws6h3j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save"; sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8"; - name = "real-auto-save"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32005,9 +41745,18 @@ license = lib.licenses.free; }; }) {}; - realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: - melpaBuild { + realgud = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , load-relative + , loc-changes + , melpaBuild + , test-simple }: + melpaBuild { pname = "realgud"; + ename = "realgud"; version = "1.4.5"; src = fetchFromGitHub { owner = "rocky"; @@ -32015,10 +41764,10 @@ rev = "09431a4561921bece36a6083b6e27ac4dc82432d"; sha256 = "00dgdiiwnwynlyyh6pfhljrl363s8zd5ynbx9mhd2y8c3gmvfab0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15"; - name = "realgud"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -32032,9 +41781,14 @@ license = lib.licenses.free; }; }) {}; - reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + reason-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "reason-mode"; + ename = "reason-mode"; version = "0.3.0"; src = fetchFromGitHub { owner = "reasonml-editor"; @@ -32042,10 +41796,10 @@ rev = "6b53815a0405be1f364a082d22fe5c900409a01a"; sha256 = "1433bgakbfyf5d5vq69rwj4zg1h0xwjy9qsryvd9r1ssax2hzi7r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode"; sha256 = "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr"; - name = "reason-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -32053,9 +41807,14 @@ license = lib.licenses.free; }; }) {}; - rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rebecca-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rebecca-theme"; + ename = "rebecca-theme"; version = "1.2.1"; src = fetchFromGitHub { owner = "vic"; @@ -32063,10 +41822,10 @@ rev = "239115183e0a354ccd5c2cb299893b558fbde05c"; sha256 = "0n6xf9s39frnyvchk40zzxbkn0hyga5ridkxbf50n7hr5j19yrmb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; sha256 = "1m72jqyqx18i1vpj07v3vkbi0di9dks5sz46wb2h0f23xqyx00md"; - name = "rebecca-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -32074,20 +41833,24 @@ license = lib.licenses.free; }; }) {}; - recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + recover-buffers = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "recover-buffers"; + ename = "recover-buffers"; version = "1.0"; src = fetchFromGitHub { owner = "tripleee"; repo = "recover-buffers"; - rev = "a1db7f084977697081da3497628e3514e032b966"; - sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q"; + rev = "fa602e32f73dcec2d90e4bb8e0f72f3240cfdb45"; + sha256 = "04vmmda2dj8madhlrkmyqw34vsx4pvb0szv3sjvfwqq1z17lsixi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/43b33cfb794c35de78fde6eabb71ffe01049d23d/recipes/recover-buffers"; sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b"; - name = "recover-buffers"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32095,9 +41858,13 @@ license = lib.licenses.free; }; }) {}; - rect-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rect-plus = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rect-plus"; + ename = "rect+"; version = "1.0.10"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -32105,10 +41872,10 @@ rev = "299b742faa0bc4448e0d5fe9cb98ab1eb93b8dcc"; sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8c1cd81f0e764a7cfc2f3f96574898ff414beb4/recipes/rect+"; sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m"; - name = "rect-plus"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32116,9 +41883,15 @@ license = lib.licenses.free; }; }) {}; - rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rectangle-utils = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rectangle-utils"; + ename = "rectangle-utils"; version = "1.1"; src = fetchFromGitHub { owner = "thierryvolpiatto"; @@ -32126,10 +41899,10 @@ rev = "6fe38fdd48ef5305a908b94a043a966ac3f2053a"; sha256 = "08n3ah40gfgkbriwj2z3y0751vpvgz86qjdn6dxs4mghjrwr2545"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1852b75c82822e97c39b7c7caeb2a32246171be4/recipes/rectangle-utils"; sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7"; - name = "rectangle-utils"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -32137,9 +41910,16 @@ license = lib.licenses.free; }; }) {}; - redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + redpen-paragraph = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "redpen-paragraph"; + ename = "redpen-paragraph"; version = "0.42"; src = fetchFromGitHub { owner = "karronoli"; @@ -32147,10 +41927,10 @@ rev = "f9569bc8e2993dea0f83cba5738a35ce32f82424"; sha256 = "087dq9h8i8cjwm8x2s33xrwnnxjpjcmddy2624z00s1ip0dh5ham"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e6b187bfc14f3affbe2d8d1cb854abe69deb15b/recipes/redpen-paragraph"; sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca"; - name = "redpen-paragraph"; + name = "recipe"; }; packageRequires = [ cl-lib emacs json ]; meta = { @@ -32158,20 +41938,25 @@ license = lib.licenses.free; }; }) {}; - redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + redprl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "redprl"; + ename = "redprl"; version = "0.1.0"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "d06d39486348a74981b2c4c4c2ed3af95b01d5ca"; - sha256 = "0k3f7pa332d0fs1js8hi7zszcirir1943bhkgwfxzsqx17m26x3n"; + rev = "c26dcea5896d199c3d0a53b792807a09c98222f5"; + sha256 = "0iacmk79wl97h9q47hzz60xzxnd2xs0yv4gxzdpmmzw2mbkvs4p6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; sha256 = "1zinzs3vzf2alsnxf5k71i7lp90fm26wv4y20ci52n0hnh5nz861"; - name = "redprl"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -32179,20 +41964,25 @@ license = lib.licenses.free; }; }) {}; - redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + redtick = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "redtick"; + ename = "redtick"; version = "0.1.1"; src = fetchFromGitHub { owner = "ferfebles"; repo = "redtick"; - rev = "14e3a07c229d1f660ca5129d6e8a52a8c68db94d"; - sha256 = "0q4a4iznk6xk680xnvly69j8w1dac79qxlycwrfki6msnkagyn9p"; + rev = "ff3a83974dfa2a6e9959baecc2d523cae8ddcda4"; + sha256 = "177bbpkkk3b7ljn9rv05774yxmbglkhyqm68bvlrgl75vnmm7jdz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3187bd436541e2a5c2b28de67c62f5d5165af737/recipes/redtick"; sha256 = "1a9rviz0hg6vlh2jc04g6vslyf9n89xglcz9cb79vf10hhr6igrb"; - name = "redtick"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -32200,9 +41990,18 @@ license = lib.licenses.free; }; }) {}; - refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: - melpaBuild { + refine = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , list-utils + , loop + , melpaBuild + , s }: + melpaBuild { pname = "refine"; + ename = "refine"; version = "0.3"; src = fetchFromGitHub { owner = "Wilfred"; @@ -32210,10 +42009,10 @@ rev = "9760e56ab849a4827e6c9425fdef6f5a7784c967"; sha256 = "1b4n0mfplh6vj87p3124c2fw24fj0vm9jvcaxrvccfq3sida4sf3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; sha256 = "1sk6rsd92pix7k8snnqm3hsimjzaihzjgac0g5h3a2zm9dabf4py"; - name = "refine"; + name = "recipe"; }; packageRequires = [ dash emacs list-utils loop s ]; meta = { @@ -32221,20 +42020,24 @@ license = lib.licenses.free; }; }) {}; - region-convert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + region-convert = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "region-convert"; + ename = "region-convert"; version = "0.0.1"; src = fetchFromGitHub { owner = "zonuexe"; repo = "right-click-context"; - rev = "31d370fce60d8cda04e1b9e4fe0e5d268fd37fe5"; - sha256 = "0bbfgz2n00dgqbij6c4kmlp3rnmf7jcjq56cmjck4nd81lkwk6j7"; + rev = "4391dd89616584dc34773d7c304a7db93f9b63a4"; + sha256 = "0kqgznjrdg70y5zcz7y9fxssddib6m1wrgfqza2g97g4gl1m91vf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert"; sha256 = "0daghvxc6gxgric1aa1gw036gbpbzilqz72gr1inqy92hz7xrxfm"; - name = "region-convert"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32242,9 +42045,14 @@ license = lib.licenses.free; }; }) {}; - relax = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + relax = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "relax"; + ename = "relax"; version = "0.2"; src = fetchFromGitHub { owner = "technomancy"; @@ -32252,10 +42060,10 @@ rev = "6e33892623ab87833082262321dc8e1977209626"; sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67247451b39461db4a5fcff3827a09f53f9fc8ec/recipes/relax"; sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk"; - name = "relax"; + name = "recipe"; }; packageRequires = [ json ]; meta = { @@ -32263,9 +42071,14 @@ license = lib.licenses.free; }; }) {}; - repeatable-motion = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + repeatable-motion = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "repeatable-motion"; + ename = "repeatable-motion"; version = "0.2"; src = fetchFromGitHub { owner = "willghatch"; @@ -32273,10 +42086,10 @@ rev = "e664b0a4a3e39c4085378a28b5136b349a0afb22"; sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd56ebaea098715b9c201f07e6196c38977f8e3/recipes/repeatable-motion"; sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw"; - name = "repeatable-motion"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -32284,20 +42097,25 @@ license = lib.licenses.free; }; }) {}; - repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }: - melpaBuild { + repl-toggle = callPackage ({ fetchFromGitHub + , fetchurl + , fullframe + , lib + , melpaBuild }: + melpaBuild { pname = "repl-toggle"; - version = "0.4.0"; + ename = "repl-toggle"; + version = "0.5.0"; src = fetchFromGitHub { owner = "tomterl"; repo = "repl-toggle"; - rev = "bd2d28738368a047d5f407034f78839a7e514489"; - sha256 = "1h58a2darz4k1aj480xahhp29gh2cg41pymidymjx4wi2ygic4pr"; + rev = "934f59478a5c5577795f9507e945d564be368510"; + sha256 = "13pgfqijfp0ad9h1rpcf0blppq3jv31wdgvpjndgi213vwrkk79j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/repl-toggle"; sha256 = "16k9fk1nl2llk9qli52kiirlx9rlz8yhjh3cy6v5y2b3k0y1cf0b"; - name = "repl-toggle"; + name = "recipe"; }; packageRequires = [ fullframe ]; meta = { @@ -32305,9 +42123,13 @@ license = lib.licenses.free; }; }) {}; - replace-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + replace-symbol = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "replace-symbol"; + ename = "replace-symbol"; version = "1.1"; src = fetchFromGitHub { owner = "bmastenbrook"; @@ -32315,10 +42137,10 @@ rev = "baf949e528aee1881f455f9c84e67718bedcb3f6"; sha256 = "178y1cmpdb2r72igx8j4l7pyhs1idw56j6hg5h8r9a2p99lkgjjc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/377b6ff2b785f6d87adf1e23a5b0ce02881fc5c9/recipes/replace-symbol"; sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng"; - name = "replace-symbol"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32326,9 +42148,15 @@ license = lib.licenses.free; }; }) {}; - replace-with-inflections = callPackage ({ fetchFromGitHub, fetchurl, inflections, lib, melpaBuild, string-inflection }: - melpaBuild { + replace-with-inflections = callPackage ({ fetchFromGitHub + , fetchurl + , inflections + , lib + , melpaBuild + , string-inflection }: + melpaBuild { pname = "replace-with-inflections"; + ename = "replace-with-inflections"; version = "0.3.0"; src = fetchFromGitHub { owner = "knu"; @@ -32336,10 +42164,10 @@ rev = "e0486653abf7c248024800132df23993cd617892"; sha256 = "1fygsr3vjpy0crxlyawwk6k21h1w3svgk79rm7fqg5xzilg6kf25"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7892eb506b8f4260bde4be2805bf3b2d594ab640/recipes/replace-with-inflections"; sha256 = "1pqpin5ipm3g74zjh1kh6s1gh0aan6202p0y2q00d4ywbz9kn5s0"; - name = "replace-with-inflections"; + name = "recipe"; }; packageRequires = [ inflections string-inflection ]; meta = { @@ -32347,20 +42175,25 @@ license = lib.licenses.free; }; }) {}; - repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + repo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "repo"; + ename = "repo"; version = "0.1.3"; src = fetchFromGitHub { owner = "canatella"; repo = "repo-el"; - rev = "d7b87cd515bad8a67d3a892a46a23f5fe81e08de"; - sha256 = "0rbvcvm7bfr6ncji7cllfxyyr6x7n9fx863byp243phsj3n93adz"; + rev = "9f03c0d90c9036b96e531c17d529f3855364d47a"; + sha256 = "1ggxs40mbk50aqhqqfdcz6izvlvsz53s93dj3ndxvgdxkpkxr6yn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1729d4ea9498549fff3594b971fcde5f81592f84/recipes/repo"; sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb"; - name = "repo"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -32368,9 +42201,17 @@ license = lib.licenses.free; }; }) {}; - req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: - melpaBuild { + req-package = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , ht + , lib + , log4e + , melpaBuild + , use-package }: + melpaBuild { pname = "req-package"; + ename = "req-package"; version = "1.2"; src = fetchFromGitHub { owner = "edvorg"; @@ -32378,10 +42219,10 @@ rev = "0c0ac7451149dac6bfda2adfe959d1df1c273de6"; sha256 = "0sx3kw1gpliifbc0gh2z1lvig68v3gwqjbj0izgn77js8kqxad84"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf"; - name = "req-package"; + name = "recipe"; }; packageRequires = [ dash ht log4e use-package ]; meta = { @@ -32389,9 +42230,14 @@ license = lib.licenses.free; }; }) {}; - request = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + request = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "request"; + ename = "request"; version = "0.3.0"; src = fetchFromGitHub { owner = "tkf"; @@ -32399,10 +42245,10 @@ rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8"; sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request"; sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji"; - name = "request"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -32410,20 +42256,26 @@ license = lib.licenses.free; }; }) {}; - request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + request-deferred = callPackage ({ deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "request-deferred"; + ename = "request-deferred"; version = "0.3.0"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8"; - sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"; + rev = "aeae9028de5c489b07a5f5df29682eff47f80f6b"; + sha256 = "002blp30bvi8l9b9mzjk8ib6xv3fps3j8cqrvbdj6dw2yvrcfl1g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred"; sha256 = "1dcxqnzmvddk61dzmfx8vjbzd8m44lscr3pjdp3r7211zhwfk40n"; - name = "request-deferred"; + name = "recipe"; }; packageRequires = [ deferred request ]; meta = { @@ -32431,20 +42283,28 @@ license = lib.licenses.free; }; }) {}; - requirejs = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, popup, s }: - melpaBuild { + requirejs = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild + , popup + , s }: + melpaBuild { pname = "requirejs"; + ename = "requirejs"; version = "1.1"; src = fetchFromGitHub { owner = "joeheyming"; repo = "requirejs-emacs"; - rev = "7d73453653b6b97cca59fcde8d529b5a228fbc01"; - sha256 = "1b832r7779rmr6rhzj7klc0l5xzwc4rids87g2hczpb5dhqnchca"; + rev = "ba99f27f97c0552f724aac822ff4e507f801b916"; + sha256 = "0s38b25jpf9l55c7z42zw5z86rihsymc48l0wp2n61ansafsalkk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6a710c0d5ab34c52498c4154deebb779052aa01/recipes/requirejs"; sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k"; - name = "requirejs"; + name = "recipe"; }; packageRequires = [ cl-lib js2-mode popup s ]; meta = { @@ -32452,20 +42312,26 @@ license = lib.licenses.free; }; }) {}; - resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + resize-window = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "resize-window"; + ename = "resize-window"; version = "0.7"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904"; - sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk"; + rev = "e281aca5a1b371aff20d7bfc6abc456de22e19dd"; + sha256 = "1d8jzhwif80bgj5pxa36hbavjrlmjg12yzxypl40d1wrjamq854c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l"; - name = "resize-window"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -32473,9 +42339,13 @@ license = lib.licenses.free; }; }) {}; - restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + restart-emacs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "restart-emacs"; + ename = "restart-emacs"; version = "0.1.1"; src = fetchFromGitHub { owner = "iqbalansari"; @@ -32483,10 +42353,10 @@ rev = "e9292fe88d8be7d0ecf9f4f30ed98ffbc6bd689b"; sha256 = "0y4ga1lj2x2f0r535ivs09m2l0q76iz72w42wknhsw9lmdsyl5nz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs"; sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6"; - name = "restart-emacs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32494,9 +42364,15 @@ license = lib.licenses.free; }; }) {}; - restclient-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }: - melpaBuild { + restclient-test = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , restclient }: + melpaBuild { pname = "restclient-test"; + ename = "restclient-test"; version = "0.2"; src = fetchFromGitHub { owner = "simenheg"; @@ -32504,10 +42380,10 @@ rev = "a21e41b905b423e762eeb4da3a236c8b1aea8c49"; sha256 = "1lan49723rpzg1q7w8x3iggazwl4zirq5l8nhpb8m5hmg21a4kih"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82e3078fc1f96d276fd288c3d7b91df5df4717a6/recipes/restclient-test"; sha256 = "0g26z5p9fq7fm6bgrwaszya5xmhsgzcn1p7zqr83w74fbw6bcl39"; - name = "restclient-test"; + name = "recipe"; }; packageRequires = [ emacs restclient ]; meta = { @@ -32515,9 +42391,13 @@ license = lib.licenses.free; }; }) {}; - reveal-in-osx-finder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + reveal-in-osx-finder = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "reveal-in-osx-finder"; + ename = "reveal-in-osx-finder"; version = "0.3.3"; src = fetchFromGitHub { owner = "kaz-yos"; @@ -32525,10 +42405,10 @@ rev = "5710e5936e47139a610ec9a06899f72e77ddc7bc"; sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bf40285279b761b0efd6bc8542ae9aad4b329e1/recipes/reveal-in-osx-finder"; sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc"; - name = "reveal-in-osx-finder"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32536,20 +42416,24 @@ license = lib.licenses.free; }; }) {}; - reverse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + reverse-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "reverse-theme"; + ename = "reverse-theme"; version = "0.3"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-reverse-theme"; - rev = "3105c950bcb51c662c79b59ca102ef662c2b0be0"; - sha256 = "15xnz4fi22wsximimwmirlz11v4ksfj8nilyjfw6acd92yrhzg6h"; + rev = "13d0821a4ec5ece7e6a81f50d2a1a7e7ad21394d"; + sha256 = "1sfl0rm4sxjkcjki0hmkkcicr24qr2q7gmficg9bi5q6vlrid1pn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/reverse-theme"; sha256 = "163kk5qnz9bk3l2fam79n264s764jfxbwqbiwgid8kw9cmk0v776"; - name = "reverse-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32557,20 +42441,27 @@ license = lib.licenses.free; }; }) {}; - rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + rg = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "rg"; - version = "1.4.2"; + ename = "rg"; + version = "1.5.0"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "562ac6fd6291f828ee6116db62982c77ddd52956"; - sha256 = "0r5pqjmjwn5qpm8kns1730a6cq3bqxjp8ha63w0n1hnrd4gb24sw"; + rev = "943226043dc9055b282d0c035fd1e1cbdd562b22"; + sha256 = "0hm25x1zym4xdc4w1ayn1an4nrg1qwyh12vb9sxas3fplapm500k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; - name = "rg"; + name = "recipe"; }; packageRequires = [ cl-lib emacs s ]; meta = { @@ -32578,9 +42469,14 @@ license = lib.licenses.free; }; }) {}; - rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rib-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rib-mode"; + ename = "rib-mode"; version = "1.0.2"; src = fetchFromGitHub { owner = "blezek"; @@ -32588,10 +42484,10 @@ rev = "4172e902fd66f235184c0eb6db7fd4a73dbd0866"; sha256 = "0s9dyqv4yh0zxngay951g98g07029h51m4r2fc7ib2arw6srfram"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode"; sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587"; - name = "rib-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -32599,20 +42495,25 @@ license = lib.licenses.free; }; }) {}; - rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rich-minority = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rich-minority"; + ename = "rich-minority"; version = "1.0.2"; src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4"; - sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b"; + rev = "333e4669f76a0fb68b433117d377711e418a525e"; + sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc"; - name = "rich-minority"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -32620,20 +42521,25 @@ license = lib.licenses.free; }; }) {}; - rigid-tabs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rigid-tabs = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rigid-tabs"; + ename = "rigid-tabs"; version = "1.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "wavexx"; repo = "rigid-tabs.el"; rev = "c7c6b726806df7e8cb25a41b213a207850c91cb7"; sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/689b0060ee5db505fc0ed4603aca204b2d3c63a2/recipes/rigid-tabs"; - sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp"; - name = "rigid-tabs"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/rigid-tabs"; + sha256 = "0623hhhykrxq702871s5p4vddkvx7jpj6hg5q0c9jkbvflz9n9y8"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -32641,20 +42547,28 @@ license = lib.licenses.free; }; }) {}; - rinari = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, jump, lib, melpaBuild, ruby-compilation, ruby-mode ? null }: - melpaBuild { + rinari = callPackage ({ fetchFromGitHub + , fetchurl + , inf-ruby + , jump + , lib + , melpaBuild + , ruby-compilation + , ruby-mode ? null }: + melpaBuild { pname = "rinari"; + ename = "rinari"; version = "2.11"; src = fetchFromGitHub { owner = "eschulte"; repo = "rinari"; - rev = "e2ed2fa55ac3435a86b1cf6a4f2d29aebc309135"; - sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk"; + rev = "7a146b23f80ac672005adc74d3d71aae83383a21"; + sha256 = "19f5n44f9qh7agvyhmwqmdh86y4vf1sn41h2afm85l2a8xq6r7rh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b243a909faa71e14ee7ca4f307df8e8136e5d7c/recipes/rinari"; sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0"; - name = "rinari"; + name = "recipe"; }; packageRequires = [ inf-ruby jump ruby-compilation ruby-mode ]; meta = { @@ -32662,9 +42576,13 @@ license = lib.licenses.free; }; }) {}; - ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ripgrep = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ripgrep"; + ename = "ripgrep"; version = "0.4.0"; src = fetchFromGitHub { owner = "nlamirault"; @@ -32672,10 +42590,10 @@ rev = "73595f1364f2117db49e1e4a49290bd6d430e345"; sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; sha256 = "1j9c3mhcyhs4xf44z6fnlvmb81pps25bp43gdqvp0954i068mgah"; - name = "ripgrep"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32683,9 +42601,15 @@ license = lib.licenses.free; }; }) {}; - rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: - melpaBuild { + rjsx-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild }: + melpaBuild { pname = "rjsx-mode"; + ename = "rjsx-mode"; version = "0.4.0"; src = fetchFromGitHub { owner = "felipeochoa"; @@ -32693,10 +42617,10 @@ rev = "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0"; sha256 = "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; sha256 = "0w3ij8k8058pfw443chm1kn30ia0f5rfbg03w9ddw86xb3wa2q0b"; - name = "rjsx-mode"; + name = "recipe"; }; packageRequires = [ emacs js2-mode ]; meta = { @@ -32704,9 +42628,15 @@ license = lib.licenses.free; }; }) {}; - robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: - melpaBuild { + robe = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild }: + melpaBuild { pname = "robe"; + ename = "robe"; version = "0.8.1"; src = fetchFromGitHub { owner = "dgutov"; @@ -32714,10 +42644,10 @@ rev = "22457d6855fb39b8aedf068556d0e2fbd2874d5b"; sha256 = "0ll7ivxqnglfb0i70ly6qq2yfw9cyi3vq3lmj4s6h6c1c7rm3gcq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe"; sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk"; - name = "robe"; + name = "recipe"; }; packageRequires = [ emacs inf-ruby ]; meta = { @@ -32725,9 +42655,13 @@ license = lib.licenses.free; }; }) {}; - robots-txt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + robots-txt-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "robots-txt-mode"; + ename = "robots-txt-mode"; version = "0.0.2"; src = fetchFromGitHub { owner = "emacs-php"; @@ -32735,10 +42669,10 @@ rev = "edf1f8082c88cb2ff5a784ba00f92c535aaa1c7d"; sha256 = "11ig771ck610glb6f3322ka026ikq0b072rlq5z6ymr3rbxagn6j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/robots-txt-mode"; sha256 = "00hxz4mygcxg7d8m2i4cm0bl82v3hw8wb4m8vv7g7fqkjp32c9qc"; - name = "robots-txt-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32746,9 +42680,14 @@ license = lib.licenses.free; }; }) {}; - roguel-ike = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + roguel-ike = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "roguel-ike"; + ename = "roguel-ike"; version = "0.1.1"; src = fetchFromGitHub { owner = "stevenremot"; @@ -32756,10 +42695,10 @@ rev = "706dcb0687e8016d7d776f9d9e5ace9fdbbca43c"; sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2db1979e039e466268ca7c264988792d3046e19a/recipes/roguel-ike"; sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8"; - name = "roguel-ike"; + name = "recipe"; }; packageRequires = [ popup ]; meta = { @@ -32767,9 +42706,13 @@ license = lib.licenses.free; }; }) {}; - rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rope-read-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rope-read-mode"; + ename = "rope-read-mode"; version = "0.3.4"; src = fetchFromGitHub { owner = "marcowahl"; @@ -32777,10 +42720,10 @@ rev = "71e475ab35555e0a1eca26d73acf1ced911e422e"; sha256 = "0x3mmf4gq4d0cqfqbkrrpwhayvmplacck0zc9nlzcn35y17jzpcz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw"; - name = "rope-read-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32788,20 +42731,24 @@ license = lib.licenses.free; }; }) {}; - rsense = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rsense = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rsense"; + ename = "rsense"; version = "0.3"; src = fetchFromGitHub { owner = "m2ym"; repo = "rsense"; - rev = "e4297052ef32d06237e8bd1534a0caf70a34ad28"; - sha256 = "0mfkq8n28lal4lqwp6v0ilz8wrwgg61sbm0jggznwisjqqy3lzrh"; + rev = "fbcfc00402742b0d8744a9bfd1bcdd869f4fb923"; + sha256 = "178rnmhj3987dscsjkg5qcsw92s3b5rv51s0j7qcavx254h7xdf0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2149ce3baef9ac01d5b2e8b1a933a3e1206015f/recipes/rsense"; sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5"; - name = "rsense"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32809,9 +42756,15 @@ license = lib.licenses.free; }; }) {}; - rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: - melpaBuild { + rspec-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , ruby-mode ? null }: + melpaBuild { pname = "rspec-mode"; + ename = "rspec-mode"; version = "1.11"; src = fetchFromGitHub { owner = "pezra"; @@ -32819,10 +42772,10 @@ rev = "e289e52ec4b3aa1caf35957d721e5568eca2a3bb"; sha256 = "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx"; - name = "rspec-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ruby-mode ]; meta = { @@ -32830,9 +42783,13 @@ license = lib.licenses.free; }; }) {}; - rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rtags = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rtags"; + ename = "rtags"; version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; @@ -32840,10 +42797,10 @@ rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; sha256 = "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd"; - name = "rtags"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32851,9 +42808,16 @@ license = lib.licenses.free; }; }) {}; - rubik = callPackage ({ calc, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rubik = callPackage ({ calc + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rubik"; + ename = "rubik"; version = "1.2"; src = fetchFromGitHub { owner = "Kurvivor19"; @@ -32861,10 +42825,10 @@ rev = "7ec955639865ca8e99a941843e19b12be5015a47"; sha256 = "0fdjg6gpg45m5myq517vkprmvh50xw10dqa8vwr9hfz2z8dy18ja"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik"; sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267"; - name = "rubik"; + name = "recipe"; }; packageRequires = [ calc cl-lib emacs ]; meta = { @@ -32872,9 +42836,14 @@ license = lib.licenses.free; }; }) {}; - rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rubocop = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rubocop"; + ename = "rubocop"; version = "0.5.0"; src = fetchFromGitHub { owner = "bbatsov"; @@ -32882,10 +42851,10 @@ rev = "980bedb455e3551d35a212fae515c054888907c1"; sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop"; sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q"; - name = "rubocop"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -32893,9 +42862,40 @@ license = lib.licenses.free; }; }) {}; - ruby-compilation = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: - melpaBuild { + rubocopfmt = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "rubocopfmt"; + ename = "rubocopfmt"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "jimeh"; + repo = "rubocopfmt.el"; + rev = "34c69c9c923d0da223f7569a6ecc842095adcf85"; + sha256 = "0aa683r16gvpv07i0gzbil81kgxbgk4pjn510xgalan3fk20nal4"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ac01edffceea771d8fe41326e28dd9881f1661ab/recipes/rubocopfmt"; + sha256 = "06ficv1r3axzi7q659pk1m3gbpf44nd2ir2ikmi8mr8rq44sqps0"; + name = "recipe"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/rubocopfmt"; + license = lib.licenses.free; + }; + }) {}; + ruby-compilation = callPackage ({ fetchFromGitHub + , fetchurl + , inf-ruby + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-compilation"; + ename = "ruby-compilation"; version = "2.11"; src = fetchFromGitHub { owner = "eschulte"; @@ -32903,10 +42903,10 @@ rev = "e2ed2fa55ac3435a86b1cf6a4f2d29aebc309135"; sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/ruby-compilation"; sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc"; - name = "ruby-compilation"; + name = "recipe"; }; packageRequires = [ inf-ruby ]; meta = { @@ -32914,9 +42914,13 @@ license = lib.licenses.free; }; }) {}; - ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ruby-electric = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-electric"; + ename = "ruby-electric"; version = "2.3.1"; src = fetchFromGitHub { owner = "knu"; @@ -32924,10 +42928,10 @@ rev = "3553448a780a1ea5c3b0e9becd820d4762876593"; sha256 = "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric"; sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2"; - name = "ruby-electric"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32935,9 +42939,13 @@ license = lib.licenses.free; }; }) {}; - ruby-end = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ruby-end = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-end"; + ename = "ruby-end"; version = "0.4.1"; src = fetchFromGitHub { owner = "rejeep"; @@ -32945,10 +42953,10 @@ rev = "648b81af136a581bcef387744d93c011d9cdf54b"; sha256 = "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ruby-end"; sha256 = "1cnmdlkhm8xsifbjs6ymvi92gdnxiaghb04h10qg41phj6v7m9mg"; - name = "ruby-end"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32956,9 +42964,13 @@ license = lib.licenses.free; }; }) {}; - ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ruby-hash-syntax = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-hash-syntax"; + ename = "ruby-hash-syntax"; version = "0.5"; src = fetchFromGitHub { owner = "purcell"; @@ -32966,10 +42978,10 @@ rev = "bc05c3130a5d3237f04c6064297e56de5f73887d"; sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5"; - name = "ruby-hash-syntax"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32977,20 +42989,24 @@ license = lib.licenses.free; }; }) {}; - ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ruby-test-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-test-mode"; + ename = "ruby-test-mode"; version = "1.0"; src = fetchFromGitHub { owner = "r0man"; repo = "ruby-test-mode"; - rev = "7d3c04b60721665af93ffb4abc2a7b3191926431"; - sha256 = "008zj9rg2cmh0xd7g6kgx6snm5sspxs4jmfa8hd43wx5y9pmlb8f"; + rev = "a8f41e63d9e9b031fcbad57911b0a28a444f6cdb"; + sha256 = "1wck3n2lcsasrg14jimm9iiyxdsh9mr9293q1kx4l0jm0z1k8f43"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode"; sha256 = "06j1q9m08jkwlnkccppf2qlcs48nr8ic9sjdv90rnixc18bw7bpk"; - name = "ruby-test-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -32998,9 +43014,13 @@ license = lib.licenses.free; }; }) {}; - ruby-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ruby-tools = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ruby-tools"; + ename = "ruby-tools"; version = "0.1.2"; src = fetchFromGitHub { owner = "rejeep"; @@ -33008,10 +43028,10 @@ rev = "6e7fb376085bfa7010ecd3dfad63adacc6e2b4ac"; sha256 = "1zvhq9l717rjgkm7bxz5gqkmh5i49cshwzlimb3h78kpjw3hxl2k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ruby-tools"; sha256 = "0zpk55rkrqyangyyljxzf0n1icgqnpdzycwack5rji556h5grvjy"; - name = "ruby-tools"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33019,20 +43039,25 @@ license = lib.licenses.free; }; }) {}; - rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rufo = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rufo"; + ename = "rufo"; version = "0.3.0"; src = fetchFromGitHub { owner = "danielma"; repo = "rufo.el"; - rev = "4e7413fafd0320f30190ae9835ab021cf7a9ebdc"; - sha256 = "10gwr479q4kd6ndp9r2nzj7rzap21q3f0l3icrviah9l5xzdx2x0"; + rev = "550651cbb39bef875a994cbcda10ecd6f9ab1d6d"; + sha256 = "0i0azjnrp4km9p5zmdzj9py7g0wg6h5dwi4pz0j5zj0a97qiqmhy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo"; sha256 = "0pxsifcxic3q54rqj0jbj20hq7f2s4icl57lligf9g0w23qzj239"; - name = "rufo"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -33040,20 +43065,24 @@ license = lib.licenses.free; }; }) {}; - runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + runner = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "runner"; + ename = "runner"; version = "1.8"; src = fetchFromGitHub { owner = "thamer"; repo = "runner"; - rev = "a211d57ddc600410d07a8b534920ba905b093d87"; - sha256 = "1ddf5jydpc43wgvw4a669wifij71b4r8zfazcqfdpyfh1j4m591b"; + rev = "e7394d7c9e886788a656a7085b4cf963d6fc318f"; + sha256 = "0gpfszp6bqr3vdr32vr6l0nq9hnic31vnins68hc5hknli91bpsq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a4e051ab45b8036b91aa0c50bd3f93cd85e9d0/recipes/runner"; sha256 = "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx"; - name = "runner"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33061,9 +43090,13 @@ license = lib.licenses.free; }; }) {}; - russian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + russian-holidays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "russian-holidays"; + ename = "russian-holidays"; version = "0.4"; src = fetchFromGitHub { owner = "grafov"; @@ -33071,10 +43104,10 @@ rev = "b285a30f29d85c48e3ea4eb93972d34a090c167b"; sha256 = "1mz842gvrscklg2w2r2q2wbj92qr31h895k700j3axqx6k30ni0h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4830900e371e7036225ea434c52204f4d2481a7/recipes/russian-holidays"; sha256 = "0lawjwz296grbvb4a1mm1j754q7mpcanyfln1gqxr339kqx2aqd8"; - name = "russian-holidays"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33082,9 +43115,14 @@ license = lib.licenses.free; }; }) {}; - rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rust-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rust-mode"; + ename = "rust-mode"; version = "0.3.0"; src = fetchFromGitHub { owner = "rust-lang"; @@ -33092,10 +43130,10 @@ rev = "e32765893ce2efb2db6662f507fb9d33d5c1b61b"; sha256 = "03i79iqhr8fzri018hx65rix1fsdxk38pkvbw5z6n5flbfr4m0k4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; sha256 = "1i1mw1v99nyikscg2s1m216b0h8svbzmf5kjvjgk9zjiba4cbqzc"; - name = "rust-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -33103,20 +43141,26 @@ license = lib.licenses.free; }; }) {}; - rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: - melpaBuild { + rust-playground = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , rust-mode }: + melpaBuild { pname = "rust-playground"; - version = "0.1"; + ename = "rust-playground"; + version = "0.2.1"; src = fetchFromGitHub { owner = "grafov"; repo = "rust-playground"; - rev = "6a23f8956bce1deaa38f52c01f5571c5cff77445"; - sha256 = "1aqcpmzzww4fd63l65rfyj0f8skdqh7j1vznwqnj71x65xlda0ys"; + rev = "2f22ec74e4158984e0e70cf0bf728bbd42eb661b"; + sha256 = "1p80zghdk3hsfj36z30sfkllqr3b4yi279zkg0la9kfg6785x2cg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rust-playground"; sha256 = "0ml0zr9vz2vjd9wr0v706w4v4qqfzpa56rdzfak2kb5llx53j89v"; - name = "rust-playground"; + name = "recipe"; }; packageRequires = [ emacs rust-mode ]; meta = { @@ -33124,9 +43168,13 @@ license = lib.licenses.free; }; }) {}; - rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + rvm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "rvm"; + ename = "rvm"; version = "1.4.0"; src = fetchFromGitHub { owner = "senny"; @@ -33134,10 +43182,10 @@ rev = "8e45a9bad8e317ff195f384dab14d3402497dc79"; sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/rvm"; sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8"; - name = "rvm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33145,9 +43193,13 @@ license = lib.licenses.free; }; }) {}; - s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + s = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "s"; + ename = "s"; version = "1.12.0"; src = fetchFromGitHub { owner = "magnars"; @@ -33155,10 +43207,10 @@ rev = "12f116d58ac03706496bd682c6449b452681874e"; sha256 = "1g8mqd13llj007al4nlxxx4z2lcsg3wk970mgjn0avwrhjjgdmmv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; sha256 = "0dars9212z0yv97mj4615h23vd22vy8b6cw2n433z9jhif3aybqa"; - name = "s"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33166,9 +43218,13 @@ license = lib.licenses.free; }; }) {}; - sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sackspace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sackspace"; + ename = "sackspace"; version = "0.8.2"; src = fetchFromGitHub { owner = "cofi"; @@ -33176,10 +43232,10 @@ rev = "fd0480eaaf6d3d11fd30ac5feb2da2f4f7572708"; sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/073e92e05c4bd6197a5ad24f470b21a97f5bb7b8/recipes/sackspace"; sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z"; - name = "sackspace"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33187,9 +43243,17 @@ license = lib.licenses.free; }; }) {}; - sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: - melpaBuild { + sage-shell-mode = callPackage ({ cl-lib ? null + , deferred + , emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "sage-shell-mode"; + ename = "sage-shell-mode"; version = "0.3"; src = fetchFromGitHub { owner = "sagemath"; @@ -33197,10 +43261,10 @@ rev = "e8bc089e8dfd76f688160e2ac77aee985afeade7"; sha256 = "166plwg9ggivr3im0yfxw8k6m9ral37jzznnb06kb6g0zycb4aps"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; sha256 = "0ivqiigmp9cf88j4xapzanjpbx692r70wb4i25mnppqsi3jlwxdv"; - name = "sage-shell-mode"; + name = "recipe"; }; packageRequires = [ cl-lib deferred emacs let-alist ]; meta = { @@ -33208,9 +43272,16 @@ license = lib.licenses.free; }; }) {}; - salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: - melpaBuild { + salt-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mmm-jinja2 + , mmm-mode + , yaml-mode }: + melpaBuild { pname = "salt-mode"; + ename = "salt-mode"; version = "0.1"; src = fetchFromGitHub { owner = "glynnforrest"; @@ -33218,10 +43289,10 @@ rev = "e14ed8f2ce0ab7a783c4341879ec8c003e2b5c81"; sha256 = "19gw35qv13f2r4wif5fgqfhrph2r320n81faxx8980zds28x2q0x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; sha256 = "1n7i9d6qpjsdcgbzmbf63y4c7ggxh5wsim8fd0casnrq9bl7ssym"; - name = "salt-mode"; + name = "recipe"; }; packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ]; meta = { @@ -33229,9 +43300,14 @@ license = lib.licenses.free; }; }) {}; - sass-mode = callPackage ({ fetchFromGitHub, fetchurl, haml-mode, lib, melpaBuild }: - melpaBuild { + sass-mode = callPackage ({ fetchFromGitHub + , fetchurl + , haml-mode + , lib + , melpaBuild }: + melpaBuild { pname = "sass-mode"; + ename = "sass-mode"; version = "3.0.18"; src = fetchFromGitHub { owner = "nex3"; @@ -33239,10 +43315,10 @@ rev = "26a66e331b507fb420e3bb7d0a6a8fbb04294343"; sha256 = "0lxrq3mzabkwj5bv0mgd7fnx3dsx8vxd5kjgb79rjfra0m7pfgln"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/sass-mode"; sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800"; - name = "sass-mode"; + name = "recipe"; }; packageRequires = [ haml-mode ]; meta = { @@ -33250,9 +43326,13 @@ license = lib.licenses.free; }; }) {}; - sauron = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sauron = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sauron"; + ename = "sauron"; version = "0.10"; src = fetchFromGitHub { owner = "djcb"; @@ -33260,10 +43340,10 @@ rev = "a9877f0efa9418c41d25002b58d1c2f8c69ec975"; sha256 = "1mcag7qad1npjn096byakb8pmmi2g64nlf2vcc12irzmwia85fml"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d30dcc4715422133e1bb00ad7a8e25b060387e4/recipes/sauron"; sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb"; - name = "sauron"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33271,9 +43351,13 @@ license = lib.licenses.free; }; }) {}; - say-what-im-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + say-what-im-doing = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "say-what-im-doing"; + ename = "say-what-im-doing"; version = "0.2"; src = fetchFromGitHub { owner = "benaiah"; @@ -33281,10 +43365,10 @@ rev = "4acc16360a29646040b51db158ba7fdeb711449d"; sha256 = "1gkzgcnh5ib4j5206mx8gbwj5ykay19vqlfg9070m2r09d1a55qf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d22ddcd4ad9514fe0c36f299e7463a4b7e771d7/recipes/say-what-im-doing"; sha256 = "1hgh842f7gs2sxy7s6zq57nsqy4jjlnjcga6hwzcx0kw3albgz7x"; - name = "say-what-im-doing"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33292,20 +43376,25 @@ license = lib.licenses.free; }; }) {}; - sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sayid = callPackage ({ cider + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sayid"; - version = "0.0.15"; + ename = "sayid"; + version = "0.0.16"; src = fetchFromGitHub { owner = "bpiel"; repo = "sayid"; - rev = "b44b6d346604f8d1ef9b9180be359ce1e601a298"; - sha256 = "0ggk60l132qgscgqbx4fdhzx6nlv2k7gbrjapkdl15slz2kyq03d"; + rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f"; + sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid"; sha256 = "0chz46wmwmsn4ys59pn7lqs4assqy2hv43rvka7kq61jdl4g6fgs"; - name = "sayid"; + name = "recipe"; }; packageRequires = [ cider ]; meta = { @@ -33313,20 +43402,25 @@ license = lib.licenses.free; }; }) {}; - sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sbt-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sbt-mode"; - version = "1.0.2"; + ename = "sbt-mode"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "a70899661861cf40f54f773c3066fe5b5e9fb71d"; - sha256 = "0gnqy88qi751pzpg8ga3j2yx0x9cz5inkqpv2451n5b0gjfps9yh"; + rev = "e658af140547cbef495c33535c7f694a501d318c"; + sha256 = "0lv9ridzk9x6rkf7lj21srnszypyq04vqg05vl10zhpz1yqlnbjd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8"; - name = "sbt-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -33334,9 +43428,13 @@ license = lib.licenses.free; }; }) {}; - scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scala-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scala-mode"; + ename = "scala-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "ensime"; @@ -33344,10 +43442,10 @@ rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379"; sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; sha256 = "12x377iw085fbkjb034dmcsbi7hma17zkkmbgrhkvfkz8pbgaic8"; - name = "scala-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33355,19 +43453,24 @@ license = lib.licenses.free; }; }) {}; - schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + schrute = callPackage ({ emacs + , fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "schrute"; + ename = "schrute"; version = "0.2.2"; src = fetchgit { url = "https://bitbucket.org/shackra/dwight-k.-schrute"; rev = "08ab6565fa94f3a8016163fe6f7be1932af1156b"; sha256 = "0l1k6wjjr569lk5k8ydwq13041kn889g20qbzf79qj1ws96rim4m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute"; sha256 = "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy"; - name = "schrute"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -33375,9 +43478,14 @@ license = lib.licenses.free; }; }) {}; - scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: - melpaBuild { + scpaste = callPackage ({ fetchFromGitHub + , fetchurl + , htmlize + , lib + , melpaBuild }: + melpaBuild { pname = "scpaste"; + ename = "scpaste"; version = "0.6.5"; src = fetchFromGitHub { owner = "technomancy"; @@ -33385,10 +43493,10 @@ rev = "cca8f4ee5402bbf9a4bbb24e81372067cb21bba4"; sha256 = "13s8hp16wxd9fb8gf05dn0xr692kkgiqg7v49fgr00gas4xgpfpm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9007fb32097bc63731c3615dae9342fcef2558a2/recipes/scpaste"; sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1"; - name = "scpaste"; + name = "recipe"; }; packageRequires = [ htmlize ]; meta = { @@ -33396,9 +43504,13 @@ license = lib.licenses.free; }; }) {}; - scss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + scss-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "scss-mode"; + ename = "scss-mode"; version = "0.5.0"; src = fetchFromGitHub { owner = "antonj"; @@ -33406,10 +43518,10 @@ rev = "d663069667d9b158d56e863b80dd4cc02984e49f"; sha256 = "0zpjf9cp8g4rgnwgmhlpwnanf9lzqm3rm1mkihf0gk5qzxvwsdh9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/scss-mode"; sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv"; - name = "scss-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33417,9 +43529,13 @@ license = lib.licenses.free; }; }) {}; - search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + search-web = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "search-web"; + ename = "search-web"; version = "1.1"; src = fetchFromGitHub { owner = "tomoya"; @@ -33427,10 +43543,10 @@ rev = "c4ae86ac1acfc572b81f3d78764bd9a54034c331"; sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f1a3697649ccf69c8eb177c31ec4246b98f503b/recipes/search-web"; sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36"; - name = "search-web"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33438,19 +43554,28 @@ license = lib.licenses.free; }; }) {}; - secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }: - melpaBuild { + secretaria = callPackage ({ alert + , emacs + , f + , fetchgit + , fetchurl + , lib + , melpaBuild + , org + , s }: + melpaBuild { pname = "secretaria"; + ename = "secretaria"; version = "0.2.7"; src = fetchgit { url = "https://bitbucket.org/shackra/secretaria.el"; rev = "1cd32d957864be1ba5c44a3f505f662832169a28"; sha256 = "1xvwzmcfwfxsm9chbjnqjsipmv5pqpzk5d0ybw3rcdc47nag3jdg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria"; sha256 = "1a8jf91wplzazssh0s8ld0g8rp57gdfvxlsyn643w3mbp3ny8ybv"; - name = "secretaria"; + name = "recipe"; }; packageRequires = [ alert emacs f org s ]; meta = { @@ -33458,9 +43583,16 @@ license = lib.licenses.free; }; }) {}; - sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + sekka = callPackage ({ cl-lib ? null + , concurrent + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "sekka"; + ename = "sekka"; version = "1.8.0"; src = fetchFromGitHub { owner = "kiyoka"; @@ -33468,10 +43600,10 @@ rev = "d1fd5d47aacba723631d5d374169a45ff2051c41"; sha256 = "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp"; - name = "sekka"; + name = "recipe"; }; packageRequires = [ cl-lib concurrent popup ]; meta = { @@ -33479,9 +43611,13 @@ license = lib.licenses.free; }; }) {}; - select-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + select-themes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "select-themes"; + ename = "select-themes"; version = "0.1.4"; src = fetchFromGitHub { owner = "jasonm23"; @@ -33489,10 +43625,10 @@ rev = "236f54287519a3ea6dd7b3992d053e4f4ff5d0fe"; sha256 = "1c9yv1kjcd0jrzgw99q9p4kzj980f261mjcsggbcw806wb0iw1xn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4e7d01da10a1a1f7fe563031af5d3f9694cea33/recipes/select-themes"; sha256 = "18ydv7240vcqppg1i7n8sy18hy0lhpxz17947kxs7mvj4rl4wd84"; - name = "select-themes"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33500,9 +43636,13 @@ license = lib.licenses.free; }; }) {}; - selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + selectric-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "selectric-mode"; + ename = "selectric-mode"; version = "1.4.1"; src = fetchFromGitHub { owner = "rbanffy"; @@ -33510,10 +43650,10 @@ rev = "a35cb3815caceaf273ad7d16ac3b2dd3c7a3003e"; sha256 = "04bj71080wqybznyx63dawhppq6x3p88x1j56gvl8kvxv2hwzgzf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode"; sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4"; - name = "selectric-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33521,9 +43661,21 @@ license = lib.licenses.free; }; }) {}; - servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }: - melpaBuild { + servant = callPackage ({ ansi + , commander + , dash + , epl + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , shut-up + , web-server }: + melpaBuild { pname = "servant"; + ename = "servant"; version = "0.3.0"; src = fetchFromGitHub { owner = "cask"; @@ -33531,10 +43683,10 @@ rev = "4d2aa8250b54b28e6e7ee4cd5ebd98a33db2c134"; sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/servant"; sha256 = "0h8xsg37cvc5r8vkclf7d3gbf6gh4k5pmbiyhwpkbrxwjyl1sl21"; - name = "servant"; + name = "recipe"; }; packageRequires = [ ansi commander dash epl f s shut-up web-server ]; meta = { @@ -33542,9 +43694,17 @@ license = lib.licenses.free; }; }) {}; - serverspec = callPackage ({ dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: - melpaBuild { + serverspec = callPackage ({ dash + , f + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , s }: + melpaBuild { pname = "serverspec"; + ename = "serverspec"; version = "0.0.7"; src = fetchFromGitHub { owner = "k1LoW"; @@ -33552,10 +43712,10 @@ rev = "b6dfe82af9869438de5e5d860ced196641f372c0"; sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a4f4757d8886d178a85d4bc8ac9399a99d8c4d4/recipes/serverspec"; sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id"; - name = "serverspec"; + name = "recipe"; }; packageRequires = [ dash f helm s ]; meta = { @@ -33563,9 +43723,14 @@ license = lib.licenses.free; }; }) {}; - services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + services = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "services"; + ename = "services"; version = "1.7"; src = fetchFromGitHub { owner = "davep"; @@ -33573,10 +43738,10 @@ rev = "514e4095e8964c4d0f38c4f3ad6c692e86d12faa"; sha256 = "1k6w2ghi1iczh65bbln5ryxwnxmkkjm3p0p54s155q9sjidiqlwb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services"; sha256 = "02lgmpbw52ps6z4p9gwzvh9iaxisq5mb0n9aml9ajxac1473vpcd"; - name = "services"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -33584,9 +43749,39 @@ license = lib.licenses.free; }; }) {}; - session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sesman = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "sesman"; + ename = "sesman"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "vspinu"; + repo = "sesman"; + rev = "0d8d1bef455b58439df333f2a0a0693543b8f098"; + sha256 = "1hgl1djfxiajcc5rnwq7rlli6fhim57mbmabxdsc78p18c1azxhz"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/31110e9bd82ad9c817e6cb597fa9c26c4cdc93ed/recipes/sesman"; + sha256 = "106jcdsp7rhkr4bbyprcld5fxcnimfcyx0cwcpzhd0b4vh3v3qvg"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/sesman"; + license = lib.licenses.free; + }; + }) {}; + session = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "session"; + ename = "session"; version = "2.3.1"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -33594,10 +43789,10 @@ rev = "19ea0806873daac3539a4b956e15655e99e3dd6c"; sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/session"; sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx"; - name = "session"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33605,9 +43800,13 @@ license = lib.licenses.free; }; }) {}; - sexp-move = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + sexp-move = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sexp-move"; + ename = "sexp-move"; version = "0.2.6"; src = fetchFromGitLab { owner = "elzair"; @@ -33615,10 +43814,10 @@ rev = "117f7a91ab7c25e438413753e916570122011ce7"; sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sexp-move"; sha256 = "0sdm3kr4594fy9hk8yljj2iwa40bgs8nqpwwl2a60r060spz54z9"; - name = "sexp-move"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33626,9 +43825,13 @@ license = lib.licenses.free; }; }) {}; - sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sexy-monochrome-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sexy-monochrome-theme"; + ename = "sexy-monochrome-theme"; version = "3.1"; src = fetchFromGitHub { owner = "voloyev"; @@ -33636,10 +43839,10 @@ rev = "f64714a176d9212c9fa82355dd8ec89587ce13f0"; sha256 = "17ahrdyk2v7vz13b4934xn8xjza4b7bfrkq8n42frq3pc8mgwqfd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme"; sha256 = "0rlx4029zxrnzzqspn8zrp3q6w0n46q24qk7za46hvxdsmgdpxbq"; - name = "sexy-monochrome-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33647,9 +43850,14 @@ license = lib.licenses.free; }; }) {}; - shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shackle = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shackle"; + ename = "shackle"; version = "1.0.1"; src = fetchFromGitHub { owner = "wasamasa"; @@ -33657,10 +43865,10 @@ rev = "4189c1c773aab533969b587f7801ffbcd1d7d613"; sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6"; - name = "shackle"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -33668,20 +43876,24 @@ license = lib.licenses.free; }; }) {}; - shakespeare-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shakespeare-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shakespeare-mode"; - version = "0.0.1"; + ename = "shakespeare-mode"; + version = "0.0.2"; src = fetchFromGitHub { owner = "CodyReichert"; repo = "shakespeare-mode"; - rev = "4bff63eeac2b7ec1220f17e8bbcddbea4c11cb02"; - sha256 = "0vkxl3w4y4yacs1s4v0gwggvzrss8g74d3dgk8h3gphl4dlgx496"; + rev = "c442eeea9d585e1b1fbb8813e33d47feec348a57"; + sha256 = "1ba9xy5jwn8ni8fi2k144j669jp95k2qf9ip77r16rsiy7divl0y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shakespeare-mode"; sha256 = "1sg8n4ifpi36zmf6b6s0swq7k3r038cmj8kxjm7hpgxq6f9qnk9x"; - name = "shakespeare-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33689,20 +43901,24 @@ license = lib.licenses.free; }; }) {}; - shampoo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shampoo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shampoo"; + ename = "shampoo"; version = "0.0.1"; src = fetchFromGitHub { owner = "dmatveev"; repo = "shampoo-emacs"; - rev = "9bf488ad4025beef6eef63d2d5b72bc1c9b9e142"; - sha256 = "11g9lsgakq8nf689k49p9l536ffi62g3bh11mh9ix1l058xamqw2"; + rev = "be20737f2b870670ce8889a34ad5db0657e7a153"; + sha256 = "1dfjxphh3i9dwyjdj708ddi2mw7r90bxqzhc9inqkknfabycdw1r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f145113a0698466e706a6a4c55d63cec512706/recipes/shampoo"; sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61"; - name = "shampoo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33710,9 +43926,15 @@ license = lib.licenses.free; }; }) {}; - shell-pop = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shell-pop = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shell-pop"; + ename = "shell-pop"; version = "0.64"; src = fetchFromGitHub { owner = "kyagi"; @@ -33720,10 +43942,10 @@ rev = "4a3a9d093ad1add792bba764c601aa28de302b34"; sha256 = "1ybvg048jvijcg9jjfrbllf59pswmp0fd5zwq5x6nwg5wmggplzd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop"; sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8"; - name = "shell-pop"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -33731,20 +43953,24 @@ license = lib.licenses.free; }; }) {}; - shell-split-string = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shell-split-string = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shell-split-string"; + ename = "shell-split-string"; version = "0.1"; src = fetchFromGitHub { owner = "10sr"; repo = "shell-split-string-el"; - rev = "6d01c9249853fe1f8fd925ee80f97232d4e3e5eb"; - sha256 = "0mcxp74sk9bn36gbhhimgns07iqa4dgbq2pvpqy41igqwb84w306"; + rev = "062b85f333a0a60ae09207530544a95d9b001581"; + sha256 = "18k7asrisxaa5kh3y849hxpk419429cnr2109cs6bnnzr3wya0r3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84e20f4d02c69f8caf39cd20a581be3b9fa79931/recipes/shell-split-string"; sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m"; - name = "shell-split-string"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33752,9 +43978,13 @@ license = lib.licenses.free; }; }) {}; - shell-switcher = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shell-switcher = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shell-switcher"; + ename = "shell-switcher"; version = "1.0.1"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -33762,10 +43992,10 @@ rev = "2c5575ae859a82041a4bacd1793b844bfc24c34f"; sha256 = "0ia7sdip4hl27avckv3qpqgm3k4ynvp3xxq1cy53bqfzzx0gcria"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a16194f6ddc05350b9875f4e0a3a0383c79e650e/recipes/shell-switcher"; sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx"; - name = "shell-switcher"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33773,9 +44003,13 @@ license = lib.licenses.free; }; }) {}; - shell-toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shell-toggle = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shell-toggle"; + ename = "shell-toggle"; version = "1.3.1"; src = fetchFromGitHub { owner = "knu"; @@ -33783,10 +44017,10 @@ rev = "9820b0ad6f22c700759555aae8a454a7dc5a46b3"; sha256 = "0wvaa5nrbblayjvzjyj6cd942ywg7xz5d8fqaffxcvwlcdihvm7q"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95873d90886d2db5cc1d83d4bcb8dd5c2e65bc3e/recipes/shell-toggle"; sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446"; - name = "shell-toggle"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33794,9 +44028,15 @@ license = lib.licenses.free; }; }) {}; - shelldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + shelldoc = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "shelldoc"; + ename = "shelldoc"; version = "0.0.5"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -33804,10 +44044,10 @@ rev = "1d40c73969347586906ca1dde2adb50afcd73b1b"; sha256 = "1nli26llyfkj1cz2dwn18c5pz1pnpz3866hapfibvdmwrg4z6cax"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/551623175e55629be6cfe44a595f25f09bd889e8/recipes/shelldoc"; sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx"; - name = "shelldoc"; + name = "recipe"; }; packageRequires = [ cl-lib s ]; meta = { @@ -33815,20 +44055,24 @@ license = lib.licenses.free; }; }) {}; - shelltest-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shelltest-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shelltest-mode"; + ename = "shelltest-mode"; version = "1.1"; src = fetchFromGitHub { owner = "rtrn"; repo = "shelltest-mode"; - rev = "fead97c7ff1b39715ec033a793de41176f1788f5"; - sha256 = "0mn7bwvj1yv75a2531jp929j6ypckdfqdg6b5ig0kkbcrrwb7kxs"; + rev = "b7f5cbb5eb64941afc9a3bf19ea3757b8e60cc18"; + sha256 = "1k26krij8vz2582cs194paiyzyjjns87w8syicm58fx6z0s6zrad"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af6dcd4fc0663a255bd85b247bbdf57d425efdb7/recipes/shelltest-mode"; sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh"; - name = "shelltest-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33836,9 +44080,14 @@ license = lib.licenses.free; }; }) {}; - shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shen-elisp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shen-elisp"; + ename = "shen-elisp"; version = "0.1"; src = fetchFromGitHub { owner = "deech"; @@ -33846,10 +44095,10 @@ rev = "ffe17dee05f75539cf5e4c59395e4c7400ececaa"; sha256 = "10dq3qj1q8i6f604zws97xrvjxwrdcjj3ygh6xpna00cvf40llc2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shen-elisp"; sha256 = "045nawzyqaxd3g5f56fxfy680pl18x67w0wi28nrq4l4681w9xyq"; - name = "shen-elisp"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -33857,9 +44106,13 @@ license = lib.licenses.free; }; }) {}; - shift-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shift-number = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shift-number"; + ename = "shift-number"; version = "0.1"; src = fetchFromGitHub { owner = "alezost"; @@ -33867,10 +44120,10 @@ rev = "ba3c1f2e6b01bf14aa1433c2a49098af1c025f7c"; sha256 = "0zlwmzsxkv4mkggylxfx2fkrwgz7dz3zbg2gkn2rxcpy2k2gla64"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b06be6b25078ddfabc1ef1145c817552f679c41c/recipes/shift-number"; sha256 = "1sbzkmd336d0dcdpk29pzk2b5bhlahrn083x62l6m150n2xzxn4p"; - name = "shift-number"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33878,20 +44131,24 @@ license = lib.licenses.free; }; }) {}; - shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shm"; + ename = "shm"; version = "1.0.20"; src = fetchFromGitHub { owner = "chrisdone"; repo = "structured-haskell-mode"; - rev = "8abc5cd73e59ea85bef906e14e87dc388c4f350f"; - sha256 = "1vf766ja8f4xp1f5pmwgz6a85km0nxvc5dn571lwidfrrdbr9rkk"; + rev = "bbdefb56cd341256628a19d1b2d7b0abe5da4b0e"; + sha256 = "12svprs5r2sbdgmp7cslr7xlwaqzjw386dzf6imf5d9m7rnlylck"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm"; sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c"; - name = "shm"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33899,9 +44156,13 @@ license = lib.licenses.free; }; }) {}; - showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + showtip = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "showtip"; + ename = "showtip"; version = "0.1"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -33909,10 +44170,10 @@ rev = "930da302809a4257e8d69425455b29e1cc91949b"; sha256 = "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/showtip"; sha256 = "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780"; - name = "showtip"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33920,9 +44181,13 @@ license = lib.licenses.free; }; }) {}; - shpec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shpec-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shpec-mode"; + ename = "shpec-mode"; version = "0.1.0"; src = fetchFromGitHub { owner = "shpec"; @@ -33930,10 +44195,10 @@ rev = "76bccd63e3b70233a6c9ca0798dd03550952cc76"; sha256 = "09454mcjd8n1090pjc5mk1dc6bn3bgh60ddpnv9hkajkzpcjxx4h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd1bfe85b430c3bbb5a7baf11bb9699dad417f60/recipes/shpec-mode"; sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl"; - name = "shpec-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -33941,9 +44206,15 @@ license = lib.licenses.free; }; }) {}; - shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }: - melpaBuild { + shr-tag-pre-highlight = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , language-detection + , lib + , melpaBuild }: + melpaBuild { pname = "shr-tag-pre-highlight"; + ename = "shr-tag-pre-highlight"; version = "2"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -33951,10 +44222,10 @@ rev = "63eb0b2a4c1caf1004bac8e002ff8b7477871e36"; sha256 = "14b398k7rd0c2ymvg8wyq65fhggkm0camgvqr7j6ia2y0kairxba"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight"; sha256 = "1v8fqx8bd5504r2mflq6x8xs3k0py3bgsnadz3bjs68yhaxacj3v"; - name = "shr-tag-pre-highlight"; + name = "recipe"; }; packageRequires = [ emacs language-detection ]; meta = { @@ -33962,9 +44233,16 @@ license = lib.licenses.free; }; }) {}; - shrink-path = callPackage ({ dash, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: - melpaBuild { + shrink-path = callPackage ({ dash + , f + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "shrink-path"; + ename = "shrink-path"; version = "0.3.1"; src = fetchFromGitLab { owner = "bennya"; @@ -33972,10 +44250,10 @@ rev = "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b"; sha256 = "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path"; sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb"; - name = "shrink-path"; + name = "recipe"; }; packageRequires = [ dash f s ]; meta = { @@ -33983,9 +44261,13 @@ license = lib.licenses.free; }; }) {}; - shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shrink-whitespace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shrink-whitespace"; + ename = "shrink-whitespace"; version = "0.0.1"; src = fetchFromGitHub { owner = "jcpetkovich"; @@ -33993,10 +44275,10 @@ rev = "24518d58e8e692fa98a73d5e7cd44c1536ab4e42"; sha256 = "050gmxdk88zlfjwi07jsj2mvsfcv5imhzcpa6ip3cqkzpmw3pl32"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shrink-whitespace"; sha256 = "0baqv4wr1wi4wd7cfhqf4y24qkpd72lax596z5lj934ihwf3gggw"; - name = "shrink-whitespace"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34004,9 +44286,15 @@ license = lib.licenses.free; }; }) {}; - shut-up = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shut-up = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shut-up"; + ename = "shut-up"; version = "0.3.2"; src = fetchFromGitHub { owner = "cask"; @@ -34014,10 +44302,10 @@ rev = "dccd8f7d6af2dde96718f557b37bc25adc61dd12"; sha256 = "103yvfgkj78i4bnv1fwk76izsa8h4wyj3vwj1vq7xggj607hkxzq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/297d3d88a1dad694d5903072adb679f2194ce444/recipes/shut-up"; sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26"; - name = "shut-up"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -34025,20 +44313,25 @@ license = lib.licenses.free; }; }) {}; - shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + shx = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "shx"; - version = "0.0.14"; + ename = "shx"; + version = "0.0.16"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "b33b23097ad34177e4179e9d3731ec5db30c6391"; - sha256 = "0vlgm1aix074ifi9gvp4c0ygdmzplydj4gdsl46173qbd8lfi2rj"; + rev = "207e6cd292a26fb1162072e2e20df9aa5efd61ef"; + sha256 = "1hnjmnnmg6axgw4z57rmc8h8wpnbi2rwyr4bv2sdrkk12d3i2kp5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; sha256 = "0h5ldglx4y85lm0pfilasnch2k82mlr7rb20qvarzwd41hb1az1k"; - name = "shx"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -34046,9 +44339,39 @@ license = lib.licenses.free; }; }) {}; - sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + side-notes = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "side-notes"; + ename = "side-notes"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "rnkn"; + repo = "side-notes"; + rev = "981ac308b9b5d58e2af20485377e693d2a6e15aa"; + sha256 = "1hjj6pkl83b9fldzf2bixdny85l5mn81a9kf25kyp0cc6apvwsqr"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/24a71c493adfb79bcd5172d65aa0751e9a6ab556/recipes/side-notes"; + sha256 = "07hrrplgvp3fvl10fsmxifnim8wz34w7fhzzzkxpdj1zlwls6h83"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/side-notes"; + license = lib.licenses.free; + }; + }) {}; + sift = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sift"; + ename = "sift"; version = "0.2.0"; src = fetchFromGitHub { owner = "nlamirault"; @@ -34056,10 +44379,10 @@ rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13"; sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift"; sha256 = "1kr5rxza5li3zrkfvs91y7dxmn213z0zf836rkwkmwg2b9rmqxvj"; - name = "sift"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34067,20 +44390,25 @@ license = lib.licenses.free; }; }) {}; - silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + silkworm-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "silkworm-theme"; + ename = "silkworm-theme"; version = "0.1"; src = fetchFromGitHub { owner = "mswift42"; repo = "silkworm-theme"; - rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b"; - sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91"; + rev = "ffb3d6d26191dec696ebb2ba4dc5fddfb38b9e0b"; + sha256 = "0g9672gfinlgmfi23c7zizf3sgpmjm5imzfhx3j77yw5l7zdx8ak"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme"; sha256 = "1zbrjqmhf80qs3i910sixirrv42rxkqdrg2z03gnz1g885gpcn13"; - name = "silkworm-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -34088,9 +44416,14 @@ license = lib.licenses.free; }; }) {}; - simple-bookmarks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + simple-bookmarks = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "simple-bookmarks"; + ename = "simple-bookmarks"; version = "1.8"; src = fetchFromGitHub { owner = "jtkDvlp"; @@ -34098,10 +44431,10 @@ rev = "e89e8163a0705e28e9346320a1ee13c1aae249af"; sha256 = "0bx8inaihfs48rzi01nlr3wp2iw0bnk318hhgpd4zg64ap3sgdsv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a60dd50c388a75ce21a5aec9acf938835d7afdbc/recipes/simple-bookmarks"; sha256 = "0jn5wzm9y4054mr9czd3224s5kbrqpcpcfmj6fi62yhy3p1ys9rb"; - name = "simple-bookmarks"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -34109,20 +44442,25 @@ license = lib.licenses.free; }; }) {}; - simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + simple-httpd = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "simple-httpd"; - version = "1.4.6"; + ename = "simple-httpd"; + version = "1.5.1"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "b191b07c942e44c946a22a826c4d9c9a0475fd7e"; - sha256 = "1qmkc0w28l53zzf5yd2grrk1sq222g5qnsm35ph25s1cfvc1qb2g"; + rev = "a5eb49a6567e33586fba15dd649d63ca6e964314"; + sha256 = "0dpn92rg813c4pq7a1vzj3znyxzp2lmvxqz6pzcqi0l2xn5r3wvb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; sha256 = "1g9m8dx62pql6dqz490pifcli96i5pv6sar18w4lwrfgpfisfz8c"; - name = "simple-httpd"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -34130,9 +44468,13 @@ license = lib.licenses.free; }; }) {}; - simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + simpleclip = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "simpleclip"; + ename = "simpleclip"; version = "1.0.4"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -34140,10 +44482,10 @@ rev = "d461c462c237cd896553adb468cd77499d0d26ad"; sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip"; sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s"; - name = "simpleclip"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34151,9 +44493,14 @@ license = lib.licenses.free; }; }) {}; - simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: - melpaBuild { + simplenote2 = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request-deferred }: + melpaBuild { pname = "simplenote2"; + ename = "simplenote2"; version = "3.0.0"; src = fetchFromGitHub { owner = "alpha22jp"; @@ -34161,10 +44508,10 @@ rev = "070aa311b0a08b530394c53d0c52c6438efbc20c"; sha256 = "0zx49kd3wrqx6f52nk8rzqx3ay3qbcygibcidw6w7drvxnxjgd04"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm"; - name = "simplenote2"; + name = "recipe"; }; packageRequires = [ request-deferred ]; meta = { @@ -34172,9 +44519,13 @@ license = lib.licenses.free; }; }) {}; - simplezen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + simplezen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "simplezen"; + ename = "simplezen"; version = "0.1.1"; src = fetchFromGitHub { owner = "magnars"; @@ -34182,10 +44533,10 @@ rev = "c0ddaefbb38fcc1c9775434f734f89227d246a30"; sha256 = "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eddd3de86e14f56b59fa6f9a08fc89288e0bdbc1/recipes/simplezen"; sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j"; - name = "simplezen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34193,20 +44544,30 @@ license = lib.licenses.free; }; }) {}; - skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: - melpaBuild { + skeletor = callPackage ({ cl-lib ? null + , dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , s }: + melpaBuild { pname = "skeletor"; + ename = "skeletor"; version = "1.6.1"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "skeletor.el"; - rev = "d986806559628623b591542143707de8d76347d0"; - sha256 = "101xn4glqi7b5vhdqqahj2ib4pm30pzq8sad7zagxw9csihcri3q"; + rev = "91cd3a81b5881e7bef8024177bd0d9c5501d1d79"; + sha256 = "1a3yx3bg61kk1xpwzrn4b0wiavnms1myc1fy48xf9awfqfi78zxd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor"; sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v"; - name = "skeletor"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs f let-alist s ]; meta = { @@ -34214,9 +44575,14 @@ license = lib.licenses.free; }; }) {}; - skewer-less = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode }: - melpaBuild { + skewer-less = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , skewer-mode }: + melpaBuild { pname = "skewer-less"; + ename = "skewer-less"; version = "0.2"; src = fetchFromGitHub { owner = "purcell"; @@ -34224,10 +44590,10 @@ rev = "593001930f1d68c85233f34c5f6fb04173fc98d6"; sha256 = "0g5sapd76pjnfhxlw149zj0fpn6l3pz3l8qlcn2c237vm8vn6qv3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb63f7417f39bd718972f54e57360708eb48b977/recipes/skewer-less"; sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl"; - name = "skewer-less"; + name = "recipe"; }; packageRequires = [ skewer-mode ]; meta = { @@ -34235,20 +44601,27 @@ license = lib.licenses.free; }; }) {}; - skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }: - melpaBuild { + skewer-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild + , simple-httpd }: + melpaBuild { pname = "skewer-mode"; - version = "1.7.0"; + ename = "skewer-mode"; + version = "1.8.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "51f3bbeafea6701de78190a395f6376a9974f1e5"; - sha256 = "0k8yc75d7hly4qiqxvg027cwmcck63nmbyr75qyjq8kc0vk0x5mr"; + rev = "a10955db9ef95b0243ee31bcd30a6fb07ce5302b"; + sha256 = "1ha7jl7776pk1bki5zj2q0jy66450mn8xr3aqjc0m9kj3gc9qxgw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm"; - name = "skewer-mode"; + name = "recipe"; }; packageRequires = [ emacs js2-mode simple-httpd ]; meta = { @@ -34256,9 +44629,14 @@ license = lib.licenses.free; }; }) {}; - sl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sl = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sl"; + ename = "sl"; version = "0.2"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -34266,10 +44644,10 @@ rev = "51d92f820f3e93776fff6cdb9690458816888bdc"; sha256 = "1faklr7jz1s6hs1xrzhvddlibhbjbqwxsb8iz6i5c8dg9sj3hw45"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl"; sha256 = "0h90ajikr6kclsy73vs9f50jg8z3d6kqbpanm9ryh2pw3sd4rnii"; - name = "sl"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -34277,20 +44655,24 @@ license = lib.licenses.free; }; }) {}; - slideview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + slideview = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "slideview"; + ename = "slideview"; version = "0.6.1"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-slideview"; - rev = "ec2340e7b0e74201206d14e3eaef1e77149f122d"; - sha256 = "0rk12am1dq52khwkwrmg70zarhni2avj4sy44jqckb4x7sv7djfk"; + rev = "b0572c757115ba703f471e83135b2c8cc86d7f8f"; + sha256 = "0yrmm514b2sq86njc1pi7qnngfy5izz3nnpfk9nxsqar1vmdbdzb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b250f977f44a08346ee9715b416c9706375227a1/recipes/slideview"; sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1"; - name = "slideview"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34298,9 +44680,13 @@ license = lib.licenses.free; }; }) {}; - slim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + slim-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "slim-mode"; + ename = "slim-mode"; version = "1.1"; src = fetchFromGitHub { owner = "slim-template"; @@ -34308,10 +44694,10 @@ rev = "fe8abb644b7b9cc0ed1e76d9ca8d6c01edccbdb8"; sha256 = "1cl8amk1kc7a953l1khjms04j40mfkpnbsjz3qa123msgachrsg7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a3b59bdbc53d7c0b4c4d6434689f7aab2546678/recipes/slim-mode"; sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac"; - name = "slim-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34319,20 +44705,26 @@ license = lib.licenses.free; }; }) {}; - slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: - melpaBuild { + slime = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , macrostep + , melpaBuild }: + melpaBuild { pname = "slime"; - version = "2.20"; + ename = "slime"; + version = "2.22"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "f223388c78ea51ce7717e9bbae14c50ad2386c2c"; - sha256 = "07jks9fnqjv2i9sjfpgj7r3a7g5aha4aipsffjbnw1qd930ygw83"; + rev = "8d9fdf34fe542ec280ee042ee7bdea16e512d3c0"; + sha256 = "0zsliqfd92ivg2y2w1z6scn6i3w658x8bi1wd0rvf6mddc74lvj6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign"; - name = "slime"; + name = "recipe"; }; packageRequires = [ cl-lib macrostep ]; meta = { @@ -34340,9 +44732,15 @@ license = lib.licenses.free; }; }) {}; - slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: - melpaBuild { + slime-company = callPackage ({ company + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , slime }: + melpaBuild { pname = "slime-company"; + ename = "slime-company"; version = "1.1"; src = fetchFromGitHub { owner = "anwyn"; @@ -34350,10 +44748,10 @@ rev = "6c244690c80387a32b0cb984843e00c8b75ad6bb"; sha256 = "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company"; sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2"; - name = "slime-company"; + name = "recipe"; }; packageRequires = [ company slime ]; meta = { @@ -34361,9 +44759,17 @@ license = lib.licenses.free; }; }) {}; - slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: - melpaBuild { + slime-docker = callPackage ({ cl-lib ? null + , docker-tramp + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , slime }: + melpaBuild { pname = "slime-docker"; + ename = "slime-docker"; version = "0.7"; src = fetchFromGitHub { owner = "daewok"; @@ -34371,10 +44777,10 @@ rev = "1ba41c2d86540a84b47466b0b6957f8063f23aa8"; sha256 = "168s5xsf7l6s8x5hcmzmk5j9d8a3wpr4s3dlm697dg2n1717gl2z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker"; sha256 = "13zkkrpww51ndsblpyz2msiwrjnaz6yrk61jbzrwp0r7a2v0djsa"; - name = "slime-docker"; + name = "recipe"; }; packageRequires = [ cl-lib docker-tramp emacs slime ]; meta = { @@ -34382,9 +44788,13 @@ license = lib.licenses.free; }; }) {}; - slime-volleyball = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + slime-volleyball = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "slime-volleyball"; + ename = "slime-volleyball"; version = "1.1"; src = fetchFromGitHub { owner = "fitzsim"; @@ -34392,10 +44802,10 @@ rev = "159b5c0f40b109e3854e94b89ec5383854c46ae3"; sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/853f47f469e372bdbae40f3cea60d9598e966fab/recipes/slime-volleyball"; sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7"; - name = "slime-volleyball"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34403,9 +44813,15 @@ license = lib.licenses.free; }; }) {}; - slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + slstats = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "slstats"; + ename = "slstats"; version = "1.10"; src = fetchFromGitHub { owner = "davep"; @@ -34413,10 +44829,10 @@ rev = "e9696066abf3f2b7b818a57c062530dfd9377033"; sha256 = "1mjzr6lqcyx3clp3bxq77k2rpkaglnq407xdk05xkaqissirpc83"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; sha256 = "0z5y2fmb3v16g5gf87c9gll04wbjp3d1cf7gm5cxi4w3y1kw4r7q"; - name = "slstats"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -34424,20 +44840,24 @@ license = lib.licenses.free; }; }) {}; - sly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sly = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sly"; + ename = "sly"; version = "2.14"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "1942c53fc40fd6ace0e822b5c9bf551f59061f32"; - sha256 = "1aihr5pbdqjb5j6xsghi7qbrmp46kddv76xmyx5z98m93n70wzqf"; + rev = "9dfa53bbaa33c4e91fc58f816d0a766ae94f47c9"; + sha256 = "0bw6rvpkfpv5shih0ywjw6pa5h2a8v1xpvkxbijqd4dpdj3dlyj9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l"; - name = "sly"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34445,30 +44865,15 @@ license = lib.licenses.free; }; }) {}; - sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: - melpaBuild { - pname = "sly-company"; - version = "0.8"; - src = fetchFromGitHub { - owner = "capitaomorte"; - repo = "sly-company"; - rev = "930e14fee9cdc837ae26299c7f5e379c53cee1af"; - sha256 = "11p89pz6zmnjng5177w31ilcmifvnhv9mfjy79ic7amg01h09hsr"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/sly-company"; - sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2"; - name = "sly-company"; - }; - packageRequires = [ company emacs sly ]; - meta = { - homepage = "https://melpa.org/#/sly-company"; - license = lib.licenses.free; - }; - }) {}; - smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: - melpaBuild { + smart-mode-line = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , rich-minority }: + melpaBuild { pname = "smart-mode-line"; + ename = "smart-mode-line"; version = "2.11.0"; src = fetchFromGitHub { owner = "Malabarba"; @@ -34476,10 +44881,10 @@ rev = "5aca51956fae55d7310c1f96b5d128201087864a"; sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6"; - name = "smart-mode-line"; + name = "recipe"; }; packageRequires = [ emacs rich-minority ]; meta = { @@ -34487,20 +44892,27 @@ license = lib.licenses.free; }; }) {}; - smart-mode-line-powerline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, smart-mode-line }: - melpaBuild { + smart-mode-line-powerline-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , powerline + , smart-mode-line }: + melpaBuild { pname = "smart-mode-line-powerline-theme"; + ename = "smart-mode-line-powerline-theme"; version = "2.11.0"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "5aca51956fae55d7310c1f96b5d128201087864a"; - sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw"; + rev = "558251e200cc555df137e60326295f2bd640fd6a"; + sha256 = "1xh1qcxw0r3j8hx8k8hsx0cl82wps5x755j4kbn01m7srzv6v167"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4"; - name = "smart-mode-line-powerline-theme"; + name = "recipe"; }; packageRequires = [ emacs powerline smart-mode-line ]; meta = { @@ -34508,20 +44920,25 @@ license = lib.licenses.free; }; }) {}; - smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-semicolon = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-semicolon"; + ename = "smart-semicolon"; version = "0.2.1"; src = fetchFromGitHub { owner = "iquiw"; repo = "smart-semicolon"; - rev = "c11096679dbed3875c37413337ee490ee7951b63"; - sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518"; + rev = "94cf665aed45c5882e94afe465704fed6326e92e"; + sha256 = "16nkxf8phxi240fd9ksazxmjs91j0xplny6890a06kx4r8s61p9f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon"; sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0"; - name = "smart-semicolon"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -34529,9 +44946,13 @@ license = lib.licenses.free; }; }) {}; - smart-tabs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smart-tabs-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smart-tabs-mode"; + ename = "smart-tabs-mode"; version = "1.0"; src = fetchFromGitHub { owner = "jcsalomon"; @@ -34539,10 +44960,10 @@ rev = "8b196d596b331f03fba0efdb4e31d2fd0752c4a7"; sha256 = "1kfihh4s8578cwqyzn5kp3iib7f9vvg6rfc3klqzgads187ryd4z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d712f0fb9538945713faf773772bb359fe6f509f/recipes/smart-tabs-mode"; sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl"; - name = "smart-tabs-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34550,9 +44971,15 @@ license = lib.licenses.free; }; }) {}; - smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smartparens = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smartparens"; + ename = "smartparens"; version = "1.11.0"; src = fetchFromGitHub { owner = "Fuco1"; @@ -34560,10 +44987,10 @@ rev = "4873352b5d0a1c5142658122de1b6950b8fe7e4d"; sha256 = "0zij2f2rjjym98w68jkp10n1ckpfprlkk217c3fg16hz5nq4vnm6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6"; - name = "smartparens"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -34571,9 +44998,13 @@ license = lib.licenses.free; }; }) {}; - smartrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smartrep = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smartrep"; + ename = "smartrep"; version = "1.0.0"; src = fetchFromGitHub { owner = "myuhe"; @@ -34581,10 +45012,10 @@ rev = "0b73bf3d1a3c795671bfee0a36cecfaa54729446"; sha256 = "0j5lg9gryl8vbzw8d3r2fl0c9wxa0c193mcvdfidd25b98wccc3f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81cb649dc49767c21f79668d6bee950567b05aa0/recipes/smartrep"; sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn"; - name = "smartrep"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34592,9 +45023,13 @@ license = lib.licenses.free; }; }) {}; - smartscan = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smartscan = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smartscan"; + ename = "smartscan"; version = "0.2"; src = fetchFromGitHub { owner = "mickeynp"; @@ -34602,10 +45037,10 @@ rev = "13c9fd6c0e38831f78dec55051e6b4a643963176"; sha256 = "1sd7dh9114mvr4xnp43xx4b7qmwkaj1a1fv7pwc28fhiy89d2md4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smartscan"; sha256 = "1q0lqms16g7avln1pbxzb49z3w96kv1r7lbh61ijlnz3jips098w"; - name = "smartscan"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34613,9 +45048,13 @@ license = lib.licenses.free; }; }) {}; - smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smbc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smbc"; + ename = "smbc"; version = "0.2.1"; src = fetchFromGitHub { owner = "sakshamsharma"; @@ -34623,10 +45062,10 @@ rev = "c377b806118d82140197d9cb1095548477e00497"; sha256 = "16cj6jsy1psmcjshxb46i44sf1zb9s4mfiagl5cr22njy01ajq1h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b4f16cd8028edc758ada842432df11c8276fd3/recipes/smbc"; sha256 = "0aviqa8mk8dxxnddfskq9jgz3knqhf0frj7gq7nk6ckxkrxrgqn4"; - name = "smbc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34634,9 +45073,14 @@ license = lib.licenses.free; }; }) {}; - smeargle = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smeargle = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smeargle"; + ename = "smeargle"; version = "0.3"; src = fetchFromGitHub { owner = "syohex"; @@ -34644,10 +45088,10 @@ rev = "0665b1ff5109731898bc4a0ca6d939933b804777"; sha256 = "0p0kxmjdr02l9injlyyrnnzqdbb7mirz1xx79c3lw1rgpalf0jnf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5b985b24a23499454dc61bf071073df325de571/recipes/smeargle"; sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd"; - name = "smeargle"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -34655,9 +45099,13 @@ license = lib.licenses.free; }; }) {}; - smex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smex = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smex"; + ename = "smex"; version = "3.0"; src = fetchFromGitHub { owner = "nonsequitur"; @@ -34665,10 +45113,10 @@ rev = "97b4a4d82a4449e3f1a3fa8a93387d6eb0ef9c26"; sha256 = "1hcjh577xz3inx28r8wb4g2b1424ccw8pffvgdmpf80xp1llldj5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/smex"; sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda"; - name = "smex"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34676,9 +45124,13 @@ license = lib.licenses.free; }; }) {}; - smmry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smmry = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smmry"; + ename = "smmry"; version = "0.0.3"; src = fetchFromGitHub { owner = "microamp"; @@ -34686,10 +45138,10 @@ rev = "b7ee765337fa627a6c59eb4f2a91df5d280ac6df"; sha256 = "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba2d4be4dd4d6c378eabd833f05a944afa21817b/recipes/smmry"; sha256 = "05ikcvyr74jy3digd0ad443h5kf11w29hgnmb71bclm3mfslh5wn"; - name = "smmry"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34697,9 +45149,13 @@ license = lib.licenses.free; }; }) {}; - smooth-scroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smooth-scroll = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smooth-scroll"; + ename = "smooth-scroll"; version = "1.2"; src = fetchFromGitHub { owner = "k-talo"; @@ -34707,10 +45163,10 @@ rev = "02320f28abb5cae28b3a18f6b9ce93129bdbfc45"; sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ad6411f76281232848c870e8f4f5bb78e6cf328/recipes/smooth-scroll"; sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf"; - name = "smooth-scroll"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34718,9 +45174,13 @@ license = lib.licenses.free; }; }) {}; - smooth-scrolling = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + smooth-scrolling = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "smooth-scrolling"; + ename = "smooth-scrolling"; version = "2.0.0"; src = fetchFromGitHub { owner = "aspiers"; @@ -34728,10 +45188,10 @@ rev = "6a1420be510decde0a5eabc56cff229ae554417e"; sha256 = "1dkqix0iyjyiqf34h3p8faqcpffc0pwkxqqn80ys9jvj4f27kkrg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e156f146649a51f6ee636aef95214944a8079a27/recipes/smooth-scrolling"; sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6"; - name = "smooth-scrolling"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34739,9 +45199,16 @@ license = lib.licenses.free; }; }) {}; - snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: - melpaBuild { + snakemake-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , magit-popup + , melpaBuild }: + melpaBuild { pname = "snakemake-mode"; + ename = "snakemake-mode"; version = "1.3.0"; src = fetchFromGitHub { owner = "kyleam"; @@ -34749,10 +45216,10 @@ rev = "6cf6d20db2e5253ce3f86e302651faa28f220aa7"; sha256 = "0dmvd5f5rb5kkzjkhzz17b40hlld23sy5wyzr8vq763f6pzs37kk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4"; - name = "snakemake-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs magit-popup ]; meta = { @@ -34760,9 +45227,15 @@ license = lib.licenses.free; }; }) {}; - snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }: - melpaBuild { + snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq + , snapshot-timemachine }: + melpaBuild { pname = "snapshot-timemachine-rsnapshot"; + ename = "snapshot-timemachine-rsnapshot"; version = "0.4"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -34770,10 +45243,10 @@ rev = "72b0b700d80f1a0442e62bbbb6a0c8c59182f97f"; sha256 = "1bdy7p0bjfdlv6l6yih6fvvi7xpldal4rj8l2ajpc6sgby24h8bb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot"; sha256 = "0fxijd94p961ab0p4ddmhja4bfrif2d87v32g4c41amc1klyf25r"; - name = "snapshot-timemachine-rsnapshot"; + name = "recipe"; }; packageRequires = [ seq snapshot-timemachine ]; meta = { @@ -34781,20 +45254,26 @@ license = lib.licenses.free; }; }) {}; - snazzy-theme = callPackage ({ base16-theme, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + snazzy-theme = callPackage ({ base16-theme + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "snazzy-theme"; + ename = "snazzy-theme"; version = "1.0"; src = fetchFromGitHub { owner = "weijiangan"; repo = "emacs-snazzy"; - rev = "578d7ebc4ed91c0a630b652c4b6fdd54d9ae16cd"; - sha256 = "0gykymah4ap7zgjr7fkir21avcdhgy6n88nwxl1iynim3vkq441v"; + rev = "8729d10b5c1edf1053800170dab1ffd820b6fff2"; + sha256 = "1c07yggr6cnbca2iag1rjjsp1hiaccix222wzybxrphb72fn93wq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18c89a612418e0f49b7e6ae29a678d2fc1ffaf3d/recipes/snazzy-theme"; sha256 = "0srmhwhqrp1s01p1znhjzs254l3r2i6c91v7cnlwlvrls1sbh32k"; - name = "snazzy-theme"; + name = "recipe"; }; packageRequires = [ base16-theme emacs ]; meta = { @@ -34802,9 +45281,15 @@ license = lib.licenses.free; }; }) {}; - snoopy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + snoopy = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "snoopy"; + ename = "snoopy"; version = "0.2.0"; src = fetchFromGitHub { owner = "anmonteiro"; @@ -34812,10 +45297,10 @@ rev = "ec4123bdebfe0bb7bf4feaac2dc02b59caffe386"; sha256 = "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy"; sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi"; - name = "snoopy"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -34823,20 +45308,28 @@ license = lib.licenses.free; }; }) {}; - socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: - melpaBuild { + socyl = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , s }: + melpaBuild { pname = "socyl"; + ename = "socyl"; version = "0.3.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "socyl"; - rev = "fcc0deda5b6c39d25e48e7da2a0ae73295193ea8"; - sha256 = "1a8qd9hcmp4xl6hyvlq116nr9cn392bmrrda8vqkvjpd8rm8i776"; + rev = "38157e3bb0d7afa8b90b744648f63c85b4edb230"; + sha256 = "1ha0827zcdkl1ih8c7018cpbiw2k1b8ik4h7p6asw7pg0n5xf1c6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl"; sha256 = "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz"; - name = "socyl"; + name = "recipe"; }; packageRequires = [ cl-lib dash pkg-info s ]; meta = { @@ -34844,20 +45337,26 @@ license = lib.licenses.free; }; }) {}; - solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + solaire-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "solaire-mode"; - version = "1.0.4"; + ename = "solaire-mode"; + version = "1.0.6"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "dd93cfd6c02e4575e6c7048ecf9dac8c09864bf2"; - sha256 = "1afbkz93xa6f0453n7n1mrm0ng5jrdi06mh0s105gkzcfxqjc0gd"; + rev = "abf2ce4da77d0877efb4a035687390ce921eda4f"; + sha256 = "15wszz841vd9i59gq2xxh8rk7bh7agwglh2dwhxgs70m24hsp3p4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; sha256 = "0pvgip12xl16rwz4wqmqjd8nhh3a299aknfsghazmxigamlmlsl5"; - name = "solaire-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -34865,9 +45364,14 @@ license = lib.licenses.free; }; }) {}; - solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + solarized-theme = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "solarized-theme"; + ename = "solarized-theme"; version = "1.2.2"; src = fetchFromGitHub { owner = "bbatsov"; @@ -34875,10 +45379,10 @@ rev = "210dbef0186f87048d50face41d1d374d6154b3a"; sha256 = "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12"; - name = "solarized-theme"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -34886,20 +45390,24 @@ license = lib.licenses.free; }; }) {}; - solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + solidity-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "solidity-mode"; - version = "0.1.8"; + ename = "solidity-mode"; + version = "0.1.9"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048"; - sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p"; + rev = "d0ff4dea49540f37301d869f2797fca2492f55d5"; + sha256 = "1wcy5z4wggn3zs9h1kyvm0ji51ppjcqdmym3mmxbrhan6a0kq724"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx"; - name = "solidity-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -34907,9 +45415,14 @@ license = lib.licenses.free; }; }) {}; - sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { + sos = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { pname = "sos"; + ename = "sos"; version = "0.1"; src = fetchFromGitHub { owner = "omouse"; @@ -34917,10 +45430,10 @@ rev = "c3906ca6872f460c0bdd276410519308626313f1"; sha256 = "0b5w3vdr8llg3hqd22gnc6b6y089lq6vfk0ajkws6gfldz2gg2v1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36e02223b4ff9c0be4662991d734ca4a4e756f4b/recipes/sos"; sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb"; - name = "sos"; + name = "recipe"; }; packageRequires = [ org ]; meta = { @@ -34928,9 +45441,17 @@ license = lib.licenses.free; }; }) {}; - sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }: - melpaBuild { + sotclojure = callPackage ({ cider + , clojure-mode + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sotlisp }: + melpaBuild { pname = "sotclojure"; + ename = "sotclojure"; version = "1.3.1"; src = fetchFromGitHub { owner = "Malabarba"; @@ -34938,10 +45459,10 @@ rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32"; sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure"; sha256 = "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090"; - name = "sotclojure"; + name = "recipe"; }; packageRequires = [ cider clojure-mode emacs sotlisp ]; meta = { @@ -34949,9 +45470,14 @@ license = lib.licenses.free; }; }) {}; - sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sotlisp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sotlisp"; + ename = "sotlisp"; version = "1.6.2"; src = fetchFromGitHub { owner = "Malabarba"; @@ -34959,10 +45485,10 @@ rev = "fffe8d0b42b143a2e7df0470d9049fa57b6ecac5"; sha256 = "0j5zwb1ypqps30126w2684lmjh8ia4qxg8inlajcbv8i3pbai7k6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/sotlisp"; sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk"; - name = "sotlisp"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -34970,9 +45496,15 @@ license = lib.licenses.free; }; }) {}; - sound-wav = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sound-wav = callPackage ({ cl-lib ? null + , deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sound-wav"; + ename = "sound-wav"; version = "0.2"; src = fetchFromGitHub { owner = "syohex"; @@ -34980,10 +45512,10 @@ rev = "2a8c8a9bd797dfbf4a0aa1c023a464b803227ff8"; sha256 = "1ba1r359cb1dms24ajn0xfrqn8c9y08m6m7dwgxpylyyjwh1096y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8333470e3d84d5433be489a23e065c876bed2ab2/recipes/sound-wav"; sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f"; - name = "sound-wav"; + name = "recipe"; }; packageRequires = [ cl-lib deferred ]; meta = { @@ -34991,9 +45523,17 @@ license = lib.licenses.free; }; }) {}; - sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + sourcekit = callPackage ({ dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "sourcekit"; + ename = "sourcekit"; version = "0.2.0"; src = fetchFromGitHub { owner = "nathankot"; @@ -35001,10 +45541,10 @@ rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit"; sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks"; - name = "sourcekit"; + name = "recipe"; }; packageRequires = [ dash dash-functional emacs request ]; meta = { @@ -35012,9 +45552,14 @@ license = lib.licenses.free; }; }) {}; - sourcemap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sourcemap = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sourcemap"; + ename = "sourcemap"; version = "0.3"; src = fetchFromGitHub { owner = "syohex"; @@ -35022,10 +45567,10 @@ rev = "64c89d296186f48d9135fb8aad501de19f64bceb"; sha256 = "115g2mfpbfywp8xnag4gsb50klfvplqfh928a5mabb5s8v4a3582"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557d18259543263932fccdbaf44c4e7986bd277b/recipes/sourcemap"; sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5"; - name = "sourcemap"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35033,9 +45578,18 @@ license = lib.licenses.free; }; }) {}; - spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: - melpaBuild { + spaceline = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , powerline + , s }: + melpaBuild { pname = "spaceline"; + ename = "spaceline"; version = "2.0.1"; src = fetchFromGitHub { owner = "TheBB"; @@ -35043,10 +45597,10 @@ rev = "2d1a7bfb5bdaf24958f50b4bf93182847916af85"; sha256 = "1q8r95zfrh0vxna5ml2pq9b9f66clfqcl4d2qy2aizkvzyxg6skl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw"; - name = "spaceline"; + name = "recipe"; }; packageRequires = [ cl-lib dash emacs powerline s ]; meta = { @@ -35054,9 +45608,17 @@ license = lib.licenses.free; }; }) {}; - spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }: - melpaBuild { + spaceline-all-the-icons = callPackage ({ all-the-icons + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , memoize + , spaceline }: + melpaBuild { pname = "spaceline-all-the-icons"; + ename = "spaceline-all-the-icons"; version = "1.4.0"; src = fetchFromGitHub { owner = "domtronn"; @@ -35064,10 +45626,10 @@ rev = "7eafe2d7a81f8d10e03498bdcc3bec0ea50f905d"; sha256 = "186v71d8n1iy73drayyf57pyzlz973q74mazkyvb8w3fj8bb3llm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons"; sha256 = "1h6clkr2f29k2vw0jcrmnfbjpphaxm7s3zai6pn6qag32bgm3jq6"; - name = "spaceline-all-the-icons"; + name = "recipe"; }; packageRequires = [ all-the-icons emacs memoize spaceline ]; meta = { @@ -35075,9 +45637,14 @@ license = lib.licenses.free; }; }) {}; - sparkline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sparkline = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sparkline"; + ename = "sparkline"; version = "1.0.2"; src = fetchFromGitHub { owner = "woudshoo"; @@ -35085,10 +45652,10 @@ rev = "e44498cf1a58fb165991198fe5104d51c92ea904"; sha256 = "1gmmmkzxxlpz2ml6qk24vndlrbyl55r5cba76jn342zrxvb357ny"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7278ca31ee3c035c8ec754af152127776f04792e/recipes/sparkline"; sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y"; - name = "sparkline"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -35096,9 +45663,15 @@ license = lib.licenses.free; }; }) {}; - sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sparql-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sparql-mode"; + ename = "sparql-mode"; version = "4.0.2"; src = fetchFromGitHub { owner = "ljos"; @@ -35106,10 +45679,10 @@ rev = "2837b97244111515c61fb3823c1479bc126a458b"; sha256 = "0hqp8r24wvzrkl630wbm0lynrcrnawv2yn2a3xgwqwwhwgva35rn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d"; - name = "sparql-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -35117,20 +45690,24 @@ license = lib.licenses.free; }; }) {}; - speech-tagger = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + speech-tagger = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "speech-tagger"; + ename = "speech-tagger"; version = "0.0.0"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "speech-tagger"; - rev = "e6595bd0eea93ede1534c536c1746c9cf763b73c"; - sha256 = "1k6c7450v0ln6l9b8z1hib2s2b4rmjbskynvwwyilgdnvginfhi3"; + rev = "f5b9d4c0bca82dec6b70a2d6ec933cd189ef553a"; + sha256 = "0jcax2867nps9xfb85xwz7zx9mlfgxmkmw6nprivmm1hd3wm8dpd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db80aa5d95846ee02a9d762aa68325ab5e37dcf7/recipes/speech-tagger"; sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc"; - name = "speech-tagger"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35138,20 +45715,25 @@ license = lib.licenses.free; }; }) {}; - speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + speed-type = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "speed-type"; + ename = "speed-type"; version = "1.1"; src = fetchFromGitHub { owner = "parkouss"; repo = "speed-type"; - rev = "5d691f57743304db63b6afdc5bd79dabd282d390"; - sha256 = "08qp2b80rh9k8h5vv141lfsg73rqqikhh7ygal789rr278ai1rjf"; + rev = "f87399c523a2d0c6c98549f507006f1313d9cd6c"; + sha256 = "069rc8fjh5ic7b66x1gxfss4vki6j1pcvqjs8680wj3mxw5vbfw1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06"; - name = "speed-type"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -35159,9 +45741,15 @@ license = lib.licenses.free; }; }) {}; - sphinx-doc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + sphinx-doc = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "sphinx-doc"; + ename = "sphinx-doc"; version = "0.1.0"; src = fetchFromGitHub { owner = "naiquevin"; @@ -35169,10 +45757,10 @@ rev = "b3459ecb9e6d3fffdee3cb7342563a56a32ce666"; sha256 = "1q6v0xfdxm57lyj4zxyqv6n5ik5w9drk7yf9w8spb5r22jg0dg8c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3b80d346ad4fb415970beddb5f02ae795fbf1b4/recipes/sphinx-doc"; sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z"; - name = "sphinx-doc"; + name = "recipe"; }; packageRequires = [ cl-lib s ]; meta = { @@ -35180,9 +45768,13 @@ license = lib.licenses.free; }; }) {}; - sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sphinx-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sphinx-mode"; + ename = "sphinx-mode"; version = "0.1.1"; src = fetchFromGitHub { owner = "Fuco1"; @@ -35190,10 +45782,10 @@ rev = "3d6e3059350593dc077f06f54c33869b9e28f7bc"; sha256 = "0l3a8swmf3sm54ayk2ahh1i5j1hf0hd822dfmx50kgwi4wpv48sp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode"; sha256 = "0f5xkaqsmxc4bfz80njlc395dcw2dbvmzx6h9fw31mylshzbmrys"; - name = "sphinx-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35201,20 +45793,25 @@ license = lib.licenses.free; }; }) {}; - splitjoin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + splitjoin = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "splitjoin"; + ename = "splitjoin"; version = "0.1"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-splitjoin"; - rev = "0eb91e7beec915065cd6c00ceaca180a64d85cda"; - sha256 = "17qsmjsbk8aq3azjxid6h9fzz77bils74scp21sqn8vdnijx8991"; + rev = "7e3a37e6700cda6a7ed6e3f1b97b85704c071f89"; + sha256 = "1bir7vvvd2zx2rf79cnmry30hi5xdn92yzg926mahfjdksbh2rhx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51e172f46045fbb71b6a13b3521b502339a4a02b/recipes/splitjoin"; sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l"; - name = "splitjoin"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -35222,9 +45819,14 @@ license = lib.licenses.free; }; }) {}; - spotify = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + spotify = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "spotify"; + ename = "spotify"; version = "0.3.3"; src = fetchFromGitHub { owner = "remvee"; @@ -35232,10 +45834,10 @@ rev = "472f6e61d732a7e700f5505e2a445fc0b030916a"; sha256 = "0kc17ijjd8ygwjji23ndhq75kqjyxlb8kg9q0ij0l38q3b903fhi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spotify"; sha256 = "07y6d3cz3nziasza3znysvcnx3kw156ab78kw5y0pdll45nw210x"; - name = "spotify"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -35243,9 +45845,14 @@ license = lib.licenses.free; }; }) {}; - sprintly-mode = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }: - melpaBuild { + sprintly-mode = callPackage ({ fetchFromGitHub + , fetchurl + , furl + , lib + , melpaBuild }: + melpaBuild { pname = "sprintly-mode"; + ename = "sprintly-mode"; version = "0.0.4"; src = fetchFromGitHub { owner = "sprintly"; @@ -35253,10 +45860,10 @@ rev = "6695892bae5860b5268bf3ae62be990ee9b63c11"; sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8730956d3f00e030e06ef54c3f2aecc10bb40f9d/recipes/sprintly-mode"; sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4"; - name = "sprintly-mode"; + name = "recipe"; }; packageRequires = [ furl ]; meta = { @@ -35264,9 +45871,15 @@ license = lib.licenses.free; }; }) {}; - sprunge = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + sprunge = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "sprunge"; + ename = "sprunge"; version = "0.1.1"; src = fetchFromGitHub { owner = "tomjakubowski"; @@ -35274,10 +45887,10 @@ rev = "0fd386b8b29c4175022a04ad70ea5643185b6726"; sha256 = "03wjzk1ljclfjgqzkg6m7v8saaajgavyd0xskd8fg8rdkx13ki0l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f7b9f8cc2f2f8f8e1cf80b3e76c89b9f12cacf95/recipes/sprunge"; sha256 = "199vfl6i881aks8fi9d9w4w7mnc7n443h79p3s4srcpmbyfg6g3w"; - name = "sprunge"; + name = "recipe"; }; packageRequires = [ cl-lib request ]; meta = { @@ -35285,9 +45898,13 @@ license = lib.licenses.free; }; }) {}; - sql-impala = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sql-impala = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sql-impala"; + ename = "sql-impala"; version = "1.0"; src = fetchFromGitHub { owner = "jterk"; @@ -35295,10 +45912,10 @@ rev = "68248e9851b153850542ed1f709298bb9ab59610"; sha256 = "12zyw8b8s3jga560wv141gc4yvlbldvfcmpibns8wrpx2w8aivfj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sql-impala"; sha256 = "1mh36ycqgr07r0hknkr6vb4k0r5b2h8bqd7m5faz9p56qbisgvvh"; - name = "sql-impala"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35306,9 +45923,13 @@ license = lib.licenses.free; }; }) {}; - sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sqlup-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sqlup-mode"; + ename = "sqlup-mode"; version = "0.8.0"; src = fetchFromGitHub { owner = "Trevoke"; @@ -35316,10 +45937,10 @@ rev = "04970977b4abb4d44301651618bbf1cdb0b263dd"; sha256 = "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; sha256 = "0ngs58iri3fwv5ny707kvb6xjq98x19pzak8c9nq4qnpw3nkr83b"; - name = "sqlup-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35327,9 +45948,13 @@ license = lib.licenses.free; }; }) {}; - sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sr-speedbar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sr-speedbar"; + ename = "sr-speedbar"; version = "20140914.2339"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -35337,10 +45962,10 @@ rev = "4f816528a32eb421197a768d6dcf3a05de83f642"; sha256 = "1x9wizd0fzcmpf8ff7c3rcfxk64diy9jmzzvxa7d5a3k8vvpdhg3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/sr-speedbar"; sha256 = "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052"; - name = "sr-speedbar"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35348,9 +45973,39 @@ license = lib.licenses.free; }; }) {}; - srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + srcery-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "srcery-theme"; + ename = "srcery-theme"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "srcery-colors"; + repo = "srcery-emacs"; + rev = "8e4627430abcedc0ed320f620c4411985c9913e1"; + sha256 = "0lh9hp4aypfwhc6bgywlqxcwyms27yjw71yfcq48iwnqzafpdnkr"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2654fc05f55c7fab7d550b7db1d187edc9ff0f42/recipes/srcery-theme"; + sha256 = "1bnvf9v7g2mpx8519lh73fphhr4cqd33qlw22qyxnqiz5cz93lsp"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/srcery-theme"; + license = lib.licenses.free; + }; + }) {}; + srefactor = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "srefactor"; + ename = "srefactor"; version = "0.5"; src = fetchFromGitHub { owner = "tuhdo"; @@ -35358,10 +46013,10 @@ rev = "ecd40713f736b243285c07f4cfd77113794d4f9f"; sha256 = "0wx8l8gkh8rbf2g149f35gpnmkk45s9x4r844aqw5by4zkvix4rc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23115ab231ab108678608f2ad0a864f896cd0f2/recipes/srefactor"; sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2"; - name = "srefactor"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35369,20 +46024,52 @@ license = lib.licenses.free; }; }) {}; - ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ssass-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ssass-mode"; + ename = "ssass-mode"; + version = "0.2"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "ssass-mode"; + rev = "5f36a169a1ad497f1d7a465be386ffb5e1f80bcf"; + sha256 = "1n1q26p52i6c6i8svkr0bn91hliqm540y1fcz3jci8w2ws0s5x11"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode"; + sha256 = "07aym4a7l70f1lb6yvwxkhsykrwbf0lcpwlwgcn5n44kavvdbzxm"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ssass-mode"; + license = lib.licenses.free; + }; + }) {}; + ssh-agency = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ssh-agency"; - version = "0.3"; + ename = "ssh-agency"; + version = "0.4"; src = fetchFromGitHub { owner = "magit"; repo = "ssh-agency"; - rev = "94abffa716aff963175196066526c7ee8b4efae7"; - sha256 = "1r41hgh0kaf9x56jllqjz7f9ypzgyf9pqqpm3r49xyi8fr1drbxc"; + rev = "d9dbedd773ad3a831e02e162c47936d6814a850a"; + sha256 = "0895n7bss4wdydic1gflr03f2cwdyqywl16gvb599lpn288jhwvz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency"; sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8"; - name = "ssh-agency"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -35390,20 +46077,25 @@ license = lib.licenses.free; }; }) {}; - ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ssh-deploy = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ssh-deploy"; - version = "1.5"; + ename = "ssh-deploy"; + version = "1.6"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "aef539bb4feefe927fa48d01736dfadb7b3d7930"; - sha256 = "0vra7y2icid9sdyp7iygwkp4xaas249nm1lcbcyfpaad250g2pn4"; + rev = "b13ba60ea175798cfd1395ab833082789724073d"; + sha256 = "0fgcxvs2ngv65chnkb9w5rrak187xkwxiwmpc25iqvrrnrfr43s6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm"; - name = "ssh-deploy"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35411,9 +46103,13 @@ license = lib.licenses.free; }; }) {}; - stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + stan-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stan-mode"; + ename = "stan-mode"; version = "9.2.0"; src = fetchFromGitHub { owner = "stan-dev"; @@ -35421,10 +46117,10 @@ rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac"; sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode"; sha256 = "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy"; - name = "stan-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35432,9 +46128,15 @@ license = lib.licenses.free; }; }) {}; - stan-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stan-mode, yasnippet }: - melpaBuild { + stan-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , stan-mode + , yasnippet }: + melpaBuild { pname = "stan-snippets"; + ename = "stan-snippets"; version = "9.2.0"; src = fetchFromGitHub { owner = "stan-dev"; @@ -35442,10 +46144,10 @@ rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac"; sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets"; sha256 = "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85"; - name = "stan-snippets"; + name = "recipe"; }; packageRequires = [ stan-mode yasnippet ]; meta = { @@ -35453,9 +46155,13 @@ license = lib.licenses.free; }; }) {}; - stash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + stash = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stash"; + ename = "stash"; version = "0.4.1"; src = fetchFromGitHub { owner = "vermiculus"; @@ -35463,10 +46169,10 @@ rev = "638ae8a4f6d33af54fe77d57c2c0eb1800dd2e19"; sha256 = "0igqifws73cayvjnhhrsqpy14sr27avymfhaqzrpj76m2fsh6fj4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3837ac3f1ac82e08a5ad7193766074a4d1bfa3d/recipes/stash"; sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9"; - name = "stash"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35474,9 +46180,13 @@ license = lib.licenses.free; }; }) {}; - status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + status = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "status"; + ename = "status"; version = "0.3"; src = fetchFromGitHub { owner = "tromey"; @@ -35484,10 +46194,10 @@ rev = "b62c74bf272566f82a68622f29fb9edafea0f241"; sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dca8976de7060fcfc37a1623280869e0cef7b0a2/recipes/status"; sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3"; - name = "status"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35495,20 +46205,24 @@ license = lib.licenses.free; }; }) {}; - stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + stgit = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stgit"; + ename = "stgit"; version = "0.18"; src = fetchFromGitHub { owner = "ctmarinas"; repo = "stgit"; - rev = "3df606d14f6673fede6cdf5fad921a664c03e108"; - sha256 = "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y"; + rev = "25a7ad1bbe8d529ab6c5bb8557d39650d0b2378f"; + sha256 = "17m3nb64wckh8jzcxah284cd8fakd4ja1mhix6v8nm9kknqic6xc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit"; sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g"; - name = "stgit"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35516,9 +46230,14 @@ license = lib.licenses.free; }; }) {}; - string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + string-edit = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "string-edit"; + ename = "string-edit"; version = "0.1.0"; src = fetchFromGitHub { owner = "magnars"; @@ -35526,10 +46245,10 @@ rev = "9f9c9cd659156fd2217be814eb4e91da48d44647"; sha256 = "15gdcpbba3h84s7xnpk69nav6bixdixnirdh5n1rly010q0m5s5x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20fd24f22ef734fe064c66692bf3e18eb896f1ac/recipes/string-edit"; sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8"; - name = "string-edit"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -35537,20 +46256,24 @@ license = lib.licenses.free; }; }) {}; - string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + string-inflection = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "string-inflection"; - version = "1.0.6"; + ename = "string-inflection"; + version = "1.0.7"; src = fetchFromGitHub { owner = "akicho8"; repo = "string-inflection"; - rev = "a150e7bdda60b7824d3a936750ce23f73b0e4edd"; - sha256 = "1k0sm552iawi49v4zis6dbb81d1rzgky9v0dpv7nj31gnb7bmy7k"; + rev = "a9de404b2ece932da9b1c9aa1c29dbf7cf506e76"; + sha256 = "1km8xxb0zc3yll1yzlsrrz14ch3inblpq2nhglwp1wskqwdhwly5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection"; sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2"; - name = "string-inflection"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35558,9 +46281,14 @@ license = lib.licenses.free; }; }) {}; - string-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }: - melpaBuild { + string-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , list-utils + , melpaBuild }: + melpaBuild { pname = "string-utils"; + ename = "string-utils"; version = "0.3.2"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -35568,10 +46296,10 @@ rev = "3ae530143899f533a9ef5e1f26f28b577ebe72ee"; sha256 = "03azfs6z0jg66ppalijcxl973vdbhj4c3g84sm5dm8xv6rnxrv2s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/string-utils"; sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v"; - name = "string-utils"; + name = "recipe"; }; packageRequires = [ list-utils ]; meta = { @@ -35579,9 +46307,14 @@ license = lib.licenses.free; }; }) {}; - stripe-buffer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + stripe-buffer = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stripe-buffer"; + ename = "stripe-buffer"; version = "0.2.5"; src = fetchFromGitHub { owner = "sabof"; @@ -35589,10 +46322,10 @@ rev = "d9f009b92cf16fe2c40cd92b8f842a3872e6c190"; sha256 = "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/stripe-buffer"; sha256 = "1kjib1kf9xqdirryr16wlvc95701hq8s4h8hz4dqzg3wzyb8287b"; - name = "stripe-buffer"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -35600,19 +46333,23 @@ license = lib.licenses.free; }; }) {}; - stumpwm-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { + stumpwm-mode = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "stumpwm-mode"; + ename = "stumpwm-mode"; version = "0.9.8"; src = fetchgit { url = "https://git.savannah.nongnu.org/git/stumpwm.git"; - rev = "4d0603e52b5bab993b3be63e3654c74f641e677d"; - sha256 = "0pn3xjz433b0djcys25a8fv775yqmj3qgg0hyghgxjpzsh6k2a4f"; + rev = "a920d31bac148e7f6afa98c05f98920135de8b89"; + sha256 = "0hg2dhgph1fz8z6c79ia2j36wnbqgi6a7fjiz3wngslhbwy28xq7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/stumpwm-mode"; sha256 = "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf"; - name = "stumpwm-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35620,20 +46357,25 @@ license = lib.licenses.free; }; }) {}; - stylus-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }: - melpaBuild { + stylus-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , sws-mode }: + melpaBuild { pname = "stylus-mode"; + ename = "stylus-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "brianc"; repo = "jade-mode"; - rev = "4e7a20db492719062f40b225ed730ed50be5db56"; - sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n"; + rev = "73893e8d8f1bcaf9f0252c6f020cdb3741d7125c"; + sha256 = "0fiihkwq4s8lkqx5fp3csmnaf0blnm6kpl4hfkwsb8rywgvzh7lk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/877b5a3e612e1b1d6d51e60c66b0b79f231abdb2/recipes/stylus-mode"; sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5"; - name = "stylus-mode"; + name = "recipe"; }; packageRequires = [ sws-mode ]; meta = { @@ -35641,9 +46383,13 @@ license = lib.licenses.free; }; }) {}; - subatomic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + subatomic-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "subatomic-theme"; + ename = "subatomic-theme"; version = "1.8.1"; src = fetchFromGitHub { owner = "cryon"; @@ -35651,10 +46397,10 @@ rev = "6a4086af748b1ecb27f6ba2aa2614988db16d594"; sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de7f6009bab3e9a5b14b7b96ab16557e81e7f078/recipes/subatomic-theme"; sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc"; - name = "subatomic-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35662,20 +46408,24 @@ license = lib.licenses.free; }; }) {}; - subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + subemacs = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "subemacs"; + ename = "subemacs"; version = "1.0"; src = fetchFromGitHub { owner = "kbauer"; repo = "subemacs"; - rev = "24f0896f1995a3ea42a58b0452d250dcc6802944"; - sha256 = "189547d0g9ax0nr221bkdchlfcj60dsy8lgbbrvq3n3xrmlvl362"; + rev = "c053ccae8b1d5317651f131a63210eb20f590c93"; + sha256 = "0jfdw6i3qjsil0myhrddqchg39vrnd94qci4k1z37k2323vszy3m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18714a6b5ca4dcc51fa509fee1dc9afb0595c707/recipes/subemacs"; sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm"; - name = "subemacs"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35683,9 +46433,13 @@ license = lib.licenses.free; }; }) {}; - sublimity = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sublimity = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sublimity"; + ename = "sublimity"; version = "20160629"; src = fetchFromGitHub { owner = "zk-phi"; @@ -35693,10 +46447,10 @@ rev = "ee9c9fbb92b8fc0c191e5e8640477e251b602bf9"; sha256 = "1kpq7kpmhgq3vjd62rr4qsc824qcyjxm50m49r7invgnmgd78h4x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e78cd1e5366a9b6d04237e9bf6a7e73424be52/recipes/sublimity"; sha256 = "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw"; - name = "sublimity"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35704,9 +46458,13 @@ license = lib.licenses.free; }; }) {}; - sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sudden-death = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sudden-death"; + ename = "sudden-death"; version = "0.2.1"; src = fetchFromGitHub { owner = "yewton"; @@ -35714,10 +46472,10 @@ rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb"; sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death"; sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh"; - name = "sudden-death"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35725,9 +46483,15 @@ license = lib.licenses.free; }; }) {}; - sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sudo-edit = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sudo-edit"; + ename = "sudo-edit"; version = "0.1.0"; src = fetchFromGitHub { owner = "nflath"; @@ -35735,10 +46499,10 @@ rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b"; sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; sha256 = "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4"; - name = "sudo-edit"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -35746,30 +46510,44 @@ license = lib.licenses.free; }; }) {}; - suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: - melpaBuild { + suggest = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , loop + , melpaBuild + , s + , spinner }: + melpaBuild { pname = "suggest"; - version = "0.5"; + ename = "suggest"; + version = "0.7"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "05beef9ecf94107d72d0070fa092a8392505b012"; - sha256 = "008d9kk8vb90n8j5dvw1rslfny66q012022na03dzbnmq3f73k7a"; + rev = "31ab6c956d17176affbbe9ca53c416920180ddbd"; + sha256 = "01v8plska5d3g19sb1m4ph1i3ayprfzk8mi6mpabjy6zad397xjl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; sha256 = "12vvakqqzmmqq5yynpd4wf4lnb0yvcnz065kni996sy7rv7rh83q"; - name = "suggest"; + name = "recipe"; }; - packageRequires = [ dash emacs f loop s ]; + packageRequires = [ dash emacs f loop s spinner ]; meta = { homepage = "https://melpa.org/#/suggest"; license = lib.licenses.free; }; }) {}; - suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + suomalainen-kalenteri = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "suomalainen-kalenteri"; + ename = "suomalainen-kalenteri"; version = "2017.8.1"; src = fetchFromGitHub { owner = "tlikonen"; @@ -35777,10 +46555,10 @@ rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3"; sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri"; sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh"; - name = "suomalainen-kalenteri"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35788,9 +46566,14 @@ license = lib.licenses.free; }; }) {}; - super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + super-save = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "super-save"; + ename = "super-save"; version = "0.2.0"; src = fetchFromGitHub { owner = "bbatsov"; @@ -35798,10 +46581,10 @@ rev = "73397501fa5b01c02b9ae94f82a8cb37d1ed105f"; sha256 = "0cw3yf2npy2ah00q2whpn52kaybbccw1qvfzsww0x4zshlrwvvvq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9730b65787b26d3909952cf246a01bd349e5fbab/recipes/super-save"; sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p"; - name = "super-save"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35809,9 +46592,14 @@ license = lib.licenses.free; }; }) {}; - svg-mode-line-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xmlgen }: - melpaBuild { + svg-mode-line-themes = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xmlgen }: + melpaBuild { pname = "svg-mode-line-themes"; + ename = "svg-mode-line-themes"; version = "0.1.3"; src = fetchFromGitHub { owner = "sabof"; @@ -35819,10 +46607,10 @@ rev = "80a0e01839cafbd66899202e7764c33231974259"; sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ca54d78b5e87c3bb582b178e4892af2bf447d1e/recipes/svg-mode-line-themes"; sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506"; - name = "svg-mode-line-themes"; + name = "recipe"; }; packageRequires = [ xmlgen ]; meta = { @@ -35830,9 +46618,16 @@ license = lib.licenses.free; }; }) {}; - swagger-to-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + swagger-to-org = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "swagger-to-org"; + ename = "swagger-to-org"; version = "0.0.2"; src = fetchFromGitHub { owner = "ahungry"; @@ -35840,10 +46635,10 @@ rev = "181357c71ea24bede263f5706d8781ad65e16877"; sha256 = "0x1mxxvlhhs34j869cy68gy5pgmvpfliyl9vlrlwm3z8apbip9gp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d5a7f017593e73ea48c0e535ecf3809536bcde5/recipes/swagger-to-org"; sha256 = "1m40f5njxcxmc2snaz2q43b4scwgp51y761kq6klixjvafi0pv86"; - name = "swagger-to-org"; + name = "recipe"; }; packageRequires = [ cl-lib emacs json ]; meta = { @@ -35851,9 +46646,17 @@ license = lib.licenses.free; }; }) {}; - sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: - melpaBuild { + sweetgreen = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , request }: + melpaBuild { pname = "sweetgreen"; + ename = "sweetgreen"; version = "0.5"; src = fetchFromGitHub { owner = "CestDiego"; @@ -35861,10 +46664,10 @@ rev = "e40d2821ff941695e50a9b003a8c96d32c19bfdc"; sha256 = "1gw09x5d4yqlmknjsrhgygp9bch315cnmyqp3679i3hza0l7fds6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63812707948e6dcc00e00ebc3c423469593e80fd/recipes/sweetgreen"; sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy"; - name = "sweetgreen"; + name = "recipe"; }; packageRequires = [ cl-lib dash helm request ]; meta = { @@ -35872,20 +46675,26 @@ license = lib.licenses.free; }; }) {}; - swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + swift-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "swift-mode"; - version = "4.1.1"; + ename = "swift-mode"; + version = "6.0.0"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29"; - sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4"; + rev = "d2f2f1da6085c6fad2709b951d6891dd139a6080"; + sha256 = "1ldf593qzbscwlngbabxb52kcpriwhglk95l82qs8y3q1x6aj0cw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d"; - name = "swift-mode"; + name = "recipe"; }; packageRequires = [ emacs seq ]; meta = { @@ -35893,9 +46702,14 @@ license = lib.licenses.free; }; }) {}; - swift3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + swift3-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "swift3-mode"; + ename = "swift3-mode"; version = "2.1.1"; src = fetchFromGitHub { owner = "taku0"; @@ -35903,10 +46717,10 @@ rev = "ea34d46bf9a4293e75ffdac9500d34989316d9e9"; sha256 = "1hwc3fxv87hmw0a0mgl8khfzf1p7yp2izkc02z8f1vbkaibmmawp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ca9071199230d3c4c1b2e3a501736df87095fd3/recipes/swift3-mode"; sha256 = "14vm05p8ix09v73dkmf03i56yib8yk6h2r1zc9m4ym80fki4f520"; - name = "swift3-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -35914,9 +46728,15 @@ license = lib.licenses.free; }; }) {}; - swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: - melpaBuild { + swiper = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { pname = "swiper"; + ename = "swiper"; version = "0.10.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -35924,10 +46744,10 @@ rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; sha256 = "0qaia5pgsjsmrfmcdj72jmj39zq82wg4i5l2mb2z6jlf1jpbk6y9"; - name = "swiper"; + name = "recipe"; }; packageRequires = [ emacs ivy ]; meta = { @@ -35935,9 +46755,16 @@ license = lib.licenses.free; }; }) {}; - swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }: - melpaBuild { + swiper-helm = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , swiper }: + melpaBuild { pname = "swiper-helm"; + ename = "swiper-helm"; version = "0.2.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -35945,10 +46772,10 @@ rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008"; sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm"; sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph"; - name = "swiper-helm"; + name = "recipe"; }; packageRequires = [ emacs helm swiper ]; meta = { @@ -35956,20 +46783,24 @@ license = lib.licenses.free; }; }) {}; - switch-buffer-functions = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + switch-buffer-functions = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "switch-buffer-functions"; + ename = "switch-buffer-functions"; version = "0.0.1"; src = fetchFromGitHub { owner = "10sr"; repo = "switch-buffer-functions-el"; - rev = "e1bccfff2d123b6218efab16c486215cedb9a108"; - sha256 = "0pq53b8wrjbrxd5hnrcdi0z7mffp4bax55hn90k9ca3j76lhbn1k"; + rev = "701caf97c977903c9afae6ef305241d068c5d9ac"; + sha256 = "1j6m3alk6y31zkq8h3fkha39fnvad7wmpa7kj4cwva0r5cd40l5a"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d37ebd28f4a2f770958bd9a2669cce86cc76cbe7/recipes/switch-buffer-functions"; sha256 = "1b93p8q07zncqq3nw829gddc615rwaan1ds5vgfhdb1l7bh9f37l"; - name = "switch-buffer-functions"; + name = "recipe"; }; packageRequires = []; meta = { @@ -35977,41 +46808,50 @@ license = lib.licenses.free; }; }) {}; - switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + switch-window = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "switch-window"; - version = "1.5.1"; + ename = "switch-window"; + version = "1.6.1"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d"; - sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c"; + rev = "40565f7bdf11e86d882185fa4c4ec77b96dcc21c"; + sha256 = "047qx4vk86b9jbvv5w477215mkmqpdwl5wd4n9fhp5xjni11jnhx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2"; - name = "switch-window"; + name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/switch-window"; license = lib.licenses.free; }; }) {}; - sws-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + sws-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "sws-mode"; + ename = "sws-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "brianc"; repo = "jade-mode"; - rev = "4e7a20db492719062f40b225ed730ed50be5db56"; - sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n"; + rev = "03486dce6990c96e85e53c18b8fcb35fbb8509f5"; + sha256 = "10w73i4sh6mn108lcnm6sv4xr1w0avbfw05kid28c33583h80vpm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/877b5a3e612e1b1d6d51e60c66b0b79f231abdb2/recipes/sws-mode"; sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i"; - name = "sws-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36019,9 +46859,18 @@ license = lib.licenses.free; }; }) {}; - sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: - melpaBuild { + sx = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , let-alist + , lib + , markdown-mode + , melpaBuild }: + melpaBuild { pname = "sx"; + ename = "sx"; version = "0.4"; src = fetchFromGitHub { owner = "vermiculus"; @@ -36029,10 +46878,10 @@ rev = "4892f45746fb217d059f4fa074a237c5bac7dd6c"; sha256 = "02f63k8rzb3bcch6vj6w5c5ncccqg83siqnc8hyi0lhy1bfx240p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517"; - name = "sx"; + name = "recipe"; }; packageRequires = [ cl-lib emacs json let-alist markdown-mode ]; meta = { @@ -36040,20 +46889,24 @@ license = lib.licenses.free; }; }) {}; - symbolword-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + symbolword-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "symbolword-mode"; + ename = "symbolword-mode"; version = "1.0"; src = fetchFromGitHub { owner = "ncaq"; repo = "symbolword-mode"; - rev = "273dece5b04f7abc4c35048b2f64f04b33774b87"; - sha256 = "0gpm0zy1kwqxkakvfdgh1lylp99msyamwvi19c53g9jl01m9avyd"; + rev = "14a2e4429229d073d48d77c81b3551d60256c545"; + sha256 = "1p92xxclzyfpxl3g12s3651y5rx4a6hf9zy232mxzlxjy0adic2v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be2018e0206c3f39c1b67e83000b030d70a72ceb/recipes/symbolword-mode"; sha256 = "1fs1irnmlbrn76b4gdsy0v65nz8av85iqm0b7g9nm2rm8azcr050"; - name = "symbolword-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36061,9 +46914,13 @@ license = lib.licenses.free; }; }) {}; - symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + symon = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "symon"; + ename = "symon"; version = "20160630"; src = fetchFromGitHub { owner = "zk-phi"; @@ -36071,10 +46928,10 @@ rev = "7beeedd70dc37f5904c781fb697c8df056196ee9"; sha256 = "1q7di9s8k710nx98wnqnbkkhdimrn0jf6z4xkm4c78l6s5idjwlz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f4bbc6b3d7b2e2a9fbe7ff7f1d47cda9c859cc0/recipes/symon"; sha256 = "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz"; - name = "symon"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36082,20 +46939,25 @@ license = lib.licenses.free; }; }) {}; - syndicate = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + syndicate = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "syndicate"; + ename = "syndicate"; version = "1.0"; src = fetchFromGitHub { owner = "KNX32542"; repo = "syndicate"; - rev = "b839aaba0c8583a3254476b53976e3caac4f89a9"; - sha256 = "01bymbsvbisnpb2wpqxhrvqx6cj57nh4xvpsbsr5rr1h4pm5jkzl"; + rev = "38b78e18442b1fd028ef3c44053c97bd6020a5b8"; + sha256 = "0iycq74liddjgah9xhb562rr7a8s2c99mbw22r34gvl7rqhn6c2j"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/626bda1691d9c7a97fcf549f7a3f0d41d832cfde/recipes/syndicate"; sha256 = "06nmldcw5dy2shhpk6nyix7gs57gsr5s9ksj57xgg8y2j3j0da95"; - name = "syndicate"; + name = "recipe"; }; packageRequires = [ evil ]; meta = { @@ -36103,20 +46965,25 @@ license = lib.licenses.free; }; }) {}; - synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + synosaurus = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "synosaurus"; + ename = "synosaurus"; version = "0.1.0"; src = fetchFromGitHub { owner = "hpdeifel"; repo = "synosaurus"; - rev = "56efdc38952b9bd56a445591fcdeb626aede8678"; - sha256 = "0hi2jflrlpp7xkbj852vp9hcl8bfmf04jqw1hawxrw4bxdp95jh2"; + rev = "93f8e0bdddc94426730bfcdf736522e378af508f"; + sha256 = "0gq9gq3a2x7ysmxil4fg6srnm424digpfp8gc2iqvhkdrhmygg3y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus"; sha256 = "06a48ajpickf4qr1bc14skfr8khnjjph7c35b7ajfy8jw2zwavpn"; - name = "synosaurus"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -36124,9 +46991,13 @@ license = lib.licenses.free; }; }) {}; - syntactic-sugar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + syntactic-sugar = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "syntactic-sugar"; + ename = "syntactic-sugar"; version = "0.9.4"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -36134,10 +47005,10 @@ rev = "06d943c6ad9507603bb6ab6d37be2d359d0763a9"; sha256 = "1pn69f4w48jdj3wd1myj6qq2mhvygmlzbq2dws2qkjlp3kbwa6da"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b32b9b3b3e820e498d7531a1f82da36e5e8f4e74/recipes/syntactic-sugar"; sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r"; - name = "syntactic-sugar"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36145,8 +47016,11 @@ license = lib.licenses.free; }; }) {}; - syntax-subword = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + syntax-subword = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "syntax-subword"; version = "0.2"; src = fetchhg { @@ -36154,7 +47028,7 @@ rev = "ad0db0fcb464"; sha256 = "1wcgr6scvwwfmhhjbpq3riq0gmp4g08ffbl91fpgp72j8zrc1c6x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/syntax-subword"; sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm"; name = "syntax-subword"; @@ -36165,30 +47039,39 @@ license = lib.licenses.free; }; }) {}; - system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + system-packages = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "system-packages"; - version = "1.0.1"; - src = fetchFromGitHub { + ename = "system-packages"; + version = "1.0.5"; + src = fetchFromGitLab { owner = "jabranham"; repo = "system-packages"; - rev = "557b1eb96479cc6c73b9b7d509dd60b0ee71934d"; - sha256 = "01r8754ckbzsvlmnbpwpx2j33q693cmg5a59i5d77adn24ssk4f4"; + rev = "7b87f7dbd53d7bd365157d831893f7a70ae67910"; + sha256 = "02h3qf455y3dpmf4f312x9dvxrndp9dkyyvs1vw6g9aqahrr4vys"; }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; - sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1"; - name = "system-packages"; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/system-packages"; + sha256 = "13nk3m8gw9kqjllk7hgkmpxsx9y5h03f0l7zydg388wc7cxsiy3l"; + name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/system-packages"; license = lib.licenses.free; }; }) {}; - system-specific-settings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + system-specific-settings = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "system-specific-settings"; + ename = "system-specific-settings"; version = "0.2"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; @@ -36196,10 +47079,10 @@ rev = "0050d85b2175095aa5ecf580a2fe43c069b0eef3"; sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f52c584d7435c836ba3c95c598306ba0f5c06da/recipes/system-specific-settings"; sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp"; - name = "system-specific-settings"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36207,9 +47090,14 @@ license = lib.licenses.free; }; }) {}; - systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + systemd = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "systemd"; + ename = "systemd"; version = "1.6"; src = fetchFromGitHub { owner = "holomorph"; @@ -36217,10 +47105,10 @@ rev = "1e7567a9973bf80cab0d7e0355656a84bee7ca96"; sha256 = "0ylgnvpfindg4cxccbqy02ic7p0i9rygf1w16dm1filwhbqvjplq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; sha256 = "1ykvm8mfi3fjvrkfcy9qn0sr9mhwm9x1svrmrd0gyqk418clk5i3"; - name = "systemd"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -36228,9 +47116,15 @@ license = lib.licenses.free; }; }) {}; - ta = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ta = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ta"; + ename = "ta"; version = "1.5"; src = fetchFromGitHub { owner = "kuanyui"; @@ -36238,10 +47132,10 @@ rev = "9226afbe7abbefb825844ef3ba4ca15f1934cfc2"; sha256 = "09nndx83ws5v2i9x0dzk6l1a0lq29ffzh3y05n0n64nf5j0a7zvk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/847693b5952e99597bd77223e1058536d1beeb5c/recipes/ta"; sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll"; - name = "ta"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -36249,9 +47143,14 @@ license = lib.licenses.free; }; }) {}; - tabbar-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tabbar }: - melpaBuild { + tabbar-ruler = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tabbar }: + melpaBuild { pname = "tabbar-ruler"; + ename = "tabbar-ruler"; version = "0.45"; src = fetchFromGitHub { owner = "mattfidler"; @@ -36259,10 +47158,10 @@ rev = "7df2e4814018e84ef9261d04a2ade8168a44e3d7"; sha256 = "1xd67s92gyr49v73j7r7cbhsc40bkw8aqh21whgbypdgzpyc7azc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d69d1ef8dbab8394be01153cf9ebe8e49bf9912/recipes/tabbar-ruler"; sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d"; - name = "tabbar-ruler"; + name = "recipe"; }; packageRequires = [ tabbar ]; meta = { @@ -36270,9 +47169,14 @@ license = lib.licenses.free; }; }) {}; - tablist = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tablist = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tablist"; + ename = "tablist"; version = "0.70"; src = fetchFromGitHub { owner = "politza"; @@ -36280,10 +47184,10 @@ rev = "ef38312867bc0268b1584dd890b1c420bb77ec11"; sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc0c6c02d609fb22710560337bd577f4b1e0c8f/recipes/tablist"; sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p"; - name = "tablist"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -36291,9 +47195,15 @@ license = lib.licenses.free; }; }) {}; - tagedit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + tagedit = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "tagedit"; + ename = "tagedit"; version = "1.4.0"; src = fetchFromGitHub { owner = "magnars"; @@ -36301,10 +47211,10 @@ rev = "3fcf54b824b75c5ad68f5438d5638103049a389f"; sha256 = "0kq40g46s8kgiafrhdq99h79rz9h5fvgz59k7ralmf86bl4sdmdb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8968e2cd0bd49d54a5479b2467bd4f0a97d7a969/recipes/tagedit"; sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z"; - name = "tagedit"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -36312,30 +47222,65 @@ license = lib.licenses.free; }; }) {}; - tawny-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tawny-mode = callPackage ({ cider + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tawny-mode"; - version = "1.5.0"; + ename = "tawny-mode"; + version = "2.0.0"; src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "5666b34900a39c6da73d9a1efe11bddf94136a04"; - sha256 = "0amsz28n0syqqkxlmzsndm0ayvzc9kgzk8brs9ihskv0j5b3pdcq"; + rev = "9f11bb428a255a605c725dfbd23cc082c5d258af"; + sha256 = "0l419pvvnj850c6byr7njnjki171mcsvlqj8g2d4qk16j504n34m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; sha256 = "1xaw1six1n6rw1283fdyl15xcf6m7ngvq6gqlz0xzpf232c4b0kr"; - name = "tawny-mode"; + name = "recipe"; }; - packageRequires = []; + packageRequires = [ cider emacs ]; meta = { homepage = "https://melpa.org/#/tawny-mode"; license = lib.licenses.free; }; }) {}; - telepathy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tdd-status-mode-line = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "tdd-status-mode-line"; + ename = "tdd-status-mode-line"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "algernon"; + repo = "tdd-status-mode-line"; + rev = "9b3c35b0a972772640e9fee653eab6a76e06416a"; + sha256 = "0bvxc926kaxvqnppaw4y6gp814qc0krvidn5qg761z4qwz023rax"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/25b445a1dea5e8f1042bed6b5372471c25129fd8/recipes/tdd-status-mode-line"; + sha256 = "1i0s7f4y4v8681mymcmjlcbq0jfghgmdzrs167c453mb5ssz8yxg"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/tdd-status-mode-line"; + license = lib.licenses.free; + }; + }) {}; + telepathy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "telepathy"; + ename = "telepathy"; version = "1.0"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -36343,10 +47288,10 @@ rev = "211d785b02a29ddc254422fdcc3db45262582f8c"; sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/485ef1745f07f29c45bf0d489eeb4fcdfda80b33/recipes/telepathy"; sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr"; - name = "telepathy"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36354,9 +47299,17 @@ license = lib.licenses.free; }; }) {}; - telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: - melpaBuild { + telephone-line = callPackage ({ cl-generic + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { pname = "telephone-line"; + ename = "telephone-line"; version = "0.4"; src = fetchFromGitHub { owner = "dbordak"; @@ -36364,10 +47317,10 @@ rev = "a83dcda21b0f6e10e51c3cded7da9a5d2ead5f34"; sha256 = "1cg34l6jq75mcqnb3p93z0kv1arvnswm8nkk39fmryand2yygnl9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3"; - name = "telephone-line"; + name = "recipe"; }; packageRequires = [ cl-generic cl-lib emacs seq ]; meta = { @@ -36375,9 +47328,14 @@ license = lib.licenses.free; }; }) {}; - ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ten-hundred-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ten-hundred-mode"; + ename = "ten-hundred-mode"; version = "1.0.1"; src = fetchFromGitHub { owner = "aaron-em"; @@ -36385,10 +47343,10 @@ rev = "bdcfda49b1819e82d61fe90947e50bb948cf7933"; sha256 = "11nsh6dkd3i489lrqpd9xhr4c0ai51364rlrd6slm54720by9jql"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a0534044ff9ce0740414bf5dc3b104bbdbdacce/recipes/ten-hundred-mode"; sha256 = "17v38h33ka70ynq72mvma2chvlnm1k2amyvk62c65iv67rwilky3"; - name = "ten-hundred-mode"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -36396,9 +47354,17 @@ license = lib.licenses.free; }; }) {}; - term-alert = callPackage ({ alert, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, term-cmd }: - melpaBuild { + term-alert = callPackage ({ alert + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , term-cmd }: + melpaBuild { pname = "term-alert"; + ename = "term-alert"; version = "1.2"; src = fetchFromGitHub { owner = "CallumCameron"; @@ -36406,10 +47372,10 @@ rev = "47af9e6fe483ef0d393098c145f499362a33292a"; sha256 = "1nv8ma8x9xkgsl95z7yysy8q1lb3xr0pd8a5sb01nlx8ks3clad4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d77aee0b1b2eb7834436bdfa339f95cb97da140/recipes/term-alert"; sha256 = "02qvfhklysfk1fd4ibdngf4crp9k5ab11zgg90hi1sp429a53f3m"; - name = "term-alert"; + name = "recipe"; }; packageRequires = [ alert emacs f term-cmd ]; meta = { @@ -36417,9 +47383,16 @@ license = lib.licenses.free; }; }) {}; - term-cmd = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + term-cmd = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "term-cmd"; + ename = "term-cmd"; version = "1.1"; src = fetchFromGitHub { owner = "CallumCameron"; @@ -36427,10 +47400,10 @@ rev = "6c9cbc659b70241d2ed1601eea34aeeca0646dac"; sha256 = "08qiipjsqc9dfbha6r2yijjbrg2s4i2mkn6zn5616086550v3kpj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e08ea89cf193414cce5073fc9c312f2b382bc842/recipes/term-cmd"; sha256 = "0pbz9fy9rjfpzspwq78ggf1wcvjslwvj8fvc05w4g56ydza0gqi4"; - name = "term-cmd"; + name = "recipe"; }; packageRequires = [ dash emacs f ]; meta = { @@ -36438,20 +47411,26 @@ license = lib.licenses.free; }; }) {}; - term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + term-manager = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "term-manager"; + ename = "term-manager"; version = "0.1.1"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "0bca2e7e3b6e906ec67696bc0be952988ca7f733"; - sha256 = "0ybmszjb2lrgqp3zixpxy0lp2l9axw3mz2d4n2kmajh8ckbr576v"; + rev = "bbf64e7d840bc60242dd1d4943f6f5acee1478c2"; + sha256 = "1p11zrig6f01hyxx0adrz57i8zq4c61myiak3kd80v4j3aa8d7ng"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager"; sha256 = "0ab388ki7vr1wpz81bvbl2fskq9zz5bicdf5gqfg01qzv5l75iza"; - name = "term-manager"; + name = "recipe"; }; packageRequires = [ dash emacs ]; meta = { @@ -36459,9 +47438,15 @@ license = lib.licenses.free; }; }) {}; - term-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: - melpaBuild { + term-projectile = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , term-manager }: + melpaBuild { pname = "term-projectile"; + ename = "term-projectile"; version = "0.1.1"; src = fetchFromGitHub { owner = "IvanMalison"; @@ -36469,10 +47454,10 @@ rev = "0bca2e7e3b6e906ec67696bc0be952988ca7f733"; sha256 = "0ybmszjb2lrgqp3zixpxy0lp2l9axw3mz2d4n2kmajh8ckbr576v"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; sha256 = "1mzyzjxkdfvf1kq9m3c1f6y6xzj1qq53rixawmnzmil5cmznvwag"; - name = "term-projectile"; + name = "recipe"; }; packageRequires = [ projectile term-manager ]; meta = { @@ -36480,9 +47465,13 @@ license = lib.licenses.free; }; }) {}; - term-run = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + term-run = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "term-run"; + ename = "term-run"; version = "0.1.5"; src = fetchFromGitHub { owner = "10sr"; @@ -36490,10 +47479,10 @@ rev = "54650dbbabb13cb2a6c0670ff6b24b29717a6a8b"; sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cad6343104bfe5724e068660af79a6249010164/recipes/term-run"; sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs"; - name = "term-run"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36501,9 +47490,14 @@ license = lib.licenses.free; }; }) {}; - termbright-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + termbright-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "termbright-theme"; + ename = "termbright-theme"; version = "1.0"; src = fetchFromGitHub { owner = "bmastenbrook"; @@ -36511,10 +47505,10 @@ rev = "bec6ab14336c0611e85f45486276004f16d20607"; sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7151773de39fe570e3e9b351daad89db9dd267f/recipes/termbright-theme"; sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj"; - name = "termbright-theme"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -36522,9 +47516,15 @@ license = lib.licenses.free; }; }) {}; - terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + terminal-here = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "terminal-here"; + ename = "terminal-here"; version = "1.0"; src = fetchFromGitHub { owner = "davidshepherd7"; @@ -36532,10 +47532,10 @@ rev = "e176d1675dc5c41b6aebd05122fb2efc44b6cff0"; sha256 = "0dj3z8czvziszb20sizgf1yriv4im811rcfadm7ga9zs2al56kqy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; sha256 = "1w64r3y88lspxxcqcqfwhakk8p9vl7q3z610dykfbqwqx61a6adj"; - name = "terminal-here"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -36543,20 +47543,27 @@ license = lib.licenses.free; }; }) {}; - tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + tern = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "tern"; + ename = "tern"; version = "0.21.0"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "e6a7777f273050098fa7074577ac196bae59d80b"; - sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv"; + rev = "f9bde5792b7a19ac63c344219e0b0c6bd5a41d35"; + sha256 = "0pdpchnpsy7iwafr2gawy4sm8kfhh101k8yijkckpnk8ir1lw1jw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; sha256 = "1am97ssslkyijpvgk4nldi67ws48g1kpj6gisqzajrrlw5q93wvd"; - name = "tern"; + name = "recipe"; }; packageRequires = [ cl-lib emacs json ]; meta = { @@ -36564,20 +47571,28 @@ license = lib.licenses.free; }; }) {}; - tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: - melpaBuild { + tern-auto-complete = callPackage ({ auto-complete + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tern }: + melpaBuild { pname = "tern-auto-complete"; + ename = "tern-auto-complete"; version = "0.21.0"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "e6a7777f273050098fa7074577ac196bae59d80b"; - sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv"; + rev = "dcd808f985e7b0f562467e2145dcd1e901347999"; + sha256 = "1wwf9h6inv3gvp8g7n98dqvjmn01i8sx3n3h3ilqq3cbsy58yjvg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; sha256 = "1i99b4awph50ygcqsnppm1h48hbf8cpq1ppd4swakrwgmcy2mn26"; - name = "tern-auto-complete"; + name = "recipe"; }; packageRequires = [ auto-complete cl-lib emacs tern ]; meta = { @@ -36585,20 +47600,27 @@ license = lib.licenses.free; }; }) {}; - tern-context-coloring = callPackage ({ context-coloring, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: - melpaBuild { + tern-context-coloring = callPackage ({ context-coloring + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tern }: + melpaBuild { pname = "tern-context-coloring"; + ename = "tern-context-coloring"; version = "1.0.1"; src = fetchFromGitHub { owner = "jacksonrayhamilton"; repo = "tern-context-coloring"; - rev = "3a8e979d6cc83aabcb3dda3f5f31a6422532efba"; - sha256 = "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y"; + rev = "db0466c650ed4f7e6621a48dfdc53eaf5e127be9"; + sha256 = "093mdq97gc0ljw6islhm7y1yl3yf7w4gf205s96bnsnb1v952n63"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db2119d2c2d167d771ee02c2735b435d59991b93/recipes/tern-context-coloring"; sha256 = "0wkb7gn2ma6mz495bgphcjs5p0c6a869zk4a8mnm0spq41xbw4gi"; - name = "tern-context-coloring"; + name = "recipe"; }; packageRequires = [ context-coloring emacs tern ]; meta = { @@ -36606,20 +47628,27 @@ license = lib.licenses.free; }; }) {}; - tern-django = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: - melpaBuild { + tern-django = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , tern }: + melpaBuild { pname = "tern-django"; + ename = "tern-django"; version = "0.1.0"; src = fetchFromGitHub { owner = "proofit404"; repo = "tern-django"; - rev = "6d616c5f802d3432c4065dc306d7977d254df49f"; - sha256 = "0l63lzm96gg3ihgc4l671i342qxigwdbn4xfkbxnarb0206gnb5p"; + rev = "3b779469ba7f0249dec17d91b219dc0badf98774"; + sha256 = "0k9fra8nf1zpa59rznw93pa0pg9h98sq6896wdhahcm9z3x0rlhn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9e128a795e4949e3d4c2f01db0161a34935f635/recipes/tern-django"; sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0"; - name = "tern-django"; + name = "recipe"; }; packageRequires = [ emacs f tern ]; meta = { @@ -36627,9 +47656,15 @@ license = lib.licenses.free; }; }) {}; - terraform-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }: - melpaBuild { + terraform-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , hcl-mode + , lib + , melpaBuild }: + melpaBuild { pname = "terraform-mode"; + ename = "terraform-mode"; version = "0.6"; src = fetchFromGitHub { owner = "syohex"; @@ -36637,10 +47672,10 @@ rev = "6286aa42132a7fcad49271d63be33deeeb8d4efc"; sha256 = "05hn8kskx9lcgn7bzgam99c629zlryir2pickwrqndacjrqpdykx"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode"; sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn"; - name = "terraform-mode"; + name = "recipe"; }; packageRequires = [ emacs hcl-mode ]; meta = { @@ -36648,9 +47683,14 @@ license = lib.licenses.free; }; }) {}; - test-case-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }: - melpaBuild { + test-case-mode = callPackage ({ fetchFromGitHub + , fetchurl + , fringe-helper + , lib + , melpaBuild }: + melpaBuild { pname = "test-case-mode"; + ename = "test-case-mode"; version = "1.0"; src = fetchFromGitHub { owner = "ieure"; @@ -36658,10 +47698,10 @@ rev = "26e397c0f930b7eb0be413ef7dd257b1da052bec"; sha256 = "108csr1d7w0105rb6brzgbksb9wmq1p573vxbq0miv5k894j447f"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2e0bf342713cbdf30cf98d0bbc7476b0abeb7f5/recipes/test-case-mode"; sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi"; - name = "test-case-mode"; + name = "recipe"; }; packageRequires = [ fringe-helper ]; meta = { @@ -36669,9 +47709,13 @@ license = lib.licenses.free; }; }) {}; - test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + test-kitchen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "test-kitchen"; + ename = "test-kitchen"; version = "0.3.0"; src = fetchFromGitHub { owner = "jjasghar"; @@ -36679,10 +47723,10 @@ rev = "ddbcb964ac4700973eaf30ae366f086e3319e51f"; sha256 = "004rd6jkaklsbgka9mf2zi5qzxsl2shwl1kw0vgb963xkmk9zaz8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420d18c76f593338fb28807fcbe3b884be5b1634/recipes/test-kitchen"; sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0"; - name = "test-kitchen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36690,9 +47734,13 @@ license = lib.licenses.free; }; }) {}; - test-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + test-simple = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "test-simple"; + ename = "test-simple"; version = "1.0"; src = fetchFromGitHub { owner = "rocky"; @@ -36700,10 +47748,10 @@ rev = "75eea25bae04d8e5e3e835a2770f02f0ff4602c4"; sha256 = "08g7fan1y3wi4w7cdij14awadqss6prqg3k7qzf0wrnbm13dzhmk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b76e053faee299f5b770a0e41aa615bf5fbf10/recipes/test-simple"; sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g"; - name = "test-simple"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36711,20 +47759,24 @@ license = lib.licenses.free; }; }) {}; - textmate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + textmate = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "textmate"; + ename = "textmate"; version = "1"; src = fetchFromGitHub { owner = "defunkt"; repo = "textmate.el"; - rev = "484845493a3c9b570799aea5195a5435a5a01b76"; - sha256 = "1a0fzn66gv421by0x6wj3z6bvzv274a9p8c2aaax0dskncl5lgk1"; + rev = "17b699fc96849958f9a09003d11da73020ffb7be"; + sha256 = "14bxpbswwpzbz6g8z3imgk2nsig0xllxmf71w0i83cdhh7ql1f3h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad3923ac8948de75a159e916ecc22005a17458ad/recipes/textmate"; sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v"; - name = "textmate"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36732,9 +47784,13 @@ license = lib.licenses.free; }; }) {}; - textmate-to-yas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + textmate-to-yas = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "textmate-to-yas"; + ename = "textmate-to-yas"; version = "0.21"; src = fetchFromGitHub { owner = "mattfidler"; @@ -36742,10 +47798,10 @@ rev = "8805e5159329e1b74629b7b584373fc446f57d31"; sha256 = "0fjapb7naysf34g4ac5gsa90b2s2ss7qgpyd9mfv3mdqrsp2dyw7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/487c461bf658d50135428d72fbfbb2573a00eb7d/recipes/textmate-to-yas"; sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l"; - name = "textmate-to-yas"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36753,9 +47809,14 @@ license = lib.licenses.free; }; }) {}; - textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + textx-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "textx-mode"; + ename = "textx-mode"; version = "0.0.2"; src = fetchFromGitHub { owner = "novakboskov"; @@ -36763,10 +47824,10 @@ rev = "72f9f0c5855b382024f0da8f56833c22a70a5cb3"; sha256 = "1lr9v7dk0pnmpvdvs4m5d9yvxlii0xzr8b3akknm25gvbw1y1q8k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode"; sha256 = "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn"; - name = "textx-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -36774,9 +47835,13 @@ license = lib.licenses.free; }; }) {}; - theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + theme-changer = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "theme-changer"; + ename = "theme-changer"; version = "2.1.0"; src = fetchFromGitHub { owner = "hadronzoo"; @@ -36784,10 +47849,10 @@ rev = "d3d9c9f62a138958262ac5dd61837df427268611"; sha256 = "09vf3qs949n4iqzd14iq2kgvypwdwdv8ii8l5jcqfppgspd8m8yd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d08b24a2aec1012751054c68f7d55bac1bd1fd11/recipes/theme-changer"; sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w"; - name = "theme-changer"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36795,9 +47860,14 @@ license = lib.licenses.free; }; }) {}; - theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + theme-looper = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "theme-looper"; + ename = "theme-looper"; version = "1.0.0"; src = fetchFromGitHub { owner = "myTerminal"; @@ -36805,10 +47875,10 @@ rev = "5e3a3ea7ad31d4b38efa2cc08f0063b230736da9"; sha256 = "06khrrjlhnzckr2zisdbx4pj6r8kmv7dbdzvzh74qz79x337lvzn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf"; - name = "theme-looper"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -36816,9 +47886,14 @@ license = lib.licenses.free; }; }) {}; - thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + thinks = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "thinks"; + ename = "thinks"; version = "1.12"; src = fetchFromGitHub { owner = "davep"; @@ -36826,10 +47901,10 @@ rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d"; sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks"; sha256 = "11vj9mjfzmqwdmkq97aqns3fh8hkgx9scnki6c2iag5lj0av2vcq"; - name = "thinks"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -36837,20 +47912,24 @@ license = lib.licenses.free; }; }) {}; - thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + thrift = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "thrift"; + ename = "thrift"; version = "0.11.0"; src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "327ebb6c2b6df8bf075da02ef45a2a034e9b79ba"; - sha256 = "1scv403g5a2081awg5za5d3parj1lg63llnnac11d6fn7j7ms99p"; + rev = "98bebac1520bcf1dd5392535e06a751d7b2af58e"; + sha256 = "185hrigx5q15c2jimzbklmi4z6kzigsarqwr805llsmsmg9pp3wi"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9"; - name = "thrift"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36858,9 +47937,14 @@ license = lib.licenses.free; }; }) {}; - tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tickscript-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tickscript-mode"; + ename = "tickscript-mode"; version = "0.4.1"; src = fetchFromGitHub { owner = "msherry"; @@ -36868,10 +47952,10 @@ rev = "6e7564593d7735acc9f3fa670ec6512991cb73a1"; sha256 = "173zk9nzjds0rkypmaq8xv5qianivgk16jpzgk0msdsn9kjbd8s9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54"; - name = "tickscript-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -36879,20 +47963,26 @@ license = lib.licenses.free; }; }) {}; - tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: - melpaBuild { + tidal = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "tidal"; - version = "0.9.6"; + ename = "tidal"; + version = "0.9.8"; src = fetchFromGitHub { owner = "tidalcycles"; repo = "Tidal"; - rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406"; - sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg"; + rev = "ef658d3df0604f3dec955a150509ec1cc68fbd98"; + sha256 = "1ild1gnbcrw830b8d3byvqlmgm27609dgailmxgin6z7g1pg4r7z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a"; - name = "tidal"; + name = "recipe"; }; packageRequires = [ emacs haskell-mode ]; meta = { @@ -36900,20 +47990,29 @@ license = lib.licenses.free; }; }) {}; - tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: - melpaBuild { + tide = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild + , s + , typescript-mode }: + melpaBuild { pname = "tide"; - version = "2.8.1"; + ename = "tide"; + version = "2.8.3.1"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "0db094ba1748e3add4e152fa34d64b25eb07bdd2"; - sha256 = "113lg22aaagh3bbabxp65460cfwa9whjg3yzafd5n8azkinq8s6k"; + rev = "0c624e7f02fb8f5b78ec35436d7b2f3f42d46dea"; + sha256 = "0pcxfdql98nnfckjzpykr619p8qsy87wnhyqjajgqxh6ad5rq6si"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1"; - name = "tide"; + name = "recipe"; }; packageRequires = [ cl-lib dash flycheck s typescript-mode ]; meta = { @@ -36921,20 +48020,24 @@ license = lib.licenses.free; }; }) {}; - timer-revert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + timer-revert = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "timer-revert"; + ename = "timer-revert"; version = "0.1"; src = fetchFromGitHub { owner = "yyr"; repo = "timer-revert"; - rev = "31ad8d94b85807cd9f63fcba0c90c3e9a9515fa2"; - sha256 = "1vq5yp6pyjam2csz22mcp353a4d5r7f9m6bsjizfmgr2ld7bwhx7"; + rev = "6c67f09d4c8349f2883ee870097ec68be0033291"; + sha256 = "0b9sar8crzh3rzsscvqj45gkr2kfxp7w1fzq7y1d631d45wn41zq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/991e68c59d1fbaef06ba2583f07499ecad05586d/recipes/timer-revert"; sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy"; - name = "timer-revert"; + name = "recipe"; }; packageRequires = []; meta = { @@ -36942,9 +48045,16 @@ license = lib.licenses.free; }; }) {}; - timesheet = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: - melpaBuild { + timesheet = callPackage ({ auctex + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org + , s }: + melpaBuild { pname = "timesheet"; + ename = "timesheet"; version = "0.4.0"; src = fetchFromGitHub { owner = "tmarble"; @@ -36952,10 +48062,10 @@ rev = "2ed6fea9b508eb7eaff659d9a34a09ba064d4df8"; sha256 = "028d1sn29idznzsc95w2c1sdz3rpmf3vgk2365li0vvs99s51hi2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/40009ef2f6845c83242ca5d0a8c9c2c1e4ef8a9d/recipes/timesheet"; sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506"; - name = "timesheet"; + name = "recipe"; }; packageRequires = [ auctex org s ]; meta = { @@ -36963,9 +48073,19 @@ license = lib.licenses.free; }; }) {}; - timonier = callPackage ({ all-the-icons, dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }: - melpaBuild { + timonier = callPackage ({ all-the-icons + , dash + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild + , pkg-info + , request + , s }: + melpaBuild { pname = "timonier"; + ename = "timonier"; version = "0.1.0"; src = fetchFromGitHub { owner = "nlamirault"; @@ -36973,10 +48093,10 @@ rev = "33ca5887a1d1b63349177237e9edfb73546511a5"; sha256 = "0z6s26kc50rbmgkkbxzpasphi8hcwhixmi8ksqzrclayccjjj7ar"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier"; sha256 = "0vb83kv2dkca2bq876icxs8iivv9qgkzmzrsxfpnvbv752b220b0"; - name = "timonier"; + name = "recipe"; }; packageRequires = [ all-the-icons dash hydra pkg-info request s ]; meta = { @@ -36984,9 +48104,13 @@ license = lib.licenses.free; }; }) {}; - toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + toc-org = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "toc-org"; + ename = "toc-org"; version = "1.0.1"; src = fetchFromGitHub { owner = "snosov1"; @@ -36994,10 +48118,10 @@ rev = "a0e8ca05e806e5074b8603985da7f18b92c15856"; sha256 = "1sv9y5dln4ai9w3mgg8p4a3s05hflfqh0k7k8isjqikydbv85m2k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; sha256 = "06mx2b0zjck82vp3i4bwbqlrzn05i2rkf8080cn34nkizi59wlbs"; - name = "toc-org"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37005,9 +48129,14 @@ license = lib.licenses.free; }; }) {}; - total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + total-lines = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "total-lines"; + ename = "total-lines"; version = "0.2.0"; src = fetchFromGitHub { owner = "hinrik"; @@ -37015,10 +48144,10 @@ rev = "58a9fb0ffca63e3dfb3b27c7d91b4630e422903b"; sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines"; sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh"; - name = "total-lines"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37026,20 +48155,24 @@ license = lib.licenses.free; }; }) {}; - tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tox = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tox"; + ename = "tox"; version = "0.4.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "tox.el"; - rev = "7655eb254038d5e34433e8a9d66b3ffc9c72e40c"; - sha256 = "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki"; + rev = "27a074b21238855ce3c33d22e42d69e2c2921205"; + sha256 = "1m3f0i6vrkrncd7xsgz65m6595iv6yr4gbbzlis8p01kd98wbxfk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox"; sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl"; - name = "tox"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37047,8 +48180,12 @@ license = lib.licenses.free; }; }) {}; - toxi-theme = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + toxi-theme = callPackage ({ emacs + , fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "toxi-theme"; version = "0.1.2"; src = fetchhg { @@ -37056,7 +48193,7 @@ rev = "b322fc7497a5"; sha256 = "1pnsky541m8kzcv81w98jkv0hgajh04hxqlmgddc1y0wbvi849j0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/toxi-theme"; sha256 = "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd"; name = "toxi-theme"; @@ -37067,20 +48204,62 @@ license = lib.licenses.free; }; }) {}; - tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + traad = callPackage ({ dash + , deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup + , request + , request-deferred + , virtualenvwrapper }: + melpaBuild { + pname = "traad"; + ename = "traad"; + version = "3.1.1"; + src = fetchFromGitHub { + owner = "abingham"; + repo = "emacs-traad"; + rev = "1f05cb4e5e96a90d2fb2bbc93093084327c40cf2"; + sha256 = "14qg8aczcdf51w618zdzx3d48y9n4skjrg72yhgcm9a9lrs5v8y1"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; + sha256 = "08gxh5c01xfbbj9g4992jah494rw3d3bbs8j79r3mpqxllkp2znf"; + name = "recipe"; + }; + packageRequires = [ + dash + deferred + popup + request + request-deferred + virtualenvwrapper + ]; + meta = { + homepage = "https://melpa.org/#/traad"; + license = lib.licenses.free; + }; + }) {}; + tracking = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tracking"; - version = "2.7"; + ename = "tracking"; + version = "2.10"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "661a2cdb3a3d9bc11ee511a4f90116c88e0d3484"; - sha256 = "19fcvmm915dz9l2w1rna4yik96rb3hrk7042012g961xn4sgs0ih"; + rev = "571853c1f5ece6777fe745489b34d3ad7c3cb0ba"; + sha256 = "1l2zhszwg7cg96vlyi33bykk4mmig38xmasgpp02xypa4j4p11sw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z"; - name = "tracking"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37088,9 +48267,15 @@ license = lib.licenses.free; }; }) {}; - transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: - melpaBuild { + transmission = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "transmission"; + ename = "transmission"; version = "0.12.1"; src = fetchFromGitHub { owner = "holomorph"; @@ -37098,10 +48283,10 @@ rev = "03a36853f141387654b7cb9217c7417db096a083"; sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9"; - name = "transmission"; + name = "recipe"; }; packageRequires = [ emacs let-alist ]; meta = { @@ -37109,9 +48294,17 @@ license = lib.licenses.free; }; }) {}; - travis = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: - melpaBuild { + travis = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pkg-info + , request + , s }: + melpaBuild { pname = "travis"; + ename = "travis"; version = "0.6.0"; src = fetchFromGitHub { owner = "nlamirault"; @@ -37119,10 +48312,10 @@ rev = "c8769d3db10ed4604969049e3bd276afa0a0138e"; sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c064a0dc7922cbe4cff2ae65665c4f10e6dbff27/recipes/travis"; sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix"; - name = "travis"; + name = "recipe"; }; packageRequires = [ dash pkg-info request s ]; meta = { @@ -37130,20 +48323,33 @@ license = lib.licenses.free; }; }) {}; - treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: - melpaBuild { + treemacs = callPackage ({ ace-window + , cl-lib ? null + , dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , ht + , hydra + , lib + , melpaBuild + , pfuture + , s }: + melpaBuild { pname = "treemacs"; - version = "1.18.1"; + ename = "treemacs"; + version = "2.2"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; - sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; + rev = "9b1129ee3152994b033a877fc49777bfe02e315a"; + sha256 = "08ias1nixz7ma8g6v3v4dqdnd87sqdhplsp5v5wvr3w58szlia5b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs"; sha256 = "1wcsn0kzrbawyyhxmsmrsxr1vp0llkxw6r7zx53pwyc82ia64nlv"; - name = "treemacs"; + name = "recipe"; }; packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ]; meta = { @@ -37151,20 +48357,26 @@ license = lib.licenses.free; }; }) {}; - treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: - melpaBuild { + treemacs-evil = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , treemacs }: + melpaBuild { pname = "treemacs-evil"; - version = "1.18.1"; + ename = "treemacs-evil"; + version = "2.2"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; - sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; + rev = "d0f874c90990400c02a8029d4efe815d3548ba5c"; + sha256 = "0hclgsv96gr50z9cqj97rp45c5r50q2zb6hq5jcx3xmlw12k9pk7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil"; sha256 = "1i2mxqwnqb2jz775qg3z4lf7pk4mgi646fyyi2la5gdcnq6a46mg"; - name = "treemacs-evil"; + name = "recipe"; }; packageRequires = [ evil treemacs ]; meta = { @@ -37172,20 +48384,26 @@ license = lib.licenses.free; }; }) {}; - treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: - melpaBuild { + treemacs-projectile = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , treemacs }: + melpaBuild { pname = "treemacs-projectile"; - version = "1.18.1"; + ename = "treemacs-projectile"; + version = "2.2"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; - sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; + rev = "cbc75759fd54a772fcb67bd8babacf1b2020ba88"; + sha256 = "18aafgiircgb5max35zqzdfb0yjmgjqacax9sfy39ihh9x9z0vc1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-projectile"; sha256 = "1vyifik30673bwlfvbmw8pzz7f3wd4q6zzssvbj8d23zhk8kh8vc"; - name = "treemacs-projectile"; + name = "recipe"; }; packageRequires = [ projectile treemacs ]; meta = { @@ -37193,9 +48411,14 @@ license = lib.licenses.free; }; }) {}; - treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + treepy = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "treepy"; + ename = "treepy"; version = "1.0.0"; src = fetchFromGitHub { owner = "volrath"; @@ -37203,10 +48426,10 @@ rev = "282fbc94747fe2a00d36e2a74d147c8fa0ac4be7"; sha256 = "0acw6c073h2a0fy8gx2xc2d1fw0yhaqikqrvs2iq53fqcqrrq81r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy"; sha256 = "0jfah4vywi1b6c86h7vh8fspmklhs790qzkl51i9p7yckfggwp72"; - name = "treepy"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37214,9 +48437,13 @@ license = lib.licenses.free; }; }) {}; - trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + trr = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "trr"; + ename = "trr"; version = "2.0.0"; src = fetchFromGitHub { owner = "kawabata"; @@ -37224,10 +48451,10 @@ rev = "7500ae0a05a3e26888949208afcd0185cc1b1404"; sha256 = "0x1knf2jqkd1sdswv1w902jnlppih2yw6z028268nizl0c9q92yn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/56fa3c0b65e4e300f01804df7779ba6f1cb18cec/recipes/trr"; sha256 = "068vqsyx8riqzfrmjk8wr81f68r2y2b6ymc2vvl6vka9rprvsfwr"; - name = "trr"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37235,9 +48462,14 @@ license = lib.licenses.free; }; }) {}; - truthy = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }: - melpaBuild { + truthy = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , list-utils + , melpaBuild }: + melpaBuild { pname = "truthy"; + ename = "truthy"; version = "0.2.8"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -37245,10 +48477,10 @@ rev = "276a7e6b13606d28e4f2e423bb1ea30904c5def3"; sha256 = "18na22fhwqz80qinmnpsvp6ghc9irva1scixi6s4q6plmgr4m397"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f7a7e319dbe17e2b31353e7d7cab51d557d86e9d/recipes/truthy"; sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg"; - name = "truthy"; + name = "recipe"; }; packageRequires = [ list-utils ]; meta = { @@ -37256,9 +48488,14 @@ license = lib.licenses.free; }; }) {}; - try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + try = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "try"; + ename = "try"; version = "0.0.1"; src = fetchFromGitHub { owner = "larstvei"; @@ -37266,10 +48503,10 @@ rev = "271b0a362cadf44d0694628b9e213f54516ef913"; sha256 = "1fvpi02c6awyrwg2yqjapvcv4132qvmvd9bkbwpjmndxpicsann3"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13c0ed40ad02fa0893cbf4dd9617dccb624f064b/recipes/try"; sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n"; - name = "try"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37277,20 +48514,28 @@ license = lib.licenses.free; }; }) {}; - tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + tss = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , json-mode + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "tss"; + ename = "tss"; version = "0.6.0"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-tss"; - rev = "1f302deea3d74462c71a9c62031f48b753e8915f"; - sha256 = "1ma3k9bbw427cj1n2gjajbqii482jhs2lgjggz9clpc21bn5wqfb"; + rev = "140ae681828469b1415ae51a39ac4fdfaa84e4c3"; + sha256 = "113qs1frz1rfvswgw5wrvmxd7q6zbpp6rdz35hr1wmpfj546z1kw"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d52e20f5ca38ed399d19f18f778b8601baf78460/recipes/tss"; sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm"; - name = "tss"; + name = "recipe"; }; packageRequires = [ auto-complete json-mode log4e yaxception ]; meta = { @@ -37298,20 +48543,25 @@ license = lib.licenses.free; }; }) {}; - tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tuareg = callPackage ({ caml + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tuareg"; + ename = "tuareg"; version = "2.1.0"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "92c1dea250038d1590ab6ce76a6e099fef10d450"; - sha256 = "187z651w2ngj29bgvw0435c88ky8jvczgvglja9491vprp1zfypc"; + rev = "927a309b1ad8559be33e6a1d7951214a66f7c130"; + sha256 = "05rsid1g3vrg10qiws7dd1rpd6wva9mqldwfyrrhg088k4v2a0q5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q"; - name = "tuareg"; + name = "recipe"; }; packageRequires = [ caml ]; meta = { @@ -37319,9 +48569,13 @@ license = lib.licenses.free; }; }) {}; - tumble = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tumble = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tumble"; + ename = "tumble"; version = "1.5"; src = fetchFromGitHub { owner = "febuiles"; @@ -37329,10 +48583,10 @@ rev = "a1db6dac5720b9f468a79e0efce04f77c0a458e3"; sha256 = "0ihjjw5wxz5ybl3600k937pszw3442cijs4gbqqip9vhd5y9m8gy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/579a441d153c4c7d9f8172be94983a632d6fab8f/recipes/tumble"; sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9"; - name = "tumble"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37340,9 +48594,13 @@ license = lib.licenses.free; }; }) {}; - tup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + tup-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "tup-mode"; + ename = "tup-mode"; version = "1.3.1"; src = fetchFromGitHub { owner = "ejmr"; @@ -37350,10 +48608,10 @@ rev = "945af9c8e6c402e10cd3bf8e28a9591174023d6d"; sha256 = "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bda3260dad1c766c5b6ae9124f966bf441e24f2f/recipes/tup-mode"; sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l"; - name = "tup-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37361,9 +48619,14 @@ license = lib.licenses.free; }; }) {}; - turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + turing-machine = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "turing-machine"; + ename = "turing-machine"; version = "0.2.0"; src = fetchFromGitHub { owner = "therockmandolinist"; @@ -37371,10 +48634,10 @@ rev = "ad1dccc9c445f9e4465e1c67cbbfea9583153047"; sha256 = "0qaz4r5ahg2fxsfyxilb8c9956i5ra9vg80l82slm8vrnsinzll6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine"; sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn"; - name = "turing-machine"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37382,9 +48645,13 @@ license = lib.licenses.free; }; }) {}; - twilight-anti-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + twilight-anti-bright-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "twilight-anti-bright-theme"; + ename = "twilight-anti-bright-theme"; version = "0.3.0"; src = fetchFromGitHub { owner = "jimeh"; @@ -37392,10 +48659,10 @@ rev = "16d4ff2606789b506f0d2f53d12f02d5b1b64f9b"; sha256 = "0glw5lns7hwp8jznnfm6dyjw454sv2n84gy07ma7s1q3yczhq5bc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-anti-bright-theme"; sha256 = "1wfj570l5k0ygqi9dwjskc78rpnxw6080bkw1zd1a8kl3fa28n2k"; - name = "twilight-anti-bright-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37403,20 +48670,24 @@ license = lib.licenses.free; }; }) {}; - twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + twittering-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "twittering-mode"; + ename = "twittering-mode"; version = "3.0.0"; src = fetchFromGitHub { owner = "hayamiz"; repo = "twittering-mode"; - rev = "27e7f3aab238bd0788fd3b471c645c3ceceb0f13"; - sha256 = "193v98i84xybm3n0f30jin5q10i87vbcnbdhl4zqi7jij9p5v98z"; + rev = "fa40325328bc8c2aa40eff6ed1954d5c07436152"; + sha256 = "1bpzcljg81igldjjglgn0vxy9i89i802kx2jgvcr16c1vway7cm9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode"; sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1"; - name = "twittering-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37424,20 +48695,26 @@ license = lib.licenses.free; }; }) {}; - typed-clojure-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + typed-clojure-mode = callPackage ({ cider + , clojure-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "typed-clojure-mode"; + ename = "typed-clojure-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "typedclojure"; repo = "typed-clojure-mode"; - rev = "00bc20db78901204a67722ab47482660e36d0463"; - sha256 = "1risfbsaafh760vnl4ryys91g4k78g0fxj2zlcndpxxv34gwkhy7"; + rev = "03f01f5bfa93247f8f7958a8a45cf83604f7d96e"; + sha256 = "0d6i5n3s6b0q0c06ix7vm7iwx5zi4j7h2yygcsbzwyza1z284ry5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/961471c194b508a5025f00a5be02d316b26f330a/recipes/typed-clojure-mode"; sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3"; - name = "typed-clojure-mode"; + name = "recipe"; }; packageRequires = [ cider clojure-mode ]; meta = { @@ -37445,20 +48722,24 @@ license = lib.licenses.free; }; }) {}; - typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + typescript-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "typescript-mode"; - version = "0.2"; + ename = "typescript-mode"; + version = "0.3"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "f25f4751fea12298905c811a1f469a6b0a169ef1"; - sha256 = "1s4qzhi8bd45l824pwzh97i9npf7j4ai6wkbhf28q2nd1hiv29hw"; + rev = "7a5c74d88e3c5513cc4431a837003736f905a75e"; + sha256 = "002f1xfhq43fjaqliwrgxspryfahpa82va5dw3p8kwil2xwvc6mh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; sha256 = "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha"; - name = "typescript-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37466,9 +48747,16 @@ license = lib.licenses.free; }; }) {}; - typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: - melpaBuild { + typit = callPackage ({ emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mmt }: + melpaBuild { pname = "typit"; + ename = "typit"; version = "0.2.1"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -37476,10 +48764,10 @@ rev = "a4e3147dedac5535bdc8b06aca00f34f14f26e35"; sha256 = "0hbnwrhxj9wwjvxsk372ffgjqfkb3ljxhgi5h7wps2r15dxfvf3w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; sha256 = "05m7ymcq6fgbhh93ninrf3qi7csdnf2ahhf01mkm8gxxyaqq6m4n"; - name = "typit"; + name = "recipe"; }; packageRequires = [ emacs f mmt ]; meta = { @@ -37487,9 +48775,13 @@ license = lib.licenses.free; }; }) {}; - typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + typo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "typo"; + ename = "typo"; version = "1.1"; src = fetchFromGitHub { owner = "jorgenschaefer"; @@ -37497,10 +48789,10 @@ rev = "e72171e4eb0b9ec80b9dabc3198d137d9fb4f972"; sha256 = "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo"; sha256 = "1p8is1n525lmzq588hj6vazmhl9wi6rairnfx1g1p6g6ijdycd4h"; - name = "typo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37508,9 +48800,13 @@ license = lib.licenses.free; }; }) {}; - ubuntu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ubuntu-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ubuntu-theme"; + ename = "ubuntu-theme"; version = "4.2"; src = fetchFromGitHub { owner = "rocher"; @@ -37518,10 +48814,10 @@ rev = "41f09ca6c203da93bdadb2077556efd48e3b5d5a"; sha256 = "0k41hwb6jgv3hngfrphlyhmfhvy4k05mvn0brm64xk7lj56y8q2c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ubuntu-theme"; sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2"; - name = "ubuntu-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37529,9 +48825,16 @@ license = lib.licenses.free; }; }) {}; - ucs-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft }: - melpaBuild { + ucs-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , list-utils + , melpaBuild + , pcache + , persistent-soft }: + melpaBuild { pname = "ucs-utils"; + ename = "ucs-utils"; version = "0.8.4"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -37539,10 +48842,10 @@ rev = "cbfd42f822bf5717934fa2d92060e6e24a813433"; sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/ucs-utils"; sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2"; - name = "ucs-utils"; + name = "recipe"; }; packageRequires = [ list-utils pcache persistent-soft ]; meta = { @@ -37550,9 +48853,16 @@ license = lib.licenses.free; }; }) {}; - undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }: - melpaBuild { + undercover = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , shut-up }: + melpaBuild { pname = "undercover"; + ename = "undercover"; version = "0.6.1"; src = fetchFromGitHub { owner = "sviridov"; @@ -37560,10 +48870,10 @@ rev = "86f856c799aacfd48d2eb42d1a6afda0e6e49845"; sha256 = "080bmfwyfi8663y8x594770hqz7mff7zvj2v03qdfwbhdr9w9y29"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover"; sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf"; - name = "undercover"; + name = "recipe"; }; packageRequires = [ dash emacs shut-up ]; meta = { @@ -37571,9 +48881,14 @@ license = lib.licenses.free; }; }) {}; - underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + underline-with-char = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "underline-with-char"; + ename = "underline-with-char"; version = "3.0.0"; src = fetchFromGitHub { owner = "marcowahl"; @@ -37581,10 +48896,10 @@ rev = "c2f4870aff70efe70a8d1b089e56d3a2d6d048b9"; sha256 = "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char"; sha256 = "0la24nvyqinla40c2f3f4a63mjjsg58096hyw3pvp0mwiff7rxyd"; - name = "underline-with-char"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37592,9 +48907,13 @@ license = lib.licenses.free; }; }) {}; - underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + underwater-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "underwater-theme"; + ename = "underwater-theme"; version = "1.1.0"; src = fetchFromGitHub { owner = "jmdeldin"; @@ -37602,10 +48921,10 @@ rev = "1fbd4ecd4538256c6c46f9638f883072c73ac927"; sha256 = "1g1ldyz42q3i2xlgvhd4s93cvkh0fm8m3l344zjcw8rvqaisyphj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7dccc77d082181629b8f0c45404ac5d8bd97590/recipes/underwater-theme"; sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr"; - name = "underwater-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37613,20 +48932,24 @@ license = lib.licenses.free; }; }) {}; - unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + unfill = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unfill"; + ename = "unfill"; version = "0.2"; src = fetchFromGitHub { owner = "purcell"; repo = "unfill"; - rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8"; - sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc"; + rev = "234fee7351cafdcfa68a2b1fc603744b03e0e16b"; + sha256 = "0i25kr4anszl48w29vlxwfg3dq1baa81qj91v4iw3wsnmc40n7ww"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill"; sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv"; - name = "unfill"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37634,9 +48957,17 @@ license = lib.licenses.free; }; }) {}; - unicode-enbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft, string-utils, ucs-utils }: - melpaBuild { + unicode-enbox = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , persistent-soft + , string-utils + , ucs-utils }: + melpaBuild { pname = "unicode-enbox"; + ename = "unicode-enbox"; version = "0.1.4"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -37644,10 +48975,10 @@ rev = "ff313f6778bb96481c0ee3291b07a7db46f21ff5"; sha256 = "0n06dvf6r7qblz8vz38qc37xrn29wa1c0jyzis1qw9zzf6hmmzj7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/unicode-enbox"; sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv"; - name = "unicode-enbox"; + name = "recipe"; }; packageRequires = [ pcache persistent-soft string-utils ucs-utils ]; meta = { @@ -37655,20 +48986,27 @@ license = lib.licenses.free; }; }) {}; - unicode-escape = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { + unicode-escape = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names }: + melpaBuild { pname = "unicode-escape"; + ename = "unicode-escape"; version = "1.1"; src = fetchFromGitHub { owner = "kosh04"; repo = "unicode-escape.el"; - rev = "b9cee7af45be62119b97033dc639bd1b5ed858f3"; - sha256 = "09dgxb1z9kdbs8wri9sl5daygp1bgqcng40vyfv5y0ic50w08ksf"; + rev = "04c7f22f90c96e93f998f084089ab08dc7f4fdd6"; + sha256 = "01i5cq7yan9z1kr6pvp4bwzsnxs0bpqsaglfbvy7v6jfp923bvdm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2ae00434b80357dc62cd0177dbd714b25fb3ac7/recipes/unicode-escape"; sha256 = "0gcwkv7qbdnvak10jfzj9irb7nkfqsfxv2n5fi8vvrk90j1a2i2k"; - name = "unicode-escape"; + name = "recipe"; }; packageRequires = [ dash emacs names ]; meta = { @@ -37676,9 +49014,18 @@ license = lib.licenses.free; }; }) {}; - unicode-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }: - melpaBuild { + unicode-fonts = callPackage ({ fetchFromGitHub + , fetchurl + , font-utils + , lib + , list-utils + , melpaBuild + , pcache + , persistent-soft + , ucs-utils }: + melpaBuild { pname = "unicode-fonts"; + ename = "unicode-fonts"; version = "0.4.8"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -37686,10 +49033,10 @@ rev = "a36597d83e0248bd0e6b2c1d5fb95bff72add527"; sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83459421dd2eb3d60ec668c3d5bb38d99ee64aff/recipes/unicode-fonts"; sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3"; - name = "unicode-fonts"; + name = "recipe"; }; packageRequires = [ font-utils @@ -37703,9 +49050,17 @@ license = lib.licenses.free; }; }) {}; - unicode-progress-reporter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft, ucs-utils }: - melpaBuild { + unicode-progress-reporter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , persistent-soft + , ucs-utils }: + melpaBuild { pname = "unicode-progress-reporter"; + ename = "unicode-progress-reporter"; version = "0.5.4"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -37713,10 +49068,10 @@ rev = "f4705332412b12fc72ca868b77c78465561bda75"; sha256 = "0qy1hla7vf674ynqdzsaw2cnk92nhpcimww5q94rc0a95pzw64wd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83459421dd2eb3d60ec668c3d5bb38d99ee64aff/recipes/unicode-progress-reporter"; sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7"; - name = "unicode-progress-reporter"; + name = "recipe"; }; packageRequires = [ emacs pcache persistent-soft ucs-utils ]; meta = { @@ -37724,9 +49079,16 @@ license = lib.licenses.free; }; }) {}; - unicode-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft, ucs-utils }: - melpaBuild { + unicode-whitespace = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pcache + , persistent-soft + , ucs-utils }: + melpaBuild { pname = "unicode-whitespace"; + ename = "unicode-whitespace"; version = "0.2.4"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -37734,10 +49096,10 @@ rev = "6d29f25d46b3344c74ce289fc80b3d4fc17ed6db"; sha256 = "0q7cbl89yg3fjxaxsqsksxhw7ibdslbb004z5y1m579n7zgcrljy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9892a826f3ac335d12bd1a07202334e28a44f40/recipes/unicode-whitespace"; sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy"; - name = "unicode-whitespace"; + name = "recipe"; }; packageRequires = [ pcache persistent-soft ucs-utils ]; meta = { @@ -37745,9 +49107,14 @@ license = lib.licenses.free; }; }) {}; - unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + unify-opening = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unify-opening"; + ename = "unify-opening"; version = "2.1.0"; src = fetchFromGitHub { owner = "DamienCassou"; @@ -37755,10 +49122,10 @@ rev = "502469ddba6d8d52159f53976265f7d956b6b17c"; sha256 = "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening"; sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8"; - name = "unify-opening"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37766,20 +49133,24 @@ license = lib.licenses.free; }; }) {}; - unkillable-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + unkillable-scratch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "unkillable-scratch"; + ename = "unkillable-scratch"; version = "0.1"; src = fetchFromGitHub { owner = "EricCrosson"; repo = "unkillable-scratch"; - rev = "4451f82eb98f9b159745ca1a79ac60b9d224fd5b"; - sha256 = "1w2w0gmyr0nbq8kv3ldj30h9xma76gi1khbdia1y30kss677rr8m"; + rev = "85e01b6da499a05bc920ca7958f0642c76dd9ce2"; + sha256 = "0j513ia8mfa4i8h1z0m00k65g89fdcdp6h37bdm2ymy4g26wbk6n"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/822ac5610f333e41b676a29ef45a6f8bfea3162e/recipes/unkillable-scratch"; sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7"; - name = "unkillable-scratch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37787,20 +49158,26 @@ license = lib.licenses.free; }; }) {}; - uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + uptimes = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "uptimes"; - version = "3.5"; + ename = "uptimes"; + version = "3.6"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "07bcd6517243c9c9f61172202d33718bd9b2a850"; - sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n"; + rev = "5e81f8bb419836602819045e7d5a74b76ad3e69c"; + sha256 = "04l452k249s3ilfj0da0k7rrfyjnxxdsipa2al46xqjds8l3h2rn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h"; - name = "uptimes"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -37808,9 +49185,15 @@ license = lib.licenses.free; }; }) {}; - use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + use-package = callPackage ({ bind-key + , diminish + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "use-package"; + ename = "use-package"; version = "2.3"; src = fetchFromGitHub { owner = "jwiegley"; @@ -37818,10 +49201,10 @@ rev = "cd58b268a8a025451c11c3cb1ba18d4f27f245da"; sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp"; - name = "use-package"; + name = "recipe"; }; packageRequires = [ bind-key diminish ]; meta = { @@ -37829,9 +49212,14 @@ license = lib.licenses.free; }; }) {}; - use-package-el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: - melpaBuild { + use-package-el-get = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , use-package }: + melpaBuild { pname = "use-package-el-get"; + ename = "use-package-el-get"; version = "0.1"; src = fetchFromGitHub { owner = "edvorg"; @@ -37839,10 +49227,10 @@ rev = "f33c448ed43ecb003b60ff601ee7ef9b08cff947"; sha256 = "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee4a96cf467bcab171a0adfd4ef754abec1a9971/recipes/use-package-el-get"; sha256 = "0sg9ijkjax6w25p0q7rw5rjn8r2i83z5jfzjkvy8pxil5cg8zyh0"; - name = "use-package-el-get"; + name = "recipe"; }; packageRequires = [ use-package ]; meta = { @@ -37850,9 +49238,14 @@ license = lib.licenses.free; }; }) {}; - usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + usql = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "usql"; + ename = "usql"; version = "0.0.3"; src = fetchFromGitHub { owner = "nickbarnwell"; @@ -37860,10 +49253,10 @@ rev = "bfaf428b366a9a185eef84f0d645a98dc918fe3d"; sha256 = "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql"; sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84"; - name = "usql"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37871,20 +49264,25 @@ license = lib.licenses.free; }; }) {}; - utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + utop = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "utop"; - version = "2.1.0"; + ename = "utop"; + version = "2.2.0"; src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "1b4bd052c6513d38f6cc626c24665637d25fdc07"; - sha256 = "05pv6nj88im1jf9nngv56z362wrp9pmkzrjn3nm846rdzbc5f21j"; + rev = "48100fcf769bdaeb4a6c93bbb33c37b85c1dcb10"; + sha256 = "1cr1i5ywn9abqbrl4iq1c82vdjwrbh43v67zv1a8i4fvh99yzlv1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7"; - name = "utop"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -37892,20 +49290,27 @@ license = lib.licenses.free; }; }) {}; - v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request }: - melpaBuild { + v2ex-mode = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , request }: + melpaBuild { pname = "v2ex-mode"; + ename = "v2ex-mode"; version = "0.2"; src = fetchFromGitHub { owner = "aborn"; repo = "v2ex-mode"; - rev = "7a59ac3be2b08d873ec271ec7a3d5ace309c1407"; - sha256 = "0f4y0s0zhqlb3n56yqp2w1krhrar5l4axl7dfn595hmwhhgxvvra"; + rev = "e871c4872a4970bf76e6132d77ef0ef7b11536fe"; + sha256 = "0sc0ix8d5knsm8p6z819j7iwkp2d6lrq0d8l94x4a8dgh4mapls8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b27b7d777415aa350c8c30822e239b9a4c02e77d/recipes/v2ex-mode"; sha256 = "04frd6jbnf9g7ak2fdbik9iji7b0903cpbg1hx7rai1853af7gh1"; - name = "v2ex-mode"; + name = "recipe"; }; packageRequires = [ cl-lib let-alist request ]; meta = { @@ -37913,9 +49318,13 @@ license = lib.licenses.free; }; }) {}; - vagrant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vagrant = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vagrant"; + ename = "vagrant"; version = "0.6.1"; src = fetchFromGitHub { owner = "ottbot"; @@ -37923,10 +49332,10 @@ rev = "ef3022d290ee26597e21b17ab87acbd8d4f1071f"; sha256 = "1661fwfx2gpxjriy3ngi9raz8c2kkk3rgg51irdi591jr2zqmw6s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/vagrant"; sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf"; - name = "vagrant"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37934,9 +49343,16 @@ license = lib.licenses.free; }; }) {}; - vbasense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: - melpaBuild { + vbasense = callPackage ({ auto-complete + , fetchFromGitHub + , fetchurl + , lib + , log4e + , melpaBuild + , yaxception }: + melpaBuild { pname = "vbasense"; + ename = "vbasense"; version = "0.1.1"; src = fetchFromGitHub { owner = "aki2o"; @@ -37944,10 +49360,10 @@ rev = "8c61a492d7c15218ae1a96e2aebfe6f78bfff6db"; sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e7dd1e985d55149f48e4f93a31fb28ec01a4add/recipes/vbasense"; sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n"; - name = "vbasense"; + name = "recipe"; }; packageRequires = [ auto-complete log4e yaxception ]; meta = { @@ -37955,9 +49371,15 @@ license = lib.licenses.free; }; }) {}; - vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { + vc-msg = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popup }: + melpaBuild { pname = "vc-msg"; + ename = "vc-msg"; version = "0.0.4"; src = fetchFromGitHub { owner = "redguardtoo"; @@ -37965,10 +49387,10 @@ rev = "091f3cf15ecb35bb4dc5de1ef7229f78735d9aee"; sha256 = "0s129fzxhrr8pp4h0hkmxapnman67r0bdmbj8ys6r361na7h16hf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg"; sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9"; - name = "vc-msg"; + name = "recipe"; }; packageRequires = [ emacs popup ]; meta = { @@ -37976,9 +49398,13 @@ license = lib.licenses.free; }; }) {}; - vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vcomp = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vcomp"; + ename = "vcomp"; version = "0.3.1"; src = fetchFromGitHub { owner = "tarsius"; @@ -37986,10 +49412,10 @@ rev = "a12363c3a66576b68955abcadf7280de32eaa051"; sha256 = "07dx3dyvkwcin0gb6j4jx0ldfxs4rqhygl56a8i81yy05adkaq2x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/561442ea9f75ebe8444db1a0c40f7756fcbca482/recipes/vcomp"; sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0"; - name = "vcomp"; + name = "recipe"; }; packageRequires = []; meta = { @@ -37997,9 +49423,15 @@ license = lib.licenses.free; }; }) {}; - vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: - melpaBuild { + vdiff = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild }: + melpaBuild { pname = "vdiff"; + ename = "vdiff"; version = "0.2.2"; src = fetchFromGitHub { owner = "justbur"; @@ -38007,10 +49439,10 @@ rev = "f55acdbfcbb14e463d0850cfd041614c7002669e"; sha256 = "0dlhisvnlzkzlilg456lxi0m5wh4a8681n142684hmk8vaw3wx2k"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; sha256 = "11gw0l63fssbiyhngqb7ykrp7m1vy55wlf27ybhh2dkwh1cpkr4l"; - name = "vdiff"; + name = "recipe"; }; packageRequires = [ emacs hydra ]; meta = { @@ -38018,20 +49450,27 @@ license = lib.licenses.free; }; }) {}; - vdiff-magit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, vdiff }: - melpaBuild { + vdiff-magit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild + , vdiff }: + melpaBuild { pname = "vdiff-magit"; - version = "0.3.1"; + ename = "vdiff-magit"; + version = "0.3.2"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff-magit"; - rev = "5e245b6a078860d3b0f58436efec8ff6b4f485db"; - sha256 = "0rz06jh5ayg0w6a19w9jyyn6jw27ri3cydynflxygk9364zvj59p"; + rev = "7e841dc7225300dd4d5560faad04e5c44cd8b267"; + sha256 = "0800lnclv0kdkk2njddhsydsbifrwgg6w09mm4js7mqci1mr3gia"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2159275fabde8ec8b297f6635546b1314d519b8b/recipes/vdiff-magit"; sha256 = "1vjc1r5xfdg9bmscgppx1fps1w5bd0zpp6ab5z5dxlg2zx2vdldw"; - name = "vdiff-magit"; + name = "recipe"; }; packageRequires = [ emacs magit vdiff ]; meta = { @@ -38039,20 +49478,28 @@ license = lib.licenses.free; }; }) {}; - vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }: - melpaBuild { + vdirel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , org-vcard + , seq }: + melpaBuild { pname = "vdirel"; + ename = "vdirel"; version = "0.2.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "vdirel"; - rev = "4232676e93ca5ace8e51f6605bec223c3205beea"; - sha256 = "0jdjg50f6my9952frl6asi8zk0i8b4hva26wm7pi8zk423pydr30"; + rev = "58b0b6e6f0913a782691373b3996ca6bb6d1ba54"; + sha256 = "0rkj9w1jbagx1515xs1jwh6fi0cx0nj7gym30c99c8v8asq63ds2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel"; sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj"; - name = "vdirel"; + name = "recipe"; }; packageRequires = [ emacs helm org-vcard seq ]; meta = { @@ -38060,9 +49507,13 @@ license = lib.licenses.free; }; }) {}; - vector-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vector-utils = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vector-utils"; + ename = "vector-utils"; version = "0.1.2"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -38070,10 +49521,10 @@ rev = "2bd63c8ade1a2b6f8aac403c5f25adda2215a685"; sha256 = "0lzq31zqnk32vfp3kicnvgfr3nkv8amjzxmk9nrz1kwgmq7gvkjk"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/081aa3e1d50c2c9e5a9b9ce0716258a93279f605/recipes/vector-utils"; sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n"; - name = "vector-utils"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38081,9 +49532,14 @@ license = lib.licenses.free; }; }) {}; - vertigo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vertigo = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vertigo"; + ename = "vertigo"; version = "1.0"; src = fetchFromGitHub { owner = "noctuid"; @@ -38091,10 +49547,10 @@ rev = "ebfa068d9e2fc39ba6d1744618c4e31dad6f629b"; sha256 = "1yk7qqg8i3970kpfk34wvi0gh16qf0b0sfnf18g3s21dd4gk5a6g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1957e7fa03b6b8eb2f3250bd814d707bce3cfa3/recipes/vertigo"; sha256 = "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83"; - name = "vertigo"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -38102,20 +49558,28 @@ license = lib.licenses.free; }; }) {}; - vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: - melpaBuild { + vhdl-tools = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , ggtags + , helm + , lib + , melpaBuild + , outshine }: + melpaBuild { pname = "vhdl-tools"; - version = "5.8"; + ename = "vhdl-tools"; + version = "5.9"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "6bbcbdfbff7154517178290371b0182a176c09b5"; - sha256 = "16k2h8n85ldfjb4zh7f202q370zs0rmmjhgf2jr4xfrvbdmgr8pa"; + rev = "4e9df06c3519be22f1f713d18c80d325a5b0c3d2"; + sha256 = "0n6mmbg8g3ip3dkbc4kxqxsd4p1h7jry25n1cqvzm24x1adwlcfm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw"; - name = "vhdl-tools"; + name = "recipe"; }; packageRequires = [ emacs ggtags helm outshine ]; meta = { @@ -38123,9 +49587,14 @@ license = lib.licenses.free; }; }) {}; - vim-region = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vim-region = callPackage ({ expand-region + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vim-region"; + ename = "vim-region"; version = "0.3.0"; src = fetchFromGitHub { owner = "ongaeshi"; @@ -38133,10 +49602,10 @@ rev = "e5359cc584a0cfa9270a76866a5eff7d3f44eb3d"; sha256 = "1750gx65ymibam8ahx5blfv5jc26f3mzbklk1jrmfwpsalyghdd9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23249b485ca8e66a21f858712f46aa76b8554f28/recipes/vim-region"; sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx"; - name = "vim-region"; + name = "recipe"; }; packageRequires = [ expand-region ]; meta = { @@ -38144,9 +49613,16 @@ license = lib.licenses.free; }; }) {}; - vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vimish-fold = callPackage ({ cl-lib ? null + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vimish-fold"; + ename = "vimish-fold"; version = "0.2.3"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -38154,10 +49630,10 @@ rev = "e631352fbf910f692807afe38a2b6a7882a403a8"; sha256 = "152w1wqxj7yzm3d12lknzz1aix4h8cb571sjns3m1s7azsr3vfbq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3"; - name = "vimish-fold"; + name = "recipe"; }; packageRequires = [ cl-lib emacs f ]; meta = { @@ -38165,9 +49641,15 @@ license = lib.licenses.free; }; }) {}; - virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + virtualenvwrapper = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "virtualenvwrapper"; + ename = "virtualenvwrapper"; version = "0.1.0"; src = fetchFromGitHub { owner = "porterjamesj"; @@ -38175,10 +49657,10 @@ rev = "5649028ea0c049cb7dfa2105285dee9c00d189fb"; sha256 = "1xcjjs394vlaz94xh52kqaq94gkbmmjqmxlg7wly8vfn9vh34mws"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i"; - name = "virtualenvwrapper"; + name = "recipe"; }; packageRequires = [ dash s ]; meta = { @@ -38186,9 +49668,13 @@ license = lib.licenses.free; }; }) {}; - visible-mark = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { + visible-mark = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "visible-mark"; + ename = "visible-mark"; version = "0.1"; src = fetchFromGitLab { owner = "iankelling"; @@ -38196,10 +49682,10 @@ rev = "c1852e13b6b61982738b56977a452ec9026faf1b"; sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/visible-mark"; sha256 = "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80"; - name = "visible-mark"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38207,9 +49693,14 @@ license = lib.licenses.free; }; }) {}; - visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + visual-fill-column = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "visual-fill-column"; + ename = "visual-fill-column"; version = "1.11"; src = fetchFromGitHub { owner = "joostkremers"; @@ -38217,10 +49708,10 @@ rev = "57c2a72d46900117ea92e0a01b97e19481800503"; sha256 = "086zfx4lh168rg50ndg8qzdh8vzc6sgfii7qzcn4mg4wa74hnp9y"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column"; sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5"; - name = "visual-fill-column"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -38228,9 +49719,14 @@ license = lib.licenses.free; }; }) {}; - visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + visual-regexp = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "visual-regexp"; + ename = "visual-regexp"; version = "1.1.1"; src = fetchFromGitHub { owner = "benma"; @@ -38238,10 +49734,10 @@ rev = "b3096c2d391ff4e28a2a4e8cd82efbf11071ea85"; sha256 = "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp"; sha256 = "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z"; - name = "visual-regexp"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -38249,9 +49745,14 @@ license = lib.licenses.free; }; }) {}; - visual-regexp-steroids = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, visual-regexp }: - melpaBuild { + visual-regexp-steroids = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , visual-regexp }: + melpaBuild { pname = "visual-regexp-steroids"; + ename = "visual-regexp-steroids"; version = "1.1.0"; src = fetchFromGitHub { owner = "benma"; @@ -38259,10 +49760,10 @@ rev = "a6420b25ec0fbba43bf57875827092e1196d8a9e"; sha256 = "1isqa4ck6pm4ykcrkr0g1qj8664jkpcsrq0f8dlb0sksns2dqkwj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f105ebce741956b7becc86e4bdfcafecf59af74/recipes/visual-regexp-steroids"; sha256 = "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr"; - name = "visual-regexp-steroids"; + name = "recipe"; }; packageRequires = [ visual-regexp ]; meta = { @@ -38270,20 +49771,24 @@ license = lib.licenses.free; }; }) {}; - vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + vlf = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "vlf"; + ename = "vlf"; version = "1.7.1"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; - rev = "a01e9ed416cd81ccddebebbf05d4ca80060b07dc"; - sha256 = "0ziz08ylhkqwj2rp6h1z1yi309f6791b9r91nvr255l2331481pm"; + rev = "df677c128f8abc764b51d2a0ed26071618e686de"; + sha256 = "1fx2ngjh3y69ynih328jiy8132z9y7q7s91rzw8mgpf3hnfmaqly"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8"; - name = "vlf"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38291,9 +49796,13 @@ license = lib.licenses.free; }; }) {}; - voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + voca-builder = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "voca-builder"; + ename = "voca-builder"; version = "0.2.0"; src = fetchFromGitHub { owner = "yitang"; @@ -38301,10 +49810,10 @@ rev = "224402532da28e45edd398fda61ecbddb97d22d3"; sha256 = "0q1rwqjwqcnsr57s531pwlm464q8wx5vvdm5rj2xy9b3yi6phis1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42a930e024ce525b2890ccd5a1eb4844859faafd/recipes/voca-builder"; sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y"; - name = "voca-builder"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38312,9 +49821,13 @@ license = lib.licenses.free; }; }) {}; - volatile-highlights = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + volatile-highlights = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "volatile-highlights"; + ename = "volatile-highlights"; version = "1.11"; src = fetchFromGitHub { owner = "k-talo"; @@ -38322,10 +49835,10 @@ rev = "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24"; sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/volatile-highlights"; sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d"; - name = "volatile-highlights"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38333,20 +49846,53 @@ license = lib.licenses.free; }; }) {}; - vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: - melpaBuild { + vue-html-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "vue-html-mode"; + ename = "vue-html-mode"; + version = "0.2"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "vue-html-mode"; + rev = "361a9fa117f044c3072dc5a7344ff7be31725849"; + sha256 = "1z1pphxli8fcahw9fhmxls1v9nyd34pz51jwwa6g468zvdmcjb77"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode"; + sha256 = "1f4pjfp4298jkvhacxygddg557hhyivgnm5x3yhjipfv6fjkgl2s"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/vue-html-mode"; + license = lib.licenses.free; + }; + }) {}; + vue-mode = callPackage ({ edit-indirect + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , mmm-mode + , ssass-mode + , vue-html-mode }: + melpaBuild { pname = "vue-mode"; - version = "0.3.1"; + ename = "vue-mode"; + version = "0.4"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "fe501dba780025066dcdcd2055e772d06c2abdbc"; - sha256 = "0k67kzrh2fjhjiqcy1yq5cmcwjpx85yd2xxvkqvv4791q58f7c4z"; + rev = "48ff04657613f39848d0e66e9dd367aa2dc19e89"; + sha256 = "014vx8jkscj1c614v78dqlqlg7n0zc3c2db3dqvxvaz417i5mxq0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0"; - name = "vue-mode"; + name = "recipe"; }; packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ]; meta = { @@ -38354,9 +49900,13 @@ license = lib.licenses.free; }; }) {}; - w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + w32-browser = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "w32-browser"; + ename = "w32-browser"; version = "235"; src = fetchFromGitHub { owner = "emacsorphanage"; @@ -38364,10 +49914,10 @@ rev = "a8126b60bf18193e8e4ec6f699b5694b6f71a062"; sha256 = "13wjvzsas7in8f09sc2qj17dz25wizg1l0r2krgp1zymy92p8f97"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/w32-browser"; sha256 = "16sp0gn4yv7iaa55i2kvfsqw3610gr3x31l9lqa14r9xmfhda1rn"; - name = "w32-browser"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38375,9 +49925,15 @@ license = lib.licenses.free; }; }) {}; - wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wacspace = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wacspace"; + ename = "wacspace"; version = "0.4.2"; src = fetchFromGitHub { owner = "shosti"; @@ -38385,10 +49941,10 @@ rev = "b951995c204ff23699d2bda515a96221147a725d"; sha256 = "0jl3n79wmbxnrbf83qjq0v5pzhvv67i9r5sp2zj8nc86hh7dvjsd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58e5ff4c5853c5350d0534894ddb358daa83cee9/recipes/wacspace"; sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl"; - name = "wacspace"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -38396,9 +49952,16 @@ license = lib.licenses.free; }; }) {}; - wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: - melpaBuild { + wandbox = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request + , s }: + melpaBuild { pname = "wandbox"; + ename = "wandbox"; version = "0.6.4"; src = fetchFromGitHub { owner = "kosh04"; @@ -38406,10 +49969,10 @@ rev = "e002fe41f2cd9b4ce2b1dc80b83301176e9117f1"; sha256 = "0fnbj3k21lisgs94pf8z13cdymmclgpn994xq3xly4gq6l8k0an5"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox"; sha256 = "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz"; - name = "wandbox"; + name = "recipe"; }; packageRequires = [ emacs request s ]; meta = { @@ -38417,9 +49980,13 @@ license = lib.licenses.free; }; }) {}; - wc-goal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wc-goal-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wc-goal-mode"; + ename = "wc-goal-mode"; version = "2.1"; src = fetchFromGitHub { owner = "bnbeckwith"; @@ -38427,10 +49994,10 @@ rev = "a8aa227b1a692dd6399855add84b5e37f6c5d9cb"; sha256 = "0mnfk2ys8axjh696cq5msr5cdr91icl1i3mi0dd2y00lvh6sbm7w"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f003b6d6bc91e6f9e510de8f5f5f9189d1c7334/recipes/wc-goal-mode"; sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419"; - name = "wc-goal-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38438,9 +50005,13 @@ license = lib.licenses.free; }; }) {}; - wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wc-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wc-mode"; + ename = "wc-mode"; version = "1.3"; src = fetchFromGitHub { owner = "bnbeckwith"; @@ -38448,10 +50019,10 @@ rev = "122f90bd1d422a84cc50acabd350d44d39ddeb69"; sha256 = "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode"; sha256 = "191dmxfpqnj7d43cr0fhdmj5ldfs7w9zg5pb2lv9wvlfl7asdid6"; - name = "wc-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38459,9 +50030,13 @@ license = lib.licenses.free; }; }) {}; - wcheck-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wcheck-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wcheck-mode"; + ename = "wcheck-mode"; version = "2016.1.30"; src = fetchFromGitHub { owner = "tlikonen"; @@ -38469,10 +50044,10 @@ rev = "adb9dd9f39cb0bd0000d140d6e778c4864dfde08"; sha256 = "113prlamr2j6y6n0w43asffawwa4qiq63mgwm85v04h6pr8bd90l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d10b59f568fdedf248c2e8eaa06c4a74032ca56/recipes/wcheck-mode"; sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k"; - name = "wcheck-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38480,9 +50055,15 @@ license = lib.licenses.free; }; }) {}; - weather-metno = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + weather-metno = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "weather-metno"; + ename = "weather-metno"; version = "0.1.0"; src = fetchFromGitHub { owner = "ruediger"; @@ -38490,10 +50071,10 @@ rev = "b59680c1ab908b32513954034ba894dfb8564dd8"; sha256 = "0qx92jqzsimjk92pql2h8pzhq66mqijwqgjqwp7rmq5b6k0nvx1z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/75beac314565b9becb701ddd9bc85660e268c3ae/recipes/weather-metno"; sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6"; - name = "weather-metno"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -38501,9 +50082,13 @@ license = lib.licenses.free; }; }) {}; - web-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + web-beautify = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "web-beautify"; + ename = "web-beautify"; version = "0.3.2"; src = fetchFromGitHub { owner = "yasuyk"; @@ -38511,10 +50096,10 @@ rev = "aa95055224c24f38736716809fec487cd817c38d"; sha256 = "0vms7zz3ym53wf1zdrkbf2ky2xjr1v134ngsd0jr8azyi8siw84d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d528d3e20b1656dff40860cac0e0fa9dc1a3e87/recipes/web-beautify"; sha256 = "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f"; - name = "web-beautify"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38522,9 +50107,13 @@ license = lib.licenses.free; }; }) {}; - web-completion-data = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + web-completion-data = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "web-completion-data"; + ename = "web-completion-data"; version = "0.2"; src = fetchFromGitHub { owner = "osv"; @@ -38532,10 +50121,10 @@ rev = "c272c94e8a71b779c29653a532f619acad433a4f"; sha256 = "19nzjgvd2i5745283ck3k2vylrr6lnk9h3ggzwrwdhyd3m9433vm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604f155a3ce7e5375dcf8b9c149c5af403ef48bd/recipes/web-completion-data"; sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9"; - name = "web-completion-data"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38543,9 +50132,14 @@ license = lib.licenses.free; }; }) {}; - web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + web-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "web-mode"; + ename = "web-mode"; version = "16"; src = fetchFromGitHub { owner = "fxbois"; @@ -38553,10 +50147,10 @@ rev = "3ff506aae50a47b277f2b95ff7b7a7c596664e6a"; sha256 = "17dw6a8d0p304f2sa4f9zwd8r48w2wbkc3fvbmxwlg4w12h7cwf0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i"; - name = "web-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -38564,9 +50158,15 @@ license = lib.licenses.free; }; }) {}; - web-mode-edit-element = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }: - melpaBuild { + web-mode-edit-element = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , web-mode }: + melpaBuild { pname = "web-mode-edit-element"; + ename = "web-mode-edit-element"; version = "2.1"; src = fetchFromGitHub { owner = "jtkDvlp"; @@ -38574,10 +50174,10 @@ rev = "8b8ac07aa8c920dafd94c96a51effb0d6c0ed1ce"; sha256 = "0aj1ibmnrbaxrkwjf1fac2qzazrj39pql3prcibnchc2bmp191aa"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web-mode-edit-element"; sha256 = "1kcycsjjv1bzfn93aq3cdh5d913izrr8cdxmknbyriyipsqryh3l"; - name = "web-mode-edit-element"; + name = "recipe"; }; packageRequires = [ emacs web-mode ]; meta = { @@ -38585,9 +50185,14 @@ license = lib.licenses.free; }; }) {}; - web-search = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + web-search = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "web-search"; + ename = "web-search"; version = "0.1.1"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -38595,10 +50200,10 @@ rev = "72fea0e7429ed3d6932a497b568335316d8ef283"; sha256 = "1f2g6r24482k1dra1z92yahwvqiryc8p5p1v2naxv16ysa461a34"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503ef2042cc14dbe53e7121b8d0b5ccbdf6c882b/recipes/web-search"; sha256 = "08iflbp6rmsxsy2lahsdjj9ki70ixqhsas0vxzawz5pi5vk2x9gj"; - name = "web-search"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -38606,9 +50211,16 @@ license = lib.licenses.free; }; }) {}; - webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { + webpaste = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { pname = "webpaste"; + ename = "webpaste"; version = "2.1.0"; src = fetchFromGitHub { owner = "etu"; @@ -38616,10 +50228,10 @@ rev = "2da60b8857d107721b089346121a7d51296a58bf"; sha256 = "1r945qz7z5z80qvzlqvz985mz51zy3pj3fk36y0flc380y4ap6hd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; sha256 = "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm"; - name = "webpaste"; + name = "recipe"; }; packageRequires = [ cl-lib emacs request ]; meta = { @@ -38627,20 +50239,25 @@ license = lib.licenses.free; }; }) {}; - websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + websocket = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "websocket"; - version = "1.9"; + ename = "websocket"; + version = "1.10"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "7d2adf218743c52578c8e8fd5584a5e54732e256"; - sha256 = "0k8n710ip4av51n6l9ap1254qkifj987a6k86pgj3y6bw76ry08f"; + rev = "0d96ba2ff5a25c6cd6c66f417cc9b5f38a4308ba"; + sha256 = "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg"; - name = "websocket"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -38648,20 +50265,28 @@ license = lib.licenses.free; }; }) {}; - weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: - melpaBuild { + weechat = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , tracking }: + melpaBuild { pname = "weechat"; + ename = "weechat"; version = "0.4.0"; src = fetchFromGitHub { owner = "the-kenny"; repo = "weechat.el"; - rev = "a1bda40513f0ea94a8a85ee122a475475a03f6ef"; - sha256 = "05jnfrjrf1da038jkypvx3slyk39xlpak4n9s5vwmx7mgf4zg06y"; + rev = "a0d81074088d313dd596af6602e51d4253a55ca5"; + sha256 = "08ibyabvdlmp74xa950al3axmzsqpcal30313ab5wgb746sh3dvm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat"; sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46"; - name = "weechat"; + name = "recipe"; }; packageRequires = [ cl-lib emacs s tracking ]; meta = { @@ -38669,9 +50294,13 @@ license = lib.licenses.free; }; }) {}; - weibo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + weibo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "weibo"; + ename = "weibo"; version = "1.0"; src = fetchFromGitHub { owner = "austin-----"; @@ -38679,10 +50308,10 @@ rev = "a8af467e5660a35342029c2796de99cd551454b2"; sha256 = "14vmgfz45wmpjfhfx3pfjn3bak8qvj1zk1w4xc5w1cfl6vnij6hv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21f4c1b34f86331ecbcdbdc39858a191232902f2/recipes/weibo"; sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd"; - name = "weibo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38690,20 +50319,24 @@ license = lib.licenses.free; }; }) {}; - wgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wgrep = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wgrep"; + ename = "wgrep"; version = "2.1.10"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; - sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; + rev = "3028e9b31427c528d9343d458abcb2222813410f"; + sha256 = "1gc3xwj7dffwpmjq1189x27ij25v2pp909xpdxc69a01yx5474i1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep"; sha256 = "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4"; - name = "wgrep"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38711,20 +50344,25 @@ license = lib.licenses.free; }; }) {}; - wgrep-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: - melpaBuild { + wgrep-ack = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , wgrep }: + melpaBuild { pname = "wgrep-ack"; + ename = "wgrep-ack"; version = "2.1.10"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; - sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; + rev = "9448a9d597bd089ae61e58add2c5dbecb0aa2b8f"; + sha256 = "0x27h0ccq93avsmb8gim43zklbsb4ghfw30a7hjvz0ilfx02gdca"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-ack"; sha256 = "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh"; - name = "wgrep-ack"; + name = "recipe"; }; packageRequires = [ wgrep ]; meta = { @@ -38732,20 +50370,25 @@ license = lib.licenses.free; }; }) {}; - wgrep-ag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: - melpaBuild { + wgrep-ag = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , wgrep }: + melpaBuild { pname = "wgrep-ag"; + ename = "wgrep-ag"; version = "2.1.10"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; - sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; + rev = "9448a9d597bd089ae61e58add2c5dbecb0aa2b8f"; + sha256 = "0x27h0ccq93avsmb8gim43zklbsb4ghfw30a7hjvz0ilfx02gdca"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c50b704343c4cac5e2a62a67e284ba6d8e15f8a/recipes/wgrep-ag"; sha256 = "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a"; - name = "wgrep-ag"; + name = "recipe"; }; packageRequires = [ wgrep ]; meta = { @@ -38753,20 +50396,25 @@ license = lib.licenses.free; }; }) {}; - wgrep-helm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: - melpaBuild { + wgrep-helm = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , wgrep }: + melpaBuild { pname = "wgrep-helm"; + ename = "wgrep-helm"; version = "2.1.10"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; - sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; + rev = "976eb41327e9c15c3be860a9d9962b3c3df9712e"; + sha256 = "1nh9gl1k54w7402fkphgw35bq3lljhv1alaaig2xfrjcm5x2phwv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-helm"; sha256 = "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b"; - name = "wgrep-helm"; + name = "recipe"; }; packageRequires = [ wgrep ]; meta = { @@ -38774,20 +50422,25 @@ license = lib.licenses.free; }; }) {}; - wgrep-pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: - melpaBuild { + wgrep-pt = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , wgrep }: + melpaBuild { pname = "wgrep-pt"; + ename = "wgrep-pt"; version = "2.1.10"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; - sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; + rev = "cd8df1be69257da2e48dc3eae4badc674468b61c"; + sha256 = "1df7lal4c0zsinrfjp4qv2k3xi1kbl66d36in47pmiam1kkqs9fs"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39faef3b9c2e1867cd48341d9878b714dbed4eb/recipes/wgrep-pt"; sha256 = "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg"; - name = "wgrep-pt"; + name = "recipe"; }; packageRequires = [ wgrep ]; meta = { @@ -38795,20 +50448,25 @@ license = lib.licenses.free; }; }) {}; - which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + which-key = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "which-key"; - version = "3.1.0"; + ename = "which-key"; + version = "3.3.0"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "7559a79e95aada65601f7413a1c3f08bfa34557b"; - sha256 = "1l9m04hypk8j5qkg7rlhsknj9hx5l3zjy97s3kv7wbcwvcx3yxhz"; + rev = "ff79dfff66f880885c5893dd6fd05dc51173a476"; + sha256 = "0x9bmm4s5gq9k9x1rkwxr8zz8p2hgsxvzpji138m8m4j809l6cn4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59"; - name = "which-key"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -38816,9 +50474,14 @@ license = lib.licenses.free; }; }) {}; - whitaker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + whitaker = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "whitaker"; + ename = "whitaker"; version = "0.3"; src = fetchFromGitHub { owner = "Fuco1"; @@ -38826,10 +50489,10 @@ rev = "28172edce0f727f0f7f17d8ba71d5510d877bb45"; sha256 = "01fwhrfi92pcrwc4yn03pflc9wj07mhzj0a0i5amar4f9bj6m5b4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b5d717e2eaf35ce33b26be049a39f2f75a7de72/recipes/whitaker"; sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj"; - name = "whitaker"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -38837,9 +50500,13 @@ license = lib.licenses.free; }; }) {}; - whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + whitespace-cleanup-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "whitespace-cleanup-mode"; + ename = "whitespace-cleanup-mode"; version = "0.10"; src = fetchFromGitHub { owner = "purcell"; @@ -38847,10 +50514,10 @@ rev = "e1e250aa6f5b1a526778c7a501cdec98ba29c0a4"; sha256 = "0xmwhybb8x6wwfr55ym5xg4dhy1aqx1abxy9qskn7h3zf1z4pgg2"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode"; sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3"; - name = "whitespace-cleanup-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38858,20 +50525,25 @@ license = lib.licenses.free; }; }) {}; - whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + whizzml-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "whizzml-mode"; - version = "0.2.2"; + ename = "whizzml-mode"; + version = "0.3.0"; src = fetchFromGitHub { owner = "whizzml"; repo = "whizzml-mode"; - rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22"; - sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b"; + rev = "eca56d0fd51c5f41ef3e84e363f66d717ea5b160"; + sha256 = "0rli8jc9fig32dx7icvmwmmdzkvar12323xy25vh296xzcyjrgba"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; sha256 = "0gas9xfpz5v9fbhjxhd4msihwz9w4a05l5icsaclxvh06f92wcyk"; - name = "whizzml-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -38879,9 +50551,13 @@ license = lib.licenses.free; }; }) {}; - whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + whole-line-or-region = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "whole-line-or-region"; + ename = "whole-line-or-region"; version = "1.3.1"; src = fetchFromGitHub { owner = "purcell"; @@ -38889,10 +50565,10 @@ rev = "a60e022b30c2f4d3118bcaef1adb77b90e0ca941"; sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region"; sha256 = "0zz9i1jxayw2p6ggfxjvhb1mc3ly9iy4jvk23ycndz9lnnzkch0y"; - name = "whole-line-or-region"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38900,9 +50576,13 @@ license = lib.licenses.free; }; }) {}; - widget-mvc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + widget-mvc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "widget-mvc"; + ename = "widget-mvc"; version = "0.0.2"; src = fetchFromGitHub { owner = "kiwanami"; @@ -38910,10 +50590,10 @@ rev = "2576e6f0c35d8dedfa9c2cd6ea4fb4c14cb72b63"; sha256 = "0fqv63m8z5m5ghh4j8ccdnmgcdkvi4jqpg9z7lp17g4p9pq3xfjf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76d3c38e205076a22628f490d8e8ddd80d091eab/recipes/widget-mvc"; sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f"; - name = "widget-mvc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38921,20 +50601,26 @@ license = lib.licenses.free; }; }) {}; - wiki-nav = callPackage ({ button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash }: - melpaBuild { + wiki-nav = callPackage ({ button-lock + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nav-flash }: + melpaBuild { pname = "wiki-nav"; + ename = "wiki-nav"; version = "1.0.2"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "button-lock"; - rev = "cd0bf4a3c2f224d851e6ed8a54a6e80c129b225f"; - sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2"; + rev = "86c514d20b9b67c1e87112a574f65c7d53aec2ec"; + sha256 = "0yy4z9k30prsjaig39x20f925dbl2svs8n3lgshcbv5aijffkq07"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/baa49e7d2d5c07ebf77e7941c240b88fcfd0fc8b/recipes/wiki-nav"; sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy"; - name = "wiki-nav"; + name = "recipe"; }; packageRequires = [ button-lock nav-flash ]; meta = { @@ -38942,9 +50628,13 @@ license = lib.licenses.free; }; }) {}; - win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + win-switch = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "win-switch"; + ename = "win-switch"; version = "1.1.4"; src = fetchFromGitHub { owner = "genovese"; @@ -38952,10 +50642,10 @@ rev = "954eb5e4c5737f0c06368c42a7f1c3dd374d782f"; sha256 = "1xpx4sc1g1w8w0yc39k2dys83m8skrpvi745bfrzdl47jngrf54h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/win-switch"; sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my"; - name = "win-switch"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38963,9 +50653,13 @@ license = lib.licenses.free; }; }) {}; - window-end-visible = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + window-end-visible = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "window-end-visible"; + ename = "window-end-visible"; version = "0.1.0"; src = fetchFromGitHub { owner = "rolandwalker"; @@ -38973,10 +50667,10 @@ rev = "bdc3d182e5f76e75f1b8cc49357194b36e48b67c"; sha256 = "049bwa5g0z1b9nrsc1vc4511aqcq9fvl16xg493wj651g6q9qigb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/window-end-visible"; sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq"; - name = "window-end-visible"; + name = "recipe"; }; packageRequires = []; meta = { @@ -38984,9 +50678,13 @@ license = lib.licenses.free; }; }) {}; - window-layout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + window-layout = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "window-layout"; + ename = "window-layout"; version = "1.4"; src = fetchFromGitHub { owner = "kiwanami"; @@ -38994,10 +50692,10 @@ rev = "cd2e4f967b610c2bbef53182829e47250d027056"; sha256 = "0wgqi8r844lbx52fn6az8c1n8m681rp6dkfzd54wmdk1ka7zmvv6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/window-layout"; sha256 = "061mvxcj4mg2pmkln7nn6gyscs08aid4cfc6xck0x5gzr1snr639"; - name = "window-layout"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39005,9 +50703,13 @@ license = lib.licenses.free; }; }) {}; - window-numbering = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + window-numbering = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "window-numbering"; + ename = "window-numbering"; version = "1.1.2"; src = fetchFromGitHub { owner = "nschum"; @@ -39015,10 +50717,10 @@ rev = "653afce73854d629c2b9d63dad73126032d6a24c"; sha256 = "1rz2a1l3apavsknlfy0faaivqgpj4x9jz3hbysbg9pydpcwqgf64"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce1dc80f69894736b276885e4ec3ce571a8612c9/recipes/window-numbering"; sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x"; - name = "window-numbering"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39026,9 +50728,17 @@ license = lib.licenses.free; }; }) {}; - window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }: - melpaBuild { + window-purpose = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , imenu-list + , let-alist + , lib + , melpaBuild }: + melpaBuild { pname = "window-purpose"; + ename = "window-purpose"; version = "1.6"; src = fetchFromGitHub { owner = "bmag"; @@ -39036,10 +50746,10 @@ rev = "00c253778d8e845bdc17a350c22ea157c5871b41"; sha256 = "11hv2rrcirswzgx0l52kwav5dilr3yksky9a3vg1pghgqhmm59hv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; sha256 = "1y70jrba3gf9fyf2qdihfshbsblzb88yv9fkcswdzrpq5kmgwp84"; - name = "window-purpose"; + name = "recipe"; }; packageRequires = [ cl-lib emacs imenu-list let-alist ]; meta = { @@ -39047,9 +50757,13 @@ license = lib.licenses.free; }; }) {}; - windsize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + windsize = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "windsize"; + ename = "windsize"; version = "0.1"; src = fetchFromGitHub { owner = "grammati"; @@ -39057,10 +50771,10 @@ rev = "014b0836f9ffe45fa7e0ccc84576fbef74815a59"; sha256 = "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/windsize"; sha256 = "1fzqf86d7pimnc87xdgvpv4hnv7j6ngmk1sjvazj6726xygswkyv"; - name = "windsize"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39068,9 +50782,40 @@ license = lib.licenses.free; }; }) {}; - winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + winring = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "winring"; + ename = "winring"; + version = "5.1"; + src = fetchFromGitLab { + owner = "warsaw"; + repo = "winring"; + rev = "f2d072bd446b73e93b127523f19ea82b99b9267f"; + sha256 = "1j0g52panhx91hqw5glnlv5vnnpnjyx49xc8xif8mjf0m27723fv"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2476a28c33502f908b7161c5a9c63c86b8d7b57d/recipes/winring"; + sha256 = "1mgr5z4h7mf677xx8md3pqd31k17qs62z9iamfih206fcwgh24k4"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/winring"; + license = lib.licenses.free; + }; + }) {}; + winum = callPackage ({ cl-lib ? null + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "winum"; + ename = "winum"; version = "2.0.0"; src = fetchFromGitHub { owner = "deb0ch"; @@ -39078,10 +50823,10 @@ rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c"; sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw"; - name = "winum"; + name = "recipe"; }; packageRequires = [ cl-lib dash ]; meta = { @@ -39089,8 +50834,11 @@ license = lib.licenses.free; }; }) {}; - wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { + wisp-mode = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wisp-mode"; version = "0.9.8"; src = fetchhg { @@ -39098,7 +50846,7 @@ rev = "d04938232934"; sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc"; name = "wisp-mode"; @@ -39109,9 +50857,14 @@ license = lib.licenses.free; }; }) {}; - wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wispjs-mode = callPackage ({ clojure-mode + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wispjs-mode"; + ename = "wispjs-mode"; version = "0.2.0"; src = fetchFromGitHub { owner = "krisajenkins"; @@ -39119,10 +50872,10 @@ rev = "be094c3c3223c07b26b5d8bb8fa7aa6866369b3f"; sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a628330ee8deeab2bd5c2d4b61b33f119c4549d8/recipes/wispjs-mode"; sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p"; - name = "wispjs-mode"; + name = "recipe"; }; packageRequires = [ clojure-mode ]; meta = { @@ -39130,20 +50883,26 @@ license = lib.licenses.free; }; }) {}; - with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + with-editor = callPackage ({ async + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "with-editor"; - version = "2.7.2"; + ename = "with-editor"; + version = "2.7.3"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "ff3e96929d4532e33422a5980a6e3ca9f2fcf032"; - sha256 = "1fhn2wd0wszbnfpvnjmlw8gxqzy8f4q7dg7r16jpa1cmk0fpcdi0"; + rev = "ad5bb005ed3afec2d8b9b2bc1df19fb9b5e2dd84"; + sha256 = "0hq2dy8djxf45ajk9di1grhgzly0qrijcjfdah8xj5zkwvn9cvlh"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb"; - name = "with-editor"; + name = "recipe"; }; packageRequires = [ async emacs ]; meta = { @@ -39151,9 +50910,16 @@ license = lib.licenses.free; }; }) {}; - with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: - melpaBuild { + with-simulated-input = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , seq }: + melpaBuild { pname = "with-simulated-input"; + ename = "with-simulated-input"; version = "2.2"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; @@ -39161,10 +50927,10 @@ rev = "9efeb236c8f6887a8591d6241962c37266d8e726"; sha256 = "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input"; sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk"; - name = "with-simulated-input"; + name = "recipe"; }; packageRequires = [ emacs s seq ]; meta = { @@ -39172,9 +50938,14 @@ license = lib.licenses.free; }; }) {}; - wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wn-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wn-mode"; + ename = "wn-mode"; version = "1.4"; src = fetchFromGitHub { owner = "luismbo"; @@ -39182,10 +50953,10 @@ rev = "6e7029b0d5773a79914a289937be068784931cad"; sha256 = "0nmzh6dynbm8vglp4pqz81s2z68jbnasvamvi1x1iawf8g9zfyix"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6213c01e6954985daff8cd1a5a3ef004431f0477/recipes/wn-mode"; sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3"; - name = "wn-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -39193,9 +50964,13 @@ license = lib.licenses.free; }; }) {}; - wolfram = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wolfram = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wolfram"; + ename = "wolfram"; version = "1.1.1"; src = fetchFromGitHub { owner = "hsjunnesson"; @@ -39203,10 +50978,10 @@ rev = "6b5dceae3fd6cdb4d7562510deeafa02c93c010b"; sha256 = "1ijyjw2793i7n00i30ma8lw4fzi9w63m6k0xgjx6j78r5y7pfj2g"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/785b5b1ec73e6376f2f2bb405707a1078398fa3a/recipes/wolfram"; sha256 = "02xp1916v9rydh0586jkx71v256qdg63f87s3m0agc2znnrni9h4"; - name = "wolfram"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39214,9 +50989,17 @@ license = lib.licenses.free; }; }) {}; - wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }: - melpaBuild { + wonderland = callPackage ({ dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , multi }: + melpaBuild { pname = "wonderland"; + ename = "wonderland"; version = "0.1.1"; src = fetchFromGitHub { owner = "kurisuwhyte"; @@ -39224,10 +51007,10 @@ rev = "28cf6b37000c395ece9519db53147fb826a42bc4"; sha256 = "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed02d5e4cba10023ebc7c26f90ba8d1e8ee32a08/recipes/wonderland"; sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi"; - name = "wonderland"; + name = "recipe"; }; packageRequires = [ dash dash-functional emacs multi ]; meta = { @@ -39235,9 +51018,15 @@ license = lib.licenses.free; }; }) {}; - wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wordgen = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wordgen"; + ename = "wordgen"; version = "0.1.4"; src = fetchFromGitHub { owner = "Fanael"; @@ -39245,10 +51034,10 @@ rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d"; sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen"; sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m"; - name = "wordgen"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -39256,20 +51045,24 @@ license = lib.licenses.free; }; }) {}; - wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wordsmith-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wordsmith-mode"; + ename = "wordsmith-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "istib"; repo = "wordsmith-mode"; - rev = "41b10f2fe3589da9812395cb417c3dcf906f0969"; - sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs"; + rev = "45df3bca3b49f7ee9d59278e4f6662d63d1dec33"; + sha256 = "0yxhw6kv12ny1fg5k0j9k7z3f54hnaq6h6b454197lssm9xjgg2b"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b5fda506e5b388cd6824d433b89032ed46858dc/recipes/wordsmith-mode"; sha256 = "0s6b6dfqn31jdcgs2mlmvwgpr5a4zs4xi8m002ly11c6sn035xb1"; - name = "wordsmith-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39277,9 +51070,16 @@ license = lib.licenses.free; }; }) {}; - worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }: - melpaBuild { + worf = callPackage ({ ace-link + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild + , swiper }: + melpaBuild { pname = "worf"; + ename = "worf"; version = "0.1.0"; src = fetchFromGitHub { owner = "abo-abo"; @@ -39287,10 +51087,10 @@ rev = "f36755447b588b739b2bf6ab0fb5eb5f4d8db3df"; sha256 = "0l2n3vwk251ba06xdrs9z0bp4ligfdjd259a84ap2z3sqdfa98x4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi"; - name = "worf"; + name = "recipe"; }; packageRequires = [ ace-link hydra swiper ]; meta = { @@ -39298,9 +51098,14 @@ license = lib.licenses.free; }; }) {}; - wrap-region = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wrap-region = callPackage ({ dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wrap-region"; + ename = "wrap-region"; version = "0.7.3"; src = fetchFromGitHub { owner = "rejeep"; @@ -39308,10 +51113,10 @@ rev = "5a910ad23ebb0649e644bf62ad042587341da5da"; sha256 = "03hjwm51sngkh7jjiwnqhflllqq6i99ib47rm2ja9ii0qyhj1qa0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/wrap-region"; sha256 = "058518smxj3j3mr6ljzh7c9x5g23d24104p58sl9nhpw0cq9k28i"; - name = "wrap-region"; + name = "recipe"; }; packageRequires = [ dash ]; meta = { @@ -39319,20 +51124,24 @@ license = lib.licenses.free; }; }) {}; - writegood-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + writegood-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "writegood-mode"; - version = "2.0.2"; + ename = "writegood-mode"; + version = "2.0.3"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "writegood-mode"; - rev = "4302169c1563cab9319745083f9b9a7f5f4af0bd"; - sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b"; + rev = "b71757ec337e226909fb0422f0224e31acc71733"; + sha256 = "038gliy6l931r02bf2dbhmp188sgk1rq46ngg9nhf5q5rkf3pi8p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode"; sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d"; - name = "writegood-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39340,9 +51149,15 @@ license = lib.licenses.free; }; }) {}; - writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }: - melpaBuild { + writeroom-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , visual-fill-column }: + melpaBuild { pname = "writeroom-mode"; + ename = "writeroom-mode"; version = "3.7"; src = fetchFromGitHub { owner = "joostkremers"; @@ -39350,10 +51165,10 @@ rev = "d3252f54c8f9f37a19d6a21fb2291c3da7a7121a"; sha256 = "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk"; - name = "writeroom-mode"; + name = "recipe"; }; packageRequires = [ emacs visual-fill-column ]; meta = { @@ -39361,9 +51176,13 @@ license = lib.licenses.free; }; }) {}; - ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ws-butler = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ws-butler"; + ename = "ws-butler"; version = "0.6"; src = fetchFromGitHub { owner = "lewang"; @@ -39371,10 +51190,10 @@ rev = "323b651dd70ee40a25accc940b8f80c3a3185205"; sha256 = "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ws-butler"; sha256 = "1k5nhj37r51i0czrlafra53wir73p0nbq83jjccqmw4p4xk6axl3"; - name = "ws-butler"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39382,9 +51201,13 @@ license = lib.licenses.free; }; }) {}; - wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + wsd-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "wsd-mode"; + ename = "wsd-mode"; version = "0.5.0"; src = fetchFromGitHub { owner = "josteink"; @@ -39392,10 +51215,10 @@ rev = "b5e8ea0daeaa52f2ea6349e09902bd3216e96258"; sha256 = "1ibvcc54y2w72d3yvcczvzywribiwmkhlb1b08g4pyb1arclw393"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/wsd-mode"; sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc"; - name = "wsd-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39403,20 +51226,26 @@ license = lib.licenses.free; }; }) {}; - wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: - melpaBuild { + wttrin = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , xterm-color }: + melpaBuild { pname = "wttrin"; + ename = "wttrin"; version = "0.1.0"; src = fetchFromGitHub { owner = "bcbcarl"; repo = "emacs-wttrin"; - rev = "d595240d92788791da2218d12efd6a77eee06217"; - sha256 = "0mbc3ndggv2rbmfcfhw8bsx3qw6jy684hxz5dqa88lfb6vs5knzc"; + rev = "36375c46220aae42aa2c3fe20cf1c252e8ecad87"; + sha256 = "1vjcfqqm6xwinwmi973n45jillc5j77da436wlv1ax0095xck4nl"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b2b6876562f1fadd4af1ea9b279ac4dc1b21660/recipes/wttrin"; sha256 = "0msp8lja9nz6khz3dkasv8hnhkaayqxd7m58kma03hpkcjxnaxil"; - name = "wttrin"; + name = "recipe"; }; packageRequires = [ emacs xterm-color ]; meta = { @@ -39424,20 +51253,26 @@ license = lib.licenses.free; }; }) {}; - x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + x86-lookup = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "x86-lookup"; - version = "1.1.1"; + ename = "x86-lookup"; + version = "1.2.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "x86-lookup"; - rev = "208810ea93214491e6e2329cdbf81de85437939a"; - sha256 = "0whhi05mg7xirzfcz7fzn4hkqq0qbrhqi77myrgdhwgs123cd9bj"; + rev = "609b2ba70dc5a246ac9b4b5f89eb5ef4331519bf"; + sha256 = "19zgq7mcc3wx847xc911fibvphbsws99m2l3k54xdjp8mb5qfdzm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup"; sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd"; - name = "x86-lookup"; + name = "recipe"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -39445,9 +51280,13 @@ license = lib.licenses.free; }; }) {}; - xbm-life = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xbm-life = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xbm-life"; + ename = "xbm-life"; version = "0.1.3"; src = fetchFromGitHub { owner = "wasamasa"; @@ -39455,10 +51294,10 @@ rev = "bde2b3730a02d237f7d95a8e3f3722f23f2d9201"; sha256 = "154xnfcmil9xjjmq4cyrfpir4ga4mgcmmbd7dja1m7rpk1734xk6"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6cb4c55583338dafee61fd9c266d2ee7cae2b1ed/recipes/xbm-life"; sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q"; - name = "xbm-life"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39466,9 +51305,14 @@ license = lib.licenses.free; }; }) {}; - xcode-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xcode-project = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xcode-project"; + ename = "xcode-project"; version = "1.0.0"; src = fetchFromGitHub { owner = "nhojb"; @@ -39476,10 +51320,10 @@ rev = "f5548a26a1afc0b0d873556c25f6d8b6b9c2aa8c"; sha256 = "0xb1cvjaw7zjnw6c5aq315vvlc3cncris62jis44jb8s5r8gxcrv"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49b866ebf7e707bc74525f83dd5038e6e860fcef/recipes/xcode-project"; sha256 = "0igp30f6ypmp4l8zmdfpa5bza4avm7mq2gj8v7b3ii655v91n6vi"; - name = "xcode-project"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -39487,9 +51331,13 @@ license = lib.licenses.free; }; }) {}; - xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xcscope = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xcscope"; + ename = "xcscope"; version = "1.3"; src = fetchFromGitHub { owner = "dkogan"; @@ -39497,10 +51345,10 @@ rev = "1e4c8e60eb841a3ecb56ff4115b6a8ae5c0bf779"; sha256 = "1cc3bmi4fxlgqha7sxswn9lcc126xnr2j8xz6wszjnqh5w274fpp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/068c7846e70b91ce7e88330937fc64a60281802a/recipes/xcscope"; sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w"; - name = "xcscope"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39508,9 +51356,14 @@ license = lib.licenses.free; }; }) {}; - xkcd = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { + xkcd = callPackage ({ fetchFromGitHub + , fetchurl + , json ? null + , lib + , melpaBuild }: + melpaBuild { pname = "xkcd"; + ename = "xkcd"; version = "1.1"; src = fetchFromGitHub { owner = "vibhavp"; @@ -39518,10 +51371,10 @@ rev = "2c538d41a9728939cc5e8292faa78ed50997877d"; sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xkcd"; sha256 = "0gy2952zg1rq5gl10x7iwbchz5jibfcvikd3chifqbmil80wh6b5"; - name = "xkcd"; + name = "recipe"; }; packageRequires = [ json ]; meta = { @@ -39529,9 +51382,13 @@ license = lib.licenses.free; }; }) {}; - xml-rpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xml-rpc = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xml-rpc"; + ename = "xml-rpc"; version = "1.6.12"; src = fetchFromGitHub { owner = "hexmode"; @@ -39539,10 +51396,10 @@ rev = "0ab093d60140d19e31d217c8abdc7dbdac944486"; sha256 = "0g52bmamcd54acyk6i47ar5jawad6ycvm9g656inb994wprnjin9"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/547d773e07d6229d2135d1b081b5401039ffad39/recipes/xml-rpc"; sha256 = "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js"; - name = "xml-rpc"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39550,9 +51407,13 @@ license = lib.licenses.free; }; }) {}; - xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xmlgen = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xmlgen"; + ename = "xmlgen"; version = "0.5"; src = fetchFromGitHub { owner = "philjackson"; @@ -39560,10 +51421,10 @@ rev = "dba66681f0c5e621a9e70e8afb34903c9ffe93c4"; sha256 = "096i29v0badx0a6339h9ckdz78zj59gbjdp7vj7vhkq9d830392s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xmlgen"; sha256 = "0c77la6kl02qkapfzbjmhac60f8p837kwg8bp0686ylxh5s31zsh"; - name = "xmlgen"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39571,9 +51432,13 @@ license = lib.licenses.free; }; }) {}; - xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xquery-tool = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xquery-tool"; + ename = "xquery-tool"; version = "0.1.10"; src = fetchFromGitHub { owner = "paddymcall"; @@ -39581,10 +51446,10 @@ rev = "b81b5862e8541aca5231840eb176afad7ab55cf3"; sha256 = "0dv3gl9djs9sbsg5mhdfnnv61ir9xccqijh7i2b82gq2j3lqhibm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool"; sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0"; - name = "xquery-tool"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39592,9 +51457,15 @@ license = lib.licenses.free; }; }) {}; - xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: - melpaBuild { + xref-js2 = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , js2-mode + , lib + , melpaBuild }: + melpaBuild { pname = "xref-js2"; + ename = "xref-js2"; version = "1.5"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -39602,10 +51473,10 @@ rev = "7e2bc6a8dad08a493d11d3554f6374584846b9e6"; sha256 = "1mmd27miv32sl8cj7qhy09yfh7v1zgw7rv4fdwk96msvd4qfdkqd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5dab444ead98210b4ab3a6f9a61d013aed6d5b7/recipes/xref-js2"; sha256 = "1mfyszdi1wx2lqd9fyqm0ra227dcsjs8asc1dw2li0alwh7n4xs3"; - name = "xref-js2"; + name = "recipe"; }; packageRequires = [ emacs js2-mode ]; meta = { @@ -39613,9 +51484,14 @@ license = lib.licenses.free; }; }) {}; - xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xterm-color = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xterm-color"; + ename = "xterm-color"; version = "1.7"; src = fetchFromGitHub { owner = "atomontage"; @@ -39623,10 +51499,10 @@ rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c"; sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj"; - name = "xterm-color"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -39634,9 +51510,14 @@ license = lib.licenses.free; }; }) {}; - xtest = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + xtest = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "xtest"; + ename = "xtest"; version = "1.1.0"; src = fetchFromGitHub { owner = "promethial"; @@ -39644,10 +51525,10 @@ rev = "b227414d714e7baddef79bd306a43024b9a34d45"; sha256 = "1wqx6hlqcmqiljydih5fx89dw06g8w728pyn4iqsap8jwgjngb09"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/378fe14c66072ecb899a074c56f95077dfc9667e/recipes/xtest"; sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7"; - name = "xtest"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -39655,9 +51536,13 @@ license = lib.licenses.free; }; }) {}; - yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yafolding = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yafolding"; + ename = "yafolding"; version = "0.4.0"; src = fetchFromGitHub { owner = "zenozeng"; @@ -39665,10 +51550,10 @@ rev = "57c015ddd7c3454571c80825bc5391d7a10fa1d7"; sha256 = "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yafolding"; sha256 = "1yb1rlxa5f1y1xjqs7ndr5jnf9j5cv0ccqdpbrx4l9xkm3npw9zl"; - name = "yafolding"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39676,9 +51561,14 @@ license = lib.licenses.free; }; }) {}; - yagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yagist = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yagist"; + ename = "yagist"; version = "0.8.12"; src = fetchFromGitHub { owner = "mhayashi1120"; @@ -39686,10 +51576,10 @@ rev = "97723a34750ccab5439eb9f6a2f67e4e0e234167"; sha256 = "0l9b888wv72j4hhkcfzsh09iqjxp2qjbjcjcfmvfhxf7il11pv8h"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97ea1250ffbf159d7870710b9348ef26616dbedb/recipes/yagist"; sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd"; - name = "yagist"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -39697,9 +51587,14 @@ license = lib.licenses.free; }; }) {}; - yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yaml-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yaml-mode"; + ename = "yaml-mode"; version = "0.0.13"; src = fetchFromGitHub { owner = "yoshiki"; @@ -39707,10 +51602,10 @@ rev = "2ace378bef2047a980fba0e42e3e6b5d990f2c66"; sha256 = "1wx4gqkg0v0mcykimiihrp4lg2s9qac31w8rw5frbs1r37v3l8x7"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc"; - name = "yaml-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -39718,9 +51613,13 @@ license = lib.licenses.free; }; }) {}; - yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yang-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yang-mode"; + ename = "yang-mode"; version = "0.9.8"; src = fetchFromGitHub { owner = "mbj4668"; @@ -39728,10 +51627,10 @@ rev = "340aec635e359609b22f7e94df15af1af2b070f6"; sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; sha256 = "0rl90xbcf3383ls95g1dixh2dr02kc4g60d324cqbb4h59wffp40"; - name = "yang-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39739,9 +51638,13 @@ license = lib.licenses.free; }; }) {}; - yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yankpad = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yankpad"; + ename = "yankpad"; version = "1.6"; src = fetchFromGitHub { owner = "Kungsgeten"; @@ -39749,10 +51652,10 @@ rev = "d2ea6920a2444f1ce6f53947640446b8e16f84b7"; sha256 = "1lw2d25rwszk35bi3gm3bg0cb30b8c2bf3p32b89shnsmwylw52m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; sha256 = "1w5r9zk33cjgsmk45znfg32ym06nyqj5q3knr59jmn1fafx7a3z4"; - name = "yankpad"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39760,9 +51663,13 @@ license = lib.licenses.free; }; }) {}; - yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yapfify = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yapfify"; + ename = "yapfify"; version = "0.0.6"; src = fetchFromGitHub { owner = "JorisE"; @@ -39770,10 +51677,10 @@ rev = "9e63a9135bd8dbfbee55819837a3aa0d119c5e6f"; sha256 = "1bf09hah2g8x0jbrdh4fm1v01qjymiv38yvv8a5qmfpv5k93lcrc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify"; sha256 = "0scl8lk1c5i7jp1qj5gg8zf3zyi8lkb57ijkmvcs4czzlyv3y9bm"; - name = "yapfify"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39781,20 +51688,24 @@ license = lib.licenses.free; }; }) {}; - yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yard-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yard-mode"; + ename = "yard-mode"; version = "0.1"; src = fetchFromGitHub { owner = "pd"; repo = "yard-mode.el"; - rev = "78792f6a6fbff4f1bc955f494fdb11378e7f8095"; - sha256 = "096ay60hrd14b459cyxxcf9g7i1ivsxg6yhc0q162px6kl1x0m2y"; + rev = "28015f600c38efed37df025b76705f7edbf963ea"; + sha256 = "1p1f1cdq1km2zlk1z8s2yhw9mgf3kdx48pgp7bhd0l2ybxh5kc85"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/afad2677f901b8d27922389afb1d235d5c8edc39/recipes/yard-mode"; sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx"; - name = "yard-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39802,9 +51713,14 @@ license = lib.licenses.free; }; }) {}; - yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yarn-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yarn-mode"; + ename = "yarn-mode"; version = "1.0"; src = fetchFromGitHub { owner = "anachronic"; @@ -39812,10 +51728,10 @@ rev = "99891000efe31214b065fa9446cd5e68c5c42ed8"; sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode"; sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg"; - name = "yarn-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -39823,9 +51739,13 @@ license = lib.licenses.free; }; }) {}; - yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yascroll = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yascroll"; + ename = "yascroll"; version = "0.1"; src = fetchFromGitHub { owner = "m2ym"; @@ -39833,10 +51753,10 @@ rev = "0a8b531b3a3c8afe7235c8c212e08bfe2021a629"; sha256 = "007837w6gd7k253h7g2in6l3ihcbwv733yiffs26pnymgk21xdqz"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yascroll"; sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f"; - name = "yascroll"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39844,20 +51764,25 @@ license = lib.licenses.free; }; }) {}; - yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yasnippet = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yasnippet"; - version = "0.12.2"; + ename = "yasnippet"; + version = "0.13.0"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "89eb7ab64d67e96646576dc0d551e8c23d50438a"; - sha256 = "1wr0d14yl3440hkdr436zxl9pk7nqhl76n9m3b3ia4lp6z5aj4jc"; + rev = "5a29fe67d70de3749e30ebb37206395b4d1a51a8"; + sha256 = "0fkkplycrw8f8r30hjjxl1wm7p2irq2ipzzc1g7cc52abaal796p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; sha256 = "1r37vz5b8nj6hr6c2ki9fdbrs3kkb4zwimh8r4ixm10kdkk5jqds"; - name = "yasnippet"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -39865,20 +51790,52 @@ license = lib.licenses.free; }; }) {}; - yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: - melpaBuild { + yasnippet-snippets = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { + pname = "yasnippet-snippets"; + ename = "yasnippet-snippets"; + version = "0.5"; + src = fetchFromGitHub { + owner = "AndreaCrotti"; + repo = "yasnippet-snippets"; + rev = "d153af6d1d8ab8dfbc57f4065cee72f86d5cd2c4"; + sha256 = "0dkhac40kiyqnq42c2fcdb1jzshgakabq4rq796qfhjpc5j8x5wk"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/42490bbdac871bce302fbc9a0488ff7de354627e/recipes/yasnippet-snippets"; + sha256 = "0daawvlw78ya38bbi95swjq8qk5jf5shsyv164m81y2gd8i5c183"; + name = "recipe"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://melpa.org/#/yasnippet-snippets"; + license = lib.licenses.free; + }; + }) {}; + yatemplate = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yasnippet }: + melpaBuild { pname = "yatemplate"; + ename = "yatemplate"; version = "3.0"; src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "c1de31d2b16d98af197a4392b6481346ab4e8d57"; - sha256 = "0lp5ym2smmvmlxpdyv4kh75qsz8dsdz9afd8nxaq8y4fazzabblx"; + rev = "caa8734afc559a28eb4ec5dc3f240434e51cafc9"; + sha256 = "0zzmhkadyyw56j1z6dgj3x81sb5mxd0s2r20vy5mrfm18cyvsdd1"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q"; - name = "yatemplate"; + name = "recipe"; }; packageRequires = [ emacs yasnippet ]; meta = { @@ -39886,7 +51843,11 @@ license = lib.licenses.free; }; }) {}; - yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + yatex = callPackage ({ fetchhg + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yatex"; version = "1.80"; src = fetchhg { @@ -39894,7 +51855,7 @@ rev = "af4601ee3c6a"; sha256 = "1r0irbkg8c5aapd1i7il31wv2fmhi0bzspiy21k670m896jqx50p"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex"; sha256 = "1qbqdsqf5s61hyyzx84csnby242n5sdcmcw55pa8r16j8kyzgrc0"; name = "yatex"; @@ -39905,20 +51866,24 @@ license = lib.licenses.free; }; }) {}; - yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yaxception = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yaxception"; + ename = "yaxception"; version = "0.3.3"; src = fetchFromGitHub { owner = "aki2o"; repo = "yaxception"; - rev = "4e94cf3e0b9b5631b0e90eb4b7de597ee7185875"; - sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8"; + rev = "21a36020c6a5319ea6461f4524aa3a0589df3bbd"; + sha256 = "06fnm2c17hmlfp40mq8lxk1blmcy10z0xxdpy8ykyv1r1r6syjf8"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da5261081fc66910d935b81e52391c071e52379/recipes/yaxception"; sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58"; - name = "yaxception"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39926,9 +51891,22 @@ license = lib.licenses.free; }; }) {}; - ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: - melpaBuild { + ycmd = callPackage ({ cl-lib ? null + , dash + , deferred + , emacs + , fetchFromGitHub + , fetchurl + , let-alist + , lib + , melpaBuild + , pkg-info + , request + , request-deferred + , s }: + melpaBuild { pname = "ycmd"; + ename = "ycmd"; version = "1.2"; src = fetchFromGitHub { owner = "abingham"; @@ -39936,10 +51914,10 @@ rev = "d042a673b4d717c3ca9d641f120bfe16c994c740"; sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; sha256 = "10jqr6xz2fnrd1ihips9jmbcd28zha432h4pxjpswz3ivwjqhxna"; - name = "ycmd"; + name = "recipe"; }; packageRequires = [ cl-lib @@ -39957,20 +51935,24 @@ license = lib.licenses.free; }; }) {}; - ydk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + ydk-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "ydk-mode"; + ename = "ydk-mode"; version = "1.0.0"; src = fetchFromGitHub { owner = "jacksonrayhamilton"; repo = "ydk-mode"; - rev = "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e"; - sha256 = "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi"; + rev = "3de9ef27dbdf5887f05092895e4ba93e7659e0ec"; + sha256 = "1kc1qsblfxfxrbgv3ksqf87gzic463136k2v7ryaj3x2r9mc0j3l"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/865b9ee86ca28fc1cedc0a432a292400184711ae/recipes/ydk-mode"; sha256 = "1z9digf39d7dd736svp0cy6773l3nklzc263q23gwfcg0jswbdyg"; - name = "ydk-mode"; + name = "recipe"; }; packageRequires = []; meta = { @@ -39978,9 +51960,16 @@ license = lib.licenses.free; }; }) {}; - yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { + yesql-ghosts = callPackage ({ cider + , dash + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { pname = "yesql-ghosts"; + ename = "yesql-ghosts"; version = "0.1.0"; src = fetchFromGitHub { owner = "magnars"; @@ -39988,10 +51977,10 @@ rev = "bd834e97f263f9f981758c1462bc6297a83ca852"; sha256 = "0yvz7lmid4jcikb9jmc7h2lcry3fdyy809k25nyasj2bk41xqqsd"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c652657be0f9b9dcb236e01c3abd2fd717190d7/recipes/yesql-ghosts"; sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf"; - name = "yesql-ghosts"; + name = "recipe"; }; packageRequires = [ cider dash s ]; meta = { @@ -39999,9 +51988,13 @@ license = lib.licenses.free; }; }) {}; - yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + yoshi-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "yoshi-theme"; + ename = "yoshi-theme"; version = "6.1.0"; src = fetchFromGitHub { owner = "ryuslash"; @@ -40009,10 +52002,10 @@ rev = "b140d3adce4e8e7ff7b0daaa6684bd7065e4819b"; sha256 = "19a47780h0x1rdicr8i7356kvamkbkcwp31skdpp5cxgysvi3d9s"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme"; sha256 = "1kzdjs3rzg9rxrjgsk0wk75rwvbip6ixg1apcxv2c1a6biqqf2hv"; - name = "yoshi-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40020,9 +52013,17 @@ license = lib.licenses.free; }; }) {}; - youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup }: - melpaBuild { + youdao-dictionary = callPackage ({ chinese-word-at-point + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , names + , popup }: + melpaBuild { pname = "youdao-dictionary"; + ename = "youdao-dictionary"; version = "0.4"; src = fetchFromGitHub { owner = "xuchunyang"; @@ -40030,10 +52031,10 @@ rev = "a6e44e4fb93cc1b9f1067f10cf854b0bfc3fe732"; sha256 = "1m4zri7kiw70062w2sp4fdqmmx2vmjisamjwmjdg6669dzvnpawq"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/712bdf83f71c2105754f9b549a889ffc5b7ba565/recipes/youdao-dictionary"; sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym"; - name = "youdao-dictionary"; + name = "recipe"; }; packageRequires = [ chinese-word-at-point emacs names popup ]; meta = { @@ -40041,9 +52042,40 @@ license = lib.licenses.free; }; }) {}; - zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , frecency + , lib + , melpaBuild }: + melpaBuild { + pname = "zel"; + ename = "zel"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "rudolfochrist"; + repo = "zel"; + rev = "1d938ac01a42e7a985a3f92f5e97bc09e057676e"; + sha256 = "1hk84x4aqcfd3jggk9san1v4kr58v2zhikbv9sh3dcii6x5w2nv0"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/25b445a1dea5e8f1042bed6b5372471c25129fd8/recipes/zel"; + sha256 = "0fwc1fghsw2rg4fv10kgc9d6rhbq20xa9diqcvp1f1cqs12rfhpd"; + name = "recipe"; + }; + packageRequires = [ emacs frecency ]; + meta = { + homepage = "https://melpa.org/#/zel"; + license = lib.licenses.free; + }; + }) {}; + zenburn-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zenburn-theme"; + ename = "zenburn-theme"; version = "2.5"; src = fetchFromGitHub { owner = "bbatsov"; @@ -40051,10 +52083,10 @@ rev = "f031c785b469cf4356fddb997eccf60399e34235"; sha256 = "029955wp29wdrk1ddmhxixd76vhkp2li3mjaknw9d8iqz819vshc"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9"; - name = "zenburn-theme"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40062,20 +52094,25 @@ license = lib.licenses.free; }; }) {}; - zephir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zephir-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zephir-mode"; + ename = "zephir-mode"; version = "0.3.3"; src = fetchFromGitHub { owner = "sergeyklay"; repo = "zephir-mode"; - rev = "243f0fb7fd1dfebf0f0bdf94046b72d1bea4f66c"; - sha256 = "0jydy2zcbksi7db7bvfhgdh08np8k4a1yd6q2wq6m3ll2y3zd0w2"; + rev = "b031c56753cef349484d53d2f3f29bd8080f4dc5"; + sha256 = "1gxz2khyl14z4hg1gxscv14gsqgnrz0343yy3lla0cc9i64c65ih"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode"; sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j"; - name = "zephir-mode"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40083,9 +52120,16 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: - melpaBuild { + zerodark-theme = callPackage ({ all-the-icons + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , magit + , melpaBuild }: + melpaBuild { pname = "zerodark-theme"; + ename = "zerodark-theme"; version = "4.5"; src = fetchFromGitHub { owner = "NicolasPetton"; @@ -40093,10 +52137,10 @@ rev = "ceb46240636865e86f3fe26906957943ba7bd73c"; sha256 = "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; - name = "zerodark-theme"; + name = "recipe"; }; packageRequires = [ all-the-icons flycheck magit ]; meta = { @@ -40104,20 +52148,27 @@ license = lib.licenses.free; }; }) {}; - zombie-trellys-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: - melpaBuild { + zombie-trellys-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , haskell-mode + , lib + , melpaBuild }: + melpaBuild { pname = "zombie-trellys-mode"; + ename = "zombie-trellys-mode"; version = "0.2.1"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "zombie-trellys-mode"; - rev = "9e99d444a387dd1634cab62ef802683f5bf5d907"; - sha256 = "1ksjd3askc3k1l0b3nia5mzkxa74bidh2x0xlrj4qs4im5445vnz"; + rev = "03b8d3635f65dbf38f9a19b5d1a8dfdcb38ba423"; + sha256 = "0rp615k41v5v9m9g3ydyzgwr6a7wqrmsdkz3pc2frl1zij8jpjm4"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e66db80ab82a69542688cd57c9e0ec10e6616c87/recipes/zombie-trellys-mode"; sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv"; - name = "zombie-trellys-mode"; + name = "recipe"; }; packageRequires = [ cl-lib emacs haskell-mode ]; meta = { @@ -40125,9 +52176,14 @@ license = lib.licenses.free; }; }) {}; - zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zone-nyan = callPackage ({ esxml + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zone-nyan"; + ename = "zone-nyan"; version = "0.2.2"; src = fetchFromGitHub { owner = "wasamasa"; @@ -40135,10 +52191,10 @@ rev = "e36875d83ad3dce14f23864688959fa0d98ba410"; sha256 = "1lrgirfvcvbir7csshkhhwj99jj1x5aprhw7xfiicv7nan9m6gjy"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zone-nyan"; sha256 = "1g7i5p26gb9gny64b84x6zqml7fly5q9aykmc6l6c1kfl6pqxs94"; - name = "zone-nyan"; + name = "recipe"; }; packageRequires = [ esxml ]; meta = { @@ -40146,9 +52202,14 @@ license = lib.licenses.free; }; }) {}; - zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zoom = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zoom"; + ename = "zoom"; version = "0.2.1"; src = fetchFromGitHub { owner = "cyrus-and"; @@ -40156,10 +52217,10 @@ rev = "85deb722abb89f1758a24969680fc13b51344cb2"; sha256 = "1a7dlfi1w0rh6iphvflip3798xg7sac916qwjmqzz4inw9wdh3ga"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; sha256 = "09bk0nnfj72an2b3rravd6qp21gdgcm1m55qnf2r8rzbgqymq5ls"; - name = "zoom"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40167,9 +52228,14 @@ license = lib.licenses.free; }; }) {}; - zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zoom-window = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zoom-window"; + ename = "zoom-window"; version = "0.5"; src = fetchFromGitHub { owner = "syohex"; @@ -40177,10 +52243,10 @@ rev = "eefe36d26e04a9f89aad27671d1f06e9d4736ac6"; sha256 = "08splg49ncgfsap3ivpc974wmg22ikshwv33l0i6advjjv9cskhm"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window"; sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3"; - name = "zoom-window"; + name = "recipe"; }; packageRequires = [ emacs ]; meta = { @@ -40188,9 +52254,14 @@ license = lib.licenses.free; }; }) {}; - zop-to-char = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zop-to-char = callPackage ({ cl-lib ? null + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zop-to-char"; + ename = "zop-to-char"; version = "1.1"; src = fetchFromGitHub { owner = "thierryvolpiatto"; @@ -40198,10 +52269,10 @@ rev = "816ea90337db0545a2f0a5079f4d7b3a2822af7d"; sha256 = "14waf3g7b92k3qd5088w4pn0wcspxjfkbswlzf7nnkjliw1yh0kf"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9277f1a5f1aef8886e739c73dea91d3f81dc5/recipes/zop-to-char"; sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga"; - name = "zop-to-char"; + name = "recipe"; }; packageRequires = [ cl-lib ]; meta = { @@ -40209,9 +52280,13 @@ license = lib.licenses.free; }; }) {}; - zotelo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zotelo = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zotelo"; + ename = "zotelo"; version = "1.3"; src = fetchFromGitHub { owner = "vspinu"; @@ -40219,10 +52294,10 @@ rev = "56eaaa76f80bd15710e68af4a1e585394af987d3"; sha256 = "0qwdbzfi8mddmchdd9ab9ms1ynlc8dx08i6g2mf3za1sbcivdqsr"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/zotelo"; sha256 = "0y6s5ma7633h5pf9zj7vkazidlf211va7nk47ppb1q0iyfkyln36"; - name = "zotelo"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40230,9 +52305,14 @@ license = lib.licenses.free; }; }) {}; - zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }: - melpaBuild { + zotxt = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , request-deferred }: + melpaBuild { pname = "zotxt"; + ename = "zotxt"; version = "0.1.34"; src = fetchFromGitLab { owner = "egh"; @@ -40240,10 +52320,10 @@ rev = "43c0c6d23b31126bac6b14bb85608180fd9c866f"; sha256 = "0qksa67aazs9vx7v14nlakr34z6l0h6mhfzi2c0vhrr0c210r6hp"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt"; sha256 = "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5"; - name = "zotxt"; + name = "recipe"; }; packageRequires = [ request-deferred ]; meta = { @@ -40251,9 +52331,13 @@ license = lib.licenses.free; }; }) {}; - zygospore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zygospore = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zygospore"; + ename = "zygospore"; version = "0.0.3"; src = fetchFromGitHub { owner = "LouisKottmann"; @@ -40261,10 +52345,10 @@ rev = "1af5ee663f5a7aa08d96a77cacff834dcdf55ea8"; sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/zygospore"; sha256 = "0n9qs6fymdjly0i4rmx87y8gapfn5sqivsivcffi42vcb5f17kxj"; - name = "zygospore"; + name = "recipe"; }; packageRequires = []; meta = { @@ -40272,9 +52356,16 @@ license = lib.licenses.free; }; }) {}; - zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + zzz-to-char = callPackage ({ avy + , cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { pname = "zzz-to-char"; + ename = "zzz-to-char"; version = "0.1.2"; src = fetchFromGitHub { owner = "mrkkrp"; @@ -40282,10 +52373,10 @@ rev = "b62414b155fe2e09d91b70059a909d1403d89acf"; sha256 = "07a086s3fpncr4plkmr89vghn7xwji9k69m64ri7i1vhnnl6q4zj"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh"; - name = "zzz-to-char"; + name = "recipe"; }; packageRequires = [ avy cl-lib emacs ]; meta = { @@ -40293,4 +52384,4 @@ license = lib.licenses.free; }; }) {}; - } \ No newline at end of file + } diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index be01b125cb714125d9aff4af82affd1cecf033a7..61086b96230e37b75b18cf1bc006f4766f41a00d 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -13,7 +13,7 @@ To update the list of packages from MELPA, */ -{ lib }: +{ external }: self: @@ -96,8 +96,8 @@ self: # Expects bash to be at /bin/bash flycheck-rtags = markBroken super.flycheck-rtags; - # upstream issue: missing file header - fold-dwim = markBroken super.fold-dwim; + # upstream issue: missing dependency + fold-dwim-org = markBroken super.fold-dwim-org; # build timeout graphene = markBroken super.graphene; @@ -108,6 +108,14 @@ self: # Expects bash to be at /bin/bash helm-rtags = markBroken super.helm-rtags; + # Build same version as Haskell package + hindent = super.hindent.overrideAttrs (attrs: { + version = external.hindent.version; + src = external.hindent.src; + packageRequires = [ self.haskell-mode ]; + propagatedUserEnvPkgs = [ external.hindent ]; + }); + # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; @@ -132,6 +140,17 @@ self: # upstream issue: missing file header maxframe = markBroken super.maxframe; + magit = + (super.magit.override { + # version of magit-popup needs to match magit + # https://github.com/magit/magit/issues/3286 + inherit (self.melpaStablePackages) magit-popup; + }).overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # missing OCaml merlin = markBroken super.merlin; @@ -175,6 +194,12 @@ self: # missing OCaml utop = markBroken super.utop; + vdiff-magit = + (super.vdiff-magit.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + })); + # upstream issue: missing file header voca-builder = markBroken super.voca-builder; diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix index 7ed6355f9815a344228f75a706870426506b20b9..9f8d408dd5a2dabd1c7289e4fefb38618bbce653 100644 --- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, emacs, ocaml }: +{ stdenv, emacs, ocaml }: # this package installs the emacs-mode which # resides in the ocaml compiler sources. diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 4af93ceb0bc54a15df4efd35f74b755d092ba5ed..32b6b703729f460b0b9ea280bb9506e07654e73c 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,13 @@ -{ callPackage }: { - org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { +{ callPackage }: + { + org = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "org"; - version = "20180402"; + ename = "org"; + version = "20180723"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20180402.tar"; - sha256 = "0gb8hh26jzjqy262ll8jl3ym0cpw6s17id2gizv5qvw18knxs751"; + url = "http://orgmode.org/elpa/org-20180723.tar"; + sha256 = "1mcgnba16lpyh55zjx4rcbmpygcmdnjjzvgv1rx0c3kz1h5fgzf8"; }; packageRequires = []; meta = { @@ -12,12 +15,14 @@ license = lib.licenses.free; }; }) {}; - org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { pname = "org-plus-contrib"; - version = "20180402"; + ename = "org-plus-contrib"; + version = "20180723"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20180402.tar"; - sha256 = "09q5nr0ka7z719mi626wj5d51bcvdb08gk4zf94dzpks0gsqiikr"; + url = "http://orgmode.org/elpa/org-plus-contrib-20180723.tar"; + sha256 = "1l34bagkm8mcyv5diprpbd4yjijkdvx1l54qpvi8bmvxjnzsm7mk"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix index b8543841a7ff32b9b7a583dfea05ed6050d652b6..46b90a52a0913ec3c08e2624f2b3524a36386749 100644 --- a/pkgs/applications/editors/emacs-modes/org-packages.nix +++ b/pkgs/applications/editors/emacs-modes/org-packages.nix @@ -11,7 +11,7 @@ To update the list of packages from ELPA, */ -{ fetchurl, lib, stdenv, texinfo }: +{ }: self: @@ -23,12 +23,6 @@ self: super = imported; - markBroken = pkg: pkg.override { - elpaBuild = args: self.elpaBuild (args // { - meta = (args.meta or {}) // { broken = true; }; - }); - }; - overrides = { }; diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 1189fd1d6d15020c4070ee3f368cddcebdc9f94a..99ecddcb26481972076032c2f60d9e5e80bb3c6d 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, emacs, texinfo, which, texlive }: +{ fetchurl, stdenv, emacs, texinfo, texlive }: stdenv.mkDerivation rec { name = "org-8.3.3"; diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix index f82d467066a63af6f35f55aebfcc3928b72c87f6..7867226ff8063ea5a960c666faa4fd3627b9dad3 100644 --- a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix +++ b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An Emacs mode for editing Scala code"; - homepage = http://www.scala-lang.org/node/354; + homepage = https://www.scala-lang.org/node/354; # non-copyleft, BSD-style license = "permissive"; diff --git a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix index b09b6dd0e4d9dd27a6ddc5f4ad2290d07d44d78c..820919b5321f9ae548cf1b4b36a830fbe2bfb8be 100644 --- a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix +++ b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, melpaBuild }: +{ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; @@ -10,7 +10,7 @@ melpaBuild { name = "thingatpt+.el"; }; - recipeFile = fetchurl { + recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa"; name = "thingatpt-plus"; diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix new file mode 100644 index 0000000000000000000000000000000000000000..ee21bbbd9bd9a94b6d1fc12438f1d21ebbb90ee3 --- /dev/null +++ b/pkgs/applications/editors/emacs/25.nix @@ -0,0 +1,136 @@ +{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d +, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif +, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux +, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO +, withX ? !stdenv.isDarwin +, withGTK2 ? false, gtk2 ? null +, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null +, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null +, withCsrc ? true +, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null +}: + +assert (libXft != null) -> libpng != null; # probably a bug +assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise +assert withGTK2 -> withX || stdenv.isDarwin; +assert withGTK3 -> withX || stdenv.isDarwin; +assert withGTK2 -> !withGTK3 && gtk2 != null; +assert withGTK3 -> !withGTK2 && gtk3 != null; +assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null; + +let + toolkit = + if withGTK2 then "gtk2" + else if withGTK3 then "gtk3" + else "lucid"; +in +stdenv.mkDerivation rec { + name = "emacs-${version}${versionModifier}"; + version = "25.3"; + versionModifier = ""; + + src = fetchurl { + url = "mirror://gnu/emacs/${name}.tar.xz"; + sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"; + }; + + enableParallelBuilding = true; + + patches = lib.optionals stdenv.isDarwin [ + ./at-fdcwd.patch + + # Backport of the fix to + # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html + # Should be removed when switching to Emacs 26.1 + (fetchurl { + url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch"; + sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj"; + }) + ]; + + nativeBuildInputs = [ pkgconfig ] + ++ lib.optionals srcRepo [ autoconf automake texinfo ] + ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; + + buildInputs = + [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] + ++ lib.optionals stdenv.isLinux [ dbus libselinux ] + ++ lib.optionals withX + [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft + imagemagick gconf ] + ++ lib.optional (withX && withGTK2) gtk2 + ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] + ++ lib.optional (stdenv.isDarwin && withX) cairo + ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]; + + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; + + hardeningDisable = [ "format" ]; + + configureFlags = [ "--with-modules" ] ++ + (if stdenv.isDarwin + then [ "--with-ns" "--disable-ns-self-contained" ] + else if withX + then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] + else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" + "--with-gif=no" "--with-tiff=no" ]) + ++ lib.optional withXwidgets "--with-xwidgets"; + + preConfigure = lib.optionalString srcRepo '' + ./autogen.sh + '' + '' + substituteInPlace lisp/international/mule-cmds.el \ + --replace /usr/share/locale ${gettext}/share/locale + + for makefile_in in $(find . -name Makefile.in -print); do + substituteInPlace $makefile_in --replace /bin/pwd pwd + done + ''; + + installTargets = "tags install"; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp + cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el + $out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el + + rm -rf $out/var + rm -rf $out/share/emacs/${version}/site-lisp + '' + lib.optionalString withCsrc '' + for srcdir in src lisp lwlib ; do + dstdir=$out/share/emacs/${version}/$srcdir + mkdir -p $dstdir + find $srcdir -name "*.[chm]" -exec cp {} $dstdir \; + cp $srcdir/TAGS $dstdir + echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el + done + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv nextstep/Emacs.app $out/Applications + ''; + + meta = with stdenv.lib; { + description = "The extensible, customizable GNU text editor"; + homepage = http://www.gnu.org/software/emacs/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; + platforms = platforms.all; + + longDescription = '' + GNU Emacs is an extensible, customizable text editor—and more. At its + core is an interpreter for Emacs Lisp, a dialect of the Lisp + programming language with extensions to support text editing. + + The features of GNU Emacs include: content-sensitive editing modes, + including syntax coloring, for a wide variety of file types including + plain text, source code, and HTML; complete built-in documentation, + including a tutorial for new users; full Unicode support for nearly all + human languages and their scripts; highly customizable, using Emacs + Lisp code or a graphical interface; a large number of extensions that + add other functionality, including a project planner, mail and news + reader, debugger interface, calendar, and more. Many of these + extensions are distributed with GNU Emacs; others are available + separately. + ''; + }; +} diff --git a/pkgs/applications/editors/emacs/clean-env.patch b/pkgs/applications/editors/emacs/clean-env.patch index f80efeeef706b1779ca4f07dbcc9e865d750190a..7b4cb9d52667154bfb6e98713eb2a12ebd4e1426 100644 --- a/pkgs/applications/editors/emacs/clean-env.patch +++ b/pkgs/applications/editors/emacs/clean-env.patch @@ -8,8 +8,8 @@ diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in ifeq ($(CANNOT_DUMP),yes) ln -f temacs$(EXEEXT) $@ else -- LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump -+ env -i LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump +- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump ++ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump ifneq ($(PAXCTL_dumped),) $(PAXCTL_dumped) $@ endif diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index ba243629cc3e320bfd506d53d5f45056483037ad..0a304fabe60037b7799d66e7d64e56d645714d4e 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,11 +1,12 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO +, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf +, systemd ? null , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null -, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null +, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null }: @@ -16,7 +17,7 @@ assert withGTK2 -> withX || stdenv.isDarwin; assert withGTK3 -> withX || stdenv.isDarwin; assert withGTK2 -> !withGTK3 && gtk2 != null; assert withGTK3 -> !withGTK2 && gtk3 != null; -assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null; +assert withXwidgets -> withGTK3 && webkitgtk != null; let toolkit = @@ -26,44 +27,40 @@ let in stdenv.mkDerivation rec { name = "emacs-${version}${versionModifier}"; - version = "25.3"; + version = "26.1"; versionModifier = ""; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"; + sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"; }; enableParallelBuilding = true; patches = [ ./clean-env.patch - ] ++ lib.optionals stdenv.isDarwin [ - ./at-fdcwd.patch - - # Backport of the fix to - # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html - # Should be removed when switching to Emacs 26.1 - (fetchurl { - url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch"; - sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj"; - }) ]; + postPatch = lib.optionalString srcRepo '' + rm -fr .git + ''; + + CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200"; + nativeBuildInputs = [ pkgconfig ] ++ lib.optionals srcRepo [ autoconf automake texinfo ] ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; buildInputs = [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] - ++ lib.optionals stdenv.isLinux [ dbus libselinux ] + ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft - imagemagick gconf ] + imagemagick gconf m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2 ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 70c723b40dae4ac3e0300ebaf68beb70100b3841..8f74aca44885f856c07d42638878f7b50985c0bf 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -4,35 +4,35 @@ }: stdenv.mkDerivation rec { - emacsVersion = "25.3"; + emacsVersion = "26.1"; emacsName = "emacs-${emacsVersion}"; - macportVersion = "6.8"; + macportVersion = "7.1"; name = "emacs-mac-${emacsVersion}-${macportVersion}"; builder = ./builder.sh; src = fetchurl { - url = "mirror:///gnu/emacs/${emacsName}.tar.xz"; - sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"; + url = "mirror://gnu/emacs/${emacsName}.tar.xz"; + sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "167lgl76jz1bq6whb9ajshhw5v9bbw9ci4lji4qlmd5nrwnb7kqg"; + sha256 = "0d2ny54f68v3hjc2g3pkj83xv3yzv0hrwvn2cmpyb0jxjbsb2frc"; }; hiresSrc = fetchurl { - url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-hires-icons-2.0.tar.gz"; - sha256 = "1ari8n3y1d4hdl9npg3c3hk27x7cfkwfgyhgzn1vlqkrdah4z434"; + url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-hires-icons-3.0.tar.gz"; + sha256 = "0f2wzdw2a3ac581322b2y79rlj3c9f33ddrq9allj97r1si6v5xk"; }; + patches = [ ./clean-env.patch ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig autoconf automake ]; - buildInputs = [ ncurses libxml2 gnutls texinfo gettext ]; - - propagatedBuildInputs = [ + buildInputs = [ ncurses libxml2 gnutls texinfo gettext AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO # may be optional ]; @@ -75,10 +75,10 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - description = "GNU Emacs 25, the extensible, customizable text editor"; + description = "The extensible, customizable text editor"; homepage = http://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with maintainers; [ jwiegley matthewbauer ]; platforms = platforms.darwin; longDescription = '' @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { extensions are distributed with GNU Emacs; others are available separately. - This is "Mac port" addition to GNU Emacs 25. This provides a native + This is the "Mac port" addition to GNU Emacs 26. This provides a native GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later already contain the official GUI support via the NS (Cocoa) port for Mac OS X 10.4 and later. So if it is good enough for you, then you diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 0e4a6a5bf207f416ef399be3345a3e05582fa11c..706f2f015b12d526fe55669bb88115cb99670caa 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.6.11"; + version = "1.6.15"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "0izbsm2vx24pnd92gf7ky8x47g324a8d16hy1s8kk3x1inxd80z1"; + sha256 = "0afs9cm5q7zxag28m427ycwwxkbn47zw7v111x7963ydqyn9gr9q"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 23478758efe5773e9d47ea97d2d57c888643fc9c..24954a602cccbdd77bd9c3773e14f3fe57db32d8 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }: +{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl, hicolor-icon-theme }: with stdenv.lib; @@ -10,14 +10,12 @@ stdenv.mkDerivation rec { name = "geany-${version}"; src = fetchurl { - url = "http://download.geany.org/${name}.tar.bz2"; + url = "https://download.geany.org/${name}.tar.bz2"; sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2"; }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - - nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gtk2 which file ]; + nativeBuildInputs = [ pkgconfig intltool libintl ]; + buildInputs = [ gtk2 which file hicolor-icon-theme ]; doCheck = true; @@ -25,10 +23,6 @@ stdenv.mkDerivation rec { patchPhase = "patchShebangs ."; - # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command - # It have no reasons to exist in a redistribuable package - postInstall = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { description = "Small and lightweight IDE"; longDescription = '' @@ -51,7 +45,7 @@ stdenv.mkDerivation rec { - Plugin interface ''; homepage = https://www.geany.org/; - license = "GPL"; + license = licenses.gpl2; maintainers = []; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix index 7689ebad0f01823ee382122108ffae4eb5089d0e..ac35560c7f639453331798052e5f4563089961a4 100644 --- a/pkgs/applications/editors/geany/with-vte.nix +++ b/pkgs/applications/editors/geany/with-vte.nix @@ -1,7 +1,7 @@ { runCommand, makeWrapper, geany, gnome2 }: let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name; in -runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; } " +runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } " mkdir -p $out ln -s ${geany}/share $out makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 491fc0ca2a8dd7fd81d2cb7375564a917975d336..36259593463d697d6ed33f1638c8f044c490cf3c 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ghostwriter"; - version = "1.5.0"; + version = "1.7.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = "v${version}"; - sha256 = "0ixw2w2526836lwj4pc0vp7prp1gls7iq37v8m9ql1508b33b9pq"; + sha256 = "1xkxd59rw2dn6xphgcl06zzmfgs1zna2w0pxrk0f49ywffvkvs72"; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..db2d07db31e771c91a687163c92bc676e9b3e4e6 --- /dev/null +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -0,0 +1,155 @@ +{ stdenv +, desktop-file-utils +, docbook_xsl +, docbook_xml_dtd_43 +, fetchpatch +, fetchurl +, flatpak +, glibcLocales +, gnome3 +, gobjectIntrospection +, gspell +, gtk-doc +, gtk3 +, gtksourceview3 +, hicolor-icon-theme +, json-glib +, jsonrpc-glib +, libdazzle +, libxml2 +, meson +, ninja +, ostree +, pcre +, pkgconfig +, python3 +, sysprof +, template-glib +, vala +, webkitgtk +, wrapGAppsHook +}: +let + version = "3.28.4"; + pname = "gnome-builder"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz"; + sha256 = "0ibb74jlyrl5f6rj1b74196zfg2qaf870lxgi76qzpkgwq0iya05"; + }; + + nativeBuildInputs = [ + #appstream-glib # tests fail if these tools are available + desktop-file-utils + docbook_xsl + docbook_xml_dtd_43 + glibcLocales # for Meson's gtkdochelper + gobjectIntrospection + gtk-doc + hicolor-icon-theme + meson + ninja + pkgconfig + python3.pkgs.wrapPython + wrapGAppsHook + ]; + + buildInputs = [ + flatpak + gnome3.devhelp + gnome3.libgit2-glib + gnome3.libpeas + gnome3.vte + gspell + gtk3 + gtksourceview3 + json-glib + jsonrpc-glib + libdazzle + libxml2 + ostree + pcre + python3 + sysprof + template-glib + vala + webkitgtk + ]; + + outputs = [ "out" "devdoc" ]; + + prePatch = '' + patchShebangs build-aux/meson/post_install.py + ''; + + patches = [ + (fetchpatch { + name = "absolute-shared-library-path.patch"; + url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/1011cabc519fd7322e2d695c79bfce3e18ff6200.patch"; + sha256 = "1g12zziidzrphp527aa8sklfaln4qpjprkz73f0c9w5ph6k252fw"; + }) + (fetchpatch { + name = "python-libprefix.patch"; + url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/43494ce83a347f369ed4cfb8dd71d3b93452736b.patch"; + sha256 = "0kgi3n3g13n1j4xa61ln9xiahcfdc43bxi5mw4yva2d5px445msf"; + }) + (fetchpatch { + name = "ostree-dependency.patch"; + url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/8b11773b65c95f464a0de16b91318c1ca73deeae.patch"; + sha256 = "18r4hd90id0w6r0lzqpw83bcj45nm9jhr46a0ffi1mcayb18mgbk"; + }) + ]; + + mesonFlags = [ + "-Dpython_libprefix=${python3.libPrefix}" + "-Dwith_docs=true" + + # Making the build system correctly detect clang header and library paths + # is difficult. Somebody should look into fixing this. + "-Dwith_clang=false" + ]; + + # Some tests fail due to being unable to find the Vte typelib, and I don't + # understand why. Somebody should look into fixing this. + doCheck = false; + + preInstall = '' + export LC_ALL="en_US.utf-8" + ''; + + pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ]; + + preFixup = '' + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$program_PYTHONPATH" + ) + + # Ensure that all plugins get their interpreter paths fixed up. + find $out/lib -name \*.py -type f -print0 | while read -d "" f; do + chmod a+x "$f" + done + ''; + + passthru.updateScript = gnome3.updateScript { packageName = pname; }; + + meta = with stdenv.lib; { + description = "An IDE for writing GNOME-based software"; + longDescription = '' + Global search, auto-completion, source code map, documentation + reference, and other features expected in an IDE, but with a focus + on streamlining GNOME-based development projects. + + This package does not pull in the dependencies needed for every + plugin. If you find that a plugin you wish to use doesn't work, we + currently recommend running gnome-builder inside a nix-shell with + appropriate dependencies loaded. + ''; + homepage = https://wiki.gnome.org/Apps/Builder; + license = licenses.gpl3Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..055ac050b541b34210dbb2c853fc40864193988e --- /dev/null +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, wrapGAppsHook +, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: +let + version = "3.30.1"; + pname = "gnome-latex"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0yvkp311ikmiypzj2q6ypvyw5migxiqp8lwhyl3qq6mk6p0x66w8"; + }; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + configureFlags = ["--disable-dconf-migration"]; + + nativeBuildInputs = [ + pkgconfig + wrapGAppsHook + itstool + intltool + ]; + + buildInputs = with gnome3; [ + amtk + defaultIconTheme + glib + gsettings-desktop-schemas + gspell + gtksourceview4 + libgee + libxml2 + tepl + ]; + + doCheck = true; + + passthru.updateScript = gnome3.updateScript { packageName = pname; }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/GNOME-LaTeX; + description = "A LaTeX editor for the GNOME desktop"; + maintainers = [ maintainers.manveru ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index de1e5e4c64bce4710a987fb7fc62559b476e94ed..e59def88de55d7e84607b5dd57a1246a201e2e38 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,26 +1,22 @@ { avahiSupport ? false # build support for Avahi in libinfinity -, gnomeSupport ? false # build support for Gnome(gnome-vfs) -, stdenv, fetchurl, pkgconfig -, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool -, gnome_vfs ? null}: +, stdenv, fetchurl, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook +, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; - in stdenv.mkDerivation rec { - - name = "gobby-0.5.0"; - src = fetchurl { - url = "http://releases.0x539.de/gobby/${name}.tar.gz"; - sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; + name = "gobby-unstable-2018-04-03"; + src = fetchFromGitHub { + owner = "gobby"; + repo = "gobby"; + rev = "ea4df27c9b6b885434797b0071ce198b23f9f63b"; + sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] - ++ stdenv.lib.optional gnomeSupport gnome_vfs; - - configureFlags = '' - ''; + nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool gnome3.yelp-tools wrapGAppsHook ]; + buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ]; + + preConfigure = "./autogen.sh"; meta = with stdenv.lib; { homepage = http://gobby.0x539.de/; diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 7715de153981d9ad241fa0fec77e8f6151ebcc3d..04de4f564c3382e2f784c234863d1c4bb96aa263 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip -, coreutils, gnugrep, which, git, python, unzip, libsecret +{ stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip +, coreutils, gnugrep, which, git, unzip, libsecret }: -{ name, product, version, src, wmClass, jdk, meta } @ attrs: +{ name, product, version, src, wmClass, jdk, meta }: with stdenv.lib; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3c55743882362c2f6f2af1298f648495bd08e1cb..b46dddfc73e981fdb67eef0633d0e02b3ff4d314 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,10 +1,8 @@ -{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf -, coreutils, gnugrep, which, git, python, unzip, p7zip -, androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses +{ lib, stdenv, callPackage, fetchurl +, python +, jdk, cmake, libxml2, zlib, python3, ncurses }: -assert stdenv.isLinux; - with stdenv.lib; let @@ -12,7 +10,7 @@ let # Sorted alphabetically - buildClion = { name, version, src, license, description, wmClass, update-channel }: + buildClion = { name, version, src, license, description, wmClass, ... }: lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "CLion"; @@ -31,36 +29,48 @@ let ( cd $out/clion-${version} # bundled cmake does not find libc - rm -rf bin/cmake - ln -s ${cmake} bin/cmake + rm -rf bin/cmake/linux + ln -s ${cmake} bin/cmake/linux - lldbLibPath=$out/clion-${version}/bin/lldb/lib + lldbLibPath=$out/clion-${version}/bin/lldb/linux/lib interp="$(cat $NIX_CC/nix-support/dynamic-linker)" ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5 patchelf --set-interpreter $interp \ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \ - bin/lldb/bin/lldb-server + bin/lldb/linux/bin/lldb-server for i in LLDBFrontend lldb lldb-argdumper; do patchelf --set-interpreter $interp \ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \ - "bin/lldb/bin/$i" + "bin/lldb/linux/bin/$i" done patchelf \ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \ - bin/lldb/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so + bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so patchelf \ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \ - bin/lldb/lib/liblldb.so + bin/lldb/linux/lib/liblldb.so + + gdbLibPath=$out/clion-${version}/bin/gdb/linux/lib + patchelf \ + --set-rpath "$gdbLibPath" \ + bin/gdb/linux/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so + patchelf --set-interpreter $interp \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$gdbLibPath" \ + bin/gdb/linux/bin/gdb + patchelf --set-interpreter $interp \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$gdbLibPath" \ + bin/gdb/linux/bin/gdbserver - patchelf --set-interpreter $interp bin/gdb/bin/gdb - patchelf --set-interpreter $interp bin/gdb/bin/gdbserver patchelf --set-interpreter $interp \ - --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$lldbLibPath" \ - bin/clang/clang-tidy + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + bin/clang/linux/clangd + patchelf --set-interpreter $interp \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \ + bin/clang/linux/clang-tidy wrapProgram $out/bin/clion \ --set CL_JDK "${jdk}" @@ -68,7 +78,7 @@ let ''; }); - buildDataGrip = { name, version, src, license, description, wmClass, update-channel }: + buildDataGrip = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "DataGrip"; @@ -85,7 +95,7 @@ let }; }); - buildGoland = { name, version, src, license, description, wmClass, update-channel }: + buildGoland = { name, version, src, license, description, wmClass, ... }: lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Goland"; @@ -104,13 +114,13 @@ let }) (attrs: { postFixup = (attrs.postFixup or "") + '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv - chmod +x $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + chmod +x $out/goland*/plugins/go/lib/dlv/linux/dlv ''; }); - buildIdea = { name, version, src, license, description, wmClass, update-channel }: + buildIdea = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "IDEA"; @@ -127,7 +137,7 @@ let }; }); - buildPhpStorm = { name, version, src, license, description, wmClass, update-channel }: + buildPhpStorm = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "PhpStorm"; @@ -144,7 +154,7 @@ let }; }); - buildPycharm = { name, version, src, license, description, wmClass, update-channel }: + buildPycharm = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "PyCharm"; @@ -171,7 +181,7 @@ let propagatedUserEnvPkgs = [ python ]; }; - buildRider = { name, version, src, license, description, wmClass, update-channel }: + buildRider = { name, version, src, license, description, wmClass, ... }: lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "Rider"; @@ -197,7 +207,7 @@ let ''; }); - buildRubyMine = { name, version, src, license, description, wmClass, update-channel }: + buildRubyMine = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "RubyMine"; @@ -210,7 +220,7 @@ let }; }); - buildWebStorm = { name, version, src, license, description, wmClass, update-channel }: + buildWebStorm = { name, version, src, license, description, wmClass, ... }: lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; @@ -239,145 +249,145 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1yxjvsp89mkk7gghbz5lqh7bbqi6l1ihg876c60bhqg0f5m98zcg"; /* updated by script */ + sha256 = "1wjrki0awjyjmv7hh5rkhbpx40yqjssgh4nv61fvg189aric4rzj"; /* updated by script */ }; wmClass = "jetbrains-clion"; - update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml + update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml }; datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2017.3.7"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1pmkv1yd8xwqa4kdffg0vvk3whmnvrs9js7vnq4ilm39zzksqmpa"; /* updated by script */ + sha256 = "0sfcl6bcq5hzwx1fdn8zfyl4qqjcmjmzwspa7v7niyqhbj5zdba9"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; - update-channel = "datagrip_2017_3"; + update-channel = "DataGrip 2018.2"; }; goland = buildGoland rec { name = "goland-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "073wwhg58hkd8w4jazvwngl78gbhnmilm63jhpirr98jk7i7a4mq"; /* updated by script */ + sha256 = "0k96v00cbxkgxs9xby5m4dxl4w2kkm2lii54z1hqjwqmc9kxa2ia"; /* updated by script */ }; wmClass = "jetbrains-goland"; - update-channel = "goland_release"; + update-channel = "GoLand Release"; }; idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "124rzc46f4bqyhllwyb26lkavh7zwbj62axrwhif34rayl2rcmpm"; /* updated by script */ + sha256 = "1495zkccss1bkh803p6065nypqj72zra9dbnlx3iz4kkbawr7j15"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; - update-channel = "IDEA_Release"; + update-channel = "IntelliJ IDEA Release"; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "10r3z37mhr8daxi14k011bhx3pxpx3lsj7jvikwll4wjlv1znhiw"; /* updated by script */ + sha256 = "04jzsmnfmxxf264dla6scshk576z8w8sv78mpzb2mc1ndwviwflx"; /* updated by script */ }; wmClass = "jetbrains-idea"; - update-channel = "IDEA_Release"; + update-channel = "IntelliJ IDEA Release"; }; phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1mcq8n7rd074aghmiyqf1yg3qvs28w97kk4dygj2a46y3s1ha4cd"; /* updated by script */ + sha256 = "1sjxavkfjg4g9rgjqjjb9d6wg53dwfs8n65w3qbp87c7x3pl006r"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; - update-channel = "PS2017.3"; + update-channel = "PhpStorm 2018.2"; }; pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "027w73qrrj7aml2kdj3sx890q7jyj2jfnsg0pivi7i4kh8i11204"; /* updated by script */ + sha256 = "0nq4xwqczppdrswi826yzjdzqpiwl4iyi70d7g6ncqd9wyiay4z4"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; - update-channel = "PyCharm_Release"; + update-channel = "PyCharm Release"; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0040ryx7kj64vwc10gvns43f1c97dvrgnwlmdm1m1506ldvaw0si"; /* updated by script */ + sha256 = "1cf8z1wb532qhxlf0z4d791x084drfxzlaxq28hzy4f450bqbkp7"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; - update-channel = "PyCharm_Release"; + update-channel = "PyCharm Release"; }; rider = buildRider rec { name = "rider-${version}"; - version = "2017.3.1"; /* updated by script */ + version = "2018.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0k9yc00lmk826pylfs9jyxqnlczk9vhq7bs61b8nyfam1dqbgikv"; /* updated by script */ + url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; + sha256 = "0yigw9g53i6xamwva8vcd38f0aysxqkf77avms4l7l63dkap99nq"; /* updated by script */ }; wmClass = "jetbrains-rider"; - update-channel = "rider_2017_3"; + update-channel = "Rider 2018.2"; }; ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1b0y8pcg8wwprm1swrl4laajnmx2c359bi7ahsyfjfprlzwx7wck"; /* updated by script */ + sha256 = "1gwcadjgs4cw5i3h1xn92ng415vzr5cxyrpgckr1qy37d5f4bhqg"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; - update-channel = "rm2017.3"; + update-channel = "RubyMine 2018.2"; }; webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2018.2.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "123v4m8p7acndj8p8frn1bjvycijlx904pa84ka9pv18c90qiym9"; /* updated by script */ + sha256 = "1a31q7wrg4ihap8j6n2cg98ml1zic78drkrp0p554rgsnh7v4hwr"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; - update-channel = "WS_Release"; + update-channel = "WebStorm Release"; }; } diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl index a0479fc911250c1baf5868210864511e53547b85..b4a96228db40dedba055ae280623de34df45566b 100755 --- a/pkgs/applications/editors/jetbrains/update.pl +++ b/pkgs/applications/editors/jetbrains/update.pl @@ -17,7 +17,7 @@ sub get_latest_versions { my @channels = get("http://www.jetbrains.com/updates/updates.xml") =~ /()/gs; my %h = {}; for my $ch (@channels) { - my ($id) = $ch =~ /^)/gs; my $latest_build = reduce { my ($aversion) = $a =~ /^]*version="([^"]+)"/; die "no version in $a" unless $aversion; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index c24866671f9bae326d8e035dc01c9c365e51eb96..08918beb8d5921cf3c26edd5bf9797fae56f50e3 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,7 +1,7 @@ -{ config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx, +{ stdenv, fetchgit, gnome3, at-spi2-core, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, - coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }: + coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: with stdenv.lib; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ - dbus_libs + dbus openssl libxml2 gnome3.gtksourceview diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix index 14fdcce1c8e583cf9476d8526bf61abf0fd45918..5e6406e33f286679ee590d67307348a8e6e1cc0c 100644 --- a/pkgs/applications/editors/jupp/default.nix +++ b/pkgs/applications/editors/jupp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz" - "http://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ]; + "https://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ]; sha256 = "1fnf9jsd6p4jyybkhjjs328qx38ywy8w029ngc7j7kqp0ixn0l0s"; }; diff --git a/pkgs/applications/editors/jupyter/default.nix b/pkgs/applications/editors/jupyter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2bca120c1debc04703cdd8717e5edee1ef571e05 --- /dev/null +++ b/pkgs/applications/editors/jupyter/default.nix @@ -0,0 +1,18 @@ +# Jupyter notebook with the given kernel definitions + +{ python3 +, jupyter-kernel +, definitions ? jupyter-kernel.default +}: + +let + + jupyterPath = (jupyter-kernel.create { inherit definitions; }); + +in + +with python3.pkgs; toPythonModule ( + notebook.overridePythonAttrs(oldAttrs: { + makeWrapperArgs = ["--set JUPYTER_PATH ${jupyterPath}"]; + }) +) diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix new file mode 100644 index 0000000000000000000000000000000000000000..cdb6b6212bd38cc0483e2eed449fef340157229d --- /dev/null +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -0,0 +1,74 @@ +{ lib, stdenv, python3}: + +let + + default = { + python3 = let + env = (python3.withPackages (ps: with ps; [ ipykernel ])); + in { + displayName = "Python 3"; + argv = [ + "${env.interpreter}" + "-m" + "ipykernel_launcher" + "-f" + "{connection_file}" + ]; + language = "python"; + logo32 = "${env.sitePackages}/ipykernel/resources/logo-32x32.png"; + logo64 = "${env.sitePackages}/ipykernel/resources/logo-64x64.png"; + }; + }; + +in +{ + inherit default; + + # Definitions is an attribute set. + + create = { definitions ? default }: with lib; stdenv.mkDerivation rec { + + name = "jupyter-kernels"; + + src = "/dev/null"; + + unpackCmd = "mkdir jupyter_kernels"; + + installPhase = '' + mkdir kernels + + ${concatStringsSep "\n" (mapAttrsToList (kernelName: kernel: + let + config = builtins.toJSON { + display_name = if (kernel.displayName != "") + then kernel.displayName + else kernelName; + argv = kernel.argv; + language = kernel.language; + }; + logo32 = + if (kernel.logo32 != null) + then "ln -s ${kernel.logo32} 'kernels/${kernelName}/logo-32x32.png';" + else ""; + logo64 = + if (kernel.logo64 != null) + then "ln -s ${kernel.logo64} 'kernels/${kernelName}/logo-64x64.png';" + else ""; + in '' + mkdir 'kernels/${kernelName}'; + echo '${config}' > 'kernels/${kernelName}/kernel.json'; + ${logo32} + ${logo64} + '') definitions)} + + mkdir $out + cp -r kernels $out + ''; + + meta = { + description = "Wrapper to create jupyter notebook kernel definitions"; + homepage = http://jupyter.org/; + maintainers = with maintainers; [ aborsu ]; + }; + }; +} diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 868dfaf3d12a9d54847157fce650ccad968250be..ad408081e1fd0b77517ae432ffb8a87f64b1192b 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt, pkgconfig }: +{ stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkgconfig }: with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-unstable-${version}"; - version = "2018-03-22"; + version = "2018-08-05"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "f8e297acef1be0657b779fea5256f606a6c6a3a3"; - sha256 = "14xmw3lkwzppm9bns55nmyb1lfihzhdyisf6xjqlszdj4mcf94jl"; + rev = "ae75032936ed9ffa2bf14589fef115d3d684a7c6"; + sha256 = "1qm6i8vzr4wjxxdvhr54pan0ysxq1sn880bz8p2w9y6qa91yd3m3"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; + makeFlags = [ "debug=no" ]; postPatch = '' export PREFIX=$out diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 41d1a6262ed594a3263b3ffc597d930f7fb84e84..f0ac79e2d22c021d5b5f9b81debda72cc3cebc12 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -1,23 +1,23 @@ { mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules -, qtquickcontrols, qtwebkit, qttools, kde-cli-tools +, qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons -, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared-mime-info -, libksysguard, konsole, llvmPackages, makeWrapper +, plasma-framework, krunner, kdevelop-pg-qt, shared-mime-info, libkomparediff2 +, libksysguard, konsole, llvmPackages, makeWrapper, kpurpose, boost }: let pname = "kdevelop"; - version = "5.1.2"; - + version = "5.2.4"; + qtVersion = "5.${lib.versions.minor qtbase.version}"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "af54e807847d145fe5f3eb55962ed0d22e6363c2bc6c32167e51ca4823c00ac7"; + sha256 = "1jbks7nh9rybz4kg152l39hfj2x0p6mjins8x9mz03bbv8jf8gic"; }; nativeBuildInputs = [ @@ -30,20 +30,22 @@ mkDerivation rec { ]; propagatedBuildInputs = [ - qtquickcontrols qtwebkit + qtquickcontrols qtwebkit boost libkomparediff2 kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner - kdevplatform shared-mime-info libksysguard konsole kcrash karchive kguiaddons + shared-mime-info libksysguard konsole kcrash karchive kguiaddons kpurpose ]; postInstall = '' # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. - wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}" + wrapProgram "$out/bin/kdevelop!" \ + --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}" + + wrapProgram "$out/bin/kdevelop" \ + --prefix QT_PLUGIN_PATH : $out/lib/qt-${qtVersion}/plugins # Fix the (now wrapped) kdevelop! to find things in right places: - # - Make KDEV_BASEDIR point to bin directory of kdevplatform. - kdev_fixup_sed="s|^export KDEV_BASEDIR=.*$|export KDEV_BASEDIR=${kdevplatform}/bin|" # - Fixup the one use where KDEV_BASEDIR is assumed to contain kdevelop. kdev_fixup_sed+=";s|\\\$KDEV_BASEDIR/kdevelop|$out/bin/kdevelop|" sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped" diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix deleted file mode 100644 index 88164c2c4585176986c747255a2e74d1b0e9e2e0..0000000000000000000000000000000000000000 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules -, boost, subversion, apr, aprutil, kwindowsystem -, qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n -, kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications -, knotifyconfig, ktexteditor, threadweaver, kdeclarative, libkomparediff2 }: - -let - pname = "kdevplatform"; - version = "5.1.2"; - -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz"; - sha256 = "e622ddad552a678baaf1166d5cbdc5fd1192d2324300c52ef2d25f1c6778664a"; - }; - - nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ]; - - buildInputs = [ - boost subversion apr aprutil kwindowsystem - qtscript qtwebkit grantlee karchive kconfig kcoreaddons kguiaddons kiconthemes - ki18n kitemmodels kitemviews kio kparts sonnet kcmutils knewstuff - knotifications knotifyconfig ktexteditor threadweaver kdeclarative - libkomparediff2 - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - maintainers = [ maintainers.ambrop72 ]; - platforms = platforms.linux; - description = "KDE libraries for IDE-like programs"; - longDescription = '' - A free, opensource set of libraries that can be used as a foundation for - IDE-like programs. It is programing-language independent, and is planned - to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc." - ''; - homepage = https://www.kdevelop.org; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; - }; -} diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index b03abc2146aaab2c8bc36637e12d1bd0d4c2f1aa..4e22e032e357ffe8e2bd65e6e1dadeecae8cd85c 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper +{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , # Patchelf dependencies: alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined , openssl, xorg, zlib diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index c5f8278f649d9f66818a79bb2c95d3d83a853473..dfd6543c5985375f3d4b9e230d3a3c3644a7d380 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify +, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss - fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr xorg.libXcursor diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index fc27e4a00f7e743eb0e744b478d3b87060e5df79..815af2103d58be17bc239468d5f65559395df198 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -1,11 +1,11 @@ { stdenv, zlib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "manuskript"; + pname = "manuskript"; version = "0.3.0"; src = fetchFromGitHub { - repo = name; + repo = pname; owner = "olivierkes"; rev = version; sha256 = "0bqxc4a8kyi6xz1zs0dp85wxl9h4v8lzc6073bbcsn1zg4y59ys7"; @@ -19,15 +19,15 @@ python3Packages.buildPythonApplication rec { patchPhase = '' substituteInPlace manuskript/ui/welcome.py \ - --replace sample-projects $out/share/${name}/sample-projects + --replace sample-projects $out/share/${pname}/sample-projects ''; buildPhase = ''''; installPhase = '' - mkdir -p $out/share/${name} + mkdir -p $out/share/${pname} cp -av bin/ i18n/ libs/ manuskript/ resources/ icons/ $out - cp -r sample-projects/ $out/share/${name} + cp -r sample-projects/ $out/share/${pname} ''; doCheck = false; diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index f1c1e3dcac70bd91618b148051cf0fa905748a79..fab3646efdff7f9d5ec2ae1c32b67936332dcab4 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "micro-${version}"; - version = "1.4.0"; + version = "1.4.1"; goPackagePath = "github.com/zyedidia/micro"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "zyedidia"; repo = "micro"; rev = "v${version}"; - sha256 = "0w1rmh81h28n1jlb05k89i751h498i6p883hrsjr70hvrwq5zjpb"; + sha256 = "0m9p6smb5grdazsgr3m1x4rry9ihhlgl9ildhvfp53czrifbx0m5"; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index 751b78ab674ba565394bcb6d4a339c04dc8a6531..764877a11cb34fa03b2600ea1c5087b60e949476 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/moe/; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } # TODO: a configurable, global moerc file diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index e8e529b63abcf657ae4b679fdb38a581e0ba3ffc..69e102f207750f03ecf421543e34fa97a3807404 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, fetchNuGet +{ stdenv, fetchurl , autoconf, automake, pkgconfig, shared-mime-info, intltool , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "monodevelop-${version}"; src = fetchurl { - url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/monodevelop/${name}.tar.bz2"; sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji"; }; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 9ff1c44dceb074f9eb861db7a552f396bfb1451f..64b8e48b2881ccde9afaf147b6cbd164af4ed829 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, fetchFromGitHub +{ stdenv, fetchurl, fetchFromGitHub , ncurses , texinfo , gettext ? null @@ -14,17 +14,17 @@ let nixSyntaxHighlight = fetchFromGitHub { owner = "seitz"; repo = "nanonix"; - rev = "17e0de65e1cbba3d6baa82deaefa853b41f5c161"; - sha256 = "1g51h65i31andfs2fbp1v3vih9405iknqn11fzywjxji00kjqv5s"; + rev = "7483fd8b79f1f3f2179dbbd46aa400df4320ba10"; + sha256 = "10pv75kfrgnziz8sr83hdbb0c3klm2fmsdw3i5cpqqf5va1fzb8h"; }; in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.4"; + version = "2.9.8"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "0nm3zy4azr5rkxjq7jfybbj3cnddmvxc49rxyqm9cp2zfdp75y9c"; + sha256 = "122lm0z97wk3mgnbn8m4d769d4j9rxyc9z7s89xd4gsdp8qsrpn2"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; @@ -32,11 +32,11 @@ in stdenv.mkDerivation rec { outputs = [ "out" "info" ]; - configureFlags = '' - --sysconfdir=/etc - ${optionalString (!enableNls) "--disable-nls"} - ${optionalString enableTiny "--enable-tiny"} - ''; + configureFlags = [ + "--sysconfdir=/etc" + (stdenv.lib.enableFeature enableNls "nls") + (stdenv.lib.enableFeature enableTiny "tiny") + ]; postInstall = '' cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index 7feb7f22e222b1822d769b5296c88e3fb828f602..a24fb90ed9c7e75aa7f12400f9d4694110e622f4 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "ne-${version}"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "vigna"; repo = "ne"; rev = version; - sha256 = "05inzhlqlf4ka22q78q389pr34bsb4lgp1i5qh550vjkb2cvbdfp"; + sha256 = "1i4vk5r2wn4cd6sgsidzqs9s3bmb4j9cn4392izkidi0j9mm3hvg"; }; buildInputs = [ ncurses texlive.combined.scheme-medium texinfo perl ghostscript ]; dontBuild = true; diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 39d96775ebcd2e6b55f5a65daffdefffc00f8972..6fff6df8cdda7fadfd8c99271b5fbcefa4eb6b05 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/nedit; platforms = with platforms; linux ++ darwin; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 149f7804a79911b7dfc5c8582fa9f5ba50dd2a90..6690e4c9c1b97579147679d6f5e3478915279d10 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey -, libtool, libuv, luaPackages, ncurses, perl, pkgconfig -, unibilium, vimUtils, xsel, gperf, callPackage +{ stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv +, libuv, luaPackages, ncurses, pkgconfig +, unibilium, xsel, gperf +, libvterm-neovim , withJemalloc ? true, jemalloc }: @@ -8,44 +9,15 @@ with stdenv.lib; let - # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: - neovimLibvterm = stdenv.mkDerivation rec { - name = "neovim-libvterm-${version}"; - version = "2017-11-05"; - - src = fetchFromGitHub { - owner = "neovim"; - repo = "libvterm"; - rev = "4ca7ebf7d25856e90bc9d9cc49412e80be7c4ea8"; - sha256 = "05kyvvz8af90mvig11ya5xd8f4mbvapwyclyrihm9lwas706lzf6"; - }; - - buildInputs = [ perl ]; - nativeBuildInputs = [ libtool ]; - - makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - - enableParallelBuilding = true; - - meta = { - description = "VT220/xterm/ECMA-48 terminal emulator library"; - homepage = http://www.leonerd.org.uk/code/libvterm/; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - platforms = platforms.unix; - }; - }; - neovim = stdenv.mkDerivation rec { name = "neovim-unwrapped-${version}"; - version = "0.2.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "1dxr29d0hyag7snbww5s40as90412qb61rgj7gd9rps1iccl9gv4"; + sha256 = "19jy9nr2ffscli6wsysqkdvqvh7sgkkwhzkw3yypfrvg4pj9rl56"; }; enableParallelBuilding = true; @@ -53,13 +25,14 @@ let buildInputs = [ libtermkey libuv - libmsgpack + msgpack ncurses - neovimLibvterm + libvterm-neovim unibilium luaPackages.lua gperf ] ++ optional withJemalloc jemalloc + ++ optional stdenv.isDarwin libiconv ++ lualibs; nativeBuildInputs = [ @@ -75,6 +48,7 @@ let cmakeFlags = [ "-DLUA_PRG=${luaPackages.lua}/bin/lua" + "-DGPERF_PRG=${gperf}/bin/gperf" ]; # triggers on buffer overflow bug while running tests @@ -86,7 +60,7 @@ let ''; postInstall = stdenv.lib.optionalString stdenv.isLinux '' - sed -i -e "s|'xsel|'${xsel}/bin/xsel|" $out/share/nvim/runtime/autoload/provider/clipboard.vim + sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim '' + stdenv.lib.optionalString (withJemalloc && stdenv.isDarwin) '' install_name_tool -change libjemalloc.1.dylib \ ${jemalloc}/lib/libjemalloc.1.dylib \ diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 1c99429a7fe27f5e4cb3d23c68883bc4ea733b09..b0c834934f9c4fb7e36913cfb1e03b5624a18917 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -3,15 +3,15 @@ with stdenv.lib; pythonPackages.buildPythonPackage rec { - name = "neovim-remote-${version}"; - version = "v1.8.6"; + pname = "neovim-remote"; + version = "2.0.5"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; - rev = version; - sha256 = "0x01zpmxi37jr7j2az2bd8902h7zhkpg6kpvc8xmll9f7703zz2l"; + rev = "v${version}"; + sha256 = "08qsi61ba5d69ca77layypzvi7nalx4niy97xn4w88jibnbmbrxw"; }; propagatedBuildInputs = with pythonPackages; [ neovim psutil ]; diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 48f7b29f407fc7cc236ef2796caf5aa8bdb13da3..baeb38797352729d12438c7498194ea025e84ef2 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -1,24 +1,23 @@ { stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper -, libmsgpack, neovim, pythonPackages, qtbase }: +, msgpack, neovim, pythonPackages, qtbase }: stdenv.mkDerivation rec { name = "neovim-qt-${version}"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "190yg6kkw953h8wajlqr2hvs2fz65y6z0blmywlg1nff724allaq"; + sha256 = "014zqfbbv7q85z64h1iw88l37vhrvhjv7xxd0a76j7d1m2769kqs"; }; cmakeFlags = [ - "-DMSGPACK_INCLUDE_DIRS=${libmsgpack}/include" - "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so" + "-DUSE_SYSTEM_MSGPACK=1" ]; buildInputs = with pythonPackages; [ - neovim qtbase libmsgpack + neovim qtbase msgpack ] ++ (with pythonPackages; [ jinja2 msgpack python ]); @@ -28,13 +27,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preConfigure = '' - # avoid cmake trying to download libmsgpack - echo "" > third-party/CMakeLists.txt # we rip out a number of tests that fail in the build env # the GUI tests will never work but the others should - they did before neovim 0.2.0 # was released sed -i test/CMakeLists.txt \ -e '/^add_xtest_gui/d' \ + -e '/tst_neovimobject/d' \ -e '/tst_neovimconnector/d' \ -e '/tst_callallmethods/d' \ -e '/tst_encoding/d' @@ -42,7 +40,14 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = '' + postInstall = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv $out/bin/nvim-qt.app $out/Applications + rmdir $out/bin || : + + wrapProgram "$out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt" \ + --prefix PATH : "${neovim}/bin" + '' else '' wrapProgram "$out/bin/nvim-qt" \ --prefix PATH : "${neovim}/bin" ''; diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 87b011c4f8b40c184bff1c50073cac592a2cc725..a95ced76371d40c7095e0ee2e79a9d8f2a18830d 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.2.2) + msgpack (1.2.4) multi_json (1.13.1) - neovim (0.6.2) + neovim (0.7.0) msgpack (~> 1.0) multi_json (~> 1.0) diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index aefecbf5ba83adc0be7f80e9d3003063bf86fd09..af887161ea6cff33273614d2b81a079f32b6e704 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -2,10 +2,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ai0sfdv9jnr333fsvkn7a8vqvn0iwiw83yj603a3i68ds1x6di1"; + sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.4"; }; multi_json = { source = { @@ -19,9 +19,9 @@ dependencies = ["msgpack" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15r3j9bwlpm1ry7cp6059xb0irvsvvlmw53i28z6sf2khwfj5j53"; + sha256 = "0b487dzz41im8cwzvfjqgf8kkrp6mpkvcbzhazrmqqw8gxyvfbq4"; type = "gem"; }; - version = "0.6.2"; + version = "0.7.0"; }; } diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index a27b5a41ac70b88bce78a43fee0e04589db3be37..17cf49521f1db14402b525f9b1cf69c954fcc903 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper +{ stdenv, lib, makeWrapper , vimUtils , bundlerEnv, ruby , pythonPackages @@ -10,14 +10,13 @@ neovim: let wrapper = { - name ? "neovim" - , withPython ? true, extraPythonPackages ? [] - , withPython3 ? true, extraPython3Packages ? [] + withPython ? true, extraPythonPackages ? (_: []) /* the function you would have passed to python.withPackages */ + , withPython3 ? true, extraPython3Packages ? (_: []) /* the function you would have passed to python.withPackages */ , withRuby ? true , withPyGUI ? false , vimAlias ? false , viAlias ? false - , configure ? null + , configure ? {} }: let @@ -29,29 +28,31 @@ let ''; }; - pluginPythonPackages = if configure == null then [] else builtins.concatLists - (map ({ pythonDependencies ? [], ...}: pythonDependencies) - (vimUtils.requiredPlugins configure)); - pythonEnv = pythonPackages.python.buildEnv.override { - extraLibs = ( - if withPyGUI - then [ pythonPackages.neovim_gui ] - else [ pythonPackages.neovim ] - ) ++ extraPythonPackages ++ pluginPythonPackages; - ignoreCollisions = true; - }; + /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */ + compatFun = funOrList: (if builtins.isList funOrList then + (_: builtins.trace "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList) + else funOrList); + extraPythonPackagesFun = compatFun extraPythonPackages; + extraPython3PackagesFun = compatFun extraPython3Packages; - pluginPython3Packages = if configure == null then [] else builtins.concatLists - (map ({ python3Dependencies ? [], ...}: python3Dependencies) - (vimUtils.requiredPlugins configure)); - python3Env = python3Packages.python.buildEnv.override { - extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages ++ pluginPython3Packages; - ignoreCollisions = true; - }; + requiredPlugins = vimUtils.requiredPlugins configure; + getDeps = attrname: map (plugin: plugin.${attrname} or (_:[])); + + pluginPythonPackages = getDeps "pythonDependencies" requiredPlugins; + pythonEnv = pythonPackages.python.withPackages(ps: + (if withPyGUI then [ ps.neovim_gui ] else [ ps.neovim ]) + ++ (extraPythonPackagesFun ps) + ++ (concatMap (f: f ps) pluginPythonPackages)); + + pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; + python3Env = python3Packages.python.withPackages (ps: + [ ps.neovim ] + ++ (extraPython3PackagesFun ps) + ++ (concatMap (f: f ps) pluginPython3Packages)); in stdenv.mkDerivation { - inherit name; + name = "neovim-${stdenv.lib.getVersion neovim}"; buildCommand = let bin="${neovim}/bin/nvim"; in '' if [ ! -x "${bin}" ] then @@ -64,7 +65,6 @@ let --cmd \"${if withPython then "let g:python_host_prog='$out/bin/nvim-python'" else "let g:loaded_python_provider = 1"}\" \ --cmd \"${if withPython3 then "let g:python3_host_prog='$out/bin/nvim-python3'" else "let g:loaded_python3_provider = 1"}\" \ --cmd \"${if withRuby then "let g:ruby_host_prog='$out/bin/nvim-ruby'" else "let g:loaded_ruby_provider=1"}\" " \ - --unset PYTHONPATH \ ${optionalString withRuby '' --suffix PATH : ${rubyEnv}/bin --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath}'' } '' @@ -76,9 +76,9 @@ let --replace 'Name=Neovim' 'Name=WrappedNeovim' '' + optionalString withPython '' - ln -s ${pythonEnv}/bin/python $out/bin/nvim-python + makeWrapper ${pythonEnv}/bin/python $out/bin/nvim-python --unset PYTHONPATH '' + optionalString withPython3 '' - ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3 + makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH '' + optionalString withRuby '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' @@ -89,7 +89,7 @@ let ln -s $out/bin/nvim $out/bin/vim '' + optionalString viAlias '' ln -s $out/bin/nvim $out/bin/vi - '' + optionalString (configure != null) '' + '' + optionalString (configure != {}) '' wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}" '' ; diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index a23c5242a24b1708df3a6a1abd4ecfa8292809ce..9af60ca4fcbd879aa8a14675adc749ad07ea85d0 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { name = "netbeans-8.2"; src = fetchurl { - url = http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip; + url = https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip; sha256 = "0j092qw7aqfc9vpnvr3ix1ii94p4ik6frcnw708iyv4s9crqi65d"; }; diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index 0bcbad58b3a2eeb70f5d05efc4216bc5feef1fc9..567f47520352799555ee8ceb544613dca076bb2e 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -1,10 +1,10 @@ -{ pkgs, fetchurl, tk, python2Packages }: +{ pkgs, fetchurl, python2Packages }: let pythonPackages = python2Packages; in pythonPackages.buildPythonApplication rec { version = "0.9.7"; - name = "nvpy-${version}"; + pname = "nvpy"; src = fetchurl { url = "https://github.com/cpbotha/nvpy/archive/v${version}.tar.gz"; diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..efe728f68494bf44bae843b41316567b74477ccc --- /dev/null +++ b/pkgs/applications/editors/okteta/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig +, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts +, qca-qt5, shared-mime-info }: + +stdenv.mkDerivation rec { + name = "okteta-${version}"; + version = "0.25.2"; + + src = fetchurl { + url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; + sha256 = "00mw8gdqvn6vn6ir6kqnp7xi3lpn6iyp4f5aknxwq6mdcxgjmh1p"; + }; + + nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; + buildInputs = [ shared-mime-info ]; + + propagatedBuildInputs = [ + kconfig + kinit + kcmutils + kconfigwidgets + knewstuff + kparts + qca-qt5 + karchive + kcrash + ]; + + meta = with stdenv.lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg bkchr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 1a0e6e54fb3e7ff83a45377b6b39330f34fdf1a4..9456ea3150a44c691e1221ce25aaa134286fb54a 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonApplication, fetchFromGitHub -, gdk_pixbuf, glib, gtk3, pango, webkitgtk +, gdk_pixbuf, glib, gobjectIntrospection, gtk3, pango, webkitgtk , pygobject3, pyyaml }: buildPythonApplication rec { - name = "rednotebook-${version}"; + pname = "rednotebook"; version = "2.3"; src = fetchFromGitHub { @@ -17,6 +17,8 @@ buildPythonApplication rec { # We have not packaged tests. doCheck = false; + nativeBuildInputs = [ gobjectIntrospection ]; + propagatedBuildInputs = [ gdk_pixbuf glib gtk3 pango webkitgtk pygobject3 pyyaml diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 6b7881c490cf3cd14c6497dfacb4abf8ffb9505f..0943513a4d12607ce5e9c40f6ce8f925c09b1936 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -6,7 +6,7 @@ let verMajor = "1"; verMinor = "1"; - verPatch = "423"; + verPatch = "442"; version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "1.5"; gwtVer = "2.7.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "02kpmzh0vr0gb5dhiwcm4gwjbc3biwz0km655mgzmx9j64cyd3nf"; + sha256 = "0drqh2brfs9w8dfh4r7j3fsqdsg63s6pvj2bbg5xwwc0yf220ahs"; }; # Hack RStudio to only use the input R. diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 61b28e02949ebcb588c3cdca3586721bd47c2268..2f4693982a9c01daa55e1d5338cf07d9f91fb37d 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scite-${version}"; - version = "3.7.5"; + version = "4.0.5"; src = fetchurl { - url = http://www.scintilla.org/scite375.tgz; - sha256 = "11pg9bifyyqpblqsrl1b9f8shb3fa6fgzclvjba6hwh7hh98drji"; + url = https://www.scintilla.org/scite405.tgz; + sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2"; }; nativeBuildInputs = [ pkgconfig ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.scintilla.org/SciTE.html; + homepage = https://www.scintilla.org/SciTE.html; description = "SCIntilla based Text Editor"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index a6f454deaf5c737ccfc3addf76456be9c07ebdef..ef0d98455f278ffc3c6c93324641f45aea00a013 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { - sha256 = "01pvc7k54mx5c7h1qiw92d4j459psv7n9xg94qbinf8vmpvkrcbw"; + sha256 = "11r7043kbqv67z1aqk929scsg6yllldpl8icl32dw3dai7f1c658"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/2/default.nix similarity index 95% rename from pkgs/applications/editors/sublime/default.nix rename to pkgs/applications/editors/sublime/2/default.nix index 9cf5bd97d0a330e91a6fe2c8c763032c97c3c89e..78c2d9aaa0c41cca63d23f626c73d43c629d28cb 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -2,11 +2,10 @@ let libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; in -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "sublimetext-2.0.2"; - src = + src = if stdenv.system == "i686-linux" then fetchurl { name = "sublimetext-2.0.2.tar.bz2"; @@ -55,5 +54,6 @@ stdenv.mkDerivation rec { meta = { description = "Sophisticated text editor for code, markup and prose"; license = stdenv.lib.licenses.unfree; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime/3/common.nix similarity index 79% rename from pkgs/applications/editors/sublime3/default.nix rename to pkgs/applications/editors/sublime/3/common.nix index 9c8a75320a617ec5202504de6c8632e9fd508762..628993dbf5be55d7a8f33109c66ad0d0263f163b 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -1,33 +1,38 @@ +{buildVersion, x32sha256, x64sha256}: + { fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2, pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, - gksuSupport ? false, gksu, unzip, zip, bash }: + gksuSupport ? false, gksu, unzip, zip, bash}: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; let - build = "3143"; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; in let + archSha256 = + if stdenv.system == "i686-linux" then + x32sha256 + else + x64sha256; + + arch = + if stdenv.system == "i686-linux" then + "x32" + else + "x64"; + # package with just the binaries sublime = stdenv.mkDerivation { - name = "sublimetext3-${build}-bin"; - + name = "sublimetext3-${buildVersion}-bin"; src = - if stdenv.system == "i686-linux" then - fetchurl { - name = "sublimetext-${build}.tar.bz2"; - url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; - } - else - fetchurl { - name = "sublimetext-${build}.tar.bz2"; - url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; - }; + fetchurl { + name = "sublimetext-${buildVersion}.tar.bz2"; + url = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2"; + sha256 = archSha256; + }; dontStrip = true; dontPatchELF = true; @@ -80,8 +85,8 @@ in let wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; -in stdenv.mkDerivation { - name = "sublimetext3-${build}"; +in stdenv.mkDerivation (rec { + name = "sublimetext3-${buildVersion}"; phases = [ "installPhase" ]; @@ -108,6 +113,6 @@ in stdenv.mkDerivation { homepage = https://www.sublimetext.com/; maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ]; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; -} +}) diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix new file mode 100644 index 0000000000000000000000000000000000000000..8ab7c81440791c4086a43003c1ec643751cd5bb3 --- /dev/null +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -0,0 +1,18 @@ +{ callPackage }: + +let + common = opts: callPackage (import ./common.nix opts); +in + rec { + sublime3-dev = common { + buildVersion = "3176"; + x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23"; + x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl"; + } {}; + + sublime3 = common { + buildVersion = "3176"; + x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23"; + x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl"; + } {}; + } diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix index e319ccf39b1b1639c1627ef5168b71ff61795fb5..dfb2e49e0c8d02ccbc18514bd8225c4bd5de1bb0 100644 --- a/pkgs/applications/editors/texmacs/darwin.nix +++ b/pkgs/applications/editors/texmacs/darwin.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeWrapper, +{ stdenv, callPackage, fetchurl, guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript, tex ? null, aspell ? null, diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 447e729d4f9b5e5667db87414ed213c44f0c336b..d3d95e5886a5996538327abc834fa6fef99a22b4 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation { meta = common.meta // { maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 03505ec11a5f7ee63135fd62a7c09c9f4653155a..7ba37bd14ff1e4939d1c91e7d000bf097c4dd45a 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, qt5, poppler_qt5, zlib, pkgconfig}: +{ stdenv, fetchFromGitHub, qt5, poppler, zlib, pkgconfig}: stdenv.mkDerivation rec { pname = "texstudio"; - version = "2.12.6"; + version = "2.12.10"; name = "${pname}-${version}"; - altname="Texstudio"; - src = fetchurl { - url = "mirror://sourceforge/texstudio/${name}.tar.gz"; - sha256 = "18rxd7ra5k2f7s4c296b3v3pqhxjmfix9xpy9i1g4jm87ygqrbnd"; + src = fetchFromGitHub { + owner = "${pname}-org"; + repo = pname; + rev = version; + sha256 = "0mkx7fym41hwd7cdg31ji2hxlv3gxx0sa6bnap51ryxmq8sxdjhq"; }; nativeBuildInputs = [ qt5.qmake pkgconfig ]; - buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ]; + buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler zlib ]; qmakeFlags = [ "NO_APPDATA=True" ]; diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index 4f1a29278be927f334ffcb946adcbbf301d25f20..818183b9852b979bce79070a4deac2ff494f3da9 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -56,7 +56,6 @@ let gtdialog_zip = "gtdialog_1.3.zip"; cdk_tgz = "cdk-5.0-20150928.tgz"; termkey_tgz = "libtermkey-0.17.tar.gz"; - bombay_zip = "bombay.zip"; scinterm_url = "http://foicica.com/scinterm/download/" + scinterm_zip; tre_url = "https://github.com/laurikari/tre/archive/" + tre_zip; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 8444ff6eaecc42934f2f95bd134b235ca449e194..93f1639107eeaea4db3d911afcbe7d0deb426e3c 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake -, python, qtbase, qttools, zlib }: +, python, qtbase, qttools }: stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "1.1.4"; + version = "1.1.6"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "0ln8lis9g23wp3w70xwbkzqmmbkd02cdx6z7msw9lrpkjzkj7mlr"; + sha256 = "09qnlinm3q9xwp6b6cajs49fx8y6pkpixhji68bhs53m5hpvfg4s"; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free, easy to use and flexible tile map editor"; - homepage = http://www.mapeditor.org/; + homepage = https://www.mapeditor.org/; license = with licenses; [ bsd2 # libtiled and tmxviewer gpl2Plus # all the rest diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix index e55bcb48787fc1416cf0fb0d4072561a6baf4ddb..aa3b4b99d7a076cacad989c138afc4a22a74e957 100644 --- a/pkgs/applications/editors/tweak/default.nix +++ b/pkgs/applications/editors/tweak/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.02"; src = fetchurl { - url = "http://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz"; + url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz"; sha256 = "06js54pr5hwpwyxj77zs5s40n5aqvaw48dkj7rid2d47pyqijk2v"; }; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 7c6d186b88302fd070059933e5f7244a30394fbb..93ee70e4148bb9f7a7e11770318a0f9924afa217 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -1,30 +1,31 @@ -{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, atk, cairo -, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev }: +{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gnome3, gtk3, atk, cairo, pango +, gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }: stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.44"; + version = "0.9.53"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "9442c090bf2619d270890228abd7dabb9e217c0b200615f8ed3cb255efd122d5"; + sha256 = "02k6x30l4mbjragqbq5rn663xbw3h4bxzgppfxqf5lwydswldklb"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "ae228ca946d03940b85df30c995c4de3f942a780e32d4dcab872dec671c66ef3"; + sha256 = "1wyq1ri0wwdy7slbd9dwyrdynsaa644x44c815jl787sg4nhas6y"; } ; rpath = stdenv.lib.makeLibraryPath [ alsaLib gnome2.GConf - gnome2.gtk - gnome2.gdk_pixbuf - gnome2.pango + gdk_pixbuf + pango + gnome3.defaultIconTheme expat + gtk3 atk nspr nss @@ -50,6 +51,9 @@ stdenv.mkDerivation rec { xorg.libXScrnSaver ]; + nativeBuildInputs = [ wrapGAppsHook ]; + + dontWrapGApps = true; buildInputs = [ dpkg makeWrapper ]; @@ -71,7 +75,12 @@ stdenv.mkDerivation rec { --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/share/typora:${rpath}" "$out/share/typora/Typora" - ln -s "$out/share/typora/Typora" "$out/bin/typora" + makeWrapper $out/share/typora/Typora $out/bin/typora + + wrapProgram $out/bin/typora \ + "''${gappsWrapperArgs[@]}" \ + --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share" # Fix the desktop link substituteInPlace $out/share/applications/typora.desktop \ diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix deleted file mode 100644 index 98f45f6be02d2b56e80a5648d450ef026c1f00e8..0000000000000000000000000000000000000000 --- a/pkgs/applications/editors/vanubi/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, vala_0_28, which, autoconf, automake -, libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }: - -stdenv.mkDerivation rec { - name = "vanubi-${version}"; - version = "0.0.16"; - - src = fetchurl { - url = "https://github.com/vanubi/vanubi/archive/v${version}.tar.gz"; - sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala_0_28 which autoconf automake - libtool glib gtk3 libwnck3 asciidoc - gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ]; - - configureScript = "./autogen.sh"; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://vanubi.github.io/vanubi; - description = "Programming editor for GTK+ inspired by Emacs"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 00b2b23c6f47cd54041f2f0768bdde8fcfa03fc6..2ce6563be0bd5cb5d4af579f6c7c817dfa569157 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.0.1605"; + version = "8.1.0146"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0a8zf43q806py14vq1frm350wycn47cmanj1hn1i7bqx1gdgcal9"; + sha256 = "1v33h08j15zii0ipw5py18ghsaxlbar0nyx365z1acjhk4vhn9nb"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 0f81b0bdd640085626a1939de1fbc77d9a31dca8..7ee28adfa47fd2f72b1bc9acaa5115e8ee1e12ee 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,18 +1,36 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc -args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext -, composableDerivation, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby +{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext +, writeText, config, glib, gtk2, gtk3, lua, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE +, vimPlugins +, makeWrapper +, wrapGAppsHook # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private -, ... }: with args; +, features ? "huge" # One of tiny, small, normal, big or huge +, wrapPythonDrv ? false +, guiSupport ? config.vim.gui or "gtk3" +, luaSupport ? config.vim.lua or true +, perlSupport ? config.vim.perl or false # Perl interpreter +, pythonSupport ? config.vim.python or true # Python interpreter +, rubySupport ? config.vim.ruby or true # Ruby interpreter +, nlsSupport ? config.vim.nls or false # Enable NLS (gettext()) +, tclSupport ? config.vim.tcl or false # Include Tcl interpreter +, multibyteSupport ? config.vim.multibyte or false # Enable multibyte editing support +, cscopeSupport ? config.vim.cscope or true # Enable cscope interface +, netbeansSupport ? config.netbeans or true # Enable NetBeans integration support. +, ximSupport ? config.vim.xim or true # less than 15KB, needed for deadkeys +, darwinSupport ? config.vim.darwin or false # Enable Darwin support +, ftNixSupport ? config.vim.ftNix or true # Add .nix filetype detection and minimal syntax highlighting support +, ... +}: let - inherit (args.composableDerivation) composableDerivation edf; nixosRuntimepath = writeText "nixos-vimrc" '' set nocompatible syntax on @@ -44,138 +62,123 @@ let ''; common = callPackage ./common.nix {}; -in -composableDerivation { -} (fix: rec { - - name = "vim_configurable-${version}"; - - inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; - - src = builtins.getAttr source { - "default" = common.src; # latest release - - "vim-nox" = - { - # vim nox branch: client-server without X by uing sockets - # REGION AUTO UPDATE: { name="vim-nox"; type="hg"; url="https://code.google.com/r/yukihironakadaira-vim-cmdsrv-nox/"; branch="cmdsrv-nox"; } - src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-nox-hg-2082fc3.tar.bz2"; sha256 = "293164ca1df752b7f975fd3b44766f5a1db752de6c7385753f083499651bd13a"; }); - name = "vim-nox-hg-2082fc3"; - # END - }.src; - }; - - patches = [ ./cflags-prune.diff ]; - - configureFlags - = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ]; - - nativeBuildInputs = [ pkgconfig ]; - - buildInputs - = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau - libXmu glib libICE ] ++ (if args.gui == "gtk3" then [gtk3] else [gtk2]); - - # most interpreters aren't tested yet.. (see python for example how to do it) - flags = { - ftNix = { - patches = [ ./ft-nix-support.patch ]; - }; - } - // edf { - name = "darwin"; - enable = { - buildInputs = [ CoreServices CoreData Cocoa Foundation libobjc cf-private ]; - NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin - "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; - }; - } #Disable Darwin (macOS) support. - // edf { name = "xsmp"; } #Disable XSMP session management - // edf { name = "xsmp_interact"; } #Disable XSMP interaction - // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter. - // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter. - - // edf { - name = "python"; - feat = "python${if python ? isPy3 then "3" else ""}interp"; - enable = { - buildInputs = [ python ]; - } // lib.optionalAttrs stdenv.isDarwin { - configureFlags - = [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes" - "--with-python${if python ? isPy3 then "3" else ""}-config-dir=${python}/lib" - "--disable-python${if python ? isPy3 then "" else "3"}interp" ]; - }; - } - - // edf { name = "tcl"; feat = "tclinterp"; enable = { buildInputs = [tcl]; }; } #Include Tcl interpreter. - // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildInputs = [ruby]; };} #Include Ruby interpreter. - // edf { - name = "lua"; - feat = "luainterp"; - enable = { - buildInputs = [lua]; - configureFlags = [ - "--with-lua-prefix=${args.lua}" - "--enable-luainterp" - ]; - }; - } - // edf { name = "cscope"; } #Include cscope interface. - // edf { name = "workshop"; } #Include Sun Visual Workshop support. - // edf { name = "netbeans"; } #Disable NetBeans integration support. - // edf { name = "sniff"; feat = "sniff" ; } #Include Sniff interface. - // edf { name = "multibyte"; } #Include multibyte editing support. - // edf { name = "hangulinput"; feat = "hangulinput" ;} #Include Hangul input support. - // edf { name = "xim"; } #Include XIM input support. - // edf { name = "fontset"; } #Include X fontset output support. - // edf { name = "acl"; } #Don't check for ACL support. - // edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon). - // edf { name = "nls"; enable = {nativeBuildInputs = [gettext];}; } #Don't support NLS (gettext()). - ; - - cfg = { - luaSupport = config.vim.lua or true; - pythonSupport = config.vim.python or true; - rubySupport = config.vim.ruby or true; - nlsSupport = config.vim.nls or false; - tclSupport = config.vim.tcl or false; - multibyteSupport = config.vim.multibyte or false; - cscopeSupport = config.vim.cscope or true; - netbeansSupport = config.netbeans or true; # eg envim is using it - ximSupport = config.vim.xim or true; # less than 15KB, needed for deadkeys - - # by default, compile with darwin support if we're compiling on darwin, but - # allow this to be disabled by setting config.vim.darwin to false - darwinSupport = stdenv.isDarwin && (config.vim.darwin or true); - - # add .nix filetype detection and minimal syntax highlighting support - ftNixSupport = config.vim.ftNix or true; - }; - #--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gtk3/gnome/gnome2/motif/athena/neXtaw/photon/carbon - /* - // edf "gtk_check" "gtk_check" { } #If auto-select GUI, check for GTK default=yes - // edf "gtk2_check" "gtk2_check" { } #If GTK GUI, check for GTK+ 2 default=yes - // edf "gnome_check" "gnome_check" { } #If GTK GUI, check for GNOME default=no - // edf "motif_check" "motif_check" { } #If auto-select GUI, check for Motif default=yes - // edf "athena_check" "athena_check" { } #If auto-select GUI, check for Athena default=yes - // edf "nextaw_check" "nextaw_check" { } #If auto-select GUI, check for neXtaw default=yes - // edf "carbon_check" "carbon_check" { } #If auto-select GUI, check for Carbon default=yes - // edf "gtktest" "gtktest" { } #Do not try to compile and run a test GTK program - */ + isPython3 = python.isPy3 or false; - preInstall = '' - mkdir -p $out/share/applications $out/share/icons/{hicolor,locolor}/{16x16,32x32,48x48}/apps - ''; +in stdenv.mkDerivation rec { + + name = "vim_configurable-${version}"; + + inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; - postInstall = stdenv.lib.optionalString stdenv.isLinux '' + src = builtins.getAttr source { + "default" = common.src; # latest release + }; + + patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch; + + configureFlags = [ + "--enable-gui=${guiSupport}" + "--with-features=${features}" + "--disable-xsmp" # XSMP session management + "--disable-xsmp_interact" # XSMP interaction + "--disable-workshop" # Sun Visual Workshop support + "--disable-sniff" # Sniff interface + "--disable-hangulinput" # Hangul input support + "--disable-fontset" # X fontset output support + "--disable-acl" # ACL support + "--disable-gpm" # GPM (Linux mouse daemon) + "--disable-mzschemeinterp" + "--disable-gtk_check" + "--disable-gtk2_check" + "--disable-gnome_check" + "--disable-motif_check" + "--disable-athena_check" + "--disable-nextaf_check" + "--disable-carbon_check" + "--disable-gtktest" + ] + ++ stdenv.lib.optional stdenv.isDarwin + (if darwinSupport then "--enable-darwin" else "--disable-darwin") + ++ stdenv.lib.optionals luaSupport [ + "--with-lua-prefix=${lua}" + "--enable-luainterp" + ] + ++ stdenv.lib.optionals pythonSupport [ + "--enable-python${if isPython3 then "3" else ""}interp=yes" + "--with-python${if isPython3 then "3" else ""}-config-dir=${python}/lib" + "--disable-python${if (!isPython3) then "3" else ""}interp" + ] + ++ stdenv.lib.optional nlsSupport "--enable-nls" + ++ stdenv.lib.optional perlSupport "--enable-perlinterp" + ++ stdenv.lib.optional rubySupport "--enable-rubyinterp" + ++ stdenv.lib.optional tclSupport "--enable-tclinterp" + ++ stdenv.lib.optional multibyteSupport "--enable-multibyte" + ++ stdenv.lib.optional cscopeSupport "--enable-cscope" + ++ stdenv.lib.optional netbeansSupport "--enable-netbeans" + ++ stdenv.lib.optional ximSupport "--enable-xim"; + + nativeBuildInputs = [ + pkgconfig + ] + ++ stdenv.lib.optional wrapPythonDrv makeWrapper + ++ stdenv.lib.optional nlsSupport gettext + ++ stdenv.lib.optional perlSupport perl + ++ stdenv.lib.optional (guiSupport == "gtk3") wrapGAppsHook + ; + + buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau + libXmu glib libICE ] + ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2 + ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3 + ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ] + ++ stdenv.lib.optional luaSupport lua + ++ stdenv.lib.optional pythonSupport python + ++ stdenv.lib.optional tclSupport tcl + ++ stdenv.lib.optional rubySupport ruby; + + preConfigure = '' + '' + stdenv.lib.optionalString ftNixSupport '' + cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim + cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim + cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim + ''; + + postInstall = '' + '' + stdenv.lib.optionalString stdenv.isLinux '' patchelf --set-rpath \ - "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ + "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ "$out"/bin/{vim,gvim} ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc + '' + stdenv.lib.optionalString wrapPythonDrv '' + wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin" + '' + stdenv.lib.optionalString (guiSupport == "gtk3") '' + + rewrap () { + rm -f "$out/bin/$1" + echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" + chmod a+x "$out/bin/$1" + } + + rewrap ex -e + rewrap view -R + rewrap gvim -g + rewrap gex -eg + rewrap gview -Rg + rewrap rvim -Z + rewrap rview -RZ + rewrap rgvim -gZ + rewrap rgview -RgZ + rewrap evim -y + rewrap eview -yR + rewrap vimdiff -d + rewrap gvimdiff -gd + ''; + + preInstall = '' + mkdir -p $out/share/applications $out/share/icons/{hicolor,locolor}/{16x16,32x32,48x48}/apps ''; dontStrip = 1; -}) +} diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch index 416ec18cf2cad7aa4c7a508d42669ee126428117..274d855731fdcc0f0c8c2b200ef52577903abcca 100644 --- a/pkgs/applications/editors/vim/ft-nix-support.patch +++ b/pkgs/applications/editors/vim/ft-nix-support.patch @@ -6,7 +6,7 @@ index a8e6261..2b008fc 100644 " Z80 assembler asz80 au BufNewFile,BufRead *.z8a setf z8a -+" NIX ++" Nix +au BufNewFile,BufRead *.nix setf nix + augroup END @@ -18,72 +18,3 @@ index a8e6261..2b008fc 100644 unlet s:cpo_save + + -diff --git a/runtime/syntax/nix.vim b/runtime/syntax/nix.vim -new file mode 100644 -index 0000000..a2f9918 ---- /dev/null -+++ b/runtime/syntax/nix.vim -@@ -0,0 +1,56 @@ -+" Vim syntax file -+" Language: nix -+" Maintainer: Marc Weber -+" Modify and commit if you feel that way -+" Last Change: 2011 Jun -+" -+" this syntax file can be still be enhanced very much.. -+" Don't ask, do it :-) -+" This file (github.com/MarcWeber/vim-addon-nix) is periodically synced with -+" the patch found in vim_configurable (nixpkgs) -+ -+" Quit when a (custom) syntax file was already loaded -+if exists("b:current_syntax") -+ finish -+endif -+ -+ -+sy cluster nixStrings contains=nixStringParam,nixStringIndented -+ -+syn keyword nixKeyword let throw inherit import true false null with -+syn keyword nixConditional if else then -+syn keyword nixBrace ( ) { } = -+syn keyword nixBuiltin __currentSystem __currentTime __isFunction __getEnv __trace __toPath __pathExists -+ \ __readFile __toXML __toFile __filterSource __attrNames __getAttr __hasAttr __isAttrs __listToAttrs __isList -+ \ __head __tail __add __sub __lessThan __substring __stringLength -+ -+syn region nixStringIndented start=+''+ skip=+'''\|''${\|"+ end=+''+ contains=nixStringParam -+" syn region nixString start=+"+ skip=+\\"+ end=+"+ -+syn match nixAttr "\w\+\ze\s*=" -+syn match nixFuncArg "\zs\w\+\ze\s*:" -+syn region nixStringParam start=+\${+ end=+}+ contains=@nixStrings -+syn region nixMultiLineComment start=+/\*+ skip=+\\"+ end=+\*/+ -+syn match nixEndOfLineComment "#.*$" -+ -+hi def link nixKeyword Keyword -+hi def link nixConditional Conditional -+hi def link nixBrace Special -+hi def link nixString String -+hi def link nixStringIndented String -+hi def link nixBuiltin Special -+hi def link nixStringParam Macro -+hi def link nixMultiLineComment Comment -+hi def link nixEndOfLineComment Comment -+hi def link nixAttr Identifier -+hi def link nixFuncArg Identifier -+ -+syn sync maxlines=20000 -+syn sync minlines=50000 -+ -+let b:current_syntax = "nix" -+ -+" thanks to domenkozar -+" scan backwards to find begining of multiline statements -+syn sync ccomment nixMultiLineComment minlines=10 maxlines=500 -+syn sync ccomment nixStringIndented minlines=10 maxlines=500 -+syn sync ccomment nixString maxlines=10 -diff --git a/runtime/ftplugin/nix.vim b/runtime/ftplugin/nix.vim -new file mode 100644 ---- /dev/null -+++ b/runtime/ftplugin/nix.vim -@@ -0,0 +1,2 @@ -+" coding conventions -+setlocal sw=2 ts=2 expandtab diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index b6c03a57b561cdc6b886ec2816fcb955141eb62c..c97b17bd9af1f1ac217543f300ef216c36b671e0 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ncurses, gettext -, pkgconfig, cscope, python, ruby, tcl, perl, luajit +, pkgconfig, python, ruby, tcl, perl, luajit , darwin }: diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index c23bf360daf3f4cf99eb3c548fb72e59ad95400c..81948918a114adf7bcc14cfbac2525efb97b2f60 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -1,110 +1,94 @@ args@{ fetchgit, stdenv, ncurses, pkgconfig, gettext -, composableDerivation, lib, config, python, perl, tcl, ruby, qt4 +, lib, config, python, perl, tcl, ruby, qt4 , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu -, libICE, ... }: with args; +, libICE +, lua +, features +, luaSupport ? config.vim.lua or true +, perlSupport ? config.vim.perl or false # Perl interpreter +, pythonSupport ? config.vim.python or true +, rubySupport ? config.vim.ruby or true +, nlsSupport ? config.vim.nls or false +, tclSupport ? config.vim.tcl or false +, multibyteSupport ? config.vim.multibyte or false +, cscopeSupport ? config.vim.cscope or false +, netbeansSupport ? config.netbeans or true # eg envim is using it + +# by default, compile with darwin support if we're compiling on darwin, but +# allow this to be disabled by setting config.vim.darwin to false +, darwinSupport ? stdenv.isDarwin && (config.vim.darwin or true) + +# add .nix filetype detection and minimal syntax highlighting support +, ftNixSupport ? config.vim.ftNix or true + +, ... }: with args; let tag = "20140827"; sha256 = "0ncgbcm23z25naicxqkblz0mcl1zar2qwgi37y5ar8q8884w9ml2"; -in +in { -let inherit (args.composableDerivation) composableDerivation edf; in -composableDerivation { -} (fix: { + name = "qvim-7.4." + tag; - name = "qvim-7.4." + tag; + enableParallelBuilding = true; # test this - enableParallelBuilding = true; # test this - - src = fetchgit { - url = https://bitbucket.org/equalsraf/vim-qt.git ; - rev = "refs/tags/package-" + tag; - inherit sha256; - }; - - # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux - # to meta.platforms.unix - preConfigure = assert (! stdenv.isDarwin); ""; - - configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ]; - - nativeBuildInputs - = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw libXau - libXmu libICE qt4]; - - # most interpreters aren't tested yet.. (see python for example how to do it) - flags = { - ftNix = { - # because we cd to src in the main patch phase, we can't just add this - # patch to the list, we have to apply it manually - postPatch = '' - cd runtime - patch -p2 < ${./ft-nix-support.patch} - cd .. - ''; - }; - } - // edf { name = "darwin"; } #Disable Darwin (macOS) support. - // edf { name = "xsmp"; } #Disable XSMP session management - // edf { name = "xsmp_interact"; } #Disable XSMP interaction - // edf { name = "mzscheme"; } #Include MzScheme interpreter. - // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter. - - // edf { - name = "python"; - feat = "pythoninterp"; - enable = { - nativeBuildInputs = [ python ]; - } // lib.optionalAttrs stdenv.isDarwin { - configureFlags - = [ "--enable-pythoninterp=yes" - "--with-python-config-dir=${python}/lib" ]; - }; - } - - // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. - // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter. - // edf { - name = "lua"; - feat = "luainterp"; - enable = { - nativeBuildInputs = [lua]; - configureFlags = [ - "--with-lua-prefix=${args.lua}" - "--enable-luainterp" - ]; - }; - } - // edf { name = "cscope"; } #Include cscope interface. - // edf { name = "workshop"; } #Include Sun Visual Workshop support. - // edf { name = "netbeans"; } #Disable NetBeans integration support. - // edf { name = "sniff"; feat = "sniff" ; } #Include Sniff interface. - // edf { name = "multibyte"; } #Include multibyte editing support. - // edf { name = "hangulinput"; feat = "hangulinput" ;} #Include Hangul input support. - // edf { name = "xim"; } #Include XIM input support. - // edf { name = "fontset"; } #Include X fontset output support. - // edf { name = "acl"; } #Don't check for ACL support. - // edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon). - // edf { name = "nls"; enable = {nativeBuildInputs = [gettext];}; } #Don't support NLS (gettext()). - ; - - cfg = { - luaSupport = config.vim.lua or true; - pythonSupport = config.vim.python or true; - rubySupport = config.vim.ruby or true; - nlsSupport = config.vim.nls or false; - tclSupport = config.vim.tcl or false; - multibyteSupport = config.vim.multibyte or false; - cscopeSupport = config.vim.cscope or false; - netbeansSupport = config.netbeans or true; # eg envim is using it - - # by default, compile with darwin support if we're compiling on darwin, but - # allow this to be disabled by setting config.vim.darwin to false - darwinSupport = stdenv.isDarwin && (config.vim.darwin or true); - - # add .nix filetype detection and minimal syntax highlighting support - ftNixSupport = config.vim.ftNix or true; + src = fetchgit { + url = https://bitbucket.org/equalsraf/vim-qt.git; + rev = "refs/tags/package-" + tag; + inherit sha256; }; + # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux + # to meta.platforms.unix + preConfigure = assert (! stdenv.isDarwin); ""; + + configureFlags = [ + "--with-vim-name=qvim" + "--enable-gui=qt" + "--with-features=${features}" + "--disable-xsmp" + "--disable-xsmp_interact" + "--disable-workshop" # Sun Visual Workshop support + "--disable-sniff" # Sniff interface + "--disable-hangulinput" # Hangul input support + "--disable-fontset" # X fontset output support + "--disable-acl" # ACL support + "--disable-gpm" # GPM (Linux mouse daemon) + "--disable-mzscheme" + ] + ++ stdenv.lib.optionals luaSupport [ + "--with-lua-prefix=${lua}" + "--enable-luainterp" + ] + ++ stdenv.lib.optional pythonSupport "--enable-pythoninterp" + ++ stdenv.lib.optional (pythonSupport && stdenv.isDarwin) "--with-python-config-dir=${python}/lib" + ++ stdenv.lib.optional nlsSupport "--enable-nls" + ++ stdenv.lib.optional perlSupport "--enable-perlinterp" + ++ stdenv.lib.optional rubySupport "--enable-rubyinterp" + ++ stdenv.lib.optional tclSupport "--enable-tcl" + ++ stdenv.lib.optional multibyteSupport "--enable-multibyte" + ++ stdenv.lib.optional darwinSupport "--enable-darwin" + ++ stdenv.lib.optional cscopeSupport "--enable-cscope"; + + nativeBuildInputs = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw + libXau libXmu libICE qt4 + ] + ++ stdenv.lib.optional nlsSupport gettext + ++ stdenv.lib.optional perlSupport perl + ++ stdenv.lib.optional pythonSupport python + ++ stdenv.lib.optional tclSupport tcl + ++ stdenv.lib.optional rubySupport ruby + ++ stdenv.lib.optional luaSupport lua + ; + + postPatch = '' + '' + stdenv.lib.optionalString ftNixSupport '' + # because we cd to src in the main patch phase, we can't just add this + # patch to the list, we have to apply it manually + cd runtime + patch -p2 < ${./ft-nix-support.patch} + cd .. + ''; + postInstall = stdenv.lib.optionalString stdenv.isLinux '' rpath=`patchelf --print-rpath $out/bin/qvim`; for i in $nativeBuildInputs; do @@ -125,5 +109,5 @@ composableDerivation { maintainers = with maintainers; [ smironov ttuegel ]; platforms = platforms.linux; }; -}) +} diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index a8b38012a1318ec2fdb28fe67b3cbd8ba28e068e..a775fb3bd79a6ebbaa0bfafa2d7bd83cd90c757a 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem, - makeWrapper, libXScrnSaver, libxkbfile, libsecret }: +{ stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem, + gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.21.1"; + version = "1.26.1"; channel = "stable"; plat = { @@ -12,15 +12,16 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0c5wh6i4yl601hg0r1c8y25lz7j2p4vhisdnvnx9nzd6v4ib27cj"; - "x86_64-linux" = "19i0wkl0qccq2cm10khy0xxb53a6g2m061g71y54s4cxb4wimc9l"; - "x86_64-darwin" = "0d1ws4c3n80gypiarqbylyipg273ssc0m29jnrg7hx1mcy5ljb1i"; + "i686-linux" = "1g7kqbz6mrf8ngx2bnwpi9fifq5rjznxgsgwjb532z3nh92ypa8n"; + "x86_64-linux" = "02yldycakn5zxj1ji4nmhdyazqlkjqpzdj3g8j501c3j28pgiwjy"; + "x86_64-darwin" = "0pnsfkh20mj7pzqw7wlfd98jqc6a1mnsq1iira15n7fafqgj8zpl"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; rpath = lib.concatStringsSep ":" [ atomEnv.libPath + "${lib.makeLibraryPath [gtk2]}" "${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0" "${lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1" "${lib.makeLibraryPath [libxkbfile]}/libxkbfile.so.1" @@ -48,8 +49,8 @@ in }; buildInputs = if stdenv.system == "x86_64-darwin" - then [ unzip makeWrapper libXScrnSaver libsecret ] - else [ makeWrapper libXScrnSaver libxkbfile libsecret ]; + then [ unzip libXScrnSaver libsecret ] + else [ wrapGAppsHook libXScrnSaver libxkbfile libsecret ]; installPhase = if stdenv.system == "x86_64-darwin" then '' @@ -81,6 +82,11 @@ in --set-rpath "${rpath}" \ $out/lib/vscode/resources/app/node_modules.asar.unpacked/keytar/build/Release/keytar.node + patchelf \ + --set-rpath "${rpath}" \ + "$out/lib/vscode/resources/app/node_modules.asar.unpacked/native-keymap/build/Release/\ + keymapping.node" + ln -s ${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0 $out/lib/vscode/libsecret-1.so.0 ''; diff --git a/pkgs/applications/editors/vscode-with-extensions/default.nix b/pkgs/applications/editors/vscode/with-extensions.nix similarity index 86% rename from pkgs/applications/editors/vscode-with-extensions/default.nix rename to pkgs/applications/editors/vscode/with-extensions.nix index c54c8a4277f1ecc584eaaccf330586ac132055d9..5535d9ab11282e835395c0f0c99c1a5bca543801 100644 --- a/pkgs/applications/editors/vscode-with-extensions/default.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, runCommand, buildEnv, vscode, which, writeScript +{ stdenv, lib, runCommand, buildEnv, vscode, which, writeScript , vscodeExtensions ? [] }: /* @@ -12,7 +12,7 @@ # When the extension is already available in the default extensions set. vscodeExtensions = with vscode-extensions; [ bbenoist.Nix - ] + ] # Concise version from the vscode market place when not available in the default set. ++ vscode-utils.extensionsFromVscodeMarketplace [ @@ -26,11 +26,11 @@ } ~~~ - This expression should fetch + This expression should fetch - the *nix* vscode extension from whatever source defined in the default nixpkgs extensions set `vscodeExtensions`. - - the *code-runner* vscode extension from the marketplace using the + - the *code-runner* vscode extension from the marketplace using the following url: ~~~ @@ -72,6 +72,11 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { meta = vscode.meta; } '' mkdir -p "$out/bin" + mkdir -p "$out/share/applications" + mkdir -p "$out/share/pixmaps" + + ln -sT "${vscode}/share/applications/code.desktop" "$out/share/applications/code.desktop" + ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png" ${if [] == vscodeExtensions then '' ln -sT "${vscode}/bin/${wrappedExeName}" "$out/bin/${exeName}" diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 85d9b0546d62587925265bc56e247b3ff4af4f4c..c345e8a95d55b6a1e8976877cf13eeea6f52d6d1 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext, bash }: +{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: stdenv.mkDerivation rec { name = "wxHexEditor-${version}"; - version = "v0.24"; + version = "0.24"; src = fetchFromGitHub { repo = "wxHexEditor"; owner = "EUA"; - rev = version; + rev = "v${version}"; sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; }; diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index 916f296b3fccfdd3fc5970b4e76e5ffdb5a4c99c..e20c0a3cbca775da1885871f82abbc7522dd7aac 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -8,8 +8,8 @@ let yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self); in -stdenv.mkDerivation { - name = "yi-custom"; +stdenv.mkDerivation rec { + name = "yi-custom-${version}"; version = "0.0.0.1"; unpackPhase = "true"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 987b544c556576acc5fd7e9e44e80b2cd6e50ecc..a64e9a18e1ad553eda07deb27268eb0fe4f83441 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,20 +1,25 @@ { stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages +, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS }: stdenv.mkDerivation { name = "grass-7.2.2"; src = fetchurl { - url = http://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz; + url = https://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz; sha256 = "0yzljbrxlqp4wbw08n1dvmm4vmwkg8glf1ff4xyh589r5ryb7gxv"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas ] + readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas + libLAS ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); + # On Darwin the installer tries to symlink the help files into a system + # directory + patches = [ ./no_symbolic_links.patch ]; + configureFlags = [ "--with-proj-share=${proj}/share/proj" "--without-opengl" @@ -29,8 +34,12 @@ stdenv.mkDerivation { "--with-mysql-includes=${mysql.connector-c}/include/mysql" "--with-mysql-libs=${mysql.connector-c}/lib/mysql" "--with-blas" + "--with-liblas=${libLAS}/bin/liblas-config" ]; + # Otherwise a very confusing "Can't load GDAL library" error + makeFlags = stdenv.lib.optional stdenv.isDarwin "GDAL_DYNAMIC="; + /* Ensures that the python script run at build time are actually executable; * otherwise, patchShebangs ignores them. */ postConfigure = '' @@ -69,6 +78,7 @@ stdenv.mkDerivation { --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' ln -s $out/grass-*/lib $out/lib + ln -s $out/grass-*/include $out/include ''; enableParallelBuilding = true; @@ -78,5 +88,6 @@ stdenv.mkDerivation { description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [mpickering]; }; } diff --git a/pkgs/applications/gis/grass/no_symbolic_links.patch b/pkgs/applications/gis/grass/no_symbolic_links.patch new file mode 100644 index 0000000000000000000000000000000000000000..ef09b97b70371a8978e807fd5580ae1af9c32165 --- /dev/null +++ b/pkgs/applications/gis/grass/no_symbolic_links.patch @@ -0,0 +1,37 @@ +diff --git a/include/Make/Install.make b/include/Make/Install.make +index 0aba138..8ba74bc 100644 +--- a/include/Make/Install.make ++++ b/include/Make/Install.make +@@ -116,11 +116,6 @@ real-install: | $(INST_DIR) $(UNIX_BIN) + -$(INSTALL) config.status $(INST_DIR)/config.status + -$(CHMOD) -R a+rX $(INST_DIR) 2>/dev/null + +-ifneq ($(findstring darwin,$(ARCH)),) +- @# enable OSX Help Viewer +- @/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR) +-endif +- + $(INST_DIR) $(UNIX_BIN): + $(MAKE_DIR_CMD) $@ + +diff --git a/macosx/app/build_html_user_index.sh b/macosx/app/build_html_user_index.sh +index 04e63eb..c9d9c2c 100755 +--- a/macosx/app/build_html_user_index.sh ++++ b/macosx/app/build_html_user_index.sh +@@ -140,7 +140,6 @@ else + # echo "$BASENAME $SHORTDESC" >> $FULLINDEX + # make them local to user to simplify page links + echo "$BASENAME $SHORTDESC" >> $FULLINDEX +- ln -sf "$HTMLDIRG/$i" global_$i + done + done + fi +@@ -183,8 +182,3 @@ echo " + " > $i.html + done + +-# add Help Viewer links in user docs folder +- +-mkdir -p $HOME/Library/Documentation/Help/ +-ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER-addon +-ln -sfh $GISBASE/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 6eb7fba646cb50b4657214cfb0e7cfff20abb5e0..6ed6326f16e5ab50d364c54f6ac5206675699c77 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchFromGitHub, gdal, cmake, ninja, proj, clipper, zlib, qtbase, qttools - , qtlocation, qtsensors, doxygen, cups, makeWrapper + , qtlocation, qtsensors, doxygen, cups, makeWrapper, qtimageformats }: stdenv.mkDerivation rec { name = "OpenOrienteering-Mapper-${version}"; - version = "0.8.1"; + version = "0.8.2"; - buildInputs = [ gdal qtbase qttools qtlocation qtsensors clipper zlib proj doxygen cups]; + buildInputs = [ gdal qtbase qttools qtlocation qtimageformats + qtsensors clipper zlib proj doxygen cups]; nativeBuildInputs = [ cmake makeWrapper ninja ]; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "10viw8bddl76mc2gh84jsl7h237yzvh4nim61pbd63vg1hlqisi6"; + sha256 = "02lga6nlal4c7898zc3lv1pcwyv1wpkn7v2xji2kgq68r6aw6j59"; }; cmakeFlags = @@ -48,19 +49,20 @@ stdenv.mkDerivation rec { # Fixes "This application failed to start because it could not find or load the Qt # platform plugin "cocoa"." wrapProgram $out/Mapper.app/Contents/MacOS/Mapper \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms \ + --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtimageformats}/${qtbase.qtPluginPrefix} mkdir -p $out/bin ln -s $out/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper ''; - meta = { + meta = with stdenv.lib; { description = '' OpenOrienteering Mapper is an orienteering mapmaking program and provides a free alternative to the existing proprietary solution. ''; homepage = https://www.openorienteering.org/apps/mapper/; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; darwin; - maintainers = with stdenv.lib.maintainers; [mpickering]; + license = licenses.gpl3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [mpickering]; }; } diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 21ee4297599a515a463c734ef98178023fdefc48..8f06a659f60cd2c77a3eb3bc4e88456797b63455 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,23 +1,31 @@ -{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl +{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper -, qjson, qca2, txt2tags, openssl -, withGrass ? false, grass +, qjson, qca2, txt2tags, openssl, darwin, pkgconfig +, withGrass ? true, grass, IOKit, ApplicationServices }: stdenv.mkDerivation rec { - name = "qgis-2.18.17"; + name = "qgis-2.18.22"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla - fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ + fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig ] + ++ + (stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]) + ++ (stdenv.lib.optional withGrass grass) ++ + (stdenv.lib.optional (stdenv.isDarwin && withGrass) darwin.apple_sdk.libs.utmp) ++ (with python2Packages; [ jinja2 numpy psycopg2 pygments requests python2Packages.qscintilla sip ]); - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; # `make -f src/providers/wms/CMakeFiles/wmsprovider_a.dir/build.make src/providers/wms/CMakeFiles/wmsprovider_a.dir/qgswmssourceselect.cpp.o`: # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory enableParallelBuilding = false; + preConfigure = '' + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libspatialindex)" + ''; + # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. preBuild = '' @@ -25,23 +33,50 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "1nxwl5lwibbiz9v3qaw3px7iyxg113zr4j8d99yj07mhk2ap082y"; + url = "https://qgis.org/downloads/${name}.tar.bz2"; + sha256 = "00b3a2hfn3i7bdx7x96vz2nj0976vpkhid4ss7n8c33fdvw3k82a"; }; - cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + # CMAKE_FIND_FRAMEWORK=never stops the installer choosing system + # installed frameworks + # QGIS_MACAPP_BUNDLE=0 stops the installer copying the Qt binaries into the + # installation which causes havoc + # Building RelWithDebInfo allows QGIS_DEBUG to print debugging information + cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}" + ++ stdenv.lib.optional stdenv.isDarwin + (["-DCMAKE_FIND_FRAMEWORK=never"] + ++ ["-DQGIS_MACAPP_BUNDLE=0"]); +# ++ ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"]; - postInstall = '' - wrapProgram $out/bin/qgis \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} - ''; + + + postInstall = + (stdenv.lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/qgis \ + --set PYTHONPATH $PYTHONPATH \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} + '') + + (stdenv.lib.optionalString stdenv.isDarwin '' + # Necessary for QGIS to find the correct default GRASS path + # Plugins look for gdal tools like deminfo on the PATH + ${stdenv.lib.optionalString withGrass "ln -sf ${grass} $out/QGIS.app/Contents/MacOS/grass"} + for file in $(find $out -type f -name "QGIS"); do + wrapProgram "$file" \ + --prefix DYLD_LIBRARY_PATH : "${qwt}/lib" \ + --prefix DYLD_LIBRARY_PATH : "${qscintilla}/lib" \ + --prefix PATH : "${gdal}/bin" \ + ${stdenv.lib.optionalString withGrass "--prefix PATH : ${grass}/bin"} \ + --set PYTHONPATH $PYTHONPATH + done + mkdir -p $out/bin + ln -s $out/QGIS.app/Contents/MacOS/QGIS $out/bin/qgis + ''); meta = { description = "User friendly Open Source Geographic Information System"; homepage = http://www.qgis.org; license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; unix; + maintainers = with stdenv.lib.maintainers; [mpickering]; }; } diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f6adf7857ede0a1da038401ec3a0e72540c4b9cb --- /dev/null +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform , fetchFromGitHub, Security }: +rustPlatform.buildRustPackage rec { + name = "whitebox_tools-${version}"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "jblindsay"; + repo = "whitebox-tools"; + rev = "6221cdf327be70f0ee4f2053b76bfa01c3f37caa"; + sha256 = "1423ga964mz7qkl88vkcm8qfprsksx04aq4sz9v5ghnmdzzvl89x"; + }; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + + cargoSha256 = "1gbgirng21ak0kl3fiyr6lxwzrjd5v79gcrbzf941nb8y8rlvz7k"; + + meta = with stdenv.lib; { + description = "An advanced geospatial data analysis platform"; + homepage = http://www.uoguelph.ca/~hydrogeo/WhiteboxTools/index.html; + license = licenses.mit; + maintainers = [ maintainers.mpickering ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 410c74ac6cfa874155f7c7e10da42f84485cfee0..c4afd6b3bed3cfc6c8dc1097c5d645a262171a0c 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg -, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp +, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices -, buildPlatform, hostPlatform +, hostPlatform }: let @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-27"; - sha256 = "04v7m1s2a89xi57fpxbq30hzxqg3fawr3lms6wfmaq4j2ax0qw6k"; + version = "7.0.8-6"; + sha256 = "1v7m1g9a7fqc8nravvv3dy54nzd3ip75hcnkdrpb5wbiz9pqgzi3"; patches = []; }; in @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 + libpng libtiff libxml2 libheif ] ++ lib.optionals (!hostPlatform.isMinGW) [ openexr librsvg openjpeg ] @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; + license = licenses.asl20; maintainers = with maintainers; [ the-kenny wkennington ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index be3a369c28b60f76233d008bdc9c9464591aba11..94a4aeaa9337e7b6a419b5e19c6d0df65093bb33 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg -, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp +, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices -, buildPlatform, hostPlatform +, hostPlatform }: let @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ImageMagick"; - repo = "ImageMagick"; + repo = "ImageMagick6"; rev = cfg.version; inherit (cfg) sha256; }; @@ -66,18 +66,20 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 + libpng libtiff libxml2 libheif libde265 ] ++ lib.optionals (!hostPlatform.isMinGW) [ openexr librsvg openjpeg ] ++ lib.optional stdenv.isDarwin ApplicationServices; propagatedBuildInputs = - [ bzip2 freetype libjpeg lcms2 ] + [ bzip2 freetype libjpeg lcms2 fftw ] ++ lib.optionals (!hostPlatform.isMinGW) [ libX11 libXext libXt libwebp ] ; + doCheck = false; # fails 6 out of 76 tests + postInstall = '' (cd "$dev/include" && ln -s ImageMagick* ImageMagick) moveToOutput "bin/*-config" "$dev" @@ -99,5 +101,6 @@ stdenv.mkDerivation rec { description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ the-kenny wkennington ]; + license = licenses.asl20; }; } diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 5fb7e0078065d9d8937799e3258052952ca5d714..5326458038087b3101d0afcb9934c10c99f38e6e 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, +{ stdenv, fetchFromGitHub, pkgconfig, libconfig, gtkmm2, glibmm, libxml2, libsecret, curl, libzip, librsvg, gst_all_1, autoreconfHook, makeWrapper, useUnrar ? false, unrar diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0d6b538b1072d5f0adec77dca2b84d9b71d9ea00 --- /dev/null +++ b/pkgs/applications/graphics/animbar/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchurl, cmake, qt4, file, gcc }: + +stdenv.mkDerivation rec { + pname = "animbar"; + version = "1.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + sha256 = "0836nwcpyfdrapyj3hbg3wh149ihc26pc78h01adpc7c0r7d9pr9"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt4 file ]; + + installPhase = '' + mkdir -p $out/bin $out/share/pixmaps + cp src/animbar $out/bin + cp ../icon/* $out/share/pixmaps + ''; + + meta = with lib; { + description = "Create your own animation on paper and transparancy"; + longDescription = '' + Animbar lets you easily create your own animation on paper and + transparancy. From a set of input images two output images are + computed, that are printed one on paper and one on + transparency. By moving the transparency over the paper you + create a fascinating animation effect. This kind of animation + technique is hundreds of years old and known under several + names: picket fence animation, barrier grid animation, Moiré + animation, to name a few. + ''; + homepage = http://animbar.mnim.org; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix index d415df1bae804b5d66edf830f1f7b8231019149f..f51777bdbf7343ed3d13e775ea7881be4bed9867 100644 --- a/pkgs/applications/graphics/ao/default.nix +++ b/pkgs/applications/graphics/ao/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; # Some parts can be extracted and used under LGPL2+ maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e0aea87c90c335383752ad400a8b800dec6be9e1 --- /dev/null +++ b/pkgs/applications/graphics/avocode/default.nix @@ -0,0 +1,99 @@ +{ stdenv, makeDesktopItem, fetchurl, unzip +, gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2 +, xorg, mozjpeg +}: + +stdenv.mkDerivation rec { + name = "avocode-${version}"; + version = "3.4.0"; + + src = fetchurl { + url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; + sha256 = "1dk4vgam9r5nl8dvpfwrn52gq6r4zxs4zz63p3c4gk73d8qnh4dl"; + }; + + libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [ + stdenv.cc.cc.lib + gdk_pixbuf + glib + gtk2 + atk + pango + cairo + freetype + fontconfig + dbus + nss + nspr + alsaLib + cups + expat + udev + GConf + libX11 + libxcb + libXi + libXcursor + libXdamage + libXrandr + libXcomposite + libXext + libXfixes + libXrender + libXtst + libXScrnSaver + ]); + + desktopItem = makeDesktopItem { + name = "Avocode"; + exec = "avocode"; + icon = "avocode"; + desktopName = "Avocode"; + genericName = "Design Inspector"; + categories = "Application;Development;"; + comment = "The bridge between designers and developers"; + }; + + buildInputs = [ unzip ]; + + # src is producing multiple folder on unzip so we must + # override unpackCmd to extract it into newly created folder + unpackCmd = '' + mkdir out + unzip $curSrc -d out + ''; + + installPhase = '' + substituteInPlace avocode.desktop.in \ + --replace /path/to/avocode-dir/Avocode $out/bin/avocode \ + --replace /path/to/avocode-dir/avocode.png avocode + + mkdir -p share/applications share/pixmaps + mv avocode.desktop.in share/applications/avocode.desktop + mv avocode.png share/pixmaps/ + + rm resources/cjpeg + cp -av . $out + + mkdir $out/bin + ln -s $out/avocode $out/bin/avocode + ln -s ${mozjpeg}/bin/cjpeg $out/resources/cjpeg + ''; + + postFixup = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode + for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do + patchelf --set-rpath ${libPath}:$out/ $file + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://avocode.com/; + description = "The bridge between designers and developers"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ megheaiulian ]; + }; +} diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index f7a813f360612979f9a5deb00ccadde382b05ab4..df742645e86b1d241476bf3cbcd8b573b8514a89 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }: +{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }: let diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index a27590ccd4da257a814d521708c2d35af7d612b0..4032e2e3fee358be9424a80dda45f2f8ae18c4fd 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { buildInputs = [unzip]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Java based toolkit for handling SVG"; + homepage = https://xmlgraphics.apache.org/batik; + license = licenses.asl20; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 74631e88ebfb611b14e66b0453c73a42ef39c851..7e1c6d7c8c4bcf0da3f3c0eeac0c793830e7b305 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "c3d"; - version = "1.1.0"; + version = "2018-10-04"; src = fetchgit { url = "https://git.code.sf.net/p/c3d/git"; - rev = "3453f6133f0df831dcbb0d0cfbd8b26e121eb153"; - sha256 = "1xgbk20w22jwvf7pa0n4lcbyx35fq56zzlslj0nvcclh6vx0b4z8"; + rev = "351929a582b2ef68fb9902df0b11d38f44a0ccd0"; + sha256 = "0mpv4yl6hdnxgvnwrmd182h64n3ppp30ldzm0jz6jglk0nvpzq9w"; }; nativeBuildInputs = [ cmake ]; @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license = licenses.gpl2; + broken = true; }; } diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index d81fea5ea398ec917c1b485560178a294d8539b9..51a401d4b8c86d6ad1222b130f0d1826537ef9cd 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -3,38 +3,47 @@ , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 +, ocl-icd, pcre, gtk-mac-integration }: stdenv.mkDerivation rec { - version = "2.4.2"; + version = "2.4.4"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "10asz918kv2248px3w9bn5k8cfrad5xrci58x9y61l0yf5hcpk0r"; + sha256 = "0kdhmiw4wxk2w9v2hms9yk8nl4ymdshnqyj0l07nivzzr6w20hwn"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; buildInputs = [ - cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif + cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libsoup graphicsmagick json-glib openjpeg lua pugixml - colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme - osm-gps-map - ]; + libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre + ] ++ stdenv.lib.optionals stdenv.isLinux [ + colord colord-gtk libX11 ocl-icd + ] ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration; cmakeFlags = [ "-DBUILD_USERMANUAL=False" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DUSE_COLORD=OFF" + "-DUSE_KWALLET=OFF" ]; + # darktable changed its rpath handling in commit # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in # the wrappers: - preFixup = '' + preFixup = let + libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libPathPrefix = "$out/lib/darktable" + stdenv.lib.optionalString stdenv.isLinux ":${ocl-icd}/lib"; + in '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable" + --prefix ${libPathEnvVar} ":" "${libPathPrefix}" ) ''; @@ -42,7 +51,7 @@ stdenv.mkDerivation rec { description = "Virtual lighttable and darkroom for photographers"; homepage = https://www.darktable.org; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ goibhniu rickynils flosse mrVanDalo ]; }; } diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 73362588a57eb9fb1fd7d3563ca6613d14b27113..a1f26f7bc09f4cf8aeff95e0b2eced72a6fbaf29 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, -libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, +libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme, gtk-mac-integration }: stdenv.mkDerivation rec { @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { version = "0.97.3.20170622"; src = fetchgit { - url = git://git.gnome.org/dia; + url = https://gitlab.gnome.org/GNOME/dia.git; rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c"; sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96"; }; buildInputs = [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5 - libxslt docbook_xsl libart_lgpl ] + libxslt docbook_xsl libart_lgpl hicolor-icon-theme ] ++ stdenv.lib.optional withGNOME libgnomeui ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration; @@ -24,20 +24,15 @@ stdenv.mkDerivation rec { preConfigure = '' NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough ''; - configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; + configureFlags = stdenv.lib.optional withGNOME "--enable-gnome"; hardeningDisable = [ "format" ]; - # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command - # It have no reasons to exist in a redistribuable package - postInstall = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; - - meta = { + meta = with stdenv.lib; { description = "Gnome Diagram drawing software"; homepage = http://live.gnome.org/Dia; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ raskin ]; + license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 633a1d9bd6e6d7a8a566ea13020443c9cfdc6661..a31bbe8caeb6f780691a5e63164b8b213cd0eac8 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -35,7 +35,6 @@ , libusb1 , marble , libGLU_combined -, mysql , opencv3 , pcre , threadweaver @@ -116,7 +115,7 @@ mkDerivation rec { meta = with lib; { description = "Photo Management Program"; license = licenses.gpl2; - homepage = http://www.digikam.org; + homepage = https://www.digikam.org; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 9984c0222a0211fa849d4bba1ad38762803dd016..821a9e8083e15e27a88f75dc966c8ed90f77b946 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -3,7 +3,8 @@ , argyllcms, wxPython, numpy }: buildPythonPackage { - name = "displaycal-3.5.0.0"; + pname = "displaycal"; + version = "3.5.0.0"; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d45d6c3a62e391fbee9634d53af8ded65bf0590b --- /dev/null +++ b/pkgs/applications/graphics/dosage/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + pname = "dosage"; + version = "2018.04.08"; + PBR_VERSION = version; + + src = fetchFromGitHub { + owner = "webcomics"; + repo = "dosage"; + rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; + sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; + }; + buildInputs = with pythonPackages; [ pytest responses ]; + propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ]; + + disabled = pythonPackages.pythonOlder "3.3"; + + checkPhase = '' + py.test tests/ + ''; + + meta = { + description = "A comic strip downloader and archiver"; + homepage = https://dosage.rocks/; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 9ab43ff9433706e8c232b6d60b5b99fc7ed6dc5a..30101bb947709d3aff7e8f14ce8d681bada18407 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -1,12 +1,10 @@ -{ stdenv, requireFile, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, - dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12, - xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc, +{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, + dbus, alsaLib, cups, fontconfig, glib, icu, libpng12, + xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libXrender, libXcomposite }: -assert stdenv.system == "x86_64-linux"; - -let version = "2017-SP2"; in +let version = "2018SP2"; in stdenv.mkDerivation { name = "draftsight-${version}"; @@ -33,7 +31,7 @@ stdenv.mkDerivation { $out/bin/$exe \ --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" done - for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so; do + for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so*; do # DraftSight ships with broken symlinks for some reason if [ -f $(readlink -f $lib) ] then @@ -43,6 +41,19 @@ stdenv.mkDerivation { echo "Ignoring broken link $lib" fi done + for lib in $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/lib/cpp/*.so*; do + if [ -f $(readlink $lib) ] + then + echo "Patching $lib..." + chmod u+w $lib + patchelf --set-rpath $libPath:\$ORIGIN/../Libraries $lib + else + echo "Ignoring broken link $lib" + fi + done + # These libraries shouldn't really be here anyway: + find $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/Samples/C++ \ + -type d -name _lib | xargs rm -r ''; # TODO: Figure out why HelpGuide segfaults at startup. @@ -53,15 +64,15 @@ stdenv.mkDerivation { # that it dlopen()'s libraries in paths removed by shrinking RPATH. dontPatchELF = true; - src = requireFile { + src = fetchurl { name = "draftSight.deb"; - url = "https://www.3ds.com/?eID=3ds_brand_download&uid=41&pidDown=13426&L=0"; - sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr"; + url = "http://dl-ak.solidworks.com/nonsecure/draftsight/${version}/draftSight.deb"; + sha256 = "05lrvml0zkzqg0sj6sj2h8h66hxdmsw5fg9fwz923r1y8j48qxdx"; }; libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils - dbus_tools alsaLib cups.lib fontconfig glib icu libpng12 - xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11 + dbus alsaLib cups.lib fontconfig glib icu libpng12 + xkeyboard_config zlib libxslt libxml2 sqlite orc libX11 libXcursor libXrandr libxcb libXi libSM libICE libXrender libXcomposite ]; @@ -71,6 +82,6 @@ stdenv.mkDerivation { homepage = https://www.3ds.com/products-services/draftsight-cad-software/; license = stdenv.lib.licenses.unfree; maintainers = with maintainers; [ hodapp ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3645cc565728ebdf7ae25ec547640461704f7e3c --- /dev/null +++ b/pkgs/applications/graphics/epeg/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake +, libjpeg, libexif +}: + +stdenv.mkDerivation rec { + name = "epeg-0.9.1.042"; # version taken from configure.ac + + src = fetchFromGitHub { + owner = "mattes"; + repo = "epeg"; + rev = "248ae9fc3f1d6d06e6062a1f7bf5df77d4f7de9b"; + sha256 = "14ad33w3pxrg2yfc2xzyvwyvjirwy2d00889dswisq8b84cmxfia"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig libtool autoconf automake ]; + + propagatedBuildInputs = [ libjpeg libexif ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/mattes/epeg; + description = "Insanely fast JPEG/ JPG thumbnail scaling"; + platforms = platforms.linux ++ platforms.darwin; + license = { + url = "https://github.com/mattes/epeg#license"; + }; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index e698fb8f234184c105cca670aa43a3b820f7b01f..562fb8c11dc39124fd220ff86cd3f53fdb99cfcd 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }: - -assert fltk.glSupport; +{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, ctl }: stdenv.mkDerivation { name ="openexr_viewers-2.2.1"; @@ -14,14 +12,14 @@ stdenv.mkDerivation { ./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config ''; - buildPahse = '' + buildPhase = '' make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl" ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openexr fltk libGLU_combined openexr_ctl ]; + buildInputs = [ openexr fltk libGLU_combined ctl ]; - meta = { + meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; homepage = http://openexr.com; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index 097062a8258a7dc62a04c8a1fa9ba1aeb3f7d6bb..7980d09fed12b802556a74fa371b146f7d5ccba6 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }: stdenv.mkDerivation rec { - name = "exrtools"; + name = "exrtools-${version}"; version = "0.4"; src = fetchurl { - url = "http://scanline.ca/exrtools/${name}-${version}.tar.gz"; + url = "http://scanline.ca/exrtools/${name}.tar.gz"; sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; }; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 2943b5ef94c0e705fa4ffaa927c180e8b1c53f39..33d65a860764e473b1881ec4fe98548e1f43ea16 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,25 +1,28 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm -, epoxy, poppler, lirc }: +, epoxy, poppler, mesa_noglu, lirc }: stdenv.mkDerivation rec { - name = "fbida-2.13"; + name = "fbida-2.14"; src = fetchurl { url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; - sha256 = "01yv4qqqfbz9v281y2jlxhxdym3ricyb0zkqkgp5b40qrmfik1x8"; + sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; }; nativeBuildInputs = [ pkgconfig which ]; - buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff - libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ]; + buildInputs = [ + libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp + imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc + mesa_noglu + ]; - makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" ]; + makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ]; - patchPhase = - '' + patchPhase = '' sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile - ''; + sed -e 's@$(HAVE_LINUX_FB_H)@yes@' -i GNUmakefile + ''; meta = with stdenv.lib; { description = "Image viewing and manipulation programs"; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index d7f25fdd42619bd79788480add72dd936c3c499d..f10916bcd6318fe593fa33feec8538c703738e89 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,17 +6,16 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.25.1"; + version = "2.27.1"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "197sm78bm33dvahr5nxqkbmpmdn4b13ahc9mrgn1l7n104bg4phc"; + sha256 = "10zk76l491s22qrv86rax6cvpgwyl3qq0izl2pbk0k1z1kw3ihvf"; }; outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ makeWrapper xorg.libXt ] - ++ optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; + nativeBuildInputs = [ makeWrapper xorg.libXt ]; buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; @@ -36,8 +35,9 @@ stdenv.mkDerivation rec { install -D -m 644 man/*.1 $out/share/man/man1 ''; - checkPhase = '' - PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test + checkInputs = [ perlPackages.TestCommand perlPackages.TestHarness ]; + preCheck = '' + export PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" ''; doCheck = true; diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1e54152fff4d302ac8de03e1832407434676ed63 --- /dev/null +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, ghostscript, libpng } : + +let + version = "3.2.7a"; + +in stdenv.mkDerivation { + name = "fig2dev-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; + sha256 = "0a7vkfl38fvkhg3na5gr9c4fskas9wbs84y9djg85nzwbshik8mx"; + }; + + buildInputs = [ libpng ]; + + GSEXE="${ghostscript}/bin/gs"; + + meta = with stdenv.lib; { + description = "Tool to convert Xfig files to other formats"; + homepage = http://mcj.sourceforge.net/; + license = licenses.xfig; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index d517306c1d613d93074457a2bb642c4001427f20..6362d6c06fe92ef7df7d4973461d5229c19a44c6 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,20 +1,33 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper, makeDesktopItem }: +, hdf5, vtk, medfile, zlib, python27Packages, swig, gfortran, fetchpatch +, soqt, libf2c, makeWrapper, makeDesktopItem +, mpi ? null }: + +assert mpi != null; let pythonPackages = python27Packages; in stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "0.16.6712"; + version = "0.17"; src = fetchurl { url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz"; - sha256 = "14hs26gvv7gbg9misxq34v4nrds2sbxjhj4yyw5kq3zbvl517alp"; + sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df"; }; - buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost - zlib python swig gfortran soqt libf2c makeWrapper matplotlib - pycollada pyside pysideShiboken pysideTools pivy + buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts + zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile + ] ++ (with pythonPackages; [ + matplotlib pycollada pyside pysideShiboken pysideTools pivy python boost + ]); + + patches = [ + # Fix for finding boost_python. Boost >= 1.67.0 appends the Python version. + (fetchpatch { + url = https://github.com/FreeCAD/FreeCAD/commit/3c9e6b038ed544e446c61695dab62f83e781a28a.patch; + sha256 = "0f09qywzn0y41hylizb5g8jy74fi53iqmvqr5zznaz16wpw4hqbp"; + }) ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b1437508a5094814f73d337abb15fa5495c64936 --- /dev/null +++ b/pkgs/applications/graphics/fstl/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchFromGitHub, qtbase, mesa_glu}: +stdenv.mkDerivation rec { + name = "fstl-${version}"; + version = "0.9.3"; + + buildInputs = [qtbase mesa_glu]; + + prePatch = '' + sed -i "s|/usr/bin|$out/bin|g" qt/fstl.pro + ''; + + preBuild = '' + qmake qt/fstl.pro + ''; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv fstl.app $out/Applications + ''; + + src = fetchFromGitHub { + owner = "mkeeter"; + repo = "fstl"; + rev = "v" + version; + sha256 = "1j0y9xbf0ybrrnsmfzgpyyz6bi98xgzn9ivani424j01vffns892"; + }; + + meta = with stdenv.lib; { + description = "The fastest STL file viewer"; + homepage = "https://github.com/mkeeter/fstl"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ tweber ]; + }; +} diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index d034f5d64d9384165a9079cc60b8889e07b04285..a1ea88da84be2d6c88911a101b3d962dc0866f07 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = http://geeqie.sourceforge.net; maintainers = with maintainers; [ jfrankenau pSub ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix deleted file mode 100644 index a2cbffd5d217bddeca2ff65ba39cf3aca1d27775..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf -, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff -, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper -, python2Packages, libexif, gettext, xorg -, AppKit, Cocoa, gtk-mac-integration }: - -let - inherit (python2Packages) pygtk wrapPython python; -in stdenv.mkDerivation rec { - name = "gimp-${version}"; - version = "2.8.22"; - - # This declarations for `gimp-with-plugins` wrapper, - # (used for determining $out/lib/gimp/${majorVersion}/ paths) - majorVersion = "2.0"; - targetPluginDir = "$out/lib/gimp/${majorVersion}/plug-ins"; - targetScriptDir = "$out/lib/gimp/${majorVersion}/scripts"; - - src = fetchurl { - url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - sha256 = "12k3lp938qdc9cqj29scg55f3bb8iav2fysd29w0s49bqmfa71wi"; - }; - - buildInputs = - [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo - freetype fontconfig lcms libpng libjpeg poppler libtiff webkit - libmng librsvg libwmf zlib libzip ghostscript aalib jasper - python pygtk libexif gettext xorg.libXpm - wrapPython - ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; - - pythonPath = [ pygtk ]; - - postFixup = '' - wrapPythonProgramsIn $out/lib/gimp/2.0/plug-ins/ - wrapProgram $out/bin/gimp \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" - ''; - - passthru = { gtk = gtk2; }; # probably its a good idea to use the same gtk in plugins ? - - #configureFlags = [ "--disable-print" ]; - - enableParallelBuilding = true; - - # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib" - + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; - - meta = { - description = "The GNU Image Manipulation Program"; - homepage = https://www.gimp.org/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..15033b8b2b09d86d2ca8a6203fb4a71ce07d250d --- /dev/null +++ b/pkgs/applications/graphics/gimp/default.nix @@ -0,0 +1,74 @@ +{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes +, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff +, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info +, python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 +, harfbuzz, mypaint-brushes, libwebp, libheif, libgudev, openexr +, AppKit, Cocoa, gtk-mac-integration }: + +let + inherit (python2Packages) pygtk wrapPython python; +in stdenv.mkDerivation rec { + name = "gimp-${version}"; + version = "2.10.6"; + + src = fetchurl { + url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; + sha256 = "07qh2ljbza2mph1gh8sicn27qihhj8hx3ivvry2874cfh8ghgj2f"; + }; + + nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ]; + propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc + buildInputs = [ + babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes + freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr + libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif + python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes + ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ] + ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ]; + + pythonPath = [ pygtk ]; + + # Check if librsvg was built with --disable-pixbuf-loader. + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk_pixbuf.moduleDir}"; + + preConfigure = '' + # The check runs before glib-networking is registered + export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" + ''; + + postFixup = '' + wrapPythonProgramsIn $out/lib/gimp/${passthru.majorVersion}/plug-ins/ + wrapProgram $out/bin/gimp-${stdenv.lib.versions.majorMinor version} \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + passthru = rec { + # The declarations for `gimp-with-plugins` wrapper, + # used for determining plug-in installation paths + majorVersion = "${stdenv.lib.versions.major version}.0"; + targetPluginDir = "lib/gimp/${majorVersion}/plug-ins"; + targetScriptDir = "lib/gimp/${majorVersion}/scripts"; + + # probably its a good idea to use the same gtk in plugins ? + gtk = gtk2; + }; + + configureFlags = [ + "--without-webkit" # old version is required + "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" + "--with-icc-directory=/var/run/current-system/sw/share/color/icc" + ]; + + doCheck = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "The GNU Image Manipulation Program"; + homepage = https://www.gimp.org/; + maintainers = with maintainers; [ jtojnar ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 0d4215dd5bc2cb92baf6a094ea3f0c05c98317ac..0c753498af345eec048d3517815477fee358e3d8 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -12,19 +12,18 @@ let prePhases = "extraLib"; extraLib = '' installScripts(){ - mkdir -p ${targetScriptDir}; - for p in "$@"; do cp "$p" ${targetScriptDir}; done + mkdir -p $out/${targetScriptDir}; + for p in "$@"; do cp "$p" $out/${targetScriptDir}; done } installPlugins(){ - mkdir -p ${targetPluginDir}; - for p in "$@"; do cp "$p" ${targetPluginDir}; done + mkdir -p $out/${targetPluginDir}; + for p in "$@"; do cp "$p" $out/${targetPluginDir}; done } ''; } // a - # don't call this gimp-* unless you want nix replace gimp by a plugin :-) // { - name = "${a.name}-${gimp.name}-plugin"; + name = "gimp-plugin-${a.name}"; buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []); nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []); } @@ -35,15 +34,6 @@ let installPhase = "installScripts ${src}"; }; - libLQR = pluginDerivation { - name = "liblqr-1-0.4.1"; - # required by lqrPlugin, you don't havet to install this lib explicitely - src = fetchurl { - url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2; - sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz"; - }; - }; - in rec { gap = pluginDerivation { @@ -52,7 +42,7 @@ rec { */ name = "gap-2.6.0"; src = fetchurl { - url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; + url = https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; patchPhase = '' @@ -62,7 +52,7 @@ rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { description = "The GIMP Animation Package"; - homepage = http://www.gimp.org; + homepage = https://www.gimp.org; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license # falls inside "free". license = with licenses; [ gpl3 free ]; @@ -97,6 +87,7 @@ rec { url = "http://registry.gimp.org/files/${name}.tar.bz2"; sha256 = "1gqf3hchz7n7v5kpqkhqh8kwnxbsvlb5cr2w2n7ngrvl56f5xs1h"; }; + meta.broken = true; }; resynthesizer = pluginDerivation { @@ -147,6 +138,7 @@ rec { sha256 = "1zzvbczly7k456c0y6s92a1i8ph4ywmbvdl8i4rcc29l4qd2z8fw"; }; installPhase = "installPlugins src/texturize"; + meta.broken = true; # https://github.com/lmanul/gimp-texturize/issues/1 }; waveletSharpen = pluginDerivation { @@ -166,54 +158,18 @@ rec { Layer/Liquid Rescale */ name = "lqr-plugin-0.6.1"; - buildInputs = with pkgs; [ libLQR ]; + buildInputs = with pkgs; [ liblqr1 ]; src = fetchurl { url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2; sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; }; - #postInstall = ''mkdir -p $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"''; + #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"''; installPhase = "installPlugins src/gimp-lqr-plugin"; }; - gmic = - pluginDerivation rec { - inherit (pkgs.gmic) name src meta; + gmic = pkgs.gmic.gimpPlugin; - buildInputs = with pkgs; [ fftw opencv curl ]; - - sourceRoot = "${name}/src"; - - buildFlags = "gimp"; - - installPhase = "installPlugins gmic_gimp"; - }; - - # this is more than a gimp plugin ! - # either load the raw image with gimp (and the import dialog will popup) - # or use the binary - ufraw = pluginDerivation rec { - name = "ufraw-0.19.2"; - buildInputs = with pkgs; [ gtkimageview lcms ]; - # --enable-mime - install mime files, see README for more information - # --enable-extras - build extra (dcraw, nikon-curve) executables - # --enable-dst-correction - enable DST correction for file timestamps. - # --enable-contrast - enable the contrast setting option. - # --enable-interp-none: enable 'None' interpolation (mostly for debugging). - # --with-lensfun: use the lensfun library - experimental feature, read this before using it. - # --with-prefix=PREFIX - use also PREFIX as an input prefix for the build - # --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window - configureFlags = "--enable-extras --enable-dst-correction --enable-contrast"; - - src = fetchurl { - url = "mirror://sourceforge/ufraw/${name}.tar.gz"; - sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk"; - }; - installPhase = " - installPlugins ufraw-gimp - mkdir -p $out/bin - cp ufraw $out/bin - "; - }; + ufraw = pkgs.ufraw.gimpPlugin; gimplensfun = pluginDerivation rec { version = "0.2.4"; @@ -239,7 +195,7 @@ rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; }; diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 7455a69dde97c9862904348be73144b63b63f980..ec529519159b2f3958ba07e9735d9b3ac3cb8299 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,9 +1,10 @@ { stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, plugins ? null}: let -allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation") (lib.attrValues gimpPlugins); +allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation" && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); selectedPlugins = if plugins == null then allPlugins else plugins; extraArgs = map (x: x.wrapArgs or "") selectedPlugins; +versionBranch = stdenv.lib.versions.majorMinor gimp.version; in symlinkJoin { name = "gimp-with-plugins-${gimp.version}"; @@ -13,14 +14,14 @@ in symlinkJoin { buildInputs = [ makeWrapper ]; postBuild = '' - for each in gimp-2.8 gimp-console-2.8; do + for each in gimp-${versionBranch} gimp-console-${versionBranch}; do wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ ${toString extraArgs} done set +x for each in gimp gimp-console; do - ln -sf "$each-2.8" $out/bin/$each + ln -sf "$each-${versionBranch}" $out/bin/$each done ''; } diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index dea3fd4e3c613a06424d992d7c4b3bc8683c48f1..fbc84521de08a6a7793d4716d5ed09511894b77d 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Cross platform image and hierarchical vector viewer based"; homepage = http://giv.sourceforge.net/giv/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index c1f15904818ff42916d6d8227be1815abdaaaa15..df8ebee020c910bbdb2f46fe662ae49b2ff960e9 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book -, intltool, itstool, makeWrapper, pkgconfig, which +, intltool, itstool, makeWrapper, pkgconfig, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.4.0"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz"; + url = "https://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz"; sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl"; }; @@ -17,11 +17,10 @@ stdenv.mkDerivation rec { barcode gtk3 gtk-doc gnome3.yelp-tools gnome3.gnome-common gnome3.gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool - + hicolor-icon-theme ]; preFixup = '' - rm "$out/share/icons/hicolor/icon-theme.cache" wrapProgram "$out/bin/glabels-3" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index 2b391710907c85ebe134837ebb5eec4f576c0462..b3671ead377ab2c13a2f7c82bb675dae2d8cc252 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkgconfig }: stdenv.mkDerivation rec { - name = "gnuclad"; + name = "gnuclad-${version}"; version = "0.2.4"; src = fetchurl { - url = "https://launchpad.net/gnuclad/trunk/0.2/+download/${name}-${version}.tar.gz"; + url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${name}.tar.gz"; sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 98a32ad1899547e393d45a6c277ed74818cb5739..78772a63dfe3192e4c83c6b4cc31676a1484a4f6 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gocr-0.51"; src = fetchurl { - url = "http://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz"; + url = "https://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz"; sha256 = "14i6zi6q11h6d0qds2cpvgvhbxk5xaa027h8cd0wy1zblh7sxckf"; }; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 8df630d582cc65188a27a8131a7fd5cf7d69914f..99230eb23e32d6fe876c8ec1c632083d23313fdd 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -1,17 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook +{ stdenv, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook , glfw3, gtk3, libpng12 }: stdenv.mkDerivation rec { name = "goxel-${version}"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "114s1pbv3ixc2gzkg7n927hffd6ly5gg59izw4z6drgjcdhd7xj9"; + sha256 = "01022c43pmwiqb18rx9fz08xr99h6p03gw6bp0lay5z61g3xkz17"; }; + patches = [ ./disable-imgui_ini.patch ]; + nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; diff --git a/pkgs/applications/graphics/goxel/disable-imgui_ini.patch b/pkgs/applications/graphics/goxel/disable-imgui_ini.patch new file mode 100644 index 0000000000000000000000000000000000000000..9427d45487d4b50ffb8ac053c0f4a0e01294fc61 --- /dev/null +++ b/pkgs/applications/graphics/goxel/disable-imgui_ini.patch @@ -0,0 +1,13 @@ +diff --git a/src/gui.cpp b/src/gui.cpp +index 9b7236c..a8a11b2 100644 +--- a/src/gui.cpp ++++ b/src/gui.cpp +@@ -314,6 +314,8 @@ static void init_ImGui(const inputs_t *inputs) + ImGuiIO& io = ImGui::GetIO(); + io.DeltaTime = 1.0f/60.0f; + ++ io.IniFilename = NULL; ++ + io.KeyMap[ImGuiKey_Tab] = KEY_TAB; + io.KeyMap[ImGuiKey_LeftArrow] = KEY_LEFT; + io.KeyMap[ImGuiKey_RightArrow] = KEY_RIGHT; diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index a892f98ac4753e34eff96d199803d580a4d8dd4d..75140bd005d56e561231178da55cc1aa42570db0 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { description = "A fast image viewer"; homepage = http://gqview.sourceforge.net; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix new file mode 100644 index 0000000000000000000000000000000000000000..bd1ce2ed893a49655c26e2e0fdc4f40a7476add2 --- /dev/null +++ b/pkgs/applications/graphics/graphicsmagick/compat.nix @@ -0,0 +1,37 @@ +{ stdenv, graphicsmagick }: + +stdenv.mkDerivation rec { + name = "graphicsmagick-imagemagick-compat-${version}"; + inherit (graphicsmagick) version; + + unpackPhase = "true"; + buildPhase = "true"; + + utils = [ + "composite" + "conjure" + "convert" + "identify" + "mogrify" + "montage" + "animate" + "display" + "import" + ]; + + # TODO: symlink libraries? + installPhase = '' + mkdir -p "$out"/bin + mkdir -p "$out"/share/man/man1 + for util in ''${utils[@]}; do + ln -s ${graphicsmagick}/bin/gm "$out/bin/$util" + ln -s ${graphicsmagick}/share/man/man1/gm.1.gz "$out/share/man/man1/$util.1.gz" + done + ''; + + meta = { + description = "ImageMagick interface for GraphicsMagick"; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index f086a8f5ba608b51b8caaedd49a5eeabc073b4c1..ee58e9831e9af57086c9a04e5043ecbf731b2922 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, bzip2, freetype, graphviz, ghostscript +{ stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: -let version = "1.3.28"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "graphicsmagick-${version}"; + version = "1.3.30"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0jlrrimrajcmwp7llivyj14qnzb1mpqd8vw95dl6zbx5m2lnhall"; + sha256 = "1warar0731xf94r4bn5x1km85rjabl4iq8r0dk3ywmczap3farfr"; }; patches = [ diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 8107ed8aa4497a5a9c11b56508fb3fce4ad1a3e4..1c5b8d1b81dda2bdacd846bc933358a7b006eda0 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = http://hugin.sourceforge.net/; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric hrdinka ]; + maintainers = with maintainers; [ hrdinka ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 673361c734e1302632767708152e63980bc1bb3e..0bbd543a307699df0c6a356458ed0441085c06c2 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -12,7 +12,7 @@ let version = "150"; src = fetchurl { - url = "http://wsr.imagej.net/distros/cross-platform/ij150.zip"; + url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip"; sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ad2cb4198d2d717815e67855ea889cf58c2f26ce --- /dev/null +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, ncurses }: + +stdenv.mkDerivation rec { + name = "imgcat-${version}"; + version = "2.3.0"; + + buildTools = [ autoconf automake libtool ncurses ]; + + preConfigure = '' + ${autoconf}/bin/autoconf + sed -i -e "s|-ltermcap|-L ${ncurses}/lib -lncurses|" Makefile + ''; + + preInstall = '' + makeFlagsArray=(PREFIX="$out"); + ''; + + src = fetchFromGitHub { + owner = "eddieantonio"; + repo = "imgcat"; + rev = "3d854c72f785dce0eecd9485767a7f972d54890c"; + sha256 = "0m83c33rzxvs0w214njql2c7q3fg06wnyijch3l2s88i7frl121f"; + }; + + meta = with stdenv.lib; { + description = "It's like cat, but for images"; + homepage = https://github.com/eddieantonio/imgcat; + license = licenses.isc; + maintainers = with maintainers; [ jwiegley ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index 90f8eec5993a801f0ffaadaab6cf738b7f924e3f..a881c0fc1f93176d6845f41e2ac9fd3fead59ac2 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "imlibsetroot-${version}"; version = "1.2"; src = fetchurl { - url = "http://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz"; + url = "https://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz"; sha256 = "8c1b3b7c861e4d865883ec13a96b8e4ab22464a87d4e6c67255b17a88e3cfd1c"; }; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 47452eb43e88be8c7c02b4c2e076f955c5325890..f4d08195309b024964d8b88d87e2e006f7e1e70b 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft +{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, potrace, cmake +, libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme }: let @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6"; }; + # Inkscape hits the ARGMAX when linking on macOS. It appears to be + # CMake’s ARGMAX check doesn’t offer enough padding for NIX_LDFLAGS. + # Setting strictDeps it avoids duplicating some dependencies so it + # will leave us under ARGMAX. + strictDeps = true; + unpackPhase = '' cp $src ${name}.tar.bz2 tar xvjf ${name}.tar.bz2 > /dev/null @@ -33,24 +39,25 @@ stdenv.mkDerivation rec { --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env perl perlXMLParser ]; buildInputs = [ - perl perlXMLParser libXft libpng zlib popt boehmgc + libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext - makeWrapper gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace cmake python2Env + gsl poppler imagemagick libwpg librevenge + libvisio libcdr libexif potrace hicolor-icon-theme ]; enableParallelBuilding = true; - postInstall = '' - # Make sure PyXML modules can be found at run-time. - rm "$out/share/icons/hicolor/icon-theme.cache" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + # Make sure PyXML modules can be found at run-time. + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; + # 0.92.3 complains about an invalid conversion from const char * to char * + NIX_CFLAGS_COMPILE = " -fpermissive "; + meta = with stdenv.lib; { license = "GPL"; homepage = https://www.inkscape.org; diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index f120f8b13d40516c75fd6ea53cdd1c877cce3ca9..9c81fe32b513208e3948e8fcb26ade068a556247 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -37,5 +37,6 @@ in pythonPackages.buildPythonApplication rec { homepage = http://manatlan.com/jbrout/; description = "Photo manager"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 0cad1e1aabb6df42e3a95663f802816ee810fac7..ba64aae621599a51f1fd61bd4f825884becc194f 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.5"; + version = "1.4.6"; name = "jpegoptim-${version}"; src = fetchurl { - url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz"; - sha256 = "1mngi8c4mhzwa7i4wqrqq6i80cqj4adbacblfvk6dy573wywyxmi"; + url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz"; + sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8"; }; # There are no checks, it seems. diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index eb59b6ff6d65d755609c3a55c41c34e33f96a3c4..3555c2b477ffccc3ed4641d542aaa93da67cff56 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc -, cmake, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype +{ stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc +, cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: @@ -20,24 +20,25 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false"; + cmakeFlags = [ + "-DK3D_BUILD_DOCS=false" + "-DK3D_BUILD_GUIDE=false" + ]; preConfigure = '' export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)" ''; + nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ]; + buildInputs = [ - cmake libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng - boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff - gettext intltool perl unzip ftgl glew asciidoc - gtkmm2 glibmm gtkglext pangox_compat libXmu + libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng + boost cairomm imagemagick libjpeg libtiff + ftgl glew gtkmm2 glibmm gtkglext pangox_compat libXmu ]; #doCheck = false; - enableParallelBuilding = true; - meta = { description = "A 3D editor with support for procedural editing"; homepage = http://www.k-3d.org/; diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 8f043816ba06d6087ae93ab34a230a3a96702aa1..0d898df14b3f9ee5d9246ca289661f3009681f08 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook -, kconfig, kcrash, kinit, kdoctools, kiconthemes, kio, kparts, kwidgetsaddons +, kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , qtbase, qtsvg , boost, graphviz }: diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index d27fdb8b53beb482ef13ae717a3b869e91417ec8..48a94a5253d01e19cc8b6a83d017850e857e68b6 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Plugins for KDE-based image applications"; license = stdenv.lib.licenses.gpl2; - homepage = http://www.digikam.org; + homepage = https://www.digikam.org; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 6eaa4727e811281f04b0a467e8b4f3999cb26b50..836a78ce058bd08762675a398db3f98c1c1a3413 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,19 +1,20 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, cmake, extra-cmake-modules +{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash -, boost, libraw, fftw, eigen, exiv2, lcms2, gsl, openexr +, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib , openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase , qtmultimedia, qtx11extras +, python3 }: mkDerivation rec { name = "krita-${version}"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "0dh3bm90mxrbyvdp7x7hcf5li48j7ppkb44lls65lpn6c59r5waz"; + sha256 = "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; @@ -21,9 +22,10 @@ mkDerivation rec { buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash - boost libraw fftw eigen exiv2 lcms2 gsl openexr + boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib openjpeg opencolorio vc poppler_qt5 curl ilmbase qtmultimedia qtx11extras + python3 ]; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2858086e0d643b56dff55875313dad122971d3bc --- /dev/null +++ b/pkgs/applications/graphics/krop/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript }: + +python3Packages.buildPythonApplication rec { + pname = "krop"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "arminstraub"; + repo = pname; + rev = "v${version}"; + sha256 = "0y8z9xr10wbzmi1dg1zpcsf3ihnxrnvlaf72821x3390s3qsnydf"; + }; + + propagatedBuildInputs = with python3Packages; [ + pyqt5 + pypdf2 + poppler-qt5 + libsForQt5.poppler + ghostscript + ]; + + # Disable checks because of interference with older Qt versions // xcb + doCheck = false; + + meta = { + homepage = http://arminstraub.com/software/krop; + description = "Graphical tool to crop the pages of PDF files"; + longDescription = '' + Krop is a tool that allows you to optimise your PDF files, and remove + sections of the page you do not want. A unique feature of krop, at least to my + knowledge, is its ability to automatically split pages into subpages to fit the + limited screensize of devices such as eReaders. This is particularly useful, if + your eReader does not support convenient scrolling. Krop also has a command line + interface. + ''; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ leenaars ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 8817071e9843100d9a803fe961edfae317767443..4b3a423a8ce232d83a1fd3cf6b3702c476533790 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }: +{ stdenv, fetchFromGitHub, gettext, poppler, qt5 , pkgconfig }: # Warning: You will also need a working pdflatex installation containing # at least auctex and pgf. @@ -64,8 +64,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext qt5.full poppler_qt5 ]; + buildInputs = [ gettext qt5.full poppler ]; enableParallelBuilding = true; } - diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index adb1ec29237e823bd8400b34c0e76af9dc6b51a9..bd5dea8014d6cdcecdb7b2480d2b3944f06110dc 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchFromGitHub, libGLU, qtbase, qtscript, qtxmlpatterns }: +{ fetchFromGitHub, libGLU, llvmPackages, qtbase, qtscript, qtxmlpatterns }: let - meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662"; - vcglibRev = "a8e87662b63ee9f4ded5d4699b28d74183040803"; + meshlabRev = "d596d7c086c51fbdfb56050f9c30b55dd0286d4c"; + vcglibRev = "6c3c940e34327322507c703889f9f1cfa73ab183"; + # ^ this should be the latest commit in the vcglib devel branch at the time of the meshlab revision + + stdenv = llvmPackages.stdenv; # only building with clang seems to be tested upstream in stdenv.mkDerivation { - name = "meshlab-2016.12"; + name = "meshlab-20180627-beta"; srcs = [ @@ -12,31 +15,32 @@ in stdenv.mkDerivation { owner = "cnr-isti-vclab"; repo = "meshlab"; rev = meshlabRev; - sha256 = "0srrp7zhi86dsg4zsx1615gr26barz38zdl8s03zq6vm1dgzl3cc"; + sha256 = "0xi7wiyy0yi545l5qvccbqahlcsf70mhx829gf7bq29640si4rax"; name = "meshlab-${meshlabRev}"; }) (fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "vcglib"; rev = vcglibRev; - sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; + sha256 = "0jfgjvf21y9ncmyr7caipy3ardhig7hh9z8miy885c99b925hhwd"; name = "vcglib-${vcglibRev}"; }) ]; sourceRoot = "meshlab-${meshlabRev}"; - patches = [ ./fix-2016.02.patch ]; - hardeningDisable = [ "format" ]; enableParallelBuilding = true; + patches = [ ./fix-20180627-beta.patch ]; + buildPhase = '' # MeshLab has ../vcglib hardcoded everywhere, so move the source dir mv ../vcglib-${vcglibRev} ../vcglib cd src export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" + export QMAKESPEC="linux-clang" pushd external qmake -recursive external.pro @@ -53,7 +57,7 @@ in stdenv.mkDerivation { ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver ''; - buildInputs = [ libGLU qtbase qtscript qtxmlpatterns ]; + buildInputs = [ libGLU llvmPackages.openmp qtbase qtscript qtxmlpatterns ]; meta = { description = "A system for processing and editing 3D triangular meshes."; diff --git a/pkgs/applications/graphics/meshlab/fix-2016.02.patch b/pkgs/applications/graphics/meshlab/fix-2016.02.patch deleted file mode 100644 index ebccccc00a296a5170f5510d5a3777b9f898b91d..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/meshlab/fix-2016.02.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 0fd17cd2b6d57e8a2a981a70115c2565ee076d0f Mon Sep 17 00:00:00 2001 -From: Marco Callieri -Date: Mon, 9 Jan 2017 16:06:14 +0100 -Subject: [PATCH 1/3] resolved ambiguity for abs overloads - - -diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp -index 364d53bf..ef3d4a2d 100644 ---- a/src/meshlabplugins/edit_quality/eqhandle.cpp -+++ b/src/meshlabplugins/edit_quality/eqhandle.cpp -@@ -83,7 +83,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) - setCursor(Qt::OpenHandCursor); - - QPointF newPos = event->scenePos(); -- qreal handleOffset = abs(newPos.x()-pos().x()); -+ qreal handleOffset = std::fabs(newPos.x()-pos().x()); - - if (handleOffset >= std::numeric_limits::epsilon()) - { --- -2.15.0 - - -From 33cfd5801e59b6c9e34360c75112e6dcb88d807b Mon Sep 17 00:00:00 2001 -From: Marco Callieri -Date: Tue, 10 Jan 2017 10:05:05 +0100 -Subject: [PATCH 2/3] again, fabs ambiguity - - -diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp -index ef3d4a2d..d29f8c45 100644 ---- a/src/meshlabplugins/edit_quality/eqhandle.cpp -+++ b/src/meshlabplugins/edit_quality/eqhandle.cpp -@@ -30,6 +30,7 @@ FIRST RELEASE - #include "eqhandle.h" - #include - #include -+#include - - EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position, - EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox, -@@ -83,7 +84,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) - setCursor(Qt::OpenHandCursor); - - QPointF newPos = event->scenePos(); -- qreal handleOffset = std::fabs(newPos.x()-pos().x()); -+ qreal handleOffset = fabs(newPos.x()-pos().x()); - - if (handleOffset >= std::numeric_limits::epsilon()) - { --- -2.15.0 - - -From d717e44f4134ebee03322a6a2a56fce626084a3c Mon Sep 17 00:00:00 2001 -From: Patrick Chilton -Date: Mon, 4 Dec 2017 21:27:23 +0100 -Subject: [PATCH 3/3] io_TXT -> io_txt - - -diff --git a/src/meshlab_full.pro b/src/meshlab_full.pro -index 6ea7f1db..2a95c127 100644 ---- a/src/meshlab_full.pro -+++ b/src/meshlab_full.pro -@@ -16,7 +16,7 @@ SUBDIRS = common \ - meshlabplugins/io_x3d \ - meshlabplugins/io_expe \ - meshlabplugins/io_pdb \ -- plugins_experimental/io_TXT \ -+ plugins_experimental/io_txt \ - # Filter plugins - meshlabplugins/filter_aging \ - meshlabplugins/filter_ao \ -diff --git a/src/plugins_experimental/io_TXT/io_txt.cpp b/src/plugins_experimental/io_txt/io_txt.cpp -similarity index 100% -rename from src/plugins_experimental/io_TXT/io_txt.cpp -rename to src/plugins_experimental/io_txt/io_txt.cpp -diff --git a/src/plugins_experimental/io_TXT/io_txt.h b/src/plugins_experimental/io_txt/io_txt.h -similarity index 100% -rename from src/plugins_experimental/io_TXT/io_txt.h -rename to src/plugins_experimental/io_txt/io_txt.h -diff --git a/src/plugins_experimental/io_TXT/io_txt.pro b/src/plugins_experimental/io_txt/io_txt.pro -similarity index 100% -rename from src/plugins_experimental/io_TXT/io_txt.pro -rename to src/plugins_experimental/io_txt/io_txt.pro --- -2.15.0 - diff --git a/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch b/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch new file mode 100644 index 0000000000000000000000000000000000000000..177b8e90c57430c4fe48be005c747325cec85fe4 --- /dev/null +++ b/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch @@ -0,0 +1,25 @@ +diff --git a/src/meshlabplugins/edit_paint/paintbox.cpp b/src/meshlabplugins/edit_paint/paintbox.cpp +index 2097a5b..6bcd1a4 100644 +--- a/src/meshlabplugins/edit_paint/paintbox.cpp ++++ b/src/meshlabplugins/edit_paint/paintbox.cpp +@@ -23,6 +23,7 @@ + + #include "paintbox.h" + #include ++#include + + Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags) + { +diff --git a/src/meshlabplugins/render_gdp/shaderDialog.h b/src/meshlabplugins/render_gdp/shaderDialog.h +index a62d3b5..7eb1594 100644 +--- a/src/meshlabplugins/render_gdp/shaderDialog.h ++++ b/src/meshlabplugins/render_gdp/shaderDialog.h +@@ -32,6 +32,8 @@ + #include "shaderStructs.h" + #include "ui_shaderDialog.h" + #include ++#include ++#include + + class QGLWidget; + diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index 33785a279c7b4aad0ccc934f821ecbcf8a7d7eb4..b48fd891a6ac16622045981ef348d02110456fcf 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl, file, pkgconfig, libpng, nasm }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libpng, nasm }: stdenv.mkDerivation rec { - version = "3.2"; + version = "3.3.1"; name = "mozjpeg-${version}"; - src = fetchurl { - url = "https://github.com/mozilla/mozjpeg/releases/download/v${version}/mozjpeg-${version}-release-source.tar.gz"; - sha256 = "0wvv5qh1jasz8apq93c3j9d5wd22j7lld9dr06p76yj4mpnc3v4a"; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "mozjpeg"; + rev = "v${version}"; + sha256 = "1na68860asn8b82ny5ilwbhh4nyl9gvx2yxmm4wr2v1v95v51fky"; }; - postPatch = '' - sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure - ''; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libpng nasm ]; meta = { diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 630834fc9e99976504c3328441a0291902d29bcd..120fc1174cdf9c99c03b58251ad7627d43cfc986 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, - pkgconfig, python2Packages, scons, swig, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobjectIntrospection, hicolor-icon-theme +, gdk_pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }: let inherit (python2Packages) python pycairo pygobject3 numpy; @@ -15,9 +15,14 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ intltool pkgconfig scons swig wrapGAppsHook ]; + nativeBuildInputs = [ + intltool pkgconfig scons swig wrapGAppsHook + gobjectIntrospection # for setup hook + ]; - buildInputs = [ gtk3 json_c lcms2 libpng librsvg pycairo pygobject3 python ]; + buildInputs = [ + gtk3 gdk_pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python hicolor-icon-theme + ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 8c3a8bc894b368687bee473072d51b21801ac8e8..05d047f7227505c3a71fa57e0114eded0e0f0f55 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , cmake -, makeWrapper , pkgconfig , wrapGAppsHook , gsettings-desktop-schemas @@ -18,12 +17,12 @@ }: stdenv.mkDerivation rec { - version = "3.6.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "0yli05hhmd57v3mynq78nmr15rbpm0vadv273pavmcnayv86yl44"; + sha256 = "0v2gsdc8caswf2b5aa023d8kil1fqf4r9mlg15180h3c92f8jzvh"; }; name = "nomacs-${version}"; @@ -34,8 +33,6 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */ImageLounge) ''; - patches = [./fix-appdata-install.patch]; - nativeBuildInputs = [cmake pkgconfig wrapGAppsHook]; diff --git a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch deleted file mode 100644 index cdeed56f496dd21f3ab0afd13ae07226bbf3dad4..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/UnixBuildTarget.cmake b/cmake/UnixBuildTarget.cmake -index 3521056a..34f99ed9 100644 ---- a/cmake/UnixBuildTarget.cmake -+++ b/cmake/UnixBuildTarget.cmake -@@ -80,7 +80,7 @@ install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) - # manpage - install(FILES Readme/nomacs.1 DESTINATION share/man/man1) - # appdata --install(FILES nomacs.appdata.xml DESTINATION /usr/share/appdata/) -+install(FILES nomacs.appdata.xml DESTINATION share/appdata/) - - # "make dist" target - string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME) diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index ac67759c258cdeb89f31ca0ab73dfc505fded1f0..2ff62cc9eef27d5080e928aefbca6f3fe046df88 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 33fddf6c8d0121ff06509f727e9d5b9843a32beb..44855d5c8b49c0c4f06e9f054bac229b6141704d 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,20 +1,30 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal -, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext +{ stdenv, fetchFromGitHub, qt5, libsForQt5 +, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal +, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext }: stdenv.mkDerivation rec { - version = "2015.03-3"; + version = "2018.04-git"; name = "openscad-${version}"; - src = fetchurl { - url = "http://files.openscad.org/${name}.src.tar.gz"; - sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; +# src = fetchurl { +# url = "http://files.openscad.org/${name}.src.tar.gz"; +# sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; +# }; + src = fetchFromGitHub { + owner = "openscad"; + repo = "openscad"; + rev = "179074dff8c23cbc0e651ce8463737df0006f4ca"; + sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb"; }; buildInputs = [ - qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib - pkgconfig harfbuzz qscintilla gettext - ]; + bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib + pkgconfig harfbuzz gettext + ] + ++ (with qt5; [qtbase qmake]) + ++ (with libsForQt5; [qscintilla]) + ; qmakeFlags = [ "VERSION=${version}" ]; diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 9ca90d2f5df36c226cbabc3ae525bf8f3f547208..719aca5096a584c082a316be9efe598f1e0c632e 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "Free software suite for authoring and displaying virtual reality panoramas"; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 42b69e249267af6ceecc6bdc015d721a020dafeb..9839bb740778147a11a964d7efba5345f72a3e06 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,12 +1,12 @@ { -stdenv, fetchFromGitHub, cmake +stdenv, fetchFromGitHub, cmake, makeWrapper ,qtbase, qttools, python, libGLU_combined ,libXt, qtx11extras, qtxmlpatterns }: stdenv.mkDerivation rec { name = "paraview-${version}"; - version = "5.4.1"; + version = "5.5.2"; # fetching from GitHub instead of taking an "official" source # tarball because of missing submodules there @@ -14,31 +14,34 @@ stdenv.mkDerivation rec { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "1ma02sdkz2apxnwcsyvxb26ibwnjh60p71gicw6nlp042acs6v74"; + sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j"; fetchSubmodules = true; }; - cmakeFlags = [ - "-DPARAVIEW_ENABLE_PYTHON=ON" - "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" - "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" - ]; + cmakeFlags = [ + "-DPARAVIEW_ENABLE_PYTHON=ON" + "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" + "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" + "-DOpenGL_GL_PREFERENCE=GLVND" + ]; # During build, binaries are called that rely on freshly built # libraries. These reside in build/lib, and are not found by # default. preBuild = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib ''; enableParallelBuilding = true; nativeBuildInputs = [ cmake + makeWrapper ]; buildInputs = [ python + python.pkgs.numpy libGLU_combined libXt qtbase @@ -47,12 +50,22 @@ stdenv.mkDerivation rec { qtxmlpatterns ]; + # Paraview links into the Python library, resolving symbolic links on the way, + # so we need to put the correct sitePackages (with numpy) back on the path + postInstall = '' + wrapProgram $out/bin/paraview \ + --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + wrapProgram $out/bin/pvbatch \ + --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + wrapProgram $out/bin/pvpython \ + --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + ''; meta = { homepage = http://www.paraview.org/; description = "3D Data analysis and visualization application"; license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric guibert]; + maintainers = with stdenv.lib.maintainers; [guibert]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 0e52190af420085f8a2b4276c4d4c9232085a1b5..de75827100480044069b0623097c1372e12ed973 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -2,7 +2,7 @@ # build dependencies alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg, - glibc, udev + glibc, systemd }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ar p "$src" data.tar.xz | tar xJ ''; - buildPhase = ":"; + dontBuild = true; nativeBuildInputs = [ makeWrapper ]; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { chmod a+x $out/opt/Pencil/libffmpeg.so # fix missing libudev - ln -s ${udev}/lib/systemd/libsystemd-shared.so $out/opt/Pencil/libudev.so.1 + ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/Pencil/libudev.so.1 wrapProgram $out/opt/Pencil/pencil \ --prefix LD_LIBRARY_PATH : $out/opt/Pencil ''; diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 73bbd5003bd88312c3e3e78d792fa0ef257a39f6..4843898eb645a6326facfa1fb9e00db502b6926e 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ ]; + platforms = platforms.linux; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ffef558e84dd816ad0b9e231b4968d8ce15699a7 --- /dev/null +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobjectIntrospection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }: + +stdenv.mkDerivation { + name = "photoflow-unstable-2018-03-06"; + + src = fetchFromGitHub { + owner = "aferrero2707"; + repo = "PhotoFlow"; + rev = "f9bbea183fa02412d1d17075955d2284eeaf8174"; + sha256 = "1fsk7kdmlkd64wcswbxrl87aqwmzqak6p3s38ggxzx2h51fa7lmf"; + }; + + nativeBuildInputs = [ + gettext + glib + libxml2 + pkgconfig + swig + automake + gobjectIntrospection + cmake + ninja + ]; + + buildInputs = [ + libtiff + libjpeg + fftw + exiv2 + lensfun + gtkmm2 # Could be build with gtk3 but proper UI theme is missing and therefore not very usable with gtk3 + # See: https://discuss.pixls.us/t/help-needed-for-gtk3-theme/5803 + libraw + lcms2 + libexif + vips + expat + pcre + pugixml + ]; + + cmakeFlags = [ + "-DBUNDLED_EXIV2=OFF" + "-DBUNDLED_LENSFUN=OFF" + "-DBUNDLED_GEXIV2=OFF" + ]; + + meta = with stdenv.lib; { + description = "A fully non-destructive photo retouching program providing a complete RAW image editing workflow"; + homepage = https://aferrero2707.github.io/PhotoFlow/; + license = licenses.gpl3Plus; + maintainers = [ maintainers.MtP ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 01affbbbd94cccc864ce32873bd81dad7beccdee..7571bb29bec99e222626607e6e28961aabac311c 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { description = "Simple, yet powerful and good looking image viewer"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; }; } diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index a3151238438bba1fcc39ba702c0bdc90db930a2c..14090376684897afcd1a548768f81e48af7da2fb 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -77,7 +77,7 @@ buildDotnetPackage rec { homepage = http://www.pinta-project.com/; description = "Drawing/editing program modeled after Paint.NET"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 9e5958871cc054f26d0c46b86998bd2fbf2376a0..e4f565b3b052b6eb6603fc8277eb53bc25d60904 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (rec { name = "pqiv-${version}"; - version = "2.10.2"; + version = "2.10.4"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "0zn7ps73lw04l9i4777c90ik07v3hkg66mnpz8vvvwjyi40i77a7"; + sha256 = "04fawc3sd625y1bbgfgwmak56pq28sm58dwn5db4h183iy3awdl9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5575c56b7fd09f09a85f10cdc457ef9affb038cd --- /dev/null +++ b/pkgs/applications/graphics/processing3/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: + +stdenv.mkDerivation rec { + version = "3.4"; + name = "processing3-${version}"; + + src = fetchFromGitHub { + owner = "processing"; + repo = "processing"; + rev = "processing-0265-${version}"; + sha256 = "12wpxgn2wd5vbasx9584w5yb1s319smq1zh8m7dvp7gkqw9plwp4"; + }; + + nativeBuildInputs = [ ant rsync makeWrapper ]; + buildInputs = [ jdk ]; + + buildPhase = '' + # use compiled jogl to avoid patchelf'ing .so files inside jars + rm core/library/*.jar + cp ${javaPackages.jogl_2_3_2}/share/java/*.jar core/library/ + + # do not download a file during build + ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml + install -D -m0444 ${fetchurl { + url = http://download.processing.org/reference.zip; + sha256 = "0dli1bdgw8hsx7g7b048ap81v2za9maa6pfcwdqm3qkfypr8q7pr"; + } + } ./java/reference.zip + + # suppress "Not fond of this Java VM" message box + substituteInPlace app/src/processing/app/platform/LinuxPlatform.java \ + --replace 'Messages.showWarning' 'if (false) Messages.showWarning' + + ( cd build + substituteInPlace build.xml --replace "jre-download," "" # do not download jre1.8.0_144 + mkdir -p linux/jre1.8.0_144 # fake dir to avoid error + ant build ) + ''; + + installPhase = '' + mkdir $out + cp -dpR build/linux/work $out/${name} + + rmdir $out/${name}/java + ln -s ${jdk} $out/${name}/java + + makeWrapper $out/${name}/processing $out/bin/processing \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ + --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ + --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib + makeWrapper $out/${name}/processing-java $out/bin/processing-java \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ + --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ + --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib + ''; + + meta = with stdenv.lib; { + description = "A language and IDE for electronic arts"; + homepage = https://processing.org; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index f1a58d4e21b8ef5e39825b448322ec355b6c6a15..8e6058d699803a2718744a6ef38b3d95777ad5db 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (rec { name = "qiv-${version}"; src = fetchurl { - url = "http://spiegl.de/qiv/download/${name}.tgz"; + url = "https://spiegl.de/qiv/download/${name}.tgz"; sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7"; }; @@ -17,10 +17,11 @@ stdenv.mkDerivation (rec { substituteInPlace Makefile --replace /man/ /share/man/ ''; - meta = { + meta = with stdenv.lib; { description = "Quick image viewer"; homepage = http://spiegl.de/qiv/; inherit version; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; }) diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index d3edc40cbea2aebdd795342211e663048af6194a..4be7d230b5f461e186a666dbcd9d68f8cf1dc3ae 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index c8327b9bca19742636917317b0b07c7db5cfa6c3..b300c0071faead67312b53931ae0cf9ebc1c3fee 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; description = ''Constructive solid geometry package''; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d47f08c90b9cb643b19f090b43b2941a29852463 --- /dev/null +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, python3Packages +, file, intltool, gobjectIntrospection, libgudev +, udisks, glib, gnome3, gst_all_1, libnotify +, exiv2, exiftool, qt5, gdk_pixbuf +}: + +python3Packages.buildPythonApplication rec { + pname = "rapid-photo-downloader"; + version = "0.9.10"; + + src = fetchurl { + url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; + sha256 = "1i0lfj9gnfya49gxx59ls364z651fqagd4krnz9jhg9m0l48ljdf"; + }; + + # Disable version check and fix install tests + postPatch = '' + substituteInPlace raphodo/constants.py \ + --replace "disable_version_check = False" "disable_version_check = True" + substituteInPlace raphodo/rescan.py \ + --replace "from preferences" "from raphodo.preferences" + substituteInPlace raphodo/copyfiles.py \ + --replace "import problemnotification" "import raphodo.problemnotification" + ''; + + nativeBuildInputs = [ file intltool gobjectIntrospection ]; + + buildInputs = [ + libgudev + udisks + glib + gnome3.gexiv2 + gst_all_1.gstreamer + libnotify + exiv2 + exiftool + qt5.qtimageformats + gdk_pixbuf + ] ++ (with python3Packages; [ + pyqt5 + pygobject3 + gphoto2 + pyzmq + tornado + psutil + pyxdg + arrow + dateutil + easygui + colour + pymediainfo + sortedcontainers + rawkit + requests + colorlog + pyprind + ]); + + makeWrapperArgs = [ + "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" + "--set PYTHONPATH \"$PYTHONPATH\"" + ]; + + meta = with stdenv.lib; { + description = "Photo and video importer for cameras, phones, and memory cards"; + homepage = http://www.damonlynch.net/rapid/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index eb97a2b9b3b6d071bc23b0c557478ae9b78f585d..52cdc0bc0676454d1e5efb625b8a1739840c78ce 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "RAW converter and digital photo processing software"; homepage = http://www.rawtherapee.com/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ jcumming mahe the-kenny ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/renderdoc/custom_swig.patch b/pkgs/applications/graphics/renderdoc/custom_swig.patch deleted file mode 100644 index e6ed05ea97a541e27e8a294ba3721b51ed0fd843..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/renderdoc/custom_swig.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt -index 2df9ffa5..66bafaba 100644 ---- a/qrenderdoc/CMakeLists.txt -+++ b/qrenderdoc/CMakeLists.txt -@@ -65,16 +65,6 @@ include(ExternalProject) - # Need bison for swig - find_package(BISON) - --# Compile our custom SWIG that will do scoped/strong enum classes --ExternalProject_Add(custom_swig -- # using an URL to a zip directly so we don't clone the history etc -- URL ${RENDERDOC_SWIG_PACKAGE} -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ./autogen.sh > /dev/null 2>&1 -- COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./configure --with-pcre=yes --prefix=${CMAKE_BINARY_DIR} > /dev/null -- BUILD_COMMAND $(MAKE) > /dev/null 2>&1 -- INSTALL_COMMAND $(MAKE) install > /dev/null 2>&1) -- - # Lastly find PySide 2, optionally, for Qt5 Python bindings - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") - -@@ -186,9 +176,8 @@ foreach(in ${swig_interfaces}) - get_filename_component(swig_file ${in} NAME_WE) - - add_custom_command(OUTPUT ${swig_file}_python.cxx ${swig_file}.py -- COMMAND ${CMAKE_BINARY_DIR}/bin/swig -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} -+ COMMAND $ENV{NIXOS_CUSTOM_SWIG} -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${in} -- DEPENDS custom_swig - DEPENDS ${RDOC_REPLAY_FILES} - DEPENDS ${QRD_INTERFACE_FILES}) - diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 2bd3ab89161f5b3d2209dd723eb5f38c1434cb9a..99e250e9e4d7d9d560ab3e852ddfaed7ba0345b8 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,74 +1,62 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtx11extras, qtsvg, makeWrapper, python3, bison -, pcre, vulkan-loader, xorg, autoreconfHook +, qtbase, qtx11extras, qtsvg, makeWrapper +, vulkan-loader, xorg +, python36, bison, pcre, automake, autoconf }: - let - custom_swig = stdenv.mkDerivation { - name = "renderdoc-custom-swig"; - src = fetchFromGitHub { - owner = "baldurk"; - repo = "swig"; - rev = "renderdoc-modified-1"; - sha256 = "1whymd3vamwnp4jqfc9asls3dw9wsdi21xhm1d2a4vx9nql8if1x"; - }; - - nativeBuildInputs = [ autoreconfHook pcre ]; - - autoreconfPhase = '' - patchShebangs autogen.sh - ./autogen.sh - ''; + custom_swig = fetchFromGitHub { + owner = "baldurk"; + repo = "swig"; + rev = "renderdoc-modified-5"; + sha256 = "0ihrxbx56p5wn589fbbsns93fp91sypqdzfxdy7l7v9sf69a41mw"; }; in stdenv.mkDerivation rec { + version = "1.1"; name = "renderdoc-${version}"; - version = "0.91"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; - rev = "2d8b2cf818746b6a2add54e2fef449398816a40c"; - sha256 = "07yc3fk7j2nqmrhc4dm3v2pgbc37scd7d28nlzk6v0hw99zck8k0"; + rev = "v${version}"; + sha256 = "0kb9m1dm0mnglqyh1srvl0f1bgjghxzbqarn0xfqw49wphqwhmcd"; }; buildInputs = [ - qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader + qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python36 ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison ]; + nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf ]; + + postUnpack = '' + cp -r ${custom_swig} swig + chmod -R +w swig + patchShebangs swig/autogen.sh + ''; cmakeFlags = [ "-DBUILD_VERSION_HASH=${src.rev}" "-DBUILD_VERSION_DIST_NAME=NixOS" - "-DBUILD_VERSION_DIST_VER=0.91" + "-DBUILD_VERSION_DIST_VER=${version}" "-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc" - "-DBUILD_VERSION_DIST_STABLE=ON" - # TODO: use this instead of preConfigure once placeholders land - #"-DVULKAN_LAYER_FOLDER=${placeholder out}/share/vulkan/implicit_layer.d/" + "-DBUILD_VERSION_STABLE=ON" + # TODO: add once pyside2 is in nixpkgs + #"-DPYSIDE2_PACKAGE_DIR=${python36Packages.pyside2}" ]; + # Future work: define these in the above array via placeholders preConfigure = '' cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" + cmakeFlags+=" -DRENDERDOC_SWIG_PACKAGE=$PWD/../swig" ''; preFixup = '' - mkdir $out/bin/.bin - mv $out/bin/qrenderdoc $out/bin/.bin/qrenderdoc - ln -s $out/bin/.bin/qrenderdoc $out/bin/qrenderdoc wrapProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib - mv $out/bin/renderdoccmd $out/bin/.bin/renderdoccmd - ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; - # Set path to custom swig binary - NIXOS_CUSTOM_SWIG = "${custom_swig}/bin/swig"; - enableParallelBuilding = true; - patches = [ ./custom_swig.patch ]; - meta = with stdenv.lib; { description = "A single-frame graphics debugger"; homepage = https://renderdoc.org/; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 42d129e53887992d5189b56136bf37cbdbf88626..df44c132ed96587ae4363737446115bbe7c8c033 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; + url = "https://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd"; } else throw "${name} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 2ca1fead84c8988fa5599671f7e268cf40ebdc4f..0f47c82f0325324c5871c31b5b570750fe4838e9 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv , avahi, libjpeg, libusb1, libv4l, net_snmp, libpng , gettext, pkgconfig diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index ad02e1a80231a71d07573da2cf3760148fb4ecf0..09b431fdb116cfb677064f3071cf2952657f780e 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng , libusb ? null -, gimpSupport ? false, gimp_2_8 ? null +, gimpSupport ? false, gimp ? null }: -assert gimpSupport -> gimp_2_8 != null; +assert gimpSupport -> gimp != null; stdenv.mkDerivation rec { name = "xsane-0.999"; @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] ++ (if libusb != null then [libusb] else []) - ++ stdenv.lib.optional gimpSupport gimp_2_8; + ++ stdenv.lib.optional gimpSupport gimp; meta = { homepage = http://www.sane-project.org/; description = "Graphical scanning frontend for sane"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric peti]; + maintainers = with stdenv.lib.maintainers; [peti]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 8f26d5a9884afb2f54d009844f7b67484ccbead2..d55441e39fa55fad5aa14127987d49d77dca251e 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -1,49 +1,26 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem +{ stdenv, fetchFromGitHub , cmake, libjpeg, libpng, libtiff, boost , qtbase, qttools }: stdenv.mkDerivation rec { name = "scantailor-advanced-${version}"; - version = "1.0.12"; + version = "1.0.16"; src = fetchFromGitHub { owner = "4lex4"; repo = "scantailor-advanced"; rev = "v${version}"; - sha256 = "0i80jzky7l8wdv0wqdx48x1q0wmj72hhm0050pd43q80pj5r78a0"; + sha256 = "0lc9lzbpiy5hgimyhl4s4q67pb9gacpy985gl6iy8pl79zxhmcyp"; }; nativeBuildInputs = [ cmake qttools ]; buildInputs = [ libjpeg libpng libtiff boost qtbase ]; - postInstall = '' - mkdir -p $out/share/icons/hicolor/scalable/apps - cp $src/resources/appicon.svg $out/share/icons/hicolor/scalable/apps/scantailor.svg - - mkdir -p $out/share/applications - cp $desktopItem/share/applications/* $out/share/applications/ - for entry in $out/share/applications/*.desktop; do - substituteAllInPlace $entry - done - ''; - - desktopItem = makeDesktopItem { - name = "scantailor-advanced"; - exec = "scantailor %f"; - icon = "scantailor"; - comment = meta.description; - desktopName = "Scan Tailor Advanced"; - genericName = "Scan Processing Software"; - mimeType = "image/png;image/tif;image/jpeg;"; - categories = "Graphics;"; - startupNotify = "true"; - }; - meta = with stdenv.lib; { homepage = https://github.com/4lex4/scantailor-advanced; description = "Interactive post-processing tool for scanned pages"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jfrankenau ]; - platforms = platforms.gnu; + platforms = with platforms; gnu ++ linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index ec7af8829073932ac36cf08807728a9f1c63f493..395179ff70aedccfe03f6a269dfc550d7efaa243 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index cffe485711f639640e925d83bdf37accd9b87cb1..292ae9c8faa875de4929bec6e859f0148c11d570 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages, glib }: +{ stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index 80987a8c74117fc6eee442ead87709c1cb4c65db..bca88cc7013030e42248d60438095a810c8fa462 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -6,7 +6,7 @@ assert (stdenv ? glibc); stdenv.mkDerivation { name = "seg3d-1.12_20090930"; src = fetchurl { - url = http://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz; + url = https://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz; sha256 = "1wr6rc6v5qjjkmws8yrc03z35h3iydxk1z28p06v1wdnca0y71z8"; }; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index c214fa58bc9b2df0f4bcc99652432ad922ffe862..1ebc2f88ec5da247563c5c052d0b169754bc8c47 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -7,13 +7,13 @@ let pname = "shotwell"; - version = "0.28.1"; + version = "0.28.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1ywikm5kdsr7q8hklh146x28rzvqkqfjs8kdpw7zcc15ri0dkzya"; + sha256 = "0pa7lb33i4hdnz7hr7x938d48ilrnj47jzb99la79rmm08yyin8n"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index a8b4973203d1897e19448e99ba33ccbff658a486..a409060afdc680307c3ed3a43fd8fd4e264e7168 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }: +{ stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg +, hicolor-icon-theme +}: let perlModules = with perlPackages; [ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView Gtk2Unique FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext - ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWPUserAgent JSON + ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS - CommonSense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo + commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo + EncodeLocale TryTiny TypesSerialiser LWPMediaTypes ]; in stdenv.mkDerivation rec { @@ -28,6 +31,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/shutter \ --set PERL5LIB "${stdenv.lib.makePerlPath perlModules}" \ --prefix PATH : "${imagemagick.out}/bin" \ + --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 55c856c19127086e90dcce724f678ba88aa18178..377a5ae616875f119b04fba88b84bdae23eb9b08 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/Y-Vladimir/SmartDeblur; description = "Tool for restoring blurry and defocused images"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 930a7e686f8f1c5164029cb36fae565573494c9f..63d35cc545316f2c91677c77403aa3cf641497c0 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3 -, libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig +{ stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 +, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig , imagemagick, intltool, autoreconfHook, which, defaultIconTheme }: diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index eb9a638386124cf580777246c98c3d33ad368da0..7940079d099480b48f7c147b8c578a9aae146398 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,10 +1,38 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , leptonica, libpng, libtiff, icu, pango, opencl-headers - # Supported list of languages or `null' for all available languages , enableLanguages ? null +# if you want just a specific list of languages, optionally specify a hash +# to make tessdata a fixed output derivation. +, enableLanguagesHash ? (if enableLanguages == null # all languages + then "1h48xfzabhn0ldbx5ib67cp9607pr0zpblsy8z6fs4knn0zznfnw" + else null) }: +let tessdata = stdenv.mkDerivation ({ + name = "tessdata"; + src = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tessdata"; + rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d"; + # when updating don't forget to update the default value fo enableLanguagesHash + sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7"; + }; + buildCommand = '' + cd $src; + for lang in ${if enableLanguages==null then "*.traineddata" else stdenv.lib.concatMapStringsSep " " (x: x+".traineddata") enableLanguages} ; do + install -Dt $out/share/tessdata $src/$lang ; + done; + ''; + preferLocalBuild = true; + } // (stdenv.lib.optionalAttrs (enableLanguagesHash != null) { + # when a hash is given, we make this a fixed output derivation. + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = enableLanguagesHash; + })); +in + stdenv.mkDerivation rec { name = "tesseract-${version}"; version = "3.05.00"; @@ -16,41 +44,17 @@ stdenv.mkDerivation rec { sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30"; }; - tessdata = fetchFromGitHub { - owner = "tesseract-ocr"; - repo = "tessdata"; - rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d"; - sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7"; - }; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; LIBLEPT_HEADERSDIR = "${leptonica}/include"; - # Copy the .traineddata files of the languages specified in enableLanguages - # into `$out/share/tessdata' and check afterwards if copying was successful. - postInstall = let - mkArg = lang: "-iname ${stdenv.lib.escapeShellArg "${lang}.traineddata"}"; - mkFindArgs = stdenv.lib.concatMapStringsSep " -o " mkArg; - findLangArgs = if enableLanguages != null - then "\\( ${mkFindArgs enableLanguages} \\)" - else "-iname '*.traineddata'"; - in '' - numLangs="$(find "$tessdata" -mindepth 1 -maxdepth 1 -type f \ - ${findLangArgs} -exec cp -t "$out/share/tessdata" {} + -print | wc -l)" - - ${if enableLanguages != null then '' - expected=${toString (builtins.length enableLanguages)} - '' else '' - expected="$(ls -1 "$tessdata/"*.traineddata | wc -l)" - ''} - - if [ "$numLangs" -ne "$expected" ]; then - echo "Expected $expected languages, but $numLangs" \ - "were copied to \`$out/share/tessdata'" >&2 - exit 1 - fi + postInstall = '' + for i in ${tessdata}/share/tessdata/*; do + ln -s $i $out/share/tessdata; + done ''; meta = { diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index fc8e7a62c2bac5b2576b33754027a2689456e43b..50cd9485a3e8d4da9879fb8e849def9a95098800 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -1,6 +1,9 @@ { fetchurl, stdenv, pkgconfig, gtk2, gettext, bzip2, zlib +, withGimpPlugin ? true, gimp ? null , libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }: +assert withGimpPlugin -> gimp != null; + stdenv.mkDerivation rec { name = "ufraw-0.22"; @@ -10,10 +13,23 @@ stdenv.mkDerivation rec { sha256 = "0pm216pg0vr44gwz9vcvq3fsf8r5iayljhf5nis2mnw7wn6d5azp"; }; - buildInputs = - [ pkgconfig gtk2 gtkimageview gettext bzip2 zlib - libjpeg libtiff cfitsio exiv2 lcms2 lensfun - ]; + outputs = [ "out" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; + + nativeBuildInputs = [ pkgconfig gettext ]; + buildInputs = [ + gtk2 gtkimageview bzip2 zlib + libjpeg libtiff cfitsio exiv2 lcms2 lensfun + ] ++ stdenv.lib.optional withGimpPlugin gimp; + + configureFlags = [ + "--enable-extras" + "--enable-dst-correction" + "--enable-contrast" + ] ++ stdenv.lib.optional withGimpPlugin "--with-gimp"; + + postInstall = stdenv.lib.optionalString withGimpPlugin '' + moveToOutput "lib/gimp" "$gimpPlugin" + ''; meta = { homepage = http://ufraw.sourceforge.net/; @@ -33,6 +49,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # needs GTK+ + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # needs GTK+ }; } diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index c655cadef400866abaac7a92ecd504cd04e4510d..5afd7a0237d05fd5faecdd3e6d3b24af07225d2f 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.smironov ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9fd464f46204d4ee369166998a9091fc43c62e6c --- /dev/null +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -0,0 +1,64 @@ +{ stdenv, lib, qtbase, qtsvg, fetchurl, makeDesktopItem }: +stdenv.mkDerivation rec { + name = "write_stylus-${version}"; + version = "209"; + + desktopItem = makeDesktopItem { + name = "Write"; + exec = "Write"; + comment = "A word processor for handwriting"; + icon = "write_stylus"; + desktopName = "Write"; + genericName = "Write"; + categories = "Office;Graphics"; + }; + + src = fetchurl { + url = "http://www.styluslabs.com/write/write${version}.tar.gz"; + sha256 = "1p6glp4vdpwl8hmhypayc4cvs3j9jfmjfhhrgqm2xkgl5bfbv2qd"; + }; + + # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon + # license: Free for commercial use + icon = fetchurl { + url = "https://oyra.eu/write/icon.tar.gz"; + sha256 = "1zd98g63apwi17qc1hm1g14maain5d18g4afadxm30qjz2s0mvs8"; + }; + + sourceRoot = "."; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -R Write $out/ + # symlink the binary to bin/ + ln -s $out/Write/Write $out/bin/Write + + # untar icons + tar -xzf ${icon} *.tar.gz -C $out/ + + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + ''; + preFixup = let + libPath = lib.makeLibraryPath [ + qtbase # libQt5PrintSupport.so.5 + qtsvg # libQt5Svg.so.5 + stdenv.cc.cc.lib # libstdc++.so.6 + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + $out/Write/Write + ''; + + meta = with stdenv.lib; { + homepage = http://www.styluslabs.com/; + description = "Write is a word processor for handwriting."; + platforms = platforms.linux; + license = stdenv.lib.licenses.unfree; + maintainers = with maintainers; [ oyren ]; + }; +} diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index 4542de2d42fac84bfb56ff56b587d62783011216..56388a8a2555a636c36a36392222f48e25217bed 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; buildInputs = [ wxGTK gtk2 libxml2 freetype pango ]; - configureFlags = "--disable-svnversion"; + configureFlags = [ "--disable-svnversion" ]; patches = map fetchurl (import ./debian-patches.nix); diff --git a/pkgs/applications/graphics/xfig/builder.sh b/pkgs/applications/graphics/xfig/builder.sh deleted file mode 100644 index 9d95eca01226315a332b55a3559cd82d5c7c641d..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/xfig/builder.sh +++ /dev/null @@ -1,28 +0,0 @@ -source $stdenv/setup - -makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man" - -# We need chmod +wx on dirs, not just chmod +w -dontMakeSourcesWritable=1 -postUnpack() { - find . -type d -exec chmod +x '{}' \; -} - -preBuild() { - echo "#define XAW3D" >> Imakefile.tmp - echo "#define XAW3D1_5E" >> Imakefile.tmp - cat Imakefile >> Imakefile.tmp - mv Imakefile.tmp Imakefile - xmkmf - - sed -e 's@[$][$]m@-- &@g' -i Makefile -} - -installPhase() { - make install.all $makeFlags - - wrapProgram $out/bin/xfig \ - --set XAPPLRESDIR $out/etc/X11/app-defaults -} - -genericBuild diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index c70b1029b7910897f1ca55812a79e589a8954d6d..429af12b9bb336d89f4179019526cee213f8e35d 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -1,47 +1,42 @@ -{ stdenv, fetchurl, makeWrapper, imake -, xlibsWrapper, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}: +{ stdenv, fetchurl, xlibsWrapper, makeWrapper, libXpm +, libXmu, libXi, libXp, Xaw3d, fig2dev +}: -let version = "3.2.5b"; in -stdenv.mkDerivation { +let + version = "3.2.7a"; + +in stdenv.mkDerivation { name = "xfig-${version}"; src = fetchurl { - url = "mirror://sourceforge/mcj/xfig.${version}.full.tar.gz"; - sha256 = "1hl5x49sgc0vap411whhcq6qhvh4xbjg7jggv7ih9pplg5nwy0aw"; + url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz"; + sha256 = "096zgp0bqnxhgxbrv2jjylrjz3pr4da0xxznlk2z7ffxr5pri2fa"; }; - builder = ./builder.sh; + postPatch = '' + sed -i 's:"fig2dev":"${fig2dev}/bin/fig2dev":' src/main.c + ''; - buildInputs = [xlibsWrapper libXpm libXmu libXi libXp Xaw3d libpng libjpeg]; + postInstall = '' + mkdir -p $out/share/X11/app-defaults + cp app-defaults/* $out/share/X11/app-defaults - nativeBuildInputs = [ imake makeWrapper ]; + wrapProgram $out/bin/xfig \ + --set XAPPLRESDIR $out/share/X11/app-defaults + ''; - hardeningDisable = [ "format" ]; + enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11"; + nativeBuildInputs = [ makeWrapper ]; - patches = - let - debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-3"; - in - [ - (fetchurl { - url = "${debPrefix}/35_CVE-2010-4262.patch"; - sha256 = "1pj669sz49wzjvvm96gwbnani7wqi0ijh21imqdzqw47qxdv7zp5"; - }) - (fetchurl { - url = "${debPrefix}/13_remove_extra_libs.patch"; - sha256 = "1qb14ay0c8xrjzhi21jl7sl8mdzxardldzpnflkzml774bbpn8av"; - }) - (fetchurl { - url = "${debPrefix}/36_libpng15.patch"; - sha256 = "0jd5bqj7sj9bbnxg2d0y6zmv4ka4qif2x4zc84ngdqga5433anvn"; - }) - ]; + buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d ]; - meta = { + meta = with stdenv.lib; { description = "An interactive drawing tool for X11"; - homepage = http://xfig.org; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + longDescription = '' + Note that you need to have the netpbm tools + in your path to export bitmaps. + ''; + inherit (fig2dev.meta) license homepage platforms; }; } diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index a8b4038b11f3cdf7cabd78ca4dd4b851bea3c376..a7cc7229d5b1d53559cd42c9ac352f6282a9371d 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }: +{ stdenv, requireFile, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { name = "yEd-${version}"; - version = "3.17.2"; + version = "3.18.1"; src = requireFile { name = "${name}.zip"; url = "https://www.yworks.com/en/products/yfiles/yed/"; - sha256 = "0wpfvd3jqxgjk3xqkamvlg7rk0w0pmrv7srjfqns447ccc3i7qg2"; + sha256 = "6aefd87cd925b4a4c86871a3772de243b4e520a86f82158189ae8c19a9a5ecf8"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 1af165368363bc380d3768b2aa8c5de8a2f5489d..7a49e5b2cb7f0d100298d8496b9c6fdf1f6343da 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "zgv-${version}"; version = "5.9"; src = fetchurl { - url = "http://www.svgalib.org/rus/zgv/${name}.tar.gz"; + url = "https://www.svgalib.org/rus/zgv/${name}.tar.gz"; sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj"; }; diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix index 3f3c2a32e68edb165923bfe24684449dc9033c2e..de9be76b6e45ca8f5926d83fd598fa1110425abe 100644 --- a/pkgs/applications/inferno/default.nix +++ b/pkgs/applications/inferno/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchhg, stdenv, xorg, makeWrapper }: +{ fetchhg, stdenv, xorg, makeWrapper }: stdenv.mkDerivation rec { # Inferno is a rolling release from a mercurial repository. For the verison number diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix new file mode 100644 index 0000000000000000000000000000000000000000..cc1acbc6dd05e1f9828e5ecb677afa88f368a11a --- /dev/null +++ b/pkgs/applications/kde/akonadi-import-wizard.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, karchive, kcontacts, kcrash, kidentitymanagement, kio, + kmailtransport, kwallet, mailcommon, mailimporter, messagelib +}: + +mkDerivation { + name = "akonadi-import-wizard"; + meta = { + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi karchive kcontacts kcrash kidentitymanagement kio + kmailtransport kwallet mailcommon mailimporter messagelib + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch index 91fd934b1eccad8f880ac6a4648d37c06ea42df7..4743c36c44d0b20e8f8ee795bfabc51584a588ba 100644 --- a/pkgs/applications/kde/akonadi/akonadi-paths.patch +++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch @@ -1,8 +1,40 @@ -Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp -+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp -@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &sett +diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp +index 2e9f1acf4..ecc80afdc 100644 +--- a/src/akonadicontrol/agentmanager.cpp ++++ b/src/akonadicontrol/agentmanager.cpp +@@ -84,12 +84,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent) + mStorageController = new Akonadi::ProcessControl; + mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld + connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); +- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + + if (mAgentServerEnabled) { + mAgentServer = new Akonadi::ProcessControl; + connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); +- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + } + + #ifndef QT_NO_DEBUG +diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp +index be1cc4afb..6d0c1d7e5 100644 +--- a/src/akonadicontrol/agentprocessinstance.cpp ++++ b/src/akonadicontrol/agentprocessinstance.cpp +@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) + } else { + Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); + const QStringList arguments = QStringList() << executable << identifier(); +- const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher")); ++ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); + mController->start(agentLauncherExec, arguments); + } + return true; +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index a32e86602..48ea4e52e 100644 +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -10,7 +42,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp QString defaultCleanShutdownCommand; #ifndef Q_OS_WIN -@@ -71,25 +70,8 @@ bool DbConfigMysql::init(QSettings &sett +@@ -71,25 +70,7 @@ bool DbConfigMysql::init(QSettings &settings) #endif const bool defaultInternalServer = true; @@ -29,28 +61,28 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp - << QStringLiteral("/opt/local/lib/mysql5/bin") - << QStringLiteral("/opt/mysql/sbin"); - if (defaultServerPath.isEmpty()) { -- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath); +- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("mysqld"), mysqldSearchPath); - } - -- const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath); +- +- const QString mysqladminPath = QStandardPaths::findExecutable(QStringLiteral("mysqladmin"), mysqldSearchPath); + const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN); if (!mysqladminPath.isEmpty()) { #ifndef Q_OS_WIN defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown") -@@ -99,10 +81,10 @@ bool DbConfigMysql::init(QSettings &sett +@@ -99,10 +80,10 @@ bool DbConfigMysql::init(QSettings &settings) #endif } -- mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath); +- mMysqlInstallDbPath = QStandardPaths::findExecutable(QStringLiteral("mysql_install_db"), mysqldSearchPath); + mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath; -- mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath); +- mMysqlCheckPath = QStandardPaths::findExecutable(QStringLiteral("mysqlcheck"), mysqldSearchPath); + mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK); qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); -@@ -119,7 +101,7 @@ bool DbConfigMysql::init(QSettings &sett +@@ -119,7 +100,7 @@ bool DbConfigMysql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -59,7 +91,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); -@@ -129,9 +111,6 @@ bool DbConfigMysql::init(QSettings &sett +@@ -129,9 +110,6 @@ bool DbConfigMysql::init(QSettings &settings) // intentionally not namespaced as we are the only one in this db instance when using internal mode mDatabaseName = QStringLiteral("akonadi"); } @@ -69,7 +101,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; -@@ -140,9 +119,6 @@ bool DbConfigMysql::init(QSettings &sett +@@ -140,9 +118,6 @@ bool DbConfigMysql::init(QSettings &settings) settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -79,20 +111,20 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); settings.sync(); -@@ -196,7 +172,7 @@ bool DbConfigMysql::startInternalServer( +@@ -196,7 +171,7 @@ bool DbConfigMysql::startInternalServer() #endif // generate config file -- const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf")); +- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf")); + const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); - const QString localConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf")); + const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); if (globalConfig.isEmpty()) { -Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/server/storage/dbconfigpostgresql.cpp -+++ akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp -@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings +diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp +index 60e6272f2..ad7cefbfe 100644 +--- a/src/server/storage/dbconfigpostgresql.cpp ++++ b/src/server/storage/dbconfigpostgresql.cpp +@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -100,7 +132,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp QString defaultInitDbPath; QString defaultPgData; -@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings +@@ -70,34 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings) mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); if (mInternalServer) { @@ -130,14 +162,13 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp - } - } - postgresSearchPath.append(postgresVersionedSearchPaths); -- -- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath); -- defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath); +- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), postgresSearchPath); +- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), postgresSearchPath); + defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB); defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); } -@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings +@@ -117,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -149,7 +180,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath; mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString(); if (mInternalServer && mInitDbPath.isEmpty()) { -@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings +@@ -141,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings) settings.setValue(QStringLiteral("Port"), mHostPort); } settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -157,35 +188,3 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); -Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/akonadicontrol/agentprocessinstance.cpp -+++ akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp -@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A - } else { - Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); - const QStringList arguments = QStringList() << executable << identifier(); -- const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher")); -+ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); - mController->start(agentLauncherExec, arguments); - } - return true; -Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/akonadicontrol/agentmanager.cpp -+++ akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp -@@ -102,12 +102,12 @@ AgentManager::AgentManager(bool verbose, - mStorageController = new Akonadi::ProcessControl; - mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld - connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); -- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); - - if (mAgentServerEnabled) { - mAgentServer = new Akonadi::ProcessControl; - connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); -- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); - } - - #ifndef QT_NO_DEBUG diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index fb631414838cd36005c2e72df63b48131825e4a1..598857f2e70d3d46e7f772cc3f4ebe3550e00c40 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, config, makeWrapper, + mkDerivation, lib, makeWrapper, extra-cmake-modules, kdoctools, diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 2555fe409f254c773e5b6ed2ce4684c566cd62df..072b66e556386deb092b7a10533fe454f07c9ba1 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -26,8 +26,8 @@ still shows most of the available features is in `./gwenview.nix`. */ { - stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs, - plasma5, attica, phonon, + lib, libsForQt5, fetchurl, + okteta }: let @@ -66,6 +66,7 @@ let akonadi = callPackage ./akonadi {}; akonadi-calendar = callPackage ./akonadi-calendar.nix {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; + akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix {}; akonadi-mime = callPackage ./akonadi-mime.nix {}; akonadi-notes = callPackage ./akonadi-notes.nix {}; akonadi-search = callPackage ./akonadi-search.nix {}; @@ -76,6 +77,7 @@ let calendarsupport = callPackage ./calendarsupport.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; + dragon = callPackage ./dragon.nix {}; eventviews = callPackage ./eventviews.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; filelight = callPackage ./filelight.nix {}; @@ -84,6 +86,7 @@ let incidenceeditor = callPackage ./incidenceeditor.nix {}; k3b = callPackage ./k3b.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; + kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; kate = callPackage ./kate.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; @@ -93,11 +96,13 @@ let kcolorchooser = callPackage ./kcolorchooser.nix {}; kcontacts = callPackage ./kcontacts.nix {}; kdav = callPackage ./kdav.nix {}; + kdebugsettings = callPackage ./kdebugsettings.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive.nix {}; kdepim-runtime = callPackage ./kdepim-runtime.nix {}; + kdepim-addons = callPackage ./kdepim-addons.nix {}; kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; kdialog = callPackage ./kdialog.nix {}; @@ -105,10 +110,10 @@ let kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; - kholidays = callPackage ./kholidays.nix {}; kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; kimap = callPackage ./kimap.nix {}; + kitinerary = callPackage ./kitinerary.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kldap = callPackage ./kldap.nix {}; kleopatra = callPackage ./kleopatra.nix {}; @@ -123,10 +128,12 @@ let konsole = callPackage ./konsole.nix {}; kontact = callPackage ./kontact.nix {}; kontactinterface = callPackage ./kontactinterface.nix {}; + konquest = callPackage ./konquest.nix {}; korganizer = callPackage ./korganizer.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; ksmtp = callPackage ./ksmtp {}; kqtquickcharts = callPackage ./kqtquickcharts.nix {}; + kpkpass = callPackage ./kpkpass.nix {}; krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; kruler = callPackage ./kruler.nix {}; @@ -136,6 +143,7 @@ let libgravatar = callPackage ./libgravatar.nix {}; libkcddb = callPackage ./libkcddb.nix {}; libkdcraw = callPackage ./libkdcraw.nix {}; + libkdegames = callPackage ./libkdegames.nix {}; libkdepim = callPackage ./libkdepim.nix {}; libkexiv2 = callPackage ./libkexiv2.nix {}; libkgapi = callPackage ./libkgapi.nix {}; @@ -150,7 +158,6 @@ let mbox-importer = callPackage ./mbox-importer.nix {}; messagelib = callPackage ./messagelib.nix {}; minuet = callPackage ./minuet.nix {}; - okteta = callPackage ./okteta.nix {}; okular = callPackage ./okular.nix {}; pimcommon = callPackage ./pimcommon.nix {}; pim-data-exporter = callPackage ./pim-data-exporter.nix {}; @@ -158,6 +165,9 @@ let print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; syndication = callPackage ./syndication.nix {}; + # Okteta was removed from kde applications and will now be released independently + # Lets keep an alias for compatibility reasons + inherit okteta; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 2570e37bf2c9a50b9cc21e7621a2790f305f4d7a..dcc797743035f4199f52f802ff44e156f99fecbd 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -1,10 +1,10 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils, + baloo, baloo-widgets, kactivities, kbookmarks, kcmutils, kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons, kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, - konsole, kparts, ktexteditor, kwindowsystem, phonon, solid + kparts, ktexteditor, kwindowsystem, phonon, solid }: mkDerivation { @@ -21,4 +21,8 @@ mkDerivation { phonon solid ]; outputs = [ "out" "dev" ]; + # We need the RPATH for linking, because the `libkdeinit5_dolphin.so` links + # private against its dependencies and without the correct RPATH, these + # dependencies are not found. + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; } diff --git a/pkgs/applications/kde/dragon.nix b/pkgs/applications/kde/dragon.nix new file mode 100644 index 0000000000000000000000000000000000000000..9dd55ec4b9c13a4f2e29819c69e0c2ac497b369d --- /dev/null +++ b/pkgs/applications/kde/dragon.nix @@ -0,0 +1,25 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + baloo, baloo-widgets, kactivities, kbookmarks, kcmutils, + kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons, + kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, + kparts, ktexteditor, kwindowsystem, phonon, solid, phonon-backend-gstreamer +}: + +mkDerivation { + name = "dragon"; + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + description = "A simple media player for KDE"; + maintainers = [ lib.maintainers.jonathanreeve ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig + kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes + kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem + phonon solid phonon-backend-gstreamer + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix index cc1e83f6581d6d580bb0d778ac5b8302caa7576d..495491f6d3c1ae14e330da675cc26f8421c2d5a8 100644 --- a/pkgs/applications/kde/eventviews.nix +++ b/pkgs/applications/kde/eventviews.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, calendarsupport, kcalutils, kdiagram, libkdepim, qtbase, qttools, + akonadi, calendarsupport, kcalutils, + kdiagram, libkdepim, qtbase, qttools, kholidays }: mkDerivation { @@ -12,7 +13,8 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi calendarsupport kcalutils kdiagram libkdepim qtbase qttools + akonadi calendarsupport kcalutils kdiagram + libkdepim qtbase qttools kholidays ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 9ad488f63ab44a4c1ff11d0020bbd97696f51ffa..c7cc617f163cb4bab0d5631f2cce92c744b3e9b3 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.12.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.08.0/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 5035685c64fb5e773311c012ff674b37592c2475..bb8a97e8341eb7e15320f45bd7c45ca9ba6f556f 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -1,7 +1,7 @@ { mkDerivation, copyPathsToStore, lib, kdepimTeam, extra-cmake-modules, kdoctools, - grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, + grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, }: mkDerivation { @@ -14,7 +14,7 @@ mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase + grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase ]; - propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ]; + propagatedBuildInputs = [ grantlee kiconthemes knewstuff ]; } diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch index fe8b15febf2eb5022f6a5de79df924446d682daa..ebb81248475fac7c897bc103d31a12dd3195705d 100644 --- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch +++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch @@ -1,82 +1,8 @@ -Index: grantleetheme-17.04.0/src/grantleetheme_p.h -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleetheme_p.h -+++ grantleetheme-17.04.0/src/grantleetheme_p.h -@@ -47,7 +47,7 @@ public: - QString description; - QString name; - QString dirName; -- QString absolutePath; -+ QStringList absolutePaths; - QString author; - QString email; - -Index: grantleetheme-17.04.0/src/grantleetheme.h -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleetheme.h -+++ grantleetheme-17.04.0/src/grantleetheme.h -@@ -50,11 +50,14 @@ public: - QStringList displayExtraVariables() const; - QString dirName() const; - QString absolutePath() const; -+ QStringList absolutePaths() const; - QString author() const; - QString authorEmail() const; - - QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); - -+ void addThemeDir(const QString&); -+ - static void addPluginPath(const QString &path); - - private: -Index: grantleetheme-17.04.0/src/grantleethememanager.cpp -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp -+++ grantleetheme-17.04.0/src/grantleethememanager.cpp -@@ -142,25 +142,18 @@ public: - - for (const QString &directory : qAsConst(themesDirectories)) { - QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); -- QStringList alreadyLoadedThemeName; - while (dirIt.hasNext()) { - dirIt.next(); - const QString dirName = dirIt.fileName(); - GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - QString themeName = theme.name(); -- if (alreadyLoadedThemeName.contains(themeName)) { -- int i = 2; -- const QString originalName(theme.name()); -- while (alreadyLoadedThemeName.contains(themeName)) { -- themeName = originalName + QStringLiteral(" (%1)").arg(i); -- ++i; -- } -- theme.d->name = themeName; -+ QMap::iterator i = themes.find(dirName); -+ if (i != themes.end()) { -+ i.value().addThemeDir(dirIt.filePath()); -+ } else { -+ themes.insert(dirName, theme); - } -- alreadyLoadedThemeName << themeName; -- themes.insert(dirName, theme); -- //qDebug()<<" theme.name()"<addDir(directory); -@@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con - GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - if (dirName == themeName) { -- return theme.absolutePath(); -+ return theme.absolutePaths().first(); - } - } - } ---- src/grantleetheme.cpp.orig 2017-12-22 16:11:39.863598126 +0300 -+++ ./src/grantleetheme.cpp 2017-12-22 16:16:14.045664607 +0300 -@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePr +diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp +index 27d5bc8..8d43140 100644 +--- a/src/grantleetheme.cpp ++++ b/src/grantleetheme.cpp +@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePrivate &other) , description(other.description) , name(other.name) , dirName(other.dirName) @@ -105,7 +31,7 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp loader->setTheme(dirName); if (!sEngine) { -@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, c +@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &de KConfigGroup group(&config, QStringLiteral("Desktop Entry")); if (group.isValid()) { d->dirName = dirName; @@ -137,7 +63,7 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp } QString Theme::author() const -@@ -223,6 +231,13 @@ QString Theme::render(const QString &tem +@@ -223,6 +231,13 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con return result; } @@ -151,3 +77,79 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp void Theme::addPluginPath(const QString &path) { if (!ThemePrivate::sEngine) { +diff --git a/src/grantleetheme.h b/src/grantleetheme.h +index a25c27b..be38299 100644 +--- a/src/grantleetheme.h ++++ b/src/grantleetheme.h +@@ -48,11 +48,14 @@ public: + Q_REQUIRED_RESULT QStringList displayExtraVariables() const; + Q_REQUIRED_RESULT QString dirName() const; + Q_REQUIRED_RESULT QString absolutePath() const; ++ Q_REQUIRED_RESULT QStringList absolutePaths() const; + Q_REQUIRED_RESULT QString author() const; + Q_REQUIRED_RESULT QString authorEmail() const; + + Q_REQUIRED_RESULT QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); + ++ void addThemeDir(const QString&); ++ + static void addPluginPath(const QString &path); + + private: +diff --git a/src/grantleetheme_p.h b/src/grantleetheme_p.h +index eb73dcb..00510e9 100644 +--- a/src/grantleetheme_p.h ++++ b/src/grantleetheme_p.h +@@ -43,7 +43,7 @@ public: + QString description; + QString name; + QString dirName; +- QString absolutePath; ++ QStringList absolutePaths; + QString author; + QString email; + +diff --git a/src/grantleethememanager.cpp b/src/grantleethememanager.cpp +index 606d717..dc99041 100644 +--- a/src/grantleethememanager.cpp ++++ b/src/grantleethememanager.cpp +@@ -125,25 +125,18 @@ public: + + for (const QString &directory : qAsConst(themesDirectories)) { + QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); +- QStringList alreadyLoadedThemeName; + while (dirIt.hasNext()) { + dirIt.next(); + const QString dirName = dirIt.fileName(); + GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); + if (theme.isValid()) { + QString themeName = theme.name(); +- if (alreadyLoadedThemeName.contains(themeName)) { +- int i = 2; +- const QString originalName(theme.name()); +- while (alreadyLoadedThemeName.contains(themeName)) { +- themeName = originalName + QStringLiteral(" (%1)").arg(i); +- ++i; +- } +- theme.d->name = themeName; ++ QMap::iterator i = themes.find(dirName); ++ if (i != themes.end()) { ++ i.value().addThemeDir(dirIt.filePath()); ++ } else { ++ themes.insert(dirName, theme); + } +- alreadyLoadedThemeName << themeName; +- themes.insert(dirName, theme); +- //qDebug()<<" theme.name()"<addDir(directory); +@@ -366,7 +359,7 @@ QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QS + GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); + if (theme.isValid()) { + if (dirName == themeName) { +- return theme.absolutePath(); ++ return theme.absolutePaths().first(); + } + } + } diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 89bc171d295375f3858aef545a39b865332c874a..9b16485cfa770bf968539c09beb664c4342e78be 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -16,7 +16,7 @@ mkDerivation { platforms = platforms.linux; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - propagatedBuildInputs = [ + buildInputs = [ # qt qtwebkit # kde @@ -32,11 +32,17 @@ mkDerivation { ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = - let k3bPath = lib.makeBinPath [ - cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode - vcdimager - ]; + let + binPath = lib.makeBinPath [ + cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode + vcdimager flac + ]; + libraryPath = lib.makeLibraryPath [ + cdparanoia + ]; in '' - wrapProgram "$out/bin/k3b" --prefix PATH : "${k3bPath}" + wrapProgram "$out/bin/k3b" \ + --prefix PATH : "${binPath}" \ + --prefix LD_LIBRARY_PATH : ${libraryPath} ''; } diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix new file mode 100644 index 0000000000000000000000000000000000000000..9978e7ff66749290e77666a212f92c45c3d78ea1 --- /dev/null +++ b/pkgs/applications/kde/kalarm.nix @@ -0,0 +1,37 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + + kauth, kcodecs, kcompletion, kconfig, kconfigwidgets, kdbusaddons, kdoctools, + kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio, + knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon, + + kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalcore, kcalutils, + kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime, + pimcommon, kpimtextedit, kdepim-apps-libs, messagelib, + + qtx11extras, + + kdepim-runtime +}: + +mkDerivation { + name = "kalarm"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.rittelle ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kauth kcodecs kcompletion kconfig kconfigwidgets kdbusaddons kdoctools + kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio + knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon + + kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalcore kcalutils + kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime + pimcommon kpimtextedit kdepim-apps-libs messagelib + + qtx11extras + ]; + propagatedUserEnvPkgs = [ kdepim-runtime ]; +} diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix index f2fb6f4d8bbd1877883bec410cfed44bd795ba4d..46832477cc60b7a8c8eb4a40f812952744f4389e 100644 --- a/pkgs/applications/kde/kalarmcal.nix +++ b/pkgs/applications/kde/kalarmcal.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement, - kpimtextedit, + kpimtextedit, kcalutils }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ - akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit + akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix index 3f6821e08eaec9b090ebebfe9497a9f5830e55b2..1628af7e22023b0113e4703aa13037a198d7a3d2 100644 --- a/pkgs/applications/kde/kcalutils.nix +++ b/pkgs/applications/kde/kcalutils.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support, + grantlee, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support, kidentitymanagement, kpimtextedit, }: @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support + grantlee kcalcore kconfig kontactinterface kcoreaddons kdelibs4support kidentitymanagement kpimtextedit ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix new file mode 100644 index 0000000000000000000000000000000000000000..a58e1b25a2ee837e2fe3a0883f3291284f8ac8d2 --- /dev/null +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + gettext, + kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, + python +}: + +mkDerivation { + name = "kdebugsettings"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.rittelle ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python + ]; + propagatedUserEnvPkgs = [ ]; +} diff --git a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch b/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch deleted file mode 100644 index ea2af2b09509f6b591eb6f571f29320b7c9c8203..0000000000000000000000000000000000000000 --- a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur kdenlive-17.04.1-upstream/CMakeLists.txt kdenlive-17.04.1/CMakeLists.txt ---- kdenlive-17.04.1-upstream/CMakeLists.txt 2017-06-10 00:06:44.773146595 -0400 -+++ kdenlive-17.04.1/CMakeLists.txt 2017-06-10 00:07:35.766596566 -0400 -@@ -79,7 +79,7 @@ - check_include_files(malloc.h HAVE_MALLOC_H) - check_include_files(pthread.h HAVE_PTHREAD_H) - --find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick ) -+find_package(Qt5 REQUIRED COMPONENTS Core Concurrent DBus Widgets Script Svg Quick ) - find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET) - - find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET) diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index b5eca47d6c0eb5791786b3d9b7a486898633d6cd..9da12b248c5681c886a952002a4d71471f10d725 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -2,18 +2,13 @@ , lib , extra-cmake-modules , kdoctools -, kactivities , kconfig , kcrash , kguiaddons , kiconthemes , ki18n , kinit -, kio -, kio-extras -, kwindowsystem , kdbusaddons -, plasma-framework , knotifications , knewstuff , karchive @@ -34,9 +29,6 @@ mkDerivation { name = "kdenlive"; - patches = [ - ./kdenlive-cmake-concurrent-module.patch - ]; nativeBuildInputs = [ extra-cmake-modules kdoctools diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix new file mode 100644 index 0000000000000000000000000000000000000000..75c1bf5be8bf569e8ec314adcc0ae5e69bcf7333 --- /dev/null +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -0,0 +1,25 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, shared-mime-info, + akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews, + incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative, + kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, + libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass, + kitinerary +}: + +mkDerivation { + name = "kdepim-addons"; + meta = { + license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; + buildInputs = [ + akonadi-import-wizard akonadi-notes calendarsupport eventviews + incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative + kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar + libksieve mailcommon mailimporter messagelib poppler prison kpkpass + kitinerary + ]; +} diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix new file mode 100644 index 0000000000000000000000000000000000000000..8112460549b4582a6c17c77a4a34bc3abe763857 --- /dev/null +++ b/pkgs/applications/kde/kitinerary.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, extra-cmake-modules +, qtbase, qtdeclarative, ki18n, kmime, kpkpass +, poppler, kcontacts, kcalcore +}: + +mkDerivation { + name = "kitinerary"; + meta = { + license = with lib.licenses; [ lgpl21 ]; + maintainers = [ lib.maintainers.bkchr ]; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + qtbase qtdeclarative ki18n kmime kpkpass poppler + kcontacts kcalcore + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix index a19fef9c9edb7fdd5eaca93b6229d08a0179821e..c15c6eb78d69242556b0eadbb426962d5d94c2e6 100644 --- a/pkgs/applications/kde/kleopatra.nix +++ b/pkgs/applications/kde/kleopatra.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime, - knotifications, kwindowsystem, kxmlgui, libkleo + knotifications, kwindowsystem, kxmlgui, libkleo, kcrash }: mkDerivation { @@ -14,6 +14,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime - knotifications kwindowsystem kxmlgui libkleo + knotifications kwindowsystem kxmlgui libkleo kcrash ]; } diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix index c4b7c0ab4327a545900c28c4584961cec32184dc..703f62aa72c021c079b8a56dae88b7b61c45e1a7 100644 --- a/pkgs/applications/kde/kmailtransport.nix +++ b/pkgs/applications/kde/kmailtransport.nix @@ -1,7 +1,9 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, ksmtp + akonadi, akonadi-mime, cyrus_sasl, kcmutils, + ki18n, kio, kmime, kwallet, ksmtp, libkgapi, + kcalcore, kcontacts }: mkDerivation { @@ -11,7 +13,7 @@ mkDerivation { maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ akonadi kcmutils ki18n kio ksmtp ]; + buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalcore kcontacts ]; propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/konquest.nix b/pkgs/applications/kde/konquest.nix new file mode 100644 index 0000000000000000000000000000000000000000..cfef018de6cc05faf4063740a8c6411d039999d1 --- /dev/null +++ b/pkgs/applications/kde/konquest.nix @@ -0,0 +1,18 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, kdoctools +, kdelibs4support +, libkdegames +, qtquickcontrols +}: + +mkDerivation { + name = "konquest"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kdelibs4support libkdegames qtquickcontrols ]; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ lheckemann ]; + }; +} diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 5269941fa113b506bb08b1c9dad7a9d0efc4283b..2847e312d00ad761b93fdfbff24de439b62c75d2 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -4,7 +4,7 @@ kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons, - kwindowsystem, kxmlgui, qtscript + kwindowsystem, kxmlgui, qtscript, knewstuff }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { buildInputs = [ kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty - kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript + kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; } diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix index 17c960d176268fdb903445c5a5e87a8e0d65778e..05d174b055414981d31cbb880b5d207a0acee49a 100644 --- a/pkgs/applications/kde/kpimtextedit.nix +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, + grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, }: @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin + grantlee kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin sonnet syntax-highlighting qttools ]; propagatedBuildInputs = [ ktextwidgets ]; diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix new file mode 100644 index 0000000000000000000000000000000000000000..e9505a72e85e1cbaa5ae13e19ec1aefb74df7f92 --- /dev/null +++ b/pkgs/applications/kde/kpkpass.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, extra-cmake-modules +, qtbase, karchive, shared-mime-info +}: + +mkDerivation { + name = "kpkpass"; + meta = { + license = with lib.licenses; [ lgpl21 ]; + maintainers = [ lib.maintainers.bkchr ]; + }; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; + buildInputs = [ qtbase karchive ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index d6de2521533958d56b5813c16a7c6f0f05c037ec..d2b96bf6100e816925e83e1e12f4e1d2f5a3e124 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kdelibs4support, kdnssd, libvncserver, libXtst, qtx11extras + kdelibs4support, kdnssd, libvncserver, libXtst, libXdamage, qtx11extras }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { maintainers = with lib.maintainers; [ jerith666 ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ libvncserver libXtst qtx11extras ]; + buildInputs = [ libvncserver libXtst libXdamage qtx11extras ]; propagatedBuildInputs = [ kdelibs4support kdnssd ]; } diff --git a/pkgs/applications/kde/libkdegames.nix b/pkgs/applications/kde/libkdegames.nix new file mode 100644 index 0000000000000000000000000000000000000000..494b193b8326e7c172c5aa20d4223d3436b472f1 --- /dev/null +++ b/pkgs/applications/kde/libkdegames.nix @@ -0,0 +1,26 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, kdoctools +, kdelibs4support +, qtdeclarative +, kdeclarative +, kdnssd +, knewstuff +, openal +, libsndfile +, qtquickcontrols +}: + +mkDerivation { + name = "libkdegames"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kdelibs4support qtdeclarative kdeclarative kdnssd knewstuff openal libsndfile + qtquickcontrols + ]; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ lheckemann ]; + }; +} diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix index 7ff3a1f04b09931902e376d6c41ecf31ece2bf47..998e65f28347fd8243e7d9b857ea0a7b7f2762a9 100644 --- a/pkgs/applications/kde/libkgapi.nix +++ b/pkgs/applications/kde/libkgapi.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - qtwebengine, kio, kcalcore, kcontacts + qtwebengine, kio, kcalcore, kcontacts, + cyrus_sasl }: mkDerivation { @@ -11,5 +12,5 @@ mkDerivation { maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ qtwebengine kio kcalcore kcontacts ]; + buildInputs = [ qtwebengine kio kcalcore kcontacts cyrus_sasl ]; } diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix index 52aa2b10e2414ca79ffe2bab0b1733aec0067183..cae2aec5668d3bd8783e86d002b69f3fba3b7963 100644 --- a/pkgs/applications/kde/libkomparediff2.nix +++ b/pkgs/applications/kde/libkomparediff2.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: +{ mkDerivation, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: mkDerivation { name = "libkomparediff2"; diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix index aa637d440bd9df01f9c034cd1cacfdf154dec794..0704003353aed4d63cf0967fddcc6c55ec6df3f0 100644 --- a/pkgs/applications/kde/mbox-importer.nix +++ b/pkgs/applications/kde/mbox-importer.nix @@ -14,7 +14,4 @@ mkDerivation { buildInputs = [ akonadi akonadi-search kconfig kservice kio mailcommon mailimporter messagelib ]; - preHook = '' - set -x - ''; } diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index f12158a1f71e57d6776a8b8abae1b35f0dbe0b0f..23920a081c06e4024a88effebaf76ca9497e32da 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5, + akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee, grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, @@ -16,7 +16,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs + akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit syntax-highlighting diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix deleted file mode 100644 index 0ac8ddebc75d704a3381fb2d72ab880f5e161c2f..0000000000000000000000000000000000000000 --- a/pkgs/applications/kde/okteta.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - qtscript, kconfig, kinit, karchive, kcrash, - kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, - shared-mime-info -}: - -mkDerivation { - name = "okteta"; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ peterhoeg ]; - }; - nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; - buildInputs = [ shared-mime-info ]; - propagatedBuildInputs = [ - kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 - karchive kcrash - ]; -} diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 5f6f28c95b0827e115d294b9f503aa24d673105f..39fb232b34210ff7dff75ecf6ec807ce23e9d129 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -5,7 +5,7 @@ kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5, - qtdeclarative, qtsvg, threadweaver + qtdeclarative, qtsvg, threadweaver, kcrash }: mkDerivation { @@ -16,7 +16,7 @@ mkDerivation { kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 - qtdeclarative qtsvg threadweaver + qtdeclarative qtsvg threadweaver kcrash ] ++ lib.optional (!stdenv.isAarch64) chmlib; meta = with lib; { homepage = http://www.kde.org; diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix index 10123944e3a6929a040203803c67b997eb81263b..d17ffb3c044460dced77372295bed4d7d114cccb 100644 --- a/pkgs/applications/kde/pim-data-exporter.nix +++ b/pkgs/applications/kde/pim-data-exporter.nix @@ -4,7 +4,7 @@ akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo, pimcommon, qttools, - karchive, mailcommon, messagelib, pim-data-exporter + karchive, mailcommon, messagelib }: mkDerivation { diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index 02e9a47274b4e3656288371034920b66ecf73c05..bbbcca13d9804fd855b8d97e437c78b2ce2999a1 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs, - kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kdesignerplugin, + kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit, kwallet, kwindowsystem, libkdepim, qtwebengine }: diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 6deec6aaabb4ad4e49bd4266e92ffd12557a1f91..f036e8cf632c60fa6d125916c9ff39a456ec0c06 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -4,7 +4,7 @@ ki18n, xcb-util-cursor, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, - qtx11extras + qtx11extras, knewstuff }: mkDerivation { @@ -14,6 +14,7 @@ mkDerivation { buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor + knewstuff ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index d61784805e45386ef7d9b708b48f37a54c421446..decf0f4a314f570cf312d743c2dd67aa07434b3d 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1691 +3,1715 @@ { akonadi = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-17.12.3.tar.xz"; - sha256 = "006cb98k3kxd51d0d07984aj4d0km0bn0v3rigpa3sw5s07w8dfi"; - name = "akonadi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-18.08.0.tar.xz"; + sha256 = "06a1n84w4bfljyariyajzpn1sajkn4dwpsrr47pz38vf1m6dp7mz"; + name = "akonadi-18.08.0.tar.xz"; }; }; akonadi-calendar = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-17.12.3.tar.xz"; - sha256 = "0ffrnpwyjmvx80qziajdkihdzl5pyp0zbm8qg8wkcr8nxs3fgv6a"; - name = "akonadi-calendar-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-18.08.0.tar.xz"; + sha256 = "1qlqvsv4gs50v9dd3nbw8wyq0vgvxvslhnk1hnqpyvh0skcwslh5"; + name = "akonadi-calendar-18.08.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-tools-17.12.3.tar.xz"; - sha256 = "0836al499pd0bmwgaqzmbbmas3jmn44hv37y9k6j6ab71gpkjjy9"; - name = "akonadi-calendar-tools-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-tools-18.08.0.tar.xz"; + sha256 = "1d5kr7nxfy7y9ybi4qnfbfci5kc44ya916j9wgb18r6rfdhdwsxr"; + name = "akonadi-calendar-tools-18.08.0.tar.xz"; }; }; akonadiconsole = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadiconsole-17.12.3.tar.xz"; - sha256 = "0xny4y5i03sj93dxaafnqiyczichjnzjrx1h4z13fn62flz8fn1b"; - name = "akonadiconsole-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadiconsole-18.08.0.tar.xz"; + sha256 = "0qrwgjdmqa5jj8vcbs6n733v462sxnf4jcmh2khjddf2h5na6q86"; + name = "akonadiconsole-18.08.0.tar.xz"; }; }; akonadi-contacts = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-contacts-17.12.3.tar.xz"; - sha256 = "0jbxyzvpp2lan8pi212adwflqx38paqvr661ia4zmdjnkhdvi95v"; - name = "akonadi-contacts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-contacts-18.08.0.tar.xz"; + sha256 = "0jqs0llpxq34j4glgzsfifk5yd24x6smky550s66bjzkyg3j2s2m"; + name = "akonadi-contacts-18.08.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-import-wizard-17.12.3.tar.xz"; - sha256 = "0knddbgirj55l24njak7s8ixg1v9i6g5nx6ijh6cnnbr2zl6aws4"; - name = "akonadi-import-wizard-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-import-wizard-18.08.0.tar.xz"; + sha256 = "00my9ja8clz758s3x2jjlsxlpc8zfs8vlq4vh9i2vmsacqwrfy24"; + name = "akonadi-import-wizard-18.08.0.tar.xz"; }; }; akonadi-mime = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-mime-17.12.3.tar.xz"; - sha256 = "0n04x37palp2k6mq20p97k89qi2zfncaapn5pcf4372bzvzi9vj2"; - name = "akonadi-mime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-mime-18.08.0.tar.xz"; + sha256 = "0jj9l1zjh72crj8gfifpn73c5xiyycjgv0cm1qalf370cd1sdx80"; + name = "akonadi-mime-18.08.0.tar.xz"; }; }; akonadi-notes = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-notes-17.12.3.tar.xz"; - sha256 = "0lwnyl12a5sc3ijmahqy3prdzh9352rsqp2jpw2y58xpa2sx0w3g"; - name = "akonadi-notes-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-notes-18.08.0.tar.xz"; + sha256 = "0x2v8ylnli29ld6y9vqj18a4bph4zm34zymdmrp3swll1j6xib7q"; + name = "akonadi-notes-18.08.0.tar.xz"; }; }; akonadi-search = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-search-17.12.3.tar.xz"; - sha256 = "0npnbnras7lxs4r1g0v2nynpdni7wni7y9hy30k61lbif06ghm9x"; - name = "akonadi-search-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-search-18.08.0.tar.xz"; + sha256 = "0fsn7mm1h9m9h3zm2z2fdghbw7m6wdbgfhg7b4iish2br375qh1s"; + name = "akonadi-search-18.08.0.tar.xz"; }; }; akregator = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akregator-17.12.3.tar.xz"; - sha256 = "0032jg05xwk29hpqscb5xfk7ipcpprhw8m28ksfx7v77fb025dsp"; - name = "akregator-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akregator-18.08.0.tar.xz"; + sha256 = "1s044m9l8z6safqcarjplmlksappjkx7iry3k8s2p6ld4w377w3c"; + name = "akregator-18.08.0.tar.xz"; }; }; analitza = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/analitza-17.12.3.tar.xz"; - sha256 = "0xyr5s69768l0lp1qkp68jvny8mfh36q1xpz8msdhcn4513bw5sw"; - name = "analitza-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/analitza-18.08.0.tar.xz"; + sha256 = "1sqr94mbblqry9a1nkmg6py2w0p1wlnbim99kadmp56ypf483rw7"; + name = "analitza-18.08.0.tar.xz"; }; }; ark = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ark-17.12.3.tar.xz"; - sha256 = "0hjnzcn6ijpgqld7034gwzyl9m0i5nwac457f010ibzf0qp10gdi"; - name = "ark-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ark-18.08.0.tar.xz"; + sha256 = "0dp7lrc0nqwwshcsi1408lqyycqhxgx18bmnf1sq7ysh6d1w6i75"; + name = "ark-18.08.0.tar.xz"; }; }; artikulate = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/artikulate-17.12.3.tar.xz"; - sha256 = "0ynbq0m7rk4mm3khjsh0bl744g7m6l2cq9v2a4slg7n4dq8gr8zx"; - name = "artikulate-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/artikulate-18.08.0.tar.xz"; + sha256 = "12bkfxpaz352823c639q3bal9j6fcaamypv2ql08rn44h9zdjvk8"; + name = "artikulate-18.08.0.tar.xz"; }; }; audiocd-kio = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/audiocd-kio-17.12.3.tar.xz"; - sha256 = "0916igzdp1v9zafq5jwhwsfja5h9zsbqgwq97mnkmx9bnd4d2r26"; - name = "audiocd-kio-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/audiocd-kio-18.08.0.tar.xz"; + sha256 = "0mh1cfz0dn28i9hqyjmz2cm50qkxzj0qkrvar59p03i2r8vqybf8"; + name = "audiocd-kio-18.08.0.tar.xz"; }; }; baloo-widgets = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/baloo-widgets-17.12.3.tar.xz"; - sha256 = "1gn18raxqwjx09l54a4gaisxlv4i2vf7pnpv8fqfdk49wc06b58h"; - name = "baloo-widgets-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/baloo-widgets-18.08.0.tar.xz"; + sha256 = "026lm8m7bp8q1akwgfvzsyyam7jknndif3vmij4x5ra7yy5xa0s9"; + name = "baloo-widgets-18.08.0.tar.xz"; }; }; blinken = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/blinken-17.12.3.tar.xz"; - sha256 = "0lda34yw7h867jzfqi071yw0g47916cmr145x1gz71nclg9sdgr0"; - name = "blinken-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/blinken-18.08.0.tar.xz"; + sha256 = "0ivpv27vgzchm0r8zlb02w6l0a8xsi7q173660bjv1ynwalgn3bm"; + name = "blinken-18.08.0.tar.xz"; }; }; bomber = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/bomber-17.12.3.tar.xz"; - sha256 = "14iyn9901canzd4hpsb4xwxd67j01wn54asplvlizmwy3jhpfx9s"; - name = "bomber-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/bomber-18.08.0.tar.xz"; + sha256 = "0z83hkvs7h0pg91sczmvkkn7yc8xfch5hl7l25b7kac4c9qznzix"; + name = "bomber-18.08.0.tar.xz"; }; }; bovo = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/bovo-17.12.3.tar.xz"; - sha256 = "15zaf8017zqfj4z0mlc321lvfnfhda8n648zlsxxap1lj6icr3s9"; - name = "bovo-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/bovo-18.08.0.tar.xz"; + sha256 = "0bbkm0c801rcvk8z0idbasn1m7cdd2mpbpb1ap9ghgv2vjbln7va"; + name = "bovo-18.08.0.tar.xz"; }; }; calendarsupport = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/calendarsupport-17.12.3.tar.xz"; - sha256 = "020ra0sbc8pmibff5ffyzhqwww8qdi1wlmn6h9qh0z2sjk9hrs84"; - name = "calendarsupport-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/calendarsupport-18.08.0.tar.xz"; + sha256 = "0ps4963c2wbmlwp7aks16jw2pz74fqlxarhsnjj3r339575inzw2"; + name = "calendarsupport-18.08.0.tar.xz"; }; }; cantor = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/cantor-17.12.3.tar.xz"; - sha256 = "08jhbm54vv5s14ig2adw83fkk1r0p98aifhiq0sc4xga7gkx032w"; - name = "cantor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/cantor-18.08.0.tar.xz"; + sha256 = "08sqr1nxn9a24z4jicmjn9zn64xv3yyy054rzblr2h2hi3n6fqdy"; + name = "cantor-18.08.0.tar.xz"; }; }; cervisia = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/cervisia-17.12.3.tar.xz"; - sha256 = "04qvgpaa5mf9jmlqd60r1df3r9rscaqasfa9c39cfmahrnvm4yyr"; - name = "cervisia-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/cervisia-18.08.0.tar.xz"; + sha256 = "1avc18vv2lb27w5ybiajsr65c65zpvbv43ihz4gcjv7awqf754w7"; + name = "cervisia-18.08.0.tar.xz"; }; }; dolphin = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/dolphin-17.12.3.tar.xz"; - sha256 = "0fd4c7kwdvjpx7q9yb2razdlv6q7y74nkk99jg20jsng0px9dp20"; - name = "dolphin-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/dolphin-18.08.0.tar.xz"; + sha256 = "1r3g3qssawhav3dx9a9qdd7dqcjj1ynm6ravj5wx39h4qdflrysy"; + name = "dolphin-18.08.0.tar.xz"; }; }; dolphin-plugins = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/dolphin-plugins-17.12.3.tar.xz"; - sha256 = "0bdvwsl83bilm1jhgmcl0b8iyh4vbfg3imara2rmizfxl5g6jccf"; - name = "dolphin-plugins-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/dolphin-plugins-18.08.0.tar.xz"; + sha256 = "1j96bkc3xah4ca3a9asplpf152dp234r2bzs5wg25b3aw7zp5siv"; + name = "dolphin-plugins-18.08.0.tar.xz"; }; }; dragon = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/dragon-17.12.3.tar.xz"; - sha256 = "1j5li70fyz1ynykmxb63i2na3n964lsdkyilj1vhdzb55592b1s4"; - name = "dragon-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/dragon-18.08.0.tar.xz"; + sha256 = "020vnnzd7crvrv8dbcf41h04hpr2ayrfk6ayxhxpazrzic1sxxx6"; + name = "dragon-18.08.0.tar.xz"; }; }; eventviews = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/eventviews-17.12.3.tar.xz"; - sha256 = "0v712sisa0bic6zbl7gb4jvh11wf7krsfpxffxgxc3i8zmvw9jfc"; - name = "eventviews-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/eventviews-18.08.0.tar.xz"; + sha256 = "1ca499dzqsy2n6c0s0vrwvjykc4vd5s4m2bkn0vdg2dbyyx9fncj"; + name = "eventviews-18.08.0.tar.xz"; }; }; ffmpegthumbs = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ffmpegthumbs-17.12.3.tar.xz"; - sha256 = "18f2yxbfxrf4598xwzjd6fws35ipnvnsljv5jwy9lmq400iqpii5"; - name = "ffmpegthumbs-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ffmpegthumbs-18.08.0.tar.xz"; + sha256 = "1rbfbwnyync4j15qzdhn47gksr6jm97pgkld2x3p564gi98w0vrn"; + name = "ffmpegthumbs-18.08.0.tar.xz"; }; }; filelight = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/filelight-17.12.3.tar.xz"; - sha256 = "1k8vibkxv8m8f2q4hj3g4jvk96zkkd0wpxhag5jycla6v50q9anf"; - name = "filelight-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/filelight-18.08.0.tar.xz"; + sha256 = "1wx6q0gq4zlg95a93sg7zqkbaka1pcn99jsjkdncq1z4lfphppk9"; + name = "filelight-18.08.0.tar.xz"; }; }; granatier = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/granatier-17.12.3.tar.xz"; - sha256 = "1zysqf68d2zzhii587a3qdqqf1zhi2k3008f626r59a0yb2bdz9x"; - name = "granatier-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/granatier-18.08.0.tar.xz"; + sha256 = "06nzgpwvgvbh6hf5yxmcxigh3n72qa0mbiv7k56157yyvxigk62q"; + name = "granatier-18.08.0.tar.xz"; }; }; grantlee-editor = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/grantlee-editor-17.12.3.tar.xz"; - sha256 = "03v4yrmbkpa6w8kq54iv0a6rx0q7zv1jmwka103iv89qf9d332j4"; - name = "grantlee-editor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/grantlee-editor-18.08.0.tar.xz"; + sha256 = "06m2n5rcgp63xgnr5jdzly7fda8zx5r3ki07ldxz1xivd985zmfp"; + name = "grantlee-editor-18.08.0.tar.xz"; }; }; grantleetheme = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/grantleetheme-17.12.3.tar.xz"; - sha256 = "0q6s5h236a61q015g9238jandibfhpw9yrx7s367qagk5wi4phsx"; - name = "grantleetheme-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/grantleetheme-18.08.0.tar.xz"; + sha256 = "1mk80hfra4nmrcb0ff3n7l33pbw6j5lypb3ip7g4c1p8qik6imfv"; + name = "grantleetheme-18.08.0.tar.xz"; }; }; gwenview = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/gwenview-17.12.3.tar.xz"; - sha256 = "03gz5a4531xhmr0m5x7nzwzfr3j61xy8yw6pk06i6q7azbxxr1rr"; - name = "gwenview-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/gwenview-18.08.0.tar.xz"; + sha256 = "1nv9a7pj0h2m3wxzy03jw3pi5ps3xqvq9sx7mblq8p4klga2pcnl"; + name = "gwenview-18.08.0.tar.xz"; }; }; incidenceeditor = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/incidenceeditor-17.12.3.tar.xz"; - sha256 = "19jl8mpabxm8gk7krpby1c0kcrss1nvxl5blpviy0m4ccq5jsbka"; - name = "incidenceeditor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/incidenceeditor-18.08.0.tar.xz"; + sha256 = "1s88i1l30b30an8lwc8sdlzfm1cvmb9n5786bs9y0jfgw01wdl7j"; + name = "incidenceeditor-18.08.0.tar.xz"; }; }; juk = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/juk-17.12.3.tar.xz"; - sha256 = "1zzzvwn3ahzwkd7gdavz6k72js2xh79wf1w06vfjx9h35j54smb6"; - name = "juk-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/juk-18.08.0.tar.xz"; + sha256 = "1lzw9ih4771vdxqngc0ja57v9y6wlgf8dbmnjax74ryi232py1d9"; + name = "juk-18.08.0.tar.xz"; }; }; k3b = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/k3b-17.12.3.tar.xz"; - sha256 = "1i74c8x72qx36wl9vc7wcz5rpyd6410n3w8bas7hb5j4bfaapl3l"; - name = "k3b-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/k3b-18.08.0.tar.xz"; + sha256 = "1lm9140xc5mq1szyc4vkms6b3qhl4b3yn74kqp942b8k9djn17md"; + name = "k3b-18.08.0.tar.xz"; }; }; kaccounts-integration = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kaccounts-integration-17.12.3.tar.xz"; - sha256 = "0c3jx2wr7qxkh5i3fmhsd1r0aqf133443nc7l7krymjzd54y6db9"; - name = "kaccounts-integration-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kaccounts-integration-18.08.0.tar.xz"; + sha256 = "0wvqhf9br8nqqacyn6j4k2323w6nixkfzlajkmx872d31d7aqf11"; + name = "kaccounts-integration-18.08.0.tar.xz"; }; }; kaccounts-providers = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kaccounts-providers-17.12.3.tar.xz"; - sha256 = "1h2asblaqmyhy4qfzcl7mxinfg0djghr9xrcvl2xyd85jkk428h5"; - name = "kaccounts-providers-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kaccounts-providers-18.08.0.tar.xz"; + sha256 = "1zxyqwdrf9pp5b1vnd8p4wz21ciavffjxd68vcjjyj8bba30c51l"; + name = "kaccounts-providers-18.08.0.tar.xz"; }; }; kaddressbook = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kaddressbook-17.12.3.tar.xz"; - sha256 = "1ys2hrpqpbwpml3arw076gng7ygdvvkwy489lnq7d345y79501bq"; - name = "kaddressbook-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kaddressbook-18.08.0.tar.xz"; + sha256 = "1wgqqnikv9qyrb4nvkm7h91r1iqfkmbpdp67lcw4jkglqghnn2qc"; + name = "kaddressbook-18.08.0.tar.xz"; }; }; kajongg = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kajongg-17.12.3.tar.xz"; - sha256 = "1p39qjj05p1zjlz9f49pvwzvlsa61h549r74ravj4xdl6fqvdgfa"; - name = "kajongg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kajongg-18.08.0.tar.xz"; + sha256 = "0dfrwzq1p9ikff52qi50ckb769pfij7gzn61r6pdkkfjgy86364y"; + name = "kajongg-18.08.0.tar.xz"; }; }; kalarm = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalarm-17.12.3.tar.xz"; - sha256 = "0n3cdj630q96rvljph3raz0f698pwrh2rx81xzsyp2lk917737h7"; - name = "kalarm-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kalarm-18.08.0.tar.xz"; + sha256 = "0415yq61q700slmm6vskd92pc2sp1027flghgans80i29617zgaq"; + name = "kalarm-18.08.0.tar.xz"; }; }; kalarmcal = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalarmcal-17.12.3.tar.xz"; - sha256 = "13bg69qsyzjaabghq6n33y211i5mz9pnnc26kqyhg87za526j7km"; - name = "kalarmcal-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kalarmcal-18.08.0.tar.xz"; + sha256 = "0ss56dy451lbbq872sarqcyapf4g6kgw78s88hgs7z5mlyj8xnll"; + name = "kalarmcal-18.08.0.tar.xz"; }; }; kalgebra = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalgebra-17.12.3.tar.xz"; - sha256 = "1vm64azi46zgxg0kjg8ch7gxbb8wb3bafsfgxmv4x1hqy45crkv7"; - name = "kalgebra-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kalgebra-18.08.0.tar.xz"; + sha256 = "0fv4v7xnspqjbc7x6n2gcyjssm15apszbvj4gs1w2lwlbbr3i224"; + name = "kalgebra-18.08.0.tar.xz"; }; }; kalzium = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalzium-17.12.3.tar.xz"; - sha256 = "1zha7iy2wg8dyrajijnc3vy7wb0k4kli4q2xkv6ryc6klrp2910h"; - name = "kalzium-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kalzium-18.08.0.tar.xz"; + sha256 = "0bjpiir1xxwvhs4xgnvbhphw24iif9g4kj9zg61bqcvq5zxf821x"; + name = "kalzium-18.08.0.tar.xz"; }; }; kamera = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kamera-17.12.3.tar.xz"; - sha256 = "1xk2cclavzkjifzznd9kx4nq8dysmns2ni9w865s0vvl98z6jbg9"; - name = "kamera-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kamera-18.08.0.tar.xz"; + sha256 = "169vsxnpcgxws27hcap2l5wjbfyxxi30321c8r3p8fm2klvbc8nw"; + name = "kamera-18.08.0.tar.xz"; + }; + }; + kamoso = { + version = "18.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.08.0/src/kamoso-18.08.0.tar.xz"; + sha256 = "1a8azx7rdbzznh9qwzg0x6w50vb5bc6cmd442j2hhdwkl15dqpwd"; + name = "kamoso-18.08.0.tar.xz"; }; }; kanagram = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kanagram-17.12.3.tar.xz"; - sha256 = "05dl248lvskh46mii5glvxpspf6gw1m4z2g6lpb9acafr8cqvz8k"; - name = "kanagram-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kanagram-18.08.0.tar.xz"; + sha256 = "02v3xlkfphkk86y8yrw10lq7f4wc7gmh02ms2w00aqrllkpja4vn"; + name = "kanagram-18.08.0.tar.xz"; }; }; kapman = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kapman-17.12.3.tar.xz"; - sha256 = "04ngab85hsx4z9h45z32s1arahfzyxkyb4i9w6x51jmm3a7cnp4z"; - name = "kapman-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kapman-18.08.0.tar.xz"; + sha256 = "03fhxn8zckidkab56fzgwai0d1ac5k3il32w881gq5z012ms013h"; + name = "kapman-18.08.0.tar.xz"; }; }; kapptemplate = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kapptemplate-17.12.3.tar.xz"; - sha256 = "11v108jqmqp4xcmf6nz41fl7avmcpd26w4pdgfk70dzjwpzf1hl3"; - name = "kapptemplate-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kapptemplate-18.08.0.tar.xz"; + sha256 = "10fyvwxf6xmn8jdc4p3m3jpb8ykaga1jmwx2hzhf8c6a3rrcxvvb"; + name = "kapptemplate-18.08.0.tar.xz"; }; }; kate = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kate-17.12.3.tar.xz"; - sha256 = "041ax9mvmgi9aj3759411bv1yj0a0v08djmwmn6kbvl8nv6a7dp5"; - name = "kate-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kate-18.08.0.tar.xz"; + sha256 = "1licprflzcsrfap7klr1ia2kl2z2cp16zgznphrqkkn9n6x7xz67"; + name = "kate-18.08.0.tar.xz"; }; }; katomic = { - version = "17.12.3"; + version = "18.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.08.0/src/katomic-18.08.0.tar.xz"; + sha256 = "07d9irgqrawll18fi3b2mrjj416gpkn43bsriifkraqf8yrn3m4s"; + name = "katomic-18.08.0.tar.xz"; + }; + }; + kbackup = { + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/katomic-17.12.3.tar.xz"; - sha256 = "1ljc8h2ngsc3cqz58dal3kkn7ymwa23ikxhjakn0nsg07fbqkdjl"; - name = "katomic-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kbackup-18.08.0.tar.xz"; + sha256 = "14nmk7dwrmkfv7kz4r64vzy46n48g3l1iqj0937qnpbqk12yvak9"; + name = "kbackup-18.08.0.tar.xz"; }; }; kblackbox = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kblackbox-17.12.3.tar.xz"; - sha256 = "1nc15k4rlpjb9p5y3g6jhi1j8nnwzxv4cymg7m7p356xr5k0m5qm"; - name = "kblackbox-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kblackbox-18.08.0.tar.xz"; + sha256 = "0nd4nsx7yyiy1g1g4v0gaw0m6r3kb07gnn8236bch6xxy9xcdzhb"; + name = "kblackbox-18.08.0.tar.xz"; }; }; kblocks = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kblocks-17.12.3.tar.xz"; - sha256 = "04yyz71a4nr8g6fnb3mfsnlisnsw2c28z39w1hn54msmi32wyvi2"; - name = "kblocks-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kblocks-18.08.0.tar.xz"; + sha256 = "1pnxzfp3bd089bjbdsi0iwjpw60p36lb110yb61cv0vb54g1sia1"; + name = "kblocks-18.08.0.tar.xz"; }; }; kblog = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kblog-17.12.3.tar.xz"; - sha256 = "0169m2h60iygy021j5w7fqww4ljal3gzffmj8f7arf6fin9myhwb"; - name = "kblog-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kblog-18.08.0.tar.xz"; + sha256 = "00q7266lx29bfgzhfmb192l8h3qwgpj3yyfc0lykkbhjf6d9w783"; + name = "kblog-18.08.0.tar.xz"; }; }; kbounce = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kbounce-17.12.3.tar.xz"; - sha256 = "0m0hvb8dv2z5s80c8i0ivkwnp9xaqprvgkgnrfmispj1splpzlvw"; - name = "kbounce-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kbounce-18.08.0.tar.xz"; + sha256 = "0x07lxqip9l2k9mdpan03yh17ammkd1f242l2p3qq3j1s71bpznm"; + name = "kbounce-18.08.0.tar.xz"; }; }; kbreakout = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kbreakout-17.12.3.tar.xz"; - sha256 = "04n01c36dbfq8khklc7jp2d80zxyhfy7v3x4dqpknnq22a8x8f6c"; - name = "kbreakout-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kbreakout-18.08.0.tar.xz"; + sha256 = "1jrix92p48zcpgwvfxn484bw1k8ynfacm4iww14splx2d9skj489"; + name = "kbreakout-18.08.0.tar.xz"; }; }; kbruch = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kbruch-17.12.3.tar.xz"; - sha256 = "1m3cdifm13gyfkhnab3nmw762kvbz64fyfw8py7lqy7i023yg35r"; - name = "kbruch-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kbruch-18.08.0.tar.xz"; + sha256 = "1gkij27hl847bc2jdnjqvigncdmb11spj2rsy825rsnpiqxbqv8f"; + name = "kbruch-18.08.0.tar.xz"; }; }; kcachegrind = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcachegrind-17.12.3.tar.xz"; - sha256 = "1nsx813dsngf5agdw04cdrw3h8cj4g2na28i5anxbscn7fm715hd"; - name = "kcachegrind-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcachegrind-18.08.0.tar.xz"; + sha256 = "13nqcxh21apxpzg51alsgn34hps21nr7aqyh60kd4fbmmsxrqll0"; + name = "kcachegrind-18.08.0.tar.xz"; }; }; kcalc = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcalc-17.12.3.tar.xz"; - sha256 = "0w4rqkjsl24528bqkqansk985iq6nk78bm0pinagm1fqrarjqk8j"; - name = "kcalc-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcalc-18.08.0.tar.xz"; + sha256 = "04bdbdyc9lky6i0dkm6w9f2k3gvr9zq5b9yc6qhl4smdiivlqjb6"; + name = "kcalc-18.08.0.tar.xz"; }; }; kcalcore = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcalcore-17.12.3.tar.xz"; - sha256 = "125qdd3gp6bwm6lqc1ib4icv3sa8sd0n5fjbgwr4klx8xsxzr03z"; - name = "kcalcore-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcalcore-18.08.0.tar.xz"; + sha256 = "0sdzx0ygq89np2cj22v06m9j00nwbqn97rm43nffgixwvrlf1wy5"; + name = "kcalcore-18.08.0.tar.xz"; }; }; kcalutils = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcalutils-17.12.3.tar.xz"; - sha256 = "1cag7pg9qd8w7xmvplkqr6p6pscnjzlzlin9fi6yjhhsq8bi2rxb"; - name = "kcalutils-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcalutils-18.08.0.tar.xz"; + sha256 = "12s2anmwi3q95kjl197jis90vi5gzpxs0b4xj4m6n4lzmnyjvfxl"; + name = "kcalutils-18.08.0.tar.xz"; }; }; kcharselect = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcharselect-17.12.3.tar.xz"; - sha256 = "1chxa1nsczk525hvwyw6cbzdr73i21zw9jngp9c79frcnpb5hdi4"; - name = "kcharselect-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcharselect-18.08.0.tar.xz"; + sha256 = "1gfzzzk5admdclw75qhnsf3271p2lr0fgqzxvclcxppwmv5j56aq"; + name = "kcharselect-18.08.0.tar.xz"; }; }; kcolorchooser = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcolorchooser-17.12.3.tar.xz"; - sha256 = "1yf8bizxd65h9pzai51l7piw5p4rlcl2bmw3qf9s73xii9cxz8yl"; - name = "kcolorchooser-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcolorchooser-18.08.0.tar.xz"; + sha256 = "1sxlx6cnpm0yfbrbk1pqaf0lsf1mgzdnkszr30hwz6z5lvvzj73l"; + name = "kcolorchooser-18.08.0.tar.xz"; }; }; kcontacts = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcontacts-17.12.3.tar.xz"; - sha256 = "08gzaznb6nazqcd5v755cs6fvxq4y1ywa7qbff7fb28sbkz6sdjl"; - name = "kcontacts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcontacts-18.08.0.tar.xz"; + sha256 = "0cil96cd383gvqa2dw1lhaw3vi3m04y4rpjqmiapzwnn4ck0v1ii"; + name = "kcontacts-18.08.0.tar.xz"; }; }; kcron = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcron-17.12.3.tar.xz"; - sha256 = "0kdd0kzx26jhwrz9ism9fc5gbf1fh0qsb6h3gmx524r40wzr45bf"; - name = "kcron-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcron-18.08.0.tar.xz"; + sha256 = "14lkaz1b6hnpwvxnnx3mgv3fg86vm1g45fggfx25x6x72kiihhzq"; + name = "kcron-18.08.0.tar.xz"; }; }; kdav = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdav-17.12.3.tar.xz"; - sha256 = "141a2fk3n18554qh8h00dnik33pf4jmvp1z94gbhscgkza1xdlx4"; - name = "kdav-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdav-18.08.0.tar.xz"; + sha256 = "13jwc4623f9mx64i7fb3ha5gwbqgfd54dirbvcyyglrzipxmgja1"; + name = "kdav-18.08.0.tar.xz"; }; }; kdebugsettings = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdebugsettings-17.12.3.tar.xz"; - sha256 = "0y71ay5b7fly5rbl7fii6glkhmdkrk6fxmyx5ick5jgjgnmzjkdr"; - name = "kdebugsettings-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdebugsettings-18.08.0.tar.xz"; + sha256 = "1ddqcfq2icsk2xmfr02jawdgxyydhx4yyhrfd7pk8cfw66rm23br"; + name = "kdebugsettings-18.08.0.tar.xz"; }; }; kde-dev-scripts = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kde-dev-scripts-17.12.3.tar.xz"; - sha256 = "1mipi7fchmf6rmivlpbncx106axaw9hi9r1kd7ibn5jqz0raa554"; - name = "kde-dev-scripts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kde-dev-scripts-18.08.0.tar.xz"; + sha256 = "1glnm91wn3xdd6zqqy2p178f05z5wn3gr1i6jyqb0zkl8ansy3yi"; + name = "kde-dev-scripts-18.08.0.tar.xz"; }; }; kde-dev-utils = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kde-dev-utils-17.12.3.tar.xz"; - sha256 = "05a8h9bdg81zlaf1zqk8vdqp1d2lkymdg82ppxvm2sxg00rrzgp6"; - name = "kde-dev-utils-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kde-dev-utils-18.08.0.tar.xz"; + sha256 = "1dk510kgjgvycdyzr5mwq9z1b3xr8hlpm4ahfwlfn299gl563fwf"; + name = "kde-dev-utils-18.08.0.tar.xz"; }; }; kdeedu-data = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdeedu-data-17.12.3.tar.xz"; - sha256 = "17xdhkaavz1b5f2iqw64b7891qc8l2i3f90zr2byw4j05gfm24wr"; - name = "kdeedu-data-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdeedu-data-18.08.0.tar.xz"; + sha256 = "1ph3bw4xgmgh28j9vnj9v1amgisy3f44whpwwhzin9zgzz0cw3gw"; + name = "kdeedu-data-18.08.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-mobipocket-17.12.3.tar.xz"; - sha256 = "16l5s4ha93h7bvb07kx60674i0j1n26c16w8q3drl8jmkmmf2h4j"; - name = "kdegraphics-mobipocket-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-mobipocket-18.08.0.tar.xz"; + sha256 = "0p3bci612qbqnbps4g4yb2kd1rs6kx2ppcls6vpfb035c28ygf7a"; + name = "kdegraphics-mobipocket-18.08.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-thumbnailers-17.12.3.tar.xz"; - sha256 = "1xak3c76bwprmb0anjvw5p620lm9hxyn6dzw2vh1di899b1p60n4"; - name = "kdegraphics-thumbnailers-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-thumbnailers-18.08.0.tar.xz"; + sha256 = "0dwfphz70y0g43a9nxfda78qwsv7y4llx1f51x6n8jl64kpxnijw"; + name = "kdegraphics-thumbnailers-18.08.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdenetwork-filesharing-17.12.3.tar.xz"; - sha256 = "0hkvmv0wiyhh4b036sdqx4f69ihxwl4m3mnmwc58va3cj5p32pyh"; - name = "kdenetwork-filesharing-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdenetwork-filesharing-18.08.0.tar.xz"; + sha256 = "0l5f9ffwsk0s9r87kid9k1a7j2v4lcdzbn2w4qb2pg22k92k8p67"; + name = "kdenetwork-filesharing-18.08.0.tar.xz"; }; }; kdenlive = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdenlive-17.12.3.tar.xz"; - sha256 = "0gjhiwjh5h727v4lcs3yy526sr4sr563acg9xc54q76hcl1qc7rp"; - name = "kdenlive-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdenlive-18.08.0.tar.xz"; + sha256 = "06d0viqma7kivzv3hbsiirkfhbj28mdr2nr3f5ic56381q3ps923"; + name = "kdenlive-18.08.0.tar.xz"; }; }; kdepim-addons = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdepim-addons-17.12.3.tar.xz"; - sha256 = "13562gn2jc049pfkq8kw2w5lnmh6s6z6r57p3rpjr880izw9707h"; - name = "kdepim-addons-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdepim-addons-18.08.0.tar.xz"; + sha256 = "05141013jdaascsb7ihbmd4f1lh1r6ah5w39wp5vky6ma35zv2l1"; + name = "kdepim-addons-18.08.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdepim-apps-libs-17.12.3.tar.xz"; - sha256 = "178iq1kjynid2hfnlh5pbcq2z46rl55xfvvsnpbwbk80j81mpj24"; - name = "kdepim-apps-libs-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdepim-apps-libs-18.08.0.tar.xz"; + sha256 = "0zpx3nilrsvgmgx5visppyx3kn2g5k8fnhfy649k6wa35p846495"; + name = "kdepim-apps-libs-18.08.0.tar.xz"; }; }; kdepim-runtime = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdepim-runtime-17.12.3.tar.xz"; - sha256 = "1r30wp4n020hh83znv6889w3vm0flyn31b92pmrgvsxm8yzphgwn"; - name = "kdepim-runtime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdepim-runtime-18.08.0.tar.xz"; + sha256 = "0b1jbksxks32s8gjzrjhh4nja089j5dq75yaiil99w11f7nfpkar"; + name = "kdepim-runtime-18.08.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdesdk-kioslaves-17.12.3.tar.xz"; - sha256 = "022yp5glg3dxfm5lgv4095dimw9nwbdh559y2vvvlx06pyi0b1qa"; - name = "kdesdk-kioslaves-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdesdk-kioslaves-18.08.0.tar.xz"; + sha256 = "1fpg4sdbgzvlc9z7wwxxbp466fhybphvmcdpplbr7ws3588792cb"; + name = "kdesdk-kioslaves-18.08.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdesdk-thumbnailers-17.12.3.tar.xz"; - sha256 = "0qndm22x7f4w8nmai4zxrxmxkism25xh7cf8vfsihlpqj1qs7wci"; - name = "kdesdk-thumbnailers-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdesdk-thumbnailers-18.08.0.tar.xz"; + sha256 = "047rnzn2lsbhfll0fp4vdf4jsyixg7vmpl2xyvi1y85df5nvv2pc"; + name = "kdesdk-thumbnailers-18.08.0.tar.xz"; }; }; kdf = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdf-17.12.3.tar.xz"; - sha256 = "18q0581jaqc6w2cbdq1crxgrn97p89ah205mv253pd58w9qc4xlp"; - name = "kdf-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdf-18.08.0.tar.xz"; + sha256 = "1flv6qjb936fcj5crshy26qy9y2p7j9i3hlidr9lsk81wsyjkqqg"; + name = "kdf-18.08.0.tar.xz"; }; }; kdialog = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdialog-17.12.3.tar.xz"; - sha256 = "1smz7q09ss963c9snsvb6biimn1d2c9yyx9lhxszfl9155cgd9x4"; - name = "kdialog-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdialog-18.08.0.tar.xz"; + sha256 = "04xhp4pdn7gv69gwydz9afml27qj9mrqz2hnrhcsf29pw3vq0hli"; + name = "kdialog-18.08.0.tar.xz"; }; }; kdiamond = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdiamond-17.12.3.tar.xz"; - sha256 = "1k4mlajxwpbn4y6dlkz5psxy6iqfjj5qif7i5sfn0c3gsgm76pxc"; - name = "kdiamond-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdiamond-18.08.0.tar.xz"; + sha256 = "14c5i2fj9scvkqffz95lrqj49vfg7yh7gfc4s3zzg2sl91j7hwzq"; + name = "kdiamond-18.08.0.tar.xz"; }; }; keditbookmarks = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/keditbookmarks-17.12.3.tar.xz"; - sha256 = "066ia9n648p53g4451zfn5nram821rlbjlnfi9ny9p0j4dl6wwya"; - name = "keditbookmarks-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/keditbookmarks-18.08.0.tar.xz"; + sha256 = "1zsfmcyb9s782k6knlv56mrssazdid6i70g74is46s59sgfdd9fl"; + name = "keditbookmarks-18.08.0.tar.xz"; }; }; kfind = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kfind-17.12.3.tar.xz"; - sha256 = "1xf1sw422sg3ki1phy097lwma14drdnjbgc1m5rap3dg0za25c9s"; - name = "kfind-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kfind-18.08.0.tar.xz"; + sha256 = "1bvln7iq2ikcrzaa53wskpqwzmndjvc84a2jdjqzirmh6pqzlf3h"; + name = "kfind-18.08.0.tar.xz"; }; }; kfloppy = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kfloppy-17.12.3.tar.xz"; - sha256 = "0gjp2l5jm16v1v4xwzaandplabz6rjdiimcf3b0r5d9prbiwry3p"; - name = "kfloppy-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kfloppy-18.08.0.tar.xz"; + sha256 = "1clz5651d11pm77mi57nzr274zwshx2qhglfn6jxiif9yz6s9dfp"; + name = "kfloppy-18.08.0.tar.xz"; }; }; kfourinline = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kfourinline-17.12.3.tar.xz"; - sha256 = "1l10fj1vhxj1d647mcxp7a2bbilrhs3sf7cwkr57vavfzsp7diyw"; - name = "kfourinline-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kfourinline-18.08.0.tar.xz"; + sha256 = "1agmzlwy4izrmi58cf08cg34h155inmws3ghp524jz1li6rqvzfr"; + name = "kfourinline-18.08.0.tar.xz"; }; }; kgeography = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kgeography-17.12.3.tar.xz"; - sha256 = "1dl3k4zlchpdhvjb459wb44iyq30ngki6x198pyc23j15mjfdrih"; - name = "kgeography-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kgeography-18.08.0.tar.xz"; + sha256 = "0nj3lg8q84wvh1pypix619bdr9xm6s9s5vywciq8ggskqa2qrdc5"; + name = "kgeography-18.08.0.tar.xz"; }; }; kget = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kget-17.12.3.tar.xz"; - sha256 = "1kaxvid76s8rx07hza56s83l785dxi5whhkqzkv132z2dm01yzww"; - name = "kget-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kget-18.08.0.tar.xz"; + sha256 = "0vpphsfgqa4h1bsj0k6lz591ymd5zy3ng86fl4l1qv36kh5b3sr4"; + name = "kget-18.08.0.tar.xz"; }; }; kgoldrunner = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kgoldrunner-17.12.3.tar.xz"; - sha256 = "1ihj48kvr9xpw4rajiyq3kng1dn6l60dmii5pnyjmxlfs08apayx"; - name = "kgoldrunner-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kgoldrunner-18.08.0.tar.xz"; + sha256 = "13i3b8z2pbvh90ykv365s30az9r33is8wp8ys33kz88z26260rsv"; + name = "kgoldrunner-18.08.0.tar.xz"; }; }; kgpg = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kgpg-17.12.3.tar.xz"; - sha256 = "19yacv7l6kynyznb8ixn3697h04mhh4fhx02n4frdy9pnzv94hyp"; - name = "kgpg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kgpg-18.08.0.tar.xz"; + sha256 = "12d6vqfcrgmqajk383p9gx9l49digm51km00slwkb15yjzgsjckx"; + name = "kgpg-18.08.0.tar.xz"; }; }; khangman = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/khangman-17.12.3.tar.xz"; - sha256 = "0hnm499qs1l2yzfqxhmkyc5lp0qb5j29h1knap1vmv4qy0qnmnjk"; - name = "khangman-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/khangman-18.08.0.tar.xz"; + sha256 = "0vcyak1pqq894d10jn4s8948fz8py6kjhgrbvjk2ksp28fzsb1q2"; + name = "khangman-18.08.0.tar.xz"; }; }; khelpcenter = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/khelpcenter-17.12.3.tar.xz"; - sha256 = "0z5hrwqsi9ifraivz59nbq247x481hx90wiyfbls9lwv56y1zi7n"; - name = "khelpcenter-17.12.3.tar.xz"; - }; - }; - kholidays = { - version = "17.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kholidays-17.12.3.tar.xz"; - sha256 = "0w886443zzvpwqznnn7ymw5bxzdnigfz9j45qrl1qvdd6q8710di"; - name = "kholidays-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/khelpcenter-18.08.0.tar.xz"; + sha256 = "1ykw91s1w5953646ylxm49bq0bjgxd8yp29r09644q12qmi1w9ay"; + name = "khelpcenter-18.08.0.tar.xz"; }; }; kidentitymanagement = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kidentitymanagement-17.12.3.tar.xz"; - sha256 = "0my4r8k8gadkda3z1myarrq4x72qz6wxsy6lj9rzkj4y549bm93y"; - name = "kidentitymanagement-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kidentitymanagement-18.08.0.tar.xz"; + sha256 = "1rrdxbil0z0vmv0h0d6jdlwa3sfs3nncq39wmydhwx09phk7db85"; + name = "kidentitymanagement-18.08.0.tar.xz"; }; }; kig = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kig-17.12.3.tar.xz"; - sha256 = "0liv94y90bfd5pi003bd3jryc1dal5mwxhqy94c2n3ay8yz8kxid"; - name = "kig-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kig-18.08.0.tar.xz"; + sha256 = "0kgsar7sp3a7x72gnagi2hwajbl1yaaj493qjnwzlwidjjrlzmhb"; + name = "kig-18.08.0.tar.xz"; }; }; kigo = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kigo-17.12.3.tar.xz"; - sha256 = "1z01w5zsbwn8h0mgr5liqagsmlppqclkjs4z5rdys75sxm142fzh"; - name = "kigo-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kigo-18.08.0.tar.xz"; + sha256 = "1ws0diq3kb8f15v30cj0hc0ii4d14dca7fb3p8vvm8r4ly7gqbdr"; + name = "kigo-18.08.0.tar.xz"; }; }; killbots = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/killbots-17.12.3.tar.xz"; - sha256 = "14xgh9qhagq9c01xbv0n4g5b3q9r6qr0dsc5ilindr66psspx7an"; - name = "killbots-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/killbots-18.08.0.tar.xz"; + sha256 = "165g1zll7wq6gyz1lzaf1x17j2nagd66lj015qxifjpn9fd475mm"; + name = "killbots-18.08.0.tar.xz"; }; }; kimagemapeditor = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kimagemapeditor-17.12.3.tar.xz"; - sha256 = "1s9929wb3lclbn85rk3zd0nai64mrwgqdqnkw2dys98snq12r3hn"; - name = "kimagemapeditor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kimagemapeditor-18.08.0.tar.xz"; + sha256 = "1r3hngzvidv1yz7kd7l8l78gqdhjvw9smciv1vkzf7dk9qarlyfq"; + name = "kimagemapeditor-18.08.0.tar.xz"; }; }; kimap = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kimap-17.12.3.tar.xz"; - sha256 = "1prilnf01s73ml7542s7qh0ki9gqvgq7xqzxq2mz17k4d3irdvxw"; - name = "kimap-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kimap-18.08.0.tar.xz"; + sha256 = "12lslmprwmibijlpwng4acmmhdfhm1dgvqsazbyvsr8jagkryxmq"; + name = "kimap-18.08.0.tar.xz"; }; }; kio-extras = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kio-extras-17.12.3.tar.xz"; - sha256 = "1ifi09hv5aqx62x1cjnsxxh7xji9m0mmk3gfn43la9vw4rhxzlks"; - name = "kio-extras-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kio-extras-18.08.0.tar.xz"; + sha256 = "1k5azz26zwsflnsgv4r0i8z8jph060wpksyqfpkz0vfsf3lv0k3n"; + name = "kio-extras-18.08.0.tar.xz"; }; }; kiriki = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kiriki-17.12.3.tar.xz"; - sha256 = "1zl8mq1ya3x67y1pj1ir98v5lbxwccwyni8i02wc7mbgmxbk6p9q"; - name = "kiriki-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kiriki-18.08.0.tar.xz"; + sha256 = "1fciiq490iwcz86g9pqp8g0s40zf7a3zan132iqmscpl71hsv01b"; + name = "kiriki-18.08.0.tar.xz"; }; }; kiten = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kiten-17.12.3.tar.xz"; - sha256 = "1p1s20ks3r2zfd7wig1j2lbxbf3ch9gbykw2cgadip4nyn9nyll5"; - name = "kiten-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kiten-18.08.0.tar.xz"; + sha256 = "1gzgfj0p0s5yjhwx6hldc8s0cs6p2bn5gd8sy29sicg13wjvhkmj"; + name = "kiten-18.08.0.tar.xz"; + }; + }; + kitinerary = { + version = "18.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.08.0/src/kitinerary-18.08.0.tar.xz"; + sha256 = "14jwlkfy9z6q2pnjmlcy5gihc75n6qnsck05zycs4qsxa4srpn0l"; + name = "kitinerary-18.08.0.tar.xz"; }; }; kjumpingcube = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kjumpingcube-17.12.3.tar.xz"; - sha256 = "07fakw1nq3bickj05cvb39wyb02fpfph0ia1wfm8wf43rd34c76l"; - name = "kjumpingcube-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kjumpingcube-18.08.0.tar.xz"; + sha256 = "001a2ayl74hi89j8i3553qx0cs8w7f4myskq3qa01rg3w4pb3wl2"; + name = "kjumpingcube-18.08.0.tar.xz"; }; }; kldap = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kldap-17.12.3.tar.xz"; - sha256 = "02adfzjlvxjff33cpyihsf9z9zm7nvgmnipg9dmkpc0cwl25a8jy"; - name = "kldap-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kldap-18.08.0.tar.xz"; + sha256 = "1825146vi1lq1383qmn8ix70d2rc2cfwp95vpn4divf9aqwmc4x0"; + name = "kldap-18.08.0.tar.xz"; }; }; kleopatra = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kleopatra-17.12.3.tar.xz"; - sha256 = "1417j1jh7bs0020laaimpwmmng508k85kp24k923ad2v65i51agd"; - name = "kleopatra-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kleopatra-18.08.0.tar.xz"; + sha256 = "1wwjn2p2vblr6fdfcy1s5gf3h5cnclc4lj5vsi5cxyp7d86ij49c"; + name = "kleopatra-18.08.0.tar.xz"; }; }; klettres = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/klettres-17.12.3.tar.xz"; - sha256 = "0npp2dkwi3g36scipdra5xj5lf0xga3l8h8pk6isx7l86xsv3ds0"; - name = "klettres-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/klettres-18.08.0.tar.xz"; + sha256 = "1g84swzlynyl7r2ln52n7w9q0yf6540dd9hj3j0zsp1y2hb9fns8"; + name = "klettres-18.08.0.tar.xz"; }; }; klickety = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/klickety-17.12.3.tar.xz"; - sha256 = "0f8gxqcfanxbqjqrq1j598nbis3djxxps61hdl1wd9xki1a86xy8"; - name = "klickety-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/klickety-18.08.0.tar.xz"; + sha256 = "1jrxabmnv0s38i255x7xycn12fgpkmr4p1y0ydk5x98zrv4vn8y0"; + name = "klickety-18.08.0.tar.xz"; }; }; klines = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/klines-17.12.3.tar.xz"; - sha256 = "0kp7c8qxkwgf13cwa7x5wik5w7snq6830zpah6lsk4ls5jw5mln0"; - name = "klines-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/klines-18.08.0.tar.xz"; + sha256 = "14ks53xh6hhlrmiqa7a1f7z42i035qw3v72dpbc8bw20vg53bzpy"; + name = "klines-18.08.0.tar.xz"; }; }; kmag = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmag-17.12.3.tar.xz"; - sha256 = "0n9dxf5mcz6rlfr91r6yd7sxfmshgdc8znxfbncd1a9j523vba3w"; - name = "kmag-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmag-18.08.0.tar.xz"; + sha256 = "00ni6clpgwcr6b2yanmgplsb5jqmqxjiymd3572fkj7q8m17ak7f"; + name = "kmag-18.08.0.tar.xz"; }; }; kmahjongg = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmahjongg-17.12.3.tar.xz"; - sha256 = "0ai6jlny4fi69psiizix5adz3kga4plf70y322a3ybl8g9c44m1a"; - name = "kmahjongg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmahjongg-18.08.0.tar.xz"; + sha256 = "0lflx8jxk2yv7bsywwmbk5l54gyhbyv65996fg82z6lw9hrr5wrb"; + name = "kmahjongg-18.08.0.tar.xz"; }; }; kmail = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmail-17.12.3.tar.xz"; - sha256 = "02hjrk1c4mk3jrmyhn4ppar6vdlg51j79fqcjzfs1d8s4w0swwbs"; - name = "kmail-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmail-18.08.0.tar.xz"; + sha256 = "1xj2z4ix9zba6k3cdnakr7f0nfij1z925j3vp0gimkgyvbcb28vr"; + name = "kmail-18.08.0.tar.xz"; }; }; kmail-account-wizard = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmail-account-wizard-17.12.3.tar.xz"; - sha256 = "1qdwqd763k5dq8mmwibnvgqjb7l6br9dqwxfsi7q8bhjxipijvdx"; - name = "kmail-account-wizard-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmail-account-wizard-18.08.0.tar.xz"; + sha256 = "1hc6zqys2qncljvsl9j48ns77kkq5zabj5a2kzg953dgcdv5x25r"; + name = "kmail-account-wizard-18.08.0.tar.xz"; }; }; kmailtransport = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmailtransport-17.12.3.tar.xz"; - sha256 = "131yy2xa61fi2dmrb3qapf589lf4s9v2rkk2js0bi1827yg097f0"; - name = "kmailtransport-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmailtransport-18.08.0.tar.xz"; + sha256 = "0dfws0pzq3jf1h6j5qzjm96fz1ci4v57j4s9fbry10vyn4racpq8"; + name = "kmailtransport-18.08.0.tar.xz"; }; }; kmbox = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmbox-17.12.3.tar.xz"; - sha256 = "15x9cdwcbwrjaj3rzphwmpayhy45j45pwj88sz0drqz3mwc55jgm"; - name = "kmbox-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmbox-18.08.0.tar.xz"; + sha256 = "11dh1lgjhiy4bvpvrk1rw23fgjil45ch3lazqc4jp21d1skrr1v4"; + name = "kmbox-18.08.0.tar.xz"; }; }; kmime = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmime-17.12.3.tar.xz"; - sha256 = "0251szs8dcpnwhqk72c211mp7h0xhn0f8z21mdm6k94ij43da9cm"; - name = "kmime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmime-18.08.0.tar.xz"; + sha256 = "0kci9b2c67hzbl4hjwkkzk9j7g1l5wy1d8qrm1jwk8s7ccndindw"; + name = "kmime-18.08.0.tar.xz"; }; }; kmines = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmines-17.12.3.tar.xz"; - sha256 = "0r9rs97s92z5854xdampgp6igmppzp3mhaw9rscrdwvvq4xpsll9"; - name = "kmines-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmines-18.08.0.tar.xz"; + sha256 = "0z0fidlcp0kf9vmdgfyzrwi9yk5mfwhkzlqlbfy1631xisz158yn"; + name = "kmines-18.08.0.tar.xz"; }; }; kmix = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmix-17.12.3.tar.xz"; - sha256 = "12fwimqr21hgwqscihaxwh1f39xm8k21f95f7b3gwwa5lbj0l9mp"; - name = "kmix-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmix-18.08.0.tar.xz"; + sha256 = "084l5dpms26jwd894xnqr054hxjzlxcp2wm2rq37y3cbriia2xgh"; + name = "kmix-18.08.0.tar.xz"; }; }; kmousetool = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmousetool-17.12.3.tar.xz"; - sha256 = "0gbvzywnxbcb4iw7pgf70ljz0qd8xl8825srpp3fj7lv0kh9ni9z"; - name = "kmousetool-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmousetool-18.08.0.tar.xz"; + sha256 = "0lcr8hpflaw5lrfydwi5sf069hfb19qifb7wh7qxh7j1b2z8w4gf"; + name = "kmousetool-18.08.0.tar.xz"; }; }; kmouth = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmouth-17.12.3.tar.xz"; - sha256 = "012lpy904n2isj8msxivgk0ssy56qajgjxn1hz2jy9jjyyi77f2n"; - name = "kmouth-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmouth-18.08.0.tar.xz"; + sha256 = "0naqn9pl7jldfna9l3i3kdv8rkw0nky4ppsvqghlrb9jf4dy8lfm"; + name = "kmouth-18.08.0.tar.xz"; }; }; kmplot = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmplot-17.12.3.tar.xz"; - sha256 = "0plblgv243ymmcbpb8rs4clilwlsggn7219yqrh064lzbfblhxa9"; - name = "kmplot-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmplot-18.08.0.tar.xz"; + sha256 = "0lvw351iz2gdzkphrf8hxgqbjqi4pqvxqk2zjbly4fzwbgk261bd"; + name = "kmplot-18.08.0.tar.xz"; }; }; knavalbattle = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/knavalbattle-17.12.3.tar.xz"; - sha256 = "07z0h0h6fmd99x0kqjlwlkpxndypa2svdvmjv8vmwcdp45hik90f"; - name = "knavalbattle-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/knavalbattle-18.08.0.tar.xz"; + sha256 = "0b21z3qqhsyafsa6rx9mc560hrw0046npqjmi5jpmczl6y9mr78q"; + name = "knavalbattle-18.08.0.tar.xz"; }; }; knetwalk = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/knetwalk-17.12.3.tar.xz"; - sha256 = "1iz819dsrdf5fck6qx0s4d0k7sz58pbxp5kk4aczszmvpnn2197k"; - name = "knetwalk-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/knetwalk-18.08.0.tar.xz"; + sha256 = "04yfxxihfdqhrs126796k498v8valhd73q2bagcx59lj7iymxszj"; + name = "knetwalk-18.08.0.tar.xz"; }; }; knotes = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/knotes-17.12.3.tar.xz"; - sha256 = "1iy6rmhlh7jgryxrwqrqaqaajfimdlqcw0x3yizbqalpw1k6f8m3"; - name = "knotes-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/knotes-18.08.0.tar.xz"; + sha256 = "0dvjafmf57z10lx8fb4y4na73qq3dfmqfa2w01b3sdzns0nzaqig"; + name = "knotes-18.08.0.tar.xz"; }; }; kolf = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kolf-17.12.3.tar.xz"; - sha256 = "1zc1i36a302rpvv2lbfv8q8glh1brjk95mjkwxbplv8gmdbd71cj"; - name = "kolf-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kolf-18.08.0.tar.xz"; + sha256 = "0bcd4k7v5sid98h95xbqm5l0dcjkv367mdgzhr6yizlqpyg6c132"; + name = "kolf-18.08.0.tar.xz"; }; }; kollision = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kollision-17.12.3.tar.xz"; - sha256 = "019ibb9190k6qf07kgjy88lzyawvbh9hb7df96l96ilgssxxhnvz"; - name = "kollision-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kollision-18.08.0.tar.xz"; + sha256 = "029pwgwmsm9m284m1sbi2zzhhwbz6rlq68jd783ir6cq2z3llvjp"; + name = "kollision-18.08.0.tar.xz"; }; }; kolourpaint = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kolourpaint-17.12.3.tar.xz"; - sha256 = "15vd3ykixfkbwg3dk4plfpf72k2cknwpk6ip7rnw4h41r0rg838w"; - name = "kolourpaint-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kolourpaint-18.08.0.tar.xz"; + sha256 = "0p08xc8ai1cllbdwmv46xzcpv70mn6zwd4f62xsh71hhpg8fbqpi"; + name = "kolourpaint-18.08.0.tar.xz"; }; }; kompare = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kompare-17.12.3.tar.xz"; - sha256 = "0kfrxwx2dnvbvy7ykm3dxm0873g2136jllakav8pxgf75z4iwryl"; - name = "kompare-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kompare-18.08.0.tar.xz"; + sha256 = "0md4qw29q5mnsz0k4a3dl6fdgff33w4kg59qy02kp3pvqav9r1zx"; + name = "kompare-18.08.0.tar.xz"; }; }; konqueror = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/konqueror-17.12.3.tar.xz"; - sha256 = "0dhm22p4mx244pd2wnl7xxhkh4yc3dsl126ndmajj62i0si0y0hw"; - name = "konqueror-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/konqueror-18.08.0.tar.xz"; + sha256 = "12zw4bgmmc35vghi8phm93x9lmhfgpxxfvz0grxa4gxcxqjyzzcq"; + name = "konqueror-18.08.0.tar.xz"; }; }; konquest = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/konquest-17.12.3.tar.xz"; - sha256 = "1jdwa4b9224x2m3r3v3sgk7796kvlayf7gjpsdvby0xggpihsqli"; - name = "konquest-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/konquest-18.08.0.tar.xz"; + sha256 = "0pvx4ss8dpxd6q4jnxim3pwyxjvhcy1xihn7s3513hy0h4wabv6s"; + name = "konquest-18.08.0.tar.xz"; }; }; konsole = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/konsole-17.12.3.tar.xz"; - sha256 = "1g3c7wl10n5qhs5bnm1d92qsv7jh8gn3d1l0wivj29cn9b0rf2gs"; - name = "konsole-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/konsole-18.08.0.tar.xz"; + sha256 = "1p119ky78zxi8l08xnfklrg21c6124q1fbjvbybf6l0qq3mzwy77"; + name = "konsole-18.08.0.tar.xz"; }; }; kontact = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kontact-17.12.3.tar.xz"; - sha256 = "0gik5h84mx3izdlml0sl1y68n7h9w8196h2l09lxnf10mmya3yas"; - name = "kontact-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kontact-18.08.0.tar.xz"; + sha256 = "0027zinl9s92vxhlzv9mak9fgzygqw5ml6i6x659pl3mc889fr7j"; + name = "kontact-18.08.0.tar.xz"; }; }; kontactinterface = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kontactinterface-17.12.3.tar.xz"; - sha256 = "15nigzawl5rzd0s6l9xqv3sldah3wc9m6zd3avbsb3ydmi0f1hks"; - name = "kontactinterface-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kontactinterface-18.08.0.tar.xz"; + sha256 = "0mcvpmvczqpsqj83vqfv9zwz7jj3az65nq45xg1l476j8sva278n"; + name = "kontactinterface-18.08.0.tar.xz"; + }; + }; + kopete = { + version = "18.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.08.0/src/kopete-18.08.0.tar.xz"; + sha256 = "0g79zv187pj7c2p33qsnkpmvrxpcx1iiy9lcrdz3acgzgvpfh5dk"; + name = "kopete-18.08.0.tar.xz"; }; }; korganizer = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/korganizer-17.12.3.tar.xz"; - sha256 = "0gplnra98ivhsqcrdy44ghak0h9x0fn481irqh2y11f8kjaf6z40"; - name = "korganizer-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/korganizer-18.08.0.tar.xz"; + sha256 = "0qifd6l93jjj7sxf3kllm3dq13p738zlvbpxg24wzc3gllyq4ip1"; + name = "korganizer-18.08.0.tar.xz"; }; }; kpat = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kpat-17.12.3.tar.xz"; - sha256 = "0nkqfnxrnik4ma7xrskqjsmcmbmxszyn9ckf3rql338d485h8awh"; - name = "kpat-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kpat-18.08.0.tar.xz"; + sha256 = "0dm9alimp2ibf5fpgbafiaz3lh9irvq2539jp6l61jqcv7801fml"; + name = "kpat-18.08.0.tar.xz"; }; }; kpimtextedit = { - version = "17.12.3"; + version = "18.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.08.0/src/kpimtextedit-18.08.0.tar.xz"; + sha256 = "0ciivvpfcsjzpc620zalx7k5ybh6bf53y19lvr1dgad29j6j871q"; + name = "kpimtextedit-18.08.0.tar.xz"; + }; + }; + kpkpass = { + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kpimtextedit-17.12.3.tar.xz"; - sha256 = "0b6f1hsh3q183lkinaz9f94akaf1z2g1pb7sm83f6c4yjn9qfg9c"; - name = "kpimtextedit-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kpkpass-18.08.0.tar.xz"; + sha256 = "1wgycyx8nn9kaqbxvlps44g1nzr2qpr6mb7m22q5qcykly0i5wzl"; + name = "kpkpass-18.08.0.tar.xz"; }; }; kqtquickcharts = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kqtquickcharts-17.12.3.tar.xz"; - sha256 = "0gigdramz5kmjyzd7yff8j0c3sisblqy0xjc301hkhh7ss93r2d0"; - name = "kqtquickcharts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kqtquickcharts-18.08.0.tar.xz"; + sha256 = "0ykf5xfzjsanj5rmn5qrhhqfb93i19mrwzsqq8pngaimcqb70cdk"; + name = "kqtquickcharts-18.08.0.tar.xz"; }; }; krdc = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/krdc-17.12.3.tar.xz"; - sha256 = "1flk8pvnr4kf273xzfxb7pcsam3mb056pbvmva1k864kbb6bzdps"; - name = "krdc-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/krdc-18.08.0.tar.xz"; + sha256 = "03j3cn088mr8cd6vjkv19k5ayrhgh9mbyr0lkj9rr16z6861avmr"; + name = "krdc-18.08.0.tar.xz"; }; }; kreversi = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kreversi-17.12.3.tar.xz"; - sha256 = "1hmh80dpg25ay06dmd1g6a0a7zcd2di99s989msi85wzgk6vh0fg"; - name = "kreversi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kreversi-18.08.0.tar.xz"; + sha256 = "18qqfaxb34b0z6cdz9h2z0hkmr1vv85j7ra8gzhy35k40dgvhgqm"; + name = "kreversi-18.08.0.tar.xz"; }; }; krfb = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/krfb-17.12.3.tar.xz"; - sha256 = "0anfcb1xsr638k3d3ljy9khbxf7v9sj5vbksyhfjrzsifj4m2skv"; - name = "krfb-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/krfb-18.08.0.tar.xz"; + sha256 = "1zaran8lbhrnlr2nz12xis4b7q0krynzqyix14diiiysrfsmnwqm"; + name = "krfb-18.08.0.tar.xz"; }; }; kross-interpreters = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kross-interpreters-17.12.3.tar.xz"; - sha256 = "0v3ly21lc8riv4by87kjilab5zqd6wvwl92a983ybd5bivl1a98s"; - name = "kross-interpreters-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kross-interpreters-18.08.0.tar.xz"; + sha256 = "1g3fgva8h0s1ld38m38iawjr04bsh572lazizr9a460nwk60nmsi"; + name = "kross-interpreters-18.08.0.tar.xz"; }; }; kruler = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kruler-17.12.3.tar.xz"; - sha256 = "0r12vwg9jsvg8bldrfdnmcygn6rkx9dp8r0948jhf662qs7a0jsa"; - name = "kruler-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kruler-18.08.0.tar.xz"; + sha256 = "0fv3186xhyvfi9zz48r4facy9x8m8y53qfl7x1rs0y1hq2d2k3nh"; + name = "kruler-18.08.0.tar.xz"; }; }; kshisen = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kshisen-17.12.3.tar.xz"; - sha256 = "1an28mxgc1ic6acj3r59q9nnmq267fy6k48xzdxqdxhivs74bjx0"; - name = "kshisen-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kshisen-18.08.0.tar.xz"; + sha256 = "11q717m7m37902bchbgpdgsward4w2c9bwjns3xs4c3pyx1w7mg4"; + name = "kshisen-18.08.0.tar.xz"; }; }; ksirk = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksirk-17.12.3.tar.xz"; - sha256 = "07y300qk3jls8cscf0xxgq52gxmc4j5rkn2pxhxymm0yr07ip1xz"; - name = "ksirk-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksirk-18.08.0.tar.xz"; + sha256 = "1wxf1g5vfcnvz9n28ja17iawc1997vhz6p75bq84jmls51pxjkzn"; + name = "ksirk-18.08.0.tar.xz"; }; }; ksmtp = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksmtp-17.12.3.tar.xz"; - sha256 = "1dws2jrizixi108mw1lgb7jz6dgs5xvvmj16bkf9x54rhvjb7r9b"; - name = "ksmtp-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksmtp-18.08.0.tar.xz"; + sha256 = "13jkxrlycgk9qqw5v16i1rax8lwany7fd1n6m2875saxmjm9qi0s"; + name = "ksmtp-18.08.0.tar.xz"; }; }; ksnakeduel = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksnakeduel-17.12.3.tar.xz"; - sha256 = "0w4nw1pyznn4dkcqgf2d5c2r7z5xg5gc97whw1i67wqq9sbi98hy"; - name = "ksnakeduel-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksnakeduel-18.08.0.tar.xz"; + sha256 = "0ixbv4b9ngb82f4s58hzjvmmifkjy5v59g76kpb5dv9nqb9x8833"; + name = "ksnakeduel-18.08.0.tar.xz"; }; }; kspaceduel = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kspaceduel-17.12.3.tar.xz"; - sha256 = "13pqdb3f0zjnv71y93kha3wkq9kivl8g01sa5g9ydjmnxahzhqc6"; - name = "kspaceduel-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kspaceduel-18.08.0.tar.xz"; + sha256 = "0qw3lkiwwrzicyqqr6fs78ljhn5z4vsvcvcn9l5j18qkmi2fd2dk"; + name = "kspaceduel-18.08.0.tar.xz"; }; }; ksquares = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksquares-17.12.3.tar.xz"; - sha256 = "19cbmc2mnljlndijb11k9l67q2cmdd5yjsjwv61rawq25xwfh667"; - name = "ksquares-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksquares-18.08.0.tar.xz"; + sha256 = "01g9jkd5cq1ga9k9brr8yiny3idmj88c4n1cm2qi10d9n1vd4fja"; + name = "ksquares-18.08.0.tar.xz"; }; }; ksudoku = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksudoku-17.12.3.tar.xz"; - sha256 = "0c335klnzq4bf91c2iib3iqhx24nf264p86mypk2as2mbcr02j9n"; - name = "ksudoku-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksudoku-18.08.0.tar.xz"; + sha256 = "0fc7d6bs0ba51nypx4bn5hylfx9h6xlam7wjw1i7fr2yr8fdv9id"; + name = "ksudoku-18.08.0.tar.xz"; }; }; ksystemlog = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksystemlog-17.12.3.tar.xz"; - sha256 = "0lnjdiwq3xlqi2lw0p9vj6fbqzmmqf0y6aivyxb7lbrjgjvh64lr"; - name = "ksystemlog-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksystemlog-18.08.0.tar.xz"; + sha256 = "1m5y8rawhi03vnpdw75npdd7hc830a5b2kkrz1112g959psv00ah"; + name = "ksystemlog-18.08.0.tar.xz"; }; }; kteatime = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kteatime-17.12.3.tar.xz"; - sha256 = "0f7cf0p7cnmw6mpc3135wk9l2j63yfd2fz06vngnl0zdysf4iwfz"; - name = "kteatime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kteatime-18.08.0.tar.xz"; + sha256 = "18pm15s7q4xwzi61m2l8k6qplf948lq36iv9nh5sf4p6vp6syay2"; + name = "kteatime-18.08.0.tar.xz"; }; }; ktimer = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktimer-17.12.3.tar.xz"; - sha256 = "1ghh3433wai87ifspvsvmjvamzminf9i73vbpf61ph5qgahx804x"; - name = "ktimer-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktimer-18.08.0.tar.xz"; + sha256 = "0g81daqdmfsmbnzjq74zxrbnjxjbi6nd6kl0acmjg7832l30m4js"; + name = "ktimer-18.08.0.tar.xz"; }; }; ktnef = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktnef-17.12.3.tar.xz"; - sha256 = "13irgbcq6g363n65i92c2ciw35rxmq1x5hdlrdbidp718n44n84n"; - name = "ktnef-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktnef-18.08.0.tar.xz"; + sha256 = "007gjmjyi5r8110w4fv7n5gl67ddn1dg0pb119qr3r82iba8qiqi"; + name = "ktnef-18.08.0.tar.xz"; }; }; ktouch = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktouch-17.12.3.tar.xz"; - sha256 = "04frgq9lyk51p66lv48pgk8b4f4jxh73fpr907dnwbsyqkg6l795"; - name = "ktouch-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktouch-18.08.0.tar.xz"; + sha256 = "0pgckza5cn52aapa39d12dighx698jzb877iiml2n9870whifkms"; + name = "ktouch-18.08.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-accounts-kcm-17.12.3.tar.xz"; - sha256 = "0fi3065yq38pn2x7r5a0fynbq7xyklbzvlp4gwr4bhg41fqm74hm"; - name = "ktp-accounts-kcm-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-accounts-kcm-18.08.0.tar.xz"; + sha256 = "16k7dprj75g2lgsmnnmn9n6zgwnp64zsjci5y2vk0cp8ndlr1j54"; + name = "ktp-accounts-kcm-18.08.0.tar.xz"; }; }; ktp-approver = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-approver-17.12.3.tar.xz"; - sha256 = "06x1ycp5biapalf5yk0lh9wwda1mx5a4ssv1p3q9kb7f7v1i8wkp"; - name = "ktp-approver-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-approver-18.08.0.tar.xz"; + sha256 = "1nh75yzprhbn0af33qsrs81vxk1brlxjf1jal7p8fpr47qdwhzvd"; + name = "ktp-approver-18.08.0.tar.xz"; }; }; ktp-auth-handler = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-auth-handler-17.12.3.tar.xz"; - sha256 = "03vha3rf7989wi47hn004g4m1lgi236in395yl4f2bl2h0qq1g21"; - name = "ktp-auth-handler-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-auth-handler-18.08.0.tar.xz"; + sha256 = "0akmbrn9z0ind3jmz2azixyvr9glai66j6dynszn59svvjxp0fiz"; + name = "ktp-auth-handler-18.08.0.tar.xz"; }; }; ktp-call-ui = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-call-ui-17.12.3.tar.xz"; - sha256 = "0l85q8xykz0vj26yvcqcm3l6w84iada8hr32sn71151rv6palv0m"; - name = "ktp-call-ui-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-call-ui-18.08.0.tar.xz"; + sha256 = "0z23vcvz6nyc6klqqys4ivh33j21kww4fgcm5dvvlf940cc9gr3h"; + name = "ktp-call-ui-18.08.0.tar.xz"; }; }; ktp-common-internals = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-common-internals-17.12.3.tar.xz"; - sha256 = "0vzppfy2ik3j9aw2rzb272h8q57vv6z3pqycfwbsd4j751hccx80"; - name = "ktp-common-internals-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-common-internals-18.08.0.tar.xz"; + sha256 = "1sj1k8x8d2lk8xsqckjzg6zz01gqh3yj52yar56lngn1cjnnf6ak"; + name = "ktp-common-internals-18.08.0.tar.xz"; }; }; ktp-contact-list = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-list-17.12.3.tar.xz"; - sha256 = "1clyfaabjjafmazw3gli10b00v0yb8m05bd6lwia7anslhs9pjfb"; - name = "ktp-contact-list-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-list-18.08.0.tar.xz"; + sha256 = "0yx64rz6k5dv6s4wsadjqc0fcx6j7blhy15cbnh8r2pbwf0ilk2w"; + name = "ktp-contact-list-18.08.0.tar.xz"; }; }; ktp-contact-runner = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-runner-17.12.3.tar.xz"; - sha256 = "0rj7l0dr0kqcijaxwq06chbmjb5xr12zcs02mjc08af5kc2girsq"; - name = "ktp-contact-runner-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-runner-18.08.0.tar.xz"; + sha256 = "0i4zc6bksnb4iajz91wbw140dh7p0rg3hzhi563pn3siy9id442s"; + name = "ktp-contact-runner-18.08.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-desktop-applets-17.12.3.tar.xz"; - sha256 = "16n8gj6x9cbk9bbpdf8zchrjajpw0dh2n5vf2ngyhw59w3rlwisj"; - name = "ktp-desktop-applets-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-desktop-applets-18.08.0.tar.xz"; + sha256 = "0i5sniidcgkvq2scf76pkshrj89gvkzjjslgqaxvqrgvyagsaski"; + name = "ktp-desktop-applets-18.08.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-filetransfer-handler-17.12.3.tar.xz"; - sha256 = "1l2w39k9gmlnysphh4scc0krmxf0s9h1frj9blml9qfd8n92v5y8"; - name = "ktp-filetransfer-handler-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-filetransfer-handler-18.08.0.tar.xz"; + sha256 = "15mifrbxxr8lvq7nflxwsz46ywnqmjv1d3irzq1xfcpl47907qhg"; + name = "ktp-filetransfer-handler-18.08.0.tar.xz"; }; }; ktp-kded-module = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-kded-module-17.12.3.tar.xz"; - sha256 = "1752m9sr7mb7hgrbarr2vnllvd67n6c059i3k2ds4npajvcdszhp"; - name = "ktp-kded-module-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-kded-module-18.08.0.tar.xz"; + sha256 = "12rnnf2nm2kn2904b475qh9ql50yx583jga31389l012whm4gqqf"; + name = "ktp-kded-module-18.08.0.tar.xz"; }; }; ktp-send-file = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-send-file-17.12.3.tar.xz"; - sha256 = "02z13fy21v8yl3q164lw9265k3mw5mdhmr8f0dlpkx2x3mgdgjch"; - name = "ktp-send-file-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-send-file-18.08.0.tar.xz"; + sha256 = "0m8p8w4hqanccf7g0za5yh30z2nxv8dxi09mg1fniypqaw4cp2n7"; + name = "ktp-send-file-18.08.0.tar.xz"; }; }; ktp-text-ui = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-text-ui-17.12.3.tar.xz"; - sha256 = "0zhqhq7zq4xp44df77fms1jp14pfz1gdandblgcbyx55fqgkx38v"; - name = "ktp-text-ui-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-text-ui-18.08.0.tar.xz"; + sha256 = "04ygny9m823h30hi5qgjz1nk7dj44hdqa9ga0ai9cazxnavvsx57"; + name = "ktp-text-ui-18.08.0.tar.xz"; }; }; ktuberling = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktuberling-17.12.3.tar.xz"; - sha256 = "1rqn9fzniyz3nnrjk6qjpbcs7m0gfnl2m671dgj87pwfsddicyr4"; - name = "ktuberling-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktuberling-18.08.0.tar.xz"; + sha256 = "1m9mdv7hdsrnzjcdnmqrl82mafa9psbr5k7b6m3llh95f61b4jpn"; + name = "ktuberling-18.08.0.tar.xz"; }; }; kturtle = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kturtle-17.12.3.tar.xz"; - sha256 = "1m7pppqy1c6kscy95hx284p0iinx00iafpihii8hl4bvvam2sws8"; - name = "kturtle-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kturtle-18.08.0.tar.xz"; + sha256 = "0mwhnsbwj92zrgyjdfi18pxsfyaxa8pzdmh5k20m0jrh76gkhjr0"; + name = "kturtle-18.08.0.tar.xz"; }; }; kubrick = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kubrick-17.12.3.tar.xz"; - sha256 = "0ls51xvkvxpr6pzpj67jmfbcwx7wrc9lyb149y59bmfbckc1cimp"; - name = "kubrick-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kubrick-18.08.0.tar.xz"; + sha256 = "1affzpwq45r1cqb9ra8w24rrszvvzxiik4ng6jf54dik8sk7wrnn"; + name = "kubrick-18.08.0.tar.xz"; }; }; kwalletmanager = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kwalletmanager-17.12.3.tar.xz"; - sha256 = "1lwslsx15ymyssnwl9yam26j3m5153sjyc4cvv5sxflk5wghaad1"; - name = "kwalletmanager-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kwalletmanager-18.08.0.tar.xz"; + sha256 = "10yri44d68n6hc4dn78wgqzw394krwjqr6azwd6qgxjp6asc8n69"; + name = "kwalletmanager-18.08.0.tar.xz"; }; }; kwave = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kwave-17.12.3.tar.xz"; - sha256 = "1wqhjdjc1cf1zjbgpxmiw60bxlxld7mikv1lkph750wygjkmnrng"; - name = "kwave-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kwave-18.08.0.tar.xz"; + sha256 = "0aimhn8hgjnwhv0j2hiyiqgh5bslm7rs13yc8sk0kh1vix6909mp"; + name = "kwave-18.08.0.tar.xz"; }; }; kwordquiz = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kwordquiz-17.12.3.tar.xz"; - sha256 = "1w1z5hjg36jyzl247ff1xk4xhr49qhnkmcxhnyp8fsj5hq9in6xx"; - name = "kwordquiz-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kwordquiz-18.08.0.tar.xz"; + sha256 = "1aghybg72anwj6vz3s3zr5i5wflackvfwl9n39mvxddm4ajnw1km"; + name = "kwordquiz-18.08.0.tar.xz"; }; }; libgravatar = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libgravatar-17.12.3.tar.xz"; - sha256 = "1862yzcmk1w9y1k83hkh749mhk9hlba7hdlsbbj8hmf3jb7hrczm"; - name = "libgravatar-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libgravatar-18.08.0.tar.xz"; + sha256 = "0yqd99lax1w5r1fy4rmbv9lk988zvq2yydkrdgh8vymxjljg5xa4"; + name = "libgravatar-18.08.0.tar.xz"; }; }; libkcddb = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkcddb-17.12.3.tar.xz"; - sha256 = "1qwizxb8y35qddiqvf0469gnjid2bc80dfnv4qixxs3ba094c2pi"; - name = "libkcddb-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkcddb-18.08.0.tar.xz"; + sha256 = "1ns90vcbp21mwsbvndmk97fpd8n7152iw783q7bqfy1n3ggzkz5x"; + name = "libkcddb-18.08.0.tar.xz"; }; }; libkcompactdisc = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkcompactdisc-17.12.3.tar.xz"; - sha256 = "1brz12j45vfb4xixr3lhn9fs1hbf723kc46psdg24yghfmx5j28v"; - name = "libkcompactdisc-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkcompactdisc-18.08.0.tar.xz"; + sha256 = "0pgn65knay7fgk2zdgqd29wfhqk9x4zlpp4ywjwb2zsvzz51j9f8"; + name = "libkcompactdisc-18.08.0.tar.xz"; }; }; libkdcraw = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkdcraw-17.12.3.tar.xz"; - sha256 = "11p25ldv3ry4khb52mfay85wlfbrsvk6f52yx8shzvbzxyzxf0nc"; - name = "libkdcraw-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkdcraw-18.08.0.tar.xz"; + sha256 = "0xpkkgxsmvrldnprzqrxaz67jb5cv6vndg8flbkagvp0s7mnw56x"; + name = "libkdcraw-18.08.0.tar.xz"; }; }; libkdegames = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkdegames-17.12.3.tar.xz"; - sha256 = "1kh1wpdajzd1i3j0kr79npzq4w41gisn27k8v26dq1wy727vy4kd"; - name = "libkdegames-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkdegames-18.08.0.tar.xz"; + sha256 = "1jl3snqyg3p3l4hddg7ag2mkgi49qvzml8p82zdn3sf5fhka1g70"; + name = "libkdegames-18.08.0.tar.xz"; }; }; libkdepim = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkdepim-17.12.3.tar.xz"; - sha256 = "0zz86mnz73jj78gdfh0s19wfypb0xwxsvjcijbkr340diri5862q"; - name = "libkdepim-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkdepim-18.08.0.tar.xz"; + sha256 = "1gfwfmr5iqkwb490d3mm32892q47pc73b6c8zygm7mn5cjb5376l"; + name = "libkdepim-18.08.0.tar.xz"; }; }; libkeduvocdocument = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkeduvocdocument-17.12.3.tar.xz"; - sha256 = "0yqilmf61izbh44rsmspslnikawikxsq8nk8a4lvq9206yy6h11v"; - name = "libkeduvocdocument-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkeduvocdocument-18.08.0.tar.xz"; + sha256 = "1i5vmjfczd71654cpxd11djwk852aqg5lkn98pa8qvjy7v85jynn"; + name = "libkeduvocdocument-18.08.0.tar.xz"; }; }; libkexiv2 = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkexiv2-17.12.3.tar.xz"; - sha256 = "1xzrq9dn4x8afsf21sxqbsz1sk2vzp2g1ri5d5rz4vd1gj0sk3lg"; - name = "libkexiv2-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkexiv2-18.08.0.tar.xz"; + sha256 = "0cdh5wd2lvm9m4nyz2yv5ksszk1pc8ajzwq9c467m74lvb1p2had"; + name = "libkexiv2-18.08.0.tar.xz"; }; }; libkgapi = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkgapi-17.12.3.tar.xz"; - sha256 = "015g1l4fkc5j403f0hak03iz2qi62gx4wlldm59hi1vgqq1xfp1y"; - name = "libkgapi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkgapi-18.08.0.tar.xz"; + sha256 = "1aax7djyp1104b8sbrpfhf5c8j30g3hac973lpblfqg0yhkd9lw0"; + name = "libkgapi-18.08.0.tar.xz"; }; }; libkgeomap = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkgeomap-17.12.3.tar.xz"; - sha256 = "1064yl3whr8g9qyirpgzvag2z4lal4qyljvlapfq3mpa3jxpcwdi"; - name = "libkgeomap-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkgeomap-18.08.0.tar.xz"; + sha256 = "00hjz7amg2rf5s74465s44ac6kd33q4mvsa9ynpljisll5avlhan"; + name = "libkgeomap-18.08.0.tar.xz"; }; }; libkipi = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkipi-17.12.3.tar.xz"; - sha256 = "0qqvrg1nvzcrxjvm1grxzm0vk7s9j1kzf73dk41cmvgwv9wirlgq"; - name = "libkipi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkipi-18.08.0.tar.xz"; + sha256 = "1g34ryzr4vx5657c4j4w3b57n5ir6miwp1k60qk7av73qsik7a7d"; + name = "libkipi-18.08.0.tar.xz"; }; }; libkleo = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkleo-17.12.3.tar.xz"; - sha256 = "0pp72ba58vwl1m9i72gdghbk3r5sa0pm8y7q9hz4a5qv919iny2k"; - name = "libkleo-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkleo-18.08.0.tar.xz"; + sha256 = "0vscfz794yp9hnrn4r4phbip2mqi3jvi41m5mpjd5pw11644d66c"; + name = "libkleo-18.08.0.tar.xz"; }; }; libkmahjongg = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkmahjongg-17.12.3.tar.xz"; - sha256 = "10j9r8mb5x90zv91m32q0in2brqcwl3h7kv7lr6dqhd6jjmrx4gd"; - name = "libkmahjongg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkmahjongg-18.08.0.tar.xz"; + sha256 = "0xzv7vawwq0gm10h9mfrsy5m5zpk1n3s338al0h9vskvhznphy83"; + name = "libkmahjongg-18.08.0.tar.xz"; }; }; libkomparediff2 = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkomparediff2-17.12.3.tar.xz"; - sha256 = "0w6p8lvm2rn7y4qz0x3s87lwh1758xnyhwkkkng55n8v9rpjjw7l"; - name = "libkomparediff2-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkomparediff2-18.08.0.tar.xz"; + sha256 = "0nx66198vn6zrv012i4p2ghc2slxqccfb3fhd9zszzpnyd08zs27"; + name = "libkomparediff2-18.08.0.tar.xz"; }; }; libksane = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libksane-17.12.3.tar.xz"; - sha256 = "1rnxywpljiw4fb6djlm486z98l5f7vlwca0i0q99rj17gkxlddk2"; - name = "libksane-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libksane-18.08.0.tar.xz"; + sha256 = "09wx6haaw0rjcjdh2c05b2zrpz57zlhx9x9jy9hw28byrf71i0k0"; + name = "libksane-18.08.0.tar.xz"; }; }; libksieve = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libksieve-17.12.3.tar.xz"; - sha256 = "1cp1bfw2xd5fsnw5z061vfg8wbvv1bqk2lvcyvxgvm1im7892433"; - name = "libksieve-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libksieve-18.08.0.tar.xz"; + sha256 = "0xnjw2q1hlmrlzdi776459v5w3l88bxpzzpqc93xmq39xh7xqq7b"; + name = "libksieve-18.08.0.tar.xz"; }; }; lokalize = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/lokalize-17.12.3.tar.xz"; - sha256 = "0n5f7myv45446kfpcaw7y278xsjxq5hnamfhc20h24m9pflp7bp9"; - name = "lokalize-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/lokalize-18.08.0.tar.xz"; + sha256 = "17h634abxzg3kx182qxdx6gyz0knl61yn32nlf76l0cv0bqc2xz5"; + name = "lokalize-18.08.0.tar.xz"; }; }; lskat = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/lskat-17.12.3.tar.xz"; - sha256 = "0n4kma0llqbgzcqsm7rb5rjidn8wlal9ay26041mic9hk51s3bm0"; - name = "lskat-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/lskat-18.08.0.tar.xz"; + sha256 = "05ckhh8270hjj94ks9zg6pypa2dm1d2r4l219gq456rrhyj9zv13"; + name = "lskat-18.08.0.tar.xz"; }; }; mailcommon = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/mailcommon-17.12.3.tar.xz"; - sha256 = "17m54i4a9kn8lmpj3b42q2q9gqrympl9z2lgbhsacmak9aqrv94f"; - name = "mailcommon-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/mailcommon-18.08.0.tar.xz"; + sha256 = "06j66326wbvgnmacmbhvszbhdcw6h3pzxwcnbbz66n0zz2y4m5gd"; + name = "mailcommon-18.08.0.tar.xz"; }; }; mailimporter = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/mailimporter-17.12.3.tar.xz"; - sha256 = "1q93lc98ak5kzz762ih906g0jj0vnib97x39sqq4awspy4a825pc"; - name = "mailimporter-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/mailimporter-18.08.0.tar.xz"; + sha256 = "0gywzd882mkjf9q07wg2hi4js4gqvyjxf3y0lgq22k5bd5gpfxbs"; + name = "mailimporter-18.08.0.tar.xz"; }; }; marble = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/marble-17.12.3.tar.xz"; - sha256 = "1pgqnvdmx7s33m2wyz73lwlpbjh9qfc3aqk532lznz3ncc54n07i"; - name = "marble-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/marble-18.08.0.tar.xz"; + sha256 = "1ylcdnf0rw0a51jcy183p9xcir4j7jlm6dmhk4k13zvzv16pcwvf"; + name = "marble-18.08.0.tar.xz"; }; }; mbox-importer = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/mbox-importer-17.12.3.tar.xz"; - sha256 = "16gkjgqjh91kx2rgjz4idm888q6fxycqdmwy6bmks825260426rp"; - name = "mbox-importer-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/mbox-importer-18.08.0.tar.xz"; + sha256 = "08n46q2xxvjbbcr4754x7qw4p3yffmrpvzxi7k2i48ifxhs2awqj"; + name = "mbox-importer-18.08.0.tar.xz"; }; }; messagelib = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/messagelib-17.12.3.tar.xz"; - sha256 = "1pmdzyd8jka9wrflzv7lrr03nqf4r4vli2imhmg5hhjknn2b0ald"; - name = "messagelib-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/messagelib-18.08.0.tar.xz"; + sha256 = "0d1bb0n9izwlk9fbwyf1hvwkrng1b6im574fxpkgk73ivb72ppfx"; + name = "messagelib-18.08.0.tar.xz"; }; }; minuet = { - version = "17.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/minuet-17.12.3.tar.xz"; - sha256 = "1ahrcpkbs49kyhq0l5fcacn49pqfczy1b9zvydxmld5kxlpz7w8b"; - name = "minuet-17.12.3.tar.xz"; - }; - }; - okteta = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/okteta-17.12.3.tar.xz"; - sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; - name = "okteta-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/minuet-18.08.0.tar.xz"; + sha256 = "0gvla9ig912wrg6vvdmqv2hyybr08a45crx69l31hcd13h9pmyg6"; + name = "minuet-18.08.0.tar.xz"; }; }; okular = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/okular-17.12.3.tar.xz"; - sha256 = "0786kr75ly0h2jwabhzz3fc15swn8n90g1w3l27kphch5nf584ha"; - name = "okular-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/okular-18.08.0.tar.xz"; + sha256 = "11wwh0vb1l2dw2zhcg6f92y7vb5i5kaqwi8kszz8sd874ydpp8pn"; + name = "okular-18.08.0.tar.xz"; }; }; palapeli = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/palapeli-17.12.3.tar.xz"; - sha256 = "11kjj85axc7l1l1ip0gcf5p7f7g9rfwyn476wz25prsr2g2ijgln"; - name = "palapeli-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/palapeli-18.08.0.tar.xz"; + sha256 = "1a1k44q62raw1kxkyg8cspvwxzr1islbwzcb7sj63cmzsmwfhkg1"; + name = "palapeli-18.08.0.tar.xz"; }; }; parley = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/parley-17.12.3.tar.xz"; - sha256 = "0swb7371vz9cxr2588hgcdxa5bmdb9n7h1yvmw28fbzgz98ax7g6"; - name = "parley-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/parley-18.08.0.tar.xz"; + sha256 = "1cy58fs1jaz1zga4dwfr80m0p6cgzc5ip26ds2x2lpygx7pbjcc6"; + name = "parley-18.08.0.tar.xz"; }; }; picmi = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/picmi-17.12.3.tar.xz"; - sha256 = "04cza4rvgzzvrzzw27n74k7kiwm7amcg12k97fr1rvlpd5irh2vn"; - name = "picmi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/picmi-18.08.0.tar.xz"; + sha256 = "1x2ya0vwxwc56rfskl3l83nw0vpdh1lzshh0sdal3rfw0s8w895x"; + name = "picmi-18.08.0.tar.xz"; }; }; pimcommon = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/pimcommon-17.12.3.tar.xz"; - sha256 = "1yav8flw6rf5qdwgys3zkmijp81p56hwn6cd71ckfzdrjm11kikq"; - name = "pimcommon-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/pimcommon-18.08.0.tar.xz"; + sha256 = "1j6pj7f52ya0jgzq97g65zl3mpv7hn002flv35qlg5srzdllm3pd"; + name = "pimcommon-18.08.0.tar.xz"; }; }; pim-data-exporter = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/pim-data-exporter-17.12.3.tar.xz"; - sha256 = "0j5ynb0y602lnl571i247dbxna7xjqfphl7bcfqmg09ipjhxvk5b"; - name = "pim-data-exporter-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/pim-data-exporter-18.08.0.tar.xz"; + sha256 = "1spbkwv9kqzky958nymr5plz8rgzxbn6xzgy7k9pkpvynd1a54hz"; + name = "pim-data-exporter-18.08.0.tar.xz"; }; }; pim-sieve-editor = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/pim-sieve-editor-17.12.3.tar.xz"; - sha256 = "0bkd5qsrabwg5imnif8z0hvhsk00a2n23238f9y14g963bhyw4pp"; - name = "pim-sieve-editor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/pim-sieve-editor-18.08.0.tar.xz"; + sha256 = "0nqv530rlamlngxwy3cpbyjj75akx3k9lcifgymlbm4ipp9k125c"; + name = "pim-sieve-editor-18.08.0.tar.xz"; }; }; poxml = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/poxml-17.12.3.tar.xz"; - sha256 = "0r8wm2x13ayb3mi69c35plvwzw7r9525idk3indsxc0rhv5qkhfp"; - name = "poxml-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/poxml-18.08.0.tar.xz"; + sha256 = "04sy8v3n12asz8hfh107y5irhxzlpkzgc3zjw8qfygflzg9a48cz"; + name = "poxml-18.08.0.tar.xz"; }; }; print-manager = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/print-manager-17.12.3.tar.xz"; - sha256 = "0w1snq5ca7hza3x4gp17skia6g8yvarn9g3qacfwp13vad4v8zj7"; - name = "print-manager-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/print-manager-18.08.0.tar.xz"; + sha256 = "1mi2aqsh5irlnlgkajkkxhazyafhpndrxckcc2kmrh00d4cxhivn"; + name = "print-manager-18.08.0.tar.xz"; }; }; rocs = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/rocs-17.12.3.tar.xz"; - sha256 = "1dfg0klvix2mgnvw3dkh13694iac5jf0jk8rm9ssxcaljvix7h46"; - name = "rocs-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/rocs-18.08.0.tar.xz"; + sha256 = "1c3i11mg6xs64wjyph51hqr6j428hh71ljdq4ajhysql7l5kbhhx"; + name = "rocs-18.08.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/signon-kwallet-extension-17.12.3.tar.xz"; - sha256 = "0r9whz7p6v9wgbycdxzgxfm1ngxhjk4dzir5k5fqvmb6wrg05v4m"; - name = "signon-kwallet-extension-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/signon-kwallet-extension-18.08.0.tar.xz"; + sha256 = "024ay0z9inbf7k54iq5v78cxh4q8x1ypvd8r3w80dyygjw2dw743"; + name = "signon-kwallet-extension-18.08.0.tar.xz"; }; }; spectacle = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/spectacle-17.12.3.tar.xz"; - sha256 = "12g976ys2ga88n0a45zqkai28bmxw0vxy2qlgdmx7mxvkpwlccyr"; - name = "spectacle-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/spectacle-18.08.0.tar.xz"; + sha256 = "1gc2qza529jld1zngzs98zmd3734h13phviswqpg93qnbr9hxskr"; + name = "spectacle-18.08.0.tar.xz"; }; }; step = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/step-17.12.3.tar.xz"; - sha256 = "161r0abz18s32xpn8x2j5diwb6p4hggvlnv7p9yk1z3qm3fyj46v"; - name = "step-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/step-18.08.0.tar.xz"; + sha256 = "15hjbisv3adsn0vavlcl3iy3vz6mf1fv0qj4ykmxckblcyhm1mgg"; + name = "step-18.08.0.tar.xz"; }; }; svgpart = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/svgpart-17.12.3.tar.xz"; - sha256 = "1rcfdkpinqdbz7js7p9h0lxmnvln4y95af1icq2871w7mg4fzsf5"; - name = "svgpart-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/svgpart-18.08.0.tar.xz"; + sha256 = "0q71nn1xsdh7ag60szl836lif9ywnv3dlv8w0sn3zfa7yv0cbraa"; + name = "svgpart-18.08.0.tar.xz"; }; }; sweeper = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/sweeper-17.12.3.tar.xz"; - sha256 = "1pwjv4knj0by0sn8j788cxg3sl3vm0gql49yv47bansrvs458n4x"; - name = "sweeper-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/sweeper-18.08.0.tar.xz"; + sha256 = "1j87cb9bbfn42f2xn9k6j8ailgn18b5ribjf4sgglx2h1l3vpq51"; + name = "sweeper-18.08.0.tar.xz"; }; }; syndication = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/syndication-17.12.3.tar.xz"; - sha256 = "1bq220ir09sszj31xi8sk116k9xkhkmnmahigc73qc3hvgq0x808"; - name = "syndication-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/syndication-18.08.0.tar.xz"; + sha256 = "17j3ks7bmr3p71lvrm8bzbfai5sw3frwrwl0ckbg1rwhkbsi3d71"; + name = "syndication-18.08.0.tar.xz"; }; }; umbrello = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/umbrello-17.12.3.tar.xz"; - sha256 = "0j3qwisq9aqvgpqx54jd4idspbgvl72xffb8qn3wwyky9jpnmhr0"; - name = "umbrello-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/umbrello-18.08.0.tar.xz"; + sha256 = "0rs92l6disjha8w5nx05qjbidib4a9yyab7f4cd4sjnjfcw3i1px"; + name = "umbrello-18.08.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.12.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/zeroconf-ioslave-17.12.3.tar.xz"; - sha256 = "1glhci1vivkx3nvk6zwf2z09dii81vr5lcp3xf0aafl4p1vlxi3i"; - name = "zeroconf-ioslave-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/zeroconf-ioslave-18.08.0.tar.xz"; + sha256 = "05j8k8la4gcydazzhhxq8700w1l4q57yylcar1wzs108icp03rkm"; + name = "zeroconf-ioslave-18.08.0.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..94dfc68fb59b20b59bf2f2f83945d5ba0dea9940 --- /dev/null +++ b/pkgs/applications/misc/1password/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "1password-${version}"; + version = "0.5.3"; + src = + if stdenv.system == "i686-linux" then + fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; + sha256 = "05s223h1yps4k9kmignl0r5sbh6w7m1hnlmafnf1kiwv7gacvxjc"; + stripRoot = false; + } + else if stdenv.system == "x86_64-linux" then + fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + sha256 = "0p9x1fx0309v8dxxaf88m8x8q15zzqywfmjn6v5wb9v3scp9396v"; + stripRoot = false; + } + else if stdenv.system == "x86_64-darwin" then + fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; + sha256 = "1z2xp9bn93gr4ha6zx65va1fb58a2xlnnmpv583y96gq3vbnqdcj"; + stripRoot = false; + } + else throw "Architecture not supported"; + + installPhase = '' + install -D op $out/bin/op + ''; + postFixup = stdenv.lib.optionalString stdenv.isLinux '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/bin/op + ''; + + meta = with stdenv.lib; { + description = "1Password command-line tool"; + homepage = https://support.1password.com/command-line/; + downloadPage = https://app-updates.agilebits.com/product_history/CLI; + maintainers = with maintainers; [ joelburget ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/applications/misc/acbuild/default.nix b/pkgs/applications/misc/acbuild/default.nix index 319764ae81a5d5d1f51276b93671fcee94929177..c1b8a7eb866308ac55dedf7017d2494da14a1772 100644 --- a/pkgs/applications/misc/acbuild/default.nix +++ b/pkgs/applications/misc/acbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, fetchFromGitHub }: +{ stdenv, go, fetchFromGitHub }: stdenv.mkDerivation rec { name = "acbuild-${version}"; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 6907ce8776451c173d544c223eb2653d6059eb2d..4544ed1fba3bef4d92b1784ac1c12e59aa4d9cdc 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -1,19 +1,30 @@ { stdenv, + lib, fetchgit, rustPlatform, cmake, makeWrapper, + ncurses, expat, pkgconfig, freetype, fontconfig, libX11, - gperf, + gzip, libXcursor, libXxf86vm, libXi, libXrandr, - xclip }: + libGL, + xclip, + # Darwin Frameworks + AppKit, + CoreFoundation, + CoreGraphics, + CoreServices, + CoreText, + Foundation, + OpenGL }: with rustPlatform; @@ -26,43 +37,77 @@ let libXcursor libXxf86vm libXrandr + libGL libXi ]; + darwinFrameworks = [ + AppKit + CoreFoundation + CoreGraphics + CoreServices + CoreText + Foundation + OpenGL + ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; - version = "2018-03-04"; + version = "2018-08-30"; # At the moment we cannot handle git dependencies in buildRustPackage. # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. src = fetchgit { url = https://github.com/Mic92/alacritty.git; rev = "rev-${version}"; - sha256 = "0pxnc6r75c7rwnsqc0idi4a60arpgchl1i8yppibhv0px5w11mwa"; + sha256 = "0izvg7dwwb763jc6gnmn47i5zrkxvmh3vssn6vzrrmqhd4j3msmf"; fetchSubmodules = true; }; - cargoSha256 = "0q2yy9cldng8znkmhysgrwi43z2x7a8nb1bnxpy9z170q8ds0m0j"; + cargoSha256 = "1ijgkwv9ij4haig1h6n2b9xbhp5vahy9vp1sx72wxaaj9476msjx"; nativeBuildInputs = [ cmake makeWrapper pkgconfig + ncurses + gzip ]; - buildInputs = rpathLibs; + buildInputs = rpathLibs + ++ lib.optionals stdenv.isDarwin darwinFrameworks; + + outputs = [ "out" "terminfo" ]; postPatch = '' substituteInPlace copypasta/src/x11.rs \ --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\) ''; + postBuild = lib.optionalString stdenv.isDarwin "make app"; + installPhase = '' runHook preInstall install -D target/release/alacritty $out/bin/alacritty + + '' + (if stdenv.isDarwin then '' + mkdir $out/Applications + cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app + '' else '' + install -D alacritty.desktop $out/share/applications/alacritty.desktop patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty + '') + '' + + install -D alacritty-completions.zsh "$out/share/zsh/site-functions/_alacritty" + install -D alacritty-completions.bash "$out/etc/bash_completion.d/alacritty-completions.bash" + install -D alacritty-completions.fish "$out/share/fish/vendor_completions.d/alacritty.fish" + + install -dm 755 "$out/share/man/man1" + gzip -c alacritty.man > "$out/share/man/man1/alacritty.1.gz" - install -D Alacritty.desktop $out/share/applications/alacritty.desktop + install -dm 755 "$terminfo/share/terminfo/a/" + tic -x -o "$terminfo/share/terminfo" alacritty.info + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages runHook postInstall ''; @@ -74,6 +119,5 @@ in buildRustPackage rec { homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ mic92 ]; - platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 250590d0d302ef902ca85673a345d5c3d2645e79..f16144f3befa52b06718e73c2149121418b21279 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,15 +1,18 @@ { mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3 }: +let + pname = "albert"; + version = "0.14.21"; +in mkDerivation rec { - name = "albert-${version}"; - version = "0.14.15"; + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "1rjp0bmzs8b9blbxz3sfcanyhgmds882pf1g3jx5qp85y64j8507"; + sha256 = "16nk9krn1mwr0bh57viig9hizqyp3slna0qg7s5a736nsfxy226w"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index 30b8a435f90684e4922f5d124ab4944d16e312d4..f21438dfcec59d3396a50015d43f72f04e29e1be 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { - name = "antfs-cli-unstable-2017-02-11"; +python3Packages.buildPythonApplication rec { + pname = "antfs-cli"; + version = "unstable-2017-02-11"; meta = with stdenv.lib; { homepage = https://github.com/Tigge/antfs-cli; @@ -17,5 +18,5 @@ pythonPackages.buildPythonApplication rec { sha256 = "0v8y64kldfbs809j1g9d75dd1vxq7mfxnp4b45pz8anpxhjf64fy"; }; - propagatedBuildInputs = [ pythonPackages.openant ]; + propagatedBuildInputs = [ python3Packages.openant ]; } diff --git a/pkgs/applications/misc/ape/apeclex.nix b/pkgs/applications/misc/ape/apeclex.nix new file mode 100644 index 0000000000000000000000000000000000000000..710ddfec994247c69af46402e97c5ab2492553fc --- /dev/null +++ b/pkgs/applications/misc/ape/apeclex.nix @@ -0,0 +1,8 @@ +{ stdenv, attemptoClex, callPackage }: + +callPackage ./. { + pname = "ape-clex"; + lexicon = "${attemptoClex}/clex_lexicon.pl"; + description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)"; + license = with stdenv.lib; [ licenses.lgpl3 licenses.gpl3 ]; +} diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix new file mode 100644 index 0000000000000000000000000000000000000000..37d140e19ba309c8337c9d0ee56915fea896b9a8 --- /dev/null +++ b/pkgs/applications/misc/ape/clex.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "attempto-clex-${version}"; + version = "5133afe"; + + src = fetchFromGitHub { + owner = "Attempto"; + repo = "Clex"; + rev = version; + sha256 = "0p9s64g1jic213bwm6347jqckszgnni9szrrz31qjgaf32kf7nkp"; + }; + + installPhase = '' + mkdir -p $out + cp clex_lexicon.pl $out + ''; + + meta = with stdenv.lib; { + description = "Large lexicon for APE (~100,000 entries)"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ yrashk ]; + }; +} diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e78ba2df9993d0a6914e917ad6bbacc8adfb4cf6 --- /dev/null +++ b/pkgs/applications/misc/ape/default.nix @@ -0,0 +1,45 @@ +{ stdenv, swiProlog, makeWrapper, + fetchFromGitHub, + lexicon ? "lexicon/clex_lexicon.pl", + pname ? "ape", + description ? "Parser for Attempto Controlled English (ACE)", + license ? with stdenv.lib; licenses.lgpl3 + }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "6.7-131003"; + + buildInputs = [ swiProlog makeWrapper ]; + + src = fetchFromGitHub { + owner = "Attempto"; + repo = "APE"; + rev = version; + sha256 = "0cw47qjg4896kw3vps6rfs02asvscsqvcfdiwgfmqb3hvykb1sdx"; + }; + + patchPhase = '' + # We move the file first to avoid "same file" error in the default case + cp ${lexicon} new_lexicon.pl + rm lexicon/clex_lexicon.pl + cp new_lexicon.pl lexicon/clex_lexicon.pl + ''; + + buildPhase = '' + make build + ''; + + installPhase = '' + mkdir -p $out/bin + cp ape.exe $out + makeWrapper $out/ape.exe $out/bin/ape --add-flags ace + ''; + + meta = with stdenv.lib; { + description = description; + license = license; + platforms = platforms.unix; + maintainers = with maintainers; [ yrashk ]; + }; +} diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 12da125bb3e29d0a66f094a0a0932b98002888bf..7c4e6ff8c3d7bb4dc174c1d62ab234f731908ba1 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "soxr-0.1.2"; + name = "soxr-0.1.3"; src = fetchurl { url = "mirror://sourceforge/soxr/${name}-Source.tar.xz"; - sha256 = "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl"; + sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di"; }; outputs = [ "out" "doc" ]; # headers are just two and very small diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index e5e09bf71fd731ef4b8add4f5c132497dca5b0b9..0add5ed78cc53f22a9899e6d630d728958de32bd 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "wavesurfer-1.8.5"; src = fetchurl { - url = http://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz; + url = https://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz; sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; }; diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6151b3d55ab71eac84d89f2f0ccf7631c7813c68 --- /dev/null +++ b/pkgs/applications/misc/barrier/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchpatch, fetchurl, cmake, curl, xorg, avahi, qt5, + avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } +}: + +stdenv.mkDerivation rec { + name = "barrier-${version}"; + version = "2.1.1"; + src = fetchurl { + url = "https://github.com/debauchee/barrier/archive/v${version}.tar.gz"; + sha256 = "0x17as5ikfx2r5hawr368a9risvcavyc8zv5g724s709nr6m0pbp"; + }; + + buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ]; + propagatedBuildInputs = with qt5; [ qtbase ]; + + patches = [ + # Fix compilation on Qt 5.11 + # Patch should be removed on next version bump from 2.1.1! + (fetchpatch { + url = "https://github.com/debauchee/barrier/commit/a956cad0da23f544b874888c6c3540dc7f8f22cf.patch"; + sha256 = "0x5045bdks1f9casp0v7svx9ml1gxhkhw5sqc7xk36h184m24a21"; + }) + ]; + + postFixup = '' + substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" + ''; + + meta = { + description = "Open-source KVM software"; + longDescription = '' + Barrier is KVM software forked from Symless's synergy 1.9 codebase. + Synergy was a commercialized reimplementation of the original + CosmoSynergy written by Chris Schoeneman. + ''; + homepage = https://github.com/debauchee/barrier; + downloadPage = https://github.com/debauchee/barrier/releases; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.phryneas ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index acd5ae7dd73d4f55d45122d5f542f22d817d8ca7..fc5fa4d030062251cbf6e4f1bed92c6102e699e8 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, curl, netcat, python, bind, iproute, bc, gitMinimal }: +, curl, python, bind, iproute, bc, gitMinimal }: let version = "1.17.3"; deps = lib.makeBinPath [ diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix index a9d32d4b2522d15650b28ba215c11fa9ce4a67bb..3245a56e9de3b45c0881c1438822500eb477b8b0 100644 --- a/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -6,7 +6,6 @@ let version = "0.96.1"; - sitePackages = pythonPackages.python.sitePackages; inherit (pythonPackages) buildPythonApplication pyqt4 psutil twisted; in buildPythonApplication { diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index c4c57380be994179d46ed5633e3b428742e71edb..b9d4b83e4f1f302bc56ea750483cdb574c376abd 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "blender-2.79b"; src = fetchurl { - url = "http://download.blender.org/source/${name}.tar.gz"; + url = "https://download.blender.org/source/${name}.tar.gz"; sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c"; }; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index c645d9bf0b43b261d237685efd4fde72450bee95..dacfa908b51689be861962970c060cb7fee488f0 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,23 +1,23 @@ -{ stdenv, python3, fetchFromGitHub }: +{ stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "3.7"; - name = "buku-${version}"; + version = "3.8"; + pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "0qc6xkrhf2phaj9fhym19blr4rr2vllvnyljjz909xr4vsynvb41"; + sha256 = "0gv26c4rr1akcaiff1nrwil03sv7d58mfxr86pgsw6nwld67ns0r"; }; - nativeBuildInputs = [ + checkInputs = [ pytestcov - pytest-catchlog hypothesis pytest pylint flake8 + pyyaml ]; propagatedBuildInputs = [ @@ -25,6 +25,14 @@ with python3.pkgs; buildPythonApplication rec { beautifulsoup4 requests urllib3 + flask + flask-api + flask-bootstrap + flask-paginate + flask_wtf + arrow + werkzeug + click ]; preCheck = '' @@ -38,7 +46,7 @@ with python3.pkgs; buildPythonApplication rec { --replace "self.assertEqual(url, 'https://www.google.com')" "" ''; - installPhase = '' + postInstall = '' make install PREFIX=$out mkdir -p $out/share/zsh/site-functions $out/share/bash-completion/completions $out/share/fish/vendor_completions.d @@ -52,7 +60,7 @@ with python3.pkgs; buildPythonApplication rec { homepage = https://github.com/jarun/Buku; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ matthiasbeyer infinisil ]; + maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 8800ebd83ca000faecb75e1868c6868fb9d05b37..fd65fcd22606607c7f80e1763997503a985af9c1 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.3.0"; src = fetchurl { - url = "http://calcurse.org/files/${name}.tar.gz"; + url = "https://calcurse.org/files/${name}.tar.gz"; sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i"; }; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 3c023a279744ca181b60b9f9d0487ea63927a439..d66a778c1cd9003ce5e441217462cb5af442c747 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng +{ stdenv, fetchurl, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite -, makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp +, makeWrapper, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp , xdg_utils, makeDesktopItem, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "3.20.0"; + version = "3.30.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1rnmh24d9hqnncg6p6zwkb3y3m4k9n7pzma69haxnm7iaps84gmy"; + sha256 = "0j7w63kniqnpr8v1aldzbim2dyrk79n23mzw9y56jqd0k47m8zfz"; }; patches = [ @@ -162,7 +162,7 @@ stdenv.mkDerivation rec { description = "Comprehensive e-book software"; homepage = https://calibre-ebook.com; license = with licenses; if unrarSupport then unfreeRedistributable else gpl3; - maintainers = with maintainers; [ viric domenkozar pSub AndersonTorres ]; + maintainers = with maintainers; [ domenkozar pSub AndersonTorres ]; platforms = platforms.linux; inherit version; }; diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch index 4d37c3b642f5c7323211664b5376f7a53a541c4a..faaaf2c19949410b9cce12a800a29f7cf4a0b519 100644 --- a/pkgs/applications/misc/calibre/no_updates_dialog.patch +++ b/pkgs/applications/misc/calibre/no_updates_dialog.patch @@ -13,15 +13,3 @@ diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre parser.add_option('--ignore-plugins', default=False, action='store_true', help=_('Ignore custom plugins, useful if you installed a plugin' ' that is preventing calibre from starting')) -diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py ---- calibre-2.9.0.orig/src/calibre/gui2/update.py 2014-11-09 20:09:54.082231864 +0800 -+++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-09 20:17:49.954767115 +0800 -@@ -154,6 +154,8 @@ - self.update_checker.signal.update_found.connect(self.update_found, - type=Qt.QueuedConnection) - self.update_checker.start() -+ else: -+ self.update_checker = None - - def recalc_update_label(self, number_of_plugin_updates): - self.update_found(self.last_newest_calibre_version, number_of_plugin_updates) diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index e48b32a783d729a62a811b404cccda50ffa9dc95..f2aac4326cbf365a3700df02f718e0bcc3e77e39 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://cgg.bzatek.net/; description = "a simple static web photo gallery, designed to be clean and easily usable"; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/cataract/default.nix b/pkgs/applications/misc/cataract/default.nix index 83292a76c5dd658d0c4098b151fd89a74d4c2174..3a9f20289227bf3cd87f498d842519e3be46340f 100644 --- a/pkgs/applications/misc/cataract/default.nix +++ b/pkgs/applications/misc/cataract/default.nix @@ -1,13 +1,4 @@ -{ callPackage -, stdenv -, fetchgit -, autoconf -, automake -, glib -, pkgconfig -, libxml2 -, exiv2 -, imagemagick }: +{ callPackage }: callPackage ./build.nix { version = "1.1.0"; diff --git a/pkgs/applications/misc/cataract/unstable.nix b/pkgs/applications/misc/cataract/unstable.nix index 8d8b063e48b375c42ea4707423935194576c209c..397aed355a952483eb84e54aa3ff9ea0a15542b2 100644 --- a/pkgs/applications/misc/cataract/unstable.nix +++ b/pkgs/applications/misc/cataract/unstable.nix @@ -1,13 +1,4 @@ -{ callPackage -, stdenv -, fetchgit -, autoconf -, automake -, glib -, pkgconfig -, libxml2 -, exiv2 -, imagemagick }: +{ callPackage }: callPackage ./build.nix { version = "unstable-2016-10-18"; diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 0c71b3ffb0addb9ae2416950e963c9d0a098855b..f4ba30080f7152678453dff0a6f2b672d532dc93 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -3,15 +3,19 @@ stdenv.mkDerivation rec { name = "cbatticon-${version}"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "valr"; repo = "cbatticon"; rev = version; - sha256 = "0rm1rpq81cxjwd4f11c3ivg5hwsd08qm47vdn16yr1cmm2cw4r2d"; + sha256 = "16g26vin1693dbdr9qsnw36fdchx394lp79gvp7gcbw0w1ny9av6"; }; + patchPhase = '' + sed -i -e 's/ -Wno-format//g' Makefile + ''; + makeFlags = "PREFIX=$(out)"; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index acd38d74dca4a4c2ed7fe2b303bd1b2399d3154e..ee3e2a955d322bed5032e3a665d88f760f7ed8cd 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXext xorg.libXinerama jansson ]; configureScript = "./autogen.sh"; - configureFlags = "--enable-scrypt --enable-opencl"; + configureFlags = [ "--enable-scrypt" "--enable-opencl" ]; NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; preConfigure = '' diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 4ef1adb8e6cca351e77d942cc9a84ebc133d31ac..ad3f653465938fd87b821c1fa788bf38d11e586b 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -4,7 +4,7 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "cheat"; - version = "2.2.2"; + version = "2.2.3"; propagatedBuildInputs = [ docopt pygments ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "chrisallenlane"; repo = "cheat"; rev = version; - sha256 = "1da4m4n6nivjakpll6jj0aszrv24g2zax74034lzpv3pbh84fvas"; + sha256 = "1p9a54fax3b1ilqcwdlccy08ww3igwsyzcyikqivaxj5p6mqq6wl"; }; # no tests available doCheck = false; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index ff1712f12fec1634d9f1cf7887637e12d4e2b161..6bd1cef7c1b26a3f6fbca0fb771427d5021aa228 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pythonPackages, gettext, sqlite }: +{ stdenv, fetchurl, pythonPackages, gettext }: with stdenv.lib; stdenv.mkDerivation rec { name = "cherrytree-${version}"; - version = "0.38.4"; + version = "0.38.5"; src = fetchurl { - url = "http://www.giuspen.com/software/${name}.tar.xz"; - sha256 = "1zazyxkrli77wahn4c1z24qyz5bwlayl335f2kdxb44dicrx58g2"; + url = "https://www.giuspen.com/software/${name}.tar.xz"; + sha256 = "1ja3b14vm3yd26pf82p2qlld0flqkqvgdg2g33r5dav6wfq3pz6y"; }; buildInputs = with pythonPackages; diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 068d8e7945478a0cec3c202a93f6278ebf682780..8a26631d5c0d796afd569c6449de2868f2db4edd 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libxml2Python, libxslt, makeWrapper -, python, pyserial, pygtk }: +, pyserial, pygtk }: stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20180325"; + version = "20180815"; src = fetchurl { - url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "0z2m74hhkxvxchxv819wy947v3wl13kxrdq4kjjazzrlyaky921y"; + url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; + sha256 = "0z3jh9sbszs8x0xjmkgxa3b1xnw3w9b13pml4i5apx3mj171npyv"; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source tool for programming your amateur radio"; - homepage = http://chirp.danplanet.com/; + homepage = https://chirp.danplanet.com/; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.the-kenny ]; diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 8b24df1bee92775b0c21591e7ba5a5c54e209f50..7aecc8f823ee4153b40de5dff4018f1ae451775c 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { - version = "1.6"; + version = "1.7"; name = "cli-visualizer-${version}"; src = fetchFromGitHub { owner = "dpayne"; repo = "cli-visualizer"; rev = version; - sha256 = "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc"; + sha256 = "06z6vj87xjmacppcxvgm47wby6mv1hnbqav8lpdk9v5s1hmmp1cr"; }; postPatch = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dpayne/cli-visualizer; description = "CLI based audio visualizer"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6dd68123b132a4e7c66604c4a5b005f33d2fa53b --- /dev/null +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -0,0 +1,33 @@ +{ clipnotify, makeWrapper, xsel, dmenu2, utillinux, gawk, stdenv, fetchFromGitHub, lib }: +let + runtimePath = lib.makeBinPath [ clipnotify xsel dmenu2 utillinux gawk ]; +in +stdenv.mkDerivation rec { + name = "clipmenu-${version}"; + version = "5.5.0"; + + src = fetchFromGitHub { + owner = "cdown"; + repo = "clipmenu"; + rev = version; + sha256 = "15if7bwqviyynbrcwrn04r418cfnxf2mkmq112696np24bggvljg"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp clipdel clipmenu clipmenud $out/bin + + for bin in $out/bin/*; do + wrapProgram "$bin" --prefix PATH : "${runtimePath}" + done + ''; + + meta = with stdenv.lib; { + description = "Clipboard management using dmenu"; + inherit (src.meta) homepage; + maintainers = with maintainers; [ jb55 ]; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..23d76afff0cef82ed2e200443fd62c962eef7b8e --- /dev/null +++ b/pkgs/applications/misc/cointop/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "cointop-unstable-${version}"; + version = "2018-05-03"; + rev = "08acd96082682347d458cd4f861e2debd3255745"; + + goPackagePath = "github.com/miguelmota/cointop"; + + src = fetchgit { + inherit rev; + url = "https://github.com/miguelmota/cointop"; + sha256 = "14savz48wzrfpm12fgnnndpl3mpzx7wsch4jrnm3rmrfdabdx7mi"; + }; + + goDeps = ./deps.nix; + + meta = { + description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; + longDescription = '' + cointop is a fast and lightweight interactive terminal based UI application + for tracking and monitoring cryptocurrency coin stats in real-time. + + The interface is inspired by htop and shortcut keys are inspired by vim. + ''; + homepage = https://cointop.sh; + platforms = stdenv.lib.platforms.linux; # cannot test others + maintainers = [ ]; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/applications/misc/cointop/deps.nix b/pkgs/applications/misc/cointop/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..3ba1d12a8048b4389c7e3a37b1fc27cf536d964f --- /dev/null +++ b/pkgs/applications/misc/cointop/deps.nix @@ -0,0 +1,3 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ +] diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index 7781f0df853aabcb9d8e2251136704644a6b9d90..3851730c4596d0302d150f2312c2a25c09c766d5 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qt4, qmake4Hook }: -let version = "0.6.1"; in +let version = "0.6.4"; in stdenv.mkDerivation { name = "confclerk-${version}"; src = fetchurl { - url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; - sha256 = "1wprndshmc7k1919n7k93c4ha2jp171q31gx7xsbzx7g4sw6432g"; + url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; + sha256 = "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3"; }; buildInputs = [ qt4 ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 45bd417abb4f4b9c3ccbffccbf43b66545c2a94f..7b34674c218313773fca48e7a6b58a8a84b224d7 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst, git +{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst +, qtx11extras, git , webkitSupport ? true }: stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.3.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0j46h87ifinkydi0m725p422m9svk3dpcz8dnrci4mxx0inn6qs3"; + sha256 = "0hzdv6rhjpq9yrfafnkc6d8m5pzw9qr520vsjf2gn1819gdybmr0"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ - git qtbase qtscript libXfixes libXtst + git qtbase qtscript libXfixes libXtst qtx11extras ] ++ stdenv.lib.optional webkitSupport qtwebkit; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a6afee13e47bdfffd3763813195929631e97bd12 --- /dev/null +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, glibcLocales, pandoc, python3 }: + +let + pythonPackages = python3.pkgs; + +in pythonPackages.buildPythonApplication rec { + pname = "coursera-dl"; + version = "0.11.4"; + + src = fetchFromGitHub { + owner = "coursera-dl"; + repo = "coursera-dl"; + rev = version; + sha256 = "0dn7a6s98dwba62r0dyabq8pryzga4b2wpx88i9bmp7ja1b1f92f"; + }; + + nativeBuildInputs = with pythonPackages; [ pandoc ]; + + buildInputs = with pythonPackages; [ glibcLocales ]; + + propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 ConfigArgParse keyring pyasn1 requests six urllib3 ]; + + checkInputs = with pythonPackages; [ pytest mock ]; + + preConfigure = '' + export LC_ALL=en_US.utf-8 + ''; + + checkPhase = '' + # requires dbus service + py.test -k 'not test_get_credentials_with_keyring' . + ''; + + meta = with stdenv.lib; { + description = "CLI for downloading Coursera.org videos and naming them"; + homepage = https://github.com/coursera-dl/coursera-dl; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ alexfmpe ]; + platforms = platforms.darwin ++ platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 857254c3cb0326c4099b6a15161b667b44f27ebb..4d99751924619d14927d357134e98104abd8c8b9 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , jsoncpp -, libjson_rpc_cpp +, libjson-rpc-cpp , curl , boost , leveldb @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake jsoncpp - libjson_rpc_cpp + libjson-rpc-cpp curl boost leveldb @@ -80,5 +80,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ artuuge ]; platforms = platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 0123e0c38d74a6f493deedc137cbf73b6f0899fd..f8927319a0110515d40b5a3922248cd28f75e34a 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = http://ctodo.apakoh.dk/; description = "A simple ncurses-based task list manager"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index edb10a0f6671774a3e1ee948951835c9087192de..f97b83a85075882be1d34d78c7d774d8cf6d9020 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,27 +1,42 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols, curaengine }: +{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, curaengine }: mkDerivation rec { name = "cura-${version}"; - version = "3.2.1"; + version = "3.4.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp"; + sha256 = "03s9nf1aybbnbf1rzqja41m9g6991bbvrcly1lcrfqksianfn06w"; }; - buildInputs = [ qtbase qtquickcontrols ]; + materials = fetchFromGitHub { + owner = "Ultimaker"; + repo = "fdm_materials"; + rev = "3.4.1"; + sha256 = "1pw30clxqd7qgnidsyx6grizvlgfn8rhj6rd5ppkvv3rdjh0gj28"; + }; + + buildInputs = [ qtbase qtquickcontrols2 ]; propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ]; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; - cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ]; + cmakeFlags = [ + "-DURANIUM_DIR=${python3.pkgs.uranium.src}" + "-DCURA_VERSION=${version}" + ]; postPatch = '' sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py ''; + postInstall = '' + mkdir -p $out/share/cura/resources/materials + cp ${materials}/*.fdm_material $out/share/cura/resources/materials/ + ''; + postFixup = '' wrapPythonPrograms ''; diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix index 4d13e62bdfec794579169a0740af9dd8a198542b..6a36e42eaa3d182f60ba384d2488109f8a144472 100644 --- a/pkgs/applications/misc/cura/lulzbot.nix +++ b/pkgs/applications/misc/cura/lulzbot.nix @@ -4,13 +4,13 @@ let py = python27Packages; in stdenv.mkDerivation rec { - name = "cura-lulzbot"; + name = "cura-lulzbot-${version}"; version = "15.02.1-1.03-5064"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb"; + url = "https://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb"; sha256 = "1gsfidg3gim5pjbl82vkh0cw4ya253m4p7nirm8nr6yjrsirkzxg"; } else if stdenv.system == "i686-linux" then diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index c3a19e6551a230e78b642c775b5a2ef46f5239de..ba9a98c616b34190a0016d47b36c14f2ad9c8c44 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, libarcus }: +{ stdenv, fetchFromGitHub, cmake, libarcus, stb }: stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "3.2.1"; + version = "3.4.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "1yqpp6qhixzni3ik11vbk5kcdrhlz2j4ylzmh8f6c86r4d73a0cp"; + sha256 = "083jmhzmb60rmqw0fhbnlxyblzkmpn3k6zc75xq90x5g3h60wib4"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libarcus ]; + buildInputs = [ libarcus stb ]; - enableParallelBuilding = true; + cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; meta = with stdenv.lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 27ff0360a8dc270547b3ef637305cc9cf160a7b6..35698a32331900c335946890219b5395da392486 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.0.2"; + version = "5.1.6"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0jk8z0s14rc1fnmi7pynhybslwm147mqih187zsa33xqmmhlw1lp"; + url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; + sha256 = "1zypadnyhinm6mfv91s7zs2s55bhzgkqhl6ai6x3yqwhvayc02nn"; }; installPhase = '' @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://dbeaver.jkiss.org; + homepage = https://dbeaver.io/; description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more"; longDescription = '' Free multi-platform database tool for developers, SQL programmers, database diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix index 7aa19ffb30179f615fa97da9e4bc4502b227bc0b..fbeb965df3805d99eab21639f4915e4bd72cb4f1 100644 --- a/pkgs/applications/misc/dbvisualizer/default.nix +++ b/pkgs/applications/misc/dbvisualizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, coreutils, makeWrapper }: +{ stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation { name = "dbvisualizer-9.5.7"; diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 53344595f7831827cf7d171132df7da6b9963b09..eeb7a8ccf526471cb1fea901e6647cec84201fd5 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, file, qtbase, qttools, qtx11extras, solid }: +{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }: let version = "git-2016-01-10"; @@ -20,6 +20,5 @@ stdenv.mkDerivation { description = "File manager written in Qt/C++"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; }; } diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 144e1fa566cada6093c2e65dcf7c4373ea4f0371..daea20835c8a2859f8789bb080f06254a5d31717 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }: +{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: stdenv.mkDerivation rec { version = "2.1.3"; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase poppler_qt5 ]; + buildInputs = [ qtbase poppler ]; preConfigure = '' - substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev} + substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler.dev} lrelease diffpdf.pro ''; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index fbd9d47633a1e0412a590d7c2953c6a904c1c06a..3e6a6ab53f77dc148e3c5cf1c35f8b5353d1d2c5 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -3,10 +3,11 @@ , curl , fetchFromGitHub , git +, libcap , libevent , libtool , libqrencode -, libudev +, udev , libusb , makeWrapper , pkgconfig @@ -66,10 +67,12 @@ in stdenv.mkDerivation rec { qttools ]; - buildInputs = with stdenv.lib; [ + buildInputs = [ + # TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio. + libcap libevent libtool - libudev + udev libusb libqrencode @@ -112,6 +115,8 @@ in stdenv.mkDerivation rec { ${copyUdevRuleToOutput "52-hid-digitalbox.rules" udevRule52} ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A QT based application for the Digital Bitbox hardware wallet"; longDescription = '' diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 6e158f5696c1124839635cdb09527f64f56a48e3..0b685e04a6fca138a6cf9c3a5d3ee29f527841f8 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libtiff, librsvg, libintlOrEmpty }: +{ stdenv, fetchurl, libjpeg, libtiff, librsvg, libiconv }: stdenv.mkDerivation rec { name = "djvulibre-3.5.27"; @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; - buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + buildInputs = [ libjpeg libtiff librsvg libiconv ]; meta = with stdenv.lib; { description = "A library and viewer for the DJVU file format for scanned images"; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index f8b175eb86a13b76a7ce5521b88cc4f82905f8b7..3ee2006ab0c056e374f43396f7eba6d7f5b2c5cb 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dmenu-4.8"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy"; }; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = http://tools.suckless.org/dmenu; + homepage = https://tools.suckless.org/dmenu; license = licenses.mit; - maintainers = with maintainers; [ viric pSub ]; + maintainers = with maintainers; [ pSub ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/doing/Gemfile b/pkgs/applications/misc/doing/Gemfile new file mode 100644 index 0000000000000000000000000000000000000000..2706a85e9d89196c550c8cbd8d824ea2fb54f75b --- /dev/null +++ b/pkgs/applications/misc/doing/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'doing', '1.0.10pre' diff --git a/pkgs/applications/misc/doing/Gemfile.lock b/pkgs/applications/misc/doing/Gemfile.lock new file mode 100644 index 0000000000000000000000000000000000000000..4d266827415f92cf139a6494f87411e245ffecaf --- /dev/null +++ b/pkgs/applications/misc/doing/Gemfile.lock @@ -0,0 +1,25 @@ +GEM + remote: https://rubygems.org/ + specs: + chronic (0.10.2) + deep_merge (1.2.1) + doing (1.0.10pre) + chronic (~> 0.10, >= 0.10.2) + deep_merge + gli (~> 2.17.1) + haml (= 4.0.3) + json (~> 1.8.1) + gli (2.17.1) + haml (4.0.3) + tilt + json (1.8.6) + tilt (2.0.8) + +PLATFORMS + ruby + +DEPENDENCIES + doing (= 1.0.10pre) + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0286e38a0edf57fbc4dbe5d648ad19305bf2dcdf --- /dev/null +++ b/pkgs/applications/misc/doing/default.nix @@ -0,0 +1,25 @@ +{ lib, bundlerEnv, ruby +}: + +# Bundix: +# nix-shell -p bundix zlib +bundlerEnv rec { + pname = "doing"; + version = (import ./gemset.nix).doing.version; + + inherit ruby; + gemdir = ./.; + + meta = with lib; { + description = "A command line tool for keeping track of what you’re doing and tracking what you’ve done."; + longDescription = '' + doing is a basic CLI for adding and listing "what was I doing" reminders + in a TaskPaper-formatted text file. It allows for multiple + sections/categories and flexible output formatting. + ''; + homepage = http://brettterpstra.com/projects/doing/; + license = licenses.mit; + maintainers = with maintainers; [ ktf ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/doing/gemset.nix b/pkgs/applications/misc/doing/gemset.nix new file mode 100644 index 0000000000000000000000000000000000000000..b30a124bb58b7bb6f38d2da00ba5e8fb0d6da283 --- /dev/null +++ b/pkgs/applications/misc/doing/gemset.nix @@ -0,0 +1,60 @@ +{ + chronic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; + type = "gem"; + }; + version = "0.10.2"; + }; + deep_merge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q3picw7zx1xdkybmrnhmk2hycxzaa0jv4gqrby1s90dy5n7fmsb"; + type = "gem"; + }; + version = "1.2.1"; + }; + doing = { + dependencies = ["chronic" "deep_merge" "gli" "haml" "json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y42yc7h45sz9hqj3g1dd77ipx58l7v64i7mrsj3is2f5rszd1rv"; + type = "gem"; + }; + version = "1.0.10pre"; + }; + gli = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g7g3lxhh2b4h4im58zywj9vcfixfgndfsvp84cr3x67b5zm4kaq"; + type = "gem"; + }; + version = "2.17.1"; + }; + haml = { + dependencies = ["tilt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l9zhfdk9z7xjfdp108r9fw4xa55hflin7hh3lpafbf9bdz96knr"; + type = "gem"; + }; + version = "4.0.3"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; + type = "gem"; + }; + version = "1.8.6"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; + type = "gem"; + }; + version = "2.0.8"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index bd7fbe863163150fc2935357dff5284d551d8444..fd08ed9c391662f1d07c9657ec2cf3903322b725 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,24 +1,26 @@ -{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2 }: +{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: stdenv.mkDerivation rec { name = "doomseeker-${version}"; - version = "2018-03-03"; + version = "2018-03-05"; src = fetchFromBitbucket { owner = "Doomseeker"; repo = "doomseeker"; - rev = "072110a8fe0643c4a72461e7768560813bb0a62b"; - sha256 = "1w4g5f7yifqk2d054dqrmy8qj4n5hxdan7n59845m1xh2f2r8i0p"; + rev = "c2c7f37b1afb"; + sha256 = "17fna3a604miqsvply3klnmypps4ifz8axgd3pj96z46ybxs8akw"; }; - patches = [ ./fix_paths.patch ]; + patches = [ ./fix_paths.patch ./qt_build_fix.patch ]; buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - nativeBuildInputs = [ cmake qttools pkgconfig ]; + nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=format-security"; + meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/; description = "Multiplayer server browser for many Doom source ports"; diff --git a/pkgs/applications/misc/doomseeker/qt_build_fix.patch b/pkgs/applications/misc/doomseeker/qt_build_fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..e21b53b3cc536a79630bef37fc841e88f5161d7a --- /dev/null +++ b/pkgs/applications/misc/doomseeker/qt_build_fix.patch @@ -0,0 +1,47 @@ +diff -r c2c7f37b1afb src/core/gui/irc/ircdock.cpp +--- a/src/core/gui/irc/ircdock.cpp Tue Mar 06 00:14:23 2018 +0100 ++++ b/src/core/gui/irc/ircdock.cpp Sat Jul 28 16:53:04 2018 -0700 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + DClass : public Ui::IRCDock + { +diff -r c2c7f37b1afb src/core/gui/logdock.cpp +--- a/src/core/gui/logdock.cpp Tue Mar 06 00:14:23 2018 +0100 ++++ b/src/core/gui/logdock.cpp Sat Jul 28 16:53:04 2018 -0700 +@@ -21,6 +21,8 @@ + // Copyright (C) 2009 "Zalewa" + //------------------------------------------------------------------------------ + ++#include ++ + #include "clipboard.h" + #include "logdock.h" + #include "log.h" +diff -r c2c7f37b1afb src/core/gui/serverdetailsdock.cpp +--- a/src/core/gui/serverdetailsdock.cpp Tue Mar 06 00:14:23 2018 +0100 ++++ b/src/core/gui/serverdetailsdock.cpp Sat Jul 28 16:53:04 2018 -0700 +@@ -21,6 +21,7 @@ + // Copyright (C) 2014 Braden "Blzut3" Obrzut + //------------------------------------------------------------------------------ + ++#include + #include + + #include "serverdetailsdock.h" +diff -r c2c7f37b1afb src/core/gui/serverfilterdock.cpp +--- a/src/core/gui/serverfilterdock.cpp Tue Mar 06 00:14:23 2018 +0100 ++++ b/src/core/gui/serverfilterdock.cpp Sat Jul 28 16:53:04 2018 -0700 +@@ -20,6 +20,9 @@ + //------------------------------------------------------------------------------ + // Copyright (C) 2011 "Zalewa" + //------------------------------------------------------------------------------ ++ ++#include ++ + #include "serverfilterdock.h" + #include "ui_serverfilterdock.h" + diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b5ae9fb567ca273e0ad59199a9975d6f90c78a93 --- /dev/null +++ b/pkgs/applications/misc/dozenal/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, ncurses, hdate, lua5_2 }: + +stdenv.mkDerivation rec { + version = "12010904"; + name = "dozenal-${version}"; + src = fetchFromGitHub { + owner = "dgoodmaniii"; + repo = "dozenal"; + rev = "v${version}"; + sha256 = "1ic63gpdda762x6ks3al71dwgmsy2isicqyr2935bd245jx8s209"; + }; + makeFlags = [ + # author do not use configure and prefix directly using $prefix + "prefix=$(out)" + # graphical version of dozdc requires xforms, which is not i nixpkgs so I turned it down + "XFORMS_FLAGS=-UXFORMS" + "LUALIB=-llua" + "bindir=$(prefix)/bin/" + ]; + # some include hardcodes the lua libraries path. This is a patch for that + patches = [ ./lua-header.patch ]; + preBuild = "cd dozenal"; + buildInputs = [ ncurses hdate lua5_2 ]; + # I remove gdozdc, as I didn't figure all it's dependency yet. + postInstall = "rm $out/bin/gdozdc"; + + meta = { + description = "A complete suite of dozenal (base twelve) programs"; + longDescription = '' + Programs + + doz --- a converter; converts decimal numbers into dozenal. Accepts + input in standard or exponential notation (i.e., "1492.2" or "1.4922e3"). + dec --- a converter; converts dozenal numbers into decimal. Accepts input + in standard or exponential notation (i.e., "X44;4" or "X;444e2"). + dozword --- converts a dozenal number (integers only) into words, + according to the Pendlebury system. + dozdc --- a full-featured scientific calculator which works in the + dozenal base. RPN command line. + tgmconv --- a converter for all standard measurements; converts to and + from TGM, Imperial, customary, and SI metric. + dozpret --- a pretty-printer for dozenal numbers; inserts spacing (or + other characters) as desired, and can also transform transdecimal digits + from 'X' to 'E' into any character or sequence of characters desired. + dozdate --- a more-or-less drop-in replacement for GNU and BSD date, it + outputs the date and time in dozenal, as well as containing some TGM + extensions. + dozstring --- a simple byte converter; absorbs a string either from + standard input or a command line argument, leaving it identical but + for the numbers, which it converts into dozenal. Options for padding + and for not converting specific numbers. + doman --- a converter which takes a dozenal integer and + emits its equivalent in a non-place-value system, such as + Roman numerals. Arbitrary ranks and symbols may be used. + Defaults to dozenal Roman numerals. + ''; + homepage = https://github.com/dgoodmaniii/dozenal/; + maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/dozenal/lua-header.patch b/pkgs/applications/misc/dozenal/lua-header.patch new file mode 100644 index 0000000000000000000000000000000000000000..45b76e159a119292e004f8dddd72969c7908c24d --- /dev/null +++ b/pkgs/applications/misc/dozenal/lua-header.patch @@ -0,0 +1,16 @@ +diff -ruN dozenal-12010904/dozenal/dozcal/call_lua.c dozenal-patched/dozenal/dozcal/call_lua.c +--- dozenal-12010904/dozenal/dozcal/call_lua.c 2017-09-04 19:25:01.000000000 +0200 ++++ dozenal-patched/dozenal/dozcal/call_lua.c 2018-06-13 10:19:57.821950327 +0200 +@@ -38,9 +38,9 @@ + #include"utility.h" + #include"conv.h" + #include"proc_date.h" +-#include +-#include +-#include ++#include ++#include ++#include + + void bail(lua_State *L, int err_code, char *filename); + int file_prefix(char **s, char *t); diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 9906b1fd8587a6c833fef2b2db21ec720797d9b3..12f1f78acb9e1ad448eaf4f26d10ddf808a7b0a4 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub, makeWrapper , pkgconfig, which, perl, libXrandr , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver -, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg +, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg, dunstify ? false }: stdenv.mkDerivation rec { name = "dunst-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "0i518v2z9fklzl5w60gkwwmg30yz3bd0k4rxjrxjabx73pvxm1mz"; + sha256 = "1kqlshaflp306yrjjmc28pghi1y5p24vdx4bxf8i4n9khdawb514"; }; - nativeBuildInputs = [ perl pkgconfig which systemd ]; + nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ]; buildInputs = [ cairo dbus gdk_pixbuf glib libX11 libXScrnSaver @@ -31,6 +31,15 @@ stdenv.mkDerivation rec { "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user" ]; + buildFlags = if dunstify then [ "dunstify" ] else []; + + postInstall = stdenv.lib.optionalString dunstify '' + install -Dm755 dunstify $out/bin + '' + '' + wrapProgram $out/bin/dunst \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + meta = with stdenv.lib; { description = "Lightweight and customizable notification daemon"; homepage = https://dunst-project.org/; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index d83eb1ed86a746c727b822c9e095443c69cb1d46..b08ce5baa5b67428ff051556fe2fda583c6582c4 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://eaglemode.sourceforge.net; description = "Zoomable User Interface"; license = licenses.gpl3; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; broken = true; }; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 76b61de56088cc60dbfed3eabf207a52c0c59f2f..891222a0f10e36b295cb54f30a09df69623b594c 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, qtbase }: +{ stdenv, fetchurl, python3Packages }: let diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum/dash.nix similarity index 100% rename from pkgs/applications/misc/electrum-dash/default.nix rename to pkgs/applications/misc/electrum/dash.nix diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 425203be01cc6e8656f193258049bf5bdcc68775..ed2f0626e5d27e3926dae2e82bea162ba942a091 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, python3, python3Packages, zbar, fetchpatch }: +{ stdenv, fetchurl, python3, python3Packages, zbar }: python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0ds3p7cjbavsbizm04rhzl8s59czynynpx1jvg367mwbi6gng59i"; + sha256 = "05m28yd3zr9awjhaqikf4rg08j5i4ygm750ip1z27wl446sysniy"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum/ltc.nix similarity index 93% rename from pkgs/applications/misc/electrum-ltc/default.nix rename to pkgs/applications/misc/electrum/ltc.nix index 8540c39d1336038fc1ef111b2211fcfc0eef7ab0..45c448804626d9697129221e60dbb48f5a69ec69 100644 --- a/pkgs/applications/misc/electrum-ltc/default.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { name = "electrum-ltc-${version}"; - version = "3.0.6.2"; + version = "3.1.3.1"; src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "1bay4vfkanxsa8pj8n99sj55yc59s84nns97lbvagyp0p0lclia7"; + sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/ephemeralpg/default.nix b/pkgs/applications/misc/ephemeralpg/default.nix index 65df422599ca1a11d7b6bb926988373b1863846c..0ade32d998991fb27fabf7a417917bbe8988cff3 100644 --- a/pkgs/applications/misc/ephemeralpg/default.nix +++ b/pkgs/applications/misc/ephemeralpg/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, postgresql, makeWrapper }: stdenv.mkDerivation rec { name = "ephemeralpg-${version}"; - version = "2.2"; + version = "2.5"; src = fetchurl { url = "http://ephemeralpg.org/code/${name}.tar.gz"; - sha256 = "1v48bcmc23zzqbha80p3spxd5l347qnjzs4z44wl80i2s8fdzlyz"; + sha256 = "004fcll7248h73adkqawn9bhkqj9wsxyi3w99x64f7s37r2518wk"; }; buildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index 40631b0a0dbf6fcedc96ec1b70d959de4d64c476..4aaaa3339982e633630d991adeb4d6df474d5b1b 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "et-${version}"; - version = "0.1"; + version = "0.1.1"; src = fetchFromGitHub { owner = "geistesk"; repo = "et"; rev = "${version}"; - sha256 = "1d2hq6p1y2ynk0a3l35lwbm1fcl9kg7rpjcin8bx4xcdpbw42y94"; + sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc"; }; buildInputs = [ libnotify gdk_pixbuf ]; diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b8bd0a59bea26d7c9ff2416e7783901b52e9905e --- /dev/null +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }: + +stdenv.mkDerivation rec { + name = "eureka-editor-${version}"; + version = "1.21"; + shortver = "121"; + + src = fetchzip { + url = "mirror://sourceforge/eureka-editor/Eureka/${version}/eureka-${shortver}-source.tar.gz"; + sha256 = "0fpj13aq4wh3f7473cdc5jkf1c71jiiqmjc0ihqa0nm3hic1d4yv"; + }; + + buildInputs = [ fltk zlib xdg_utils libjpeg xorg.libXinerama libGL ]; + + enableParallelBuilding = true; + + preBuild = '' + substituteInPlace src/main.cc \ + --replace /usr/local $out + substituteInPlace Makefile \ + --replace /usr/local $out \ + --replace "-o root " "" + ''; + + preInstall = '' + mkdir -p $out/bin $out/share/applications $out/share/icons $out/man/man6 + cp misc/eureka.desktop $out/share/applications + cp misc/eureka.ico $out/share/icons + cp misc/eureka.6 $out/man/man6 + ''; + + meta = with stdenv.lib; { + homepage = http://eureka-editor.sourceforge.net; + description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ neonfuz ]; + }; +} diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index 1165ced11f9c760058db8a5520ee2b5d9cd1e416..b72fcde4a9ee0fac958d819821cb0c475e0f9572 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -31,5 +31,8 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.bodil ]; platforms = platforms.linux; + knownVulnerabilities = [ + "https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854585" + ]; }; } diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 73911bab6f66bccc2058b24471ba5dfc3a51dc72..3d715a1d16bd30054637f30b415c392a3aac97bb 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, automake, pkgconfig, libxml2 }: +{ stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }: stdenv.mkDerivation rec { name = "evtest-1.33"; diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 74aab5e7e130e937a4b79a97751273ad85fb5556..4c5e9e5230a67f8936513b474b128d58623e1767 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "exercism-${version}"; - version = "2.4.1"; + version = "3.0.6"; goPackagePath = "github.com/exercism/cli"; @@ -10,14 +10,15 @@ buildGoPackage rec { owner = "exercism"; repo = "cli"; rev = "v${version}"; - sha256 = "1nab4459zi2gkh18k9vsm54bz39c2sb60v2xy0i72j1vd99axjjj"; + sha256 = "0xr5bqzm0md1vllnr384k92k7w1nxzw9lhqgm23zkxx5a4vqzy56"; }; + goDeps = ./deps.nix; + meta = with stdenv.lib; { + inherit (src.meta) homepage; description = "A Go based command line tool for exercism.io"; - homepage = http://exercism.io/cli; license = licenses.mit; maintainers = [ maintainers.rbasso ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/exercism/deps.nix b/pkgs/applications/misc/exercism/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..ad93aa4e4373444bbe8d5d43ae2f4ecd6a188814 --- /dev/null +++ b/pkgs/applications/misc/exercism/deps.nix @@ -0,0 +1,201 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "3c1074078d32d767e08ab2c8564867292da86926"; + sha256 = "1vqkjrag8nn5hvjz34cf9zsrgwd13ss63y6sp7y5jq39j7bcprdx"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; + sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; + }; + } + { + goPackagePath = "github.com/inconshreveable/go-update"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/go-update"; + rev = "8152e7eb6ccf8679a64582a66b78519688d156ad"; + sha256 = "07czhspakpi7al004rm669cmf4h5l0vnygsm11280nkfn2zxqdi3"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c2353362d570a7bfa228149c62842019201cfb71"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac"; + sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; + }; + } + { + goPackagePath = "github.com/pelletier/go-buffruneio"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-buffruneio"; + rev = "e2f66f8164ca709d4c21e815860afd2024e9b894"; + sha256 = "16h7fybbai45p5gn2la6z37a8h1ws6r3pg3nwqiw6gbbgjqicrbv"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602"; + sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "787d034dfe70e44075ccc060d346146ef53270ad"; + sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "7c4570c3ebeb8129a1f7456d0908a8b676b6f9f1"; + sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; + sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "3ebe029320b2676d667ae88da602a5f854788a8a"; + sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "d493c32b69b8c6f2377bf30bc4d70267ffbc0793"; + sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd"; + sha256 = "0vx7mz18p480p7fh0w5jv6mfdbsswrlac1sz4i705q7q7ygz59lm"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "bd9dbc187b6e1dacfdd2722a87e83093c2d7bd6e"; + sha256 = "0zj8s3q2fznmap1nfr8pv4hz8xqixmkyhr6slq4baf8rvcb4mvbj"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "0605a8320aceb4207a5fb3521281e17ec2075476"; + sha256 = "1pak7q9ivwxh5bnjk00pkrs9ri9vmbyccvza56fl6138w397h49j"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } +] \ No newline at end of file diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch deleted file mode 100644 index a50070c4eadd45e562a9f80ead42975394f2b01d..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/colorer/configs/base/hrc/nix.hrc b/colorer/configs/base/hrc/nix.hrc -new file mode 100644 -index 0000000..1bd9bb5 ---- /dev/null -+++ b/colorer/configs/base/hrc/nix.hrc -@@ -0,0 +1,132 @@ -+ -+ -+ -+ -+ -+ -+ -+ Nix -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc -index 11e493b..2a67263 100644 ---- a/colorer/configs/base/hrc/proto.hrc -+++ b/colorer/configs/base/hrc/proto.hrc -@@ -156,6 +156,14 @@ - - /\.(w?lua)$/i - -+ -+ -+ /\.(nix)$/i -+ -+ -+ -+ -+ - - - /\.(rb|rbw|ruby|rake)$/i diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 9ddd39981cc2902fa2a40f5d2f8df8fe3e9f8285..3cdd4fb0bfe9553638c2c841a8d9fddb18576d99 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -3,15 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - rev = "819d131110a9fedfc14f3b3bea8f1f56e68b077a"; - build = "unstable-2018-02-27.git${builtins.substring 0 7 rev}"; + build = "unstable-2018-07-19.git${builtins.substring 0 7 src.rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; - rev = rev; - sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b"; + rev = "dceaa3918ea2c5e43600bad3fc63f861b8d26fc4"; + sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; @@ -19,10 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 glib pcre ] ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - patches = [ ./add-nix-syntax-highlighting.patch ]; - postPatch = optionalString stdenv.isLinux '' - substituteInPlace far2l/bootstrap/open.sh \ + substituteInPlace far2l/bootstrap/trash.sh \ --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' '' + optionalString stdenv.isDarwin '' substituteInPlace far2l/CMakeLists.txt \ @@ -44,6 +41,15 @@ stdenv.mkDerivation rec { --replace '"gzip ' '"${gzip}/bin/gzip ' \ --replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \ --replace '"tar ' '"${gnutar}/bin/tar ' + + ( cd colorer/configs/base + patch -p2 < ${ fetchpatch { + name = "nix-language-highlighting.patch"; + url = https://github.com/colorer/Colorer-schemes/commit/64bd06de0a63224b431cd8fc42cd9fa84b8ba7c0.patch; + sha256 = "1mrj1wyxmk7sll9j1jzw6miwi0sfavf654klms24wngnh6hadsch"; + } + } + ) ''; installPhase = '' diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 80f76bc27c89509186bc3b922da2e2af62ca24e3..6fa34a008e770f9f118fc98f632ca04a25fa47b9 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "fbreader-0.99.4"; src = fetchurl { - url = http://fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz; + url = https://fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz; sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x"; }; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 5cd8f572ad48860192cc5268deccf0f505ba8c8e..e9d1946660944b1a661b390f7613c64bf801e871 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ openssl ]; - configureFlags = "--with-ssl=${openssl.dev}"; + configureFlags = [ "--with-ssl=${openssl.dev}" ]; meta = { homepage = http://www.fetchmail.info/; @@ -29,5 +29,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix deleted file mode 100644 index 93e5d297ffb3012d42f803ae61eecb47e4878d95..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/finalterm/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper -, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc -, keybinder3, clutter-gtk, libnotify -, libxkbcommon, xorg, udev -, bashInteractive -}: - -with stdenv.lib; - -stdenv.mkDerivation { - name = "finalterm-git-2014-11-15"; - - src = fetchFromGitHub { - owner = "p-e-w"; - repo = "finalterm"; - rev = "39b078b2a96a5c3c9e74f92b1929f383d220ca8b"; - sha256 = "14viln5nabr39lafg1lzf6ydibz1h5d9346drp435ljxc6wsh21i"; - }; - - nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; - buildInputs = [ - vala_0_26 gtk3 gnome3.gnome-common gnome3.libgee - gtk-doc clutter-gtk libmx keybinder3 libxml2 libnotify - xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence - libxkbcommon - ] ++ optionals stdenv.isLinux [ udev ]; - - preConfigure = '' - substituteInPlace data/org.gnome.finalterm.gschema.xml \ - --replace "/bin/bash" "${bashInteractive}/bin/bash" - - cmakeFlagsArray=( - -DMINIMAL_FLAGS=ON - ) - ''; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ - ''; - - postFixup = '' - wrapProgram "$out/bin/finalterm" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = { - homepage = http://finalterm.org; - description = "A new breed of terminal emulator"; - longDescription = '' - Final Term is a new breed of terminal emulator. - - It goes beyond mere emulation and understands what is happening inside the shell it is hosting. This allows it to offer features no other terminal can, including: - - - Semantic text menus - - Smart command completion - - GUI terminal controls - ''; - license = licenses.gpl3Plus; - maintainers = [ maintainers.cstrahan ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index be853e4213bc771ec48262e30189153e759b7e49..54392b03bfbfa86092fc3e75c5e7cce9590ad12a 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool, - librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection + librsvg, vala, gnome3, wrapGAppsHook, gobjectIntrospection }: stdenv.mkDerivation rec { name = "font-manager-${version}"; - version = "0.7.3"; + version = "0.7.3.1"; src = fetchFromGitHub { - owner = "FontManager"; - repo = "master"; - rev = version; - sha256 = "0qwi1mn2sc2q5cs28rga8i3cn34ylybs949vjnh97dl2rvlc0x06"; + owner = "FontManager"; + repo = "master"; + rev = version; + sha256 = "0i65br0bk3r6x8wcl8jhc0v0agl0k6fy5g60ss1bnw4md7ldpgyi"; }; nativeBuildInputs = [ @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { automake autoconf libtool file intltool - vala_0_34 + itstool + vala gnome3.yelp-tools wrapGAppsHook # For setup hook @@ -30,12 +31,9 @@ stdenv.mkDerivation rec { libxml2 json-glib sqlite - itstool librsvg gnome3.gtk - gnome3.gucharmap gnome3.libgee - gnome3.file-roller gnome3.defaultIconTheme ]; @@ -46,7 +44,10 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file" ''; - configureFlags = "--disable-pycompile"; + configureFlags = [ + "--with-file-roller" + "--disable-pycompile" + ]; meta = { homepage = https://fontmanager.github.io/; diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 67bb5feff8c7f896fe6701cdf888a2de1e2ae6e6..a3aebf227339db2715a90695c05053ed0240e66e 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses }: +{ stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { name = "gcal-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.gnu.org/software/gcal/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; }; } diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index d3ba5a97333a805d9a715ecf6f327e216f7a0e11..6a7a7ae604de9234cfb8bf02492d307d2ec1a61f 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -1,7 +1,38 @@ -{ stdenv, lib, fetchFromGitHub, pythonPackages +{ stdenv, lib, fetchFromGitHub, python2 , libnotify ? null }: -pythonPackages.buildPythonApplication rec { +let + py = python2.override { + packageOverrides = self: super: { + google_api_python_client = super.google_api_python_client.overridePythonAttrs (oldAttrs: rec { + version = "1.5.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig"; + }; + }); + + oauth2client = super.oauth2client.overridePythonAttrs (oldAttrs: rec { + version = "1.4.12"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; + }; + }); + + uritemplate = super.uritemplate.overridePythonAttrs (oldAttrs: rec { + version = "0.6"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3"; + }; + # there are no checks in this version + doCheck = false; + }); + }; + }; + +in with py.pkgs; buildPythonApplication rec { version = "3.4.0"; name = "gcalcli-${version}"; @@ -12,27 +43,21 @@ pythonPackages.buildPythonApplication rec { sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8"; }; - propagatedBuildInputs = with pythonPackages; [ - dateutil - gflags - google_api_python_client - httplib2 - oauth2client - parsedatetime - six - vobject - ] - ++ lib.optional (!pythonPackages.isPy3k) futures; - - # there are no tests as of 3.4.0 - doCheck = false; + propagatedBuildInputs = [ + dateutil gflags httplib2 parsedatetime six vobject + # overridden + google_api_python_client oauth2client uritemplate + ] ++ lib.optional (!isPy3k) futures; postInstall = lib.optionalString stdenv.isLinux '' - substituteInPlace $out/bin/gcalcli \ - --replace "command = 'notify-send -u critical -a gcalcli %s'" \ - "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'" + substituteInPlace $out/bin/gcalcli --replace \ + "command = 'notify-send -u critical -a gcalcli %s'" \ + "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'" ''; + # There are no tests as of 3.4.0 + doCheck = false; + meta = with lib; { homepage = https://github.com/insanum/gcalcli; description = "CLI for Google Calendar"; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 7fd3db860dfb33dd524ab73940c9ef712042141a..dc70747784cf2f6e03898d80caae94887af2882a 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,35 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses, libiconv, libintlOrEmpty -, withBuildColors ? true +{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gtk, gettext, libiconv, libintl }: -assert withBuildColors -> ncurses != null; - stdenv.mkDerivation rec { name = "girara-${version}"; - version = "0.2.8"; + version = "0.3.0"; src = fetchurl { - url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98"; + url = "https://pwmt.org/projects/girara/download/${name}.tar.xz"; + sha256 = "18j1gv8pi4cpndvnap88pcfacdz3lnw6pxmw7dvzm359y1gzllmp"; }; - preConfigure = '' - substituteInPlace colors.mk \ - --replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)' - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk gettext libintlOrEmpty ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - makeFlags = [ - "PREFIX=$(out)" - (if withBuildColors - then "TPUT=${ncurses.out}/bin/tput" - else "TPUT_AVAILABLE=0") - ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + buildInputs = [ libintl libiconv ]; + propagatedBuildInputs = [ glib gtk ]; meta = with stdenv.lib; { homepage = https://pwmt.org/projects/girara/; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index d4f2a056a9f6ce765011e1b22355d75a6a66ac96..712c2081f102c8904948d8a39fd62a0ebfc280ca 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu, +{ stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu, intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring + gtk2 gnome2.GConf libstartup_notification gnome3.libgnome-keyring ]; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop ''; - configureFlags = "--disable-nautilus-extension"; + configureFlags = [ "--disable-nautilus-extension" ]; meta = { description = "A graphical frontend for libgksu"; diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e0535eeca3877a17b84566ea6dc5ba4952007429 --- /dev/null +++ b/pkgs/applications/misc/glava/default.nix @@ -0,0 +1,106 @@ +{ stdenv, fetchurl, writeScript, fetchFromGitHub +, libGL, libX11, libXext, python3, libXrandr, libXrender, libpulseaudio, libXcomposite +, enableGlfw ? false, glfw }: + +let + inherit (stdenv.lib) optional makeLibraryPath; + + version = "1.4.5"; + gladVersion = "0.1.24"; + # glad + # https://github.com/wacossusca34/glava/issues/46#issuecomment-397816520 + glad = fetchFromGitHub { + owner = "Dav1dde"; + repo = "glad"; + rev = "v${gladVersion}"; + sha256 = "0s2c9w064kqa5i07w8zmvgpg1pa3wj86l1nhgw7w56cjhq7cf8h8"; + }; + # gl.xml + gl = fetchurl { + url = https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/a24f3f7a4c924fdbc666024f99c70e5b8e34c819/xml/gl.xml; + sha256 = "1mskxjmhb35m8qv255pibf633d8sn1w9rdsf0lj75bhlgy0zi5c7"; + }; + # EGL 1.5 + egl = fetchurl { + url = https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h; + sha256 = "0p0vs4siiya05cvbqq7cw3ci2zvvlfh8kycgm9k9cwvmrkj08349"; + }; + + wrapperScript = writeScript "glava" '' + #!${stdenv.shell} + case "$1" in + --copy-config) + # The binary would symlink it, which won't work in Nix because the + # garbage collector will eventually remove the original files after + # updates + echo "Nix wrapper: Copying glava config to ~/.config/glava" + cp -r --no-preserve=all @out@/etc/xdg/glava ~/.config/glava + ;; + *) + exec @out@/bin/.glava-unwrapped "$@" + esac + ''; +in + stdenv.mkDerivation rec { + name = "glava-${version}"; + + src = fetchFromGitHub { + owner = "wacossusca34"; + repo = "glava"; + rev = "v${version}"; + sha256 = "1zfw8samrzxxbny709rcdz1z77cw1cd46wlfnf7my02kipmqn0nr"; + }; + + buildInputs = [ + libX11 + libXext + libXrandr + libXrender + libpulseaudio + libXcomposite + ] ++ optional enableGlfw glfw; + + nativeBuildInputs = [ + python3 + ]; + + patchPhase = '' + cp -r --no-preserve=all ${glad}/* glad + mkdir -p glad/include/KHR + + cp ${gl} glad/gl.xml + cp ${egl} glad/include/KHR/khrplatform.h + patchShebangs . + ''; + + makeFlags = optional (!enableGlfw) "DISABLE_GLFW=1"; + + installFlags = [ + "DESTDIR=$(out)" + ]; + + fixupPhase = '' + mkdir -p $out/bin + mv $out/usr/bin/glava $out/bin/.glava-unwrapped + rm -rf $out/usr + + patchelf \ + --set-rpath "$(patchelf --print-rpath $out/bin/.glava-unwrapped):${makeLibraryPath [ libGL ]}" \ + $out/bin/.glava-unwrapped + + substitute ${wrapperScript} $out/bin/glava --subst-var out + chmod +x $out/bin/glava + ''; + + meta = with stdenv.lib; { + description = '' + OpenGL audio spectrum visualizer + ''; + homepage = https://github.com/wacossusca34/glava; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ + eadwu + ]; + }; + } diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 423eea914b9541bab78dc397b3affc9e7f89319b..bb1556c7c4dc43807a207c5c82401f184d5be0fd 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; + preFixup = '' + gappsWrapperArgs+=(--add-flags "--datapath \"$out/share\""); + ''; + meta = { description = "A simple MP3 and Media player client for UNIX and UNIX like systems."; homepage = https://gmtp.sourceforge.io; diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix index 68b49492791557f9ca2a35449ac827bec2464cdd..0bb0926f048abe20eca0171020aca7faf044b702 100644 --- a/pkgs/applications/misc/gnss-sdr/default.nix +++ b/pkgs/applications/misc/gnss-sdr/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source Global Navigation Satellite Systems software-defined receiver"; - homepage = http://gnss-sdr.org/; + homepage = https://gnss-sdr.org/; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio/ais.nix similarity index 100% rename from pkgs/applications/misc/gnuradio-ais/default.nix rename to pkgs/applications/misc/gnuradio/ais.nix diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 58d8e9fae61804bb4a998346e8c35c6f1c2d200e..0224d5fd68c755ebbaae4be01df896ded699d893 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -6,7 +6,7 @@ # May be able to upgrade to swig3 , python, swig2, numpy, scipy, matplotlib # => grc - the gnu radio companion -, cheetah, pygtk +, Mako, cheetah, pygtk # Note: GR is migrating to Mako. Cheetah should be removed for GR3.8 # => gr-wavelet: collection of wavelet blocks , gsl # => gr-qtgui: the Qt-based GUI @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.11.1"; + version = "3.7.13.3"; src = fetchFromGitHub { owner = "gnuradio"; repo = "gnuradio"; - rev = "6d2221196082a4954c249dc6955e33d5832a56f2"; - sha256 = "1fkrb8cnjbriy2x94lz73q6aqxar1rkvfbafp266ykdpm29b4xgm"; + rev = "v${version}"; + sha256 = "1qpa53axqavdv2ykby7rwh7xmhvv964xq1d7rcvbwkry7dngrbib"; fetchSubmodules = true; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ]; propagatedBuildInputs = [ - cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl + Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl ]; enableParallelBuilding = true; @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { setupHook = [ grcSetupHook ]; # patch wxgui and pygtk check due to python importerror in a headless environment + # wxgtk gui will be removed in GR3.8 + # c++11 hack may not be necessary anymore preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable ${stdenv.lib.optionalString (!stdenv.isDarwin) "-std=c++11"}" sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio/gsm.nix similarity index 100% rename from pkgs/applications/misc/gnuradio-gsm/default.nix rename to pkgs/applications/misc/gnuradio/gsm.nix diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio/nacl.nix similarity index 100% rename from pkgs/applications/misc/gnuradio-nacl/default.nix rename to pkgs/applications/misc/gnuradio/nacl.nix diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio/osmosdr.nix similarity index 100% rename from pkgs/applications/misc/gnuradio-osmosdr/default.nix rename to pkgs/applications/misc/gnuradio/osmosdr.nix diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio/rds.nix similarity index 100% rename from pkgs/applications/misc/gnuradio-rds/default.nix rename to pkgs/applications/misc/gnuradio/rds.nix diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b80ddb8f303f01819101c18b1d197b82a74b5e39 --- /dev/null +++ b/pkgs/applications/misc/go-jira/default.nix @@ -0,0 +1,22 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "go-jira-${version}"; + version = "1.0.17"; + + goPackagePath = "gopkg.in/Netflix-Skunkworks/go-jira.v1"; + + src = fetchgit { + rev = "v${version}"; + url = "https://gopkg.in/Netflix-Skunkworks/go-jira.v1"; + sha256 = "0ap5dzikp934mawigmv7ighajr5yxpck2gpnb2cmkc1p6qa6gn4v"; + }; + + meta = with stdenv.lib; { + description = "Simple command line client for Atlassian's Jira service written in Go"; + homepage = "https://github.com/Netflix-Skunkworks/go-jira"; + license = licenses.asl20; + maintainers = [ maintainers.carlosdagos ]; + }; +} diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index efd3bfe73dd9265131333ad4520ab34dd26290b6..f62eb92ac04a59676c9fc80a8d73a2b7ad10ca06 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity -, yacc, flex, zlib, config, qmake, makeWrapper +, yacc, flex, zlib, qmake, makeWrapper }: stdenv.mkDerivation rec { name = "golden-cheetah-${version}"; diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index f552a74f4c11798b51f6f0827b34f507b7b324f5..5cb51eefe5d7e630777ad5443b8920e3cee7c394 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, libXtst, libvorbis, hunspell +{ stdenv, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell , libao, ffmpeg, libeb, lzo, xz, libtiff , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }: stdenv.mkDerivation rec { - name = "goldendict-1.5.0.rc2"; - src = fetchurl { - url = "https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz"; - sha256 = "1pizz39l61rbps0wby75fkvzyrah805257j33siqybwhsfiy1kmw"; + name = "goldendict-2018-06-13"; + src = fetchFromGitHub { + owner = "goldendict"; + repo = "goldendict"; + rev = "48e850c7ec11d83cba7499f7fdce377ef3849bbb"; + sha256 = "0i4q4waqjv45hgwillvjik97pg26kwlmz4925djjkx8s6hxgjlq9"; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -22,6 +24,6 @@ stdenv.mkDerivation rec { description = "A feature-rich dictionary lookup program"; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.astsmtl ]; + maintainers = with stdenv.lib.maintainers; [ gebner astsmtl ]; }; } diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index f8ba66c4197c23fed590f05debfc7d64611c746f..9c1b457c299da0087faa730ca9f1276c9fa1625e 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv -, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4 -, zlib, fontconfig, dpkg }: +, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11 +, zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }: let arch = @@ -11,6 +11,7 @@ let if arch == "amd64" then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2"; + version = "7.1.8.3036"; fullPath = stdenv.lib.makeLibraryPath [ glibc glib @@ -28,21 +29,26 @@ let freetype libXext libX11 - qt4 zlib fontconfig + libproxy + libxml2 + gstreamer + dbus + gst_all_1.gstreamer + gst_all_1.gst-plugins-base ]; in stdenv.mkDerivation rec { - version = "7.1.4.1529"; name = "googleearth-${version}"; - src = fetchurl { - url = "https://dl.google.com/earth/client/current/google-earth-stable_current_${arch}.deb"; + url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_${version}-r0_${arch}.deb"; inherit sha256; }; - phases = "unpackPhase installPhase"; + phases = [ "unpackPhase" "installPhase" "checkPhase" ]; + + doCheck = true; buildInputs = [ dpkg ]; @@ -55,25 +61,37 @@ stdenv.mkDerivation rec { mv usr/* $out/ rmdir usr mv * $out/ - rm $out/bin/google-earth $out/opt/google/earth/free/google-earth - ln -s $out/opt/google/earth/free/googleearth $out/bin/google-earth + rm $out/bin/google-earth $out/opt/google/earth/free/googleearth + # patch and link googleearth binary + ln -s $out/opt/google/earth/free/googleearth-bin $out/bin/googleearth patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${fullPath}:\$ORIGIN" \ $out/opt/google/earth/free/googleearth-bin + # patch and link gpsbabel binary + ln -s $out/opt/google/earth/free/gpsbabel $out/bin/gpsbabel + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${fullPath}:\$ORIGIN" \ + $out/opt/google/earth/free/gpsbabel + + # patch libraries for a in $out/opt/google/earth/free/*.so* ; do patchelf --set-rpath "${fullPath}:\$ORIGIN" $a done ''; + checkPhase = '' + $out/bin/gpsbabel -V > /dev/null + ''; + dontPatchELF = true; - meta = { + meta = with stdenv.lib; { description = "A world sphere viewer"; homepage = http://earth.google.com; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.unfree; + maintainers = with maintainers; [ markus1189 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 3b8b08c1b660c9cb3657b19ab0d9436a89fc93e0..ca6ccdcdb2ae620b11d99a2b3ac9b63f2bade660 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, python}: stdenv.mkDerivation rec { - version = "3.5"; + version = "3.6"; name = "googler-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "googler"; rev = "v${version}"; - sha256 = "0z5cngg1kr3b484zddqlg9yn7crbmnd78pdb8vzd32mkp3fahcxa"; + sha256 = "1j1755b9mfmkqkgjrlsi4wr82352pqc9rfyalammqn6qrm3v3lb6"; }; propagatedBuildInputs = [ python ]; diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index ef805a31567ac23659016c1b61d729f52e5de09b..149092c70d387413d99ee46f69d35081f4dddbcf 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Graphical user interface for the GnuPG"; homepage = https://www.gnupg.org/related_software/gpa/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 77e7b592f6470a1f3bb6a82be1715d28c44736bc..5131e0739e73b287ed034af5b55e4f2cba719ce7 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.15"; + name = "gphoto2-2.5.17"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0xsa12k5fz49v8y4h3zahzr427a3ylxaf0k7hybrkp43g4i1lmxf"; + sha256 = "0kslwclyyzvnxjw3gdzhlagj7l5f8lba833ipr9s0s0c4hwi0mxa"; }; nativeBuildInputs = [ pkgconfig gettext libtool ]; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index a51ec8c1b044f0cf60542d9a4d0806faf0b4c67d..6689a3cae102696db1c0a0b8a7287b16373b5103 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,16 +1,15 @@ -{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }: stdenv.mkDerivation rec { name = "gpsprune-${version}"; - version = "18.6"; + version = "19"; src = fetchurl { - url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "1ii9pkj24jcwzs225nyi17ks07dfc5x3940hpqrsb5xzxy2vkw7q"; + url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; + sha256 = "0n08fg55zgpfg1f6lq0n3ngi0n8af1r0rhmbnpik5mjng4m9g3x5"; }; - phases = [ "installPhase" ]; - + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre8 ]; desktopItem = makeDesktopItem { @@ -23,15 +22,11 @@ stdenv.mkDerivation rec { categories = "Education;Geoscience;"; }; - installPhase = '' + buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/gpsprune.jar - cat > $out/bin/gpsprune < libpulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.11.2"; + version = "2.11.5"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "0sndhzz2gnhsz41cp0zrsw3z10rqm1j3mvkzs1g1lsndrk12bcgy"; + sha256 = "0q9i0dhd6blagxzk84pzqjq8n4ym3jc1mkkhygg8yncr4vq2saaf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 9b8628d152704b8461d4ac7d28422a0e8c919c28..b12b84d106dc968d2a95f2049bec26c31eaef501 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, - pango, gsettings-desktop-schemas, +{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, + pango, gobjectIntrospection, wrapGAppsHook, # Optional packages: enableOSM ? true, osm-gps-map }: @@ -7,25 +7,23 @@ let inherit (pythonPackages) python buildPythonApplication; in buildPythonApplication rec { - version = "4.2.8"; + version = "5.0.0"; name = "gramps-${version}"; - buildInputs = [ intltool gtk3 ] + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ intltool gtk3 gobjectIntrospection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map ; - # Currently broken - doCheck = false; - src = fetchFromGitHub { owner = "gramps-project"; repo = "gramps"; rev = "v${version}"; - sha256 = "17y6rjvvcz7lwjck4f5nmhnn07i9k5vzk5dp1jk7j3ldxjagscsd"; + sha256 = "056l4ihmd3gdsiv6wwv4ckgh8bfzd5nii6z4afsdn2nmjbj4hw9m"; }; - pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ] ++ [ pango ]; + pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. @@ -51,16 +49,9 @@ in buildPythonApplication rec { runHook postInstall ''; - # gobjectIntrospection package, wrap accordingly - preFixup = '' - wrapProgram $out/bin/gramps \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; - meta = with stdenv.lib; { description = "Genealogy software"; - homepage = http://gramps-project.org; + homepage = https://gramps-project.org; license = licenses.gpl2; }; } diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 0a2a17fc8fa0ecdb3769e4957ade2ddacde40551..8bf779185b36bff8c2507b902dc8113fe2e241f9 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -1,76 +1,44 @@ -/* Beware! -After starting Guake it will give the error message "Guake can not init! Gconf Error. Have you installed guake.schemas properly?", -which will have to be resolved manually, because I have not found a way to automate this, without being impure. - -If you have Guake installed, you can use `nix-build -A gnome3.guake` to get the path to the build directory in the nix store, -which then can be used in the following command to install the schemas file of Guake: -gconftool-2 --install-schema-file /path/returned/by/nix-build/share/gconf/schemas/guake.schemas - -It can be removed again by the following command: -gconftool-2 --recursive-unset /apps/guake -*/ -{ stdenv, fetchurl, lib -, pkgconfig, libtool, intltool, makeWrapper -, dbus, gtk2, gconf, python2Packages, libutempter, vte, keybinder, gnome2, gnome3 }: - -with lib; +{ stdenv, fetchFromGitHub, python3, gettext, gobjectIntrospection, wrapGAppsHook, glibcLocales +, gtk3, keybinder3, libnotify, libutempter, vte }: let - inherit (python2Packages) python; - inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome-common ]; - pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); - in stdenv.mkDerivation rec { + version = "3.3.2"; +in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; - version = "0.8.3"; + format = "other"; - src = fetchurl { - url = "https://github.com/Guake/guake/archive/${version}.tar.gz"; - sha256 = "1lbmdz3i9a97840h8239s360hd37nmhy3hs6kancxbzl1512ak1y"; + src = fetchFromGitHub { + owner = "Guake"; + repo = "guake"; + rev = version; + sha256 = "0cz58wfsa66j01sqpka7908ilj5ch3jdxaxzqdi8yspqwzz5iwc7"; }; - nativeBuildInputs = [ pkgconfig libtool intltool makeWrapper ]; + nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; - buildInputs = inputs ++ (with python2Packages; [ pyGtkGlade pyxdg ]); + buildInputs = [ gtk3 keybinder3 libnotify python3 vte ]; - propagatedUserEnvPkgs = [ gconf.out ]; + propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 ]; - patchPhase = '' - patchShebangs . - ''; + LC_ALL = "en_US.UTF-8"; # fixes weird encoding error, see https://github.com/NixOS/nixpkgs/pull/38642#issuecomment-379727699 - configureScript = "./autogen.sh"; + PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var - configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - "--disable-schemas-install" - ]; + postPatch = '' + # unnecessary /usr/bin/env in Makefile + # https://github.com/Guake/guake/pull/1285 + substituteInPlace "Makefile" --replace "/usr/bin/env python3" "python3" + ''; - installFlags = [ - # Configuring the installation to not install gconf schemas is not always supported, - # therefore gconftool-2 has this variable, which will make gconftool-2 not update any of the databases. - "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" - "sysconfdir=\${out}/etc" - "localstatedir=\${TMPDIR}" + makeFlags = [ + "prefix=$(out)" ]; - postInstall = '' - mkdir -p $out/share/gconf/schemas - cp data/guake.schemas $out/share/gconf/schemas - ''; - - postFixup = '' - for bin in $out/bin/{guake,guake-prefs}; do - substituteInPlace $bin \ - --replace '/usr/bin/env python2' ${python.interpreter} - wrapProgram $bin \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \ - --prefix PYTHONPATH : "$out/${python.sitePackages}:${pyPath}:$PYTHONPATH" - done + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libutempter ]}") ''; - meta = { + meta = with stdenv.lib; { description = "Drop-down terminal for GNOME"; homepage = http://guake-project.org; license = licenses.gpl2; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 5fdb8985bbbbd39916c355fb783c356e8e76677f..6c84f3cbd326522de46bccf8b81d64da4f54bf12 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgs, makeWrapper +{ stdenv, pkgs, makeWrapper , glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler , pkgconfig, intltool, autoreconfHook, wrapGAppsHook }: diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix index 7a04bd7194f2f50e3d1401676ef1f90104da5f7f..c5982f68201da20c392c119d69f68609e95c449d 100644 --- a/pkgs/applications/misc/gutenberg/default.nix +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, CoreServices, cf-private }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices, cf-private }: rustPlatform.buildRustPackage rec { name = "gutenberg-${version}"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Keats"; repo = "gutenberg"; rev = "v${version}"; - sha256 = "03zhbwxp4dbqydiydx0hpp3vpg769zzn5i95h2sl868mpfia8gyd"; + sha256 = "0is7156aim2ad8xg2f5068crc4gfvm89x8gxa25vc25p0yr1bpla"; }; - cargoSha256 = "0441lbmxx16aar6fn651ihk3psrx0lk3qdbbyih05xjlkkbk1qxs"; + cargoSha256 = "146vlr85n9d06am5ki76fh1vb5r8a4lzx5b7dmgi292kc3dsn41z"; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig openssl ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; postInstall = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { description = "An opinionated static site generator with everything built-in"; homepage = https://www.getgutenberg.io; license = licenses.mit; - maintainers = []; + maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 3fad634b18b7bc04fb5d9f1f475287148ee5c29f..036cb104b4805f761764e57058e9c14d67ed3e86 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }: +{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }: let name = "gv-3.7.4"; @@ -11,7 +11,18 @@ stdenv.mkDerivation { sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; - buildInputs = [ Xaw3d ghostscriptX perl ]; + configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + "--enable-SIGCHLD-fallback" + ]; + + buildInputs = [ + Xaw3d + ghostscriptX + perl + pkgconfig + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv + ]; patchPhase = '' sed 's|\|${ghostscriptX}/bin/gs|g' -i "src/"*.in @@ -32,6 +43,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index a61d532f1f8e18080ad9c05234c3328c048ff90c..8401386ead4914297e94658727679c41d4de7441 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo}: +{ stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "gxmessage-${version}"; @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gnome3.gtk texinfo ]; + buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ]; + meta = { description = "A GTK enabled dropin replacement for xmessage"; homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index f581b302c3f4213308acca3e9ff4c148f1a375ce..ec041902b256f57122baed57e944bd1e8299afa6 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur_0_13, libglade, GConf, pcre }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: stdenv.mkDerivation { - name = "gxneur-0.13.0"; - + name = "gxneur-0.20.0"; + src = fetchurl { - url = http://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2; - sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f"; + url = https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/gxneur_0.20.0.orig.tar.gz; + sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13 - libglade GConf pcre + xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur + libglade GConf pcre libappindicator-gtk2 ]; - preConfigure = '' - sed -e 's@-Werror@@' -i configure - sed -e 's@"xneur"@"${xneur_0_13}/bin/xneur"@' -i src/misc.c - ''; - meta = { description = "GUI for XNEUR keyboard layout switcher"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 105f7beb98fe3dc73014e06a6300f519a421e824..2abdce45c95f246630bfdea4860c1cd95466cc81 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils -, intltool, dbus-glib, gnome_python, dbus +, intltool, dbus-glib, gnome_python , hicolor-icon-theme }: diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index b37a6ad732fe5beed63e1db1eda4b3e8ea154dbe..1fa016627d4e0badb47c274551d41937cbcdfb4f 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, python }: with python.pkgs; @@ -32,7 +32,7 @@ buildPythonApplication rec { homepage = https://github.com/donnemartin/haxor-news; description = "Browse Hacker News like a haxor"; license = licenses.asl20; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/applications/misc/hdate/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e2f5f653d47ceb3874cee1e70400d39bd591a2d2 --- /dev/null +++ b/pkgs/applications/misc/hdate/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "1.6.02"; + name = "hdate-${version}"; + src = fetchurl { + url = "https://sourceforge.net/projects/libhdate/files/libhdate/libhdate-${version}/libhdate-${version}.tar.bz2"; + sha256 = "3c930a8deb57c01896dc37f0d7804e5a330ee8e88c4ff610b71f9d2b02c17762"; + }; + meta = { + description = "Hebrew calendar and solar astronomical times library and utilities"; + homepage = https://sourceforge.net/projects/libhdate/; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; + }; +} diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ef378b2c5ffbd08f8a88e4f859d2484c0aeca2b4 --- /dev/null +++ b/pkgs/applications/misc/hello-unfree/default.nix @@ -0,0 +1,23 @@ +{ stdenv }: + +stdenv.mkDerivation rec { + name = "example-unfree-package-${version}"; + version = "1.0"; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cat > $out/bin/hello-unfree << EOF + #!/bin/sh + echo "Hello, you are running an unfree system!" + EOF + chmod +x $out/bin/hello-unfree + ''; + + meta = { + description = "An example package with unfree license (for testing)"; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.oxij ]; + }; +} diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 8a31c591b29bfa054e7cb091753a4157cdac5fdd..7998d30f253fd49457e30c01969167f68f753f30 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hello-2.10"; + name = "hello-${version}"; + version = "2.10"; src = fetchurl { url = "mirror://gnu/hello/${name}.tar.gz"; @@ -10,15 +11,15 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' GNU Hello is a program that prints "Hello, world!" when you run it. It is fully customizable. ''; homepage = http://www.gnu.org/software/hello/manual/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + maintainers = [ maintainers.eelco ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 0b679617243dd3bb372e9bd366bec0a978f5fafa..607dff2931895b5c5deea1e181d356306ef27803 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,4 +1,4 @@ -{ zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }: +{ callPackage, buildFHSUserEnv, undaemonize }: let houdini-runtime = callPackage ./runtime.nix { }; diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 097386547f57082de07ed0cca45cc891eed48088..b92012a29ddb3e535f448bfd455bcabdd9a5e6a4 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ -{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }: +{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc }: let ld_library_path = builtins.concatStringsSep ":" [ "${stdenv.cc.cc.lib}/lib64" - "/run/opengl-driver/lib" (stdenv.lib.makeLibraryPath [ libGLU + libGL xorg.libXmu xorg.libXi xorg.libXext @@ -29,11 +29,11 @@ let license_dir = "~/.config/houdini"; in stdenv.mkDerivation rec { - version = "16.5.405"; + version = "16.5.439"; name = "houdini-runtime-${version}"; src = requireFile rec { name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz"; - sha256 = "14i0kzv881jqd5z9jshri1fxxi3pkxdmi5l4p2b51c9i3apsxmw6"; + sha256 = "7e483072a0e6e751a93f2a2f968cccb2d95559c61106ffeb344c95975704321b"; message = '' This nix expression requires that ${name} is already part of the store. Download it from https://sidefx.com and add it to the nix store with: diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 2fd56e3c55529ea549f0e7818175ad783bb62517..6b0926db047630b1c2d589ee1eaefc4e98190447 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/LuRsT/hr; description = "A horizontal bar for your terminal"; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 6b62b418d786305457ccf64937ff15727be07b10..026cf9ecc14a05aca630a0e2a72388bf1aee33f5 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hstr-${version}"; - version = "1.24"; + version = "1.25"; src = fetchurl { url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; - sha256 = "0w8is777fwq6r17zhl9xwrv9f7vanllzjiasx1pg6pxvppq7rh0x"; + sha256 = "10njj0a3s5czv497wk3whka3gxr7vmhabs12vaw7kgb07h4ssnhg"; }; buildInputs = [ readline ncurses ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dvorka/hstr; description = "Shell history suggest box - easily view, navigate, search and use your command history"; license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; # Cannot test others }; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index f984cb712c7a002ff7baad2e8a4f0b93f7372369..a6a489492e3135bba2b29348f33e1dea948bf56b 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.36.1"; + version = "0.47.1"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,11 +10,17 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "179lzkd6f81rssgcwlngx2mhr9nvbj0rsh6yjbf1fsrpxfzr2q9z"; + sha256 = "0n27vyg66jfx4lwswsmdlybly8c9gy5rk7yhy7wzs3rwzlqv1jzj"; }; goDeps = ./deps.nix; + buildFlags = "-tags extended"; + + postInstall = '' + rm $bin/bin/generate + ''; + meta = with stdenv.lib; { description = "A fast and modern static website engine."; homepage = https://gohugo.io; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index cf55ef4b64b259843b9a0f8e2183c55d57d7d15d..47487029ea0127e5faea76cb38f3d68cc19016a0 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,12 +1,21 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ + { + goPackagePath = "github.com/BurntSushi/locker"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/locker"; + rev = "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a"; + sha256 = "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg"; + }; + } { goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; - sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; + rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; }; } { @@ -14,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/purell"; - rev = "1c4bec281e4bbc75b4f4a1bd923bdf1bd989a969"; - sha256 = "05aif0xf3i6j6r0ivas8ywagkz92iynsa0xnkbrif4w1chzalx0f"; + rev = "975f53781597ed779763b7b65566e74c4004d8de"; + sha256 = "1j5l793zxrjv09z3cdgs05qn45sbhbm9njsw5cfv168x8z88pd3l"; }; } { @@ -32,8 +41,17 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "df4ec264daccb2ecb17bde9134830100701199c5"; - sha256 = "1snw7byfkfvvw0579jc0yxk79j1v1rb0jdcvivfsalh064zmjdvd"; + rev = "5d7fef2ae60b501bbf28d476c3f273b8017d8261"; + sha256 = "150jv4vhsdi1gj3liwkgicdrwnzgv5qkq2fwznlnzf64vmfb0b9f"; + }; + } + { + goPackagePath = "github.com/bep/debounce"; + fetch = { + type = "git"; + url = "https://github.com/bep/debounce"; + rev = "844797fa1dd9ba969d71b62797ff19d1e49d4eac"; + sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy"; }; } { @@ -41,8 +59,17 @@ fetch = { type = "git"; url = "https://github.com/bep/gitmap"; - rev = "de8030ebafb76c6e84d50ee6d143382637c00598"; - sha256 = "0adkv2ghi0zd104akksa9wjzj7s849wpa1rij03mycgxp4si9ami"; + rev = "ecb6fe06dbfd6bb4225e7fda7dc15612ecc8d960"; + sha256 = "0zqdl5h4ayi2gi5aqf35f1sjszhbcriksm2bf84fkrg7ngr48jn6"; + }; + } + { + goPackagePath = "github.com/bep/go-tocss"; + fetch = { + type = "git"; + url = "https://github.com/bep/go-tocss"; + rev = "2abb118dc8688b6c7df44e12f4152c2bded9b19c"; + sha256 = "12q7h6nydklq4kg65kcgd85209rx7zf64ba6nf3k7y16knj4233q"; }; } { @@ -59,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "48d8747a2ca13185e7cc8efe6e9fc196a83f71a5"; - sha256 = "01hpll16rvxhnvv35vs3z8p51x54c5jyl1gjdm0g7kwfwp2chvjx"; + rev = "691ee98543af2f262f35fbb54bdd42f00b9b9cc5"; + sha256 = "1864g10y9n6ni0p1yqjhvwyjdh0lgxnf7dlb0c4njazdg5rppww9"; }; } { @@ -77,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "1884593a19ddc6f2ea050403430d02c1d0fc1283"; - sha256 = "13wlkidihz7gc36hd1vy7i81d0v1rbnw97118z3slq1kv1j56zll"; + rev = "0bd5694c78c9c3d9a3cd06a706a8f3c59296a9ac"; + sha256 = "1laxccmzi7q51zxn81ringmdwp8iaipivrl375yc3gq56d70sp0r"; }; } { @@ -113,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/gobuffalo/envy"; - rev = "50fabbbaf1e65fc9b739f37a00590c396485d84d"; - sha256 = "0js2hggb1gybk28pk3hcsb1m6rswfdzvvr194z4my4za09ly5jax"; + rev = "3c96536452167a705ca5a70b831d3810e1e10452"; + sha256 = "0ixqpdmb7kjlarkv0qlbwnbr194sajx9flysnhcldzmciqgk5bqs"; }; } { @@ -122,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/gobwas/glob"; - rev = "19c076cdf202b3d1c0489bdfa2f2f289f634474b"; - sha256 = "0176psz3m0pks0ka6pb62g7ccq5izzj0i7c0j20lb7dp3kawphxs"; + rev = "f756513aec94125582ee6c0dc94179251ef87370"; + sha256 = "1pyzlvb950864syf2safazv39s7rpi08r7x2vby82kj9ykqgvhc4"; }; } { @@ -131,8 +158,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "f37d1588608ec036fa9b0b7b8afbde47dc06aea9"; - sha256 = "1y0z7k4yi8aaw6yjm8s92hvbkyc51b5azpiywminjj1a84czvzvq"; + rev = "3ff3320c2a1756a3691521efc290b4701575147c"; + sha256 = "1b0kpix2qxv3qiiq739nk9fjh453if0mcpr9gmlizicdpjp5alw2"; }; } { @@ -158,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; - sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; + rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; + sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; }; } { @@ -167,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/jdkato/prose"; - rev = "e27abfd3f31b84c37bbce37179b0428fcb1384be"; - sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7"; + rev = "99216ea17cba4e2f2a4e8bca778643e5a529b7aa"; + sha256 = "1mdh276lmj21jbi22ky8ngdsl9hfcdv6czshycbaiwjr5y9cv7bn"; }; } { @@ -176,8 +203,8 @@ fetch = { type = "git"; url = "https://github.com/joho/godotenv"; - rev = "6bb08516677f8c8274c557fc801bee9ab564ab2c"; - sha256 = "0jqczq5x5zwgs29vrmq87335c99gi5jrvxkwcpidz98yqg95db4f"; + rev = "1709ab122c988931ad53508747b3c061400c2984"; + sha256 = "1pym5lydb28ggxrz80q9s26bj2bd80ax1igm1zfhyhx9i3060kif"; }; } { @@ -194,8 +221,8 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "2c9e9502788518c97fe44e8955cd069417ee89df"; - sha256 = "1w0rl9rla61m0qbha75jg48yiq1vs91sfy96rgqa6nags9v9b1rl"; + rev = "c2353362d570a7bfa228149c62842019201cfb71"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; }; } { @@ -203,8 +230,8 @@ fetch = { type = "git"; url = "https://github.com/markbates/inflect"; - rev = "80fa1ea41b0dc859816314ab0b85f07a6bc57923"; - sha256 = "0fmpfcz8g0qsb6h94yqpcms2bdb68qac706b54x0k1crfzl1d1mj"; + rev = "84854b5b4c0dbb0c107480d480a71f7db1fc7dae"; + sha256 = "0b7shs0mxhkl7v7mwp799n7jgjsdbgi81f5hbaz2b936gbxksw7d"; }; } { @@ -212,8 +239,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; - sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; }; } { @@ -226,12 +253,12 @@ }; } { - goPackagePath = "github.com/mitchellh/go-homedir"; + goPackagePath = "github.com/mitchellh/hashstructure"; fetch = { type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + url = "https://github.com/mitchellh/hashstructure"; + rev = "2bca23e0e452137f789efbc8610126fd8b94f73b"; + sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1"; }; } { @@ -239,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; - sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac"; + sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; }; } { @@ -248,8 +275,8 @@ fetch = { type = "git"; url = "https://github.com/muesli/smartcrop"; - rev = "c2a0373a193bac1daf8b6691e2ece069c5d7ac7f"; - sha256 = "1jv68g9wddm2a1kf838anjnr4w17k7sqzz01h4z2lfashw3nanar"; + rev = "f6ebaa786a12a0fdb2d7c6dee72808e68c296464"; + sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp"; }; } { @@ -257,8 +284,8 @@ fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "ec04da47793482067e2e376d810e1622277368e4"; - sha256 = "1c7ip5jidvssr8d4dbx9nchf99m13wblgaz630f7wm73y99dc3lr"; + rev = "04f547cc50da4c144c5fdfd4495aef143637a236"; + sha256 = "1h4ndn822k7i04h9k5dxm6c29mhhhqhl63vzpmz2l1k0zpj7xyd1"; }; } { @@ -266,8 +293,8 @@ fetch = { type = "git"; url = "https://github.com/olekukonko/tablewriter"; - rev = "b8a9be070da40449e501c3c4730a889e42d87a9e"; - sha256 = "1z9frlk9avqhzjv6zz2rg7mvdhzcr9acdgagblijwwkx01f02hw7"; + rev = "d4647c9c7a84d847478d890b816b7d8b62b0b279"; + sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l"; }; } { @@ -275,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; - sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; + rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602"; + sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz"; }; } { @@ -284,8 +311,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5"; - sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0"; + rev = "46c73eb196baff5bb07288f245b223bd1a30fba6"; + sha256 = "01z1jsdkac09cw95lqq4pahkw9xnini2mb956lvb772bby2x3dmj"; }; } { @@ -302,8 +329,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "bbf41cb36dffe15dff5bf7e18c447801e7ffe163"; - sha256 = "19jgsm6y1yp99h0fr77rhamdsn34r8545if7y9q377l3phrz2s0l"; + rev = "787d034dfe70e44075ccc060d346146ef53270ad"; + sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; }; } { @@ -320,8 +347,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "be77323fc05148ef091e83b3866c0d47c8e74a8b"; - sha256 = "0kl0psbdg8cyznwvq13sva6r4ggmhwzfxdjmkl2vqhy83xq3a6yn"; + rev = "ff0d02e8555041edecbd0ce27f32c6ea4b214483"; + sha256 = "1ilw6b2nir1bg7hmx8hrn60za37qqm18xvamv90fx5vxq85fsml9"; }; } { @@ -338,8 +365,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; - sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; + rev = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2"; + sha256 = "1f9154lijbz0kkgqwmbphykwl4adv4fvkx6n1p7fdq3x5j9g8i17"; }; } { @@ -356,8 +383,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "ee5fd03fd6acfd43e44aea0b4135958546ed8e73"; - sha256 = "1fgb1ph3vrqcpdvypp3c1fwj15r587l9yvv5wqcq08shln5rbsnk"; + rev = "947b89bd1b7dabfed991ac30e1a56f5193f0c88b"; + sha256 = "0n4h5cb07n96fcw9k8dwnj6yisf2x357lsiwjmrq6xr1vkzdlk8c"; }; } { @@ -365,8 +392,35 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5"; - sha256 = "089balmspfs2x68wr4riwh7qvhf0b061wqqqfw8j4p9pxvwrxsdc"; + rev = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9"; + sha256 = "177ziws6mwxdlvicmgpv7w7zy5ri2wgnw2f2v3789b5skv9d6a6b"; + }; + } + { + goPackagePath = "github.com/tdewolff/minify"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/minify"; + rev = "948b6490cf3cacab5f4d7474104c3d21bf6eda46"; + sha256 = "1js5l0405kbic53qgim0lj3crw7cc2a2sbga35h9qcnm8l3cx22f"; + }; + } + { + goPackagePath = "github.com/tdewolff/parse"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/parse"; + rev = "dd9676af8dd934a61082c5b3038e79626847fa32"; + sha256 = "1hp9qh8knx3q57aw5qavsf7ia3mxm8ka0bk6kjkqkqq8k9jq97qk"; + }; + } + { + goPackagePath = "github.com/wellington/go-libsass"; + fetch = { + type = "git"; + url = "https://github.com/wellington/go-libsass"; + rev = "615eaa47ef794d037c1906a0eb7bf85375a5decf"; + sha256 = "0imjiskn4vq7nml5jwb1scgl61jg53cfpkjnb9rsc6m8gsd8s16s"; }; } { @@ -374,8 +428,8 @@ fetch = { type = "git"; url = "https://github.com/yosssi/ace"; - rev = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56"; - sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; + rev = "2b21b56204aee785bf8d500c3f9dcbe3ed7d4515"; + sha256 = "0cgpq1zdnh8l8zsn9w63asc9k7cm6k4qvjgrb4hr1106h8fjwfma"; }; } { @@ -383,8 +437,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7"; - sha256 = "017xpcshrj1r2w20xvpcx0rklpfmbz6h16msv12l3x0w6vy0800s"; + rev = "c73c2afc3b812cdd6385de5a50616511c4a3d458"; + sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz"; }; } { @@ -392,8 +446,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; - sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; + rev = "922f4815f713f213882e8ef45e0d315b164d705c"; + sha256 = "1ci1rxk2d6hmfsjjc19n2sxhyn4jqr5ia3ykyah1h08p0pn7k52w"; }; } { @@ -401,8 +455,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; - sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; + rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; + sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; }; } { @@ -410,8 +464,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd"; - sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; + rev = "4ea2f632f6e912459fe60b26b1749377f0d889d5"; + sha256 = "16pdi4mmjlcrjdcz7k559jqnsvkhdmff68bbqq7ii1lp8vrpqqmy"; }; } { @@ -419,8 +473,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "9e2b64d659da1afe07ce1c9c1dfefc09d188f21e"; - sha256 = "00ichxdybvs76gj805j828qxg7x4h4v64pq1s56ydaw07ja6lmry"; + rev = "6e3c4e7365ddcc329f090f96e4348398f6310088"; + sha256 = "1r511ncipn7sdlssn06fpzcpy4mp4spagni4ryxq86p2b0bi8pn4"; }; } { @@ -428,8 +482,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; - sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } ] diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 9349c07a62e9614f065fce38136057f9c6b59045..5e1626e12c579dcb151ddc96a1a33af7403cb8f3 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -1,22 +1,21 @@ -{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo +{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome2, gtk2, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver -, libxcb -, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: +, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio + libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio ]; in stdenv.mkDerivation rec { - version = "1.4.8"; + version = "2.0.0"; name = "hyper-${version}"; src = fetchurl { url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; - sha256 = "0v31z3p5h3qr8likifbq9kk08fpfyf8g1hrz6f6v90z4b2yhkf51"; + sha256 = "04241kjy65pnp5q9z901910rmvcx18x0qaqfl31i0l4c2xj83ws0"; }; buildInputs = [ dpkg ]; unpackPhase = '' diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index 2295e15cc3d3c18916be72eded0709fdd1ee7e9d..49b1741fd5af564427698b47137a4852b77f80ff 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }: +{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }: let lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ]; in diff --git a/pkgs/applications/misc/img2pdf/default.nix b/pkgs/applications/misc/img2pdf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9b6ac086efdf55ec77390920ba23f5bb1ad759b1 --- /dev/null +++ b/pkgs/applications/misc/img2pdf/default.nix @@ -0,0 +1,27 @@ +{ stdenv, python3Packages }: + +with python3Packages; + +buildPythonApplication rec { + pname = "img2pdf"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "071s3gf28nb8ifxkix7dzjny6vib7791mnp0v3f4zagcjcic22a4"; + }; + + doCheck = false; # needs pdfrw + + propagatedBuildInputs = [ + pillow + ]; + + meta = with stdenv.lib; { + description = "Convert images to PDF via direct JPEG inclusion"; + homepage = https://gitlab.mister-muffin.de/josch/img2pdf; + license = licenses.lgpl2; + platforms = platforms.unix; + maintainers = [ maintainers.veprbl ]; + }; +} diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index 2efd0ee969f14704201c1912f34077a4711655b6..e150ab457e07891abbe3ce8792eac62f8b2abf46 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ipmicfg-${version}"; - version = "1.27.1"; - buildVersion = "170901"; + version = "1.28.0"; + buildVersion = "180302"; src = fetchzip { url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; - sha256 = "11xhzw36pg4has8857pypf44cni8m2mg8qsqi1s4bfjbxlfgxgwk"; + sha256 = "0hw853cwaaxmxy1sa3m7l9gqalwpbbvp4ghk8inr7dzwxjljmr02"; extraPostFetch = "chmod u+rwX,go-rwx+X $out/"; }; @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/opt/ipmicfg" cp Linux/64bit/* "$out/opt/ipmicfg" - patchelf "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" \ + patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" + --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" \ + "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg" ''; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index ebc13766cccbb993caa843623ae6b565befafe2e..58fcd59a2b2fde10c411f81c2d9e339094a9b81d 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "IPMIView-${version}"; - version = "2.13.0"; - buildVersion = "170504"; + version = "2.14.0"; + buildVersion = "180213"; src = fetchurl { url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; - sha256 = "1hfw5g6lxg3vqg0nc3g2sv2h6bn8za35bxxms0ri0sgb9v3xg1y6"; + sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h"; }; buildInputs = [ patchelf makeWrapper ]; diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index d18546cb36f8f1d2cf11e6f0fc7e8f2c5b92df14..15beb8a88fb15e852bb6bf2c97a3a2299eda6a61 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -13,17 +13,17 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.5) - ffi (1.9.23) + eventmachine (1.2.7) + ffi (1.9.25) forwardable-extended (2.6.0) gemoji (3.0.0) - html-pipeline (2.7.1) + html-pipeline (2.8.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.3) + jekyll (3.8.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -36,26 +36,24 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.5.0) + jekyll-avatar (0.6.0) jekyll (~> 3.0) - jekyll-mentions (1.2.0) - activesupport (~> 4.0) + jekyll-mentions (1.4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.4.0) + jekyll-seo-tag (2.5.0) jekyll (~> 3.3) jekyll-sitemap (1.2.0) jekyll (~> 3.3) jekyll-watch (2.0.0) listen (~> 3.0) - jemoji (0.9.0) - activesupport (~> 4.0, >= 4.2.9) + jemoji (0.10.0) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) - kramdown (1.16.2) + kramdown (1.17.0) liquid (4.0.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -69,13 +67,13 @@ GEM pathutil (0.16.1) forwardable-extended (~> 2.6) public_suffix (3.0.2) - rb-fsevent (0.10.2) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rouge (3.1.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.5) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index b5b21dec438253811075c56ff51b949522fdb49f..a75f74119ca75b36006249914d0b90650a9d9f86 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -45,18 +45,18 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.7"; }; ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; type = "gem"; }; - version = "1.9.23"; + version = "1.9.25"; }; forwardable-extended = { source = { @@ -78,10 +78,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd"; + sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.0"; }; "http_parser.rb" = { source = { @@ -104,28 +104,28 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff"; + sha256 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk"; type = "gem"; }; - version = "3.7.3"; + version = "3.8.3"; }; jekyll-avatar = { dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf"; + sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; jekyll-mentions = { - dependencies = ["activesupport" "html-pipeline" "jekyll"]; + dependencies = ["html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd"; + sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb"; type = "gem"; }; - version = "1.2.0"; + version = "1.4.0"; }; jekyll-sass-converter = { dependencies = ["sass"]; @@ -140,10 +140,10 @@ dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f9b2mvmx57zj49afb3x8cmzdmb1kh4rbpbv3v7w5bh47g2c9big"; + sha256 = "19yfr5i04gm50swbc6xxf4090z5z1v0kjfnvh695ydq1dkyx1csl"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; jekyll-sitemap = { dependencies = ["jekyll"]; @@ -164,21 +164,21 @@ version = "2.0.0"; }; jemoji = { - dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"]; + dependencies = ["gemoji" "html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b"; + sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.0"; }; kramdown = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za"; + sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; type = "gem"; }; - version = "1.16.2"; + version = "1.17.0"; }; liquid = { source = { @@ -250,10 +250,10 @@ rb-fsevent = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; type = "gem"; }; - version = "0.10.2"; + version = "0.10.3"; }; rb-inotify = { dependencies = ["ffi"]; @@ -292,10 +292,10 @@ dependencies = ["sass-listen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; + sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; type = "gem"; }; - version = "3.5.5"; + version = "3.5.6"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 190f1d66479df93e4e9f093061e52aa4b6f6f519..0689bad59806272d4f8f62d8ba0889eee9599009 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -20,21 +20,21 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.5) + eventmachine (1.2.7) execjs (2.7.0) - faraday (0.14.0) + faraday (0.15.2) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) - ffi (1.9.23) + ffi (1.9.25) forwardable-extended (2.6.0) gemoji (3.0.0) - html-pipeline (2.7.1) + html-pipeline (2.8.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.3) + jekyll (3.8.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -47,17 +47,16 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.5.0) + jekyll-avatar (0.6.0) jekyll (~> 3.0) jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) - jekyll-feed (0.9.3) + jekyll-feed (0.10.0) jekyll (~> 3.3) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-mentions (1.2.0) - activesupport (~> 4.0) + jekyll-mentions (1.4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-paginate (1.1.0) @@ -65,18 +64,17 @@ GEM jekyll (~> 3.3) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.4.0) + jekyll-seo-tag (2.5.0) jekyll (~> 3.3) jekyll-sitemap (1.2.0) jekyll (~> 3.3) jekyll-watch (2.0.0) listen (~> 3.0) - jemoji (0.9.0) - activesupport (~> 4.0, >= 4.2.9) + jemoji (0.10.0) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) - kramdown (1.16.2) + kramdown (1.17.0) liquid (4.0.0) liquid-c (3.0.0) liquid (>= 3.0.0) @@ -94,23 +92,23 @@ GEM multipart-post (2.0.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) - octokit (4.8.0) + octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.1) forwardable-extended (~> 2.6) public_suffix (3.0.2) pygments.rb (1.2.1) multi_json (>= 1.0.0) - rb-fsevent (0.10.2) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rdiscount (2.2.0.1) - rdoc (6.0.1) + rdoc (6.0.4) redcarpet (3.4.0) rouge (3.1.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.5) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 3a115f8a4b0ea110aa043c550ec29de7ef382161..e5eb6d62a706bd0869f486a6c4089e2b5cb96f33 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -79,10 +79,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.7"; }; execjs = { source = { @@ -96,10 +96,10 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr"; + sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg"; type = "gem"; }; - version = "0.14.0"; + version = "0.15.2"; }; fast-stemmer = { source = { @@ -112,10 +112,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; type = "gem"; }; - version = "1.9.23"; + version = "1.9.25"; }; forwardable-extended = { source = { @@ -137,10 +137,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd"; + sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.0"; }; "http_parser.rb" = { source = { @@ -163,19 +163,19 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff"; + sha256 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk"; type = "gem"; }; - version = "3.7.3"; + version = "3.8.3"; }; jekyll-avatar = { dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf"; + sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; jekyll-coffeescript = { dependencies = ["coffee-script" "coffee-script-source"]; @@ -190,10 +190,10 @@ dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kr3kyaq4z3jixn6ay8h16bxxlv6slvvp7nqnl05jdymhkl0bmm9"; + sha256 = "0l5w2bd6dsjnc623qjw5h06n0wslh32rqkkjlkymga24cplbln8j"; type = "gem"; }; - version = "0.9.3"; + version = "0.10.0"; }; jekyll-gist = { dependencies = ["octokit"]; @@ -205,13 +205,13 @@ version = "1.5.0"; }; jekyll-mentions = { - dependencies = ["activesupport" "html-pipeline" "jekyll"]; + dependencies = ["html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd"; + sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb"; type = "gem"; }; - version = "1.2.0"; + version = "1.4.0"; }; jekyll-paginate = { source = { @@ -243,10 +243,10 @@ dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f9b2mvmx57zj49afb3x8cmzdmb1kh4rbpbv3v7w5bh47g2c9big"; + sha256 = "19yfr5i04gm50swbc6xxf4090z5z1v0kjfnvh695ydq1dkyx1csl"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; jekyll-sitemap = { dependencies = ["jekyll"]; @@ -267,21 +267,21 @@ version = "2.0.0"; }; jemoji = { - dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"]; + dependencies = ["gemoji" "html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b"; + sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.0"; }; kramdown = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za"; + sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; type = "gem"; }; - version = "1.16.2"; + version = "1.17.0"; }; liquid = { source = { @@ -379,10 +379,10 @@ dependencies = ["sawyer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg"; + sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298"; type = "gem"; }; - version = "4.8.0"; + version = "4.9.0"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -413,10 +413,10 @@ rb-fsevent = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; type = "gem"; }; - version = "0.10.2"; + version = "0.10.3"; }; rb-inotify = { dependencies = ["ffi"]; @@ -438,10 +438,10 @@ rdoc = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1vzhv04lp76iax258dh47zsxhjg34r9sg76vgikbyfywjzflvfyj"; + sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.4"; }; redcarpet = { source = { @@ -479,10 +479,10 @@ dependencies = ["sass-listen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; + sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; type = "gem"; }; - version = "3.5.5"; + version = "3.5.6"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh new file mode 100755 index 0000000000000000000000000000000000000000..528f1062c733f212708d69ba15378aa2f6205393 --- /dev/null +++ b/pkgs/applications/misc/jekyll/update.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bundix zlib + +set -o errexit +set -o nounset + +readonly BASEDIR="$(dirname $(readlink -f $0))" + +for directory in "basic" "full"; do + pushd "$BASEDIR/$directory" + rm -f Gemfile.lock gemset.nix + bundix --magic + rm -rf .bundle vendor + popd +done diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index ffb898b265c20c1b989a3ae04bb42fe06195a9d4..b868808ec3dce99c2b08f9a8a71419a7955b450c 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jgmenu-${version}"; - version = "0.8.2"; + version = "1.1"; src = fetchFromGitHub { owner = "johanmalm"; repo = "jgmenu"; rev = "v${version}"; - sha256 = "0nflj4fcpz7rcd1s0zlyi5ikxjykkmz3p5w4gzica1fdbyn2l7x3"; + sha256 = "0hnxzy5mm5z6r9gaimfsf7kbpr23khck2fhh3j8bk2lkp53420fz"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index d8b1253ac2763ec84d4e07f451b07fe7f15d0fd0..3561fcde839d2cf93107be024fe5b524c86c06d8 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ db gtk2 bzip2 ]; - configureFlags = "--without-libdb"; + configureFlags = [ "--without-libdb" ]; meta = { description = "Download utility that can fetch files from several sources simultaneously"; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index a73e4820e6c56e2be4244948c7a0b9633b479256..e753c5ded95cba180ab6586674d95503bafffbba 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,15 +1,15 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre10 }: stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13500"; + version = "14066"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1dyys4y859dazjqpn3f7vd0cpyglk82y3igrdca293y0n0hrmi7v"; + sha256 = "06mhaz5vr19ydqc5irhgcbl0s8fifwvaq60iz2nsnlxb1pw89xia"; }; - buildInputs = [ jre8 makeWrapper ]; + buildInputs = [ jre10 makeWrapper ]; desktopItem = makeDesktopItem { name = "josm"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/josm.jar - makeWrapper ${jre8}/bin/java $out/bin/josm \ + makeWrapper ${jre10}/bin/java $out/bin/josm \ --add-flags "-jar $out/share/java/josm.jar" mkdir -p $out/share/applications diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index fc8b8043b94c9a6bd22f300887a689d38a2cbc0d..30e36c3dcf0f129d588e23df07d6a868e7e24676 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -1,14 +1,12 @@ { stdenv -, python +, python3 }: -with python.pkgs; +with python3.pkgs; buildPythonApplication rec { pname = "jrnl"; version = "1.9.8"; - name = "${pname}-${version}"; - disabled = isPy3k; src = fetchPypi { inherit pname version; @@ -16,7 +14,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - pytz six tzlocal keyring argparse dateutil_1_5 + pytz six tzlocal keyring argparse dateutil parsedatetime pycrypto ]; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index fe2503625938e6877ad21926f5d54d49b4c346b0..97e371e9e72c57b07ee995a00dce930a1675a8ef 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -15,22 +15,23 @@ , qtx11extras , sshfs , makeWrapper +, kwayland }: stdenv.mkDerivation rec { pname = "kdeconnect"; - version = "1.2.1"; + version = "1.3.1"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-v${version}.tar.xz"; - sha256 = "01v432p9ylwss9gl6fvby8954bnjd91dni5jk1i44vv7x26yn8zg"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz"; + sha256 = "0rzjbn4d2lh81n19dd3a5ilm8qml3zs3g3ahg75avcw8770rr344"; }; buildInputs = [ libfakekey libXtst ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications - qca-qt5 qtx11extras makeWrapper + qca-qt5 qtx11extras makeWrapper kwayland ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix index cd83d2a44e1d35ab37a26d159cb1eaca109128fa..80bf5deceb160d1a2bc1b8e543dd5652d4150987 100644 --- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -1,19 +1,19 @@ { stdenv, buildEnv, fetchzip, mono }: let - version = "0.8.1"; + version = "0.10.1"; drv = stdenv.mkDerivation { name = "keeagent-${version}"; src = fetchzip { - url = http://lechnology.com/wp-content/uploads/2016/07/KeeAgent_v0.8.1.zip; - sha256 = "16x1qrnzg0xkvi7w29wj3z0ldmql2vcbwxksbsmnidzmygwg98hk"; + url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip"; + sha256 = "0j7az6l9wcr8z66mfplkxwydd4bgz2p2vd69xncf0nxlfb0lshh7"; stripRoot = false; }; meta = { description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication"; - homepage = http://lechnology.com/software/keeagent; + homepage = "http://lechnology.com/software/keeagent"; platforms = with stdenv.lib.platforms; linux; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 5e492fc621fef38a7e686ecb770630278a3b7fac..53b965a1bb70252c72fb85952d86357371e30ed8 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -3,11 +3,11 @@ with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.38"; + version = "2.39.1"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "0m33gfpvv01xc28k4rrc8llbyk6qanm9rsqcnv8ydms0cr78dbbk"; + sha256 = "0y69w9zzxqj7xrn632bw6bibrknjbx1k3qcvi9axn67sqmzaka00"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 0e1aecaab1d19d694a2fdfc36db5d238dc4e4f2d..b6258491a8c32b19439a60da8e9e0c09be130d27 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -26,13 +26,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassxc-${version}"; - version = "2.3.1"; + version = "2.3.4"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "1xlg8zb22c2f1pi2has4f4qwggd0m2z254f0d6jrgz368x4g3p87"; + sha256 = "1gja402dsbws4z8ybnhqbw7rc9svgqnshqjgf7158d6x0ni386m3"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ @@ -47,7 +47,11 @@ stdenv.mkDerivation rec { --replace "/usr/local/share/man" "../share/man" ''; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; - patches = [ ./darwin.patch ]; + + patches = [ + ./darwin.patch + ./qt511.patch + ]; cmakeFlags = [ "-DKEEPASSXC_BUILD_TYPE=Release" diff --git a/pkgs/applications/misc/keepassx/qt511.patch b/pkgs/applications/misc/keepassx/qt511.patch new file mode 100644 index 0000000000000000000000000000000000000000..b4d312c8c263f04cac0701e85aec2a0bf930ff80 --- /dev/null +++ b/pkgs/applications/misc/keepassx/qt511.patch @@ -0,0 +1,15 @@ +diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp +index 6fd65c1a..e99275b0 100644 +--- a/src/gui/entry/EditEntryWidget.cpp ++++ b/src/gui/entry/EditEntryWidget.cpp +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.17.1 + diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 91e583e2af4e41bd3c3d25637bfba12b7e04dbcf..ede85aeada5a4946598094419b2e8402438a5742 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,15 +1,28 @@ -{ stdenv, pkgs, python3Packages }: +{ stdenv, pkgs, python3 }: -with python3Packages; +let + python = python3.override { + packageOverrides = self: super: { -buildPythonApplication rec { - name = "${pname}-${version}"; + # https://github.com/pimutils/khal/issues/780 + python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec { + version = "2.6.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca"; + }; + }); + + }; + }; + +in with python.pkgs; buildPythonApplication rec { pname = "khal"; - version = "0.9.8"; + version = "0.9.9"; src = fetchPypi { inherit pname version; - sha256 = "1blx3gxnv7sj302biqphfw7i6ilzl2xlmvzp130n3113scg9w17y"; + sha256 = "0dq9aqb9pqjfqrnfg43mhpb7m0szmychxy1ydb3lwzf3500c9rsh"; }; LC_ALL = "en_US.UTF-8"; @@ -30,16 +43,17 @@ buildPythonApplication rec { pkginfo freezegun ]; - buildInputs = [ setuptools_scm pytest pkgs.glibcLocales ]; + nativeBuildInputs = [ setuptools_scm pkgs.glibcLocales ]; + checkInputs = [ pytest ]; checkPhase = '' - # py.test + py.test ''; meta = with stdenv.lib; { homepage = http://lostpackets.de/khal/; description = "CLI calendar application"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 5f3ac3d93c44a7962c04750b7973abca01b4ce2c..3c5184d54632b50840d49328a765f948f0609e57 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,6 +1,22 @@ -{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }: +{ stdenv, fetchurl, glibcLocales, python3 }: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + + # https://github.com/pimutils/khal/issues/780 + python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec { + version = "2.6.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca"; + }; + }); + + }; + }; + +in with python.pkgs; buildPythonApplication rec { version = "0.12.2"; name = "khard-${version}"; namePrefix = ""; @@ -14,7 +30,7 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ atomicwrites configobj vobject @@ -31,6 +47,6 @@ python3Packages.buildPythonApplication rec { homepage = https://github.com/scheibler/khard; description = "Console carddav client"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 52f1c9fb1a1db6a6e25fa0a01c2cec6f4c9ea4d6..d3fff65a39950d5fdbb4757a006ec21d502b180e 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, - fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, +{ stdenv, fetchFromGitHub, python3Packages, glfw, libunistring, harfbuzz, + fontconfig, pkgconfig, ncurses, imagemagick, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, - libxkbcommon, libXi, libXext }: + libxkbcommon, libXi, libXext, wayland-protocols, wayland, + which +}: with python3Packages; buildPythonApplication rec { - version = "0.8.2"; + version = "0.11.3"; name = "kitty-${version}"; format = "other"; @@ -13,19 +15,24 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "08s8l59bib363ykg4djcxrc1968n5j1cjlp6fwwv7xmf18wd1a6c"; + sha256 = "1fql8ayxvip8hgq9gy0dhqfvngv13gh5bf71vnc3agd80kzq1n73"; }; buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext + wayland-protocols wayland ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig which sphinx ]; postPatch = '' substituteInPlace kitty/utils.py \ --replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'" + + substituteInPlace docs/Makefile \ + --replace 'python3 .. +launch $(shell which sphinx-build)' \ + 'PYTHONPATH=$PYTHONPATH:.. HOME=$TMPDIR/nowhere $(shell which sphinx-build)' ''; buildPhase = '' diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 699cb2fd09863897d9479676671ded985122a8ec..c37d26f3dbcce97ae4c45bf06cd540d85fe8c466 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, pkgconfig , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc -, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib +, libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake , xapian, ctpp2, zimlib }: diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index e686ec94a4a34b317ca385ded9ede4c5ea3e294b..a0a2776ae36049edce5ad12f2d90975765592dbc 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchFromGitHub, lib, + mkDerivation, fetchurl, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, kconfig, kinit, kjsembed, taglib, exiv2, podofo, kcrash @@ -7,15 +7,14 @@ let pname = "krename"; - version = "20170610"; + version = "5.0.0"; + in mkDerivation rec { name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "krename"; - rev = "18000edfec52de0b417d575e14eb078b4bd7b2f3"; - sha256 = "0hsrlfrbi42jqqnkcz682c6yrfi3xpl299672knj22074wr6sv0j"; + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "136j1dkqrhv458rjh5v3vzjhvq6dhz7k79zk6mmx8zvqacc7cq8a"; }; meta = with lib; { diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index bcf351ff46ae9b415f0ae1981ed46d0ffe368640..70915ca870737d2ed8ac881e45500c948040ddbe 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -6,13 +6,13 @@ let pname = "krusader"; - version = "2.6.0"; + version = "2.7.1"; in mkDerivation rec { name = "krusader-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; - sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh"; + sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm"; }; meta = with lib; { diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index bb55fc2d4a8b7d38bb7602a23c3174a17ee99db5..3072963c43e85580df7248387f39c69e7ef4575c 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -1,11 +1,9 @@ { stdenv -, makeWrapper , fetchurl , intltool , python3Packages , gobjectIntrospection , gtk3 -, dbus , libwnck3 , keybinder3 , hicolor-icon-theme diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 1867ec3a9c623093eee14c6eee75ff705a3076a8..c22c014bf5f5756c6b12096f8a1f5f97b6f038b3 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,28 +1,31 @@ -{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub -, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }: +{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchurl +, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash, knewstuff }: -let version = "0.7.4"; in +mkDerivation rec { + pname = "latte-dock"; + version = "0.8.0"; + name = "${pname}-${version}"; -mkDerivation { - name = "latte-dock-${version}"; - - src = fetchFromGitHub { - owner = "psifidotos"; - repo = "Latte-Dock"; - rev = "v${version}"; - sha256 = "0w4fphgpdvql31wrypxyfahmr4cv5ap96wjc4270yyawnrqrx0y6"; + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; + sha256 = "1zg9r162r66vcvj5rzgy61mda89sk5yfy96g5p1aahbim0rgbdbs"; + name = "${name}.tar.xz"; }; buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ]; nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem - qtx11extras kcrash ]; + qtx11extras kcrash knewstuff ]; + + meta = with lib; { description = "Dock-style app launcher based on Plasma frameworks"; homepage = https://github.com/psifidotos/Latte-Dock; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.benley ]; + maintainers = [ maintainers.benley maintainers.ysndr ]; }; + + } diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index bfb658098b73a2d34bda336a5275823fa3f4d662..ca9a90777e33a6b8accec620366ba0c8c5ebb7c6 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A 2D CAD package based upon Qt"; - homepage = http://librecad.org; + homepage = https://librecad.org; repositories.git = git://github.com/LibreCAD/LibreCAD.git; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 36527cdbe7c3b477d1e0fd048cd9cb45d70e1c69..72cb1e85802ad10fff48784c5d2760b5f249d5c5 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -15,7 +15,7 @@ let then rec { version = "0.9.9.4"; src = fetchurl { - url = "http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"; + url = "https://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"; sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp"; }; } @@ -40,17 +40,17 @@ stdenv.mkDerivation rec { preConfigure = "sh autogen.sh"; - configureFlags = '' - --enable-nls - --enable-safe-mode - ''; + configureFlags = [ + "--enable-nls" + "--enable-safe-mode" + ]; meta = with stdenv.lib; { description = "A fast, lightweight terminal emulator"; longDescription = '' LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. ''; - homepage = http://lilyterm.luna.com.tw/; + homepage = https://lilyterm.luna.com.tw/; license = licenses.gpl3; maintainers = with maintainers; [ AndersonTorres Profpatsch ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..070073ea3e2cc3686262b1c9570e3021af1a85e3 --- /dev/null +++ b/pkgs/applications/misc/limesuite/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, cmake +, sqlite, wxGTK30, libusb1, soapysdr +, mesa_glu, libX11, gnuplot, fltk +} : + +let + version = "18.06.0"; + +in stdenv.mkDerivation { + name = "limesuite-${version}"; + + src = fetchFromGitHub { + owner = "myriadrf"; + repo = "LimeSuite"; + rev = "v${version}"; + sha256 = "0j6mxlvij2k6ib1d9jwzvilmqgm1h0q7wy9sf8a6bvidwlphvy25"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libusb1 + sqlite + wxGTK30 + fltk + gnuplot + libusb1 + soapysdr + mesa_glu + libX11 + ]; + + postInstall = '' + mkdir -p $out/lib/udev/rules.d + cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d + + mkdir -p $out/share/limesuite + cp bin/Release/lms7suite_mcu/* $out/share/limesuite + + cp bin/dualRXTX $out/bin + cp bin/basicRX $out/bin + cp bin/singleRX $out/bin + ''; + + meta = with stdenv.lib; { + description = "Driver and GUI for LMS7002M-based SDR platforms"; + homepage = https://github.com/myriadrf/LimeSuite; + license = licenses.asl20; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 959ed6b11babf63bc434244b0b43c4d839b00631..372adef4375c4e284b49f7d3e2370f92712e87dc 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,10 +1,9 @@ { stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf -, lablgl, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: +, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; -let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "llpp-${version}"; version = "2018-03-02"; diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 0a2a051223acc18db4b0b56f453623c375b365c9..b16507c8b7bd48cc9c1503e385e4333cef28b19b 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte -, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs +, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs }: let version = "0.3.1"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf intltool pkgconfig - libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs + libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; buildInputs = [ gtk3 vte ]; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 092ad6bf4780c188171a00aec91d223477c4858a..ad3bd499cde9c6e13f67f4a2a8ff1a355f5005cd 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, python, file, bc +{ fetchurl, stdenv, pkgconfig, python, file, bc, fetchpatch , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: @@ -35,6 +35,13 @@ stdenv.mkDerivation rec { --prefix PATH : '${python}/bin' ''; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch?id=07e82fd1fc07bf055c78b81eaa128f8f837da80d"; + sha256 = "1bnx0il2iv36lnrnyb370wyvww0rd8bphcy6z8d7zmvd3pwhyfql"; + }) + ]; + meta = with stdenv.lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = http://www.lyx.org; diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index 787ce7231f30f0d693f29f06afb255fb0541853e..f2dacb7890f051c7f9e14b6abd470217b112283e 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "madonctl-${version}"; diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 8a752bbaf86ec15cf65b054c45f4fcf574d16f61..a9ec2760e8ad7be9598800d8de0b35737b8b2a58 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.4.0"; name = "makeself-${version}"; src = fetchFromGitHub { owner = "megastep"; repo = "makeself"; rev = "release-${version}"; - sha256 = "01r7vb9vyb99s3g5cw0c04s1ahcingynk3ki17wknlk2asjrbc4p"; + sha256 = "1lw3gx1zpzp2wmzrw5v7k31vfsrdzadqha9ni309fp07g8inrr9n"; }; patchPhase = '' diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 19a45e7d17be0fa863209a0d32db2039bfce5bdf..3155ab678d8688839225a9c34e0bbf24514e264d 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,52 +1,48 @@ -{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: - let - version = "4.3.82"; - in - stdenv.mkDerivation { - name = "masterpdfeditor-${version}"; - src = fetchurl { - url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "0bfqnpg2p5jxygcahqqljyb0gd2z28hj5n1j9g1x7px8f7wwiwl4"; - }; - libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc - glibc - sane-backends - qtbase - qtsvg - libXext - libX11 - libXdmcp - libXau - libxcb - ]; - dontStrip = true; - installPhase = '' - p=$out/opt/masterpdfeditor - mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps - - substituteInPlace masterpdfeditor4.desktop \ - --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ - --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ - --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" - cp -v masterpdfeditor4.png $out/share/pixmaps/ - cp -v masterpdfeditor4.desktop $out/share/applications - - cp -v masterpdfeditor4 $p/ - ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 - cp -v -r stamps templates lang fonts $p - - install -D license.txt $out/share/$name/LICENSE - - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - $p/masterpdfeditor4 - ''; - meta = with stdenv.lib; { - description = "Master PDF Editor"; - homepage = "https://code-industry.net/free-pdf-editor/"; - license = licenses.unfreeRedistributable; - platforms = with platforms; [ "x86_64-linux" ]; - maintainers = with maintainers; [ cmcdragonkai flokli ]; - }; - } +{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook }: + +let + version = "5.1.12"; + +in stdenv.mkDerivation { + name = "masterpdfeditor-${version}"; + + src = fetchurl { + url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; + sha256 = "1i3pdrhnlj06phm36gs42s6b94pigcfb8wa5dhmplxn0dqp434hq"; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ nss qtbase qtsvg sane-backends stdenv.cc.cc ]; + + dontStrip = true; + + installPhase = '' + runHook preInstall + + p=$out/opt/masterpdfeditor + mkdir -p $out/bin + + substituteInPlace masterpdfeditor5.desktop \ + --replace 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps" + + install -Dm644 -t $out/share/pixmaps masterpdfeditor5.png + install -Dm644 -t $out/share/applications masterpdfeditor5.desktop + install -Dm755 -t $p masterpdfeditor5 + install -Dm644 license.txt $out/share/$name/LICENSE + ln -s $p/masterpdfeditor5 $out/bin/masterpdfeditor5 + cp -v -r stamps templates lang fonts $p + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Master PDF Editor"; + homepage = "https://code-industry.net/free-pdf-editor/"; + license = licenses.unfreeRedistributable; + platforms = with platforms; [ "x86_64-linux" ]; + maintainers = with maintainers; [ cmcdragonkai flokli ]; + }; +} diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 9e584217c5985f67173da90bd3762d47cebce7b1..5af524a456babca892ef66388d98be2061284d9d 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.0.12"; + version = "1.0.13"; name = "mdp-${version}"; src = fetchFromGitHub { owner = "visit1985"; repo = "mdp"; rev = version; - sha256 = "04izj9i9rxmgswjh2iawqs6qglfv44zfv042smmcvfh1pm43361i"; + sha256 = "0snmglsmgfavgv6cnlb0j54sr0paf570ajpwk1b3g81v078hz2aq"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/visit1985/mdp; description = "A command-line based markdown presentation tool"; - maintainers = with maintainers; [ matthiasbeyer vrthra ]; + maintainers = with maintainers; [ vrthra ]; license = licenses.gpl3; platforms = with platforms; unix; }; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 8451c783aac6b0ebe94b8acfe51630c22309c997..b6ec3305cb3a2e7e4ee75fc0e69d1e7b7febc66a 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "17.12"; + version = "18.05"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f"; + sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 18eb1800a7b18942488caa9433b342435271ec3e..5b2f8125f72c622b72dffc80aea09b1b17880103 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "18.03"; + version = "18.05"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "171xv1qn6lbzybhx471j5a3rdqdj3xn0xc7gs181624r1kslxyn1"; + sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index fc1c08dc2b2cb56cfdfcdbc22f9a50b56bd104b2..c112cf0c928f0f910ca873ae305a0cff2eafaa5a 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,26 +1,40 @@ -{ fetchFromGitHub, ag, tree, stdenv, ... }: +{ fetchFromGitHub, silver-searcher, tree, man, stdenv, + git, + pandocSupport ? true, pandoc ? null + , ... }: + +assert pandocSupport -> pandoc != null; stdenv.mkDerivation rec { name = "memo-${version}"; - version = "0.2"; + version = "0.6"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "memo"; rev = "${version}"; - sha256 = "0mww4w5m6jv4s0krm74cccrz0vlr8rrwiv122jk67l1v9r80pchs"; + sha256 = "1cvjs36f6vxzfz5d63yhyw8j7gdw5hn6cfzccf7ag08lamjhfhbr"; }; - installPhase = '' - mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions} + installPhase = let + pandocReplacement = if pandocSupport then + "pandoc_cmd=${pandoc}/bin/pandoc" + else + "#pandoc_cmd=pandoc"; + in '' + mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions,share/zsh/site-functions} substituteInPlace memo \ - --replace "ack " "${ag}/bin/ag " \ - --replace "tree " "${tree}/bin/tree " + --replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \ + --replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \ + --replace "man_cmd=man" "man_cmd=${man}/bin/man" \ + --replace "git_cmd=git" "git_cmd=${git}/bin/git" \ + --replace "pandoc_cmd=pandoc" "${pandocReplacement}" mv memo $out/bin/ mv doc/memo.1 $out/share/man/man1/memo.1 - mv completion/memo.bash $out/share/bash-completion/completions/memo.sh + mv completion/bash/memo.sh $out/share/bash-completion/completions/memo.sh + mv completion/zsh/_memo $out/share/zsh/site-functions/_memo ''; meta = { diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index d1befec34082d22cc749103765a6b2eaba649070..70a6efb90ddc21eaeea9f2d345e774c634bf8b28 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "OpenStreetMap editor"; homepage = http://merkaartor.be/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6aa7eea3d7e9105e1d44cebc006d9edfd1a44859 --- /dev/null +++ b/pkgs/applications/misc/minergate-cli/default.nix @@ -0,0 +1,36 @@ +{ fetchurl, stdenv, dpkg, makeWrapper, openssl }: + +stdenv.mkDerivation rec { + version = "8.2"; + name = "minergate-cli-${version}"; + src = fetchurl { + url = "https://minergate.com/download/ubuntu-cli"; + sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + pgm=$out/opt/minergate-cli/minergate-cli + + interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + patchelf --set-interpreter "$interpreter" $pgm + + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} + + rm $out/usr/bin/minergate-cli + mkdir -p $out/bin + ln -s $pgm $out/bin + ''; + + meta = with stdenv.lib; { + description = "Minergate CPU/GPU console client mining software"; + homepage = https://www.minergate.com/; + license = licenses.unfree; + maintainers = with maintainers; [ bfortz ]; + platforms = [ "x86_64-linux" ]; +}; +} diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d11e889e932c8912e82be4c7418a795c7522c2c7 --- /dev/null +++ b/pkgs/applications/misc/minergate/default.nix @@ -0,0 +1,36 @@ +{ fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }: + +stdenv.mkDerivation rec { + version = "8.1"; + name = "minergate-${version}"; + src = fetchurl { + url = "https://minergate.com/download/ubuntu"; + sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + pgm=$out/opt/minergate/minergate + + interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + patchelf --set-interpreter "$interpreter" $pgm + + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" + + rm $out/usr/bin/minergate + mkdir -p $out/bin + ln -s $out/opt/minergate/minergate $out/bin + ''; + + meta = with stdenv.lib; { + description = "Minergate CPU/GPU mining software"; + homepage = https://www.minergate.com/; + license = licenses.unfree; + maintainers = with maintainers; [ bfortz ]; + platforms = [ "x86_64-linux" ]; +}; +} diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 701e4b2e052d474fcde9a8449682a2d894d37bee..31793031dc1fbf269ff0960b8d8d785591680233 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.8.4"; + version = "3.8.6"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "07ih7953pr1jr99rayjn57ba5a0cr3niqkmvy9n59lcc1qwcrwf9"; + sha256 = "06zylbinh84s9v79hrlvv44rd57z7kvgz9afbps3rjcbncxcmivd"; }; nativeBuildInputs = [ pkgconfig autoconf ]; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 42f1b58061ef09b8d32cb69297ce5a61c815a3e5..5aaaa7a0e37bd5278affde851d0bd2fcf4e67b85 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, perl -, alsaLib, libevdev, libopus, libudev, SDL2 +, alsaLib, libevdev, libopus, udev, SDL2 , ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ - alsaLib libevdev libopus libudev SDL2 + alsaLib libevdev libopus udev SDL2 ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi enet libuuid ]; diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index 336b136c56d61b320e25b1ff8835cf42eadb0d8f..8c6bd92d5362e9c0a2f84c481c9cdeef181e853d 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "mop-${version}"; diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index fdb236194f9c29e1afee9d0c05601e0b1de8215d..d6153d2268b6cf6500f6fc39feb4e2e7cc1b29de 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre }: +{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre, gsettings-desktop-schemas }: let version = "0.9.2"; @@ -10,7 +10,7 @@ let rev = version; sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8"; }; - + postPatch = '' # there is no .git anyway substituteInPlace build.gradle \ @@ -69,7 +69,9 @@ in stdenv.mkDerivation { installPhase = '' mkdir $out tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1 - wrapProgram $out/bin/mucommander --set JAVA_HOME ${jre} + wrapProgram $out/bin/mucommander \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ + --set JAVA_HOME ${jre} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..02541842c36e7835cda5523139bebcbfb91a6033 --- /dev/null +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -0,0 +1,59 @@ +{ lib, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5 }: +python36Packages.buildPythonApplication rec { + pname = "multibootusb"; + name = "${pname}-${version}"; + version = "9.2.0"; + + buildInputs = [ + python36Packages.dbus-python + python36Packages.pyqt5 + python36Packages.pytest-shutil + python36Packages.python + python36Packages.pyudev + python36Packages.six + libxcb + mtools + p7zip + parted + procps + qt5.full + utillinux + ]; + + src = fetchFromGitHub { + owner = "mbusb"; + repo = pname; + rev = "v${version}"; + + sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3"; + }; + + # Skip the fixup stage where stuff is shrinked (can't shrink text files) + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + share="$out/share/${pname}" + mkdir -p "$share" + cp -r data "$share/data" + cp -r scripts "$share/scripts" + cp "${pname}" "$share/${pname}" + + mkdir "$out/bin" + cat > "$out/bin/${pname}" <= 1.1.0' && echo yes)" "yes" HAVE_LIBCRYPTO := yes SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) @@ -113,7 +101,7 @@ SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl) @@ -33,3 +33,15 @@ diff --git a/Makerules b/Makerules ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes" HAVE_X11 := yes +diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c +index d58f7ba..808af18 100644 +--- a/platform/gl/gl-main.c ++++ b/platform/gl/gl-main.c +@@ -16,6 +16,7 @@ void glutExit(void) {} + void glutMouseWheelFunc(void *fn) {} + void glutInitErrorFunc(void *fn) {} + void glutInitWarningFunc(void *fn) {} ++#define glutSetOption(X,Y) + #endif + + enum diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 000a916b737ad7b331b20ee361b6c1d307f4528d..bce2a79cde33d4ec4dd3f342e8ccbcd12660bb77 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -14,79 +14,24 @@ let in stdenv.mkDerivation rec { - version = "1.12.0"; + version = "1.13.0"; name = "mupdf-${version}"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz"; - sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw"; + sha256 = "02faww5bnjw76k6igrjzwf0lnw4xd9ckc8d6ilc3c4gfrdi6j707"; }; patches = [ - # Compatibility with new openjpeg (fetchpatch { - name = "mupdf-1.12-openjpeg-version.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306"; - sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk"; - }) - (fetchpatch { - name = "CVE-2018-6544.1.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=b03def134988da8c800adac1a38a41a1f09a1d89;hp=26527eef77b3e51c2258c8e40845bfbc015e405d"; - sha256 = "1rlmjibl73ls8xfpsz69axa3lw5l47vb0a1dsjqziszsld4lpj5i"; - }) - (fetchpatch { - name = "CVE-2018-6544.2.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=26527eef77b3e51c2258c8e40845bfbc015e405d;hp=ab98356f959c7a6e94b1ec10f78dd2c33ed3f3e7"; - sha256 = "1brcc029s5zmd6ya0d9qk3mh9qwx5g6vhsf1j8h879092sya5627"; - }) - (fetchpatch { - # Bugs 698804/698810/698811, 698819: Keep PDF object numbers below limit. - name = "CVE-2017-17858.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=55c3f68d638ac1263a386e0aaa004bb6e8bde731"; - sha256 = "1bf683d59i5009cv1hhmwmrp2rsb75cbf98qd44dk39cpvq8ydwv"; - }) - (fetchpatch { - # Bug 698825: Do not drop borrowed colorspaces. - name = "CVE-2018-1000051.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=321ba1de287016b0036bf4a56ce774ad11763384"; - sha256 = "0jbcc9j565q5y305pi888qzlp83zww6nhkqbsmkk91gim958zikm"; - }) - (fetchpatch { - # Bug 698908 preprecondition: Add portable pseudo-random number generator based on the lrand48 family. - name = "CVE-2018-6187.0.1.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2d5b4683e912d6e6e1f1e2ca5aa0297beb3e6807"; - sha256 = "028bxinbjs5gg9myjr3vs366qxg9l2iyba2j3pxkxsh1851hj728"; - }) - (fetchpatch { - # Bug 698908 precondition: Fix "being able to search for redacted text" bug. - name = "CVE-2018-6187.0.2.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=25593f4f9df0c4a9b9adaa84aaa33fe2a89087f6"; - sha256 = "195y69c3f8yqxcsa0bxrmxbdc3fx1dzvz8v66i56064mjj0mx04s"; - }) - (fetchpatch { - # Bug 698908: Resize object use and renumbering lists after repair. - name = "CVE-2018-6187.1.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=3e30fbb7bf5efd88df431e366492356e7eb969ec"; - sha256 = "0wzbqj750h06q1wa6vxbpv5a5q9pfg0cxjdv88yggkrjb3vrkd9j"; - }) - (fetchpatch { - # Bug 698908: Plug PDF object leaks when decimating pages in pdfposter. - name = "CVE-2018-6187.2.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a71e7c85a9f2313cde20d4479cd727a5f5518ed2"; - sha256 = "1pcjkq8lg6l2m0186rl79lilg79crgdvz9hrmm3w60gy2gxkgksc"; - }) - (fetchpatch { - # Bug 698916: Indirect object numbers must be in range. - name = "CVE-2018-6192.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=5e411a99604ff6be5db9e273ee84737204113299"; - sha256 = "134zc07fp0p1mwqa8xrkq3drg4crajzf1hjf4mdwmcy1jfj2pfhj"; + name = "CVE-2018-10289.patch"; + url = "https://bugs.ghostscript.com/attachment.cgi?id=15230"; + sha256 = "0jmpacxd9930g6k57kda9jrcrbk75whdlv8xwmqg5jwn848qvy4q"; }) ] - - # Use shared libraries to decrease size - ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.12-shared_libs-1.patch - - ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch + # Use shared libraries to decrease size + ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.13-shared_libs-1.patch + ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch ; postPatch = '' @@ -141,11 +86,11 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://mupdf.com; + homepage = https://mupdf.com; repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ viric vrthra fpletz ]; + maintainers = with maintainers; [ vrthra fpletz ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch b/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch similarity index 80% rename from pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch rename to pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch index b39f005ed74a179f008498347fe56989ff55c5ee..e29f1f52077c36274e3e3b4ece9eb065e0173436 100644 --- a/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch +++ b/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch @@ -9,22 +9,24 @@ LIBS += $(XLIBS) -lm LIBS += $(FREETYPE_LIBS) -@@ -312,9 +312,9 @@ +@@ -312,10 +312,10 @@ # --- Library --- -MUPDF_LIB = $(OUT)/libmupdf.a -THIRD_LIB = $(OUT)/libmupdfthird.a -THREAD_LIB = $(OUT)/libmuthreads.a +-PKCS7_LIB = $(OUT)/libmupkcs7.a +MUPDF_LIB = $(OUT)/libmupdf.so +THIRD_LIB = $(OUT)/libmupdfthird.so +THREAD_LIB = $(OUT)/libmuthreads.so ++PKCS7_LIB = $(OUT)/libmupkcs7.so MUPDF_OBJ := \ $(FITZ_OBJ) \ -@@ -343,11 +343,14 @@ - - THREAD_OBJ := $(THREAD_OBJ) +@@ -343,13 +343,17 @@ + $(ZLIB_OBJ) \ + $(LCMS2_OBJ) -$(MUPDF_LIB) : $(MUPDF_OBJ) +$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB) @@ -33,9 +35,11 @@ + $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so -Wl,--no-undefined $(THREAD_LIB) : $(THREAD_OBJ) + $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so -Wl,--no-undefined -lpthread + $(PKCS7_LIB) : $(PKCS7_OBJ) ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupkcs7.so -INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) -+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) ++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB) # --- Tools and Apps --- diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index e6ac35d19a0c234004f6a090228e441d3f5b2281..67e6ed3fa9ce9388d7c2ae313a8b0646250761f8 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "0.7.4"; + version = "0.7.5"; name = "mwic-${version}"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz"; - sha256 = "0c0xk7wx4vaamlry6srdixw1q6afmqznvxdzcg1skr0qjypw5i5q"; + sha256 = "1b4fz9vs0aihg9nj9aj6d2jmykpa9nxi9rvz06v50wwk515plpmc"; }; makeFlags=["PREFIX=\${out}"]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://jwilk.net/software/mwic; description = "spell-checker that groups possible misspellings and shows them in their contexts"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 76517f874642209246276cfa15258c355e563385..7068d8aedd376d8a5c14e879a8780352d9095969 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,118 +1,95 @@ -{ stdenv, fetchurl, makeWrapper, cmake, pkgconfig -, glibc, gnome-keyring, gtk, gtkmm, pcre, swig, sudo -, mysql, libxml2, libctemplate, libmysqlconnectorcpp -, vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs -, libXdmcp, libuuid, libzip, libgnome-keyring, file -, pythonPackages, jre, autoconf, automake, libtool -, boost, glibmm, libsigcxx, pangomm, libX11, openssl -, proj, cairo, libglade +{ stdenv, fetchurl, substituteAll, cmake, ninja, pkgconfig +, glibc, gtk3, gtkmm3, pcre, swig, antlr4_7, sudo +, mysql, libxml2, libmysqlconnectorcpp +, vsqlite, gdal, libiodbc, libpthreadstubs +, libXdmcp, libuuid, libzip, libsecret, libssh +, python2, jre +, boost, libsigcxx, libX11, openssl +, proj, cairo, libxkbcommon, epoxy, wrapGAppsHook +, at-spi2-core, dbus, bash, coreutils }: let - inherit (pythonPackages) pexpect pycrypto python paramiko; + inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "6.3.8"; + version = "8.0.12"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "1bxd828nrawmym6d8awh1vrni8dsbwh1k5am1lrq5ihp5c3kw9ka"; + sha256 = "0d6k1kw0bi3q5dlilzlgds1gcrlf7pis4asm3d6pssh2jmn5hh82"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gnome-keyring gtk gtk.dev gtkmm pcre swig python sudo - paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file - libpthreadstubs libXdmcp libuuid libzip libgnome-keyring libgnome-keyring.dev jre autoconf - automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl - proj cairo cairo.dev makeWrapper libglade ] ; - - prePatch = '' - for f in backend/wbpublic/{grt/spatial_handler.h,grtui/geom_draw_box.h,objimpl/db.query/db_query_Resultset.cpp} ; - do - sed -i 's@#include ext/antlr-runtime/fix-configure - #!${stdenv.shell} - echo "fixing bundled antlr3c configure" ; - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - sed -i '12121d' configure - EOF - chmod +x ext/antlr-runtime/fix-configure - sed -i '236s@&&@& ''${PROJECT_SOURCE_DIR}/ext/antlr-runtime/fix-configure &@' CMakeLists.txt + buildInputs = [ + gtk3 gtkmm3 libX11 antlr4_7.runtime.cpp python2 mysql libxml2 + libmysqlconnectorcpp vsqlite gdal boost libssh openssl + libiodbc pcre cairo libuuid libzip libsecret + libsigcxx proj + # python dependencies: + paramiko pycairo pyodbc # sqlanydb + # transitive dependencies: + libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus + ]; - substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc.bin}/bin/catchsegv" - substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "/usr/lib/x86_64-linux-gnu" "${proj}/lib" - patchShebangs $(pwd)/library/mysql.parser/grammar/build-parser - patchShebangs $(pwd)/tools/get_wb_version.sh + postPatch = '' + patchShebangs tools/get_wb_version.sh ''; NIX_CFLAGS_COMPILE = [ - "-I${libsigcxx}/lib/sigc++-2.0/include" - "-I${pangomm}/lib/pangomm-1.4/include" - "-I${glibmm}/lib/giomm-2.4/include" + # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated + "-Wno-error=deprecated-declarations" ]; cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" - "-DCTemplate_INCLUDE_DIR=${libctemplate}/include" - "-DCAIRO_INCLUDE_DIRS=${cairo.dev}/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${gtk.dev}/include" - "-DGTK2_GTKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gtkmm-2.4/include" - "-DGTK2_GDKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gdkmm-2.4/include" - "-DGTK2_GLIBMMCONFIG_INCLUDE_DIR=${glibmm}/lib/glibmm-2.4/include" + "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" + "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" ]; - postInstall = '' - patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh - - for i in $out/lib/mysql-workbench/modules/wb_utils_grt.py \ - $out/lib/mysql-workbench/modules/wb_server_management.py \ - $out/lib/mysql-workbench/modules/wb_admin_grt.py; do - substituteInPlace $i \ - --replace "/bin/bash" ${stdenv.shell} \ - --replace "/usr/bin/sudo" ${sudo}/bin/sudo - done + # There is already an executable and a wrapper in bindir + # No need to wrap both + dontWrapGApps = true; - wrapProgram "$out/bin/mysql-workbench" \ - --prefix LD_LIBRARY_PATH : "${python}/lib" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \ - --prefix PATH : "${gnome-keyring}/bin" \ - --prefix PATH : "${python}/bin" \ - --set PYTHONPATH $PYTHONPATH \ - --run ' -# The gnome-keyring-daemon must be running. To allow for environments like -# kde, xfce where this is not so, we start it first. -# It is cleaned up using a supervisor subshell which detects that -# the parent has finished via the closed pipe as terminate signal idiom, -# used because we cannot clean up after ourselves due to the exec call. - -# Start gnome-keyring-daemon, export the environment variables it asks us to set. -for expr in $( gnome-keyring-daemon --start ) ; do eval "export "$expr ; done - -# Prepare fifo pipe. -FIFOCTL="/tmp/gnome-keyring-daemon-ctl.$$.fifo" -[ -p $FIFOCTL ] && rm $FIFOCTL -mkfifo $FIFOCTL - -# Supervisor subshell waits reading from pipe, will receive EOF when parent -# closes pipe on termination. Negate read with ! operator to avoid subshell -# quitting when read EOF returns 1 due to -e option being set. -( - exec 19< $FIFOCTL - ! read -u 19 - - kill $GNOME_KEYRING_PID - rm $FIFOCTL -) & + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${python2}/bin" + --prefix PROJSO : "${proj}/lib/libproj.so" + --set PYTHONPATH $PYTHONPATH + ) + ''; -exec 19> $FIFOCTL - ' + # Let’s wrap the programs not ending with bin + # until https://bugs.mysql.com/bug.php?id=91948 is fixed + postFixup = '' + find -L "$out/bin" -type f -executable -print0 \ + | while IFS= read -r -d ''' file; do + if [[ "''${file}" != *-bin ]]; then + echo "Wrapping program ''${file}" + wrapProgram "''${file}" "''${gappsWrapperArgs[@]}" + fi + done ''; meta = with stdenv.lib; { @@ -127,6 +104,6 @@ exec 19> $FIFOCTL homepage = http://wb.mysql.com/; license = licenses.gpl2; maintainers = [ maintainers.kkallio ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch b/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch new file mode 100644 index 0000000000000000000000000000000000000000..0a5c31fd40a27c96c213d10d2e8f179dd51690ef --- /dev/null +++ b/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch @@ -0,0 +1,47 @@ +--- a/backend/wbpublic/grt/spatial_handler.h ++++ b/backend/wbpublic/grt/spatial_handler.h +@@ -24,12 +24,12 @@ + #ifndef SPATIAL_HANDLER_H_ + #define SPATIAL_HANDLER_H_ + +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include + #include + #include "base/geometry.h" + #include "wbpublic_public_interface.h" +--- a/backend/wbpublic/grtui/geom_draw_box.h ++++ b/backend/wbpublic/grtui/geom_draw_box.h +@@ -25,7 +25,7 @@ + #define _GEOM_DRAW_BOX_H_ + + #include +-#include ++#include + #include "wbpublic_public_interface.h" + + class WBPUBLICBACKEND_PUBLIC_FUNC GeomDrawBox : public mforms::DrawBox { +--- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp ++++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp +@@ -21,9 +21,9 @@ + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include +-#include +-#include ++#include ++#include ++#include + + #include + #include diff --git a/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..dddf992e4c1206bad1ac07dad5c412e89d2f62b8 --- /dev/null +++ b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch @@ -0,0 +1,187 @@ +--- a/frontend/linux/workbench/mysql-workbench.in ++++ b/frontend/linux/workbench/mysql-workbench.in +@@ -99,8 +99,8 @@ + if test "$WB_DEBUG" != ""; then + $WB_DEBUG $MWB_BINARIES_DIR/mysql-workbench-bin "$@" + else +- if type -p catchsegv > /dev/null; then +- catchsegv $MWB_BINARIES_DIR/mysql-workbench-bin "$@" ++ if type -p @catchsegv@ > /dev/null; then ++ @catchsegv@ $MWB_BINARIES_DIR/mysql-workbench-bin "$@" + else + $MWB_BINARIES_DIR/mysql-workbench-bin "$@" + fi +--- a/plugins/migration/frontend/migration_bulk_copy_data.py ++++ b/plugins/migration/frontend/migration_bulk_copy_data.py +@@ -110,7 +110,7 @@ + return 'sh' + + def generate_import_script(self, connection_args, path_to_file, schema_name): +- output = ['#!/bin/bash'] ++ output = ['#!/usr/bin/env bash'] + output.append('MYPATH=\`pwd\`') + + output.append('if [ -f \$MYPATH/%s ] ; then' % self.error_log_name) +@@ -164,7 +164,7 @@ + return 'sh' + + def generate_import_script(self, connection_args, path_to_file, schema_name): +- output = ['#!/bin/bash'] ++ output = ['#!/usr/bin/env bash'] + output.append('MYPATH=\`pwd\`') + + output.append('if [ -f \$MYPATH/%s ] ; then' % self.error_log_name) +@@ -417,7 +417,7 @@ + + with open(script_path, 'w+') as f: + os.chmod(script_path, 0700) +- f.write('#!/bin/bash\n\n') ++ f.write('#!/usr/bin/env bash\n\n') + f.write('MYPATH=`pwd`\n') + + f.write("arg_source_password=\"\"\n") +@@ -521,7 +521,7 @@ + + with open(script_path, 'w+') as f: + os.chmod(script_path, 0700) +- f.write('#!/bin/bash\n\n') ++ f.write('#!/usr/bin/env bash\n\n') + f.write('MYPATH=`pwd`\n') + + f.write("arg_source_password=\"\"\n") +--- a/plugins/wb.admin/backend/wb_server_control.py ++++ b/plugins/wb.admin/backend/wb_server_control.py +@@ -39,7 +39,7 @@ + + UnixVariant = { + "" : { +- 'sudo_command' : "/usr/bin/sudo -k -S -p EnterPasswordHere ", ++ 'sudo_command' : "@sudo@ -k -S -p EnterPasswordHere ", + } + } + +--- a/plugins/wb.admin/backend/wb_server_management.py ++++ b/plugins/wb.admin/backend/wb_server_management.py +@@ -40,7 +40,7 @@ + + def reset_sudo_prefix(): + global default_sudo_prefix +- default_sudo_prefix = '/usr/bin/sudo -k -S -p EnterPasswordHere' ++ default_sudo_prefix = '@sudo@ -k -S -p EnterPasswordHere' + + reset_sudo_prefix() + +@@ -100,7 +100,7 @@ + + if to_spawn: + command += ' &' +- sudo_prefix += ' /usr/bin/nohup' ++ sudo_prefix += ' @nohup@' + + # If as_user is the CURRENT then there's no need to sudo + if as_user != Users.CURRENT: +@@ -111,7 +111,7 @@ + if '/bin/sh' in sudo_prefix or '/bin/bash' in sudo_prefix: + command = "LANG=C " + sudo_prefix + " \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" + else: +- command = "LANG=C " + sudo_prefix + " /bin/bash -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" ++ command = "LANG=C " + sudo_prefix + " @bash@ -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" + + return command + +@@ -896,9 +896,9 @@ + if as_user == Users.CURRENT: + raise PermissionDeniedError("Cannot set owner of directory %s" % path) + else: +- command = "/bin/mkdir %s && chown %s %s" % (quote_path(path), with_owner, quote_path(path)) ++ command = "@mkdir@ %s && chown %s %s" % (quote_path(path), with_owner, quote_path(path)) + else: +- command = "/bin/mkdir %s" % (quote_path(path)) ++ command = "@mkdir@ %s" % (quote_path(path)) + + res = self.process_ops.exec_cmd(command, + as_user = as_user, +@@ -927,7 +927,7 @@ + @useAbsPath("path") + def remove_directory(self, path, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() +- res = self.process_ops.exec_cmd('/bin/rmdir ' + quote_path(path), ++ res = self.process_ops.exec_cmd('@rmdir@ ' + quote_path(path), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -940,7 +940,7 @@ + @useAbsPath("path") + def remove_directory_recursive(self, path, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() +- res = self.process_ops.exec_cmd('/bin/rm -R ' + quote_path(path), ++ res = self.process_ops.exec_cmd('@rm@ -R ' + quote_path(path), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -953,7 +953,7 @@ + @useAbsPath("path") + def delete_file(self, path, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() +- res = self.process_ops.exec_cmd("/bin/rm " + quote_path(path), ++ res = self.process_ops.exec_cmd("@rm@ " + quote_path(path), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -1001,7 +1001,7 @@ + def _copy_file(self, source, dest, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() + +- res = self.process_ops.exec_cmd("LC_ALL=C /bin/cp " + quote_path(source) + " " + quote_path(dest), ++ res = self.process_ops.exec_cmd("LC_ALL=C @cp@ " + quote_path(source) + " " + quote_path(dest), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -1077,9 +1077,9 @@ + # for ls -l, the output format changes depending on stdout being a terminal or not + # since both cases are possible, we need to handle both at the same time (1st line being total or not) + # the good news is that if the line is there, then it will always start with total, regardless of the locale +- command = 'LC_ALL=C /bin/ls -l -p %s' % quote_path(path) ++ command = 'LC_ALL=C @ls@ -l -p %s' % quote_path(path) + else: +- command = 'LC_ALL=C /bin/ls -1 -p %s' % quote_path(path) ++ command = 'LC_ALL=C @ls@ -1 -p %s' % quote_path(path) + + output = StringIO.StringIO() + res = self.process_ops.exec_cmd(command, +@@ -2160,9 +2160,9 @@ + def get_range(self, start, end): + f = StringIO.StringIO() + if not self._need_sudo: +- ret = self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write) ++ ret = self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write) + else: +- ret = self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.ADMIN, user_password=self.get_password, output_handler=f.write) ++ ret = self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.ADMIN, user_password=self.get_password, output_handler=f.write) + + if ret != 0: + raise RuntimeError("Could not get data from file %s" % self.path) +@@ -2170,9 +2170,9 @@ + + def read_task(self, offset, file): + if not self._need_sudo: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=file.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=file.write) + else: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self.get_password, output_handler=file.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self.get_password, output_handler=file.write) + # this will signal the reader end that there's no more data + file.close() + +@@ -2198,9 +2198,9 @@ + self._pos = offset + f = StringIO.StringIO() + if not self._need_sudo: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write) + else: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self._password, output_handler=f.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self._password, output_handler=f.write) + self.data = f + self.data.seek(0) + if self.skip_first_newline: diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 447fc4570a76dc9884e4e09cdd58204adc8f1955..9a40e3bc1053b42698eb4e8bc1c6a8feaeb8fcd5 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://navipowm.sourceforge.net/; description = "Car navigation system"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/navit/CMakeLists.txt.patch b/pkgs/applications/misc/navit/CMakeLists.txt.patch new file mode 100644 index 0000000000000000000000000000000000000000..7f8a75f319be2124f743706dbc3444828f15ee37 --- /dev/null +++ b/pkgs/applications/misc/navit/CMakeLists.txt.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 763f75b..defa74a 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -212,7 +212,7 @@ CHECK_INCLUDE_FILES(endian.h HAVE_ENDIAN_H) + CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) + CHECK_INCLUDE_FILES(byteswap.h HAVE_BYTESWAP_H) + CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND) +-CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD) ++CHECK_INCLUDE_FILES(speech-dispatcher/libspeechd.h HAVE_LIBSPEECHD) + CHECK_INCLUDE_FILES(sys/socket.h HAVE_SOCKET) + CHECK_INCLUDE_FILES(sys/shm.h HAVE_SHMEM) + CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF) diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 92269e03e58d48a4dd11964d87ec6dc603097ffc..5d591243f50d668d9f3351f08b79295461bd096f 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,30 +1,89 @@ -{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined, -libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}: +{ stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2 +, SDL_image, libGLU_combined, libXmu, freeglut, pcre, dbus, dbus-glib, glib +, librsvg, freeimage, libxslt, cairo, gdk_pixbuf, pango +, atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc +, gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper +, qtquickcontrols, qtmultimedia, qtspeech, qtsensors +, qtlocation, qtdeclarative, qtsvg +, qtSupport ? false, qtbase #need to fix qt_qpainter +, sdlSupport ? true, SDL +, xkbdSupport ? true, xkbd +, espeakSupport ? true, espeak +, postgresqlSupport ? false, postgresql +, speechdSupport ? false, speechd ? null +}: + +assert speechdSupport -> speechd != null; + +with stdenv.lib; stdenv.mkDerivation rec { - name = "navit-svn-3537"; + name = "navit-${version}"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "navit-gps"; + repo = "navit"; + rev = "v${version}"; + sha256 = "0jf2gjh2sszr5y5c2wvamfj2qggi2y5k3ynb32pak9vhf5xyl5xj"; + }; - src = fetchsvn { - url = svn://svn.code.sf.net/p/navit/code/trunk/navit; - rev = 5576; - sha256 = "1xx62l5srfhh9cfi7n3pxj8hpcgr1rpa0hzfmbrqadzv09z36723"; + sample_map = fetchurl { + url = "http://www.navit-project.org/maps/osm_bbox_11.3,47.9,11.7,48.2.osm.bz2"; + name = "sample_map.bz2"; + sha256 = "0vg6b6rhsa2cxqj4rbhfhhfss71syhnfa6f1jg2i2d7l88dm5x7d"; }; - hardeningDisable = [ "format" ]; + patches = [ ./CMakeLists.txt.patch ]; + + NIX_CFLAGS_COMPILE = optional sdlSupport "-I${SDL.dev}/include/SDL" + ++ optional speechdSupport "-I${speechd}/include/speech-dispatcher"; + + # we choose only cmdline and speech-dispatcher speech options. + # espeak builtins is made for non-cmdline OS as winCE + cmakeFlags = [ + "-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + "-Dspeech/qt5_espeak=FALSE" "-Dsupport/espeak=FALSE" + ]; - buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined - libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ]; + buildInputs = [ + gtk2 fontconfig freetype imlib2 libGLU_combined freeimage + libxslt libXmu freeglut python gettext quesoglc gd + fribidi pcre dbus dbus-glib librsvg shapelib glib + cairo gdk_pixbuf pango atk + ] ++ optionals sdlSupport [ SDL SDL_ttf SDL_image ] + ++ optional postgresqlSupport postgresql + ++ optional speechdSupport speechd + ++ optionals qtSupport [ + qtquickcontrols qtmultimedia qtspeech qtsensors + qtbase qtlocation qtdeclarative qtsvg + ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ makeWrapper pkgconfig cmake patchelf bzip2 ]; - NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ]; + # we dont want blank screen by defaut + postInstall = '' + # emulate DSAMPLE_MAP + mkdir -p $out/share/navit/maps/ + bzcat "${sample_map}" | $out/bin/maptool "$out/share/navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin" + ''; - cmakeFlags = [ "-DSAMPLE_MAP=n" ]; + # TODO: fix upstream? + postFixup = '' + for lib in $(find "$out/lib/navit/" -iname "*.so" ); do + patchelf --set-rpath ${makeLibraryPath buildInputs} $lib + done + wrapProgram $out/bin/navit \ + --prefix PATH : ${makeBinPath ( + optional xkbdSupport xkbd + ++ optional espeakSupport espeak + ++ optional speechdSupport speechd ) } + ''; meta = { - homepage = http://www.navit-project.org/; + homepage = http://www.navit-project.org; description = "Car navigation system with routing engine using OSM maps"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index 04f10de3d27418bf8fcd4feb981d3b5e8385f64f..7e5a3a7840d7abca89809ba49af28ff8f0db1a43 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchgit, electron } : stdenv.mkDerivation rec { - name = "nix-tour"; + name = "nix-tour-${version}"; + version = "0.0.1"; buildInputs = [ electron ]; - version = "v0.0.1"; - src = fetchgit { url = "https://github.com/nixcloud/tour_of_nix"; - rev = "refs/tags/${version}"; + rev = "v${version}"; sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb"; }; @@ -34,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ qknight ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index 4ac152c26694511a51e1640057812f1bdb70844a..12f8c12b5864482b07d9192dfcb66c7735e132c4 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -1,4 +1,5 @@ -{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}: +{ stdenv, mkDerivation, fetchFromGitHub, boost +, qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}: mkDerivation rec { name = "nixnote2-${version}"; @@ -11,7 +12,7 @@ mkDerivation rec { sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr"; }; - buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ]; + buildInputs = [ boost qtbase qtwebkit poppler hunspell ]; enableParallelBuilding = true; @@ -28,7 +29,7 @@ mkDerivation rec { substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy' ''; - + postInstal = '' cp images/windowIcon.png $out/share/pixmaps/nixnote2.png ''; diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index ae1c178e5716a0e0c8fa2b9a6d7f86e5633d6a92..d97f2d2c0489fc46c8e3d634ccb87f2c1e3a2ca0 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "1.7"; + version = "1.9"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "03cgsdj4l19gla5fx9d1ydqirpsah9d7gx9jaik73x38zqsabr89"; + sha256 = "0z7mr9lql5hz0518wzkj8fdsdp8yh17fr418arjxjn66md4kwgpg"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 8e8126192ddaf2fb9c97a3a16602a8a709b21612..f602ce9db66ad16f79b00be3f02a8e9c3c02b534 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { gnome3.gsettings-desktop-schemas ]; - configureFlags = "--libexecdir=$(out)/bin"; + configureFlags = [ "--libexecdir=$(out)/bin" ]; preFixup = '' wrapProgram "$out/bin/notify-osd" \ diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 35931707ed6bed22e6fb9e7a76e065674372be64..40432c18aa38747355e3f5fb43d4be7cdf5f64c9 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -53,7 +53,7 @@ pythonPackages.buildPythonApplication rec { description = "Open source document analysis and OCR system"; license = licenses.asl20; homepage = https://github.com/tmbdev/ocropy/; - maintainers = with maintainers; [ domenkozar viric ]; + maintainers = with maintainers; [ domenkozar ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 6587305a770fe59f8779a5b485710cd7f03ef38a..99d23b0eb7cf2d146cbcf999cdad4480bac1849b 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,34 +1,48 @@ -{ stdenv, fetchFromGitHub, python2, fetchurl }: +{ stdenv, fetchFromGitHub, python2 }: let pythonPackages = python2.pkgs.override { overrides = self: super: with self; { - backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2; + backports_ssl_match_hostname = super.backports_ssl_match_hostname.overridePythonAttrs (oldAttrs: rec { + version = "3.4.0.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae"; + }; + }); + + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "0.12.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd"; + }; + }); tornado = buildPythonPackage rec { - name = "tornado-${version}"; + pname = "tornado"; version = "4.0.2"; propagatedBuildInputs = [ backports_ssl_match_hostname certifi ]; - src = fetchurl { - url = "mirror://pypi/t/tornado/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h"; }; }; flask_login = buildPythonPackage rec { - name = "Flask-Login-${version}"; + pname = "Flask-Login"; version = "0.2.2"; - src = fetchurl { - url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; }; propagatedBuildInputs = [ flask ]; - buildInputs = [ nose ]; + checkInputs = [ nose ]; # No tests included doCheck = false; @@ -37,10 +51,9 @@ let jinja2 = buildPythonPackage rec { pname = "Jinja2"; version = "2.8.1"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m"; }; @@ -53,14 +66,14 @@ let }; in pythonPackages.buildPythonApplication rec { - name = "OctoPrint-${version}"; - version = "1.3.6"; + pname = "OctoPrint"; + version = "1.3.8"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "0pgpkjw5zjnks5bky51gjaksq8mhrzkl52kpgf799hl35pd08xr3"; + sha256 = "00zd5yrlihwfd3ly0mxibr77ffa8r8vkm6jhml2ml43dqb99caa3"; }; # We need old Tornado @@ -70,9 +83,10 @@ in pythonPackages.buildPythonApplication rec { psutil pyserial flask_login netaddr markdown sockjs-tornado pylru pyyaml sarge feedparser netifaces click websocket_client scandir chainmap future dateutil futures wrapt monotonic emoji + frozendict ]; - buildInputs = with pythonPackages; [ nose mock ddt ]; + checkInputs = with pythonPackages; [ nose mock ddt ]; # Jailbreak dependencies. postPatch = '' @@ -88,12 +102,15 @@ in pythonPackages.buildPythonApplication rec { -e 's,PyYAML>=[^"]*,PyYAML,g' \ -e 's,scandir>=[^"]*,scandir,g' \ -e 's,werkzeug>=[^"]*,werkzeug,g' \ - -e 's,psutil>=[^"]*,psutil,g' \ + -e 's,psutil==[^"]*,psutil,g' \ -e 's,requests>=[^"]*,requests,g' \ -e 's,future>=[^"]*,future,g' \ -e 's,pyserial>=[^"]*,pyserial,g' \ -e 's,semantic_version>=[^"]*,semantic_version,g' \ -e 's,wrapt>=[^"]*,wrapt,g' \ + -e 's,python-dateutil>=[^"]*,python-dateutil,g' \ + -e 's,emoji>=[^"]*,emoji,g' \ + -e 's,futures>=[^"]*,futures,g' \ setup.py ''; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 0a1d26012a8020afbe901c1d666116060507b813..bd65acf5e5e9ad8c12ec1bb3f8924389fa1c615b 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, octoprint, pythonPackages }: +{ stdenv, fetchFromGitHub, octoprint, pythonPackages }: let buildPlugin = args: pythonPackages.buildPythonApplication (args // { diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 9e460bf2611a41771ac202b3232b10b20bfa7a11..792cff818655f8a4fea559c972b7e6d112b44afd 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ola-${version}"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { owner = "OpenLightingProject"; repo = "ola"; rev = version; - sha256 = "1qazhkcakvzkf1dvav0alk33aaklawf8vckgwpf6fvwf7g2kyh63"; + sha256 = "18krwrw7w1qzwih8gnmv7r4sah5ppvq7ax65r7l5yjxn3ihwp2kf"; }; nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index d4847e4ce493e6022f4955ded00b512473df376d..78105ea535d6e0741c40aab62434d007da4dcaeb 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -16,7 +16,7 @@ , intltool , isocodes , libcanberra-gtk3 -, libudev +, udev , libxkbcommon , pkgconfig , procps @@ -79,7 +79,7 @@ in python3.pkgs.buildPythonApplication rec { hunspell isocodes libcanberra-gtk3 - libudev + udev libxkbcommon wrapGAppsHook xorg.libXtst @@ -88,6 +88,7 @@ in python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ glibcLocales + gobjectIntrospection # populate GI_TYPELIB_PATH intltool pkgconfig ]; diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 4655b059b339024f44ebff6357172c8145d15855..e1cc70e42779f315ee6637fd1356ec52cd09346f 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, x11 }: +{ stdenv, fetchurl, xorg, xlibsWrapper }: stdenv.mkDerivation rec { version = "1.2.sakura.5"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz"; sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f"; }; - buildInputs = [ xorg.imake xorg.gccmakedep x11 ]; - + buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ]; + configurePhase = "xmkmf"; installPhase = '' @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { homepage = "http://www.daidouji.com/oneko/"; license = licenses.publicDomain; maintainers = [ maintainers.xaverdh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } - diff --git a/pkgs/applications/misc/open-pdf-presenter/default.nix b/pkgs/applications/misc/open-pdf-presenter/default.nix deleted file mode 100644 index 0f40a236c5870582ba486d91a7b93b5d23204326..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/open-pdf-presenter/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, pythonPackages }: - -stdenv.mkDerivation rec { - name = "open-pdf-presenter-git-2014-09-23"; - - src = fetchFromGitHub { - owner = "olabini"; - repo = "open-pdf-presenter"; - rev = "f14930871b60b6ba50298c27377605e0a5fdf124"; - sha256 = "1lfqb60zmjmsvzpbz29m8yxlzs2fscingyk8jvisng1y921726rr"; - }; - - buildInputs = [ cmake qt4 pythonPackages.poppler-qt4 ]; - - meta = { - homepage = https://github.com/olabini/open-pdf-presenter; - description = "A program for presenting PDFs on multi-monitor settings (typically a laptop connected to a overhead projector)"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 1c5fde9353aa073dd464ebd863247d5e53cfd6f7..7713b5256bfa87886e49b6a01d506fa9a0828c40 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "opencpn-${version}"; - version = "4.8.2"; + version = "4.8.4"; src = fetchFromGitHub { owner = "OpenCPN"; repo = "OpenCPN"; rev = "v${version}"; - sha256 = "0r6a279xhhf4jrmjb2xi5arxb4xd5wvqbs4hyyildlgpr1x7bd09"; + sha256 = "0v4klprzddmpq7w8h2pm69sgbshirdmjrlzhz62b606gbr58fazf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 109c0afa12d0a11863dafab9b2927f4d43009954..199fa3e9bfe9edc559f13e7e14d376f0de2f04f9 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, pkgconfig, fetchurl, buildPythonApplication -, autoreconfHook, wrapGAppsHook +{ lib, pkgconfig, fetchurl, buildPythonApplication +, autoreconfHook, wrapGAppsHook, gobjectIntrospection , intltool, yelp-tools, itstool, libxmlxx3 , python, pygobject3, gtk3, gnome3, substituteAll , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg -, xkbcomp, gsettings-desktop-schemas, liblouis +, xkbcomp, gsettings-desktop-schemas , speechd, brltty, setproctitle, gst_all_1, gst-python }: with lib; let pname = "orca"; - version = "3.28.0"; + version = "3.28.2"; in buildPythonApplication rec { name = "${pname}-${version}"; @@ -18,7 +18,7 @@ in buildPythonApplication rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1jy2zxs50ah1rg4zgiaj2l2sm1zyyvs37phws0hwmy3xd90ljfc2"; + sha256 = "08rh6ji680g5nrw2n7jrxrw7nwg04sj52jxffcfasgss2f51d38q"; }; patches = [ @@ -30,11 +30,12 @@ in buildPythonApplication rec { nativeBuildInputs = [ autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 - intltool yelp-tools itstool + intltool yelp-tools itstool gobjectIntrospection ]; propagatedBuildInputs = [ - pygobject3 pyatspi dbus-python pyxdg brltty liblouis speechd gst-python setproctitle + # TODO: re-add liblouis when it is fixed + pygobject3 pyatspi dbus-python pyxdg brltty speechd gst-python setproctitle ]; buildInputs = [ diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index e70be8201b348b8ffc401456db666f5b3bd685c9..bb53782fb7d217c92faf7a0ac291905f16fa19b2 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { https://wiki.openstreetmap.org/wiki/Osmfilter ]; platforms = platforms.unix; + license = licenses.agpl3; }; } diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index 46e00a979900a0681ffc0104d3869b5df7610c68..ac985a5e4d2d780e5c9ee7f3baedd9b741bee8dd 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -1,21 +1,21 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, tmux, makeWrapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, tmux, which, makeWrapper }: buildGoPackage rec { name = "overmind-${version}"; - version = "1.1.1"; + version = "2.0.0.beta1"; goPackagePath = "github.com/DarthSim/overmind"; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$bin/bin/overmind" --prefix PATH : "${stdenv.lib.makeBinPath [ tmux ]}" + wrapProgram "$bin/bin/overmind" --prefix PATH : "${stdenv.lib.makeBinPath [ tmux which ]}" ''; src = fetchFromGitHub { owner = "DarthSim"; repo = "overmind"; rev = "v${version}"; - sha256 = "0gdsbm54ln07jv1kgg53fiavx18xxw4f21lfcdl74ijk6bx4jbzv"; + sha256 = "15fch3qszdm8bj1m9hxky9zgk6f5gpbswwfslg84qdjf4iwr5drq"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 148dd427fbc7c2d5d2a65d5d1a6b8532e2b31849..a77b2d17ecb4fa1b52dcde6704ed59dce42b38ab 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -7,10 +7,10 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "pcmanfm-1.2.5"; + name = "pcmanfm-1.3.0"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; - sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc"; + sha256 = "1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas"; }; buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 060d4899f4c73b6c16db7cca9fc43be67351e1ec..7fdfbd84d2f68e2a303240839033ff264a18a1da 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: +{ stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: -stdenv.mkDerivation { - name = "pcmanx-gtk2-1.3"; - src = fetchurl { - url = "https://github.com/pcman-bbs/pcmanx/archive/1.3.tar.gz"; - sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302"; +stdenv.mkDerivation rec { + name = "pcmanx-gtk2-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "pcman-bbs"; + repo = "pcmanx"; + rev = version; + sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -12,10 +16,12 @@ stdenv.mkDerivation { preConfigure = '' ./autogen.sh + # libtoolize generates configure script which uses older version of automake, we need to autoreconf it + cd libltdl; autoreconf; cd .. ''; meta = with stdenv.lib; { - homepage = http://pcman.ptt.cc; + homepage = https://pcman.ptt.cc; license = licenses.gpl2; description = "Telnet BBS browser with GTK+ interface"; maintainers = [ maintainers.sifmelcara ]; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c567a7903b81372f818cc411c14eff8fb91e3761 --- /dev/null +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: + +pythonPackages.buildPythonApplication rec { + name = "pdf-quench-${version}"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "linuxerwang"; + repo = "pdf-quench"; + rev = "b72b3970b371026f9a7ebe6003581e8a63af98f6"; + sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = with pkgs; [ + gtk3 + gobjectIntrospection + goocanvas2 + poppler_gi + ]; + propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; + + format = "other"; + doCheck = false; + + installPhase = '' + install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/linuxerwang/pdf-quench; + description = "A visual tool for cropping pdf files"; + platforms = platforms.linux; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index 90149263644dfa4a74b0bd378fb198a83fbe66c6..ee54904bfd66e479d3b58751af56d39218b8ef41 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -7,7 +7,7 @@ py.buildPythonApplication rec { version = "0.92"; src = fetchurl { - url = "http://www.cs.ox.ac.uk/people/cas.cremers/downloads/software/pdfdiff.py"; + url = "https://www.cs.ox.ac.uk/people/cas.cremers/downloads/software/pdfdiff.py"; sha256 = "0zxwjjbklz87wkbhkmsvhc7xmv5php7m2a9vm6ydhmhlxsybf836"; }; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 47be9dc8200ec954ea4e9e5d2bfc79c34d3be638..45d83b5872fa3e1923635b71472cd433f31aac5a 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib , mono, gtk-sharp-2_0, gnome-sharp, hyena -, which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook +, which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { --add-flags "$out/lib/pdfmod/PdfMod.exe" \ --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome2.GConf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]} ''; dontStrip = true; @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { description = "A simple application for modifying PDF documents"; platforms = platforms.all; maintainers = with maintainers; [ obadz ]; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 515127e12ebbe34a24f0599ff576f5e0a9925230..e61613a4b3054543fed0afe292ff9ace90868dba 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.1"; + version = "4.1.2"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "02cp0x5prqrizxdp0sf2sk5ip0363vyw6fxsb3zwyx4dw0vz4g96"; + sha256 = "01c2bswvxqk4biidpfj3hzf0kdk69i56ibk2wfi8v50qm105psli"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix index e06f4407534b6fee8d2185c2d09f1685fb270c58..025ad9cd30a1b33e7ae4e1ddeeb10c51945476c9 100644 --- a/pkgs/applications/misc/pdfshuffler/default.nix +++ b/pkgs/applications/misc/pdfshuffler/default.nix @@ -36,5 +36,6 @@ python3Packages.buildPythonApplication rec { description = "Merge or split pdf documents and rotate, crop and rearrange their pages"; platforms = platforms.linux; maintainers = with maintainers; [ mic92 ]; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 746a319c2e1e11a7d3a325ab9b55f1ea9d47efca..8804e438b7e8afbcdae86c8c192ee97a967286ac 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -1,72 +1,32 @@ -{ stdenv, lib, go, fetchzip, git, fetchpatch, fetchFromGitHub, fetchgit }: +{ buildGo110Package, fetchzip, lib }: -# When perkeep is updated all deps in the let block should be removed -let - gopherjs = fetchFromGitHub { - owner = "gopherjs"; - repo = "gopherjs"; - # Rev matching https://github.com/perkeep/perkeep/commit/2e46fca5cc1179dbd90bec49fec3870e6eca6c45 - rev = "b40cd48c38f9a18eb3db20d163bad78de12cf0b7"; - sha256 = "0kniz8dg5bymb03qriizza1h3gpymf97vsgq9vd222282pdj0vyc"; - }; - - gotool = fetchFromGitHub { - owner = "kisielk"; - repo = "gotool"; - rev = "80517062f582ea3340cd4baf70e86d539ae7d84d"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - - gcimporter15 = fetchgit { - url = "https://go.googlesource.com/tools"; - rev = "f8f2f88271bf2c23f28a09d288d26507a9503c97"; - sha256 = "1pchwizx1sdli59g8r0p4djfjkchcvh8msfpp3ibvz3xl250jh0n"; - }; - -in -stdenv.mkDerivation rec { +buildGo110Package rec { name = "perkeep-${version}"; - version = "20170505"; + version = "0.10.1"; src = fetchzip { - url = "https://perkeep.org/dl/monthly/camlistore-${version}-src.zip"; - sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa"; + url = "https://perkeep.org/dl/perkeep-${version}-src.zip"; + sha256 = "0rqibc6w4m1r50i2pjcgz1k9dxh18v7jwj4s29y470bc526wv422"; }; - # When perkeep is updated postPatch should be removed - postPatch = '' - rm -r ./vendor/github.com/gopherjs/gopherjs/ - cp -a ${gopherjs} ./vendor/github.com/gopherjs/gopherjs - mkdir -p ./vendor/github.com/kisielk/ - cp -a ${gotool} ./vendor/github.com/kisielk/gotool - mkdir -p ./vendor/golang.org/x/tools/go - cp -a ${gcimporter15}/go/gcimporter15 ./vendor/golang.org/x/tools/go/gcimporter15 - - substituteInPlace vendor/github.com/gopherjs/gopherjs/build/build.go \ - --replace '"github.com/fsnotify/fsnotify"' 'fsnotify "camlistore.org/pkg/misc/fakefsnotify"' - - substituteInPlace ./make.go \ - --replace "goVersionMinor = '8'" "goVersionMinor = '9'" \ - --replace "gopherJSGoMinor = '8'" "gopherJSGoMinor = '9'" - ''; - - buildInputs = [ git go ]; + goPackagePath = "perkeep.org"; - goPackagePath = ""; buildPhase = '' + cd "$NIX_BUILD_TOP/go/src/$goPackagePath" go run make.go ''; - installPhase = '' - mkdir -p $out/bin - cp bin/* $out/bin + # devcam is only useful when developing perkeep, we should not install it as + # part of this derivation. + postInstall = '' + rm -f $out/bin/devcam ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; homepage = https://perkeep.org; license = licenses.asl20; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan kalbasit ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 889f516f00b7a399b5025a1d06baa4e5936acab6..7e7850668b846a942fa07ac7ded63a33cfd562f4 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.22.2"; src = fetchurl { - url = "http://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"; + url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"; sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v"; }; diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index 7da71df7814cb2e80e4c7510f34f3715cd745e82..a17f34378a8b774db1f5f8c201153c9e3d83b73f 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } : +{ stdenv, fetchFromGitHub, postgresql, openssl } : stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.1.1"; + version = "10.3.1"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "1gv96an1ff9amh16lf71wknshmxl3l4hsl3ga7wb106c10i14zzc"; + sha256 = "0ym1arla9wfkmr5n6h6dfyd680vlnng5s5j5nyxi2gl2wxqqhxzz"; }; patchPhase = '' @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast replacement for PGAdmin"; longDescription = '' - At the heart of Postage is a modern, fast, event-based C-binary, built in - the style of NGINX and Node.js. This heart makes Postage as fast as any - PostgreSQL interface can hope to be. + At the heart of pgManage is a modern, fast, event-based C-binary, built in + the style of NGINX and Node.js. This heart makes pgManage as fast as any + PostgreSQL interface can hope to be. (Note: pgManage replaces Postage, + which is no longer maintained.) ''; homepage = https://github.com/pgManage/pgManage; license = licenses.postgresql; diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..46e26666b408a4deddf814991d2a10d2508929ae --- /dev/null +++ b/pkgs/applications/misc/plank/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3 +, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2 +, bamf, gdk_pixbuf, libdbusmenu-gtk3, file +, wrapGAppsHook, autoreconfHook, gobjectIntrospection }: + +stdenv.mkDerivation rec { + pname = "plank"; + version = "0.11.4"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://launchpad.net/${pname}/1.0/${version}/+download/${name}.tar.xz"; + sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + libxml2 # xmllint + wrapGAppsHook + gobjectIntrospection + autoreconfHook + ]; + + buildInputs = [ vala atk cairo glib gnome3.gnome-menus + gtk3 gnome3.libgee libwnck3 libX11 libXfixes + libXi pango gnome3.gnome-common bamf gdk_pixbuf + libdbusmenu-gtk3 gnome3.dconf ]; + + # fix paths + makeFlags = [ + "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" + ]; + + postPatch = '' + substituteInPlace ./configure \ + --replace "/usr/bin/file" "${file}/bin/file" + ''; + + meta = with stdenv.lib; { + description = "Elegant, simple, clean dock"; + homepage = https://launchpad.net/plank; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 9fb15aab2d450e03ec6849457d6e9b077c10dfb8..2ad6321d51911087c386740bfc7dfda084c3667c 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -21,8 +21,6 @@ , curl }: -assert stdenv.isLinux; - let version = "4.2.12"; diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index b8fa38268c385dfc4e43d4ef011ec9f0ba1ec0df..b9323ece1f44b060e14a8bbff73ec20176d771b0 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,26 +1,47 @@ -{ stdenv, fetchurl, python27Packages, wmctrl }: +{ stdenv, fetchurl, python27Packages, python36Packages, wmctrl }: -python27Packages.buildPythonPackage rec { - name = "plover-${version}"; - version = "3.1.0"; +{ + stable = with python27Packages; buildPythonPackage rec { + name = "plover-${version}"; + version = "3.1.1"; - meta = with stdenv.lib; { - description = "OpenSteno Plover stenography software"; - maintainers = with maintainers; [ twey kovirobi ]; - license = licenses.gpl2; - }; + meta = with stdenv.lib; { + description = "OpenSteno Plover stenography software"; + maintainers = with maintainers; [ twey kovirobi ]; + license = licenses.gpl2; + }; + + src = fetchurl { + url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; + sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r"; + }; - src = fetchurl { - url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4"; + buildInputs = [ pytest mock ]; + propagatedBuildInputs = [ + six setuptools pyserial appdirs hidapi wxPython xlib wmctrl + ]; }; - # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 - postPatch = '' - substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" - ''; + dev = with python36Packages; buildPythonPackage rec { + name = "plover-${version}"; + version = "4.0.0.dev8"; + + meta = with stdenv.lib; { + description = "OpenSteno Plover stenography software"; + maintainers = with maintainers; [ twey kovirobi ]; + license = licenses.gpl2; + }; - buildInputs = with python27Packages; [ pytest mock ]; - propagatedBuildInputs = with python27Packages; [ six setuptools pyserial appdirs hidapi - wxPython xlib wmctrl ]; + src = fetchurl { + url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; + sha256 = "1wxkmik1zyw5gqig5r0cas5v6f5408fbnximzw610rdisqy09rxp"; + }; + + # I'm not sure why we don't find PyQt5 here but there's a similar + # sed on many of the platforms Plover builds for + postPatch = "sed -i /PyQt5/d setup.cfg"; + + checkInputs = [ pytest mock ]; + propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth ]; + }; } diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index a3b87fd34f6829686f170c13e087ccba15f1d92c..0c358e4221a1ac0876949c9638e44db9fed14b79 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,31 +1,36 @@ { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig -, python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil -, xcbutilwm, xcbutilxrm, fetchpatch +, python2, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage +, xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper # optional packages-- override the variables ending in 'Support' to enable or # disable modules , alsaSupport ? true, alsaLib ? null -, iwSupport ? true, wirelesstools ? null , githubSupport ? false, curl ? null , mpdSupport ? false, mpd_clientlib ? null +, pulseSupport ? false, libpulseaudio ? null +, iwSupport ? false, wirelesstools ? null +, nlSupport ? true, libnl ? null , i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null }: assert alsaSupport -> alsaLib != null; assert githubSupport -> curl != null; -assert iwSupport -> wirelesstools != null; assert mpdSupport -> mpd_clientlib != null; +assert pulseSupport -> libpulseaudio != null; + +assert iwSupport -> ! nlSupport && wirelesstools != null; +assert nlSupport -> ! iwSupport && libnl != null; assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null; assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { name = "polybar-${version}"; - version = "3.1.0"; + version = "3.2.1"; src = fetchgit { url = "https://github.com/jaagr/polybar"; - rev = "bf16a4d415ea7d8845f578544de0c71e56ad314e"; - sha256 = "1jcvqxl0477j0snvh1rzqsm1dkfsybix2lgrlsgiczdxfknwz8iy"; + rev = version; + sha256 = "1z45swj2l0h8x8li7prl963cgl6zm3birsswpij8qwcmjaj5l8vz"; }; meta = with stdenv.lib; { @@ -42,18 +47,28 @@ stdenv.mkDerivation rec { buildInputs = [ cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil - xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm + xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm (if alsaSupport then alsaLib else null) (if githubSupport then curl else null) - (if iwSupport then wirelesstools else null) (if mpdSupport then mpd_clientlib else null) + (if pulseSupport then libpulseaudio else null) + + (if iwSupport then wirelesstools else null) + (if nlSupport then libnl else null) (if i3Support || i3GapsSupport then jsoncpp else null) (if i3Support then i3 else null) (if i3GapsSupport then i3-gaps else null) + + (if i3Support || i3GapsSupport then makeWrapper else null) ]; + fixupPhase = if (i3Support || i3GapsSupport) then '' + wrapProgram $out/bin/polybar \ + --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin" + '' else null; + nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index 556889e126c035475d0421987c2291103e9c89b7..3cd52af6d32185363302cc4ddf796a0f12fe22df 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz" - "http://distfiles.macports.org/pstree/${name}.tar.gz" + "https://distfiles.macports.org/pstree/${name}.tar.gz" ]; sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw"; }; diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix index a400bb04da430e9dd1064ea824f0bb0af47fbbb6..dbda7664bde077a613fd3bb6ba841d3793ce8375 100644 --- a/pkgs/applications/misc/pt/default.nix +++ b/pkgs/applications/misc/pt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "pt-0.7.3"; diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index af74ea570ab36cb81ba9799230bd50798f1ee31b..81e316eb0ee920a5769738237859f3cb8721be85 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ptask-1.0.0"; src = fetchurl { - url = "http://wpitchoune.net/ptask/files/${name}.tar.gz"; + url = "https://wpitchoune.net/ptask/files/${name}.tar.gz"; sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig makeWrapper ]; - patches = [ ./tw-version.patch ]; + patches = [ ./tw-version.patch ./json_c_is_error.patch ]; preFixup = '' wrapProgram "$out/bin/ptask" \ @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "GTK-based GUI for taskwarrior"; license = licenses.gpl2; maintainers = [ maintainers.spacefrogg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/ptask/json_c_is_error.patch b/pkgs/applications/misc/ptask/json_c_is_error.patch new file mode 100644 index 0000000000000000000000000000000000000000..435c8b26e6f7e090ef9aba48ddb7d33ec0ed1090 --- /dev/null +++ b/pkgs/applications/misc/ptask/json_c_is_error.patch @@ -0,0 +1,13 @@ +diff --git a/src/tw.c b/src/tw.c +index 602f7b3..ca601cd 100644 +--- a/src/tw.c ++++ b/src/tw.c +@@ -163,7 +163,7 @@ static struct json_object *task_exec_json(const char *opts) + + free(cmd); + +- if (o && is_error(o)) ++ if (!o) + return NULL; + + return o; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index dcbd14198f766702c5332b7a14b857ea907b5806..cdeca96568df6bd2a464148a9e9df81c92950d52 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -14,13 +14,13 @@ in python.pkgs.buildPythonApplication rec { name = "pytrainer-${version}"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "pytrainer"; repo = "pytrainer"; rev = "v${version}"; - sha256 = "09pfddjaqdpy3r27h21xvsvh04sb8hppinskxlahdqb3vjzkr581"; + sha256 = "0rzf8kks96qzlknh6g3b9pjq04j7qk6rmz58scp7sck8xz9rjbwx"; }; namePrefix = ""; diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch index 761064077a98aaf65f1732565940f962aa1ade41..ca4875769013082e08f6df90b0fc3e7736604796 100644 --- a/pkgs/applications/misc/pytrainer/fix-test-tz.patch +++ b/pkgs/applications/misc/pytrainer/fix-test-tz.patch @@ -30,13 +30,16 @@ diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrain + summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1') self.ddbb.session.add(activity) - self.ddbb.session.commit() + self.ddbb.session.commit( diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py ---- source.orig/pytrainer/test/lib/test_date.py 2018-02-27 22:15:32.079243364 +0100 -+++ source/pytrainer/test/lib/test_date.py 2018-02-27 22:16:33.936867052 +0100 -@@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase +--- source.orig/pytrainer/test/lib/test_date.py 2018-05-10 21:15:22.196275555 +0200 ++++ source/pytrainer/test/lib/test_date.py 2018-05-10 21:22:43.647870401 +0200 +@@ -47,7 +47,7 @@ class DateFunctionTest(unittest.TestCase def test_getDateTime(self): utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015') self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime) - self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime) + self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime) + + class DateRangeTest(unittest.TestCase): + diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index e162d0d317f7f89830b61bf57caf64ea31aa8884..2fa4887a0f0fce712f5e7f04b825b6ee4019c2d7 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { name = "qlcplus-${version}"; - version = "4.11.1"; + version = "4.11.2"; src = fetchFromGitHub { owner = "mcallegari"; repo = "qlcplus"; rev = "QLC+_${version}"; - sha256 = "0lb1mdp7kbnkja14phgyknr65irwkxcmzk96rqacysvwrvzvfzyd"; + sha256 = "0ry7j8d5mm3h3mzd49xqlagnldmfhfr6plwk73pz62hxr4j58s6w"; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index bc09d0b4d0ac21dffbb66f87b9c9cafafab65b67..3b9e76aee4b85cc08f056e73cf42b2fe999bcadb 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qmapshack-${version}"; - version = "1.10.0"; + version = "1.11.1"; src = fetchurl { url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz"; - sha256 = "10qk6c5myw5dhkbw7pcrx3900kiqhs32vy47xl2844nzb4fq2liw"; + sha256 = "0yqilfldmfw8m18jbkffv4ar1px6kjs0zlgb216bnhahcr1y8r9y"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index e3e7ff950b0c82c9c53e595b8df8a8cf01afd7da..dfaa90d43adf8e7d56372d4a7f99989f53001f6b 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, pkgconfig, poppler_qt4, djvulibre, libspectre, cups +{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups , file, ghostscript }: let @@ -10,9 +10,9 @@ let url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ - qt4 poppler_qt4 djvulibre libspectre cups file ghostscript + qtbase qtsvg poppler djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { @@ -21,13 +21,12 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - configurePhase = '' - qmake *.pro - for i in *.pro; do - qmake "$i" -o "Makefile.$(basename "$i" .pro)" - done - sed -e "s@/usr/@$out/@g" -i Makefile* + + # TODO: revert this once placeholder is supported + preConfigure = '' + qmakeFlags="$qmakeFlags *.pro TARGET_INSTALL_PATH=$out/bin PLUGIN_INSTALL_PATH=$out/lib/qpdfview DATA_INSTALL_PATH=$out/share/qpdfview MANUAL_INSTALL_PATH=$out/share/man/man1 ICON_INSTALL_PATH=$out/share/icons/hicolor/scalable/apps LAUNCHER_INSTALL_PATH=$out/share/applications APPDATA_INSTALL_PATH=$out/share/appdata" ''; + meta = { inherit (s) version; description = "A tabbed document viewer"; diff --git a/pkgs/applications/misc/qradiolink/default.nix b/pkgs/applications/misc/qradiolink/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4029bd80b88bfd9ef8b39a78444415073a9f82f5 --- /dev/null +++ b/pkgs/applications/misc/qradiolink/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, alsaLib, boost +, qt4, libpulseaudio, codec2, libconfig +, gnuradio, gnuradio-osmosdr, gsm +, libopus, libjpeg, protobuf, qwt, speex +} : + +let + version = "0.5.0"; + +in stdenv.mkDerivation { + name = "qradiolink-${version}"; + + src = fetchFromGitHub { + owner = "kantooon"; + repo = "qradiolink"; + rev = "${version}"; + sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi"; + }; + + preBuild = '' + cd ext + protoc --cpp_out=. Mumble.proto + protoc --cpp_out=. QRadioLink.proto + cd .. + qmake + ''; + + installPhase = '' + mkdir -p $out/bin + cp qradiolink $out/bin + ''; + + buildInputs = [ + qt4 + alsaLib + boost + libpulseaudio + codec2 + libconfig + gsm + gnuradio + gnuradio-osmosdr + libopus + libjpeg + protobuf + speex + qwt + ]; + + meta = with stdenv.lib; { + description = "SDR transceiver application for analog and digital modes"; + homepage = http://qradiolink.org/; + license = licenses.agpl3; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/qsstv/default.nix b/pkgs/applications/misc/qsstv/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c8401cdbf49e14f4d2da2a60f6cce6ddb40f853c --- /dev/null +++ b/pkgs/applications/misc/qsstv/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, qtbase, qmake, makeDesktopItem, openjpeg, pkgconfig, fftw, + libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: + +stdenv.mkDerivation rec { + version = "9.2.6"; + name = "qsstv-${version}"; + + src = fetchurl { + url = "http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"; + sha256 = "0sx70yk389fq5djvjwnam6ics5knmg9b5x608bk2sjbfxkila108"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + qmake + pkgconfig + ]; + + buildInputs = [ qtbase openjpeg fftw libpulseaudio alsaLib hamlib libv4l + fftwFloat ]; + + desktopItem = makeDesktopItem { + name = "QSSTV"; + exec = "qsstv"; + icon = "qsstv.png"; + comment = "Qt-based slow-scan TV and fax"; + desktopName = "QSSTV"; + genericName = "qsstv"; + categories = "Application;HamRadio;"; + }; + + installPhase = '' + # Install binary to the right location + make install INSTALL_ROOT=$out + mv $out/usr/bin $out/ + rm -r $out/usr + + # Install desktop icon + install -D qsstv/icons/qsstv.png $out/share/pixmaps/qsstv.png + + # Install desktop item + cp -rv ${desktopItem}/share $out + ''; + + meta = with stdenv.lib; { + description = "Qt-based slow-scan TV and fax"; + homepage = http://users.telenet.be/on4qz/; + platforms = platforms.linux; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ hax404 ]; + }; +} + diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 88628c63c9cee8753b6f4430a87a5cf3dfecce8f..6ae8f380fe28bacd574e40dbd24b48631aa15b77 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null +{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps , qtbase, qtwebengine, qtwebkit , cmake , syncthing diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 3a2ec62222f02c9d3640771252b74f05b9f89106..90908c67b4e0cacb55a31d89daf995b4e0d6efe0 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, qt5 }: let - version = "1.10.01"; + version = "1.40.13"; in stdenv.mkDerivation { name = "qtbitcointrader-${version}"; src = fetchurl { url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; - sha256 = "0pgj8rsk9yxvls7yjpzblzbci2vvd0mlf9c7wdbjhwf6qyi7dfi3"; + sha256 = "0d6b9ls742nghzg5y97dx7myvv8i88f0s27lhr52yy4833hdxdwn"; }; buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ]; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index b13bc4cb7af24ce99e6ca7481fcdca5347eec9cb..33b8c33033ead9ae35035ac92656fb146c184fee 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, pythonPackages, file, less +{ stdenv, fetchFromGitHub, python3Packages, file, less , imagePreviewSupport ? true, w3m ? null}: with stdenv.lib; assert imagePreviewSupport -> w3m != null; -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "ranger-${version}"; version = "1.9.1"; @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj"; }; - checkInputs = with pythonPackages; [ pytest ]; + checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = [ file ]; checkPhase = '' @@ -43,7 +43,7 @@ pythonPackages.buildPythonApplication rec { # give image previews out of the box when building with w3m substituteInPlace ranger/config/rc.conf \ - --replace "set preview_images false" "set preview_images true" \ + --replace "set preview_images false" "set preview_images true" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 7a4348260fd38135d0847867f3c0e67a088e097c..bf4559e911780e2c699976aacdf88c51492f4074 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchpatch, pkgconfig, libssh2 +{ stdenv, lib, fetchgit, pkgconfig, libssh2 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols , qtsvg, qttools, qtquick1, qtcharts , qmake diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index b7ab092bbc040208726b1da22282a3b3c69daed5..b8c49cb02a6974758808f69040112ec89f48d2e5 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,16 +1,22 @@ -{ stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool -, libtool, pkgconfig, wrapGAppsHook, wrapPython, geoclue2, gobjectIntrospection -, gtk3, python, pygobject3, pyxdg, libdrm, libxcb, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool +, libtool, pkgconfig, wrapGAppsHook, wrapPython, gobjectIntrospection +, gtk3, python, pygobject3, hicolor-icon-theme, pyxdg + +, withCoreLocation ? stdenv.isDarwin, CoreLocation, Foundation, Cocoa +, withQuartz ? stdenv.isDarwin, ApplicationServices +, withRandr ? stdenv.isLinux, libxcb +, withDrm ? stdenv.isLinux, libdrm +, withGeoclue ? stdenv.isLinux, geoclue }: stdenv.mkDerivation rec { name = "redshift-${version}"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "jonls"; repo = "redshift"; rev = "v${version}"; - sha256 = "0jfi4wqklqw2rm0r2xwalyzir88zkdvqj0z5id0l5v20vsrfiiyj"; + sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6"; }; patches = [ @@ -29,15 +35,25 @@ stdenv.mkDerivation rec { wrapPython ]; + configureFlags = [ + "--enable-randr=${if withRandr then "yes" else "no"}" + "--enable-geoclue2=${if withGeoclue then "yes" else "no"}" + "--enable-drm=${if withDrm then "yes" else "no"}" + "--enable-quartz=${if withQuartz then "yes" else "no"}" + "--enable-corelocation=${if withCoreLocation then "yes" else "no"}" + ]; + buildInputs = [ - geoclue2 gobjectIntrospection gtk3 - libdrm - libxcb python hicolor-icon-theme - ]; + ] ++ stdenv.lib.optional withRandr libxcb + ++ stdenv.lib.optional withGeoclue geoclue + ++ stdenv.lib.optional withDrm libdrm + ++ stdenv.lib.optional withQuartz ApplicationServices + ++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ] + ; pythonPath = [ pygobject3 pyxdg ]; @@ -45,6 +61,15 @@ stdenv.mkDerivation rec { postFixup = "wrapPythonPrograms"; + # the geoclue agent may inspect these paths and expect them to be + # valid without having the correct $PATH set + postInstall = '' + substituteInPlace $out/share/applications/redshift.desktop \ + --replace 'Exec=redshift' "Exec=$out/bin/redshift" + substituteInPlace $out/share/applications/redshift.desktop \ + --replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk" + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { @@ -59,7 +84,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; homepage = http://jonls.dk/redshift; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ yegortimoshenko ]; }; } diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 8928ee18064db2844337f912a1708bf3ad7dcd09..be365cb94e4e1f059e01f0d598a06393e672376f 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, +{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, libGL, freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: stdenv.mkDerivation rec { @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { dbus fontconfig freetype + libGL ]; installPhase = '' diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 7da721e9f3740c373c9dbdc13e88c49f51016636..2d22d87c49a8d37a30a8a67c4584777318f8bafe 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git -, cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification +, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification , bison, flex, librsvg, check }: diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix index 44c6f892bf582c6149926b9203be0186fa675841..c2384f56faa1a775636f915bd99dc9da85de4f18 100644 --- a/pkgs/applications/misc/rofi/wrapper.nix +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -1,14 +1,19 @@ -{ stdenv, rofi-unwrapped, makeWrapper, theme ? null, lib }: +{ stdenv, rofi-unwrapped, makeWrapper, theme ? null }: +if theme == null then rofi-unwrapped else stdenv.mkDerivation { name = "rofi-${rofi-unwrapped.version}"; buildInputs = [ makeWrapper ]; preferLocalBuild = true; - passthru = { unwrapped = rofi-unwrapped; }; + passthru.unwrapped = rofi-unwrapped; buildCommand = '' - mkdir -p $out/bin - ln -s ${rofi-unwrapped}/bin/rofi $out/bin/rofi - ${lib.optionalString (theme != null) ''wrapProgram $out/bin/rofi --add-flags "-theme ${theme}"''} + mkdir $out + ln -s ${rofi-unwrapped}/* $out + rm $out/bin + mkdir $out/bin + ln -s ${rofi-unwrapped}/bin/* $out/bin + rm $out/bin/rofi + makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi --add-flags "-theme ${theme}" ''; meta = rofi-unwrapped.meta // { diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index 1d0c7d28de6e4599a2fa49c97637724a8dccfcb1..11a75e4064f40d5649714f13ca8bbf0f00d5aaf6 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext -, gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme -, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper +{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat +, gsettings-desktop-schemas, gdk_pixbuf, gtk3, hicolor-icon-theme +, imagemagick, itstool, librsvg, libtool, libxslt, makeWrapper , pkgconfig, python, pythonPackages, vte , wrapGAppsHook}: @@ -22,13 +22,13 @@ in stdenv.mkDerivation rec { buildInputs = [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt - makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib + makeWrapper python pythonPackages.lockfile dbus dbus-glib gdk_pixbuf gsettings-desktop-schemas gtk3 hicolor-icon-theme vte ]; NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" - "-I${dbus_libs.dev}/include/dbus-1.0" - "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; + "-I${dbus.dev}/include/dbus-1.0" + "-I${dbus.lib}/lib/dbus-1.0/include" ]; # Fix up python path so the lockfile library is on it. PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [ diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix index f1c3cbc55577612804b59e44744f2ca1a80fea2a..bedfc563b1c07c3b9da920c66b5b90bfa2883171 100644 --- a/pkgs/applications/misc/rtl-sdr/default.nix +++ b/pkgs/applications/misc/rtl-sdr/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libusb1 }: +{ stdenv, lib, fetchpatch, fetchgit, cmake, pkgconfig, libusb1 }: stdenv.mkDerivation rec { name = "rtl-sdr-${version}"; - version = "0.5.3"; + version = "0.5.4"; src = fetchgit { url = "git://git.osmocom.org/rtl-sdr.git"; rev = "refs/tags/v${version}"; - sha256 = "1dh52xcvxkjb3mj80wlm20grz8cqf5wipx2ksi91ascz12b5pym6"; + sha256 = "0c56a9dhlqgs6y15ns0mn4r5giz0x6y7x151jcq755f711pc3y01"; }; nativeBuildInputs = [ pkgconfig ]; @@ -26,7 +26,13 @@ stdenv.mkDerivation rec { grep -q "Requires:" "$pcfile" && { echo "Upstream has added 'Requires:' in $(basename "$pcfile"); update nix expression."; exit 1; } echo "Requires: libusb-1.0" >> "$pcfile" ''; - + patches = lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "linker-fix.patch"; + url = "https://github.com/lukeadams/rtl-sdr/commit/7a66dcf268305b5aa507d1756799942c74549b72.patch"; + sha256 = "0cn9fyf4ay4i3shvxj1ivgyxjvfm401irk560jdjl594nzadrcsl"; + }) + ]; meta = with stdenv.lib; { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr; diff --git a/pkgs/applications/misc/rtl_433/default.nix b/pkgs/applications/misc/rtl_433/default.nix index 819c6c9391a986a0deb8bf781df874fb498121c6..7097dda35740f435dc4cb014f3ca23d579a6f982 100644 --- a/pkgs/applications/misc/rtl_433/default.nix +++ b/pkgs/applications/misc/rtl_433/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }: stdenv.mkDerivation rec { - version = "2018-02-23"; + version = "18.05"; name = "rtl_433-${version}"; src = fetchFromGitHub { owner = "merbanan"; repo = "rtl_433"; - rev = "51d275c"; - sha256 = "1j443wmws5xgc18s47bvw3pqljk747izypz52rmlrvs16v96cg2g"; + rev = "18.05"; + sha256 = "0vfhnjyrx6w1m8g1hww5vdz4zgdlhcaps9g0397mxlki4sm77wpc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 5ca8bfcf5dfe745e76d007c8649d6ba581244ae8..05b19bbbff9c8962260f59b5a8d42b5ce16a4a43 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, pkgs, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -with pythonPackages; +with python3Packages; buildPythonApplication rec { - version = "1.22.1"; - name = "rtv-${version}"; + version = "1.24.0"; + pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "1jil8cwhnpf2mclgah7s79j4c38hzm0j6di2mffrqhlsnn2vxbf4"; + sha256 = "0vzhnqys8nr6ymsi1mnv092z3i7nwyhgnj4jv6mjifak9j3164fw"; }; # Tests try to access network @@ -19,7 +19,7 @@ buildPythonApplication rec { py.test ''; - buildInputs = [ + checkInputs = [ coverage coveralls docopt @@ -30,24 +30,17 @@ buildPythonApplication rec { ]; propagatedBuildInputs = [ - backports_functools_lru_cache beautifulsoup4 - configparser - contextlib2 decorator kitchen - mailcap-fix - mccabe requests six - tornado - pyyaml ]; meta = with stdenv.lib; { homepage = https://github.com/michael-lazar/rtv; description = "Browse Reddit from your Terminal"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ]; + maintainers = with maintainers; [ jgeerds wedens ]; }; } diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 4ee9f461760cecaac8b8152faff257ed712c9c40..0e59ef5512d811f31bcafba576cd2265c21d8b8b 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation (rec { downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; maintainers = [ ]; platforms = platforms.unix; + license = licenses.gpl3; }; }) diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix index 98d7e12a8ed889cf76319cf05f9821cb52fe8b09..909c267def828eca3a50425a03f375db04c4b14e 100644 --- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix +++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, rxvt_unicode, makeWrapper, plugins }: +{ symlinkJoin, rxvt_unicode, makeWrapper, plugins }: let rxvt_name = builtins.parseDrvName rxvt_unicode.name; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e0c5946d564f16566836d520f60075a6e5ff0bb5 --- /dev/null +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -0,0 +1,71 @@ +{ lib, python3Packages, gobjectIntrospection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk_pixbuf, shared-mime-info, librsvg +}: + +let inherit (python3Packages) python buildPythonApplication fetchPypi; + +in buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "safeeyes"; + version = "2.0.6"; + namePrefix = ""; + + src = fetchPypi { + inherit pname version; + sha256 = "0s14pxicgq33srvhf6bvfq48wv3z4rlsmzkccz4ky9vh3gfx7zka"; + }; + + buildInputs = [ + gtk3 + gobjectIntrospection + gnome3.defaultIconTheme + gnome3.adwaita-icon-theme + ]; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + propagatedBuildInputs = with python3Packages; [ + Babel + psutil + xlib + pygobject3 + dbus-python + + libappindicator-gtk3 + libnotify + xprintidle-ng + ]; + + # patch smartpause plugin + postPatch = '' + sed -i \ + -e 's!xprintidle!xprintidle-ng!g' \ + safeeyes/plugins/smartpause/plugin.py + + sed -i \ + -e 's!xprintidle!xprintidle-ng!g' \ + safeeyes/plugins/smartpause/config.json + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" + + # safeeyes images + --prefix XDG_DATA_DIRS : "$out/lib/${python.libPrefix}/site-packages/usr/share" + ) + ''; + + doCheck = false; # no tests + + meta = { + homepage = http://slgobinath.github.io/SafeEyes; + description = "Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder. A Free and Open Source Linux alternative to EyeLeo"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ srghma ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 7c74bb6cd45926ca246fa4e3caf6e0f6fbb241fb..94782bdd860fbfaf7b6076390d66ef1b6a6c0aca 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sakura-${version}"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "0fhcn3540iw22l5zg3njh5z8cj0g2n9p6fvagjqa5zc323jfsc7b"; + sha256 = "1q463qm41ym7jb3kbzjz7b6x549vmgkb70arpkhsf86yxly1y5m1"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index 14680619e0c2df201a3d73b076d26871f0153c79..6f38ba5662b5f63a53a73c5fcf64d0ad49e50825 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sbagen-1.4.4"; src = fetchurl { - url = "http://uazu.net/sbagen/${name}.tgz"; + url = "https://uazu.net/sbagen/${name}.tgz"; sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2"; }; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index e664a5a752747fa8da338221169962795131191a..280a42fde14c097c54fd5239b6e9bc060a80121f 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { homepage = https://github.com/andmarti1424/sc-im; description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; license = licenses.bsdOriginal; - maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.linux; # Cannot test others + maintainers = [ ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index 0a8d20a3958dc21ea6f1d5b6a82db9dba942a9cc..cc8c30043b2931cc12e9a42cb574211b2d80d876 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { mkdir locale ''; - NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__" - + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; + NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; meta = with stdenv.lib; { homepage = https://dushistov.github.io/sdcv/; diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix index 24e76500a6a5c9daee93d0fe1d31d5d20ed14e84..9bbae33b3e4115f021cf5431958b357a3d140eab 100644 --- a/pkgs/applications/misc/sent/default.nix +++ b/pkgs/applications/misc/sent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, farbfeld, libX11, libXft +{ stdenv, fetchurl, farbfeld, libX11, libXft, makeWrapper , patches ? [] }: stdenv.mkDerivation rec { @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv"; }; - buildInputs = [ farbfeld libX11 libXft ]; + buildInputs = [ libX11 libXft ]; + nativeBuildInputs = [ makeWrapper ]; # unpacking doesn't create a directory sourceRoot = "."; @@ -17,6 +18,9 @@ stdenv.mkDerivation rec { inherit patches; installFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram "$out/bin/sent" --prefix PATH : "${farbfeld}/bin" + ''; meta = with stdenv.lib; { description = "A simple plaintext presentation tool"; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 2c8753efcd745279e55ab809288d5a44ae9870f5..35242822d4a035b6c603acc4b41fd61343b6b705 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub -, cmake, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook -, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2 }: +, meson, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook, desktop-file-utils +, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }: let - version = "0.5.4"; + version = "0.6.0"; sqlGda = libgda.override { mysqlSupport = true; postgresSupport = true; @@ -17,12 +17,17 @@ in stdenv.mkDerivation rec { owner = "Alecaddd"; repo = "sequeler"; rev = "v${version}"; - sha256 = "05c7y6xdyq3h9bn90pbz03jhy9kabmgpxi4zz0i26q0qphljskbx"; + sha256 = "04x3fg665201g3zy66sicfna4vac4n1pmrahbra90gvfzaia1cai"; }; - nativeBuildInputs = [ cmake ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook desktop-file-utils ]; - buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 ]; + buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; meta = with stdenv.lib; { description = "Friendly SQL Client"; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 622f6e14752496f98be7e19ef0600be212319aa4..936b1a389f1eee83fa1d43327eb0d7d741179542 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchPypi, pythonPackages }: +{ lib, buildPythonApplication, fetchPypi, pythonPackages, ffmpeg }: buildPythonApplication rec { version = "1.4.0"; @@ -20,6 +20,8 @@ buildPythonApplication rec { blinker ]; + makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ]; + # No tests included doCheck = false; @@ -27,7 +29,7 @@ buildPythonApplication rec { description = "Yet another simple static gallery generator"; homepage = http://sigal.saimon.org/en/latest/index.html; license = licenses.mit; - maintainers = with maintainers; [ domenkozar matthiasbeyer ]; + maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 7fbf11573c490ee2a0cd572cd1209a15f6aa1efd..719b8d32b33036ee468b28e4ecfe58e526d6a470 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,15 +1,15 @@ { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr -, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }: +, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr +, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }: - stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "simplenote-${pkgver}"; - pkgver = "1.0.6"; + pkgver = "1.1.3"; src = fetchurl { - url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-x64.${pkgver}.tar.gz"; - sha256 = "18wj880iw92yd57w781dqaj7iv9j3bqhyh2cbikqrl4m5w9xkla8"; + url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-${pkgver}.tar.gz"; + sha256 = "1z92yyjmg3bgfqfdpnysf98h9hhhnqzdqqigwlmdmn3d7fy49kcf"; }; buildCommand = let @@ -19,7 +19,8 @@ fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome3.gconf + xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf + xorg.libxcb ]; libPathNative = lib.makeLibraryPath packages; diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cf5c4625c952ac31e682c1d092897911f8d0bfdd --- /dev/null +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchgit, qt5, zlib, libGLU, libX11 }: + +let + name = "sleepyhead-${version}"; + version = "1.0.0-beta-git"; +in stdenv.mkDerivation { + inherit name; + + src = fetchgit { + url = https://gitlab.com/sleepyhead/sleepyhead-code.git; + rev = "9e2329d8bca45693231b5e3dae80063717c24578"; + sha256 = "0448z8gyaxpgpnksg34lzmffj36jdpm0ir4xxa5gvzagkx0wk07h"; + }; + + buildInputs = [ + qt5.qtbase qt5.qtwebkit qt5.qtserialport + zlib + libGLU + libX11 + ]; + + patchPhase = '' + patchShebangs configure + ''; + + installPhase = '' + mkdir -p $out/bin + cp sleepyhead/SleepyHead $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://sleepyhead.jedimark.net/; + description = "Review and explore data produced by CPAP and related machines"; + longDescription = '' + SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea. + ''; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.krav ]; + }; + +} diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 8624cc9dda589ad4c46ca9e29f81c83f2380b850..21b55e6e7a01f50e362ad8842da902ba37d552ee 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX ExtUtilsMakeMaker OpenGL WxGLCanvas ModuleBuild LWP + ExtUtilsCppGuess ModuleBuildWithXSpp ExtUtilsTypemapsDefault ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r/prusa3d.nix similarity index 83% rename from pkgs/applications/misc/slic3r-prusa3d/default.nix rename to pkgs/applications/misc/slic3r/prusa3d.nix index 3a55ea6205ecb2d91bdb3bf563af973f47f6bbe2..9f4036c3f967545cdae54f91be1e433fa647d772 100644 --- a/pkgs/applications/misc/slic3r-prusa3d/default.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, - boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU, - glew, eigen }: + boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU, + glew, eigen, curl }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { name = "Alien-wxWidgets-0.69"; @@ -33,12 +33,13 @@ let in stdenv.mkDerivation rec { name = "slic3r-prusa-edition-${version}"; - version = "1.39.1"; + version = "1.40.1"; enableParallelBuilding = true; buildInputs = [ cmake + curl perl makeWrapper eigen @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { ClassXSAccessor EncodeLocale ExtUtilsMakeMaker + ExtUtilsTypemapsDefault ExtUtilsXSpp GrowlGNTP ImportInto @@ -62,7 +64,7 @@ stdenv.mkDerivation rec { MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath - ModuleBuild + ModuleBuildWithXSpp Moo NetDBus OpenGL @@ -72,6 +74,8 @@ stdenv.mkDerivation rec { prePatch = '' sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp + sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt + sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt ''; postInstall = '' @@ -81,14 +85,14 @@ stdenv.mkDerivation rec { # it seems we need to copy the icons... mkdir -p $out/bin/var - cp ../resources/icons/* $out/bin/var/ + cp -r ../resources/icons/* $out/bin/var/ cp -r ../resources $out/bin/ ''; src = fetchFromGitHub { owner = "prusa3d"; repo = "Slic3r"; - sha256 = "0frkjgzmiy788ijkcqz3baxcrncqmk9s2vcd99hb8p2q13cg51ff"; + sha256 = "022mdz8824wg68qwgd49gnplw7wn84hqw113xh8l25v3j1jb9zmc"; rev = "version_${version}"; }; diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index bc855db29ecc8ba9d0c9db7c4b5293b283c093a7..f4a2e889cd434f7ba926a31159272aebdb2416ad 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "slstatus-${version}"; - version = "unstable-2018-03-28"; + version = "unstable-2018-04-16"; src = fetchgit { url = https://git.suckless.org/slstatus; - rev = "faa52bdcc0221de2d8fae950e409a8ac5e05bfcd"; - sha256 = "0i8k7gjvx51y0mwxjlqhyk2dpvkb2d3y8x4l6ckdnyiy5632pn76"; + rev = "97ef7c2a1d67bb2c9c379e657fbc8e35acd6aafb"; + sha256 = "1777hgl10imk0l2sgnqgbkfchv1mpxrd82ninzwp7f1rgwchz36v"; }; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); diff --git a/pkgs/applications/misc/soapyairspy/default.nix b/pkgs/applications/misc/soapyairspy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..af72c784135d48ec1b53cd25c0ac2ccf6bf25c72 --- /dev/null +++ b/pkgs/applications/misc/soapyairspy/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake +, airspy, soapysdr +} : + +let + version = "0.1.1"; + +in stdenv.mkDerivation { + name = "soapyairspy-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyAirspy"; + rev = "soapy-airspy-${version}"; + sha256 = "072vc9619s9f22k7639krr1p2418cmhgm44yhzy7x9dzapc43wvk"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ airspy soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyAirspy; + description = "SoapySDR plugin for Airspy devices"; + license = licenses.mit; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapybladerf/default.nix b/pkgs/applications/misc/soapybladerf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4e1adc32946eca606050c8440b5e0d0513ab83cd --- /dev/null +++ b/pkgs/applications/misc/soapybladerf/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, libbladeRF, soapysdr +} : + +let + version = "0.3.5"; + +in stdenv.mkDerivation { + name = "soapybladerf-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyBladeRF"; + rev = "soapy-bladerf-${version}"; + sha256 = "1n7vy6y8k1smq3l729npxbhxbnrc79gz06dxkibsihz4k8sddkrg"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libbladeRF soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyBladeRF; + description = "SoapySDR plugin for BladeRF devices"; + license = licenses.lgpl21; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapyhackrf/default.nix b/pkgs/applications/misc/soapyhackrf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2c5dd058ced35c5e77d2629c4e86b4cab3376785 --- /dev/null +++ b/pkgs/applications/misc/soapyhackrf/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, hackrf, soapysdr +} : + +let + version = "0.3.3"; + +in stdenv.mkDerivation { + name = "soapyhackrf-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyHackRF"; + rev = "soapy-hackrf-${version}"; + sha256 = "1awn89z462500gb3fjb7x61b1znkjri9n1d39bqfip1qk4s11pxc"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ hackrf soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyHackRF; + description = "SoapySDR plugin for HackRF devices"; + license = licenses.mit; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapyremote/default.nix b/pkgs/applications/misc/soapyremote/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d10b09f99a8d211feb04df717c1e3a22923525e9 --- /dev/null +++ b/pkgs/applications/misc/soapyremote/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, soapysdr }: + +let + version = "0.4.3"; + +in stdenv.mkDerivation { + name = "soapyremote-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyRemote"; + rev = "d07f43863b1ef79252f8029cfb5947220f21311d"; + sha256 = "0i101dfqq0aawybv0qyjgsnhk39dc4q6z6ys2gsvwjhpf3d48aw0"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyRemote; + description = "SoapySDR plugin for remote access to SDRs"; + license = licenses.boost; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6230f2f6f6a66f68f8b8b19dbeee3c6deac310f0 --- /dev/null +++ b/pkgs/applications/misc/soapysdr/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, lndir, makeWrapper +, fetchFromGitHub, cmake +, libusb, pkgconfig +, python, swig2, numpy, ncurses +, extraPackages ? [] +} : + +let + version = "0.6.1"; + +in stdenv.mkDerivation { + name = "soapysdr-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapySDR"; + rev = "soapy-sdr-${version}"; + sha256 = "1azbb2j6dv0b2dd5ks6yqd31j17sdhi9p82czwc8zy2isymax0l9"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libusb ncurses numpy swig2 python ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DUSE_PYTHON_CONFIG=ON" + ]; + + postFixup = lib.optionalString (lib.length extraPackages != 0) '' + # Join all plugins via symlinking + for i in ${toString extraPackages}; do + ${lndir}/bin/lndir -silent $i $out + done + + # Needed for at least the remote plugin server + for file in out/bin/*; do + ${makeWrapper}/bin/wrapProgram "$file" \ + --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages} + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapySDR; + description = "Vendor and platform neutral SDR support library"; + license = licenses.boost; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/misc/soapyuhd/default.nix b/pkgs/applications/misc/soapyuhd/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4f2a79c97fe2d2847cc8d39ef556b151006dad7e --- /dev/null +++ b/pkgs/applications/misc/soapyuhd/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, uhd, boost, soapysdr +} : + +let + version = "0.3.4"; + +in stdenv.mkDerivation { + name = "soapyuhd-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyUHD"; + rev = "soapy-uhd-${version}"; + sha256 = "1da7cjcvfdqhgznm7x14s1h7lwz5lan1b48akw445ah1vxwvh4hl"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ uhd boost soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + postPatch = '' + sed -i "s:DESTINATION .*uhd/modules:DESTINATION $out/lib/uhd/modules:" CMakeLists.txt + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyAirspy; + description = "SoapySDR plugin for UHD devices"; + license = licenses.gpl3; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 55153d25cf98c4d838793fd15663efa6a9392518..afe944e868e7dbdc25db15e391adb9250b719daa 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -1,11 +1,13 @@ -{fetchurl, stdenv, gtk3, python34Packages, gobjectIntrospection}: +{fetchFromGitHub, stdenv, gtk3, python34Packages, gobjectIntrospection}: python34Packages.buildPythonApplication rec { - name = "solaar-${version}"; - version = "0.9.2"; + name = "solaar-unstable-${version}"; + version = "2018-02-02"; namePrefix = ""; - src = fetchurl { - sha256 = "0954grz2adggfzcj4df4mpr4d7qyl7w8rb4j2s0f9ymawl92i05j"; - url = "https://github.com/pwr/Solaar/archive/${version}.tar.gz"; + src = fetchFromGitHub { + owner = "pwr"; + repo = "Solaar"; + rev = "59b7285fdfc875119f0c92cfd5f5909e8a8e578c"; + sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3"; }; propagatedBuildInputs = [python34Packages.pygobject3 python34Packages.pyudev gobjectIntrospection gtk3]; @@ -35,6 +37,6 @@ python34Packages.buildPythonApplication rec { license = licenses.gpl2; homepage = https://pwr.github.io/Solaar/; platforms = platforms.linux; - maintainers = [maintainers.spinus]; + maintainers = [maintainers.spinus maintainers.ysndr]; }; } diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 6fa594dec046f403e8d16b18ece237f15c850801..9f20b20f7f3a3ffbc40e96bcf8f5e977fe4f558d 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,6 +1,6 @@ { pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils , shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer -, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2, hicolor-icon-theme, adwaita-icon-theme }: +, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }: stdenv.mkDerivation rec { name = "spacefm-${version}"; diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index c7512a8ac271ff3cf91e0a262fb7bd561a0734f9..efaf986a9e54bd16d229d257a5d527dc811a02a2 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -3,16 +3,15 @@ with stdenv.lib; -let patches' = if patches == null then [] else patches; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "st-0.8.1"; src = fetchurl { - url = "http://dl.suckless.org/st/${name}.tar.gz"; + url = "https://dl.suckless.org/st/${name}.tar.gz"; sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4"; }; - patches = patches'; + inherit patches; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; @@ -29,7 +28,7 @@ in stdenv.mkDerivation rec { homepage = https://st.suckless.org/; description = "Simple Terminal for X from Suckless.org Community"; license = licenses.mit; - maintainers = with maintainers; [viric andsild]; + maintainers = with maintainers; [andsild]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index ebb50e685da73204880923186124134e64cb10d7..6d6382faccd45eb97dadae94e0cfde1a5c9b11ad 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = https://github.com/seenaburns/stag; description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index 8be792c673c02e4ee49cdd2aaff2818bf5d1f0ec..d3cd81f7f13a8a137784bde7c3199a30e5dcf767 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocf, ptime, - uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, camlp4, omd +{ stdenv, fetchFromGitLab, ocaml, findlib, ocf, ptime, + uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, omd }: stdenv.mkDerivation rec { name = "stog-${version}"; - version = "0.17.0"; - src = fetchFromGitHub { + version = "0.18.0"; + src = fetchFromGitLab { + domain = "framagit.org"; owner = "zoggy"; repo = "stog"; - rev = "release-${version}"; - sha256 = "06fnl3im0rycn05w39adfmm7w4s8l3jrj43h8f8h3b56grh21x0d"; + rev = version; + sha256 = "154gl3ljxqlw8wz1vmsyv8180igrl5bjq0wir7ybrnzq2cdflkv0"; }; - buildInputs = [ ocaml camlp4 uutf ]; + buildInputs = [ ocaml uutf ]; propagatedBuildInputs = [ findlib omd ppx_blob ocf ptime uri xtmpl ocaml_lwt higlo ]; createFindlibDestdir = true; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XML documents and web site compiler"; - homepage = https://zoggy.github.io/stog/; + homepage = https://www.good-eris.net/stog; license = licenses.lgpl3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 5e1e7bf32258eed1bef3743700282d9c9c905c1e..1b998c48580e615e69cac03eb5a3e5b5333c1235 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -4,14 +4,14 @@ }: let - version = "4.7.5"; + version = "4.8.1"; libdc = stdenv.mkDerivation rec { name = "libdivecomputer-ssrf-${version}"; src = fetchurl { url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz"; - sha256 = "1xsgnmgc7yb46lflx8ynkbdxg2f6sny6xg6caqgx7rf0x1jmjj4x"; + sha256 = "1x6z08gfp9jldv7vcsdasjcarns43qns9cm8s9w27n0c2lvchjvy"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz"; - sha256 = "0qqmnrmj2alr4rc2nqkv8sbdp92xb6j4j468wn6yqvgb23n77b82"; + sha256 = "0758sw05gjy8sckvaqc0hmbh2kibmzapgp0hlk8rsp1vsldq4vd2"; }; buildInputs = [ diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 6c4b32ca9aa6a62f69575963fbba31a2c051b0e5..14285a52e27c7e13be2969c097e038891fbf2242 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings-desktop-schemas, p7zip, sweethome3dApp }: +{ stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant +, gtk3, gsettings-desktop-schemas, sweethome3dApp }: let diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index a337b5eae996e873a49b253933892bdea802ead1..0da0b83d64abd16f1239e9294b54d49a8aee8eeb 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -3,13 +3,13 @@ }: let - version = "0.2.99.3"; + version = "0.2.99.4"; in stdenv.mkDerivation rec { name = "synapse-${version}"; src = fetchurl { url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz"; - sha256 = "0rwd42164xqfi40r13yr29cx6zy3bckgxk00y53b376nl5yqacvy"; + sha256 = "1g6x9knb4jy1d8zgssjhzkgac583137pibisy9whjs8mckaj4k1j"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index ee3cb9cd8ed4d5efb76abeaa2d126bb07f8d822b..5f12bdb4dfcdbd00ff236ab7219f2c3d8f548c04 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr -, xinput, curl, openssl, unzip }: - -with stdenv.lib; +{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper +, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver +, libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }: stdenv.mkDerivation rec { name = "synergy-${version}"; @@ -14,17 +13,33 @@ stdenv.mkDerivation rec { sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3"; }; - patches = [ ./openssl-1.1.patch ]; + patches = [./openssl-1.1.patch ./update_gtest_gmock.patch + ] ++ lib.optional stdenv.isDarwin ./respect_macos_arch.patch; patch_gcc6 = fetchpatch { url = https://raw.githubusercontent.com/gentoo/gentoo/20e2bff3697ebf5f291e9907b34aae3074a36b53/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch; sha256 = "0j3f381x1lf8qci9pfv6mliggl8qs2w05v5lw3rs3gn7aibg174d"; }; + # Due to the included gtest and gmock not supporting clang + # we replace it with 1.7.0 for synergy-1.8.8. This should + # become unnecessary when we update to a newer version of Synergy. + gmock_zip = fetchurl { + url = https://github.com/google/googlemock/archive/release-1.7.0.zip; + sha256 = "11bd04098rzamv7f9y01zaf9c8zrmzdk6g1qrlwq780pxzlr4ya0"; + }; + + gtest_zip = fetchurl { + url = https://github.com/google/googletest/archive/release-1.7.0.zip; + sha256 = "1l5n6kzdypjzjrz2jh14ylzrx735lccfx2p3s4ccgci8g9abg35m"; + }; + postPatch = '' - ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip - ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip - patch -d ext/gmock-1.6.0 -p1 -i ${patch_gcc6} + ${unzip}/bin/unzip -d ext/ ${gmock_zip} + ${unzip}/bin/unzip -d ext/ ${gtest_zip} + mv ext/googlemock-release-1.7.0 ext/gmock-1.7.0 + mv ext/googletest-release-1.7.0 ext/gtest-1.7.0 + patch -d ext/gmock-1.7.0 -p1 -i ${patch_gcc6} '' # We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt # it's not able to find it (it's trying to search the store path of libX11 @@ -38,15 +53,19 @@ stdenv.mkDerivation rec { # Looking for XRRNotifyEvent - not found # # So let's force it: - + optionalString stdenv.isLinux '' + + lib.optionalString stdenv.isLinux '' sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \ set(HAVE_X11_EXTENSIONS_XRANDR_H true) ' CMakeLists.txt ''; + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOSX_TARGET_MAJOR=10" "-DOSX_TARGET_MINOR=7" ]; + buildInputs = [ - cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl - ]; + cmake curl openssl + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices Carbon Cocoa CoreServices ScreenSaver + ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; installPhase = '' mkdir -p $out/bin @@ -58,12 +77,11 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = "../bin/unittests"; - meta = { + meta = with lib; { description = "Share one mouse and keyboard between multiple computers"; homepage = http://synergy-project.org/; license = licenses.gpl2; - maintainers = [ maintainers.aszlig ]; + maintainers = with maintainers; [ aszlig enzime ]; platforms = platforms.all; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/misc/synergy/respect_macos_arch.patch b/pkgs/applications/misc/synergy/respect_macos_arch.patch new file mode 100644 index 0000000000000000000000000000000000000000..003d7d22421a1c359fa8042bf1322691b5f49d10 --- /dev/null +++ b/pkgs/applications/misc/synergy/respect_macos_arch.patch @@ -0,0 +1,61 @@ +From 944177c76d4c7ff5ef3460eab28286a45344a0e7 Mon Sep 17 00:00:00 2001 +From: Michael Hoang +Date: Sat, 14 Jul 2018 21:56:59 +1000 +Subject: [PATCH 2/2] Make sure CMake respects the current arch on macOS + +Only set the macOS architecture if not defined by the user. Use the +OpenSSL libraries and headers from Nix on macOS to prevent architecture +mismatches. +--- + CMakeLists.txt | 2 +- + src/CMakeLists.txt | 14 +------------- + 2 files changed, 2 insertions(+), 14 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2f37424d..c7217e28 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -172,7 +172,7 @@ if (UNIX) + # <= 10.5: 32-bit Intel and PowerPC + set(CMAKE_OSX_ARCHITECTURES "ppc;i386" + CACHE STRING "" FORCE) +- else() ++ elseif (NOT CMAKE_OSX_ARCHITECTURES) + # >= 10.6: Intel only + set(CMAKE_OSX_ARCHITECTURES "i386" + CACHE STRING "" FORCE) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 237ba484..04428636 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -23,11 +23,6 @@ if (WIN32) + set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32) + endif() + +-if (APPLE) +- set(OPENSSL_PLAT_DIR openssl-osx) +- set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/include) +-endif() +- + if (WIN32) + set(OPENSSL_LIBS + ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib +@@ -36,14 +31,7 @@ if (WIN32) + endif() + + if (UNIX) +- if (APPLE) +- set(OPENSSL_LIBS +- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a +- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a +- ) +- else() +- set(OPENSSL_LIBS ssl crypto) +- endif() ++ set(OPENSSL_LIBS ssl crypto) + endif() + + add_subdirectory(lib) +-- +2.17.1 + diff --git a/pkgs/applications/misc/synergy/update_gtest_gmock.patch b/pkgs/applications/misc/synergy/update_gtest_gmock.patch new file mode 100644 index 0000000000000000000000000000000000000000..87b53e78585b98416a830c57050025142bfb9580 --- /dev/null +++ b/pkgs/applications/misc/synergy/update_gtest_gmock.patch @@ -0,0 +1,158 @@ +From eea85dbf4bbde545d8cb07d7ee9fbdca3dcf48fd Mon Sep 17 00:00:00 2001 +From: Michael Hoang +Date: Sat, 14 Jul 2018 22:07:39 +1000 +Subject: [PATCH 1/2] Update gtest and gmock to version 1.7.0 + +Fixes compilation under clang on macOS as is now found under +. +--- + CMakeLists.txt | 2 +- + ext/toolchain/commands1.py | 4 ++-- + src/lib/platform/CMakeLists.txt | 2 +- + src/lib/server/CMakeLists.txt | 2 +- + src/lib/shared/CMakeLists.txt | 2 +- + src/lib/synergy/CMakeLists.txt | 2 +- + src/test/CMakeLists.txt | 12 ++++++------ + src/test/integtests/CMakeLists.txt | 4 ++-- + src/test/unittests/CMakeLists.txt | 4 ++-- + 9 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 94c474e8..2f37424d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -178,7 +178,7 @@ if (UNIX) + CACHE STRING "" FORCE) + endif() + +- set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1") ++ set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}") + + find_library(lib_ScreenSaver ScreenSaver) + find_library(lib_IOKit IOKit) +diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py +index f32ec483..bf997cf6 100644 +--- a/ext/toolchain/commands1.py ++++ b/ext/toolchain/commands1.py +@@ -251,10 +251,10 @@ class InternalCommands: + macIdentity = None + + # gtest dir with version number +- gtestDir = 'gtest-1.6.0' ++ gtestDir = 'gtest-1.7.0' + + # gmock dir with version number +- gmockDir = 'gmock-1.6.0' ++ gmockDir = 'gmock-1.7.0' + + win32_generators = { + 1 : VisualStudioGenerator('10'), +diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt +index 481d8ef9..1ce67eca 100644 +--- a/src/lib/platform/CMakeLists.txt ++++ b/src/lib/platform/CMakeLists.txt +@@ -31,7 +31,7 @@ endif() + + include_directories( + ../ +- ../../../ext/gtest-1.6.0/include ++ ../../../ext/gtest-1.7.0/include + ) + + if (UNIX) +diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt +index 3cb582ec..0525d627 100644 +--- a/src/lib/server/CMakeLists.txt ++++ b/src/lib/server/CMakeLists.txt +@@ -24,7 +24,7 @@ endif() + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ ../../../ext/gtest-1.7.0/include + ) + + if (UNIX) +diff --git a/src/lib/shared/CMakeLists.txt b/src/lib/shared/CMakeLists.txt +index 891f4aa7..16c8b04a 100644 +--- a/src/lib/shared/CMakeLists.txt ++++ b/src/lib/shared/CMakeLists.txt +@@ -25,7 +25,7 @@ add_library(shared STATIC ${sources}) + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ ../../../ext/gtest-1.7.0/include + ) + + target_link_libraries(shared arch base) +diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt +index 0972be8c..e19fcce5 100644 +--- a/src/lib/synergy/CMakeLists.txt ++++ b/src/lib/synergy/CMakeLists.txt +@@ -36,7 +36,7 @@ endif() + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ ../../../ext/gtest-1.7.0/include + ) + + if (UNIX) +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index 8812150a..04cdfc50 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -15,13 +15,13 @@ + # along with this program. If not, see . + + include_directories( +- ../../ext/gtest-1.6.0 +- ../../ext/gtest-1.6.0/include +- ../../ext/gmock-1.6.0 +- ../../ext/gmock-1.6.0/include) ++ ../../ext/gtest-1.7.0 ++ ../../ext/gtest-1.7.0/include ++ ../../ext/gmock-1.7.0 ++ ../../ext/gmock-1.7.0/include) + +-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc) +-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc) ++add_library(gtest STATIC ../../ext/gtest-1.7.0/src/gtest-all.cc) ++add_library(gmock STATIC ../../ext/gmock-1.7.0/src/gmock-all.cc) + + if (UNIX) + # ignore warnings in gtest and gmock +diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt +index 2f1ca7f3..6ddbd29a 100644 +--- a/src/test/integtests/CMakeLists.txt ++++ b/src/test/integtests/CMakeLists.txt +@@ -56,8 +56,8 @@ endif() + include_directories( + ../../ + ../../lib/ +- ../../../ext/gtest-1.6.0/include +- ../../../ext/gmock-1.6.0/include ++ ../../../ext/gtest-1.7.0/include ++ ../../../ext/gmock-1.7.0/include + ) + + if (UNIX) +diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt +index 3e49dc3c..5f6c4fac 100644 +--- a/src/test/unittests/CMakeLists.txt ++++ b/src/test/unittests/CMakeLists.txt +@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources}) + include_directories( + ../../ + ../../lib/ +- ../../../ext/gtest-1.6.0/include +- ../../../ext/gmock-1.6.0/include ++ ../../../ext/gtest-1.7.0/include ++ ../../../ext/gmock-1.7.0/include + ../../../ext + ) + +-- +2.17.1 + diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix index 2b0573f2d2d1a54e3130588ea5190476cdbeb739..6b38c3d59c29d884f5497bffd4abc5b4f0cecfe4 100644 --- a/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix @@ -44,12 +44,12 @@ stdenv.mkDerivation rec { HOME=$TMPDIR ''; - configureFlags = " - --without-arts --disable-docs - --x-includes=${libX11.dev}/include - --x-libraries=${libX11.out}/lib - --with-qt-dir=${qt3} - "; + configureFlags = [ + "--without-arts" "--disable-docs" + "--x-includes=${libX11.dev}/include" + "--x-libraries=${libX11.out}/lib" + "--with-qt-dir=${qt3}" + ]; preInstall = '' mkdir -p $out/share/emacs/site-lisp/ diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 0deda8ce35a35ea3f856dfbb8dd65b918eb66a10..bf0e964d591f2c11f7662d8a8f0c4f78c1619664 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses, taskwarrior }: +{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }: stdenv.mkDerivation rec { version = "2017-05-15"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { perl # For generating the man pages with pod2man ]; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses5 ]; hardeningDisable = [ "format" ]; @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/lharding/tasknc; description = "A ncurses wrapper around taskwarrior"; - maintainers = with maintainers; [ matthiasbeyer infinisil ]; + maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; # Cannot test others + license = licenses.mit; }; } diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 11bc7620368901672fc1b3de0de1ec8725eb3f65..dac447edd7d2f9f8fff5a7c5ade615d3a5466af5 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libuuid, gnutls, readline }: +{ stdenv, fetchurl, cmake, readline }: stdenv.mkDerivation rec { name = "tasksh-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; src = fetchurl { - url = "http://taskwarrior.org/download/${name}.tar.gz"; + url = "https://taskwarrior.org/download/${name}.tar.gz"; sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "REPL for taskwarrior"; homepage = http://tasktools.org; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 80e1b9b69efbddcc464bd63a42bb6d59e68435a0..1018a53ce21d7e478d3d956f9be7e840c40c1dca 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -4,10 +4,8 @@ stdenv.mkDerivation rec { name = "taskwarrior-${version}"; version = "2.5.1"; - enableParallelBuilding = true; - src = fetchurl { - url = "http://www.taskwarrior.org/download/task-${version}.tar.gz"; + url = "https://taskwarrior.org/download/task-${version}.tar.gz"; sha256 = "059a9yc58wcicc6xxsjh1ph7k2yrag0spsahp1wqmsq6h7jwwyyq"; }; @@ -20,11 +18,13 @@ stdenv.mkDerivation rec { ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash" mkdir -p "$out/share/fish/vendor_completions.d" ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/" + mkdir -p "$out/share/zsh/site-functions" + ln -s "../../../share/doc/task/scripts/zsh/_task" "$out/share/zsh/site-functions/" ''; meta = with stdenv.lib; { description = "Highly flexible command-line tool to manage TODO lists"; - homepage = http://taskwarrior.org; + homepage = https://taskwarrior.org; license = licenses.mit; maintainers = with maintainers; [ marcweber jgeerds ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index 59ea70e3da2d10ab383026e01e53dd2503b7e1e6..2fef852ace9f5758dc8e5172fc840115533b58e9 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pythonPackages, keybinder, vte, gettext, intltool, file, gtk3, gobjectIntrospection, cairo -, wrapGAppsHook, gnome3 +{ stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobjectIntrospection +, libnotify, wrapGAppsHook, gnome3 }: -pythonPackages.buildPythonApplication rec { +python2.pkgs.buildPythonApplication rec { name = "terminator-${version}"; version = "1.91"; @@ -11,13 +11,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "95f76e3c0253956d19ceab2f8da709a496f1b9cf9b1c5b8d3cd0b6da3cc7be69"; }; - nativeBuildInputs = [ file intltool wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.vte gobjectIntrospection cairo ]; - - pythonPath = with pythonPackages; [ - pygobject3 vte keybinder notify gettext psutil - pycairo - ]; + nativeBuildInputs = [ file intltool wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ gtk3 gnome3.vte libnotify keybinder3 ]; + propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; postPatch = '' patchShebangs . diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c12a4c9f8da634e2b84720628306995657e6e04d --- /dev/null +++ b/pkgs/applications/misc/terminus/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk_pixbuf, cairo +, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr +, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver +, libxcb, makeWrapper, nodejs +, nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }: + +let + libPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb + libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio + ]; +in +stdenv.mkDerivation rec { + version = "1.0.0-alpha.42"; + name = "terminus-${version}"; + src = fetchurl { + url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb"; + sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb"; + }; + buildInputs = [ dpkg makeWrapper ]; + unpackPhase = '' + mkdir pkg + dpkg-deb -x $src pkg + sourceRoot=pkg + ''; + installPhase = '' + mkdir -p "$out/bin" + mv opt "$out/" + ln -s "$out/opt/Terminus/terminus" "$out/bin/terminus" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Terminus/terminus" + mv usr/* "$out/" + wrapProgram $out/bin/terminus --prefix PATH : ${lib.makeBinPath [ nodejs ]} + ''; + dontPatchELF = true; + meta = with lib; { + description = "A terminal for a more modern age"; + homepage = https://eugeny.github.io/terminus/; + maintainers = with maintainers; [ jlesquembre ]; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/termite/add_errno_header.patch b/pkgs/applications/misc/termite/add_errno_header.patch new file mode 100644 index 0000000000000000000000000000000000000000..81283f86a21db0f5c53b09af36f5c8bf5b394220 --- /dev/null +++ b/pkgs/applications/misc/termite/add_errno_header.patch @@ -0,0 +1,24 @@ +From 95c90f302c384f410dc92e64468ac7061b57fe2d Mon Sep 17 00:00:00 2001 +From: Michael Hoang +Date: Fri, 13 Jul 2018 19:03:09 +1000 +Subject: [PATCH] Add errno.h header which isn't always included automatically. + +--- + termite.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/termite.cc b/termite.cc +index 160fe82..13e2572 100644 +--- a/termite.cc ++++ b/termite.cc +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.17.1 + diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 46276bbb03fbf72f6f14444e069d9c3e281724aa..abcd5eb42888c3bfd229785333f5892e483c73d7 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,54 +1,42 @@ -{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin -, configFile ? null -}: +{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk3, ncurses, wrapGAppsHook }: -let +stdenv.mkDerivation rec { + name = "termite-${version}"; version = "13"; - termite = stdenv.mkDerivation { - name = "termite-${version}"; - src = fetchgit { - url = "https://github.com/thestinger/termite"; - rev = "refs/tags/v${version}"; - sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj"; - }; - - # https://github.com/thestinger/termite/pull/516 - patches = [ ./url_regexp_trailing.patch ]; + src = fetchFromGitHub { + owner = "thestinger"; + repo = "termite"; + rev = "v${version}"; + sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj"; + fetchSubmodules = true; + }; - postPatch = "sed '1i#include ' -i termite.cc"; + # https://github.com/thestinger/termite/pull/516 + patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch + ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; - makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; + makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; - buildInputs = [ vte gtk3 ncurses ]; + buildInputs = [ vte gtk3 ncurses ]; - nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; + nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; - outputs = [ "out" "terminfo" ]; + outputs = [ "out" "terminfo" ]; - postInstall = '' - mkdir -p $terminfo/share - mv $out/share/terminfo $terminfo/share/terminfo + postInstall = '' + mkdir -p $terminfo/share + mv $out/share/terminfo $terminfo/share/terminfo - mkdir -p $out/nix-support - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - ''; + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; - meta = with stdenv.lib; { - description = "A simple VTE-based terminal"; - license = licenses.lgpl2Plus; - homepage = https://github.com/thestinger/termite/; - maintainers = with maintainers; [ koral garbas ]; - platforms = platforms.all; - }; + meta = with stdenv.lib; { + description = "A simple VTE-based terminal"; + license = licenses.lgpl2Plus; + homepage = https://github.com/thestinger/termite/; + maintainers = with maintainers; [ koral garbas ]; + platforms = platforms.all; }; -in if configFile == null then termite else symlinkJoin { - name = "termite-with-config-${version}"; - paths = [ termite ]; - nativeBuildInputs = [ makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/termite \ - --add-flags "--config ${configFile}" - ''; - passthru.terminfo = termite.terminfo; } diff --git a/pkgs/applications/misc/termite/remove_ldflags_macos.patch b/pkgs/applications/misc/termite/remove_ldflags_macos.patch new file mode 100644 index 0000000000000000000000000000000000000000..f8c68518bb4dee2d560772f74b0f12014ee94128 --- /dev/null +++ b/pkgs/applications/misc/termite/remove_ldflags_macos.patch @@ -0,0 +1,25 @@ +From 1b5a6934635c55472eb7949bd87ab3f45fa1b2f3 Mon Sep 17 00:00:00 2001 +From: Michael Hoang +Date: Fri, 13 Jul 2018 19:01:51 +1000 +Subject: [PATCH] Remove --as-needed flag from ld to fix compilation on macOS. + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index b115f42..ab301ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,7 @@ ifeq (${CXX}, clang++) + CXXFLAGS += -Wimplicit-fallthrough + endif + +-LDFLAGS := -s -Wl,--as-needed ${LDFLAGS} ++LDFLAGS := -s -Wl ${LDFLAGS} + LDLIBS := ${shell pkg-config --libs ${GTK} ${VTE}} + + termite: termite.cc url_regex.hh util/clamp.hh util/maybe.hh util/memory.hh +-- +2.17.1 + diff --git a/pkgs/applications/misc/termite/wrapper.nix b/pkgs/applications/misc/termite/wrapper.nix new file mode 100644 index 0000000000000000000000000000000000000000..0b12a905360c9ab1156423d3278afee9e737fc6f --- /dev/null +++ b/pkgs/applications/misc/termite/wrapper.nix @@ -0,0 +1,15 @@ +{ makeWrapper, wrapGAppsHook, symlinkJoin, configFile ? null, termite }: + +if configFile == null then termite else symlinkJoin { + name = "termite-with-config-${termite.version}"; + + paths = [ termite ]; + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/termite \ + --add-flags "--config ${configFile}" + ''; + + passthru.terminfo = termite.terminfo; +} diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/applications/misc/teseq/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9502b3a0abe7461a2fc128cd954a9cb8646a1d42 --- /dev/null +++ b/pkgs/applications/misc/teseq/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +let + version = "1.1.1"; +in +stdenv.mkDerivation { + name = "teseq-${version}"; + + src = fetchurl { + url = "mirror://gnu/teseq/teseq-${version}.tar.gz"; + sha256 = "08ln005qciy7f3jhv980kfhhfmh155naq59r5ah9crz1q4mx5yrj"; + }; + + meta = { + homepage = https://www.gnu.org/software/teseq/; + description = "Escape sequence illuminator"; + license = stdenv.lib.licenses.gpl3; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.vaibhavsagar ]; + }; +} diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index dc723336a9e93003178742caf4f5a70063e26193..e101005e44ece509c0e5ebe72ad16d279eee4189 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,30 +1,36 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus -, gsettings-desktop-schemas, libsecret, desktop-file-utils, gettext, gtkd +, gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd, libsecret , perlPackages, wrapGAppsHook, xdg_utils }: stdenv.mkDerivation rec { name = "tilix-${version}"; - version = "1.7.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; rev = "${version}"; - sha256 = "0x0bnb26hjvxmvvd7c9k8fw97gcm3z5ssr6r8x90xbyyw6h58hhh"; + sha256 = "05x2nyyb5w3122j90g0f7lh9jl7xi1nk176sl01vl2ks7zar00dq"; }; nativeBuildInputs = [ autoreconfHook dmd desktop-file-utils perlPackages.Po4a pkgconfig xdg_utils wrapGAppsHook ]; - buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus ]; + buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus libsecret ]; preBuild = '' - makeFlagsArray=(PERL5LIB="${perlPackages.Po4a}/lib/perl5") + makeFlagsArray=( + PERL5LIB="${perlPackages.Po4a}/lib/perl5" + DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace' + ) ''; postInstall = with gnome3; '' ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + + wrapProgram $out/bin/tilix \ + --prefix LD_LIBRARY_PATH ":" "${libsecret}/lib" ''; diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 42f3d1646c5747ee7e2311dddd70aabd575748ff..ff3caec29644918ffcd1ca6f0bf12fb585365c1a 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libuuid, gnutls }: +{ stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { name = "timewarrior-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A command-line time tracker"; homepage = https://tasktools.org/projects/timewarrior.html; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer mrVanDalo ]; + maintainers = with maintainers; [ mrVanDalo ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 838e26463cd0d09d6f4ebd4fbeadcacd95930c8c..31ccdb3c7f53f8e556eda6ac2e82f57c0219a0b6 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "16.2"; + version = "16.4"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "1fp9kamb09qbply8jn0gqwgnv9xdds81jzpl0lkziz8dydyis4wm"; + sha256 = "1h9l45zimai2hqfcf2y98g4i03imhmvm3mlsld9x99i650kxr5jm"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..148d6b042f7b7f3a7e00cc358d8056c76cca9d51 --- /dev/null +++ b/pkgs/applications/misc/todiff/default.nix @@ -0,0 +1,25 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "todiff-${version}"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "Ekleog"; + repo = "todiff"; + rev = version; + sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm"; + }; + + cargoSha256 = "1r7l9zbw6kq8yb5cv6h0qgl2gp71bkn9xv7b2n49a5r7by98jjqr"; + + checkPhase = "cargo test --features=integration_tests"; + + meta = with stdenv.lib; { + description = "Human-readable diff for todo.txt files"; + homepage = "https://github.com/Ekleog/todiff"; + maintainers = with maintainers; [ ekleog ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/toggldesktop/TogglDesktop.pro b/pkgs/applications/misc/toggldesktop/TogglDesktop.pro new file mode 100644 index 0000000000000000000000000000000000000000..e86156313d1f0ba3186396d00f552bc68eefacee --- /dev/null +++ b/pkgs/applications/misc/toggldesktop/TogglDesktop.pro @@ -0,0 +1,19 @@ +QT += core network widgets + +DEFINES += APP_ENVIRONMENT=\\\"production\\\" +DEFINES += APP_VERSION=\\\"@version@\\\" + +TARGET = toggldesktop +TEMPLATE = app + +SOURCES += *.cpp +HEADERS += *.h +FORMS += *.ui +RESOURCES += *.qrc + +target.path = $$PREFIX + +INSTALLS += target + +CONFIG += link_pkgconfig +PKGCONFIG += bugsnag-qt qxtglobalshortcut qt-oauth-lib toggl x11 xscrnsaver diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bc36ffa5e10115b1c80531057a135551059caa4e --- /dev/null +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -0,0 +1,148 @@ +{ stdenv, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig +, cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco +, qtbase, qtwebkit, qtx11extras, sqlite }: + +let + name = "toggldesktop-${version}"; + version = "7.4.231"; + + src = fetchzip { + url = "https://github.com/toggl/toggldesktop/archive/v${version}.tar.gz"; + sha256 = "01hqkx9dljnhwnyqi6mmzfp02hnbi2j50rsfiasniqrkbi99x9v1"; + }; + + bugsnag-qt = stdenv.mkDerivation rec { + name = "bugsnag-qt-${version}"; + version = "20180522.005732"; + + src = fetchzip { + url = "https://github.com/yegortimoshenko/bugsnag-qt/archive/${version}.tar.gz"; + sha256 = "02s6mlggh0i4a856md46dipy6mh47isap82jlwmjr7hfsk2ykgnq"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase ]; + }; + + qxtglobalshortcut = stdenv.mkDerivation rec { + name = "qxtglobalshortcut-${version}"; + version = "f584471dada2099ba06c574bdfdd8b078c2e3550"; + + src = fetchzip { + url = "https://github.com/hluk/qxtglobalshortcut/archive/${version}.tar.gz"; + sha256 = "1iy17gypav10z8aa62s5jb6mq9y4kb9ms4l61ydmk3xwlap7igw1"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase qtx11extras ]; + }; + + qt-oauth-lib = stdenv.mkDerivation rec { + name = "qt-oauth-lib-${version}"; + version = "20180521.233208"; + + src = fetchzip { + url = "https://github.com/yegortimoshenko/qt-oauth-lib/archive/${version}.tar.gz"; + sha256 = "0f46d44slzvzaqx0lksvv14lsc1jp8vd2mragxd61r820hybf5z3"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase qtwebkit ]; + }; + + poco-pc = writeText "poco.pc" '' + Name: Poco + Description: ${poco.meta.description} + Version: ${poco.version} + Libs: -L${poco}/lib -lPocoDataSQLite -lPocoData -lPocoNet -lPocoNetSSL -lPocoCrypto -lPocoUtil -lPocoXML -lPocoFoundation + Cflags: -I${poco}/include/Poco + ''; + + poco-pc-wrapped = runCommand "poco-pc-wrapped" {} '' + mkdir -p $out/lib/pkgconfig && ln -s ${poco-pc} $_/poco.pc + ''; + + libtoggl = stdenv.mkDerivation { + name = "libtoggl-${version}"; + inherit src version; + + sourceRoot = "source/src"; + + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ jsoncpp lua openssl poco poco-pc-wrapped sqlite libX11 ]; + + postPatch = '' + cat ${./libtoggl.pro} > libtoggl.pro + rm get_focused_window_{mac,windows}.cc + ''; + }; + + toggldesktop = stdenv.mkDerivation { + name = "${name}-unwrapped"; + inherit src version; + + sourceRoot = "source/src/ui/linux/TogglDesktop"; + + postPatch = '' + substituteAll ${./TogglDesktop.pro} TogglDesktop.pro + substituteInPlace toggl.cpp \ + --replace ./../../../toggl_api.h toggl_api.h + ''; + + postInstall = '' + ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/cacert.pem + ''; + + nativeBuildInputs = [ qmake pkgconfig ]; + + buildInputs = [ + bugsnag-qt + libtoggl + qxtglobalshortcut + qtbase + qtwebkit + qt-oauth-lib + qtx11extras + libX11 + libXScrnSaver + ]; + }; + + toggldesktop-icons = stdenv.mkDerivation { + name = "${name}-icons"; + inherit (toggldesktop) src sourceRoot; + + installPhase = '' + for f in icons/*; do + mkdir -p $out/share/icons/hicolor/$(basename $f)/apps + mv $f/toggldesktop.png $_ + done + ''; + }; + + toggldesktop-wrapped = runCommand "toggldesktop-wrapped" {} '' + mkdir -p $out/bin && ln -s ${toggldesktop}/toggldesktop $_ + ''; + + desktopItem = makeDesktopItem rec { + categories = "Utility;"; + desktopName = "Toggl"; + genericName = desktopName; + name = "toggldesktop"; + exec = "${toggldesktop-wrapped}/bin/toggldesktop"; + icon = "toggldesktop"; + }; +in + +buildEnv { + inherit name; + paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ]; + + meta = with stdenv.lib; { + description = "Client for Toggl time tracking service"; + homepage = https://github.com/toggl/toggldesktop; + license = licenses.bsd3; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/toggldesktop/libtoggl.pro b/pkgs/applications/misc/toggldesktop/libtoggl.pro new file mode 100644 index 0000000000000000000000000000000000000000..c8303440fe6757965a661f40537d9eb462329b90 --- /dev/null +++ b/pkgs/applications/misc/toggldesktop/libtoggl.pro @@ -0,0 +1,20 @@ +TARGET = toggl +TEMPLATE = lib + +SOURCES += *.cc +HEADERS += *.h + +headers.files = $$HEADERS +headers.path = $$PREFIX/include +target.path = $$PREFIX/lib + +INSTALLS += headers target + +CONFIG += create_prl create_pc link_pkgconfig +PKGCONFIG += jsoncpp openssl lua poco sqlite3 x11 + +QMAKE_PKGCONFIG_NAME = $$TARGET +QMAKE_PKGCONFIG_PREFIX = $$PREFIX +QMAKE_PKGCONFIG_LIBDIR = $$target.path +QMAKE_PKGCONFIG_INCDIR = $$headers.path +QMAKE_PKGCONFIG_DESTDIR = pkgconfig diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 1f8ab8b438ddca7f7b1230610b68a1ca0d90878c..cb3146d4c0dd5a310fc04a9dd7136155b3d87a7e 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.17.1"; + version = "0.19.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "05fzsakm089bn03z8gip6yp4xfmwa054v40x2f3gqpl04r504gis"; + sha256 = "1z0r6yqi522d5jbpd0w3prd33l067jb1jhfnxf6hkzhnx1wddjsa"; }; checkInputs = with python3Packages; [ pytest ]; @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b2aab54c104768e40017b2536005eb20c1addc5c --- /dev/null +++ b/pkgs/applications/misc/tootle/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub +, meson, ninja, pkgconfig +, gnome3, vala, gobjectIntrospection, wrapGAppsHook +, gtk3, granite +, json-glib, glib, glib-networking +}: + +let + pname = "tootle"; + version = "0.1.5"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "bleakgrey"; + repo = pname; + rev = version; + sha256 = "022h1rh1jk3m1f9al0s1rylmnqnkydyc81idfc8jf1g0frnvn5i6"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection wrapGAppsHook ]; + buildInputs = [ + gtk3 granite json-glib glib glib-networking + gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas + ]; + + postPatch = '' + chmod +x ./meson/post_install.py + patchShebangs ./meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Simple Mastodon client designed for elementary OS"; + homepage = https://github.com/bleakgrey/tootle; + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix index 829ed2585627f6e562f2ae0c32d7564325516ab2..f001cbcaab92dac87edea1199e616caa18308873 100644 --- a/pkgs/applications/misc/tqsl/default.nix +++ b/pkgs/applications/misc/tqsl/default.nix @@ -1,18 +1,11 @@ { stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }: -let - lib_suffix = - if stdenv.system == "x86_64-linux" then - "64" - else - ""; -in stdenv.mkDerivation rec { name = "tqsl-${version}"; version = "2.3.1"; src = fetchurl { - url = "http://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz"; + url = "https://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz"; sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv"; }; diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 8e8a22ed4e4166965bb5900e9d5393b5cb9dc0f5..15c4b8185a22ce3efb6c926db7fa9229c070a499 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "translate-shell"; - version = "0.9.6.7"; + version = "0.9.6.8"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v${version}"; - sha256 = "0krcidjh32xwybr1v4nykgf0jjnffjqx125bvn3jh2a44cikyq3n"; + sha256 = "17fc5nlc594lvmihx39h4ddmi8ja3qqsyswzxadbaz7l3zm356b8"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 9df2a2dde76509c8dc9c9be40c8c1885c3283e76..5bb614ac68b1ce15b88b0b1c1b3898727cb94729 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -40,7 +40,7 @@ library, use the 'NOGUI' parameter: $ make NOGUI=1 */ -{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, devicemapper, +{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, lvm2, wxGUI ? true }: @@ -86,13 +86,13 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse devicemapper wxGTK nasm ]; + buildInputs = [ fuse lvm2 wxGTK nasm ]; meta = { description = "Free Open-Source filesystem on-the-fly encryption"; homepage = http://www.truecrypt.org/; license = "TrueCrypt License Version 2.6"; - maintainers = with stdenv.lib.maintainers; [ viric ryantm ]; + maintainers = with stdenv.lib.maintainers; [ ryantm ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix new file mode 100644 index 0000000000000000000000000000000000000000..38865ca4f3d96eacb4859b6720d2a73894bc2033 --- /dev/null +++ b/pkgs/applications/misc/tvbrowser/bin.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, makeWrapper, jre, makeDesktopItem }: + +let + desktopItem = makeDesktopItem { + name = "tvbrowser"; + exec = "tvbrowser"; + icon = "tvbrowser"; + comment = "Themeable and easy to use TV Guide"; + desktopName = "TV-Browser"; + genericName = "Electronic TV Program Guide"; + categories = "AudioVideo;TV;Java;"; + startupNotify = "true"; + extraEntries = '' + StartupWMClass=tvbrowser-TVBrowser + ''; + }; + +in stdenv.mkDerivation rec { + pname = "tvbrowser"; + version = "4.0.1"; + name = "${pname}-bin-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%208%20and%20higher%29/${version}/${pname}_${version}_bin.tar.gz"; + sha256 = "0ahsirf6cazs5wykgbwsc6n35w6jprxyphzqmm7d370n37sb07pm"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/share/java/${pname} + cp -R * $out/share/java/${pname} + rm $out/share/java/${pname}/${pname}.{sh,desktop} + + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + + for i in 16 32 48 128; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + ln -s $out/share/java/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png + done + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/java/${pname}/${pname}.jar" \ + --run "cd $out/share/java/${pname}" + ''; + + meta = with stdenv.lib; { + description = "Electronic TV Program Guide"; + homepage = https://www.tvbrowser.org/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 297f3d0b5991c7549f2c1df2387dff4757daabd6..0667ec49b3287ef5d2d842a285543a427a202ec9 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }: +{ stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }: stdenv.mkDerivation rec { name = "twmn-git-2014-09-23"; @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/sboli/twmn; platforms = with stdenv.lib.platforms; linux; maintainers = [ stdenv.lib.maintainers.matejc ]; + license = stdenv.lib.licenses.lgpl3; }; } diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index 7eb0f2d41b55160d82faf78013eda56a0cb4f4e5..3a723907c925d0f7c5ceb35dee0e9bdfdafee2d6 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -4,7 +4,6 @@ let inherit (python.pkgs) buildPythonApplication fetchPypi requests; in buildPythonApplication rec { - name = "${pname}-${version}"; pname = "tzupdate"; version = "1.2.0"; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index ea79e29ff020cebf8d70d6e2682bfc8e76947081..5b75fbbc08e1016bfd1774152e53a08d3a0ce856 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchFromGitHub, asciidoc-full, gettext -, gobjectIntrospection, gtk3, hicolor-icon-theme, libnotify, librsvg +, gobjectIntrospection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg , udisks2, wrapGAppsHook , buildPythonApplication , docopt , pygobject3 , pyyaml -, ... }: buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.7.3"; + version = "1.7.5"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "1yv1faq81n3vspf3jprcs5v21l2fchy3m3pc7lk8jb0xqlnh60x4"; + sha256 = "1mcdn8ha5d5nsmrzk6xnnsqrmk94rdrzym9sqm38zk5r8gpyl1k4"; }; buildInputs = [ @@ -28,7 +27,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ gettext gobjectIntrospection gtk3 libnotify docopt - pygobject3 pyyaml udisks2 + pygobject3 pyyaml udisks2 libappindicator-gtk3 ]; postBuild = "make -C doc"; diff --git a/pkgs/applications/misc/unixcw/default.nix b/pkgs/applications/misc/unixcw/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2aeba5fb5f4a969fe8642318c4a35cabd377bce0 --- /dev/null +++ b/pkgs/applications/misc/unixcw/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, libpulseaudio, alsaLib , pkgconfig, qt5}: +stdenv.mkDerivation rec { + name = "unixcw-${version}"; + version = "3.5.1"; + src = fetchurl { + url = "mirror://sourceforge/unixcw/unixcw_${version}.orig.tar.gz"; + sha256 ="5f3aacd8a26e16e6eff437c7ae1e9b389956fb137eeb3de24670ce05de479e7a"; + }; + patches = [ + ./remove-use-of-dlopen.patch + ]; + buildInputs = [libpulseaudio alsaLib pkgconfig qt5.qtbase]; + CFLAGS ="-lasound -lpulse-simple"; + + meta = with stdenv.lib; { + description = "sound characters as Morse code on the soundcard or console speaker"; + longDescription = '' + unixcw is a project providing libcw library and a set of programs + using the library: cw, cwgen, cwcp and xcwcp. + The programs are intended for people who want to learn receiving + and sending Morse code. + unixcw is developed and tested primarily on GNU/Linux system. + + cw reads characters from an input file, or from standard input, + and sounds each valid character as Morse code on either the system sound card, + or the system console speaker. + After it sounds a character, cw echoes it to standard output. + The input stream can contain embedded command strings. + These change the parameters used when sounding the Morse code. + cw reports any errors in embedded commands + ''; + homepage = "http://unixcw.sourceforge.net"; + maintainers = [ maintainers.mafo ]; + license = licenses.gpl2; + platforms=platforms.linux; + }; +} diff --git a/pkgs/applications/misc/unixcw/remove-use-of-dlopen.patch b/pkgs/applications/misc/unixcw/remove-use-of-dlopen.patch new file mode 100644 index 0000000000000000000000000000000000000000..0475c008ba22f24cd1d6d12f3b5bbc7be013a89a --- /dev/null +++ b/pkgs/applications/misc/unixcw/remove-use-of-dlopen.patch @@ -0,0 +1,677 @@ +From e4b91b5a7943a3b54f555ff2e0029b83bd96b131 Mon Sep 17 00:00:00 2001 +From: MarcFontaine +Date: Sat, 9 Jun 2018 11:02:11 +0200 +Subject: [PATCH] remove use of dlopen + +--- + src/libcw/libcw_alsa.c | 215 ++++++++++--------------------------------------- + src/libcw/libcw_pa.c | 118 ++++----------------------- + 2 files changed, 56 insertions(+), 277 deletions(-) + +diff --git a/src/libcw/libcw_alsa.c b/src/libcw/libcw_alsa.c +index a669c6e..17c306d 100644 +--- a/src/libcw/libcw_alsa.c ++++ b/src/libcw/libcw_alsa.c +@@ -35,7 +35,6 @@ + + + +-#include /* dlopen() and related symbols */ + #include + + +@@ -65,7 +64,6 @@ static const snd_pcm_format_t CW_ALSA_SAMPLE_FORMAT = SND_PCM_FORMAT_S16; /* "Si + + + static int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *params); +-static int cw_alsa_dlsym_internal(void *handle); + static int cw_alsa_write_internal(cw_gen_t *gen); + static int cw_alsa_debug_evaluate_write_internal(cw_gen_t *gen, int rv); + static int cw_alsa_open_device_internal(cw_gen_t *gen); +@@ -80,56 +78,6 @@ static int cw_alsa_print_params_internal(snd_pcm_hw_params_t *hw_params); + + + +-static struct { +- void *handle; +- +- int (* snd_pcm_open)(snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode); +- int (* snd_pcm_close)(snd_pcm_t *pcm); +- int (* snd_pcm_prepare)(snd_pcm_t *pcm); +- int (* snd_pcm_drop)(snd_pcm_t *pcm); +- snd_pcm_sframes_t (* snd_pcm_writei)(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size); +- +- const char *(* snd_strerror)(int errnum); +- +- int (* snd_pcm_hw_params_malloc)(snd_pcm_hw_params_t **ptr); +- int (* snd_pcm_hw_params_any)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); +- int (* snd_pcm_hw_params_set_format)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val); +- int (* snd_pcm_hw_params_set_rate_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +- int (* snd_pcm_hw_params_set_access)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t _access); +- int (* snd_pcm_hw_params_set_channels)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val); +- int (* snd_pcm_hw_params)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); +- int (* snd_pcm_hw_params_get_periods)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +- int (* snd_pcm_hw_params_get_period_size)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir); +- int (* snd_pcm_hw_params_get_period_size_min)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir); +- int (* snd_pcm_hw_params_get_buffer_size)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val); +-} cw_alsa = { +- .handle = NULL, +- +- .snd_pcm_open = NULL, +- .snd_pcm_close = NULL, +- .snd_pcm_prepare = NULL, +- .snd_pcm_drop = NULL, +- .snd_pcm_writei = NULL, +- +- .snd_strerror = NULL, +- +- .snd_pcm_hw_params_malloc = NULL, +- .snd_pcm_hw_params_any = NULL, +- .snd_pcm_hw_params_set_format = NULL, +- .snd_pcm_hw_params_set_rate_near = NULL, +- .snd_pcm_hw_params_set_access = NULL, +- .snd_pcm_hw_params_set_channels = NULL, +- .snd_pcm_hw_params = NULL, +- .snd_pcm_hw_params_get_periods = NULL, +- .snd_pcm_hw_params_get_period_size = NULL, +- .snd_pcm_hw_params_get_period_size_min = NULL, +- .snd_pcm_hw_params_get_buffer_size = NULL +-}; +- +- +- +- +- + + /** + \brief Check if it is possible to open ALSA output +@@ -144,34 +92,19 @@ static struct { + */ + bool cw_is_alsa_possible(const char *device) + { +- const char *library_name = "libasound.so.2"; +- if (!cw_dlopen_internal(library_name, &(cw_alsa.handle))) { +- cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: can't access ALSA library \"%s\"", library_name); +- return false; +- } +- +- int rv = cw_alsa_dlsym_internal(cw_alsa.handle); +- if (rv < 0) { +- cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: failed to resolve ALSA symbol #%d, can't correctly load ALSA library", rv); +- dlclose(cw_alsa.handle); +- return false; +- } +- +- const char *dev = device ? device : CW_DEFAULT_ALSA_DEVICE; ++ int rv; ++ const char *dev = device ? device : CW_DEFAULT_ALSA_DEVICE; + snd_pcm_t *alsa_handle; +- rv = cw_alsa.snd_pcm_open(&alsa_handle, ++ rv = snd_pcm_open(&alsa_handle, + dev, /* name */ + SND_PCM_STREAM_PLAYBACK, /* stream (playback/capture) */ + 0); /* mode, 0 | SND_PCM_NONBLOCK | SND_PCM_ASYNC */ + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, + "cw_alsa: can't open ALSA device \"%s\"", dev); +- dlclose(cw_alsa.handle); + return false; + } else { +- cw_alsa.snd_pcm_close(alsa_handle); ++ snd_pcm_close(alsa_handle); + return true; + } + } +@@ -204,7 +137,7 @@ int cw_alsa_write_internal(cw_gen_t *gen) + /* Send audio buffer to ALSA. + Size of correct and current data in the buffer is the same as + ALSA's period, so there should be no underruns */ +- int rv = cw_alsa.snd_pcm_writei(gen->alsa_data.handle, gen->buffer, gen->buffer_n_samples); ++ int rv = snd_pcm_writei(gen->alsa_data.handle, gen->buffer, gen->buffer_n_samples); + cw_alsa_debug_evaluate_write_internal(gen, rv); + /* + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, +@@ -231,7 +164,7 @@ int cw_alsa_write_internal(cw_gen_t *gen) + */ + int cw_alsa_open_device_internal(cw_gen_t *gen) + { +- int rv = cw_alsa.snd_pcm_open(&gen->alsa_data.handle, ++ int rv = snd_pcm_open(&gen->alsa_data.handle, + gen->audio_device, /* name */ + SND_PCM_STREAM_PLAYBACK, /* stream (playback/capture) */ + 0); /* mode, 0 | SND_PCM_NONBLOCK | SND_PCM_ASYNC */ +@@ -251,7 +184,7 @@ int cw_alsa_open_device_internal(cw_gen_t *gen) + /* TODO: move this to cw_alsa_set_hw_params_internal(), + deallocate hw_params */ + snd_pcm_hw_params_t *hw_params = NULL; +- rv = cw_alsa.snd_pcm_hw_params_malloc(&hw_params); ++ rv = snd_pcm_hw_params_malloc(&hw_params); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, + "cw_alsa: can't allocate memory for ALSA hw params"); +@@ -265,7 +198,7 @@ int cw_alsa_open_device_internal(cw_gen_t *gen) + return CW_FAILURE; + } + +- rv = cw_alsa.snd_pcm_prepare(gen->alsa_data.handle); ++ rv = snd_pcm_prepare(gen->alsa_data.handle); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, + "cw_alsa: can't prepare ALSA handler"); +@@ -275,7 +208,7 @@ int cw_alsa_open_device_internal(cw_gen_t *gen) + /* Get size for data buffer */ + snd_pcm_uframes_t frames; /* period size in frames */ + int dir = 1; +- rv = cw_alsa.snd_pcm_hw_params_get_period_size_min(hw_params, &frames, &dir); ++ rv = snd_pcm_hw_params_get_period_size_min(hw_params, &frames, &dir); + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, + "cw_alsa: rv = %d, ALSA buffer size would be %u frames", rv, (unsigned int) frames); + +@@ -305,14 +238,11 @@ int cw_alsa_open_device_internal(cw_gen_t *gen) + void cw_alsa_close_device_internal(cw_gen_t *gen) + { + /* "Stop a PCM dropping pending frames. " */ +- cw_alsa.snd_pcm_drop(gen->alsa_data.handle); +- cw_alsa.snd_pcm_close(gen->alsa_data.handle); ++ snd_pcm_drop(gen->alsa_data.handle); ++ snd_pcm_close(gen->alsa_data.handle); + + gen->audio_device_is_open = false; + +- if (cw_alsa.handle) { +- dlclose(cw_alsa.handle); +- } + + #if CW_DEV_RAW_SINK + if (gen->dev_raw_sink != -1) { +@@ -332,11 +262,11 @@ int cw_alsa_debug_evaluate_write_internal(cw_gen_t *gen, int rv) + if (rv == -EPIPE) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING, + "cw_alsa: underrun"); +- cw_alsa.snd_pcm_prepare(gen->alsa_data.handle); ++ snd_pcm_prepare(gen->alsa_data.handle); + } else if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING, +- "cw_alsa: writei: %s", cw_alsa.snd_strerror(rv)); +- cw_alsa.snd_pcm_prepare(gen->alsa_data.handle); ++ "cw_alsa: writei: %s", snd_strerror(rv)); ++ snd_pcm_prepare(gen->alsa_data.handle); + } else if (rv != gen->buffer_n_samples) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING, + "cw_alsa: short write, %d != %d", rv, gen->buffer_n_samples); +@@ -363,19 +293,19 @@ int cw_alsa_debug_evaluate_write_internal(cw_gen_t *gen, int rv) + int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params) + { + /* Get current hw configuration. */ +- int rv = cw_alsa.snd_pcm_hw_params_any(gen->alsa_data.handle, hw_params); ++ int rv = snd_pcm_hw_params_any(gen->alsa_data.handle, hw_params); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: get current hw params: %s", cw_alsa.snd_strerror(rv)); ++ "cw_alsa: get current hw params: %s", snd_strerror(rv)); + return CW_FAILURE; + } + + + /* Set the sample format */ +- rv = cw_alsa.snd_pcm_hw_params_set_format(gen->alsa_data.handle, hw_params, CW_ALSA_SAMPLE_FORMAT); ++ rv = snd_pcm_hw_params_set_format(gen->alsa_data.handle, hw_params, CW_ALSA_SAMPLE_FORMAT); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: can't set sample format: %s", cw_alsa.snd_strerror(rv)); ++ "cw_alsa: can't set sample format: %s", snd_strerror(rv)); + return CW_FAILURE; + } + +@@ -387,7 +317,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params + bool success = false; + for (int i = 0; cw_supported_sample_rates[i]; i++) { + rate = cw_supported_sample_rates[i]; +- int rv = cw_alsa.snd_pcm_hw_params_set_rate_near(gen->alsa_data.handle, hw_params, &rate, &dir); ++ int rv = snd_pcm_hw_params_set_rate_near(gen->alsa_data.handle, hw_params, &rate, &dir); + if (!rv) { + if (rate != cw_supported_sample_rates[i]) { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING, "cw_alsa: imprecise sample rate:"); +@@ -402,7 +332,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params + + if (!success) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: can't get sample rate: %s", cw_alsa.snd_strerror(rv)); ++ "cw_alsa: can't get sample rate: %s", snd_strerror(rv)); + return CW_FAILURE; + } else { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, +@@ -410,18 +340,18 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params + } + + /* Set PCM access type */ +- rv = cw_alsa.snd_pcm_hw_params_set_access(gen->alsa_data.handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); ++ rv = snd_pcm_hw_params_set_access(gen->alsa_data.handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: can't set access type: %s", cw_alsa.snd_strerror(rv)); ++ "cw_alsa: can't set access type: %s", snd_strerror(rv)); + return CW_FAILURE; + } + + /* Set number of channels */ +- rv = cw_alsa.snd_pcm_hw_params_set_channels(gen->alsa_data.handle, hw_params, CW_AUDIO_CHANNELS); ++ rv = snd_pcm_hw_params_set_channels(gen->alsa_data.handle, hw_params, CW_AUDIO_CHANNELS); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: can't set number of channels: %s", cw_alsa.snd_strerror(rv)); ++ "cw_alsa: can't set number of channels: %s", snd_strerror(rv)); + return CW_FAILURE; + } + +@@ -496,7 +426,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params + snd_pcm_uframes_t accepted = 0; /* buffer size in frames */ + dir = 0; + for (snd_pcm_uframes_t val = 0; val < 10000; val++) { +- rv = cw_alsa.snd_pcm_hw_params_test_buffer_size(gen->alsa_data.handle, hw_params, val); ++ rv = snd_pcm_hw_params_test_buffer_size(gen->alsa_data.handle, hw_params, val); + if (rv == 0) { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, + "cw_alsa: accepted buffer size: %u", (unsigned int) accepted); +@@ -507,10 +437,10 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params + } + + if (accepted > 0) { +- rv = cw_alsa.snd_pcm_hw_params_set_buffer_size(gen->alsa_data.handle, hw_params, accepted); ++ rv = snd_pcm_hw_params_set_buffer_size(gen->alsa_data.handle, hw_params, accepted); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: can't set accepted buffer size %u: %s", (unsigned int) accepted, cw_alsa.snd_strerror(rv)); ++ "cw_alsa: can't set accepted buffer size %u: %s", (unsigned int) accepted, snd_strerror(rv)); + } + } else { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +@@ -526,7 +456,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params + /* this limit should be enough, "accepted" on my machine is 8 */ + const unsigned int n_periods_max = 30; + for (unsigned int val = 1; val < n_periods_max; val++) { +- rv = cw_alsa.snd_pcm_hw_params_test_periods(gen->alsa_data.handle, hw_params, val, dir); ++ rv = snd_pcm_hw_params_test_periods(gen->alsa_data.handle, hw_params, val, dir); + if (rv == 0) { + accepted = val; + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, +@@ -534,10 +464,10 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params + } + } + if (accepted > 0) { +- rv = cw_alsa.snd_pcm_hw_params_set_periods(gen->alsa_data.handle, hw_params, accepted, dir); ++ rv = snd_pcm_hw_params_set_periods(gen->alsa_data.handle, hw_params, accepted, dir); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: can't set accepted number of periods %d: %s", accepted, cw_alsa.snd_strerror(rv)); ++ "cw_alsa: can't set accepted number of periods %d: %s", accepted, snd_strerror(rv)); + } + } else { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +@@ -549,7 +479,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params + /* Test period size */ + dir = 0; + for (snd_pcm_uframes_t val = 0; val < 100000; val++) { +- rv = cw_alsa.snd_pcm_hw_params_test_period_size(gen->alsa_data.handle, hw_params, val, dir); ++ rv = snd_pcm_hw_params_test_period_size(gen->alsa_data.handle, hw_params, val, dir); + if (rv == 0) { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, + "cw_alsa: accepted period size: %lu", val); +@@ -562,7 +492,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params + /* Test buffer time */ + dir = 0; + for (unsigned int val = 0; val < 100000; val++) { +- rv = cw_alsa.snd_pcm_hw_params_test_buffer_time(gen->alsa_data.handle, hw_params, val, dir); ++ rv = snd_pcm_hw_params_test_buffer_time(gen->alsa_data.handle, hw_params, val, dir); + if (rv == 0) { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, + "cw_alsa: accepted buffer time: %d", val); +@@ -573,10 +503,10 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params + #endif /* #if CW_ALSA_HW_BUFFER_CONFIG */ + + /* Save hw parameters to device */ +- rv = cw_alsa.snd_pcm_hw_params(gen->alsa_data.handle, hw_params); ++ rv = snd_pcm_hw_params(gen->alsa_data.handle, hw_params); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: can't save hw parameters: %s", cw_alsa.snd_strerror(rv)); ++ "cw_alsa: can't save hw parameters: %s", snd_strerror(rv)); + return CW_FAILURE; + } else { + return CW_SUCCESS; +@@ -600,30 +530,30 @@ int cw_alsa_print_params_internal(snd_pcm_hw_params_t *hw_params) + unsigned int val = 0; + int dir = 0; + +- int rv = cw_alsa.snd_pcm_hw_params_get_periods(hw_params, &val, &dir); ++ int rv = snd_pcm_hw_params_get_periods(hw_params, &val, &dir); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: can't get 'periods': %s", cw_alsa.snd_strerror(rv)); ++ "cw_alsa: can't get 'periods': %s", snd_strerror(rv)); + } else { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, + "cw_alsa: 'periods' = %u", val); + } + + snd_pcm_uframes_t period_size = 0; +- rv = cw_alsa.snd_pcm_hw_params_get_period_size(hw_params, &period_size, &dir); ++ rv = snd_pcm_hw_params_get_period_size(hw_params, &period_size, &dir); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: can't get 'period size': %s", cw_alsa.snd_strerror(rv)); ++ "cw_alsa: can't get 'period size': %s", snd_strerror(rv)); + } else { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, + "cw_alsa: 'period size' = %u", (unsigned int) period_size); + } + + snd_pcm_uframes_t buffer_size; +- rv = cw_alsa.snd_pcm_hw_params_get_buffer_size(hw_params, &buffer_size); ++ rv = snd_pcm_hw_params_get_buffer_size(hw_params, &buffer_size); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "cw_alsa: can't get buffer size: %s", cw_alsa.snd_strerror(rv)); ++ "cw_alsa: can't get buffer size: %s", snd_strerror(rv)); + } else { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, + "cw_alsa: 'buffer size' = %u", (unsigned int) buffer_size); +@@ -642,70 +572,9 @@ int cw_alsa_print_params_internal(snd_pcm_hw_params_t *hw_params) + + + +-/** +- \brief Resolve/get symbols from ALSA library +- +- Function resolves/gets addresses of few ALSA functions used by +- libcw and stores them in cw_alsa global variable. +- +- On failure the function returns negative value, different for every +- symbol that the funciton failed to resolve. Function stops and returns +- on first failure. +- +- \param handle - handle to open ALSA library +- +- \return 0 on success +- \return negative value on failure +-*/ +-static int cw_alsa_dlsym_internal(void *handle) +-{ +- *(void **) &(cw_alsa.snd_pcm_open) = dlsym(handle, "snd_pcm_open"); +- if (!cw_alsa.snd_pcm_open) return -1; +- *(void **) &(cw_alsa.snd_pcm_close) = dlsym(handle, "snd_pcm_close"); +- if (!cw_alsa.snd_pcm_close) return -2; +- *(void **) &(cw_alsa.snd_pcm_prepare) = dlsym(handle, "snd_pcm_prepare"); +- if (!cw_alsa.snd_pcm_prepare) return -3; +- *(void **) &(cw_alsa.snd_pcm_drop) = dlsym(handle, "snd_pcm_drop"); +- if (!cw_alsa.snd_pcm_drop) return -4; +- *(void **) &(cw_alsa.snd_pcm_writei) = dlsym(handle, "snd_pcm_writei"); +- if (!cw_alsa.snd_pcm_writei) return -5; +- +- *(void **) &(cw_alsa.snd_strerror) = dlsym(handle, "snd_strerror"); +- if (!cw_alsa.snd_strerror) return -10; +- +- *(void **) &(cw_alsa.snd_pcm_hw_params_malloc) = dlsym(handle, "snd_pcm_hw_params_malloc"); +- if (!cw_alsa.snd_pcm_hw_params_malloc) return -20; +- *(void **) &(cw_alsa.snd_pcm_hw_params_any) = dlsym(handle, "snd_pcm_hw_params_any"); +- if (!cw_alsa.snd_pcm_hw_params_any) return -21; +- *(void **) &(cw_alsa.snd_pcm_hw_params_set_format) = dlsym(handle, "snd_pcm_hw_params_set_format"); +- if (!cw_alsa.snd_pcm_hw_params_set_format) return -22; +- *(void **) &(cw_alsa.snd_pcm_hw_params_set_rate_near) = dlsym(handle, "snd_pcm_hw_params_set_rate_near"); +- if (!cw_alsa.snd_pcm_hw_params_set_rate_near) return -23; +- *(void **) &(cw_alsa.snd_pcm_hw_params_set_access) = dlsym(handle, "snd_pcm_hw_params_set_access"); +- if (!cw_alsa.snd_pcm_hw_params_set_access) return -24; +- *(void **) &(cw_alsa.snd_pcm_hw_params_set_channels) = dlsym(handle, "snd_pcm_hw_params_set_channels"); +- if (!cw_alsa.snd_pcm_hw_params_set_channels) return -25; +- *(void **) &(cw_alsa.snd_pcm_hw_params) = dlsym(handle, "snd_pcm_hw_params"); +- if (!cw_alsa.snd_pcm_hw_params) return -26; +- *(void **) &(cw_alsa.snd_pcm_hw_params_get_periods) = dlsym(handle, "snd_pcm_hw_params_get_periods"); +- if (!cw_alsa.snd_pcm_hw_params_get_periods) return -27; +- *(void **) &(cw_alsa.snd_pcm_hw_params_get_period_size) = dlsym(handle, "snd_pcm_hw_params_get_period_size"); +- if (!cw_alsa.snd_pcm_hw_params_get_period_size) return -28; +- *(void **) &(cw_alsa.snd_pcm_hw_params_get_period_size_min) = dlsym(handle, "snd_pcm_hw_params_get_period_size_min"); +- if (!cw_alsa.snd_pcm_hw_params_get_period_size_min) return -29; +- *(void **) &(cw_alsa.snd_pcm_hw_params_get_buffer_size) = dlsym(handle, "snd_pcm_hw_params_get_buffer_size"); +- if (!cw_alsa.snd_pcm_hw_params_get_buffer_size) return -30; +- +- return 0; +-} +- +- +- +- +- + void cw_alsa_drop(cw_gen_t *gen) + { +- cw_alsa.snd_pcm_drop(gen->alsa_data.handle); ++ snd_pcm_drop(gen->alsa_data.handle); + + return; + } +@@ -721,7 +590,7 @@ void cw_alsa_drop(cw_gen_t *gen) + + + #include +-#include "libcw_alsa.h" ++#include "libh" + + + +diff --git a/src/libcw/libcw_pa.c b/src/libcw/libcw_pa.c +index 8269e9d..e190200 100644 +--- a/src/libcw/libcw_pa.c ++++ b/src/libcw/libcw_pa.c +@@ -39,7 +39,6 @@ + #include + #include + #include +-#include /* dlopen() and related symbols */ + #include + #include + #include +@@ -63,39 +62,12 @@ extern cw_debug_t cw_debug_object_dev; + + + static pa_simple *cw_pa_simple_new_internal(pa_sample_spec *ss, pa_buffer_attr *ba, const char *device, const char *stream_name, int *error); +-static int cw_pa_dlsym_internal(void *handle); + static int cw_pa_open_device_internal(cw_gen_t *gen); + static void cw_pa_close_device_internal(cw_gen_t *gen); + static int cw_pa_write_internal(cw_gen_t *gen); + + + +-static struct { +- void *handle; +- +- pa_simple *(* pa_simple_new)(const char *server, const char *name, pa_stream_direction_t dir, const char *dev, const char *stream_name, const pa_sample_spec *ss, const pa_channel_map *map, const pa_buffer_attr *attr, int *error); +- void (* pa_simple_free)(pa_simple *s); +- int (* pa_simple_write)(pa_simple *s, const void *data, size_t bytes, int *error); +- pa_usec_t (* pa_simple_get_latency)(pa_simple *s, int *error); +- int (* pa_simple_drain)(pa_simple *s, int *error); +- +- size_t (* pa_usec_to_bytes)(pa_usec_t t, const pa_sample_spec *spec); +- char *(* pa_strerror)(int error); +-} cw_pa = { +- .handle = NULL, +- +- .pa_simple_new = NULL, +- .pa_simple_free = NULL, +- .pa_simple_write = NULL, +- .pa_simple_get_latency = NULL, +- .pa_simple_drain = NULL, +- +- .pa_usec_to_bytes = NULL, +- .pa_strerror = NULL +-}; +- +- +- + + static const pa_sample_format_t CW_PA_SAMPLE_FORMAT = PA_SAMPLE_S16LE; /* Signed 16 bit, Little Endian */ + static const int CW_PA_BUFFER_N_SAMPLES = 1024; +@@ -117,21 +89,6 @@ static const int CW_PA_BUFFER_N_SAMPLES = 1024; + */ + bool cw_is_pa_possible(const char *device) + { +- const char *library_name = "libpulse-simple.so"; +- if (!cw_dlopen_internal(library_name, &(cw_pa.handle))) { +- cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "libcw_pa: can't access PulseAudio library \"%s\"", library_name); +- return false; +- } +- +- int rv = cw_pa_dlsym_internal(cw_pa.handle); +- if (rv < 0) { +- cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "libcw_pa: failed to resolve PulseAudio symbol #%d, can't correctly load PulseAudio library", rv); +- dlclose(cw_pa.handle); +- return false; +- } +- + const char *dev = (char *) NULL; + if (device && strcmp(device, CW_DEFAULT_PA_DEVICE)) { + dev = device; +@@ -145,13 +102,10 @@ bool cw_is_pa_possible(const char *device) + + if (!s) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "libcw_pa: can't connect to PulseAudio server: %s", cw_pa.pa_strerror(error)); +- if (cw_pa.handle) { +- dlclose(cw_pa.handle); +- } ++ "libcw_pa: can't connect to PulseAudio server: %s", pa_strerror(error)); + return false; + } else { +- cw_pa.pa_simple_free(s); ++ pa_simple_free(s); + s = NULL; + return true; + } +@@ -186,10 +140,10 @@ int cw_pa_write_internal(cw_gen_t *gen) + + int error = 0; + size_t n_bytes = sizeof (gen->buffer[0]) * gen->buffer_n_samples; +- int rv = cw_pa.pa_simple_write(gen->pa_data.s, gen->buffer, n_bytes, &error); ++ int rv = pa_simple_write(gen->pa_data.s, gen->buffer, n_bytes, &error); + if (rv < 0) { + cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "libcw_pa: pa_simple_write() failed: %s", cw_pa.pa_strerror(error)); ++ "libcw_pa: pa_simple_write() failed: %s", pa_strerror(error)); + } else { + //cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, "libcw_pa: written %d samples with PulseAudio", gen->buffer_n_samples); + } +@@ -237,13 +191,13 @@ pa_simple *cw_pa_simple_new_internal(pa_sample_spec *ss, pa_buffer_attr *ba, con + } + + // http://www.mail-archive.com/pulseaudio-tickets@mail.0pointer.de/msg03295.html +- ba->tlength = cw_pa.pa_usec_to_bytes(50*1000, ss); +- ba->minreq = cw_pa.pa_usec_to_bytes(0, ss); +- ba->maxlength = cw_pa.pa_usec_to_bytes(50*1000, ss); ++ ba->tlength = pa_usec_to_bytes(50*1000, ss); ++ ba->minreq = pa_usec_to_bytes(0, ss); ++ ba->maxlength = pa_usec_to_bytes(50*1000, ss); + /* ba->prebuf = ; */ /* ? */ + /* ba->fragsize = sizeof(uint32_t) -1; */ /* not relevant to playback */ + +- pa_simple *s = cw_pa.pa_simple_new(NULL, /* server name (NULL for default) */ ++ pa_simple *s = pa_simple_new(NULL, /* server name (NULL for default) */ + "libcw", /* descriptive name of client (application name etc.) */ + PA_STREAM_PLAYBACK, /* stream direction */ + dev, /* device/sink name (NULL for default) */ +@@ -258,47 +212,6 @@ pa_simple *cw_pa_simple_new_internal(pa_sample_spec *ss, pa_buffer_attr *ba, con + + + +- +- +-/** +- \brief Resolve/get symbols from PulseAudio library +- +- Function resolves/gets addresses of few PulseAudio functions used by +- libcw and stores them in cw_pa global variable. +- +- On failure the function returns negative value, different for every +- symbol that the funciton failed to resolve. Function stops and returns +- on first failure. +- +- \param handle - handle to open PulseAudio library +- +- \return 0 on success +- \return negative value on failure +-*/ +-int cw_pa_dlsym_internal(void *handle) +-{ +- *(void **) &(cw_pa.pa_simple_new) = dlsym(handle, "pa_simple_new"); +- if (!cw_pa.pa_simple_new) return -1; +- *(void **) &(cw_pa.pa_simple_free) = dlsym(handle, "pa_simple_free"); +- if (!cw_pa.pa_simple_free) return -2; +- *(void **) &(cw_pa.pa_simple_write) = dlsym(handle, "pa_simple_write"); +- if (!cw_pa.pa_simple_write) return -3; +- *(void **) &(cw_pa.pa_strerror) = dlsym(handle, "pa_strerror"); +- if (!cw_pa.pa_strerror) return -4; +- *(void **) &(cw_pa.pa_simple_get_latency) = dlsym(handle, "pa_simple_get_latency"); +- if (!cw_pa.pa_simple_get_latency) return -5; +- *(void **) &(cw_pa.pa_simple_drain) = dlsym(handle, "pa_simple_drain"); +- if (!cw_pa.pa_simple_drain) return -6; +- *(void **) &(cw_pa.pa_usec_to_bytes) = dlsym(handle, "pa_usec_to_bytes"); +- if (!cw_pa.pa_usec_to_bytes) return -7; +- +- return 0; +-} +- +- +- +- +- + /** + \brief Open PulseAudio output, associate it with given generator + +@@ -325,16 +238,16 @@ int cw_pa_open_device_internal(cw_gen_t *gen) + + if (!gen->pa_data.s) { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "libcw_pa: can't connect to PulseAudio server: %s", cw_pa.pa_strerror(error)); ++ "libcw_pa: can't connect to PulseAudio server: %s", pa_strerror(error)); + return false; + } + + gen->buffer_n_samples = CW_PA_BUFFER_N_SAMPLES; + gen->sample_rate = gen->pa_data.ss.rate; + +- if ((gen->pa_data.latency_usecs = cw_pa.pa_simple_get_latency(gen->pa_data.s, &error)) == (pa_usec_t) -1) { ++ if ((gen->pa_data.latency_usecs = pa_simple_get_latency(gen->pa_data.s, &error)) == (pa_usec_t) -1) { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "libcw_pa: pa_simple_get_latency() failed: %s", cw_pa.pa_strerror(error)); ++ "libcw_pa: pa_simple_get_latency() failed: %s", pa_strerror(error)); + } + + #if CW_DEV_RAW_SINK +@@ -357,20 +270,17 @@ void cw_pa_close_device_internal(cw_gen_t *gen) + if (gen->pa_data.s) { + /* Make sure that every single sample was played */ + int error; +- if (cw_pa.pa_simple_drain(gen->pa_data.s, &error) < 0) { ++ if (pa_simple_drain(gen->pa_data.s, &error) < 0) { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR, +- "libcw_pa: pa_simple_drain() failed: %s", cw_pa.pa_strerror(error)); ++ "libcw_pa: pa_simple_drain() failed: %s", pa_strerror(error)); + } +- cw_pa.pa_simple_free(gen->pa_data.s); ++ pa_simple_free(gen->pa_data.s); + gen->pa_data.s = NULL; + } else { + cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING, + "libcw_pa: called the function for NULL PA sink"); + } + +- if (cw_pa.handle) { +- dlclose(cw_pa.handle); +- } + + #if CW_DEV_RAW_SINK + if (gen->dev_raw_sink != -1) { +-- +2.16.2 + diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index d2463616d6773071e8e2d851d00b2c9c9b3ae42c..56da0cf22efea57c3a0c445b35260c88d34d2b36 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.0.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "0mnnrxm49s77s1qg7zbfciw0525ipsl010sciqdw8a22jg1rfjh8"; + sha256 = "1iq84590cjpf2rlxb60fy4hxi7vir27bbb10axbwrqwnp5cc4bql"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index c3071647c40a437b4d928610b253a850fdf11588..6b0c4670544fa1e4359636812de1988a4628c251 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "1jxjcq869jimsq1ihk2fbjhp5lj7yga0hbp0msskxyz92afl1kz8"; + sha256 = "0vad1g234r9agvkdsry9xb6hmn6lg4mygfcy0mg68gibmrg7h1ji"; }; propagatedBuildInputs = [ python3Packages.urwid ]; diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7649785524f1b5e8653d84288f584dd284c399a8 --- /dev/null +++ b/pkgs/applications/misc/vcal/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "vcal-${version}"; + version = "2.8"; + + src = fetchurl { + url = "https://waynemorrison.com/software/vcal"; + sha256 = "0jrm0jzqxb1xjp24hwbzlxsh22gjssay9gj4zszljzdm68r5afvc"; + }; + + nativeBuildInputs = [ perl ]; # for pod2man + + unpackPhase = ":"; + dontBuild = true; + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/man/man1} + substitute ${src} $out/bin/vcal \ + --replace /usr/bin/perl ${perl}/bin/perl + chmod 0755 $out/bin/* + pod2man --name=vcal --release=${version} ${src} > $out/share/man/man1/vcal.1 + + runHook postInstall + ''; + + # There are no tests + doCheck = false; + + meta = with lib; { + description = "Parser for VCalendar and ICalendar files, usable from the command line"; + homepage = https://waynemorrison.com/software/; + license = licenses.asl20; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 1c5c4d1dcaac41ae41b391a7927e22180c7192c7..bc5b19e77370edf299e4e541964c29a1b306faae 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, devicemapper, makeself, +{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, lvm2, makeself, wxGUI ? true }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ makeself yasm pkgconfig ]; - buildInputs = [ fuse devicemapper ] + buildInputs = [ fuse lvm2 ] ++ optional wxGUI wxGTK30; makeFlags = optionalString (!wxGUI) "NOGUI=1"; diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index 3ec92adb7f8ce282c5b9b838ce1b45ae6d910541..f23862c63cd4c81092e6994b74d176a83e889114 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.1.45"; src = fetchurl { - url = "http://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz"; + url = "https://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz"; sha256 = "180zyhdjspp7lk2291wsqs6bm7y27r7bd00447iimmjpx372s22c"; }; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index d090878f976878f6ff8a8e6bac2ef7700734a38f..b7d0b330e85b0d8f869cfa8eff4e853f152b8fa3 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper -, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }: +, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "viking-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils - libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite + libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme ]; configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ]; diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index d8dea641c3addb2aa5e0cdd3a3d1d05974f76887..40a399247e9050a12eea6ae1055c6374614500b4 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation { meta = { description = "Visual Interactive Taskwarrior"; - maintainers = with pkgs.lib.maintainers; [ matthiasbeyer ]; - platforms = pkgs.lib.platforms.linux; + maintainers = with pkgs.lib.maintainers; [ ]; + platforms = pkgs.lib.platforms.all; license = pkgs.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index e06242f7a02406261d0e6566d62dabfd9ce08cd2..48818ca3b8b11bc666d5a70c39e478e818dd46f3 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, qt4, qmake4Hook }: +{ stdenv, fetchurl, pkgconfig, qmake, qtsvg }: stdenv.mkDerivation rec { name = "vym-${version}"; - version = "2.2.4"; + version = "2.6.11"; src = fetchurl { - url = "mirror://sourceforge/project/vym/${version}/${name}.tar.bz2"; - sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs"; + url = "mirror://sourceforge/project/vym/2.6.0/${name}.tar.bz2"; + sha256 = "1yznlb47jahd662a2blgh1ccwpl5dp5rjz9chsxjzhj3vbkzx3nl"; }; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ qt4 qmake4Hook ]; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ qtsvg ]; meta = with stdenv.lib; { description = "A mind-mapping software"; diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 90fa016615430919ff03eab4f9c5ccfa918f7949..544c1252ff411b31719ab68625d52c0535c72b1b 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://fungi.yuggoth.org/weather; description = "Quick access to current weather conditions and forecasts"; license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; # my only platform }; } diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index e59a3e989432c5582ff08eb213631be3450d9c24..b61566af6b2c1351e2b927485c1a2a8e96da43bf 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "wego-${version}"; diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index d705de1a8cd6ca44190581789f39bb8554f57809..410346bce9adfb7e790e2981a5a85db3e4193392 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 -, faad2, rtl-sdr, libusb, fftwSinglePrec }: +, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }: let version = "1.0-rc2"; @@ -28,20 +28,20 @@ in stdenv.mkDerivation { qtquickcontrols qtquickcontrols2 rtl-sdr + soapysdr-with-plugins ]; cmakeFlags = [ - "-DRTLSDR=true" + "-DRTLSDR=true" "-DSOAPYSDR=true" ]; enableParallelBuilding = true; meta = with stdenv.lib; { description = "A DAB/DAB+ Software Radio"; - homepage = http://www.welle.io/; + homepage = https://www.welle.io/; maintainers = with maintainers; [ ck3d ]; license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; }; - } diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index 84f7d4fd29131456854b8c803f44bcd10f99e368..d8628b794d7161a730a7c485bfae986781d19ae9 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "1.3"; + version = "1.4"; name = "wikicurses-${version}"; - src = fetchurl { - url = "http://github.com/ids1024/wikicurses/archive/v${version}.tar.gz"; - sha256 = "1yxgafk1sczg1xi2p6nhrvr3hchp7ydw98n48lp3qzwnryn1kxv8"; + src = fetchFromGitHub { + owner = "ids1024"; + repo = "wikicurses"; + rev = "v${version}"; + sha256 = "0f14s4qx3q5pr5vn460c34b5mbz2xs62d8ljs3kic8gmdn8x2knm"; }; - patches = [ - # This is necessary to build without a config file. - # It can be safely removed after updating to wikicurses to 1.4 - # or when commit 4b944ac339312b642c6dc5d6b5a2f7be7503218f is included - (fetchurl { - url = "https://github.com/ids1024/wikicurses/commit/4b944ac339312b642c6dc5d6b5a2f7be7503218f.patch"; - sha256 = "0ii4b0c4hb1zdhcpp4ij908mfy5b8khpm1l7xr7lp314lfhsg9as"; - }) - ]; - propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ]; meta = { @@ -26,6 +18,7 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/ids1024/wikicurses/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index fe0348cad211f18112760def79628eb4a9bd519f..68f6c4df15936559e892326e533a8c43bacd8ce9 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "wmname-0.1"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5"; }; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 71d95e138927589d37f2e6588698f290d6241560..a2e3fa13fc6a5ebb29300c58786c5a1312e8c32b 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { ''; # Needs the path to `tclConfig.sh' and `tkConfig.sh'. - configureFlags = "--with-tcl=" + tcl + "/lib " + - "--with-tk=" + tk + "/lib"; + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + ]; postInstall = '' wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 968539336a9cb5cce992eac97001931ad3a140c4..bfb43d3e49d10832a651b58e04aad816cb8171d1 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "3.15.0"; + version = "3.15.1"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "0baaxa10jnf4nralhjdi7525wd1wj0161z2ixz1j5pb0rl38brl8"; + sha256 = "05h25dxqff4xhmrk7j9j11yxpqa4qm7m3xprv7yldryc1mbvnpwi"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix index 8a23134e3ed0bae0ea65f3d4c3a6346b13e4c92d..fd6be8f59201b60f982a0f71a3d65522f97f0721 100644 --- a/pkgs/applications/misc/wsjtx/default.nix +++ b/pkgs/applications/misc/wsjtx/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, - docbook_xsl, fftw, fftwFloat, gfortran, libtool, libpulseaudio, qtbase, + docbook_xsl, fftw, fftwFloat, gfortran, libtool, qtbase, qtmultimedia, qtserialport, texinfo, libusb1 }: stdenv.mkDerivation rec { name = "wsjtx-${version}"; - version = "1.8.0"; + version = "1.9.1"; # This is a composite source tarball containing both wsjtx and a hamlib fork src = fetchurl { url = "http://physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz"; - sha256 = "21603ad4d5f43cd9c79a6e8cf468bde88c554654012b2c6c1ef9144cfbf668ce"; + sha256 = "143r17fri08mwz28g17wcfxy60h3xgfk46mln5lmdr9k6355aqqc"; }; # Hamlib builds with autotools, wsjtx builds with cmake diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 270380a8c3fb120b04bf8700acfe22c406587a33..ee4300cde0f51759b97d2e2b657900c31f8cb0fa 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,22 +1,27 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, which +{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig, which , libtool, openssl, qtbase, qttools }: mkDerivation rec { name = "xca-${version}"; - version = "1.4.1"; + version = "2.1.0"; - src = fetchurl { - url = "mirror://sourceforge/xca/${name}.tar.gz"; - sha256 = "11niik2m4yswkp71hrdh54z5kgkvdg8y0b6wdqbrn6vy1n8gz63q"; + src = fetchFromGitHub { + owner = "chris2511"; + repo = "xca"; + rev = "RELEASE.${version}"; + sha256 = "039qz6hh43hx8dcw2bq71mgy95zk09jyd3xxpldmxxd5d69zcr8m"; }; - enableParallelBuilding = true; + postPatch = '' + substituteInPlace doc/code2html \ + --replace /usr/bin/perl ${perl}/bin/perl + ''; buildInputs = [ libtool openssl qtbase qttools ]; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ autoreconfHook pkgconfig which ]; - configureFlags = [ "CXXFLAGS=-std=c++11" ]; + enableParallelBuilding = true; meta = with lib; { description = "Interface for managing asymetric keys like RSA or DSA"; diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ccbb88bd1a8e84768d65e65e4a23c1160b3c95a3 --- /dev/null +++ b/pkgs/applications/misc/xkbd/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, freetype, libXrender, libXft, xextproto +, xinput, libXi, libXext, libXtst, libXpm, libX11, xproto, autoreconfHook +}: + +stdenv.mkDerivation rec { + name = "xkbd-${version}"; + version = "0.8.18"; + + src = fetchFromGitHub { + owner = "mahatma-kaganovich"; + repo = "xkbd"; + rev = name; + sha256 = "05ry6q75jq545kf6p20nhfywaqf2wdkfiyp6iwdpv9jh238hf7m9"; + }; + + buildInputs = [ + freetype libXrender libXft libXext libXtst libXpm libX11 + libXi xextproto xinput xproto + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mahatma-kaganovich/xkbd; + description = "onscreen soft keyboard for X11"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/xlog/default.nix b/pkgs/applications/misc/xlog/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3ba7062b7bb1a98f33bdf7af8426516570792498 --- /dev/null +++ b/pkgs/applications/misc/xlog/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: +stdenv.mkDerivation rec { + name = "xlog-${version}"; + version = "2.0.15"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/xlog/${name}.tar.gz"; + sha256 = "0an883wqw3zwpw8nqinm9cb17hp2xw9vf603k4l2345p61jqdw2j"; + }; + + buildInputs = [ glib pkgconfig gtk2 hamlib ]; + + meta = with stdenv.lib; { + description = "An amateur radio logging program"; + longDescription = + '' Xlog is an amateur radio logging program. + It supports cabrillo, ADIF, trlog (format also used by tlf), + and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files. + Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone, + location in latitude and longitude and distance and heading in kilometers or miles, + both for short and long path. + ''; + homepage = http://www.nongnu.org/xlog; + maintainers = [ maintainers.mafo ]; + license = licenses.gpl3; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix index 32729d57475fdce93a79de368ad860009096ddac..e461a2c8816a485c505684cc524ef0d0911fa68c 100644 --- a/pkgs/applications/misc/xmove/default.nix +++ b/pkgs/applications/misc/xmove/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 98b3af52d6ee2bf0b1be3fc4cb89f8c876d4cec0..b98d10efdee10c1dedd0b7feccf060b681ea3241 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -1,19 +1,24 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl +{ stdenv, stdenvGcc6, lib +, fetchFromGitHub, cmake, libmicrohttpd, openssl , opencl-headers, ocl-icd, hwloc, cudatoolkit , devDonationLevel ? "0.0" , cudaSupport ? false , openclSupport ? true }: -stdenv.mkDerivation rec { +let + stdenv' = if cudaSupport then stdenvGcc6 else stdenv; +in + +stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.3.0"; + version = "2.4.7"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "1iisy73pi4xx3vmqvy6whdzb566jqyjx4pdyx0g35qjj8giflpc8"; + sha256 = "072gapchmd05ir5ygrvbgdhpjhm7pdjyl61n1ykxzvnvi81z6817"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 42d9e448991a2e15e1f530765d820a284cf38be1..f61cbf397597ea6abd22594b70a9d2960284cafb 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.5.2"; + version = "2.6.4"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1jc6vzqdl85pmiw5qv9b148kfw4k4wxn90ggylxfpfdv7czamh2c"; + sha256 = "1c68qg7433chri6q1yhyggy4mbq2vnn3p2fxs8gqmgij9vpqn3m2"; }; nativeBuildInputs = [ cmake ]; @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { description = "Monero (XMR) CPU miner"; homepage = "https://github.com/xmrig/xmrig"; license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix new file mode 100644 index 0000000000000000000000000000000000000000..c013a9cc44ec516a45022127aad55dd079b10ea9 --- /dev/null +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, libuuid +, donateLevel ? 0 +}: + +stdenv.mkDerivation rec { + name = "xmrig-proxy-${version}"; + version = "2.6.4"; + + src = fetchFromGitHub { + owner = "xmrig"; + repo = "xmrig-proxy"; + rev = "v${version}"; + sha256 = "0h6ihrrkgwi8k642iqq13qx3zlxl9r8q7wm417hb7j35rnmwn8lq"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libuv libmicrohttpd libuuid ]; + + # Set default donation level to 0%. Can be increased at runtime via --donate-level option. + postPatch = '' + substituteInPlace src/donate.h --replace "kDonateLevel = 2;" "kDonateLevel = ${toString donateLevel};" + ''; + + installPhase = '' + install -vD xmrig-proxy $out/bin/xmrig-proxy + ''; + + meta = with lib; { + description = "Monero (XMR) Stratum protocol proxy"; + homepage = "https://github.com/xmrig/xmrig-proxy"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ aij ]; + }; +} diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix deleted file mode 100644 index 39da756204f9af74dbf32bc5103e2f4d72176047..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/xneur/0.8.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, pcre, gstreamer, glib, libxml2, aspell -, imlib2, xorg, xosd }: - -stdenv.mkDerivation { - name = "xneur-0.8.0"; - - src = fetchurl { - url = http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2; - sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8"; - }; - - buildInputs = - [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell - xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext - ]; - - preConfigure = '' - sed -e 's/-Werror//' -i configure - sed -e 's@for aspell_dir in@for aspell_dir in ${aspell} @' -i configure - sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure - sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure - ''; - - meta = { - description = "Utility for switching between keyboard layouts"; - platforms = stdenv.lib.platforms.linux; - }; - -} diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index ca0d7775ecef034bdbd2d1dbfd0bbb01e0d25b2f..c6438a21f2c35d14926761966b5777f157a3a211 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,44 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2 -, aspell, cairo, imlib2, xosd, libnotify, gtk2, pango, atk, enchant, - gdk_pixbuf}: - -let s = import ./src-for-default.nix; in +{ stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib +, xosd, libnotify, enchant, wrapGAppsHook, gdk_pixbuf }: stdenv.mkDerivation rec { - inherit (s) version name; + name = "xneur-${version}"; + version = "0.20.0"; + src = fetchurl { - inherit(s) url; - sha256 = s.hash; + url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/xneur_0.20.0.orig.tar.gz"; + sha256 = "1lg3qpi9pkx9f5xvfc8yf39wwc98f769yb7i2438vqn66kla1xpr"; }; - buildInputs = - [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo - xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify - gtk2 pango enchant gdk_pixbuf - ]; + nativeBuildInputs = [ + pkgconfig intltool wrapGAppsHook + ]; - preConfigure = '' - sed -e 's/-Werror//' -i configure - sed -e 's@for aspell_dir in@for aspell_dir in ${aspell} @' -i configure - sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure - sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure + buildInputs = [ + xorg.libX11 xorg.libXtst pcre gst_all_1.gstreamer glib + xosd xorg.libXext xorg.libXi libnotify + enchant gdk_pixbuf + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.dev}/include/gtk-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.out}/lib/gtk-2.0/include" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango.dev}/include/pango-1.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/include" - - export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify" + postPatch = '' + sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure ''; - meta = { + meta = with stdenv.lib; { description = "Utility for switching between keyboard layouts"; - homepage = http://xneur.ru; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + homepage = https://xneur.ru; + license = licenses.gpl2Plus; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xneur/src-for-default.nix b/pkgs/applications/misc/xneur/src-for-default.nix deleted file mode 100644 index a7db13bd81d14679459702c88b332d29d5c6b25f..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/xneur/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="0.13.0"; - name="xneur-0.13.0"; - hash="19z8nnfj9paf877k0nrqy6dih69l81svxymqg6llh7ndgkw20hgd"; - url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2"; - advertisedUrl="http://dists.xneur.ru/release-0.13.0/tgz/xneur-0.13.0.tar.bz2"; - - -} diff --git a/pkgs/applications/misc/xneur/src-info-for-default.nix b/pkgs/applications/misc/xneur/src-info-for-default.nix deleted file mode 100644 index 0de3e83baf71675aa4b70f513a9c698f7a349925..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/xneur/src-info-for-default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - downloadPage = "http://xneur.ru/downloads"; - baseName = "xneur"; - versionReferenceCreator = "$(replaceAllVersionOccurences)"; -} diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index 01df5d32ab1a8096e72af5666acad958a2805871..fdd468a9c06af3db3a605254c6487aa5fc345ce4 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "xpad-${version}"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2"; - sha256 = "02yikxg6z9bwla09ka001ppjlpbv5kbza3za9asazm5aiz376mkb"; + sha256 = "0l0g5x8g6dwhf5ksnqqrjjsycy57kcvdslkmsr6bl3vrsjd7qml3"; }; nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index e9bb722dcab04c3abbf1b0c984cd7c3226f9c586..bb3385ad016a68627ca906a8c00327ef73d3ceac 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, libXrandr}: stdenv.mkDerivation rec { - version = "v0.01"; + version = "0.01"; name = "xrandr-invert-colors-${version}"; src = fetchurl { - url = "https://github.com/zoltanp/xrandr-invert-colors/archive/${version}.tar.gz"; + url = "https://github.com/zoltanp/xrandr-invert-colors/archive/v${version}.tar.gz"; sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75"; }; diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..28ce4a0d500d1969dcd44157ee1f588097aea68e --- /dev/null +++ b/pkgs/applications/misc/xscope/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, libXt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "xscope"; + version = "1.4.1"; + + src = fetchurl { + url = "mirror://xorg/individual/app/${name}.tar.bz2"; + sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXt ]; + + meta = with stdenv.lib; { + description = "program to monitor X11/Client conversations"; + homepage = https://cgit.freedesktop.org/xorg/app/xscope/; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ]; + platforms = with platforms; unix; + }; +} + diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index d807e8eb9ed50abc00c1d7ac750beece977d4d68..292e4e5ba38b21f1efcb487c39d981a99d3fb573 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-331"; + name = "xterm-335"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "047gk58hvj64974sg259ss5gixj7pac6halmjfz4cc6r1yimds4s"; + sha256 = "15nbgys4s2idhx6jzzc24g9bb1s6yps5fyg2bafvs0gkkcm1ggz0"; }; buildInputs = @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://invisible-island.net/xterm; license = with stdenv.lib.licenses; [ mit ]; - maintainers = with stdenv.lib.maintainers; [viric vrthra]; + maintainers = with stdenv.lib.maintainers; [vrthra]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix index eae5240129a51600ec104842d340651abe3bfc3b..8df29cef5392805f65cf914d0813e8dbf1727bd1 100644 --- a/pkgs/applications/misc/xtermcontrol/default.nix +++ b/pkgs/applications/misc/xtermcontrol/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4"; name = "xtermcontrol-${version}"; src = fetchurl { - url = "http://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; - sha256 = "1v2c1cnx43apmspga7icssh5ndbhzy5h82y6vm8fda40flq9mxj5"; + url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; + sha256 = "1g81v9gfn08gjn1269j0qx12x36s9j6x39gl91ycay391flgzr5l"; }; meta = { diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix index d273d27944a85324dcbbca8c24f76965707f6a4a..0794b2b6dbe93b59d5d4a702783ec3a3eaca4c73 100644 --- a/pkgs/applications/misc/yaft/default.nix +++ b/pkgs/applications/misc/yaft/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/uobikiemukot/yaft; description = "Yet another framebuffer terminal"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 676cfc12eb0fc868af02a4223f330312b6c7010f..8f8494ac45b5166b68895d8da4c998ed6b8d41c0 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -65,5 +65,6 @@ mkDerivation rec { homepage = https://yakuake.kde.org; description = "Quad-style terminal emulator for KDE"; maintainers = with lib.maintainers; [ fridh ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a8ff981400a9e5658b39262e99be793c463f22ef --- /dev/null +++ b/pkgs/applications/misc/yarssr/default.nix @@ -0,0 +1,68 @@ +{ +fetchFromGitHub, stdenv, lib, +makeWrapper, pkgs, +perl, perlPackages, +gnome2 }: + +let + perlDeps = with perlPackages; [ + Glib Gtk2 Gnome2 Pango Cairo Gnome2Canvas Gnome2VFS Gtk2GladeXML Gtk2TrayIcon + XMLLibXML XMLSAXBase XMLParser XMLRSS + HTMLParser + DateTime DateTimeFormatMail DateTimeFormatW3CDTF DateTimeLocale DateTimeTimeZone + ParamsValidate + ModuleImplementation ModuleRuntime + TryTiny + ClassSingleton + URI + AnyEvent AnyEventHTTP + commonsense + FileSlurp + JSON + Guard + LocaleGettext + ]; + libs = [ + stdenv.cc.cc.lib + pkgs.gtk2 + ]; +in +stdenv.mkDerivation rec { + version = "git-2017-12-01"; + name = "yarssr-${version}"; + + src = fetchFromGitHub { + owner = "JGRennison"; + repo = "yarssr"; + rev = "e70eb9fc6563599bfb91c6de6a79654de531c18d"; + sha256 = "0x7hz8x8qyp3i1vb22zhcnvwxm3jhmmmlr22jqc5b09vpmbw1l45"; + }; + + nativeBuildInputs = [ perl pkgs.gettext makeWrapper ]; + buildInputs = perlDeps ++ [gnome2.libglade]; + propagatedBuildInputs = libs ++ perlDeps; + + installPhase = '' + DESTDIR=$out make install + mv $out/usr/* $out/ + rm -R $out/usr + sed -i -r "s!use lib [^;]+;!use lib '$out/share/yarssr';!" $out/bin/yarssr + sed -i -r "s!$Yarssr::PREFIX = [^;]+;!$Yarssr::PREFIX = '$out';!" $out/bin/yarssr + sed -i -r "s!use Yarssr::Browser;!!" $out/share/yarssr/Yarssr/GUI.pm + chmod a+x $out/bin/yarssr + ''; + + postFixup = '' + wrapProgram $out/bin/yarssr \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs} \ + --set PERL5LIB "${lib.makePerlPath perlDeps}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/tsyrogit/zxcvbn-c; + description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes."; + license = licenses.gpl1; + platforms = platforms.linux; + maintainers = with maintainers; [ xurei ]; + }; +} diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 3d12fc0371074276464583ab1952529fd971ab7f..8843c821ffb41906ccae67ae2fdffd5bdd219318 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python27Packages, swig, gettext, pcsclite, qt48Full, yubikey-personalization }: +{ stdenv, fetchurl, python27Packages, pcsclite, yubikey-personalization }: python27Packages.buildPythonApplication rec { namePrefix = ""; @@ -6,7 +6,7 @@ python27Packages.buildPythonApplication rec { version = "3.1.0"; src = fetchurl { - url = "http://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; + url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; sha256 = "0jfvllgh88g2vwd8sg6willlnn2hq05nd9d3xmv98lhl7gyy1akw"; }; @@ -18,7 +18,7 @@ python27Packages.buildPythonApplication rec { # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary # support that the yubicommon library uses to load libykpers - makeWrapperArgs = ''--prefix LD_LIBRARY_PATH : "${pcsclite}/lib:${yubikey-personalization}/lib" --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so"''; + makeWrapperArgs = ''--prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so"''; postInstall = '' mkdir -p $out/share/applications diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index afb38ace1d93ef552cfe7167d59d939ef51b4ca9..001d70775d6d1548bea2b294b888a71bd2229782 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig -, gtk, girara, ncurses, gettext, docutils -, file, sqlite, glib, texlive, libintlOrEmpty +{ stdenv, fetchurl, meson, ninja, makeWrapper, pkgconfig +, appstream-glib, desktop-file-utils, python3 +, gtk, girara, gettext, libxml2 +, file, sqlite, glib, texlive, libintl, libseccomp , gtk-mac-integration, synctexSupport ? true }: @@ -9,53 +10,35 @@ assert synctexSupport -> texlive != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "zathura-core-${version}"; - version = "0.3.8"; + name = "zathura-core-${version}"; + version = "0.4.0"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "0dz5pky3vmf3s2cp2rv1c099gb1s49p9xlgm3ghyy4pzyxc8bgs6"; + url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"; + sha256 = "1j0yah09adv3bsjhhbqra5lambal32svk8fxmf89wwmcqrcr4qma"; }; - icon = ./icon.xpm; - nativeBuildInputs = [ - pkgconfig - ] ++ optional stdenv.isDarwin [ libintlOrEmpty ]; + meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx + gettext makeWrapper libxml2 + ]; buildInputs = [ - file gtk girara - gettext makeWrapper sqlite glib + file gtk girara libintl libseccomp + sqlite glib ] ++ optional synctexSupport texlive.bin.core ++ optional stdenv.isDarwin [ gtk-mac-integration ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - makeFlags = [ - "PREFIX=$(out)" - "RSTTOMAN=${docutils}/bin/rst2man.py" - "VERBOSE=1" - "TPUT=${ncurses.out}/bin/tput" - (optionalString synctexSupport "WITH_SYNCTEX=1") - ]; - postInstall = '' wrapProgram "$out/bin/zathura" \ - --prefix PATH ":" "${makeBinPath [ file ]}" \ - --prefix XDG_CONFIG_DIRS ":" "$out/etc" - - install -Dm644 $icon $out/share/pixmaps/pwmt.xpm - mkdir -pv $out/etc - echo "set window-icon $out/share/pixmaps/pwmt.xpm" > $out/etc/zathurarc - echo "Icon=pwmt" >> $out/share/applications/zathura.desktop + --prefix PATH ":" "${makeBinPath [ file ]}" ''; meta = { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura/; description = "A core component for zathura PDF viewer"; - license = licenses.zlib; - platforms = platforms.unix; + license = licenses.zlib; + platforms = platforms.unix; maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/applications/misc/zathura/core/icon.xpm b/pkgs/applications/misc/zathura/core/icon.xpm deleted file mode 100644 index a863c5ddb090c546c7da638aa4e773bac78bc1fd..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/zathura/core/icon.xpm +++ /dev/null @@ -1,120 +0,0 @@ -/* XPM */ -static char *freeimage[] = { -/* width height num_colors chars_per_pixel */ -"16 16 96 2", -/* colors */ -" c #1e1e1e", -" . c #222222", -" X c #212121", -" o c #535353", -" O c #a4a4a4", -" + c #202020", -" @ c #252525", -" # c #3c3c3c", -" $ c #292929", -" % c #979797", -" & c #cccccc", -" * c #303030", -" = c #1f1f1f", -" - c #494949", -" ; c #dddddd", -" : c #696969", -" > c #232323", -" , c #262626", -" < c #adadad", -" 1 c #bbbbbb", -" 2 c #1d1d1d", -" 3 c #1c1c1c", -" 4 c #5e5e5e", -" 5 c #e8e8e8", -" 6 c #9c9c9c", -" 7 c #242424", -" 8 c #b1b1b1", -" 9 c #b3b3b3", -" 0 c #090909", -" q c #161616", -" w c #131313", -" e c #4d4d4d", -" r c #dedede", -" t c #afafaf", -" y c #282828", -" u c #393939", -" i c #c4c4c4", -" p c #dcdcdc", -" a c #9a9a9a", -" s c #a2a2a2", -" d c #ababab", -" f c #313131", -" g c #a7a7a7", -" h c #e4e4e4", -" j c #f2f2f2", -" k c #eaeaea", -" l c #e2e2e2", -" z c #f0f0f0", -" x c #d5d5d5", -" c c #737373", -" v c #323232", -" b c #808080", -" n c #7a7a7a", -" m c #d3d3d3", -" M c #e5e5e5", -" N c #8a8a8a", -" B c #cbcbcb", -" V c #b5b5b5", -" C c #b9b9b9", -" Z c #272727", -" A c #b4b4b4", -" S c #bababa", -" D c #2d2d2d", -" F c #414141", -" G c #444444", -" H c #f4f4f4", -" J c #838383", -" K c #cfcfcf", -" L c #fafafa", -" P c #efefef", -" I c #e3e3e3", -" U c #8d8d8d", -" Y c #656565", -" T c #ffffff", -" R c #fbfbfb", -" E c #e9e9e9", -" W c #bdbdbd", -" Q c #e1e1e1", -" ! c #dfdfdf", -" ~ c #646464", -" ^ c #3a3a3a", -" / c #a1a1a1", -" ( c #999999", -" ) c #c0c0c0", -" _ c #3b3b3b", -" ` c #acacac", -" ' c #050505", -" ] c #151515", -" [ c #1b1b1b", -" { c #1a1a1a", -" } c #b2b2b2", -" | c #a5a5a5", -". c #c5c5c5", -".. c #a6a6a6", -".X c #bfbfbf", -".o c #747474", -/* pixels */ -" ", -" . . . X X X X . o O + X . . ", -" . . X @ # $ . @ % & * = . . ", -" . . - ; : > , < 1 2 X . . ", -" . . 3 4 5 6 7 7 8 9 0 q q 3 ", -" . + w e r t y u i p a s d 4 ", -" X f g h j k p l z z x g c v ", -" X f b n m M N c B V 3 , > X ", -" X X w V C $ Z A S + $ , . ", -" D F G u S H 1 J K L P I U @ ", -" Y T T T R E & W Q ! d g ~ 7 ", -" ^ / 6 ( ; ) _ 2 ` 8 ' ] [ X ", -" + > 7 { A } 7 @ |. $ + . . ", -" X X X ].. 8 Z 7 n.X + X . . ", -" . . . { n.o 7 . @ y X X . . ", -" " -}; - diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index d280a10f6180c491d92052a728e4f1f9d55934bf..58985dced4255826efe69edbf75052082a8075b0 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,29 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.2.7"; + name = "zathura-djvu-0.2.8"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1sbfdsyp50qc85xc4458sn4w1rv1qbygdwmcr5kjlfpsmdq98vhd"; + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "0axkv1crdxn0z44whaqp2ibkdqcykhjnxk7qzms0dp1b67an9rnh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ djvulibre gettext zathura_core gtk girara ]; - patches = [ ./gtkflags.patch ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}' - string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}' - makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) - echo "''${makefileC1/$string1/$string2}" > Makefile - ''; - - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with stdenv.lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-djvu/; description = "A zathura DJVU plugin"; longDescription = '' The zathura-djvu plugin adds DjVu support to zathura by using the diff --git a/pkgs/applications/misc/zathura/djvu/gtkflags.patch b/pkgs/applications/misc/zathura/djvu/gtkflags.patch deleted file mode 100644 index 6e8819e60823386a78d8338e7ff7402b4ba1d469..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/zathura/djvu/gtkflags.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- zathura-djvu-0.2.7.orig/config.mk 2017-12-21 14:20:24.000000000 +0100 -+++ zathura-djvu-0.2.7/config.mk 2017-12-31 00:41:02.580154770 +0100 -@@ -16,6 +16,9 @@ - DESKTOPPREFIX ?= ${PREFIX}/share/applications - - # libs -+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) -+GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0) -+ - CAIRO_INC ?= $(shell pkg-config --cflags cairo) - CAIRO_LIB ?= $(shell pkg-config --libs cairo) - -@@ -34,8 +37,8 @@ - PLUGINDIR = ${LIBDIR}/zathura - endif - --INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC} --LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB} -+INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC} -+LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB} ${GTK_LIB} - - # pre-processor flags - CPPFLAGS += -D_FILE_OFFSET_BITS=64 diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 1ca7644f60f87019edd2f9ae565cd0078105d7a0..9d86dfe4a445d9c7f0c7056836db1d142f4e81c7 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,35 +1,27 @@ -{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, -gtk-mac-integration, girara, mupdf, openssl , libjpeg, jbig2dec, -openjpeg, fetchpatch }: +{ stdenv, lib, meson, ninja, fetchurl, pkgconfig, zathura_core, cairo, +gtk-mac-integration, girara, mupdf }: stdenv.mkDerivation rec { - version = "0.3.2"; + version = "0.3.3"; name = "zathura-pdf-mupdf-${version}"; src = fetchurl { - url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz"; - sha256 = "0xkajc3is7ncmb2fmymbzfgrran2bz12i7zsm1vvxhxds728h7ck"; + url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.xz"; + sha256 = "1zbdqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg + zathura_core girara mupdf cairo ] ++ stdenv.lib.optional stdenv.isDarwin [ gtk-mac-integration ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}' - string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}' - makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) - echo "''${makefileC1/$string1/$string2}" > Makefile - ''; - - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-pdf-mupdf/; description = "A zathura PDF plugin (mupdf)"; longDescription = '' The zathura-pdf-mupdf plugin adds PDF support to zathura by diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 215ebdd756406fb2a29fcf163b1c4781c4824252..663e798ee0b4140cce4e30d8520b3575fd4d56ed 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,28 +1,21 @@ -{ stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }: +{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }: stdenv.mkDerivation rec { - version = "0.2.8"; + version = "0.2.9"; name = "zathura-pdf-poppler-${version}"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2"; + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "1p4jcny0jniygns78mcf0nlm298dszh49qpmjmackrm6dq8hc25y"; }; - nativeBuildInputs = [ pkgconfig zathura_core ]; + nativeBuildInputs = [ meson ninja pkgconfig zathura_core ]; buildInputs = [ poppler girara ]; - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}' - string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}' - makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) - echo "''${makefileC1/$string1/$string2}" > Makefile - ''; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-pdf-poppler/; description = "A zathura PDF plugin (poppler)"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index c324deb28e0a1922bb53a75af3aacdeb26ef817f..07e4c5d715b7f7178fa07d66cc92c5cd381b4005 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,29 +1,20 @@ -{ stdenv, lib, fetchurl, pkgconfig, gtk2, zathura_core, girara, libspectre, gettext }: +{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { - name = "zathura-ps-0.2.5"; + name = "zathura-ps-0.2.6"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1x4knqja8pw2a5cb3y2209nr3iddj1z8nwasy48v5nprj61fdxqj"; + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libspectre gettext zathura_core gtk2 girara ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + buildInputs = [ libspectre zathura_core girara ]; - patches = [ ./gtkflags.patch ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) - makefileC2=$(echo "$makefileC1" | sed 's|-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}|-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}|g' ) - echo "$makefileC2" > Makefile - echo "$makefileC2" - ''; - - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-ps/; description = "A zathura PS plugin"; longDescription = '' The zathura-ps plugin adds PS support to zathura by using the diff --git a/pkgs/applications/misc/zathura/ps/gtkflags.patch b/pkgs/applications/misc/zathura/ps/gtkflags.patch deleted file mode 100644 index 1464d2c8373bc51447fedd5bcbc128302682165a..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/zathura/ps/gtkflags.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- zathura-ps-0.2.5.orig/config.mk 2017-12-21 14:21:17.000000000 +0100 -+++ zathura-ps-0.2.5/config.mk 2017-12-31 01:05:17.507268817 +0100 -@@ -16,6 +16,9 @@ - DESKTOPPREFIX ?= ${PREFIX}/share/applications - - # libs -+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) -+GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0) -+ - CAIRO_INC ?= $(shell pkg-config --cflags cairo) - CAIRO_LIB ?= $(shell pkg-config --libs cairo) - -@@ -34,8 +37,8 @@ - PLUGINDIR = ${LIBDIR}/zathura - endif - --INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} --LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB} -+INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC} -+LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB } ${GTK_LIB} - - # compiler flags - CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 2fd7d58e63ed82b70703a3fd2fb781c580730fd4..64f617782f2d6354db7d0323c0a1e09fab1723fd 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -1,7 +1,7 @@ { symlinkJoin, lib, makeWrapper, zathura_core, plugins ? [] }: let - pluginsPath = lib.makeLibraryPath plugins; + pluginsPath = lib.makeSearchPath "lib/zathura" plugins; in symlinkJoin { name = "zathura-with-plugins-${zathura_core.version}"; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 92d173807f90b405de1b1685483dd5dce4274fda..18876cf355b86e73c46c1b2daf949680d294f104 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, python3Packages, fetchFromGitHub }: +{ stdenv, python3, python3Packages, fetchFromGitHub }: let version = "1.0"; in diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix index eb988471c8c737efa817ef25238a2cb08e302cfb..dae540ba4260f27a972f414c999b9175ca5e7b6d 100644 --- a/pkgs/applications/networking/bittorrentsync/generic.nix +++ b/pkgs/applications/networking/bittorrentsync/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, version, sha256s, ... } @ args: +{ stdenv, fetchurl, version, sha256s, ... }: let arch = { diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cf90d2afd0005a574327efe64faacc8281ffdd31 --- /dev/null +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -0,0 +1,60 @@ +{ stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: + +let + version = "1.4.10"; + + # TODO: must build the extension instead of downloading it. But since it's + # literally an asset that is indifferent regardless of the platform, this + # might be just enough. + webext = fetchurl { + url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi"; + sha256 = "0rgwzv1qahqy52q7zz4dklnwx7w4x3gj92ka8n0ypgf9fjjnmqas"; + }; + +in buildGoPackage rec { + inherit version; + + name = "browsh-${version}"; + + goPackagePath = "browsh"; + + src = fetchFromGitHub { + owner = "browsh-org"; + repo = "browsh"; + rev = "v${version}"; + sha256 = "0lvb20zziknlbgy509ccpvlc21sqjc53xar26blmb6sdl6yqkj0w"; + }; + + buildInputs = [ go-bindata ]; + + # embed the web extension in a go file and place it where it's supposed to + # be. See + # https://github.com/browsh-org/browsh/blob/9abc3aaa3f575ca6ec9a483408d9fdfcf76300fa/interfacer/contrib/xpi2bin.sh + preBuild = '' + xpiprefix="$(mktemp -d)" + cp "${webext}" "$xpiprefix/browsh.xpi" + go-bindata \ + -prefix "$xpiprefix" \ + -pkg browsh \ + -o "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/webextension.go" \ + "$xpiprefix/browsh.xpi" + + sed \ + -e 's:Asset("/browsh.xpi"):Asset("browsh.xpi"):g' \ + -i "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/firefox.go" + ''; + + postBuild = '' + mv "$NIX_BUILD_TOP/go/bin/src" "$NIX_BUILD_TOP/go/bin/browsh" + ''; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "A fully-modern text-based browser, rendering to TTY and browsers"; + homepage = https://www.brow.sh/; + maintainers = [ maintainers.kalbasit ]; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/applications/networking/browsers/browsh/deps.nix b/pkgs/applications/networking/browsers/browsh/deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..e0eb6600c9beca57b5ec2e794dd500c499c691e1 --- /dev/null +++ b/pkgs/applications/networking/browsers/browsh/deps.nix @@ -0,0 +1,272 @@ +[ + { + goPackagePath = "github.com/NYTimes/gziphandler"; + fetch = { + type = "git"; + url = "https://github.com/NYTimes/gziphandler"; + rev = "5032c8878b9dd46cfe8c625c0d9b9f258a560ee8"; + sha256 = "1avn8xb78xmmc61fjycpc81yrkfi42fna8zgzdqba6v7g8gq8a3x"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "a1dbeea552b7c8df4b542c66073e393de198a800"; + sha256 = "0nssmn8j0yavs8099gwb69qpd1k9yd2z28bii6i4y61v0grb6bc2"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9"; + sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "de7e78efa4a71b3f36c7154989c529dbdf9ae623"; + sha256 = "1ly3gqkziw01cb7h64k0wc4myzfcsr9hl7xznxd8k2yqzqvmhljz"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; + fetch = { + type = "git"; + url = "https://github.com/go-errors/errors"; + rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; + sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71"; + sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; + sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "c7842319cf3ac2eff253e8b3ebe15fcc56b6414a"; + sha256 = "00v2x6qchhi6vv09w29kcyr9i0kq4n4daaj3vk1c4nfj2z7xx5hc"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c2353362d570a7bfa228149c62842019201cfb71"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac"; + sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "3774a09d95489ccaa16032e0770d08ea77ba6184"; + sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "b6ea1ea48f981d0f615a154a45eabb9dd466556d"; + sha256 = "14179j7pj1h2vx60i68x2m6650ldji4xhanhc702i8a8iy7b49ja"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602"; + sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; + sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/shibukawa/configdir"; + fetch = { + type = "git"; + url = "https://github.com/shibukawa/configdir"; + rev = "e180dbdc8da04c4fa04272e875ce64949f38bd3e"; + sha256 = "0vbma9jkwh0ifz8dk2ssgmy7aiaify63lpa0lah7i4dkkxr94c9z"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "787d034dfe70e44075ccc060d346146ef53270ad"; + sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; + sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "3ebe029320b2676d667ae88da602a5f854788a8a"; + sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "d493c32b69b8c6f2377bf30bc4d70267ffbc0793"; + sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/ulule/limiter"; + fetch = { + type = "git"; + url = "https://github.com/ulule/limiter"; + rev = "af07f8759cbc68c744a15ffbfdabf35f7aff5e3b"; + sha256 = "1c68vz9r0442lkj206l6k03nssxx3ys8ddg7d2p2brdanfbprzrq"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a0f8a16cb08c06df97cbdf9c47f4731ba548c33c"; + sha256 = "1pnvrhi2minkn9mfa9p70b5jnixx8il5yqp08ad1w7kl34c21ma2"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "bd9dbc187b6e1dacfdd2722a87e83093c2d7bd6e"; + sha256 = "0zj8s3q2fznmap1nfr8pv4hz8xqixmkyhr6slq4baf8rvcb4mvbj"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "0605a8320aceb4207a5fb3521281e17ec2075476"; + sha256 = "1pak7q9ivwxh5bnjk00pkrs9ri9vmbyccvza56fl6138w397h49j"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } +] diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index e35d894e0e7eb6a9532e5993249ad56318fe7f2e..f31ff05a42bb66634ebb75e2b01ed4f9da208abc 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -51,5 +51,6 @@ mkChromiumDerivation (base: rec { license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; + timeout = 172800; # 48 hours }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 44310b054628412e2e1bd404c6584a6b83bdbdb0..ebc700a7f37ce064bcab85514cf045c975da429a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -5,7 +5,7 @@ , libevent, expat, libjpeg, snappy , libpng, libcap , xdg_utils, yasm, minizip, libwebp -, libusb1, pciutils, nss, re2, zlib, libvpx +, libusb1, pciutils, nss, re2, zlib , python2Packages, perl, pkgconfig , nspr, systemd, kerberos @@ -14,15 +14,13 @@ , glib, gtk2, gtk3, dbus-glib , libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups -, ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2 +, ffmpeg, libxslt, libxml2 # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport -, libexif ? null # only needed for Chromium before version 51 # package customization , enableNaCl ? false -, enableHotwording ? false , enableWideVine ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null @@ -44,10 +42,6 @@ let # source tree. extraAttrs = buildFun base; - gentooPatch = name: sha256: fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}"; - inherit sha256; - }; githubPatch = commit: sha256: fetchpatch { url = "https://github.com/chromium/chromium/commit/${commit}.patch"; inherit sha256; @@ -88,8 +82,8 @@ let xdg_utils yasm minizip libwebp libusb1 re2 zlib ffmpeg libxslt libxml2 - # harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together - # so we can't build with one from system and other from source + # harfbuzz # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source ]; # build paths and release info @@ -138,48 +132,20 @@ let ++ optional pulseSupport libpulseaudio; patches = [ - ./patches/nix_plugin_paths_52.patch # As major versions are added, you can trawl the gentoo and arch repos at # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # for updated patches and hints about build flags # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") - ] ++ optionals (versionRange "65" "66") [ - (gentooPatch "chromium-stdint.patch" "037gjnc8h087g6dpxz53nqvzbpa9mq0z47h25vix9p62s9nhz2a8") - (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd") - (gentooPatch "chromium-math.h-r0.patch" "0dlzbdj0lvp9qklgifsvgbn6p1ppxbl3hkwqqqfsw1d9jka9wy8x") - # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled - # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325 - (githubPatch "1517db71cccaec48a05cdf30208e0cba7ab9b9a8" "08ac502cwwb05ml3w4wzn66i5c2d1h22xs5rzszwlnhxckxfc0fk") - # GCC 7 fixes - (githubPatch "f64fadcd79aebe5ed893ecbf258d1123609d28f8" "1h255w1v327r08cnifs19s4bwmkinqjmdmbwihddc5dyl43sjnvv") - (githubPatch "4d8468a07f374c11425494271256151fb6fe0c34" "0kqqq8kj0zv5bi1n9mm0vnn8wsgi98mjmj7snpav21fh3pgiqjrm") - (githubPatch "ede5178322ccd297b0ad82ae4c59119ceaab9ea5" "0rsal0dy0yhgs4lhn8h1vy1s77xcssy4f5wals7hvrz5m08jqizj") - (githubPatch "7d721f438acb38db556ae9a9e6e8b718bd503216" "13lzvxm63zq3rd8p387ylq4bm9wr4r09vk2w4p81f838pf0v1kbj") - # Following commit doesn't apply cleanly to stable branch, replace with handcrafted one - #(githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z") - ./patches/PlaybackImageProvider-copy-constructor.patch - # * base/optional.h - (githubPatch "f1c8789c71dbdaeeef98ecd52c9715495824e6b0" "0w3d82s10cl10r6zq9vpsscmdhbdkcy0vbdiqy5pvbr031nfxw5w") - (githubPatch "5cae9645215d02cb1f986a181a208f8a4817fc86" "052y0f9nwq6y6jh2gvr1pm8qdcqghyi3jj5svvrp5aqirlkwb7ri") - # * ConfigurationPolicyProviders - (githubPatch "1ee888aed9f9a6291570ce360bcdd2d06bcc68cb" "1bm34p3bsny44sk60j842ghhhx8qaibwpqnfnyndfj96f7nb2az0") - (githubPatch "76da73abaeede740fc97479c09c92a52972bc477" "03rkf514ddj9d32d3zfcnf96kzzdk6cwxvrqj8acyv93vp1hvckr") - #(gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") - ] ++ optionals (versionRange "66" "67") [ - (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd") - (gentooPatch "chromium-ffmpeg-r1.patch" "1k8agaqsvg0w0s6s5wh346ih02cc86vr0vwyshw2q9vafa0jvmq4") - # GCC 7 fixes - (githubPatch "f64fadcd79aebe5ed893ecbf258d1123609d28f8" "1h255w1v327r08cnifs19s4bwmkinqjmdmbwihddc5dyl43sjnvv") - (githubPatch "ede5178322ccd297b0ad82ae4c59119ceaab9ea5" "0rsal0dy0yhgs4lhn8h1vy1s77xcssy4f5wals7hvrz5m08jqizj") - (githubPatch "7d721f438acb38db556ae9a9e6e8b718bd503216" "13lzvxm63zq3rd8p387ylq4bm9wr4r09vk2w4p81f838pf0v1kbj") - (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj") - (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw") - (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z") - ] ++ optional enableWideVine ./patches/widevine.patch - ++ optionals (stdenv.isAarch64 && versionRange "65" "66") [ - ./patches/skia_buildfix.patch - ]; + ./patches/fix-freetype.patch + ./patches/nix_plugin_paths_68.patch + ] ++ optionals (versionRange "68" "69") [ + ./patches/remove-webp-include-68.patch + (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc") + (githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs") + ] ++ optionals (versionAtLeast version "69") [ + ./patches/remove-webp-include-69.patch + ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX @@ -219,8 +185,10 @@ let tar -xJf ${freetype_source} # remove unused third-party + # in third_party/crashpad third_party/zlib contains just a header-adapter for lib in ${toString gnSystemLibraries}; do find -type f -path "*third_party/$lib/*" \ + \! -path "*third_party/crashpad/crashpad/third_party/zlib/*" \ \! -path "*third_party/$lib/chromium/*" \ \! -path "*third_party/$lib/google/*" \ \! -path "*base/third_party/icu/*" \ @@ -242,11 +210,8 @@ let proprietary_codecs = false; use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; - ## FIXME remove use_gconf after chromium 65 has become stable - use_gconf = gnomeSupport; use_gio = gnomeSupport; enable_nacl = enableNaCl; - enable_hotwording = enableHotwording; enable_widevine = enableWideVine; use_cups = cupsSupport; @@ -286,7 +251,10 @@ let libExecPath="${libExecPath}" python build/linux/unbundle/replace_gn_files.py \ --system-libraries ${toString gnSystemLibraries} - gn gen --args=${escapeShellArg gnFlags} out/Release + gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt + + # Fail if `gn gen` contains a WARNING. + grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 runHook postConfigure ''; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1458a1816569e7103fc6820b4513489227cef861..51618a479d423344a86b5c5a1a62c953c8d16358 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -4,7 +4,6 @@ # package customization , channel ? "stable" , enableNaCl ? false -, enableHotwording ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true @@ -22,7 +21,7 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { - inherit enableNaCl enableHotwording gnomeSupport gnome + inherit enableNaCl gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport enableWideVine; }; @@ -65,8 +64,6 @@ let version = chromium.browser.version; - inherit (stdenv.lib) versionAtLeast; - in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; diff --git a/pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch b/pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch deleted file mode 100644 index a9b70ac508633f892c26d67dc8b9dde8ed409648..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- a/cc/raster/playback_image_provider.cc -+++ b/cc/raster/playback_image_provider.cc -@@ -20,7 +20,7 @@ - PlaybackImageProvider::PlaybackImageProvider( - ImageDecodeCache* cache, - const gfx::ColorSpace& target_color_space, -- base::Optional settings) -+ base::Optional&& settings) - : cache_(cache), - target_color_space_(target_color_space), - settings_(std::move(settings)) { -@@ -70,7 +70,10 @@ - } - - PlaybackImageProvider::Settings::Settings() = default; --PlaybackImageProvider::Settings::Settings(const Settings& other) = default; -+PlaybackImageProvider::Settings::Settings(PlaybackImageProvider::Settings&&) = -+ default; - PlaybackImageProvider::Settings::~Settings() = default; -+PlaybackImageProvider::Settings& PlaybackImageProvider::Settings::operator=( -+ PlaybackImageProvider::Settings&&) = default; - - } // namespace cc ---- a/cc/raster/playback_image_provider.h -+++ b/cc/raster/playback_image_provider.h -@@ -20,8 +20,10 @@ - public: - struct CC_EXPORT Settings { - Settings(); -- Settings(const Settings& other); -+ Settings(const Settings&) = delete; -+ Settings(Settings&&); - ~Settings(); -+ Settings& operator=(Settings&&); - - // The set of image ids to skip during raster. - PaintImageIdFlatSet images_to_skip; -@@ -34,7 +36,7 @@ - // If no settings are provided, all images are skipped during rasterization. - PlaybackImageProvider(ImageDecodeCache* cache, - const gfx::ColorSpace& target_color_space, -- base::Optional settings); -+ base::Optional&& settings); - ~PlaybackImageProvider() override; - - PlaybackImageProvider(PlaybackImageProvider&& other); ---- a/cc/raster/playback_image_provider_unittest.cc -+++ b/cc/raster/playback_image_provider_unittest.cc -@@ -84,7 +84,8 @@ TEST(PlaybackImageProviderTest, SkipsSomeImages) { - settings.emplace(); - settings->images_to_skip = {skip_image.stable_id()}; - -- PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings); -+ PlaybackImageProvider provider(&cache, gfx::ColorSpace(), -+ std::move(settings)); - provider.BeginRaster(); - - SkIRect rect = SkIRect::MakeWH(10, 10); -@@ -100,7 +101,8 @@ TEST(PlaybackImageProviderTest, RefAndUnrefDecode) { - - base::Optional settings; - settings.emplace(); -- PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings); -+ PlaybackImageProvider provider(&cache, gfx::ColorSpace(), -+ std::move(settings)); - provider.BeginRaster(); - - { -@@ -133,7 +135,8 @@ TEST(PlaybackImageProviderTest, AtRasterImages) { - settings.emplace(); - settings->at_raster_images = {draw_image1, draw_image2}; - -- PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings); -+ PlaybackImageProvider provider(&cache, gfx::ColorSpace(), -+ std::move(settings)); - - EXPECT_EQ(cache.refed_image_count(), 0); - provider.BeginRaster(); -@@ -158,7 +161,8 @@ TEST(PlaybackImageProviderTest, SwapsGivenFrames) { - settings.emplace(); - settings->image_to_current_frame_index = image_to_frame; - -- PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings); -+ PlaybackImageProvider provider(&cache, gfx::ColorSpace(), -+ std::move(settings)); - provider.BeginRaster(); - - SkIRect rect = SkIRect::MakeWH(10, 10); - diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch new file mode 100644 index 0000000000000000000000000000000000000000..cc380a55abe0e08e34cd3862dad7b5259aab495c --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch @@ -0,0 +1,15 @@ +--- a/third_party/freetype/BUILD.gn ++++ b/third_party/freetype/BUILD.gn +@@ -63,10 +63,12 @@ source_set("freetype_source") { + "src/src/base/ftbase.c", + "src/src/base/ftbbox.c", + "src/src/base/ftbitmap.c", ++ "src/src/base/ftfntfmt.c", + "src/src/base/ftfstype.c", + "src/src/base/ftgasp.c", + "src/src/base/ftglyph.c", + "src/src/base/ftinit.c", ++ "src/src/base/ftlcdfil.c", + "src/src/base/ftmm.c", + "src/src/base/ftstroke.c", + "src/src/base/fttype1.c", diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch similarity index 95% rename from pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch rename to pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch index fc1b609479b28582d506105b228600c81ac8058a..3c80dbcec004075a06287311a07367cd1bbfe867 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch @@ -20,13 +20,13 @@ index f4e119d..d9775bd 100644 -#endif - - // The rest of the world expects plugins in the module directory. -- return PathService::Get(base::DIR_MODULE, result); +- return base::PathService::Get(base::DIR_MODULE, result); +bool GetInternalPluginsDirectory(base::FilePath* result, + const std::string& ident) { + std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; + const char* value = getenv(full_env.c_str()); + if (value == NULL) -+ return PathService::Get(base::DIR_MODULE, result); ++ return base::PathService::Get(base::DIR_MODULE, result); + else + *result = base::FilePath(value); } diff --git a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch new file mode 100644 index 0000000000000000000000000000000000000000..1995bf1fa8f53c14f0579103640dafc2b479bcf4 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch @@ -0,0 +1,12 @@ +--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h ++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h +@@ -8,7 +8,7 @@ + #include "third_party/blink/renderer/platform/platform_export.h" + #include "third_party/blink/renderer/platform/wtf/vector.h" + #include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION +-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION ++#define WEBP_MAX_DIMENSION 16383 + #include "third_party/skia/include/core/SkStream.h" + #include "third_party/skia/include/encode/SkJpegEncoder.h" + #include "third_party/skia/include/encode/SkPngEncoder.h" + diff --git a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch new file mode 100644 index 0000000000000000000000000000000000000000..07572cf7ee947e75e1e0b4f55f0ef83658a73ba8 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch @@ -0,0 +1,11 @@ +--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc ++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc +@@ -13,7 +13,7 @@ + + #include "jpeglib.h" // for JPEG_MAX_DIMENSION + +-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION ++#define WEBP_MAX_DIMENSION 16383 + + namespace blink { + diff --git a/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch deleted file mode 100644 index 5348b9ac905b2ec68c679c0823830f60dee58af8..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 07bc2bbc5f0fda790352843fb89cdc95ed525ea8..84c4e62026252d4189b25d40f12961e5b7e3676f 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,12 +98,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "29.0.0.113"; + version = "30.0.0.154"; src = fetchzip { - url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" - + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1ix86jv4ckn5pcj37fgx4mncqjyvabdvwxp9zs9frdfbyx740izr"; + url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; + sha256 = "0bi9b6syx7x2avixgjwanrvynzanf89xm2g3nxazw9qgxxc1cp48"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index e30ec4228c8a0cd39c18dfb537d92d0229d24850..89b6a7ce3121591a096cd3bd69ac414e8729462e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "18dampi62wwvscywvdz8lil0zhxdr4p6bhr4yv08arz029w356lc"; - sha256bin64 = "129jq8ynj4y81rhzxyyfcfpllq3a6ddhiy766zw28s7d43q4zca2"; - version = "66.0.3359.45"; + sha256 = "0w5k1446j45796vj8p6kv5cdrkrxyr7rh8d8vavplfldbvg36bdw"; + sha256bin64 = "0a7gmbcps3b85rhwgrvg41m9db2n3igwr4hncm7kcqnq5hr60v8s"; + version = "69.0.3497.32"; }; dev = { - sha256 = "09x7p83p188ms0awxj3kl9kdx796ns6m42smqd3jccnljx54jls2"; - sha256bin64 = "1aa24gvbf9awm59n05jkb4wy6ssr7fns4rl1hd2c66cq2d4mx3d8"; - version = "67.0.3377.1"; + sha256 = "15gk2jbjv3iy4hg4xm1f66x5jqfqh9f98wfzrcsd5ix3ki3f9g3c"; + sha256bin64 = "1lir6q31dnjsbrz99bfx74r5j6f0c1a443ky1k0idbx6ysvr8nnm"; + version = "70.0.3521.2"; }; stable = { - sha256 = "11w6wg862ixbgm7dpqag2lmbjknv83zlr9imd8zchvmrqr468rlk"; - sha256bin64 = "0r14w94aa7zg2i3zjpwvb7d6fg9yg0xkki7jzcpjmzwygy78fs16"; - version = "65.0.3325.181"; + sha256 = "1676y2axl5ihvv8jid2i9wp4i4awxzij5nwvd5zx98506l3088bh"; + sha256bin64 = "0d352maw1630g0hns3c0g0n95bp5iqh7nzs8bnv48kxz87snmpdj"; + version = "68.0.3440.106"; }; } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index b056bdedb41e358c4d9968538c2e60e23fe7d7a7..671ab03a2e2996e0062114058c85048a8854a086 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "dillo-${version}"; src = fetchurl { - url = "http://www.dillo.org/download/${name}.tar.bz2"; + url = "https://www.dillo.org/download/${name}.tar.bz2"; sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"; }; buildInputs = with stdenv.lib; [ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ]; - configureFlags = "--enable-ssl"; + configureFlags = [ "--enable-ssl" ]; meta = with stdenv.lib; { homepage = https://www.dillo.org/; @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch b/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch deleted file mode 100644 index 347fb8e128770f30c9a0809823d994844e2acbf2..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b51b63b78c9ff1639f5f65ccfdd54681f1cadc1d Mon Sep 17 00:00:00 2001 -From: Sam Parkinson -Date: Tue, 26 Dec 2017 14:46:27 +1100 -Subject: [PATCH] Extend the python path; rather than replacing it - -Some distros (i.e. NixOS) require the special PYTHONPATH, so that -the web extension has access to the python packages it wants (i.e. gi). - -Previously, the PYTHONPATH was replaced with the web extension path; -meaning it would crash on NixOS. This instead prepends the web -extension path to the PYTHONPATH. ---- - eolie/application.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/eolie/application.py b/eolie/application.py -index 3c21542..bed4e55 100644 ---- a/eolie/application.py -+++ b/eolie/application.py -@@ -340,7 +340,11 @@ class Application(Gtk.Application): - self.settings = Settings.new() - - # Init extensions -- GLib.setenv("PYTHONPATH", self.__extension_dir, True) -+ current_path = GLib.getenv("PYTHONPATH") -+ new_path = self.__extension_dir -+ if current_path: -+ new_path = new_path + ':' + current_path -+ GLib.setenv("PYTHONPATH", new_path, True) - - # Create favicon path - if not GLib.file_test(self.__FAVICONS_PATH, GLib.FileTest.IS_DIR): --- -2.15.0 - diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 9d4c858298d68dd507b42bd0c6ff142d7cbda4b8..8d7f4e6cc7033e41977c6a72694c531d421f9ec5 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,67 +1,53 @@ -{ stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook -, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3, gobjectIntrospection -, gtkspell3, libsecret, python36, python36Packages, webkitgtk }: +{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook +, desktop-file-utils, gobjectIntrospection, python36Packages +, gnome3, gst_all_1, gtkspell3, hunspell }: stdenv.mkDerivation rec { name = "eolie-${version}"; - version = "0.9.16"; + version = "0.9.35"; src = fetchgit { - url = https://gitlab.gnome.org/gnumdk/eolie; - rev = version; - sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b"; + url = "https://gitlab.gnome.org/World/eolie"; + rev = "refs/tags/${version}"; + fetchSubmodules = true; + sha256 = "0x3p1fgx1fhrnr7vkkpnl34401r6k6xg2mrjff7ncb1k57q522k7"; }; - nativeBuildInputs = [ - intltool - itstool + nativeBuildInputs = with python36Packages; [ + desktop-file-utils + gobjectIntrospection meson ninja pkgconfig wrapGAppsHook - gobjectIntrospection + wrapPython ]; - buildInputs = [ - glib - glib-networking - gsettings-desktop-schemas - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav - gtk3 - gtkspell3 - libsecret - python36 - python36Packages.pygobject3 - python36Packages.pycairo - python36Packages.dateutil - python36Packages.dbus-python - python36Packages.beautifulsoup4 - python36Packages.pycrypto - python36Packages.requests - webkitgtk + buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [ + glib glib-networking gsettings-desktop-schemas gtk3 webkitgtk libsecret + ]) ++ (with gst_all_1; [ + gst-libav gst-plugins-base gst-plugins-ugly gstreamer + ]); + + pythonPath = with python36Packages; [ + beautifulsoup4 + pycairo + pygobject3 + python-dateutil ]; - wrapPrefixVariables = [ "PYTHONPATH" ]; + postFixup = "wrapPythonPrograms"; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py ''; - patches = [ - ./0001-Extend-the-python-path-rather-than-replacing-it.patch - ]; - meta = with stdenv.lib; { description = "A new GNOME web browser"; - homepage = https://wiki.gnome.org/Apps/Eolie; - license = licenses.gpl3; - maintainers = [ maintainers.samdroid-apps ]; - platforms = platforms.linux; + homepage = https://wiki.gnome.org/Apps/Eolie; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ samdroid-apps worldofpeace ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index de56a0605b86277a0be15790a00f0bafd21af9b8..21631ef191c487a15d12b30b94414070927b42c3 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -1,15 +1,15 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake -, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }: +{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake +, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet }: stdenv.mkDerivation rec { name = "falkon-${version}"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; rev = "v${version}"; - sha256 = "148idxvx32iwg18m3b7s22awcijnbrywz9r8gnfrq6gpwr0m2jna"; + sha256 = "1ay1ljrdjcfqwjv4rhf4psh3dfihnvhpmpqcayd3p9lh57x7fh41"; }; preConfigure = '' diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index d8afbf9aa193a969b30ad9553b4d11f94e26d954..f3a8ca6f289ca97c1f48b8c28c3694cff9c51c8a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,995 @@ { - version = "60.0b8"; + version = "62.0b20"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ach/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ach/firefox-62.0b20.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "f45033523be148f3cf43d800ec7186791045104eba8c6eb10bb427a5048e826152c4d129bf97a4efda41281b5854643f239b9a124b488740c1cd2bc55acb2504"; + sha512 = "bcc42abc76f41f5fe32a1bf1e824be451d15686c05adfb58b85df6eeff39e29aac3aa18878023469e85bcd8e9d4f55cea9cd96d7b40a5b6918ec2fa572e32b7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/af/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/af/firefox-62.0b20.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "8d4ca433ad148cd3ac62cb142009a64c8aa09e49d04a060040d42c9e5720ec3619f1896a7b2e91f9bc0f4a78be0dbfa30fef7f19c233b78228413335cbfc9a93"; + sha512 = "f371acf6a9435d6c673768270be5a950ac369cb04e91b77f8422feb77cb09e65731c6842e933aa5012402a69bfa4c01373419caf029e133408105b71d218a3f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/an/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/an/firefox-62.0b20.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "16d132420f991376b3dc15d43f118aa12d1d617cadb65d16d645b1a82a65cc7a17a4fa36a03a4280a6e6c3d05d5f4c6d97d5f1df24fbb4d6420a16d271dffcd1"; + sha512 = "79fa43b710bb99cb94ed463b845d7eaa993a2d35b27eecafac0e387f5781b77415375fb3d19256d3097f314d0891020ac929877635d3f26ab3fd808bd105cf1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ar/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ar/firefox-62.0b20.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2a362ddb4a263a228b93494b8b39071b85cdf05264ef1541df5dd75a84f7d7391b0d68c19e76ee68fb0a4cab7e4de6c1b39d2f97f8f16e6d7c06ad1b630562c8"; + sha512 = "66b40adacfa9e36e61d9f4f77fb85db08cbce2eb162201fd65db48bee54c38f4749c7375d893727796c8954a71004e4f163fde8a3f701dec712d271f808c40fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/as/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/as/firefox-62.0b20.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "b9172bb80eec38221065e89e0e244c1a93f52e2a5754c0b0d93e78b338783188460fdb4aad13eb69a205f7af1b831451f07b19a9633ab1737e1d48e88108647c"; + sha512 = "090f4b517d242f67b43bdce75e586cfd0eb58abb076cccae9c5cffc74d14b04ba06018764bb7696f2b43049ff8311f3a6b6d7207d3ac0f3432904f4ecf39e96a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ast/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ast/firefox-62.0b20.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "c1b665bf08317624aec791a4cf97a240c8bd192f28b31a3a4283846628216bb98b60b50a44d7a14b37b0339fa7cf51af9f3a47cc1ced764f560567eb19c31d56"; + sha512 = "309b5feeffbe980b06bd04b4a6db6f4677d131c7ccdd138cb8d43eebfec61b423e30d5f7d5776827f973f6c7fd995f091263839e811e1496b7d4def2f97ea922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/az/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/az/firefox-62.0b20.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "fefa5958fd2bd47125b5a8601fbd0834b6498a4ef4b38c73246575b090b94981d39f086534fa5844432554134f590ef28fd9ba0a9e656a4be16c82e4dc368f75"; + sha512 = "6b64a0346ce7a5854c878317a34dd91c044456f823fc5e55e8dcfea55663600a2bd1c9471f01732426397674303919125f69ef0d61d77fddcaca0d462cd8e084"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/be/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/be/firefox-62.0b20.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "3ad059b65ac9a5d6e8af9745df0ff35ecacdd0af756fc1d5a22a272fd94c49b163d62c7a59ba5cf485d860dfc096209ebd814673b909c047a5c0a8fe3b551701"; + sha512 = "9553685556a1def24354972fafe785ca9ad180b0cda48a928b39a47011fae41660a4d046f6a38c11c148ac2b6a883c1f8a56d6aa4b6ada75365df2b985cbe473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bg/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bg/firefox-62.0b20.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "0eae9cbaba7eebe0fbbac423538afc7dbf439c55d1d29eea9f14468764febbb3f1141fde29642f485f5d7c690ac1ba3b91c9fa436f1cfa50fa87191f1b76d6d0"; + sha512 = "531e0f09ba97828a039f796b6166753a9e35ee902258b9318fb91838b956d92de6d0f86168f2945eb2ed6352307f60bcfb81740dbe3e3ebd0988c9a8fa59ff18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bn-BD/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bn-BD/firefox-62.0b20.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "0c056092cac3a3660d8397a5f14f2ea0cfadf7253d23d97280d7ab3c6086ef1292bcd5cf42fcff3b1ac6bc55e98ba5aae707d5b205472bab9c37d4fc7869485d"; + sha512 = "545525b698e0bd93f6036b92e3723a452e8083cfb0cf7462c8c077ddcbc0210d25ab53d3b41b67dcc1dbaa14d1923fd0b56b3097b98bf84164ca367f1c07413a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bn-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bn-IN/firefox-62.0b20.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "f98a1efb8dc56319429a06e9b52d0431591ed70573c76e80a4b4c419c47a2d810ad9f3f9ea1c9a5457cd55e8f98155165b7922000d750033503eacab2e8b40bf"; + sha512 = "95ceade2812bd3ffc084167280d4154331fe5239f167f79b9c29a43646c2c9f5c7a4e22cf6d814985dd01e8d60661007c66ebec27bae9e19a85895ae9610f9dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/br/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/br/firefox-62.0b20.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "475d9a65a6041570a4bed8c96e63aba067a7eb659a1f303b0ebf27e55478dbe3597ec7d968329f352498a58a5256b2fb36505e09e35d1af9ac1219adaf0e607a"; + sha512 = "15153f5e0222d3d0bd716e7595e2d5ad7b84595bd14971153ca809fd62955c55ef99b01b8687e32e3e3ba65b030f4e93beae90938efeda3b5bdedc9a2a012c1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bs/firefox-62.0b20.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "ceea5a1b8fd3f8ef3d719acb62c5653ee00a3fdf7ffb2e81cfc22936aed53e726d447564a7173e53f27946f55d37816a7bb01abde95e8a6c1718d0f7cea35437"; + sha512 = "6f7b1f882ae6b9d95fccee972962e98c9c722194bb08c466071333cbcf5ff56b149c07daf1d6abf808fe0e07e22af78a915c94268fa356412c88a9f35fe5364b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ca/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ca/firefox-62.0b20.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "97b687e518ea024c510365b18a220ff22fa0f722645c927519778bb8ccbce55b1bc3a909d4d06b3cfb1ed20b3dfa3761593b7967f516623b4ddc8b26e97359aa"; + sha512 = "dfc0cfb8f95421e8b60b91716a68c6a5db1c0630c298c2b76c80b3a24308d852e056e552530b034f9889b87c72e581590ad018ef0b0657baf14895f383a594ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cak/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/cak/firefox-62.0b20.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "6e846c894d67da44f5734f409b6822afc043bd02ac6bd3801daf47891fbb1b3bab10ded1f980f11c7f41a8ce4d59b6d99b20eecc33fb60d189cc15df9bfd63f4"; + sha512 = "7561a94f9bf8edd5693c9e961aabc316056a76f19c8b3d0490f94d74ee1bd8cd0b49aecf71b48c7e90435a2ea2efd716cde53303c73a68a1a6230e51445f719a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/cs/firefox-62.0b20.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4c647b30775cd27e6955e8ebc4e9b375283ecf0b068fc7a49d3a3f99212a8f318a83879f975d85c6c83a88735e9851296869374edcb43dcaa167c2b954edf939"; + sha512 = "cf2f2b8cff2951cb71454f3d0351e157606af1bb306b65f0fb8930a9257e16ed5f7704be09114bbeb37c5c92d12feec1371339b2fb126c8766aa8bc8034d07c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cy/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/cy/firefox-62.0b20.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "f1d742720553ce31bef0881fe5da8c20d5bb2ca99710a882c8805b26c35e2677653ad2d4ec91371dc724410d0edeb884813f8d88ceb0f9019963cc98121e6bb2"; + sha512 = "05e3f84109a47790bd88cdf248c32eddece4c95ef9c5cc46cf67b013063441106eb0b4022cfaf8501593c6c4e13f84684ae1b8f48ddd3704ea52d520d1f9a185"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/da/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/da/firefox-62.0b20.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "ff07e1c11f23091084361ff20404cd154e89d483b98b3d960b2e72567adf66192debe1862c1dd461477469d8c6b07a02a6dfbb9f0ff644c6743380159df5fe30"; + sha512 = "cc8dbabf299e1009b180ed8201699ebc773351e4969587df146b977da3a7a1bedadd0366e765488d2e16aa81e768c3fb0892972346d6611c29a1d6eda921e672"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/de/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/de/firefox-62.0b20.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2338b344b5507478c36f900f76e264580ed7f62e46d042252ea90251c1c80a9262746dfe7d40c6bb593de89737c848527fe33d555dd7aa7fa3971fd0d4483e9a"; + sha512 = "a69c1786b2b5455fece6d49ae0a8408cbb448c4b6c3f394401c2eee20a5f7d80db09d982ac50e4893877d876123586b1e1cf844e72495d5b1a5ed2349300adbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/dsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/dsb/firefox-62.0b20.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "72cbf626c69a54d18d8c63895e59c2464e7e2f9e0c6f78e58548a8f861e7b2033533c3569ddc2ec3a2e4fe54d0e064a855a23485a68c08e1ea672e2499183258"; + sha512 = "b464c71a4dddb8fd864f1a4c7ab2ed6e870e0cbbf3213255965f3534b2b776d7da03e997d78c9f4e794da7201c92f0e9f85bf5b5631131a2355224452112ab0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/el/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/el/firefox-62.0b20.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ee3ba405eeb7ee4d0622af5ed377e39ee4049b33637d122b1395cb00a9db8558454d8d371ee16ced37e1a9f5df7c07b8df5c0db67822117287c58a7b08d45fc6"; + sha512 = "9578203045825c12c8efba6f3488771efb52452f3a1f57b8a3084fd0c83998f0733520f1d646b1b847ffb76cbcd4d3e184cc0fee0ca01684429396dadd09757f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-GB/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-CA/firefox-62.0b20.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha512 = "d316262b3c08730782a741177224e3aa269843e1d65ba7f1487e947be73ebbd4fb88f0734bc98e840951d89ecca8ef0a62cb5b8c456e4203da1d11a8a4a1451c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-GB/firefox-62.0b20.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "203e6881ebfe4e1c238b83ceee8e59666856640417dfb27478027ba204823f78400b03e7e060c8e070207654f522893c321a9efe3671a212fc3d93519bf6c960"; + sha512 = "fd43c18250362b0f18140d123eec2d87578e29acb864ea1513498ec47b7696f0138424e8be33f8af2b77cefa11d7a5ba368b3fbfc85205272d9ed848ce2a9f1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-US/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-US/firefox-62.0b20.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "51690eb72296dfe440216bcc85f31312da6c10feb251a94396944af3fcecefa9cc07a4a278775214df2841a3530575fd385ade2dacce18b33231ea7abbfadb75"; + sha512 = "f5c6b847ea22bed95aec68a6e4316e0217fab7a4d7426d4b6b57ec0f7f4a6fb3b07e9aa330ce41f0a2c24d500425696bd475583c849556a6011b2b9169581f29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-ZA/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-ZA/firefox-62.0b20.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "2c802cba2c2d9c6627136f83fa3bf31ac2a1da1a8803a0d816ebcb16ed36111ace5fd229617e88a9a6e25818dc350261650969f05f3b2c3e7bd252a0d29ee54f"; + sha512 = "5bed0853937d3777307f2a432e8b05f7fd919ee0f781fd88381e6cb81c43711c2c12b9fe05d85c22eeb70b217710ea3d44e1f599e447c2212209135f796eccdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/eo/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/eo/firefox-62.0b20.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "407f5e44710733635f1508ac205186a182891415615be886da185b856903fd3c5d4b61c55c89f4d9a5ddc5e275918dc9e2881a2d3c1b5f038e1d7f7d490334d2"; + sha512 = "3881270a0874ca0094b27361cdf228e50c01c326f931062a54b5ff774e0c88e36b3df7087f11faa3f7f6add2d4156d385fbf30be4ce30f73102b47e280b3f006"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-AR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-AR/firefox-62.0b20.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f6d00c92c423e09c61f23ce9c743c91efbc4f24a140d136f0b567fae3ecb45168eaf3ad5d886a1f15bf269c63cf8d8ed4f35468fb887371610ef55ea71322a62"; + sha512 = "44191518ade9f6c7c5f72296886d90b2c649d59a0f64ce7e7b23896f858b95ca12f3d1c91e4dfabe94bfe1dfb91dbeaac536cb121d7e497efc77f1316c323385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-CL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-CL/firefox-62.0b20.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "4f8fe24bbda036402225b42b27bb48b46166bd9fe1963f0c802ecba2f186bc72c300d59e10a0fae384448ee2374ae88f311606d69b939669441c33dbde352795"; + sha512 = "628e49819bb7e98f685412ed024e980a7934c1dcd3968709b8a1f23f449c493a0c8a0edd646f80e131d49d0b22e87a93c6671f892684e677e77207085cc84b79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-ES/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-ES/firefox-62.0b20.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e3051d9beb78b3ff9fc2ea969ea9e8b672b03162f94a5cd290c8953c08f106d4bf141b749f3ea8c2d38a2d4711d3585fd0a358a45862b4968f6b1a1b38bccee9"; + sha512 = "ca0edb153550ffa62cb56686bca81970a6e15ed0f982db35f82e69068e1c28452f69ea09df674aa26171e05832dfe39b47d48d0b25205b689455b282b679c6bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-MX/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-MX/firefox-62.0b20.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "a1b7c28fde683783d5e36ade55ae051bddfdb829f6568a0ede19d038ad9e5cf25fce0e5669d7fee50cecd8b476dc9f0d4d401c9d6b30f2c4589bb086731fc5b6"; + sha512 = "28c26551beb43276c8bcab443e88d52921a6861796bf2c0fe5519bc2e26cb6fdd28e3be54575e300a53186e96238749c61394aeb7a71f6c196ea6e4f51cb73de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/et/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/et/firefox-62.0b20.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "70f839dca4b337a3161b71ae8e2007e8075a0b8fbb1b17ccc0e78c9e1f34e50b5711e5678f183cb3fb14fb6b961fad82fbe32393f15c1476e57ecdf58881d1d6"; + sha512 = "f26a59f6b75d1b85da6e13d02a206a41754e7e8214b41240839f0852b3fb4d38aa75a22556239262ec5551f551582ee7a374121dc57ef32fbb466a089e8bf98c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/eu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/eu/firefox-62.0b20.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "e242ec15f4b6d136d9018df3edebc2eb94ab9e02f0ec1737e10ad3f17a2c24696a0cc2d0314e3b09e07d979a2f0fbaed5a8ac10b9954d5c54cac0dd0a2b01ae4"; + sha512 = "60ea439cb2d5ec6dad00e6ea597d5ca78e0f56001703e4f4e8099f695b5e557ff945cd83e48356fd7e78c7a054030d0f23fd85ebc15fd72030e32db1d78b7b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fa/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fa/firefox-62.0b20.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "4fb727e5d8b8c3519fba218a8d4bd49a58ea4d7c20f3143b183fb6ab5d1b17cb373933da645c5d3856906a97bfe6648964495ff7a85bb85e01938abf79139f45"; + sha512 = "7d0454ecb645438b79137acfba79d8d03cc9d44a3a70edcbf72b628f430b83d5eaaf7bf6d5a5f04f2f592cf6750dfd7667a39907a29de398a926e40b2a36b31b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ff/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ff/firefox-62.0b20.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "ee25d95b8f9a5db60fa5adb7c656e8f39a1420b380ddabb3b39fa2a50322fa104934380b6698cd4f6d941d9b63e77a98e5cb002ba9dd3548111c9e6d6741f7b8"; + sha512 = "c1f5e4d7df8590fc18844e5bc67e28bb2d5e88c3eca8b1dc8d3103d49f333ce9dfca7bdee432e190d01688ce7b8c58fb1a2a3fea0cc71e5a007d11e411611d53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fi/firefox-62.0b20.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "5344184aee16ccdd0b8de303c788134b8435364a760c1ea0a706c44f36d344ca6b25dc5dc6821c84cdff2c5f0a8a7da8427ef4234d94d649e951c901200c087e"; + sha512 = "a848315e5f0b259e6770fff8e275f29946a0daa8f432135ae2d7d94ebaaf0f7bbbae7566c87f20cca78ae0fb512c7c4434dffb322df78e568095ef3b166f7f37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fr/firefox-62.0b20.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "67f5f6d342262e8bd3eb9ac0561b7bbf170b3f8dbe861e8b9c0607b087410a24c1e4b453502f77eebb5a045d5980bc9e1680bb0c6585223d4aa809c872fb9d3c"; + sha512 = "1a65ba7d442436ef0a8de3c7ea18b765eb933c59a211652a4a472f10e73db987aa2888a9e0b33f69586c6152da5213f1ea1d9a0bf6919a3a5a4b0a352f35e421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fy-NL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fy-NL/firefox-62.0b20.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b4a3d6a3be694d00809de9d78a1b36958f9150714b8ec068fdf9e79982bff82d3dc7c54f9857812b2ea9b2708aa0290d4fdf787993697f99ff719b213e50b0f0"; + sha512 = "0871b3adc369c1125e3b4532122610de49a9a4a8a309eed73e4b76a86e4c0f25510c6ab5b37e87090e68d6d72c07519f1044403fea7144c84b6e003294f86e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ga-IE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ga-IE/firefox-62.0b20.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "14411beefc9729e07b80f1f036ac651312fa4d257479882841f82b0c5c10ccfaf83f31b2597c9076dedd3af4dcdcd62ee660a38d48a864c09519bb1c75728e34"; + sha512 = "c99aa21fe8e3f835047c3d9caa167401f7b692ba4be1b7c43a4b22d61eeac1a2e2e5a8ad2567730f310ebff73dbd5cbcf1032a13ff454477a80b30421e1b4abc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gd/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gd/firefox-62.0b20.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "a6e40bbcda17d41a9972e56794847fad10bdd14d3e09d9ceda82b09d0d8c65559667b69afa2807fb9ecd26b8daeebe29a8cef6975bfa9e769886bcb94526f14f"; + sha512 = "8906f71ad07f89647eb43940da7ffcaf97d10845d7ff0a9a89e60601004aba148a5f49d8343190f9b559741213cfbfd840d17e68c3b67a61183647b8caa7d6ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gl/firefox-62.0b20.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "39d93aad369a22207d052611355b8868159b8fcef54fb86bd7bb1323ffad34d90ddf870d4cf21fcd3db0418b7e12335043d683c5f533454e19201ba6b9090c77"; + sha512 = "8865ea0724ea9359e07f59ce65c0a9953710ef963a440ca86e0fb2bd612b0129c86436f1c53b803ae0eb87ea4a710cd49f8fce9ba128dfa36b2af703c274bf33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gn/firefox-62.0b20.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "83f4351f9c7217aae381b2ba3ff8cd00d1e60ac0a05e87598633ebcf70804d8aa235f0b6af0f5218b90292970a5f18ba923a1a20b6343b3a8a5fb67195034d58"; + sha512 = "dd9e201889a78f8c779aab5da5112c11bb57fcc2e1294bfb078c90ce7f4b81010fe014d5af3ad4a3ae9ae3af7260c1d33a19f5c9282577e5ac562e4493102fd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gu-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gu-IN/firefox-62.0b20.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "82a3f443e757dfbe47cba8c6fd0099b55537eb290529a3d93569d7f044147e37518e6be82bfdf1b9bf13541615007c11d12ae7feea6c20c35e5cf74e00aac1d2"; + sha512 = "53a97afb17c1a64248c7c0fda8f2a412fac892b075d9b956fc92974dcb6fb2f5fc25377d215cc565d10e353b2e34554a0d4cebe73ce45780e2d5bc93a0af4451"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/he/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/he/firefox-62.0b20.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "71bea5afbb118e32e2e8c88f2eb88a044124068115301e1eccd892293fa59b2296d548cb662f6b67c6b52d8d9dcac6c7f395e70183c2881b72b7fd3fcf1fa759"; + sha512 = "084ac6281fc2bae1efca509e3f1c2306640c54ae976cb747b6a8bbf6c9f5a962e9a37a3e1219df29acb8f25436782f72e2b388b4d1eac69dccbd628bd4304956"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hi-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hi-IN/firefox-62.0b20.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "3cd583e0bf4d646fcea81b4c20a25731b9b69dacc61384e8aca6bbb3e1cbd795e31ff980f4079a51ce76f71d84c5cc6a3e486ff23f1ef2447d249aba48af9434"; + sha512 = "05d91b4e6b8411e9a979222d42c82b7772a39653e621339c30698fc5a41d58696614c5677cb41c20b9224d3fcb77501ac436b1681b38c104ff505b1d1ed95945"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hr/firefox-62.0b20.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "79393657fda529897b2f13e842f44f1bb76b2f90889bc86511a23238fe930eaa8abb55eb5541640fb214119ee2e0472b3688e75bd5f00c87f5b47b193bce8e70"; + sha512 = "6b497998cd3d038cddf0b1bb3e940da7993b95c711bcc369a0aef7f4e8b757a3c606fd5c0f109adf4f0648acd770327a5c4550338afe065ba6f85f18aecdc62c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hsb/firefox-62.0b20.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "b391dd863b6d336cc6c9c60c287e9f85f73c91cdc8463f1b3ded0239953ff7e0bf04cd8daf12185277175a71b55ba002ec74cc1256882e453fede8034c9a9a34"; + sha512 = "6a06093a377b8ec417edb4183bd19707971d35bd1792ba83cbf7ed801f4ab050f7859f4e47278d39340c25b15ca2506594ab70210d62905f45a764e28adf81d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hu/firefox-62.0b20.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "ecc51ff78e3343c72bd1337a025ffe81fbd62e98bf1028f892ef59591a3893bf99bc0f58dec5e183672c6ff9a7fe36ab140a8dbfd892bcb99206b7683b7f7189"; + sha512 = "2fb808e6938b525e5c5af4fdbc4da7a4191ad8bb5f488d50245662427e4295898a7495b4e94066ea04e4f68a4fca8b09b621b5503d4e51949dcfd682f7bce1b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hy-AM/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hy-AM/firefox-62.0b20.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "e0fe7721850ce3dc21aa5fb587e205d3833fcbf1b513df3fe67e9e3326ed57411920c6ba7d8872bd92a5df073362f67b101ae865e0954731549c7b25cc34400e"; + sha512 = "b17e2ae6e42676ee01016f2e90d73d4e43968224669b1a9c63aef86ebab479bf7d10ba29d6102e38db7317ad4befa3d66eff472905a9372aaa7b1519e2c71189"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ia/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ia/firefox-62.0b20.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "fa1f58e589f1d5453e8b349f87bd798a0b7fbf396890b6531c433fd27043d3a599f218093398de09387b2bd1d98ab50e92bed3c211617cfea700bafa0c846f80"; + sha512 = "8cbf136b34e180efc01d2dd21bbec2a5802ed0fe3cfe742a3f4760668cb165bfbba009eef26944a186b1ca8b3bd7b2a4d467eb0665be8a5ea0bf7e57bf9c97c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/id/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/id/firefox-62.0b20.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "73a0214561b02b4b30e495c5e62c1883409cc20b8f26c7aaa2bc32edbe197e8aed2e4165122ae84dd3035d36296d91a30c4460e9a5a319fb222f0d813601486b"; + sha512 = "ef9a54d8895242d75b6f0346df227ae3b819a85de4a4c6fd658533fb2e5f32a465374a80e70ab0614c9e833cefebefe44413767ce0295982c062633dda81b466"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/is/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/is/firefox-62.0b20.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ff6d9319998a1c9d394fec7c484b96cda4a473e374b193b47de3c473ba91684000d5a909e5bc460b83fd92562e225476671d42781968051a9701a5e0f760a385"; + sha512 = "ec2e9056cecc69516637d8a8d5da90a199dd4f287f85af19dd6fd8cb4d29cd85802b5c578c44a9fb1aae8f7f3e742ca071a2f09354b41e113f64dcbdf78cd82f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/it/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/it/firefox-62.0b20.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3b31ae6a9d84266007d7a61840782f3e1621a5d4b5dc05c7352e682132ede5225990712b4371edd59edd47004a87319e11c347b18a39e4477afc267186b2f1e7"; + sha512 = "1e70e9bfdd3b9346fb8815b1457ae89466c97b22150afd32d60a92c2c51e72ec7e151780398399d4d3a410a3e7d0871b6107018e8ed629476bb6fa23e2cb0c61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ja/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ja/firefox-62.0b20.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d5342196a66b2feb19352b5792bea6579e1921b573d583ea8223a3ec1e7c59df375a3ebe83345330bf42e6a01c54a5947111d0951025f6c57e55bf374bec1c52"; + sha512 = "83e5d827c447081e073daf51a1c842c42a86ed984dc0961548b04b4353e1384b6bf6dd75f60b0058a31281b51401441bc79c0d0acbac9407af6fd6fb62b08752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ka/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ka/firefox-62.0b20.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "ab045e67a005d31da572c30c6a90266e82a892c3c99af55ba97de6dba0f2be029d58d6ea259ee13d63e15b27f124dac528879109ae4342dcbfb46eb376021846"; + sha512 = "036c2a3ce2342ec50c3c2227f49c4708785ca4b7afaa9324d2708b1653ff09cf97b08be9c7e8ec5cf9713badb0db9ac3b2b1f36fd5e941cc5cff8c8ec9a72f4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kab/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/kab/firefox-62.0b20.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "aef5375d4d9ec0f34cc3417d68cfefd7f4ecb489a66bd668ce1bdad9ab804fea267557439bdab5d6685007a3d16cff85c9e92f7c1434e3a76bfcc94bea8353b7"; + sha512 = "fced42ab596fa0eed255e895a115fc117acaeed0c32204c9625ad37fba62b64f9199a97bd0794d5d91c432776abbf533cac651ab6156c5e7d1d34998ed97d760"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/kk/firefox-62.0b20.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d3c86d1afc103a1db53e1a03ae36f3c7da7a1dcddcb5ff9e2c8ec06ffe60a8e4f767a012e375191063f0c40a80bea08b66ab0a2db3ceccf796de15bcf232f04f"; + sha512 = "89c23113f22f4a16977c91bd5728514b31bdc5ef8c75c7946caba06c7db64a7c1dcbbaea194addccc203365b91d284066f5a68be585873a1d05aad176cd9f3db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/km/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/km/firefox-62.0b20.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "0effdf51a9ecb2312f34e14edcaa7ef40d392f6f969c46b1dc204471da276ba5b73416ede2cf6ea69205f67ef44df815e6038137c2400df2e2581564cde5b1b3"; + sha512 = "2b97795dd8ca4ce7d934df392c6863ae7a1824b63e8c8a97ea923d0b7324a1feb42c39cf259b83302240e7ab2f0fc84ec65aa5b72ef36ff98e9316a85eeb348c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/kn/firefox-62.0b20.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "f57499563c17f119472fcb48afd54d4df98c85c854814f872e12e5ef4d3dac3192905f43453849ca7f024b4ae9a96528c2f9a55866133e3ba0651d046fc4ee8f"; + sha512 = "b53454c825088debd764988e3217052039ebb516b1e9df4a06d411d4b69270303a8617fc83eddfd48064dd35f9712369f5cef2e12e4c01e35da20aaa9f53ab5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ko/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ko/firefox-62.0b20.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "50defae5a904a2dccfe8cd34aa2ddffa05a18a8b8b7181029f7b5b2a6bf612445bee2c3a4cb4c4f272bb97dfaaa487f2ed31dabf200631c53d963bc5f66fec1e"; + sha512 = "5f40c6f0cab40af75c473e4579510847ffc69b1364af264ab90c9cab97872d685dd62d57839ded440dd34fc6b431c668fdb927d9a58c76f2540239c490bbf465"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lij/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/lij/firefox-62.0b20.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9bee6742358a2c726b23e5c51d79fafa92ab8a3df7ac4acd2ebcf9b0d6a3661ee65d6335ec91b4e02a0f8cc3c3b452ff642ff2682788a647fc5d29c80b8a6d16"; + sha512 = "772d20d98fe64cae50ac856e2a0d085cc823cd90e8d4824ba51106d473ee3eb530cc49e8e77960ab5585439b9d82bb809ff1c899b3984274525d0cf0f07c6769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lt/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/lt/firefox-62.0b20.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "1c2d6e3f62ff24b4590163da626a92e461b9e7035346309bc7cbf1185f21ce318ef6e072902249da5c59d1f37724e4079b1d673492d2dd94ba0f50c38af818a7"; + sha512 = "62c55ce5dfbfb14124b24e7462b18e61a7a4e6b5afb2d5da3c79ea9069b3875cbf71c2d9d28f499630ab4c1603bdb0d71a90d30c39beee17c70f4de5931324df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lv/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/lv/firefox-62.0b20.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "be9704ccfae945863ddd60ac9a4cf4bd2642bfb11fe3adc20d396c9fb0a85189fdd31200e59f06aa4a1c50f46c799ab07864e7f677bec2133b9e2e60ebe3175f"; + sha512 = "d01e28e410b7325b2710c04127666fd69e047ff78046b518d3000271a89d9536ece6ec365248bd3a925e13078ba0b750b469a082b7273bbb02356c3318c46c6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mai/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/mai/firefox-62.0b20.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "0bfb640ce98b3e16b01b12db7c28753d9d90d46beb7ca7f205fcfb9d90537eeeab6b29ee999108e549b257c26ec4e13d64e470ab79531f83895403ca7ebe7d0c"; + sha512 = "501a76a99b28dd3d33c1023c95dd1203f321e9ea82a789f56c27fb63ac2b0dc1c4a758535b81cd38fa2a6f9234f5a854899c5c9af70b6afe0db0011d1ed144f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/mk/firefox-62.0b20.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7f8ee664f3f4f91c3b13f2e9f0cfc8d575f9a0da263370b0575a16e6e9bc7ba9e449f62df6494ee9837fd8e4620c2d4848d0cb7d99a3cd675a87bd65c1ae96e4"; + sha512 = "734804d2b15cdb34bfb1e3e51d3b4475d0b23ddcb0bc7e5de536c6098e9f5c2debcc53bcaf9ac76bfe49522ceb345c44d45721d4440b3763054c2e0e195ce68b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ml/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ml/firefox-62.0b20.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "1161e096b7d01fa4de5ae618045cd0528715f961434eaa569f8492a7ef0c059c2369f2dca348ffe0f24376cf6ed529be9b7077bffada3b0812a4aaa6677a6c82"; + sha512 = "97eaeb4382199859ee8c8d5f92322bc30eac9aecbea4a00fdebb63ec93172be9225d7269b99d7284edb93bd2b98ed6542cda6e5d65b45f97044c1a117cba53ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/mr/firefox-62.0b20.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "cefca3f2f8c94cafea0e473a44a1068ab7a26956b9bf2eb3cd0dbdef851288df0bfc05ec0cfd6cd804963d1fbed7b5226cd1171d2fbe86372c977c22b162df4e"; + sha512 = "1d1677c48b3d829673fb5140891d1b52ac9b9f075b2348c527c5e364d0a3fcb6eb5cae2c0fb255a834e7d94bcb7af03b928151ad397a1fec13d629a2cf37d44a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ms/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ms/firefox-62.0b20.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7b6801cde7734c77318de91dfbfcb3e039012d048fd83014e66079d797a9d4b4c7394b7a39f330a24c82c0761436bfe6d7d5915e26e4ca18f4095fc68c728caa"; + sha512 = "70524b569d00964c9773560996972a6f96079e749389849ae6615a90f55ebe458d0d857a1ea7df89b51d39b5cd8e0bfd65bec6b98ba5500419c8e17e269713fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/my/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/my/firefox-62.0b20.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "c4257963ea60c4d932326dc5fd468b96bfb6a35b35ef3c7950981ba92f6ba07dda586177ebfe20c386fb8b61d0ad406e102163f43a2f96e9710a4b0e7c241245"; + sha512 = "19fb98e2f9622ee33d828df12b2f2ed035abc7c66b8d8c4cc5bcb5d985ebc0a7a42d5d793b102e247da395d8257f9070f3896531e507d50c21575b3287792f80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nb-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/nb-NO/firefox-62.0b20.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "6061bc7c8c0fea22bcaadebd2a264f0726b43c71b9f4b8c4b33ded9dea7ce9765e88fd1e4dd47935ceb5791a43785db5f4381fd2bd0181a281e62b6de025ef13"; + sha512 = "a5073203319b7e778975c86dda8930fc5f7676b1cd124d461ae0d01d9fd7290a8a87f2303bdb2ceac78eb562955b06eaa86a4111098a241513023cd005cc450c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ne-NP/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ne-NP/firefox-62.0b20.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "ad4b705bcf4ce2b819f92b45e4fcdaa2003b37dd6823e75caa153ecf5afb1940ef79984c8602c94e96ee2be025d46a52956a78de57e3261bdacfdbde605f568c"; + sha512 = "432b527c41424d34b61bc9ea3c691349397efbf26fd5b9ff85b1e1701d768be7f5f61f621d1f920a696579f5e4d0dacc0e3f91642e2c24b725cb0be16e0f4283"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/nl/firefox-62.0b20.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "d74352e12bd6f7a948f9ef8cc383811f361c8b68eaa060ed9859d3680674c07a4ff922c818bc502fda85dd94ffefea679e6f9ddc927fd193ead7685f40beba75"; + sha512 = "27bf6e9aa084cf7ff041c0d4d9e380f9becf909309317bfc2fb8f99af81a849975575f8e12c83b4abcf0b1706987f29ad313b352f5bee7a73d76b3c8ce5eb95c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nn-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/nn-NO/firefox-62.0b20.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "7fdfb976b9c586cc5cafda4cae0e6d379eed5ab0524bfe5cd5384612667a2949e5cf1e741786828b30e8ba67a4150bf34c4f10f2cd2c7aa89caede413501adc4"; + sha512 = "62a187309f01f6d0d7c2b89ae77fac381d14d91ebc864990f897ffdc45d068a7d51a5af3371e4319c0719dbf126f25ee4445a8cf30badf02c89a8a756c44f83f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/oc/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/oc/firefox-62.0b20.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "3a967f09b09bdb3b0009dee7896cfe787b65ae15095e88be6acacbe79f69411afc6d90638f0cd82171a4f8f858e366821d3b3f3cbe0fd50b03172768ad2525d6"; + sha512 = "a5d2fa30167f19b9a7d6f05ddc2e374cbf9918da0eb2d12a121c442f48106ac369133d42bf9ad4de83379c315d0e4ee4820365d43191563da07e3908937bee01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/or/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/or/firefox-62.0b20.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "2f9d078b65e479427c1a91714aa7290a2aec04cf3a6414df82ddeb5e830210575656d7e3cb35304c2d1fbbad264d85ccbea2e2408a477a396c368fcd4aab95ff"; + sha512 = "9aa6f12da9a63cd135b7196fcd579b2115a6a3d0fd7dbcd3896d5c76caa021f64e5622ccc298bada1bbf1eeb78dd5905efc79e779c4e46ce96acda18b0f54576"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pa-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pa-IN/firefox-62.0b20.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "bc3b65a2db74bd04e31082b9dbf3aad9434c9db2021d28f6a058ce78ade53b6ead38b9a7f123bf58e8a25f25d76a0e5fdff6372b04e34c88f4cf7e58ef80daea"; + sha512 = "c90b483004ea2ebd3da65f4b8832990894cd20230aba256ce01b38148378831a7950ad9366ce420d961a72c4bca682bbb5f9ceb027021cb7527530d7260a7e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pl/firefox-62.0b20.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e1910f17681e058fca270e37939e5b6003195499080d747f3bc5a4ee9dbb960919a440a7f627050dbd0b66988067f32e41599d72fd6bf38f07e23ad317f83938"; + sha512 = "35b67fe4b6a526256e0c7b0669a99409064dc7e2f8a1e7d46cf71751b6c2074207a592e8fe263ec3634601a793f56d76b09de8233b94fa410ea391d72db5174f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pt-BR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pt-BR/firefox-62.0b20.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a5993b73b475483deab792e4f657a27994aea194c716246707a0612a7b5c4f6b8b7a23befafd7c6fe50855a11fef8513b5bf16cfc6125a786b7fc0d50b102687"; + sha512 = "ef30ece766447105ac86da1e324c7a9818ebf7c0a5ea93a31f20ee0e22e3663593824be9db040f02f424cdb6e9ff4e4bb121a57505b0019a0d7579a12ef7fc0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pt-PT/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pt-PT/firefox-62.0b20.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "306c7f964d09d8d73b7c35161e28dc856917e7798c1a6a57bae7ccead2abce5a6a6a151f8e5a66473d3ffac43e0d0e2e4dd9d1bfcf66b23818e6bec246bd547f"; + sha512 = "b6a571f6c019522d49824554881684f38fdd5df7c518daa35950fdfb7f481ab8ac03d90ce89909e4c6a9112c8b965ce321ece7e317d176394f700c4e0d24adc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/rm/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/rm/firefox-62.0b20.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "fb29e90b0728b2a0b23e2d87c8baeb6140301cd0d6d89fcaa3e047da25c8333f5eda67a5a1582f98c6711f894cc08542a6e8ab0a326726e02c08195cd88131c3"; + sha512 = "d72c24d58c415f02b85b9312709050cdbd975f0febae57e39db118d88741c5691f82412e6607cf8c440295ef2c55805512d60a05013ba3020afb4c6723c9419b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ro/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ro/firefox-62.0b20.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "8cc66ac0b88632bc40d92764f0efdb71a69949d29a14a2ea06907356fecac5faf472399fa2c55dd515579ed8c3501925286db600f9239a82a4963aafba2b56b5"; + sha512 = "e881440fceaabe3bac8b038e3bd4569019c1f85a27586f4b4e16a7b2d2f55f47f520b317ab5e1df238ad41529f00b004b65b104ffdd4ca6055cb07e2de439801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ru/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ru/firefox-62.0b20.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "d346b5e10da51dd30b1b404f567673fec759ba0f8e44f0f0dcad1375df212aee58d34147599beef8eb78d12ff6911ba703ecbc3daf8edf206d19a3566a83cd49"; + sha512 = "777d3c168580d3686f9b58fa6ce83b3941c3fcfd17eaa84ec31193192019c76345ffa2b416d081e974f050c14d485eaa5862245bb4464c239290c27bf9cf8299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/si/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/si/firefox-62.0b20.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "ec97cbfb74a86d96e05c70f73ac2e45448720c25845cf24e9c45d8d3174fe540911b691fa12fa96ed4b82cbf291a539311247d2b2c8073f790e1a3054997f50c"; + sha512 = "aee6dc0e73a06f3aa2cc7ede2890cee4a72d3711510eef89420cc6cdc09380e30706ca3706b14823fa7c7b53d57f7257aa5f5692bf49834178322015b828a969"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sk/firefox-62.0b20.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "86676135408c0d9c268f93a271d959dc250d6cbd9e47273abafef0e5d8ba86a03e560539008034b5895ee0e9c415748c10586be538adfaeb5c7fac5f3f54a4f2"; + sha512 = "6063a5ef564f2cc7b54f89002a67a2e8488a6b62051a61e545c43ea123c95d3a51fde6eef2165a983266423af421d1c915bcb5a80c63aa4bd16a27eb59c27245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sl/firefox-62.0b20.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "7fd5bbc7c046a09ab05f8751015d9c04f01d8cea0cd5252ad49f7dae612ac87d65d5992e840bc7701b3d99c90869143c721e690e51f45ac0311e27c45471b23f"; + sha512 = "76fe24bb152e4d89e9d4a4409bee5c2555e42ef2dc49beae13cf9f26b4ab5c3ac2d7d8bea9d1d257f2a7ac4e68e520f9e7c00529aef46dfc7436cc9de0b6eedf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/son/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/son/firefox-62.0b20.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "b1fb2a67f132d420cf47707e0f8c4cac748b2c010ae5df7720921e742c13af851b7962c6808316db3eddb31520fdc84367f9dcd4cd0549bfc5a0aafc02cd9b4c"; + sha512 = "f641b6ac0915678b88e18d8a4d4ba49f9a303252024ffbc21641ca5c337c8d3d4317aefc889e9ee9c647fe51a10c3755146d1b859955efcce2ea2d2f5e9e4a11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sq/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sq/firefox-62.0b20.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "979ba11bdc4a19cd0ff71c6626ec9bacd18738758b1748218206590c29474532ecf28aa9284e94e57db72b24330632913df89128a6e4297582ee64ed47e63065"; + sha512 = "773904cae848afc33b0b88fa835db0e0ccb62476ae71628cf5edc1190b70edfb2e91fa6583ea473c6632b8809f485e34bc55a5a86f61380cdba5ea4e99880ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sr/firefox-62.0b20.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "65fc8854f5dbe87f0f548eb755b08f9dde3141c765eb6e891fc85cb91814a72edfd09d0aeeec2d98949a788a11a775e49a8ab16829358d8499b5ee27565da4bd"; + sha512 = "dbc995e9a6c690d66e6cecea3012ba6c0825124bcd1f49073ad0c70e740c7bcf7b07a565360a881fa31d13988dc88a7e2038e13f229894d532ba44d0f7f36f82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sv-SE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sv-SE/firefox-62.0b20.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "2ed2dc8618c8864497174245c50f6e4c64cb00225c7ce77c04a81619bf56fc5e93bbdaf7c215576e521a7951aae5d22ef606f8b93fb5d5a302bde3e92d2bfda8"; + sha512 = "94664f3b8a5090c71d7bf5d66534567af5e88aaefb1b96bfe68398c1726dfd3d139f1b106f1fe743d480c857828bba7877c0d77d3b1a582e9f39762e2f2600e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ta/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ta/firefox-62.0b20.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "f8bacb758829611b730ae584107964b4fdb3e202e45ce5ddceae9d6697c655377242a1550884051c7d6c18126fa24f8859ec9a8527368bb28348d16e69ab656f"; + sha512 = "05f938e3f3d380e991ea61b774c0afa60681cd90e193dcf3ba99c2d8f783c265f6094b0a3f088639ab2b060b07a9d1f90396b65cd9bfa2480dcd366f3f05a2b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/te/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/te/firefox-62.0b20.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "b20773a0ee3be91af9635e4bc92b148c91f1cc62597294f5b37608368b1c5fccda1fc203938a8ad7f2f59274dd6dd74e98d1436e74b6e4cd8ea21a6cf2263cbf"; + sha512 = "48aab49101dceacc974792ba8b355bacd40569a6571c9e7fedb72574b09b019ae3e78fb8ffaf1f7809f121e7cad7ff581b5555847bfa8067cd7441f131d9b973"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/th/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/th/firefox-62.0b20.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ea05713f6f615280317d3deb14a5f8c3ab6895333333da165aac253c7cd9d62e6b913b56a850e82c0713abd1fa92c9f447771755b557d0056e10f39e54b5c663"; + sha512 = "1d6dac041ffabef622b1e71b1473a8acade169f567e98906795c14146f8ec800ae4ec5e5a4ef06a800dbc18a41400dbea6892a9a0cfc902d9d7348a201ae3548"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/tr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/tr/firefox-62.0b20.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "73a8207478a59a2cf2291ae848dd1e8edc7274b4de4feaff4703279750406bfb9f74a3928f717d0d2274f0475b449c8327cdbbfe367a31f35499fe3401029f26"; + sha512 = "0f6e4854a5f6a9540d78e14090b4204bca5de037fa15077bc6417bc422f6f7cac6f0655b61f9062be6545515a1eb38a54ef5e7d0fe347426424b48686d6928bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/uk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/uk/firefox-62.0b20.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "7a6f6ab7e282150b7020bdcc4d025883709088206df00f1eb47979a937f5b7f1b1f7984c3e9148e14ea669bcb4b9022c885816e52aeaf695098f55d9c00739e5"; + sha512 = "2288d8d209a6392646f10f0fdd2229b281eca6ed9e830ef4102127b74f9f314b9f3d67f03d68aea57c8c99814e46c87a2c27c6d1ce5b31e43e427ade1ea7535c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ur/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ur/firefox-62.0b20.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b8f7af681ee9f83d6f0ef76f860a399612a4431447f77b16750cc09c03e2b78b98f2b2ccd9b661221a17a2a45a3e383a12346215fc3970d6105c44ba4e655e62"; + sha512 = "a1cdd10df63e2306a0907686de28066c7c5c6241dc594350eea456a9684a288be20bb1625aa7017e320d3f5bdc961d8f0945220126448c54ee57699e67f5aac0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/uz/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/uz/firefox-62.0b20.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "85978c209c7519862d72adc61065c52a2f7e2d3f37fa5fbc10190fc896506737a42bb33fca3f7532805617932e7f824bef010c43f51510b8c9e0609560c1918d"; + sha512 = "70905785d613426e585ef75989f90d4ead06f267e49a668c986df0bca93ca5bc409cd1f62d1b4b23de0659c18155075e05aca5122fd2ca7d22c748f94b34dfc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/vi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/vi/firefox-62.0b20.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "c7dce64af32f44b09811fd42c2edbc58556c931d9e4d11e763b27d969e74d860a682108b5011335fc75f1ceb09107dc27ef1e4c0b196f0048fe8b3541bad8f59"; + sha512 = "9ff2e67f2be33356054615abe599acb7d192f6fa7525ff20307818c7cef25cef649ef7f26c231d75afcb7e0babdbf4df9ed4f56d5b749a884a0eb17335bc1919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/xh/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/xh/firefox-62.0b20.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b63e73be6f0f7667fea700592407adf7599935c5a25ed93d140565d17f563fdc5c7e0cb688733916312287952b95f16e82496905c187d92832e0da296d925164"; + sha512 = "39b0d603092198f6b06fb0fceb9de7f5787bcb24d3f8129888b00ad5b22e171c396c679a945dae43e8088a662ef2abb2aa94c2cba0bd1037a7f4f5dd3ca2df1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/zh-CN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/zh-CN/firefox-62.0b20.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "8b1de2e32b3450c84184d20df16991ad0a84cefc745ef110c93697841fa5cb3f4bbd9d3f21c8df6807d6cacf97dea1b856cf651567858b4c7403738e7c8445bf"; + sha512 = "f0ae1486ea7155521095dbb2ed764365cd01bca16e7a9520810950699e3a6d0b191488c929a2b9980783976b90e0df7c5999f1df8b67b8f851e133fb93dc600d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/zh-TW/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/zh-TW/firefox-62.0b20.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "4dacea538fe5885bc5030512ade78787be53db7625ca4a006c48787e6d62c4ac82b0c7d40976767ac483a6b88e4f44abe5339e7909b211cf1f720d584105de89"; + sha512 = "7d970407678c320e731de0a4f00438ad7faad0dbc375e0eb12c3956a543279ef379b8f1e009b3f866680ee2122f6383da232f2bd1bf06ababed3ba04e453d065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ach/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ach/firefox-62.0b20.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "6a2681ba41f8449503b9a55d551ca72a94c51903865062baf0f80e29a4cd98953ebfb239c72706e42795dc1a49d087822e4f13790298a78b0d12a0a08468691d"; + sha512 = "04da51cb7580a716ce70f46ed48b6332342a7c54548280d2c2a82bcac01534bf6ec638bf6090f61794b78fc3a1445dec98fbb420103f2b942314d9aa3db85263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/af/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/af/firefox-62.0b20.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "7835ee1925c7e097cd16c92a9455e331573baa0a7c5150df27698199b423cfe0e511400955be5fecfe342d537b8a0d66e10042bfbe1f411b5b9563dfcd2f4875"; + sha512 = "1acf9dfca2cb878c4fc3ee1ca56a87daac9248a42295d0d0ae11e829768dc4dec8655fcaf4c0843fc916e58927a417b9ccca4ee8886ac5238c37cfdebf8d4608"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/an/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/an/firefox-62.0b20.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "bcad9e4ce854ae1a36ffcf82690cd8f2240aa04f0a525c1c0d9149e5ebed1e78813488a4eb8330b39e61399907fd421542f1b10c616819b2567215e5ff5f972b"; + sha512 = "81897f7babf614ce6951f402104bd829e770fe88f6f64335181fc4283e73c6c01c45d4078b70a933525a20d8ab1f4c3b3b23eb9fad5304f0b35513e43b79d15a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ar/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ar/firefox-62.0b20.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "205217f6214d77d0d8a9c33f5d09abc7c32488bdbb7f5e5221968ed490c10f634dc2ae561700f63408ac38d020f6d17937af2b711f2451585ff34affd52dd25f"; + sha512 = "67beeb695048bb70f2e613a4d08e00d2d5ea5d7748e6c8606ac7ead43a9d2f870e72c3ca1dbbc3c7244068ec29a916354ead91391d3cc77b1bee5184c25bd75b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/as/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/as/firefox-62.0b20.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "7fff85971ce1150b1ba030b11b637c51f166ddc038acd78297aea2251b3b2383fec376fce58610bfa3579825ba66d9859a8f3e7d2e33939c82d4e692d9df5b24"; + sha512 = "6d39b86898ea8169d47f801058874a07a32c2da59d59c0f101fa020b4c118be720fc221cfb59fbe124aa278edd49c828142616b714be0053b1d74beb8dd88b33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ast/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ast/firefox-62.0b20.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "f3bc3e70cbc691ff611b6bac2900d7e547d80ac84b3e1caad250c11e3b3776d9ab4db7fca8db0c6888378a540f966aa57e100becb810b1a3fa5b0e8944ae81a6"; + sha512 = "552d79448ad366770d1f759793f1f792265d1630ecadd87a011eae75f2a17243a1636ddf483afc10e1a59874f1466e8a9bcce5b2b8e31f2ec72be831c9e2d7b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/az/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/az/firefox-62.0b20.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e9c25cedcc9684b88f442918e0a5606c1bc8986edb8c1ac8e885b00241a792c115f118799d425a876c462aa25abb36708b819ac712ed0c854e114a835998e30c"; + sha512 = "16eaf530b848b2291fe2ee03489b9414d538693024ee12be223dfca2980ef3536d560b698ff8f99744bf6101138fd1303ffd42002d2272b2dc5fbc5f97dd4138"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/be/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/be/firefox-62.0b20.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "0e27ac6e9ef47d8e54ed5da4e88b02468596869613dd214066bee13c11c5a3f614fce3dc92f6e4b49250a175195a14fa4e11e0a576e24a550c02fc64187a7da1"; + sha512 = "47565829a3f5859fe1e640263d4c46e2584666fd5e388c4e831b6411c5af0fadbf4e69c14c730ff2adeb14d732ad71031a2f903e86a1c0ebc26eee3126739ae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bg/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bg/firefox-62.0b20.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "06a1a97d89230b344d72544e7d16cf9249b608d5a8957efbd5fc72eeea09ca791cf17d040d3a8adb64493d2eb10dc9cc1c334a0236aa41b087b9dade15345f6e"; + sha512 = "5ba29e660effe660301e9c9f009e3c88c12aca3b79553f8480dc01f99f5858cd838fa9a7fbd0105070f5186a10476719c753514f0005957fe774d845e182801a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bn-BD/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bn-BD/firefox-62.0b20.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "6acec4d29d2a40e0d946fcd72ff1f623d54daf9d9c5c00099560fbb286dc91f1e2ba341153e97bdcf62f54fe616bfcf38ff1e6c0b774a7917653a7e422e26320"; + sha512 = "ad81b92e79e754b1d88a2292643699d6b66c34259ba66f460017cdfd4739326ef97610ab2be3168d0db88cbd1885a2161f708e2c1b889e5b5f1680ab2ff4a1b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bn-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bn-IN/firefox-62.0b20.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "b492f32f37ed40ab42fd628cd01d063a4705c8fd14ea599327f417231951a610b307cf1035cc81edaae2e784e38c55dda17275f77921e1a63936872d48944ae6"; + sha512 = "960b40181a3f4a31844a7b1d63b2211c296b1337d4c072f259e80a368fc5b6554808683eac530068e0b0a155f72292d6a4ebb717d3693e367142841fe325a827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/br/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/br/firefox-62.0b20.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "e4a2432e279ee0046606ebbe84f0249afc225fc1276cd28bbe989049ac59b8c2fd09ef787fbf269367b45ff9c8092c6779cbafa45a05382976dfde3479527148"; + sha512 = "4e1fb7c0155bf06af57abf0dcd10989199063030378ef6864ff5f4cb7410fa1af780c038dabdf3ff6fee5a26aa27592dfb01911e353dd300faae04a8782e4408"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bs/firefox-62.0b20.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "c8172442b52b48396b57b36a9099c3dbfac36020769101c6c2fbe0a1e857700817dadea56a775d62f127fe8f86b714be0d1be63c9dbd8a2aff15b6698fca84eb"; + sha512 = "7af74277d78647ff61ad05aaafd1d9cec295f63198bebab083c5bd8817f3c00de6f5ff49d7548fe8b6d2d7e06663255864e6bd6852ee769c465577217366d074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ca/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ca/firefox-62.0b20.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e199d2b24e0a1f559a551bef9f0658d23dd69b0a6f9e1c2b02885eaeade95144bea2a29bbdbdb0cf7e34cf9f7c6ceb49c407c34ef61f855e260b2b84436e38e1"; + sha512 = "fa050db4fea78126bab3c2ec2db4514f826a22a98e2986c8a779c933641bbb722b223e76b6d7b533cc43f5186a8c978af34603ae4ba1987ee1fe383004079232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cak/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/cak/firefox-62.0b20.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "32552d0a4ec557950d64b0e67c572a7696ea7e58a99960b192e5b383ee30a39382c5b80e0fdb1b14f3643ec8c48a422098dbee1d99ad6b2c9eef1bdc3d0dba91"; + sha512 = "c69d394ef30975c4e546978dc9e64266236727bc1703c5224e721b12476d73e1455197380dca29e4d71b741116a29ecd441423422d398004cade9b009deecb7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/cs/firefox-62.0b20.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "07f772b65b234ecdac971fd0a4c0ba049d17e148701b286223e972cfc77fbfb28c357e60e2311519459806b48ee8f10f5df96686a360b5148ad88c6e9de3d545"; + sha512 = "b5d4a689fe6b475fc87083ef7be7a31bac3569063baa160b0c6ab8847a12807f8a1e9c3e6d0c2c3b49ba74f3b93514211c084a99b9406bee369d0bbb78678b71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cy/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/cy/firefox-62.0b20.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1ae9d11b2911997ecbdf06c66072ba5584c70b33024a18aa348a50ce91019c62c862ad201d6cb7b427397eeaf0c7133136047241cc61fcba4cc761d9665bce00"; + sha512 = "baffd6932c5fef0b4e9a652ff4c892be693abecdaa0757d8ed1ebf5aaccfab34d0856a8a156db252892b8721093302a03dda65ec510837cb31713c3a803a11cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/da/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/da/firefox-62.0b20.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "71786ab9acb16d3d2bb102863efb79e716a67ab0b32c6a6475bdcf93211d9517b862939576d258b98b543be9301c26e210c9f420ae084233e56d497ab49b8763"; + sha512 = "bc4a2a7eec60f6d4ef8436538ff4067a34fa6ead9d75b4f88b24ebb6d3e7712facad4386423b3c2dcef6ae183891bc71d0e9062421fe5ce7725ff564ac042b70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/de/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/de/firefox-62.0b20.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "36067646d3459c6893f3504d5e9a7ae3fffa7291fc32969e98d4ce3223b09ccdf7e0b04a6b73fa2584f9aa45e9b38a8135fa243a88a50fa2cf745b17e7c17de7"; + sha512 = "470d8758e2407781308814bb581b68ef6d46bd918c2a7e2eb2cade73012c79ae01796fc2df8848ce92ffc3953d180a0d742d1da315025190d1795e450004cef5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/dsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/dsb/firefox-62.0b20.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e6fbb31e7db958d00a937a8565e691c4a65b975c0cd3f852c9eb13e97ed195dff660bf36c40764d3f9169059884e384fdea25ec55e49226a02b693b9e2fc3c0f"; + sha512 = "14f9beced9df9de025550b06a9a418e4d37b8978025068570b955ab80dc1a5a87e43f93b92e145287668082024eaef91916232ec1736070af6e415bfad9f6c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/el/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/el/firefox-62.0b20.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "15d300f31ce324e89f7927e66e39c25a0437609817f321185b385ad4026eb2646f065f81a1cdd0ae1f7b120582603c83e8c2b845530a6d44871741a23f219261"; + sha512 = "a52072b717f8d557fee3e4536cbfa436ccc87fa9568837b58494ffa6f2b3d153ee43378ac871f99b7afe62ec6adb831805ac7e1348b2b395360b79d94042b35e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-CA/firefox-62.0b20.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha512 = "71cadf96c97c236d0c9d4bc8886368ea5a9220f5fcd63a4e54ccea90de606391037bf87e4fb8deab4ff3043c2a0c8d641ade107f60ac5e7793ef1e85c031c525"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-GB/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-GB/firefox-62.0b20.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "7ee1708cea3282fb0de47147bc54d5738ec4420c3d8e41af445e138fe88b453572d6848de2edb7e48258bf3ac25e03fdcf22d768b220af6998e97fd16d4588d2"; + sha512 = "0b7a55f1172239857ddc9d75a14061e7b5feb5855fe8d5e07088300f64a1e4c0c1521d1db5a8b7b05837223d1ab43ec5730d8e706953a14c9fd13ec3c73020a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-US/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-US/firefox-62.0b20.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "2dd63530379b00312b310ddf63f7796b6eec97edfe6638dcc82dbc2648c42e9e96932c73f16518687f922cb1d45212b82b04abd39b2e6e7aed54fa4924a5da34"; + sha512 = "1622748e3b656c8703ebb276f7a8bef4b2f6a593590eef50bf0e9722466d49a33ea31be107e3879073dd7b2c4e7ee3e2eedfa89b3e723108ced6a34ec3007868"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-ZA/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-ZA/firefox-62.0b20.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "a04e3c3202e12f7f53b11107e0db92282bb5d8fc6627f3bc8729c520481d9a3566d39c68c283a97959020fc62ce1095c5b19d8dd85577bd5b0b171f7b67abec9"; + sha512 = "d5186d4172f636ecc4c39c60d32c80592deffbbcbdbe518e88eb67d3c56d8095ba440ee82af3efe138e78d3ae40b8367f5281fcf2900b913557734978f741354"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/eo/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/eo/firefox-62.0b20.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "87afb472bc3cf46a4af7d7bef7b063a09208927fce7060824575ddf7197e6f58810e5e36631402deed1cfd5d921323ba9326547a57792e0c8f4166c061214018"; + sha512 = "e0686beaaeb880be30604a8a5ab0acc541df1020dc2de3757d5fe5e43a1ad6a7de603d5c137569cb42f5dd1f2845c75392cd276815512231116991a5e54f1af7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-AR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-AR/firefox-62.0b20.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "c963b697c4ecbde0432170a068143d03486156622294ab46e1426e3a3535031ce4c8e2b49d5a5b0de721cf1dde2abd60b6619fd4f8dfea90b12ce64ad4744ef6"; + sha512 = "5816049b91462845cbc4eed891aed168836e86ac2935bfb8d27485de30a7dacf83bd765016b528465b7aa559dda30034ef2195a98756aa5b17a25b96906b4573"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-CL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-CL/firefox-62.0b20.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "f88736bd06a98e2a03550b7134ed4b6dfd06ea0506f83f0974d1c4b3226a3a37c1fbc5ffb085c5cb044dd282c594ec8899ddd3aa1ab153f9a5214432ffafdf4b"; + sha512 = "cf1b7bdb35d5bc8d30c805c98e3a0843f714cdc2f79ef8478277356032bf8eaa4c013901f46662712b4b628d62e2f6b1e9520e868f39badcb0dfa56581862699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-ES/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-ES/firefox-62.0b20.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "ae0368b758e8a19c96a4344a0519b2b5c645e6bb19a3babc0b0fce9c7b43df83a5586406144d08df049fa984ace65f86282bbd14307364d99139549e0873be4e"; + sha512 = "ff873d670ce9b20b8ff63bb8727a338b3bc0818f0568675f1a3fc6bda13e8f4097d1bdcf6cbaf651ca89163c8676f9492103bab682a8f9956b43c2686a51df13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-MX/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-MX/firefox-62.0b20.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a003622d0b5b048087e80baaee0776ef0f41189bbab81441bd31f430947521149ef8671aeef02308049192d4184d2fa0dabea8c4b29eeff6abb005992278da7d"; + sha512 = "253c140c390c3107ce16a9c2f73c41a71e4b080eabd049a5c1f65c8fe895bd3ec669eb653c8bad55b00bd65e97108d85be18e1edd1ba7457374fdc0b9d82d616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/et/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/et/firefox-62.0b20.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "71a81507a18ee16d947441f76daaff9c35a7d1f509ec4699143a7018534524f5d0c64340541efebacdbc7a163955ae06a143a165ac178a5d26c1b87b2479d669"; + sha512 = "cec92b0815fd530f3dbbf195104c6699e4d078a4a35353cfce2425050bf62811b093e4276052622eefb60d4f670fdef28919f8d83e273a27c7c9cd6b9725f064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/eu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/eu/firefox-62.0b20.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d9fbed6bd402b3d21eb2ba032c4776888629e68f9dca68421418e1d293e4eac154bc26b0d8297e814dca2cc754e69b33e307e9a896bfa8edc0f2da7a75a8cef2"; + sha512 = "6cf19489fccc70da26bb2b28f8d036a402214ee785e082e2be7b065f8420fd1057e3caeacb42436955a84467228fbcf2cbc62f871fbec959a4461d9555ee4fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fa/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fa/firefox-62.0b20.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "bb024088948f3be6d37418eaa0e987ddf4d9854e7d06513e1691c4944e1d8ad8fff1e65118e9f45557601a238f0adf07a1596e82293728f2b011d0f1784a8afa"; + sha512 = "5d540a7f403ec92a884656279cd4e7bcf7bcca72f25246894295f2f0d7271b756b6851d68d925f1853e16be14c4f9607b2284a642f4438725384a2ed18e8def0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ff/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ff/firefox-62.0b20.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "e3f21493b6dff7cea9564ee067445076b2a9967b752530a0f922a70794fd5dd120982833574240d0ef854734a397651eb77a8edd0715da6c8e1710c3515e40e5"; + sha512 = "65b32a30ab5bbe626cbd1276eb0fe4bffb60ac5651ca6437b0887a0bcbbf5201aebc74c3a80c92baa1a56e60a6852b32fe7ec7228de99e9296deea976c6c238b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fi/firefox-62.0b20.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "9ad7444691a95c1b21fe149ab4468031a6886a42738f31d5aa81e2321c737d2c53a6d817523de2722394a47eeecf514d218d7e41158f42a80b9bf2ac3515a0b4"; + sha512 = "00515a094f79ef0817bc3bc392ab9d4effabd68748d0de0f6c0cb14e7996b97fa48df200e1444ccfc2810c80252ceb22b6e87037efc476dc58330f9af712bb05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fr/firefox-62.0b20.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "d3eade70bde9bae372fa275912f3c1970c10978ac9e83f84c018b02443d341c21441b100f723c6856a5b61b742285606c5049328838444e7813e7427e1a0feb6"; + sha512 = "2a1f2b26f3f8031e2da3778e375b889793bcd87cc2e21b3f26f16a3aa2f4043225472e9be3c8e914578a59277f7bf42c929a2f0d5475041eeebbd8d722a67c3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fy-NL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fy-NL/firefox-62.0b20.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "412a873708341e94fefcbb5fd72661559a83b4c897f5bea8a17051759afc0ba214dbb9732f65d5f4d9dfdff98498106a3cce73cb4c6314ec7f7bebafd8e63113"; + sha512 = "669f1c45e9382b81aac5c612fc111c9be716e662f0a87c7b0c9f536277d010203438c09ecaeba58c87cb91f979427ce389c5de9d55adab8366d36273a4926ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ga-IE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ga-IE/firefox-62.0b20.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "59f0b8e533575841f768cd80390d8237c2db3fc2f2e99bd87011a8868fdc76ee8e5a87401c029f55c990fb0775fabc163ad4d9ad1531dfdb7bf9fbb9b601e08b"; + sha512 = "c6977760950f0121cfc61e7d130f89965df9cb6d319389811bfc08b6acbce34eb6d644b3926f4b2fe4fcc735aad1a1be447dad8a160a85bc543d95d2db3d2b36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gd/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gd/firefox-62.0b20.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "29cfb3bb6bffe5960968cae3096c63d92e50c514fcde9a26940e8304b688a869d6b03ce7479df514281fc609ea767c69fa66fc1f42e9b0f3cfe3be9ea0efad7b"; + sha512 = "cd1d2369a9609969f52d08012bab63ff82a795438ddaeca2c17f0df69a713df209b455eba32112cd571769f0a7a8cf8f8eab718a597b5f795f05b6867e88a382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gl/firefox-62.0b20.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "f7b425e76607833cf4ed8e4381da101667c94d2942fa06a9be94193da350d03e8bd0f1f6d500ed0c231bddc3db5e458e9e94bd8ff77580ceb321ffdbd8a5e320"; + sha512 = "a0a3bce700746a50651a982ac7dfbdbaf192f10f0e443974ae088c9bcf0e2fe6eb96d3c406138bb236512bd6b1460b0e9005ed370f38520d4f618d090e58201e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gn/firefox-62.0b20.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "4f4a07552616989448bf5eb12d0a0ddbfb12b10b8f876d8a08f86bf58f113436b364f99ec26a20fc29eeef1030eb81546e0db1e92a8c86f46f6db1e60e784698"; + sha512 = "d609256292a297f959793c39da5d91ceab2a409abe9a560b47fa51e8856fdef2d1af2bfc6a4b2fe870f4fb8ca175c369e9ad9029df6070b7ca12205b712a6e21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gu-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gu-IN/firefox-62.0b20.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "5510e8a069b7444c20af0c95258e21d5d7e35baea46b83ed7fa3546af41e76299191fb8e14beb459c79a4a2aa5f195f6c99240f5f54a54291e2bd7256e8a9979"; + sha512 = "c014f45aa1a46558a67d80b177f8f22a01f250b5658149c64056ffcc2f1f7953f43a0e6eb21b7c8ec5d4e7ce677f6620fd87454a7d65d145a3609e29c7b2dfc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/he/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/he/firefox-62.0b20.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "c3b140194ef9fefe85f2aff0cfb44c49ddbfa3bef89b9b53d4fd92eea4532753d19617a57809c7d5413833e8055547daa1296e4cdc8f6d2a1cc792adfff65a79"; + sha512 = "e65683aa8ffd57fe3563c8b7d13087fc473eaf240d1acad36a23be418cbf41a543ad4a2226df16ba65dd3bd6d309fd7cee162b60485c58ff5c4b61a1b2e25b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hi-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hi-IN/firefox-62.0b20.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "34e457813bdb5201b862dac75309ed6e0f4d7915111e9956517de12a809cf7cdf8f18238dea9e480434334d61f0e02cb1d3b7b63ee1e83f4854bc76507093838"; + sha512 = "2125df51d6209b702c1445935ed44de5fc13b218e44f199300bbfd1efe51fcfa5123c47063f5e465a542f34f5a8f7643ace65aac433f76a2db9ce17a4a727c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hr/firefox-62.0b20.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b65b6560c82225baed727e8831c549512d0d900f41c337a759d941b6d78462221649f6ccf2a3cbf889a838518c773cadc034d70cc34ae1253afe74af8e173220"; + sha512 = "85067ec21e29bf7a055c5a089c829412a703985e0fa699579edad4f4e01a2212d5068212b93455965f469d71b99e374aeb512cbb8f83228b5bf66e392a5c26e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hsb/firefox-62.0b20.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "c0966d7b799648a279dc1e53729bb1eb740eda31cbe008623e617085ebd2c6e76fcba68ad038b6b25e9f22032ca6075a66dd3fc068de7edcc9a297ced0353793"; + sha512 = "5eacc1b187016d1d9202fc0755dc5eafded40552ceb34ba6391a15785a720bd13b01b5e451b5fa013d3047e572e460195236c6acd98c041c31e50b5f7ae1c0c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hu/firefox-62.0b20.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d324a1a87dd4ce1d39691e1f5bce35b0576abdcff72786703f9a1c336706faae885b7cf3578fd5436d3a6c5e30aea2f80276cbde72c38bfc546fbfda60ba29e6"; + sha512 = "b820778f6ede465d2047c2a8ef6e509983647fc0ce8d829ac38a269fd0c7ce9eba0c9ea6f1ff53debfe934531794e78a71c3c212a716a85c6f3cd866f832a841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hy-AM/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hy-AM/firefox-62.0b20.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "7aea87a05327f9d322931c79f39635d4b395a648af26177cbf2b4bf261d2fce0c756668f0de5ea6d3bbeb1fd51f7d4673882573a5f67ebb4406434ab42dae86a"; + sha512 = "6859c52b6a7265a14feee8c41d969d79c9e347a297dae320e6fd7ed17e8d306dbb4775df49d907003ba2c506c00ce774239cf3afddaeec78bf8d4738af555fd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ia/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ia/firefox-62.0b20.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "cb0a81af96aa96923a49ce75c5dd6ece2597c1c7741127b9727df9f403437e41da674958dc3680d60ff599bdcfe7320d3c18fabb7cf28ea1db27a321e25506b9"; + sha512 = "20fcbce5d73e2cdc53f715876d5863725cd2645025ecc468f9b5a9c73aed58676965279834c2ac3daf9fd439fff6952ed398afb356ed210221e6c4cba0803601"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/id/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/id/firefox-62.0b20.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "546a0f63b7221de9bbba1d055d9d27a220d61527957b236031a062a092d73a55dbc8699154c6cae7d24cdee4715080fc99c4d15d592a7dd6af8a1f05811199d4"; + sha512 = "b7308aec549714ddd570fc0347db65ed8692df6c9ba8a98b01f51671976232c6ab6b3deadfe952a6371b05525a49e480fa34cefae6b11a11a81e0bd8c80e8563"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/is/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/is/firefox-62.0b20.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "8ad727a32508f339880f10cfb059c7f3efdd2a195490586d59566e622f99d58a9f0e72d2975453e795a51c6087b0e400c7deac34fcd250510eb85094df08128d"; + sha512 = "1a4b499fa6a14f2556456a2aca27a636a5396d01f5be9ffd324228c2f7c1a63e200320e33852436187cb3a301a0992b4d4ce52d40dd3b62360bf1aaa572007b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/it/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/it/firefox-62.0b20.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "21d1b28d39098f9580f8573a85e50c2ad9aceee4c9183dd4a6c9ec673cdfb1411c743c44a26737a662fcf9b4acd9193ffba69016a8ad1ad8a2e85eb1723aa55a"; + sha512 = "86bcde5aa926466b1c49c3b0e1fe54b011816a08772582b35b7d35c091809c4db9b8d63630029949172709302e65b4a7ef50a8ef60dcc31fa97696b08d3e7b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ja/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ja/firefox-62.0b20.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "71bc02ba091f38f0cbeb76c14e0009152a37a6f0adbac5886918fd2b6e75d04f3be3fcfb85230cc88664199422c15041d44991d476b8d5e827e502b145751fd0"; + sha512 = "af6b46c0c452f38a66333b022191a37f25d24792bef794a34a1f3f5aeb9ec88aca4f7764e4221b4f05a7148b37214e1f8121058f30ce85ec639d56132e6f85c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ka/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ka/firefox-62.0b20.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "dde038391cacfa4acdb25b3c703cc16a98c1a6115f82907d5dc40dc9512c904772f73e8f27651ea0dccdaf703bbe1dc4fa8f8249937933ae7ddbb51d0787d9cb"; + sha512 = "3d7e18abd78e4525803ea45e7d47fd9157c1577179a449aa9224704a467afe4cea4b9c2c25117c05e91c8d4cdf096e5a3d9e478fe0b391695b535df74ad5dfa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kab/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/kab/firefox-62.0b20.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "5879b59629f09cc265a1ab6a477899538f1ddaafefe6357fbe655698096d084df9e0f0cb7c7b4387e3ba14d3997cb36744c7e9f92e8967a44124df59cf1d00d9"; + sha512 = "a8221b5079837075511af6e94a99a0bf3b30930683956ffc862966f4f3637afe11ad67ded04e98f609b885dee65c2f885daab91d4150585d0199ffc8cc5c9958"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/kk/firefox-62.0b20.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "fe41667306010fd00ad3611b4c426373617c5eb64345ca3b08d86f0a28fa2055f61c1ce3320fc5b26223b851eef19168a2f43ed2e4e00167ab937d1a1f3133fe"; + sha512 = "720813df718cb5a6a6fa464950857ca262ff6784d53c85debe1e172a992efc9d46092b55bda7a13df46ac453a4c65024c9fcb78d544ac19976afcd4169600e93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/km/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/km/firefox-62.0b20.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "5520a9cbabd270113dedda63162a21af2d284e0df6a9eb9b5b9a55d11989eb1ab72e6b0cde32245716de15e7d89ff54f26ea67b56871c4ab94de690a015c80c4"; + sha512 = "1da32f65cb39f0289f3b68ed645dc6dba1604d0cdafcfbc41ee05af0d9468b49af8f0479d1391150284b0175bcdb5c0386137850afb7f026883597662f2c69d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/kn/firefox-62.0b20.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "e9f33a0476c90be99f3e66da6f4c244496a5b20a45dd81b8294446cab71e423e8a6a77442b2af268b87b62b329525690200b54996856039cdd857e5ba4e07f84"; + sha512 = "997e6a75633829c6a981f647a550a716232f72e385bb02da03e52533a719bf702db2f4d5972237611ce0c6ea320dff071094e8b10f6bcfbf4bf17613257853d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ko/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ko/firefox-62.0b20.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "e021722d534ab811c632fd472ac1b3cc24a49865fc625476db9e142b8210dad7d9eca87aac1537b1447f38f2264b7f61ac7a780edca4929637f78587378fb66c"; + sha512 = "28bac11d194b40f94ac2e951a5a96fe05d21624d72b1210669c8cf2ca094b3c017388205072b90a8bb94207f9fd9d8beee93b61ca557837ae96a4c567704083e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lij/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/lij/firefox-62.0b20.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "c7e8e77b2a71e57d8114ea0f4aa3f9653bf5fa695091211534ec1eae3185b68c557550e8cf7a506b361310b95274e4a5f21073957af25ea4d19c8fee33b07c50"; + sha512 = "c3c3a6ae74919acad82a9c796c36bcda9c25627a173897f67f9270adfe2a6b44ce2f1c3dfe7dd76e05b9bd772df2f88b40c0d6794e4b355bea1e40b83b48688a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lt/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/lt/firefox-62.0b20.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c82b411a66b0385ec8e9708ecb9e68a3c6cccb4088d299727b639adcdc41edb740b79721025c6ff17b8e3b3f9783ad7405ffe1da3c3e844f82e640ccf076dae6"; + sha512 = "30d70a30c0140e89696e457ea799b5575e3be75ca02954c46158aac96f8b30e94180715608535c8e8c43f09506d218e253a5713463bceb03267004c5b82a6aa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lv/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/lv/firefox-62.0b20.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "a45966d7dd15c325588705d209409730ec21f828c5dd690e705a8540b58f278f4ec67d3ea17c4fa0c94f2de9765de7fff71c2fa2d3dac851f01bc5df856f6c8f"; + sha512 = "4c089810bef9c3ef475a178d9e64c379ebb2f120f336240e8d004586ddac300050dd46671ee4f3872e0e6ce84cea09438f7035685362f8f66b3c2748194fa61a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mai/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/mai/firefox-62.0b20.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "bd205990181115edb1b9134c5a7ddc7725699ade854737b8d27018b80c4d6d5d0774ae92e6d64c5bb160f85bbe8a3cff7033893dbb698adcd4bca0a189b6dd20"; + sha512 = "cfe6c4676bbf009256c3cf9e7b4533236ef48404664a27f8767a37b40046eb3f418921f9c5c4789c8db5930dfd940628e026ce1dd8ba4ca245dfdd97fd5f564b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/mk/firefox-62.0b20.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "0cf7a3617c4cc9e8fe6753b1a6eb2199b3ddc8739efac499c45f41b79f319c4cedbf8c9e522c13150a7afd622c569c66057f934ff03176ca33cd35cf51a792c4"; + sha512 = "bcfef6667c8e7a7fa8695483d8da79c2cee101c6001f24a10ae1d1558422d4f250ab1c1c55370daf5c913742e2655ab826e0302cc91117d134fd124c51b18a00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ml/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ml/firefox-62.0b20.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "a65f9f11ad6dbd82b64576a1dae5b76d30a353478932b5f8afd046764f9fb438c10d631935ede3743155ecc05612247766a1b3b603e3a9206538e68e015b6eb6"; + sha512 = "a199e177f361dacc07aebfcfa6ed5e28a07cbcafc766c7f7e86f83d42e33680d219ee79d3df3c55f0025aa3ee4ac2ef0ace1af1f83ee6ee536876aa9fa904015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/mr/firefox-62.0b20.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "3385e2cbee86b9fbb44a1cf719a3fc6dcfebcb67f8adc884bf207e887651befa00f55aad6c74e009bbd4b1e07fcf39bd299abd3ff9d1c9f44f9ab33a1f4bd129"; + sha512 = "795079bc0cb4ed0d6ff7e4dbffd9ffc5cda8f5045402a22e10689f88a63e0684d99d74d896317dbaa7cf2f1b3c2a4701bbfef3fec1b5bb8f1e132b7848064a00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ms/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ms/firefox-62.0b20.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0c3a323e1e72cc8fcfa153def5ce4b2fb90d69e16ca4e4b6472561b72d7cfddc28e8ee3f90f5b9909837330f6521cee5b1ee86329ff0db245c0ba94cbc87da9a"; + sha512 = "919828730ee86c893563673c27cc81ff99a9831bcf20f5d12b630b89306f7bcec3395c289b39d9bc41804e45c66addf8307dc6de5777f0138f397d9cf4d01048"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/my/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/my/firefox-62.0b20.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "18e7e4fabb8a42491bf083863b2979ddab9a3a914ae476b2cbb8a290179d3685164543e637bfdf905655c482634b1914903253d7ac120bb18d122d0e60ae1f85"; + sha512 = "9d0a31384a9cf43999b4edfe0904449e5c86c5f7a55f83403f5b612a3df260a24f78d8a077f27560d9c95a83680aa58fd1f0dc43b57de1f9f9eaf5d7125f1f0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nb-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/nb-NO/firefox-62.0b20.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "2f7a98b86c52b35ec5cac1b866b844474020eb0076cb5a2fab4abf6bd12ab3882a54b7b324ee3491ea173c206655aec3f854a9f0a29d934405359c56a34bc9b0"; + sha512 = "0bf6caf24367e8a86692b3bab88a740f3aeeaaaddab7c9f475daae259c6348a6b61f20b01c2d8c611aa26ed61e87fb158bae8baeddf335849ec4168531306877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ne-NP/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ne-NP/firefox-62.0b20.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "18b8472b4af585b65995b3d25e6fe290d5758a06b1cc1dfea4ed3a6512a8c250c2d3e0157a274a35677183b2e4a89d1b0970d310e8dc319ec8aa8f1c02a6b70b"; + sha512 = "9a871db32e0ffc5126536b1de4647aac0e081126ca0c7a042188eac8ae3dc80d3912377714e42f2d5d851ccca3afa995249dbf58e9a4e2203dc228aab50f84de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/nl/firefox-62.0b20.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "f62dd81c30ae0201d1f7f98804c10e8e431bf19ea3249b4a4edc71ad2103ecb63efdddd5153059837dcf4d70499bcef5b874aa69a15a391255af0d7c37a65b5c"; + sha512 = "4a5e884f833ad8d7d66050f95fbf7f856513ed6d2fa3481df3b1ad71ba78c0711412890414dd8581a080156d05ef08118fde9ef2c13717cf4af4bfb67c7312d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nn-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/nn-NO/firefox-62.0b20.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "955b9faf5f17f598c13d51d9845c4c520b5cc93c0c0433da189cfc43d177665f47f2894f77d2dcc195da7ebb16870200d49703e45eec6769624d6f4c52d85879"; + sha512 = "3f2b4e57ad161cdcf31512b0207c0c3d7ca810bf897be5d6b9fbf41f4f84898b960e61cf881f19e5ebd886bcaec95612e11aebf78d4894b6c6cb6c6c1c7651bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/oc/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/oc/firefox-62.0b20.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "6a400ceada231224f3e38d4583ab064fb6a2aaaa89b886f21eb51435ecca32c5cc0bf4c67041a3e04ff2006b1d12899679e0cd6e425e39b005ddb5ca80e4aaaf"; + sha512 = "a4747101315a61f7b2f04b58ef36540adb1ec941eeee86ccdaa515f408b15b0f300f8edd3c7e81ac6845a80aeed596b0577c35d64e626f90c981002886747604"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/or/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/or/firefox-62.0b20.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "ef19a79b8ccf2c5418009abb06131a46b7205899a71b48baac0958062f73c54fe000ccee3984c42cc2fec2ceb2aff3644ee260754af5ff40317c375e22edd9c3"; + sha512 = "93e76f3f570bf6a053551bf24fc1dd04e13e3032271122ee159d1bc72828a932c0ba45d8dd7f80d5f0638f39d5966a836276b2655e3e33d1c141dd038fbb196f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pa-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pa-IN/firefox-62.0b20.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "590785f0a3cfca1f8f7518cd6cf93398d71f1bd01e5bb6add5c79e3acb7fe8322d37b77994ac33d4ca33e19a81dce016dd0dd479fc38a7ba611d7a4d8fc30955"; + sha512 = "7fcbbd0526596f106f062cdc48ad61989074ca3357aa725df9e32254a74208f8b3604569c0ee66e1c9556fba19bc7c38958d1b779c1a2444527b92bafae0e021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pl/firefox-62.0b20.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "77d6741dc35da55b92cd3eb5ebd3a32a96cde805e53314cdd64ac0ecca6a74bbb042af6cb778d344cfe01e88ef5005c067f964609404e55d4076f1427479d629"; + sha512 = "d8e86a809ad774eb43a20f2aaeafd35f0dfc0710716a41338bbb0e75cc9a2bef5dc92e671d1912a902d484a77a5d0f578633d180718653ac421d0b744c3db567"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pt-BR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pt-BR/firefox-62.0b20.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "1aac86496779b9b6b570a7e7b0b4c8b443c4ac13e5dc548290d33dfc64ad940d6058afb7cf062d8e89baabbba5d55f285d1724322006c15476005cb0a04c163e"; + sha512 = "0b02882448b1c2c1b164ee5a8b79582e84e989aa42e03d127cde10087097db57887a31d7ffdf6960bbd29e8ab7316fad38dab61f7bca58893adac25e898f703d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pt-PT/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pt-PT/firefox-62.0b20.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3ae95a9255c6dccc8551d59b5428345a672b9c39fc08dd6e5b509ddb64ae0af197e6f1823e1bee08a2393c54c17077529a474757aa0a4bb70de3d868ca934023"; + sha512 = "82b714e304f0f358b66c2b8ec76d93aab65225c16afdeb2041e1eb6e2617e969dd7fb123158f186194a36c57a41eb9e7b25642cb60cd1ab6faa7c56f031736ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/rm/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/rm/firefox-62.0b20.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "41d5e3a61b7d8ede3c040720fd6be629f948a8fb55617a9cc6333c275c00304e990e6a0924d2eb4fc16544d855208cb2bbfa633ff829fdc37385b51492e49416"; + sha512 = "997e8d1311efce4fbe0b4ee9d76e7a9f6fb52eed6f64aa89928d62f251b38e4e7deee42312d6b06e417db7932b3990e9936f8ee2306e66d4bcc0200c747af2b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ro/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ro/firefox-62.0b20.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "bc409d8cb772d57ac8729ec61d5fb71b7df32d20ec9836cb1c2870bda85ac8f1d6263f607ab0be0e2818795969bdd4fe41b48c9fac5827b363868505867dcf87"; + sha512 = "9a658f5d770fa0192374e29b82a209895b7f684e61133d6c7f83347087d85de291f8566fa4597cede1a8f8a5bd90b491c7a87392578ade07da911ee9dc4bfc8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ru/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ru/firefox-62.0b20.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "4c2c6342a08da3991c4b6a436cc638be0f600b34e7fe02d75fbb6c10d297e693d2aee44624e6ef8543164f36b11a466f4f7c7bec709682aeb870e591523d72b8"; + sha512 = "fae3452c17b0b7b4b309e1fc57c027b1c1ea24f3722c6e15bc3907d239891cef6f3696fbb901b76811cfafe566dd94b0f16c9f9335edeaf547caaa940f57c2b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/si/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/si/firefox-62.0b20.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "6708d0ad517b3551302f0b3533b8e365a8c27489b781f375fb469e45b8e9c84df11e0ff4299154ff7e3132e233b5b64f9e41432f61a399ade7ee0409fb1c5654"; + sha512 = "a2b5133a8f8efcbc5ab1a6c36b95afcd21a89e048c3f3782760ab9608ebdcb0afa72d8eaf451579c0bca196346d4642ae96b885d084921388240eafab580a80f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sk/firefox-62.0b20.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "cfcb6141b3bc780f2bd27f9226f5b0f82d86ef9f22a15066ce57f8f156727f437b67b3f165c2b450fbf0c0492a2c9d246f2fcef417a511164ca29a4a7fbef6ff"; + sha512 = "ceec1a45af1c9e05f327acb520ba6df722e0fa416a98821350cbf71f73e2fc9ff3172edc472772441236bd66d9ba08918dbf76e864dd87c9a028eb3d274350d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sl/firefox-62.0b20.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "2df73ada8ee40a4a6f01143c4dcef7fc5b5efd486a20057e86c1036d68018651c2451e02c10ba127a110fcf8bf88f43928ed8b65958b1c7598b81973b79ef9f1"; + sha512 = "ba63d313cd3b75e341322ba40b38bf7da4b447f5e05c26a1ef6503ce8603ffc8a5c4b486d86a9061fd153f2997fc339241118344e54e75f6436dd8575bf4c191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/son/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/son/firefox-62.0b20.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "75f0025e6d7f6d63fd4e017ec68dab3de9cda824944d73319580861bc3be599d5ed6e4e81b7b4b4fb8bc8be7d530ccc52dfcfa920ca160682ea20e499a863b20"; + sha512 = "b938397f1825f9200c7dc490b59c6c649765c94a99670ca4604a0a1040bf307f259dd52235ae045ddc85fec1558dae1382858fd59a5b82c63b5a0e87a12233fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sq/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sq/firefox-62.0b20.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "763bb5692bbb818688ce3ec8ea78a9734b4de8ee29ec9ca8516c33e406913907affe211cf7146428b176c230353f0468824bef69c4f5ccff69b75ef7c302a1b1"; + sha512 = "66d7582888e7b8c6d5322955558009d15d243c5feb14cbd36a6d76e2308ed229255bf19104381e284859a85272e901a6a3185988c97a28d3b9c2ece77c36fcda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sr/firefox-62.0b20.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "eb0eeb897688fc2f2c29ddf31b76e8e67a40e620f7892bcf2379f2d28dd033070fad749d58770709f73610dbfa512331bc090ef5f4a8c561b196485e30dd27da"; + sha512 = "ad28930d33084df204283f7ea1312510f02dfe4915018e7101873cd773291275de8e8307df6f099b9f6bbb946a49fe930a65bf6ed2791a4bae3477bd44da7809"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sv-SE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sv-SE/firefox-62.0b20.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "6860fa25a9b2a1933784f0d4bf2cce6066049586a7968fcf3dcf1078f1964027fddd28c4c18842073befdfa34ef5b9a470d6ad06f014d86677e548e1b4b6de98"; + sha512 = "42a9f3612c5e2fcef7c67c04faf6279bd8d9de0144e03ea2325f2bb2b59d72dba78c69d3c3ea9768d2b7e8483c6a9676e53b6458e29ff05d215aa698d6df901b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ta/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ta/firefox-62.0b20.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "b060723474d8075a3b0dcc32387983a4fd159f7399de7a4dc606a11dadacf2b6b8af059238045fda70597c1530ba6007b7a07e065ce153a5b992965d1889a964"; + sha512 = "8e9c36dda61507c313396a70ac2959f500b761a51d2423956ec4343a79b688d8a845358f880443d123260134627ed08f280c422129c4c87196ce4111d64f7c3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/te/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/te/firefox-62.0b20.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ddb772b303412b1275dbe563b991038fb5b860a7cafe3c79ca4a85070cfd1eec1394850c6478e3e2c89353c1d90e7d99ada1b2adeb35d5b55c7b190881c1a920"; + sha512 = "1d97795b7b4e0a26f742db20de34a2551cfe9c0077560e4886e710d12fa9ed932e7bc532f66b9be9df438fdfb3d67b1a7dac481f66b778d32cb9772688048c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/th/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/th/firefox-62.0b20.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "91e4108240ee7e2573935c5db84ecc3a6d1ffce5f508f6a725e66d7d633c23f48d20797bb664a6e079e0ba6f4ad6a12abbf80a43cd51cfbc925a2b10e0ac0473"; + sha512 = "d9769f7a21189104cf53f6a837b3e30b8954b963c4d5b6751012ee1e0800de27321248a5c2d1b44bfc3fc28a2d7204659bf006b6681f8067799e94688e7777e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/tr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/tr/firefox-62.0b20.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "e4ca27faf36e60fd8db2d338d6cd2bc57c27d0c446e7e434279c8c663235b69b16dc2a957ddd0f025ec71650647459152dcc289a72b90f8b94b9e50d69ef2989"; + sha512 = "c12bd30cb85a2140c4e342e4996c8dc32c34cb14d64441901774313c3384aa1765fc9277f67bb2966f6509ed67fe5cab938eac18881f4ae003b354c381e146a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/uk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/uk/firefox-62.0b20.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bfac00d8b23fe24da516c22e2e200f68ac8057b09fb3d93969622d4c703d2a74e64f86d6a0d942c32eee4cd6fb50f1324035a6d9be9e6f8d98781eba28d582e5"; + sha512 = "5ae83fe9bc6e92d19048c6f3f4e9832d21be4ed4b648036a792f08af813e9dabfa48cb2450a3e49fd227bbf379784dd225b03a654fd54214a71ab9cfaff200b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ur/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ur/firefox-62.0b20.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "3548acbf07cd5012fb75f739f78d2b4c63f01253a06f094d0433f7b631f8e3ab33f887459afeae7f855193c5c9802ed96f862d41e937f517c6f84edead88a624"; + sha512 = "bbd4e1ee235bb61dd7380e22818f692710d2354abc7d3b895ffd750bb5ead6d3e5127088c2dd11ee38f7f8ab4f89ef710eb1c84385b4e9fb4f7342ab333dd93e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/uz/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/uz/firefox-62.0b20.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ff30ce6eae9d2e78aba595a5a8c3a6579243ec585f705f949402cbf930f7f375b2dbaa36df40e888151831d2a2feefcfd91eb698330df0c8ae67bf469e782ed2"; + sha512 = "116a7914da2659bb40fcd8e06d12fc715d78bfe17fe8409756aae1d72010780f25d6b2234ab1e13a3fe69037b682b68e2cb9ccd5c156405426a959d9d3d954e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/vi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/vi/firefox-62.0b20.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "1d052d53ebae70c01c9aff7295d20323403a067275b59e6f66980718654a3858d55271d31fb0812a22a5dbd7cc8a1db8737aab1e696f4fcc99cd9bba42cbc812"; + sha512 = "e661ae440c5e01e77110a0f5969df213d33236589c9d6a7e5be2da2e5b0efb6d67dddf9d6f209e0fb5d0ba99badadc3460f4ff61e58de1f0a2fb0fbca5c7c85a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/xh/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/xh/firefox-62.0b20.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fe0c271d4af2236ce8d2b489eedbeebe185da434d0b4080bae2ecd222bf95b4b3828860c3186cb79434ee60ffd379399b15045c8231ddd56aa5c210b8c52c856"; + sha512 = "4c4841775946ddaebefeb930cb1277a800b814a6896d46b329c6550f5e1e9d1d1ec2041e7ec192f9053775bcda81f663e196968c6b916f1e5ffa962ba2935f10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/zh-CN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/zh-CN/firefox-62.0b20.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "4ef2464fd35bb71ebe6d86d0e213e9e5d33a756ba139d38ccf903ae852dc025e5bc34727cf4a8c3a8a851634c975044b9c9f91ce64adec8cace79ae1d3e67093"; + sha512 = "d14b19d5566b7b2ff85c692091576d0e343fbb8aa2be3141693e8185ccf3e492cfde0e9eefe4aec1fc8773063438f1e65f6cb00486f7f95090df726563375ca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/zh-TW/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/zh-TW/firefox-62.0b20.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "da7d14a85785ec5ff6fc01bf6c18b7468aee74d5cae30f11515588ad403a3cd571890843f4a11beab08577eaf78ae3af6bfd757cdfa628c36aa95feaea6e5a5e"; + sha512 = "71c96ebbb527ad8a83be94bc718d2eb928b78420335170e9f2dbdd3ed9de50b6229f27ce1d11131f4f35d931a95836c65b3a74c200f4c8f247df93027b6c6126"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 3a6dd626ac69ed544bd926f5c6afbe3a553c1846..1fbcb3d9714319f8c9ddd709a3df0cec46bd0e2c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -5,15 +5,13 @@ , curl , cups , dbus-glib -, dbus_libs +, dbus , fontconfig , freetype , gconf , gdk_pixbuf , glib , glibc -, gst-plugins-base -, gstreamer , gtk2 , gtk3 , kerberos @@ -21,15 +19,18 @@ , libXScrnSaver , libxcb , libXcomposite +, libXcursor , libXdamage , libXext , libXfixes +, libXi , libXinerama , libXrender , libXt , libcanberra-gtk2 , libgnome , libgnomeui +, libnotify , defaultIconTheme , libGLU_combined , nspr @@ -46,10 +47,9 @@ , gnused , gnugrep , gnupg +, ffmpeg }: -assert stdenv.isLinux; - let inherit (generated) version sources; @@ -93,31 +93,32 @@ stdenv.mkDerivation { curl cups dbus-glib - dbus_libs + dbus fontconfig freetype gconf gdk_pixbuf glib glibc - gst-plugins-base - gstreamer gtk2 gtk3 kerberos libX11 libXScrnSaver libXcomposite + libXcursor libxcb libXdamage libXext libXfixes + libXi libXinerama libXrender libXt libcanberra-gtk2 libgnome libgnomeui + libnotify libGLU_combined nspr nss @@ -126,6 +127,7 @@ stdenv.mkDerivation { libpulseaudio (lib.getDev libpulseaudio) systemd + ffmpeg ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; @@ -172,8 +174,11 @@ stdenv.mkDerivation { gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped") ''; + passthru.execdir = "/bin"; passthru.ffmpegSupport = true; passthru.gssSupport = true; + # update with: + # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; baseUrl = diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index bf7e7cfe9d3f8e5d34017dbeccd7c2df46b8bf55..c0ba8e5e822becac1d0ab7c28cb1b028c5e9fef9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,995 @@ { - version = "60.0b8"; + version = "62.0b20"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ach/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ach/firefox-62.0b20.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "3cfc027c422936911f669825d03be090788fb94a33e0e67b2b7d58aed52b719eab4ff1a7e19ac368543a4b662766a41062971b9a5fb5588b76029fd8a78dcb1b"; + sha512 = "47f6ffba22960f16caa981e72d58c28f5308581c0740c15a6e2107431761e90f6751fbffbf79f2a03efbe7edc3e9f7078835d60a79de603aac1f06b09b0eee5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/af/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/af/firefox-62.0b20.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "a8d96e9d9529b4c068371cda82219bb334d54e069b3e63caa6de4054cf917eea2aec9e8767d64999ce72323ced179477e07791ec8bb23d8231fe268f92c72042"; + sha512 = "a7b1e73f5f6de78b73654a153a34648fc6c65559f7489b6fcb88f763f8aaa6ea0238dcf71a19f3f97c72c4cf16a919fd1b47bf4dfeab0cbc96db8b22ee4cb932"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/an/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/an/firefox-62.0b20.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "18b5d0188d6ddd22c2de16c02a3b3f8eeffc25cee1c1afcb2bc9f80c722bca7c15f9561c9215e65a5390b45989c235f5720cfdf01005d7ef7e1ab1119a7ee294"; + sha512 = "626b63a3a550c92e6b8c8df8db925c3b0790cc835e7f76274bd8b2a12179d300fb2659fc47d394c8868c89f2291fdd7c865b034464a84fa454825d84e53f1fd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ar/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ar/firefox-62.0b20.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "8f8c83b0f4f0031dad8d3fef2db67ed7ee19e794a7c20525dd91f5024cbc1b7d1b0c9c847173b2aa187050b8bbf68f537b7ef91ad7bdf557759a3ecb4ae7a98f"; + sha512 = "14385896811e1b6e53d204caa9a3b8e56758c494376cf87309a25c4af795b34a906b959963fb96926143bc5bcd8c658e3558c5083642150fdfa3501feed67392"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/as/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/as/firefox-62.0b20.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "866bc322de99f428e09ce5cafa26dadf77117ead452a527fcaa536da749e9eeda0a82f4d1c5e1aceb202fe931a79fc99d2512acc643a88638c5f37c48e19454f"; + sha512 = "859413e14cdc432fb92e02d94212dea896c28a26d86972501aed1fee38610917ae70a0d2f749f4ef1432d543819f1b403d85ac3ba6563639bb1a6e6bbfb75978"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ast/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ast/firefox-62.0b20.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "e91d908997d5924be2f5f7e7afd30a1e5d16d2227ea066a3136a12976fca7fcc89989160a3249ba47145518b53c4285cc7a9d39440cf8953c1729179efc1c690"; + sha512 = "139a2995639bc2fc6331f47cf1fc5d5e1df2c4f7c1d582c125c5320a54fa20f58bc0d8fcf94ef07eccb32cce6839b6e8ddc8044c2166242dddc40e861954df37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/az/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/az/firefox-62.0b20.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2dbb8d8df8177b4f4f7c69d321817b3ffb4f4430fd8e8250c2cc3678d758c01d9568873270b7aef2368145b6f5ffb0e358ed6c74864c9b883b6c04e11709fff5"; + sha512 = "b7785f29b4b6dd0dfbd325e6c51c9ea66f6fc34a6151a991506863f9169d4051af6847dbeabe4db04a7db70049b0b964ce9038c363749c3c728144037d7ae821"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/be/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/be/firefox-62.0b20.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "6728628f6b71a6d495b49dd32472a64ddb3c41e2d9e2923cd033a37f19d1149ba5d3594598209ff5b59f0aaf6b0c2fcfd4313fcf34c9ddf3d5b6bda034dcb6c8"; + sha512 = "f246128a4473237afd5881eb088d334b086d2c49c79eeb051f9365f0f0bb5eefec7d0e06a67ad1d3771d81a3bffa7a665d270242155cad5b099b9d5890b7d71e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bg/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bg/firefox-62.0b20.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "1b71d585449f3da51da9c9934c9f5bf15b618bfd6a80e5054137c15c16b245eddcd50458cff69fb70ba2ac050b7fb6f316825bbb49e2ed640d63055a4b80f145"; + sha512 = "262eae9674709dba572674214ba2626c6e36b372c99ef8f278b1edd900c0a75854fce26f3cff80b669e56cb70b592d92b070582cb82ff47526c956d45f2f1936"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bn-BD/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bn-BD/firefox-62.0b20.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "a84a384debb371c3cd7b4c4a30cd66f69cccd658c089c10339c0fc7c0b0badbe8600f18451bec4352cde253ba7c4cc9566def047d7df9551214dfe88d0965ef0"; + sha512 = "69f03e13c99f621bd83061bf1cc8ddf9e761e05eb5a11c35e8a1e4a7d82cf258fa32292dde088ef5c383320ee59a05da8e46ddce6e6283aad3463a7ebfe68394"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bn-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bn-IN/firefox-62.0b20.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "b2f2c879b067d752c69a841c40b319db0d36a2805d441ee832246da199a0099cd359c0e925996c152d67e7d5f733ddcc776a393d86090c455f4c5cdfe79752da"; + sha512 = "1fc385ea3e38dee112329e72b7397c031b4bff02bd1e3e863d673f96c98366115d2112ee5364da93a34ce3de631e81b156e0f51895f64c1fe84bcf3724b744c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/br/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/br/firefox-62.0b20.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "db7d9c6e991b3be123f80e62f5b1f9107ae537f3a298d65f910c71397183129a4527e324f75273605a5b945516ac5d2bcde05a3fa3de9748fb880bf0582d4e74"; + sha512 = "45ee27e4889203ac4b6267388e5dc9a557713e044c5ede07dfe039358ddd9c91c4b79f5205f3b9c0f5c770232ac4ad16aa87c26d4a436a5f4e58f44c861649c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bs/firefox-62.0b20.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "df4dbb35c37726af2d5fa1dbcabd8d926f171896b5dda453a07989cede18f58705617e67f9b0702623ee4cbfe570cb81fd5cd9b93a050d2b75e28843fa5a81ae"; + sha512 = "a190925733374f1abd35c974b2bf4ff091d208c274ae59f04f6efe2cd904e607829212d23efec2f6ed1c297b1ee8eedb797b460b815800f18b4a3969589b33c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ca/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ca/firefox-62.0b20.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "2386672d892863c4d1ad4a063270125703aeeb2f2afa8bc09cd6d813088c9c80f5837096207c8a662d28025f9c457903f036f79aca3fc3b7ba97660ae861f1b9"; + sha512 = "35fd9322687c3a7bd4163f5b6493bf4385b4a08c8060ae4be47b9d1aef18b7847977d32bc67579f7543549cb803a1a3a06d655c9e02e9203860316c9364bb26b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cak/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/cak/firefox-62.0b20.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "6f6d1604cd1060a5efa633cb09ef8525369245ef753fa7894f17299d0df2b3bd62c7d2ac8cacb93cf93961dbbf9b240a43d47a0c73cbcc7ea09a2cea2b86755a"; + sha512 = "ec3e12bc71fa7976dc4ed73eca01b4e38c3e4c69d257ed2a51c913ab1c7f24e14b1ab0cd6da90c76d432f2efda02c350f752293c41d62ca4fdac74ed7f94b179"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/cs/firefox-62.0b20.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "5b8dd67086cfa08fb76b066e2c10be109e0a4eddeb5e4579aa9366dff50642f5e56f6aec37f9aa21299fab0ae7005ae0e6ab4db05e079870e2f4620a4d96c54b"; + sha512 = "73af384a8a5f0efd33954e6dcd4cf1043dd7fd4accca1aaa93f58bd3742488e01ed4c4911694c21f45cfd4d2b4e1b213d7d18b233360a1eafbdc14e63cf8d515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cy/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/cy/firefox-62.0b20.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "31347a1cb6fa703ccbf444830fa88f8535a2717da85fee09f6a544ee8aba1aaea093f4ab1368f0dc4fd7b0dcc3570bbd60bf8855de06a8725d2ee1b345242bad"; + sha512 = "07c8c875b8c3b8b613d4405de0cbbbaa5b1a3808e754e6135bd2ed368f674bec3033e5cc069dee811cb4b57ba884437a1607c9d1c0277b2d8aae6904b0dca007"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/da/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/da/firefox-62.0b20.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "20785e095d45c22ebab25f4a2fc224aa6e4a4b7c86db1e94a304c41598cba74ce1d1200effd78bd185e5bc90a11bb66f223e28c0cc65d6663229bb724ad1c791"; + sha512 = "7c65fa62a1f0fd65da54f8ddbd33b4df1f375a567c7c5daed49d28be1ce738c9fa7689fc7302ed3ac865db53aee7a287702936a9db623815febb20b7c04a627d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/de/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/de/firefox-62.0b20.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "e070625687172f84d1d5d82ec2ef385291a60c2bf011a4a075892413ded629ac16b7688d2ccc698ace07cde309e782a1b7b16707bc42d2b47ef9394a0deb6872"; + sha512 = "0fa1128a70b4658a7a32cdb0002ecd069486192b2fec14664da94333627028e08d9d942d1d04a14c672210da3612170d7122dd91744c18e41cc0a67f5e333071"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/dsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/dsb/firefox-62.0b20.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "38df16c7aa84fe2cfbff1e19e702b2c1ea4e2c5f1523cd3094144685fa1d5d561e00270881d0a113b14e926f540b25ceeb1562ecf4876cc35cd93fb794de448c"; + sha512 = "4b79c34b4a56033a885837a74c9a7bd10a6117f7f184a0b9b0801300ccda5cebe94b7f19eebbf17cd12c86406df2485340cfc30fbd1dbcd7e1ba7ec6c62b567f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/el/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/el/firefox-62.0b20.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "e9846b81293eef5d593eb5175d9d73b7a42de7316c23251d94015da0554ec15981932fcbade6a5fcd726f6a89c6db461564f7ab9351342b9c4d8d915eb768219"; + sha512 = "16695437f4a137f57c2ddd5b88cc0148737a419dedf09e16e0395a4595490bf4021f7c37726beda11b8144cc9b8ea194e82bfac379198f59b2f0e4097093fbd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-GB/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-CA/firefox-62.0b20.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha512 = "6ce532e57b68579117c41299fd0dfc08ddd5dc4ed963d4a70260d801e4a07553199d87cdbe5f2742d09153b18fdd5c1b06948a990e1793a32ec718e46a62f281"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-GB/firefox-62.0b20.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "53cc5276c35d94f263cdb4ee4a92dbbd356eeff382c2a69dba006f6b5a3ce022c528b4e6102374b97c618e70ef7ad692b1799f6ee3987b26378b742c18145cac"; + sha512 = "f830812530c75a6d916196c445f494c77bea33419abda526abdeb534c533553387e156a43c749bfa3425f1233235f96b174abb7fc2bfca75956325816a7714a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-US/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-US/firefox-62.0b20.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "2b0e15a85f5d9a7fe6e8ac198c86d3746d880f96ec13f8e78d69d4618d86e73f76e64bc8dca214a73f2ed95a12ba674f57c697e54f0b869760129176dfae14fa"; + sha512 = "ba546c700ca987f07d05eb363e81c1a30ff31873643898f54a6dbe76647071dae4e0a189069066ad854383b39460f273358b2aac1d9c6b627eb89de089ca7bbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-ZA/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-ZA/firefox-62.0b20.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "c751b4ec0567c5fdcf3b8660ab7bf100366b9c819f78c957c79f217a0e7658d1a7c4bd141baced6e7ba36596a8c07c89b825ade20becf380249d90e0517e1096"; + sha512 = "ef5e08dc45f8f111a22753e52baa0c91991fe363ea774df0617afabf6805aae2d508d3d9c29afb0d30e8e81661ca283115b71155b5fac725fe85134813b06a2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/eo/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/eo/firefox-62.0b20.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d556386436ad4c226f0986500de244a2efc5cf57ac8d792f328616deabb5884cbd3127d0530add7f7a9dc5c2ac61512456abecd6b1cb8c84c74b2d2bf18d9113"; + sha512 = "7bc3e96d300ea64f6e871b04e980aee436451df9995c562fde3592c829b9f3824e534793d506bded7b7f82e7c6367ed4e09010d3b1bb845d5d3e0801230a7e6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-AR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-AR/firefox-62.0b20.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "1fdfea27dd45fbec3727804c49c8db28e624e8240a8589d28621b4f03ca12d184395632db2f629032eebbcd6f0d0f514eb3944d60c2b54bef3c187e06b9add92"; + sha512 = "39a25d45317f7783b9f960c59435ac2c846142a272020dea9ad5c46a91dac8c4621b2d8b400b23d15bcc58673a1df9ec1129fc68fb06c39368a670705ce125fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-CL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-CL/firefox-62.0b20.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "fc171dc5fad703344d0ec1a9d1800650d0469b1d4f10533e102031c776aaf14d5df7b9375a73583112b9bbd1d1e7df267873da0cb3e7937f5473b2d4652f19d5"; + sha512 = "fd2229ef1d2f64f2f602b15894322163cc4067a72d580c13eb8ac6113dbce4a2eb5e4a17a833ee13ac68e30bfefa24fe83739d7c820b48232af841b24e9c0c97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-ES/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-ES/firefox-62.0b20.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "7d8f9c31417bb03d02278c5567eff23d07cc2d9de93a5874938db0108c8c0eca0c0e3f924eb8d9887b14d7c058bf4b4fbe1aee1925f0a150212e76e11a0b587c"; + sha512 = "c65a840ff3e3b5be0a3c74ba82f17d2a65f3071d91e71cfaa634bfdc92531fdbc7f6865aa8e3621d94eea626c4483736705ef7363907dccc3d7ee2ea643ff629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-MX/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-MX/firefox-62.0b20.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "95b43192a707943cda58d98fba2bbb96b745d6997932113c1807f12de7fe3fe165c9dff7c000dafdf21192b24eaa42c874f068e3cef6a2e7c6cabb8f0e1fcc32"; + sha512 = "8a964e8832a9fecb6124cb1453ebccb0b8064a6d9306a92a6646fccf8ca23a058e3e2d99d3e3e10bce4de9f2f75bd32ad94f3486d1cf9597c2bc93ed70ef4c9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/et/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/et/firefox-62.0b20.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "3e379c3389fe3a1a97dd3d6ad39abca49273e6e36bfcc9b5b6b2eda948529bf6e744fb9550b89edce2d9ea9145a2c7a0a5d9466f2975d4c2193696871b32ec58"; + sha512 = "13c7521af9e6ff3b6c1058c93ae84c3fa7e46482938a90f5aa489b3db99a87a6d25143d244c8c0e493a22e84cfbe831f5438f1537f78699a90aea476bba221a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/eu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/eu/firefox-62.0b20.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a1b6197535661193818b0ece5d28112073fa03824aa4bf4de999b554acf751da7117b073c875c7b2265b05af0bbbba7307b59c0f4ea02258e7ed438bc6e0bfaa"; + sha512 = "b28e45e45a91c732db3fbef5ac249ecf6b6880d3f25d3151e9e0981556eefd4e98bb27b2312b9d4b0ec50e63ee8176401ceb6dbe36046b7ffb3ac80c3e09aa32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fa/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fa/firefox-62.0b20.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "28927abe6b2e33868c37473378b5915ca325ab26e87b6c83566cf9a6974eef28a1ff1a800c164d2d79d613ab1482c0e563597aba20de2179b8645e8dfc5b40d0"; + sha512 = "abde704eee0fdafa637ed4ac52f605c81cb6f4a4563ed4cd2cbbb7af31b40148ebb3614ffb6b3312f19eb05b026833f32485006e79ad577f4f1de3fa6ea83398"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ff/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ff/firefox-62.0b20.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "07e3f102f8324d3b613c972651b80f83575129a3d23fddea3d02d3880bb66d3697c1d7c9cb47fb2b8dfb24acb4bf9029080675a5295d3ea1d2f7b31114ce4d13"; + sha512 = "2a16ba87e145740d055df33201510cb33ff2dbd6faaa30b894f71b960ab5daf7a24f1c3ecfcb984a5e20d525a70c2e72f4ccbf32ceb66c7879c8a238f5618a82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fi/firefox-62.0b20.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "90bfbe9cd103b981413d57f74d416098ee1bb284e871bc40676fd8f8240a7fea891b4d68a079c1d23d2c62e6f84dbeddc884b4ba31e446dc59fcc4d1b3422469"; + sha512 = "06aafd066c312ec6d8163cb5cc773c0622432424516e70b84716c662e36ab68a2e4923b0a5ebd184a3ec50bc2db27a3eb98dce2a3d6046a929e1c499303b55e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fr/firefox-62.0b20.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "a71571118b26ffb823da9723a6c84a2f10c04c4f52b0a5aa9dc6832ca008071bca761adc71b67959fad643711f1ff859b7e1093b5df8a6f26fb03b01de8c234c"; + sha512 = "044c2ec838104a7abdce0a9f4dbf3cdc0238505fb15ed7de36f197863afb606e4f1749df31bc1d2777acb7df874a8a1d4900b29a51877c53c5174608c330ed1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fy-NL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fy-NL/firefox-62.0b20.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "371d1292c4b9fb561bddfbda150eafe227f9c0c6525f5b9bc4ecb178c2768c2e837ae6f213cbf0dd4f64e16d51e56fbb0775d4df1b019587d5bb51428f21fe22"; + sha512 = "3023d86731d6a2174a638e3f20c4922447eb904e7b6350664eb6402724841197d19e1755c514710a46bf60b27ce107fd9f41bcff894a86918ab6bc3451f88e98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ga-IE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ga-IE/firefox-62.0b20.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "2477da8f55c599acfd8091a420885f795841f55bb7a0b399c2dfa51db860d9ef03626cf62c6ed99c7c89d7549d1d0b5053c44580894d0c896169fc23dd2568e0"; + sha512 = "a901fd3e728500244de17055d7c9c543ce0899d3c8d0e6b0b16436d45c3a66db43c2b59368d23a1ad3681b365e07cb47e9414124cfcefa98251533e75789b7e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gd/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gd/firefox-62.0b20.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "b9849c5d545c40bdcb7bae8d5e3447894a7637d59b1b413f7a42f9fbfe3509a45afb03b20bbee3ce1a625a08404f903a1b79bde183f51b043326d560794e501b"; + sha512 = "d96c4f74fc2c76e1012b98a75bfd70c17fd22966c6d4e2ca0174fdfbeaeb5500f55637df7851d23b34b4e1330fd010bff0da0ede28029a3fc92714bb14eeb30e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gl/firefox-62.0b20.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f5c014f18422c09f96d63efbd1dd3cd5e880ee5f4c1cb6a2a0eaf939a755a952ace065237b74ed8c4e70508062f69ec545d24aa55b21416cbdc449e840e8bdb9"; + sha512 = "6f20c7966d71bda681412b3c9e3a782e3a6fe71e096759b8fcaf443f7671a94565de0fa8222fa8b2c430a1fbc28146567f47523e96e23a94c6ded0022d8b04e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gn/firefox-62.0b20.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "e35e1d007c0f1371fa4e95ea6498a87949f9f0fde93dbc960f44ad14fb8f2d4587a08fd456bd6898ba864153344a2ac8093f45264d7305a5db88fc920a8e79db"; + sha512 = "bb5e2c63b2a48c3ec8746997a57d88b9a7f001e2b9b9f3c3e4d2913935cbe34931d9426d528d6336dc60ede140afb24487ecd3c93547113455e28928336169f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gu-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gu-IN/firefox-62.0b20.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "cc8740fd82ca6cb4aff2a5bb2bcc02d6d3457cf7f10c619b087c94d278f79a80da26a7f5f5a995fd77915c95789e1d263feec9bf1b52a9e511835565861e0bdd"; + sha512 = "8139f6f236b5ac5d082c2c01f3e7950d312e6e241f2a1bc29e22a71238056546dba1ae7d5dab494662d82ac53b7617ab1dfb50375cf77eb565cadb3f4b074280"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/he/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/he/firefox-62.0b20.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7547c1099276b4683012cf286482f37af3d8e3c0afa6f95aff2e2030b7ef81c5accb4116ea178134c916f9ff09cf9aebee30c0a698c8f88cdac6f91af64ee66c"; + sha512 = "a311fb555c096a5c69c174da176881d390dc187147c46722bb3ef073e4bac236e36e307c22d856036bf52bf87bddfd02ebf3f90dc3cb9b7c707ecf13fa27e251"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hi-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hi-IN/firefox-62.0b20.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "ff3db0fa7c76764d836b94b7a8e7028a2c3f39c6a3340e90cd1396564bcbf9540b9adb9b235206146c3fde2b8845968817e5eb34095aa5d27cf5ce7cff885504"; + sha512 = "56758751511dbf42d04a772a6567fe436030d4a272123fa8da8aaa7e8ed26f06bea6a32b35cc195674eb93be9f7b46b280e140dbe906292dd346912b433a2867"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hr/firefox-62.0b20.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c13fde2cc3d39d87203239e442feeeb9caa7a0fa03fa1b98f7c49eddf79ed60b88fcd4ceaf5a3d70fd48b64270ee770bc03bf0bc4fbda15fa72090d0e0b3ce03"; + sha512 = "da29589e3f62f2e2d4441059393e84f79cf973179db7bda8ca9e632d6c0e2d83e30a32f93f02fde21fa74a4899d89afd4871cd1d3341b2b8ddbde8a10743f755"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hsb/firefox-62.0b20.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "e688ecdbcbdab4a821ca17aaae031874c454b8e78cda40ab8d2ac8258a71730c656c6ea5e8542fe3bba975f8203c63bbc82a45f47a4af4da606a446a5a9c0d75"; + sha512 = "9846523a1d026b04ecebcee3534bc17093ae8ab891e7090b45c397355506d41da1261e69073d7b1a9e228be0909bacd8f6aaeb877f23aba0d2c84ed8303c9aa0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hu/firefox-62.0b20.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "72d6977d4709f04b282301b6f1b803e924f1b1f1b6488b871206cb323457c9cfc01d0a683dc24b3cb16b26d160271d4f234e5f8308f01cb7c8183059e3036415"; + sha512 = "1966565f1cb52a30aa941a28db6da2dd6232e8eda91d1f54d996da884dfe46b172a85606c3c33b8c5160667719d30fe710e9620b5332421742072debdd56e410"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hy-AM/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hy-AM/firefox-62.0b20.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "380bb6c5e7dba01547fc64e10e20234e571ea1aab0dff8ef8fba971a25038ea99694e235269321b38b346872314d64bc31529aae8623cd21c934dfdf82f2f87f"; + sha512 = "367d11c62740213ad5161e708dd7a2cb3396a1f09e9e8b9426cc25ae3b32d70dc3ccf70b50542503818d50e62fbbe1f373f1328779f2be0d2ddfb143288187f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ia/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ia/firefox-62.0b20.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "12cbea767896b7e20b0c717666b87d7de9f6f818c4f35920d5a0eaf847fc6fd29911d1e8f3cd8bced453e38493359f4e3e644d9c1d92e91285caf9e9b8e75cdd"; + sha512 = "6a0eaca21a2d110a12ac3e5ad8a453d8b07b122335da4ed7f33e5e20ccab69f01eb1b7365136de20aca83b670ecbd6b44dc3a750809cebdc2c9d9c76c9c55613"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/id/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/id/firefox-62.0b20.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3be7d341d036d4899dccaa6a92fdf117a46a441b4eb481b65f8a94e32b15f5d98662a4bd5ac0c45985142027af811cfa0bed9ea1d7d1ec45439df5b9b6210be2"; + sha512 = "d821c322c2f40fa726692d54d393a29569f38f66cdc0c9991d4800f7d2fc9366e9cff0123a47259274681b0a67b01501ae0dbaf9c7f96207170b92cdb91fe77d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/is/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/is/firefox-62.0b20.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "67f9ae05aef3eb743559401bfe1abe662f748ac11f788fe1407b9d77f6fc2974e8e4ca9e107d2b9500e01283f07a06d35dcd7a1a7223c92e09aa38022e077b88"; + sha512 = "d5b2ab8bddac3fb0dc3351cd130c77249e4f5ca79815c96b41cce075298a181be79b27a1ea09bac48b79d8d35ddc710f3d7382ec036effafd974f17c7e44bd10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/it/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/it/firefox-62.0b20.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e529d48adce27340bafa07dfd7da2b6eef3559ba2caf2be59fc953028b48c3ead9974632ceaa1ae1a3c6983d2bd7a0b3beb094e8aa0cb5bb28a9e4166a8c50b4"; + sha512 = "aba0b87b3605077cbb7362c2dd23514f8a31a61a69d7a054753e2e89b5388541fa7d356a13e7fb3d21540381d5b244645d305c88932854ff91e45acc75bbfaca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ja/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ja/firefox-62.0b20.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "35fbee4fe54f18627a647a610b178a5387428375ce743c8c91caf24ebcd37062183dd8d64b090925343e77530a0dd3a384ed5e4b2f8bccf9eba2815213721a46"; + sha512 = "ec5377009d64d2e2d625ba9f364e456c4a6d576cec8633164a3ea21a73cc643c31f74a27a64aa8cc9b2ec6313b6a5e25a78612566a11ad5833308eb69e5c4a2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ka/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ka/firefox-62.0b20.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "5298adaa040804ae5311da123475f746beb2890406c47d0a15d530ad1754f78fd695c0355b3709e7416537dc1965ea8d714feb12865d183788f0962104a169e7"; + sha512 = "7362eadc3fc6cb0ab78948474570641a8f78a6d311a8035211e08dcdef9d035177eb25f679d4ffa9b6411ae4e2a3fd389814b0ea724e05320762539761cf1cae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kab/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/kab/firefox-62.0b20.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "0729b8a96b8cb56b2e57fe29355792b70ba253aa1bcc34e13aa6f8c1e63358c9b315c2193c3f72ed40f47544c14f2f05768a293270bd07a2b735af9bb000ab5e"; + sha512 = "b45027c2fe7eeefe582868ff307330e9691c9796a3fc792967399edce5d5cfc9387ca6e50c1d623743eff3350476eb2db7588eecaa00407a69fd5c5ec2aa3e81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/kk/firefox-62.0b20.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "4df76c0efd75cb75da4756add7a95dfba2a8a2834c90639687e4a963072e30d22dfeb4e9f5cfd4ea471bf97926844e561a2043423957baa1d60a64b9f1d152ec"; + sha512 = "f2f79ea3415f8f9db46d7a4c86be44e5d055133f0eeb2231c8f15171aa27133aeb7d7aca5e475af839e68cb09218ca96e0176b19111589ae643353fa7bb08b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/km/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/km/firefox-62.0b20.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "7d44c52fd2b384a6212e3a5ad11ab1523d0689a61562b05fcbfd7578e47fa39368bc1fd605bc6f4a27a382f4a62bb5301a103a5cdee7e5f8353596e80edf3723"; + sha512 = "fc573a0131b6e0ceb6e7d49347178aebcd902b61f870c8855e08eb7f4da29bacc9a22edaf612e4c00287415bcc18a8a8d5577e08ec324a68440f8f224819ae93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/kn/firefox-62.0b20.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "953f22af390aeb1f13a10a47003f0f97051e83d3cd0a8f30fc9e3f7e99b82519da6ce0afdfae5f89e88b6bd017af858010aab624e1de8ab39ff9787b9d804dc3"; + sha512 = "1fdb48b0e5a270182e337efb03819fec21f55f9542fbf6f9607d6b4f205742017d63531555244ab89b8171e141e600b6209508eb1b619062ea43c01719c28aa8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ko/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ko/firefox-62.0b20.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "4cde6ff0a032c6c222e2f36e33398d6acf72b0e944d9d9b6c75c34893082fe3847ac87e837848b3866e55819fed1f41c0a1807ea2c2dcd264f793df9548a5ec0"; + sha512 = "6d101bb20570c5ec2229079982070da0338fb4b77694f3a6e75e0336cd645ec95eb085b9d0223e43ea14561c269b1c58d382a0128e4149bb6a04ad640d159845"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lij/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/lij/firefox-62.0b20.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d6ffcad6fdfdaadef0b8225f30d9d0a80e7f918d6b2ff6468f4e460643034286cd561dd63391f79c3b32222d783c09842fe4979c6d94dfce4ebab41fcc6580be"; + sha512 = "970a52aef535b3ae87f295c3326d0217edef7c5e19fd8f155fac71d86b9eaa0c18c9f8f393ea4dae5811a6801caa38ba03cb432e690fc19d5ee559f576098540"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lt/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/lt/firefox-62.0b20.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "8814f08d6d26a05e7f003280a0272886a44fcf3b88da93d0088f0d2a9e517c34c264229ad8ccea8efdf15247631e3cd28f82b589afc4d2d3973127e1227c6c67"; + sha512 = "a9acdc7f4a94118f115d9cafcda0960adb82fef5fdbfb7916ae785cea3b541057052a027b0831bcedef43014a088b6ad3d3570bbcb467cb62411513f877a91f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lv/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/lv/firefox-62.0b20.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "b80fdf0b0ac0f8decc7e4329a23f8ee1005aecc70f7d0d8a000eade3d406221ffff8015beb99c77403f903487ec71870dafa92003aca86f5b0cfdd8ee1f297eb"; + sha512 = "47d690d3e12c718d67877d4f37951a31114f6a3fe7bf49b0813ca0acc5d3c5c8f60b6c0b572e0e7e7e77c3d9e68f8d2f28d407ea62bf1976350ec4e05f05aeae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mai/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/mai/firefox-62.0b20.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "63b69aae0a219ad993e557d7125cf91ccbe8a19310a17a09536d5c2a80e7f3292e3aace28342a4b8eb73042ac2ce5d728af5a745416b4b6401d29fae95c7f9ed"; + sha512 = "1fbbf72a08f98df105b47c21c07ad98270e9b4bca21bc5d9a940780db040c3d51b7531dd00aedfc8f7c946359749a5718f40744695086c25f9ba0d6641ca26b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/mk/firefox-62.0b20.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "18ddb3ff53baf7efd11ccb432d87dcb7a89260c080f29691785bd44999a43e8f9fed99b636b26bd21e557921b82ad9e69d729c498bfcb45077adcfedcc3208fa"; + sha512 = "64047802b567ad586cd3dac1a444f5fd510f9bf06a883cdd60d3bac9dee4fac12cced932d927b39fd579d60a256dd4a7c2cc52561edf477eb2d48f29a111f159"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ml/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ml/firefox-62.0b20.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "2164dc4beed74c24bd3015d9d294ff0361bd5912728fb64854ce5146188414d4e8402d4ba88ac20944e499e24be103853b4820433a99d6aa8e4e48bed5b3abcc"; + sha512 = "f98cf7854193dba3ea520eaf0e2c0c0f60f4965b3aa5d1ad442dae5aeb518d334ccf0edbefe9c4c1dfe2f7372188d64d17ba7cfdf41d7a1d715318a4aacf51d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/mr/firefox-62.0b20.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "476e3031b7a850cd52f2f20ec712b1fd0f4f55dc74ac10985c5957ab74b303b1eb4cb00ed1303a820ad4a6cea1729d282794e9b8f6b425280a05b413d86f8975"; + sha512 = "abb1425003da6faea70157e01c733a757c8a46b1a22304f86ea93a84ad3fd5777754e44873b70668ff2baaaf0402631e5b9272bb0a0711c6c03fb46a3ac2b607"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ms/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ms/firefox-62.0b20.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "25d07f7f5013a1bd7de9bf977a1b16d193446e0003000362073d26f982139ff8bf0d17990173e77b40a808f845fd590543b7ef1de5a41d3bacc9491438d4aa36"; + sha512 = "a96e18eef12d7067d4808e0b680773b192017dad2c95798c541ab2b97cb94990e010b227982b6bd83ea595ea5ee33fcb644fcce995131a5d7a46c880e27aa9ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/my/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/my/firefox-62.0b20.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "131dc61a6c8a07c593e304cb5c1c887794a597a3ed98ccee1188081da0002bb2ea29a946b12fce1ac7287c5df74864bd881e9f99c2c485b2fbf7684196489248"; + sha512 = "53e6e08640443f40285f372b53cfb9dbd3c44757693a2a575479f71333951c5dcf9ef5f8b948fe493c40ad789233a17e89efe2d91a132b414e7809635a78311a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nb-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/nb-NO/firefox-62.0b20.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "115698e54318f4107c565337c266109925310d79cfd2f1908fd5a6114128ffe827e8e81db630665907a942300664af2ece8cb6888be80f009d6fc2d8d065cdd3"; + sha512 = "fb3883a509ce36e8d24a0f0fc7aa9774c2ecad35d66d37f093cc20af8efa8516a8ff75c5f8fc410cc4c3e616757ff7136869b218735ecc7ea9ea20265331f491"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ne-NP/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ne-NP/firefox-62.0b20.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b89572ed1e0620ec29a762e49394ebaebc98ec964a9d98e8896927eda35155403883e734880ffed51d13405641c569085824ec36356cb2c3e8d57090b5f0301a"; + sha512 = "f12033fa6a5c2b18c2ceb96ca22cee6dd7842223c7baac09d235c8bbb75e638d38c6160750ae9a0cb9e5ecf04301c9da873dcea1891b436fea9ba0d9466faba3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/nl/firefox-62.0b20.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "4a62b79d27361b324269488d1dceb4405f469d8e9a5f4764cf46a2ca31561d759e3f63ba5c23b21b45a43e07181aabd06f01aa699b04b9d1b75f0ca338e161c1"; + sha512 = "37126248ec02b357837f22909b6dbcfa7979ca3b3907e339558d8f213f92c5a7c8b89a4e9d7d069a99dd494fbc41c52bf66a4b8c2910f48eced058098927c6c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nn-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/nn-NO/firefox-62.0b20.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "d8407d6930a11e73e1338e13f980f7575df5233dccd633625175c21387c5c697c5ad3fca95db99d52b50248b257586145fac8d57ddcab8d4bb7dc97dd7dc6dbb"; + sha512 = "746da9da5138c7c9d0c0252aa4a679a3d8ae2e3ae53695cdf59355c7e943a4d0598bd691cd55e580b01536ef6779dc86ef17b1a5481e0a8d8d551695fb5fea19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/oc/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/oc/firefox-62.0b20.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "1e963bf3f340dba469ae928d87fae73c112be3d8df0bd5b0667c5d7ba3a140d919b96bee2cb1a40a235bc1b80a174ba8a8615dc4ffcfad156fe87e1da2ab0fed"; + sha512 = "ac454a4fd62dcc0c8436e691e103859bc5767e679d876c445ad3e553f5afb4741460dc80e647ef82f006b34aa44436469fe66978917a6cd852fb0a47ced85fff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/or/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/or/firefox-62.0b20.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "60c29bd2eb3a4abb984d495ac7e1679a66e951022b975b57ce1f5c23db3f2c43363f22626842d0a2750b7275ddb711f7ff868ddb209d37f3d790460169c5ac29"; + sha512 = "ac11a4b4927eccbb5a3b0c823cba907dc32ad228e8f147d1d84f5670b1fb12638a1ce858ce628b486f41eb0e98ef8b7d8757facfa9d592c3edde03123a79a703"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pa-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pa-IN/firefox-62.0b20.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "de2c7b09e0973a6b2c86bda0f5fe2a5e29b4a18fdb53cd73301a135fef2212c0fc792c532dda5131cc9a1ee2b097e9a40d5ff4fa4e07f8b640422f9bd2e14490"; + sha512 = "396a14508013d7b6b8dd396d7d48fc26c68da3c1ad57952213a0e01a859445201dcef08d824ffeba6958f8a79b5c1af59b4f6c30e539f80ffe5568d6a09406e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pl/firefox-62.0b20.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "2a999ee49e7152227bcc18fcb0c17047df73b27c6330eba701ce12c4283dcd7643d824310cde1bf7571da403e3d3e9db8c34ec04ece7a3e72aa55a8e21da483a"; + sha512 = "67a17f065011d6a84cd455c614804351e1d9de4be361aab3bec5f34db43db378f1f594b4f76c35967181aa62f484aa84b49a05e129e6dc00b67caf68ececed60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pt-BR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pt-BR/firefox-62.0b20.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "c62b8aefcd8b5fe59d0e2e643a73b0f6e4c8e6334ba5c223d44e14bead88e81f3622b717afb5af24b7f3d668852572942d555e5a38a577c242534d4328269b68"; + sha512 = "caf1805b852a6f8b19251450d72701cacfd1f0c20ffe23cd65378fc2f99109246ff9f237c120f273902d6b9cb67d7db54a0bd5ebf4cbe0217ee13ee28a390136"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pt-PT/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pt-PT/firefox-62.0b20.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c0738d209d9686dbd28e8219fbb40d497ee418450210613749355c57a64578b5591a78f38b78bd3dc2d838e65738ae91d6c69a13d9eeff5e2721be46e7ebd66f"; + sha512 = "6119fd1ce5695c4c3aa8d61cbc6748d656a591ca7ba6e3aa8bf52fd7da68633155897fbb739568c816c78b1c7d291544d747dbfa70a346d93acac951f21c33da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/rm/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/rm/firefox-62.0b20.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "925db7b71d25a8e1c5485c92a4c0ba420d541a5c8c919bfd55a7a40357e83ee9728488bfc38eab789ff205513110f6c8f5894ec02d9fc5f47f9ae829a34a71d9"; + sha512 = "04ce2405adb0be7f8a1c2fd9f5df38f648f704abf342ad7b7854cddda69b2ceb1d0f4925390f2a96d349c62af3f486cd587fabc5f42e555e83874d1b76b52922"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ro/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ro/firefox-62.0b20.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "c718cee842c5bd456282b1daa7b697a7a1bd5eb63108a5ff63dc4dc8f4ce67fcf0b433e65b6128877636f8a2bcfb469d7340052a9347d3b43ab5d87c03b82b38"; + sha512 = "d4add282f611ca37aab7a43c9d5bc284b77384b87f941df77123a869ad1a9ac8a4de3db540167e1b67b61531441fe1ebe3bb01bab95abb60c483dc666365cdc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ru/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ru/firefox-62.0b20.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "fb650b4ad152cf230c23a4c849671e2fc96982d01785261ac643375e51eda259a9ac725d668b6d7fb50d3db14e7a2dc26babe208774a37444ee25eedaeb8b414"; + sha512 = "0ddac21be61e70542bc94e3c2541b5ff91991bce26596d4c7330557353db6d9d0670ec394a88c49ddbe08f862e5c53d74ee3ba23a1ba0d6cce2500873fde4756"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/si/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/si/firefox-62.0b20.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "f2fb270f51fe996b829e1d49bfed793ab6ef61bccedcc6f3cedf02b2a50aa214e2942c9f90676f3339de8aac977b561879376513c0815e1157c510ecad29f2d9"; + sha512 = "f74c8063bac884db58ee847f2f9d2ee366d72e4335c07e268b3aa22d33bee4dfb1c8ead9a02592178924bbf056d75ba05b12b8e79f2b10b5cf91e55d1b08d15a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sk/firefox-62.0b20.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "533bcb8ce4d54fec85f0c74e04c6ab6635ccdc462bbd80771919700220e2fa48a12e1d5afa684a2cf4d00bd892fb3ccf219dd288926a16c13eb79dd64b9c7bcf"; + sha512 = "2020c4c9115ff890757620a2f3fd2da39ba989feeb2baf83af50627e9d22cc9f68a44f3f442d846910458f14523a59df78cccb238095feaea76bcee93fb066d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sl/firefox-62.0b20.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d0e3d28147a6ef4e33b25790c9c205016d7495c0342221dbe3e3c56cc7de34c8fb4f319fcc8ca39fe14365c2ebc44bef4571e42b9254b6f093ec3eaf4e28b3aa"; + sha512 = "338b4ea7cb5c4ed7773eb7ed45c464da01e63768a9eba76b7c50ff2ca9a78c9580ad067f94e01b6e2d55f9b3dd76d7db9e8f0b5d3cdf023ba8e76a0a5060ab5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/son/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/son/firefox-62.0b20.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "a883303cf4805a251344be37563ceb16197fe41c5120f549449e507383b0737bf8a7ffab58cce6c13e57432e4c452a8cea8abfe4e776cf962436621f16ab1692"; + sha512 = "e2bc04b99f98b1c22e92bc326de8278dfa57d9b54be24d8b3f0efd27ad4cace395565816f7ba265409f66f06c0ca60fadf37acf4abe21729b68113206d389f9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sq/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sq/firefox-62.0b20.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9b2cefd313e9bed5d21dd937c6427313cb186f268449521af18bb48077f241f2c7fcc2a62145287dbcc9ad3e6532beb46a58fe3a05c195ece2eb5c2b9be9a76c"; + sha512 = "e430eb8296d46986ea536ada48db5bc3444eb381d3caaa44b22e17be1a8b6f05c06df85a8c90827d0bb87cf4864d1ab3c20ba43de8ea0622d8c6753fdecd187e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sr/firefox-62.0b20.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "6da0c24c43ae42e1ee778ce6f190b3159824d16b9072f72af13b9a33e43bc08551b66e7f0f6f101c2845bbd8bc0b88603390205888b640a01c36a61925eddf35"; + sha512 = "9a6558c6c21cf211b5d52c713a2136d55a39146954a580b6e9f304b63d28cd8c8fb9f88beab95998edf12cea87578ab6941a9e7b793d50eccb4678b57e283b21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sv-SE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sv-SE/firefox-62.0b20.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "17ec7de363cd11814d4de5df4c88350bca1a30033f98fdcd415c408f40b34aed5c0c10cfea0d94e1a31f0325878319b7b8cfdeb787bde0e65320f4d914c7a3dd"; + sha512 = "55aa7f899a770bcfe0690df0bf61a209a5f55a90524f6bbe7ead517947a3884a48ea19f887bc4ac227e0396f6704b15eae9ae992b3314899372f4e41d8ab8f43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ta/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ta/firefox-62.0b20.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "821564902471cc3b36bc14a9f168262dee1b4e527445f93f8f8c39b7db2af71c80eb4637da2471247983c600c50ba44f6581d6fdf792ef5774fdb08bbe357aa4"; + sha512 = "61b6d93e433575fe3b5d2982cf558f165e11f02ea2009375b8da468efc641455ea028afb0c0c5e6e26048832fb9274344a607713350b6afdccc5b95cac3d318c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/te/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/te/firefox-62.0b20.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0757f19aab0c1b9fdc9d80e82fa5eedeb43e7302903add9b4c7f68e030de42527237d2f5d1b1b0fc7d88c3de670aef25c3014546e01783b65cc6b25fa8a75217"; + sha512 = "fd67b31ef7d18af1786c966cc011a909367b9700eb22130246f0bb66b3f3e2ee266612f1993e65b79bd8f9e7aa6e7daf7c50e678e0e7f0c67aa63adde0c155d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/th/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/th/firefox-62.0b20.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "811815fc732896e6e90a860647152c1c9196ad7280cf7274b8d224aa5ffff6ccee1c10c127d6750c4bf5b8ccef5659eebf43241db32b516ed1f95e3d2af99a52"; + sha512 = "35d657b0e14853def56ca6c15331cc8aeba7ba1f230f8b8669b6466ae257c362a4a97a1853d9b32bdc62902f3de71001e17d2859cda77642283c6f8a41e7702b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/tr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/tr/firefox-62.0b20.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "bc07e863014d7be3a783a90b4373794ce491b57fc47ceb55382c816cd47c8b19e9b71d209217ff4af79e0b333953c4b791025e3760c7a04d7f8d2c672d9e36f3"; + sha512 = "1b562046ac23fd3a34b450042773afcaa255025972ae251855403865b4d2ce96e958f6a2de9d96267d17ecabea9a9e02d48314ffcd9986f1cc3f58f24fed310e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/uk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/uk/firefox-62.0b20.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "1d48c99480c0db287b4ac3b7f183a6b708b61b1ebeb542aac37133bcb3dce61aaa2ab38b4fcf08130ca068c79494f6e1896ed3f0d26d88ee364f5c48842d8ddd"; + sha512 = "7adca8260cfa16067d0df3270602d01b19df2bb9a7e5a373fc39a0ad846239ebf1ab868e13f3240381465ab7e950898f4664cefc7907af4d66698ea8eebcc4d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ur/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ur/firefox-62.0b20.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "ae2c95bcd342bf2362266e460cc6303653771926789cf3ae689bbef6bb4d59c24baa3537329315ecf91d7a483f1f97a961049c2e866112978602096470cd28d0"; + sha512 = "b492ef2bc8447460f02db4646e8a489e9e0e880660fee94077306ed9de0642498c46a1a81681692a5cda8ceafbb1a5788dbfe7c46ae949d4a0b1d1e4be695576"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/uz/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/uz/firefox-62.0b20.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6c349ead6a53f417bb693dce2fc06664796a1781ec78a38e4b2df72505808cc63fdb5629a9264c9bc93c3a8f61be6a832b42a0a1ae56c38e064c61d105ecc09e"; + sha512 = "b45916a341b82f95e983bb796d2316b77480982e3158d07c05b87dd8096385a9e8100995fa4aaa9b8fe1feb140c672e87b01cadc7861c8a057ad5b01f23fd295"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/vi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/vi/firefox-62.0b20.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "df4a98d33d15d1e4cd8fef2f5ef80c8db43a47c7715c4f5ef8c3a8e3afa7515193557c5a779dbd93b905ede42563d6c266506dc881bae5b534dd2f5d091f593f"; + sha512 = "c04fdd2751851bfaa7d61a6dfa405820f422f456a6768feac95061e7fa24f05380c0808a7637b54a344fcc237cd135bf0a32e7d697d9252abea8bfe31e2659e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/xh/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/xh/firefox-62.0b20.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "853dd4a017b7f53b32c08a3984ab3e0584ea461e3fccf18fafaa461ca07fa40450d248c9b5df38800c8978d2d74b024861ab11e385b6edd99fe6637c2af6fe1b"; + sha512 = "aa754dbf9f04586c60e6406b26649955a273395c130c5955e6b83c2a5d7714de1f0afcc0c6904f01bfa5acf50cb03e848244a62214d4db241eed18f049320f6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/zh-CN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/zh-CN/firefox-62.0b20.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "76f72bb1563001978c39de8b44a01167d1c8a4bbef7d6fa34f2f904ca039ccb00534e4856413fceb0e49d2afaba06d40ba7b92c8c2cf9cdf55412755dfd8382a"; + sha512 = "2b58c6806c8ae4e476add919f5f4d5e380252cd2a822dc0ebcc5caaf20f1797430fc8ea4747f998953f41e612491e41c6c00a9eafa98299f4a10571a89d6128a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/zh-TW/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/zh-TW/firefox-62.0b20.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "df08afbc8bfa7d82d9ea2e5e212494198270cf9f401aeab34d31cd36df8311f92d8cba0cdf46d6f82afec42897a3ddbee0d949d73a17ae962efcee72be728d3e"; + sha512 = "8d744785056b3c423f42e337befec9983c1e914475eccef8ed43e8db87aa80514003fc20976a60fdeabae3ac95b8c1a4d8701e31158f2f811ecec1e003cb03c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ach/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ach/firefox-62.0b20.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9dcefe6cd21b403bf51a54addcbc4776db92aa1e722f592ed5bc2cb39a52a1255c88134500ae0905193dadec89147ff7bf95499180678177e29fc872bb71e5cd"; + sha512 = "b89b8af1e22c88e1e6140e46953e15f25673bf0f3645a8af40a9c1be3f44e621ab469fc171538cc2d009d50c3bb9fee9d1653ea9a3291f3c535e3918fe25ccc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/af/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/af/firefox-62.0b20.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "ec5a3058b71d81c2e30804942d8d39ecb2ed4f8cf801c0464993b4521ad5992dc9c6bc2aaa63b646f7202a19a4243e37f32e1af095827a63d7ec044e9c47754d"; + sha512 = "cb217f4fc3d817f25f76691abf459fde2b9d55e41318600ed822ead6ee1492396441bcecb898386fc5e6e6ed8a95736562d241b05b186dd0497bc0100cfec6ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/an/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/an/firefox-62.0b20.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "814de6c9e194b42d2d4b6f5f1c0b88d5bba4f64f92a4819f8fead0c3806c52a3b9d8bcafb11c02abaab6a37253fa27efefba5133587e60ec25b76c94a004fa35"; + sha512 = "298f2737835faf98e688d2cca5c12f6c121e83ecad52f0fa6af06a1a0a823a5b1c9713742524b1495452bf099e82b3e1fc8faa30c9c8fc5221f11b514b165ab3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ar/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ar/firefox-62.0b20.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "ba5afe64785c45fcbc7577e519bd996dbc324cf1da87f0e3044db968f9e67d16cf2958346ece84b57bf34775b05f27cecdb6043bd09bbd594dbbc277624787ac"; + sha512 = "659908189fcefe7cb5c3a0dba1938d8dcd23336be2a728b0d96641a410fd9bf723e4ca4978649b5e01e13c3545ca3d8348a5a1451496c690efb663640961f6dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/as/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/as/firefox-62.0b20.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "fdf9cefa473363a7bd7027b05f412a260aa69742743cd121900f1bc5f2ca45c45011d068a6db01b6c5849d53719beefa4da659aadf7116e9c2b17ea251188586"; + sha512 = "e655389c4dea4d9db66549256ec05443a7bfedf508db46ab8943ad644229cabe2ec1edf8ab40b55bb2b53cdbc83832c3a39aa5c42950fe15fbce1152eb9ce8bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ast/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ast/firefox-62.0b20.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "f6236d368e813b3aa88847cea48510be3c2be2fb7ff054eff0c1458205db70f645d83f6ef20285f774686ade01f58751cb082fdb2dd632511089ef2c63209253"; + sha512 = "7be4c535d4d63ae1c5f98e49b58c57af0adafc95553a505fb60d5a83523422e6b71054f1bbf02a060510d59a8f85f905830a02c2837fa3c3e5008494e3bbe74a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/az/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/az/firefox-62.0b20.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "74658505a2462cfd26032a837db50bcdd092a927f8f8427bfa3182301f25a15da346091d73689ffcb0c0e7c59b154da343b7be917e1ef4e1761948bbfe1bcc7b"; + sha512 = "2b13f55b90997e245c69b16f6c0fdc1df6f1f7cbeaf4af72cade86866aa7c4b1afdca46a705e5203b74b0db645a514995f6554c59094c2f21c13aef1f126b27e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/be/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/be/firefox-62.0b20.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "c168ac1509e7fcd3715b8f1eea47c64999028256b442f11ebfacb7809d61553f251fb1e3fb80bbe4050c7fd0371e6f1a417b7fcb3eeefdd0b2e30e547da3b8a9"; + sha512 = "d7bf4a8aad2adb1dc5c9c0fe474aca23b8f3b3e66374ef36f28cb3818c74932aa4c5c92b8c06c384dd4f200fc1215a8a5fc7a2c22693224d5955965b239754a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bg/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bg/firefox-62.0b20.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a2440702f8382ff965b17641e9d9dbc6cfb4d536427f92f51a3b8df63ae61ec869760d6eaa38202a7f19acc0ebd6895f1c57a27a5ece8bd1f6a29781d5a298da"; + sha512 = "f1d9bdff18573cc004b8172c96f2766b42b0f0759a756e7dbea0aa46fc8957675a556e6b952b3a7562421a6ebb33d825a886c1cc96ad627e806ad7f0a097799a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bn-BD/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bn-BD/firefox-62.0b20.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "c1aa573de2ed71b85392bff6b8c9279633a142ce51bc26e690c02ed059f6f7db47cdde3fecff902617d27fecca1824b8ebad1b10a7889b918de2056991921c76"; + sha512 = "aa1509462dcf6c8f2718a85bc6fa00c572fa3f41856b50a7bc0e2fe1f50a7c6717c05ee674e7594c4d07ef0ff23395bf9cfb23caebf707e0d8b4112687caadfd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bn-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bn-IN/firefox-62.0b20.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "a728779adf7644f3fe8363080d93a8180ef2ba09fb78f0d05989fa57585f77897757c5b587a318886eb54d805ee8de625c7cbee44908badc14b47dfbe2dd2885"; + sha512 = "e71b318b693a256dceecea4ea1ee494f5ffb9af08d72fb14a76c21a51b8f8796659a7f9a087e2b732f72cc8787217f14d17776c658c0affbcebd5e2208160a7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/br/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/br/firefox-62.0b20.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "5bf79cb726263b8aab120c6b826a09524594bfd8ab7c6464937d23f02e866e353cf8ce71adc8dcb621d6df71e4e7d9dc8d60eeba4023cc3d7c8358eae2058d40"; + sha512 = "1c33e290074d0dae9654d30b21592360f3f7199069b070a791974f665388ce290d36bc7cd9518d8bf855bdfac97acaa90430f4cc4627e9033c169dc75bd79700"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bs/firefox-62.0b20.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "84f717ea9067ea2ae636aa15fae1821e2660c84db5c6d3f1f656d9170312b31e44abcdaa1298a29adfed9b221e72301faf2fb1253672729c7fe7ce275cf37b45"; + sha512 = "a92dcbdc514f3b593f5c222f093f88953558388e03e71f851cb2c242b67f3d51ce7c891a8f183fa554752d13ad93152171233b81aa727c9c20a341e558b39229"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ca/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ca/firefox-62.0b20.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "66a6ca250c2d916503b825c05dc108e865ef63aaa851a658198869a0fecbad3e31b7572873b2b39f53220c0c1472e30d5822700512675cc9b1df9cda782185de"; + sha512 = "ecd961e322ba0b9b8477a52bcd1e31084a18109937ac50cac68d73333c3d62efeced2fb11ba63fa97e144c0b711f5e9e15ba346d957bdd4506dd9a7a85400e1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cak/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/cak/firefox-62.0b20.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c953bde75215054be5be2364394aa89bebc4489dfd930ce1088ea770fe5b94ef9682f8a17065674dc674303a558dfbc77973c751b7e52d975b2138ba5be823cb"; + sha512 = "d49f167dfac2e4ce2a3f5cdfe7b5651347e90f7a04d52cea92c05ec0325f67993ec3ed97ecab501d973f16da856e474321307719842da958496e07d07dea2b64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/cs/firefox-62.0b20.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d2ef4e665ce29f2df4ea9a9322962bf934b4e8eb8f2396fe532e2873a68a3d7124c53f3afafc541ac67799f01b8e75595de849a2a7d5bb7f552e0893add7ffab"; + sha512 = "04829e46c4d84745abac063114ea1abeaea8ec7f596e7e3850ecb8702134aa2164ccd11c98da7a22adcccc9bc21fee5886bc7c80652f4ef3682ce907f7e5ccdc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cy/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/cy/firefox-62.0b20.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e5f8b77ca5fa59d5236984e6141b909e2d232a5d279a295eee7fb83eeadf17d0078c936d2c560bdd9ce9df5809b0138547946d9052842d93e699fb7ad7161062"; + sha512 = "b211eaee0ca7f2faf073762e9b0e47a6fb1249d20f0ec96345104b75367066c5b671d3fd16cd1387fc773152c1f22f26784df14146e5b3ef41db61810d6ce317"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/da/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/da/firefox-62.0b20.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f241d4d26266231e063bd556d07b34477eb5d93452ce29a1c0518a5414eeba3398bfba5b6113a9c7cbc7ff3dc5371cd2eb470de4a00891a97a9e8f5a6ffb6d3c"; + sha512 = "46c7f949b5d306f1511ee68d624a276b4635edd21cbbc9f3b19dcb8f6fe7842acfbeb55307dbfb6bbe19461f093752d1d27abe908b394a013cdbbc68b36caa09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/de/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/de/firefox-62.0b20.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "2e72ba457794ae8c40f0cc84a7f8f4ec66a2157a61853fa9ac7fb088e9320b85ca6d2b32653266dd4042b786596b9e03abdaa8f3f26157d354c070e3bd3cce52"; + sha512 = "d53f3ed49d59945ac711cca09a49460f82a74afeea3848605b0375778f3d94e2b0f8e473ca567a9a3326d847de97a83374b37c012b94d96bdff7482cadd45139"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/dsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/dsb/firefox-62.0b20.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "b3bfa0ebfe62ddaebaaa35a90e220e6092b269ade846a07f45f12ba78050ff1d9c430ae98c84467dcb4449eec93c8216aaf9046a40a74b23d289beef89c347af"; + sha512 = "e9274015c9a150ca2518358ed9847f060dce50f5aae902ba107eb07071b7be1255e3f034a8c3f8d9c29a4825d17d124da76b4072da20082364fca5ff874a9a19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/el/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/el/firefox-62.0b20.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "d85b8c718e82115f1d653e4cbaa87e5713dbf4046e7c81701b6d9f7d7d3020142de5ff181bb3a46916a65954a743716f0b2898d098b8b582a14703a7a0169abd"; + sha512 = "8631f28be76ad3e16c521cbbc263f3c58df6e73cbcc9b4a5528934f9411faca0ed28f821004c901c97d925abb95fd597a34b901f97f33fdc508e99a3d8c4f689"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-CA/firefox-62.0b20.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha512 = "1f70a550b4f7a6dd2578fd0a385a68b153954002d1a4d7e66ef58f86a1b5c9f33e153ce04a32737113f974e7caea5c2c6d338b69da94ced49a56dfbe61a99d68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-GB/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-GB/firefox-62.0b20.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "ad456cf1fb209f0a7f3f567fb79684657074eaf9f40bfe46716e52c482fd3f6e63cd4ff2bccf9d47a2a70d59c02c1953ecd70eff89f95608c25caf100be31f02"; + sha512 = "473dc2bfc05fa24f4a5c88321d087604b81245b08e3813dc45a2a7bd62e2c7012f0d2ca1dcbedeaceab7549ef5f53d47208c04b0bbc9f9267f4319b2720a14b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-US/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-US/firefox-62.0b20.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c70393c2ff8eb5bfaefc5bb646a327f685d16ddf5e9f6839d9d064fe51b51ef12e82716dc247fe9533f97bd33641d242049d1cb09130d29bd72faf497f989bad"; + sha512 = "317db45661d149e6ad123241b9b335f34a2852921a97ac0caddc7c49dbb1d105091990e99d538255359c42c5f12057fa728dd546019e710168f696b88ca202c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-ZA/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-ZA/firefox-62.0b20.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "6a4260b28a9d3f1bf118f4e32a64395a636395a98e0cf33546530d3439d74bcb773dd4493c9634c16f455cd7d034235d2c1f06830371033940a8cceef7a786f3"; + sha512 = "dda42571be54e4955cad1db913579ae7e5b002dea09eef65c47da53adeff0631667d34339bf102d2c779d5601066b7d403da03349dffb60efb9205cbf92678b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/eo/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/eo/firefox-62.0b20.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e0a0812ac3a24a0b9358f68a63d136b4dd0d140bd299bbc7b9b4c7a72e88c6ecbd149d1419478642b0b9bb662d625f9134febe5d6d210f9856fe99a6bd566832"; + sha512 = "c52807336eb6a7acefd83053b13b9e5e6a8ce746466fc8a117e29b3293317d8d8aad86fa5f893b57713ae6e2d1a86e63ac3a8e00079542bb9d171d0297b46a39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-AR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-AR/firefox-62.0b20.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "171772bdf3fd38225db4f1dd0321f7c47101f804d94ad6b558423761ac0a3e464ff992b23e118c2ee05e053213ebf27807413007c5dab0bd9429e6612e52acc6"; + sha512 = "822524e73b1f49037b0e94b297fca1239dd8db130661bd791c1e5e213c9d3cc8f433af205b9cb3a2b3b983bc1470471f558d5e49e908ca582921b0f04d429472"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-CL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-CL/firefox-62.0b20.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "c7f96bc59b36c6ba7c4cd1d2ad0ce4e572dd489edadd39690aadf4cbb7e4573353fd73cfff94b2defdb6923a8a23d1857ec16621130cc106bdb6000fc054f98e"; + sha512 = "24e6938f719b0f369db6d2277017e976e3db83ad342ebfe3caee1c266e4832c0fe306018746e3b45bcf6a7a430c9083fd56cd22e57945966ff4f2943b828299d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-ES/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-ES/firefox-62.0b20.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "b4f28a2c5b303af01f1fab300a3c09554496cdae9ea15a0a6ab816411e7493a8a8fac2360e12a39be050a8de9ff2bde5bc4f6f8e0b6dc25cd8adad49a0d7514f"; + sha512 = "7d97797796becc35a27bdcc461aed9f0165e49ff8010234ac9d2fa0274ce9270b2b69657d841545fd2b6b4cf7727ebea76ba3d5c2bab8c2f1a4612fa678828d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-MX/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-MX/firefox-62.0b20.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d847c11a5f207a27221a6b022cbb78e770a6d060eeb05065bd770101bc0238c0309bf4aaa063d070e23c1e8ab8c955c4318c09215bec8184b279f653ea05838b"; + sha512 = "bcba9c47bf13b77679374f077024b62e6f4e6048980b71901f576492629ee4e6074f9e5f33b9260eb67476823a604803194f668c4ce1ad09bfe78aa5017ad9e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/et/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/et/firefox-62.0b20.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "9a0a608abdf8040be460483ce8c291eaa5cfa5ff719ac113c03bb1092ace9017f9beb10cc78edf8a6169452f6f46169673f856dd58f6d8eb7cdb49d9378c82cd"; + sha512 = "ef00d5c331d377d544c3f8acf87ed78c658a5e076db36a025a9c004366b27d95f2c82971ce45f2d48eda4cf34f57adb95c646ad21d2000e5d631aa2a8c2355ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/eu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/eu/firefox-62.0b20.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ca8e503ae4c7e6e457dce0674116a9beaa6360ba50df5d97d0b56375794c940c91028bbc1424f5f7628a80560220a169c8a8ff59a3739e2555bd9b091842d7dd"; + sha512 = "7d83cca4b0f6de980d5e66b152bcbc72286cc7a241ac1869cc5999a7007f7b632d35b9319425fe1391cf0b16188709fc62c05e81fbf9d1bad0a338509cc7c529"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fa/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fa/firefox-62.0b20.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "842bf6fa0d8b6ad46a17e1f1d54207522cc6d65051138e73063fbc0c9623ef56d0861f524d441105ff606753e95a072124c3538dbf87ce333d22bdc1a448bc3f"; + sha512 = "aaf6b7583a9c9219c4967b34c2d89d58766261178efa2d89f4cb7c9bf8018d908887ec04bafaa0ec464c243d301cf09734cfe6150d40952df532579c35abd517"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ff/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ff/firefox-62.0b20.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "f83218ecd31e86ce402b47cd00abec4065355e64e9d884fb5aacbde86977cf8e0ead693fd939f27c735d74b8b483ec18d4b185d7023c2124993fc52109238234"; + sha512 = "3cfb4321724a30c49e735b001dcc3b3b1fe2ea2872793b5287adaaf89b6821f8b81669761d8296111b574be14eb6bce7d0467a945dd22ed652f82d2ddc29a46a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fi/firefox-62.0b20.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "5d00e98297f9a9d768467c981bd789fa15945a5c70ffcb2f402f68cf13efea72106de8aa947963d58e25365d17456538e6e76c8bf4ae62f8ea5c0aef0b4d109f"; + sha512 = "2acdfd29ad1213c8fa5ffde258737ba2232ec1d2fbdd5285c913b7c383f4e30a2cda65a16e1f597c81f9ae0ea1b7fe492625eac48a92fc2f428d5fb0ecd5ef83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fr/firefox-62.0b20.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a30c6c7d0f50cc1db0505ec34ae1d5714737305c3e8e1e1660b6f519aabb699ba2a2bb14ecb77e1deda1d30cfd50ee69de3a308be004ca6a4b9e6df50eeb94de"; + sha512 = "4f18a80f38d2f8b2e828e58171a10bf0509275dcb5321867c52a818ce82b56ee564973f13fb222b049e0df3aad1d7b0f68a6ca24e88181553bd3ae125577eb04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fy-NL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fy-NL/firefox-62.0b20.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "9f3a5a32d4be8c9941293eb1d8c18968502eaa28fad44ae89df20c2170809b850a7a0460a95f6aa189c148c2c54a881ab138d12f3029f21a863c5307e4aa11e5"; + sha512 = "c7b18de94816353897423bcb35b5f5d88e998c5dac3d37b417e2887f5fcc7ea2c4233a5e603596e742e2710e345edad14a48f45b74a91810e126a14be803b7f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ga-IE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ga-IE/firefox-62.0b20.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "93547d639642d8c0ed10f23344ea01a66b43f99ecdcdd7a0e2e1a9b2a895a1fc10b44231db8c6d948a19a84b820a8dbbaa9ecec4df0bfc4555cfa62385ece6f3"; + sha512 = "e1b070d63012e494a0fb380d7e97f8ca32e93dc3e8df5e2f5347cf829b6a94fa886dabd46285110b4e83c807f49fbdc7f792061ca36246b1f7c1c4260dc3d927"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gd/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gd/firefox-62.0b20.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "73c501b9a4a329acf953881a795444baf4291ca6dd152cc05c698f661b2ad1f979fa7f45f4cbd6abb6b79b6b41ca0079658d32c1b5cfb6dd166eff486f0ff067"; + sha512 = "218450b49eafb3e13dee8d96cef0374423c0fd9ed9f3700428fdf0234a7f921138b4188dbdef60013062c6aa62fe2e13a6bbc219c756b8085e4b87f1a7400ab2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gl/firefox-62.0b20.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b505c3ef839778b713c42ba61ab2616d389184e6268313537ec12e648c341c8ff57b739622ec118daaad900b54fb4f8eb57f43526f711f59f368db88f788aa51"; + sha512 = "e841e13d8f9aff9c00e3d78f01c6a6145d87f9c6fa5fd6390080b1f0002cd6ae2e1d45a14624151f7d2a075a479281c534b06bea6f03d022dcdcf330858fb212"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gn/firefox-62.0b20.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "744247e1441b2c44cd427179e5008ec2a25bf4b6d4e3195c910e8943c76deabd63dd5ce5c5ce6de2968d5f00e67990d8fce2322d901d2a5bcba6b2fbfb4f51df"; + sha512 = "00b1242cd074fa385757a2059719fe680d52bed9ff74ba913f50fd3c7a6e2bdb16a2c0b63343bef47dd0fe2a7b55b5bb089e801feb3d4e537048840b453b9464"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gu-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gu-IN/firefox-62.0b20.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "1784177b07a777972dbbe14b259af9c0f5e4e8453d82ed0a9dfc7c0f548f6909cd9a986b4a03c2c40a5d1e88bcaea32c75909e5f085c652637512e8cc56ce38e"; + sha512 = "a1ba413e9f9f9167d15f37854d91620cee806edc1d3aef95fcc8b067384632d07789ed7fbb90255e572de0de73096fe08147082e24fbad9373717d1388f275dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/he/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/he/firefox-62.0b20.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "7a56deb3e7014ab4ed95f70e537c1613fdbca8a0a538820f903808e8d881a7259033ec6d0c8512ee17dca4b55dd5bf54789be78a6018f6c21f5176e7d9cef09e"; + sha512 = "6ee67f5d621666c3d1fe3bea325499f21be3c5b51b76dac0ce04986e4a780b2da6abfdd2ca2b0e135abbd5c085b6a58da3bdebd9aac2daac3921e36b5c823027"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hi-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hi-IN/firefox-62.0b20.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "d47f44b37418d61131cf1b804e2914b6dbfcb8bb30efa771d2d41d0e3768e20660bc4c8c3b36b1611ea3e992825cbb9548a4c3b975578d6c218fe10f743d37a2"; + sha512 = "a6c674a0303589372f0f065509977a7233a0a64ec3eae0d6c33321a3f8ef39e8bb0c06fab28114c620560a5dd7748801aa01c59feb785250455ea5d3683aa324"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hr/firefox-62.0b20.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "8e9229d45bd3484c76fcabfa66845b41de87b33c1dafadc9a06ff6d36396cdd9a1d5d86a7e85728b9b658c39197962f20f374453c594cb92b82f0a14536522be"; + sha512 = "49491d5cfbdb63a0ce5dfeab0041f3ac188eea65d9804ad204eee826a745e7274b59119545278a76e1a69f239b2350835ce69aade82195f2c9e3d926849b0732"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hsb/firefox-62.0b20.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "f656f3bbc00dd0c3c4a0a9c4a7d5d74f2049c343284b891ea455ac093f15ef24bcb4acb244213516272b730cd42798115ce3e9013cc7ac6bcd648e97aaf6ef3b"; + sha512 = "94a1b14a0307be3946abf0291be752d90ffb004742e27ecabeaf340c8a291a203a71152dfefb0ac8614f029763d0f7748c20a9e254763745e74bba7e00dbb752"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hu/firefox-62.0b20.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "de412f63269b4e89bea1fc854c9a0ac9f37ef73d19ec900f32aef0fb444fb49daac0bb2e1df9ad01ec01810f64eb8f9d96d17816e7f062f5f3a324406a863efe"; + sha512 = "ad13f2c9b2e233b63685e5d259e189c42e03c20fa4635b1e3549bc993aa84b6b6f60db765d3d754d4077df71482db8a410b78255525a98484af90963d7bd46b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hy-AM/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hy-AM/firefox-62.0b20.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "5b6a9f82c85318e21a4a4bb44e74db28e690372d3fd93c8ad8ab4db8b1efcd9014fe365df1c95cae4ab4e7a3abde9ab4dc8873e8d9440c3a5716cce8b38407c4"; + sha512 = "af60b06dccac40856fd7553853ea27f084db076ab544e02bb85608f54b7fa91b05eafc878ff453f5392a2dc642e1f8bf7792ea2393233814e23e65f4eecd39e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ia/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ia/firefox-62.0b20.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "8a44046e7a0c0345575fd9b715dddfb88bff2cae6b674421724056e9142570b3499c645691c4c0bf37cb4ed59026a6e4827801b32fc865e6e2f9ed7653e13c30"; + sha512 = "f1a8b6d609ffebb5152f0156ee2dda7452f56321852988ccc5f0f644c96477a0bdb8bf1645f5049bc404b0ebe17627b53db7467c208b7f2c8406f7742e90a9ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/id/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/id/firefox-62.0b20.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "57dd98bc122a433f4f2bc0a07d167344087a26bc7dbf728a9d9770b61b108f953826d88889e73c2c6599fba5edfeeca3dd6eee2377faab254bd7f741ae30939b"; + sha512 = "8b90571b48108e99021594d517e07cbbc897c96a84dbb8547c29a674f875fa7cdf01432af3a8133a524fe43640b7d6e6b6603627789b01b6cdcda0e3dc6be431"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/is/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/is/firefox-62.0b20.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "58e47133a1a1e018ef4eb64cf099abc7676a63d3edc86024d024ce3e95e2c007e37480dd9e015bf45fa7c53fc46f9ee95214199d25cf57dce8dbac6a56356c22"; + sha512 = "85f59ccc1812b98df3a7ade05998e997180ff5e1fff189dcc08a6ce65d5f020d3fa1a364e36d363d92bdd9cbd8c30af38a159b304c100f65fae619371ea817c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/it/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/it/firefox-62.0b20.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "7825ff6f4f2645e4577dc472cba3e4cb0cbd8f7881671f99f48df03fd509489ae74c000705b212fd5033b7da7345b09aafd68171009f5ebc40753f7da43e36de"; + sha512 = "c6ad61d891ea8d26a18da6d53d60216ad51fb236a4e011d99dccb06fbc79cbe983310c406dc9aedd1cb6b9c15212bafdc3db23f4b63a05343509cef1f5e309a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ja/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ja/firefox-62.0b20.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0401f4890ba1f21c7dc1139046f0aa6e218891c69de964c7e0ea32c50ace9cf743990548b6d544c8047719b189f4af4594231c2c30abc48a8dbb888c9f6ff339"; + sha512 = "0b802cbeba1f5ea66818f3eb4738e43f0c448bf7a33d02a656a1c5116b218c5e7ee915f788d8de19e9599a544ac335b2a2dd3734ceb1bf927517f55a331a9ff0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ka/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ka/firefox-62.0b20.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f54ca89091125043d38ce7a197ea2e1675cd3f308ca0f93b0d57cd1ad8e341e2f8fc41dba925c85c12947cce4cc4ebae13e248a48fe5fb229e4e06e4ed0e1436"; + sha512 = "2b71658317f90bbb6beda188cb347e2ff413476e429709da08b094eb60363b658f3eb84dc58d96ccb2f16c9d7a692bbc0f282d28020dfe6de3ffdf554636f437"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kab/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/kab/firefox-62.0b20.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "c6aeb9254c51fcaaeeabb973ba7c6b7cbbdf1547300b8149abac8b35bf9d319a3d1efd7a9d252b23d6fdcfffe0f311014c17c475b27bfedc15798fdd8fa08fc1"; + sha512 = "129ff0155fea5269dc0d655633d6b807aef97a626e338b4d6a0accac675b0c7cda99a95a5989990ccc69cfd9137f4c2f907b833f650f4b789c7beb707a634f18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/kk/firefox-62.0b20.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "f3451dc01dad8018b4709a6af7c8829d41ee3de4e028b3529be556480e0c5a48b257dc33ada9527b88550b2f68985bb71b1fe7cb6fb84e505ef3165a58d94c1a"; + sha512 = "8cf6ec86d8c60fac299eaacc9f046beb497205f1414334980e0d6ef2576a043f731df5610c3ad918b5fce0993410ea5125efdb769300387ec0ee6fc5c5beab9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/km/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/km/firefox-62.0b20.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3364456a57641e1bb20bc2255c0eeced49b67043eafef74867fdffb6e6abc3eeb3871159859bbd9ff4aa823f8060409db068fbe2f44a16c09ec2170a6b8f858b"; + sha512 = "2b5a8415796d16a386de7c82201449c2929b7f75e96ca84b5adc25bb52ed27e76fd5f510d6cba14b04be26866d17b0cad026bf9dfbe49094cae2fbed984873a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/kn/firefox-62.0b20.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "e206b0ff442462a150b60a72ed29653e64e2d277d887e622f31fddf2332cef1f75b6d6ddc27bd9c5dc89bfd87b67ce3fed72491e4d29a77809f4f901a2e87c18"; + sha512 = "2d6f3384708ac2275c5b372d33daa0e80b6b253d69e80e0f2ff755bac99dd8eb2dea9585e3aaf20c2efd6528f020089b0a29a1eb8fc9719958edec806557232b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ko/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ko/firefox-62.0b20.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a0873fc6ed8c69e205d4c01783ecabbc403317d94ea7fd21077e00f8cdc264424c00e32b6dd27202b2d6ed8ac08299eb6693a38c288cf9b9a24c722745ab0eb9"; + sha512 = "dcbfc97a8f6f5292e519995becb41065c561395b7cd24f76b6717e8c920c910a5456ba382e079641988de82871b7c4545cc1d9b044157222db780cdfeefd9949"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lij/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/lij/firefox-62.0b20.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "95183a50d86bd9463ae2ceff374c2c16d563cde9c2bd7395ac900195fc7f663239289baea37ecf9941abd0d8b43b5c63214fd40b8eade0419e2ffef2aad51095"; + sha512 = "fddd4b5a341405ce2d7598768d53a51c37c54c6486286569d4ad06965f27b4c7249d769507b586f5c880ea994e67b0e51a2bca9746c54501939c4717dbbdcd80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lt/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/lt/firefox-62.0b20.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "758cf8c198165c0579207ad8d67d998eaa81c32a8ddd269ce1c76a05082349cdfe38c0fd969188e7d4e86eb128b88cf88daa9e3c283820311972773b075bda10"; + sha512 = "e6a11b4709c0578aea57330e43f9e7f15d7c1c9401a2fa04d909e373be7a6c80123f05ede39a9e72a33c8824b211e42483a96a9620de419b7748080cc9a7e998"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lv/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/lv/firefox-62.0b20.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b38a18191221d6fdf1386c72ec07e198d10dfb2cb33bca34aa5d960f5c7be2ae61fb543409559e3308db188ec949261eac4949391f8b699f63948fe3177a2ec7"; + sha512 = "f1c6e3422d6cbba13d9ad137523f06be5efbaefc60490f67456d5a604c4e9083a172c3299ab1d41efdd76884ebc1fafaed6a083493c00abe81888a23b2dc0c87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mai/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/mai/firefox-62.0b20.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "f0b09948695397b53cb3fc500d6ae47aabc4f84da9314867816e2c4f21e4228e601731756b1b87253d2a2d5f6057fa115bf667d115de5d54ef4baa1a5dc181e5"; + sha512 = "5e7368d6a098f90c6b550e0700342c1e036f69c7d2a28edef7511ac88601b5befae37f2fd279c22e383050ec5fe0f5109f22309af34914c98e120144f94a0345"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/mk/firefox-62.0b20.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "46ef2273ff40e516c9deabe4b42bbb57abbc813a6717b0ecde42720e9d54ef3b332df05f48a5db516f8030aa984bbb0d91afbe3f0b84c604f9d106c39e124bde"; + sha512 = "4294fbcd18dc778ac641cb29c64d242570c018eeac33bf21445dbea4f9abcdbb31a384ab2a73817be265f6cbb6e509b86b9fd132b7cdf09258cee191821d1796"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ml/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ml/firefox-62.0b20.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "43a1803e07b496571f35e005b8ba0adfd9281c9c907b00b92bd0fcf37e9b4c8236af90d145456725feaf3ef2c7baa12f9e5651e88a239795d90cb401079ca4d4"; + sha512 = "050f90fdb97edde5a75b798af02a10f7fc5bda28a07bf5f0b883c5039d855cabff160b0fb7411726c5852584f96ca4135878ba7ea8c3298de2fb3af85b7e99a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/mr/firefox-62.0b20.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "4a79bd0bb319c8851828a4a395d7a3f12df8ac812582048758ab007a61ec656785322687dadc46b023caf6fdde6226b25fb31e2c08ced97e73832517196c5b1e"; + sha512 = "a005fa90f6d301d1dad2175d58bd9de698f061226a6776dd5da82195eba19b004252b02fb464f004b6aaeb13232e8d80d511bec3cf955911f087ee40cfcc0015"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ms/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ms/firefox-62.0b20.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "5c5c465daedb590f848415ac1781909d3645a3634da35ffe76c8e91b9a154f3f848efe23f348e0da4e2e7b79d92b41f98988fb68e59b54103ddcde913a7c8cb0"; + sha512 = "4ddf2b483f24b16a08b293a3c76049e62fb7326d3da7287bf0493eb838220cac3ba5a81473a0278c72a5c5e5391edb17304c0140e81c43c1b943b9135ada3b9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/my/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/my/firefox-62.0b20.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "338af2c5ff8fc81401cbdd4559b8371bc18a77f07c28c87d71da2d4a164a697aa6f4651e631a507c94adb962059dd6ce772d78d75b2b9224e22e555687422b9a"; + sha512 = "23f2c208eca6472879e47a5bf3c4fbe04a2feaac0d220cdcd1985001665f65e8992a97998630e65cde02c6c87dee34fa10bb78b99beb5c8968c99b410b226a68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nb-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/nb-NO/firefox-62.0b20.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "95c2dcf9a5f9abd0c2f12e9a40f9f0828a1f05c20b981d0b6c66d85b6e57c689fc443e8ca7504f592baf2e89dceb7e01c0aa9bf34fc06165bb1dcdeeaf5062bd"; + sha512 = "22461cd2fae62819fe9a44a1b947d63ccea61d5b5ccfbc949644518d3c65c242e91770a10405fbcde24b2f6eef794b3014e9b6396eb6a945c904e762792e2634"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ne-NP/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ne-NP/firefox-62.0b20.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "89c255dd709b9215d2fc933b6d09b0205495455ceceff96dcb9e2ea5b12c98b9fda258aaa12f5aa0a1806067cef1a8434c865c0d7a53c039b1612e0c8d548aa0"; + sha512 = "b499cb8cc7d5486d368b381ac6c0416861846568fe6b8cf83dd2105427d87fe12a648da5b36c42a4a22b64db48c9016828c14f61d4c6ccfce347095ac275deb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/nl/firefox-62.0b20.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "39e6043e5caff0925e1f9d475c3a3e1281023336eb79cdfece1a8a5a73d973589258719b517cd6686cfd69400eeedc7b744287286e055e4cbdcb188818c3e94a"; + sha512 = "3107acdb8fcbba9629c0e3ba940de4df42d7b2d57328ae3b2b67cfba280ae2f97499d248c1c909630e795fe1f8b8c096a60e273dee3ba1bacecac8244612ecaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nn-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/nn-NO/firefox-62.0b20.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "570fbffe7e1b70cfc0613e4b230e3dc0bace2225bf52b9b5ddea4812d1a9795aa385ff97e2471209e9a6aa3c5c03fa861741bc8f4dc499a2cd3ffe5cfffa0c0e"; + sha512 = "bb5f4ee13acbed4dabf349fe8373a6dd36df5980c6ce4c4d8a2f59cc2a7e53c0da33370ecdb394c80e3e0738d9330690664e4702776a3d5faccd6fb041fcebc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/oc/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/oc/firefox-62.0b20.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "bb58207314655f500418321d6c04f9849a6263495b0406ad0ae53b43de395dec471ca401dfadd157307d942da3cfd94df8f112cdd4aa37ed249920fc64c8d4a7"; + sha512 = "fb0ae7f6c96a5c3dab3c8b205532cf0963f58bdb6b5be335af6e04c583101d7e0769ebbe7af5a25eb8c8e0e52d29762660d1325bfb36f52ff118c3443b9c503a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/or/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/or/firefox-62.0b20.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "744a0b481604d7f5ce312f0d9cd979e768e5c53c4b251bf3e9e6d97c67450d951bcd5bf4f4e38e830a17a08e6fc98aee30fc862db27013909592ea1e953a57dd"; + sha512 = "3a096af1920f5882a3c14623855a62bb21812a342ce8202dab99937c95bf2bb25ee95d6e8d8f83efb3a4a6576cbedc08fb1990f32aa2ff95e9db109b3e246a70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pa-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pa-IN/firefox-62.0b20.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "baa1bbbc3c813a168b742a4b20c209c66bdba60b799cc307b99bf08e8975c72deebd5ae6a9aad53d7172305eb2a09cc6292d9f9533f3318de4061a8744e9686e"; + sha512 = "c078b293d2ed28fc1780ef5a245650e88f64f806b6beaf593da3f34e554e77e239626699e959c681f652a14143b46b13146a7d4fa04d3e71bbb9a55c0d487e0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pl/firefox-62.0b20.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "06840fb56bebc72b391907853474b29104107d7b7e2ee719ba48a2197cb166507f95d69ff215f29cfb806350e588c84d5f289460ae8743ba03c7d6c212b91b0d"; + sha512 = "6c528057f326285a7b41a12f5b60f6dc0c659d8475d1766b577bf3967bb0111bdbdc43a4c5dfdee20a215d12b9768cd080d33b7fde31633f41edb9019ff87a50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pt-BR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pt-BR/firefox-62.0b20.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "48e4c56091a1cece6ac3f93e769760b71b8e79cf223ead1f2ed4ac3de89c309cf50bf9a6e86c9b7a22b8d84befee91d65d909c1fa2bba8b04cc7502dd0a57e5a"; + sha512 = "e8fc71862f83004c660168b0e955a1043384dbab038f3e959087c799088bb3307c102097f627925249a5ce3f316c102a0ccc871e313cf7efbd4d10c91b2eaea7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pt-PT/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pt-PT/firefox-62.0b20.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "8a1af26ab745b2efd03ea44a850cdc8a9f2e4259de8c568db40e54fcf57d902b898eaa7240a5d2621a7f456a8ec717875d1a2e4abe4f8a0c67e9bcd1bd9b4d77"; + sha512 = "6c7881edfe14ad6cce5241e4de562e137f44abf23bec6c49e801c1fce5f1c417f88939a97f4484c37061063f7b13d64eab55777c6852634d3bcfb69954ca3837"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/rm/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/rm/firefox-62.0b20.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "784a233f3098ca62ba0edc67a27af8fceb49f778f500c825cbca54c595d9c5f4a918a16c9bc6d121838981dc006a28bf53d3e3e0531861f261f8ffeb638c0ee5"; + sha512 = "1516fe15becfeccdc63f3014fa1e776662777f303e66f1d7aa48a39905eeab20dd646832bbdbd1e3b61275f02dd338255e0e6db6b0fddb159d480be4c89dc1e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ro/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ro/firefox-62.0b20.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "a585d1c972a039f82fb69268f4a7a6daa9bcab77db9d045720f5a98cd788ee1be0128bb9f112098536975cfc9533d369e6b6b0ccbe5a1e43e93406eff45da5cc"; + sha512 = "ac6e751c4d2be30c6e918ccc1562a8aefd0e02ac672e2bd3a3f6b9bd2c153ecb172674aeb6ac9607210250e6b9058e007626bd541c4c164316c77d98e7e77c8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ru/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ru/firefox-62.0b20.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "93d5fd02be91c5e9b0304badbbe360b8755eb5e383168555712ab316ac353c2c8853a9f34ab1a028ede4f31b6b49499c5c31a0e992a0e349b6eafe6fe523285f"; + sha512 = "92a7cec3b0e4783cf2bd66a2afc0db069b9e26b0359bf376abc36db8c461b68690a789c06275d7cf3407802e961bbe6d6779497a158872f3676419cbcb1fa864"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/si/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/si/firefox-62.0b20.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "d5e197e5727cdec1d83b05a823e4379fa229673adb3d3c2c0125b028cc229747302de8f423bc0972190e01a5658f843c1baf3e1bbc268d541dc07889e8c8ef62"; + sha512 = "d0cbce1d70714e8c4b5d61caf7f6e02b1caf43530b3a8d5db775bf164b74c273ab458262502cfcd6f0aa4a77a69b0fa3c6ec7bf9d3485c7ab447b07d8e534a28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sk/firefox-62.0b20.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "6b285afe17533f9cff61eb7001b5099128bf475a999a393d21f94f6ef734b123824bd5fd6d3fc77437943145865cfbf3469b23104bcb509707594c1a5a718960"; + sha512 = "89033347ffc61f42d9dd9a2b50a24623f7e8b96e58b8f6baffb9f751e3b6b64041ebf4080fa7fe872f72e65982e860b04004b42b5c51aeeffef4129a3a593c8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sl/firefox-62.0b20.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b14bf0b48de19048a6c8188ff064e4012055d3b6ff21eeac10a19c03b6aa85208e7dcc1f2fd28a01b6ffe87eecc968d62082e7fa5ae9b2e5391730fb794e8a97"; + sha512 = "ee4ddbedb3c5b0b7c11d277f84028c867b17bf7a1559b276340312415105c80aaac8ce468cfaf99368d55ab4b9171e0555b5ff6949bce306ef72dd029464d479"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/son/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/son/firefox-62.0b20.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "771e77e3533c9273ccc08cd88dcda7a07cbf89cd1b5939daceebd24944b3c336c7c203ca1b0d1f7ea2236775099b0edf91d75064b07e4ca76c1bc7eb3b5bb816"; + sha512 = "19a7e802542421b3147c2c0acf379d5bb8fe444b1dbf3ea41eac08065e11bbaf4467fd2bf0eec2fbcbcdeb8a24677b665035bc6c7e892bc762b5f8e01f9b9cf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sq/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sq/firefox-62.0b20.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "75da529909fc77d0ad288f63d0e89103d63ce3f815eb8d713b43b712e122255ee4dcc059276dc8c53abb64693de650c8674302987999be5155c19001d8e95ed2"; + sha512 = "32baacb624f9060d34b76d8aece1c52bb4dcef3d99f01d5160878666bb0b7a79501fbbcac8db57a2be1f8bcb243f323b52510934dfed36a96efcf0a23664619d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sr/firefox-62.0b20.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "a6ebf4ecaddbb57cca585eb0d2883336b98a0c1c7249e2db78a8f2042140d2d01c787444331f5c9d98efc7fc4b5ccf63ff50c4214263ce242b9c37c943a6079b"; + sha512 = "307d847f3a8fa5dbf8ef3bf8fd4750b508fd0e01694d1b7312919335247274323806f70e7863a1cc66fd368192c8b7d3df53f5c0993fb7defa2723f50eb59ee2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sv-SE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sv-SE/firefox-62.0b20.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e6bddf3f932171acd6560bb3a69129f71db73805dcbf01743940d652613ac4cc40875c684cb8ca46b6fd0b2baaf05710e18f1457ec41e9fe4fec08b7dad6193d"; + sha512 = "e7c257a6bfdf9d946174a274ff41fbb2043978f4263e78a7c4af67f030b70ac9fe3ff0944d71b002478c9fdf033ea4a252400819e425dcd707adb40d249a2df1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ta/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ta/firefox-62.0b20.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "863142d61d13085023eed212bc8fd24ef919e22141a560e06deb78b61a822c3af0d9f38c2dfe1574e80f04942682aa1bc0c10361c08e781dcf1ad8b4ef13b108"; + sha512 = "a47b5ba62065cfe25fb0bb650c46fe1b7f92b1c87ef99e9cec15cc9d46b7cd7eb33c74065a9becbc0555604020f7a3e61588e29f920c8a926fe90991260c4cc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/te/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/te/firefox-62.0b20.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "40eb771258cfffb080462e465dc0daa0b6a3bae27ef6b5cf3e8b9e1fdec47ebc7c00f8af392a421971d2e3463456839d3fd0a5fb50d7226e5e27e3346a32b828"; + sha512 = "0e54ec5597f42d4e6b04841bb0bced5e6129c966ae917912d3b91dc0314fef006a1929af6a04b126564713ee2a810a4bb9c1957803519ff7a64a9a05512b737a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/th/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/th/firefox-62.0b20.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "08426effef46a0b26a35dd0bd37d5021a1968d2a7edfa7617e44bd561502722dc7a98c7fd63be853dc21c29241f0767a7ef31e07d3e8ba1241adc9537edc26d2"; + sha512 = "c8ab7bdb4b1a95f08620a2788ce00c3c4c054826026966a2fb6407035e26fcdb685337dbd5187235683e7ea08234d685540f541b6a1c52f3e9f2a1fb5d2a7db5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/tr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/tr/firefox-62.0b20.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "c86de3b4b96d3520e7c4483e86aacaa1c3c56f524ac37dbfa7558a372c12130ff2b55a89bcebf3fc48d361a9e5204c059dd5ce70ca04343ae913b565eb4f193a"; + sha512 = "35a4b18c459898b470a35ecbdcfe863ea66755de4f51842f2a368300e542eedcf92914d9630b9bb32c2c0381406b3656ec1860d9eaafb2d2ca1f7e315593b17a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/uk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/uk/firefox-62.0b20.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "2445e60d7dc548e1da0b79c4518bbf1aa16777ce1e944d8c70599c3c78ab9c4ae24a3c58c7c02734b0d0bf4f4bfe0a777671b82857a95dda69b8d584e6b77a54"; + sha512 = "854153f02ac9500858aa9da1f153b231ff71e372e2c9d2ad87282ac0fe981d959103847a5688be87b01b2c3032e486ecc39fc76d3e495c395c2cb88240b5d32f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ur/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ur/firefox-62.0b20.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c69f7306906fdb8f7757e2e814103467c859aa7da852e3a2e77a8b10d37d327b78ae79fd0e9170593bf82e1975126efb6296a48683e30474bc43fbe026cea046"; + sha512 = "0434852668d46ae5a85e9a1ec6a4db9ccb801b4d870b28e500690be33171b1596c7004f23ba643d88183edd524a6d558f0f105b65d1356147648003a0b6b9355"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/uz/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/uz/firefox-62.0b20.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b550a887851e2efa5c31da29b83b4152faac726bf64c2fc334ebb72b2fdfc8e74ef6ef2471e431a0efcf2491c22b0c98dd43d1d41373425b0e70216f6a58ada5"; + sha512 = "51e106c354bf253319107ee772619139413b4ef569ef3c97abc0fd26a5cc1c0eeada6a2924c3838f320fab51225e05e7ec170d61151baf018f9ad39f3de83f5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/vi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/vi/firefox-62.0b20.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "0b84043d07e62e5a7ba38a769f9949cef05cde65852e90b21e27a09b3d40fbfcbee66c74dbb50e463b3f01e3a07b1c137496feae1856c1c3ba2f4c27ee17b3a5"; + sha512 = "bd3d7a34c737e2b165de9bd893932e117d993c1ac396f7161221aa84c25e8f7bc5e528c0de710da46324bc05c18762994107b08291dec49e5d8fba58b4c10dd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/xh/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/xh/firefox-62.0b20.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "bedfadc5e0c075c284f33a5463b207fd5056117c8de9b5d0b89134be6a5489a43c95e2e741688026b21b09f3e95d3216361bbf767533173d23d5b394025ea82a"; + sha512 = "3c339ca6230783dfec8df3b14709af1a849986fdcc05546447d698f84e3e8d1b006e0885ef90321cab8d44dfb0222e6ebf936d1f3934bd8b487ad941699392e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/zh-CN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/zh-CN/firefox-62.0b20.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3a6f79a49f183e920740d306483c697ce4b315b5a25e06c2b74faff74082d632078997f78caacbfdf7b97f598d1510fe1ad4f7a0c57e7eebbf543a263f46f279"; + sha512 = "8c699af29bdcf3955c4570dbff4f3449b033360892cf8c1b86bb00fe6bbb778f6a80293627ddd0fdda8198e2f8cc89649e66f3f37bb0d2cc9a2730210ac0506b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/zh-TW/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/zh-TW/firefox-62.0b20.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c445fa9f12599a11aa5c13f5c88e5a510ac4ba99e852976504c5030008193e00194603971e1f4078d8e370f74bd3134b3702a5c97be3e6a0e4fb841e24b609e7"; + sha512 = "93ab2022e6fd50266e201352e37a158d2eb65c00ed76cbba5940d852af182e401a6ed85aff4b7e50ac62a461afe21654526b158787fef15f9ba4c71cae91a8a1"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 3dd7d9e8e6591fc80767ada0f4e8a9b47cb6b306..13808fca99fef87769a617e16f0d7d23da7c7797 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,985 @@ { - version = "59.0.2"; + version = "61.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ach/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ach/firefox-61.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "6242d81b96456c52a25af82049ffae548f7b5e14e47e2e643cea94f338e10027270d67b13c27a4a77fddc378b1e0869b5a0f897b9b269fecbe1d55336dfa4718"; + sha512 = "572696944414358a50dcf8e647f22f4d3172bf5ac846cd29bcb4baeb0ac5a351f361632ee87dacc1214633848f9970f93cbb25a6e9cfbd9ee796e30e06f34715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/af/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/af/firefox-61.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e2aa156326a38c4ac55b4ebcbcd460ce64d5e9abc210bd53d484cb97bded59bd73045fb7b3099ff3301f0262938ce8b4b90f5b0f807f73d9b7637a826a5055d9"; + sha512 = "dc4b22a8df99c3519f3a8001d0bdbcfdf4fc5d4dd13d18bd15892fb29e928126d46e2ccb9b512dca0c5395852a3c918a5aacd2b9a7b7f2cdb982052e915d5413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/an/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/an/firefox-61.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "2946fdb675ac86e32e91b3a6cf4c26d14a5c977f22a587315a1c5a03db69f84efcd5057d7bd7f8b37e7433f53d915e9e9e5ab0c9d35739ce82e1c3183b1c4d5e"; + sha512 = "2d57784a18278bac69c08e81fafbdc3530d17a112d3f1e7d407e2590935c87058641498c74300950d3f151bf5fd67065133d91c83e1e500c72b60ebc91a4572d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ar/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ar/firefox-61.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2d497f930358fdd36ae5e708bd73e151461497f8715b11efd5a2b6c23b71fbf985faeeb2bfa5cc2816982e81f27091705f849923cb724078764b50fa684374f4"; + sha512 = "e397f8d276c115105afcbab6fb71afd7bcc93778e79ec86a4274e10a6a039ad3107cbaabc9dd4bd197ce6be7add3cc0af954f029c179a6972ad2ba15ff2e3eb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/as/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/as/firefox-61.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "a1d51a99f8a5b47668c74414372d11120160f264762a3bfb988be2aaeb958ad5d3897472618a86a4a8422850c46f2895cf426fe9d064938c263bca96a9592eb4"; + sha512 = "9869e76e004c1e77d976f01f9a4cafe29c253ad3c85b1119d67a65c784b5f65dd7a4927ccd535ee80fd63a6a47127e614478effbd0455a227e200ca31c846acb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ast/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ast/firefox-61.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "dcd450fb49cce376f27e8135f8c27400af1c2cf139120602c000091231703db2cac791c82de157c9335fb09050cd4e4ee6013da3068b1527dcd9e0aedda16c5d"; + sha512 = "5b298cce253df9c8a072fdc93df894fdb4218c720ded3260f282c711270086104eca08e2d5afe1be4960beb274017eb4e0ae7313ceb5d6e596d0591f026f78fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/az/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/az/firefox-61.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "fb004315a6ad15cc9ccb6d3b36901c4c495ea21fe146df3869711fc7ae8fb625a109fc416079e85163e79524bb987b366b2d057cd0808d0dfc61f78910fbef96"; + sha512 = "cd8df2a19e10d5445ac0970814ad245e25f6ea695ec9590344c1a4e261b6fd7d15534028f6a8abf1943fb97f0e127ed55774e2cc2bf7cf85be525503bbb69f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/be/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/be/firefox-61.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ba51003823e74734726f655cfd20fe968ebe5feacd0c985f7c8b2cf9766d7b68fe74dafc8baa0605b8fb46b22312a593218c5a57fdfabddea6a51491de74cc13"; + sha512 = "94947ee7b7477b467016cd21daa8134bf28ab289ea29c0905e04291b7560da895124be2ab7403d2b9874291b7e33f5a92d36f9c0ed9d58ccc3306ecd7723305c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bg/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bg/firefox-61.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f9df1a70c569f853b94c912d8cdbc7cf98a57eda9d461777f9f94c776f4db0a70b6093478ae1e7c87e80f37cfc5a39af3d2b37897ca60496f0d00ac9b45c1713"; + sha512 = "9b0bce62c85282c79708245fa792207dccd7bf939ebc23ddb2e6bb7bc3f6fdbfdeecf69d1ba599b2ec8d10fe2d79bab5dd229cf9fa7b79e076797267df39c54b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-BD/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-BD/firefox-61.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "85758a1ac327b067a59358d3faa0663244a24a4769ac0dfe03bf9dddd5a680503ea4bc9313294d9771bc7e4f3341904c68e0059d912b563aba8061dd0b6cc793"; + sha512 = "4de95899462eafed03464fd054b7ee12cf53d004fbcb58ad18bd462e57f5c50c31d3b50f689a7d54f973228a2877e6c77c47740280daf7d6db4f7ba5988b9484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-IN/firefox-61.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "895d63b62be42947e955ce426e03f7f8cbf8333d77fd3ff4ca6623db18cc740fb1ea6c41aefbc75aa79d60fca2f00b75f1b2e6b5b0bb1ddcec61f9c0772dedfb"; + sha512 = "2ecbf2ae7d1296dcfd6e2268dbc27060ce07bb4b3d9d62f6bf27fc8874f114dfcca73672adb4d411d2c1eca7ffac22f7832bc5cdad12a492c3bc4406e3a6746a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/br/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/br/firefox-61.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "e62f445437a07f9fa070335328064355715d2e5ef81e5572f04a8644f47dd1c8cf8a3a7ac6fa88038c4e996229ab695e692aa1c0b0b3becf214579aaa76a5569"; + sha512 = "a92abcb1aaec11ae3b0eee75b5b5610157f8ca64627a20018925431ac09cc4295d14357e63ea0fa2b66bb415039c659f53292b8133558d591a16cbb5772f875f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bs/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bs/firefox-61.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "d3adea6061daa0fd54d5cd7d9d8a00f8b88db8ed36545f9fcaee7520c1cfe58534d1fb57e8297fdc8b4f348bd6c728891f6a88f1d4d36f59a7f2ffbe0e4eb229"; + sha512 = "15dda8914e02198a9b6efdf0ba9dd4f37e41ec7c6674b8b32189ccc368ab6ee671e401cd668c5ed57157634220c176be543c277342e708baf7b0110cbbb4fe64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ca/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ca/firefox-61.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "5bab1fe909680ff6eacf8fadc9aba7786d801379a2e79e5da04e973a3a218de8807c3d08f7641be554fd49c592028949e30b262fcda52413303d9044e161a60e"; + sha512 = "230591cd45dd9d3644313b96ea304d33e9c87d6968c37b73ac3c701132bf13a3869672317b135f31d8082f39298c978c07d614f5055555ba9079afc6e17a489e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cak/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cak/firefox-61.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f54a09501c7311890542d91b0ec96dfa5cb634685af4ef0fcc69e633157183f0c5ef906a205fadba6e132c9ee657f7161879a83ea382bbe400694e92c065de64"; + sha512 = "c622e622cc199b8a9946276afdf03f006403bd302d2c62a5076403e6764dfdcd121c1e15fc56d45bdb1751131326babdc9be96e6425fcab9e55d6c689e5959ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cs/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cs/firefox-61.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "28f17b2ef72356a058976da30960af1c8d4f2a02a946aec57b3671d71887573a98375eecca4a2f0f21b37bcbe0dd189ce4ee17ccb9af8fc60d63e9bd20ca44b6"; + sha512 = "8e4d452a75befcb6c2a6e7ed0b4b1aaa8f18d4d61302ddf6b8143e024352a060621c375742748db5981efecb8075268f56811702586189a116698a669408dee2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cy/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cy/firefox-61.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "36c8a1ac125a55db15d0bf7c8d8fed1ca3b0031a9421437b683adf7691fca281a499af6812cccd608e65bbcda3e1e94469b16ead2a9093708c8c2daf4ea7d588"; + sha512 = "349f73f43be8dad527549ff158b267c62be7c0d828c2adcfc635e419ac9840076549a7a51396b306bc042d1d7697c8d6caea3bf0b4e3f42e7c0efbd5b8d92e1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/da/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/da/firefox-61.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "fd8c669362fcf945b6280d103d1b9524741993db8d38b78e494ae14106309999d09f4b13d55b8521612cac9e5dad622ef361fa16f197389405ff620b3eeac467"; + sha512 = "187bec61e1218fa6c2fe79b3e80066a617ee3c26f83aa16b61a21e3fc76a64c2c821120f9206240642dd10175b6976c352b13a5b2e5514126a3840524fdd1de6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/de/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/de/firefox-61.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "32cbc3d054628a11959ccc7b553fdcf98f863a86373307bf8f558a78482de0161e533b71cbfc03142b0ac7aded506e53e821213e42c574d28132fd2f98a753e4"; + sha512 = "8aaa8aeecf1a2dff922b785ed3a4cbf248454cf010ea9c188a4ac70f0550813944a8e9265c2edb13bdbdfbe20ec5a0dda3168d2dcd529d082bafcfaef6271913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/dsb/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/dsb/firefox-61.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4e7c2f6b980dd4872850f7dfcc068c7e40a8bc896e27ede759029bf0324e1189e605ffdd2291d2e6a4a0c61e56bff6cd760b77e232209127e9a90a38b012e4fb"; + sha512 = "c821eae950e48de43580c9dd4af7fc609927e3fd27ea876fca909bb3319574663120688e442ba83acf1d273e1fd22a87d0cd934e68151edd9a8561015e58a47c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/el/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/el/firefox-61.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ecf743c23ef70e92e1f7ddfd2f1862b5b60b446f0e1020778a79ec11af94ce5f03ffea9b0b7048a7ee0861602d5c32f4f4bc8cd4b7171ae306987e1ca9993ddf"; + sha512 = "afa286bd1ac48a6007b6e5072bce0a26482a0eefdb00aee824de8c4dd06688d16731252933cb71b9f3bf6d30f951c6df68c2ede85733edc81facbb628118c72c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-GB/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-GB/firefox-61.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "ddec1dfcf976f93d1eb310ccacd9e04dac8e0b075d37b54be1402531d12c11ee9dce2be7d0bfa92c9b654192c71781fd2631cad24c8153275e786552b9ab11e6"; + sha512 = "c2ca0c9a72503ac5817ed9ff3736b812005037c51534ef9a159b7914b974a356f3f1bc89d0669d05bde8dde124f2fcc3ff3a91cb412ec0329c2e6def875219fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-US/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "3257084102282621f15207af04e6dcbb98887b13a8be911069572c151d8ad96f90e7c083e571b4ecd4d4d4ff3bfeee1dc539042d8e5bc6a0fbd7f36c427da402"; + sha512 = "9f32b33727e5877bfdeb186420a02f185896a2a5803565a811203d86e84d51ede06f27d63a88a482028c36b65ed92ac4c17196aa2069370d6cae09b74bf482a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-ZA/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-ZA/firefox-61.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "35d2f29daddfb6ba439b160644869bf806ce7a2e36c26d4dc9ef2ff2eb5079e0bda9095edd727fca9c64c3be5a5646e56892bd7ff76b2c67300c1ec7f074d98f"; + sha512 = "e41b7ea34f193bbcd892030b5feb2f117bb5f3f9dfbe69560ea64b7936bcdc47a55e878c645786999a2e52c4333c033320eb1ed9aace3481a9f37d87c9ae9ccb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eo/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eo/firefox-61.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "867ac54d47f2266ad357d1666c9206c00e45d7184f6b3a0199c2474b63829ad1d41e95491d2c977885e878d36e2d7e93d215c53e629886e7cb04abc198a06e42"; + sha512 = "e0850feb028cf0644340d2842b054e49608cdc1afbb9487ee744f6fe1ce0662874f0f96de2da52de2e0abbe39d7ea430efc70392d555e7cbff7a46f9029ba9fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-AR/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-AR/firefox-61.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "3d577099cb28dd4c4d1349141a715783215510d015f7b2b02739d530222ece5229ab3e6cfe481be4e9d1d17c40aaacac10af9d9c2be37f7956620924e56c87e8"; + sha512 = "72bde05493e4c140f6022e24cccf0ca580ed3c423840d2631cb28ce8a20be92837f78cfaa3b09a324bbc0fcb064ced351fc66a0edf2c56d972f629aed6662dcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-CL/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-CL/firefox-61.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "821738beffdb260b6b3d8b5c3a1395b6b7d58db6b05a744899c0eb83a291855152f5055c3ca6d9a460bd032d5e72829198cb72dedfcf6614aafe1d7b8189dc26"; + sha512 = "4bb298e184263edff9100e1e7f58cbbd405dbc73a265a5dc1d78e8cd25e538d34ef0994b6b5e79082fc12f1c0b2035c944e17eccaa7e1bd92eee8d27d8f50400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-ES/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-ES/firefox-61.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "10ae818fd27acc38a5386d06cd7d890d4eaa44407fe6334b81cdbe3f43ded90be72e749f075e165105e9a6f02e08014aabd7cd783860d6790b67eb2889718e5d"; + sha512 = "13d7f54f7899eda53add9dc4a1bc27fd30e0caaa9c5a95d716c1ef8382c2317733cc7a71aba9aa4f2a024717eeb09be7fdd55dbf6183d1679e61e3b57964e61e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-MX/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-MX/firefox-61.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "239d3c287eeface29994c8c2bb9bacd739d638cb277e18e57dc729e35cc0c11f6c7168673c110206f3e931c850bfebaf1a26d4f690d8f3ff6f85a61147522941"; + sha512 = "66c24cd9a80da6137a94bf9cf2bad4ad3ef0141bc10c8d92435f9d89e11712afc08018d7e1b4f17fe03e4ac62b2f6ed1cec638dc7d0726bf27453e1741a1ba06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/et/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/et/firefox-61.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "824b63c3c596191f1f1c60734bbed70058cb9bf71959dbba759a2b2e75a76d0b0c50ead203c093d568a18bb622372ae112ac22da0a33e4cfe89e5a42d7329b04"; + sha512 = "a7a686b1e16b616a3aff8901148a2818cbbe2459851660a23610ddfb4b8109aac159fe80986744bdc4124a10ab160d2703b2e8f65def0c86977bfa3fcb3ab020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eu/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eu/firefox-61.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "01e0991d3a1926f41708353bd98e3aa00d3cc71dc7635b9cce52c3699aa5ee670818db76e9d82de4afce338165fa01bb0e88c3e8b86ab2d92d1b8d3845183510"; + sha512 = "0760621f5d053fb802a46151f6283fb7a0b7de5c22ba0a55ae0f3056b0d43cf16c6da79af8a2217a665825a840b9c83134128f455dfe6e83f473290e425ad396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fa/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fa/firefox-61.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "726100abc12832418c5cdc15b9e9083d88d72a70a0f6a1a567ce781173a554cc4495da0e53539185e6ec27143bae98e952a5002dea91fceaa5f8d8e51b6d6a2d"; + sha512 = "29e8466e754900b63704206b5b650ea60aea841aebfa58187013a495a95dd32d939308253b0f856ef5e04d3ddf320c289e74cb03830a16374e9fe2c03214a1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ff/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ff/firefox-61.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "1a0d97e27008ff5f3bf3fe85cb14c303320a3015cf928b2ea4c2e115a5a1cfd809743d801157f53d6ffdfcc359c3738f2e2a0e12e5ca7ac8e3f2b93253654e8f"; + sha512 = "240232a8dd4556c5c4df872b60b3352176490b7afd4388c26322008c7dca489f48f679c21d148016965ea81d850eaffe9fb7887b97cbbbac955f9cc29f28b4f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fi/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fi/firefox-61.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ba0278c06463d0ef44308f46326a3fb9dfc0cc4243086dd9acb856e54465ad672bcfac68afd9ff81d08a1d0c924a044e0ac5afb299be9d06b657c159f6c8ceec"; + sha512 = "63c7d4ede5e02c9d4b2e59234b57d4f539c0cd3666a053b127cc18d080900bcf488f8d3d7f2dfb98399a1cec5ec6780d86d93ad9dd2ce7612e84604481562a64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fr/firefox-61.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "bd8ca7884937574f0d6b4dc5399771135778aef06bd09aac275ca11c2a8dff580be45ffbea5ceb58f8baa7d7007587aa07c3ddedd407f0852c1a3940e7ccfc8e"; + sha512 = "3a4263e78c62faaab850c743660e633269dd9e625f03f94459b34ede41989cbaf498755fb8c2f507e4f4b88b633c29a3eae837ffce0572ee03afdf67c53d4ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fy-NL/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fy-NL/firefox-61.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "9e5fa467a99cd7a9ab102eb2a50ef14a4402d03ad3dec5b6d511c7da3843e779b1492b1ba22cc72f83070ff88353ffdbf1a9d26636462c0e3bdaa6dccd6a6200"; + sha512 = "e8c7760f3f64b4c525bd0521cb66ed11bdd9142deee986fd6a5f6a322685633aa3539f819e3ec886884906998d37dd6401b77e4790a246cd098c47cd49f929d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ga-IE/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ga-IE/firefox-61.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "1226faa2c14196824f31da863aca7d076972a47d71a971847c09c66d268d07a9aa2677fa0a7e8f11f149b77261636d62c39e7a382db3abb2917bbbac74330d45"; + sha512 = "8f59620f30767cd58babc163b803b2c8b174562e5a6a686c5a586d24db0da4c4ecf180c13673a6a434faee02c2b7ef746c1f10e45055d42327044a945925e514"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gd/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gd/firefox-61.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "eb0dd803b7ba91574a044503d2edbf633e08c834f8eaa5e546975d91ac7254b3fd4357710fe4627d742a2ea3e64f568a5ef1a893363c516f958e4a153f528f12"; + sha512 = "ba496ad0daec76e2c6e4f3c2dbb8219d1f3234893acb09602e51b7bfab4ef84d9f49104a021b206ff528bb323e2255c97e92a6949b3949098e5863f48e9fefa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gl/firefox-61.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e789fdf2452043165df90c83ce4bc0ca641366ffe5f89026bb763480973073d79c097313b744c3b2017be3d80f690d18459d1b8969538ce310b802163a2eec45"; + sha512 = "3ef33eda5d7a88fb6f67f91983ab2db11404f58686ecbe30dcbc27dd1358660b4c88ab8e678184cdd3fd4102f93120e0d0a4d75435812b047ec2bcb74cb52a83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gn/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gn/firefox-61.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c368f07013b7b4fcc74e88d68a07d5d0a1fb5133991fb343d5b1a86145108e14a762962f3a3d5c7188d8cd75188cba7f26bee5555d3a5e7cfb9741e2e11ed42a"; + sha512 = "5e86c34b627b66872a7f07e30ee6285e61d041e69b0e2355eec142b23ceac8ea5ef7e257adfd1ae877b442f7171381cb013fddd7593d1b6e42f3a22e2267a5df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gu-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gu-IN/firefox-61.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "34795309248224a31ef64cef9ff335f357505684f38edc06b9365dc0da98c5b96aa38f21e317e5f0cff0d3d3fa94ef7f8aea6c27f67501aeac68c3112b63cc43"; + sha512 = "72e43c4dbc3db08473d96d0686fa2df56f82ebdbee064a152ebb2a49cb4fa7a9a80135fa9b7106ffdb64d3342b38400de5351a3b225360d5a730f0f4991418f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/he/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/he/firefox-61.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "05e21abbec43babe818f28f2f12e55159e413b0e6e0871fee76f50c380085ea129620864642d3d26e80e039a50a8434015ed348c51341b6d87190c627b90bb82"; + sha512 = "d3b5a43aff6e76264eec6d211a5a9dd0b7fb89e41bbb265f31091ce3261f4a160e1ddaf59432bc3771bc5afacf1a3e12e42e0d08107727b0e8b5941ff29174c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hi-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hi-IN/firefox-61.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f6964340a688305ac3855efa57280e3b5eb64f22e11445d76fe28edbe04216318a16c1fd02009b8a66ccc2ec689d8e0bc374e485bc03e964dd5b65ad27e535e4"; + sha512 = "7b568bad470b3fa069b44bc0d69fbae51408ab44751a99fc36a7c220548d0200ec57d8362dbe1dca7370e587d5aadb45b5c9dc91e6d267f2421fe5a2260d29fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hr/firefox-61.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "e0966ea4bfa256eb3a255eab7c89fc9073789512941311863199d96db4014f657acbd1e403a6a4dfc8165dc39d54fb1f9ef48790e942eadaf90f0cb7ffe15ef4"; + sha512 = "c69df1a2226a967dbc0cbd3813ced6ae36b696389187489ec62b78b3180800175d3c33b07bc84c45112947348e160cbcd6db2e68d5e4b6f07e0a2f6adfc8fd2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hsb/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hsb/firefox-61.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "e8ac60e1b925e7530884777a4ae05037e5c577fe6dc834ff8a007f473846b052290787d3d2f0c19b56e573385b6471336208d360c4c13a3ea3dd686429c28fe2"; + sha512 = "080ad8f1bf263f96294e3e6178dd64d30a7fda50d229081b14e54bfaa183c6efeb0ba3aa66cd23c8541a622382e415a12e3e063cb3aace5619d3c8c212ea3078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hu/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hu/firefox-61.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "737634b022794a37223779592ec948015a90c6c96c952acff5821c3af9c060e7fc60c988f17d87d5faa822fb860e6697e233601c7fb910ab5596935fce12ba49"; + sha512 = "44f07968bb89c3c0e2d365f9cfd45d89b138a269cdff48542124a34f9d9ba9df5103e4613934c504f90b494fe20bbc6f71a12c210799e689e8f69405ea22e4a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hy-AM/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hy-AM/firefox-61.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "53d3a10011e8cbd22bbe86c6ed256775de580f7b8094ce30d8337268362cffa2df85267fe11432f659a012047a164a63d1c143014c0dd26ff865760119223f5c"; + sha512 = "8d3ee8a030ad60ae2de062b21437e8d512ff3feaf614b91da71ff6af9d3994be79aab1753e3d46a94237d7e0a49eb670781c2567f96662b6057ee7172a0363c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ia/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ia/firefox-61.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5d1ba2fa31d3c5ee692d3bf8ae0995ab166ea0c31044e056b4806bca141d34f93ed5117630c311c072d22cf65d12efefa812203a8237464cc9a285c236439810"; + sha512 = "448e543b5f7075e2e1b984c808dded1ee67dcefb600058635c87d0c226eb02aa8dd7f59c624ebec60c9c0b334f98607eba88e111f2b03a1aa579b74b1398511e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/id/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/id/firefox-61.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "b94a086208cff6fa7b4b3f7eb4d681e77d2042ef1c6b21af322ef7316b8551344aa72c3d7a39b86826b8c6d69f847b9d20f60143a048ee28db88847dedfd1d37"; + sha512 = "a1f8eceb53485ac41a685f98b1e9dcf57ac094c0911ed8f9a862d4b3a5fa8072c16fa6a4cef3e06d15b07b3866397fcf9ead7b4b43143e0f5dccf93acb2f7676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/is/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/is/firefox-61.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9767dcbe58dd91364b313f4b7b8f85e1768148080ff97220fa1dfb3dc8d5a69e6fb8fbd607a92411d5f4adbfb856c101bc80f922b0b1ce8b63a79039e84c329b"; + sha512 = "43d6ff785394bdfb6c376588531a9fe043b18fe44ae83f481b11d71a2422b5d5022356cf960d92f55fb3d0ee103e6534bc0299a3d84e9ca7e6b3a5544e11ad45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/it/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/it/firefox-61.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "f8ffccb521f97f0f18f70a0cd2cecc1c31162072bbbd929a1952823275d7b7d07f36e64bf6811e1aaba64b880c432b1dd342483b9ad5a594971a0bd068c45197"; + sha512 = "460385b5854565f4ca33431c573ac355baddd7a35a2fbf631b3748b02102a749e56fb1128ec3e9f6b721b1123578060641bc3b783ece271a1708656626b10a13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ja/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ja/firefox-61.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "bd97cbffe8c4c1ca0fd8e44615a6e04dc5929c8ab896952911a04da3796a9132f797a4e32ee262af7a2d8bad294a30e11349731306d86ad18200715408337437"; + sha512 = "682430030d87391692170bc81d759d806f4667b66b4e3df84e836e65678f274720038d0556f5338d8eb18e281b64249e758b5265b3ce30e6f272ca9d84ac1496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ka/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ka/firefox-61.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "1b5a69053263a0571227e614e0ed05ca1cf8bfd7a6294fb82778c2bc99b209fc68b7d644cafa223686ae2a54ee125036a91a3a847a753c194982c0f2327b3b49"; + sha512 = "e8c9e6a61867efdb9d021aaa8f059e3ac9896444448b08b7d90f70fb2847d46d1950a24e6fa2db0b947cf3ec628bba1c230ee7d8d53a959928122018a9e5c7da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kab/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kab/firefox-61.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "33805bf3976c9ff6699767ef69336f06eb86f08b540b54b33c8997b6af42eaac6be7b9dc8f29d3099ca9530209516ef84e819fcf98f3a7bef3e8d47be8d372b2"; + sha512 = "17636e7157d6cf3ab73b7e36eeb7ad5bcc35e756fe6d369b98305c58b88208b5b11f673f52425363425d18c2a7fe79274a6e5babeb926adc9cea22afe3e55e5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kk/firefox-61.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c2bc89ceadb7ea2c81ee2b4d72bfbeac8a34cd1838f0c2201d7ef0c819e597b87a935a0e6be0831b997ecd290e286de7a1c9b903a10daaa5dfc0fdec2309b260"; + sha512 = "4eeb48f250c617ea8eefd99fb44159170311becc229f77ca014e801594260ea23ce46ae11e0526ad620dd830b857b73de8a3a90c18764ab2a8f71cebfecfa143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/km/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/km/firefox-61.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "cb1919f31651b38a77683850077cccd73c27496e1f9b4354accfc35f294d479b92549ebbfa173fdfadf95b03bbb45cf1baa0c8a4e51f132448ffb9fb2293a67b"; + sha512 = "57a0bb58ced30d8743c30d288250328568758674e55127d51e99485f5c85e8b0b300aeeec4d34526f53d1d538189b75925eb907e3b5fb2d455e0546e179dfe04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kn/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kn/firefox-61.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "4293747292be73ccf60a19744120f9cc13b45a7be0c5de4243dacb5a2258eb88391d6dc6b240420ca5097ff5f5e2d5d36240289f6a5c51ba7d0fd31729d342fe"; + sha512 = "c40e9f5906cf3968bc92932f45d4d0b712322e6efd9a5d1f3b48a7b94a162c6390142081a8a4fd2f0fb8737869723432eeb5a4b44c3161aa38a4d506bff8a3d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ko/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ko/firefox-61.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1a4723d890649ae29e9030ed2fe3208e44ed10adbe35c25877003a6adc21e033278874241bf5fc971b93f94d33fb4b503dda438153a8bc80b187b584841423ae"; + sha512 = "3f6104ed9b2fb9f1b0e3f49b06aaaf513ecf7e31b417af90c11403bca7a3ad51a87b448fa0a2ae6a01462b57dfd21f90376421ca8cd9ea62b0e3a1c7462aa9db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lij/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lij/firefox-61.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "564260546bc6436dc47ebe6b413abad6d2d25dd7a64d9b5ddbd52fdec49af951b9ce26f3aeccc330aa9601605bec7b3b1f8701668d2b01ee06a228f723600fc1"; + sha512 = "46c8eb64b30455ed97618d67215510b22acb6cf5946ba492c5938d879e656d983accfcd7ff2e93cebe7ea5a52e9fca348ebb9ba02e70ffb4196a9d9edf5abc51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lt/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lt/firefox-61.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0aa6b9bb99ae8284f7287def5048af21372d03211a279f2226de7a739523fe189b3e06e207660be7ab35751b5ccc6aaa1b53dc293417971300a4a8e7cc162b6d"; + sha512 = "54470adc31bdab9745f72598d402fc961d6b407b6f8fabc8e0c6b785a5a5f3e9922e06a922688c6bd1ba43be81ed37bbab216fe2182bdd0b32befabc55fa1a48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lv/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lv/firefox-61.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "f63955b57e40d2d49d5d1b276ad5b2bdd5122daf476c560dc64e82afa36e4a649e384957c69609e74ff96935004ddbd45c8043a27991d082e59e0f42e7221aac"; + sha512 = "376ded474c9c8a898bab54b66a4a9e9cb598dee114d9a156b9e7fb925250511e610d2e17a5decf4c2db44f227065cb2840265d6955364a1405060ff022b04d07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mai/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mai/firefox-61.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "7e857033b14656e972ecbb6f60454cc63f79a9c775bb1fdc669f44af3bde4e1d04ceac3f7028eaab17fccd8136c417d937009b6fc0e80c45200b279660924bd5"; + sha512 = "21643b1b723a42d81bb4476b16282d2550100278a221b5538d5666c8fd7f3e96f242393c4b175cf6431e82458e199fa80a51ef0f5bd6a9b691d0150bf1d4c8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mk/firefox-61.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "8f7bf3418145af3ab47372af8e131b4a8b350dcfa8a7f74720a96812563327a4e4816976c2fd655fbaced91fadeb98489bf0fd043e103e5e0923b9c2ee408188"; + sha512 = "452571329b805586a1218dd5fcd5b48f7f20fc914ba006441ec3642ef8653537b764a98b7916c0e440888d60d41b290826114c3a37083ec098fcd6c86a6adc15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ml/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ml/firefox-61.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "b9e65dd54f8b4c1da28f6079938320f9943ff94ea0a0a7857192805ff84b53e7de6b762d05f8a66b6dee9f8586623932c5cac7163db2829fe41a13b3c73c27a2"; + sha512 = "8d2c850525f9ffab96c4d02908440a9a5f4b6fffc49e5505d5eb33d35d3690fd7a81ef73aac810d0c52e0deca5b69dff9eb3f0eaf508b7c866442943f7cf9547"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mr/firefox-61.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "80e20cc4d30dd2ce2a7d5c40b4c98271a0c0834cff7bf201c3db8df4bece056becbe71dce7056d24b837d16889cb15ec73be7e853384d88447d9d00eada4fcd6"; + sha512 = "1eedeaa3a2b6362c460e468b28bf7efc9bb5c960c766ec9f0e423834aaa67248c5bea0fe9b4fc0a8e62b0a40d8dfd1e7ff31adfebf6d1d6405daa02879977015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ms/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ms/firefox-61.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ab4e6a3c244a7e1c4683f58252d02865cc9e8be51a2fe189d8bf555c968260dde63af130a491a8c3b093776a1d1d6b883e32b4054c19a20a9d1856685b4cbe35"; + sha512 = "fe2d5ae09b8921d366616eaee49c240ff529050e1b3f97c915d91c23dd67b22d78a75e14e2f192963f0fcb05eb812da2c5f68313599111d85c1abc0ac9dbb676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/my/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/my/firefox-61.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "aef82a1dff4adc9d93c967ca4fa3e4601772e8b748c3d41a08d2893667bc661a0c640b02450bfa647d35b9c097919ce90a4a4034f83cf4ec51d2341651205aab"; + sha512 = "631a6059d38a64c24e1f7d2b9a27aa2e405fe413471ac1e1d7ab337f614df9a1470a091de35904c39664d679c06eaddcd239c4a392c1e2ee548ce0be7fd5e416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nb-NO/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nb-NO/firefox-61.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "edd9601c678f8f551fa379d7f3c31d2e4c68434d9d3401b40f2945622e6c844993fcf3aaf010ec5b3bc13eb8c8cbe951d76b66a908b4824526b8da368361a347"; + sha512 = "90d0c3c696ada86b47e9a6ce8aa9a8d0939eedf5746ccef79ae170a935e6b97906b187d7839af158a6008a9022cc50467febaf0617f3a3b1e8e21fd648805d13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ne-NP/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ne-NP/firefox-61.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "6d7a5d81e0551e675d8dee4be7fc0b8a39afb37b74949d408f197562bb8d7866706dd1b9fad60de4410cac9bc91a4ecdb92aa75a60b2fc2e2b7cc51fc9e46c60"; + sha512 = "b5e13e214cbea0d541aa8c29d53afa4ae952970a64bb5695be62ce19c829df901dba4c66cfd03d5d3a31f69041c9c700553b2689dcc4ac4ef254d155700bf5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nl/firefox-61.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3d4c3714c7d1c7d4865bace3827df94068bf0cfa4037af130cb7ce0a5f6cf7eaa0e37d091fb36758b13f52a5307288e5480ddcae50bd8645cec527481c03d7f3"; + sha512 = "44470b1cc4e95a05b4198ac3458125651de9bf9548dcfbcab5850c519fea01a3e8c6161e4a66271af68d7f1a1b37456d2ae1e51ca890307e6185a531c8cbfe74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nn-NO/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nn-NO/firefox-61.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "753e792e3402a5b75043899a5f50f5926ce31d2439ee1eed16193932e962338cddd974194ac94f7aa1ef0df548d95f901a50988abbf9f3e9820f89ac372e39d0"; + sha512 = "5e49d30ed8fb64e367ea3f5b472baf0caff6c4b880d811cba5db969d21f8e5dd0d8ae4c01a151fd495eab1eef817b35b6a6e14441a860059b8f20453dbe86116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/or/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/oc/firefox-61.0.2.tar.bz2"; + locale = "oc"; + arch = "linux-x86_64"; + sha512 = "bd75cdbb1bcbe24347f35b748ec5d62da6bb20fb0f58f17a348f8bbe19e92ec3d08da3148d41f56e0b42a8e49e1c1b70b40770c737e626239b5b538bac6d42e0"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/or/firefox-61.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ac0068afcdd2b6bf5416298e1be065387606bb0b79cffa364aeef9011535ca5c155d1d28fec0715a648f065628efd2c847f47785ac7f27415ceda1902da1add8"; + sha512 = "e88f706c60e93b205484411bde177fd9b1ea921372669b5665ecebd795d7abcef5d2caee16a8605bf7f3f23e8d0ebf8036c156097318e7f8d3a22517e1fdf017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pa-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pa-IN/firefox-61.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "fe77072b374c34f5026de80ffae16fd4b30705969a795079ef9e81dcf66dddddfe01287dd44bb4f0001427935671d2753d22a8b80469f9c4e896e215400dd9f1"; + sha512 = "81af24b8ab70e373339ed4fd7116e1c4f2bc7a2ee14b46e2af29860add01ab492ec692ee2653de81856d04a465860e4cfda0af4928a237bc0c8469c4899136d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pl/firefox-61.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e4b05ab04418e65880f989d642478023bde4ba5ce17627f806b223d19005b4e6825d8a9d5c532c878a397b3cbd8220c4aa4c2627b17b83fd6f4acc395c0a1923"; + sha512 = "f7b6b21ab27b58ab1bdaaac012dc035e7cb1226f46da43fa3de37c7e4fac73f5303dac02332510eae7a8bcec0172769b620acfbaab8b383a64404bb294d6df66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-BR/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-BR/firefox-61.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "9d67c1264b90dc58ac62fa094792955b75724791b7941354d5836cecf2c5c13ec279cad12f93287e524f0f0dfc2302f68f7585dd783998630007dac806f7e2d3"; + sha512 = "c17c0e7990b4192f10f7269a5c5c6c74cd6e6353b8649a0417c537197c5f853085948e9d0c50f08afbb16e242f3d8e9eaa1e9657bfb6c40075e5f4e640771d2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-PT/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-PT/firefox-61.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a241e003b6d1a3537b5232fc793aa6dce194433028987753bbeaa5c21cdec58b326e12bd4136656cb35bae3cdece5dac100f912151aeee7548420de2d3875e93"; + sha512 = "2a5db6053556c75d399bbad5ffbfe51505f6b25bcd73008d85f7dba66d89fdf56ee0ba2cfce6e2617b463cb8db087a1700507051322fdd2ea8f732be5bfadb9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/rm/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/rm/firefox-61.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "87ada5bbfeb43e3a42f1eaa44c58e025f66ddce965e1c97de8ca0df190ca18106eacd2d1f28c959a104e79df583672206c047eb79c51a32f431f8cb6fd68bccb"; + sha512 = "94e95e037ea9f924363aa5b80298f67ecc678bb2e22d552c2207af1cdfdcd9ef5b85fa4a6b42ed08167a4b482859658ef6a946adb7462c2e2519c4685428bb90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ro/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ro/firefox-61.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "97c5d69e1e40bcb779ce058820b0a4afa4000b3c12170c63ecff1ad4b5994f71ddf36c49536280edefb971fafa6be52a3b436a405ca9a1762aa08d2cd61022c0"; + sha512 = "dc901a8b6ea913f976c915807bc4ab5fd4a756c98a78498ef52fa8577cb9e3a047e2a38240bf675d72644d975ac70d720f693db056e764218151431de572a37b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ru/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ru/firefox-61.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "74fb10b42eef3a2391aeab0e3dd1ce463b58cadba5c42e2fc8a5e0bdb1f9df122aec65a662c9ecb8a14b1ee76bb060c64de93f116a37d207b4cc0887ecc0e2bd"; + sha512 = "dcaddf1072b19f714e9f50eb1d5e8e15bce98bf96bbbc13e7a4a82581e76339818766e389279fb33d212afa6cea947185de130a3eb72c0f6079e159ff2f18e9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/si/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/si/firefox-61.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d63503345ef7896e9d9a3ecfc80395b6ced67c38b02c19f7afcf94a9efde01f3ac53f1d581b8151d78eed6c7f8eb69f9edccaa3be49133aa3abf2a1eb759a02e"; + sha512 = "5544833432d6b41efdff96fcc8d2d322f5c158764320ae6345e9183b2d48817afd796685bb87998e5e6fd227b1753f503bedda5f6fdfa9dcad2083cc9b7df9fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sk/firefox-61.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "1020baafadd4a1de8118bbdf4e281c704595730937d3aca9c8185a6ada54f4a72b8efcc7c493200c32a6a11e7121ef52d7aace68c47784eb5d17ed7fdda32d60"; + sha512 = "d4702ea94482a276ecafaeb7e991ab850a432158009c95489b2b87a82402c92a84c33ce43b27ebf58367e20d63bc444e656f32cb957ad0ad03b1d9f793157052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sl/firefox-61.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a93e20498b5b3a2b5d19197bbeb48c4502217e44a25c48372f8855a49f762e89438262ccf5dde1fea24af1199bc8cc5c935b1bc886e0bb581d698d10a59d60e9"; + sha512 = "6103a4d340e45af988d17b93c4e8951a656ace095c9e13f5b0d6bcfd55d51e27f9f26614223d40dc19733aee34606a80a221838be86a1f91417a1c6f00a7771f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/son/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/son/firefox-61.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "24411644b553e6f3c305b8a893a7bcd4ed59568a6fb7001b999be114a3e88f30d40ac6f3351c28b3287bd2a9e6aec461c54433caa45fdd349aea07e83401fc2f"; + sha512 = "ea04aee1c01d4d545ab4a370e4be4bd23b9f1a698bc660877a754f42995334446bbc08412bc9f8ec92a2a69a6fb8bd0caee40f622813d9ac18b43773c3111029"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sq/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sq/firefox-61.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "40ec8fdcc4fcec937a710e5d19077243d0ff5cd832bd20365817e4f4ff1cae5eeb2a664906ce7f60a5184fb053735df5825ffddce41276797fcce3a11548f4db"; + sha512 = "6789f071e366dfb3300cf5057d690c89daafe969a8b8b4e5a3ddee6683caa1426e62901d2288da61b8e8c59ac19d9764521b82f2d0d4fbe375d4e4eecd5751fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sr/firefox-61.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "e538596cf0de4a9d8af4e801d7c17d00c1e63c56775cef0d087a77e320cda2269cca74f0c73f679208a184c6cbf4b20c56d1d222e8846f15fc4a91c16ae3ea5e"; + sha512 = "2d079c315d0c66d2e1530cf2d30a357d62f9bb6517abe7313911bcfb5c42ac95c47b3f12f654ea61d2fdb74d44ed0b090443f6ec66ec22cbd51c674084a8c4e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sv-SE/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sv-SE/firefox-61.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "3466f482ec04f5e8827f437c9456908f04e78c67ffd299b841f2f82cdc2c38a61a566c8d85405312c144aa5c45698b5f6e81190aaee739adf4384f95c81f9e76"; + sha512 = "c78e06de0834a84bf0cdd22a46e80901db3dec7d5d9e0dcb6ad850a040e8df6d3ba2c6e68f8a3da118dd9306c7af7f352d9b56e839cf74afd3730b2d8ddbd38b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ta/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ta/firefox-61.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "7598994ca03afb1c2933b640298453a618d140791fe20255789081babb0d9788c4f3ab34d5ede82e1d688f5dc0486fa0f842f1d125dc5a955580d14b1efb6489"; + sha512 = "d996633ce2cfc9d5766840d5198900a341c8158f4bc00c32ef168ac57a1c1d89dc10e9ebfcb2a504273d1722ed319acb9d9aca8d30257a7a6a01361ae7acbc4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/te/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/te/firefox-61.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "759be69dcd9b795f7b1b8192928e27799061d83d86e0234cd2a1fdda0d922a7a9d958b19655bbe976d409297f2e2fb2d2a6a525f90f77fa53071d510ffdc6438"; + sha512 = "81b745184db9c550a135efd9b085e074a0dbbce24d81a16a39fb51166233d84da6c61b556e39b2ec68365ded627b31065d367c224721bf9e99338456aec07698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/th/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/th/firefox-61.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "a46d7eae4a2670615e100707ec3e340d48502b63d6f6f98d4a3140c1bc9d0826b44001bd8ef940c4e786ba5d3f8a00e350faa18d30fcc7663f9c29f20e7a20fd"; + sha512 = "a6ba250aa390005ce6830f14a4f7518062b3a98444da87e36f515fe29d3408b7efe9947a9d865a220b9f60ce57dadc12099c5742012981ca9c4d3fcc0ff4c877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/tr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/tr/firefox-61.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "ec5ecf9c76315d1fdc508c94023cdd60edaeba44ef6ee49859ba0689413819f11f54c9ba787000a166b0fd7f628e3c2b42f42c9014f9e7823da257d0abe88cba"; + sha512 = "55eef864538b70b8d6e7fc2e6af2c73853a48860dfdb1ac5e4471675ebd2d9f089793c1c6cee713654caaa253b059e9e01acb12aa0f6f4efedd09632d10315d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uk/firefox-61.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "430cbe8281803ca0a4e124fb62a8d2dcafb751ae20441e22dbfd45e544cf906371eef4889f16df5c1be91a4eafa193303e053f75ff15fbe82a836df3ef19a5ff"; + sha512 = "2bf67d7523c9b07acbef099dee48902d19a5b542ffe9eb65283524ce2cbcf853b1e3e862fa2a7640160cf5dec8ad884a237f4bddf215304a458a4d9575af8137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ur/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ur/firefox-61.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b293eaea548f8d1e96087e111e96fa35940254477599a3c2aec9bbe005347cdcfdcd79f9e3e6d22829fe52b091d6d18dc04ce768724f9709a6e397838974c45a"; + sha512 = "4127578edad2690915aae81fac45cbc90694b68d593562f4c55a1545cd1b8cdcf3eda18fbfb2dc9fb3e0dd3119fad09db68d65e6fdc09d96aa65440750fcf380"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uz/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uz/firefox-61.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "dc0a6b771469b89cca470a50afe47c642fe6bae284599c876c51c2c5834147cec435508c101f33d76d1e4ce5760f52f3a59592495c82db314de426a9602097ab"; + sha512 = "7b0257e2bf2edf26afaf6bff2a06f9fc81bbf5397c8823a65ee63e54cd32bd2329ddd858a5e1374df64bd188d3d3392434d83e05d0fcb4a71d0a73bb6da224dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/vi/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/vi/firefox-61.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6f7b9acc584e41be34b884da9b9f2d7aae602958cbac9843d73dada11d1a584101e603f9111c24983dc3ca0b70462091cbcf755c93b7811469b179aa2b3ecc60"; + sha512 = "071e162e6919168fa4858aa98d68a2c6ff8ceeb10e5968a2dff55040613ecd7e7290f3acc929f8f2faf3fa4b97cdfbe4fd8b464f7df0c3d1d530af5a9ca8fd71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/xh/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/xh/firefox-61.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "7623715582708bf3e18ce924aa6e1d0fc6c8bf38503691d3ede092070860db3a116b2f39ee1e467d286e0566bad594679b489b39d2c5b5885321982689b8a56a"; + sha512 = "7e12d3e453216ce6ef2dd56980a130c52e273b23543a3df0b5fb11c69d1366533eb4875814e5084682c54f86d2cb8a304b95b08a66c8595c8dada69d4e97af71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-CN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-CN/firefox-61.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "9d0e41df6cf6a7244c4aa29913ac664c67463ad50b91ffa1e7e345601eaeba76d8553523b322ae477ef0f0c5fce55ad2e1cf5bfc5fd777d9433ebedcd2474d98"; + sha512 = "1b98d214d15d0163aa91316fc6f507bda61169701a8accac3aa79dc8b6d7260d58813d87ce25d7083f6fc2d2a16519464267feaa3981e2e556298d3cc3f1abf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-TW/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-TW/firefox-61.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c65832ecb353527c6b9e11dacccc9e3d1cbfbb16db1872c8afb4472f632a0e2b4f994af43144e430aa8c8ba6aa6a579d3c024c9111fcbfa6531a4b2b7377414c"; + sha512 = "f466df89dcc7a4b72ef7b41800961828012fe913b2eecdf68f442b492109467ee69a95738db2afc1ff39fac0b6376598e8ae5b050aeddd6fe3d40d0dc8d424b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ach/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ach/firefox-61.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "468b25a5e90b385514b0f486bc3fd09a1e7c8c7230b8e31b04dc4bd18027396078b525fc5b51c9747e642d1bc60be49a7e2cfafafd528d95f08033abd12b0757"; + sha512 = "6aafc9db497700c6c91087e2477b707a162447199f26c87a4921b278d81828e868214501e8b89deb387c097d5768faa18eab83076ed84aa59799b24f62a3663a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/af/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/af/firefox-61.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a3b92e792d1ef58e029fc097eb354940094c8a94da97dd39b1f69610ffdb9a1a6527b01da2b6716c6c199d85886b6e05aa084bab30f8a2d0ba33ad4c2f6c36ef"; + sha512 = "5cfe6413a70265360661dce8555941703feaf9045604313361553769b4738e3febf21a79c8be66e24272fef72b41dbf0c3a2e8e76e5b992789250d4b04fda45e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/an/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/an/firefox-61.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "9fcb76d123b657b9eb7c62c53c703ea27afa2f41b5107cd67dc01923ffb9dc6d3f334f5d801058f05925b18afea289eac03dfc3c2b188bd2059f4dd0c40710fe"; + sha512 = "cdd9509e49d563ed3d26f58fe957375357fcee36fca7526a20dbd09e9f4f2867c81508cb637cb8d35572bd730b13ed34fceb0af4aefcff631e632bb78a6713f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ar/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ar/firefox-61.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "eee65b88c2269081dd04fbb37d360b0738e6527581e60dfef60093719a3a15b44d0d594321b4865a35784d2f378e8d86f308736d8be76c1cb7d39152b916bbc8"; + sha512 = "906d0020510eb911d7b2709c55cca0e4a69638c685bda7e7b406fb41f385b97ed95ee97515693d72f722a619d13583d227264d0819ef973f01e67427a269225f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/as/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/as/firefox-61.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "f2e54d00258b6f1c55bd8a1deed5e9c9b1e6f1579447ad832f348b50bec8fce66e50c78b2ee6e05c885359a6b2b1f9d298e907fe99478536967103708143f24a"; + sha512 = "2fce0d7c990c7e2039a601ec5b5feafa7da368e24f363489c1cdae831bf36a11e2bf967ec4f74512f6ca06095ee3a59982b0a5ea3bd003bba9c3f4c763b9771e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ast/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ast/firefox-61.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4f23798708447a4a3801b392a2ac27207df7d2b722291d3836163b3900c7745404399cb700873cf6afa70121c429ba31bbd8b0b1f597e8c91b2f970d0d6421e5"; + sha512 = "872e0b0962b7d6f86663c0cdf5fed6f4927f4a24bfe1848debb605e7c19bc574d98bdcfb74a2e5a4362c27ed1b9372881fc1418c742e4cfa75d15d838cad6f87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/az/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/az/firefox-61.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2f12c45870d5ac1a6baea455bda954cf3b112b0a3b46249a23b7cfc064c6eb00cf0ed2952deb220777cc084fa2345368b95388e143dad6e45042e7863c6c3038"; + sha512 = "dd92dcd6f0c32d5487525cd88832fb567ef0e8fda5cf7f401399992243146bc2690881839d5752ebafb4e7e099c6594c71ef99d5509d94753256507216a2532a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/be/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/be/firefox-61.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "f70af6a6f464b6098802e65226b198f670e5d9ecb2fd56f9c375cabec1e602211c4cf7d80e430f961bb56694cb1d546aa116c7a5aaeb06d13319ed41e3e69ddb"; + sha512 = "1eda2b0945a4d8e70c0e61b187abce6873b9a8a578c089cb66b2728bfc71b90aab71b57599417ce775b4d5fa1c0fd908fa4b9b3183a3aa570da95d4fd726ba84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bg/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bg/firefox-61.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "87377e96a52ed8866be4a3e6ee9c20c6d8acfaaccb53de0d2a4fd553060166c20b3677a2cd3322523f3b3f7d03618e6a6c27e485113184698207cd4b88b7e699"; + sha512 = "597dc8972c670f67f34ac23ffb57506b896efc9436d36270dbcdab484dcacab174aba53671f5462ffc7b54b9718c0280a66734e789edeb7710cd7c2b9fd602a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-BD/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-BD/firefox-61.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "0d275fdd76d8ee85615f67a11ef46bbf8b718c54a09cf6f3c7f2336098e0bc282caf429a4b228e31e7c3622be41f41384af174da9fa856fe36dc46271f55ed1f"; + sha512 = "79989196e4647c035d4af9f24dc9edfceebf9d90afb1efe894e0a54e940ffcf32e3746b9e07b486bd89a11ef8f35cfaf2e61992071352a561a535bb058c0396b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-IN/firefox-61.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "b77374481f21f37e246eb325ee41202fed9916ce36065a88f51e28fe5a015e2df341417b3420d2bff0df93437a56adb4e1fae0422bb094918a19157c655fa34d"; + sha512 = "25b3d138308e0667d62e41a8384619fea548dfe441cec761c82e238c1f0467300d6abc89d265f22f1d9699ffa2165bbb7dceab76169a78acaa4bb1c46396182e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/br/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/br/firefox-61.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "ba071fe6a668ebc7c00baec930a568a90d03c866a0b5f0011b25e8427f40fd32d54fd770e94610da43775a882eb27eff6359c67d65670fa0fc6179e788cd1394"; + sha512 = "8f18a08ed64cf071462b2eb65e0965f4b3825857e867da2898f959fbe84ea55cf19fbed289a4c4e739e5c4fc5392f1f496feb6b4f383e86a753f5041dfa333ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bs/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bs/firefox-61.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "de70dff3aa71422c96e17e637bd56c18d4b74c8cf1ef5834f1f077249f6d7d1e95703f55063737b464916b2aa87eb4469d197e3fe772d168d184e72979712e65"; + sha512 = "2cd2a33ff71b4a471d694912f8c102b53327f1bdf005316e16d32ef17a510784cfeac972f9a854304b07d6c9d19459b19bf3f7e47caae2e58a635fa555115039"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ca/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ca/firefox-61.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e197d847b044a9ff4e09b67c64a2e4bca5eb2a1770ed4cd9ba965342106b7ec809950d611367308fe2c556c4b413640f050cbbaa00532402d71b59d51c4b60c6"; + sha512 = "78649a90b8e890adb271fc57328669afb49f70e9f323a2849a2071b83125f3f1f40e13beb353336a9c5aebd930979889c719075b49ce4099715951164d979926"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cak/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cak/firefox-61.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "a716ff884d1d5260b9ed830877223eff731ad301c1349c9f1dcfea5b9dbed0770269c27aa8a336516270386c4b896a87721e3a5e433e92bd579e0d88311271e9"; + sha512 = "8e66b6ed5b20efda281350535f2b08892763c2dcb62ba4fc764b598606a36b4a6f3d5960919a8f2967f736add11132252449efc4bef827653534b45566ff69ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cs/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cs/firefox-61.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d66e5f440b2bcece18013499129462ed20d85d9b27ec803ed27bb7d4302d2369331b2320970d256b6e61ba77d93e362171ed012843ec926047c281223218a25a"; + sha512 = "5e81414b8411fda775b35704de90d006be40cffbb51b495171b9f69896b9d486e4438bcc2bd2f3775ab5f998b7b41599f44f92ee150ddbbb2a84f64058657938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cy/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cy/firefox-61.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "87c2c1056bb56b5fc3d1fa9aaf8a1d99a5ad5558016b3953d0dd1f7c70b989863fd1d66f6a8d7a0d14fff351dee8f436b89d5dc593e610721068fe187055aca4"; + sha512 = "8f4c5db5c760e16ef258bf2da401e51c2cf3d75808d83eb4b7adfaea4c2b69bfca0cd92c9cf69d7e4de188a2c43574d37c49b3c641dd9c8edb7bb6aefd2e4755"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/da/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/da/firefox-61.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "6243867a2a5a7a30176c4698888e7998c35ad84790a75a86808e6490f013990890a8137579928573564ac7dadaee6efe921579423773a0c25aa57db17a216eeb"; + sha512 = "4aceadbf8cd2ced63f15aed369d98f4234faef18560e767aab1026c876fd3d6a069cbba49139eea60a78e0e42c063451918ce4090e850fc5528a93f527067335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/de/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/de/firefox-61.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d21c6a44def103db09a072ad72fc42d3876fee9095c5b660fd491084301e2d3bbe383b4c7f9419d666dbf280bec59743a034b4f576cd618142dc7f498fc69e5b"; + sha512 = "327c8b22f3ff3c11061b5ee58d1ea2311743e53d804bcff6e66615eeae3aada694c8adbba58f3521b6bcd8f54513bcff1d50ac952ffe5f1ff3f22b52264bdb68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/dsb/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/dsb/firefox-61.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "34446bdb17e81da9ec3689eac248b2ca0fb11ceff7a153bb502a5e0d62a16d2d4a090f9a29e4ff61ae1f87ec68f2fef94be53895a409678d14ad99331058495c"; + sha512 = "5a964d9c25326d2a97730723be2a999bcd8a1bc91b2d0d7ebb4aee9bd773fe93cdfdd94c70cb2f9c0ef10f84474c28726c21c23e19a1fb9b55e6db5c2a74b6b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/el/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/el/firefox-61.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "f5d73ccbe24e30eed81546b6132dc70f08feaac68dffb749ecd7af14052b343aaa4de7bf0ff73924b28b4c5b86c29ca1f6a69caf85ee77d4c4088b925547825b"; + sha512 = "ed1eceba7d5bae11af3a916902a55c66ed97ca6da9f1a6421e4be76c65b25111e2ca7c979c55f920d5fa30146016980fde273c643a5ff4996ed32b82f0b9087e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-GB/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-GB/firefox-61.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4dbf56a7aa86341c2d08b799d76c7e0dde04d418539657f74e18a088df29d390ee10b60c1b9625bdf46ffc4f458b6ca3e86aa93b1a2d948f10b7d7bb6ac250d4"; + sha512 = "019be53a2e1bafbc4ea77730545c40be314d7e4a370e5cadaffd735a2dcb3dbca14e4d23b88dd2e34aa4518a57aae1b37ca561e8e62d7acd3417227f0d18d344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-US/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-US/firefox-61.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "15e93c9d069d0e4761520cefa508fdd7e06cca979ddb9cfa1762d70d104f5758fdccfecb531c6099f9372f112abc88dd273a29a67f720cbfa1be5c440378363e"; + sha512 = "ee88e6d55855a9e2fccf2a362f26177393447dd1210eb8f78992a7760bd0e8245267c4143eb5309a7ac5826b345b8c9637bcc504bb7214d1f7897db70e9c7697"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-ZA/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-ZA/firefox-61.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "772ca9b0318e1175e455d2243ea537a5bfab8d84541a7ee306b3670084240b9eb165935f41ef874650c3b1f5e4632ad2d5c0bce3f29a05a0676ed3ddf133cbd0"; + sha512 = "877cb9d50e95a8b0789660d871f263497279ea229b11218bc9398facb23d78200db4ad19e0030ca44cf36ae3913f8a119abddc3278e85a4c89d298c59a3443fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eo/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eo/firefox-61.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "cc3c98e80c343b065ac8f6af6875d1b2146113303ebaac42c5866d03ff254aebab2cafe398aa1fe38ef8c9d4fb8ece87345e09114145e06a2a7d6c783f1ef601"; + sha512 = "5c78af15b977019cf7402e88b823ab2488b08ba9e8dd27a55caac7570392e78afd8aa972f0f95f21dfb1239936ba23272ed5b84cf24578cda5e7bb1048ce7d67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-AR/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-AR/firefox-61.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "fea909cd16c4558ed05602cab2c3a22186d727da969143b77deb9515ef4d87dd41e59e7fc6a322e924f0b809b6205f37297576106a50b5896b4920cdab2e4749"; + sha512 = "8328fef71e94c07c37491a331ac362d142d44e93404c0a3ea883426c8f11ebf6f5bf6584237b7fa75439c7312bd1f33a2ddcfcb8882c3cf3c526abfae48a620e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-CL/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-CL/firefox-61.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "5015cdb3a1d803abed9a143fca7a118a239e37a38a65898de7ae60981066113f270260fe8e9b83822385115c2b5e378cc58ed68949ef6297e0f7fc1e28c9c8e8"; + sha512 = "ef4e96123acde3a3ed75d8d93868894f859349613b556d44056009d55a3794e78824928eb04afe8746e291fb3d443b7a1b6f63376ebeb65102f7e03067480b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-ES/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-ES/firefox-61.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "81fe49a2f31913c030cb801180daf730855dedc5f6adbd39d7d1d8a4b359a3aeee063d7fef0ce35641f163f5f8c965603bc549a1ae3b2458682c390d16a0faf0"; + sha512 = "934e92d37b920ccb715a411509905c150501eb14d11aefd084f2639afb8ee1a4ce3e869d682ec9f9db4b70a795875f09ca3d7d997f0e621ef99cffeeb1675f04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-MX/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-MX/firefox-61.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "24bff972bb2f27530b18cb7a640f2f85190977725cd82b1e86c1b47578f1d3058fcb7387d19cb2e1dece49b72c17048829bf6a66aabee2592a4b9503e3c4e546"; + sha512 = "57e7bacb006bd079554670fc216ab2c1912a252b7966b32cc25a7d6735f7b0928ae0911b666c2810c63031d57513a4ff800cf92906a95868aa32608eb927e2f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/et/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/et/firefox-61.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "d60b637f9d78a2b9e53dbab8e6db27aafa701af3cde841e056158d3de53d1c0c1032c5381f7c388edf59b1476078e0dc8166e82f39f7c006fc28c5d897f0e1b4"; + sha512 = "b357f29c0f77e7ed4ac764f7feab6588cf322a1807210052359402e5d1092d3d8cf515e04beac86d32a6ddac43b4be8b92d88a1437f6899b4007d2c9faeb7fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eu/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eu/firefox-61.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "47ed51fa6f27e8b7bd9dd0c3556af3d85e6b004d5c6a5868db8c844ba97a06eba4d3998295058ef92c4a49dad31fca0a3c24b19603e1fafccbf6b7d461596080"; + sha512 = "61b4a7b767e62b1a1b4eee4cb024e869969b5623de658ca2a3762c271a6519fb4869c9398e7a3cbb987f01799961021fff6f8634b78dc62770ca1f345e56d061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fa/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fa/firefox-61.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "8919e1daf708630e397200f09b3e9810b3aa40feb87769af5e1f0ae44ab49c63fcda1982cae5ac4753c600164b34f533054e055293a87e5a8fcf55809cda61c0"; + sha512 = "4eec6e7231fa548c0a24b8904b55311058dfc89b2ffb87142859b994aa0a31a07c48107495cfa66bb4a65094328f6bbd7f33e0ca33632457f620ecd90678552d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ff/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ff/firefox-61.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "b0a6f5a974750f3ee5b485872d1e7c51a3d894c4118de139b718e85eab94624be302ce2603233fdc3a75df3f12242d4d57c9a96ca1f429bf9e0613d2b299ee86"; + sha512 = "0a17ac2aa0a855c97b613741d7933dffc4569da9fef9f753a4e404847e683cf10a4444ff4cee5b5d1f86ef069525d0f2635433e8249ef029bfa2c247ed605386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fi/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fi/firefox-61.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "7dc300de36cd860d566a9b84de0ce2c4fdd5eeda4bf641a45e40779e98087c7dc881d2c623c99f8551c08bc84b98b1ab4547ab8144b1a22795710f57112285c6"; + sha512 = "32526703d86dcd74739f419518974ba7f43083a8b3f971d0dd7446caf787c5ed4be82710e3bd53f2d1e9e5dcb67f46735bb55f60ec7d9c49c62cfc2857866fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fr/firefox-61.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "ff793e4873e8895259b2657d613513404953d27d81bcb0c26ac97c3c2ef2c1ed8db3ec909ecb744dcaa7d194b4fa0660885daf96932270f1382742dd55e0f5b0"; + sha512 = "b7e00691c8a1a5f0c1a6312a79eb40ae17e455e156f66da2f4e43beaad5ec35d770b783aba83c500db1fa885b1038095effe69f936e17d69bd320f41b71d4b2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fy-NL/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fy-NL/firefox-61.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "cbb9bf54a401aad2bc8bb869f8680ee4c00e5ae206ca9b7db732c955ee256e4ad226ccb8ffa320cb3e08aaaa787032b3dbed06aad548e733ba43ec87ddb52bb9"; + sha512 = "d8d70ed1d04686cabc9862c5cad06dffa6fa8b975a2a61f0154a6c1c6b182a173abe4563b727de30f414a4d04311744917a82158665883697d26589b29a25263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ga-IE/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ga-IE/firefox-61.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "bdfc3de17be432cb55219bf3f2a3d1371f3fe4776f452a0fb37ce4f5259fadb46487778ec63f6065dfec2cce43758be2e5ed8c5f75394f1604f3318e96f56363"; + sha512 = "352620fb58ed1fc024e8633e70ce3a705fa518cb8f600b3bbcf1c50c440812ab8f04608bb5a3582f96dfb2a19b0d52debe6c4947dff2f06f426710d8f927977c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gd/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gd/firefox-61.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "008548e75853625b690bd92e60cea25c1d9b302f7f78f42fdb4536413c10b8203f337c8384b45c3c9b729e6541f57a22e12ba264594ccfa82742373df571ebff"; + sha512 = "90923e5ecaa85d21d7d6de57c79a3f35b329faa14a74e8b210cc2024f1d48f3aa5c4930c63e8e1688778bdbe998f06c72b5bdce8287ffd7ae05fe62845ba2bfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gl/firefox-61.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "212ce344a4592ff36006e4671c29b7a4734e513d5267c4ed0e7c50c6d0b794547cb042d543feeb55a48ced69bf001670683df159354f152f9d45786cc7184c03"; + sha512 = "339f8ebd6d714945e50be0d18be3af010e2f00924a84df2fe5641b06842278550bc76b01474ad2b2a0feda734f6f2ac9254c008c3a6f942714c684504bdd47b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gn/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gn/firefox-61.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "6f60fe0c208b6447b4ee9f8c550805f070f4b3209632de91fd0a60853cdba70aa9e6653a29429ea4686dff3ccfe5dcc5a1fedd6495c7d7c38b623f31c2cfe19d"; + sha512 = "35de07bd227904bf0372555d81ead164d993410d963e0e733f536ec445112652c04d3bce8f910d0b3daa3d9ef2ff956d24ed680916a5e86c3e9a6f9366d0dda9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gu-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gu-IN/firefox-61.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "0ec6bdefeffbbd52655d332b9c21be2b372f6ee260684cd28216679aa1af267d0408d5ba641a5dcee145b80c357936a090700427520f9ee7d712e20eec13c57f"; + sha512 = "20b1b40d84264f0e98ab91a4e5943da078b7c37816b24443f8936933d779453d640b26ae04eca1b24b3a68134a29e7853bbd544c4cd725b934660574c6381284"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/he/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/he/firefox-61.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "2a4a76c674fd53eed5a73f3ef5d143138752e9d52db5c69d56fd5d0dff1c19349afba6987c4736d53391bc602245c1d4ac9f5c9b60a0c1d561f4162c859ae3b5"; + sha512 = "f8652f2cdc19827a7f2a92e6ec251c5f0bd8448d3dfaa3bd930a4ba116dbdcdd7f2a9c083c5fa93ba2a24395147782146c5443221c6183622248e54d0687f287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hi-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hi-IN/firefox-61.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "34d932f073e803678990098623149dc0ea427a70ed3e604651fb622a87404ddaf25c3a79503f4e343315101704f5cd1db058a262ed47ae02eba85f102a64f780"; + sha512 = "7051302d9315dc30fc8f6ebebaa587b49d17823aae7a542133d2f82a1d5a18e3062ff02880f347518e5f88a0de913568d9f6b4ab72bf7dd20cff5812cea65ebe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hr/firefox-61.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "474f5d71087f8eb2646750bb6a14c993b2d3708234a09b4ecee7b43e2ed75a8b9d249749f16408751a019b9a32ed8be57c5d61f9fdc36ad0f1e7aa7b5863ab9f"; + sha512 = "acc1297166057cdac0015758d6556bc870481d96951e7a14704792e39010938a6c0bafab2cb28e9a23bf24695813e8dc1a80512c1c5fc75bfb8a0d29f7091c93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hsb/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hsb/firefox-61.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "9b9127af72f9f4d780714c41a54d26ac3e8065c8ec42e0ed1318013896a3e8d920786713c79ba626f4930c92d44f2acad72ac600b5735122470fa3e3ea317965"; + sha512 = "2ec761ce5eaa14cf5fa114524f70b93998d76971de7b8d001e656cd6331c32252ef3ae78f54906f5dd416896b2cf8b6f5afcb5e3a02d017d9c8a33835655718e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hu/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hu/firefox-61.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "cec7b19e6e3fc11708c4b67105b191433880b53da8316fc8fa4d6af9eea23cf17423bbfa2f6283490815ee5c7ab33ba8e66ee7bdc201e3eef39808db34d572e0"; + sha512 = "160d7307aeb834f9ac15ad77c0cced4cf7abb855264e10d8a62eea1b1ef85aa3b0a00fa9221052bf4a3df010e54fa198d7033d8450d59212ff36c936d99a1469"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hy-AM/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hy-AM/firefox-61.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4c25802601dadbac82dc260e329db69dff3b69d1eb9237fff76ae6de98a00a79dde0702d4cecfe67016a26e2a7ea4b1f15ce70eb82f422ea3bb8afb9810313bb"; + sha512 = "09950c9536fa0bdbad207b84ccc83088b23a7f2f960d094ea0615de566ac1bd9cf55acbe01c0f574114dd9246bc74e582e67706ec0c34a2c9ed6dea3d30bae17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ia/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ia/firefox-61.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "99b3d9c4533d376ee7a9f8fd364b9b44a8f0b9f235346a60755f144fae4550a6d51993952736b58e28ed3d07a549cd1d2da5223d7af28f187c78b41959e5d733"; + sha512 = "e6c1b00971dce7387e183a8328234ba65722c69c7d48e328223eb7e490af3706298d43c11844505ba2ea5aaf21a1fcf7b3cc8ec8946862fe7aed8128e6c6d5cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/id/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/id/firefox-61.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "27275c8e2deb6716c8492fbc4ff56b8a2061be51101a2a7085c0a4bdf35c0bfec77af1f650236d13096ad204b93df695d5ab238ff6c312f9092f4d8adbc8d431"; + sha512 = "85506ef07ecdd1d466fbb261d46bca8cc4ac8b3a707f27db9083dfe1996e5214cc0e78080f33c2b3198e27e044c6a6d13717d69b43c3ad98a1c43f50b12bb69b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/is/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/is/firefox-61.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "54b6be973aab07231843455b3e0adf8f7dbc19ecd1e484795af7d6a3e346ae717621d0950297379c88a955bd75af0a19497f55015cc624609510fc3ff7b8355e"; + sha512 = "973b863ef94121836f472f5450f8a1a2d3329306f289b8ba09ff811b336196a157cfc966fdffecd54e78f4f48508ca1f8284f0c2d3804579ef82be4e1adda48d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/it/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/it/firefox-61.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "bea36ccf3c3202bb41d09ef07cf4a30d8f3b7d64a96e4955f1e62c6ce1c252726991bb3dbd1d41b840ad7d626ca2abc83eca59a1997325d0f54231daea95ff06"; + sha512 = "fbb8e899b2aac3f4c64ccde0fffa11f8609ca3b7ea8bc05e062d207b46234b2414746822e0fad8d24fe8ae43e3bd8ebf2fc5d26a02365012a95a4070de002274"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ja/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ja/firefox-61.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "bfc409fd6487ff113045732d1826589f8020597958cad12d2b821f496eeb53e65cd4e1b1d002527f6255350254b60a96d9d04c47bcde8bac89483b04270f5b86"; + sha512 = "c6585b28baaeffcdedeb1167aae4d20874755e970f53aafb351a31acd3933e6b805cde1e22ce0c2ade58984ad940a5d8b6857116f11ea6070bfa88c8232bbae8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ka/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ka/firefox-61.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f62ff3d950324b140238dc9e521e6a038a64dcc22c2679b36b59900b0f58b15d774084fdea7a1f82125a7d09d1b5c831808424e63612aac9e0a61320f6a3e4f8"; + sha512 = "136f49750c33d72e7aee3fd5733730f1b78d6656fd45b2aa2299d8e9d01adf13f9debe1d08d8fb9149107e96ce5f5fefce81b5d9a2d9a1e1896cb8df3c588829"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kab/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kab/firefox-61.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "573b7cbca69294ac56fd714308caed1549dbaff2c3716887765cf968c20d0ed37b1e0f2849af2481ef237d7c617c6641c42ecf0337fb0fc18afba82c89def034"; + sha512 = "2a0fd4952c493a4c22e76135efbf155962fb51444328726f29660cb97586ba76c1903d28c7baed9bb4815e57747b5a009649e179971b3c7aafd19fb96be23c75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kk/firefox-61.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0503e33fc8716dd94c455a0a6201334ad2bbe1f3ad9cbce057d69ec77d65bdda48a126464335cee62117b3638be636e8f2908a003951dd2866908c964a9f889d"; + sha512 = "0cad124b5e3d995124057fe0d818121be4f7f186c7cd4ada4d13b89ca5d505a8830525ffcda9a27a0f5f2241fb65b44b8433d95221220740ab8643f374c938ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/km/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/km/firefox-61.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "15797d366faf6f4daa60191e4c91cd9feab242e0879204ae8114ca5824a78fc42941c79d190526e1387ec28d2c150d008d4f69c78c450fa6c6aa9d3cbbd151c9"; + sha512 = "06a58d8d54bf641e3ddc7fdb3417f8a5a2aaa16e8c11f961321c939e803249edb7dd3e08027a4b20ea840298b4a12da20c2771364d2b9caaba496d1eba863e15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kn/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kn/firefox-61.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "53908d7a78feb6b4ac8365aeacfa7cc845af5f324b57e0fed6bce78eb4298b316ccad268d022e9adc409eb9be49b9777c7f01197dad4ab79746b8805877c1706"; + sha512 = "92a9d9e4fc65472200f408238ade4ed23321d4e25b0c7eff9096f23f76e480cea0031159b53e509cc6d3d6b2c0c0c8396742c81f2fc3e9825c1d5e45a35a12f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ko/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ko/firefox-61.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "ee4bc8ffdbd1a329df5dac2580122d883895418b93c69146206ae4e516ba1e5e993b23870ff487fb26df198b3ad73b708f9cd1f8c3f6a9f60dab73dea6ecd373"; + sha512 = "dd9d7674f6261a94cb00fb823a02cec12758476c1ca1cf6a973eae78dbc1c94ebfcc14155c035966781398e1d3262e000da4291e90ec434756c8c3ba0de7b7b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lij/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lij/firefox-61.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a3e92d13e071ec8e76c9a4b946fadc146664263b5176ecd56dc6d412d4a0b8165b67c6be568805455e2179dacb2dc9d5d917981e3b6d52b8ce994d4062d7aae5"; + sha512 = "1d01c34ab89ff1122147685b0551aa650f5b751deec35a5e7d64d6ba46272e929d7f1c49601fb2b1f5514b840ba6554af892c79c1a3f71af392216271d206cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lt/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lt/firefox-61.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "47c6066bea50fa958812ac3389efa3408b2c35ace30c99d9ffb91ae037f1a2444933eb081992b97e3419554ef6ede9aff7c445b5262a59a324e7c1301059f149"; + sha512 = "93d3dfaca37a668eb7c43bdc74ba521bee0344fff43ff9cefad5e4746b7c3ccdba445f97577338606951a15fc5e629bcd4b8cb979842fbe550d3e7e88169b3a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lv/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lv/firefox-61.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "090db495b0e0883e0e378d992a855aee03e2f2fa02ea257522485742e5a879ca42231029c2e36b8a8c31425e343ea0fcc2568a9a961752ca709737c3b3bc32ce"; + sha512 = "0037d16778bccde9146965d7553513a21a443960cabca4a65b6f58ca2ea9f243b3405d3993e8ed078c1a2b7bd636deb86ed829f8f699400fd755f35cf048c463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mai/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mai/firefox-61.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b073c397f8d5196e14d0bbd45485532ac11cd01c42fba883c6d2f3b8f831b6cd6ce095f44e279b17ec60a12e48b776004edbc22ab76fde69af875842a48fb2c6"; + sha512 = "d8025e4c4ab5b7e9b2d8dd8afbc221e1765eddf878943c4daece0e27b7443e7e17de3e400d99a5ef5b62a5ba9e3f2a4c27112551c8c0ea1f81136d6d74b7e91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mk/firefox-61.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "eb20befd569cf18a9bd8455d56d152e48b194e6703cc21457af6407348f5db0405d9fa6a7b503b8c72c96b9cda953c3e0167e5803f6f62947751e042562ad427"; + sha512 = "6ed44201501bd8336615b29078de4e52374712f857e2816732277cc37b6f8b305af0861894f3f70fa62fe2de6476d689bc5b79bd245b4dd750dcbab0b448c69e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ml/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ml/firefox-61.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "d91c916c45e9ac2abeb655bb318030553139294859701ad99cbaed1c946a24b71ebe63b7efc2d66f995cefe09b7d04bc5bda17784713d8e4a5f27702c4ac7797"; + sha512 = "5b7272acc37c4dffc2421824b86c5f0192b7a92535f193a0b567fff8e79129f41bdb336bfc1c742ea0f106739eca47339d9f550b785951364233e612b035f94b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mr/firefox-61.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "9d925c4828a427bc77631b28ffd6857f5adc38266731be58e283aa99b2fb4ed304ab464b32f33bce4ce1506c13c76947264891eabd7e63dfdbd020605bb1e8c6"; + sha512 = "fff73ffc6f080aa064df90a2f19c85364a09c831a095bf3722a5bc0760e04e305be8683804883968a492589a652d705f1cfbbed617de2f00348a723babf60a86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ms/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ms/firefox-61.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2e0f463f9db9f6c0e44e354ea495cc06f5dda8c92af586745744434c112073f4f46eab7576d1e26c93a7a8b739deb09930b10cca01eea70f6bc245a44d58fa74"; + sha512 = "a7574ce597a12b92aec0e88ca72d544cca1ec1a5def40b034a8cb25a24a3672c42e2fbe7ebcf0b5293f55fa12216856503af5514c3ab2b3cea551a8a43900b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/my/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/my/firefox-61.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "3e279289928231a02436cb344f1629b990b220c22df04e4cd3583a4995e59901a0062763e246e8cbc44ec696c7a94eb8e25ab7534a9f32b957f1332228af9b7f"; + sha512 = "0bb892e7ab8126f2f946b1d3c9b8b00119dde0a165832ed211265be4f698087ab83970b1c1d47171913db7e01f43036e90b4aea135accb91c33beea1031d545c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nb-NO/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nb-NO/firefox-61.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "abf3048155dff62d4225471531568292410bae499f10a7f51caa493bf3c66d45a30fd3fe62db2bc21447259aa75e024681abd8b1f8567fd7647202b7399b256e"; + sha512 = "184130d826eda76da820974a4f729de6eb569bbc7f36ffe2d4599b7c142d75c5537546511770db38abaf28b9d3866937fc6d51c7fbcffb074432da3d98310b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ne-NP/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ne-NP/firefox-61.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "a0a9a872bb6f92cc1f5fbf17e8ffa06fe841d5c0f50bfc543779caf10726e1a0a18bd003aef9619b25110b5a37510375de077461c3fab276cd58b319f4107a1c"; + sha512 = "2428dc2175f0da8e4fa66ac11810467306a59b181c34165e4a54dfe5f3bebc182f0fbcb117f15707e72baf97f4d75131a3ec97d03d0fc1109229caf83519dd51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nl/firefox-61.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0b0a0b5df01a72c4a433938dd8f750c60594e393108564ba20745205fa87e30231e8518e28bedb770d5b988c3684ea80f27f7de28d864a26da69fda3a5c39617"; + sha512 = "96bd92c9979e02a13db550f7f3a795585baa1017691371c5e5bc99825d730d535c63ddbf805ebf8a0e6406ae80ec644d0f715d04f913935f845ad89467c01832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nn-NO/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nn-NO/firefox-61.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0a8c474d2e0103dad61e7efbfe8bdabcf246395e7abc213a6b195aff79ae28d843c4dbcfcdbb1740c6d49e2329a1afbbde8e798dc50044be4924450c7f024396"; + sha512 = "26f35cd02873ba061cd0f38cca18947e2c05589d3b399c55fb4d0f356c26d399848467a20fc542c7f51c67c912ab7c8fe5fae25c97d942260276faba40d24c89"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/oc/firefox-61.0.2.tar.bz2"; + locale = "oc"; + arch = "linux-i686"; + sha512 = "711b260ac771280d795d6e3746df07bed4b9357b7261e83e8b17934ab027d77bfa1781d3d9d1923724f49f16136468c1fef40d1809d6a020d5b49b7767030f85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/or/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/or/firefox-61.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3b97c26b98859f1fa6e8cd682908c46fcfac7bc4aa6d6e8b0495bcdd4e1ddb53f924d4436499dcf0f059ab24d516439c2c8b4881c938d74ebb7c0e2b30911a14"; + sha512 = "dcd1d7068c75428533d268b50d3d1e7324dba2709abe4049c9cfea4fd4413b09c3c7dd9f944f5f54f57454d8d2aa8471b8ba5871e73cbeae6fa357c8c68e90fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pa-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pa-IN/firefox-61.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "978e0143198910d4c8c47764f7fce401cace00018318e5deb71a22666d7f94df735304354dd07ec2ca4386898ed4c15c8cd3efb1104dd054a4c1c11661b7619a"; + sha512 = "f34c32479a92cce9fc6564899b5477fdbdbdc868b17904f8d7ae338c2924fb7cb8335b038378a805a2119ff5ad13e349c7b80efe7a29add706bbaf1466d623a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pl/firefox-61.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "618f2dd7460090dd0b1c0edff4b33d5ae51f1298f20ec5ccf845e5e6e5e4128c55b937496257ef49064806a720b5c8326cedca9764702824391447a83ed2118c"; + sha512 = "d62822aa991cd30cb6c5e47dc211bd4018de427b243543bd83bd166601e40e3bed35dfc073660573dc500ae19ead2dca858041a3b80bd616def3c2b3f72aee11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-BR/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-BR/firefox-61.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "7e12f0f18562fb628b994df2e2c2a9bac4fe85ad593a0de37f3e1c3b1dce60406d2f28606aec5cf84ecec05570b38e7dd95d6f348dbadee09bf27ac34d52b47e"; + sha512 = "5a2ea1494423a5ce1afc60c2d1a4e53ef084a02050ca61a688ecf18ff9d99e43d6bd334683937c12965767e7e5b0bd1a32708f1f2c2a241db1f68271633ace66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-PT/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-PT/firefox-61.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "80d9c00f741ab177a5d0ffd94a8462077240c07a56dfb49213e222264224d5df5f4f964dac55d097b0ba9d658dd42ed50761ca86fc087c29cc4ef9d2972956ae"; + sha512 = "83cff834812ad238b103fcee8b801e46ae542eba3475709e04848f18df0bee68075b2834ee871bfa5eb58ad1ec7fb34239d661a27d0dcba17e6c39de8428cef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/rm/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/rm/firefox-61.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "9ef01b038cb0971b41fbb19d250db4ca96adc31f0a9cf8b7197ebe700acfab69b2dae35f2c3487ae1983df0793cacd5a7aca7d9fdec8b7fa94cb245ff1308338"; + sha512 = "c4190e7e2007805b2c7507dd26b0695bc5d3c007eabd6a592c283a99cf0495ce1dfcd6dbb1e753a990f64466f24618d3b84df617f99fb266ceadf32fcd990af8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ro/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ro/firefox-61.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d60ec8a9bddaabdae7b210c7b8f4229b10ae1080a89a3a661b6ffbffae479c81ec8f620b82655d92a792e31d4f1fad9477d195005dfdc803a7f3998d4a091413"; + sha512 = "292112e0af6bad96b97bb0a1d58d0b7c9d4cb476cf531b1caaffcfd54c2f0ecd72a4311f98b614d7f834ffe2779261f77eb43d4d7ab724378dc6b7ad83bb1840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ru/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ru/firefox-61.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "8a42c89e4a0ac8f26421450637c2781c2dac2fd4469080f5d17a86cbbaa2c1cae56cc641797e6c1efb1576467c2d9e960b8a486f4b79556eba1d8a099d82e567"; + sha512 = "3d6fa0994fba5ff988e281ac4feff8655a5353ebf0d99df5ac7412cff2d19d478a912851d27f2af5bd78fdbc68030878682bb7ffa912180d2c4aa9bafcd77cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/si/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/si/firefox-61.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "230b155c90db9c05a8f896357c1cb2baca0f96cada2a62fced73caa94a49116459b4ae42a4f61ce03dd08d9ce03541067a5cc64a53ad17cd63debbfe645a2614"; + sha512 = "e6d3c4049f267e68216e9824743b123539e5445a5d53297eb8af33af95a418e492a655a456970d02049f8969c81c0ab8c5be1471a5ab8e01b4744995b799158a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sk/firefox-61.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1072c117830b85c54e7c1ead8ca552e92ce0c1971f26a28d27490802ceeb15fc105323599fd768a8ecd94597b3f51f8efdfb3e91743395c19b52a152ffb383d5"; + sha512 = "66fc1f3f4fb7dec1c261db144243dc0647b4dbc4257de93c5fb017ae616d31d6825fdfafc30d3fc299a278d5fd51731f24e6033cb3807c69ccd1512527029063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sl/firefox-61.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5580f6777ce0acd2d47af993a8bec2e23ef16d77e6fb653147637e1efa08e82006a41108b94b213e7bb6d57b9dc27e8cc2bc1f0a26e9c2cf766e9c82dcc673d9"; + sha512 = "e089b96b77a60c2c8e96f107cd26f37e681f8a8c702cf32ee3592344900c81daba274516c32ac856609917a30f8d60d853fd649fe575c3a2915072e45908126b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/son/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/son/firefox-61.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "0f930af28da8a3643d424dc957643682909d86f83d2cde87656abb33fd5d9c5277a46cf46d4ed28a790eaa0b5681f48cc43a2184c8273cb85c821359d07ad46e"; + sha512 = "00eecadab36816ae5e977dd50f335222e1fd8253b98daa1f14920e48678afb22b0e619ae4a86e6a45c8d2973f83f614f16a1f860e6ed1ed488851032075d6c72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sq/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sq/firefox-61.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "08589b3b4bfb670a912045614bb408a856b48aee4184b98e475101b1ff0ce3f6659c13ae4ffeb981e28f0b7243ba6b340065224dae0cef85e6f5877b0b150db0"; + sha512 = "ebd8ed00c12288a3ae4f6a113bbac8595ea9c0fbc35575115fd019c6158857ad083588100d4cae440822780bf25789501d0dd800bbe2baef5f037fb43aeabb74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sr/firefox-61.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "2abe8a5c502564823ffeaf59925d6749463e4aa0fcb0732f0c68acd8243b5a1bf5a71834fd9e519df8aa4b7b32fe69336ed9976b1ffb2ca67068cbe47f9b6987"; + sha512 = "bfce8265755adbc3c30d56a1e4bbbbb14385ddd3d2434b6404b04e3fa3120d58b32cb9e598aeb1540f23d2757c23fe903fd5c9d5167db305a88077e98d9a39b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sv-SE/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sv-SE/firefox-61.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ff79a7639d654cc2714f75e619c0c6c5862c1e4216fe7e2eeaf3876c47e16a6555dfa28e9be6b8215fe9e308e4c8753c5d70bcc6f3979c8a70fd7330652126ed"; + sha512 = "518b28e8f88a763aa09c5aed12eb0f2b582f84770401f3e11e5083fe69d176ce1483a81c2345a7fae2473551bf41db6a35f341495eb59c559a99398b93a7195a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ta/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ta/firefox-61.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "fb4d4c6def12ffe32eb9517858488921f1c77380f3d1d35a8652ebe7b9e14429709debffa6dd6a1008fee71c664fd8f582db1052a203dc1d7c10ba418222f7fc"; + sha512 = "a4d5960e0b60cf03c0ecf7f0d2b697dbb68dbfb4e0f3c77548c020d574f60c0fe7cc032a81215f34108a11651800deb1b1533efad3e238fd32780f22bd5524fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/te/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/te/firefox-61.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ae97d60ac98c6cd9bad620a7c5dba8d51bdb2b035132daa0d915d1fc1e04802a25137bbbac82009ec51c0d858346e2f5c43f9981c48e991cc094cf11711fdeef"; + sha512 = "8bf1510077ce86f50c668cb8d931d6d0899d1b7559736312c86acfdc3149da75f8c8f750393e02023a9b063c27c03adcc6bd5c29c950fc0a6055392a2e0eb2d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/th/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/th/firefox-61.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "695fae213cc6705ec130c4dc08dd1c28f6ad605e0a2d0e92deef13737cc2780cd420dd883dc5153bf9cd174e1740effbc817054b16417fed90d04be04f21ab24"; + sha512 = "af32b002380fee3b147b2cc44831c3d2ee29d784b8c935fe1be464b302992aebba73a39929ca23b35b9b6a8475e909a73622f70810e0a4a21bc7db74a8b4da46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/tr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/tr/firefox-61.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "f79e1f5027a84b772358d25f0441744036f60da7de5c0b26428ebd81900977e70d2c36b454e73f7026b7e20c058830502c92bdb8cc7d55c3ab40df43b7380d31"; + sha512 = "4216a4e126a41f26b344804e4222535aee43c9f52fafbb6e1d019cc743fe18c0cdeed7fc04dd06fb921efc0431256ed2f09ed21fafff8a1132d097082b849388"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uk/firefox-61.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "30b7661e84a875ff356284a87d1dc00a9e8fc1c03c953c471d785445e78cf4568450fec97bb16a1c63b092931719119510f33f55f02ff56e38adf4fb3be3f2c8"; + sha512 = "dfe75bb618097d0a96066dd65ba0da7e9d3ce91c14075023c48aedfb88c6d30b83c8ab503666c7581783baf347beac58e81d49e7f9b671bedcdb6827f0843b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ur/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ur/firefox-61.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9ef6fed1bea2857fc60e22eb9a87db8261316ba0852a3c5d35d65c3ead474ae34ee532588e25942f76be2f13a341c9bd9b672e5b192db1d3ccfee3f6a6787b83"; + sha512 = "0a1a8cae5f364b5e0e2570ef6e06870efd136322082e2fb7690b381f05195eee48787ac679916cd7508f9f51458c038798c9e73f982992dd5b0de8d596e83ca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uz/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uz/firefox-61.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ab75b5c8e81b6bfc12b07b4fb2872cf2297c7249c352f5b66d95d867698f3e9a601f273e708bcb8855505eaba87b384e2b62f9d0b85e5976acf1c948e5e5a3e1"; + sha512 = "153e781c6e4a530fad7631168afaaed74b0c8323317b1b4104cfffd8ee9250ae9af0ed9a0a0f157fc6745dfef7889402426c3d5e13d0c1b234fdaf952c9cb3aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/vi/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/vi/firefox-61.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d08e244d22c92c0e64c1104d5bbaaa19fa3b0d8f7a3616ae0df71d8f141039f1e7e87480f52d319f57d545f58c7095da643d4bac150e47c3e595b27cb793076f"; + sha512 = "1cc2e611316137b1d569d3c2617d41bddc48a8618a8937eab643ebdf94727139743b8bc6e1d18a7487e9d30f867ae1b7f77bfd528e0b535d122a4e8f9fcd311c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/xh/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/xh/firefox-61.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b956f01619afc421ed23ac644af51f62fa9f5cffcd7f5b6bf640014d1326583f8ba871e4e4f5cf8e81ab0a2b46335b5e921243e71ed16d51b2c89f0a7d1a1280"; + sha512 = "b0c4a093950fe90ad2249a5259843e7b3b4bdf2179b0c7ee61e1f965a4104636a53d7db0b91aaff3047cc7252855970f12e1b3bc4aa9e4f85d301652cb53c6c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-CN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-CN/firefox-61.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "80f3c557a7fa2d51f5ba2d07adef2bd6980a4cd256b95702ee4fac2967d039476ea3b828ce951b354be9fea9508ecae2ea12a8b29f8feb0101b2101d741bf633"; + sha512 = "b3d1ea1e74ce5c7779bd1c7299197d0143688cc6bd9c4ae0b391e3849fec40c3142a9b7db19d3805616fa885deb16a6fdbe2fd23ddf0eac0fb0094498917d356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-TW/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-TW/firefox-61.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "50668a428310083cd175ce0dd9d09742866143d56efb0b13d11de1905d5b1d9f61e441bf1364e518aa87ebc790a335cc3b69d2438d3a4f92b4802345b8a443fa"; + sha512 = "cda9d835f282746cb711054f1ed2f137e0f7e89c27429af12f470ed8984ea0c9a4f28e5cd403aa2f37fe0c06271c7651f794009ec11ddc64a96c4c661ca9ecb6"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e8e1862d7f836d4c2be03585eb7188e1f92a86a4..bfdb5fcc01038a8190ce4671a978b158fa645ebd 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,13 +1,14 @@ { pname, version, updateScript ? null -, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? [], overrides ? {}, meta +, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? [] +, overrides ? {}, extraNativeBuildInputs ? [], meta , isTorBrowserLike ? false }: -{ lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL +{ lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx -, cairo, icu, libpng, jemalloc +, icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages , debugBuild ? false @@ -15,7 +16,7 @@ ## optional libraries -, alsaSupport ? true, alsaLib +, alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? true, libpulseaudio , ffmpegSupport ? true, gstreamer, gst-plugins-base , gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook @@ -28,7 +29,9 @@ # WARNING: NEVER set any of the options below to `true` by default. # Set to `privacySupport` or `false`. -, webrtcSupport ? !privacySupport +# webrtcSupport breaks the aarch64 build on version >= 60. +# https://bugzilla.mozilla.org/show_bug.cgi?id=1434589 +, webrtcSupport ? (if lib.versionAtLeast version "60" && stdenv.isAarch64 then false else !privacySupport) , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , crashreporterSupport ? false @@ -36,6 +39,10 @@ , safeBrowsingSupport ? false , drmSupport ? false +# macOS dependencies +, xcbuild, CoreMedia, ExceptionHandling, Kerberos, AVFoundation, MediaToolbox +, CoreLocation, Foundation, AddressBook, libobjc, cups, rsync + ## other # As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at @@ -63,7 +70,14 @@ assert stdenv.cc.libc or null != null; let flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; + + default-toolkit = if stdenv.isDarwin then "cairo-cocoa" + else "cairo-gtk${if gtk3Support then "3" else "2"}"; + + execdir = if stdenv.isDarwin + then "/Applications/${browserName}.app/Contents/MacOS" + else "/bin"; + browserName = if stdenv.isDarwin then "Firefox" else "firefox"; in stdenv.mkDerivation (rec { @@ -73,27 +87,41 @@ stdenv.mkDerivation (rec { buildInputs = [ gtk2 perl zip libIDL libjpeg zlib bzip2 - dbus dbus-glib pango freetype fontconfig xorg.libXi + dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file nspr libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx /* cairo */ - icu libpng jemalloc + libevent libstartup_notification libvpx /* cairo */ + icu libpng jemalloc glib ] ++ lib.optionals (!isTorBrowserLike) [ nss ] - + ++ lib.optional (lib.versionOlder version "61") hunspell ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ] ++ lib.optional gtk3Support gtk3 - ++ lib.optional gssSupport kerberos; - - NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; + ++ lib.optional gssSupport kerberos + ++ lib.optionals stdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos + AVFoundation MediaToolbox CoreLocation + Foundation libobjc AddressBook cups ]; + + NIX_CFLAGS_COMPILE = [ "-I${nspr.dev}/include/nspr" + "-I${nss.dev}/include/nss" + "-I${glib.dev}/include/gio-unix-2.0" ] + ++ lib.optional stdenv.isDarwin [ + "-isystem ${llvmPackages.libcxx}/include/c++/v1" + "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" ]; + + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0 + ''; nativeBuildInputs = - [ autoconf213 which gnused pkgconfig perl python cargo rustc ] - ++ lib.optional gtk3Support wrapGAppsHook; + [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] + ++ lib.optional gtk3Support wrapGAppsHook + ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] + ++ extraNativeBuildInputs; preConfigure = '' # remove distributed configuration files @@ -107,11 +135,23 @@ stdenv.mkDerivation (rec { '' else '' make -f client.mk configure-files configureScript="$(realpath ./configure)" - '') + '' - cxxLib=$( echo -n ${gcc}/include/c++/* ) - archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) - - test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml + '') + lib.optionalString (!isTorBrowserLike && lib.versionAtLeast version "53") '' + export MOZCONFIG=$(pwd)/mozconfig + + # Set C flags for Rust's bindgen program. Unlike ordinary C + # compilation, bindgen does not invoke $CC directly. Instead it + # uses LLVM's libclang. To make sure all necessary flags are + # included we need to look in a few places. + # TODO: generalize this process for other use-cases. + + BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ + $(< ${stdenv.cc}/nix-support/cc-cflags) \ + ${stdenv.cc.default_cxx_stdlib_compile} \ + ${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \ + ${lib.optionalString stdenv.cc.isGNU "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/$(cc -dumpmachine)"} \ + $NIX_CFLAGS_COMPILE" + + echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG '' + lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, @@ -132,7 +172,6 @@ stdenv.mkDerivation (rec { "--with-system-png" # needs APNG support "--with-system-icu" "--enable-system-ffi" - "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" #"--enable-system-cairo" @@ -144,8 +183,10 @@ stdenv.mkDerivation (rec { "--enable-jemalloc" "--disable-maintenance-service" "--disable-gconf" - "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}" + "--enable-default-toolkit=${default-toolkit}" ] + ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast version "61") "--disable-xcode-checks" + ++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell" ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ # on i686-linux: --with-libclang-path is not available in this configuration "--with-libclang-path=${llvmPackages.libclang}/lib" @@ -213,13 +254,19 @@ stdenv.mkDerivation (rec { ++ extraMakeFlags; enableParallelBuilding = true; + doCheck = false; # "--disable-tests" above preInstall = '' # The following is needed for startup cache creation on grsecurity kernels. paxmark m dist/bin/xpcshell ''; - postInstall = '' + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications + cp -LR dist/Firefox.app $out/Applications + '' else null; + + postInstall = lib.optionalString stdenv.isLinux '' # For grsecurity kernels paxmark m $out/lib/firefox*/{firefox,firefox-bin,plugin-container} @@ -230,7 +277,7 @@ stdenv.mkDerivation (rec { gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped") ''; - postFixup = '' + postFixup = lib.optionalString stdenv.isLinux '' # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. patchelf --set-rpath "${lib.getLib libnotify }/lib:$(patchelf --print-rpath "$out"/lib/firefox*/libxul.so)" \ @@ -240,11 +287,10 @@ stdenv.mkDerivation (rec { doInstallCheck = true; installCheckPhase = '' # Some basic testing - "$out/bin/firefox" --version + "$out${execdir}/${browserName}" --version ''; passthru = { - browserName = "firefox"; inherit version updateScript; isFirefox3Like = true; inherit isTorBrowserLike; @@ -252,6 +298,8 @@ stdenv.mkDerivation (rec { inherit nspr; inherit ffmpegSupport; inherit gssSupport; + inherit execdir; + inherit browserName; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; } // overrides) diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch index 83f9a1329bea2f8524f258346368564e3854a990..de278152f97833bbdd38a0abfc738ef9c7e120e4 100644 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch +++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch @@ -1,7 +1,7 @@ diff -ru -x '*~' firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp firefox-55.0.3/docshell/base/nsAboutRedirector.cpp --- firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200 +++ firefox-55.0.3/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200 -@@ -40,10 +40,6 @@ +@@ -36,10 +36,6 @@ nsIAboutModule::ALLOW_SCRIPT }, { @@ -20,6 +20,6 @@ diff -ru -x '*~' firefox-55.0.3-orig/toolkit/content/jar.mn firefox-55.0.3/toolk content/global/browser-child.js content/global/browser-content.js -* content/global/buildconfig.html + content/global/buildconfig.css content/global/contentAreaUtils.js - #ifndef MOZ_FENNEC - content/global/customizeToolbar.css + content/global/datepicker.xhtml diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 07495e7d4707d5c5a1c9dfa588380ce4478a16ad..984d80167c39fbdf5c72b09e66eb997dc1d15a0e 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }: +{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3 }: let @@ -6,54 +6,88 @@ let nixpkgsPatches = [ ./env_var_for_system_dir.patch - - # this one is actually an omnipresent bug - # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 - ./fix-pa-context-connect-retval.patch ]; + firefox60_aarch64_skia_patch = fetchpatch { + name = "aarch64-skia.patch"; + url = https://src.fedoraproject.org/rpms/firefox/raw/8cff86d95da3190272d1beddd45b41de3148f8ef/f/build-aarch64-skia.patch; + sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k"; + }; + in rec { firefox = common rec { pname = "firefox"; - version = "59.0.2"; + version = "61.0.2"; src = fetchurl { - url = "https://hg.mozilla.org/releases/mozilla-release/archive/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2"; - sha512 = "3kfh224sfc9ig4733frnskcs49xzjkrs00lxllsvx1imm6f4sf117mqlvc7bhgrn8ldiqn6vaa5g6gd9b7awkk1g975bbzk9namb3yv"; + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "3zzcxqjpsn2m5z4l66rxrq7yf58aii370jj8pcl50smcd55sfsyknnc20agbppsw4k4pnwycfn57im33swwkjzg0hk0h2ng4rvi42x2"; }; patches = nixpkgsPatches ++ [ ./no-buildconfig.patch ]; + extraNativeBuildInputs = [ python3 ]; + meta = { description = "A web browser built from Firefox source tree"; homepage = http://www.mozilla.com/en-US/firefox/; maintainers = with lib.maintainers; [ eelco ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; + license = lib.licenses.mpl20; }; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; }; } {}; - firefox-esr = common rec { + firefox-esr-52 = common rec { pname = "firefox-esr"; - version = "52.7.3esr"; + version = "52.9.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "31y3qrslg61724vmly6gr1lqcrqgpkh3zsl8riax45gizfcp3qbgkvmd5wwfn9fiwjqi6ww3i08j51wxrfxcxznv7c6qzsvzzc30mgw"; + sha512 = "bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9"; }; - patches = nixpkgsPatches; + patches = nixpkgsPatches ++ [ + # this one is actually an omnipresent bug + # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 + ./fix-pa-context-connect-retval.patch + ]; + + meta = firefox.meta // { + description = "A web browser built from Firefox Extended Support Release source tree"; + }; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-52-unwrapped"; + versionSuffix = "esr"; + }; + } {}; + + firefox-esr-60 = common rec { + pname = "firefox-esr"; + version = "60.1.0esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "2bg7zvkpy1x2ryiazvk4nn5m94v0addbhrcrlcf9djnqjf14rp5q50lbiymhxxz0988vgpicsvizifb8gb3hi7b8g17rdw6438ddhh6"; + }; + + patches = nixpkgsPatches ++ [ + ./no-buildconfig.patch + + # this one is actually an omnipresent bug + # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 + ./fix-pa-context-connect-retval.patch + ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch; meta = firefox.meta // { description = "A web browser built from Firefox Extended Support Release source tree"; }; updateScript = callPackage ./update.nix { - attrPath = "firefox-esr-unwrapped"; + attrPath = "firefox-esr-60-unwrapped"; versionSuffix = "esr"; }; } {}; @@ -105,40 +139,24 @@ rec { ''; homepage = https://www.torproject.org/projects/torbrowser.html; platforms = lib.platforms.linux; + license = lib.licenses.bsd3; }; }; in rec { - tor-browser-7-0 = common (rec { - pname = "tor-browser"; - version = "7.0.1"; - isTorBrowserLike = true; - - # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb - src = fetchFromGitHub { - owner = "SLNOS"; - repo = "tor-browser"; - # branch "tor-browser-52.5.0esr-7.0-1-slnos"; - rev = "830ff8d622ef20345d83f386174f790b0fc2440d"; - sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5"; - }; - - patches = nixpkgsPatches; - } // commonAttrs) {}; - tor-browser-7-5 = common (rec { pname = "tor-browser"; - version = "7.5.2"; + version = "7.5.6"; isTorBrowserLike = true; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-52.7.3esr-7.5-1-slnos"; - rev = "62e77aa47d90c10cfc9c6f3b7358a6bdc3167182"; - sha256 = "09pyqicv6z0h4lmjdybx56gj3l28gkl0bbpk0pnmlzcyr9vng7zj"; + # branch "tor-browser-52.9.0esr-7.5-2-slnos" + rev = "95bb92d552876a1f4260edf68fda5faa3eb36ad8"; + sha256 = "1ykn3yg4s36g2cpzxbz7s995c33ij8kgyvghx38z4i8siaqxdddy"; }; patches = nixpkgsPatches; @@ -153,9 +171,9 @@ in rec { src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-52.7.0esr-8.0-1-slnos"; - rev = "58314ccb043882e830ee9a21c37a92d6e0d34e94"; - sha256 = "09gb7chw2kly53b599xwpi75azj00957rnxly9fqv8zi3n5k2pdb"; + # branch "tor-browser-52.8.0esr-8.0-1-slnos"; + rev = "5d7e9e1cacbf70840f8f1a9aafe99f354f9ad0ca"; + sha256 = "0cwxwwc4m7331bbp3id694ffwxar0j5kfpgpn9l1z36rmgv92n21"; }; patches = nixpkgsPatches; diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index 997bccbe9a95dd0a3f7381b27973522a61153258..8cc03cf8212ac560f7556e6876b25fbdd6c7ce1b 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -28,9 +28,5 @@ writeScript "update-${attrPath}" '' sort --version-sort | \ tail -n 1` - source_url=`curl --silent $url$version/SOURCE | grep -o 'https://.*\.tar\.bz2'` - - shasum=`curl --silent $url$version/SHA512SUMS | grep 'source\.tar\.xz' | cut -d ' ' -f 1` - - update-source-version ${attrPath} "$version" "$shasum" "$source_url" + update-source-version ${attrPath} "$version" '' diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 078fa0885b78f95e644c9f3418c7e1807e9d2a37..b64a6cf7ad9868fba2cc89777103ee745920792c 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,14 +2,13 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2 +, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin -, vlc_npapi -, browserpass, chrome-gnome-shell -, libudev +, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow +, udev , kerberos }: @@ -44,6 +43,9 @@ let plugins = assert !(jre && icedtea); + if builtins.hasAttr "enableVLC" cfg + then throw "The option \"${browserName}.enableVLC\" has been removed since Firefox no longer supports npapi plugins" + else ([ ] ++ lib.optional enableAdobeFlash flashplayer ++ lib.optional (cfg.enableDjvu or false) (djview4) @@ -57,22 +59,24 @@ let ++ lib.optional (cfg.enableBluejeans or false) bluejeans ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin - ++ lib.optional (cfg.enableVLC or false) vlc_npapi ++ extraPlugins ); nativeMessagingHosts = ([ ] - ++ lib.optional (cfg.enableBrowserpass or false) browserpass + ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) + ++ lib.optional (cfg.enableBukubrow or false) bukubrow ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell + ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator + ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration ++ extraNativeMessagingHosts ); - libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) + libs = lib.optional stdenv.isLinux udev + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) - (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; - gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; gtk_modules = [ libcanberra-gtk2 ]; in stdenv.mkDerivation { @@ -97,30 +101,31 @@ let ]; }; - buildInputs = [makeWrapper] - ++ lib.optional (!ffmpegSupport) gst-plugins - ++ lib.optional (browser ? gtk3) browser.gtk3; + nativeBuildInputs = [ makeWrapper lndir ]; + buildInputs = lib.optional (browser ? gtk3) browser.gtk3; - buildCommand = '' - if [ ! -x "${browser}/bin/${browserName}" ] + buildCommand = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -R --no-preserve=mode,ownership ${browser}/Applications/${browserName}.app $out/Applications + rm -f $out${browser.execdir or "/bin"}/${browserName} + '' + '' + if [ ! -x "${browser}${browser.execdir or "/bin"}/${browserName}" ] then - echo "cannot find executable file \`${browser}/bin/${browserName}'" + echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${browserName}'" exit 1 fi - makeWrapper "$(readlink -v --canonicalize-existing "${browser}/bin/${browserName}")" \ - "$out/bin/${browserName}${nameSuffix}" \ + makeWrapper "$(readlink -v --canonicalize-existing "${browser}${browser.execdir or "/bin"}/${browserName}")" \ + "$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \ --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ --suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ - --suffix PATH ':' "$out/bin" \ + --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ - ${lib.optionalString (!ffmpegSupport) - ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"'' - + lib.optionalString (browser ? gtk3) + ${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' '' @@ -132,8 +137,10 @@ let else for res in 16 32 48 64 128; do mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" - ln -s "${browser}/lib/${browserName}/browser/chrome/icons/default/default''${res}.png" \ + icon=( "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" ) + if [ -e "$icon" ]; then ln -s "$icon" \ "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png" + fi done fi @@ -141,7 +148,7 @@ let mkdir -p $out/lib/mozilla for ext in ${toString nativeMessagingHosts}; do - ${lndir}/bin/lndir -silent $ext/lib/mozilla $out/lib/mozilla + lndir -silent $ext/lib/mozilla $out/lib/mozilla done # For manpages, in case the program supplies them diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index d2d26190ce058eab0013c6b596aa6dbcc070e289..52a2ccb292bb40a0c3c8219837dd4331120baf46 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, patchelf, makeWrapper +{ stdenv, patchelf, makeWrapper # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk +, dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk , kerberos # command line arguments which are always set e.g "--disable-gpu" @@ -52,7 +52,7 @@ let glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb alsaLib libXdamage libXtst libXrandr expat cups - dbus_libs gdk_pixbuf gcc-unwrapped.lib + dbus gdk_pixbuf gcc-unwrapped.lib systemd libexif liberation_ttf curl utillinux xdg_utils wget diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix deleted file mode 100644 index 26a7e883c60ca36fb39a5858381bff76c686c971..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib-networking, makeWrapper -, gsettings-desktop-schemas }: - -stdenv.mkDerivation rec { - name = "jumanji-${version}"; - version = "20150107"; - - src = fetchgit { - url = https://git.pwmt.org/pwmt/jumanji.git; - rev = "f8e04e5b5a9fec47d49ca63a096e5d35be281151"; - sha256 = "1dsbyz489fx7dp07i29q1rjkl7nhrfscc8ks8an2rdyhx3457asg"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ girara gtk webkitgtk makeWrapper gsettings-desktop-schemas ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - preFixup='' - wrapProgram "$out/bin/jumanji" \ - --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Minimal web browser"; - homepage = https://pwmt.org/projects/jumanji/; - platforms = platforms.all; - maintainers = [ maintainers.koral ]; - }; -} diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 7c007e228f81a1c3099b5eb279b7c9decc751a9a..ff165f99ae9b8d29c52df3b63128a112c3c822ea 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.15"; + version = "2.16"; name = "links2-${version}"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "1jp3xyvp87a188b4kg5ycqahrazj7928zncgsznzn54w8d5iqahy"; + sha256 = "0gsa2gpb1grhssl5jzpc5pa0zi21mxi8g25rh5bacl70slw31w42"; }; buildInputs = with stdenv.lib; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://links.twibright.com/; description = "A small browser with some graphics support"; - maintainers = with maintainers; [ raskin viric ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7142ba6140b4e793b1a89371c38c6af14c233965 --- /dev/null +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -0,0 +1,61 @@ +{stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook, makeWrapper +,help2man, lua5, luafilesystem, luajit, sqlite +,webkitgtk, gtk3, gst_all_1}: + +let + lualibs = [luafilesystem]; + getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; + getLuaPath = lib : getPath lib "lua"; + getLuaCPath = lib : getPath lib "so"; + luaPath = stdenv.lib.concatStringsSep ";" (map getLuaPath lualibs); + luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath lualibs); + +in stdenv.mkDerivation rec { + + name = "luakit-${version}"; + version = "2017.08.10"; + src = fetchFromGitHub { + owner = "luakit"; + repo = "luakit"; + rev = "${version}"; + sha256 = "09z88b50vf2y64vj79cymknyzk3py6azv4r50jng4cw9jx2ray7r"; + }; + + nativeBuildInputs = [pkgconfig help2man wrapGAppsHook makeWrapper]; + + buildInputs = [webkitgtk lua5 luafilesystem luajit sqlite gtk3 + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + ]; + + postPatch = + #Kind of ugly seds here. There must be a better solution. + '' + patchShebangs ./build-utils + sed -i "2 s|require \"lib.lousy.util\"|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/docgen/gen.lua; + sed -i "3 s|require \"lib.markdown\"|dofile(\"./lib/markdown.lua\")|" ./build-utils/docgen/gen.lua; + sed -i "1,2 s|require(\"lib.lousy.util\")|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/find_files.lua; + ''; + + buildPhase = '' + make DEVELOPMENT_PATHS=0 USE_LUAJIT=1 INSTALLDIR=$out PREFIX=$out USE_GTK3=1 + ''; + + installPhase = let + luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua"; + in '' + make DEVELOPMENT_PATHS=0 INSTALLDIR=$out PREFIX=$out XDGPREFIX=$out/etc/xdg USE_GTK3=1 install + wrapProgram $out/bin/luakit \ + --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \ + --set LUA_PATH '${luaKitPath};${luaPath};' \ + --set LUA_CPATH '${luaCPath};' + ''; + + meta = with stdenv.lib; { + description = "Fast, small, webkit based browser framework extensible in Lua"; + homepage = "http://luakit.org"; + license = licenses.gpl3; + platforms = platforms.linux; # Only tested linux + }; +} diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 9cad2838a39b20e9e1f71584c6689528dfba99b2..6097c0e95f0d94d204431eb73c87fb98ef4d187f 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPackages , fetchurl, pkgconfig, ncurses, gzip , sslSupport ? true, openssl ? null -, buildPlatform, hostPlatform , nukeReferences }: @@ -9,21 +8,24 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation rec { name = "lynx-${version}"; - version = "2.8.9dev.16"; + version = "2.8.9dev.17"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2" "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2" ]; - sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84"; + sha256 = "1lvfsnrw5mmwrmn1m76q9mx287xwm3h5lg8sv7bcqilc0ywi2f54"; }; enableParallelBuilding = true; hardeningEnable = [ "pie" ]; - configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; + configureFlags = [ + "--enable-widec" + "--enable-ipv6" + ] ++ stdenv.lib.optional sslSupport "--with-ssl"; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ nukeReferences ] @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A text-mode web browser"; - homepage = http://lynx.invisible-island.net/; + homepage = https://lynx.invisible-island.net/; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 7d69c03ea3666a0ec6c7ad30225dccb5d93210ca..94d0e9e5badd0037bed65d118f043525c0366bb9 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,25 +73,25 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "29.0.0.113"; + version = "30.0.0.154"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_npapi_linux_debug.${arch}.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_npapi_linux_debug.${arch}.tar.gz" else "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; sha256 = if debug then if arch == "x86_64" then - "15nkmnkh4w458n9yp0f54d48vzl8bk6zq3clws8jvd76aa0accl0" + "04hfh0vn1n70gdpfydq0sj94d6rkbk80h4pmy3rsfvhg0x540wx8" else - "0v9iwnb00jl6s6a1b9cnmqflh50dhyhmlwckk8qv6vy77b2jdsk7" + "073327sszbvkglh5b18axmwv40sy2vyacdhcd1fx82qskv44sfda" else if arch == "x86_64" then - "18cbalnyikb8g8fb861b9kbgsqwrin5k7gd5smz2czk73kmfrph4" + "03ypgzy88ck5rn1q971v0km9yw3p10ly1zkxh239v6nx0hs35w84" else - "06djh4scz97r8h4bsd392paimpybd59q1chd86bdsybm1xkgicmy"; + "0rld7i659ccp4gvcvdkqkc1lajvlss5d4qndzf9aqiksvdknv62x"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index fead4cb9fad6e52396f8b32eafa20f6d753f861e..ba8a8de9320906c82c56008c43b4a19786257895 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -47,27 +47,21 @@ , debug ? false }: -let - arch = - if stdenv.system == "x86_64-linux" then - "x86_64" - else throw "Flash Player is not supported on this platform"; -in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "29.0.0.113"; + version = "30.0.0.154"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux_debug.x86_64.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux_debug.x86_64.tar.gz" else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz"; + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "12ackbfyh83f3ggvr8gs88f002glrymh2s2pfb5srbgdajrh0cyc" + "133zhgc5fh6s0xr93lv70xcrgvaj7lhjxk5w7xz79h3mp185p3g4" else - "17xwsw13bq5s6mq4r22zhw99dx5xswzz83m7lvd9gl9ih78w7348"; + "1xz1l5q0zahalh0l4mkrwhmfrmcli3sckg3rcfnllizq9rbfzcmr"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index a320321ea171a1957bb6b1fb2d6df280dca8d891..a172e0e8d5d9cb234d3ff4ac6c872c7723728bec 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpm, cpio, libGL, xorg, cairo +{ stdenv, fetchurl, libGL, xorg, cairo , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl , dbus-glib, alsaLib, libpulseaudio, systemd, pango }: diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix index db871c0c9a5b05cfdb07831116f505f8f7b5a774..3d4e0fc002257fb2ba651d22fd30cc1f676d6d1d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, dpkg, zlib }: - -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; +{ stdenv, fetchurl, dpkg }: stdenv.mkDerivation { name = "TREZOR-bridge-1.0.5"; @@ -42,6 +40,7 @@ stdenv.mkDerivation { # Download URL, .deb content & hash (yikes) changed, not version. # New archive doesn't contain any Mozilla plugin at all. broken = true; - }; + platforms = platforms.linux; + }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index b98d1d415c665564995f986b01020df5baddb59e..efbfee487c6d78c0ff311be8b088fa3f89ce4148 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -32,12 +32,13 @@ , pango , stdenv , systemd +, at-spi2-atk }: let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "50.0.2762.45"; + version = "53.0.2907.99"; rpath = stdenv.lib.makeLibraryPath [ @@ -54,7 +55,7 @@ let freetype.out gdk_pixbuf.out glib.out - gnome2.GConf.out + gnome2.GConf gtk3.out libX11.out libXScrnSaver.out @@ -81,6 +82,8 @@ let # Works fine without this except there is no sound. libpulseaudio.out + + at-spi2-atk ]; in stdenv.mkDerivation { @@ -89,7 +92,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "1ajdr6yzqc9xkvdcgkps6j5996n60ibjhj518gmminx90da6x5dy"; + sha256 = "0fih5047xv275rmbcr2drji81wxi6p0kyp172mmn328g3pzddmwx"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix index 93cf220e499617a15d89a9d038967562d4e746c9..d1f50627d905d5bdb93c6d2f7db9035d7a2f7d17 100644 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -1,7 +1,7 @@ -{ stdenv, cmake, openssl, gst_all_1, fetchFromGitHub +{ stdenv, cmake, fetchFromGitHub , qtbase, qtmultimedia, qtwebengine -, version ? "0.9.94" -, sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5" +, version ? "0.9.96" +, sourceSha ? "1xzfy3jjx9sskwwbk7l8hnwnjf8af62p4kjkydp0ld0j50apc39p" }: stdenv.mkDerivation { name = "otter-browser-${version}"; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index f3eb38422c694ef9d29750166fa5de9492eeec47..fcc653e08f41b947108892b4d194cb605254658e 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.8.0"; + version = "27.9.4"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "0b08rzn50jg59rnjzx6dvsmj5dikfjipnmvhpkimvr38v8q7wdar"; + sha256 = "0ir5gzhw98gfn15x58g1fwi11jd7gysvacqxg1v0jdjhgdl4m5sx"; }; desktopItem = makeDesktopItem { @@ -79,6 +79,8 @@ stdenv.mkDerivation rec { chmod u+w . ''; + hardeningDisable = [ "format" ]; + buildPhase = '' cd $builddir $src/mach build diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f6bc05371f30f8f24980c20acd6924ae42f7a50b --- /dev/null +++ b/pkgs/applications/networking/browsers/qtchan/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, qt, makeWrapper }: + +stdenv.mkDerivation rec { + name = "qtchan-${version}"; + version = "0.100"; + + src = fetchFromGitHub { + owner = "siavash119"; + repo = "qtchan"; + rev = "v${version}"; + sha256 = "0n94jd6b1y8v6x5lkinr9rzm4bjg9xh9m7zj3j73pgq829gpmj3a"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ qt.qmake makeWrapper ]; + buildInputs = [ qt.qtbase ]; + + qmakeFlags = [ "CONFIG-=app_bundle" ]; + + installPhase = '' + mkdir -p $out/bin + cp qtchan $out/bin + ''; + + preFixup = '' + wrapProgram $out/bin/qtchan \ + --suffix QT_PLUGIN_PATH : ${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix} + ''; + + meta = with stdenv.lib; { + description = "4chan browser in qt5"; + homepage = "https://github.com/siavash119/qtchan"; + license = licenses.mit; + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 2e31f625f2e78c9ad0202a0651c49695a8f83e37..47a273e99f98100319ac8bbf9f6d1a5bb7147c58 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -12,11 +12,11 @@ assert withMediaPlayback -> gst_all_1 != null; let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; - version = "1.7.225"; + version = "1.10.100"; src = fetchzip { - url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "0bsmbz7bbh0zpd70dlhss4fjdw7zq356091wld9s7kxnb2rixqd8"; + url = "https://github.com/mozilla/pdf.js/releases/download/${version}/${name}-dist.zip"; + sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq"; stripRoot = false; }; @@ -27,15 +27,13 @@ let }; in python3Packages.buildPythonApplication rec { - name = "qutebrowser-${version}${versionPostfix}"; - namePrefix = ""; - version = "1.2.1"; - versionPostfix = ""; + pname = "qutebrowser"; + version = "1.4.1"; # the release tarballs are different from the git checkout! src = fetchurl { - url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1svbski378x276033v07jailm81b0i6hxdakbiqkwvgh6hkczrhw"; + url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "0n2z92vb91gpfchdm9wsm712r9grbvxwdp4npl5c1nbq247dxwm3"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 8a8abb42f55e1f71e34600d684f47bc013df24a6..de6766709131a41a6ec32f6326c94c40907f9310 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.5.3"; + version = "7.5.6"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0vgw1qsd6rqbbgnsw9zwcv5m308abh7wp1p12mp8g04xndxnzw0d"; + sha256 = "07z7lg5firyah0897pr04wqnbgf4mvsnk3gq2zgsg1rrwladxz5s"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0scjy51zmyn7za0gii0dvndq06slip64nd0ik2cjyq232agvbxmr"; + sha256 = "1s0k82ch7ypjyc5k5rb4skb9ylnp7b9ipvf8gb7pdhb8m4zjk461"; }; }; in @@ -340,7 +340,7 @@ stdenv.mkDerivation rec { \ TMPDIR="\''${TMPDIR:-/tmp}" \ HOME="\$HOME" \ - XAUTHORITY="\$XAUTHORITY" \ + XAUTHORITY="\''${XAUTHORITY:-}" \ DISPLAY="\$DISPLAY" \ DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \ \ diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 65ebaa3f80c571c162361757b0b195d93c720b6d..50b992253ceafa1c749235dc3e906fba747e7d55 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -337,10 +337,11 @@ stdenv.mkDerivation rec { $out/bin/tor-browser -version >/dev/null ''; + passthru.execdir = "/bin"; meta = with stdenv.lib; { description = "An unofficial version of the tor browser bundle, built from source"; homepage = https://torproject.org/; - license = licenses.unfreeRedistributable; # TODO: check this + license = licenses.free; platforms = [ "x86_64-linux" ]; hydraPlatforms = [ ]; maintainers = with maintainers; [ joachifm ]; diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 8c9f23996ede60783084c1e850269d5a0448101b..12cf108355c401aa460dc7041f2b669240212a0d 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -5,7 +5,8 @@ # but Python 2 + packages during runtime. stdenv.mkDerivation rec { - name = "uzbl-v0.9.0"; + name = "uzbl-${version}"; + version = "0.9.0"; meta = with stdenv.lib; { description = "Tiny externally controllable webkit browser"; @@ -16,8 +17,8 @@ stdenv.mkDerivation rec { }; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/uzbl/uzbl/archive/v0.9.0.tar.gz"; + name = "uzbl-v${version}.tar.gz"; + url = "https://github.com/uzbl/uzbl/archive/v${version}.tar.gz"; sha256 = "0iskhv653fdm5raiidimh9fzlsw28zjqx7b5n3fl1wgbj6yz074k"; }; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 54abc7dedff4daee5c539da7edfde2d9caa17698..9de7518677deb95d003ee33b42969fe8e9122143 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, glib, glib-networking, gtk2, libsoup, libX11, perl, +{ stdenv, fetchurl, makeWrapper, glib-networking, gtk2, libsoup, libX11, perl, pkgconfig, webkit, gsettings-desktop-schemas }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 6bd9614e08de6ed49296d147e4b8ff764dae8dad..e6902aadd906fa2a7823e0465999debec03552ae 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd -, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp -, libuuid, xz +, alsaLib, dbus, cups, libexif, ffmpeg, systemd +, freetype, fontconfig, libXft, libXrender, libxcb, expat +, libuuid , gstreamer, gst-plugins-base, libxml2 -, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3 +, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome2 , nss, nspr , patchelf, makeWrapper , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "1.14.1077.45-1"; + version = "1.15.1147.42-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "0b4iviar927jx6xqyrzgzb3p4p617zm4an1np8jnldadq2a0p56d"; + sha256 = "15cajvn2sv05qdp3y538n2xvyy3il49q8zi5928z1mfirjz3dlwh"; }; unpackPhase = '' @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd + atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr - gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf + gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; libPath = stdenv.lib.makeLibraryPath buildInputs diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 11aa0ce706d665acf35d7cafcfb86a5b8782afe6..ab2c24727d7c29f7822a249cf5cd8e7ba43cf9af 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl , dbus-glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss , pciutils, pkgconfig, python2, xdg_utils }: diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index c71ccdf8a0d205b474af263f2cc4091dbf76974e..d1561a0652698bd36e60c3aadd1eaf1a29731164 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { description = "A text-mode web browser"; maintainers = [ maintainers.cstrahan ]; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index 33a1e8a5c08e28334b29dcc89ad3b38f28c6aac5..242abc2ece79745635092296938c1083b0215046 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -1,17 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "c14-cli-unstable-${version}"; - version = "2017-05-15"; - rev = "97f437ef5133f73edd551c883db3076c76cb1f6b"; + name = "c14-cli-${version}"; + version = "0.3"; goPackagePath = "github.com/online-net/c14-cli"; src = fetchFromGitHub { owner = "online-net"; repo = "c14-cli"; - inherit rev; - sha256 = "1b44bh0zhh6rhw4d3nprnnxhjgaskl9kzp2cvwwyli5svhjxrfdj"; + rev = "${version}"; + sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8a60023b43500f18e0391cbd099e1b13211ff4c6 --- /dev/null +++ b/pkgs/applications/networking/charles/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, makeDesktopItem, jre, makeWrapper }: + +let + desktopItem = makeDesktopItem { + categories = "Network;Development;WebDevelopment;Java;"; + desktopName = "Charles"; + exec = "charles %F"; + genericName = "Web Debugging Proxy"; + icon = "charles-proxy"; + mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace"; + name = "Charles"; + startupNotify = "true"; + }; + +in stdenv.mkDerivation rec { + name = "charles-${version}"; + version = "4.2.6"; + + src = fetchurl { + url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz"; + sha256 = "1hjfimyr9nnbbxadwni02d2xl64ybarh42l1g6hlslq5qwl8ywzb"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/charles \ + --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" + + for fn in lib/*.jar; do + install -D -m644 $fn $out/share/java/$(basename $fn) + done + + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + + mkdir -p $out/share/icons + cp -r icon $out/share/icons/hicolor + ''; + + meta = with stdenv.lib; { + description = "Web Debugging Proxy"; + homepage = https://www.charlesproxy.com/; + maintainers = [ maintainers.kalbasit ]; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7fd4cd9fa824ddc8f88f500b37c27092d7b0f398 --- /dev/null +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -0,0 +1,28 @@ +{ darwin, fetchFromGitHub, rustPlatform, stdenv }: + +with rustPlatform; + +buildRustPackage rec { + name = "click-${version}"; + version = "0.3.1"; + rev = "b5dfb4a8f8344330a098cb61523695dfe0fd296a"; + + src = fetchFromGitHub { + owner = "databricks"; + repo = "click"; + sha256 = "0a2hq4hcxkkx7gs5dv7sr3j5jy2dby4r6y090z7zl2xy5wydr7bi"; + inherit rev; + }; + + cargoSha256 = "03vgbkv9xsnx44vivbbhjgxv9drp0yjnimgy6hwm32x74r00k3hj"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + meta = with stdenv.lib; { + description = ''The "Command Line Interactive Controller for Kubernetes"''; + homepage = https://github.com/databricks/click; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.mbode ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 9f6b6fcb7e112a28d1671469b16d21e4761181cc..8a006edda6a80ca5ef9651d7d33045f5e74e96f1 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cni-plugins-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "0m885v76azs7lrk6m6n53rwh0xadwvdcr90h0l3bxpdv87sj2mnf"; + sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2"; }; buildInputs = [ go ]; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix new file mode 100644 index 0000000000000000000000000000000000000000..fd067936efdfb4584911dbe56eb31d749819eee7 --- /dev/null +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -0,0 +1,36 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }: + +buildGoPackage rec { + pname = "docker-machine-kvm2"; + name = "${pname}-${version}"; + version = "0.27.0"; + + goPackagePath = "k8s.io/minikube"; + subPackages = [ "cmd/drivers/kvm" ]; + + src = fetchFromGitHub { + owner = "kubernetes"; + repo = "minikube"; + rev = "v${version}"; + sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvirt ]; + + preBuild = '' + export buildFlagsArray=(-ldflags="-X k8s.io/minikube/pkg/drivers/kvm/version.VERSION=v${version}") + ''; + + postInstall = '' + mv $bin/bin/kvm $bin/bin/docker-machine-driver-kvm2 + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md; + description = "KVM2 driver for docker-machine."; + license = licenses.asl20; + maintainers = with maintainers; [ tadfisher ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index f394df3391ac23333f7642cf3daf71ea4b30266b..402a03b77f4aacd750adf6c4b11c3aeb545d40f4 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre -, version ? "1.4" }: +, version ? "1.5" }: let versionMap = { "1.3" = { - flinkVersion = "1.3.2"; + flinkVersion = "1.3.3"; scalaVersion = "2.11"; - sha256 = "0mf4qz0963bflzidgslvwpdlvj9za9sj20dfybplw9lhd4sf52rp"; + sha256 = "0gfm48k5adr14gnhqri9cd01i9dprd0nwmnnz3yrpd20nq4ap4qy"; hadoopBundle = "-hadoop27"; }; "1.4" = { @@ -15,6 +15,12 @@ let sha256 = "0x3cikys5brin0kx9zr69xfp8k5w6g8141yrrr26ks7gpss2x636"; hadoopBundle = ""; }; + "1.5" = { + flinkVersion = "1.5.0"; + scalaVersion = "2.11"; + sha256 = "0n5023dj8ivmbhqxmb3abmfh3ahb9vmcywq5i0ll5p7xxcw2c1cv"; + hadoopBundle = ""; + }; }; in diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index 1656e5a09a6b69d549df256179a704beb33a4400..0c210dcc535b7ad7bfbcd3bbc338d5e70c77f5c0 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkgconfig +{ lib, fetchFromGitHub, rustPlatform, pkgconfig , libsodium, libarchive, openssl }: with rustPlatform; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 9af4cf3f0ed65cdf0c9989c90cb45047a147c9fa..dfe6513bf0c1062022497f1d35f382eeabf5077f 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,51 +1,155 @@ -{ stdenv, fetchurl, makeWrapper, which, jre, bash }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl }: -stdenv.mkDerivation rec { +let + common = { version, sha256, dependencies-sha256, tomcat }: + let + # compile the hadoop tarball from sources, it requires some patches + binary-distributon = stdenv.mkDerivation rec { + name = "hadoop-${version}-bin"; + src = fetchurl { + url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}-src.tar.gz"; + inherit sha256; + }; - name = "hadoop-2.2.0"; + postUnpack = stdenv.lib.optionalString (tomcat != null) '' + install -D ${tomcat.src} $sourceRoot/hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz + install -D ${tomcat.src} $sourceRoot/hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz + ''; - src = fetchurl { - url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz"; - sha256 = "0r0kx8arsrvmcfy0693hpv4cz3i0razvk1xa3yhlf3ybb80a8106"; + # perform fake build to make a fixed-output derivation of dependencies downloaded from maven central (~100Mb in ~3000 files) + fetched-maven-deps = stdenv.mkDerivation { + name = "hadoop-${version}-maven-deps"; + inherit src postUnpack nativeBuildInputs buildInputs configurePhase; + buildPhase = '' + while mvn package -Dmaven.repo.local=$out/.m2 ${mavenFlags} -Dmaven.wagon.rto=5000; [ $? = 1 ]; do + echo "timeout, restart maven to continue downloading" + done + ''; + # keep only *.{pom,jar,xml,sha1,so,dll,dylib} 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 = dependencies-sha256; + }; + + nativeBuildInputs = [ maven cmake pkgconfig ]; + buildInputs = [ fuse snappy zlib bzip2 openssl protobuf2_5 ]; + # most of the hardcoded pathes are fixed in 2.9.x and 3.0.0, this list of patched files might be reduced when 2.7.x and 2.8.x will be deprecated + postPatch = '' + for file in hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java \ + hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java \ + hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java \ + hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DockerContainerExecutor.java \ + hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java \ + hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java; do + if [ -f "$file" ]; then + substituteInPlace "$file" \ + --replace '/usr/bin/stat' 'stat' \ + --replace '/bin/bash' 'bash' \ + --replace '/bin/ls' 'ls' \ + --replace '/bin/mv' 'mv' + fi + done + ''; + configurePhase = "true"; # do not trigger cmake hook + mavenFlags = "-Drequire.snappy -Drequire.bzip2 -DskipTests -Pdist,native -e"; + buildPhase = '' + # 'maven.repo.local' must be writable + mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetched-maven-deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ${mavenFlags} + # remove runtime dependency on $jdk/jre/lib/amd64/server/libjvm.so + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhadoop.so.1.0.0 + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhdfs.so.0.0.0 + ''; + installPhase = "mv hadoop-dist/target/hadoop-${version} $out"; + }; + in + stdenv.mkDerivation rec { + name = "hadoop-${version}"; + + src = binary-distributon; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/share/doc/hadoop + cp -dpR * $out/ + mv $out/*.txt $out/share/doc/hadoop/ + + # + # Do not use `wrapProgram` here, script renaming may result to weird things: http://i.imgur.com/0Xee013.png + # + mkdir -p $out/bin.wrapped + for n in $out/bin/*; do + if [ -f "$n" ]; then # only regular files + mv $n $out/bin.wrapped/ + makeWrapper $out/bin.wrapped/$(basename $n) $n \ + --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash coreutils ]}" \ + --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ openssl snappy zlib bzip2 ]}" \ + --set JAVA_HOME "${jre}" \ + --set HADOOP_PREFIX "$out" + fi + done + ''; + + meta = with stdenv.lib; { + homepage = "http://hadoop.apache.org/"; + description = "Framework for distributed processing of large data sets across clusters of computers"; + license = licenses.asl20; + + longDescription = '' + The Apache Hadoop software library is a framework that allows for + the distributed processing of large data sets across clusters of + computers using a simple programming model. It is designed to + scale up from single servers to thousands of machines, each + offering local computation and storage. Rather than rely on + hardware to deliver high-avaiability, the library itself is + designed to detect and handle failures at the application layer, + so delivering a highly-availabile service on top of a cluster of + computers, each of which may be prone to failures. + ''; + maintainers = with maintainers; [ volth ]; + platforms = [ "x86_64-linux" ]; + }; + }; + + tomcat_6_0_48 = rec { + version = "6.0.48"; + src = fetchurl { + # do not use "mirror://apache/" here, tomcat-6 is legacy and has been removed from the mirrors + url = "https://archive.apache.org/dist/tomcat/tomcat-6/v${version}/bin/apache-tomcat-${version}.tar.gz"; + sha256 = "1w4jf28g8p25fmijixw6b02iqlagy2rvr57y3n90hvz341kb0bbc"; + }; }; - buildInputs = [ makeWrapper ]; - - buildPhase = '' - for n in "bin/"* "sbin/"*; do - sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|" - done - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor; - ''; - - installPhase = '' - mkdir -p $out - mv *.txt share/doc/hadoop/ - mv * $out - - for n in $out/{bin,sbin}"/"*; do - wrapProgram $n --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash ]}" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out" - done - ''; - - meta = { - homepage = http://hadoop.apache.org/; - description = "Framework for distributed processing of large data sets across clusters of computers"; - license = stdenv.lib.licenses.asl20; - - longDescription = '' - The Apache Hadoop software library is a framework that allows for - the distributed processing of large data sets across clusters of - computers using a simple programming model. It is designed to - scale up from single servers to thousands of machines, each - offering local computation and storage. Rather than rely on - hardware to deliver high-avaiability, the library itself is - designed to detect and handle failures at the application layer, - so delivering a highly-availabile service on top of a cluster of - computers, each of which may be prone to failures. - ''; - - platforms = stdenv.lib.platforms.linux; +in { + hadoop_2_7 = common { + version = "2.7.7"; + sha256 = "1ahv67f3lwak3kbjvnk1gncq56z6dksbajj872iqd0awdsj3p5rf"; + dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r"; + tomcat = tomcat_6_0_48; + }; + hadoop_2_8 = common { + version = "2.8.4"; + sha256 = "16c3ljhrzibkjn3y1bmjxdgf0kn60l23ay5hqpp7vpbnqx52x68w"; + dependencies-sha256 = "1j4f461487fydgr5978nnm245ksv4xbvskfr8pbmfhcyss6b7w03"; + tomcat = tomcat_6_0_48; + }; + hadoop_2_9 = common { + version = "2.9.1"; + sha256 = "0qgmpfbpv7f521fkjy5ldzdb4lwiblhs0hyl8qy041ws17y5x7d7"; + dependencies-sha256 = "1d5i8jj5y746rrqb9lscycnd7acmxlkz64ydsiyqsh5cdqgy2x7x"; + tomcat = tomcat_6_0_48; + }; + hadoop_3_0 = common { + version = "3.0.3"; + sha256 = "1vvkci0kx4b48dg0niifn2d3r4wwq8pb3c5z20wy8pqsqrqhlci5"; + dependencies-sha256 = "1kzkna9ywacm2m1cirj9cyip66bgqjhid2xf9rrhq6g10lhr8j9m"; + tomcat = null; + }; + hadoop_3_1 = common { + version = "3.1.1"; + sha256 = "04hhdbyd4x1hy0fpy537f8mi0864hww97zap29x7dk1smrffwabd"; + dependencies-sha256 = "1q63jsxg3d31x0p8hvhpvbly2b07almyzsbhwphbczl3fhlqgiwn"; + tomcat = null; }; } diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index a49ff486d961d85c0a486dd73b409e4f74ed76e8..d09e65a4caae06ad9e11c9848d6cd6da692e2fa1 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -5,10 +5,10 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if isLinux - then "1lr2s66kln6rp3sb156br9nfx51bdy654vdjr4vnncz4kp3mljv1" - else "04y4ii0w4s00z831q1wzxz6qkc8qfrhwzdrq3wwvrcl0413cza50"; + then "1fk6w6sajdi6iphxrzi9r7xfyaf923nxcqnl01s6x3f611fjvbjn" + else "1jzgy641hm3khj0bakfbr5wd5zl3s7w5jb622fjv2jxwmnv7dxiv"; pname = "helm"; - version = "2.8.2"; + version = "2.9.1"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -45,6 +45,6 @@ stdenv.mkDerivation { description = "A package manager for kubernetes"; license = licenses.asl20; maintainers = [ maintainers.rlupton20 ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = [ "x86_64-linux" ] ++ platforms.darwin; }; } diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..358f4cdb7df77d4315cb430abf636b1e0a05ff84 --- /dev/null +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: + +let version = "0.19.0"; in + +buildGoPackage { + name = "helmfile-${version}"; + + src = fetchFromGitHub { + owner = "roboll"; + repo = "helmfile"; + rev = "v${version}"; + sha256 = "0wjzzaygdnnvyi5a78bhmz2sxc4gykdl00h78dkgvj7aaw05s9yd"; + }; + + goPackagePath = "github.com/roboll/helmfile"; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $bin/bin/helmfile \ + --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} + ''; + + + meta = { + description = "Deploy Kubernetes Helm charts"; + homepage = https://github.com/roboll/helmfile; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pneumaticat ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1860874c436cee1518adbbcb4cbbd0119d5e4864 --- /dev/null +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "heptio-ark-${version}"; + version = "0.9.0"; + + goPackagePath = "github.com/heptio/ark"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "heptio"; + repo = "ark"; + sha256 = "0b3jsgs35l8kk63pjnqn3911pyb397fyvsmd3jd8vzjawisgpdp7"; + }; + + postInstall = "rm $bin/bin/generate"; + + meta = with stdenv.lib; { + description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; + homepage = https://heptio.github.io/ark/; + license = licenses.asl20; + maintainers = [maintainers.mbode]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fe2420a719d55a0e9469a9fef6835a9a61b3e363 --- /dev/null +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoPackage, fetchFromGitHub, ... }: + +let version = "0.3.1"; in + +buildGoPackage { + name = "hetzner-kube-${version}"; + + src = fetchFromGitHub { + owner = "xetys"; + repo = "hetzner-kube"; + rev = "${version}"; + sha256 = "1xldh1ca8ym8cg3w5cxizmhqxwi5kmiin28f320mxdr28fzljc2w"; + }; + + goPackagePath = "github.com/xetys/hetzner-kube"; + + meta = { + description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud"; + homepage = https://github.com/xetys/hetzner-kube; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ eliasp ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix index 5b543854473dda84e01fc6af982e539139bfc9d9..6274168b3da7fab4b7b48ad49f6290ac4134f421 100644 --- a/pkgs/applications/networking/cluster/kanif/default.nix +++ b/pkgs/applications/networking/cluster/kanif/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "kanif-${version}"; src = fetchurl { - url = "http://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz"; sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879"; }; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index ff0f664154aa87bcabfe3f017c4d864793c3d41e..d6e703f79d052136035cd64d7a0935c59659af4c 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "kompose-${version}"; diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index 56cbef7f00553830ef8f5c02835d90632aa3bc41..1e03efddc062848922e0e7dbde44f911dcb44247 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kontemplate-${version}"; - version = "1.4.0"; + version = "1.7.0"; goPackagePath = "github.com/tazjin/kontemplate"; goDeps = ./deps.nix; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "tazjin"; repo = "kontemplate"; rev = "v${version}"; - sha256 = "11aqc9sgyqz3pscx7njnb3xghl7d61vzdgl3bqndady0dxsccrpj"; + sha256 = "0vzircajhrfq1nykwpl52cqgzyhy51w4ff7ldpgi95w3a4fz1hzz"; }; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix index db2692a79e72b2fd4dd96bf72f38ba1cc54ac37a..f0a52f5266ef9f7c987c276cb7331fc2b7a32a64 100644 --- a/pkgs/applications/networking/cluster/kontemplate/deps.nix +++ b/pkgs/applications/networking/cluster/kontemplate/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/semver"; - rev = "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"; - sha256 = "1625b5sxpmlz60jw67j1ljfcc09d4lhxg3z6gc4am8s2rrdgwij6"; + rev = "c84ddcca87bf5a941b138dde832a7e20b0159ad8"; + sha256 = "1dcfdr018a0yszjpvr3wshvq9cc3kvy95l55si556p617wsn1wan"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/sprig"; - rev = "e039e20e500c2c025d9145be375e27cf42a94174"; - sha256 = "1yhpyzq6ghwl0242phjpbc9358fcw63pxrcxsyv9n4dm0w15va3m"; + rev = "77bb58b7f5e10889a1195c21b9e7a96ee166f199"; + sha256 = "0q4g12f3nvda1skz33qzbbdd2vj3gjfwf361hyzlx20s71brk3bk"; }; } { @@ -50,35 +50,35 @@ fetch = { type = "git"; url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + rev = "e9ed3c6dfb39bb1a32197cb10d527906fe4da4b6"; + sha256 = "07cf0j3wbsl1gmn175mdgljcarfz4xbqd6pgc7b08a5lcn7zwhjz"; }; } { - goPackagePath = "github.com/huandu/xstrings"; + goPackagePath = "github.com/google/uuid"; fetch = { type = "git"; - url = "https://github.com/huandu/xstrings"; - rev = "3959339b333561bf62a38b424fd41517c2c90f40"; - sha256 = "0f1jyd80grpr88gwhljx2x0xgsyzw07807n4z4axxxlybh5f0nh1"; + url = "https://github.com/google/uuid"; + rev = "dec09d789f3dba190787f8b4454c7d3c936fed9e"; + sha256 = "1hc4w67p6zkh2qk7wm1yrl69jjrjjk615mly5ll4iidn1m4mzi4i"; }; } { - goPackagePath = "github.com/imdario/mergo"; + goPackagePath = "github.com/huandu/xstrings"; fetch = { type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "d806ba8c21777d504a2090a2ca4913c750dd3a33"; - sha256 = "12n3lfbfxvnag916c6dpxl48j29s482zwsqjc6wk4vb68qbz2nl3"; + url = "https://github.com/huandu/xstrings"; + rev = "7bb0250b58e5c15670406e6f93ffda43281305b1"; + sha256 = "1fc8q65xvsxpa12p8hcjqap2pf72zqlwpm165js9kwbgm2sf977c"; }; } { - goPackagePath = "github.com/satori/go.uuid"; + goPackagePath = "github.com/imdario/mergo"; fetch = { type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b"; - sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07"; + url = "https://github.com/imdario/mergo"; + rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4"; + sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "ab89591268e0c8b748cbe4047b00197516011af5"; - sha256 = "1cbg8wlv1hmdps9ksa4kym5zy0mb2yjykw4ns7yqv7nmz4s5xajr"; + rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; + sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; }; } { @@ -95,8 +95,8 @@ fetch = { type = "git"; url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "1087e65c9441605df944fb12c33f0fe7072d18ca"; - sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } ] diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index ddb8951740cb8456dd1511189e986a7c34c90390..5f7a2e8e28435f339e6259445426e8803f96f012 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }: + +{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata }: buildGoPackage rec { name = "kops-${version}"; - version = "1.8.1"; + version = "1.9.0"; goPackagePath = "k8s.io/kops"; @@ -10,7 +11,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "12nyr0iw1xwp60apli3nlq2vyn4jk3qjrb404m2syx2mqbnn47my"; + sha256 = "03avkm7gk2dqyvd7245qsca1sbhwk41j9yhc208gcmjgjhkx2vn7"; }; buildInputs = [go-bindata]; @@ -24,8 +25,7 @@ buildGoPackage rec { preBuild = '' (cd go/src/k8s.io/kops - go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/... - go-bindata -o federation/model/bindata.go -pkg model -prefix federation/model federation/model/...) + go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...) ''; postInstall = '' diff --git a/pkgs/applications/networking/cluster/ksonnet/default.nix b/pkgs/applications/networking/cluster/ksonnet/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b8bce931523763fb8a64576311531ddb6d63cd54 --- /dev/null +++ b/pkgs/applications/networking/cluster/ksonnet/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoPackage, fetchFromGitHub, ... }: + +buildGoPackage rec { + version = "0.11.0"; + name = "ksonnet-${version}"; + + src = fetchFromGitHub { + owner = "ksonnet"; + repo = "ksonnet"; + rev = "v${version}"; + sha256 = "0z7gkgcsiclm72bznmzv5jcgx5rblndcsiqc0r2mwhxhmv19bs04"; + }; + + goPackagePath = "github.com/ksonnet/ksonnet"; + + meta = { + description = "A CLI-supported framework that streamlines writing and deployment of Kubernetes configurations to multiple clusters"; + homepage = https://github.com/ksonnet/ksonnet; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ flokli ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 2b55543532701c590778514ffecfcffec83b653b..01bf3467af957f5a518fca50b986dafe5872df76 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync -, iptables, coreutils +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync , components ? [ "cmd/kubeadm" "cmd/kubectl" @@ -7,7 +6,7 @@ "cmd/kube-apiserver" "cmd/kube-controller-manager" "cmd/kube-proxy" - "plugin/cmd/kube-scheduler" + "cmd/kube-scheduler" "test/e2e/e2e.test" ] }: @@ -16,35 +15,20 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.9.1"; + version = "1.10.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk"; + sha256 = "1k6ayb43l68l0qw31cc4k1pwvm8aks3l2xm0gdxdxbbww1mnzix2"; }; - # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60373 + # Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ]; outputs = ["out" "man" "pause"]; - patches = [ - # patch is from https://github.com/kubernetes/kubernetes/pull/58207 - (fetchpatch { - url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch"; - sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w"; - }) - (fetchpatch { - # https://github.com/kubernetes/kubernetes/pull/60978 - # Fixes critical kube-proxy failure on iptables-restore >= 1.6.2 and - # non-critical failures on prior versions. - url = "https://github.com/kubernetes/kubernetes/commit/34ce573e9992ecdbc06dff1b4e3d0e9baa8353dd.patch"; - sha256 = "1sd9qgc28zr6fkk0441f89bw8kq2kadys0qs7bgivy9cmcpw5x5p"; - }) - ]; - postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" @@ -84,8 +68,8 @@ stdenv.mkDerivation rec { meta = { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; - homepage = http://kubernetes.io; - maintainers = with maintainers; [offline]; + homepage = https://kubernetes.io; + maintainers = with maintainers; [johanot offline]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..201e3e8b30d2cb76071c30ce02f37247c392490d --- /dev/null +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, lib, ... }: + +stdenv.mkDerivation rec { + name = "kubetail-${version}"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "johanhaleby"; + repo = "kubetail"; + rev = "${version}"; + sha256 = "10ql1kdsmyrk73jb6f5saf2q38znm0vdihscj3c9n0qhyhk9blpl"; + }; + + installPhase = '' + install -Dm755 kubetail $out/bin/kubetail + ''; + + meta = with lib; { + description = "Bash script to tail Kubernetes logs from multiple pods at the same time"; + longDescription = '' + Bash script that enables you to aggregate (tail/follow) logs from + multiple pods into one stream. This is the same as running "kubectl logs + -f " but for multiple pods. + ''; + homepage = https://github.com/johanhaleby/kubetail; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 68c66d78de1c1749c73f151a56c692dde86c0a6d..8cff2494bf8fe6ca5f2a02fee62afd699548d01d 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,9 +1,11 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh , unzip, gnutar, jdk, python, wrapPython -, setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd +, setuptools, boto, pythonProtobuf, apr, subversion, gzip , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent , ethtool, coreutils, which, iptables, maven , bash, autoreconfHook +, utf8proc, lz4 +, withJava ? !stdenv.isDarwin }: let @@ -46,11 +48,14 @@ in stdenv.mkDerivation rec { autoreconfHook ]; buildInputs = [ - makeWrapper curl sasl jdk + makeWrapper curl sasl python wrapPython boto setuptools leveldb - subversion apr glog openssl libevent maven + subversion apr glog openssl libevent + utf8proc lz4 ] ++ lib.optionals stdenv.isLinux [ libnl + ] ++ lib.optionals withJava [ + jdk maven ]; propagatedBuildInputs = [ @@ -181,6 +186,7 @@ in stdenv.mkDerivation rec { "--with-libevent=${libevent.dev}" "--with-protobuf=${pythonProtobuf.protobuf}" "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar" + (if withJava then "--enable-java" else "--disable-java") ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" "--with-nl=${libnl.dev}" @@ -190,16 +196,6 @@ in stdenv.mkDerivation rec { rm -rf $out/var rm $out/bin/*.sh - mkdir -p $out/share/java - cp src/java/target/mesos-*.jar $out/share/java - - MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} - - mkdir -p $out/nix-support - touch $out/nix-support/setup-hook - echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook - echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook - # Inspired by: pkgs/development/python-modules/generic/default.nix pushd src/python mkdir -p $out/lib/${python.libPrefix}/site-packages @@ -218,6 +214,16 @@ in stdenv.mkDerivation rec { --old-and-unmanageable \ --prefix="$out" popd + '' + stdenv.lib.optionalString withJava '' + mkdir -p $out/share/java + cp src/java/target/mesos-*.jar $out/share/java + + MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} + + mkdir -p $out/nix-support + touch $out/nix-support/setup-hook + echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook + echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook ''; postFixup = '' @@ -248,6 +254,6 @@ in stdenv.mkDerivation rec { license = licenses.asl20; description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; maintainers = with maintainers; [ cstrahan kevincox offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index d181335ee35fdd96969bfd64bb9f28012dbf7de6..b674f1f645808d766b544c6e0c47adac5a40c34e 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,29 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, kubernetes, libvirt, qemu, docker-machine-kvm, - gpgme, makeWrapper, hostPlatform, vmnet }: +{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata, libvirt, qemu +, gpgme, makeWrapper, hostPlatform, vmnet, python +, docker-machine-kvm, docker-machine-kvm2 +, extraDrivers ? [] +}: let - binPath = [ kubernetes ] - ++ stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ] - ++ stdenv.lib.optionals stdenv.isDarwin []; + drivers = stdenv.lib.filter (d: d != null) (extraDrivers + ++ stdenv.lib.optionals stdenv.isLinux [ docker-machine-kvm docker-machine-kvm2 ]); - # Normally, minikube bundles localkube in its own binary via go-bindata. Unfortunately, it needs to make that localkube - # a static linux binary, and our Linux nixpkgs go compiler doesn't seem to work when asking for a cgo binary that's static - # (presumably because we don't have some static system libraries it wants), and cross-compiling cgo on Darwin is a nightmare. - # - # Note that minikube can download (and cache) versions of localkube it needs on demand. Unfortunately, minikube's knowledge - # of where it can download versions of localkube seems to rely on a json file that doesn't get updated as often as we'd like. So - # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is - # currently https://storage.googleapis.com/minikube/k8s_releases.json + binPath = drivers + ++ stdenv.lib.optionals stdenv.isLinux ([ libvirt qemu ]); - localkube-version = "1.9.4"; - localkube-binary = fetchurl { - url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "0c1n8p7q38hx864xvcsr01d028cizjfpsqbfpf1y24fnrpzacajw"; - }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.25.2"; + version = "0.28.1"; goPackagePath = "k8s.io/minikube"; @@ -31,45 +22,43 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1h8sxs6xxmli7xkb33kdl4nyn1sgq2b8b2d6aj5wim11ric3l7pb"; + sha256 = "0c36rzsdzxf9q6l4hl506bsd4qwmw033i0k1xhqszv9agg7qjlmm"; }; - patches = [ - ./localkube.patch - ]; - - # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly - # that kubectl is on the $PATH, even if it doesn't use it at all to generate the completions - buildInputs = [ go-bindata makeWrapper kubernetes gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet; - subPackages = [ "cmd/minikube" ]; + buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet; + subPackages = [ "cmd/minikube" ] ++ stdenv.lib.optional hostPlatform.isDarwin "cmd/drivers/hyperkit"; preBuild = '' pushd go/src/${goPackagePath} >/dev/null - mkdir -p out - cp ${localkube-binary} out/localkube - - go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets ./out/localkube deploy/addons/... + go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//") ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//") + KUBERNETES_VERSION=$(${python}/bin/python hack/get_k8s_version.py --k8s-version-only 2>&1) || true export buildFlagsArray="-ldflags=\ -X k8s.io/minikube/pkg/version.version=v${version} \ -X k8s.io/minikube/pkg/version.isoVersion=$ISO_VERSION \ - -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET" + -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET \ + -X k8s.io/minikube/vendor/k8s.io/client-go/pkg/version.gitVersion=$KUBERNETES_VERSION \ + -X k8s.io/minikube/vendor/k8s.io/kubernetes/pkg/version.gitVersion=$KUBERNETES_VERSION" popd >/dev/null ''; postInstall = '' mkdir -p $bin/share/bash-completion/completions/ - MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube + MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube mkdir -p $bin/share/zsh/site-functions/ - MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion zsh > $bin/share/zsh/site-functions/_minikube + MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $bin/bin/minikube completion zsh > $bin/share/zsh/site-functions/_minikube ''; - postFixup = "wrapProgram $bin/bin/${pname} --prefix PATH : ${stdenv.lib.makeBinPath binPath}"; + postFixup = '' + wrapProgram $bin/bin/${pname} --prefix PATH : $bin/bin:${stdenv.lib.makeBinPath binPath} + '' + stdenv.lib.optionalString hostPlatform.isDarwin '' + mv $bin/bin/hyperkit $bin/bin/docker-machine-driver-hyperkit + ''; meta = with stdenv.lib; { homepage = https://github.com/kubernetes/minikube; diff --git a/pkgs/applications/networking/cluster/minikube/localkube.patch b/pkgs/applications/networking/cluster/minikube/localkube.patch deleted file mode 100644 index 2d69cded555f928017d9dc1b5598edec908e516e..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/minikube/localkube.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/pkg/minikube/bootstrapper/localkube/localkube.go b/pkg/minikube/bootstrapper/localkube/localkube.go -index 1c4b5000..c9f120d4 100644 ---- a/pkg/minikube/bootstrapper/localkube/localkube.go -+++ b/pkg/minikube/bootstrapper/localkube/localkube.go -@@ -113,14 +113,9 @@ func (lk *LocalkubeBootstrapper) UpdateCluster(config bootstrapper.KubernetesCon - - copyableFiles := []assets.CopyableFile{} - var localkubeFile assets.CopyableFile -- var err error - - //add url/file/bundled localkube to file list -- lCacher := localkubeCacher{config} -- localkubeFile, err = lCacher.fetchLocalkubeFromURI() -- if err != nil { -- return errors.Wrap(err, "Error updating localkube from uri") -- } -+ localkubeFile = assets.NewBinDataAsset("out/localkube", "/usr/local/bin/", "localkube", "0777") - copyableFiles = append(copyableFiles, localkubeFile) - - // user added files diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 3f7e0650e0d5675a6cf3fc747cbf9735147c0274..0f137a872da64e86739f85e113bcabcee1e07200 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync -, iptables, coreutils, kerberos, clang +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux +, coreutils, kerberos, clang , components ? [ "cmd/oc" "cmd/openshift" @@ -9,15 +9,17 @@ with lib; let - version = "3.9.0"; + version = "3.10.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; - gitCommit = "191fece"; + gitCommit = "dd10d17"; # version is in vendor/k8s.io/kubernetes/pkg/version/base.go - k8sversion = "v1.9.1"; - k8sgitcommit = "a0ce1bc657"; + k8sversion = "v1.10.0"; + k8sgitcommit = "b81c8f8"; + k8sgitMajor = "0"; + k8sgitMinor = "1"; in stdenv.mkDerivation rec { name = "openshift-origin-${version}"; inherit version; @@ -26,7 +28,7 @@ in stdenv.mkDerivation rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "06k0zilfyvll7z34yirraslgpwgah9k6y5i6wgi7f00a79k76k78"; + sha256 = "13aglz005jl48z17vnggkvr39l5h6jcqgkfyvkaz4c3jakms1hi9"; }; # go > 1.10 @@ -37,6 +39,18 @@ in stdenv.mkDerivation rec { patchPhase = '' patchShebangs ./hack + + substituteInPlace pkg/oc/clusterup/docker/host/host.go \ + --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ + 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' + + substituteInPlace pkg/oc/clusterup/docker/host/host.go \ + --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ + 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' + + substituteInPlace pkg/oc/clusterup/docker/host/host.go \ + --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ + 'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir' ''; buildPhase = '' @@ -49,6 +63,8 @@ in stdenv.mkDerivation rec { echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs + echo "KUBE_GIT_MAJOR=${k8sgitMajor}" >> os-version-defs + echo "KUBE_GIT_MINOR=${k8sgitMinor}" >> os-version-defs export OS_VERSION_FILE="os-version-defs" export CC=clang make all WHAT='${concatStringsSep " " components}' @@ -57,6 +73,8 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/" + install -D -t "$out/etc/bash_completion.d" contrib/completions/bash/* + install -D -t "$out/share/zsh/site-functions" contrib/completions/zsh/* ''; preFixup = '' diff --git a/pkgs/applications/networking/cluster/panamax/api/Gemfile b/pkgs/applications/networking/cluster/panamax/api/Gemfile deleted file mode 100644 index 82085aa6db08b66d9ebe1a18c962aab52d896ea0..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/api/Gemfile +++ /dev/null @@ -1,23 +0,0 @@ -source 'https://rubygems.org' - -gem 'rails', '4.1.7' -gem 'puma', '2.8.2' -gem 'sqlite3', '1.3.9' -gem 'faraday_middleware', '0.9.0' -gem 'docker-api', '1.13.0', require: 'docker' -gem 'fleet-api', '0.6.0', require: 'fleet' -gem 'active_model_serializers', '0.9.0' -gem 'octokit', '3.2.0' -gem 'kmts', '2.0.1' - -group :test, :development do - gem 'rspec-rails' - gem 'its' -end - -group :test do - gem 'coveralls', '0.7.0' - gem 'shoulda-matchers', '2.6.1' - gem 'database_cleaner', '1.3.0' - gem 'webmock', '1.20.0' -end diff --git a/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock deleted file mode 100644 index 597c691700ad24cd09b1eed2fee5905d2981dd80..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock +++ /dev/null @@ -1,164 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - mail (~> 2.5, >= 2.5.4) - actionpack (4.1.7) - actionview (= 4.1.7) - activesupport (= 4.1.7) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - actionview (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - erubis (~> 2.7.0) - active_model_serializers (0.9.0) - activemodel (>= 3.2) - activemodel (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - activerecord (4.1.7) - activemodel (= 4.1.7) - activesupport (= 4.1.7) - arel (~> 5.0.0) - activesupport (4.1.7) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) - addressable (2.3.6) - archive-tar-minitar (0.5.2) - arel (5.0.1.20140414130214) - builder (3.2.2) - coveralls (0.7.0) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.2) - safe_yaml (~> 1.0.0) - database_cleaner (1.3.0) - diff-lcs (1.2.5) - docile (1.1.5) - docker-api (1.13.0) - archive-tar-minitar - excon (>= 0.37.0) - json - erubis (2.7.0) - excon (0.37.0) - faraday (0.8.9) - multipart-post (~> 1.2.0) - faraday_middleware (0.9.0) - faraday (>= 0.7.4, < 0.9) - fleet-api (0.6.0) - faraday (= 0.8.9) - faraday_middleware (= 0.9.0) - hike (1.2.3) - i18n (0.7.0) - its (0.2.0) - rspec-core - json (1.8.1) - kmts (2.0.1) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.4.3) - minitest (5.5.1) - multi_json (1.10.1) - multipart-post (1.2.0) - octokit (3.2.0) - sawyer (~> 0.5.3) - puma (2.8.2) - rack (>= 1.1, < 2.0) - rack (1.5.2) - rack-test (0.6.3) - rack (>= 1.0) - rails (4.1.7) - actionmailer (= 4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - activemodel (= 4.1.7) - activerecord (= 4.1.7) - activesupport (= 4.1.7) - bundler (>= 1.3.0, < 2.0) - railties (= 4.1.7) - sprockets-rails (~> 2.0) - railties (4.1.7) - actionpack (= 4.1.7) - activesupport (= 4.1.7) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (10.4.0) - rest-client (1.6.7) - mime-types (>= 1.16) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) - safe_yaml (1.0.4) - sawyer (0.5.4) - addressable (~> 2.3.5) - faraday (~> 0.8, < 0.10) - shoulda-matchers (2.6.1) - activesupport (>= 3.0.0) - simplecov (0.9.1) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.9) - term-ansicolor (1.3.0) - tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - tins (1.3.0) - tzinfo (1.2.2) - thread_safe (~> 0.1) - webmock (1.20.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) - -PLATFORMS - ruby - -DEPENDENCIES - active_model_serializers (= 0.9.0) - coveralls (= 0.7.0) - database_cleaner (= 1.3.0) - docker-api (= 1.13.0) - faraday_middleware (= 0.9.0) - fleet-api (= 0.6.0) - its - kmts (= 2.0.1) - octokit (= 3.2.0) - puma (= 2.8.2) - rails (= 4.1.7) - rspec-rails - shoulda-matchers (= 2.6.1) - sqlite3 (= 1.3.9) - webmock (= 1.20.0) diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix deleted file mode 100644 index 1c2e2ccac27be815f38489b2565a794905d44023..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler -, ruby, libxslt, libxml2, sqlite, openssl, docker -, dataDir ? "/var/lib/panamax-api" }@args: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "panamax-api-${version}"; - version = "0.2.16"; - - env = bundlerEnv { - name = "panamax-api-gems-${version}"; - inherit ruby; - gemdir = ./.; - }; - - bundler = args.bundler.override { inherit ruby; }; - - database_yml = builtins.toFile "database.yml" '' - production: - adapter: sqlite3 - database: <%= ENV["PANAMAX_DATABASE_PATH"] || "${dataDir}/db/mnt/db.sqlite3" %> - timeout: 5000 - ''; - - src = fetchgit { - rev = "refs/tags/v${version}"; - url = "git://github.com/CenturyLinkLabs/panamax-api"; - sha256 = "0dqg0fbmy5cgjh0ql8yqlybhjyyrslgghjrc24wjhd1rghjn2qi6"; - }; - - buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ]; - - setSourceRoot = '' - mkdir -p $out/share - cp -R panamax-api $out/share/panamax-api - export sourceRoot="$out/share/panamax-api" - ''; - - postPatch = '' - find . -type f -exec sed -e 's|/usr/bin/docker|${docker}/bin/docker|g' -i "{}" \; - ''; - - configurePhase = '' - export HOME=$PWD - export GEM_HOME=${env}/${env.ruby.gemPath} - export RAILS_ENV=production - - ln -sf ${database_yml} config/database.yml - ''; - - installPhase = '' - rm -rf log tmp - mv ./db ./_db - ln -sf ${dataDir}/{db,state/log,state/tmp} . - - mkdir -p $out/bin - makeWrapper bin/bundle "$out/bin/bundle" \ - --run "cd $out/share/panamax-api" \ - --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \ - --prefix "HOME" : "$out/share/panamax-api" \ - --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}" - ''; - - meta = with stdenv.lib; { - broken = true; # needs ruby 2.1 - homepage = https://github.com/CenturyLinkLabs/panamax-api; - description = "The API behind The Panamax UI"; - license = licenses.asl20; - maintainers = with maintainers; [ matejc offline ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/cluster/panamax/api/gemset.nix b/pkgs/applications/networking/cluster/panamax/api/gemset.nix deleted file mode 100644 index 8182543a2bb9bcba4d1bab442cc9c51b2987ecbd..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/api/gemset.nix +++ /dev/null @@ -1,568 +0,0 @@ -{ - "actionmailer" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0qjv5akjbpgd4cx518k522mssvc3y3nki65hi6fj5nbzi7a6rwq5"; - }; - dependencies = [ - "actionpack" - "actionview" - "mail" - ]; - }; - "actionpack" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "07y1ny00h69xklq260smyl5md052f617gqrzkyw5sxafs5z25zax"; - }; - dependencies = [ - "actionview" - "activesupport" - "rack" - "rack-test" - ]; - }; - "actionview" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "06sp37gfpn2jn7j6vlpp1y6vfi5kig60vyvixrjhyz0g4vgm13ax"; - }; - dependencies = [ - "activesupport" - "builder" - "erubis" - ]; - }; - "active_model_serializers" = { - version = "0.9.0"; - source = { - type = "gem"; - sha256 = "1ws3gx3wwlm17w7k0agwzmcmww6627lvqaqm828lzm3g1xqilkkl"; - }; - dependencies = [ - "activemodel" - ]; - }; - "activemodel" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0rlqzz25l7vsphgkilg80kmk20d9h357awi27ax6zzb9klkqh0jr"; - }; - dependencies = [ - "activesupport" - "builder" - ]; - }; - "activerecord" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0j4r0m32mjbwmz9gs8brln35jzr1cn7h585ggj0w0f1ai4hjsby5"; - }; - dependencies = [ - "activemodel" - "activesupport" - "arel" - ]; - }; - "activesupport" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "13i3mz66d5kp5y39gjwmcfqv0wb6mxm5k1nnz40wvd38dsf7n3bs"; - }; - dependencies = [ - "i18n" - "json" - "minitest" - "thread_safe" - "tzinfo" - ]; - }; - "addressable" = { - version = "2.3.6"; - source = { - type = "gem"; - sha256 = "137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8"; - }; - }; - "archive-tar-minitar" = { - version = "0.5.2"; - source = { - type = "gem"; - sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig"; - }; - }; - "arel" = { - version = "5.0.1.20140414130214"; - source = { - type = "gem"; - sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9"; - }; - }; - "builder" = { - version = "3.2.2"; - source = { - type = "gem"; - sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; - }; - }; - "coveralls" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4"; - }; - dependencies = [ - "multi_json" - "rest-client" - "simplecov" - "term-ansicolor" - "thor" - ]; - }; - "crack" = { - version = "0.4.2"; - source = { - type = "gem"; - sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a"; - }; - dependencies = [ - "safe_yaml" - ]; - }; - "database_cleaner" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "19w25yda684pg29bggq26wy4lpyjvzscwg2hx3hmmmpysiwfnxgn"; - }; - }; - "diff-lcs" = { - version = "1.2.5"; - source = { - type = "gem"; - sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; - }; - }; - "docile" = { - version = "1.1.5"; - source = { - type = "gem"; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; - }; - }; - "docker-api" = { - version = "1.13.0"; - source = { - type = "gem"; - sha256 = "1rara27gn7lxaf12dqkx8s1clssg10jndfcy4wz2fv6ms1i1lnp6"; - }; - dependencies = [ - "archive-tar-minitar" - "excon" - "json" - ]; - }; - "erubis" = { - version = "2.7.0"; - source = { - type = "gem"; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - }; - }; - "excon" = { - version = "0.37.0"; - source = { - type = "gem"; - sha256 = "05x7asmsq5m419n1lhzk9bic02gwng4cqmrcqsfnd6kmkwm8csv2"; - }; - }; - "faraday" = { - version = "0.8.9"; - source = { - type = "gem"; - sha256 = "17d79fsgx0xwh0mfxyz5pbr435qlw79phlfvifc546w2axdkp718"; - }; - dependencies = [ - "multipart-post" - ]; - }; - "faraday_middleware" = { - version = "0.9.0"; - source = { - type = "gem"; - sha256 = "1kwvi2sdxd6j764a7q5iir73dw2v6816zx3l8cgfv0wr2m47icq2"; - }; - dependencies = [ - "faraday" - ]; - }; - "fleet-api" = { - version = "0.6.0"; - source = { - type = "gem"; - sha256 = "0136mzc0fxp6mzh38n6xbg87cw9g9vq1nrlr3ylazbflvmlxgan6"; - }; - dependencies = [ - "faraday" - "faraday_middleware" - ]; - }; - "hike" = { - version = "1.2.3"; - source = { - type = "gem"; - sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm"; - }; - }; - "i18n" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; - }; - }; - "its" = { - version = "0.2.0"; - source = { - type = "gem"; - sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g"; - }; - dependencies = [ - "rspec-core" - ]; - }; - "json" = { - version = "1.8.1"; - source = { - type = "gem"; - sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn"; - }; - }; - "kmts" = { - version = "2.0.1"; - source = { - type = "gem"; - sha256 = "1wk680q443lg35a25am6i8xawf16iqg5xnq1m8xd2gib4dsy1d8v"; - }; - }; - "mail" = { - version = "2.6.3"; - source = { - type = "gem"; - sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; - }; - dependencies = [ - "mime-types" - ]; - }; - "mime-types" = { - version = "2.4.3"; - source = { - type = "gem"; - sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq"; - }; - }; - "minitest" = { - version = "5.5.1"; - source = { - type = "gem"; - sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; - }; - }; - "multi_json" = { - version = "1.10.1"; - source = { - type = "gem"; - sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; - }; - }; - "multipart-post" = { - version = "1.2.0"; - source = { - type = "gem"; - sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc"; - }; - }; - "octokit" = { - version = "3.2.0"; - source = { - type = "gem"; - sha256 = "07ll3x1hv72zssb4hkdw56xg3xk6x4fch4yf38zljvbh388r11ng"; - }; - dependencies = [ - "sawyer" - ]; - }; - "puma" = { - version = "2.8.2"; - source = { - type = "gem"; - sha256 = "1l57fmf8vyxfjv7ab5znq0k339cym5ghnm5xxfvd1simjp73db0k"; - }; - dependencies = [ - "rack" - ]; - }; - "rack" = { - version = "1.5.2"; - source = { - type = "gem"; - sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6"; - }; - }; - "rack-test" = { - version = "0.6.3"; - source = { - type = "gem"; - sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; - }; - dependencies = [ - "rack" - ]; - }; - "rails" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "059mpljplmhfz8rr4hk40q67fllcpsy809m4mwwbkm8qwif2z5r0"; - }; - dependencies = [ - "actionmailer" - "actionpack" - "actionview" - "activemodel" - "activerecord" - "activesupport" - "railties" - "sprockets-rails" - ]; - }; - "railties" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "1n08h0rgj0aq5lvslnih6lvqz9wadpz6nnb25i4qhp37fhhyz9yz"; - }; - dependencies = [ - "actionpack" - "activesupport" - "rake" - "thor" - ]; - }; - "rake" = { - version = "10.4.0"; - source = { - type = "gem"; - sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8"; - }; - }; - "rest-client" = { - version = "1.6.7"; - source = { - type = "gem"; - sha256 = "0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853"; - }; - dependencies = [ - "mime-types" - ]; - }; - "rspec-core" = { - version = "3.1.7"; - source = { - type = "gem"; - sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-expectations" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh"; - }; - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - }; - "rspec-mocks" = { - version = "3.1.3"; - source = { - type = "gem"; - sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-rails" = { - version = "3.1.0"; - source = { - type = "gem"; - sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq"; - }; - dependencies = [ - "actionpack" - "activesupport" - "railties" - "rspec-core" - "rspec-expectations" - "rspec-mocks" - "rspec-support" - ]; - }; - "rspec-support" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb"; - }; - }; - "safe_yaml" = { - version = "1.0.4"; - source = { - type = "gem"; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - }; - }; - "sawyer" = { - version = "0.5.4"; - source = { - type = "gem"; - sha256 = "01kl4zpf0gaacnkra5nikrzfpwj8f10hsvgyzm7z2s1mz4iipx2v"; - }; - dependencies = [ - "addressable" - "faraday" - ]; - }; - "shoulda-matchers" = { - version = "2.6.1"; - source = { - type = "gem"; - sha256 = "1p3jhvd4dsj6d7nbmvnqhqhpmb8pnr05pi7jv9ajwqcys8140mc1"; - }; - dependencies = [ - "activesupport" - ]; - }; - "simplecov" = { - version = "0.9.1"; - source = { - type = "gem"; - sha256 = "06hylxlalaxxldpbaqa54gc52wxdff0fixdvjyzr6i4ygxwzr7yf"; - }; - dependencies = [ - "docile" - "multi_json" - "simplecov-html" - ]; - }; - "simplecov-html" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9"; - }; - }; - "sprockets" = { - version = "2.12.3"; - source = { - type = "gem"; - sha256 = "1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2"; - }; - dependencies = [ - "hike" - "multi_json" - "rack" - "tilt" - ]; - }; - "sprockets-rails" = { - version = "2.2.4"; - source = { - type = "gem"; - sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; - }; - dependencies = [ - "actionpack" - "activesupport" - "sprockets" - ]; - }; - "sqlite3" = { - version = "1.3.9"; - source = { - type = "gem"; - sha256 = "07m6a6flmyyi0rkg0j7x1a9861zngwjnximfh95cli2zzd57914r"; - }; - }; - "term-ansicolor" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b"; - }; - dependencies = [ - "tins" - ]; - }; - "thor" = { - version = "0.19.1"; - source = { - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; - }; - "thread_safe" = { - version = "0.3.4"; - source = { - type = "gem"; - sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n"; - }; - }; - "tilt" = { - version = "1.4.1"; - source = { - type = "gem"; - sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; - }; - }; - "tins" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1yxa5kyp9mw4w866wlg7c32ingzqxnzh3ir9yf06pwpkmq3mrbdi"; - }; - }; - "tzinfo" = { - version = "1.2.2"; - source = { - type = "gem"; - sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; - }; - dependencies = [ - "thread_safe" - ]; - }; - "webmock" = { - version = "1.20.0"; - source = { - type = "gem"; - sha256 = "0bl5v0xzcj24lx7xpsnywv3liqnqb5lfxysmmfb2fgi0n8586i6m"; - }; - dependencies = [ - "addressable" - "crack" - ]; - }; -} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile b/pkgs/applications/networking/cluster/panamax/ui/Gemfile deleted file mode 100644 index 6f7dc59d04d03586a1d8890ed08ebc664a5ba344..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile +++ /dev/null @@ -1,31 +0,0 @@ -source 'https://rubygems.org' - -gem 'rails', '4.1.7' -gem 'puma', '2.8.2' -gem 'sass', '3.3.9' -gem 'therubyracer', '0.12.1', platforms: :ruby -gem 'haml', '4.0.5' -gem 'uglifier', '2.5.1' -gem 'ctl_base_ui' -gem 'activeresource', '4.0.0' -gem 'kramdown', '1.4.0' -gem 'zeroclipboard-rails' - - -group :test, :development do - gem 'rspec-rails' - gem 'its' - gem 'capybara' - gem 'teaspoon' - gem 'phantomjs' - gem 'dotenv-rails', '0.11.1' - gem 'pry' - gem 'pry-byebug' - gem 'pry-stack_explorer' -end - -group :test do - gem 'webmock' - gem 'sinatra', '1.4.5' - gem 'coveralls', '0.7.0' -end diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock deleted file mode 100644 index b273595bbb051f2fe48dd74d18afd20dc532e841..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock +++ /dev/null @@ -1,226 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - mail (~> 2.5, >= 2.5.4) - actionpack (4.1.7) - actionview (= 4.1.7) - activesupport (= 4.1.7) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - actionview (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - erubis (~> 2.7.0) - activemodel (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - activerecord (4.1.7) - activemodel (= 4.1.7) - activesupport (= 4.1.7) - arel (~> 5.0.0) - activeresource (4.0.0) - activemodel (~> 4.0) - activesupport (~> 4.0) - rails-observers (~> 0.1.1) - activesupport (4.1.7) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) - addressable (2.3.6) - arel (5.0.1.20140414130214) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) - builder (3.2.2) - byebug (3.5.1) - columnize (~> 0.8) - debugger-linecache (~> 1.2) - slop (~> 3.6) - capybara (2.4.4) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - coderay (1.1.0) - columnize (0.8.9) - coveralls (0.7.0) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.2) - safe_yaml (~> 1.0.0) - ctl_base_ui (0.0.5) - haml (~> 4.0) - jquery-rails (~> 3.1) - jquery-ui-rails (~> 4.2) - rails (~> 4.1) - sass (~> 3.3) - debug_inspector (0.0.2) - debugger-linecache (1.2.0) - diff-lcs (1.2.5) - docile (1.1.5) - dotenv (0.11.1) - dotenv-deployment (~> 0.0.2) - dotenv-deployment (0.0.2) - dotenv-rails (0.11.1) - dotenv (= 0.11.1) - erubis (2.7.0) - execjs (2.2.2) - haml (4.0.5) - tilt - hike (1.2.3) - i18n (0.7.0) - its (0.2.0) - rspec-core - jquery-rails (3.1.2) - railties (>= 3.0, < 5.0) - thor (>= 0.14, < 2.0) - jquery-ui-rails (4.2.1) - railties (>= 3.2.16) - json (1.8.2) - kramdown (1.4.0) - libv8 (3.16.14.11) - mail (2.6.3) - mime-types (>= 1.16, < 3) - method_source (0.8.2) - mime-types (2.4.3) - mini_portile (0.6.1) - minitest (5.5.1) - multi_json (1.10.1) - netrc (0.8.0) - nokogiri (1.6.5) - mini_portile (~> 0.6.0) - phantomjs (1.9.7.1) - pry (0.10.1) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (2.0.0) - byebug (~> 3.4) - pry (~> 0.10) - pry-stack_explorer (0.4.9.1) - binding_of_caller (>= 0.7) - pry (>= 0.9.11) - puma (2.8.2) - rack (>= 1.1, < 2.0) - rack (1.5.2) - rack-protection (1.5.3) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (4.1.7) - actionmailer (= 4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - activemodel (= 4.1.7) - activerecord (= 4.1.7) - activesupport (= 4.1.7) - bundler (>= 1.3.0, < 2.0) - railties (= 4.1.7) - sprockets-rails (~> 2.0) - rails-observers (0.1.2) - activemodel (~> 4.0) - railties (4.1.7) - actionpack (= 4.1.7) - activesupport (= 4.1.7) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (10.4.0) - ref (1.0.5) - rest-client (1.7.2) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) - safe_yaml (1.0.4) - sass (3.3.9) - simplecov (0.9.1) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - sinatra (1.4.5) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - slop (3.6.0) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - teaspoon (0.8.0) - railties (>= 3.2.5, < 5) - term-ansicolor (1.3.0) - tins (~> 1.0) - therubyracer (0.12.1) - libv8 (~> 3.16.14.0) - ref - thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - tins (1.3.3) - tzinfo (1.2.2) - thread_safe (~> 0.1) - uglifier (2.5.1) - execjs (>= 0.3.0) - json (>= 1.8.0) - webmock (1.20.4) - addressable (>= 2.3.6) - crack (>= 0.3.2) - xpath (2.0.0) - nokogiri (~> 1.3) - zeroclipboard-rails (0.1.0) - railties (>= 3.1) - -PLATFORMS - ruby - -DEPENDENCIES - activeresource (= 4.0.0) - capybara - coveralls (= 0.7.0) - ctl_base_ui - dotenv-rails (= 0.11.1) - haml (= 4.0.5) - its - kramdown (= 1.4.0) - phantomjs - pry - pry-byebug - pry-stack_explorer - puma (= 2.8.2) - rails (= 4.1.7) - rspec-rails - sass (= 3.3.9) - sinatra (= 1.4.5) - teaspoon - therubyracer (= 0.12.1) - uglifier (= 2.5.1) - webmock - zeroclipboard-rails diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix deleted file mode 100644 index 2f60942f014babdda2440c494609a2e0555dffbe..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler -, ruby, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}@args: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "panamax-ui-${version}"; - version = "0.2.14"; - - env = bundlerEnv { - name = "panamax-ui-gems-${version}"; - inherit ruby; - gemdir = ./.; - }; - - bundler = args.bundler.override { inherit ruby; }; - - src = fetchgit { - rev = "refs/tags/v${version}"; - url = "git://github.com/CenturyLinkLabs/panamax-ui"; - sha256 = "01k0h0rjqp5arvwxm2xpfxjsag5qw0qqlg7hx4v8f6jsyc4wmjfl"; - }; - - buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ]; - - setSourceRoot = '' - mkdir -p $out/share - cp -R panamax-ui $out/share/panamax-ui - export sourceRoot="$out/share/panamax-ui" - ''; - - postPatch = '' - find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Journal|NixOS Journal|g' -i "{}" \; - find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Local|NixOS Local|g' -i "{}" \; - find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Host|NixOS Host|g' -i "{}" \; - sed -e 's|CoreOS Local|NixOS Local|g' -i "spec/features/manage_application_spec.rb" - # fix libv8 dependency - substituteInPlace Gemfile.lock --replace "3.16.14.7" "3.16.14.11" - ''; - - configurePhase = '' - export HOME=$PWD - export GEM_HOME=${env}/${env.ruby.gemPath} - ''; - - buildPhase = '' - rm -f ./bin/* - bundle exec rake rails:update:bin - ''; - - installPhase = '' - rm -rf log tmp db - ln -sf ${dataDir}/{db,state/log,state/tmp} . - - mkdir -p $out/bin - makeWrapper bin/bundle "$out/bin/bundle" \ - --run "cd $out/share/panamax-ui" \ - --prefix "PATH" : "$out/share/panamax-ui/bin:${env.ruby}/bin:$PATH" \ - --prefix "HOME" : "$out/share/panamax-ui" \ - --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "GEM_PATH" : "$out/share/panamax-ui:${bundler}/${env.ruby.gemPath}" - ''; - - meta = with stdenv.lib; { - broken = true; # needs ruby 2.1 - homepage = https://github.com/CenturyLinkLabs/panamax-ui; - description = "The Web GUI for Panamax"; - license = licenses.asl20; - maintainers = with maintainers; [ matejc offline ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix deleted file mode 100644 index b41b482edb73c12331222bae51f1914ee4f97c8a..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix +++ /dev/null @@ -1,789 +0,0 @@ -{ - "actionmailer" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0qjv5akjbpgd4cx518k522mssvc3y3nki65hi6fj5nbzi7a6rwq5"; - }; - dependencies = [ - "actionpack" - "actionview" - "mail" - ]; - }; - "actionpack" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "07y1ny00h69xklq260smyl5md052f617gqrzkyw5sxafs5z25zax"; - }; - dependencies = [ - "actionview" - "activesupport" - "rack" - "rack-test" - ]; - }; - "actionview" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "06sp37gfpn2jn7j6vlpp1y6vfi5kig60vyvixrjhyz0g4vgm13ax"; - }; - dependencies = [ - "activesupport" - "builder" - "erubis" - ]; - }; - "activemodel" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0rlqzz25l7vsphgkilg80kmk20d9h357awi27ax6zzb9klkqh0jr"; - }; - dependencies = [ - "activesupport" - "builder" - ]; - }; - "activerecord" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0j4r0m32mjbwmz9gs8brln35jzr1cn7h585ggj0w0f1ai4hjsby5"; - }; - dependencies = [ - "activemodel" - "activesupport" - "arel" - ]; - }; - "activeresource" = { - version = "4.0.0"; - source = { - type = "gem"; - sha256 = "0fc5igjijyjzsl9q5kybkdzhc92zv8wsv0ifb0y90i632jx6d4jq"; - }; - dependencies = [ - "activemodel" - "activesupport" - "rails-observers" - ]; - }; - "activesupport" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "13i3mz66d5kp5y39gjwmcfqv0wb6mxm5k1nnz40wvd38dsf7n3bs"; - }; - dependencies = [ - "i18n" - "json" - "minitest" - "thread_safe" - "tzinfo" - ]; - }; - "addressable" = { - version = "2.3.6"; - source = { - type = "gem"; - sha256 = "137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8"; - }; - }; - "arel" = { - version = "5.0.1.20140414130214"; - source = { - type = "gem"; - sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9"; - }; - }; - "binding_of_caller" = { - version = "0.7.2"; - source = { - type = "gem"; - sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk"; - }; - dependencies = [ - "debug_inspector" - ]; - }; - "builder" = { - version = "3.2.2"; - source = { - type = "gem"; - sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; - }; - }; - "byebug" = { - version = "3.5.1"; - source = { - type = "gem"; - sha256 = "0ldc2r0b316rrn2fgdgiznskj9gb0q9n60243laq7nqw9na8wdan"; - }; - dependencies = [ - "columnize" - "debugger-linecache" - "slop" - ]; - }; - "capybara" = { - version = "2.4.4"; - source = { - type = "gem"; - sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f"; - }; - dependencies = [ - "mime-types" - "nokogiri" - "rack" - "rack-test" - "xpath" - ]; - }; - "coderay" = { - version = "1.1.0"; - source = { - type = "gem"; - sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s"; - }; - }; - "columnize" = { - version = "0.8.9"; - source = { - type = "gem"; - sha256 = "1f3azq8pvdaaclljanwhab78hdw40k908ma2cwk59qzj4hvf7mip"; - }; - }; - "coveralls" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4"; - }; - dependencies = [ - "multi_json" - "rest-client" - "simplecov" - "term-ansicolor" - "thor" - ]; - }; - "crack" = { - version = "0.4.2"; - source = { - type = "gem"; - sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a"; - }; - dependencies = [ - "safe_yaml" - ]; - }; - "ctl_base_ui" = { - version = "0.0.5"; - source = { - type = "gem"; - sha256 = "1pji85xmddgld5lqx52zxi5r2kx6rsjwkqlr26bp62xb29r10x57"; - }; - dependencies = [ - "haml" - "jquery-rails" - "jquery-ui-rails" - "rails" - "sass" - ]; - }; - "debug_inspector" = { - version = "0.0.2"; - source = { - type = "gem"; - sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m"; - }; - }; - "debugger-linecache" = { - version = "1.2.0"; - source = { - type = "gem"; - sha256 = "0iwyx190fd5vfwj1gzr8pg3m374kqqix4g4fc4qw29sp54d3fpdz"; - }; - }; - "diff-lcs" = { - version = "1.2.5"; - source = { - type = "gem"; - sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; - }; - }; - "docile" = { - version = "1.1.5"; - source = { - type = "gem"; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; - }; - }; - "dotenv" = { - version = "0.11.1"; - source = { - type = "gem"; - sha256 = "09z0y0d6bks7i0sqvd8szfqj9i1kkj01anzly7shi83b3gxhrq9m"; - }; - dependencies = [ - "dotenv-deployment" - ]; - }; - "dotenv-deployment" = { - version = "0.0.2"; - source = { - type = "gem"; - sha256 = "1ad66jq9a09qq1js8wsyil97018s7y6x0vzji0dy34gh65sbjz8c"; - }; - }; - "dotenv-rails" = { - version = "0.11.1"; - source = { - type = "gem"; - sha256 = "0r6hif0i1lipbi7mkxx7wa5clsn65n6wyd9jry262cx396lsfrqy"; - }; - dependencies = [ - "dotenv" - ]; - }; - "erubis" = { - version = "2.7.0"; - source = { - type = "gem"; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - }; - }; - "execjs" = { - version = "2.2.2"; - source = { - type = "gem"; - sha256 = "05m41mnxn4b2p133qzbz5cy9cc5rn57aa0pp2943hxmzbk379z1f"; - }; - }; - "haml" = { - version = "4.0.5"; - source = { - type = "gem"; - sha256 = "1xmzb0k5q271090crzmv7dbw8ss4289bzxklrc0fhw6pw3kcvc85"; - }; - dependencies = [ - "tilt" - ]; - }; - "hike" = { - version = "1.2.3"; - source = { - type = "gem"; - sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm"; - }; - }; - "i18n" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; - }; - }; - "its" = { - version = "0.2.0"; - source = { - type = "gem"; - sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g"; - }; - dependencies = [ - "rspec-core" - ]; - }; - "jquery-rails" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "0h5a565i3l2mbd221m6mz9d1nr53pz19i9qxv08qr1dv0yx2pr3y"; - }; - dependencies = [ - "railties" - "thor" - ]; - }; - "jquery-ui-rails" = { - version = "4.2.1"; - source = { - type = "gem"; - sha256 = "1garrnqwh35acj2pp4sp6fpm2g881h23y644lzbic2qmcrq9wd2v"; - }; - dependencies = [ - "railties" - ]; - }; - "json" = { - version = "1.8.2"; - source = { - type = "gem"; - sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; - }; - }; - "kramdown" = { - version = "1.4.0"; - source = { - type = "gem"; - sha256 = "001vy0ymiwbvkdbb9wpqmswv6imliv7xim00gq6rlk0chnbiaq80"; - }; - }; - libv8 = { - version = "3.16.14.11"; - source = { - type = "gem"; - sha256 = "000vbiy78wk5r1f6p7qncab8ldg7qw5pjz7bchn3lw700gpaacxp"; - }; - }; - "mail" = { - version = "2.6.3"; - source = { - type = "gem"; - sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; - }; - dependencies = [ - "mime-types" - ]; - }; - "method_source" = { - version = "0.8.2"; - source = { - type = "gem"; - sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; - }; - }; - "mime-types" = { - version = "2.4.3"; - source = { - type = "gem"; - sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq"; - }; - }; - "mini_portile" = { - version = "0.6.1"; - source = { - type = "gem"; - sha256 = "07gah4k84sar9d850v9gip9b323pw74vwwndh3bbzxpw5iiwsd3l"; - }; - }; - "minitest" = { - version = "5.5.1"; - source = { - type = "gem"; - sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; - }; - }; - "multi_json" = { - version = "1.10.1"; - source = { - type = "gem"; - sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; - }; - }; - "netrc" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "1j4jbdvd19kq34xiqx1yqb4wmcywyrlaky8hrh09c1hz3c0v5dkb"; - }; - }; - "nokogiri" = { - version = "1.6.5"; - source = { - type = "gem"; - sha256 = "1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l"; - }; - dependencies = [ - "mini_portile" - ]; - }; - "phantomjs" = { - version = "1.9.7.1"; - source = { - type = "gem"; - sha256 = "14as0yzwbzvshbp1f8igjxcdxc5vbjgh0jhdvy393il084inlrl7"; - }; - }; - "pry" = { - version = "0.10.1"; - source = { - type = "gem"; - sha256 = "1j0r5fm0wvdwzbh6d6apnp7c0n150hpm9zxpm5xvcgfqr36jaj8z"; - }; - dependencies = [ - "coderay" - "method_source" - "slop" - ]; - }; - "pry-byebug" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "17b6720ci9345wkzj369ydyj6hdlg2krd26zivpd4dvaijszzgzq"; - }; - dependencies = [ - "byebug" - "pry" - ]; - }; - "pry-stack_explorer" = { - version = "0.4.9.1"; - source = { - type = "gem"; - sha256 = "1828jqcfdr9nk86n15ky199vf33cfz51wkpv6kx230g0dsh9r85z"; - }; - dependencies = [ - "binding_of_caller" - "pry" - ]; - }; - "puma" = { - version = "2.8.2"; - source = { - type = "gem"; - sha256 = "1l57fmf8vyxfjv7ab5znq0k339cym5ghnm5xxfvd1simjp73db0k"; - }; - dependencies = [ - "rack" - ]; - }; - "rack" = { - version = "1.5.2"; - source = { - type = "gem"; - sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6"; - }; - }; - "rack-protection" = { - version = "1.5.3"; - source = { - type = "gem"; - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; - }; - dependencies = [ - "rack" - ]; - }; - "rack-test" = { - version = "0.6.3"; - source = { - type = "gem"; - sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; - }; - dependencies = [ - "rack" - ]; - }; - "rails" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "059mpljplmhfz8rr4hk40q67fllcpsy809m4mwwbkm8qwif2z5r0"; - }; - dependencies = [ - "actionmailer" - "actionpack" - "actionview" - "activemodel" - "activerecord" - "activesupport" - "railties" - "sprockets-rails" - ]; - }; - "rails-observers" = { - version = "0.1.2"; - source = { - type = "gem"; - sha256 = "1lsw19jzmvipvrfy2z04hi7r29dvkfc43h43vs67x6lsj9rxwwcy"; - }; - dependencies = [ - "activemodel" - ]; - }; - "railties" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "1n08h0rgj0aq5lvslnih6lvqz9wadpz6nnb25i4qhp37fhhyz9yz"; - }; - dependencies = [ - "actionpack" - "activesupport" - "rake" - "thor" - ]; - }; - "rake" = { - version = "10.4.0"; - source = { - type = "gem"; - sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8"; - }; - }; - "ref" = { - version = "1.0.5"; - source = { - type = "gem"; - sha256 = "19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la"; - }; - }; - "rest-client" = { - version = "1.7.2"; - source = { - type = "gem"; - sha256 = "0h8c0prfi2v5p8iim3wm60xc4yripc13nqwq601bfl85k4gf25i0"; - }; - dependencies = [ - "mime-types" - "netrc" - ]; - }; - "rspec-core" = { - version = "3.1.7"; - source = { - type = "gem"; - sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-expectations" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh"; - }; - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - }; - "rspec-mocks" = { - version = "3.1.3"; - source = { - type = "gem"; - sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-rails" = { - version = "3.1.0"; - source = { - type = "gem"; - sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq"; - }; - dependencies = [ - "actionpack" - "activesupport" - "railties" - "rspec-core" - "rspec-expectations" - "rspec-mocks" - "rspec-support" - ]; - }; - "rspec-support" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb"; - }; - }; - "safe_yaml" = { - version = "1.0.4"; - source = { - type = "gem"; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - }; - }; - "sass" = { - version = "3.3.9"; - source = { - type = "gem"; - sha256 = "0k19vj73283i907z4wfkc9qdska2b19z7ps6lcr5s4qzwis1zkmz"; - }; - }; - "simplecov" = { - version = "0.9.1"; - source = { - type = "gem"; - sha256 = "06hylxlalaxxldpbaqa54gc52wxdff0fixdvjyzr6i4ygxwzr7yf"; - }; - dependencies = [ - "docile" - "multi_json" - "simplecov-html" - ]; - }; - "simplecov-html" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9"; - }; - }; - "sinatra" = { - version = "1.4.5"; - source = { - type = "gem"; - sha256 = "0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s"; - }; - dependencies = [ - "rack" - "rack-protection" - "tilt" - ]; - }; - "slop" = { - version = "3.6.0"; - source = { - type = "gem"; - sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; - }; - }; - "sprockets" = { - version = "2.12.3"; - source = { - type = "gem"; - sha256 = "1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2"; - }; - dependencies = [ - "hike" - "multi_json" - "rack" - "tilt" - ]; - }; - "sprockets-rails" = { - version = "2.2.4"; - source = { - type = "gem"; - sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; - }; - dependencies = [ - "actionpack" - "activesupport" - "sprockets" - ]; - }; - "teaspoon" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "1j3brbm9cv5km9d9wzb6q2b3cvc6m254z48h7h77z1w6c5wr0p3z"; - }; - dependencies = [ - "railties" - ]; - }; - "term-ansicolor" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b"; - }; - dependencies = [ - "tins" - ]; - }; - "therubyracer" = { - version = "0.12.1"; - source = { - type = "gem"; - sha256 = "106fqimqyaalh7p6czbl5m2j69z8gv7cm10mjb8bbb2p2vlmqmi6"; - }; - dependencies = [ - "libv8" - "ref" - ]; - }; - "thor" = { - version = "0.19.1"; - source = { - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; - }; - "thread_safe" = { - version = "0.3.4"; - source = { - type = "gem"; - sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n"; - }; - }; - "tilt" = { - version = "1.4.1"; - source = { - type = "gem"; - sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; - }; - }; - "tins" = { - version = "1.3.3"; - source = { - type = "gem"; - sha256 = "14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna"; - }; - }; - "tzinfo" = { - version = "1.2.2"; - source = { - type = "gem"; - sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; - }; - dependencies = [ - "thread_safe" - ]; - }; - "uglifier" = { - version = "2.5.1"; - source = { - type = "gem"; - sha256 = "1vihq309mzv9a2i0s8v4imrn1g2kj8z0vr88q3i5b657c4kxzfp0"; - }; - dependencies = [ - "execjs" - "json" - ]; - }; - "webmock" = { - version = "1.20.4"; - source = { - type = "gem"; - sha256 = "01cz13ybxbbvkpl21bcfv0p9ir8m2zcplx93ps01ma54p25z4mxr"; - }; - dependencies = [ - "addressable" - "crack" - ]; - }; - "xpath" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w"; - }; - dependencies = [ - "nokogiri" - ]; - }; - "zeroclipboard-rails" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "00ixal0a0mxaqsyzp06c6zz4qdwqydy1qv4n7hbyqfhbmsdalcfc"; - }; - dependencies = [ - "railties" - ]; - }; -} diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 99b7566fc713911b323c3592cc9cb194a30df9c6..6401194eac20332f0a97e16f9b1f6cbd2cb8483b 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,20 +1,16 @@ -{ stdenv, fetchzip, makeWrapper, jre, pythonPackages +{ stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils, hadoop , RSupport? true, R , mesosSupport ? true, mesos , version }: let - versionMap = { - "2.2.1" = { - hadoopVersion = "hadoop2.7"; - sparkSha256 = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c"; - }; - }; + sha256 = { + "1.6.3" = "142hw73wf20d846l83ydx0yg7qj5qxywm4h7qrhwnd7lsy2sbnjf"; + "2.2.1" = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c"; + }.${version}; in -with versionMap.${version}; - with stdenv.lib; stdenv.mkDerivation rec { @@ -22,15 +18,15 @@ stdenv.mkDerivation rec { name = "spark-${version}"; src = fetchzip { - url = "mirror://apache/spark/${name}/${name}-bin-${hadoopVersion}.tgz"; - sha256 = sparkSha256; + inherit sha256; + url = "mirror://apache/spark/${name}/${name}-bin-without-hadoop.tgz"; }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] ++ optional RSupport R ++ optional mesosSupport mesos; - untarDir = "${name}-bin-${hadoopVersion}"; + untarDir = "${name}-bin-without-hadoop"; installPhase = '' mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java} mv * $out/lib/${untarDir} @@ -42,6 +38,7 @@ stdenv.mkDerivation rec { cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF export JAVA_HOME="${jre}" export SPARK_HOME="$out/lib/${untarDir}" + export SPARK_DIST_CLASSPATH=$(${hadoop}/bin/hadoop classpath) export PYSPARK_PYTHON="${pythonPackages.python}/bin/${pythonPackages.python.executable}" export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" ${optionalString RSupport @@ -53,6 +50,7 @@ stdenv.mkDerivation rec { for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do makeWrapper "$n" "$out/bin/$(basename $n)" + substituteInPlace "$n" --replace dirname ${coreutils.out}/bin/dirname done ln -s $out/lib/${untarDir}/lib/spark-assembly-*.jar $out/share/java ''; @@ -62,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "http://spark.apache.org"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; - maintainers = with maintainers; [ thoughtpolice offline ]; + maintainers = with maintainers; [ thoughtpolice offline kamilchm ]; repositories.git = git://git.apache.org/spark.git; }; } diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix index 1510dc575cc9ecbc7271c86e75b7ab3498404efb..c61896d892182d2bd089eab33baea05efedd2b34 100644 --- a/pkgs/applications/networking/cluster/taktuk/default.nix +++ b/pkgs/applications/networking/cluster/taktuk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl , openssh}: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "3.7.7"; diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock index 047ddaadad072619d04776a4c8a484cab01477ed..ccc2294b6a094b137af6ee506a8a19288fb50adc 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock @@ -2,17 +2,17 @@ GEM remote: https://rubygems.org/ specs: colorize (0.8.1) - commander (4.4.4) + commander (4.4.5) highline (~> 1.7.2) - diffy (3.2.0) + diffy (3.2.1) highline (1.7.10) polyglot (0.3.5) - terraform_landscape (0.1.17) + terraform_landscape (0.1.18) colorize (~> 0.7) commander (~> 4.4) diffy (~> 3.0) treetop (~> 1.6) - treetop (1.6.9) + treetop (1.6.10) polyglot (~> 0.3) PLATFORMS diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix index 38321b9d37aafff8d95b3e78fb115513e41d6221..8dd57af4c73b93f41d64692552b92492cba004e4 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix +++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix @@ -11,18 +11,18 @@ dependencies = ["highline"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "165yr8qzan3gnk241mnwxsvdfwp6p1afg13z0mqdily6lh95acl9"; + sha256 = "0sry6raysvg9qsx5nqqw09n8r8hvcsqzvci7xp2qk7jq3s9mgvnn"; type = "gem"; }; - version = "4.4.4"; + version = "4.4.5"; }; diffy = { source = { remotes = ["https://rubygems.org"]; - sha256 = "015nn9zaciqj43mfpjlw619r5dvnfkrjcka8nsa6j260v6qya941"; + sha256 = "119imrkn01agwhx5raxhknsi331y5i4yda7r0ws0an6905ximzjg"; type = "gem"; }; - version = "3.2.0"; + version = "3.2.1"; }; highline = { source = { @@ -44,18 +44,18 @@ dependencies = ["colorize" "commander" "diffy" "treetop"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bx8nfqbpxb2hnxnnl1m4sq6jlzf451c85m047jfq04b6w9691fl"; + sha256 = "0476q2kx88w9srj7rlzl6skrza3pdgyym7zksw78infsb2105lg9"; type = "gem"; }; - version = "0.1.17"; + version = "0.1.18"; }; treetop = { dependencies = ["polyglot"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd"; + sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; type = "gem"; }; - version = "1.6.9"; + version = "1.6.10"; }; } \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fddf13795f3eab11d69ebd9aa776632dedfeb9d8 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +# +# USAGE: +# install the following package globally or in nix-shell: +# +# (terraform.withPlugins ( plugins: [ terraform-provider-ibm ])) +# +# examples: +# https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples +# + +buildGoPackage rec { + name = "terraform-provider-ibm-${version}"; + version = "0.11.1"; + + goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; + subPackages = [ "./" ]; + + src = fetchFromGitHub { + owner = "IBM-Cloud"; + repo = "terraform-provider-ibm"; + sha256 = "1vp1kzadfkacn6c4illxjra8yki1fx7h77b38fixkcvc79mzasmv"; + rev = "v${version}"; + }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-ibm{,_v${version}}"; + + meta = with stdenv.lib; { + homepage = https://github.com/IBM-Cloud/terraform-provider-ibm; + description = "Terraform provider is used to manage IBM Cloud resources."; + platforms = platforms.all; + license = licenses.mpl20; + maintainers = with maintainers; [ jensbin ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix index 34a3be55f305932288a41223343273addc4643bc..2beceddc7fba4057a554fd8507065e8e08f1fe4d 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { name = "terraform-provider-libvirt-${version}"; - version = "0.3"; + version = "0.4"; goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; @@ -27,13 +27,13 @@ buildGoPackage rec { owner = "dmacvicar"; repo = "terraform-provider-libvirt"; rev = "v${version}"; - sha256 = "004gxy55p5cf39f2zpah0i2zhvs4x6ixnxy8z9v7314604ggpkna"; + sha256 = "05jkjp1kis4ncryv34pkb9cz2yhzbwg62x9qmlqsqlxwz9hqny3r"; }; buildInputs = [ libvirt pkgconfig makeWrapper ]; - goDeps = ./deps.nix; - + # mkisofs needed to create ISOs holding cloud-init data, + # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 propagatedBuildInputs = [ cdrtools ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix deleted file mode 100644 index fdf394073ab893c0ebcce2810d862b19b7c67212..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0"; - sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f4ad171c267ee46322fd8e3f97c463d358963d36 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: +buildGoPackage rec { + name = "terraform-provider-nixos-${version}"; + version = "0.0.1"; + goPackagePath = "github.com/tweag/terraform-provider-nixos"; + src = fetchFromGitHub { + owner = "tweag"; + repo = "terraform-provider-nixos"; + sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf"; + rev = "v${version}"; + }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-nixos{,_v${version}}"; + + meta = with stdenv.lib; { + description = "Terraform plugin for outputting NixOS configuration files from Terraform resources."; + homepage = "https://github.com/tweag/terraform-provider-nixos"; + license = licenses.mpl20; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 2bf1d210f83a660984356d78f239c0d50989bef0..edeac9671c16f600ad45fe52045cda1a6f966406 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildEnv, buildGoPackage, fetchpatch, fetchFromGitHub, makeWrapper }: +{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper }: let goPackagePath = "github.com/hashicorp/terraform"; @@ -60,8 +60,8 @@ let # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. if actualPlugins == [] then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) - else stdenv.mkDerivation { - name = "${terraform.name}-with-plugins"; + else lib.appendToName "with-plugins"(stdenv.mkDerivation { + inherit (terraform) name; buildInputs = [ makeWrapper ]; buildCommand = '' @@ -72,10 +72,10 @@ let ''; inherit passthru; - }; + }); in withPlugins (_: []); - plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; }; + plugins = import ./providers { inherit lib buildGoPackage fetchFromGitHub; }; in rec { terraform_0_8_5 = generic { version = "0.8.5"; @@ -104,8 +104,8 @@ in rec { terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; terraform_0_11 = pluggable (generic { - version = "0.11.5"; - sha256 = "130ibb1pd60r2cycwpzs8qfwrz6knyc1a1849csxpipg5rs5q3jy"; + version = "0.11.8"; + sha256 = "1kdmx21l32vj5kvkimkx0s5mxgmgkdwlgbin4f3iqjflzip0cddh"; 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 0a0b20bfd15d25fad11356282028407f0f2b2583..4ae44cafbf44c57c45c69044e21a426b3e3ccc23 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -4,15 +4,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.9.0"; - sha256 = "19jqyzpcnlraxzn8bvrjzsh81j7dfadswgxfsiqzxll9xbm0k2bv"; + version = "1.10.0"; + sha256 = "19lplakpl8dz4a8xw9va86gd774yq4gayq4kzv3pvr62b03a999x"; }; archive = { owner = "terraform-providers"; repo = "terraform-provider-archive"; - version = "1.0.3"; - sha256 = "1il8v9zi838naprr8dqzipk6ns71l8vdqidarxklnn8wdwxmacg4"; + version = "1.1.0"; + sha256 = "1fsynv725cmqz819v9p4i4h4w4y77mbya5y9v81sqvacqvr3i05h"; }; arukas = { @@ -32,22 +32,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.13.0"; - sha256 = "09ba2r3avqbl85s8llmgkk6gwgfkzm83994kd965r481xcnfv1ny"; + version = "1.30.0"; + sha256 = "1si2fm5nm7gad90lf410zwjf2q5kd8mv6nkkbfnfdzkpkchavr95"; }; - azure-classic = + azurerm = { owner = "terraform-providers"; - repo = "terraform-provider-azure-classic"; - version = "0.1.1"; - sha256 = "11myqq3wnxvpysjycvwg7b14ll8d9vkn06xb3r26kmc42fkl5xv1"; + repo = "terraform-provider-azurerm"; + version = "1.12.0"; + sha256 = "1avp2vhlj60iw17pw39003p30byms7xvq5lkippm60ak4ky9p51b"; }; - azurerm = + azurestack = { owner = "terraform-providers"; - repo = "terraform-provider-azurerm"; - version = "1.3.1"; - sha256 = "1qpf2h9qnhki4lg9pv77r0sc4acj08m0fqqagkvkinq46ypsfbp4"; + repo = "terraform-provider-azurestack"; + version = "0.2.0"; + sha256 = "0s1ga0ga0rbpp552hbq1dfnkpdjvk1c40i7qqnqmm20xlz6k55mb"; }; bitbucket = { @@ -56,6 +56,13 @@ version = "1.0.0"; sha256 = "0gi8p1q0y8x5y8lqihijkpqs3v152h0q7icv7ixk33xsdcvb418y"; }; + brightbox = + { + owner = "terraform-providers"; + repo = "terraform-provider-brightbox"; + version = "1.0.5"; + sha256 = "0sn7k5bqgms5sxjhjikmby0jf2n6y14z6s4wsifxaw7b0082fy28"; + }; chef = { owner = "terraform-providers"; @@ -81,22 +88,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "0.1.0"; - sha256 = "073j0kqkccj7yrqz6j4vx722vmy6mmvmgidamkjnhhjcwm6g1jbq"; + version = "1.1.0"; + sha256 = "1rmg7gndhmb1wp0zszhwx9vrax8411iy24yrpkmayjify3vsvdpx"; }; cloudscale = { owner = "terraform-providers"; repo = "terraform-provider-cloudscale"; - version = "1.0.0"; - sha256 = "0yqiz4xywbd3568hl6va8da81fbc1hnynlz4z0vqxgi3bs8hhdhz"; + version = "1.0.1"; + sha256 = "0lhzwbm1a2s11s0ahb3vxfvshh385fgy1ficvip4rl31dahhwrav"; }; cloudstack = { owner = "terraform-providers"; repo = "terraform-provider-cloudstack"; - version = "0.1.4"; - sha256 = "1dj6zkwv0bix31b8sjad9gil43m8c2c5d1dr10qza40f9z4agaxa"; + version = "0.1.5"; + sha256 = "139wq6rr6fczjz496fqkxh6cmscx5hfnv2hvhfwpkhvqipsnlxmq"; }; cobbler = { @@ -109,15 +116,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-consul"; - version = "1.0.0"; - sha256 = "1008lrvdqn3kk8gwvq094nwknh00b429jmwi0hq4brick7vyvbvz"; + version = "2.1.0"; + sha256 = "1qm29vj8ms37zb4b3bhdv4b4vrl0am134zmc654lb2g582cnj9yw"; }; datadog = { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.0.3"; - sha256 = "0nh2dww3hx6jrkcd9lq5hpnqr3grp9cmqi4nwmxlrc5azf8x0mii"; + version = "1.1.0"; + sha256 = "0ckmjpw9dkj5490kwxamdvnnidnjdgxnb1biqpvwj4139hlcl628"; }; digitalocean = { @@ -137,8 +144,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-dns"; - version = "1.0.0"; - sha256 = "05ismwpmpkv9qxn6g5i29y18s1pw4yf2pyvv9ak8hj8idh4z6gz2"; + version = "2.0.0"; + sha256 = "1km0pq1wp0bdccb612z9n0kj9w7hn1yvhk7xszwp2mzs8qmd7flv"; }; dnsimple = { @@ -151,8 +158,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-docker"; - version = "0.1.1"; - sha256 = "02lhbl34dq7lsby3g32969i4g9l3z6xw1v00shljd3amgyz2l2r2"; + version = "1.0.0"; + sha256 = "09ribvyv02r907pdvyrwaklr14xyvyn14rijslnm16xp8d4waz9h"; }; dyn = { @@ -172,15 +179,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - version = "0.1.4"; - sha256 = "0x8s11c30k9a95mafyb2zl3wh9hgbdm7jgajzy5y4xnnr96ca13k"; + version = "0.3.0"; + sha256 = "1hh4s81g256iy1rvp9snqbyhidz8n6p7pzanlxp89ffrq9p32sp0"; + }; + flexibleengine = + { + owner = "terraform-providers"; + repo = "terraform-provider-flexibleengine"; + version = "1.1.0"; + sha256 = "07g6kc211crxf9nvgvghg05jdahd1fb09lpwfcps9ph259pwwam3"; }; github = { owner = "terraform-providers"; repo = "terraform-provider-github"; - version = "1.0.0"; - sha256 = "0nca90s4bangraly1pcn3jfkfksaw0g2chs5ba6m7z6bhkrj2ylb"; + version = "1.1.0"; + sha256 = "1f0yg2qpr9ffimscy17csh20cq9czkcs96ac79s3kl56f8c95ijm"; }; gitlab = { @@ -193,22 +207,29 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.8.0"; - sha256 = "1n01gj9572hhskbl4bsg0fqyg9slv8fpvzp3avmwvg5b2hsj4snh"; + version = "1.16.2"; + sha256 = "1d8by6rb4s2dggapcbb4b2g5hf280bjayz9p5q9njgsn83579pnm"; }; grafana = { owner = "terraform-providers"; repo = "terraform-provider-grafana"; - version = "1.0.1"; - sha256 = "1dvd7dy039ranlkvnbililk2lzr6cffwc4jsgs6lk3hfxhrq8bns"; + version = "1.2.0"; + sha256 = "1kn2bbdgci6nfl2gyk4w8w203fscqws2748idv9m53ikczg8n573"; + }; + hcloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-hcloud"; + version = "1.2.0"; + sha256 = "17zrdzvb9hp02710khvh9pwkavp79zy3y2qzaydgmnrbkks4s8cg"; }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "0.1.2"; - sha256 = "0dmq5v4bwzndy6l6vx29m5ykn2zhnnbmnla00ad8i7djm1sj1fbg"; + version = "1.2.0"; + sha256 = "1w2r0wnfcr9aqij5ckq0apd8az8yzdg704hi1zjb1ggb54v97n31"; }; http = { @@ -217,6 +238,13 @@ version = "1.0.1"; sha256 = "1bnqrx4xya3lm5wp4byy6npazll6w1g6bv4rawgncswsgx08zqng"; }; + huaweicloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-huaweicloud"; + version = "1.1.0"; + sha256 = "1jsvv5yfxgz998p4wbldbq82hl4ykn1yp21igphl94n3b0jj33dj"; + }; icinga2 = { owner = "terraform-providers"; @@ -228,15 +256,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-ignition"; - version = "1.0.0"; - sha256 = "0hr2zshrx4qfb7xdknsxsa4522kkf84rsqqbliz7ac9nsqpaarf4"; + version = "1.0.1"; + sha256 = "1j9rgwrb4bnm8a44rg3d9fry46wlpfkwxxpkpw9y6l24php0qxh8"; }; influxdb = { owner = "terraform-providers"; repo = "terraform-provider-influxdb"; - version = "1.0.0"; - sha256 = "1w1izzs22b2w2qmpdxbhaj9kvnfyw0wlq3nigrigwwvqav43knh9"; + version = "1.0.1"; + sha256 = "0713h50675njnpdy4w1azfq8h6yai40gx6w2fbvw4n59h6jlfny4"; }; kubernetes = { @@ -263,15 +291,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-logentries"; - version = "0.1.0"; - sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa"; + version = "1.0.0"; + sha256 = "04xprkb9zwdjyzmsdf10bgmn8sa8q7jw0izz8lw0cc9hag97qgbq"; }; logicmonitor = { owner = "terraform-providers"; repo = "terraform-provider-logicmonitor"; - version = "1.1.0"; - sha256 = "16blwfbvx80j5s6809wrlfnkq0qvjasz0zi4ykwzvkqxh00igj7r"; + version = "1.2.0"; + sha256 = "1zir35i8j5w7ra4i7f9k0ghac9b3bar0dy16sqy1kqwbh4ikmhb8"; }; mailgun = { @@ -291,8 +319,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-newrelic"; - version = "1.0.0"; - sha256 = "1bcxq4f50qci54gckx4yax2v2qpazp10n5vcci4cba0bf5l8zx62"; + version = "1.0.1"; + sha256 = "0g4fd2rvx90f2bmjl6jjdvrsx7ayhf30vj9y3mklhxgsd9x83wpq"; }; nomad = { @@ -308,6 +336,13 @@ version = "1.0.0"; sha256 = "0zjdhz6miwlg3b68pbd99c6nw7hhyzxy736734xz8g3w89xn18f5"; }; + nsxt = + { + owner = "terraform-providers"; + repo = "terraform-provider-nsxt"; + version = "1.0.0"; + sha256 = "09yliw59wp9flfgmkznbf4syl510wpxsplzr8sa9m2vw0yc78jnq"; + }; null = { owner = "terraform-providers"; @@ -319,29 +354,29 @@ { owner = "terraform-providers"; repo = "terraform-provider-oneandone"; - version = "1.0.0"; - sha256 = "0q14r36iyn1c1wfky42imkzvkys5znj1yzq27iaxnrsqp4hh7pl2"; + version = "1.2.0"; + sha256 = "1lrcy05zklv7vc8653f8cn3jjc9zjjwi488dpaphsmsl1md3m88b"; }; opc = { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "1.1.0"; - sha256 = "19yip5v00b57j3h7870hw51nsxcwib7mlhdzzn276z74af6zirsr"; + version = "1.2.0"; + sha256 = "19rfm12w97ccyrzpdw0qlwfn7gh64lqh17kj3cv11y1f731z8rlw"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "1.3.0"; - sha256 = "0pyp95i6z6il2kl28cvilqi81wqs076d6f0zacjyvmn1d0blqrnx"; + version = "1.7.0"; + sha256 = "0sw2kmcsi9sjzi549fj6knida01q0lnpqvc3cpyjyv92f6w4bznn"; }; opentelekomcloud = { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.0.0"; - sha256 = "1wra9a6cjgsyvbfldvi2xnjk6y9zqv3y06pbq8c8dyjzssd5j591"; + version = "1.1.0"; + sha256 = "04pcgygcz2ld5hp7f29j2z3d4ypy4fm4m1zbbs9l9gc3fya88iny"; }; opsgenie = { @@ -354,43 +389,43 @@ { owner = "terraform-providers"; repo = "terraform-provider-oraclepaas"; - version = "1.0.0"; - sha256 = "1h66ijnq172zk0bkv68iq0sy5l6jlasa2pi9q8fq54ib9sxnfkk2"; + version = "1.3.0"; + sha256 = "09vsb52cbf2h1rdwfg4xb54gklwgmaxdgjcdq1yx5gxj7lfbdl9v"; }; ovh = { owner = "terraform-providers"; repo = "terraform-provider-ovh"; - version = "0.2.0"; - sha256 = "12dpgx0fpmqw64v5a70fihbgixyw71bdjbdi17gal7s2pj1xw159"; + version = "0.3.0"; + sha256 = "05bzkwa50alh8mpslh64dddp815m8df240w1mmphdmp9rsi6hqp8"; }; packet = { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "1.2.0"; - sha256 = "0jk8wwm7srjxc3mspqd9szlq8fd63bhdgkzwdjr2fvv4ivj17xp4"; + version = "1.2.4"; + sha256 = "11ga29d5bzmn6rzlb6sb28nh1zbbwglinzn185pysqx6n21l6wva"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - version = "1.0.0"; - sha256 = "113anbcpp8ab111jm19h7d9i5sds76msgnk8xvwk8qf6500ivfqa"; + version = "1.1.1"; + sha256 = "1dpl6cnii9kzx9lr1f9vndh7w6mfg5kv6az7dq49lhi16sxwwb6a"; }; panos = { owner = "terraform-providers"; repo = "terraform-provider-panos"; - version = "1.0.0"; - sha256 = "1pslp8pas1p90bmxp1yqmackqkbxrw2sgcm88ibz8l4k43vwks76"; + version = "1.3.0"; + sha256 = "1isnhaszld96zpkcbwkf70nhhwmsl2z3s9868cjsac44b27gsvrq"; }; postgresql = { owner = "terraform-providers"; repo = "terraform-provider-postgresql"; - version = "0.1.1"; - sha256 = "0ls5z02vaalcrbaq375qnk0267pb17rpsx4s3plfnr7qclv21pwn"; + version = "0.1.2"; + sha256 = "08wv03j70mych4nnamivjihwvca3aksjxgjlj8yasz5292qgl05w"; }; powerdns = { @@ -403,29 +438,29 @@ { owner = "terraform-providers"; repo = "terraform-provider-profitbricks"; - version = "1.1.1"; - sha256 = "0sn48adgpjw20a6jwagarnh5jasq0v36zsbd204j0vx4iam3vm9m"; + version = "1.3.2"; + sha256 = "0mk77n833np6ahm6bzvpg31a0m1qazaipd0vqzccqfkbz78sm3jb"; }; rabbitmq = { owner = "terraform-providers"; repo = "terraform-provider-rabbitmq"; - version = "0.2.0"; - sha256 = "1pbib43d1iqy8xl03zqwnz77362cb9cq8awcpid714n1sz7nd4im"; + version = "1.0.0"; + sha256 = "1md928243r4c46ihjnavz2375nxnfyhknyc86r9853hwhhyhsx5d"; }; rancher = { owner = "terraform-providers"; repo = "terraform-provider-rancher"; - version = "1.2.0"; - sha256 = "0xxff4mh4cv27mignvanhsz5sf5476ljk7q4h67fy4y0gzyxwpzw"; + version = "1.2.1"; + sha256 = "1z0gqchb268w5mw0519fbx4126nkxb9kvvay8vjj287yxdpi5grj"; }; random = { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "1.1.0"; - sha256 = "1mal0pg37a99q0sjqbccwc2ipwvxm8lqp93lg8i96f868hiv4yzl"; + version = "1.3.1"; + sha256 = "0zcvw0vz7mxx46m2jamhmkl7l0k8v0q5fha5z6cra3y2ikhqrnfl"; }; rundeck = { @@ -434,12 +469,19 @@ version = "0.1.0"; sha256 = "0rp8cgnp8in52g7zkl2lj42hns0g27m8f7l42lhfnv6n2vv5qxcg"; }; + runscope = + { + owner = "terraform-providers"; + repo = "terraform-provider-runscope"; + version = "0.3.0"; + sha256 = "1srnnlw94q1av8rzy8753fk4vazv5ldbimgr9gd51vrmpvmlgxas"; + }; scaleway = { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "1.2.0"; - sha256 = "123rjvslq7gy2m96rikm0i2298jjpsnyh9civbyvbxj3h47z9h4v"; + version = "1.5.1"; + sha256 = "1b42fh7mwj2cx3g16lgp4sw6ca5qqj0mhm6i7qid8agwsga34v0y"; }; softlayer = { @@ -452,15 +494,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-spotinst"; - version = "0.1.0"; - sha256 = "04sxdbx6qjxixrv9shnp8fxkss6pylqmphlm1l4q5c83dwk96pka"; + version = "1.2.0"; + sha256 = "09k79xg5cbs4qhxr0b4f42qpxj6j2795z5vmwbxfkirb5bkpqdq1"; }; statuscake = { owner = "terraform-providers"; repo = "terraform-provider-statuscake"; - version = "0.1.0"; - sha256 = "084520cak2krwpks2ipqcjfw3k4rrzn6gqqncz8c4i6g01f1m7yg"; + version = "0.2.0"; + sha256 = "065izach0hq04664hz7rc3gd0r3l06lzwcbj5800zjfv1inp6pxs"; + }; + telefonicaopencloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-telefonicaopencloud"; + version = "1.0.0"; + sha256 = "1761wkjz3d2458xl7855lxklyxgyk05fddh92rp6975y0ca6xa5m"; }; template = { @@ -487,8 +536,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-triton"; - version = "0.4.2"; - sha256 = "0nid5sp8xskw5wmc0dbkw6m87bmyb37p9ck9xm74nrvdzqjxz5ml"; + version = "0.5.1"; + sha256 = "1bn5x6nmhfkrzpxhyfclls85l9qqffvzx1xsgcb3368lhwzarn2f"; }; ultradns = { @@ -501,8 +550,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.0.0"; - sha256 = "1v4b8zs0s48gqgsh719hwi69i4h8i5vvp2g5m881z5yzv7n7haqw"; + version = "1.1.1"; + sha256 = "0kiqpnb4669xw9b8nf6a8ky0jhnp14bipaizml3gdh1hnda6hflw"; }; vcd = { @@ -515,7 +564,7 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "1.3.3"; - sha256 = "1z6v8hagpjm8573d36v3nak5h7hn3jyq2f4m93k1adygvs3n9yx7"; + version = "1.6.0"; + sha256 = "1xav341bal7lyb206zw2nzgzjvwkda54cgksza44q3jhqznxma47"; }; } diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix index 40117b4585506c2c47a3d008a3f4ee98f8a8181b..a535ab06f453fd2c3537afde321b9b80f53b9102 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: let list = import ./data.nix; @@ -16,10 +16,5 @@ let # if the versions are not provided via file paths. postBuild = "mv go/bin/${repo}{,_v${version}}"; }; - - maybeDrv = name: data: - # azure-classic is an archived repo - if name == "azure-classic" then null - else toDrv data; in - lib.mapAttrs maybeDrv list + lib.mapAttrs (n: v: toDrv v) list diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all index 16eb6004e3eef324f19745f512cfc9f036f3c8f6..31a5a4a750dc25cfc6dc537c65778302eb75148c 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform/providers/update-all @@ -58,7 +58,7 @@ cd "$(dirname "$0")" if [[ -z "${GITHUB_AUTH:-}" ]]; then cat <<'HELP' -Missing the GITHUB_AUTH env. Thi is required to work around the 60 request +Missing the GITHUB_AUTH env. This is required to work around the 60 request per hour rate-limit. Go to https://github.com/settings/tokens and create a new token with the @@ -71,7 +71,7 @@ fi org=terraform-providers -repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | sort) +repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-azure-classic | sort) # Get all the providers with index diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 996c994cf4cfeb53632777cbb299050cc71e090d..f35269eb27129b203054fe1fccf662636dea4331 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.14.6"; + version = "0.16.6"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "14zg1h76wfg6aa78llcnza7kapnl5ks6m2vg73b90azfi49fmkwz"; + sha256 = "0fzn2ymk8x0lzwfqlvnry8s6wf3q0sqn76lfardjyz6wgxl8011i"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 749b94f7b7ec5740acd856af7c2d8c85bbc00a1d..d2b1a8eba36719fa2871118b21d8f809c1efa832 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,4 +1,4 @@ -{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, gcc, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }: +{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }: stdenv.mkDerivation rec { name = "compactor-${version}"; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index b491f287e7019fd2ca49f5d2f629a120583ba529..31493e46f5389fcd254725aea1b36f012a374784 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,17 +1,19 @@ -{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper }: +{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper, unzip }: stdenv.mkDerivation rec { - name = "davmail-4.8.0"; + name = "davmail-4.8.6"; src = fetchurl { - url = "mirror://sourceforge/davmail/4.8.0/davmail-linux-x86_64-4.8.0-2479.tgz"; - sha256 = "0e650c4a060d64fd2b270ddb00baa906aac617865d5e60c9f526a281cdb27b62"; + url = "mirror://sourceforge/davmail/4.8.6/davmail-4.8.6-2600.zip"; + sha256 = "1wk4jxb46qlyipxj57flqadgm4mih243rhqq9sp9m5pifjqrw9dp"; }; - nativeBuildInputs = [ makeWrapper ]; + sourceRoot = "."; + + nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' mkdir -p $out/share/davmail - cp -R ./* $out/share/davmail + cp -vR ./* $out/share/davmail makeWrapper $out/share/davmail/davmail.sh $out/bin/davmail \ --prefix PATH : ${jre}/bin \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 826452016e73648960f82025ef2a4f2e6ef5cc80..113d6a2e5f4650207cd4080771ad4135cfd3b8f3 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "drive-${version}"; diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox/cli.nix similarity index 100% rename from pkgs/applications/networking/dropbox-cli/default.nix rename to pkgs/applications/networking/dropbox/cli.nix diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 2d364450677a61831df3fe95997134ad9ad06947..3450ad720486c5fcb60f5601a6db055104cb470e 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "40.4.46"; + version = "55.4.171"; arch = { "x86_64-linux" = "x86_64"; diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix index fedbfeb957cee86ffebf00d7c7c712338d628589..2cfde73a01a69e2e9605aaad944e400d6d4d1daa 100644 --- a/pkgs/applications/networking/enhanced-ctorrent/default.nix +++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix @@ -1,13 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { version = "dnh3.3.2"; name = "enhanced-ctorrent"; + src = fetchurl { url = "http://www.rahul.net/dholmes/ctorrent/ctorrent-dnh3.3.2.tar.gz"; sha256 = "0qs8waqwllk56i3yy3zhncy7nsnhmf09a494p5siz4vm2k4ncwy8"; }; + # These patches come from Debian and fix CVE-2009-1759. + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/c/ctorrent/1.3.4.dnh3.3.2-5/debian/patches/cve-security-fix.diff"; + sha256 = "1qkzzm8sfspbcs10azmmif4qcr7pr8r38dsa2py84lsjm1yi3kls"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/ctorrent/1.3.4.dnh3.3.2-5/debian/patches/FTBFS-fix.diff"; + sha256 = "1m3zh96xwqjjzsbg62f7kx0miams58nys1f484qhdn870b5x9p06"; + }) + ]; + meta = { description = "BitTorrent client written in C++"; longDescription = '' diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index feb6a0ab126582364ca88f87e181c57c21a00d3b..f89b8206dbe63072ba6a99f975c81aecb6537816 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "errbot-${version}"; - version = "5.1.3"; + version = "5.2.0"; src = fetchurl { url = "mirror://pypi/e/errbot/${name}.tar.gz"; - sha256 = "0nkfq6fx87g7kvxrb5lp8gkb75658cmyffnacpy8jq3a16py3jrr"; + sha256 = "0q5fg113s3gnym38d4y5mlnxw6vrm388zw5mlapf7b2zgx34r053"; }; disabled = !pythonPackages.isPy3k; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 80984208460b20523066e361d88dcdb1444ab049..a7d10adc0a75d33d3da5836d600d8250fe28a37a 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation rec { - name = "esniper-2.33.0.2017-11-06"; + name = "esniper-2.35.0"; src = fetchFromGitHub { owner = "yhfudev"; diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d2991c3ba1c9e5c4c2942e7510455f09b0f27c86 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala_0_40, gettext +, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook +, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite +}: + +let + pname = "FeedReader"; + version = "2.2"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "jangernert"; + repo = pname; + rev = "v" + version; + sha256 = "17588hsa7xv92ba55kmbyvnijypp373yrly48kbc391wadp1z939"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils + glibcLocales wrapGAppsHook + ]; + + buildInputs = [ + curl glib json-glib libnotify libsecret sqlite + ] ++ (with gnome3; [ + gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts + gsettings-desktop-schemas + ]) ++ (with gst_all_1; [ + gstreamer gst-plugins-base gst-plugins-good + ]); + + # TODO: fix https://github.com/NixOS/nixpkgs/issues/39547 + LIBRARY_PATH = stdenv.lib.makeLibraryPath [ curl ]; + + # vcs_tag function fails with UnicodeDecodeError + LC_ALL = "en_US.UTF-8"; + + postPatch = '' + patchShebangs meson_post_install.py + ''; + + meta = with stdenv.lib; { + description = "A modern desktop application designed to complement existing web-based RSS accounts."; + homepage = https://jangernert.github.io/FeedReader/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 24fed4ca85217b50ff7040c39658877cbf071410..bee4c3bea20bfc4e1f9f7aad3d97182740d81c92 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses -, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }: +, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, makeWrapper }: stdenv.mkDerivation rec { name = "newsboat-${version}"; - version = "2.11.1"; + version = "2.12"; src = fetchurl { url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; - sha256 = "1krpxl854h5dwmpr81m1s84cwk8zivdzvw0s5s0i4dba736pvdma"; + sha256 = "1x23zlgljaqf46v7sp8wnkyf6wighvirvn48ankpa34yr8mvrgcv"; }; prePatch = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace "ncurses5.4" "ncurses" ''; - nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ] + nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ] ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ]; buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index a7fd31cac2ffe4d87f9c85f645c0b58161c6cfb1..459aee01f43f2b6e56b24cf7539b2eed59dd1306 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { owner = "flok99"; }; - buildInputs = [ libmrss ] - ++ stdenv.lib.optional doCheck cppcheck; + buildInputs = [ libmrss ]; + checkInputs = [ cppcheck ]; postPatch = '' substituteInPlace Makefile --replace -liconv_hook "" diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 8bbc0abba22139d00a6b3883531dba22c2a5e2c2..335f393bc0773bf47571fcd085bb08eb02ff07b7 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -2,19 +2,19 @@ , autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils , kmod, nettools, procps, tcpdump, traceroute, utillinux, whois -# Just install FireQOS without FireHOL -, onlyQOS ? true +# If true, just install FireQOS without FireHOL +, onlyQOS ? false }: stdenv.mkDerivation rec { name = "firehol-${version}"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "firehol"; repo = "firehol"; rev = "v${version}"; - sha256 = "15cy1zxfpprma2zkmhj61zzhmw1pfnyhln7pca5lzvr1ifn2d0y0"; + sha256 = "0l7sjpsb300kqv21hawd26a7jszlmafplacpn5lfj64m4yip93fd"; }; patches = [ @@ -52,6 +52,35 @@ stdenv.mkDerivation rec { AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[ '') + + # put firehol config files in /etc/firehol (not $out/etc/firehol) + # to avoid error on startup, see #35114 + (pkgs.writeText "firehol-sysconfdir.patch" + '' + --- a/sbin/install.config.in.in + +++ b/sbin/install.config.in.in + @@ -4 +4 @@ + -SYSCONFDIR="@sysconfdir_POST@" + +SYSCONFDIR="/etc" + '') + + # we must quote "$UNAME_CMD", or the dash in /nix/store/...-coreutils-.../bin/uname + # will be interpreted as IFS -> error. this might be considered an upstream bug + # but only appears when there are dashes in the command path + (pkgs.writeText "firehol-uname-command.patch" + '' + --- a/sbin/firehol + +++ b/sbin/firehol + @@ -10295,7 +10295,7 @@ + kmaj=$1 + kmin=$2 + + - set -- $($UNAME_CMD -r) + + set -- $("$UNAME_CMD" -r) + eval $kmaj=\$1 $kmin=\$2 + } + kernel_maj_min KERNELMAJ KERNELMIN + '') ]; nativeBuildInputs = [ autoconf automake ]; diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2f97b39da60feb70cd05ef943ee079bde3ae0d01 --- /dev/null +++ b/pkgs/applications/networking/flent/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, procps, pyqt5 +, sphinx +}: + +buildPythonApplication rec { + pname = "flent"; + version = "1.2.2"; + src = fetchFromGitHub { + owner = "tohojo"; + repo = "flent"; + rev = "v${version}"; + sha256 = "1llcdakk0nk9xlpjjz7mv4a80yq4sjnbqhaqvyj9m6lbcxgssh2r"; + }; + + buildInputs = [ sphinx ]; + + propagatedBuildInputs = [ + matplotlib + procps + pyqt5 + ]; + + meta = with stdenv.lib; { + description = "The FLExible Network Tester"; + homepage = https://flent.org; + license = licenses.gpl3; + + maintainers = [ maintainers.mmlb ]; + }; +} diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix new file mode 100644 index 0000000000000000000000000000000000000000..20557c18c52c773493676eb2a44dba9c4976cc45 --- /dev/null +++ b/pkgs/applications/networking/flent/http-getter.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake +, curl, pkgconfig }: + +stdenv.mkDerivation rec { + name = "http-getter"; + version = "20180606"; + + src = fetchFromGitHub { + owner = "tohojo"; + repo = "http-getter"; + rev = "79bcccce721825a745f089d0c347bbaf2e6e12f4"; + sha256 = "1zxk52s1h5qx62idil237zdpj8agrry0w1xwkfx05wvv9sw4ld35"; + }; + + buildInputs = [ cmake pkgconfig curl ]; + + meta = with stdenv.lib; { + homepage = https://github.com/tohojo/http-getter; + description = "Simple getter for HTTP URLs using cURL"; + platforms = platforms.unix; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 9a71f8911c2591dd1fbbc6b7323708dbe7a1eac9..53ee46e2060664c2cf2fa69b9755e514ffebdbbc 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -20,6 +20,14 @@ let sha256 = "1lvb14qclrx0qf6qqx8a8hkx5akk5lk3dvcqz8760v9hya52pnfv"; }; }); + + guessit = super.guessit.overridePythonAttrs (old: rec { + version = "2.1.4"; + src = old.src.override { + inherit version; + sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56"; + }; + }); }; in @@ -28,11 +36,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.13.5"; + version = "2.14.18"; src = fetchPypi { inherit pname version; - sha256 = "1lkmxwy7k4zlcqpigwk8skc2zi8a70vrw21pz80wvmf9yg0wc9z9"; + sha256 = "1pyvm1d23qy71rg7fzxcal8978kni7sn09zw4s4dsq56g8w80ay9"; }; postPatch = '' @@ -48,7 +56,7 @@ buildPythonApplication rec { chardet beautifulsoup4 html5lib PyRSS2Gen pynzb rpyc jinja2 jsonschema requests dateutil - pathpy guessit_2_0 APScheduler + pathpy guessit APScheduler terminaltables colorclass cherrypy flask flask-restful flask-restplus flask-compress @@ -60,6 +68,7 @@ buildPythonApplication rec { idna itsdangerous markupsafe plumbum pytz six tzlocal urllib3 webencodings werkzeug zxcvbn-python + backports_functools_lru_cache ] ++ lib.optional (pythonOlder "3.4") pathlib ++ lib.optional delugeSupport deluge; diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index c3085519ec4cdc5cdff912730ca2f182f7f3bbdc..6d134708a5eb0dae10e22f383c495b8e4a905596 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "gmailieer"; - version = "0.6"; + name = "gmailieer-${version}"; + version = "0.9"; src = fetchFromGitHub { owner = "gauteh"; repo = "gmailieer"; rev = "v${version}"; - sha256 = "1z7r78ck81l8xdpjynjv8dfm4j0p6a1cbzgdckp41id27sq1vc76"; + sha256 = "1ixs5hip37hzcxwi2gsxp34r914f1wrl4r3swxqmzln3a15kngsk"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 66bf843865e6b9c28834af64fe3110287fca569d..5c66c5a5298b44ea951cfdc2e12b79eecd198c83 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.4"; + stableVersion = "2.1.9"; # Currently there is no preview version. previewVersion = stableVersion; addVersion = args: @@ -10,8 +10,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "03x9qgqs4y9swyipigviyscvlcfkb2v6iasc54nv07ks8srqwf93"; - serverSrcHash = "0qzx0y4mqxpn5xhzgr2865lvszhi6szdli1jq64gihwdy3bhli4f"; + guiSrcHash = "0gpif6f7zqz2n8q3pkr8xv3fdc904hq69661w8f1fna360xvksd7"; + serverSrcHash = "1y19jzyyz0sjjxkrpgr6z10irb47v7d8khdvk5nzmgnjfxv875yx"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 24050314c413b8fb3184940becc8ce92f923ec15..7717862f6a0ac9d2c254aa0fcc02e1ff075aa48b 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -4,6 +4,16 @@ let pythonPackages = python3Packages; + async-timeout = (stdenv.lib.overrideDerivation pythonPackages.async-timeout + (oldAttrs: + rec { + pname = "async-timeout"; + version = "2.0.1"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0"; + }; + })); aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs: rec { @@ -13,6 +23,9 @@ let inherit pname version; sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; }; + propagatedBuildInputs = [ async-timeout ] + ++ (with pythonPackages; [ attrs chardet multidict yarl ]) + ++ stdenv.lib.optional (pythonPackages.pythonOlder "3.7") pythonPackages.idna-ssl; })); aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs: diff --git a/pkgs/applications/networking/gopher/gopherclient/default.nix b/pkgs/applications/networking/gopher/gopherclient/default.nix index b233ca4ab475de3cb76b98b17251d15357586024..d36533fc9e5e639309ccb0f22b106d2cc6b6f1a8 100644 --- a/pkgs/applications/networking/gopher/gopherclient/default.nix +++ b/pkgs/applications/networking/gopher/gopherclient/default.nix @@ -40,5 +40,6 @@ buildGoPackage rec { license = licenses.mit; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 577252bc69e0cd25e54f8be016d3e17eb5a7bd11..5e79517a5512abb7e4928d845697b3140bfa1049 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -2,11 +2,11 @@ , geoip, gperftools, python, swig }: stdenv.mkDerivation rec { - name = "bro-2.5.3"; + name = "bro-2.5.4"; src = fetchurl { - url = "http://www.bro.org/downloads/${name}.tar.gz"; - sha256 = "09b227j1c0ggihbhbyphd7lnh26mpz07z1s0h148dg6fwqagm13k"; + url = "https://www.bro.org/downloads/${name}.tar.gz"; + sha256 = "07sz1i4ly30257677b8vfrbsvxhz2awijyzn5ihg4m567x1ymnl0"; }; nativeBuildInputs = [ cmake flex bison file ]; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 8f4b54cec86ab5bff4de1021a3a107fc7d79b5c4..9af105ad52eb658c360025afc1e0168ee72b903c 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -11,11 +11,15 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue]; - configureFlags = "--enable-nfq-module=yes --with-dnet-includes=${libdnet}/includes --with-dnet-libraries=${libdnet}/lib"; + configureFlags = [ + "--enable-nfq-module=yes" + "--with-dnet-includes=${libdnet}/includes" + "--with-dnet-libraries=${libdnet}/lib" + ]; meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; - homepage = http://www.snort.org; + homepage = https://www.snort.org; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index e3a917a12eb37dd8cfe15c24d2412aeec4bea567..0fdfbacb45cf9644e610847cd52417d4664c3359 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -14,7 +14,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib"; + configureFlags = [ + "--disable-static-daq" + "--enable-control-socket" + "--with-daq-includes=${daq}/includes" + "--with-daq-libraries=${daq}/lib" + ]; postInstall = '' wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine" @@ -22,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; - homepage = http://www.snort.org; + homepage = https://www.snort.org; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index a5c21e28c3d6b6f6fb234e85b6560f851039a341..7953f35507d1c074e987a932ecd4e4411792cc60 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper , gcc, nettools, iproute, linuxHeaders }: -assert stdenv.isLinux; - # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; # launch with "iked -f /etc/iked.conf" diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index 623dc8382337a145af6c341099db4b8ec1416b9b..6ff51445718b238912d563da2a1a3c18267ccbec 100644 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -7,7 +7,11 @@ stdenv.mkDerivation { sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r"; }; - configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static"; + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + "--enable-static" + ]; buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper]; @@ -19,5 +23,6 @@ stdenv.mkDerivation { description = "Instant messaging (MSN Messenger clone)"; homepage = http://amsn-project.net; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 225d622c69f9b66321777b17b8a0a3dd6b2eb486..b7570e85217c5c5caf8fdf31e188ca1af238fabc 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,21 +1,19 @@ -{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig -, cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad -, gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg +{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 +, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { - version = "0.5.8"; + version = "0.5.10"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "0qk6y83mm7cz4j66d7zy72l7890k7ifqnqbqnjd3bjfn1yjivwfr"; + sha256 = "1yx721qnyhgk2lna1p6iwndl767cy0ss5zcwhyjccgqd848b0grr"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [zlib openssl libre librem - cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good + buildInputs = [zlib openssl libre librem cairo mpg123 alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid ccache libvpx - ]; + ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_INC=${libre}/include/re" @@ -26,7 +24,7 @@ stdenv.mkDerivation rec { "CCACHE_DISABLE=1" "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" - "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1" + "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST1=1" "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1" "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 9793fd234a18de96fe58dbf514ae0cb1a0f114c1..aa7895ce14883f788656a55d9988094d6ccb968b 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: +{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 1477d0674642971f7701aab88d87479cf0464c9a..a034827c4ed47b12e811de2c9d8633c0e44d0f06 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: +{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index fa1c64ba0ad75cd85fec3b4db1a09a6e8acac84e..2ed7fbcee3b53ff43cbb18a2acc04d8a6d464ef3 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python, +{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python, enableLibPurple ? false, pidgin ? null }: with stdenv.lib; @@ -15,9 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ gnutls glib libotr python ] ++ optional enableLibPurple pidgin; - preConfigure = optionalString enableLibPurple - "export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${pidgin}/lib/pkgconfig"; - configureFlags = [ "--gcov=1" "--otr=1" @@ -26,12 +23,12 @@ stdenv.mkDerivation rec { ] ++ optional enableLibPurple "--purple=1"; - buildPhase = optionalString (!enableLibPurple) '' - make install-dev - ''; + installTargets = [ "install" "install-dev" ]; doCheck = !enableLibPurple; # Checks fail with libpurple for some reason + enableParallelBuilding = true; + meta = { description = "IRC instant messaging gateway"; @@ -50,6 +47,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ wkennington pSub ]; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 5b70d747926914170368195413dbdc9286d06d33..1e88456e6b24bfe540422830657a030f495807c0 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "coyim-${version}"; - version = "v0.3.7_1"; + version = "0.3.7_1"; goPackagePath = "github.com/twstrike/coyim"; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index fd253c389a27322bcbd473fb9b260ab1cb45d8b1..3682097e302f760ca0c9bfd1fd06d6fbbd546b1d 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2018-03-10"; + name = "dino-unstable-2018-07-08"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "4ccdc1d0920a93b313d81b4014b6f45efb49b1fe"; - sha256 = "0d9698zi09s107zva6cgip7xxmdby0zfmqvka4n0khxrsnii5awq"; + rev = "df8b5fcb722c4a33ed18cbbaafecb206f127b849"; + sha256 = "1r7h9pxix0sylnwab7a8lir9h5yssk98128x2bzva77id9id33vi"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 76d68880263657211ae2340841d3cf50e2d3000a..09ead9b3de6540aba0958489e2c913920d1e6585 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.4"; + version = "0.0.5"; name = "${pname}-${version}"; src = fetchurl { url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "1alw9rkv1vv0s1w33hd9ab1cgj7iqd7ad9kvn1d55gyki28f8qlb"; + sha256 = "067gb72qsxrzfma04njkbqbmsvwnnyhw4k9igg5769jkxay68i1g"; }; nativeBuildInputs = [ makeWrapper ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "All-in-one voice and text chat for gamers that’s free, secure, and works on both your desktop and phone"; + description = "All-in-one cross-platform voice and text chat for gamers"; homepage = https://discordapp.com/; downloadPage = "https://github.com/crmarsh/discord-linux-bugs"; license = licenses.unfree; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 003ffbfc7d1eb1af37d7045be934bb72c4981d9b..bcabdf43cd22867c1df14dd5338a274f863bf2a3 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -1,7 +1,7 @@ { stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool , perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook , libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret -, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor-icon-theme +, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: stdenv.mkDerivation rec { @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { description = "VOIP/Videoconferencing app with full SIP and H.323 support"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index c2e6528e637ee832f76f5465253be908f7e46468..b253e41ae7d856ac380b904c8d88b9e30f7bef69 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper -, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook +, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let @@ -8,17 +8,6 @@ let version = "4.0.4"; - runtimeDeps = [ - udev libnotify - ]; - deps = (with xorg; [ - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes - libXrender libX11 libXtst libXScrnSaver - ]) ++ [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus - gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc - ] ++ runtimeDeps; - desktopItem = makeDesktopItem rec { name = "Franz"; exec = name; @@ -39,16 +28,21 @@ in stdenv.mkDerivation rec { # don't remove runtime deps dontPatchELF = true; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = (with xorg; [ + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes + libXrender libX11 libXtst libXScrnSaver + ]) ++ [ + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc + ]; + runtimeDependencies = [ udev.lib libnotify ]; unpackPhase = '' tar xzf $src ''; installPhase = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz - patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz - mkdir -p $out/bin $out/opt/franz cp -r * $out/opt/franz ln -s $out/opt/franz/Franz $out/bin @@ -66,7 +60,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; - homepage = http://meetfranz.com; + homepage = https://meetfranz.com; license = licenses.free; maintainers = [ maintainers.gnidorah ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 3fd8b932283ec7e9f0796d7c99bfe47f415d395d..0f9cff4fd8d7a701314993606b0463e2834b1999 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -17,11 +17,11 @@ with lib; buildPythonApplication rec { name = "gajim-${version}"; majorVersion = "1.0"; - version = "${majorVersion}.1"; + version = "${majorVersion}.3"; src = fetchurl { url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; - sha256 = "16ynws10vhx6rhjjjmzw6iyb3hc19823xhx4gsb14hrc7l8vzd1c"; + sha256 = "0ds4rqwfrpj89a489w6yih8gx5zi7qa4ffgld950fk7s0qxvcfnb"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..be911f70f915421d3d082e568f0a340a42d0353f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -0,0 +1,71 @@ +{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl +, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk3, libX11 +, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes +, libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx +, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss +, nwjs, pango, systemd }: + +let gitterDirectorySuffix = "opt/gitter"; + doELFPatch = target: '' + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ + --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \ + $out/${gitterDirectorySuffix}/${target} + ''; + libPath = stdenv.lib.makeLibraryPath [ + alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib + gnome2.GConf gtk3 libX11 libXScrnSaver libXcomposite libXcursor libXdamage + libXext libXfixes libXi libXrandr libXrender libXtst libappindicator-gtk3 + libcxx libnotify libpulseaudio libxcb nspr nss pango stdenv.cc.cc systemd + ]; +in stdenv.mkDerivation rec { + pname = "gitter"; + version = "4.1.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb"; + sha256 = "1gny9i2pywvczzrs93k8krqn6hwm6c2zg8yr3xmjqs3p88817wbi"; + }; + + nativeBuildInputs = [ makeWrapper dpkg ]; + + unpackPhase = "dpkg -x $src ."; + + installPhase = '' + mkdir -p $out/{bin,opt/gitter,share/pixmaps} + mv ./opt/Gitter/linux64/* $out/opt/gitter + + ${doELFPatch "Gitter"} + ${doELFPatch "nacl_helper"} + ${doELFPatch "minidump_stackwalk"} + ${doELFPatch "nwjc"} + ${doELFPatch "chromedriver"} + ${doELFPatch "payload"} + + patchelf --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \ + $out/${gitterDirectorySuffix}/lib/libnw.so + + wrapProgram $out/${gitterDirectorySuffix}/Gitter --prefix LD_LIBRARY_PATH : ${libPath} + + ln -s $out/${gitterDirectorySuffix}/Gitter $out/bin/ + ln -s $out/${gitterDirectorySuffix}/logo.png $out/share/pixmaps/gitter.png + ln -s "${desktopItem}/share/applications" $out/share/ + ''; + + desktopItem = makeDesktopItem { + name = pname; + exec = "Gitter"; + icon = pname; + desktopName = "Gitter"; + genericName = meta.description; + categories = "Network;InstantMessaging;"; + }; + + meta = with stdenv.lib; { + description = "Where developers come to talk"; + downloadPage = "https://gitter.im/apps"; + license = licenses.mit; + maintainers = [ maintainers.imalison ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8e85be831a01fc50ee2b67541bc822acb0f65698 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGo110Package, fetchFromGitHub }: + +buildGo110Package rec { + name = "gomuks-${version}"; + version = "2018-07-10"; + + goPackagePath = "maunium.net/go/gomuks"; + + src = fetchFromGitHub { + owner = "tulir"; + repo = "gomuks"; + rev = "68db26bcace31297471641fe95f8882e301f5699"; + sha256 = "0dagdvsvn8nwqsvjbqk1c6gg2q1m40869nayrkwm3ndg2xkfdpm6"; + }; + + meta = with stdenv.lib; { + homepage = https://maunium.net/go/gomuks/; + description = "A terminal based Matrix client written in Go"; + license = licenses.gpl3; + maintainers = with maintainers; [ tilpner ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index e24ea5e6fb37d1f985771690498104c4e72b7b01..56f0f367c221a3c8f03c04d908f69ce54fdf7067 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -3,8 +3,7 @@ , libGL, xcbutilkeysyms, xdg_utils, libtool }: let - - version = "4.30.3.1670"; + version = "4.30.5.1682"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -39,22 +38,13 @@ let systemd libGL ] + ":${stdenv.cc.cc.lib}/lib64"; - - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "0alqzay6bvi7ybrrdk5r0xkg4sx6qjsqbgmr16bkqxncxhb215ay"; - } - else - throw "HipChat is not supported on ${stdenv.system}"; - -in - -stdenv.mkDerivation { +in stdenv.mkDerivation { name = "hipchat-${version}"; - inherit src; + src = fetchurl { + url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; + sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96"; + }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 1d03c2f47c89a212792a1b9f6c4fcf8c165251c3..820a742245edc10a71f66aab9b41de723ff6214f 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,10 +1,8 @@ { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk # Optional, Jitsi still runs without, but you may pass null: -, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg +, alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "jitsi-${version}"; version = "2.10.5550"; @@ -27,13 +25,11 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath ([ stdenv.cc.cc # For libstdc++. - ] ++ lib.filter (x: x != null) [ alsaLib - dbus_libs + dbus gtk2 libpulseaudio openssl - ] ++ lib.optionals (xorg != null) [ xorg.libX11 xorg.libXext xorg.libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index e0aecd2c810286cf58edbadac552980eab16da7d..1b257ea61dce9a94ac86e1ab7f49c4573a503c92 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp +{ stdenv, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a9ce8a96f9700e87036a7c26f27d32a7d119860c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -0,0 +1,81 @@ +{ stdenv, lib, fetchurl, gnome2, gtk2, pango, atk, cairo, gdk_pixbuf, glib, +freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, +libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, +libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }: +let + rpath = lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gtk2 + pango + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + nspr + nss + stdenv.cc.cc + udev + xorg.libxcb + ]; + +in + stdenv.mkDerivation rec { + name = "mattermost-desktop-${version}"; + version = "4.1.2"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz"; + sha256 = "16dn6870bs1nfl2082ym9gwvmqb3i5sli48qprap80p7riph6k9s"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz"; + sha256 = "145zb1l37fa2slfrrlprlwzcc5km3plxs374yhgix25mlg2afkqr"; + } + else + throw "Mattermost-Desktop is not currently supported on ${stdenv.system}"; + + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + mkdir -p $out + cp -R . $out + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${rpath}:$out $out/mattermost-desktop + + patchShebangs $out/create_desktop_file.sh + $out/create_desktop_file.sh + + mkdir -p $out/{bin,share/applications} + cp Mattermost.desktop $out/share/applications/Mattermost.desktop + ln -s $out/mattermost-desktop $out/bin/mattermost-desktop + ''; + + meta = { + description = "Mattermost Desktop client"; + homepage = https://about.mattermost.com/; + license = lib.licenses.asl20; + platforms = [ + "x86_64-linux" "i686-linux" + ]; + }; + } diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index edd7b012e217da62d786490b38c08997d25639c1..d86d62021fbd9cd1e24cced059b98b9378d9c7dc 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -7,14 +7,18 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchurl { - url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; + url = "https://mcabber.com/files/mcabber-${version}.tar.bz2"; sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ]; - configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr"; + configureFlags = [ + "--with-openssl=${openssl.dev}" + "--enable-modules" + "--enable-otr" + ]; doCheck = true; diff --git a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix deleted file mode 100644 index 37a3746669b101dea5d303ea9bee7467e626f09d..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ - stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, curl, dbus, expat, - fontconfig, freetype, glib, gnome2, libnotify, nspr, nss, systemd, xorg -}: - -with stdenv.lib; - -let - - version = "2.0.6"; - - rpath = makeLibraryPath [ - alsaLib - atk - cairo - cups - curl - dbus - expat - fontconfig - freetype - glib - gnome2.GConf - gnome2.gdk_pixbuf - gnome2.gtk - gnome2.pango - libnotify - nspr - nss - stdenv.cc.cc - systemd - - xorg.libxkbfile - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libXScrnSaver - ] + ":${stdenv.cc.cc.lib}/lib64"; - - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://github.com/aluxian/Messenger-for-Desktop/releases/download/v2.0.6/messengerfordesktop-2.0.6-linux-amd64.deb"; - sha256 = "bf3f3ed9ac46ceb4b7dffbeb33c7d15bbcbfcdd141c4dbfbb620e8bfefae906b"; - } - else - throw "Messenger for Desktop is not supported on ${stdenv.system}"; - -in stdenv.mkDerivation { - name = "messenger-for-desktop-${version}"; - - inherit src; - - buildInputs = [ dpkg ]; - unpackPhase = "true"; - buildCommand = '' - mkdir -p $out - dpkg -x $src $out - - mv $out/usr/share $out/share - mv $out/opt/messengerfordesktop $out/libexec - rmdir $out/usr $out/opt - - chmod -R g-w $out - - # patch the binaries - for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/libexec $file || true - done - - # add symlink to bin - mkdir -p $out/bin - ln -s $out/libexec/messengerfordesktop $out/bin/messengerfordesktop - - # Fix the desktop link - substituteInPlace $out/share/applications/messengerfordesktop.desktop \ - --replace /opt/messengerfordesktop/messengerfordesktop $out/bin/messengerfordesktop - ''; - - meta = { - description = "Bring messenger.com to your Linux desktop."; - longDescription = '' - A simple & beautiful desktop client for Facebook Messenger. Chat without - distractions on macOS, Windows and Linux. Not affiliated with Facebook. - This is NOT an official product. - ''; - homepage = https://messengerfordesktop.org; - license = licenses.mit; - maintainers = [ - maintainers.shawndellysse - ]; - platforms = [ - "x86_64-linux" - ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 6b17eb0a8975947d079db1af431337bf3205c6cc..3c267e612a685f1f635ac9eb774ea7987876b251 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, bundlerEnv, ruby, pkgconfig +, bundlerEnv, ruby , alsaUtils, libnotify, which, wrapGAppsHook, gtk2 }: diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cf9558b4b955d37edee7b7ba12a0f85523048121 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -0,0 +1,103 @@ +{ + lib, stdenv, fetchFromGitHub, fetchurl, + cmake, doxygen, lmdb, qt5, qtmacextras +}: + +let + json_hpp = fetchurl { + url = https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp; + sha256 = "fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733"; + }; + + variant_hpp = fetchurl { + url = https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp; + sha256 = "1vjiz1x5l8ynqqyb5l9mlrzgps526v45hbmwjilv4brgyi5445fq"; + }; + + matrix-structs = stdenv.mkDerivation rec { + name = "matrix-structs-git"; + + src = fetchFromGitHub { + owner = "mujx"; + repo = "matrix-structs"; + rev = "5e57c2385a79b6629d1998fec4a7c0baee23555e"; + sha256 = "112b7gnvr04g1ak7fnc7ch7w2n825j4qkw0jb49xx06ag93nb6m6"; + }; + + postUnpack = '' + cp ${json_hpp} "$sourceRoot/include/json.hpp" + cp ${variant_hpp} "$sourceRoot/include/variant.hpp" + ''; + + patches = [ ./fetchurls.patch ]; + + nativeBuildInputs = [ cmake doxygen ]; + }; + + tweeny = fetchFromGitHub { + owner = "mobius3"; + repo = "tweeny"; + rev = "b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf"; + sha256 = "1wyyq0j7dhjd6qgvnh3knr70li47hmf5394yznkv9b1indqjx4mi"; + }; + + lmdbxx = fetchFromGitHub { + owner = "bendiken"; + repo = "lmdbxx"; + rev = "0b43ca87d8cfabba392dfe884eb1edb83874de02"; + sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n"; + }; +in +stdenv.mkDerivation rec { + name = "nheko-${version}"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "mujx"; + repo = "nheko"; + rev = "v${version}"; + sha256 = "0qjia42nam3hj835k2jb5b6j6n56rdkb8rn67yqf45xdz8ypmbmv"; + }; + + # This patch is likely not strictly speaking needed, but will help detect when + # a dependency is updated, so that the fetches up there can be updated too + patches = [ ./external-deps.patch ]; + + # If, on Darwin, you encounter the error + # error: must specify at least one argument for '...' parameter of variadic + # macro [-Werror,-Wgnu-zero-variadic-macro-arguments] + # Then adding this parameter is likely the fix you want. + # + # However, it looks like either cmake doesn't honor this CFLAGS variable, or + # darwin's compiler doesn't have the same syntax as gcc for turning off + # -Werror selectively. + # + # Anyway, this is something that will have to be debugged with access to a + # darwin-based OS. Sorry about that! + # + #preConfigure = lib.optionalString stdenv.isDarwin '' + # export CFLAGS=-Wno-error=gnu-zero-variadic-macro-arguments + #''; + + cmakeFlags = [ + "-DMATRIX_STRUCTS_LIBRARY=${matrix-structs}/lib/static/libmatrix_structs.a" + "-DMATRIX_STRUCTS_INCLUDE_DIR=${matrix-structs}/include/matrix_structs" + "-DTWEENY_INCLUDE_DIR=${tweeny}/include" + "-DLMDBXX_INCLUDE_DIR=${lmdbxx}" + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + lmdb lmdbxx matrix-structs qt5.qtbase qt5.qtmultimedia qt5.qttools tweeny + ] ++ lib.optional stdenv.isDarwin qtmacextras; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Desktop client for the Matrix protocol"; + maintainers = with maintainers; [ ekleog ]; + platforms = platforms.all; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch new file mode 100644 index 0000000000000000000000000000000000000000..fa388edfb75a8d15989f50d872032fa00dc34c6c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch @@ -0,0 +1,94 @@ +diff --git a/cmake/LMDBXX.cmake b/cmake/LMDBXX.cmake +index 3b9817d..e69de29 100644 +--- a/cmake/LMDBXX.cmake ++++ b/cmake/LMDBXX.cmake +@@ -1,23 +0,0 @@ +-include(ExternalProject) +- +-# +-# Build lmdbxx. +-# +- +-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) +-set(LMDBXX_ROOT ${THIRD_PARTY_ROOT}/lmdbxx) +- +-set(LMDBXX_INCLUDE_DIR ${LMDBXX_ROOT}) +- +-ExternalProject_Add( +- lmdbxx +- +- GIT_REPOSITORY https://github.com/bendiken/lmdbxx +- GIT_TAG 0b43ca87d8cfabba392dfe884eb1edb83874de02 +- +- BUILD_IN_SOURCE 1 +- SOURCE_DIR ${LMDBXX_ROOT} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +-) +diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake +index cef00f6..e69de29 100644 +--- a/cmake/MatrixStructs.cmake ++++ b/cmake/MatrixStructs.cmake +@@ -1,33 +0,0 @@ +-include(ExternalProject) +- +-# +-# Build matrix-structs. +-# +- +-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) +-set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs) +-set(MATRIX_STRUCTS_INCLUDE_DIR ${MATRIX_STRUCTS_ROOT}/include) +-set(MATRIX_STRUCTS_LIBRARY matrix_structs) +- +-link_directories(${MATRIX_STRUCTS_ROOT}) +- +-set(WINDOWS_FLAGS "") +- +-if(MSVC) +- set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64") +-endif() +- +-ExternalProject_Add( +- MatrixStructs +- +- GIT_REPOSITORY https://github.com/mujx/matrix-structs +- GIT_TAG 5e57c2385a79b6629d1998fec4a7c0baee23555e +- +- BUILD_IN_SOURCE 1 +- SOURCE_DIR ${MATRIX_STRUCTS_ROOT} +- CONFIGURE_COMMAND ${CMAKE_COMMAND} +- -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT} +- ${WINDOWS_FLAGS} +- BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release +- INSTALL_COMMAND "" +-) +diff --git a/cmake/Tweeny.cmake b/cmake/Tweeny.cmake +index 537ac92..e69de29 100644 +--- a/cmake/Tweeny.cmake ++++ b/cmake/Tweeny.cmake +@@ -1,23 +0,0 @@ +-include(ExternalProject) +- +-# +-# Build tweeny +-# +- +-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) +-set(TWEENY_ROOT ${THIRD_PARTY_ROOT}/tweeny) +- +-set(TWEENY_INCLUDE_DIR ${TWEENY_ROOT}/include) +- +-ExternalProject_Add( +- Tweeny +- +- GIT_REPOSITORY https://github.com/mobius3/tweeny +- GIT_TAG b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf +- +- BUILD_IN_SOURCE 1 +- SOURCE_DIR ${TWEENY_ROOT} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch b/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch new file mode 100644 index 0000000000000000000000000000000000000000..e2f72f600ed868591fdc150cb07a49864f6b4343 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 077ac37..c639d71 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,16 +18,6 @@ include(Doxygen) + # + include(CompilerFlags) + +-file(DOWNLOAD +- "https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp" +- ${PROJECT_SOURCE_DIR}/include/json.hpp +- EXPECTED_HASH SHA256=fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733) +- +-file(DOWNLOAD +- "https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp" +- ${PROJECT_SOURCE_DIR}/include/variant.hpp +- EXPECTED_MD5 "be0ce322cdd408e1b347b9f1d59ea67a") +- + include_directories(include) + + set(SRC diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..af58aaa0a76909b2a80e4b2e0d4d23dc16dcb520 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: + +stdenv.mkDerivation rec { + name = "purple-discord-${version}"; + version = "unstable-2018-04-10"; + + src = fetchFromGitHub { + owner = "EionRobb"; + repo = "purple-discord"; + rev = "9a97886d15a1f028de54b5e6fc54e784531063b0"; + sha256 = "0dc344zh1v4yh9c8javcw5ylzwc1wpx0ih8bww8p8cjmhr8kcl32"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pidgin json-glib ]; + + makeFlags = [ + "DESTDIR=$(out)" + ]; + + PKG_CONFIG_PURPLE_PLUGINDIR = "/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "/share"; + + meta = with stdenv.lib; { + homepage = https://github.com/EionRobb/purple-discord; + description = "Discord plugin for Pidgin"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ sna ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index 37b490304c4f2993b716ef23dfd2c81b6e86cc16..8eb086a98070fcc876f3a221b54a01e378a8b419 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -5,18 +5,18 @@ let pidginHg = fetchhg { url = "https://bitbucket.org/pidgin/main"; # take from VERSION file - rev = "c9b74a765767"; - sha256 = "07bjz87jpslsb4gdqvcwp79mkahls2mfhlmpaa5w6n4xqhahw4j3"; + rev = "9ff9acf9fa14"; + sha256 = "06imlhsps4wrjgjb92zpaxprxfxl2pjb2x9pl859c8cryssrz2jv"; }; in stdenv.mkDerivation rec { - name = "purple-facebook-0.9.3"; + name = "purple-facebook-0.9.5"; src = fetchFromGitHub { owner = "dequis"; repo = "purple-facebook"; - rev = "v0.9.3-c9b74a765767"; - sha256 = "10ncvg0arcxnd3cpb0nxry1plbws0mw9vhzjrhb40sv2i563dywb"; + rev = "v0.9.5-9ff9acf9fa14"; + sha256 = "0a1860bkzrmyxahm9rlxi80z335w491wzdaqaw6j9ccavbymhwhs"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 460143e354947079336d84115460359693ed5c6c..e304c139eea54fec802403e16e3c9c3e4165bc30 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "purple-hangouts-hg-${version}"; - version = "2017-10-08"; + version = "2018-03-28"; src = fetchhg { url = "https://bitbucket.org/EionRobb/purple-hangouts/"; - rev = "5e769791d282a6e5ae4d94dc66a1ff9d6904ec9c"; - sha256 = "0cs7dcd44lkc2anradyddjvmfvnl46ixw4idaf1m9fd7j35mg7b1"; + rev = "0e137e6bf9e95c5a0bd282f3ad4a5bd00a6968ab"; + sha256 = "04vjgz6qyd9ilv1c6n08r45vc683vxs1rgfwhh65pag6q4rbzlb9"; }; buildInputs = [ pidgin glib json-glib protobuf protobufc ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bcfcbee8556847685a9663895a8bc4029137cce6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }: + +stdenv.mkDerivation rec { + name = "purple-lurch-${version}"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "gkdr"; + repo = "lurch"; + rev = "v${version}"; + sha256 = "029jjqinsfhpv0zgji3sv1cyk54fn9qp176fwy97d1clf0vflxrz"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ pidgin minixml libxml2 sqlite libgcrypt ]; + + dontUseCmakeConfigure = true; + + installPhase = '' + install -Dm755 -t $out/lib/purple-2 build/lurch.so + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/gkdr/lurch; + description = "XEP-0384: OMEMO Encryption for libpurple"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ emmanuelrosa ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8990aeee8ec01fd8ef0500fe73162398620a0d1f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, pidgin, glib, libxml2 }: + +stdenv.mkDerivation rec { + name = "purple-xmpp-upload-2017-12-31"; + + src = fetchgit { + url = "https://github.com/Junker/purple-xmpp-http-upload"; + rev = "178096cbfc9df165c2dc1677666439969d212b37"; + sha256 = "12l9rqlgb4i50xxrfnvwz9sqfk0d3c0m6l09mnvfixqi8illyvlp"; + }; + + buildInputs = [ pidgin glib libxml2 ]; + + installPhase = '' + install -Dm644 -t $out/lib/purple-2 jabber_http_file_upload.so + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/Junker/purple-xmpp-http-upload; + description = "HTTP File Upload plugin for libpurple (XMPP Protocol XEP-0363)"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ emmanuelrosa ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 73346888a3358ad284edb9ea2a28d97edfdd509a..2d3a10cec5e401a77264d7d6c130e0d873e39d90 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }: -let version = "1.23.2"; in +let version = "1.23.3"; in stdenv.mkDerivation { name = "pidgin-sipe-${version}"; src = fetchurl { url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz"; - sha256 = "1xj4nn5h103q4agar167xwcp98qf8knrgs918nl07qaxp9g4558w"; + sha256 = "0aaiblnagncb0lhdwb8qbps6hxxmyfjg7sdi15lrkl98i3fahg4n"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 68083a7b9d251d4aa49f85abf6fe0e734736dc7a..8527593c1a20d0b26643724fe0752f0750a4ac49 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin libwebp libgcrypt gettext ]; preConfigure = '' - sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/pidgin/server.tglpub|g" telegram-purple.c + sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/purple-2/server.tglpub|g" telegram-purple.c echo "#define GIT_COMMIT \"${builtins.substring 0 10 src.rev}\"" > commit.h ''; installPhase = '' - mkdir -p $out/lib/pidgin/ - cp bin/*.so $out/lib/pidgin/ #*/ - cp tg-server.tglpub $out/lib/pidgin/server.tglpub + mkdir -p $out/lib/purple-2/ + cp bin/*.so $out/lib/purple-2/ #*/ + cp tg-server.tglpub $out/lib/purple-2/server.tglpub mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} cp imgs/telegram16.png $out/pixmaps/pidgin/protocols/16 cp imgs/telegram22.png $out/pixmaps/pidgin/protocols/22 diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 3ec45702b1754275e859241fa319b6f740e00dda..ec3bb6a463e642ab1bb8a7ae89da9aa6509d5eb7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -15,11 +15,11 @@ let unwrapped = stdenv.mkDerivation rec { name = "pidgin-${version}"; majorVersion = "2"; - version = "${majorVersion}.12.0"; + version = "${majorVersion}.13.0"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "1y5p2mq3bfw35b66jsafmbva0w5gg1k99y9z8fyp3jfksqv3agcc"; + sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7"; }; inherit nss ncurses; @@ -77,6 +77,6 @@ let unwrapped = stdenv.mkDerivation rec { in if plugins == [] then unwrapped else import ./wrapper.nix { - inherit stdenv makeWrapper symlinkJoin plugins; + inherit makeWrapper symlinkJoin plugins; pidgin = unwrapped; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index 914b3480a95d96f6d4cc4b5660eaa4c7cecef849..095f838fe981e458286e9f5ec879c09a2337249d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, pidgin, makeWrapper, plugins }: +{ symlinkJoin, pidgin, makeWrapper, plugins }: let extraArgs = map (x: x.wrapArgs or "") plugins; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 5d463648bd8bc2bcf1a82b4397440979d2ab98ae..e7527bafcc65d2180524ea66c90290b84ec68b88 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, - fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, + fetchgit }: let gui = true; # Might be implemented with nixpkgs config. diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 7fabfa5f7722519d07c9cdf61340c9fd484aa29e..37d9de8794e554e147f277814ac1d6bca72d8b70 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xproto, libSM -, libICE, qca2, pkgconfig, callPackage, which, glib +, libICE, qca2, pkgconfig, which, glib , libXScrnSaver, scrnsaverproto }: diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 654c343caa8b50bf44147d9fae0ee58c48b9d4fd..3f6b23d70a0565d0584f92bb37f60c7524c4af3c 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, pythonPackages, openssl }: +{ stdenv, fetchFromGitHub, python2Packages, openssl }: -pythonPackages.buildPythonApplication rec { - name = "pybitmessage-${version}"; +python2Packages.buildPythonApplication rec { + pname = "pybitmessage"; - version = "0.6.2"; + version = "0.6.3.2"; src = fetchFromGitHub { owner = "bitmessage"; repo = "PyBitmessage"; - rev = "v${version}"; - sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8"; + rev = version; + sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35"; }; - propagatedBuildInputs = with pythonPackages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; + propagatedBuildInputs = with python2Packages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; preConfigure = '' # Remove interaction and misleading output diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index bbad5a68180727751ca8a252dd60af821415d7d7..fa481b7fe663bfce3a8450eb22300aecd67c531b 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,19 +1,23 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, - libtoxcore, - libpthreadstubs, libXdmcp, libXScrnSaver, - qtbase, qtsvg, qttools, qttranslations, - ffmpeg, filter-audio, libexif, libsodium, libopus, - libvpx, openal, pcre, qrencode, sqlcipher }: - -mkDerivation rec { +{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +, libtoxcore +, libpthreadstubs, libXdmcp, libXScrnSaver +, qtbase, qtsvg, qttools, qttranslations +, ffmpeg, filter-audio, libexif, libsodium, libopus +, libvpx, openal, pcre, qrencode, sqlcipher +, AVFoundation ? null }: + +let + version = "1.16.1"; + rev = "v${version}"; + +in mkDerivation rec { name = "qtox-${version}"; - version = "1.13.0"; src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; - rev = "v${version}"; - sha256 = "08x71p23d0sp0w11k8z3wf3k56iclmdq9x652n8ggidgyrdi9f6y"; + sha256 = "05cz67yvdqjv1dmqycnc5rd0275zh94wyaa7sqdkr1iw8k5h955n"; + inherit rev; }; buildInputs = [ @@ -22,24 +26,25 @@ mkDerivation rec { qtbase qtsvg qttranslations ffmpeg filter-audio libexif libopus libsodium libvpx openal pcre qrencode sqlcipher - ]; + ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ; nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; cmakeFlags = [ - "-DGIT_DESCRIBE=${version}" + "-DGIT_DESCRIBE=${rev}" "-DENABLE_STATUSNOTIFIER=False" "-DENABLE_GTK_SYSTRAY=False" "-DENABLE_APPINDICATOR=False" + "-DTIMESTAMP=1" ]; meta = with lib; { description = "Qt Tox client"; homepage = https://tox.chat; license = licenses.gpl3; - maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ]; + maintainers = with maintainers; [ jgeerds akaWolf peterhoeg ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 768ab24c2f390c9c625b49ba90c1c3260ac6c35c..983646fbad53968ed144e3a3fe5a1c53e8621858 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,31 +1,40 @@ -{ stdenv, lib, fetchFromGitHub, qtbase, qtquickcontrols, cmake, libqmatrixclient }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, qtbase, qtquickcontrols, cmake, libqmatrixclient }: stdenv.mkDerivation rec { name = "quaternion-${version}"; - version = "0.0.5"; - - # libqmatrixclient doesn't support dynamic linking as of 0.2 so we simply pull in the source + version = "0.0.9.2"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = "v${version}"; - sha256 = "14xmaq446aggqhpcilahrw2mr5gf2mlr1xzyp7r6amrnmnqsyxrd"; + sha256 = "0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib"; }; - buildInputs = [ qtbase qtquickcontrols libqmatrixclient ]; + buildInputs = [ qtbase qtquickcontrols ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; + patches = [ + # https://github.com/QMatrixClient/Quaternion/pull/400 + (fetchpatch { + url = "https://github.com/QMatrixClient/Quaternion/commit/6cb29834efc343dc2bcf1db62cfad2dc4c121c54.patch"; + sha256 = "0n7mgzzrvx9sa657rfb99i0mjh1k0sn5br344mknqy3wgqdr7s3x"; + }) + ]; - # take the source from libqmatrixclient + # libqmatrixclient is now compiled as a dynamic library but quarternion cannot use it yet + # https://github.com/QMatrixClient/Quaternion/issues/239 postPatch = '' rm -rf lib ln -s ${libqmatrixclient.src} lib ''; - postInstall = '' + postInstall = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv $out/bin/quaternion.app $out/Applications + rmdir $out/bin || : + '' else '' substituteInPlace $out/share/applications/quaternion.desktop \ --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" ''; diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 594004fd2949b0d551b145cdb586f05214406e0e..334c50814d78f11f72b9423c67480ee0db2e2b4c 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha -, auth0ClientID, auth0Domain, disableTooltips }: +, auth0ClientID, auth0Domain }: stdenv.mkDerivation rec { name = "rambox-bare-${version}"; - version = "0.5.13"; + version = "0.5.17"; src = fetchFromGitHub { owner = "saenzramiro"; repo = "rambox"; rev = version; - sha256 = "0c770a9z017y6gcrpyri7s1gifm8zi5f29bq5nvh3zzg4wgqh326"; + sha256 = "18adga0symhb825db80l4c7kjl3lzzh54p1qibqsfa087rjxx9ay"; }; nativeBuildInputs = [ nodejs-8_x ruby sencha ]; @@ -18,11 +18,10 @@ stdenv.mkDerivation rec { inherit src; nodejs = nodejs-8_x; - sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4"; + sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k"; }; - patches = [ ./hide-check-for-updates.patch ./isDev.patch ] - ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ]; + patches = [ ./isDev.patch ]; configurePhase = '' echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index a601db8c8da5d2d9f30d1b4a0a7e7eeeb074a64d..7c630e522afea7a665df1c636a0ca3103e8b08c5 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,14 +1,13 @@ { stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU" -, auth0Domain ? "nixpkgs.auth0.com" -, disableTooltips ? false }: +, auth0Domain ? "nixpkgs.auth0.com" }: let callPackage = newScope self; self = { fetchNodeModules = callPackage ./fetchNodeModules.nix {}; rambox-bare = callPackage ./bare.nix { - inherit auth0ClientID auth0Domain disableTooltips; + inherit auth0ClientID auth0Domain; }; sencha = callPackage ./sencha {}; }; @@ -38,4 +37,8 @@ stdenv.mkDerivation { mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications ''; + + inherit (rambox-bare.meta // { + platforms = [ "i686-linux" "x86_64-linux" ]; + }); } diff --git a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch deleted file mode 100644 index 5ddaa9d51771b965ac98b07a5ecbbe2dc8b57179..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- index.html.orig 2017-12-16 20:06:03.401298402 +0300 -+++ ./index.html 2017-12-16 20:06:21.474484436 +0300 -@@ -43,14 +43,14 @@ - - - -- --> - - - diff --git a/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch b/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch deleted file mode 100644 index 8363baef2dfccd12f4349e49005e362115998b32..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://github.com/saenzramiro/rambox/issues/1283 - -diff -urNZ a/electron/menu.js b/electron/menu.js ---- a/electron/menu.js 2017-11-02 22:02:59.753119865 +0000 -+++ b/electron/menu.js 2017-11-02 22:08:34.419698562 +0000 -@@ -220,14 +220,6 @@ - } - }, - { -- label: locale['menu.help[5]'], -- click(item, win) { -- const webContents = win.webContents; -- const send = webContents.send.bind(win.webContents); -- send('autoUpdater:check-update'); -- } -- }, -- { - label: locale['menu.help[6]'], - click() { - sendAction('showAbout') -@@ -290,14 +282,6 @@ - type: 'separator' - }); - helpSubmenu.push({ -- label: `&`+locale['menu.help[5]'], -- click(item, win) { -- const webContents = win.webContents; -- const send = webContents.send.bind(win.webContents); -- send('autoUpdater:check-update'); -- } -- }); -- helpSubmenu.push({ - label: `&`+locale['menu.help[6]'], - click() { - sendAction('showAbout') diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index 5f68e6d86295db27c2d84e35a4d3f00151b67492..ca82f30e2d1f2ea03b944b3dad50f894a496cc66 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, gzip, which, unzip, jdk }: let - version = "6.5.2"; + version = "6.5.3.6"; srcs = { i686-linux = fetchurl { url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip"; - sha256 = "18gcqw9434xab97skcb97iw4p4s2pgggvq7jaisblap0ja00kqjr"; + sha256 = "0g3hk3fdgmkdsr6ck1fgsmaxa9wbj2fpk84rk382ff9ny55bbzv9"; }; x86_64-linux = fetchurl { url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip"; - sha256 = "1b8jv99k37q1bi7b29f23lfzxc66v5fqdmr1rxsrqchwcrllc0z7"; + sha256 = "08j8gak1xsxdjgkv6s24jv97jc49pi5yf906ynjmxb27wqpxn9mz"; }; }; in diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 5d004db60e3ad10dc51bb7383cbdbc9209d2a885..add337d3f0856467b5af06eae9bf5efa3d040c17 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -5,22 +5,24 @@ with stdenv.lib; let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); -in -stdenv.mkDerivation rec { - name = "ratox-0.4"; +in stdenv.mkDerivation rec { + name = "ratox-0.4.20180303"; src = fetchgit { url = "git://git.2f30.org/ratox.git"; - rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c"; - sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5"; + rev = "269f7f97fb374a8f9c0b82195c21de15b81ddbbb"; + sha256 = "0bpn37h8jvsqd66fkba8ky42nydc8acawa5x31yxqlxc8mc66k74"; }; - patches = [ ./ldlibs.patch ]; - buildInputs = [ libtoxcore ]; - preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h"; + preConfigure = '' + substituteInPlace config.mk \ + --replace '-lsodium -lopus -lvpx ' "" + + ${optionalString (conf!=null) "cp ${configFile} config.def.h"} + ''; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch deleted file mode 100644 index 1406e714310709085c440b3a779decf911b281b7..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -13 +13 @@ LDFLAGS = -L/usr/local/lib --LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread -+LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index c99130f28a391c35f00a47bd669d33f7e93eea77..a6aef5e6a2fb21866923d9439346dae7cbed957a 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip +{ stdenv, fetchurl, pkgconfig, makeDesktopItem , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols , openssl, protobuf, qmake }: diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 024902a9c486faae0b02c5437ae73dd5c293a014..168719bf0e4c0db889d0dd14a0e90b36586bd260 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -20,7 +20,7 @@ , speex , boost , opendht -, libmsgpack +, msgpack , gnutls , zlib , jsoncpp @@ -30,7 +30,6 @@ , openssl , perl , python3 -, bash , libupnp , speexdsp , fetchFromGitHub @@ -109,7 +108,7 @@ stdenv.mkDerivation rec { speex boost opendht - libmsgpack + msgpack gnutls zlib jsoncpp diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index b47280d3b156b62ad9e7ced359957b51e9a5a591..322ad020c9ad6d029f54032659939afee04ad180 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, fetchpatch, writeText, conf ? null }: +{ lib, stdenv, fetchurl, writeText, conf ? null }: let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.13.5"; + version = "0.16.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1ap62ksi3dg7qijxxysjpnlmngzgh2jdldvb8s1jx14avanccch6"; + sha256 = "1nl0ih5flhp57k96hv6nl5pzrm3r9piqmwzirz9nz8k9803mqp5m"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 9ff1799ddd2d1ec8a649c4664cb4e75d08b992e4..987a7aa1be05e3783c96fb95f16392988b3a4b73 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "salut-a-toi"; + name = "salut-a-toi-${version}"; version = "0.6.1"; pname = "sat-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix deleted file mode 100644 index f627479a3c0438ee59312788b7c00705fbeb52c2..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype, -fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, -libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, -nspr, alsaLib, cups, expat, udev -}: -let - rpath = lib.makeLibraryPath [ - alsaLib - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk_pixbuf - glib - gnome2.GConf - gnome2.gtk - gnome2.pango - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - nspr - nss - stdenv.cc.cc - udev - xorg.libxcb - ]; - -in - stdenv.mkDerivation rec { - name = "signal-desktop-${version}"; - - version = "1.1.0-beta.5"; - - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - sha256 = "1kllym2iazp9i5afrh0vmsqqlh5b8i6f929p5yhl8bl4zd17zwpx"; - } - else - throw "Signal for Desktop is not currently supported on ${stdenv.system}"; - - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ dpkg ]; - unpackPhase = "dpkg-deb -x $src ."; - installPhase = '' - mkdir -p $out - cp -R opt $out - cp -R usr/share $out/share - - chmod -R g-w $out - - # Patch signal - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}:$out/opt/Signal Beta" \ - "$out/opt/Signal Beta/signal-desktop-beta" - - # Symlink to bin - mkdir -p $out/bin - ln -s "$out/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta - - # Fix the desktop link - substituteInPlace $out/share/applications/signal-desktop-beta.desktop \ - --replace "/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta - ''; - - meta = { - description = "Signal Private Messenger for the Desktop (Beta version)"; - homepage = https://signal.org/; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ixmatus benley ]; - platforms = [ - "x86_64-linux" - ]; - }; - } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 74f784a1ba1a80dc8743285dd87bdb4a46b54ac0..516abb4c9c0068f88baa9ddc4fef1c635ed926b1 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,9 +1,26 @@ -{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype, -fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, -libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, -nspr, alsaLib, cups, expat, udev +{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook +, gnome2, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig +, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite +, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib +, cups, expat, udev +# Unfortunately this also overwrites the UI language (not just the spell +# checking language!): +, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" +# For a full list of available languages: +# $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' }: + let + customLanguageWrapperArgs = (with lib; + let + # E.g. "de_DE" -> "de-de" (spellcheckerLanguage -> hunspellDict) + spellLangComponents = splitString "_" spellcheckerLanguage; + hunspellDict = elemAt spellLangComponents 0 + "-" + toLower (elemAt spellLangComponents 1); + in if spellcheckerLanguage != null + then '' + --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ + --set LC_MESSAGES "${spellcheckerLanguage}"'' + else ""); rpath = lib.makeLibraryPath [ alsaLib atk @@ -16,8 +33,8 @@ let gdk_pixbuf glib gnome2.GConf - gnome2.gtk - gnome2.pango + gtk3 + pango libX11 libXScrnSaver libXcomposite @@ -36,54 +53,57 @@ let xorg.libxcb ]; -in - stdenv.mkDerivation rec { - name = "signal-desktop-${version}"; +in stdenv.mkDerivation rec { + name = "signal-desktop-${version}"; + version = "1.15.5"; - version = "1.6.1"; + src = fetchurl { + url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; + sha256 = "1a63kyxbhdaz6izprg8wryvscmvfjii50xi1v5pxlf74x2pkxs8k"; + }; - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0q2qzl84ifnhcn1qbq38fdpj8ry748h6dlzp2mdpkslsh8mc46as"; - } - else - throw "Signal for Desktop is not currently supported on ${stdenv.system}"; + phases = [ "unpackPhase" "installPhase" ]; - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ dpkg ]; - unpackPhase = "dpkg-deb -x $src ."; - installPhase = '' - mkdir -p $out - cp -R opt $out + nativeBuildInputs = [ dpkg wrapGAppsHook ]; - mv ./usr/share $out/share - mv $out/opt/Signal $out/libexec - rmdir $out/opt + unpackPhase = "dpkg-deb -x $src ."; - chmod -R g-w $out + installPhase = '' + mkdir -p $out + cp -R opt $out - # Patch signal - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop + mv ./usr/share $out/share + mv $out/opt/Signal $out/libexec + rmdir $out/opt - # Symlink to bin - mkdir -p $out/bin - ln -s $out/libexec/signal-desktop $out/bin/signal-desktop + chmod -R g-w $out - # Fix the desktop link - substituteInPlace $out/share/applications/signal-desktop.desktop \ - --replace /opt/Signal/signal-desktop $out/bin/signal-desktop - ''; + # Patch signal + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop + wrapProgram $out/libexec/signal-desktop \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + ${customLanguageWrapperArgs} \ + "''${gappsWrapperArgs[@]}" + + # Symlink to bin + mkdir -p $out/bin + ln -s $out/libexec/signal-desktop $out/bin/signal-desktop - meta = { - description = "Signal Private Messenger for the Desktop."; - homepage = https://signal.org/; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.ixmatus ]; - platforms = [ - "x86_64-linux" - ]; - }; - } + # Fix the desktop link + substituteInPlace $out/share/applications/signal-desktop.desktop \ + --replace /opt/Signal/signal-desktop $out/bin/signal-desktop + ''; + + meta = { + description = "Private, simple, and secure messenger"; + longDescription = '' + Signal Desktop is an Electron application that links with your + "Signal Android" or "Signal iOS" app. + ''; + homepage = https://signal.org/; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ixmatus primeos ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index dca7d1257f651b20fa1399fd774df5eb6269a737..1219440bf8335fc7377fe5c8d6e59e719c034771 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - configureFlags = "--with-ncurses=${ncurses.dev}"; + configureFlags = [ "--with-ncurses=${ncurses.dev}" ]; preConfigure = stdenv.lib.optionalString enablePlugin '' configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix index 713aa8f03744c6238dc365e1c8d3fd5ed94004b2..5fcee73c0f909235e3c44519ae250e1f178d9719 100644 --- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "skype-call-recorder-0.8"; src = fetchurl { - url = "http://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz"; + url = "https://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz"; sha256 = "1iijkhq3aj9gr3bx6zl8ryvzkqcdhsm9yisimakwq0lnw0lgf5di"; }; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index fc8a601f1bea33d0a88b2aff4b17e2a9e43cfa38..d728c8d95cca6e226b008bd9217fa9d7496bd67b 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, dpkg, makeWrapper -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2 -, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, systemd, xorg }: +{ stdenv, fetchurl, dpkg +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3 +, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg }: let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.18.0.6"; + version = "8.28.0.41"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -23,19 +23,18 @@ let libsecret gnome2.GConf - gnome2.gdk_pixbuf - gnome2.gtk - gnome2.pango + gdk_pixbuf + gtk3 - gnome2.gnome-keyring + gnome3.gnome-keyring libnotify libpulseaudio nspr nss + pango stdenv.cc.cc systemd - libstdcxx5 libv4l xorg.libxkbfile @@ -57,7 +56,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "193icz1s385d25qzm5vx58h66m4hfwwmkavn0p3w6631gj617hig"; + sha256 = "1kydf71qbz35dx4674h3nxfx8a88k620217906i54ic4qq2mgy2x"; } else throw "Skype for linux is not supported on ${stdenv.system}"; @@ -69,7 +68,12 @@ in stdenv.mkDerivation { inherit src; - buildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ + wrapGAppsHook + glib # For setup hook populating GSETTINGS_SCHEMA_PATH + ]; + + buildInputs = [ dpkg ]; unpackPhase = "true"; installPhase = '' @@ -79,6 +83,8 @@ in stdenv.mkDerivation { rm -rf $out/opt $out/usr rm $out/bin/skypeforlinux + ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" + # Otherwise it looks "suspicious" chmod -R g-w $out ''; @@ -89,8 +95,6 @@ in stdenv.mkDerivation { patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true done - ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" - # Fix the desktop link substituteInPlace $out/share/applications/skypeforlinux.desktop \ --replace /usr/bin/ $out/bin/ \ diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index b1339f6a6948ccdc7a55a4f3aa1285f286dbd556..bcf887808750907a801b3abce580b53df7fe32cb 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, dpkg +{ stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }: +, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango +, systemd, xorg }: let - version = "3.1.0"; + version = "3.2.1"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -18,9 +19,9 @@ let freetype glib gnome2.GConf - gnome2.gdk_pixbuf - gnome2.gtk - gnome2.pango + gdk_pixbuf + gtk3 + pango libnotify libxcb nspr @@ -46,7 +47,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1y8xxfpqvz4q6y1zkna4cp3rqi7p03w5xgr8h1cmym8z66bj7dq3"; + sha256 = "095dpkwvvnwlxsglyg6wi9126wpalzi736b6g6j3bd6d93z9afah"; } else throw "Slack is not supported on ${stdenv.system}"; @@ -56,7 +57,13 @@ in stdenv.mkDerivation { inherit src; - buildInputs = [ dpkg ]; + buildInputs = [ + dpkg + gtk3 # needed for GSETTINGS_SCHEMAS_PATH + ]; + + nativeBuildInputs = [ makeWrapper ]; + unpackPhase = "true"; buildCommand = '' mkdir -p $out @@ -72,9 +79,10 @@ in stdenv.mkDerivation { patchelf --set-rpath ${rpath}:$out/lib/slack $file || true done - # Fix the symlink + # Replace the broken bin/slack symlink with a startup wrapper rm $out/bin/slack - ln -s $out/lib/slack/slack $out/bin/slack + makeWrapper $out/lib/slack/slack $out/bin/slack \ + --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 0bcf3493d29eefde6b26247f576ff346ae466f8a..9df816dd8907f747255349fe1aea1fd7f3d6af05 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -33,12 +33,12 @@ let ] + ":${stdenv.cc.cc.lib}/lib64"; in stdenv.mkDerivation rec { - version = "1.8.18"; + version = "1.17.82"; name = "stride-${version}"; src = fetchurl { url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb"; - sha256 = "0hpj3i3xbvckxm7fphqqb3scb31w2cg4riwp593y0gnbivpc0hym"; + sha256 = "0lx61gdhw0kv4f9fwbfg69yq52dsp4db7c4li25d6wn11qanzqhy"; }; dontBuild = true; diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e3b3d71918924c2c2c9b464ff167e052fd58b7ed --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, pkgconfig, qttools, scons +, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 +, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib +}: + +let + _scons = "scons -j$NIX_BUILD_CORES"; +in stdenv.mkDerivation rec { + name = "swift-im-${version}"; + version = "4.0.2"; + + src = fetchurl { + url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; + sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; + }; + + patches = [ ./scons.patch ]; + + nativeBuildInputs = [ pkgconfig qttools scons ]; + + buildInputs = [ + GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2 + lua miniupnpc openssl qtbase qtmultimedia qtsvg qtwebkit qtx11extras zlib + ]; + + propagatedUserEnvPkgs = [ GConf ]; + + NIX_CFLAGS_COMPILE = [ + "-I${libxml2.dev}/include/libxml2" + "-I${miniupnpc}/include/miniupnpc" + ]; + + buildPhase = '' + ${_scons} Swift + ''; + + installPhase = '' + ${_scons} SWIFT_INSTALLDIR=$out $out + ''; + + meta = with stdenv.lib; { + homepage = https://swift.im/; + description = "Qt XMPP client"; + license = licenses.gpl3; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch new file mode 100644 index 0000000000000000000000000000000000000000..c63b05d7acb1a0e03b40c43fb5188fbbd88f0fec --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch @@ -0,0 +1,53 @@ +diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot +index 40f242513..53e1ff26a 100644 +--- a/BuildTools/SCons/SConscript.boot ++++ b/BuildTools/SCons/SConscript.boot +@@ -508,6 +508,7 @@ if env.get("distcc", False) : + if var.startswith("DISTCC_") : + env["ENV"][var] = os.environ[var] + ++env["ENV"] = os.environ + conf_env = env.Clone() + + Export("env") +diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct +index 70bffbcfe..fef281899 100644 +--- a/BuildTools/SCons/SConstruct ++++ b/BuildTools/SCons/SConstruct +@@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"] + gconf_env = conf_env.Clone() + conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG}) + if conf.CheckPKG("gconf-2.0") : +- gconf_bare_env = Environment() ++ gconf_bare_env = Environment(ENV = os.environ) + gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0') + if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) : + gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]] +@@ -634,9 +634,9 @@ hunspell_env.MergeFlags(hunspell_flags) + env["HAVE_HUNSPELL"] = 0; + if env.get("hunspell_enable", False) : + hunspell_conf = Configure(hunspell_env) +- if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell") : ++ if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell-1.6") : + env["HAVE_HUNSPELL"] = 1 +- hunspell_flags["LIBS"] = ["hunspell"] ++ hunspell_flags["LIBS"] = ["hunspell-1.6"] + env["HUNSPELL_FLAGS"] = hunspell_flags + hunspell_conf.Finish() + +diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py +index 89f8963dc..b8559f7a6 100644 +--- a/BuildTools/SCons/Tools/textfile.py ++++ b/BuildTools/SCons/Tools/textfile.py +@@ -113,7 +113,10 @@ def _action(target, source, env): + lsep = None + for s in source: + if lsep: fd.write(lsep) +- fd.write(_do_subst(s, subs)) ++ b = _do_subst(s, subs) ++ if isinstance(b, unicode): ++ b = b.encode('UTF-8') ++ fd.write(b) + lsep = linesep + fd.close() + diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index ea2030e964b9aac689915b910f616d6b48445527..7a50536cc0ff082cbc4965de4377de2bcbbe8763 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { name = "teamspeak-client-${version}"; - version = "3.1.8"; + version = "3.1.10"; src = fetchurl { urls = [ @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run" ]; sha256 = if stdenv.is64bit - then "0yav71sfklqg2k3ayd0bllsixd486l0587s5ygjlc9gnchw3zg6z" - else "1agf6jf5hkyxazxqcnvcjfb263p5532ahi7h4rkifnnvqay36v5i"; + then "17gylj5pxba14c1c98b5rdyyb87c58z8l8yrd1iw5k293wf7iwv3" + else "1bkn3ykrc73wr02qaqwpr4garlqm3424y3dm2fjx6lqcfzm3ms2k"; }; # grab the plugin sdk for the desktop icon @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { rm *.so.* *.so rm QtWebEngineProcess rm qt.conf + rm -r platforms # contains libqxcb.so # Install files. mkdir -p $out/lib/teamspeak @@ -91,7 +92,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ts3client \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \ + --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \ --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index df0b6f39ca57d1cde73f686f6647af9ef2ff3fd3..5d8e2c52c21858cb65e22df9e3097b81adf9e48c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,14 +1,14 @@ -{ qt5, stdenv }: +{ qt5 }: let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.2.15"; - sha256Hash = "18srw7g8h5zmc0plzqd03aijaylrsfaybraw97b1w9hj4lf2bl92"; + version = "1.3.14"; + sha256Hash = "107m9iqw78b691pcq65s3m3zhamn8slh0wiyipwbbp0w13rqna3v"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "310557"; - archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk"; + archPatchesRevision = "359861"; + archPatchesHash = "15xybfs9k6dww747if8z6m9sh7anvqi76zsx2gxyna2j1z36i0r0"; }; in { stable = mkTelegram stableVersion; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..1c79840d626075bdcb8b6716e1c98d04f99adcde --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch @@ -0,0 +1,68 @@ +Date: Tue, 17 Jul 2018 20:29:49 +0200 + +--- + Telegram/SourceFiles/export/data/export_data_types.cpp | 9 ++++++--- + Telegram/SourceFiles/export/export_api_wrap.cpp | 6 ++++-- + 2 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp +index f835dc2f9..e811c27e8 100644 +--- a/Telegram/SourceFiles/export/data/export_data_types.cpp ++++ b/Telegram/SourceFiles/export/data/export_data_types.cpp +@@ -221,7 +221,8 @@ Image ParseMaxImage( + result.width = data.vw.v; + result.height = data.vh.v; + result.file.location = ParseLocation(data.vlocation); +- if constexpr (MTPDphotoCachedSize::Is()) { ++ constexpr bool condition = MTPDphotoCachedSize::Is(); ++ if constexpr (condition) { + result.file.content = data.vbytes.v; + result.file.size = result.file.content.size(); + } else { +@@ -409,7 +410,8 @@ Document ParseDocument( + result.width = data.vw.v; + result.height = data.vh.v; + result.file.location = ParseLocation(data.vlocation); +- if constexpr (MTPDphotoCachedSize::Is()) { ++ constexpr bool condition = MTPDphotoCachedSize::Is(); ++ if constexpr (condition) { + result.file.content = data.vbytes.v; + result.file.size = result.file.content.size(); + } else { +@@ -1017,7 +1019,8 @@ Message ParseMessage( + auto result = Message(); + data.match([&](const auto &data) { + result.id = data.vid.v; +- if constexpr (!MTPDmessageEmpty::Is()) { ++ constexpr bool condition = !MTPDmessageEmpty::Is(); ++ if constexpr (condition) { + result.toId = ParsePeerId(data.vto_id); + const auto peerId = (!data.is_out() + && data.has_from_id() +diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp +index b618937f6..bb98647dd 100644 +--- a/Telegram/SourceFiles/export/export_api_wrap.cpp ++++ b/Telegram/SourceFiles/export/export_api_wrap.cpp +@@ -709,7 +709,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { + Expects(_userpicsProcess != nullptr); + + result.match([&](const auto &data) { +- if constexpr (MTPDphotos_photos::Is()) { ++ constexpr bool condition = MTPDphotos_photos::Is(); ++ if constexpr (condition) { + _userpicsProcess->lastSlice = true; + } + loadUserpicsFiles(Data::ParseUserpicsSlice( +@@ -1141,7 +1142,8 @@ void ApiWrap::requestMessagesSlice() { + result.match([&](const MTPDmessages_messagesNotModified &data) { + error("Unexpected messagesNotModified received."); + }, [&](const auto &data) { +- if constexpr (MTPDmessages_messages::Is()) { ++ constexpr bool condition = MTPDmessages_messages::Is(); ++ if constexpr (condition) { + _chatProcess->lastSlice = true; + } + loadMessagesFiles(Data::ParseMessagesSlice( +-- +2.16.3 + diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 2588340de1deb8ca0e812e0a0395a5a43baaba7b..2d9a9d10aed95664f1e38b57d90a592e36d46f15 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -28,7 +28,10 @@ mkDerivation rec { }; # TODO: libtgvoip.patch no-gtk2.patch - patches = [ "${archPatches}/tdesktop.patch" ]; + patches = [ "${archPatches}/tdesktop.patch" ] + # TODO: Only required to work around a compiler bug. + # This should be fixed in GCC 7.3.1 (or later?) + ++ [ ./fix-internal-compiler-error.patch ]; postPatch = '' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ @@ -90,6 +93,10 @@ mkDerivation rec { sed -i Telegram/gyp/qt_rcc.gypi \ -e "s,/usr/bin/rcc,rcc,g" + # Build system assumes x86, but it works fine on non-x86 if we patch this one flag out + sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \ + -e "/-msse2/d" + gyp \ -Dbuild_defines=${GYP_DEFINES} \ -Gconfig=Release \ @@ -114,7 +121,7 @@ mkDerivation rec { install -m444 "$src/lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop" sed "s,/usr/bin,$out/bin,g" $archPatches/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" + install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram.png" done ''; @@ -133,7 +140,7 @@ mkDerivation rec { description = "Telegram Desktop messaging app " + (if stable then "(stable version)" else "(pre-release)"); license = licenses.gpl3; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; homepage = https://desktop.telegram.org/; maintainers = with maintainers; [ primeos abbradar garbas ]; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 2d880bef753e51682c13326a7c884cbd388adf0e..a0cc73da46d86895754a529650015ef6822d9fa5 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon +{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { name = "telepathy-gabble-0.18.4"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz"; sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; nativeBuildInputs = [ pkgconfig libxslt ]; - buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ] - ++ stdenv.lib.optional doCheck dbus_daemon; + buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + checkInputs = [ dbus.daemon ]; + + configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; enableParallelBuilding = true; doCheck = true; @@ -22,6 +23,6 @@ stdenv.mkDerivation rec { homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/; description = "Jabber/XMPP connection manager for the Telepathy framework"; license = licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index a1669183bb3b7302d28f062664e001bca35dd240..769e639314e0672c140fa6246593a0a6626e96eb 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "${pname}-0.8.0"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "A Telepathy connection manager based on libpurple"; - platforms = stdenv.lib.platforms.gnu; # Random choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # Random choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 7894554eee4f80070170d491dcc1fb2beb028ce6..4607961cdf08bb8f65865bb79b34baaa85d3edce 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "IRC connection manager for the Telepathy framework"; license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 111970ab71126d77fe8c326fa50af93dd54d6572..f6e3baadb4e8aa3fe0e73f792ca41fc807d435e5 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig -, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }: +, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus }: stdenv.mkDerivation rec { project = "telepathy-logger"; name = "${project}-0.8.2"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; - sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl"; + url = "https://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; + sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; }; nativeBuildInputs = [ @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib - dbus_libs telepathy-glib.python + dbus telepathy-glib.python ]; - configureFlags = "--enable-call"; + configureFlags = [ "--enable-call" ]; preFixup = '' wrapProgram "$out/libexec/telepathy-logger" \ @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = https://telepathy.freedesktop.org/components/telepathy-logger/; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.gnu; # Arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 18b3bb06e98fee0ad44933cae4d12abd63e9e274..7d68f66afc793aa460b82924e0077e3e16f0e51d 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "telepathy-mission-control"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index e060eaabf2819069ef49ed9016779e5647bd7142..68c81d380782fa98681946594336eac0ff1b462f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "${pname}-0.8.1"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh"; }; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libxslt pkgconfigUpstream ]; - configureFlags = "--disable-avahi-tests"; + configureFlags = [ "--disable-avahi-tests" ]; meta = with stdenv.lib; { description = "Link-local XMPP connection manager for Telepathy"; - platforms = platforms.gnu; # Random choice + platforms = platforms.gnu ++ platforms.linux; # Random choice maintainers = [ maintainers.lethalman ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index e2e25be49f23a55cedaab35f282055c10cdf364a..646b41cfe75a3f91580c8d1c34f380e426b08cdc 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "toxic-${version}"; - version = "0.7.2"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "1kws6bx5va1wc0k6pqihrla91vicxk4zqghvxiylgfbjr1jnkvwc"; + sha256 = "0fwmk945nip98m3md58y3ibjmzfq25hns3xf0bmbc6fjpww8d5p5"; }; makeFlags = [ "PREFIX=$(out)"]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk_pixbuf libnotify - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut libqrencode ]; nativeBuildInputs = [ pkgconfig libconfig ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reference CLI for Tox"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 9c208dd52a83ff837d93ef3ada2b83f9557420d1..531ca5cbadc60b77006e60f75c6ac730ad8c10f7 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l -, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }: +{ stdenv, lib, fetchFromGitHub, check, cmake, pkgconfig +, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l +, libXrender, fontconfig, libXext, libXft, libsodium, libopus }: stdenv.mkDerivation rec { name = "utox-${version}"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828"; + sha256 = "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar"; + fetchSubmodules = true; }; buildInputs = [ @@ -20,16 +22,21 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake git pkgconfig check + cmake pkgconfig ]; cmakeFlags = [ - "-DENABLE_UPDATER=OFF" - ] ++ stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; - - doCheck = true; + "-DENABLE_AUTOUPDATE=OFF" + "-DENABLE_TESTS=${if doCheck then "ON" else "OFF"}" + ]; - checkTarget = "test"; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + checkInputs = [ check ]; + checkPhase = '' + runHook preCheck + ctest -VV + runHook postCheck + ''; meta = with stdenv.lib; { description = "Lightweight Tox client"; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 9ed954cc7ec2ccf996dfb0865aaf54724b9220b0..9d5d5c1b80fc8031cfdec333e7d21d669c06853d 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, fetchFromGitHub , qt4, qmake4Hook, openssl , xproto, libX11, libXScrnSaver, scrnsaverproto , xz, zlib diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 3c164820019b6c4b396bf343e75e8c20f81cf793..d7c70232b0adc8789ef162b43381d6d7d617e5b1 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -3,14 +3,12 @@ libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: -assert stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { name = "viber-${version}"; version = "7.0.0.1035"; src = fetchurl { - url = "http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; sha256 = "06mp2wvqx4y6rd5gs2mh442qcykjrrvwnkhlpx0lara331i2p0lj"; }; @@ -99,7 +97,7 @@ stdenv.mkDerivation rec { homepage = http://www.viber.com; description = "An instant messaging and Voice over IP (VoIP) app"; license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ jagajaga ]; }; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ce73acf8d596daca2b89b1208642aadb1191fcbb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook +, xorg, gtk2, gtk3 , gnome2, gnome3, nss, alsaLib, udev, libnotify, xdg_utils }: + +with stdenv.lib; + +let + bits = "x86_64"; + + version = "3.14.10"; + + desktopItem = makeDesktopItem rec { + name = "Wavebox"; + exec = name; + icon = "wavebox"; + desktopName = name; + genericName = name; + categories = "Network;"; + }; + + tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; + +in stdenv.mkDerivation rec { + name = "wavebox-${version}"; + src = fetchurl { + url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}"; + sha256 = "06ce349f561c6122b2d326e9a1363fb358e263c81a7d1d08723ec567235bbd74"; + }; + + # don't remove runtime deps + dontPatchELF = true; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + buildInputs = with xorg; [ + libXScrnSaver libXtst + ] ++ [ + gtk3 nss gtk2 alsaLib gnome2.GConf + ]; + + runtimeDependencies = [ udev.lib libnotify ]; + + installPhase = '' + mkdir -p $out/bin $out/opt/wavebox + cp -r * $out/opt/wavebox + + # provide desktop item and icon + mkdir -p $out/share/applications $out/share/pixmaps + ln -s ${desktopItem}/share/applications/* $out/share/applications + ln -s $out/opt/wavebox/Wavebox-linux-x64/wavebox_icon.png $out/share/pixmaps/wavebox.png + ''; + + postFixup = '' + paxmark m $out/opt/wavebox/Wavebox + makeWrapper $out/opt/wavebox/Wavebox $out/bin/wavebox \ + --prefix PATH : ${xdg_utils}/bin + ''; + + meta = with stdenv.lib; { + description = "Wavebox messaging application"; + homepage = https://wavebox.io; + license = licenses.mpl20; + maintainers = with maintainers; [ rawkode ]; + platforms = ["x86_64-linux"]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix index f1338bc0df3532fbab6fdadd91053055fce20c08..4a8ffaaa261a1d4acb2ecaa901dd9ceaec85f605 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix @@ -1,12 +1,12 @@ { stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: stdenv.mkDerivation { - name = "weechat-matrix-bridge-2017-03-28"; + name = "weechat-matrix-bridge-2018-05-29"; src = fetchFromGitHub { owner = "torhve"; repo = "weechat-matrix-protocol-script"; - rev = "0052e7275ae149dc5241226391c9b1889ecc3c6b"; - sha256 = "14x58jd44g08sfnp1gx74gq2na527v5jjpsvv1xx4b8mixwy20hi"; + rev = "ace3fefc0e35a627f8a528032df2e3111e41eb1b"; + sha256 = "1snf8vn5n9wzrnqnvdrcli4199s5p114jbjlgrj5c27i53173wqw"; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix index 8c7e80b3ff8d69b688d1eda5b4c654694aaa8753..4b92d1212c55a018b74f5b834e3dffc2f01a2695 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xmpppy }: +{ stdenv, fetchFromGitHub, xmpppy, pydns, substituteAll, buildEnv }: stdenv.mkDerivation { name = "weechat-jabber-2017-08-30"; @@ -15,15 +15,14 @@ stdenv.mkDerivation { cp jabber.py $out/share/jabber.py ''; - buildInputs = [ xmpppy ]; - - postPatch = '' - substituteInPlace jabber.py \ - --replace "__NIX_OUTPUT__" "${xmpppy}/lib/python2.7/site-packages" - ''; - patches = [ - ./libpath.patch + (substituteAll { + src = ./libpath.patch; + env = "${buildEnv { + name = "weechat-xmpp-env"; + paths = [ pydns xmpppy ]; + }}/lib/python2.7/site-packages"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch index d3faab33a8e5dcdeceb91a99881dcfb5b5a74a17..372c83944a271917d31c62c7e53441c62b7f07b4 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch @@ -8,7 +8,7 @@ index 27006a3..e53c2c0 100644 +import sys + -+sys.path.append('__NIX_OUTPUT__') ++sys.path.append('@env@') + + import_ok = True diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0745836271ae5922cef32429364c7748ad76c1d4 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -0,0 +1,104 @@ +{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome2, gtk2, atk, cairo, pango, gdk_pixbuf, glib +, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage +, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver +, nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell +}: +let + rpath = lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gtk2 + pango + hunspell + libnotify + libX11 + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXScrnSaver + libXtst + nspr + nss + stdenv.cc.cc + udev + xdg_utils + xorg.libxcb + ]; + + version = "3.2.2840"; + + plat = { + "i686-linux" = "i386"; + "x86_64-linux" = "amd64"; + }.${stdenv.system}; + + sha256 = { + "i686-linux" = "071ddh2d8wmiybwafwyb97962zj358l0fq7g2r44231653sgybvq"; + "x86_64-linux" = "0qp9ms94smnm7k47b0n0jdzvnm1b7gj25hyinsfc6lghrb6jqw3r"; + }.${stdenv.system}; + +in + stdenv.mkDerivation rec { + name = "wire-desktop-${version}"; + + src = fetchurl { + url = "https://wire-app.wire.com/linux/debian/pool/main/wire_${version}_${plat}.deb"; + inherit sha256; + }; + + desktopItem = makeDesktopItem { + name = "wire-desktop"; + exec = "wire-desktop %U"; + icon = "wire-desktop"; + comment = "Secure messenger for everyone"; + desktopName = "Wire Desktop"; + genericName = "Secure messenger"; + categories = "Network;InstantMessaging;Chat;VideoConference"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ dpkg ]; + unpackPhase = "dpkg-deb -x $src ."; + installPhase = '' + mkdir -p $out + cp -R opt $out + cp -R usr/share $out/share + + chmod -R g-w $out + + # Patch signal + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}:$out/opt/wire-desktop" \ + "$out/opt/wire-desktop/wire-desktop" + + # Symlink to bin + mkdir -p $out/bin + ln -s "$out/opt/wire-desktop/wire-desktop" $out/bin/wire-desktop + + # Desktop file + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + + meta = { + description = "A modern, secure messenger"; + homepage = https://wire.com/; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ worldofpeace ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + } diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 03b4b980929c807b80444960c28349d977239e5c..afc6f03edb4a3c42e0936b2a827a0dc6b729a0f5 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,95 +1,85 @@ -{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem, - alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, - libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: +{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem, autoPatchelfHook, env +# Dynamic libraries +, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative +, qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg +, qttools, qtwayland, qtwebchannel, qtwebengine +# Runtime +, coreutils, libjpeg_turbo, pciutils, procps, utillinux +, pulseaudioSupport ? true, libpulseaudio ? null +}: + +assert pulseaudioSupport -> libpulseaudio != null; let + inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.0.106600.0904"; + version = "2.3.128305.0716"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1dcr0rqgjingjqbqv37hqjhhwy8axnjyirrnmjk44b5xnh239w9s"; + sha256 = "1jpw5sclr5bhif559hmnyiggjh6gkm1smiw34y3ad4k8xhag9dkh"; }; }; + qtDeps = [ + qtbase qtdeclarative qtlocation qtquickcontrols qtquickcontrols2 qtscript + qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland + ]; + + qtEnv = env "zoom-us-qt-${qtbase.version}" qtDeps; + in stdenv.mkDerivation { name = "zoom-us-${version}"; src = srcs.${system}; - buildInputs = [ makeWrapper ]; - - libPath = stdenv.lib.makeLibraryPath [ - alsaLib - dbus - glib - gstreamer - fontconfig - freetype - libpulseaudio - libxml2 - libxslt - nspr - nss - sqlite - utillinux - zlib - udev - expat - - xorg.libX11 - xorg.libSM - xorg.libICE - xorg.libxcb - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.libXcursor - xorg.libXext - xorg.libXfixes - xorg.libXdamage - xorg.libXtst - xorg.libxshmfence - xorg.libXi - xorg.libXrender - xorg.libXcomposite - xorg.libXScrnSaver - xorg.libXrandr - - stdenv.cc.cc - ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + buildInputs = [ + dbus glib libGL libX11 libXfixes libuuid libxcb qtEnv libjpeg_turbo + ] ++ qtDeps; + + runtimeDependencies = optional pulseaudioSupport libpulseaudio; + + # Don't remove runtimeDependencies from RPATH via patchelf --shrink-rpath + dontPatchELF = true; - installPhase = '' - runHook preInstall - - packagePath=$out/share/zoom-us - mkdir -p $packagePath - mkdir -p $out/bin - cp -ar * $packagePath - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zoom - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/QtWebEngineProcess - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/qtdiag - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zopen - # included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53 - # it works for me without it, but, well... - paxmark m $packagePath/zoom - #paxmark m $packagePath/QtWebEngineProcess # is this what dtzWill talked about? - - # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it - makeWrapper $packagePath/zoom $out/bin/zoom-us \ - --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ - --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ - --set QT_PLUGIN_PATH "$packagePath/platforms" \ - --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" - - cat > $packagePath/qt.conf < !client && !daemon; assert client || daemon -> !monolithic; assert !buildClient -> !withKDE; # KDE is used by the client only @@ -73,6 +71,8 @@ in with stdenv; mkDerivation rec { --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; + patches = [ ./qt5_11.patch ]; + meta = with stdenv.lib; { homepage = https://quassel-irc.org/; description = "Qt/KDE distributed IRC client suppporting a remote daemon"; diff --git a/pkgs/applications/networking/irc/quassel/qt5_11.patch b/pkgs/applications/networking/irc/quassel/qt5_11.patch new file mode 100644 index 0000000000000000000000000000000000000000..45e43d7f96beb129aa50d61dfcdc274ecc0984d8 --- /dev/null +++ b/pkgs/applications/networking/irc/quassel/qt5_11.patch @@ -0,0 +1,72 @@ +From 92f4dca367c3a6f0536a1e0f3fbb44bb6ed4da62 Mon Sep 17 00:00:00 2001 +From: Manuel Nickschas +Date: Thu, 3 May 2018 23:19:34 +0200 +Subject: [PATCH] cmake: Fix build with Qt 5.11 + +Qt 5.11 removes the qt5_use_modules function, so add a copy. If +present, the Qt-provided function will be used instead. + +Closes GH-355. +--- + cmake/QuasselMacros.cmake | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake +index 652c0042..d77ba1cf 100644 +--- a/cmake/QuasselMacros.cmake ++++ b/cmake/QuasselMacros.cmake +@@ -5,6 +5,9 @@ + # The qt4_use_modules function was taken from CMake's Qt4Macros.cmake: + # (C) 2005-2009 Kitware, Inc. + # ++# The qt5_use_modules function was taken from Qt 5.10.1 (and modified): ++# (C) 2005-2011 Kitware, Inc. ++# + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type) + endforeach() + endfunction() + ++# Qt 5.11 removed the qt5_use_modules function, so we need to provide it until we can switch to a modern CMake version. ++# If present, the Qt-provided version will be used automatically instead. ++function(qt5_use_modules _target _link_type) ++ if (NOT TARGET ${_target}) ++ message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.") ++ endif() ++ if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" ) ++ set(_qt5_modules ${ARGN}) ++ set(_qt5_link_type ${_link_type}) ++ else() ++ set(_qt5_modules ${_link_type} ${ARGN}) ++ endif() ++ ++ if ("${_qt5_modules}" STREQUAL "") ++ message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.") ++ endif() ++ foreach(_module ${_qt5_modules}) ++ if (NOT Qt5${_module}_FOUND) ++ find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH) ++ if (NOT Qt5${_module}_FOUND) ++ message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.") ++ endif() ++ endif() ++ target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES}) ++ set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS}) ++ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS}) ++ if (Qt5_POSITION_INDEPENDENT_CODE ++ AND (CMAKE_VERSION VERSION_LESS 2.8.12 ++ AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" ++ OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))) ++ set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE}) ++ endif() ++ endforeach() ++endfunction() ++ + # Some wrappers for simplifying dual-Qt support + + function(qt_use_modules) +-- +2.16.2 + diff --git a/pkgs/applications/networking/irc/quassel/source.nix b/pkgs/applications/networking/irc/quassel/source.nix index f3941ee976e4b27dc542b4d15d02f2b887b6668a..20daba788997e4fb13d0f4bf422128b0e5df81d8 100644 --- a/pkgs/applications/networking/irc/quassel/source.nix +++ b/pkgs/applications/networking/irc/quassel/source.nix @@ -1,9 +1,9 @@ { fetchurl }: rec { - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { url = "https://github.com/quassel/quassel/archive/${version}.tar.gz"; - sha256 = "0q2qlhy1d6glw9pwxgcgwvspd1mkk3yi6m21dx9gnj86bxas2qs2"; + sha256 = "04f42x87a4wkj3va3wnmj2jl7ikqqa7d7nmypqpqwalzpzk7kxwv"; }; } diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 975715ed7fcd3802a7b1a46b08c048dc7610cd31..cf72bef62b1774a0435ee67fcb1c4fb44701c030 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; src = fetchurl { - url = "http://dl.suckless.org/tools/sic-${version}.tar.gz"; + url = "https://dl.suckless.org/tools/sic-${version}.tar.gz"; sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185"; }; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index b2ea28f0cf8579d55f90cebb4fb40ba57b1b6c82..16162435e09ab1a8887ee51cf8843a5a0a187ff5 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, lib +{ stdenv, fetchurl, lib , ncurses, openssl, aspell, gnutls , zlib, curl, pkgconfig, libgcrypt , cmake, makeWrapper, libobjc, libresolv, libiconv -, writeScriptBin, symlinkJoin # for withPlugins +, writeScriptBin # for withPlugins , asciidoctor # manpages , guileSupport ? true, guile , luaSupport ? true, lua5 @@ -15,7 +15,7 @@ , runCommand }: let - inherit (pythonPackages) python pycrypto pync; + inherit (pythonPackages) python; plugins = [ { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; } { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; } @@ -29,12 +29,12 @@ let weechat = assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.0"; + version = "2.1"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0jd1l67k2k44xmfv0a71im3j4v0gss3a6bd5s84nj3f7lqnfmqdn"; + sha256 = "0fq68wgynv2c3319gmzi0lz4ln4yrrk755y5mbrlr7fc1sx7ffd8"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; @@ -123,6 +123,7 @@ in if configure == null then weechat else ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} exec ${weechat}/bin/weechat "$@" '') // { + name = weechat.name; unwrapped = weechat; meta = weechat.meta; } diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index ec67321400dc6b8ecd141120d7f76bdef2867c39..2019d9930ef09fb27719936f863a5900bc42d6b1 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jmeter-${version}"; version = "4.0"; src = fetchurl { - url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; + url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; sha256 = "1dvngvi6j8qb6nmf5a3gpi5wxck4xisj41qkrj8sjwb1f8jq6nw4"; }; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 4bd0f2e73e6f45b27211190499b1ebf349e9cafb..0139a3f3a93d8df51130509048caa71cfe509d95 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt6 }: +{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt }: stdenv.mkDerivation rec { name = "linssid-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig qmake ]; - buildInputs = [ qtbase qtsvg boost qwt6 ]; + buildInputs = [ qtbase qtsvg boost qwt ]; patches = [ ./0001-unbundled-qwt.patch ]; diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index 3b45c2fd44569826cf8096600b515b4a573903f0..bb62014c77a447d00c948dda151ece6e7ed486bb 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos +{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos , openldap }: diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 610b16dab5bc5ba21b78d068799c321c5d58c0d5..0cb07b8ce7552cd5f443acfa105bf08c0bc7d4cd 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,24 +1,44 @@ -{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3 -, libsass, notmuch, boost, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk +, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable +, makeWrapper, python3, python3Packages +, vim ? vim_configurable.override { + features = "normal"; + gui = "auto"; + } +}: stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.10.2"; + version = "0.13"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "0y1i40xbjjvnylqpdkvj0m9fl6f5k9zk1z4pqg3vhj8x1ys8am1c"; + sha256 = "105x5g44hng3fi03h67j3an53088148jbq8726nmcp0zs0cy9gac"; }; - nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas - notmuch boost gnome3.gsettings-desktop-schemas ]; + buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas + python3 python3Packages.pygobject3 + notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme + glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); - buildPhase = "scons --propagate-environment --prefix=$out build"; - installPhase = "scons --propagate-environment --prefix=$out install"; + patches = [ + # TODO: remove when https://github.com/astroidmail/astroid/pull/531 + # is released + ./run_tests.diff + ]; + + postPatch = '' + sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc + sed -i "s~ -geom 10x10~~g" src/config.cc + ''; + + postInstall = '' + wrapProgram "$out/bin/astroid" --set CHARSET=en_us.UTF-8 + ''; meta = with stdenv.lib; { homepage = https://astroidmail.github.io/; diff --git a/pkgs/applications/networking/mailreaders/astroid/run_tests.diff b/pkgs/applications/networking/mailreaders/astroid/run_tests.diff new file mode 100644 index 0000000000000000000000000000000000000000..21b466741ce1e55792ad3e6b136c9a346efb0421 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/astroid/run_tests.diff @@ -0,0 +1,10 @@ +diff --git a/tests/run_test.sh b/tests/run_test.sh +index f2ea7d7..927c61d 100755 +--- a/tests/run_test.sh ++++ b/tests/run_test.sh +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /usr/bin/env bash + # + # Set up environment and run test specified on command line + diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..571a48951477cbf17b567d4895b3e3b49298220d --- /dev/null +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls, + webkitgtk, libesmtp, openssl, libnotify, enchant, gpgme, + libcanberra-gtk3, libsecret, gtksourceview, gobjectIntrospection, + hicolor-icon-theme, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "balsa-${version}"; + version = "2.5.6"; + + src = fetchurl { + url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2"; + sha256 = "17k6wcsl8gki7cskr3hhmfj6n54rha8ca3b6fzd8blsl5shsankx"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + gobjectIntrospection + hicolor-icon-theme + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + gmime + gnutls + webkitgtk + openssl + libnotify + enchant + gpgme + libcanberra-gtk3 + gtksourceview + libsecret + libesmtp + ]; + + configureFlags = [ + "--with-canberra" + "--with-gpgme" + "--with-gtksourceview" + "--with-libsecret" + "--with-ssl" + "--with-unique" + "--without-gnome" + ]; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://pawsa.fedorapeople.org/balsa/; + description = "An e-mail client for GNOME"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 10daeeab8e13d92bda6c1cc6caa27f42271d8972..47cb83dee7667de4c8d98adb6e204046b268f235 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,16 +1,14 @@ -{ fetchurl, stdenv, wrapGAppsHook +{ fetchurl, stdenv, wrapGAppsHook, autoreconfHook , curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor-icon-theme , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap , perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2 +, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2 , glib-networking, gsettings-desktop-schemas, libSM, libytnef - # Build options # TODO: A flag to build the manual. # TODO: Plugins that complain about their missing dependencies, even when # provided: # gdata requires libgdata # geolocation requires libchamplain -# python requires python , enableLdap ? false , enableNetworkManager ? false , enablePgp ? true @@ -19,6 +17,7 @@ , enablePluginNotificationDialogs ? true , enablePluginNotificationSounds ? true , enablePluginPdf ? false +, enablePluginPython ? false , enablePluginRavatar ? false , enablePluginRssyl ? false , enablePluginSmime ? false @@ -32,27 +31,33 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "claws-mail-${version}"; - version = "3.16.0"; + version = "3.17.1"; src = fetchurl { url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "1awpr3s7n8bq8p3w10a4j6lg5bizjxyiqp4rqzc2j8cn7lyi64n2"; + sha256 = "1wknxbwyzm5xjh3cqmddcxmvp1rkp301qga5n5rgfi7vcd0myyvm"; }; outputs = [ "out" "dev" ]; patches = [ ./mime.patch ]; + preConfigure = '' + # autotools check tries to dlopen libpython as a requirement for the python plugin + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${python}/lib + ''; + postPatch = '' substituteInPlace src/procmime.c \ --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook python.pkgs.wrapPython ]; + propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; buildInputs = [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas hicolor-icon-theme - libetpan perl python glib-networking libSM libytnef + libetpan perl glib-networking libSM libytnef ] ++ optional enableSpellcheck enchant ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] @@ -77,6 +82,7 @@ stdenv.mkDerivation rec { ++ optional (!enablePluginArchive) "--disable-archive-plugin" ++ optional (!enablePluginFancy) "--disable-fancy-plugin" ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin" + ++ optional (!enablePluginPython) "--disable-python-plugin" ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin" ++ optional (!enablePluginRssyl) "--disable-rssyl-plugin" ++ optional (!enablePluginSmime) "--disable-smime-plugin" @@ -87,8 +93,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + pythonPath = with python.pkgs; [ pygobject2 pygtk ]; + preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share" --prefix PYTHONPATH : "$program_PYTHONPATH") ''; postInstall = '' @@ -98,7 +107,7 @@ stdenv.mkDerivation rec { meta = { description = "The user-friendly, lightweight, and fast email client"; - homepage = http://www.claws-mail.org/; + homepage = https://www.claws-mail.org/; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin ]; diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index cd4de0ecd56079bfdfcda69411138cd45f0e3170..390f68bd105f1e2786083b356a84c2904920accd 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, binutils, patchelf, makeWrapper, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, libudev }: +{ stdenv, fetchurl, binutils, patchelf, makeWrapper +, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype +, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }: stdenv.mkDerivation rec { name = "inboxer-${version}"; - version = "1.0.3"; + version = "1.1.2"; meta = with stdenv.lib; { description = "Unofficial, free and open-source Google Inbox Desktop App"; @@ -14,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; - sha256 = "1k2wgvs17lfxqmk0v7g8cf34h5ahr41vaibgb4a6ixay41hfx06d"; + sha256 = "100185j10dj044mg5p9xlq7fj7n7xki9qw5xn845dgq0dpj8rkrm"; }; unpackPhase = '' @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { expat stdenv.cc.cc.lib libpulseaudio - libudev + udev ]; in '' patchelf \ @@ -62,7 +64,7 @@ stdenv.mkDerivation rec { patchelf \ --set-rpath "$out/opt/Inboxer:${lpath}" \ $out/opt/Inboxer/libffmpeg.so - + patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/opt/Inboxer:${lpath}" \ @@ -70,7 +72,7 @@ stdenv.mkDerivation rec { wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}" ''; - + installPhase = '' mkdir -p $out/bin cp -R usr/share opt $out/ diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 75f34952394eb1462b75de46900cc7420a50963f..2b62db069bc9d5742dafd8fabea23febd31128da 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, gtk3, pythonPackages , gdk_pixbuf, libnotify, gst_all_1 -, libgnome-keyring3, networkmanager +, libgnome-keyring3 , wrapGAppsHook, gnome3 # otherwise passwords are stored unencrypted , withGnomeKeyring ? true diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 36dc94951d5c883499d9b5c489b7f460ccb53156..0f11d9a6df05a9d138a4f190744d73488c16c16d 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, makeWrapper, openssl, git }: +{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: python2Packages.buildPythonApplication rec { name = "mailpile-${version}"; diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index ff4507991e4043c18389ca67ae37ce8ee68240da..86f945f369a09814c01246c19f910ab14c1d8691 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.3.2"; + version = "0.4"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "0sgzcf7lpgdix7x4p6wp1jjv9h62rrkca6325c7a9j8r0dbg1fdg"; + sha256 = "15ac213a17mxni3bqvzxhiln65s4almrlmv72bbcgi7cymb303rp"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 487b2799b980c6140b68bb3683b17ad26f1124b1..6e2e8d58c6760bc83af7a30783be9342a679a1eb 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, writeScript, unzip, jre }: +{ stdenv, fetchurl, makeWrapper, unzip, jre }: let version = "1.9"; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 03bfc711c4308379694233ddcfccf6ed467ddf19..f2c097a43752a993bd063a81abc0bcb5e77ad9f1 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.9.4"; + version = "1.10.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "1pxmw5yyizb9bqbai6lihv6zxmw0znjfb60zaldwh6hc6lkbzlgl"; + sha256 = "182lkbkpd3q3l1x6bvyds90ycp38gyyxhf35ry0d3hwf2n1khjkk"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index d9c2a136adf6d3e566682574a5b417eafa849475..f082c241a64c1bbdff1fdc5b92c374601d9eebbd 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -15,14 +15,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20180323"; + version = "20180716"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0wxk1fqxk9pf2s43mw7diixv3hpwdry1cyr2xh119gqjc27lrc5w"; + sha256 = "0im2kkahkr04q04irvcimfawxi531ld6wrsa92r2m7l10gmijkl8"; }; buildInputs = [ @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { --replace /etc/mime.types ${mime-types}/etc/mime.types # The string conversion tests all fail with the first version of neomutt - # that has tests (20180223) as well as 20180323 so we disable them for now. + # that has tests (20180223) as well as 20180716 so we disable them for now. # I don't know if that is related to the tests or our build environment. # Try again with a later release. sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { postInstall = '' cp ${muttWrapper} $out/bin/mutt - wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/lib/neomutt" + wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt" ''; doCheck = true; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index a3de728ce4157d16ec99cc3b25d3554bbb105a55..9b259cad6d0b1258f5c3a9f4783dfe433e953580 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.26"; + version = "0.27"; name = "notmuch-${version}"; passthru = { @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "1pvn1n7giv8n3xlazi3wpscdqhd2yak0fgv68aj23myr5bnr9s6k"; + url = "https://notmuchmail.org/releases/${name}.tar.gz"; + sha256 = "0xh8vq2sa7r07xb3n13drc6gdiqhcgl0pj0za5xj43qkiwpikls0"; }; nativeBuildInputs = [ pkgconfig ]; @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { ++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies postPatch = '' + patchShebangs configure + find test/ -type f -exec \ sed -i \ -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index 766aab39ce307080f7f86275a49ec2ff632fbc53..3376eebe5dc93de2301c5ada91fca2efd16406ef 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -1,4 +1,4 @@ -{ dpkg, fetchurl, lib, pkgs, stdenv, config +{ dpkg, fetchurl, lib, pkgs, stdenv , alsaLib , atk , cairo @@ -13,7 +13,6 @@ , gdk_pixbuf , glib , gnome2 -, libgcrypt , libgnome-keyring , libnotify , makeWrapper @@ -82,8 +81,6 @@ stdenv.mkDerivation rec { ]; - buildInputs = [ gnome2.gnome-keyring ]; - nativeBuildInputs = [ makeWrapper ]; buildCommand = '' diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix index 728287f8c75ab20f0a930226ed595d71b2f3fd95..713f585d283c9b7bdfe297490c77a62542025594 100644 --- a/pkgs/applications/networking/mailreaders/realpine/default.nix +++ b/pkgs/applications/networking/mailreaders/realpine/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos +{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos , openldap }: # NOTE: Please check if any changes here are applicable to ../alpine/ as well diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index b7ac621eb6db8ef5739ee27a2f07b3ff86f07803..06777916b92af0ca906bc4e5eae1db2d85dcaa0c 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian -, pkgconfig, which }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "sup-0.22.1"; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index d58680d15d5a532729985a3e39f188dd84e1cfc2..70f74dff3097ffe42f47b5c44f6c3326a4d9e22b 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sylpheed-${version}"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { - url = "http://sylpheed.sraoss.jp/sylpheed/v3.6/${name}.tar.bz2"; - sha256 = "0idk9nz3d200l2bxc38vnxlx0wcslrvncy9lk50vz7dl8c5sg97b"; + url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz"; + sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 9dbc99cac7d0e091482bf72fa588439779aca279..b9b553f9447295b5f72ae524c3eddb55726e0561 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -7,7 +7,7 @@ , cups , curl , dbus-glib -, dbus_libs +, dbus , fontconfig , freetype , gdk_pixbuf @@ -43,8 +43,6 @@ , gnupg }: -assert stdenv.isLinux; - # imports `version` and `sources` with (import ./release_sources.nix); @@ -72,7 +70,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; + url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; inherit (source) sha512; }; @@ -88,7 +86,7 @@ stdenv.mkDerivation { cups curl dbus-glib - dbus_libs + dbus fontconfig freetype gdk_pixbuf diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 24b16744ff65dc8bb4040dd58c5e119abf1bf5cf..5097215d436667b06d39c5a5f3542d1efcca8551 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,585 @@ { - version = "52.7.0"; + version = "60.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ar/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ar/thunderbird-60.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "af887818b7859b8bfc87e0ac7ff26c1fbb98a50968d18d174bce37c2132a5957a8c5153f0364aa3ec0f636831313dd3bac6512dd6e7f932ed5cc99ed2016e9b5"; + sha512 = "fd37e00c8b50d1dc932295288ad2865358da2f37f5b170a3a7f75d929e78486165a24f1967defcb4032546a7f712cd6887c7cf47257a4a08685df85f9ecf81bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ast/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ast/thunderbird-60.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "dcf8ab98558b7d2b8e5d2a97406eb13cc93900fcd60502ea4d8469179d08c55d91e66c7b99a024fbc6705e339750b41d9537d4d81f53f8d1f83461b986a6487a"; + sha512 = "64a14f40678a64def00597eb1bd7cc0c9759b56da4e72bfe24c3d4e50ef92414bb18346b8ecc9c0a834a063a2a2fe7920b72c2ce59c7cb7ba67442f7e8842b13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/be/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/be/thunderbird-60.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "021f531995db9a0993e830fa8f1da6089d0703424dd8993c23e59939091f58c4baae5ecb6cf51770ff73743c227129ac3215ec46d7181d88cd52a39b2e0e41ee"; + sha512 = "6368f3693f0f54f4768d27a4b9f82015d4c789180db3d8ea5302053e2ff8d7bc5e50388b00b7b1d534c0145718255c84d43977361f5d8cff5f432a8336436e9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bg/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/bg/thunderbird-60.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a60f13e7b2760e19592e99eef1bc52593cabcf1b70b7803dd4262b2743e3c755cb4381ccaf1e75f41d4360897dcac3edd7e79648a6f4e81da4a1e83d67bb3ffe"; + sha512 = "b881105b39f5a3d66cf77105fb555af692477b387a4fe2c13c9c398968baa705cdf3753665b0e6d28bd8fdb21bc75e439672402dbe1185a9f8289b8236f505ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bn-BD/thunderbird-52.7.0.tar.bz2"; - locale = "bn-BD"; - arch = "linux-x86_64"; - sha512 = "a73074fa5dfaf121b8f12e86dfc29189e9700a71a868f68a70ccd17c47df3a8512700893f981e065c5c20f9432ca764f3c59d4726a2c6abf3fd25530eca0d9a5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/br/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/br/thunderbird-60.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "28f4bff69059dbd1077641e888b234b0db95feb11bcb1db1ed047f3ab12282b9f95138835cca5f7eeb87a15ec1057b60587cadcb5fd658fbbe4c556d7eeed47a"; + sha512 = "c45a3dfb8ae5564071c2e59a623263f995a83f9ac20c84345be47935a337b863be3d334b2e0f40767842e9a53cbb1eb00dd87645cb0b8a737efce15cd81b9336"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ca/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ca/thunderbird-60.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "a9e45eda2b36bb12321140854e685fe4e203c7f56c1c8184a776c38d984f8381c6553cb5f601677f8e0e74ad497a040a18f5f392b99bdbe9535e19aa9afdcb7c"; + sha512 = "aec05cd7e9a5f529408bca9691ef68bb384b23b9cd464c9342336b96da0afe20473121128861c20d55bc3c4f5c33f779fe892681270d5b26df6b64aa27c13511"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cs/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cs/thunderbird-60.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2c0f60ccc5c9a9fd66526af3aedbe2749f35a5fa7509c93b7b60d9babb1b4968eac6bff48d042ac8112793fe2825467de4d0efc42afda19547e8c6803b723119"; + sha512 = "e0286e388a1b9a273043bfbcfd2bdf9675bede43d6b3f364882a9f7a9bee1fccd76e5ada76aae309f961c3e0bcae6373cb40457a53d48a9ff37c9fb53245f889"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cy/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cy/thunderbird-60.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "611ffc3d156ce4cedec0679bd9af3e8376dca5b20af2457a75d83dac7c71640a23a6cd544c190551480d6b37bcb9a9ec91342c2bca95cf10acb642d067056a04"; + sha512 = "7f5f28836084132f044b3fcda749dec03fa6234a04eff73a8001f804c98be8df57eba564e864bf09a9938818bb86003d9fcf54cacba2d1efad7a330381e08b0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/da/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/da/thunderbird-60.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "0b858b5be09e038983a21715f58a215ea70fd811f7c8acd4ddb89611dd5590599339ab26913865b2ba75f4538cc95bd3e38e28646c281c041b0b08002aef033a"; + sha512 = "1b9b63abe185fc91ee2e0dea054bc5e94941bc2cdd59cd85c9997ef9d49eed0c93827265847a480845901af8b37e3547c9301896beb538aef724945bca2ed2b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/de/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/de/thunderbird-60.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "cfcdbaec0a026ab246d45e00232f5d5f3f240f4957bbe41d70cfb421be438cbf8986920784d4d0350a274284b39ec42c20d33883f3f7fabf3b51df3a062fac15"; + sha512 = "e499f327ed9f4536b7bd9659879b28a2282a6a2b9aeb4514b3a70f774d76427283379293d09e95271e54f7c68ab07beaa60e867936b9de8c09b600914d3e4156"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/dsb/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/dsb/thunderbird-60.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "52ef4b0dda8fe163675d46e7233b935b38a5899763012b0b9befb1ddd015f0a8d265de2adb4924856a4bc7753b3eaac2dc7861c5b75d8b231e667d29a583d673"; + sha512 = "d862020f5ae7c50560ba4c58d67af4c0e54622f826934b90887efcff5ae1c97126bbce0bd42f7e1c1215258b92db6a012b184a2106f4beed0d7e8c79b84bae54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/el/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/el/thunderbird-60.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ab92343651598eea5f8010829bde589eb88a795ad0a3d0dbd1a5889d162b966e0e9bdf7bd32f49c59eb49b29261a075da1f4e75de49f87aa3fbf95796281062a"; + sha512 = "88b98d3558400370b48f1e133147b8ba57fbb240ad6db1bbd79d7e0266c4a2814fc9cad5521ea8c0296b14857bd09cb4e8e0d86f625fc53d621008729f31e002"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-GB/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-GB/thunderbird-60.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "1b0e11a1f8daba6a57ac619d764a60e9af6874cf7468c9487e55cc4be7c981d9dd375931b8956ee307754eb846900d4831c313fbdd3eba4658eaf77940e4436e"; + sha512 = "02f1eecc4aff0a8691cdf131736c34fa93035d821a645c97213be41a95b4ff00d244411344089e56c24267984bc91d294f1250b1fd7e8c966ee9de9983794427"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-US/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-US/thunderbird-60.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "a8f4cb2238c3bf0ea6e4f8b444991bf0d6a4fe42cf7c0e38ae3738167900ac52debc0daf8bf4d7fb1e63326626072fc498db6b227337eab82ea48f2fcd561334"; + sha512 = "87be28d46f22885c730e89c0a945ed307b23da11e331a5911b21353a53536587f8e95658de591d44a9bdf617dc3d50099f537bebe85680dbf1b3f25c7f18fdfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-AR/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/es-AR/thunderbird-60.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "adddbaee6899434a0eb1fb955cd99c33786dc9c7376f1e84bb8036ed41d5731c48917ddd5d677a9dcefe3e7f382bcbbd51921afe1e6e119a4d32fe2cf9ae23cf"; + sha512 = "4d1651de4d4b3d5324ae5b07581634fc82399a2b0f9793d53797224d2f6b1205389bd0672b1c671fb956191312549b446c317ff98f187e1a7248aba901bd2499"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-ES/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/es-ES/thunderbird-60.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "aaafff39c8f5566056f5339310c8f633e48f78c57d2b4730a13377aa5c09e9698295e59e7b137def2706a3dbff9b48710e25a0db24e60dec75c06f9d0713cead"; + sha512 = "6abc82968464377cb2c05bc09b1bc978af65d9423dcba78e73e8d0817a2dcc1dde89711acb1d5fd9e3539cd33c6e3813e6b00297f3a23ff1c4250771b40c8522"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/et/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/et/thunderbird-60.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "8eab1f67c3f56a39e21734cfefd11e84fea60fdbd3e470c1e777b607535923c451d7318c2bd7958435ae137928e14f97559781458d8bd6cb2e1e88d47dabfc2d"; + sha512 = "9e4bba499f39ee7a87676627fe3ec6da2dcba6a55e39aec897953abf00ad08216550d0fe94804a5426e2894970ad2db3f391dd09ae2768580ea05ac6a77ddbb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/eu/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/eu/thunderbird-60.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "be2dd281a0a219e031cc485c21341d259aeeb56d34f79a9db82033d1e17647cf8c8617a2fcbc6a46b2025842a46f1117e43ca769a449a64577df691bdfa18801"; + sha512 = "66aaf66011117c2f9e675f22a68317552ed7673c05dd56266e4a8719e853629648de3d88fd44448ac1d9674b0cdf6cbe48925328f633c1bc23cb5a7f005468ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fi/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fi/thunderbird-60.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "21535608a1197744f9385b3eca5c7dbef8f3a05f9639b5011f8abf0bbc0143db17954ca4ce1bfc9ba1f5c4659a4a0a74351e30e5f57c1d416d7bf11273211f61"; + sha512 = "8c61206e100182080859c45736d973975ae5e1055fc2df170828dc0715e04be5468ba815995be9d60530ba9600e187aed965a1d94f9887337789c8219e2cca6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fr/thunderbird-60.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ddda6457d4bd737778105d0bc7086e64ba58d9fb23a083977b456873fafd3170df495a2d81fa19c6b12a06d32e448a2cd224263f4773c0d165226c6f56cfbcec"; + sha512 = "1583081060580dc72d864ca88ae8f114a22db4d4f3177532a4345471bac6ca3a85397b5bd82cc32f85dbfdc4992f788dd15a4dfa9d6fa7b154d3921c0c23fa29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fy-NL/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fy-NL/thunderbird-60.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "aa3844d3d17a8fdc201e55352f52fa7805328e9f0b105b729cc8cbcde117885a6a6671d343469e7fad61fd9a5ebd8d87faec8f4a214744771ec4d2b43015c975"; + sha512 = "59deb0b3e32dc2dbcce96aed6558dee899e290a469ded997bd2b7b6b2832f5f7c358d44f128cc1fac2327e3c19c43400424dccf4a0478bcbfeae3401fbc93882"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ga-IE/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ga-IE/thunderbird-60.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "30e88160a0c19fa58d6d86f916a86d95362bb8b8d073b1ac0e17608c0c5bd9ac040402dc950579602f5124e40a814e582ad98cf0853ecd8c7b11a7418bf0441d"; + sha512 = "8bba0addc0d9d1000ddaed0702b5db0d797f3ac9fff0f04e645d6fb3747f961c2570ee058e53d4084e3c02cbb8490c2a32781517c57bf7971b8f1d4db0fe871d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gd/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/gd/thunderbird-60.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "7458c820056c89b15988424325785ef4e525c2fb970b6c7c04d8c3e8b09cf7a3592e16b5c15862c84bcf95e2b399e37874f2c099c61bbc76293e4d5d8ed5980d"; + sha512 = "8e8f5df3aee5f1dbc1e6fd8c761b5d968dd35b9e29a8c04e013a7de08091f65cc2573109f0bfe201048f90a578ea84f1bb05826d7bd8e9fb7dd9110b45623034"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/gl/thunderbird-60.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "6be48b4ac248cff0842a5b78023dcb9787588c74ce1db89bb03a9a99ac0a2ac24a6949ae125219e99caf93260574d1c84355ca8f0f9c76ed15731d8a4950c98c"; + sha512 = "56a56179eddff5da07ce124f17ed08a6a033d7c2c3d139fd5b00afdb86f0c54215525c40f9c6c108384adeafdcc6f8dab87d72b07d88bd38e0c43c89aac4db0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/he/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/he/thunderbird-60.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "3dca324d7b3b00a2cc98f8949165d178be7bd68b118ae66383a0d3705925e3f6bda14aa25475886c1f9810cd15a48a79e81924b8ebccfb528ad4bd21e36ebf8e"; + sha512 = "6880b7ab22b3e642d10edce67458fe30935c87dad60f32ac32b443473e5a208a4df0645b2a18ef26d5ce40053b3a9119eb432e640afca8421c4e93815b28bdf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hr/thunderbird-60.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "23d5b2b0cb48fd274856a60dd9f916d294c8ec133771ff624e88cbdec214182c443ed5fd2d424475ed748113f84b74c732092f51061571104b1a62c301affabe"; + sha512 = "14b22f95559f1c9addf04d51dcf857c3cd59f3612743970bf9cbfc99c84a3d0fcb898be7e83858c0848e341039493a5aba4189d24941362327f4ef9982dd739e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hsb/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hsb/thunderbird-60.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "7360e964d5322e433014eb10f369f27a6e4ff688ed441671ddaaa3526b70d212509c16624ca854e988ca581d0f60ccf31db1bb49b5c93521a5d07e697be84a4c"; + sha512 = "5bbddd6bb288cc03015707bd2ed3ef38ff20c7b93b08907e1b90cd8a22725786a293fedb142f99e18e0cf66fa14529097399e95fd157c434414c8fd61c0ba70b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hu/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hu/thunderbird-60.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "5aaaf22f17015026a32c3648323fbca16b3845c0f52ebfd3414c11e1d7cd1a0e72a8319e924b9eea67bd9c1448b87585709d3b99a8783ed580e11020a762eb31"; + sha512 = "4f751f64b1417022f6c1487e1f3d92edc0ea1cd603850a9f64b35a71a652be1e51dfa17babb66e3447bc5a8bb2693c6e2dae89a736dc2f070b4b6a9500cf9299"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hy-AM/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hy-AM/thunderbird-60.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "7159dcfddf5981e1ddec5ac11613a7b30c513e0319249f08196ec88fe3e2256b52f3e1e418e46e276c1f35195f15d778b83d27e3186b2b8571e0b374844f6248"; + sha512 = "c932b56abf6801bfb6ff90978343aea12f67f006ea71882fa7bbb469dd750371330c47581f48aec3ecfca9cfa51f7edfb2aed6a3da874041c2087b5c5ff60abc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/id/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/id/thunderbird-60.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "9cf647ea244bcd046f73cfcca97c5b5f2dc3f5b0991d6edb100b4c4263ab75d8b5d07a418b906b66b50d9c4f29360637ff4ce605dbed7bd85c9b624d33331ae6"; + sha512 = "d8a61bb0c1c308d7ef89a9f938fd1c738ce8e66cebfdf4a236636e3c9469705c1012d19c3d3cf8837bdabefed01c744692aec2d749c7ec0adb472bc125e54cdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/is/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/is/thunderbird-60.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d567dd894926e7a5288da3f7a2837ded333772c799acf6f27489327b3e50236561dd0a9d04e3623d23a6d00e7b35c7b8572c611bf1e767b4f43f7d5164ea3787"; + sha512 = "1fe98420d0ceda881b50e4dfff667de59b960c1d8a23b5f88140c076fa5bfc8cc01b636a3b9bd46987f87a30ba6cb510eeaeadbf83ada954a5681c3da68cf7a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/it/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/it/thunderbird-60.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e3511d7fed2617cb6cd59b1b56189a5f70db7f98cf889ce0be31d6931d0500a61b7d6a7f9907009bdaf37ad968b50aebae0930467cd5b0b70a6d2caaf89bc5ea"; + sha512 = "79190716416c48bfaf486470a5f31ef881bce0b97e4c780126581a38ff39e6a14ae12487779ed219e55afa2467139b652f54e989b91f4d438685d1fb174f920d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ja/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ja/thunderbird-60.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0a4cac4b246542a42534e2b028a84cfef470c884143a08c489b56906a1d167ef66de82d326874e49d22a64c259aeac21b76f4cc2b20acf2885040db35decbc41"; + sha512 = "c8c9d6a31664df4e7ad9668a73197da100f5c0b9bcd7bc500638f1d1c26e123a91cd370cd574185f0a2700c44564df7a048b6942265294c2326c8d0ae02f8c73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/kab/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/kab/thunderbird-60.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "9b6939d454dd5f0635d6fa3cd78d57d4c3461df67108a9c20a85cded552bffb68ca9f8e9af037150a0cb31588fcc663a0f1a8b91183fd257eec5e144516b5ca6"; + sha512 = "d76f7178edaee6d16045e332ecac4dd31d7eaa3e8688c24cc48cde48df7df9b1bf9bbc0d76a95e8c35923fe1fb743792bcadf8d3f705f76a8acc7d714b8b0bad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ko/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/kk/thunderbird-60.0.tar.bz2"; + locale = "kk"; + arch = "linux-x86_64"; + sha512 = "f3d13ee3665e6345ea8295d616d227ade4be5af166af08b0a2094ae27a69eb82955933967f734e111930d802270f8c5ace57a9f16bc56b920ad9a3081f82acbb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ko/thunderbird-60.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "c965abf90339a3b8dbaffacd61b33729a0312052ced29cd8300cd5dbb577b7b663a314a5d27528f9e03ca55753ee96b392ae745558e59eeebec80857dcf34b3c"; + sha512 = "9ff20db6d945938868b5b9833519a93011d33804f5514f0f347814137f9f8e96b427658f1f086867c0b272ef8fa5c22e92b8093950b534f3ac0224f84bbf2779"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/lt/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/lt/thunderbird-60.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "f8724c9f29d2965e23a90156586ea85721b5c5693c56fbc5932ee367c87a4531fdd318968cb38046f748dd60f4ef0ebb4636a2034f061e3e5926826aaccff410"; + sha512 = "cc0309a724a2b21bd6426af53e5ca6b8168f2e3f1293c16aba954c1484defd0a227a1d93c4d92e946d5327d5ce58fcc37f6848d180426e3cd9673de483676713"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ms/thunderbird-60.0.tar.bz2"; + locale = "ms"; + arch = "linux-x86_64"; + sha512 = "59351da7225877be43a1e651afd089facd47675497d8f2c0d6bc1c8a2234058ef9362b30309d65b074c8b98faf19b9d4cf80e83cfec2f8e438fc0a7c6d60f899"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nb-NO/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nb-NO/thunderbird-60.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "87bd58ae4dcd766c0b3403e578c41ddc46b5801bd743747a23802770099ce37f55daed7beca134835f0f16939784d7d082b8d6903fdcc993cec56846b1d55c5c"; + sha512 = "94c5f139cda0a90bc575f32f6121441dd198455482a89d052227777759f912f26aa53d74a6232e3a78ecf1cd3062cadfb3c7f30e349dd59bb8797825dce825a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nl/thunderbird-60.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3f332437788bd314e8a19fe3263631c2000cdaf30505129b37693fbf499fac3d15736b51d2838e49daad8e9225094a92bf3638fee6a6e33f2cfff6357f1a1597"; + sha512 = "f1fd359ab66f349643191efc5f112a4512acfb64cf088b963068e54688c34b4244a8b0d31135200a706122ed797e2d2b09237e96c1076bbf086d660b80d44dbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nn-NO/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nn-NO/thunderbird-60.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "4bd2918e59a87ad0afcba3e82640a0c729fdf672c1d977cce62f3bb7d92e14e008c83fc362a5c162090a3d4c0a5608262f5859ced2327274231ff534b6768694"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pa-IN/thunderbird-52.7.0.tar.bz2"; - locale = "pa-IN"; - arch = "linux-x86_64"; - sha512 = "f0c448cf25471b1aa4387208a8d0bd7e41531fca86dc7118f4467d2db101835af3be9ba79713bcbd8d8556895efe4a2af68606df18fbd506734359950e00ebe9"; + sha512 = "819c02852685cdebf0b3c3b86ab4261ac13ae6067f0a9c3610214d4cab05f3a913da58527be7d3fd2d06fbe9de13481c34c679b317fe0659383b31ac1fd19bec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pl/thunderbird-60.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "5f9bbd0a1be4d0ac5c50c281ae75025f4b12d8781a73463876f26861c9289c51165cb68ab4438401ded5ea484477c1fe862f5d57430624bc11871f0b36e2c50c"; + sha512 = "e384e19a68ab56c16266d59abb6b22ad5b7bfef649c2a7537a5822753f856a6e90604e057a7a43b744487294475be6afca2b8484911044422fbf06d01df31e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-BR/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pt-BR/thunderbird-60.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "afb4ed9a2739e0d590ace16f4dc8c4b1d19d05537fcdbd1f23e404218387d2c016715a074b630885a903588b8bd4a8329190d6ddb9231805a8538b4199513a6d"; + sha512 = "edf352970e3292c9f3eb17caf8de07edb924d14500c3dfc6d1864adebcfc174d1639b2d0ca5b4006cd952f9922e09fd220ef50c7ee3f15920d554dbae22eaff4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-PT/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pt-PT/thunderbird-60.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "d907bee397dcfac8763c7dfd18d5bdb5bd99afbef554a98f625c36aedde922fa03c5f79e46acca4ecb07f9adf6eb59c869b1694c68e88ed759e04abab13a210d"; + sha512 = "2d91620bce2051d6c30a3b16f21f7c97b99e3ac4a239e22b582b37ce7e6ef4b6861d66e56e7e7f58cd71cd25fcddb5e161e66248d87fc9984e755f229dbd54b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/rm/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/rm/thunderbird-60.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "61c70149b717b193e541e49614027a5cc5c4f5a0a4642bb5445843b2c53165ae29088773498245de3e8d3324c26d6d96cd225d9e3e2e491f06d0b60586f23d2e"; + sha512 = "0ee05046cef873313eea34cb5bc002f9231f015415ba97c23b06e7ed0ef9996e7cb77beab89cc1e312fc74122cbac179af430153b2426d885acef8fb7d1126b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ro/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ro/thunderbird-60.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "d9d604216c4805fbaa0444c5f61c7e1f8dc5609adde7bd8fc301e4ff0577b73a255cc95aa07f13543ce82b5487212b9b0e4284be47b2eb897a5c1880ed9fcaa5"; + sha512 = "c53a2bdfbda8cda335d2a9fe03476090034ebfdbd8a8eb345a9fa5d3c0f1422a0e1c2d95bb5a0b75cf84f8338679068436cc90c857a3547f297f3294d5028b70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ru/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ru/thunderbird-60.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "e385a46635372660a304d4cceb86be56d2a07b767a4eb17b131d67eb33494c878ed4e4cf3da3a1a198a9f3cab7c541161e325cbd9d5957c8af56d2a62118ffec"; + sha512 = "ffc6c2729291d8d1c7f32cca8933d3d8adbd54e278940ccd7cb844778b8a55123af0bcc9d435480077551de49d1c2200250209311579d2a34a5609a336eb32b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/si/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/si/thunderbird-60.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "952e89769e201e9320929f0562f27ca2de25a7bf4f0098964df6974831ef342f228de0278dd2de55a0d11c36804d04f42b9c9714f2c1ad44f5d68da1ae184d54"; + sha512 = "9f708d01d6a6492d10ff058bd2425172bb90ff9c2827cf88a4307de0df20c6cdac9d8c135daddbca132fc55e89c68924fddfe9ca8cb49d77ca6c874283c49a8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sk/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sk/thunderbird-60.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "827243b12ae2eafbb0da9673f914e26755dd3a54931e41a85ce89ab236b56bdf4ac4c256769865928509be4b998dac4a4924895ba583192d95b7271788185822"; + sha512 = "44e3dd85654dd91ac9b0bd1f1d7f6f74341e3f39be8f01b028353d3425938825877b8f8b0c296ebf269cc5b1e78dbdde18bc49153ada0065dbc1de3079096ad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sl/thunderbird-60.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d4063aa855abd1701feb078471e628728e3bb61e8799ac186c75b325b4db14a81734befe4782d75cd07170cceaa37b83de90d1d1ba73f950f7f76e24265cf49f"; + sha512 = "2d77bebf1e3a6466fdddf32f21cbb5d28e46f4b70fbd07eec701559a0accb6f78ed9ed8a3b969d0eb3e249907208ffe8ab096e6bb035bdfb8c91e268ba228992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sq/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sq/thunderbird-60.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "a90f3446a0a759fd9cdac2ea0251c676539f5dea56099d0e515fdcac72e881f54a95506f257da91b87d4be547b4377cfe8a7345e5087ff63d24e8bd2fc6742bb"; + sha512 = "f705fad8b3a3ec5f760f28205caeb19986cd90084c8db0d921569553aa3cef668443e30594a82a32cb684e4cb2444057d04355b39a2dc02ac2dfc0ad5273bd68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sr/thunderbird-60.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "f313d71b58efbe34f96ecdccb0ed14977899b6038d2a5d0d7c3138881a7668e8282e4c927f106fdfd1d74774404734e57d97d0004086997ace4ca53921321adb"; + sha512 = "37dd80ec39ea566e66d8ace889bdf0353ec63682356472a1d0352f556814bee38793a263b285c65e9a68e62b782caf064d7b530b503e1222a490ad81798b2a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sv-SE/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sv-SE/thunderbird-60.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "0889f3c2917b01211dbb5d28262726a3dd077dfd5327fe1f3dd4742cd45aab9ab8d7bfeb141a5a2c120239c522182e46a263ad0d6cb8c2d71d4c9c004d734a68"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ta-LK/thunderbird-52.7.0.tar.bz2"; - locale = "ta-LK"; - arch = "linux-x86_64"; - sha512 = "49bd7127f1412a48aa7e66bbd2957cbdb4f02d4f43cf856b8b796562e945a1016852d695773351b30b65ee0d2d4b65c9aff4c347e9a5c2b64bc3818cce65ae54"; + sha512 = "3685b1788f7da31032b5b16a974af87d729a05aad8f906f6692d7dd688684c6f745fe766a1c5baaaaecac4d1b417d3e91d78ca082a41704a6f9caff29b64d842"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/tr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/tr/thunderbird-60.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "6b50781107d219c7a86bce30b51c5e791627fd6305d1573d4fda98321e8476c3978a3b8d388005bb6d05ceb0ed0c6c119f9baf1d057b1f6d533d0e42baa90a51"; + sha512 = "3b1de9eb1371ac686c1d28253bab5b5a3c5ee3b91739bd9e272ed496266fbad01fafe5015f257cd0dc6ef553d47d674bf13e5a53444d030f50572c929d0b3c75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/uk/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/uk/thunderbird-60.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "58e7e921d7d2ad46237ff66bf0f2cb0de448f68668968b56779ee874d0a9eb29ffc46876b6aab4a0c30e4aba597039c73939e6d454c8feb56cbb6b4215791016"; + sha512 = "0cbd6f8ad5f0bf49e62efeed2d52b3c22ec0dc4701d84771465f3650ca2ca2736acb1e9d83fead6ecba4dbbd64eb883bd9cce9ece31b5e1ec28da4a410db196c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/vi/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/vi/thunderbird-60.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "5a2bee3035e76deb55d24d5043967e51dbb9d79dbc7cdb5dd9f59cfa2311391fc25017f08c709e7d33a5fa7ca0d8ae375ba074ae382a67f46b04e36eed504f53"; + sha512 = "0e0440d0640b7c50aea0a6a6983779524007897dee8996fbf898d110881920041c99891ba282cdd5bd02060d4f8606e57bf9ebd25531ef9cdb87659aa1150e55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-CN/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/zh-CN/thunderbird-60.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "73983afdd0e07a394029f64f1fba5f24ae0bce80ef7f9fa3f5374af3b5e6a094bb41d7428a252396b433ca59a092e5d19b20eeefc5867d68bef00a1894437159"; + sha512 = "3fd66874bbb9853da447cd4a4495f848d1ead3a1ef1ceca36590082f4ccec8985280d25f42a643b52f955290a4b9649709909080db8b6a592a943ee1ba4bbb44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-TW/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/zh-TW/thunderbird-60.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "71ba36ffb59a94191ffd6bd24a00d3e35422601310b70a6f411b8ad0175d7f67efe9ccb8d0a2a7c1d47263d5d1cbd0a4f790ef54cd174875d0c0bafa86481457"; + sha512 = "8e716f938a146a14c9f5ad8d99da463a6b5ea8d1705c26a575a4e34de89e1e9a36e1a288f60bd67b87a2560fae7646dd9157c4d60e9a35f7e977d20d55756f0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ar/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ar/thunderbird-60.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "fc69ea6bc9393f55e247a78eb747c4ae6ae0c30efad8188d50eb52f4bc3f2e47e328788cf329966e8184b468a58bb923fdfdc736ff7b7b37cbbfa31bc619e065"; + sha512 = "2076cd84255a8ad52521a752b8444cafd3490932b69a3ec632d8815a5215d08d4efcbebb888f76b26232eb6edd66c4b9ce2233107de32603d6a7a37b87f3595e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ast/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ast/thunderbird-60.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "74a6ed4829522c0ac7a4411ab4d269f557391c53d1313eb1b70bb6e3fbba30217343945e60d46bb7c5fcfb20a40b2e6bc0c40cb66bb72259be4f9ad78796bedd"; + sha512 = "a070d8bf3771ae9a9e09f40888b3c7cf391eef4966bbf437f547eb8a914290d2da918e7a824558aa5a506ce1941fc95ad738bb9ba56cc7418004da6658c42344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/be/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/be/thunderbird-60.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ba645d2eaf0eaf90a0c1f2f24aa87c6783405fab00b2608aa1e3f88f1f81877c4927e93e2090509b9e06c8e2655a4aa731bed47ecf8992bf12b9c5dcb189c0eb"; + sha512 = "f9c92aec1316decc523e8bb9136004ef74e184f2213c1ae92541416c36c9f3aa1a8adbe9f875b25120597026dd948a1ca68a9e1074643088d2698f8483a04762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bg/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/bg/thunderbird-60.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "62dabdc80e0e3d46b42c69462d18964e584b54fee80bd632c0a3be19fceabf6bbcb80ee6b200472e52998f90252a7e62355cfa9d7d8ba3b3bd0f7bf247557c59"; + sha512 = "a576991acf9129ab9a365e80b90fca7aef01e66ce3d06dffb8ecdc0ae3d8dc2902470a99a0293a87c9f112fd13658b71a86e6fb045fa7cefb7773de1cdbbe31c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bn-BD/thunderbird-52.7.0.tar.bz2"; - locale = "bn-BD"; - arch = "linux-i686"; - sha512 = "11acf4d6546aa3b3b1ee3159fb54e0769617664155d1dde4ec7d5af28335e90b428559b80e570d2b1829153f2edf8472e37e8e2cbf1d72567258e0c76aab4704"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/br/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/br/thunderbird-60.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "1056f78922c277ba64e3dad8e41ebed516495d41c07be4026271a2ca97d314218ce5a46c8b29be38645507a9f2070663cc6bb5deb194ee2d57df01809cb2d3ac"; + sha512 = "d63edb38305e2ee76df5c05dda275ee45ba419bfc6776d007fa39dec36d202158f7eacff9611aee44d3681b0db5b200a6706e8034fffcf1ca7d575787240a5ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ca/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ca/thunderbird-60.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "f50bdc6d1bdfbe4bbfd8aa8ce3938e2ca6963d0fbc0fd47d23505158bccfe328195e45c0215dfcd354847e5e3a0897941790a7cc1f1db31ec29cbfaa1cae7a33"; + sha512 = "d5ae9f8478c638fb50af671dbd12e95b338333e87b31a7cd42d99e8deb200ec23841ac9b93b0ab26b39306067203d8645976cb99292e3a028149ca549c9d43c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cs/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/cs/thunderbird-60.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "7d8c6d9be08bff6fcea06a994c637ea83576377975476edc01dbb152c8cc8768b00bab4295d5f13ca01451344aa64af6ad227e359f3d11bcc0228b31fd13c1f8"; + sha512 = "9284fd6b7757c4ba331f2d2e713c247f7fbdecb7724c1d66df1d1f0c81e3803dea4cee6fc4a905020b00ec5b281a4c959eb56ef401af5b8ec5cbf05252d7ab66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cy/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/cy/thunderbird-60.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8bc583a05e872f36df9512ffd5c06cafcee81c632358b5bb13d8a920689b030e8ed4996bfc265c074d5d7959a1e75c7180900b51adb30ff3181de496cd34a4eb"; + sha512 = "182e1c8878e53af87b5b83fe00ba5a8fa7c72ee35002e843d3e1cbbcebb1d2e82c37e90a44c411b238b9c843be6594aa75d34deaa576d213c23af4e2e8b0fe23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/da/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/da/thunderbird-60.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "ccef5bffe4a807d55924ebc8b36f0065891f03520fbb015547da1264997e95cb9e919aa5af838686af070715ffb314ddf6abda0e99e1e06657a2ea6fbc956441"; + sha512 = "10f22a40283a4202c0e6612a27022ffdd3d2c45727cd170ebeaab6678f59f624c6d2520ddf2c9540e98030c6813760b5d56c70882caada0166985f3206fef4c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/de/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/de/thunderbird-60.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "02061b7572ad3b784a28926da15abea9fd9c93b4df9c40a5435190e6d872d356b6001cf0666e4cef0696da32c76e64cadfbeca28f6f894b1b230033d451fe105"; + sha512 = "42709aa4778e93ebd61ff44d027eb0445028f036c735943d71ad355870d03da6dabb763367123156922aa56fe66d6968ba9c93e7b9a8b58197624f984c36437b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/dsb/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/dsb/thunderbird-60.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "458785317a61ff0fba04524b13cd72e22d4cdeee69bb99c849f4b12385a19f3236b586ab6a12cf9c8042a444553d1a3f82bef1f51fa9cd11639ec3911eff0013"; + sha512 = "6b82976526b862c9cae1a056b04f36c6d6cbc4ca91308a1f02a808d88272326c10f34cc77aef00b6f6c1863de42ed9a03328a667e4a0b985ecf837765557f982"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/el/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/el/thunderbird-60.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "5b8fdd6a65b4057eff462c5ae8cee366ced8ee482892c0457a6fbc52303b8dad96437230f18f560a3bef3f392eec43194b89715071b559623ada47fd031680a5"; + sha512 = "4314dc7d8fcffa4c4f498d41657332bc476d79f934b4f46181fac4b6cd93d3161271fcd0575f07139186d502c5b833b53ff26d2f8728c9a73765e551963c45d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-GB/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-GB/thunderbird-60.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0c32a412f9c7ad9195e113ab994ed8e0d80a14bcfdd70b3fc51399eca7e34241a265a7d81d5cdeb8a7217a0c694ebceed45c3b038de0656ee3a03bfde1887b3b"; + sha512 = "0840f23683c8c109ac802415b4216f778d6e1c2487e0e8d179def2a3b56308a7d9888c46a96d8d509f99fa4aa296213e2772bf1e74a97330c5e2bea97dce7c70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-US/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-US/thunderbird-60.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f7f8bf3f74052310987b546bba0f986abcfd65e53125c2cbde4bc4744e27de054f21eba8080313c28c9c3b44de1d773e4471facc9b71f520b6085c32cfe721c2"; + sha512 = "baf0334ba9803cdb79e1a05a6745f6a87575d52bf86f6169b664903608236eda8ba8965481a58b660fb1edb567c681211f328c3f0b9b298e267b5e572b41f642"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-AR/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/es-AR/thunderbird-60.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "0187b3cb9b91d43d6faf217dca8566429103f2bb3c04bfb59e842da9c464cfba3f542be3789bf0fd46e6ca4c355d632f50b16b01667671e41231b8ca8d5b75d4"; + sha512 = "c7a7ba5a547cbb7b839191b14a0a78835935cf589f82d3ee28e144032e0d94d9209348a45502b7e2da67314427b23d88fabf61db1ea78e55dda9bd1ef97abe9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-ES/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/es-ES/thunderbird-60.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "876de2da5068acdb546d5091c64bf3edc4269a3e6dde2c2d928cd05439570773db4272819fcf8e12c63f94cdc41f0721412e108f078d1cd11501dc31966ee3d2"; + sha512 = "ae3c7211dea682e133f960a147169e0a7b615a0fd4ad2fd28fed3976a395f16ebbe1184c872746e2872a09466ca84646cfdddd270ecb3567725dab24201297d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/et/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/et/thunderbird-60.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "2ff7a791390e955cb2489c685504b5a118396d99d225e616e9bbc09b4f7be70d7a2f1a925d5cdc38b944e2476904604356d9e3e0dbc497258a133ec80ab499cb"; + sha512 = "e08db3e430bc90b5af7fa5d979d694d38de1bcfbb89d68613f5b3abc2abe135ca19071890fcaa5e08e2c42d7486a113345ec24ce5555d963ef2c072a3f4b77ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/eu/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/eu/thunderbird-60.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "bef88a12c122f2d275e1fa24a92f5cc6fbc11534414ebd151e7d53d95d1c5ab06045270221ceb46629160eafd60bc1fd8a8928c13915493c83db231785507c21"; + sha512 = "f3e5ab6e80ef67fb7b05e08dcaab138475f4feede719939a055c0c548a719902a1bd9b7c18c4a76d5e7173f5a01a319c56579c41059a1888fd29bd43f78666ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fi/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fi/thunderbird-60.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d2c1be7209706fa96dc20af9c30be61557e0bf82da575c7b95fa8b5d2fc7ac6b7b2101bdf0db169694fde66cd1da60edcd4b505b849b1949ee72f12d7dbef200"; + sha512 = "b034c2fc5f633e4cc5b9f3258d7073439e805371833e7dccea9e8a7c9bc52ea7bb862642eb32bc02cacf2f114ff9b379edc22eb0df52ce676db52f67a3d48672"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fr/thunderbird-60.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "194711b687ec4ededcb9140c7c1c3e1a0ccb47759cd00ba56819a3a7d9be66f9a7a29e2a91db0b1d573d584953871a37781877f43e734a8e39599dc6e8027622"; + sha512 = "bdc4222ef8f15ec73297b0b1382e2e6da638d103e70c0a00adb5f3aff3b4944be1149f4099cde60e7e0daab273775959110e2354834641f6c85ddcc3f1b8303f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fy-NL/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fy-NL/thunderbird-60.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "7b9ef6651166e66c6abb88b79628a0c51f576f2ccf2dc5eaefd1c01100a492ca9fe1657aa2d6745079e0f422e0f2692d24389577b47248ec6713817e51543c6e"; + sha512 = "d4ccbbed8cd929c385369c7df9b9d031e4e06600cf8d08449d9e60844aad2ccafbb6517327882cecf1e25786a573e2878f15d841851cf30c72646eea7cd028d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ga-IE/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ga-IE/thunderbird-60.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "801af21d297c95505afb3bb6cc79edf72057ffbb9ee9da56c1f283043e6df921239a4ac8eb3d7442286b27265d3462569f79e29adc88b7674f7e9d8396ff3109"; + sha512 = "c89c2ff0a5c06ce0df29300ac2e1ba034b39b021487ddf86e870138dd165459a71dc250a066df1622e4ebec1813b1c315eaeadaad5da6afa522ca2208222f1d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gd/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/gd/thunderbird-60.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f778ff74408d3d9c7ba9c62cfa2c9447932b15446801df1c5363cf7c2059e1aa89539c1270fadbfc482c42b5c1845376e2fe037741fc267461d0b22f8edaf859"; + sha512 = "5f1ab74c7492a6a52b1ddbd38f7b9f85f59bd911cf8a64084d1eb35715f0b9cd45a7650dcfa9771679ac6255eed99dafc0becb8b3e32e315e7d186e118b56afb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/gl/thunderbird-60.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "ce541ef081ee8f8946f71b07a820ec31c4241730e565a8bf781a844a79fbfb0258d2f0d371ae3f4690067b6c520a103f4df996e8085d2a8afb997a4f1fefd288"; + sha512 = "690915f4e182b5ecab32675aa03616a2f51f7a4e795991cdfece82f63f074e2d8057d6e87ebf9f74dcc5acd149b1dc844517bee19de3d959a493cb64b51e6158"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/he/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/he/thunderbird-60.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ec3cef4bd411f6604e1ec3486272208aaa41b1154dad1473c6fbb483ec2d3960aaadc11cb592777f49571bba35a0812f4f0a14c0edf9eb8a7b1fc70d56fcd4a1"; + sha512 = "ea589ef7a9b4897beb23b4595c830fa14e7021472dbab815fb15325e99cf858a28b7265d43df0629d2196c1563a769f36beae1ca048fa3c006cd97d54e923ecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hr/thunderbird-60.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f27bd94723f65c4972ee41cf6a9397098cfbf9097e3eeb06b7b41d50b4f0143711fcd0ad59a04f23ab9acb42d3f9515900c067f9532366ae3333ecae2a54f965"; + sha512 = "e5b8e4cf40819c9b83339520e832773e3161c9c38c802ca37fe512616f128163bcc2d1e7a40ea6e0bb754973a782f141ed044c4be3a0cb7a39685326a1c3a8e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hsb/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hsb/thunderbird-60.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7caad57604b9d83e64e8e30e03e89c4661e8d81d2ce833a6908e2d662d4d6c7ffbbb8b071e8657fabb0ebc0c0f84b07617ac878c9bbcfb400b711654e36f66d7"; + sha512 = "81382e35b825b65f95508cf04bdeb1a8709f2cd7b408f3dc068cb75d4c5ec31bdbead8807008c78599bc11043f77437013242f9969333c46e10d9ba4a8e563cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hu/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hu/thunderbird-60.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "382d79b8513ad28f06233af3473c2fef995d72c9913f64adce5a86528ae0ead883e94f91b4d394cf30541e690da5aad77dc48b8c2a4a84ea6c5fef86c22a4159"; + sha512 = "190794f6fa1ffdbfc2b8516cf0c954a9abf8408aa04c1d9c51e1a601f8a1d3d8fc32e2ca9644bcd1e11e8cfc47982c55995b2daadbbbafcc713b4c6f5c8aa63e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hy-AM/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hy-AM/thunderbird-60.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "3a4e5878e4fcc9c493cf1de1393da8efe85ff86d96702f57f085da42cac990290b054a3998e96cce69dca17ada849301a6724fd6ae245bf4aa396db5ce76aac4"; + sha512 = "a6cc1ebcf284fb7b4fa0873768713dc569efdb39982f37131499434577ab5515448caaa5fac776987bc008074ac6c04eb29e2f60e21626b06dac2dfd17ee09c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/id/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/id/thunderbird-60.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "dca16b2c0b5034e1be2831a1992ca47f6a7c614382e781e86095df11f34193f13868bdd7f972f54e72d7f844cb24172057155d5457fc6ec98ee476ed01d8899c"; + sha512 = "4333f727d2e310bb24e6f266b748d757683523d6c3414c68169bc1a7852edad8d76bc3021aea01bc08e7d95c5fe4da16281306236cb6eca6f3e339cd5cc11fa0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/is/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/is/thunderbird-60.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "181868826a0da43deeb2ef68a307ba195fa7a470651d4a08e904bde994320e832a04c44fa355cdaa94bd4c8258471e6849cf06dae8284d43f43defc7a3976816"; + sha512 = "f26d7117241a090de6675e3a336b5b0c9b5462acc80248d6e41bf43f8c990a761ce36e6d0a4620a1733d06f5bf7cd8511c88f686b9ae0806f23f5a852be3c0d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/it/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/it/thunderbird-60.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "88c906753878c7b8b0a3d60de21813017ae6ba63b6be9c5d24b6072f1a4aa3a1cc01e56433f960c02f33317cb113266200fbeedc397cd3a5587aa592fdaaacfb"; + sha512 = "33dfd7890b6c156b907e40c5442795c8549053362d65272bd08a5ddaeda61783ec914d8c917a7b9731885aff766011b9a667307ee01cac79614eb84133bc8675"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ja/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ja/thunderbird-60.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0e53d3f877793afa9c3ecb48f73640ff3974633bd28ce036b96c7ed29f3b9a4af47e1fca89da9d594c879f534e7c4dc27ca05ece8ec33909fe2dfd57800b3a11"; + sha512 = "4ed858b1a1411472bc2029ce1396b78a00f25cabfc2232f6e3daf0acfe91898df769c2397f908db52759c32efc25a79d9d39efa99891a68e2b7d5b7c13820a23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/kab/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/kab/thunderbird-60.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "feeef278ab269f6e33b479b38f32004a5ece2a37ed2aad97c87e68dd0a8195ffe3428ac9dce0a3e72349d3c136b6b5bfdc25916bc57f4fa043eecffc64bafc3c"; + sha512 = "61e8b05c0c952eb493fb5f35b7ce6ee1da586a7a4d25f27224f36b7afae75a0f217717f5afac17b43f763b2f6403f4c50ed01c1d1dc6dd084d24f8821566b552"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ko/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/kk/thunderbird-60.0.tar.bz2"; + locale = "kk"; + arch = "linux-i686"; + sha512 = "507ad5d46263ada1fb9b3d05f2c6d1a00b76f5d25fe9459edafcb2793070b6771ff52b338bc9963c1810a46740ea1e22ed330a5b935bfef72437b572f0214e67"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ko/thunderbird-60.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "c138dcbb692780cc1598906a630e90c8102d6a562f922ee28bc88e25624eb88aea20bf3d6fa6b87719f2a9fda0962bc413ce7e6d07147efb47dee7fd670a5c76"; + sha512 = "2550ae6cd5e8ee1fb6fc0b3fd974c1028edf8b292da72b57d6e27fe2e600d6418c6f4ca2c9d5535cbf1f1c67b20713cfef5732beae79ceebe328f44a73023b69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/lt/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/lt/thunderbird-60.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "96e5cbd33b57fe02134aac190347f0ac37fdb9f847ad74a44f59004cb739579b9309442605e3c9c2693bbc484372505aeff9378bb7bccfe8e1432da7a5508ff4"; + sha512 = "29e47bd8306507fd65d27892863b9cd0b58cff4d2035f7c0d3df8cfb98ddc890e922c0e54e0177b255b6bda70116a72fa630494b7ead05683f928c1a3f6bfed3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ms/thunderbird-60.0.tar.bz2"; + locale = "ms"; + arch = "linux-i686"; + sha512 = "fec173bea9f579e605ea3b40510f26d0cd94ae96ca465f2b6b829eb710fd3154ce6b997c3951b12165491b8d57af8371517a23ec73615b3b53e463b6077efe96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nb-NO/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nb-NO/thunderbird-60.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "913a731cf2c063be645cca94ea4beab6601e2536baad9369f9804af663e7b1a024024ff2b5befda1ac8169db0e8cf9ce5c9ca5d0ce650fe629e606c221776e8a"; + sha512 = "1f15c20580104e6bbfcf07d234ac987e2d35eadeff5437369f62b34acb8b47dd646c365c31e2c5601c675a413cc0d2d73fff6f4a663436b426331d373725aee5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nl/thunderbird-60.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "79ceea0143319e4b883d2c59949fe3ddc62af70e9fe6653b745fedd2e683aaaf4c6f10d55688b83085abcd36672242f21ea0c592930cdcc7cfef7e32dcc72230"; + sha512 = "5f1b20753423ed3882625309ad91e3a6c0931984b502e395cd56d5701eaa6612ba547d996c608b5d87f521989900eb4f02a419036b4f1c9312f9d763bf68e89d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nn-NO/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nn-NO/thunderbird-60.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "c524517c417b977e9e8c3b0d3b9a8f1b256c68360f70e61ba4d1b2f887fe550222843de1f9c42081db935e27b3ec63ed8b1a1b5658f48f9534eb787d4fc28d54"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pa-IN/thunderbird-52.7.0.tar.bz2"; - locale = "pa-IN"; - arch = "linux-i686"; - sha512 = "10e8c6a1faf395371421387ec1cc6891d8e0bc9f69f37f2e4fc414dd9a5e4c10246f279e15804280a550ab7acc265b8a3691ef1d089459cb58cbf06896f88806"; + sha512 = "2a7964d792058c973940cb99add2862f61e66e6ce0cf6988c6b0395274b8791a09f81730a403748962b56be8a183c5d8e063cc8b7e93e166a1d508c8f274ad16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pl/thunderbird-60.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "13afd039d50bc7c6ead72e9d69f5dd6dafa0fc2b5d1f18a207a15192cda4473ca8706386eba98b522667cd036ded38bfcb67fb3dd8c2e50629c3db9a1243c3e6"; + sha512 = "49e372e264e902eac027db402d5e53683efcdf67faa41696113f7e963dabb85e6fbb8f58759460bb3fefc67ad52100a1d204884dcbafc39ab08e46059f72124e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-BR/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pt-BR/thunderbird-60.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "9c024bfa1733d144ff4fa58e7ce8a2127528d7fe05e64142a3b1d8a0fdaeda1b1c02998089fd219804571cae4072db984a74a40c4a22bcc18dfb68c849aa37cc"; + sha512 = "201398c2c58e55b9d311f87d445727a0a3c455167febe23a597ec97fe80ca189aff3557d8ac0e1957443251af184542d071229664f0a78de2faf31dcf337d951"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-PT/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pt-PT/thunderbird-60.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ed4d7117bc87cb2ec6df65667f554a83f2fcddbf4eafd6a587082ad42cab69fab5c1d9fc36e132660911840fe85dcc18ab4b23e83b9b57317b900db820483b40"; + sha512 = "88ba0c8dc4665305c85e00a0f50ff4247abf1a5925436d717c082c4934a6df41f9d45c45ac458598167bfae8633e3fa2c12f938e32480b956b2a61527c677af2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/rm/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/rm/thunderbird-60.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "d1e1e48c47866b89e05c975cc6d4d70120173066457a4c05de1ab9222dee87b0d562959c63afbe024681b0a3f9f8cb3c836f2f0a0e910507e5211a430b1f9bab"; + sha512 = "f121ad8ca5ee662a9b815d547352b21f7cf46bbabcf12f21617f857821e8a2b303a915fb1b3b3676684a0e79b30c9d97ba34a9223794616b4fd79f85f562d264"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ro/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ro/thunderbird-60.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "c1929be134d8127433eb4b26468379a631456681a6dc3d98bf9ec313576a4c951d5fa7f08ae2d3bc5e8563eecda0a71c412c62a970a0cec618e06d5cdcbc46fa"; + sha512 = "a0bff4872cb8186eb187fb7b366a5469cb2f8bbc5c42296195a104432b91e99b4729515d4808651f61faa585979966be903453a75524001b619350b66a6f2349"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ru/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ru/thunderbird-60.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "aa7893b8ea0f44f625afca61adc5942dfaf2eadc6cc7ead569a3536ad827a9b4f88f225dd01a9c5e375eb24a9940de6f65413ab6d93ec2bd736f0bca711739a3"; + sha512 = "e5eb22490436cb0c1456af5f7019b2b1b77dbdc4b68fb9d0d693a8502acde51027a90335ea4adb1b030cb4557ffdcefc8caec423110fbdc40f0c30bd269e1e45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/si/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/si/thunderbird-60.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ed425325419e0598e3cc5abd0d2b2898ef781c4be847aa8d9c93596f6dca0b718cb7035479d4013d3213b97a440dea2560549619c3ca330df9bda7b287cea673"; + sha512 = "830965b9d551665e84646e865e66aeabe6082308278669fce95e005643ba5807a0fc17ec294043f5ce908676a53b88ac64d9234b56571dbbb22b5a5de66aefac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sk/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sk/thunderbird-60.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "bd576b29abe39634c864a27f5ab8d59ada34bfd069a7eb9fbe6af1cd79f2e0fdd61ab4fe06cc3944a92b06634bde9faa68ad6d56399085999df5e7827dd121bd"; + sha512 = "40fca2d6bc9d2dea9df6ad7c153bcffcd30687c0fcce17b78583501dda379994ad706f28003248ed2cb62b0a3f0d510c203b7d4eca2f071be6f2d670f7f04c76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sl/thunderbird-60.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "98abc990d644a991abd9f513e205556974905c82c93e0fe8171608ec4d1aac7883ecdab5bf86ed287f43e6c5e45661b79ad012a4dda7b1e5cf6c3411dce7ea2c"; + sha512 = "0881ee4832639fe79201260f8c0c755bd2d4bdac7ce5a422a37b9798901815b5b7ee1eefda9d3f82c1d49fbd0c6174ffa3aa5cc850aa260af7133d60b0685ad3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sq/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sq/thunderbird-60.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "d45920069f8c0808b4965118be5ba6e4cf36b99bac9add6d1ac2e20051e95ebf09eaaa9ac559515803b655a61608bb4afab0d69d720ca74f57ec5a643b151f24"; + sha512 = "df1d0639030a33ecd4e0e336aff064dc87daf423ce7c8a6a0279f1a92d3cec4406ff0054eec1c911812f0ec6074308c8e66180e1adf919d366a8b6f138a6ef36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sr/thunderbird-60.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "7d77124de3cdd684f13fb824a0bcf7a9440ec7c626ba34deeb04478950bfc908494bc97de5f2d8d8dc0b0abfaa3f7c88b3948a10b7fd31de092702c755cacf25"; + sha512 = "ce264e4a8b5bc11396832533c1dfcfe43b601d4b4e8dad3d3b03c285732ab6b5fba50b90e28dfd883468cdab06e4f726d46478aa8b9e2b3a244c515288fef0bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sv-SE/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sv-SE/thunderbird-60.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e16fdb819ca8ae5c8392eae50115d6b6853678c002de3a18fff25ae0e7e7fa2af06dab17a6a2dff31440608373a5268197efedeaf36f0012c2763080f4b51cc5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ta-LK/thunderbird-52.7.0.tar.bz2"; - locale = "ta-LK"; - arch = "linux-i686"; - sha512 = "3c8429d8a31771452e108c0a7b16070138ea1e82aa16536bad4d7570117f0790045e9a34fb9f7546eb3d749e0d94b2a1a7a65b93198909189cbd2f1bf872af94"; + sha512 = "da5e8ee2e9fc35a605481f7351b0391d8ca056ce7f152a5e46b3b91b539f5e35b1ecb0067cd8fdd26f249393d45e22e61d318c9687d66b52accb59e8b3283e13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/tr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/tr/thunderbird-60.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "effe30bec8c4b0fc1428681888ea1e0a79eefa1f60fc3964e08142d00c6db065ff9a2acf989765497520f27504b4ea3c8104a084f63abe4358d165c5bfecc680"; + sha512 = "546c6ed7113af0c52aaa69630561637789381a5e97f2edea3415d14a88edc25124a64427c3a1e1a75e8c4019468aed0ebf4d6ff56ecf26ed1c64eee6b69ee777"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/uk/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/uk/thunderbird-60.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "92cca4a0b9ac66bd4c0e14d0c04a162dbe2a3aac3a9fa95e26e6eef8ef1716fc21832967323ca5b46df19b28843de6e4781ea323120bac37a9821745f7ca9af7"; + sha512 = "ce3386e90c77fae05c79d4e30abb723fba507e4655bee6667edca9de048c8854184af5c8775b10f2b7560dc9e6e95bbe7b8db79a345e590211cb56ad313f288a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/vi/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/vi/thunderbird-60.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "b470364cac631fe944e7c06a27299e8ddf65605aaa1550d0736ab6088e38cf008d224b920111a17f6d87aceda3b95ad0ebb01351ed2339680530629a70fca1b9"; + sha512 = "9bce245422e162e017198782778995ecc1ac1e2760ca91864605e3002042576a9c53519f085f6159e1654a4dff7dddc19f9fd1dda0a9f4cb9b616baeba8845d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-CN/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/zh-CN/thunderbird-60.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "1840d47835805c0ab854dde0a08fed90c785377d14b8f53b303fbd65bc5dc8e967146ae5d26ef4a0693df89679cff27ccbad0cabde27356dff97701fd3c91579"; + sha512 = "db756f120fc2ecfa3478cf07935b12414f79f746a96b0e30f75496f2cb8a7d880b9f3017b12122f0cdc0f64d10ae738da9c026aa9c533dbdaa6e0f38e5a71ee7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-TW/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/zh-TW/thunderbird-60.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "aaaef2821bb128218a6c9bbf07b1f017574f39a20664e0e82a396ddebeb4b2ac754fa1ece956ab70b1f55ef5e2a750d612cd6ebbd2a747d28f9c24a5b994c730"; + sha512 = "b589e9f472681bc9ddb5909197db2acf8b54e610998d00df4731c6a1403c5b865334aef2e072b3c7ac0694175f0e7cda6864809fc6079f95681b508267d90a59"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 1bf37edf1af9fef556ddcb1924e485d7b607ba73..d925838e642cac24ce600ecc931f05267c25c74e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -3,9 +3,10 @@ , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip , hunspell, libevent, libstartup_notification -, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc +, icu, libpng, jemalloc , autoconf213, which, m4 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl +, cargo, rustc, llvmPackages , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper , enableCalendar ? true , debugBuild ? false @@ -20,22 +21,16 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.7.0"; + version = "60.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21"; + sha512 = "1933csh6swcx1z35lbxfkxlln36mx2mny28rzxz53r480wcvar8zcj77gwb06hzn6j5cvqls7qd5n6a7x43sp7w9ykkf4kf9gmlccya"; }; - # New sed no longer tolerates this mistake. - postPatch = '' - for f in mozilla/{js/src,}/configure; do - substituteInPlace "$f" --replace '[:space:]*' '[[:space:]]*' - done - ''; - # from firefox, but without sound libraries buildInputs = [ gtk2 zip libIDL libjpeg zlib bzip2 @@ -50,11 +45,11 @@ in stdenv.mkDerivation rec { ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ]; # from firefox + m4 + wrapperTool - nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool ]; + nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; configureFlags = [ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio) - "--enable-application=mail" + "--enable-application=comm/mail" "--disable-alsa" "--disable-pulseaudio" @@ -66,6 +61,7 @@ in stdenv.mkDerivation rec { "--with-system-libevent" "--with-system-png" # needs APNG support "--with-system-icu" + "--enable-rust-simd" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-pixman" @@ -79,18 +75,29 @@ in stdenv.mkDerivation rec { "--enable-jemalloc" "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}" + "--enable-js-shell" ] ++ lib.optional enableCalendar "--enable-calendar" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] else [ "--disable-debug" "--enable-release" "--disable-debug-symbols" "--enable-optimize" "--enable-strip" ]) - ++ lib.optional enableOfficialBranding "--enable-official-branding"; + ++ lib.optional enableOfficialBranding "--enable-official-branding" + ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ + # on i686-linux: --with-libclang-path is not available in this configuration + "--with-libclang-path=${llvmPackages.libclang}/lib" + "--with-clang-path=${llvmPackages.clang}/bin/clang" + ]; enableParallelBuilding = true; preConfigure = '' + cxxLib=$( echo -n ${gcc}/include/c++/* ) + archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) + + test -f layout/style/ServoBindings.toml && sed -i -e '/"-DRUST_BINDGEN"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml + configureScript="$(realpath ./configure)" mkdir ../objdir cd ../objdir @@ -106,14 +113,14 @@ in stdenv.mkDerivation rec { postInstall = '' # For grsecurity kernels - paxmark m $out/lib/thunderbird-[0-9]*/thunderbird + paxmark m $out/lib/thunderbird/thunderbird # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl # $binary is a symlink to $target. # We wrap $target by replacing the $binary symlink. - local target="$out/lib/thunderbird-${version}/thunderbird" + local target="$out/lib/thunderbird/thunderbird" local binary="$out/bin/thunderbird" # Wrap correctly, this is needed to @@ -139,7 +146,7 @@ in stdenv.mkDerivation rec { name = "thunderbird"; exec = "thunderbird %U"; desktopName = "Thunderbird"; - icon = "$out/lib/thunderbird-${version}/chrome/icons/default/default256.png"; + icon = "$out/lib/thunderbird/chrome/icons/default/default256.png"; genericName = "Mail Reader"; categories = "Application;Network"; mimeType = stdenv.lib.concatStringsSep ";" [ @@ -163,8 +170,8 @@ in stdenv.mkDerivation rec { # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. '' patchelf --set-rpath "${lib.getLib libnotify - }/lib:$(patchelf --print-rpath "$out"/lib/thunderbird-*/libxul.so)" \ - "$out"/lib/thunderbird-*/libxul.so + }/lib:$(patchelf --print-rpath "$out"/lib/thunderbird*/libxul.so)" \ + "$out"/lib/thunderbird*/libxul.so ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 94e8bd34087d2331b685d490753bd547c5676058..4e2f9e636d5d957b4ee64d0d951886f582b6397f 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig +{ stdenv, lib, fetchpatch, fetchurl, autoreconfHook, pkgconfig , openssl, netcat-gnu, gnutls, gsasl, libidn, Security , withKeyring ? true, libsecret ? null , systemd ? null }: @@ -10,15 +10,23 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; name = "${pname}-${version}"; - version = "1.6.6"; + version = "1.6.8"; src = fetchurl { - url = "mirror://sourceforge/msmtp/${name}.tar.xz"; - sha256 = "0ppvww0sb09bnsrpqnvlrn8vx231r24xn2iiwpy020mxc8gxn5fs"; + url = "https://marlam.de/msmtp/releases/${name}.tar.xz"; + sha256 = "1ysrnshvwhzwmvb2walw5i9jdzlvmckj7inr0xnvb26q0jirbzsm"; }; patches = [ ./paths.patch + + # To support passwordeval commands that do not print a final + # newline. + (fetchpatch { + name = "passwordeval-without-nl.patch"; + url = "https://gitlab.marlam.de/marlam/msmtp/commit/df22dccf9d1af06fcd09dfdd0d6a38e1372dd5e8.patch"; + sha256 = "06gbhvzi46zqigmmsin2aard7b9v3ihx62hbz5ljmfbj9rfs1x5y"; + }) ]; buildInputs = [ openssl gnutls gsasl libidn ] @@ -52,7 +60,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; - homepage = http://msmtp.sourceforge.net/; + homepage = https://marlam.de/msmtp/; license = licenses.gpl3; maintainers = with maintainers; [ garbas peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index d8029f02a6f0bf86cfcf130d5802f4c06b99239b..8f1960b58cd8baa40d1537769b8b0b949a3c17a4 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, fetchpatch, pkgconfig +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig , qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python , jackSupport ? false, libjack2 ? null @@ -62,7 +62,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = https://mumble.info; license = licenses.bsd3; - maintainers = with maintainers; [ viric jgeerds wkennington ]; + maintainers = with maintainers; [ jgeerds wkennington ]; platforms = platforms.linux; }; }); @@ -126,14 +126,16 @@ let }; gitSource = rec { - version = "2018-01-12"; + version = "2018-07-01"; qtVersion = 5; # Needs submodules - src = fetchgit { - url = "https://github.com/mumble-voip/mumble"; - rev = "e348e47f4af68eaa8e0f87d1d9fc28c5583e421e"; - sha256 = "12z41qfaq6w3i4wcw8pvyb8wwwa8gs3ar5zx6aqx6yssc6513lr3"; + src = fetchFromGitHub { + owner = "mumble-voip"; + repo = "mumble"; + rev = "c19ac8c0b0f934d2ff206858d7cb66352d6eb418"; + sha256 = "1mzp1bgn49ycs16d6r8icqq35wq25198fs084vyq6j5f78ni7pvz"; + fetchSubmodules = true; }; }; in { diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index 5314d3668eb049dc93f8c1bcf7f350c33eee60da..a5eb9021048e49bdac0b8520866512857fdde21a 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -1,6 +1,11 @@ -{ stdenv, fetchFromGitHub, gzip, ... }: +{ stdenv, fetchFromGitHub, fetchurl, gzip, ... }: -stdenv.mkDerivation rec { +let + serviceFile = fetchurl { + url = "https://raw.githubusercontent.com/DanielAdolfsson/ndppd/f37e8eb33dc68b3385ecba9b36a5efd92755580f/ndppd.service"; + sha256 = "1zf54pzjfj9j9gr48075njqrgad4myd3dqmhvzxmjy4gjy9ixmyh"; + }; +in stdenv.mkDerivation rec { name = "ndppd-${version}"; version = "0.2.5"; @@ -19,6 +24,16 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /bin/gzip ${gzip}/bin/gzip ''; + postInstall = '' + mkdir -p $out/etc + cp ndppd.conf-dist $out/etc/ndppd.conf + + mkdir -p $out/lib/systemd/system + # service file needed for our module is not in release yet + substitute ${serviceFile} $out/lib/systemd/system/ndppd.service \ + --replace /usr/sbin/ndppd $out/sbin/ndppd + ''; + meta = { description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; homepage = https://github.com/DanielAdolfsson/ndppd; diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index fe58b1d3e28a404b73cd16ec78b11d893a9bff18..421a3cfbe3b784e712760dc0e479b4ac5cdac100 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchFromGitHub }: +{ libsmbios, stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "netperf-2.7.0"; + name = "netperf-20180504"; src = fetchFromGitHub { owner = "HewlettPackard"; repo = "netperf"; - rev = name; - sha256 = "034indn3hicwbvyzgw9f32bv2i7c5iv8b4a11imyn03pw97jzh10"; + rev = "c0a0d9f31f9940abf375a41b43a343cdbf87caab"; + sha256 = "0wfj9kkhar6jb5639f5wxpwsraxw4v9yzg71rsdidvj5fyncjjq2"; }; + buildInputs = [ libsmbios ]; + nativeBuildInputs = [ autoreconfHook ]; + autoreconfPhase = '' + autoreconf -i -I src/missing/m4 + ''; + configureFlags = [ "--enable-demo" ]; + enableParallelBuilding = true; + meta = { description = "Benchmark to measure the performance of many different types of networking"; homepage = http://www.netperf.org/netperf/; license = "Hewlett-Packard BSD-like license"; platforms = stdenv.lib.platforms.linux; - maintainers = []; + maintainers = [ stdenv.lib.maintainers.mmlb ]; }; } diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 0b8a584fc6a623426477d9b3c043543516a72042..6e87735a9f657c68ca2361e44c69130840e60386 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook , glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1 , libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg -, gobjectIntrospection, glib-networking +, gobjectIntrospection, glib-networking, hicolor-icon-theme }: let pname = "liferea"; - version = "1.12.2"; + version = "1.12.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "18mz1drp6axvjbr9jdw3i0ijl3l2m191198p4c93qnm7g96ldh15"; + sha256 = "12852qp174nsg770cry7y257vfzl53hpy46h5agaimrfsc41mgln"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection - librsvg glib-networking libnotify + librsvg glib-networking libnotify hicolor-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); @@ -28,7 +28,6 @@ in stdenv.mkDerivation rec { pythonPath = with python3Packages; [ pygobject3 pycairo ]; preFixup = '' - rm "$out/share/icons/hicolor/icon-theme.cache" buildPythonPath "$out $pythonPath" gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 1d913118433ed9ec99a2d223d34e0826cfa64918..9d51a76f5360512a414f242b7bd6a250fe3f553e 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,26 +1,26 @@ { spellChecking ? true , stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null -, perl, pcre, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls +, perl, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls , makeWrapper, gnupg -, gnomeSupport ? true, libgnome-keyring3 +, gnomeSupport ? true, gnome3, libsecret }: assert spellChecking -> gtkspell3 != null; -let version = "0.144"; in +let version = "0.145"; in stdenv.mkDerivation { name = "pan-${version}"; src = fetchurl { url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; - sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli"; + sha256 = "1b4wamv33hprghcjk903bpvnd233yxyrm18qnh13alc8h1553nk8"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ gtk3 perl gmime2 gettext intltool itstool libxml2 dbus-glib libnotify gnutls ] + nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ]; + buildInputs = [ gtk3 gmime2 libnotify gnutls ] ++ stdenv.lib.optional spellChecking gtkspell3 - ++ stdenv.lib.optional gnomeSupport libgnome-keyring3; + ++ stdenv.lib.optionals gnomeSupport [ libsecret gnome3.gcr ]; configureFlags = [ "--with-dbus" diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index d527279ab77571da1d54600bb1052cf4e530bdad..b0bc5edba844dfa0602c91b31108b65ea0bd5a78 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, pkgconfig, sqlite }: +{ stdenv, fetchFromGitHub, qmake, pkgconfig, makeWrapper +, qtbase, qttools, qtwebkit, sqlite +}: stdenv.mkDerivation rec { name = "quiterss-${version}"; - version = "0.18.9"; + version = "0.18.12"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = "${version}"; - sha256 = "0n2rgzyxw6m29i8m8agri3cp5dbpjblhhyklvxsyzmkksnsxpw58"; + sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ qmake pkgconfig makeWrapper ]; buildInputs = [ qtbase qttools qtwebkit sqlite.dev ]; + postFixup = '' + wrapProgram $out/bin/quiterss \ + --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" + ''; + meta = with stdenv.lib; { description = "A Qt-based RSS/Atom news feed reader"; longDescription = '' diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index d761be2d7ac5555a690cfa532202069f4e6e9ef8..9f775f0db656ffd1d71e83a221fb0625749fb72b 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation { -e "s|/bin/rm|rm|" ''; - configureFlags = "--with-slang=${slang.dev} --with-ssl=${openssl.dev}"; + configureFlags = [ + "--with-slang=${slang.dev}" + "--with-ssl=${openssl.dev}" + ]; buildInputs = [ slang ncurses openssl ]; diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index c03202517747d7926fb361c1c6c7d8f24595d2d0..962f10a99c01f17156f2acd21660af86a122169d 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A packet traffic generator and analyzer"; - homepage = http://ostinato.org; + homepage = https://ostinato.org; license = licenses.gpl3; maintainers = with maintainers; [ rick68 ]; platforms = with platforms; linux ++ darwin ++ cygwin; diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9ed532acfe1a138b661d2c58b483972c94bd4da6 --- /dev/null +++ b/pkgs/applications/networking/owamp/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchFromGitHub +, autoconf, automake, mandoc }: + +stdenv.mkDerivation rec { + name = "owamp-${version}"; + version = "3.5.6"; + buildInputs = [ autoconf automake mandoc ]; + src = fetchFromGitHub { + owner = "perfsonar"; + repo = "owamp"; + rev = version; + sha256="019rcshmrqk8pfp510j5jvazdcnz0igfkwv44mfxb5wirzj9p6s7"; + fetchSubmodules = true; + }; + + preConfigure = '' + I2util/bootstrap.sh + ./bootstrap + ''; + + meta = with stdenv.lib; { + homepage = http://software.internet2.edu/owamp/; + description = ''A tool for performing one-way active measurements''; + platforms = platforms.linux; + maintainers = [maintainers.teto]; + license = licenses.asl20; + }; +} diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 94e3b7d0ba6a40b31deace7a109764ef6c1fa1df..c142661fd0334a62b42c0ed7dcb709d417774dd3 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "owncloud-client-${version}"; - version = "2.3.4"; + version = "2.4.3"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "1fpi1mlp2b8sx2993b4mava5c6qw794dmlayih430299z1l9wh49"; + sha256 = "1gz6xg1vm054ksrsakzfkzxgpskm0xkhsqwq0fj3i2kas09zzczk"; }; - patches = [ ../nextcloud-client/find-sql.patch ]; + patches = [ ./find-sql.patch ]; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]; @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = https://owncloud.org; maintainers = [ maintainers.qknight ]; platforms = platforms.unix; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/owncloud-client/find-sql.patch b/pkgs/applications/networking/owncloud-client/find-sql.patch new file mode 100644 index 0000000000000000000000000000000000000000..44dea6414e9298bccdfd736413def08526409f20 --- /dev/null +++ b/pkgs/applications/networking/owncloud-client/find-sql.patch @@ -0,0 +1,12 @@ +*** a/cmake/modules/QtVersionAbstraction.cmake +--- b/cmake/modules/QtVersionAbstraction.cmake +*************** +*** 8,13 **** +--- 8,14 ---- + find_package(Qt5Core REQUIRED) + find_package(Qt5Network REQUIRED) + find_package(Qt5Xml REQUIRED) ++ find_package(Qt5Sql REQUIRED) + find_package(Qt5Concurrent REQUIRED) + if(UNIT_TESTING) + find_package(Qt5Test REQUIRED) diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index c6e5d0f3cb31e54d9a0f7bf06873f23034969da7..f58f7e04e00b6828e6694d1a992235cd7066551d 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages }: +{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: + pythonPackages.buildPythonPackage rec { name = "deluge-${version}"; version = "1.3.15"; @@ -8,8 +9,17 @@ pythonPackages.buildPythonPackage rec { sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w"; }; + patches = [ + # Fix preferences when built against libtorrent >=0.16 + (fetchpatch { + url = "https://git.deluge-torrent.org/deluge/patch/?id=38d7b7cdfde3c50d6263602ffb03af92fcbfa52e"; + sha256 = "0la3i0lkj6yv4725h4kbd07mhfwcb34w7prjl9gxg12q7px6c31d"; + }) + ]; + propagatedBuildInputs = with pythonPackages; [ - pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity + pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity + libtorrentRasterbar.dev libtorrentRasterbar.python ]; nativeBuildInputs = [ intltool ]; @@ -22,7 +32,7 @@ pythonPackages.buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://deluge-torrent.org; + homepage = https://deluge-torrent.org; description = "Torrent client"; license = licenses.gpl3Plus; maintainers = with maintainers; [ domenkozar ebzzry ]; diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 7279994140205e296705fc0d3062507f08be8a12..7b854fce6c5552a702ab9ea399e29b82d209fa25 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: +{ stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: let - version = "6.6.3-build-253"; + version = "6.6.7-build-529"; name = "frostwire-desktop-${version}"; src = fetchFromGitHub { owner = "frostwire"; repo = "frostwire"; rev = name; - sha256 = "1bqv942hfz12i3b3nm1pfwdp7f58nzjxg44h31f3q47719hh8kd7"; + sha256 = "03wdj2kr8akzx8m1scvg98132zbaxh81qjdsxn2645b3gahjwz0m"; }; desktopItem = makeDesktopItem { @@ -40,7 +40,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0p279i41q7pn6nss8vndv3g4qzrvj3pmhdxq50kymwkyp2kly3lc"; + outputHash = "11zd98g0d0fdgls4lsskkagwfxyh26spfd6c6g9cahl89czvlg3c"; }; in stdenv.mkDerivation { @@ -52,8 +52,15 @@ in stdenv.mkDerivation { buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) ( cd desktop + + # disable auto-update (anyway it won't update frostwire installed in nix store) + substituteInPlace src/com/frostwire/gui/updates/UpdateManager.java \ + --replace 'um.checkForUpdates' '// um.checkForUpdates' + + # fix path to mplayer substituteInPlace src/com/frostwire/gui/player/MediaPlayerLinux.java \ --replace /usr/bin/mplayer ${mplayer}/bin/mplayer + substituteInPlace build.gradle \ --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' gradle --offline --no-daemon build @@ -66,8 +73,8 @@ in stdenv.mkDerivation { cp desktop/build/libs/frostwire.jar $out/share/java/frostwire.jar cp ${ { x86_64-darwin = "desktop/lib/native/*.dylib"; - x86_64-linux = "desktop/lib/native/libjlibtorrent.so"; - i686-linux = "desktop/lib/native/libjlibtorrentx86.so"; + x86_64-linux = "desktop/lib/native/lib{jlibtorrent,SystemUtilities}.so"; + i686-linux = "desktop/lib/native/lib{jlibtorrent,SystemUtilities}X86.so"; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}") } $out/lib diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 4f885116bd82bd8b4f57c3e5decd40f1a85b55c8..d1d3bf880cc54e11dada985daab55bebfed4e4e3 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.6.3"; + version = "6.7.1"; name = "frostwire-${version}"; src = fetchurl { - url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; - sha256 = "0n1g0am3d2fxw4a4zzzyif1fal1x3xch9q7743jhkkm3mldl2grw"; + url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; + sha256 = "1crhiksgky65wvb4fvqablsvixj04hbaacz23mskwrc63n4jaz0p"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index d18342177243630878c5b511851d546a6defcb33..8e1777b0ce79c19872af88997c89544b48de3a4a 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric vrthra ]; - platforms = platforms.gnu; + maintainers = with maintainers; [ vrthra ]; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/git.nix similarity index 84% rename from pkgs/applications/networking/p2p/gnunet/svn.nix rename to pkgs/applications/networking/p2p/gnunet/git.nix index 8c8d95169c87e6967d8ea4604bbf4b0c4ea14283..9428b2764585f5cf24c3b46b39aad8cd6a00d89a 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt +{ stdenv, fetchgit, libextractor, libmicrohttpd, libgcrypt , zlib, gmp, curl, libtool, adns, sqlite, pkgconfig , libxml2, ncurses, gettext, libunistring, libidn -, makeWrapper, autoconf, automake +, makeWrapper, autoconf, automake, texinfo, which , withVerbose ? false }: let - rev = "27840"; + rev = "ce2864cfaa27e55096b480bf35db5f8cee2a5e7e"; in stdenv.mkDerivation rec { - name = "gnunet-svn-${rev}"; + name = "gnunet-git-${rev}"; - src = fetchsvn { - url = https://gnunet.org/svn/gnunet; + src = fetchgit { + url = https://gnunet.org/git/gnunet.git; inherit rev; - sha256 = "0zhxvvj5rbhca2ykfx3g93dv94xyhqsnj011a6gql7zd5vfhaf6v"; + sha256 = "0gbw920m9v4b3425c0d1h7drgl2m1fni1bwjn4fwqnyz7kdqzsgl"; }; buildInputs = [ libextractor libmicrohttpd libgcrypt gmp curl libtool zlib adns sqlite libxml2 ncurses libidn pkgconfig gettext libunistring makeWrapper - autoconf automake + autoconf automake texinfo which ]; configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose "; @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { # Ensure NSS installation works fine configureFlags="$configureFlags --with-nssdir=$out/lib" - patchShebangs src/gns/nss/install-nss-plugin.sh sh contrib/pogen.sh sh bootstrap @@ -87,7 +86,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.gnu; + maintainers = with stdenv.lib.maintainers; [ ]; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 219615abb02a7a27bd68d488df8bf224d1176b57..c66c3ca05a4ec2998ec9944c6eb7c6cbeb90cd14 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, cmake +{ stdenv, fetchurl, fetchpatch, cmake , extra-cmake-modules, qtbase, qtscript , karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig , kdoctools, kross, kcmutils, kwindowsystem -, libktorrent, boost, taglib, libgcrypt, kplotting +, libktorrent, taglib, libgcrypt, kplotting }: stdenv.mkDerivation rec { @@ -22,6 +22,24 @@ stdenv.mkDerivation rec { libktorrent taglib libgcrypt kplotting ]; + patches = [ + # Fix build with CMake 3.11 + (fetchpatch { + url = "https://cgit.kde.org/ktorrent.git/patch/?id=672c5076de7e3a526d9bdbb484a69e9386bc49f8"; + sha256 = "1cn4rnbhadrsxqx50fawpd747azskavbjraygr6s11rh1wbfrxid"; + }) + + # Fix build against Qt 5.11 + (fetchpatch { + url = "https://cgit.kde.org/ktorrent.git/patch/?id=7876857d204188016a135a25938d9f8530fba4e8"; + sha256 = "1wnmfzkhf6y7fd0z2djwphs6i9lsg7fcrj8fqmbyi0j57dvl9gxl"; + }) + (fetchpatch { + url = "https://cgit.kde.org/ktorrent.git/patch/?id=36d112e56e56541d439326a267eb906da8b3ee60"; + sha256 = "1d41pqniljhwqs6awa644s6ks0zwm9sr0hpfygc63wyxnpcrsw2y"; + }) + ]; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 400600751a2e284d162208819a7b2e0b7b331136..c56e39826a663bb871f47ec951f2b485ef981dbb 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.20"; src = fetchurl { - url = "http://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; + url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; sha256 = "0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca"; }; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 90d68a96e5c0324a784df93d66a9beda399d38ff..b69906f8eb79411c178d879e1bd147b0c9629aa4 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,44 +1,55 @@ -{ stdenv, fetchurl, pkgconfig, which +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig , boost, libtorrentRasterbar, qtbase, qttools, qtsvg , debugSupport ? false # Debugging -, guiSupport ? true, dbus_libs ? null # GUI (disable to run headless) +, guiSupport ? true, dbus ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI }: -assert guiSupport -> (dbus_libs != null); +assert guiSupport -> (dbus != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.0.4"; + version = "4.1.2"; - src = fetchurl { - url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "13sw0sdw2agm49plp9xvkg6wva274drpvgz76dqj4j2kfxx9s2jk"; + src = fetchFromGitHub { + owner = "qbittorrent"; + repo = "qbittorrent"; + rev = "release-${version}"; + sha256 = "1756hr92rvh4xlf6bk2wl24ypczhwf1rv1pdq05flk118jciqb05"; }; - nativeBuildInputs = [ pkgconfig which ]; + patches = [ + (fetchpatch { + name = "fix-desktop-file-regression.patch"; + url = "https://github.com/qbittorrent/qBittorrent/commit/078325a3eb85c286b9a3454192ed2deadeda604c.patch"; + sha256 = "1xhpd4ncy2m9zxsllizkry2013ij0ii9p8b8jbb35sazw5p50c96"; + }) + ]; + + # NOTE: 2018-05-31: CMake is working but it is not officially supported + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ] - ++ optional guiSupport dbus_libs; + ++ optional guiSupport dbus; # D(esktop)-Bus depends on GUI support # Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist. QMAKE_LRELEASE = "lrelease"; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - "--with-boost=${boost.dev}" - (if guiSupport then "" else "--disable-gui") - (if webuiSupport then "" else "--disable-webui") - ] ++ optional debugSupport "--enable-debug"; + "--with-boost=${boost.dev}" ] + ++ optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files + ++ optional (!webuiSupport) "--disable-webui" + ++ optional debugSupport "--enable-debug"; enableParallelBuilding = true; meta = { - description = "Free Software alternative to µtorrent"; + description = "Featureful free software BitTorrent client"; homepage = https://www.qbittorrent.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ Anton-Latukha ]; }; } diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 950187ed9c60beee0f0db8fa0169b8df8c058639..34b4780633b838e0bd94e7b3ea153a84a2c297f0 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +{ stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg , qtmultimedia, qtx11extras, qttools }: diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 315106ea85255bf9f1bb6e982c8e025dd578e07a..44e434aa8ee935af48aeff52ec95f8e7c8c73eb4 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -1,42 +1,60 @@ { stdenv , fetchurl , dbus -, expat, zlib, fontconfig -, libpng, libX11, libxcb, libXau, libXdmcp, freetype, libbsd +, zlib, fontconfig +, qtbase, qtmultimedia +, libjson, libgpgerror +, libX11, libxcb, libXau, libXdmcp, freetype, libbsd +, pythonPackages, squashfsTools, makeDesktopItem }: with stdenv.lib; let libPath = makeLibraryPath - [ stdenv.cc.cc dbus libX11 zlib libX11 libxcb libXau libXdmcp freetype fontconfig libbsd ]; + [ stdenv.cc.cc qtbase qtmultimedia dbus libX11 zlib libX11 libxcb libXau libXdmcp freetype fontconfig libbsd libjson libgpgerror]; - version = "2016-1-17"; + version = "2018-1-30"; mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit"); srcs = { - "i686-linux" = fetchurl { - url = "https://www.dropbox.com/s/kebk1b5ib1m3xxw/${mainbin}.tgz"; - sha256 = "0r9rhnfslkgbw3l7fnc0rcfqjh58amgh5p33kwam0qvn1h1frnir"; - }; - "x86_64-linux" = fetchurl { - url = "https://www.dropbox.com/s/7qh902qv2sxyp6p/${mainbin}.tgz"; - sha256 = "05l3smpdvw8xdhv4v8a28j0yi1kvzhrha2ck23g4bl7x9wkay4cc"; + url = "https://www.dropbox.com/s/0vi87eef3ooh7iy/${mainbin}.tgz"; + sha256 = "0d1cayxr1a4j19bc5a3qp9pg22ggzmd55b6f5av3lc6lvwqqg4w6"; }; }; + desktopItem = makeDesktopItem { + name = "SoulseekQt"; + exec = "soulseekqt"; + icon = "$out/share/soulseekqt/"; + comment = "Official Qt SoulSeek client"; + desktopName = "SoulseekQt"; + genericName = "SoulseekQt"; + categories = "Network;"; + }; + in stdenv.mkDerivation rec { name = "soulseekqt-${version}"; inherit version; src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); - sourceRoot = "."; - buildPhase = ":"; # nothing to build + dontBuild = true; + + buildInputs = [ pythonPackages.binwalk squashfsTools ]; + + # avoid usage of appimagetool + unpackCmd = '' + export HOME=$(pwd) # workaround for binwalk + tar xvf $curSrc && binwalk --quiet \ + ${mainbin}.AppImage -D 'squashfs:.squashfs:unsquashfs %e' + ''; installPhase = '' - mkdir -p $out/bin - cp ${mainbin} $out/bin/soulseekqt + mkdir -p $out/{bin,share/soulseekqt} + cd squashfs-root/ + cp -R soulseek.png translations $out/share/soulseekqt + cp SoulseekQt $out/bin/soulseekqt ''; fixupPhase = '' @@ -50,6 +68,6 @@ in stdenv.mkDerivation rec { homepage = http://www.soulseekqt.net; license = licenses.unfree; maintainers = [ maintainers.genesis ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2c257a1294ac52343613762e9feea555e5b6e508 --- /dev/null +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security }: + +rustPlatform.buildRustPackage rec { + name = "synapse-bt-unstable-${version}"; + version = "2018-06-04"; + + src = fetchFromGitHub { + owner = "Luminarys"; + repo = "synapse"; + rev = "ec8f23a14af21426ab0c4f8953dd954f747850ab"; + sha256 = "0d1rrwnk333zz9g8s40i75xgdkpz6a1j01ajsh32yvzvbi045zkw"; + }; + + cargoSha256 = "1psrmgf6ddzqwx7gf301rx84asfnvxpsvkx2fan453v65819k960"; + + buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + + cargoBuildFlags = [ "--all" ]; + + meta = with stdenv.lib; { + description = "Flexible and fast BitTorrent daemon"; + homepage = https://synapse-bt.org/; + license = licenses.isc; + maintainers = with maintainers; [ dywedir ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 688f908c798ca77720e1c1390862ebbde7230536..9f47f8464a132c3d08b632f92f65cfdb47e4d755 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tixati-${version}"; - version = "2.55"; + version = "2.57"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "02mha6lfcb0mg0y977bxa6xg8krpbsbzpm4b5xw6y6wign4d8a8w"; + sha256 = "0z6znh62ry4fmc6c54zq79pk1b5bwkz93bxsfgvxpf6sajpyf9n7"; }; installPhase = '' diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index eb88d1c24c207d5408901e4d8aaa7adcf72f5914..3ddbe9be4fc6e940b406c0d1612a776e7628e6a7 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -21,13 +21,16 @@ stdenv.mkDerivation rec { pkgconfig intltool autoconf-archive appstream-glib ]; + buildInputs = [ gtk3 json-glib curl glib hicolor-icon-theme ]; - meta = with stdenv.lib; - { description = "GTK remote control for the Transmission BitTorrent client"; - homepage = https://github.com/ajf8/transmission-remote-gtk; - license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; - platforms = platforms.linux; - }; + doCheck = false; # fails with style validation error + + meta = with stdenv.lib; { + description = "GTK remote control for the Transmission BitTorrent client"; + homepage = https://github.com/ajf8/transmission-remote-gtk; + license = licenses.gpl2; + maintainers = [ maintainers.ehmry ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index cf825b724962ecbf1aaf70090bd32cbbda14298e..b94864a0b40fd17af3db8d7d42fe1da911baafd5 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, wrapGAppsHook -, openssl, curl, libevent, inotify-tools, systemd, zlib +{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook +, openssl, curl, libevent, inotify-tools, systemd, zlib, hicolor-icon-theme , enableGTK3 ? false, gtk3 , enableSystemd ? stdenv.isLinux , enableDaemon ? true @@ -10,11 +10,11 @@ let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = "transmission-" + optionalString enableGTK3 "gtk-" + version; - version = "2.93"; + version = "2.94"; src = fetchurl { - url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.93.tar.xz"; - sha256 = "8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b"; + url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz"; + sha256 = "0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m"; }; nativeBuildInputs = [ pkgconfig ] @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ intltool file openssl curl libevent zlib ] ++ optionals enableGTK3 [ gtk3 ] ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.isLinux [ inotify-tools ]; + ++ optionals stdenv.isLinux [ inotify-tools ] + ++ optionals enableGTK3 [ hicolor-icon-theme ]; postPatch = '' substituteInPlace ./configure \ @@ -39,10 +40,6 @@ stdenv.mkDerivation rec { ++ optional enableSystemd "--with-systemd-daemon" ++ optional enableGTK3 "--with-gtk"; - preFixup = optionalString enableGTK3 '' - rm "$out/share/icons/hicolor/icon-theme.cache" - ''; - NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation"; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index f6828fe6f317519d0ec1b8e3764ec155315bac5d..1169dba188cdd302c9eaf380c2696627343270dc 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick +{ stdenv, fetchurl, pythonPackages, makeWrapper, libtorrentRasterbar, imagemagick , enablePlayer ? true, vlc ? null, qt5 }: stdenv.mkDerivation rec { - pname = "tribler"; - name = "${pname}-${version}"; - version = "7.0.1"; + name = "tribler-${version}"; + version = "7.0.2"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0cqg6319x2lid5la5vdlj6lwja8g712196j39jzv5yiaq8d0zym4"; + sha256 = "1p0d0l0sa0nrnbyx2gg50nklkljwvl581i9w3z5qbkfzc7jsdy42"; }; buildInputs = [ @@ -41,6 +40,7 @@ stdenv.mkDerivation rec { pythonPackages.service-identity pythonPackages.psutil pythonPackages.meliae + pythonPackages.sip ]; postPatch = '' diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index d30527ca60939d7df9ac3aad66c95e4b69d58b11..cce44521a6208d4274171e67392308b9141a5f11 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -13,6 +13,8 @@ let }; }; + boostPython = boost.override { enablePython = true; }; + in stdenv.mkDerivation rec { name = "twister-${version}"; version = "0.9.34"; @@ -29,13 +31,13 @@ in stdenv.mkDerivation rec { "--disable-deprecated-functions" "--enable-tests" "--enable-python-binding" - "--with-boost-libdir=${boost.out}/lib" + "--with-boost-libdir=${boostPython.out}/lib" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake libtool python2 - boost db openssl geoip miniupnpc libiconv + boostPython db openssl geoip miniupnpc libiconv ]; patches = stdenv.lib.singleton (fetchpatch { diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8a8d1b33ca7345862148a08823c94dd05ff327b0 --- /dev/null +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +python2Packages.buildPythonApplication rec { + pname = "zeronet"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "HelloZeroNet"; + repo = "ZeroNet"; + rev = "v${version}"; + sha256 = "0v19jjirkyv8hj2yfdj0c40zwynn51h2bj4issn5blr95vhfm8s7"; + }; + + propagatedBuildInputs = with python2Packages; [ msgpack gevent ]; + + format = "other"; + + buildPhase = "${python2Packages.python.interpreter} -O -m compileall ."; + + installPhase = '' + mkdir -p $out/share + cp -r plugins src tools *.py $out/share/ + ''; + + # Wrap the main executable and set the log and data dir to something out of + # the store + postFixup = '' + makeWrapper "$out/share/zeronet.py" "$out/bin/zeronet" \ + --set PYTHONPATH "$PYTHONPATH" \ + --set PATH ${python2Packages.python}/bin \ + --add-flags "--log_dir \$HOME/.local/share/zeronet/logs" \ + --add-flags "--data_dir \$HOME/.local/share/zeronet" + ''; + + meta = with stdenv.lib; { + description = "Decentralized websites using Bitcoin crypto and BitTorrent network"; + homepage = "https://zeronet.io/"; + license = licenses.gpl2; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 2a4991b9318f8f1bf35acddee4b223b6927c20e1..f7f989dc3a9d81d0ce8c84464fdcb9acd0e17cbb 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; homepage = http://pjsip.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric olynch]; + maintainers = with stdenv.lib.maintainers; [olynch]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a4a127db73bfc242e0ba4f139a1cf9feb8149ccc --- /dev/null +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, full, + libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: + +let + version = "1.0.6-1"; + + description = '' + An application that runs on your computer in the background and seamlessly encrypts + and decrypts your mail as it enters and leaves your computer. + + To work, gnome-keyring service must be enabled. + ''; + + desktopItem = makeDesktopItem { + name = "Desktop-Bridge"; + exec = "Desktop-Bridge"; + icon = "desktop-bridge"; + comment = stdenv.lib.replaceStrings ["\n"] [" "] description; + desktopName = "ProtonMail Bridge"; + genericName = "ProtonMail Bridge for Linux"; + categories = "Utility;Security;Network;Email"; + }; +in stdenv.mkDerivation rec { + name = "protonmail-bridge-${version}"; + + src = fetchurl { + url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; + sha256 = "1as4xdsik2w9clbrwp1k00491324cg6araz3jq2m013yg1cild28"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + sourceRoot = "."; + + unpackCmd = '' + ar p "$src" data.tar.xz | tar xJ + ''; + + installPhase = '' + mkdir -p $out/{bin,lib,share/applications} + # mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + + cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib + # cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg + cp ${desktopItem}/share/applications/* $out/share/applications + + ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge + ''; + + postFixup = let + rpath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + qtbase + qtmultimedia + qtsvg + qtdeclarative + qttools + libGL + libsecret + libpulseaudio + glib + ]; + + qtPath = prefix: "${full}/${prefix}"; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}" \ + $out/lib/Desktop-Bridge + + wrapProgram $out/lib/Desktop-Bridge \ + --set QT_PLUGIN_PATH "${qtPath qtbase.qtPluginPrefix}" \ + --set QML_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \ + --set QML2_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \ + ''; + + meta = with stdenv.lib; { + homepage = https://www.protonmail.com/bridge; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ lightdiscord ]; + + inherit description; + }; +} diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index c331c4f287e62e4a88439701b6e7ef69992ce728..6a89731ff10413ec1964e24851fb432a41bd4f82 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey -, pkgs }: +{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }: let beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix { diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index a6858a7b5fdf04cd7d453bc93bba5d1ac5c1efed..0f107936be6fcdaa6ce3cc162ef929fa0c940f1f 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, makeWrapper -, cairo, gdk_pixbuf, glib, gnome2, gtk2, pango, xorg +{ stdenv, fetchurl, makeWrapper, makeDesktopItem +, atk, cairo, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg , lsb-release }: let @@ -13,6 +13,18 @@ let "i686-linux" = "i686"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + description = "Desktop sharing application, providing remote support and online meetings"; + + desktopItem = makeDesktopItem rec { + name = "anydesk"; + exec = "@out@/bin/anydesk"; + icon = "anydesk"; + desktopName = "anydesk"; + genericName = description; + categories = "Application;Network;"; + startupNotify = "false"; + }; + in stdenv.mkDerivation rec { name = "anydesk-${version}"; version = "2.9.4"; @@ -22,35 +34,43 @@ in stdenv.mkDerivation rec { inherit sha256; }; - libPath = stdenv.lib.makeLibraryPath ([ - cairo gdk_pixbuf glib gtk2 stdenv.cc.cc pango - gnome2.gtkglext + buildInputs = [ + atk cairo gdk_pixbuf glib gtk2 stdenv.cc.cc pango + gnome2.gtkglext libGLU_combined ] ++ (with xorg; [ - libxcb libX11 libXdamage libXext libXfixes libXi + libxcb libX11 libXdamage libXext libXfixes libXi libXmu libXrandr libXtst - ])); + ]); nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/{bin,share/icons/hicolor,share/doc/anydesk} + runHook preInstall + + mkdir -p $out/bin $out/share/{applications,doc/anydesk,icons/hicolor} install -m755 anydesk $out/bin/anydesk cp changelog copyright README $out/share/doc/anydesk cp -r icons/* $out/share/icons/hicolor/ + cp ${desktopItem}/share/applications/*.desktop $out/share/applications + + runHook postInstall ''; postFixup = '' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "${libPath}" \ + --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}" \ $out/bin/anydesk wrapProgram $out/bin/anydesk \ --prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]} + + substituteInPlace $out/share/applications/*.desktop \ + --subst-var out ''; meta = with stdenv.lib; { - description = "Desktop sharing application, providing remote support and online meetings"; + inherit description; homepage = http://www.anydesk.com; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index d5982f33e78e7f3c34b6a0516c4012bf9b63c28e..8d0022e3c8b33de2572079dacb2d218f9245c559 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchurl , requireFile , makeWrapper , libredirect @@ -23,55 +24,21 @@ , alsaLib , libidn , zlib -, version ? null +, version ? "13.10.0" }: let - versionInfo = { - "13.4.0" = rec { - major = "13"; - minor = "4"; - patch = "0"; - x64hash = "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb"; - x86hash = "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l"; - x64suffix = "10109380"; - x86suffix = x64suffix; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-13-4.html; - }; - - "13.5.0" = rec { - major = "13"; - minor = "5"; - patch = "0"; - x64hash = "1r24mhkpcc0z95n597p07fz92pd1b8qqzp2z6w07rmb9wb8mpd4x"; - x86hash = "0pwxshlryzhkl86cj9ryybm54alhzjx0gpp67fnvdn5r64wy1nd1"; - x64suffix = "10185126"; - x86suffix = x64suffix; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-13-5.html; - }; - - "13.6.0" = rec { - major = "13"; - minor = "6"; - patch = "0"; - x64hash = "6e423be41d5bb8186bcca3fbb4ede54dc3f00b8d2aeb216ae4aabffef9310d34"; - x86hash = "0ba3eba208b37844904d540b3011075ed5cecf429a0ab6c6cd52f2d0fd841ad2"; - x64suffix = "10243651"; - x86suffix = x64suffix; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-136.html; - }; - - "13.7.0" = { - major = "13"; - minor = "7"; - patch = "0"; - x64hash = "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91"; - x86hash = "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6"; - x64suffix = "10276927"; - x86suffix = "10276925"; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-137.html; + # In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12. + # Citrix looks for the former so we build version 1.34 to please the binary + libidn_134 = libidn.overrideDerivation (_: rec { + name = "libidn-1.34"; + src = fetchurl { + url = "mirror://gnu/libidn/${name}.tar.gz"; + sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; }; + }); + versionInfo = { "13.8.0" = { major = "13"; minor = "8"; @@ -91,6 +58,28 @@ let x86hash = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag"; x64suffix = "102"; x86suffix = "102"; + homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # This version has disappeared from Citrix's website... *sigh* + }; + + "13.9.1" = { + major = "13"; + minor = "9"; + patch = "1"; + x64hash = "A9A9157CE8C287E8AA11447A0E3C3AB7C227330E9D8882C6F7B938A4DD5925BC"; + x86hash = "A93E9770FD10FDD3586A2D47448559EA037265717A7000B9BD2B1DCCE7B0A483"; + x64suffix = "6"; + x86suffix = "6"; + homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-1391.html; + }; + + "13.10.0" = { + major = "13"; + minor = "10"; + patch = "0"; + x64hash = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA"; + x86hash = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4"; + x64suffix = "20"; + x86suffix = "20"; homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; }; }; @@ -123,7 +112,7 @@ let ''; }; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; sourceRoot = "."; @@ -149,7 +138,7 @@ let xorg.libXinerama xorg.libXfixes libpng12 - libidn + libidn_134 zlib gtk_engines freetype @@ -170,6 +159,8 @@ let }; installPhase = '' + runHook preInstall + export ICAInstDir="$out/opt/citrix-icaclient" sed -i \ @@ -198,6 +189,7 @@ let find $ICAInstDir -type f -exec file {} \; | grep 'ELF.*executable' | cut -f 1 -d : | + grep -vi '\(.dll\|.so\)$' | # added as a workaround to https://github.com/NixOS/nixpkgs/issues/41729 while read f do echo "Patching ELF intrepreter and rpath for $f" @@ -213,7 +205,7 @@ let makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ --add-flags "-icaroot $ICAInstDir" \ --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-standard}/lib/gtk-2.0" \ + --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_LIBRARY_PATH "$libPath" \ @@ -228,13 +220,15 @@ let # We introduce a dependency on the source file so that it need not be redownloaded everytime echo $src >> "$out/share/nix_dependencies.pin" + + runHook postInstall ''; meta = with stdenv.lib; { license = stdenv.lib.licenses.unfree; inherit homepage; description = "Citrix Receiver"; - maintainers = with maintainers; [ obadz a1russell ]; + maintainers = with maintainers; [ obadz a1russell ma27 ]; platforms = platforms.linux; }; }; diff --git a/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix b/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix new file mode 100644 index 0000000000000000000000000000000000000000..63587030b38e5593e16f19370f922f90249a6972 --- /dev/null +++ b/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix @@ -0,0 +1,19 @@ +{ citrix_receiver, extraCerts ? [], symlinkJoin }: + +let + + mkCertCopy = certPath: + "cp ${certPath} $out/opt/citrix-icaclient/keystore/cacerts/"; + +in + +if builtins.length extraCerts == 0 then citrix_receiver else symlinkJoin { + name = "citrix-with-extra-certs-${citrix_receiver.version}"; + paths = [ citrix_receiver ]; + + postBuild = '' + ${builtins.concatStringsSep "\n" (map mkCertCopy extraCerts)} + + sed -i -E "s,-icaroot (.+citrix-icaclient),-icaroot $out/opt/citrix-icaclient," $out/bin/wfica + ''; +} diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 59ae225210ca6ce4897947c52e07e16ef48d8d93..ad4a8849fac3679a75d900591110cac21b4eec6b 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, alsaLib, ffmpeg_2, glib, openssl, pcre, zlib +, alsaLib, ffmpeg, glib, openssl, pcre, zlib , libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv , libxkbcommon, libxkbfile , wayland -, gstreamer, gst-plugins-base, gst-plugins-good +, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc , libpulseaudio ? null , cups ? null , pcsclite ? null @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { name = "freerdp-${version}"; - version = "2.0.0-rc1"; + version = "2.0.0-rc2"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "0m28n3mq3ax0j6j3ai4pnlx3shg2ap0md0bxlqkhfv6civ9r11nn"; + sha256 = "01cm9g4xqihnnc5d2w1zs8gabkv59p7fyjwi1cwpzv6s198xwbfs"; }; # outputs = [ "bin" "out" "dev" ]; @@ -31,12 +31,12 @@ stdenv.mkDerivation rec { --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@" '' + lib.optionalString (pcsclite != null) '' substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \ - --replace "libpcsclite.so" "${pcsclite}/lib/libpcsclite.so" + --replace "libpcsclite.so" "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so" ''; buildInputs = with lib; [ - alsaLib cups ffmpeg_2 glib openssl pcre pcsclite libpulseaudio zlib - gstreamer gst-plugins-base gst-plugins-good + alsaLib cups ffmpeg glib openssl pcre pcsclite libpulseaudio zlib + gstreamer gst-plugins-base gst-plugins-good libunwind orc libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv libxkbcommon libxkbfile wayland diff --git a/pkgs/applications/networking/remote/freerdp/legacy.nix b/pkgs/applications/networking/remote/freerdp/legacy.nix index d3746fa6c7ad83ccdcbfb5f53e811044ca6d1f01..9830b84652597e4501da2546ec623dadf7961758 100644 --- a/pkgs/applications/networking/remote/freerdp/legacy.nix +++ b/pkgs/applications/networking/remote/freerdp/legacy.nix @@ -14,10 +14,9 @@ , ffmpeg , libxkbfile #, xmlto, docbook_xml_dtd_412, docbook_xml_xslt -, libXfixes , libXinerama , libXv -, pulseaudioSupport ? true, libpulseaudio +, pulseaudioSupport ? true }: assert printerSupport -> cups != null; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 4c1ddcef5cc87cd0a4d12c2a9688966a82503509..e07bf7958f3f4c8079512444a7d468a3317bac7e 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, autoconf, automake, pkgconfig, libtool -, gtk2, halibut, ncurses, perl }: +, gtk2, halibut, ncurses, perl +, hostPlatform, lib }: stdenv.mkDerivation rec { version = "0.70"; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1gmhwwj1y7b5hgkrkxpf4jddjpk9l5832zq5ibhsiicndsfs92mv"; }; - preConfigure = '' + preConfigure = lib.optionalString hostPlatform.isUnix '' perl mkfiles.pl ( cd doc ; make ); sed -e '/AM_PATH_GTK(/d' \ @@ -21,13 +22,25 @@ stdenv.mkDerivation rec { -e '/AC_OUTPUT/iAM_PROG_AR' -i configure.ac ./mkauto.sh cd unix + '' + lib.optionalString hostPlatform.isWindows '' + cd windows ''; + TOOLPATH = stdenv.cc.targetPrefix; + makefile = if hostPlatform.isWindows then "Makefile.mgw" else null; + + installPhase = if hostPlatform.isWindows then '' + for exe in *.exe; do + install -D $exe $out/bin/$exe + done + '' else null; + nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ]; - buildInputs = [ gtk2 ncurses ]; + buildInputs = [] + ++ lib.optionals hostPlatform.isUnix [ gtk2 ncurses ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A Free Telnet/SSH Client"; longDescription = '' PuTTY is a free implementation of Telnet and SSH for Windows and Unix @@ -36,6 +49,6 @@ stdenv.mkDerivation rec { ''; homepage = https://www.chiark.greenend.org.uk/~sgtatham/putty/; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6d32036def550415080b78a0bc379f0a1f19d9a6..14ab36c78fd2ea330c1cd703038de8db5e634727 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook +{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core -, openssl, gsettings-desktop-schemas +, openssl, gsettings-desktop-schemas, json-glib # The themes here are soft dependencies; only icons are missing without them. , hicolor-icon-theme, adwaita-icon-theme }: let - version = "1.2.0-rcgit.24"; + version = "1.2.31.3"; desktopItem = makeDesktopItem { name = "remmina"; @@ -25,11 +25,11 @@ let in stdenv.mkDerivation { name = "remmina-${version}"; - src = fetchFromGitHub { - owner = "FreeRDP"; + src = fetchFromGitLab { + owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "1x7kygl9a5nh7rf2gfrk0wwv23mbw7rrjms402l3zp1w53hrhwmg"; + sha256 = "0lvang4587wz292c3k3s8n4icc25cia1phmij34ndrl1f9lg34dp"; }; nativeBuildInputs = [ pkgconfig ]; @@ -39,7 +39,7 @@ in stdenv.mkDerivation { pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret spice-protocol spice-gtk epoxy at-spi2-core - openssl hicolor-icon-theme adwaita-icon-theme ]; + openssl hicolor-icon-theme adwaita-icon-theme json-glib ]; cmakeFlags = [ "-DWITH_VTE=OFF" @@ -64,9 +64,9 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { license = stdenv.lib.licenses.gpl2; - homepage = http://remmina.sourceforge.net/; + homepage = https://gitlab.com/Remmina/Remmina; description = "Remote desktop client written in GTK+"; - maintainers = []; + maintainers = with maintainers; [ melsigl ryantm ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index 1d1d6f4e1e3f6150fdf6c8a27f24875b74fc4e03..f20bb740615c537a4c1291d0121fa204f199a452 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, imake, zlib, jdk, libX11, libXt, libXmu -, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk, perl }: +, libXaw, libXext, libXpm, openjpeg, openssl, tk, perl }: stdenv.mkDerivation rec { name = "ssvnc-${version}"; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 260500e9d337df15f0e76b28f59d17e195ace7cf..e4715cce8e18f6ee24d2796efaf9a6a989ec23bb 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,28 +1,13 @@ -{ stdenv, lib, fetchurl, xdg_utils, pkgs, pkgsi686Linux }: +{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }: -let - ld32 = - if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" - else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" - else throw "Unsupported system ${stdenv.system}"; - ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; - - mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); - - deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xorg; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]); - tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux); - tvldpath64 = lib.makeLibraryPath (deps pkgs); -in stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "12.0.90041"; + version = "13.1.3026"; src = fetchurl { - # There is a 64-bit package, but it has no differences apart from Debian dependencies. - # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason. - url = "https://dl.tvcdn.de/download/version_12x/teamviewer_${version}_i386.deb"; - sha256 = "19gf68xadayncrbpkk3v05xm698zavv8mz8ia6jhadrh5s6i0bwg"; + url = "https://dl.tvcdn.de/download/linux/version_13x/teamviewer_${version}_amd64.deb"; + sha256 = "14zaa1xjdfmgbbq40is5mllqcd9zan03sblkzajswd5gps7crsik"; }; unpackPhase = '' @@ -30,6 +15,10 @@ stdenv.mkDerivation rec { tar xf data.tar.* ''; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ]; + propagatedBuildInputs = [ qtquickcontrols ]; + installPhase = '' mkdir -p $out/share/teamviewer $out/bin $out/share/applications cp -a opt/teamviewer/* $out/share/teamviewer @@ -46,41 +35,23 @@ stdenv.mkDerivation rec { ln -s /var/log/teamviewer $out/share/teamviewer/logfiles ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils - pushd $out/share/teamviewer/tv_bin - - sed -i "s,TV_LD32_PATH=.*,TV_LD32_PATH=$(cat ${ld32})," script/tvw_config - ${if stdenv.system == "x86_64-linux" then '' - sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config - '' else '' - sed -i "/TV_LD64_PATH=.*/d" script/tvw_config - ''} - - sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop + sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop - for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/* RTlib/libQtCore.so.4; do - echo "patching $i" - patchelf --set-interpreter $(cat ${ld32}) --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true - done - for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so RTlib/*.so* ; do - echo "patching $i" - patchelf --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true - done - ${if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64 - '' else '' - rm TVGuiSlave.64 - ''} - popd + substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_aux \ + --replace '/lib64/ld-linux-x86-64.so.2' '${glibc.out}/lib/ld-linux-x86-64.so.2' + substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \ + --replace '/var/run/' '/run/' + wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" + wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" ''; - dontPatchELF = true; dontStrip = true; meta = with stdenv.lib; { homepage = http://www.teamviewer.com; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jagajaga dasuxullebt ]; }; } diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 904a6812c489eb0041ccbc5761f2d7164a7530b2..01aaa2219bf38118ddaca86383ddd6939b0d4742 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, makeWrapper, qt4 }: +{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, +makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }: stdenv.mkDerivation rec { name = "x2goclient-${version}"; - version = "4.1.0.0"; + version = "4.1.2.1"; src = fetchurl { - url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; - sha256 = "0sibrj4qppww7mirdixrqrknkyq3g97s64186h88j8k66sy1anab"; + url = "https://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; + sha256 = "1bzjzz2m9bqqndnk1p9p522cfapsqgkb0wllvqj9d4ir18grh60w"; }; - buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ]; + buildInputs = [ cups libssh libXpm nxproxy openldap openssh + qtbase qtsvg qtx11extras qttools phonon ]; nativeBuildInputs = [ makeWrapper ]; - patchPhase = '' + patches = [ ./qt511.patch ]; + + postPatch = '' substituteInPlace Makefile \ - --replace "lrelease-qt4" "${qt4}/bin/lrelease" \ - --replace "qmake-qt4" "${qt4}/bin/qmake" \ + --replace "SHELL=/bin/bash" "SHELL=$SHELL" \ + --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \ + --replace "qmake-qt4" "${qtbase.dev}/bin/qmake" \ --replace "-o root -g root" "" ''; - makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; + makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/remote/x2goclient/qt511.patch b/pkgs/applications/networking/remote/x2goclient/qt511.patch new file mode 100644 index 0000000000000000000000000000000000000000..8f02cd62277d643acd7ba379c6263f8bfc0bc407 --- /dev/null +++ b/pkgs/applications/networking/remote/x2goclient/qt511.patch @@ -0,0 +1,15 @@ +diff --git a/src/printwidget.cpp b/src/printwidget.cpp +index 58a8af7..131d340 100644 +--- a/src/printwidget.cpp ++++ b/src/printwidget.cpp +@@ -23,6 +23,7 @@ + #include "x2gosettings.h" + #include "x2gologdebug.h" + #include ++#include + #ifdef Q_OS_WIN + #include "wapi.h" + #endif +-- +2.17.1 + diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index ed1abfcba99def4aff2e49a674efb101af38e4b7..a778042c2ea2c93b340cb5e3bb8b8b022d2280be 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: +{ stdenv, fetchFromGitHub, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: let xorgxrdp = stdenv.mkDerivation rec { name = "xorgxrdp-${version}"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - sha256 = "05ix0bvbgpg0l0f6pyxp64a4785yv16dxf522y7k84b0rag4bxr7"; + sha256 = "15idwgcjgwa9in8y1bblpj67y7w0bfngc2sa0hd9hn0dinrlifrk"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; @@ -34,7 +34,7 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.5"; + version = "0.9.7"; name = "xrdp-${version}"; src = fetchFromGitHub { @@ -42,7 +42,7 @@ let repo = "xrdp"; rev = "refs/heads/runtime-cfg-path-${version}"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already fetchSubmodules = true; - sha256 = "1sm994dic72zvxgwxw9z6an6050976nlnnn2my42pnzj9l5842d8"; + sha256 = "1dw2zl9zh6win1q0kxj08n9fawpcrs1krjh5978wp0jmq8sdbn7k"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 46de1d532dd4a13f76181681c99d05ad172d4f51..0db18e77bfa668e93df5ac07dde0ebca664b57b5 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { name = "resilio-sync-${version}"; - version = "2.5.12"; + version = "2.6.0"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "176gf5704wh22kqig8n0gg83048w71grw7h37k2qvxjaf4vypnc7"; - "i686-linux" = "15m2s2cqrkpb7ladbwimbs9agqb4ww9jr4gf0ifjwzm2grv5ffnh"; + "x86_64-linux" = "0041axi9carspkfaxvyirfvsa29zz55al01x90nh93nzxvpvywsz"; + "i686-linux" = "1ar36lp4f6a1z9i82g3gpak4q4ny09faqxdd59q1pvfzq25ypdhs"; }.${stdenv.system}; }; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 35926836e30d84eba11e8262afc8a62b074cde33..06c84759a5909064160f840b9fac25193d4a563e 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, writeScript, pkgconfig, cmake, qtbase, qttools +{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools , seafile-shared, ccnet, makeWrapper , withShibboleth ? true, qtwebengine }: with stdenv.lib; stdenv.mkDerivation rec { - version = "6.1.7"; + version = "6.2.4"; name = "seafile-client-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "1wf258sxn4pqdn1xypqwlxbnls771k2c6whpbinpns3knv5zvgaq"; + sha256 = "0z5li1d7ipsm1mp0lk6mls220v4vlmsqm8ym8kxlkinqbmkky0hz"; }; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..78910d1ecf6e4cd4360dab17c045688138c369e2 --- /dev/null +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { + name = "sieve-connect-${version}"; + version = "0.89"; + + src = fetchFromGitHub { + owner = "philpennock"; + repo = "sieve-connect"; + rev = "v${version}"; + sha256 = "0g7cv29wd5673inl4c87xb802k86bj6gcwh131xrbbg0a0g1c8fp"; + }; + + buildInputs = [ perl ]; + nativeBuildInputs = [ makeWrapper ]; + + preBuild = '' + # Fixes failing build when not building in git repo + mkdir .git + touch .git/HEAD + echo "${version}" > versionfile + echo "$(date +%Y-%m-%d)" > datefile + ''; + + buildFlags = [ "PERL5LIB=${stdenv.lib.makePerlPath [ perlPackages.FileSlurp ]}" "bin" "man" ]; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + install -m 755 sieve-connect $out/bin + gzip -c sieve-connect.1 > $out/share/man/man1/sieve-connect.1.gz + + wrapProgram $out/bin/sieve-connect \ + --prefix PERL5LIB : "${stdenv.lib.makePerlPath (with perlPackages; [ + AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS PodUsage + TermReadKey TermReadLineGnu ])}" + ''; + + meta = with stdenv.lib; { + description = "A client for the MANAGESIEVE Protocol"; + longDescription = '' + This is sieve-connect. A client for the ManageSieve protocol, + as specifed in RFC 5804. Historically, this was MANAGESIEVE as + implemented by timsieved in Cyrus IMAP. + ''; + homepage = https://github.com/philpennock/sieve-connect; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 14ed2587e6365384568a3f4682f36610a8ea6e29..cd697f107b358b2f00d8748b0f5d8ad62e390dc4 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "A masquerading SIP Proxy Server"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index f01a36cc65f5827f607aa462dfad1a6ea9bbfc0f..81c48cff4a012a2b8b1b7b5d27df5e5c76093266 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade, libgnome, libgnomeui -, gnomedocutils, scrollkeeper, libxslt }: +{ stdenv, fetchurl, pkgconfig, libtool, gtk3, libpcap, goocanvas2, +popt, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "etherape-0.9.13"; + name = "etherape-0.9.18"; src = fetchurl { url = "mirror://sourceforge/etherape/${name}.tar.gz"; - sha256 = "1xq93k1slyak8mgwrw5kymq0xn0kl8chvfcvaablgki4p0l2lg9a"; + sha256 = "0y9cfc5iv5zy82j165i9agf45n1ixka064ykdvpdhb07sr3lzhmv"; }; - configureFlags = [ "--disable-scrollkeeper" ]; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ itstool pkgconfig (stdenv.lib.getBin libxml2) ]; buildInputs = [ - libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils - scrollkeeper libxslt + libtool gtk3 libpcap goocanvas2 popt ]; - meta = { + meta = with stdenv.lib; { homepage = http://etherape.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + platforms = with platforms; linux; + maintainers = with maintainers; [ symphorien ]; }; } diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 803e35307fe9af3f4a7524a3f11fde636cca8e7f..0c793c41c55a2177142e916ead743bc29ed48d2d 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2016-07-R1"; src = fetchurl { - url = "http://www.kismetwireless.net/code/${name}.tar.xz"; + url = "https://www.kismetwireless.net/code/${name}.tar.xz"; sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx"; }; diff --git a/pkgs/applications/networking/sniffers/wireshark/cmake.patch b/pkgs/applications/networking/sniffers/wireshark/cmake.patch deleted file mode 100644 index 890fffedce031975d2996b3f08a2894bd504701d..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/sniffers/wireshark/cmake.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,6 +19,7 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - # - -+cmake_minimum_required(VERSION 3.7) - project(Wireshark C CXX) - - # Updated by make-version.pl -@@ -40,7 +41,7 @@ - # Needed for GREATER_EQUAL operator - cmake_minimum_required(VERSION 3.7) - else() -- cmake_minimum_required(VERSION 2.8.8) -+ cmake_minimum_required(VERSION 3.7) - endif() - - # Needs to be set after cmake_minimum_required or cmake_policy(VERSION) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 424c1926f35a9fe9b5a1746045b95f667f663b7f..867768d9f9f136bd90735887c20edb817ceed944 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares -, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib +{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares +, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib , libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null , withQt ? false, qt5 ? null @@ -12,15 +12,15 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.5"; + version = "2.6.2"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { name = "wireshark-${variant}-${version}"; src = fetchurl { - url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1mvgy67rvnwj2kbc43s4il81jvz5ai0bx2j3j2js7x50zclyrcmk"; + url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; + sha256 = "153h6prxamv5a62f3pfadkry0y57696xrgxfy2gfy5xswdg8kcj9"; }; cmakeFlags = [ @@ -49,8 +49,15 @@ in stdenv.mkDerivation { name = "fix-timeout.patch"; url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0"; sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv"; - }) - ++ stdenv.lib.optional stdenv.isDarwin ./cmake.patch; + }); + + postPatch = '' + sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt + ''; + + preBuild = '' + export LD_LIBRARY_PATH="$PWD/run" + ''; postInstall = if stdenv.isDarwin then '' ${optionalString withQt '' @@ -72,6 +79,8 @@ in stdenv.mkDerivation { ''} ${optionalString withQt '' install -Dm644 -t $out/share/applications ../wireshark.desktop + wrapProgram $out/bin/wireshark \ + --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix} ''} substituteInPlace $out/share/applications/*.desktop \ @@ -82,6 +91,11 @@ in stdenv.mkDerivation { enableParallelBuilding = true; + shellHook = '' + # to be able to run the resulting binary + export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 + ''; + meta = with stdenv.lib; { homepage = https://www.wireshark.org/; description = "Powerful network protocol analyzer"; diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..93ab6c56d99d055309e67c982ea595275101236c --- /dev/null +++ b/pkgs/applications/networking/soapui/default.nix @@ -0,0 +1,51 @@ +{ fetchurl, stdenv, writeText, jdk, maven, makeWrapper }: + +stdenv.mkDerivation rec { + name = "soapui-${version}"; + version = "5.4.0"; + + src = fetchurl { + url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz"; + sha256 = "1yqx1fsh8mr5zf36df7pi25dysb28gfscr1667jzd5s0k9jl42xd"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk maven ]; + + installPhase = '' + mkdir -p $out/share/java + cp -R bin lib $out/share/java + + makeWrapper $out/share/java/bin/soapui.sh $out/bin/soapui --set SOAPUI_HOME $out/share/java + ''; + + patches = [ + (writeText "soapui-${version}.patch" '' + --- a/bin/soapui.sh + +++ b/bin/soapui.sh + @@ -34,7 +34,7 @@ SOAPUI_CLASSPATH=$SOAPUI_HOME/bin/soapui-${version}.jar:$SOAPUI_HOME/lib/* + export SOAPUI_CLASSPATH + + JAVA_OPTS="-Xms128m -Xmx1024m -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -Dsoapui.properties=soapui.properties -Dsoapui.home=$SOAPUI_HOME/bin -splash:SoapUI-Spashscreen.png" + -JFXRTPATH=`java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator` + +JFXRTPATH=`${jdk}/bin/java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator` + SOAPUI_CLASSPATH=$JFXRTPATH:$SOAPUI_CLASSPATH + + if $darwin + @@ -69,4 +69,4 @@ echo = SOAPUI_HOME = $SOAPUI_HOME + echo = + echo ================================ + + -java $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@" + +${jdk}/bin/java $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@" + '') + ]; + + meta = with stdenv.lib; { + description = "The Most Advanced REST & SOAP Testing Tool in the World"; + homepage = https://www.soapui.org/; + license = "SoapUI End User License Agreement"; + maintainers = with maintainers; [ gerschtli ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1f8d0cba6d053cd3cc93954828f817a360b9fe5c --- /dev/null +++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix @@ -0,0 +1,106 @@ +{ stdenv, fetchurl, lib, makeWrapper, + # build dependencies + alsaLib, atk, cairo, cups, dbus, expat, fontconfig, + freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg, + glibc, systemd +}: + +stdenv.mkDerivation rec { + + version = "2.12.0"; + + name = "patchwork-classic-${version}"; + + src = fetchurl { + url = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb"; + sha256 = "1rvp07cgqwv7ac319p0qwpfxd7l8f53m1rlvvig7qf7q23fnmbsj"; + }; + + sourceRoot = "."; + + unpackCmd = '' + ar p "$src" data.tar.xz | tar xJ + ''; + + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -R usr/share opt $out/ + + # fix the path in the desktop file + substituteInPlace \ + $out/share/applications/ssb-patchwork-electron.desktop \ + --replace /opt/ $out/opt/ + + # symlink the binary to bin/ + ln -s $out/opt/ssb-patchwork-electron/ssb-patchwork-electron $out/bin/patchwork-classic + ''; + + + preFixup = let + packages = [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + nspr + nss + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + stdenv.cc.cc.lib + stdenv.cc.cc + glibc + ]; + libPathNative = lib.makeLibraryPath packages; + libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; + libPath = "${libPathNative}:${libPath64}"; + in '' + # patch executable + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/opt/ssb-patchwork-electron" \ + $out/opt/ssb-patchwork-electron/ssb-patchwork-electron + + # patch libnode + patchelf \ + --set-rpath "${libPath}" \ + $out/opt/ssb-patchwork-electron/libnode.so + + # libffmpeg is for some reason not executable + chmod a+x $out/opt/ssb-patchwork-electron/libffmpeg.so + + # fix missing libudev + ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/ssb-patchwork-electron/libudev.so.1 + wrapProgram $out/opt/ssb-patchwork-electron/ssb-patchwork-electron \ + --prefix LD_LIBRARY_PATH : $out/opt/ssb-patchwork-electron + ''; + + meta = with stdenv.lib; { + description = "Electron wrapper for Patchwork Classic: run as a desktop app outside the browser"; + homepage = "https://github.com/ssbc/patchwork-classic-electron"; + license = licenses.gpl3; + maintainers = with maintainers; [ mrVanDalo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..59872afaad938a62c062cc3c64aa85e492726a39 --- /dev/null +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -0,0 +1,105 @@ +{ stdenv, fetchurl, dpkg, makeWrapper +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib +, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango +, systemd, xorg, xprintidle-ng }: + +let + + version = "1.10.45"; + + rpath = stdenv.lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + curl + dbus + expat + fontconfig + freetype + glib + gnome2.GConf + gdk_pixbuf + gtk3 + pango + libnotify + libxcb + nspr + nss + stdenv.cc.cc + systemd + + xorg.libxkbfile + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libXScrnSaver + ] + ":${stdenv.cc.cc.lib}/lib64"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity_${version}_amd64.deb"; + sha256 = "0jfi0lfijnhij9jvkhxgyvq8m1jzaym8n1c7707fv3hjh1h0vxn1"; + } + else + throw "super-productivity is not supported on ${stdenv.system}"; + +in stdenv.mkDerivation { + name = "super-productivity-${version}"; + + inherit src; + + buildInputs = [ + dpkg + gtk3 # needed for GSETTINGS_SCHEMAS_PATH + ]; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = "dpkg -x $src ."; + + installPhase = '' + runHook preInstall + + mkdir -p $out + + cp -R usr/share $out/share + cp -R opt $out/libexec + + # Otherwise it looks "suspicious" + chmod -R g-w $out + + # set linker and rpath + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/libexec/superProductivity/superproductivity" + patchelf --set-rpath ${rpath}:$out/libexec/superProductivity "$out/libexec/superProductivity/superproductivity" + + # wrapper for xdg_data_dirs and xprintidle path + makeWrapper $out/libexec/superProductivity/superproductivity $out/bin/superproductivity \ + --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ + --prefix PATH : "${xprintidle-ng}/bin" + + # Fix the desktop link + substituteInPlace $out/share/applications/superproductivity.desktop \ + --replace /opt/superProductivity/ $out/bin/ + + runHook postInstall + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "To Do List / Time Tracker with Jira Integration."; + homepage = https://super-productivity.com; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ offline ]; + }; +} diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix index ef8f028274985c66be4805af2c5301df822a77c4..26288f9f6e65033a9bbc417e26b1d253130b0d3d 100644 --- a/pkgs/applications/networking/sync/backintime/qt4.nix +++ b/pkgs/applications/networking/sync/backintime/qt4.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, makeWrapper, gettext, pkgconfig, libtool, backintime-common, python3, python3Packages }: +{stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }: stdenv.mkDerivation rec { - inherit (backintime-common) version src installFlags meta; + inherit (backintime-common) version src installFlags; name = "backintime-qt4-${version}"; @@ -22,4 +22,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${backintime-common}/bin:$PATH" ''; + meta = with stdenv.lib; { + broken = true; + }; } diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bea6a0780ed92d7f7c672990654ee356c46a37ad --- /dev/null +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub +, meson, ninja, pkgconfig, sphinx +, acl, curl, fuse, libselinux, udev, xz, zstd +, fuseSupport ? true +, selinuxSupport ? true +, udevSupport ? true +, glibcLocales, rsync +}: + +stdenv.mkDerivation rec { + name = "casync-${version}"; + version = "2-152-ge4a3c5e"; + + src = fetchFromGitHub { + owner = "systemd"; + repo = "casync"; + rev = "e4a3c5efc8f11e0e99f8cc97bd417665d92b40a9"; + sha256 = "0zx6zvj5a6rr3w9s207rvpfw7gwssiqmp1p3c75bsirmz4nmsdf0"; + }; + + buildInputs = [ acl curl xz zstd ] + ++ stdenv.lib.optionals (fuseSupport) [ fuse ] + ++ stdenv.lib.optionals (selinuxSupport) [ libselinux ] + ++ stdenv.lib.optionals (udevSupport) [ udev ]; + nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; + checkInputs = [ glibcLocales rsync ]; + + postPatch = '' + for f in test/test-*.sh.in; do + patchShebangs $f + done + patchShebangs test/http-server.py + ''; + + PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + mesonFlags = stdenv.lib.optionals (!fuseSupport) [ "-Dfuse=false" ] + ++ stdenv.lib.optionals (!udevSupport) [ "-Dudev=false" ] + ++ stdenv.lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; + + doCheck = true; + preCheck = '' + export LC_ALL="en_US.utf-8" + ''; + + meta = with stdenv.lib; { + description = "Content-Addressable Data Synchronizer"; + homepage = https://github.com/systemd/casync; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index e4bdec668a022ed5db07573687ff2bbc34750877..b0315ee3477d32e4da36d2be953eb1fc434d3f66 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,18 +1,26 @@ -{ stdenv, fetchFromGitHub, cmake, lua, pkgconfig, rsync, - asciidoc, libxml2, docbook_xml_dtd_45, docbook_xml_xslt, libxslt }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkgconfig, rsync, + asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: stdenv.mkDerivation rec { name = "lsyncd-${version}"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "axkibe"; repo = "lsyncd"; rev = "release-${version}"; - sha256 = "1q2ixp52r96ckghgmxdbms6xrq8dbziimp8gmgzqfq4lk1v1w80y"; + sha256 = "1hbsih5hfq9lhgnxm0wb5mrj6xmlk2l0i9a79wzd5f6cnjil9l3x"; }; - patchPhase = '' + patches = [ + (fetchpatch { + sha256 = "0b0h2qxh73l502p7phf6qgl8576nf6fvqqp2x5wy3nz7sc9qb1z8"; + name = "fix-non-versioned-lua-not-search-in-cmake.patch"; + url = "https://github.com/axkibe/lsyncd/pull/500/commits/0af99d8d5ba35118e8799684a2d4a8ea4b0c6957.patch"; + }) + ]; + + postPatch = '' substituteInPlace default-rsync.lua \ --replace "/usr/bin/rsync" "${rsync}/bin/rsync" ''; @@ -22,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ rsync cmake lua pkgconfig - asciidoc libxml2 docbook_xml_dtd_45 docbook_xml_xslt libxslt + asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index aa2a971b15f660808052ffa3231068ef6b5e4f95..337c166a79ac49ab59c62973b7c78723d74c69c0 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.40"; + version = "1.42"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "01q9g5g4va1s91xzvxpq8lj9jcrbl66cik383cpxwmcv04qcqgw9"; + sha256 = "0r85d45q0jdfwcrblq1rd698cw3h6mc9h4dmlhzl982zpkncijqj"; }; outputs = [ "bin" "out" "man" ]; @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; - homepage = http://rclone.org; + homepage = https://rclone.org; license = licenses.mit; maintainers = with maintainers; [ danielfullmer ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index abc1f27e4f60aa81512a53cbd10c61e94ef62181..fc4bc6c0671e44c156a57894c95e5f0a0e6e98f5 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: rec { version = "3.1.3"; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index f1e3f6b7301cd5feaf85b24e076a32f49c3d06da..0b4d580cd2099684629265d9fa2439d3c5d5fa3e 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, libiconv, zlib, popt +{ stdenv, fetchurl, perl, libiconv, zlib, popt , enableACLs ? true, acl ? null , enableCopyDevicesPatch ? false }: @@ -6,7 +6,7 @@ assert enableACLs -> acl != null; let - base = import ./base.nix { inherit stdenv fetchurl fetchpatch; }; + base = import ./base.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { name = "rsync-${base.version}"; diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index bc2a6eb9c3cb658c49e0b314f06d558648357203..e5c04798aab8c4776829faef4d6d05c77f318dcb 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, perl, rsync }: let - base = import ./base.nix { inherit stdenv fetchurl fetchpatch; }; + base = import ./base.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { name = "rrsync-${base.version}"; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index e41671f236046bab6725e2f7e6140eebb3ae9704..07444fbb9fe95e07cb922e6ca3443b32ecc42c70 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -2,26 +2,21 @@ python2Packages.buildPythonApplication rec { name = "syncplay-${version}"; - version = "1.5.2"; + version = "1.5.5"; format = "other"; src = fetchurl { - url = https://github.com/Syncplay/syncplay/archive/v1.5.2.tar.gz; - sha256 = "0a7lqq3y53ag5hzkkjpz61gfmglf3w1kpvyynhq2514fn9rnwsla"; + url = https://github.com/Syncplay/syncplay/archive/v1.5.5.tar.gz; + sha256 = "0g12hm84c48fjrmwljl0ii62f55vm6fk2mv8vna7fadabmk6dwhr"; }; propagatedBuildInputs = with python2Packages; [ pyside twisted ]; - makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - - postInstall = '' - mkdir -p $out/lib/python2.7/site-packages - mv $out/lib/syncplay/syncplay $out/lib/python2.7/site-packages/ - ''; + makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://syncplay.pl/; + homepage = https://syncplay.pl/; description = "Free software that synchronises media players"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index ae715aa4321c0afb6e543b21ce03c2053a4dd8e5..9d720bee05e7a923542da4ef278165470afaa258 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: +{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall +, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook +, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 +, bcrypt, gobjectIntrospection }: buildPythonApplication rec { - version = "0.9.2.7"; + version = "0.9.4"; name = "syncthing-gtk-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing-gtk"; rev = "v${version}"; - sha256 = "08k7vkibia85klwjxbnzk67h4pphrizka5v9zxwvvv3cisjiclc2"; + sha256 = "0d3rjd1xjd7zravks9a2ph7gv1cm8wxaxkkvl1fvcx15v7f3hff9"; }; nativeBuildInputs = [ @@ -18,8 +21,8 @@ buildPythonApplication rec { ]; buildInputs = [ - gtk3 librsvg - libnotify + gtk3 librsvg libappindicator-gtk3 + libnotify gnome3.adwaita-icon-theme # Schemas with proxy configuration gnome3.gsettings-desktop-schemas ]; @@ -29,14 +32,19 @@ buildPythonApplication rec { ]; patches = [ - ./disable-syncthing-binary-configuration.patch + (fetchpatch { + url = https://github.com/syncthing/syncthing-gtk/commit/b2535e5a9cdb31c4987ab7af37f62d58d38255b7.patch; + sha256 = "047v79wz2a9334gbzywlqwpacrk53s26ksvfqaddk06avv8742w7"; + }) (substituteAll { src = ./paths.patch; - killall = "${psmisc}/bin/killall"; + killall = "${killall}/bin/killall"; syncthing = "${syncthing}/bin/syncthing"; }) ]; + setupPyBuildFlags = [ "build_py" "--nofinddaemon" "--nostdownloader" ]; + postPatch = '' substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share" @@ -48,9 +56,9 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "GTK3 & python based GUI for Syncthing"; - maintainers = with maintainers; [ ]; - platforms = syncthing.meta.platforms; homepage = https://github.com/syncthing/syncthing-gtk; license = licenses.gpl2; + maintainers = with maintainers; [ ]; + platforms = syncthing.meta.platforms; }; } diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch deleted file mode 100644 index 6c516e98acb1ee7d94fff36123b4226b44c07ec9..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- a/find-daemon.glade -+++ b/find-daemon.glade -@@ -112,6 +112,7 @@ - - True - True -+ False - 20 - - -@@ -126,6 +127,7 @@ - _Browse... - True - True -+ False - True - True - 0.51999998092651367 ---- a/syncthing_gtk/configuration.py -+++ b/syncthing_gtk/configuration.py -@@ -168,6 +168,8 @@ - yield k - - def get(self, key): -+ if key == "syncthing_binary": -+ return self.REQUIRED_KEYS[key][1] - return self.values[key] - - def set(self, key, value): ---- a/syncthing_gtk/finddaemondialog.py -+++ b/syncthing_gtk/finddaemondialog.py -@@ -163,7 +163,7 @@ - self["lblDownloadProgress"].set_markup(_("Download failed.")) - self["btDownload"].set_visible(True) - self["pbDownload"].set_visible(False) -- self["vsyncthing_binary"].set_sensitive(True) -+ self["vsyncthing_binary"].set_sensitive(False) - self["btBrowse"].set_sensitive(True) - self["btSave"].set_sensitive(True) - -@@ -179,7 +179,7 @@ - - def cb_extract_finished(self, downloader, *a): - """ Called after extraction is finished """ -- self["vsyncthing_binary"].set_sensitive(True) -+ self["vsyncthing_binary"].set_sensitive(False) - self["btBrowse"].set_sensitive(True) - self["vsyncthing_binary"].set_text(downloader.get_target()) - self["lblDownloadProgress"].set_markup("" + _("Download finished.") + "") ---- a/syncthing_gtk/wizard.py -+++ b/syncthing_gtk/wizard.py -@@ -60,7 +60,6 @@ - self.quit_button.connect("clicked", lambda *a : self.emit("cancel")) - # Pages - self.add_page(IntroPage(self)) -- self.add_page(FindDaemonPage()) - self.add_page(GenerateKeysPage()) - self.add_page(HttpSettingsPage()) - self.add_page(SaveSettingsPage()) ---- a/ui-settings.glade -+++ b/ui-settings.glade -@@ -943,6 +943,7 @@ - _Browse... - True - True -+ False - True - True - 0.51999998092651367 -@@ -974,6 +975,7 @@ - - True - True -+ False - True - - diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 531a1d5d0a1774ca4b9719f0d040af8ccbaadff1..25d482fd9b0667d33ce4038f24243764531dc6a7 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, patches ? [], postInstall ? "" }: stdenv.mkDerivation rec { - version = "0.14.46"; + version = "0.14.48"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0lv8n5id40iy2gfccy8g45fjzlnbnvi7nlvj25pri22dq2bd5svm"; + sha256 = "10jls0z3y081fq097xarplzv5sz076ibhawzm65bq695f6s5sdzw"; }; inherit patches; diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 24ffe61b5abf27809b94afa87e57c953e6305eb3..5a548d5ff65f064d7796f315d92df0b18f31b919 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgs }: +{ stdenv, fetchFromGitHub, makeWrapper, lib +, dnsutils, coreutils, openssl, nettools, utillinux, procps }: let - version = "2.9.5-3"; - pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; - opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; + version = "2.9.5-5"; in stdenv.mkDerivation rec { name = "testssl.sh-${version}"; @@ -12,22 +11,32 @@ in stdenv.mkDerivation rec { owner = "drwetter"; repo = "testssl.sh"; rev = "v${version}"; - sha256 = "07vlmf3gn2xa4wam2sql6c1s1hvj5adzd6l1fl12lq066v0k7r7n"; + sha256 = "0zgj9vhd8fv3a1cn8dxqmjd8qmgryc867gq7zbvbr41lkqc06a1r"; }; - patches = [ ./testssl.patch ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + coreutils # for pwd and printf + dnsutils # for dig + nettools # for hostname + openssl # for openssl + procps # for ps + utillinux # for hexdump + ]; postPatch = '' - sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \ - -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \ - -e "s|OPENSSL:-\"\"|OPENSSL:-\"${opensslBinPath}\"|g" \ - testssl.sh + substituteInPlace testssl.sh \ + --replace /bin/pwd pwd \ + --replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" ''; installPhase = '' - mkdir -p $out/bin $out/etc - cp -r etc/ $out/ - cp testssl.sh $out/bin/testssl.sh + install -Dt $out/bin testssl.sh + + wrapProgram $out/bin/testssl.sh \ + --prefix PATH ':' ${lib.makeBinPath buildInputs} + + cp -r etc $out ''; meta = with stdenv.lib; { @@ -38,6 +47,6 @@ in stdenv.mkDerivation rec { ''; homepage = https://testssl.sh/; license = licenses.gpl2; - maintainers = [ maintainers.etu ]; + maintainers = with maintainers; [ etu ]; }; } diff --git a/pkgs/applications/networking/testssl/testssl.patch b/pkgs/applications/networking/testssl/testssl.patch deleted file mode 100644 index d5269c737084585ca42df48888ebf6d7b619efa2..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/testssl/testssl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- testssl/testssl.sh 2017-09-24 16:53:29.395263437 +0200 -+++ testssl-new/testssl.sh 2017-09-24 16:53:41.221154492 +0200 -@@ -165,6 +165,7 @@ - # following variables make use of $ENV, e.g. OPENSSL= ./testssl.sh - # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help - declare -x OPENSSL OPENSSL_TIMEOUT -+OPENSSL=${OPENSSL:-""} - FAST_SOCKET=${FAST_SOCKET:-false} # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production - COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all - COLORBLIND=${COLORBLIND:-false} # if true, swap blue and green in the output diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d084461a9b2d7453deb49a427def481c43eac34d --- /dev/null +++ b/pkgs/applications/networking/transporter/default.nix @@ -0,0 +1,71 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, granite +, vala_0_40 +, gnome3 +, libxml2 +, gettext +, gobjectIntrospection +, appstream-glib +, desktop-file-utils +, magic-wormhole +, wrapGAppsHook }: + +let + pname = "Transporter"; + version = "1.3.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "bleakgrey"; + repo = pname; + rev = version; + sha256 = "19zb2yqmyyhk5vgh6p278b76shlq0r8ykk1ks8zzr187nr5lf5k1"; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + gobjectIntrospection # For setup hook + libxml2 + meson + ninja + pkgconfig + vala_0_40 + wrapGAppsHook + ]; + + buildInputs = with gnome3; [ + defaultIconTheme # If I omit this there's no icons in KDE + glib + granite + gsettings-desktop-schemas + gtk3 + libgee + magic-wormhole + ]; + + prePatch = '' + # The paths were hardcoded + substituteInPlace ./src/WormholeInterface.vala \ + --replace /bin/wormhole ${magic-wormhole}/bin/wormhole + ''; + + postPatch = '' + chmod +x ./meson/post_install.py + patchShebangs ./meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Simple magic-wormhole client"; + homepage = https://github.com/bleakgrey/Transporter; + license = licenses.gpl3; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index e38ba36b9253c7d27e368e5eee3781fdedeb400d..d689b17fe32568903e5827f9e0a3b0cdbd5b70cb 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "1mc7qqvrnl0zyhgh8n7wx1g1cbwq74xpvbz8rfjmyi77p693a6fp"; - url = "http://humdi.net/vnstat/${name}.tar.gz"; + url = "https://humdi.net/vnstat/${name}.tar.gz"; }; buildInputs = [ gd ncurses ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { This means that vnStat won't actually be sniffing any traffic and also ensures light use of system resources. ''; - homepage = http://humdi.net/vnstat/; + homepage = https://humdi.net/vnstat/; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index b1e2258271bf0f2a623c9a5eb4a2cf1fda006cc8..ca5624d5b73f66418ec776c90d29e72774c2cfe3 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "znc-${version}"; - version = "1.6.6"; + version = "1.7.1"; src = fetchurl { - url = "http://znc.in/releases/archive/${name}.tar.gz"; - sha256 = "09cmsnxvi7jg9a0dicf60fxnxdff4aprw7h8vjqlj5ywf6y43f3z"; + url = "https://znc.in/releases/archive/${name}.tar.gz"; + sha256 = "1i1r1lh9q2mr1bg520zrvrlwhrhy6wibrin78wjxq1gab1qymks4"; }; nativeBuildInputs = [ pkgconfig ]; @@ -24,15 +24,18 @@ stdenv.mkDerivation rec { ++ optional withTcl tcl ++ optional withCyrus cyrus_sasl; - configureFlags = optionalString withPerl "--enable-perl " - + optionalString withPython "--enable-python " - + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib " - + optionalString withCyrus "--enable-cyrus "; + configureFlags = [ + (stdenv.lib.enableFeature withPerl "perl") + (stdenv.lib.enableFeature withPython "python") + (stdenv.lib.enableFeature withTcl "tcl") + (stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib") + (stdenv.lib.enableFeature withCyrus "cyrus") + ]; meta = with stdenv.lib; { description = "Advanced IRC bouncer"; - homepage = http://wiki.znc.in/ZNC; - maintainers = with maintainers; [ viric schneefux lnl7 ]; + homepage = https://wiki.znc.in/ZNC; + maintainers = with maintainers; [ schneefux lnl7 ]; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 4b68285c3f1a5735c7bb6e8a998e458b0e739bd2..a799df2d1ed0ac9a64bab28385f3fa0762cab423 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, znc }: +{ stdenv, fetchFromGitHub, znc }: let zncDerivation = a@{ diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..be31f5fd102fde718160eed881be3598abf48672 --- /dev/null +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchzip, jre }: + +stdenv.mkDerivation rec { + name = "atlassian-cli-${version}"; + version = "7.8.0"; + + src = fetchzip { + url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip"; + sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7"; + extraPostFetch = "chmod go-w $out"; + }; + + tools = [ + "agile" + "bamboo" + "bitbucket" + "confluence" + "csv" + "hipchat" + "jira" + "servicedesk" + "structure" + "tempo" + "trello" + "upm" + ]; + + installPhase = '' + mkdir -p $out/{bin,share/doc/atlassian-cli} + cp -r lib $out/share/java + cp -r README.txt license $out/share/doc/atlassian-cli + for tool in $tools + do + substitute ${./wrapper.sh} $out/bin/$tool \ + --subst-var out \ + --subst-var-by jre ${jre} \ + --subst-var-by tool $tool + chmod +x $out/bin/$tool + done + ''; + + meta = with stdenv.lib; { + description = "An integrated family of CLI’s for various Atlassian applications"; + homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ twey ]; + inherit (jre.meta) platforms; + }; +} diff --git a/pkgs/applications/office/atlassian-cli/wrapper.sh b/pkgs/applications/office/atlassian-cli/wrapper.sh new file mode 100755 index 0000000000000000000000000000000000000000..80b60dbc468cadf01e79abcea8907cc52b240be6 --- /dev/null +++ b/pkgs/applications/office/atlassian-cli/wrapper.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +tool=@tool@ +user=ATLASSIAN_${tool^^}_USER +host=ATLASSIAN_${tool^^}_HOST +pass=ATLASSIAN_${tool^^}_PASS + +[ -f ~/.atlassian-cli ] && source ~/.atlassian-cli +if [ x = ${!user-x} ] || [ x = ${!host-x} ] || [ x = ${!pass-x} ] +then + >&2 echo please define $user, $host, and $pass in '~/.atlassian-cli' + exit 1 +fi + +@jre@/bin/java \ + -jar @out@/share/java/@tool@-cli-* \ + --server "${!host}" \ + --user "${!user}" \ + --password "${!pass}" \ + "$@" diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0a6268f8452f0656cb6afa8bf211bd81bf0d5f59 --- /dev/null +++ b/pkgs/applications/office/autokey/default.nix @@ -0,0 +1,38 @@ +{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobjectIntrospection +, gnome3, libappindicator-gtk3, libnotify }: + +python3Packages.buildPythonApplication rec { + name = "autokey-${version}"; + version = "0.94.1"; + + src = fetchFromGitHub { + owner = "autokey"; + repo = "autokey"; + rev = "v${version}"; + sha256 = "1syxyciyxzs0khbfs9wjgj03q967p948kipw27j1031q0b5z3jxr"; + }; + + # Arch requires a similar work around—see + # https://aur.archlinux.org/packages/autokey-py3/?comments=all + patches = [ ./remove-requires-dbus-python.patch ]; + + # Tests appear to be broken with import errors within the project structure + doCheck = false; + + # Note: no dependencies included for Qt GUI because Qt ui is poorly + # maintained—see https://github.com/autokey/autokey/issues/51 + + buildInputs = [ wrapGAppsHook gobjectIntrospection gnome3.gtksourceview + libappindicator-gtk3 libnotify ]; + + propagatedBuildInputs = with python3Packages; [ + dbus-python pyinotify xlib pygobject3 ]; + + meta = { + homepage = https://github.com/autokey/autokey; + description = "Desktop automation utility for Linux and X11"; + license = with lib.licenses; [ gpl3 ]; + maintainers = with lib.maintainers; [ pneumaticat ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/office/autokey/remove-requires-dbus-python.patch b/pkgs/applications/office/autokey/remove-requires-dbus-python.patch new file mode 100644 index 0000000000000000000000000000000000000000..73372e435291fb37d635b78a097b5dd8c29e62cd --- /dev/null +++ b/pkgs/applications/office/autokey/remove-requires-dbus-python.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -71,7 +71,7 @@ + 'console_scripts': ['autokey-gtk=autokey.gtkui.__main__:main'] + }, + scripts=['autokey-qt', 'autokey-run', 'autokey-shell'], +- install_requires=['dbus-python', 'pyinotify', 'python3-xlib'], ++ install_requires=['pyinotify', 'python-xlib'], + classifiers=[ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Developers', diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 9eec315217cbb59d7be84479f3fffe739913795b..cfd7a4eda2022eeefd7f8ee47cbecfdc9c75c520 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # The (only) source file states: # License: "Do what you feel is right, but don't be a jerk" public license. - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 8449cdf05def4e4855012f706778c2419a925a59..a7c6165bdd2b8309dcce92676dd02a8f7264afeb 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper, + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, boost, qtwebkit, qtx11extras, shared-mime-info, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, @@ -15,23 +15,17 @@ mkDerivation rec { pname = "calligra"; - version = "3.0.1"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; - sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5"; + sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638"; }; - enableParallelBuilding = true; + patches = [ ./qt5_11.patch ]; - patches = [ - (fetchpatch { - name = "calligra-build-with-newer-kcalcore.patch"; - url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff"; - sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0"; - }) - ]; + enableParallelBuilding = true; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; diff --git a/pkgs/applications/office/calligra/qt5_11.patch b/pkgs/applications/office/calligra/qt5_11.patch new file mode 100644 index 0000000000000000000000000000000000000000..66ff8c6eedcd55c1eb3da84152c394c44fb454dd --- /dev/null +++ b/pkgs/applications/office/calligra/qt5_11.patch @@ -0,0 +1,98 @@ +diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp +index 0ffdcf6..cdca006 100644 +--- a/libs/widgets/KoCsvImportDialog.cpp ++++ b/libs/widgets/KoCsvImportDialog.cpp +@@ -21,6 +21,7 @@ + #include "KoCsvImportDialog.h" + + // Qt ++#include + #include + #include + +diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp +index f91555c..a3816f9 100644 +--- a/libs/widgets/KoPageLayoutWidget.cpp ++++ b/libs/widgets/KoPageLayoutWidget.cpp +@@ -23,6 +23,8 @@ + + #include + ++#include ++ + class Q_DECL_HIDDEN KoPageLayoutWidget::Private + { + public: +diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp +index c0d5136..d2a772e 100644 +--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp ++++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp +@@ -24,6 +24,7 @@ + + // Qt + #include ++#include + + // Calligra + #include +diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp +index ed10919..8f52177 100644 +--- a/plugins/formulashape/FormulaToolWidget.cpp ++++ b/plugins/formulashape/FormulaToolWidget.cpp +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) +diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp +index a0a9832..7d7db53 100644 +--- a/sheets/dialogs/LayoutDialog.cpp ++++ b/sheets/dialogs/LayoutDialog.cpp +@@ -36,6 +36,7 @@ + #include + + #include ++#include + #include + #include + #include +diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp +index d64208c..bfddb3a 100644 +--- a/words/part/dialogs/KWAnchoringProperties.cpp ++++ b/words/part/dialogs/KWAnchoringProperties.cpp +@@ -35,6 +35,7 @@ + + #include + ++#include + #include + + const int KWAnchoringProperties::vertRels[4][20] = { +diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp +index e38599a..7e8b2d5 100644 +--- a/words/part/dialogs/KWRunAroundProperties.cpp ++++ b/words/part/dialogs/KWRunAroundProperties.cpp +@@ -28,6 +28,8 @@ + + #include + ++#include ++ + KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) + : m_state(state) + { +diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp +index ae743da..3007f91 100644 +--- a/stage/part/KPrPresentationTool.cpp ++++ b/stage/part/KPrPresentationTool.cpp +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index 1004733a18b5235841cdfe7a122c0479677b8480..e4dc86ebd8db2c932af405cecfa7a78a7f2ce446 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "cb2bib"; - version = "1.9.2"; + version = "1.9.8"; src = fetchurl { - url = "http://www.molspaces.com/dl/progs/${name}.tar.gz"; - sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin"; + url = "https://www.molspaces.com/dl/progs/${name}.tar.gz"; + sha256 = "0fpa0znlabk0nrzgj4c0l6qbg8l16lp9d7lvb9ijv1y0ih9igf0f"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index fdbf9183d7518918fc55b2ed7eb47f9003346d7b..29ea9ff2910fb2e03351e5fad771ad80d5cb1111 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -5,12 +5,11 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.6"; - name = "${pname}-${version}"; + version = "1.7"; src = fetchPypi { inherit pname version; - sha256 = "0iif4imx76ra0lsisksrq5vf54wbivnrb3xqz6mkx9lik3pp5sbx"; + sha256 = "c4eba4203bddaa7bc9d54971d2afeeebab0bc80ce89be1375a41a07c4e82b62f"; }; doCheck = false; @@ -23,7 +22,6 @@ buildPythonApplication rec { homepage = https://beancount.github.io/fava; description = "Web interface for beancount"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } - diff --git a/pkgs/applications/office/gnucash/2.4.nix b/pkgs/applications/office/gnucash/2.4.nix new file mode 100644 index 0000000000000000000000000000000000000000..9aa4cc64315939912cf9b2e80f285d76f605b39a --- /dev/null +++ b/pkgs/applications/office/gnucash/2.4.nix @@ -0,0 +1,90 @@ +{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx +, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui +, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade +, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar, hicolor-icon-theme +}: + +/* If you experience GConf errors when running GnuCash on NixOS, see + * http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications + * for a possible solution. + */ + +stdenv.mkDerivation rec { + name = "gnucash-2.4.15"; + + src = fetchurl { + url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; + sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml + libgnomeprint goffice enchant gettext intltool perl guile slibGuile + swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl + perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar + hicolor-icon-theme + ]; + propagatedUserEnvPkgs = [ gconf ]; + + configureFlags = [ + "CFLAGS=-O3" + "CXXFLAGS=-O3" + "--disable-dbi" + "--enable-ofx" + "--enable-aqbanking" + ]; + + postInstall = '' + # Auto-updaters don't make sense in Nix. + rm $out/bin/gnc-fq-update + + sed -i $out/bin/update-gnucash-gconf \ + -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|' + + for prog in $(echo "$out/bin/"*) + do + # Don't wrap the gnc-fq-* scripts, since gnucash calls them as + # "perl